Randao support

z2/resources/chain-specs/zq2-devnet.toml

@@ -49,7 +49,7 @@ consensus.minimum_stake = "10_000_000_000_000_000_000_000_000"
 # Gas parameters
 consensus.eth_block_gas_limit = 84000000
 consensus.gas_price = "4_761_904_800_000"
-consensus.contract_upgrades = { deposit_v5 = { height = 0, reinitialise_params = { withdrawal_period = 300 } }, deposit_v6 = { height = 0 }, deposit_v7 = { height = 0 } }
+consensus.contract_upgrades = { deposit_v5 = { height = 0, reinitialise_params = { withdrawal_period = 300 } }, deposit_v6 = { height = 0 }, deposit_v7 = { height = 0 }, deposit_v8 = { height = 0 } }
 consensus.new_view_broadcast_interval = { secs = 30, nanos = 0 }
 
 api_servers = [{ default_quota = { balance = 500, period = 1 }, port = 4201, enabled_apis = [{ namespace = "eth", apis = ["blockNumber"] }] }, { port = 4202, enabled_apis = ["admin", "debug", "erigon", "eth", "net", "ots", "trace", "txpool", "web3", "zilliqa"] }]

z2/resources/chain-specs/zq2-mainnet.toml

@@ -20,11 +20,11 @@ consensus.minimum_stake = "10_000_000_000_000_000_000_000_000"
 # Gas parameters
 consensus.eth_block_gas_limit = 84000000
 consensus.gas_price = "4_761_904_800_000"
-consensus.contract_upgrades = { deposit_v5 = { height = 0, reinitialise_params = { withdrawal_period = 1209600 } }, deposit_v6 = { height = 13514400 }, deposit_v7 = { height = 13514400, reinitialise_params = { withdrawal_period = 461680 } } }
+consensus.contract_upgrades = { deposit_v5 = { height = 0, reinitialise_params = { withdrawal_period = 1209600 } }, deposit_v6 = { height = 13514400 }, deposit_v7 = { height = 13514400, reinitialise_params = { withdrawal_period = 461680 } }, deposit_v8 = { height = 99999999, reinitialise_params = { withdrawal_period = 461680 } } }
 consensus.new_view_broadcast_interval = { secs = 30, nanos = 0 }
 
 api_servers = [{ default_quota = { balance = 500, period = 1 }, port = 4201, enabled_apis = [{ namespace = "eth", apis = ["blockNumber"] }] }, { port = 4202, enabled_apis = ["admin", "debug", "erigon", "eth", "net", "ots", "trace", "txpool", "web3", "zilliqa"] }]
