Avoid state root mismatch with scilla deltas

bzawisto · bzawisto · commit 72018b04a8e4 · 2026-05-20T14:03:11.000+02:00
diff --git a/z2/resources/chain-specs/zq2-mainnet.toml b/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 }
+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.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, cancun_active = true },
     { 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 },
 ]
diff --git a/z2/resources/chain-specs/zq2-testnet.toml b/z2/resources/chain-specs/zq2-testnet.toml
@@ -25,40 +25,19 @@ consensus.genesis_deposits = [
     "0x0000000000000000000000000000000000000000",
     "0x214695413d1ea6a4a4453cd24ffd151fbc95496a"
   ],
-  [
-    "ae776c587e6869d41331529c6dd0f59c31d1ef4c47f8b5ecb1acc54fa7452d9b2ba6f56bdad08a606d25761c8522b367",
-    "12D3KooWJyH1r2UfcFPiHbEFBYB3xWufR1va8cRK3veMwfUunfRD",
-    "20_000_000_000_000_000_000_000_000",
-    "0x0000000000000000000000000000000000000000",
-    "0x214695413d1ea6a4a4453cd24ffd151fbc95496a"
-  ],
   [
     "95de7dae002295bba9c4cffd1b0df70a7ccd0cc68e6b10da06b1b91f8a7e9b305e19431fc42b7413c65a8ab6959e41c6",
     "12D3KooWM5L182sQtJuARf5Xfg517xVqZRaPM9583BsmLcv5Ma2o",
     "20_000_000_000_000_000_000_000_000",
     "0x0000000000000000000000000000000000000000",
     "0x214695413d1ea6a4a4453cd24ffd151fbc95496a"
   ],
-  [
-    "ae96338209ec4f1ad446a131e687bde02506207b750465cbc43d1ea4f5b32daa51ff060e8451c903d6de7f1c89951b1d",
-    "12D3KooWQpAM4F19CwJAAhHFgeD7feyQLHDTxzKu2hsVH4BQceSQ",
-    "20_000_000_000_000_000_000_000_000",
-    "0x0000000000000000000000000000000000000000",
-    "0x214695413d1ea6a4a4453cd24ffd151fbc95496a"
-  ],
   [
     "a3a2419fba7962021d730f4e1eb087b5bf0d66140ef7d4ba758348b13fb2ffa9a75afbdbef988c65ce625544360dea42",
     "12D3KooWAWoMVZAXJDkuhyzyBJHGHn2gYFyTbbdZGhHs4BuEN5Fe",
     "20_000_000_000_000_000_000_000_000",
     "0x0000000000000000000000000000000000000000",
     "0x214695413d1ea6a4a4453cd24ffd151fbc95496a"
-  ],
-  [
-    "8093ea6fa4720ca0975559a5f9d3a2694c6ab8e63a8c54e986d11a28f9e958f006420e30a8d6f04d6b2df63fe6e0563d",
-    "12D3KooWNqZxaW4ZirvWUNj9KSRgTp55RsZHSFumDeRdCLZAjNNA",
-    "20_000_000_000_000_000_000_000_000",
-    "0x0000000000000000000000000000000000000000",
-    "0x214695413d1ea6a4a4453cd24ffd151fbc95496a"
   ]
 ]
 
@@ -73,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 }
+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.forks = [
     { at_height = 8099088, executable_blocks = true },
     { at_height = 8371376, scilla_delta_maps_are_applied_correctly = true },
@@ -94,4 +73,5 @@ consensus.forks = [
     { at_height = 23685219, scilla_call_gas_exempt_addrs_v2 = [] },
     { 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 },
 ]
diff --git a/z2/src/chain.rs b/z2/src/chain.rs
@@ -201,6 +201,7 @@ impl Chain {
                 "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,
             })),
             Chain::Zq2Mainnet => Some(json!({
                 "at_height": 0,
@@ -242,6 +243,7 @@ impl Chain {
                 "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,
             })),
             _ => None,
         }
