Use committee from contract instead of a one attached to block (#826)

* Some progress * Some progress with using committee from contract * Some progress with using committee from contract * Get peer_id from pending peers * Some progress * Some progress * Fixes * More logging * More debug * Some progress * Fixes * Fixing clippy * Clippy * Clippy * Test * Let tests run longer * Fixes * Give more time for txns distribution * Fixes * Fixes * progress * Some precedence * Some precedence * Clippy * Fix * Further fixes * Disable randomization of sent messages * Fmt * Fixes * Some cleanup * Build fix * Back to normal times * Cleanup * Make code compile * Address feedback * Feedback * Format * Progress * Cargo * Test * Updated config files * Feedback * Feedback 2 * Fixing tests * Cleanup * Fixes * Fixes * Fixes * Let shard network run for some time * Fmt * Disable flaky tests * Reenabling tests * Make code compile again --------- Co-authored-by: bzawisto <bartosz@zilliqa.com>
Zilliqa · May 14, 2024 · 2833c18 · 2833c18
1 parent 601e6dc
commit 2833c18
Show file tree

Hide file tree

Showing 17 changed files with 14,576 additions and 9,910 deletions.
diff --git a/config-example.toml b/config-example.toml
@@ -7,10 +7,10 @@ consensus.consensus_timeout = { secs = 5, nanos = 0 }
 consensus.genesis_committee = [ ["b27aebb3b54effd7af87c4a064a711554ee0f3f5abf56ca910b46422f2b21603bc383d42eb3b927c4c3b0b8381ca30a3", "12D3KooWESMZ2ttSxDwjfnNe23sHCqsJf6sNEKwgHkdgtCHDsbWU"] ]
 # These public keys correspond to the private keys of all four nodes in `docker-compose.yaml`.
 consensus.genesis_deposits = [
-    ["b27aebb3b54effd7af87c4a064a711554ee0f3f5abf56ca910b46422f2b21603bc383d42eb3b927c4c3b0b8381ca30a3", "32000000000000000000", "7E5F4552091A69125d5DfCb7b8C2659029395Bdf"],
-    ["b37fd66aef29ca78a82d519a284789d59c2bb3880698b461c6c732d094534707d50e345128db372a1e0a4c5d5c42f49c", "32000000000000000000", "2B5AD5c4795c026514f8317c7a215E218DcCD6cF"],
-    ["ab035d6cd3321c3b57d14ea09a4f3860899542d2187b5ec87649b1f40980418a096717a671cf62b73880afac252fc5dc", "32000000000000000000", "6813Eb9362372EEF6200f3b1dbC3f819671cBA69"],
-    ["985e3a4d367cbfc966d48710806612cc00f6bfd06aa759340cfe13c3990d26a7ddde63f64468cdba5b2ff132a4639a7f", "32000000000000000000", "1efF47bc3a10a45D4B230B5d10E37751FE6AA718"],
+    ["b27aebb3b54effd7af87c4a064a711554ee0f3f5abf56ca910b46422f2b21603bc383d42eb3b927c4c3b0b8381ca30a3", "12D3KooWESMZ2ttSxDwjfnNe23sHCqsJf6sNEKwgHkdgtCHDsbWU", "32000000000000000000", "7E5F4552091A69125d5DfCb7b8C2659029395Bdf"],
+    ["b37fd66aef29ca78a82d519a284789d59c2bb3880698b461c6c732d094534707d50e345128db372a1e0a4c5d5c42f49c", "12D3KooWJc2nBgNiSi14GcYaGmU8FoQsRkmhfMnaB1mHmPiBPZHd", "32000000000000000000", "2B5AD5c4795c026514f8317c7a215E218DcCD6cF"],
+    ["ab035d6cd3321c3b57d14ea09a4f3860899542d2187b5ec87649b1f40980418a096717a671cf62b73880afac252fc5dc", "12D3KooWLA4xVjiGszqmYJmt8E1NTurVeCujDi17FoSzSDDDKUjT", "32000000000000000000", "6813Eb9362372EEF6200f3b1dbC3f819671cBA69"],
+    ["985e3a4d367cbfc966d48710806612cc00f6bfd06aa759340cfe13c3990d26a7ddde63f64468cdba5b2ff132a4639a7f", "12D3KooWPXw2dXBRH1bT4vcNos9f6W2KoFTiarqptBuTzxaXg7zu", "32000000000000000000", "1efF47bc3a10a45D4B230B5d10E37751FE6AA718"],
 ]
 consensus.genesis_accounts = [
     # Accounts with private key 0x1, 0x2, 0x3, 0x4.
@@ -28,10 +28,10 @@ consensus_timeout = { secs = 5, nanos = 0 }
 genesis_committee = [ ["b27aebb3b54effd7af87c4a064a711554ee0f3f5abf56ca910b46422f2b21603bc383d42eb3b927c4c3b0b8381ca30a3", "12D3KooWESMZ2ttSxDwjfnNe23sHCqsJf6sNEKwgHkdgtCHDsbWU"] ]
 # These public keys correspond to the private keys of all four nodes in `docker-compose.yaml`.
 genesis_deposits = [
-    ["b27aebb3b54effd7af87c4a064a711554ee0f3f5abf56ca910b46422f2b21603bc383d42eb3b927c4c3b0b8381ca30a3", "32000000000000000000", "7E5F4552091A69125d5DfCb7b8C2659029395Bdf"],
-    ["b37fd66aef29ca78a82d519a284789d59c2bb3880698b461c6c732d094534707d50e345128db372a1e0a4c5d5c42f49c", "32000000000000000000", "2B5AD5c4795c026514f8317c7a215E218DcCD6cF"],
-    ["ab035d6cd3321c3b57d14ea09a4f3860899542d2187b5ec87649b1f40980418a096717a671cf62b73880afac252fc5dc", "32000000000000000000", "6813Eb9362372EEF6200f3b1dbC3f819671cBA69"],
-    ["985e3a4d367cbfc966d48710806612cc00f6bfd06aa759340cfe13c3990d26a7ddde63f64468cdba5b2ff132a4639a7f", "32000000000000000000", "1efF47bc3a10a45D4B230B5d10E37751FE6AA718"],
+    ["b27aebb3b54effd7af87c4a064a711554ee0f3f5abf56ca910b46422f2b21603bc383d42eb3b927c4c3b0b8381ca30a3", "12D3KooWESMZ2ttSxDwjfnNe23sHCqsJf6sNEKwgHkdgtCHDsbWU", "32000000000000000000", "7E5F4552091A69125d5DfCb7b8C2659029395Bdf"],
+    ["b37fd66aef29ca78a82d519a284789d59c2bb3880698b461c6c732d094534707d50e345128db372a1e0a4c5d5c42f49c", "12D3KooWJc2nBgNiSi14GcYaGmU8FoQsRkmhfMnaB1mHmPiBPZHd", "32000000000000000000", "2B5AD5c4795c026514f8317c7a215E218DcCD6cF"],
+    ["ab035d6cd3321c3b57d14ea09a4f3860899542d2187b5ec87649b1f40980418a096717a671cf62b73880afac252fc5dc", "12D3KooWLA4xVjiGszqmYJmt8E1NTurVeCujDi17FoSzSDDDKUjT", "32000000000000000000", "6813Eb9362372EEF6200f3b1dbC3f819671cBA69"],
+    ["985e3a4d367cbfc966d48710806612cc00f6bfd06aa759340cfe13c3990d26a7ddde63f64468cdba5b2ff132a4639a7f", "12D3KooWPXw2dXBRH1bT4vcNos9f6W2KoFTiarqptBuTzxaXg7zu", "32000000000000000000", "1efF47bc3a10a45D4B230B5d10E37751FE6AA718"],
 ]
 genesis_accounts = [
     # Accounts with private key 0x1, 0x2, 0x3, 0x4.

diff --git a/infra/config.toml b/infra/config.toml
@@ -3,12 +3,12 @@ otlp_collector_endpoint = "http://otel-collector:4317"
 [[nodes]]
 # This is the public key and peer ID corresponding to the first private key in `docker-compose.yaml`.
 consensus.genesis_committee = [ ["b27aebb3b54effd7af87c4a064a711554ee0f3f5abf56ca910b46422f2b21603bc383d42eb3b927c4c3b0b8381ca30a3", "12D3KooWESMZ2ttSxDwjfnNe23sHCqsJf6sNEKwgHkdgtCHDsbWU", "5000000000000000000000", "7E5F4552091A69125d5DfCb7b8C2659029395Bdf"] ]
-# These public keys correspond to the private keys of all four nodes in `docker-compose.yaml`.
+# These (public key, peerId, stake, rewardAddress) tuples correspond to the private keys of all four nodes in `docker-compose.yaml`.
 consensus.genesis_deposits = [
-    ["b27aebb3b54effd7af87c4a064a711554ee0f3f5abf56ca910b46422f2b21603bc383d42eb3b927c4c3b0b8381ca30a3", "32000000000000000000", "7E5F4552091A69125d5DfCb7b8C2659029395Bdf"],
-    ["b37fd66aef29ca78a82d519a284789d59c2bb3880698b461c6c732d094534707d50e345128db372a1e0a4c5d5c42f49c", "32000000000000000000", "2B5AD5c4795c026514f8317c7a215E218DcCD6cF"],
-    ["ab035d6cd3321c3b57d14ea09a4f3860899542d2187b5ec87649b1f40980418a096717a671cf62b73880afac252fc5dc", "32000000000000000000", "6813Eb9362372EEF6200f3b1dbC3f819671cBA69"],
-    ["985e3a4d367cbfc966d48710806612cc00f6bfd06aa759340cfe13c3990d26a7ddde63f64468cdba5b2ff132a4639a7f", "32000000000000000000", "1efF47bc3a10a45D4B230B5d10E37751FE6AA718"],
+    ["b27aebb3b54effd7af87c4a064a711554ee0f3f5abf56ca910b46422f2b21603bc383d42eb3b927c4c3b0b8381ca30a3", "12D3KooWESMZ2ttSxDwjfnNe23sHCqsJf6sNEKwgHkdgtCHDsbWU", "32000000000000000000", "7E5F4552091A69125d5DfCb7b8C2659029395Bdf"],
+    ["b37fd66aef29ca78a82d519a284789d59c2bb3880698b461c6c732d094534707d50e345128db372a1e0a4c5d5c42f49c", "12D3KooWJc2nBgNiSi14GcYaGmU8FoQsRkmhfMnaB1mHmPiBPZHd", "32000000000000000000", "2B5AD5c4795c026514f8317c7a215E218DcCD6cF"],
+    ["ab035d6cd3321c3b57d14ea09a4f3860899542d2187b5ec87649b1f40980418a096717a671cf62b73880afac252fc5dc", "12D3KooWLA4xVjiGszqmYJmt8E1NTurVeCujDi17FoSzSDDDKUjT", "32000000000000000000", "6813Eb9362372EEF6200f3b1dbC3f819671cBA69"],
+    ["985e3a4d367cbfc966d48710806612cc00f6bfd06aa759340cfe13c3990d26a7ddde63f64468cdba5b2ff132a4639a7f", "12D3KooWPXw2dXBRH1bT4vcNos9f6W2KoFTiarqptBuTzxaXg7zu", "32000000000000000000", "1efF47bc3a10a45D4B230B5d10E37751FE6AA718"],
 ]
 consensus.genesis_accounts = [
     # Accounts with private key 0x1, 0x2, 0x3, 0x4.

diff --git a/z2/src/setup.rs b/z2/src/setup.rs
@@ -129,10 +129,14 @@ impl Setup {
         let public_key_node_0 = self.secret_keys[0].node_public_key();
 
         // The genesis deposits.
-        let mut genesis_deposits: Vec<(NodePublicKey, String, Address)> = Vec::new();
+        let mut genesis_deposits: Vec<(NodePublicKey, PeerId, String, Address)> = Vec::new();
         for i in 0..self.how_many {
             genesis_deposits.push((
                 self.secret_keys[i].node_public_key(),
+                self.secret_keys[i]
+                    .to_libp2p_keypair()
+                    .public()
+                    .to_peer_id(),
                 GENESIS_DEPOSIT.to_string(),
                 self.node_addresses[i],
             ))

diff --git a/zilliqa/src/api/eth.rs b/zilliqa/src/api/eth.rs
@@ -539,11 +539,11 @@ pub(super) fn get_transaction_receipt_inner(
     // TODO: Return error if receipt or block does not exist.
 
     let Some(receipt) = node.get_transaction_receipt(hash)? else {
-        warn!("Failed to get TX receipt when getting TX receipt! {}", hash);
+        debug!("Failed to get TX receipt when getting TX receipt! {}", hash);
         return Ok(None);
     };
 
-    info!(
+    debug!(
         "get_transaction_receipt_inner: hash: {:?} result: {:?}",
         hash, receipt
     );

diff --git a/zilliqa/src/cfg.rs b/zilliqa/src/cfg.rs
@@ -62,8 +62,8 @@ pub struct ConsensusConfig {
     /// genesis. Only the hash can be specified for nodes joining afterwards.
     pub genesis_committee: Vec<(NodePublicKey, PeerId)>,
     /// The initially staked deposits in the deposit contract at genesis, composed of
-    /// (public key, amount, reward address) tuples.
-    pub genesis_deposits: Vec<(NodePublicKey, String, Address)>,
+    /// (public key, peerId, amount, reward address) tuples.
+    pub genesis_deposits: Vec<(NodePublicKey, PeerId, String, Address)>,
     pub genesis_hash: Option<Hash>,
     /// Accounts that will be pre-funded at genesis.
     pub genesis_accounts: Vec<(Address, String)>,