Avoid ambiguous state mismatch

Author: bzawisto

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

@@ -23,7 +23,7 @@ consensus.contract_upgrades = { deposit_v5 = { height = 0, reinitialise_params =
 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 = [], randao_support = false, evm_to_scilla_strings_encoded_properly = false, dont_overwrite_evm_accounts_from_stale_scilla_state = false }
+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, evm_to_scilla_strings_encoded_properly = false, dont_overwrite_evm_accounts_from_stale_scilla_state = false, make_transfers_in_scilla_precompiles_with_journal_api = false, disable_interop_native_zil_transfers_0 = false }
 consensus.forks = [
     { at_height = 4770088, executable_blocks = true },
     { at_height = 4854500, scilla_delta_maps_are_applied_correctly = true },
@@ -41,4 +41,6 @@ consensus.forks = [
     { at_height = 19486411, scilla_call_gas_exempt_addrs_v2 = ["0x0F8aeCCaCA7FEE297cC2aBf7fFC9a81e7122A727"] },
     { at_height = 25905600, randao_support = true, evm_to_scilla_strings_encoded_properly = true },
     { at_height = 27081150, dont_overwrite_evm_accounts_from_stale_scilla_state = true },
+    { at_height = 27152370, disable_interop_native_zil_transfers_0 = true },
+    { at_height = 27152370, make_transfers_in_scilla_precompiles_with_journal_api = true },
 ]

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

@@ -52,7 +52,7 @@ consensus.contract_upgrades = { deposit_v5 = { height = 0, reinitialise_params =
 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 = [], randao_support = false, evm_to_scilla_strings_encoded_properly = false, dont_overwrite_evm_accounts_from_stale_scilla_state = false }
+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, evm_to_scilla_strings_encoded_properly = false, dont_overwrite_evm_accounts_from_stale_scilla_state = false, make_transfers_in_scilla_precompiles_with_journal_api = false, disable_interop_native_zil_transfers_0 = false }
 consensus.forks = [
     { at_height = 8099088, executable_blocks = true },
     { at_height = 8371376, scilla_delta_maps_are_applied_correctly = true },
@@ -74,4 +74,6 @@ consensus.forks = [
     { at_height = 28281600, randao_support = true },
     { at_height = 29230131, evm_to_scilla_strings_encoded_properly = true },
     { at_height = 999999999, dont_overwrite_evm_accounts_from_stale_scilla_state = true },
+    { at_height = 999999999, disable_interop_native_zil_transfers_0 = true },
+    { at_height = 999999999, make_transfers_in_scilla_precompiles_with_journal_api = true },
 ]

z2/src/chain.rs

@@ -202,6 +202,8 @@ impl Chain {
                 "randao_support": false,
                 "evm_to_scilla_strings_encoded_properly": false,
                 "dont_overwrite_evm_accounts_from_stale_scilla_state": false,
+                "make_transfers_in_scilla_precompiles_with_journal_api": false,
+                "disable_interop_native_zil_transfers_0": false,
             })),
             Chain::Zq2Mainnet => Some(json!({
                 "at_height": 0,
@@ -244,6 +246,8 @@ impl Chain {
                 "randao_support": false,
                 "evm_to_scilla_strings_encoded_properly": false,
                 "dont_overwrite_evm_accounts_from_stale_scilla_state": false,
+                "make_transfers_in_scilla_precompiles_with_journal_api": false,
+                "disable_interop_native_zil_transfers_0": false,
             })),
             _ => None,
         }
@@ -303,6 +307,8 @@ impl Chain {
                 json!({ "at_height": 28281600, "randao_support": true}),
                 json!({ "at_height": 29230131, "evm_to_scilla_strings_encoded_properly": true}),
                 json!({ "at_height": 999999999, "dont_overwrite_evm_accounts_from_stale_scilla_state": true}),
+                json!({ "at_height": 999999999, "disable_interop_native_zil_transfers_0": true}),
+                json!({ "at_height": 999999999, "make_transfers_in_scilla_precompiles_with_journal_api": true}),
             ]),
             Chain::Zq2Mainnet => Some(vec![
                 json!({ "at_height": 4770088, "executable_blocks": true }),
@@ -360,6 +366,8 @@ impl Chain {
                 }),
                 json!({ "at_height": 25905600, "randao_support": true, "evm_to_scilla_strings_encoded_properly": true}),
                 json!({ "at_height": 27081150, "dont_overwrite_evm_accounts_from_stale_scilla_state": true}),
+                json!({ "at_height": 27152370, "disable_interop_native_zil_transfers_0": true}),
+                json!({ "at_height": 27152370, "make_transfers_in_scilla_precompiles_with_journal_api": true}),
             ]),
             _ => None,
         }

zilliqa/src/cfg.rs

@@ -722,6 +722,12 @@ impl Forks {
                 ForkName::DontOverwriteAccountsFromStaleScillaState => {
                     fork.dont_overwrite_evm_accounts_from_stale_scilla_state
                 }
+                ForkName::MakeTransfersInScillaPrecompilesWithJournalApi => {
+                    fork.make_transfers_in_scilla_precompiles_with_journal_api
+                }
+                ForkName::DisableInteropNativeZilTransfers0 => {
+                    fork.disable_interop_native_zil_transfers_0
+                }
             } {
                 return Some(fork.at_height);
             }