@@ -300,6 +302,7 @@ 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}),
             ]),
             Chain::Zq2Mainnet => Some(vec![
                 json!({ "at_height": 4770088, "executable_blocks": true }),
@@ -356,6 +359,7 @@ 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}),
             ]),
             _ => None,
         }
diff --git a/z2/src/lib.rs b/z2/src/lib.rs
@@ -1,3 +1,5 @@
+#![recursion_limit = "256"]
+
 mod address;
 pub mod chain;
 pub mod collector;
diff --git a/zilliqa/src/cfg.rs b/zilliqa/src/cfg.rs
@@ -719,6 +719,9 @@ impl Forks {
                 ForkName::ScillaCallGasExemptAddrsV2 => {
                     fork.scilla_call_gas_exempt_addrs_v2.length() != 0
                 }
+                ForkName::DontOverwriteAccountsFromStaleScillaState => {
+                    fork.dont_overwrite_evm_accounts_from_stale_scilla_state
+                }
             } {
                 return Some(fork.at_height);
             }
@@ -768,6 +771,7 @@ pub struct Fork {
     pub scilla_call_gas_exempt_addrs_v2: Vec<Address>,
     pub randao_support: bool,
     pub evm_to_scilla_strings_encoded_properly: bool,
+    pub dont_overwrite_evm_accounts_from_stale_scilla_state: bool,
 }
 
 pub enum ForkName {
@@ -795,6 +799,7 @@ pub enum ForkName {
     UseMaxGasPriorityFee,
     ValidatorJailing,
     ScillaCallGasExemptAddrsV2,
+    DontOverwriteAccountsFromStaleScillaState,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
@@ -918,6 +923,8 @@ pub struct ForkDelta {
     pub randao_support: Option<bool>,
     /// if true, strings passed from EVM to Scilla via interop are properly JSON-encoded
     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>,
 }
 
 impl Fork {
@@ -1033,6 +1040,9 @@ impl Fork {
             evm_to_scilla_strings_encoded_properly: delta
                 .evm_to_scilla_strings_encoded_properly
                 .unwrap_or(self.evm_to_scilla_strings_encoded_properly),
+            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),
         }
     }
 }
@@ -1139,6 +1149,7 @@ pub fn genesis_fork_default() -> Fork {
         scilla_call_gas_exempt_addrs_v2: vec![],
         randao_support: true,
         evm_to_scilla_strings_encoded_properly: true,
+        dont_overwrite_evm_accounts_from_stale_scilla_state: true,
     }
 }
 
@@ -1318,6 +1329,7 @@ mod tests {
                 scilla_call_gas_exempt_addrs_v2: vec![],
                 randao_support: None,
                 evm_to_scilla_strings_encoded_properly: None,
+                dont_overwrite_evm_accounts_from_stale_scilla_state: None,
             }],
             ..Default::default()
         };
@@ -1379,6 +1391,7 @@ mod tests {
                     scilla_call_gas_exempt_addrs_v2: vec![],
                     randao_support: Some(false),
                     evm_to_scilla_strings_encoded_properly: None,
+                    dont_overwrite_evm_accounts_from_stale_scilla_state: None,
                 },
                 ForkDelta {
                     at_height: 20,
@@ -1420,6 +1433,7 @@ mod tests {
                     scilla_call_gas_exempt_addrs_v2: vec![],
                     randao_support: None,
                     evm_to_scilla_strings_encoded_properly: None,
+                    dont_overwrite_evm_accounts_from_stale_scilla_state: None,
                 },
             ],
             ..Default::default()