-consensus.genesis_fork = { at_height = 0, executable_blocks = false, call_mode_1_sets_caller_to_parent_caller = true, failed_scilla_call_from_gas_exempt_caller_causes_revert = true, scilla_messages_can_call_evm_contracts = true, scilla_contract_creation_increments_account_balance = true, scilla_json_preserve_order = true, scilla_call_respects_evm_state_changes = true, only_mutated_accounts_update_state = true, scilla_call_gas_exempt_addrs = [], scilla_block_number_returns_current_block = true, scilla_maps_are_encoded_correctly = true, transfer_gas_fee_to_zero_account = true, apply_state_changes_only_if_transaction_succeeds = true, apply_scilla_delta_when_evm_succeeded = true, scilla_deduct_funds_from_actual_sender = true, fund_accounts_from_zero_account = [], scilla_delta_maps_are_applied_correctly = false, scilla_server_unlimited_response_size = false, scilla_failed_txn_correct_balance_deduction = false, scilla_transition_proper_order = false, evm_to_scilla_value_transfer_zero = false, restore_xsgd_contract = false, evm_exec_failure_causes_scilla_precompile_to_fail = false, revert_restore_xsgd_contract = false, scilla_fix_contract_code_removal_on_evm_tx = false, restore_ignite_wallet_contracts = false, prevent_zil_transfer_from_evm_to_scilla_contract = false, scilla_failed_txn_correct_gas_fee_charged = false, check_minimum_gas_price = false, inject_access_list = false, use_max_gas_priority_fee = false, failed_zil_transfers_to_eoa_proper_fee_deduction = false, validator_jailing = false, scilla_empty_maps_are_encoded_correctly = false, cancun_active = false, scilla_call_gas_exempt_addrs_v2 = [] }
+consensus.genesis_fork = { at_height = 0, executable_blocks = false, call_mode_1_sets_caller_to_parent_caller = true, failed_scilla_call_from_gas_exempt_caller_causes_revert = true, scilla_messages_can_call_evm_contracts = true, scilla_contract_creation_increments_account_balance = true, scilla_json_preserve_order = true, scilla_call_respects_evm_state_changes = true, only_mutated_accounts_update_state = true, scilla_call_gas_exempt_addrs = [], scilla_block_number_returns_current_block = true, scilla_maps_are_encoded_correctly = true, transfer_gas_fee_to_zero_account = true, apply_state_changes_only_if_transaction_succeeds = true, apply_scilla_delta_when_evm_succeeded = true, scilla_deduct_funds_from_actual_sender = true, fund_accounts_from_zero_account = [], scilla_delta_maps_are_applied_correctly = false, scilla_server_unlimited_response_size = false, scilla_failed_txn_correct_balance_deduction = false, scilla_transition_proper_order = false, evm_to_scilla_value_transfer_zero = false, restore_xsgd_contract = false, evm_exec_failure_causes_scilla_precompile_to_fail = false, revert_restore_xsgd_contract = false, scilla_fix_contract_code_removal_on_evm_tx = false, restore_ignite_wallet_contracts = false, prevent_zil_transfer_from_evm_to_scilla_contract = false, scilla_failed_txn_correct_gas_fee_charged = false, check_minimum_gas_price = false, inject_access_list = false, use_max_gas_priority_fee = false, failed_zil_transfers_to_eoa_proper_fee_deduction = false, validator_jailing = false, scilla_empty_maps_are_encoded_correctly = false, cancun_active = false, scilla_call_gas_exempt_addrs_v2 = [], randao_support = false }
 consensus.forks = [
     { at_height = 4770088, executable_blocks = true },
     { at_height = 4854500, scilla_delta_maps_are_applied_correctly = true },
@@ -40,4 +40,5 @@ consensus.forks = [
     { at_height = 19486411, scilla_empty_maps_are_encoded_correctly = true },
     { at_height = 19486411, cancun_active = true },
     { at_height = 19486411, scilla_call_gas_exempt_addrs_v2 = ["0x0F8aeCCaCA7FEE297cC2aBf7fFC9a81e7122A727"] },
+    { at_height = 99999999, randao_support = true },
 ]

z2/resources/chain-specs/zq2-testnet.toml

@@ -70,11 +70,11 @@ consensus.minimum_stake = "10_000_000_000_000_000_000_000_000"
 # Gas parameters
 consensus.eth_block_gas_limit = 84000000
 consensus.gas_price = "4_761_904_800_000"
-consensus.contract_upgrades = { deposit_v5 = { height = 0, reinitialise_params = { withdrawal_period = 1209600 } }, deposit_v6 = { height = 14997600 }, deposit_v7 = { height = 17010000, reinitialise_params = { withdrawal_period = 461680 } } }
+consensus.contract_upgrades = { deposit_v5 = { height = 0, reinitialise_params = { withdrawal_period = 1209600 } }, deposit_v6 = { height = 14997600 }, deposit_v7 = { height = 17010000, reinitialise_params = { withdrawal_period = 461680 } }, deposit_v8 = { height = 99999999, reinitialise_params = { withdrawal_period = 461680 } } }
 consensus.new_view_broadcast_interval = { secs = 30, nanos = 0 }
 
 api_servers = [{ default_quota = { balance = 500, period = 1 }, port = 4201, enabled_apis = [{ namespace = "eth", apis = ["blockNumber"] }] }, { port = 4202, enabled_apis = ["admin", "debug", "erigon", "eth", "net", "ots", "trace", "txpool", "web3", "zilliqa"] }]
-consensus.genesis_fork = { at_height = 0, executable_blocks = false, call_mode_1_sets_caller_to_parent_caller = true, failed_scilla_call_from_gas_exempt_caller_causes_revert = true, scilla_messages_can_call_evm_contracts = true, scilla_contract_creation_increments_account_balance = true, scilla_json_preserve_order = true, scilla_call_respects_evm_state_changes = true, only_mutated_accounts_update_state = true, scilla_call_gas_exempt_addrs = [], scilla_block_number_returns_current_block = true, scilla_maps_are_encoded_correctly = true, transfer_gas_fee_to_zero_account = true, apply_state_changes_only_if_transaction_succeeds = true, apply_scilla_delta_when_evm_succeeded = true, scilla_deduct_funds_from_actual_sender = true, fund_accounts_from_zero_account = [], scilla_delta_maps_are_applied_correctly = false, scilla_server_unlimited_response_size = false, scilla_failed_txn_correct_balance_deduction = false, scilla_transition_proper_order = false, evm_to_scilla_value_transfer_zero = false, restore_xsgd_contract = false, evm_exec_failure_causes_scilla_precompile_to_fail = false, revert_restore_xsgd_contract = false, scilla_fix_contract_code_removal_on_evm_tx = false, restore_ignite_wallet_contracts = false, prevent_zil_transfer_from_evm_to_scilla_contract = false, scilla_failed_txn_correct_gas_fee_charged = false, check_minimum_gas_price = false, inject_access_list = false, use_max_gas_priority_fee = false, failed_zil_transfers_to_eoa_proper_fee_deduction = false, validator_jailing = false, scilla_empty_maps_are_encoded_correctly = false, cancun_active = false, scilla_call_gas_exempt_addrs_v2 = [] }
+consensus.genesis_fork = { at_height = 0, executable_blocks = false, call_mode_1_sets_caller_to_parent_caller = true, failed_scilla_call_from_gas_exempt_caller_causes_revert = true, scilla_messages_can_call_evm_contracts = true, scilla_contract_creation_increments_account_balance = true, scilla_json_preserve_order = true, scilla_call_respects_evm_state_changes = true, only_mutated_accounts_update_state = true, scilla_call_gas_exempt_addrs = [], scilla_block_number_returns_current_block = true, scilla_maps_are_encoded_correctly = true, transfer_gas_fee_to_zero_account = true, apply_state_changes_only_if_transaction_succeeds = true, apply_scilla_delta_when_evm_succeeded = true, scilla_deduct_funds_from_actual_sender = true, fund_accounts_from_zero_account = [], scilla_delta_maps_are_applied_correctly = false, scilla_server_unlimited_response_size = false, scilla_failed_txn_correct_balance_deduction = false, scilla_transition_proper_order = false, evm_to_scilla_value_transfer_zero = false, restore_xsgd_contract = false, evm_exec_failure_causes_scilla_precompile_to_fail = false, revert_restore_xsgd_contract = false, scilla_fix_contract_code_removal_on_evm_tx = false, restore_ignite_wallet_contracts = false, prevent_zil_transfer_from_evm_to_scilla_contract = false, scilla_failed_txn_correct_gas_fee_charged = false, check_minimum_gas_price = false, inject_access_list = false, use_max_gas_priority_fee = false, failed_zil_transfers_to_eoa_proper_fee_deduction = false, validator_jailing = false, scilla_empty_maps_are_encoded_correctly = false, cancun_active = false, scilla_call_gas_exempt_addrs_v2 = [], randao_support = false }
 consensus.forks = [
     { at_height = 8099088, executable_blocks = true },
     { at_height = 8371376, scilla_delta_maps_are_applied_correctly = true },
@@ -93,4 +93,5 @@ consensus.forks = [
     { at_height = 23685219, scilla_empty_maps_are_encoded_correctly = true },
     { at_height = 23685219, cancun_active = true },
     { at_height = 23685219, scilla_call_gas_exempt_addrs_v2 = [] },
+    { at_height = 99999999, randao_support = true },
 ]

z2/src/chain.rs

@@ -101,6 +101,10 @@ impl Chain {
                     height: 0,
                     reinitialise_params: None,
                 }),
+                deposit_v8: Some(ContractUpgradeConfig {
+                    height: 0,
+                    reinitialise_params: None,
+                }),
             },
             Self::Zq2Testnet => ContractUpgrades {
                 deposit_v3: None,
@@ -119,6 +123,12 @@ impl Chain {
                         withdrawal_period: 461680,
                     }), // https://github.com/Zilliqa/zq2/pull/3221
                 }),
