Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/contracts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
with:
version: nightly
version: stable

- name: Build
run: |
Expand Down
4 changes: 3 additions & 1 deletion contracts/src/consensus/ConsensusV1.sol
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,9 @@ contract ConsensusV1 is UUPSUpgradeable, OwnableUpgradeable {
function _updateVoter(address addr) internal {
Vote storage voter = _voters[addr];
if (voter.validator == address(0)) {
revert MissingVote();
// can be called for potential non-voters because the caller doesn't have knowledge about voters
// and simply passes accounts.
return;
}

uint256 voterBalance = voter.balance;
Expand Down
4 changes: 1 addition & 3 deletions contracts/test/consensus/Consensus-Vote.sol
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@ contract ConsensusTest is Base {
consensus.unvote();
}

function test_update_voters_revert_if_did_not_vote() public {
vm.expectRevert(ConsensusV1.MissingVote.selector);

function test_update_voters_no_op_if_did_not_vote() public {
address nonVoterAddr = address(2);

address[] memory voters = new address[](1);
Expand Down
4 changes: 2 additions & 2 deletions contracts/test/consensus/Consensus-VoteAdd.sol
Original file line number Diff line number Diff line change
Expand Up @@ -371,8 +371,8 @@ contract ConsensusTest is Base {
address voterAddr = address(2);

address[] memory voters = new address[](2);
voters[0] = voterAddr;
voters[1] = addr;
voters[0] = addr;
voters[1] = voterAddr;

address[] memory validators = new address[](2);
validators[0] = addr;
Expand Down
2,084 changes: 1,042 additions & 1,042 deletions packages/core/bin/config/devnet/core/crypto.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions packages/core/bin/config/devnet/core/genesis-wallet.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"address": "0x5DD297a9F10025a7dd205cb796965712a6733d16",
"address": "0x7F34E240A7A6939bF32B3926C116D3B83C6dbd94",
"consensusKeys": {
"compressed": true,
"privateKey": "5567357b1ee30eaf91a3fb1f5aa5f2c9b400bde8788539799c2b5d2d5c591b31",
"publicKey": "af7a35b3dd826f8516257827ca5304317d8c232bac82bef29af3746e9fd089f72969d41330907be43686aa4144a229c0"
"privateKey": "3eefbd63aaea51b14820e15fbe15844b4efed0ed212cbc76665990db60c01a90",
"publicKey": "88c6bf341d62f8bb14da3e2ca69d745a6735fc5e90caa506858d8787cc65a0d16dc82e3948f3066fcde8cc8d690b877c"
},
"keys": {
"compressed": true,
"privateKey": "382b331bd587fc0f9bb7ddeafafe6b3e5e869b420765cf6942fb114677292c83",
"publicKey": "031be488def89c3577a1a6f7665c86ce26a1d92a191b6ce04892c9b4727641ba6c"
"privateKey": "4d4ef97ea5f0c4878a9cc326c1c7407343f2a09bad0fc18f9592c4d29c8bab82",
"publicKey": "02a0774d9ebebd320eabaf79f773043f14b67417ed9bc4905866394abab78ce3f5"
},
"passphrase": "obscure ramp ocean finger swing bird cup stamp giggle person path broccoli limb dove pupil rate decline voyage bacon easy clerk exclude husband wise"
"passphrase": "fragile cook equal squirrel vocal smile shed leg cricket amused endorse torch marine race text flower strike deputy east track toilet only measure vessel"
}
106 changes: 53 additions & 53 deletions packages/core/bin/config/devnet/core/validators.json

Large diffs are not rendered by default.

50 changes: 25 additions & 25 deletions packages/evm-contracts/source/abis/ConsensusV1.json

Large diffs are not rendered by default.

646 changes: 323 additions & 323 deletions tests/e2e/clients/config/core/crypto.json

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions tests/e2e/clients/config/core/validators.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"secrets": [
"shock wasp fall combine section share pull there panic demise work scrub retire drill wrap foster term wish panther hidden magnet scheme zebra device",
"grid letter cry raw online office more vivid absorb gift call plastic beyond luggage wrong speed expose clock come voyage mistake cool crash sleep",
"gold art flame steel fold clog love future puppy damp cause calm inquiry angle curve level oxygen bubble hat category sauce tribe famous loyal",
"force lawsuit tide finger bid emerge network mouse witness phone document spell supreme trigger crater list choice habit seven party museum ritual lion test",
"list someone avocado lonely negative cigar ritual attitude jeans cancel time tourist reduce gesture market once abandon surround nasty tobacco picnic company delay tuition"
]
}
"secrets": [
"pyramid hybrid segment escape organ mountain health artefact blue copper vendor quality unknown patrol fatal gasp forward defy lazy bone stone drama ghost tomato",
"dolphin crumble vault under pencil foil next ocean shoe soul dove depend point clerk border icon upset feature enforce leisure current ketchup attitude mushroom",
"sell enhance antique actor behave click among nature hedgehog chest position coin hub convince grass clump dance letter rhythm organ rib flock ketchup drop",
"awake entry entire affair mention kind thunder rare next bleak spray flee sick person craft code cannon gaze mandate debris sketch acquire girl young",
"ensure victory nephew answer lab link similar where glue lottery place uncover bamboo shrug drama wedding depend destroy whale track cool caution planet horse"
]
}
646 changes: 323 additions & 323 deletions tests/e2e/consensus/nodes/api-node/core/crypto.json

Large diffs are not rendered by default.

646 changes: 323 additions & 323 deletions tests/e2e/consensus/nodes/node0/core/crypto.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions tests/e2e/consensus/nodes/node0/core/validators.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"secrets": [
"shock wasp fall combine section share pull there panic demise work scrub retire drill wrap foster term wish panther hidden magnet scheme zebra device"
]
}
"secrets": [
"pyramid hybrid segment escape organ mountain health artefact blue copper vendor quality unknown patrol fatal gasp forward defy lazy bone stone drama ghost tomato"
]
}
646 changes: 323 additions & 323 deletions tests/e2e/consensus/nodes/node1/core/crypto.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions tests/e2e/consensus/nodes/node1/core/validators.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"secrets": [
"grid letter cry raw online office more vivid absorb gift call plastic beyond luggage wrong speed expose clock come voyage mistake cool crash sleep"
]
}
"secrets": [
"dolphin crumble vault under pencil foil next ocean shoe soul dove depend point clerk border icon upset feature enforce leisure current ketchup attitude mushroom"
]
}
646 changes: 323 additions & 323 deletions tests/e2e/consensus/nodes/node2/core/crypto.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions tests/e2e/consensus/nodes/node2/core/validators.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"secrets": [
"gold art flame steel fold clog love future puppy damp cause calm inquiry angle curve level oxygen bubble hat category sauce tribe famous loyal"
]
}
"secrets": [
"sell enhance antique actor behave click among nature hedgehog chest position coin hub convince grass clump dance letter rhythm organ rib flock ketchup drop"
]
}
646 changes: 323 additions & 323 deletions tests/e2e/consensus/nodes/node3/core/crypto.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions tests/e2e/consensus/nodes/node3/core/validators.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"secrets": [
"force lawsuit tide finger bid emerge network mouse witness phone document spell supreme trigger crater list choice habit seven party museum ritual lion test"
]
}
"secrets": [
"awake entry entire affair mention kind thunder rare next bleak spray flee sick person craft code cannon gaze mandate debris sketch acquire girl young"
]
}
Loading
Loading