@@ -772,6 +778,8 @@ pub struct Fork {
     pub randao_support: bool,
     pub evm_to_scilla_strings_encoded_properly: bool,
     pub dont_overwrite_evm_accounts_from_stale_scilla_state: bool,
+    pub make_transfers_in_scilla_precompiles_with_journal_api: bool,
+    pub disable_interop_native_zil_transfers_0: bool,
 }
 
 pub enum ForkName {
@@ -800,6 +808,8 @@ pub enum ForkName {
     ValidatorJailing,
     ScillaCallGasExemptAddrsV2,
     DontOverwriteAccountsFromStaleScillaState,
+    MakeTransfersInScillaPrecompilesWithJournalApi,
+    DisableInteropNativeZilTransfers0,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
@@ -925,6 +935,12 @@ pub struct ForkDelta {
     pub evm_to_scilla_strings_encoded_properly: Option<bool>,
     /// If true, addresses modified also by EVM are skipped while applying the Scilla state delta
     pub dont_overwrite_evm_accounts_from_stale_scilla_state: Option<bool>,
+    /// If true, the `scilla_call` precompile performs its value refund through revm's journaled
+    /// transfer API
+    pub make_transfers_in_scilla_precompiles_with_journal_api: Option<bool>,
+    /// If true, a call to the `scilla_call` precompile that carries a non-zero native ZIL value fails
+    /// immediately.
+    pub disable_interop_native_zil_transfers_0: Option<bool>,
 }
 
 impl Fork {
@@ -1043,6 +1059,12 @@ impl Fork {
             dont_overwrite_evm_accounts_from_stale_scilla_state: delta
                 .dont_overwrite_evm_accounts_from_stale_scilla_state
                 .unwrap_or(self.dont_overwrite_evm_accounts_from_stale_scilla_state),
+            make_transfers_in_scilla_precompiles_with_journal_api: delta
+                .make_transfers_in_scilla_precompiles_with_journal_api
+                .unwrap_or(self.make_transfers_in_scilla_precompiles_with_journal_api),
+            disable_interop_native_zil_transfers_0: delta
+                .disable_interop_native_zil_transfers_0
+                .unwrap_or(self.disable_interop_native_zil_transfers_0),
         }
     }
 }
@@ -1150,6 +1172,8 @@ pub fn genesis_fork_default() -> Fork {
         randao_support: true,
         evm_to_scilla_strings_encoded_properly: true,
         dont_overwrite_evm_accounts_from_stale_scilla_state: true,
+        make_transfers_in_scilla_precompiles_with_journal_api: true,
+        disable_interop_native_zil_transfers_0: true,
     }
 }
 
@@ -1330,6 +1354,8 @@ mod tests {
                 randao_support: None,
                 evm_to_scilla_strings_encoded_properly: None,
                 dont_overwrite_evm_accounts_from_stale_scilla_state: None,
+                make_transfers_in_scilla_precompiles_with_journal_api: None,
+                disable_interop_native_zil_transfers_0: None,
             }],
             ..Default::default()
         };
@@ -1392,6 +1418,8 @@ mod tests {
                     randao_support: Some(false),
                     evm_to_scilla_strings_encoded_properly: None,
                     dont_overwrite_evm_accounts_from_stale_scilla_state: None,
+                    make_transfers_in_scilla_precompiles_with_journal_api: None,
+                    disable_interop_native_zil_transfers_0: None,
                 },
                 ForkDelta {
                     at_height: 20,
@@ -1434,6 +1462,8 @@ mod tests {
                     randao_support: None,
                     evm_to_scilla_strings_encoded_properly: None,
                     dont_overwrite_evm_accounts_from_stale_scilla_state: None,
+                    make_transfers_in_scilla_precompiles_with_journal_api: None,
+                    disable_interop_native_zil_transfers_0: None,
                 },
             ],
             ..Default::default()
@@ -1513,6 +1543,8 @@ mod tests {
                     randao_support: None,
                     evm_to_scilla_strings_encoded_properly: None,
                     dont_overwrite_evm_accounts_from_stale_scilla_state: None,
+                    make_transfers_in_scilla_precompiles_with_journal_api: None,
+                    disable_interop_native_zil_transfers_0: None,
                 },
                 ForkDelta {
                     at_height: 10,
@@ -1555,6 +1587,8 @@ mod tests {
                     randao_support: None,
                     evm_to_scilla_strings_encoded_properly: None,
                     dont_overwrite_evm_accounts_from_stale_scilla_state: None,
+                    make_transfers_in_scilla_precompiles_with_journal_api: None,
+                    disable_interop_native_zil_transfers_0: None,
                 },
             ],
             ..Default::default()
@@ -1622,6 +1656,8 @@ mod tests {
                 randao_support: true,
                 evm_to_scilla_strings_encoded_properly: true,
                 dont_overwrite_evm_accounts_from_stale_scilla_state: true,
+                make_transfers_in_scilla_precompiles_with_journal_api: true,
+                disable_interop_native_zil_transfers_0: true,
             },
             forks: vec![],
             ..Default::default()
@@ -1677,6 +1713,8 @@ mod tests {
                     randao_support: None,
                     evm_to_scilla_strings_encoded_properly: None,
                     dont_overwrite_evm_accounts_from_stale_scilla_state: None,
+                    make_transfers_in_scilla_precompiles_with_journal_api: None,
+                    disable_interop_native_zil_transfers_0: None,
                 },
                 ForkDelta {
                     at_height: 20,
@@ -1719,6 +1757,8 @@ mod tests {
                     randao_support: None,
                     evm_to_scilla_strings_encoded_properly: None,
                     dont_overwrite_evm_accounts_from_stale_scilla_state: None,
+                    make_transfers_in_scilla_precompiles_with_journal_api: None,
+                    disable_interop_native_zil_transfers_0: None,
                 },
             ],
             ..Default::default()