+                deposit_v8: Some(ContractUpgradeConfig {
+                    height: 99999999,
+                    reinitialise_params: Some(ReinitialiseParams {
+                        withdrawal_period: 461680,
+                    }),
+                }),
             },
             Self::Zq2Mainnet => ContractUpgrades {
                 deposit_v3: None,
@@ -137,6 +147,12 @@ impl Chain {
                         withdrawal_period: 461680,
                     }), // https://github.com/Zilliqa/zq2/pull/3221
                 }),
+                deposit_v8: Some(ContractUpgradeConfig {
+                    height: 99999999,
+                    reinitialise_params: Some(ReinitialiseParams {
+                        withdrawal_period: 461680,
+                    }),
+                }),
             },
             _ => ContractUpgrades::default(),
         }
@@ -183,6 +199,7 @@ impl Chain {
                 "scilla_empty_maps_are_encoded_correctly": false,
                 "cancun_active": false,
                 "scilla_call_gas_exempt_addrs_v2": [],
+                "randao_support": false,
             })),
             Chain::Zq2Mainnet => Some(json!({
                 "at_height": 0,
@@ -222,6 +239,7 @@ impl Chain {
                 "scilla_empty_maps_are_encoded_correctly": false,
                 "cancun_active": false,
                 "scilla_call_gas_exempt_addrs_v2": [],
+                "randao_support": false,
             })),
             _ => None,
         }
