diff --git a/libraries/cli/include/cli/config_jsons/devnet/devnet_genesis.json b/libraries/cli/include/cli/config_jsons/devnet/devnet_genesis.json index 519150f3ce..04aab6c412 100644 --- a/libraries/cli/include/cli/config_jsons/devnet/devnet_genesis.json +++ b/libraries/cli/include/cli/config_jsons/devnet/devnet_genesis.json @@ -13,8 +13,8 @@ "delegation_locking_period": "0x5", "eligibility_balance_threshold": "0xd3c21bcecceda1000000", "vote_eligibility_balance_step": "0x152d02c7e14af6800000", - "validator_maximum_stake": "0x84595161401484A000000", - "minimum_deposit": "0x0", + "validator_maximum_stake": "0x84595161401484a000000", + "minimum_deposit": "0x3635c9adc5dea00000", "max_block_author_reward": "0x5", "dag_proposers_reward": "0x32", "commission_change_delta": "0x0", @@ -28,7 +28,7 @@ "endpoint": "", "description": "Taraxa devnet validator 1", "delegations": { - "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0x84595161401484a000000" + "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0xd3c21bcecceda1000000" }, "vrf_key": "05fe580fd2d461ee5f762a33bbe669403bb04a851f2e9ed8d2579a9c9b77c3ec" }, @@ -39,7 +39,7 @@ "endpoint": "", "description": "Taraxa devnet validator 2", "delegations": { - "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0x84595161401484a000000" + "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0xd3c21bcecceda1000000" }, "vrf_key": "70d34c86787e5f7bd0f266cad291cb521e23176fa37c6efc034858a1620ac69e" }, @@ -50,7 +50,7 @@ "endpoint": "", "description": "Taraxa devnet validator 3", "delegations": { - "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0x84595161401484a000000" + "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0xd3c21bcecceda1000000" }, "vrf_key": "f8d5c00ce9fa3058341e051b36a1e6ccf69df81fb865568b2bf1507d085691e2" }, @@ -61,7 +61,7 @@ "endpoint": "", "description": "Taraxa devnet validator 4", "delegations": { - "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0x84595161401484a000000" + "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0xd3c21bcecceda1000000" }, "vrf_key": "aa12507d00c992b95e65d80b21fd2db5b48c4f7ff4393064828d1adc930710b4" }, @@ -72,7 +72,7 @@ "endpoint": "", "description": "Taraxa devnet validator 5", "delegations": { - "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0x84595161401484a000000" + "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0xd3c21bcecceda1000000" }, "vrf_key": "bd34898ae0080187c408b5724f05682855c4425fda61d332f5f9d746d4eb753a" }, @@ -83,7 +83,7 @@ "endpoint": "", "description": "Taraxa devnet validator 6", "delegations": { - "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0x84595161401484a000000" + "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0xd3c21bcecceda1000000" }, "vrf_key": "25d35fed93989c40b4e8685d9d7ee02213230221ea9efcbe8cfccfc788670dba" }, @@ -94,7 +94,7 @@ "endpoint": "", "description": "Taraxa devnet validator 7", "delegations": { - "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0x84595161401484a000000" + "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0xd3c21bcecceda1000000" }, "vrf_key": "55c0bd1af84fb793a5dd7b960e330248d8a0acde566922b3e210f43592700dad" }, @@ -105,7 +105,7 @@ "endpoint": "", "description": "Taraxa devnet validator 8", "delegations": { - "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0x84595161401484a000000" + "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0xd3c21bcecceda1000000" }, "vrf_key": "33131367e7279ee51c0f26c6f9b6627848f822d134abef21a88be467dfbaae7b" }, @@ -116,7 +116,7 @@ "endpoint": "", "description": "Taraxa devnet validator 9", "delegations": { - "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0x84595161401484a000000" + "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0xd3c21bcecceda1000000" }, "vrf_key": "da63de37c69a59cb3ebbcfb79ef8d561b18b448b544a14438c62cd56bc0a29f5" }, @@ -127,7 +127,7 @@ "endpoint": "", "description": "Taraxa devnet validator 10", "delegations": { - "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0x84595161401484a000000" + "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0xd3c21bcecceda1000000" }, "vrf_key": "337178752602a5ca38928bf0d8d434ec653505c92b280b0edab6c39d5e79f4fd" }, @@ -138,7 +138,7 @@ "endpoint": "", "description": "Taraxa devnet validator 11", "delegations": { - "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0x84595161401484a000000" + "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0xd3c21bcecceda1000000" }, "vrf_key": "ac08e4ca5f1bcdd61dbefa7551ab839bdd4545e59ee8a4ab5d3aabb71104ab73" }, @@ -149,7 +149,7 @@ "endpoint": "", "description": "Taraxa devnet validator 12", "delegations": { - "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0x84595161401484a000000" + "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0xd3c21bcecceda1000000" }, "vrf_key": "189b05cca0a816a36f977f0541ef7585218b2087f04b23444ab58d0c755adecc" }, @@ -160,7 +160,7 @@ "endpoint": "", "description": "Taraxa devnet validator 13", "delegations": { - "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0x84595161401484a000000" + "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0xd3c21bcecceda1000000" }, "vrf_key": "8e95172f90b68ee753132bf6342ee00b398e2417312f610d58c34729ab0608ee" }, @@ -171,7 +171,7 @@ "endpoint": "", "description": "Taraxa devnet validator 14", "delegations": { - "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0x84595161401484a000000" + "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0xd3c21bcecceda1000000" }, "vrf_key": "959551740ff948d9714f15a2bfb2183c4ead897dd79775a0a18488aa8936e2ba" }, @@ -182,7 +182,7 @@ "endpoint": "", "description": "Taraxa devnet validator 15", "delegations": { - "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0x84595161401484a000000" + "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0xd3c21bcecceda1000000" }, "vrf_key": "56b7831cb3e35c1d6d1e3f661de2068d6feeaa54074b3e02709a87d7f0d6c72a" }, @@ -193,7 +193,7 @@ "endpoint": "", "description": "Taraxa devnet validator 16", "delegations": { - "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0x84595161401484a000000" + "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0xd3c21bcecceda1000000" }, "vrf_key": "e774c519814cbc04008aa958932e7adb82ebbbd6ca69089c0a1458ea34fb4299" }, @@ -204,7 +204,7 @@ "endpoint": "", "description": "Taraxa devnet validator 17", "delegations": { - "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0x84595161401484a000000" + "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0xd3c21bcecceda1000000" }, "vrf_key": "1b15b7bef6a1dbe9aeb2792f2e38d6222d31f8c6c15cff1152f258013d70d933" }, @@ -215,7 +215,7 @@ "endpoint": "", "description": "Taraxa devnet validator 18", "delegations": { - "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0x84595161401484a000000" + "0x7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0xd3c21bcecceda1000000" }, "vrf_key": "37bf145ac98e7de7db6e5b933e72737fbf190fd4fb1d193b15cf8b00db30ba30" } diff --git a/libraries/core_libs/network/src/tarcap/packets_handlers/vote_packet_handler.cpp b/libraries/core_libs/network/src/tarcap/packets_handlers/vote_packet_handler.cpp index bf494f7e32..7bd333abc9 100644 --- a/libraries/core_libs/network/src/tarcap/packets_handlers/vote_packet_handler.cpp +++ b/libraries/core_libs/network/src/tarcap/packets_handlers/vote_packet_handler.cpp @@ -70,7 +70,7 @@ void VotePacketHandler::process(const PacketData &packet_data, const std::shared onNewPbftVote(vote, pbft_block); // Update peer's max chain size - if (peer_chain_size.has_value() && *peer_chain_size > peer->pbft_chain_size_) { + if (peer_chain_size.has_value() && vote->getVoter() == peer->getId() && *peer_chain_size > peer->pbft_chain_size_) { peer->pbft_chain_size_ = *peer_chain_size; } } diff --git a/submodules/taraxa-evm b/submodules/taraxa-evm index 1b085007b7..fc286996a5 160000 --- a/submodules/taraxa-evm +++ b/submodules/taraxa-evm @@ -1 +1 @@ -Subproject commit 1b085007b794f158cb39d36604c6d91ad9a4b1f7 +Subproject commit fc286996a5c6e436b436e328336f88b3523b3236