@@ -1498,6 +1512,7 @@ mod tests {
                     scilla_call_gas_exempt_addrs_v2: vec![],
                     randao_support: None,
                     evm_to_scilla_strings_encoded_properly: None,
+                    dont_overwrite_evm_accounts_from_stale_scilla_state: None,
                 },
                 ForkDelta {
                     at_height: 10,
@@ -1539,6 +1554,7 @@ mod tests {
                     scilla_call_gas_exempt_addrs_v2: vec![],
                     randao_support: None,
                     evm_to_scilla_strings_encoded_properly: None,
+                    dont_overwrite_evm_accounts_from_stale_scilla_state: None,
                 },
             ],
             ..Default::default()
@@ -1605,6 +1621,7 @@ mod tests {
                 scilla_call_gas_exempt_addrs_v2: vec![],
                 randao_support: true,
                 evm_to_scilla_strings_encoded_properly: true,
+                dont_overwrite_evm_accounts_from_stale_scilla_state: true,
             },
             forks: vec![],
             ..Default::default()
@@ -1659,6 +1676,7 @@ mod tests {
                     scilla_call_gas_exempt_addrs_v2: vec![],
                     randao_support: None,
                     evm_to_scilla_strings_encoded_properly: None,
+                    dont_overwrite_evm_accounts_from_stale_scilla_state: None,
                 },
                 ForkDelta {
                     at_height: 20,
@@ -1700,6 +1718,7 @@ mod tests {
                     scilla_call_gas_exempt_addrs_v2: vec![],
                     randao_support: None,
                     evm_to_scilla_strings_encoded_properly: None,
+                    dont_overwrite_evm_accounts_from_stale_scilla_state: None,
                 },
             ],
             ..Default::default()
diff --git a/zilliqa/src/exec.rs b/zilliqa/src/exec.rs
@@ -866,7 +866,7 @@ impl State {
                 .apply_state_changes_only_if_transaction_succeeds;
 
             if !update_state_only_if_transaction_succeeds || result.success {
-                self.apply_delta_scilla(&state, current_block.number)?;
+                self.apply_delta_scilla(&state, None, current_block.number)?;
             } else {
                 // If the transaction rejected, we must update the nonce and balance of the sender account.
                 let from_account = state
@@ -920,10 +920,10 @@ impl State {
 
             if apply_scilla_delta_when_evm_succeeded {
                 if let ExecutionResult::Success { .. } = result {
-                    self.apply_delta_scilla(&scilla_state, current_block.number)?;
+                    self.apply_delta_scilla(&scilla_state, Some(&state), current_block.number)?;
                 }
             } else {
-                self.apply_delta_scilla(&scilla_state, current_block.number)?;
+                self.apply_delta_scilla(&scilla_state, Some(&state), current_block.number)?;
             }
 
             Ok(TransactionApplyResult::Evm(ResultAndState {
@@ -937,15 +937,25 @@ impl State {
     fn apply_delta_scilla(
         &mut self,
         state: &HashMap<Address, PendingAccount>,
+        evm_state: Option<&EvmState>,
         current_block_number: u64,
     ) -> Result<()> {
         let fork = self.forks.get(current_block_number);
         let only_mutated_accounts_update_state = fork.only_mutated_accounts_update_state;
         let scilla_delta_maps_are_applied_correctly = fork.scilla_delta_maps_are_applied_correctly;
+        let dont_overwrite_evm_accounts_from_stale_scilla_state =
+            fork.dont_overwrite_evm_accounts_from_stale_scilla_state;
         for (&address, account) in state {
             if only_mutated_accounts_update_state && !account.touched {
                 continue;
             }
+            // Modified addresses by EVM are skipped
+            if dont_overwrite_evm_accounts_from_stale_scilla_state
+                && let Some(evm) = evm_state
+                && evm.contains_key(&address)
+            {
+                continue;
+            }
 
             // We shouldn't mutate accounts that were from EVM.
             assert!(!account.from_evm);

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#![recursion_limit = "256"]`
	`2`	`+`
`1`	`3`	`mod address;`
`2`	`4`	`pub mod chain;`
`3`	`5`	`pub mod collector;`