@@ -278,6 +296,8 @@ impl Chain {
                     "scilla_call_gas_exempt_addrs_v2": [
                     ],
                 }),
+                // estimated: arbitrary high block number no reachable before next fork
+                json!({ "at_height": 99999999, "randao_support": true}),
             ]),
             Chain::Zq2Mainnet => Some(vec![
                 json!({ "at_height": 4770088, "executable_blocks": true }),
@@ -333,6 +353,8 @@ impl Chain {
                         "0x0F8aeCCaCA7FEE297cC2aBf7fFC9a81e7122A727",
                     ],
                 }),
+                // estimated: arbitrary high block number no reachable before next fork
+                json!({ "at_height": 99999999, "randao_support": true}),
             ]),
             _ => None,
         }

z2/src/converter.rs

@@ -544,6 +544,8 @@ pub async fn convert_persistence(
             SystemTime::UNIX_EPOCH + Duration::from_micros(zq1_block.timestamp),
             ScillaGas(zq1_block.gas_used).into(),
             ScillaGas(zq1_block.gas_limit).into(),
+            None,
+            None,
         );
 
         // For each receipt update block hash. This can be done once all receipts build receipt_root_hash which is used for calculating block hash
@@ -652,6 +654,8 @@ fn create_empty_block_from_parent(
         parent_block.header.timestamp,
         parent_block.header.gas_used,
         parent_block.header.gas_limit,
+        None,
+        None,
     )
 }
 

z2/src/validators.rs

@@ -242,15 +242,15 @@ impl SignerClient {
     pub async fn get_future_stake(&self, public_key: &NodePublicKey) -> Result<u128> {
         let client = self.get_signer().await?;
 
-        let data = contracts::deposit_v7::GET_FUTURE_STAKE
+        let data = contracts::deposit_v8::GET_FUTURE_STAKE
             .encode_input(&[Token::Bytes(public_key.as_bytes())])
             .unwrap();
         let tx = TransactionRequest::default()
             .to(contract_addr::DEPOSIT_PROXY)
             .input(TransactionInput::both(data.into()));
         let output = client.call(tx).await.unwrap();
 
-        let future_stake = contracts::deposit_v7::GET_FUTURE_STAKE
+        let future_stake = contracts::deposit_v8::GET_FUTURE_STAKE
             .decode_output(&output)
             .unwrap()[0]
             .clone()

zilliqa/benches/it.rs

@@ -95,7 +95,7 @@ fn process_empty(c: &mut Criterion) {
 
     let genesis = consensus.get_block_by_view(0).unwrap().unwrap();
     let mut state = consensus.state().at_root(genesis.state_root_hash().into());
-    let mut parent_hash = genesis.hash();
+    let mut parent_header = genesis.header;
     let mut proposals = (1..).map(|view| {
         // The reward per block above is configured to 1. The consensus algorithm splits this reward between the
         // proposer and the cosigners, rounding down. Effectively this means no rewards are issued to anyone with this
@@ -110,20 +110,24 @@ fn process_empty(c: &mut Criterion) {
 
         let vote = Vote::new(
             secret_key,
-            parent_hash,
+            parent_header.hash,
             secret_key.node_public_key(),
             view - 1,
         );
         let qc = QuorumCertificate::new(
             &[vote.signature()],
             bitarr![u8, Msb0; 1; MAX_COMMITTEE_SIZE],
-            parent_hash,
+            parent_header.hash,
             view - 1,
         );
 
         let mut empty_trie = eth_trie::EthTrie::new(Arc::new(MemoryDB::new(true)));
         let empty_root_hash = Hash(empty_trie.root_hash().unwrap().into());
 
+        let randao_reveal = Block::compute_randao_reveal(&secret_key, view);
+
+        let mix_hash = Block::compute_randao_mix(parent_header, randao_reveal);
+
         let block = Block::from_qc(
             secret_key,
             view,
@@ -137,8 +141,10 @@ fn process_empty(c: &mut Criterion) {
             SystemTime::UNIX_EPOCH,
             EvmGas(0),
             EvmGas(0),
+            Some(randao_reveal),
+            Some(mix_hash),
         );
-        parent_hash = block.hash();
+        parent_header = block.header;
 
         Proposal::from_parts(block, vec![])
     });

zilliqa/src/api/admin.rs

@@ -189,7 +189,7 @@ fn import_history(params: Params, node: &Arc<Node>) -> Result<()> {
     let mut params = params.sequence();
     let param: &str = params.next::<&str>()?;
     let path = std::path::Path::new(param);
-    let (block, _, _) = load_ckpt_blocks(path)?;
+    let (block, _, _, _) = load_ckpt_blocks(path)?;
     {
         if node
             .consensus
@@ -400,8 +400,20 @@ fn get_leaders(params: Params, node: &Arc<Node>) -> Result<Vec<(u64, Validator)>
         }
     };
 
+    let grandparent_mix_hash = node
+        .consensus
+        .read()
+        .get_block(&parent_block.parent_hash())
+        .ok()
+        .flatten()
+        .and_then(|block| block.header.mix_hash);
+
     while leaders.len() <= count {
-        if let Some(leader) = node.consensus.read().leader_at_block(&parent_block, view) {
+        if let Some(leader) =
+            node.consensus
+                .read()
+                .leader_at_block(&parent_block, grandparent_mix_hash, view)
+        {
             leaders.push((view, leader));
         } else {
             break; // missed view history not available

zilliqa/src/api/eth.rs

@@ -647,7 +647,7 @@ fn get_block_by_number(params: Params, node: &Arc<Node>) -> Result<Option<eth::B
         let block = node
             .get_block(block_number)?
             .ok_or_else(|| anyhow!("Block not found"))?;
-        let miner = node.get_proposer_reward_address(block.header)?;
+        let miner = node.get_proposer_reward_address(&block)?;
         let block_gas_limit = block.gas_limit();
         let result = eth::Block::from_block(&block, miner.unwrap_or_default(), block_gas_limit);
         return Ok(Some(result));
@@ -675,7 +675,7 @@ pub fn get_eth_block(
         None => return Ok(None),
     };
 
-    let miner = node.get_proposer_reward_address(block.header)?;
+    let miner = node.get_proposer_reward_address(&block)?;
     let block_gas_limit = block.gas_limit();
     let mut result = eth::Block::from_block(&block, miner.unwrap_or_default(), block_gas_limit);
 
@@ -1032,7 +1032,7 @@ async fn subscribe(
                     .db
                     .get_transactionless_block(header.hash.into())?
                     .ok_or("Block not found")?;
-                let miner = node.get_proposer_reward_address(block.header)?;
+                let miner = node.get_proposer_reward_address(&block)?;
                 let block_gas_limit = block.gas_limit();
                 let eth_block =
                     eth::Block::from_block(&block, miner.unwrap_or_default(), block_gas_limit);