diff --git a/contracts b/contracts
index 90e7043091b4..6b78beb8a268 160000
--- a/contracts
+++ b/contracts
@@ -1 +1 @@
-Subproject commit 90e7043091b4a00a5a2b1afe2da0877aa61e258b
+Subproject commit 6b78beb8a268974362511fa1932b998cbe7b6a4d
diff --git a/core/bin/system-constants-generator/src/utils.rs b/core/bin/system-constants-generator/src/utils.rs
index 3f1ee892c890..e2f7b328bf1e 100644
--- a/core/bin/system-constants-generator/src/utils.rs
+++ b/core/bin/system-constants-generator/src/utils.rs
@@ -94,7 +94,7 @@ pub(super) fn get_l2_tx(
     pubdata_price: u32,
 ) -> L2Tx {
     L2Tx::new_signed(
-        contract_address,
+        Some(contract_address),
         vec![],
         Nonce(0),
         Fee {
@@ -139,7 +139,7 @@ pub(super) fn get_l1_tx(
 ) -> L1Tx {
     L1Tx {
         execute: Execute {
-            contract_address,
+            contract_address: Some(contract_address),
             calldata: custom_calldata.unwrap_or_default(),
             value: U256::from(0),
             factory_deps,
diff --git a/core/lib/dal/src/consensus/mod.rs b/core/lib/dal/src/consensus/mod.rs
index 658da6c76821..5bc0bd0fc7e0 100644
--- a/core/lib/dal/src/consensus/mod.rs
+++ b/core/lib/dal/src/consensus/mod.rs
@@ -371,9 +371,11 @@ impl ProtoRepr for proto::Transaction {
                 }
             },
             execute: Execute {
-                contract_address: required(&execute.contract_address)
-                    .and_then(|x| parse_h160(x))
-                    .context("execute.contract_address")?,
+                contract_address: Some(
+                    required(&execute.contract_address)
+                        .and_then(|x| parse_h160(x))
+                        .context("execute.contract_address")?,
+                ),
                 calldata: required(&execute.calldata).context("calldata")?.clone(),
                 value: required(&execute.value)
                     .and_then(|x| parse_h256(x))
@@ -457,7 +459,13 @@ impl ProtoRepr for proto::Transaction {
             }
         };
         let execute = proto::Execute {
-            contract_address: Some(this.execute.contract_address.as_bytes().into()),
+            contract_address: Some(
+                this.execute
+                    .contract_address
+                    .unwrap_or_default()
+                    .as_bytes()
+                    .into(),
+            ),
             calldata: Some(this.execute.calldata.clone()),
             value: Some(u256_to_h256(this.execute.value).as_bytes().into()),
             factory_deps: this.execute.factory_deps.clone(),
diff --git a/core/lib/dal/src/models/storage_transaction.rs b/core/lib/dal/src/models/storage_transaction.rs
index 31a182a7eca0..911dfad65852 100644
--- a/core/lib/dal/src/models/storage_transaction.rs
+++ b/core/lib/dal/src/models/storage_transaction.rs
@@ -364,11 +364,11 @@ impl From<StorageTransactionReceipt> for TransactionReceipt {
                 .transfer_to
                 .or(storage_receipt.execute_contract_address)
                 .map(|addr| {
-                    serde_json::from_value::<Address>(addr)
+                    serde_json::from_value::<Option<Address>>(addr)
                         .expect("invalid address value in the database")
                 })
                 // For better compatibility with various clients, we never return null.
-                .or_else(|| Some(Address::default())),
+                .flatten(),
             cumulative_gas_used: Default::default(), // TODO: Should be actually calculated (SMA-1183).
             gas_used: {
                 let refunded_gas: U256 = storage_receipt.refunded_gas.into();
@@ -507,6 +507,12 @@ impl StorageApiTransaction {
             .signature
             .and_then(|signature| PackedEthSignature::deserialize_packed(&signature).ok());
 
+        let to = if let Ok(address) = serde_json::from_value(self.execute_contract_address) {
+            Some(address)
+        } else {
+            Some(Address::zero())
+        };
+
         let mut tx = api::Transaction {
             hash: H256::from_slice(&self.tx_hash),
             nonce: U256::from(self.nonce.unwrap_or(0) as u64),
@@ -514,7 +520,7 @@ impl StorageApiTransaction {
             block_number: self.block_number.map(|number| U64::from(number as u64)),
             transaction_index: self.index_in_block.map(|idx| U64::from(idx as u64)),
             from: Some(Address::from_slice(&self.initiator_address)),
-            to: Some(serde_json::from_value(self.execute_contract_address).unwrap()),
+            to,
             value: bigdecimal_to_u256(self.value),
             gas_price: Some(bigdecimal_to_u256(
                 self.effective_gas_price
diff --git a/core/lib/dal/src/models/tests.rs b/core/lib/dal/src/models/tests.rs
index 34cfde108f19..b4949dc101d6 100644
--- a/core/lib/dal/src/models/tests.rs
+++ b/core/lib/dal/src/models/tests.rs
@@ -13,7 +13,7 @@ use crate::{models::storage_transaction::StorageTransaction, BigDecimal};
 
 fn default_execute() -> Execute {
     Execute {
-        contract_address: H160::random(),
+        contract_address: Some(H160::random()),
         value: U256::from(10i32),
         calldata: hex::decode(
             "a9059cbb00000000000000000000000058d595f318167d5af45d9e44ade4348dd4e\
diff --git a/core/lib/dal/src/tests/mod.rs b/core/lib/dal/src/tests/mod.rs
index 497e8e6fa86b..7c8b8a9006ee 100644
--- a/core/lib/dal/src/tests/mod.rs
+++ b/core/lib/dal/src/tests/mod.rs
@@ -71,7 +71,7 @@ pub(crate) fn mock_l2_transaction() -> L2Tx {
         gas_per_pubdata_limit: U256::from(DEFAULT_GAS_PER_PUBDATA),
     };
     let mut l2_tx = L2Tx::new_signed(
-        Address::random(),
+        Address::random().into(),
         vec![],
         zksync_types::Nonce(0),
         fee,
@@ -107,7 +107,7 @@ pub(crate) fn mock_l1_execute() -> L1Tx {
     };
 
     let execute = Execute {
-        contract_address: H160::random(),
+        contract_address: H160::random().into(),
         value: Default::default(),
         calldata: vec![],
         factory_deps: vec![],
@@ -135,7 +135,7 @@ pub(crate) fn mock_protocol_upgrade_transaction() -> ProtocolUpgradeTx {
     };
 
     let execute = Execute {
-        contract_address: H160::random(),
+        contract_address: H160::random().into(),
         value: Default::default(),
         calldata: vec![],
         factory_deps: vec![],
diff --git a/core/lib/dal/src/transactions_dal.rs b/core/lib/dal/src/transactions_dal.rs
index f76b61ec1646..083ef5af3629 100644
--- a/core/lib/dal/src/transactions_dal.rs
+++ b/core/lib/dal/src/transactions_dal.rs
@@ -61,7 +61,13 @@ impl TransactionsDal<'_, '_> {
         tx: &L1Tx,
         l1_block_number: L1BlockNumber,
     ) -> DalResult<()> {
-        let contract_address = tx.execute.contract_address.as_bytes();
+        let contract_address = tx.execute.contract_address;
+        let unwrapped_contract_address = contract_address.unwrap_or_default();
+        let contract_address_b: &[u8] = if contract_address.is_none() {
+            &[]
+        } else {
+            unwrapped_contract_address.as_bytes()
+        };
         let tx_hash = tx.hash();
         let tx_hash_bytes = tx_hash.as_bytes();
         let json_data = serde_json::to_value(&tx.execute)
@@ -146,7 +152,7 @@ impl TransactionsDal<'_, '_> {
             serial_id,
             full_fee,
             layer_2_tip_fee,
-            contract_address,
+            contract_address_b,
             l1_block_number.0 as i32,
             value,
             empty_address.as_bytes(),
@@ -164,7 +170,13 @@ impl TransactionsDal<'_, '_> {
     }
 
     pub async fn insert_system_transaction(&mut self, tx: &ProtocolUpgradeTx) -> DalResult<()> {
-        let contract_address = tx.execute.contract_address.as_bytes().to_vec();
+        let contract_address = tx.execute.contract_address;
+        let unwrapped_contract_address = contract_address.unwrap_or_default();
+        let contract_address_b: &[u8] = if contract_address.is_none() {
+            &[]
+        } else {
+            unwrapped_contract_address.as_bytes()
+        };
         let tx_hash = tx.common_data.hash().0.to_vec();
         let json_data = serde_json::to_value(&tx.execute)
             .unwrap_or_else(|_| panic!("cannot serialize tx {:?} to json", tx.common_data.hash()));
@@ -241,7 +253,7 @@ impl TransactionsDal<'_, '_> {
             gas_per_pubdata_limit,
             json_data,
             upgrade_id,
-            contract_address,
+            contract_address_b,
             l1_block_number,
             value,
             &Address::default().0.to_vec(),
@@ -287,7 +299,13 @@ impl TransactionsDal<'_, '_> {
         }
 
         let initiator_address = tx.initiator_account();
-        let contract_address = tx.execute.contract_address.as_bytes();
+        let contract_address = tx.execute.contract_address;
+        let unwrapped_contract_address = contract_address.unwrap_or_default();
+        let contract_address_b: &[u8] = if contract_address.is_none() {
+            &[]
+        } else {
+            unwrapped_contract_address.as_bytes()
+        };
         let json_data = serde_json::to_value(&tx.execute)
             .unwrap_or_else(|_| panic!("cannot serialize tx {:?} to json", tx.hash()));
         let gas_limit = u256_to_big_decimal(tx.common_data.fee.gas_limit);
@@ -416,7 +434,7 @@ impl TransactionsDal<'_, '_> {
             input_data,
             &json_data,
             tx_format,
-            contract_address,
+            contract_address_b,
             value,
             &paymaster,
             &paymaster_input,
@@ -700,8 +718,15 @@ impl TransactionsDal<'_, '_> {
                     .arg_error(&format!("transactions[{index_in_block}].refunded_gas"), err)
             })?;
 
+            let contract_address = transaction.execute.contract_address;
+            let unwrapped_contract_address = contract_address.unwrap_or_default();
+            let contract_address_b: Vec<u8> = if contract_address.is_none() {
+                Vec::new()
+            } else {
+                unwrapped_contract_address.as_bytes().to_vec()
+            };
             l2_values.push(u256_to_big_decimal(transaction.execute.value));
-            l2_contract_addresses.push(transaction.execute.contract_address.as_bytes());
+            l2_contract_addresses.push(contract_address_b);
             l2_paymaster_input.push(&common_data.paymaster_params.paymaster_input[..]);
             l2_paymaster.push(common_data.paymaster_params.paymaster.as_bytes());
             l2_hashes.push(tx_res.hash.as_bytes());
@@ -821,7 +846,7 @@ impl TransactionsDal<'_, '_> {
             &l2_inputs as &[&[u8]],
             &l2_datas,
             &l2_tx_formats,
-            &l2_contract_addresses as &[&[u8]],
+            &l2_contract_addresses,
             &l2_values,
             &l2_paymaster as &[&[u8]],
             &l2_paymaster_input as &[&[u8]],
@@ -904,8 +929,15 @@ impl TransactionsDal<'_, '_> {
                     .arg_error(&format!("transactions[{index_in_block}].refunded_gas"), err)
             })?;
 
+            let contract_address = transaction.execute.contract_address;
+            let unwrapped_contract_address = contract_address.unwrap_or_default();
+            let contract_address_b: Vec<u8> = if contract_address.is_none() {
+                Vec::new()
+            } else {
+                unwrapped_contract_address.as_bytes().to_vec()
+            };
             l2_values.push(u256_to_big_decimal(transaction.execute.value));
-            l2_contract_addresses.push(transaction.execute.contract_address.as_bytes());
+            l2_contract_addresses.push(contract_address_b);
             l2_paymaster_input.push(&common_data.paymaster_params.paymaster_input[..]);
             l2_paymaster.push(common_data.paymaster_params.paymaster.as_bytes());
             l2_hashes.push(tx_res.hash.as_bytes());
@@ -1016,7 +1048,7 @@ impl TransactionsDal<'_, '_> {
             &l2_datas,
             &l2_refunded_gas,
             &l2_values,
-            &l2_contract_addresses as &[&[u8]],
+            &l2_contract_addresses,
             &l2_paymaster as &[&[u8]],
             &l2_paymaster_input as &[&[u8]],
             l2_block_number.0 as i32,
@@ -1086,6 +1118,13 @@ impl TransactionsDal<'_, '_> {
                     .arg_error(&format!("transactions[{index_in_block}].refunded_gas"), err)
             })?;
 
+            let contract_address = transaction.execute.contract_address;
+            let unwrapped_contract_address = contract_address.unwrap_or_default();
+            let contract_address_b: Vec<u8> = if contract_address.is_none() {
+                Vec::new()
+            } else {
+                unwrapped_contract_address.as_bytes().to_vec()
+            };
             let tx = &tx_res.transaction;
             l1_hashes.push(tx_res.hash.as_bytes());
             l1_initiator_address.push(common_data.sender.as_bytes());
@@ -1099,7 +1138,7 @@ impl TransactionsDal<'_, '_> {
             l1_priority_op_id.push(common_data.serial_id.0 as i64);
             l1_full_fee.push(u256_to_big_decimal(common_data.full_fee));
             l1_layer_2_tip_fee.push(u256_to_big_decimal(common_data.layer_2_tip_fee));
-            l1_contract_address.push(tx.execute.contract_address.as_bytes());
+            l1_contract_address.push(contract_address_b);
             l1_l1_block_number.push(common_data.eth_block as i32);
             l1_value.push(u256_to_big_decimal(tx.execute.value));
             l1_tx_format.push(common_data.tx_format() as i32);
@@ -1206,7 +1245,7 @@ impl TransactionsDal<'_, '_> {
             &l1_priority_op_id,
             &l1_full_fee,
             &l1_layer_2_tip_fee,
-            &l1_contract_address as &[&[u8]],
+            &l1_contract_address,
             &l1_l1_block_number,
             &l1_value,
             &l1_tx_format,
@@ -1376,6 +1415,14 @@ impl TransactionsDal<'_, '_> {
                     .arg_error(&format!("transactions[{index_in_block}].refunded_gas"), err)
             })?;
 
+            let contract_address = transaction.execute.contract_address;
+            let unwrapped_contract_address = contract_address.unwrap_or_default();
+            let contract_address_b: Vec<u8> = if contract_address.is_none() {
+                Vec::new()
+            } else {
+                unwrapped_contract_address.as_bytes().to_vec()
+            };
+
             let tx = &tx_res.transaction;
             upgrade_hashes.push(tx_res.hash.as_bytes());
             upgrade_initiator_address.push(common_data.sender.as_bytes());
@@ -1388,7 +1435,7 @@ impl TransactionsDal<'_, '_> {
                     .unwrap_or_else(|_| panic!("cannot serialize tx {:?} to json", tx.hash())),
             );
             upgrade_upgrade_id.push(common_data.upgrade_id as i32);
-            upgrade_contract_address.push(tx.execute.contract_address.as_bytes());
+            upgrade_contract_address.push(contract_address_b);
             upgrade_l1_block_number.push(common_data.eth_block as i32);
             upgrade_value.push(u256_to_big_decimal(tx.execute.value));
             upgrade_tx_format.push(common_data.tx_format() as i32);
@@ -1487,7 +1534,7 @@ impl TransactionsDal<'_, '_> {
             &upgrade_gas_per_pubdata_limit,
             &upgrade_data,
             &upgrade_upgrade_id,
-            &upgrade_contract_address as &[&[u8]],
+            &upgrade_contract_address,
             &upgrade_l1_block_number,
             &upgrade_value,
             &upgrade_tx_format,
diff --git a/core/lib/env_config/src/chain.rs b/core/lib/env_config/src/chain.rs
index f62f8b859caa..196f4bb8bd17 100644
--- a/core/lib/env_config/src/chain.rs
+++ b/core/lib/env_config/src/chain.rs
@@ -102,6 +102,9 @@ mod tests {
             default_aa_hash: Some(hash(
                 "0x0100055b041eb28aff6e3a6e0f37c31fd053fc9ef142683b05e5f0aee6934066",
             )),
+            evm_simulator_hash: Some(hash(
+                "0x01000f197081a9906cc411d0698c4961aeb5c74877f37f7071681da6e8ef3f31",
+            )),
             l1_batch_commit_data_generator_mode,
             max_circuits_per_batch: 24100,
             protective_reads_persistence_enabled: true,
diff --git a/core/lib/mempool/src/tests.rs b/core/lib/mempool/src/tests.rs
index 6ea1be3b514b..4594e72f64ff 100644
--- a/core/lib/mempool/src/tests.rs
+++ b/core/lib/mempool/src/tests.rs
@@ -371,7 +371,7 @@ fn gen_l2_tx(address: Address, nonce: Nonce) -> Transaction {
 
 fn gen_l2_tx_with_timestamp(address: Address, nonce: Nonce, received_at_ms: u64) -> Transaction {
     let mut txn = L2Tx::new(
-        Address::default(),
+        Address::default().into(),
         Vec::new(),
         nonce,
         Fee::default(),
@@ -386,7 +386,7 @@ fn gen_l2_tx_with_timestamp(address: Address, nonce: Nonce, received_at_ms: u64)
 
 fn gen_l1_tx(priority_id: PriorityOpId) -> Transaction {
     let execute = Execute {
-        contract_address: Address::repeat_byte(0x11),
+        contract_address: Address::repeat_byte(0x11).into(),
         calldata: vec![1, 2, 3],
         factory_deps: vec![],
         value: U256::zero(),
diff --git a/core/lib/multivm/src/versions/vm_1_3_2/test_utils.rs b/core/lib/multivm/src/versions/vm_1_3_2/test_utils.rs
index 603725790f8d..0193940e3595 100644
--- a/core/lib/multivm/src/versions/vm_1_3_2/test_utils.rs
+++ b/core/lib/multivm/src/versions/vm_1_3_2/test_utils.rs
@@ -153,7 +153,7 @@ pub fn get_create_execute(code: &[u8], calldata: &[u8]) -> Execute {
         .expect("failed to encode parameters");
 
     Execute {
-        contract_address: CONTRACT_DEPLOYER_ADDRESS,
+        contract_address: Some(CONTRACT_DEPLOYER_ADDRESS),
         calldata,
         factory_deps: vec![code.to_vec()],
         value: U256::zero(),
diff --git a/core/lib/multivm/src/versions/vm_1_3_2/transaction_data.rs b/core/lib/multivm/src/versions/vm_1_3_2/transaction_data.rs
index 788a52206e80..00c4beabf39d 100644
--- a/core/lib/multivm/src/versions/vm_1_3_2/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_1_3_2/transaction_data.rs
@@ -22,7 +22,7 @@ use crate::vm_1_3_2::vm_with_bootloader::{
 pub struct TransactionData {
     pub tx_type: u8,
     pub from: Address,
-    pub to: Address,
+    pub to: Option<Address>,
     pub gas_limit: U256,
     pub pubdata_price_limit: U256,
     pub max_fee_per_gas: U256,
@@ -170,7 +170,7 @@ impl TransactionData {
         encode(&[Token::Tuple(vec![
             Token::Uint(U256::from_big_endian(&self.tx_type.to_be_bytes())),
             Token::Address(self.from),
-            Token::Address(self.to),
+            Token::Address(self.to.unwrap_or_default()),
             Token::Uint(self.gas_limit),
             Token::Uint(self.pubdata_price_limit),
             Token::Uint(self.max_fee_per_gas),
@@ -593,7 +593,7 @@ mod tests {
         let transaction = TransactionData {
             tx_type: 113,
             from: Address::random(),
-            to: Address::random(),
+            to: Address::random().into(),
             gas_limit: U256::from(1u32),
             pubdata_price_limit: U256::from(1u32),
             max_fee_per_gas: U256::from(1u32),
diff --git a/core/lib/multivm/src/versions/vm_1_4_1/types/internals/transaction_data.rs b/core/lib/multivm/src/versions/vm_1_4_1/types/internals/transaction_data.rs
index 1379b853a542..307d15164783 100644
--- a/core/lib/multivm/src/versions/vm_1_4_1/types/internals/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_1/types/internals/transaction_data.rs
@@ -22,7 +22,7 @@ use crate::vm_1_4_1::{
 pub(crate) struct TransactionData {
     pub(crate) tx_type: u8,
     pub(crate) from: Address,
-    pub(crate) to: Address,
+    pub(crate) to: Option<Address>,
     pub(crate) gas_limit: U256,
     pub(crate) pubdata_price_limit: U256,
     pub(crate) max_fee_per_gas: U256,
@@ -169,7 +169,7 @@ impl TransactionData {
         encode(&[Token::Tuple(vec![
             Token::Uint(U256::from_big_endian(&self.tx_type.to_be_bytes())),
             Token::Address(self.from),
-            Token::Address(self.to),
+            Token::Address(self.to.unwrap_or_default()),
             Token::Uint(self.gas_limit),
             Token::Uint(self.pubdata_price_limit),
             Token::Uint(self.max_fee_per_gas),
@@ -311,7 +311,7 @@ mod tests {
         let transaction = TransactionData {
             tx_type: 113,
             from: Address::random(),
-            to: Address::random(),
+            to: Address::random().into(),
             gas_limit: U256::from(1u32),
             pubdata_price_limit: U256::from(1u32),
             max_fee_per_gas: U256::from(1u32),
diff --git a/core/lib/multivm/src/versions/vm_1_4_2/types/internals/transaction_data.rs b/core/lib/multivm/src/versions/vm_1_4_2/types/internals/transaction_data.rs
index 3498e51ec308..b2e344a5458b 100644
--- a/core/lib/multivm/src/versions/vm_1_4_2/types/internals/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_2/types/internals/transaction_data.rs
@@ -22,7 +22,7 @@ use crate::vm_1_4_2::{
 pub(crate) struct TransactionData {
     pub(crate) tx_type: u8,
     pub(crate) from: Address,
-    pub(crate) to: Address,
+    pub(crate) to: Option<Address>,
     pub(crate) gas_limit: U256,
     pub(crate) pubdata_price_limit: U256,
     pub(crate) max_fee_per_gas: U256,
@@ -169,7 +169,7 @@ impl TransactionData {
         encode(&[Token::Tuple(vec![
             Token::Uint(U256::from_big_endian(&self.tx_type.to_be_bytes())),
             Token::Address(self.from),
-            Token::Address(self.to),
+            Token::Address(self.to.unwrap_or_default()),
             Token::Uint(self.gas_limit),
             Token::Uint(self.pubdata_price_limit),
             Token::Uint(self.max_fee_per_gas),
@@ -311,7 +311,7 @@ mod tests {
         let transaction = TransactionData {
             tx_type: 113,
             from: Address::random(),
-            to: Address::random(),
+            to: Address::random().into(),
             gas_limit: U256::from(1u32),
             pubdata_price_limit: U256::from(1u32),
             max_fee_per_gas: U256::from(1u32),
diff --git a/core/lib/multivm/src/versions/vm_boojum_integration/types/internals/transaction_data.rs b/core/lib/multivm/src/versions/vm_boojum_integration/types/internals/transaction_data.rs
index ad740a279dcd..e00fbe8c71f9 100644
--- a/core/lib/multivm/src/versions/vm_boojum_integration/types/internals/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_boojum_integration/types/internals/transaction_data.rs
@@ -22,7 +22,7 @@ use crate::vm_boojum_integration::{
 pub(crate) struct TransactionData {
     pub(crate) tx_type: u8,
     pub(crate) from: Address,
-    pub(crate) to: Address,
+    pub(crate) to: Option<Address>,
     pub(crate) gas_limit: U256,
     pub(crate) pubdata_price_limit: U256,
     pub(crate) max_fee_per_gas: U256,
@@ -169,7 +169,7 @@ impl TransactionData {
         encode(&[Token::Tuple(vec![
             Token::Uint(U256::from_big_endian(&self.tx_type.to_be_bytes())),
             Token::Address(self.from),
-            Token::Address(self.to),
+            Token::Address(self.to.unwrap_or_default()),
             Token::Uint(self.gas_limit),
             Token::Uint(self.pubdata_price_limit),
             Token::Uint(self.max_fee_per_gas),
@@ -325,7 +325,7 @@ mod tests {
         let transaction = TransactionData {
             tx_type: 113,
             from: Address::random(),
-            to: Address::random(),
+            to: Address::random().into(),
             gas_limit: U256::from(1u32),
             pubdata_price_limit: U256::from(1u32),
             max_fee_per_gas: U256::from(1u32),
diff --git a/core/lib/multivm/src/versions/vm_fast/tests/code_oracle.rs b/core/lib/multivm/src/versions/vm_fast/tests/code_oracle.rs
index 24fda3beed4b..ce57c7711d88 100644
--- a/core/lib/multivm/src/versions/vm_fast/tests/code_oracle.rs
+++ b/core/lib/multivm/src/versions/vm_fast/tests/code_oracle.rs
@@ -55,7 +55,7 @@ fn test_code_oracle() {
     // Firstly, let's ensure that the contract works.
     let tx1 = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: precompiles_contract_address,
+            contract_address: Some(precompiles_contract_address),
             calldata: call_code_oracle_function
                 .encode_input(&[
                     Token::FixedBytes(normal_zkevm_bytecode_hash.0.to_vec()),
@@ -79,7 +79,7 @@ fn test_code_oracle() {
     // the decommitted bytecode gets erased (it shouldn't).
     let tx2 = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: precompiles_contract_address,
+            contract_address: Some(precompiles_contract_address),
             calldata: call_code_oracle_function
                 .encode_input(&[
                     Token::FixedBytes(normal_zkevm_bytecode_hash.0.to_vec()),
@@ -149,7 +149,7 @@ fn test_code_oracle_big_bytecode() {
     // Firstly, let's ensure that the contract works.
     let tx1 = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: precompiles_contract_address,
+            contract_address: Some(precompiles_contract_address),
             calldata: call_code_oracle_function
                 .encode_input(&[
                     Token::FixedBytes(big_zkevm_bytecode_hash.0.to_vec()),
@@ -217,7 +217,7 @@ fn refunds_in_code_oracle() {
 
         let tx = account.get_l2_tx_for_execute(
             Execute {
-                contract_address: precompiles_contract_address,
+                contract_address: Some(precompiles_contract_address),
                 calldata: call_code_oracle_function
                     .encode_input(&[
                         Token::FixedBytes(normal_zkevm_bytecode_hash.0.to_vec()),
diff --git a/core/lib/multivm/src/versions/vm_fast/tests/get_used_contracts.rs b/core/lib/multivm/src/versions/vm_fast/tests/get_used_contracts.rs
index af90566671ee..056b588382ad 100644
--- a/core/lib/multivm/src/versions/vm_fast/tests/get_used_contracts.rs
+++ b/core/lib/multivm/src/versions/vm_fast/tests/get_used_contracts.rs
@@ -60,7 +60,7 @@ fn test_get_used_contracts() {
     let account2 = Account::random();
     let tx2 = account2.get_l1_tx(
         Execute {
-            contract_address: CONTRACT_DEPLOYER_ADDRESS,
+            contract_address: Some(CONTRACT_DEPLOYER_ADDRESS),
             calldata: big_calldata,
             value: Default::default(),
             factory_deps: vec![vec![1; 32]],
diff --git a/core/lib/multivm/src/versions/vm_fast/tests/l1_tx_execution.rs b/core/lib/multivm/src/versions/vm_fast/tests/l1_tx_execution.rs
index 033a7b2658fa..ed2f7cacd9e0 100644
--- a/core/lib/multivm/src/versions/vm_fast/tests/l1_tx_execution.rs
+++ b/core/lib/multivm/src/versions/vm_fast/tests/l1_tx_execution.rs
@@ -176,7 +176,7 @@ fn test_l1_tx_execution_high_gas_limit() {
 
     let mut tx = account.get_l1_tx(
         Execute {
-            contract_address: L1_MESSENGER_ADDRESS,
+            contract_address: Some(L1_MESSENGER_ADDRESS),
             value: 0.into(),
             factory_deps: vec![],
             calldata,
diff --git a/core/lib/multivm/src/versions/vm_fast/tests/l2_blocks.rs b/core/lib/multivm/src/versions/vm_fast/tests/l2_blocks.rs
index 1f9d0aaff091..c92f29ee3e07 100644
--- a/core/lib/multivm/src/versions/vm_fast/tests/l2_blocks.rs
+++ b/core/lib/multivm/src/versions/vm_fast/tests/l2_blocks.rs
@@ -35,7 +35,7 @@ fn get_l1_noop() -> Transaction {
             ..Default::default()
         }),
         execute: Execute {
-            contract_address: H160::zero(),
+            contract_address: Some(H160::zero()),
             calldata: vec![],
             value: U256::zero(),
             factory_deps: vec![],
diff --git a/core/lib/multivm/src/versions/vm_fast/tests/nonce_holder.rs b/core/lib/multivm/src/versions/vm_fast/tests/nonce_holder.rs
index b18676cf2ba6..6e3d507555cf 100644
--- a/core/lib/multivm/src/versions/vm_fast/tests/nonce_holder.rs
+++ b/core/lib/multivm/src/versions/vm_fast/tests/nonce_holder.rs
@@ -59,7 +59,7 @@ fn test_nonce_holder() {
         vm.reset_state(true);
         let mut transaction = account.get_l2_tx_for_execute_with_nonce(
             Execute {
-                contract_address: account.address,
+                contract_address: Some(account.address),
                 calldata: vec![12],
                 value: Default::default(),
                 factory_deps: vec![],
diff --git a/core/lib/multivm/src/versions/vm_fast/tests/refunds.rs b/core/lib/multivm/src/versions/vm_fast/tests/refunds.rs
index 21a3129a3a61..98c9bd3dd3d1 100644
--- a/core/lib/multivm/src/versions/vm_fast/tests/refunds.rs
+++ b/core/lib/multivm/src/versions/vm_fast/tests/refunds.rs
@@ -181,7 +181,7 @@ fn negative_pubdata_for_transaction() {
 
     let expensive_tx = vm.rich_accounts[0].get_l2_tx_for_execute(
         Execute {
-            contract_address: expensive_contract_address,
+            contract_address: Some(expensive_contract_address),
             calldata: expensive_function
                 .encode_input(&[Token::Uint(10.into())])
                 .unwrap(),
@@ -200,7 +200,7 @@ fn negative_pubdata_for_transaction() {
     // This transaction cleans all initial writes in the contract, thus having negative `pubdata` impact.
     let clean_up_tx = vm.rich_accounts[0].get_l2_tx_for_execute(
         Execute {
-            contract_address: expensive_contract_address,
+            contract_address: Some(expensive_contract_address),
             calldata: cleanup_function.encode_input(&[]).unwrap(),
             value: U256::zero(),
             factory_deps: vec![],
diff --git a/core/lib/multivm/src/versions/vm_fast/tests/require_eip712.rs b/core/lib/multivm/src/versions/vm_fast/tests/require_eip712.rs
index 7e378a2b62c4..c5de3953e019 100644
--- a/core/lib/multivm/src/versions/vm_fast/tests/require_eip712.rs
+++ b/core/lib/multivm/src/versions/vm_fast/tests/require_eip712.rs
@@ -67,7 +67,7 @@ async fn test_require_eip712() {
 
     let tx = private_account.get_l2_tx_for_execute(
         Execute {
-            contract_address: account_abstraction.address,
+            contract_address: Some(account_abstraction.address),
             calldata: encoded_input,
             value: Default::default(),
             factory_deps: vec![],
@@ -124,7 +124,7 @@ async fn test_require_eip712() {
 
     // // Now send the 'classic' EIP712 transaction
     let tx_712 = L2Tx::new(
-        beneficiary.address,
+        Some(beneficiary.address),
         vec![],
         Nonce(1),
         Fee {
diff --git a/core/lib/multivm/src/versions/vm_fast/tests/rollbacks.rs b/core/lib/multivm/src/versions/vm_fast/tests/rollbacks.rs
index c530c5af18ea..4419aaeedfaa 100644
--- a/core/lib/multivm/src/versions/vm_fast/tests/rollbacks.rs
+++ b/core/lib/multivm/src/versions/vm_fast/tests/rollbacks.rs
@@ -83,7 +83,7 @@ fn test_vm_loadnext_rollbacks() {
 
     let loadnext_tx_1 = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: address,
+            contract_address: Some(address),
             calldata: LoadnextContractExecutionParams {
                 reads: 100,
                 writes: 100,
@@ -101,7 +101,7 @@ fn test_vm_loadnext_rollbacks() {
 
     let loadnext_tx_2 = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: address,
+            contract_address: Some(address),
             calldata: LoadnextContractExecutionParams {
                 reads: 100,
                 writes: 100,
diff --git a/core/lib/multivm/src/versions/vm_fast/tests/sekp256r1.rs b/core/lib/multivm/src/versions/vm_fast/tests/sekp256r1.rs
index 1e761b30ca62..9c7c4777fc32 100644
--- a/core/lib/multivm/src/versions/vm_fast/tests/sekp256r1.rs
+++ b/core/lib/multivm/src/versions/vm_fast/tests/sekp256r1.rs
@@ -49,7 +49,7 @@ fn test_sekp256r1() {
 
     let tx = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: P256VERIFY_PRECOMPILE_ADDRESS,
+            contract_address: Some(P256VERIFY_PRECOMPILE_ADDRESS),
             calldata: [digest, encoded_r, encoded_s, x, y].concat(),
             value: U256::zero(),
             factory_deps: vec![],
diff --git a/core/lib/multivm/src/versions/vm_fast/tests/storage.rs b/core/lib/multivm/src/versions/vm_fast/tests/storage.rs
index 733ce1f0618c..6dfaf19103df 100644
--- a/core/lib/multivm/src/versions/vm_fast/tests/storage.rs
+++ b/core/lib/multivm/src/versions/vm_fast/tests/storage.rs
@@ -28,7 +28,7 @@ fn test_storage(first_tx_calldata: Vec<u8>, second_tx_calldata: Vec<u8>) -> u32
 
     let tx1 = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: test_contract_address,
+            contract_address: Some(test_contract_address),
             calldata: first_tx_calldata,
             value: 0.into(),
             factory_deps: vec![],
@@ -38,7 +38,7 @@ fn test_storage(first_tx_calldata: Vec<u8>, second_tx_calldata: Vec<u8>) -> u32
 
     let tx2 = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: test_contract_address,
+            contract_address: Some(test_contract_address),
             calldata: second_tx_calldata,
             value: 0.into(),
             factory_deps: vec![],
diff --git a/core/lib/multivm/src/versions/vm_fast/tests/tracing_execution_error.rs b/core/lib/multivm/src/versions/vm_fast/tests/tracing_execution_error.rs
index 75144839006e..efa64ea17708 100644
--- a/core/lib/multivm/src/versions/vm_fast/tests/tracing_execution_error.rs
+++ b/core/lib/multivm/src/versions/vm_fast/tests/tracing_execution_error.rs
@@ -24,7 +24,7 @@ fn test_tracing_of_execution_errors() {
 
     let tx = account.get_l2_tx_for_execute(
         Execute {
-            contract_address,
+            contract_address: Some(contract_address),
             calldata: get_execute_error_calldata(),
             value: Default::default(),
             factory_deps: vec![],
diff --git a/core/lib/multivm/src/versions/vm_fast/tests/transfer.rs b/core/lib/multivm/src/versions/vm_fast/tests/transfer.rs
index 3b61b8ac7f1e..683797d6a026 100644
--- a/core/lib/multivm/src/versions/vm_fast/tests/transfer.rs
+++ b/core/lib/multivm/src/versions/vm_fast/tests/transfer.rs
@@ -70,7 +70,7 @@ fn test_send_or_transfer(test_option: TestOptions) {
     let account = &mut vm.rich_accounts[0];
     let tx = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: test_contract_address,
+            contract_address: Some(test_contract_address),
             calldata,
             value: U256::zero(),
             factory_deps: vec![],
@@ -167,7 +167,7 @@ fn test_reentrancy_protection_send_or_transfer(test_option: TestOptions) {
     let account = &mut vm.rich_accounts[0];
     let tx1 = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: reentrant_recipeint_address,
+            contract_address: Some(reentrant_recipeint_address),
             calldata: reentrant_recipient_abi
                 .function("setX")
                 .unwrap()
@@ -188,7 +188,7 @@ fn test_reentrancy_protection_send_or_transfer(test_option: TestOptions) {
 
     let tx2 = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: test_contract_address,
+            contract_address: Some(test_contract_address),
             calldata,
             value,
             factory_deps: vec![],
diff --git a/core/lib/multivm/src/versions/vm_fast/tests/upgrade.rs b/core/lib/multivm/src/versions/vm_fast/tests/upgrade.rs
index 616436776090..2a211640c759 100644
--- a/core/lib/multivm/src/versions/vm_fast/tests/upgrade.rs
+++ b/core/lib/multivm/src/versions/vm_fast/tests/upgrade.rs
@@ -265,7 +265,7 @@ fn get_forced_deploy_tx(deployment: &[ForceDeployment]) -> Transaction {
         .expect("failed to encode parameters");
 
     let execute = Execute {
-        contract_address: CONTRACT_DEPLOYER_ADDRESS,
+        contract_address: Some(CONTRACT_DEPLOYER_ADDRESS),
         calldata,
         factory_deps: vec![],
         value: U256::zero(),
@@ -315,7 +315,7 @@ fn get_complex_upgrade_tx(
         .unwrap();
 
     let execute = Execute {
-        contract_address: COMPLEX_UPGRADER_ADDRESS,
+        contract_address: Some(COMPLEX_UPGRADER_ADDRESS),
         calldata: complex_upgrader_calldata,
         factory_deps: vec![],
         value: U256::zero(),
diff --git a/core/lib/multivm/src/versions/vm_fast/transaction_data.rs b/core/lib/multivm/src/versions/vm_fast/transaction_data.rs
index 502be0dc22cc..9ebfbea3ac2b 100644
--- a/core/lib/multivm/src/versions/vm_fast/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_fast/transaction_data.rs
@@ -22,7 +22,7 @@ use crate::vm_latest::{
 pub(crate) struct TransactionData {
     pub(crate) tx_type: u8,
     pub(crate) from: Address,
-    pub(crate) to: Address,
+    pub(crate) to: Option<Address>,
     pub(crate) gas_limit: U256,
     pub(crate) pubdata_price_limit: U256,
     pub(crate) max_fee_per_gas: U256,
@@ -169,7 +169,7 @@ impl TransactionData {
         encode(&[Token::Tuple(vec![
             Token::Uint(U256::from_big_endian(&self.tx_type.to_be_bytes())),
             Token::Address(self.from),
-            Token::Address(self.to),
+            Token::Address(self.to.unwrap_or_default()),
             Token::Uint(self.gas_limit),
             Token::Uint(self.pubdata_price_limit),
             Token::Uint(self.max_fee_per_gas),
@@ -305,7 +305,7 @@ mod tests {
         let transaction = TransactionData {
             tx_type: 113,
             from: Address::random(),
-            to: Address::random(),
+            to: Address::random().into(),
             gas_limit: U256::from(1u32),
             pubdata_price_limit: U256::from(1u32),
             max_fee_per_gas: U256::from(1u32),
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/block_tip.rs b/core/lib/multivm/src/versions/vm_latest/tests/block_tip.rs
index 78136602dae2..0503710c7942 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/block_tip.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/block_tip.rs
@@ -164,7 +164,7 @@ fn execute_test(test_data: L1MessengerTestData) -> TestStatistics {
     for (i, data) in txs_data.into_iter().enumerate() {
         let tx = account.get_l2_tx_for_execute(
             Execute {
-                contract_address: CONTRACT_FORCE_DEPLOYER_ADDRESS,
+                contract_address: Some(CONTRACT_FORCE_DEPLOYER_ADDRESS),
                 calldata: data,
                 value: U256::zero(),
                 factory_deps: vec![],
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/call_tracer.rs b/core/lib/multivm/src/versions/vm_latest/tests/call_tracer.rs
index a4d0eb2d17e2..df7a78855426 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/call_tracer.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/call_tracer.rs
@@ -34,7 +34,7 @@ fn test_max_depth() {
     let account = &mut vm.rich_accounts[0];
     let tx = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: address,
+            contract_address: Some(address),
             calldata: vec![],
             value: Default::default(),
             factory_deps: vec![],
@@ -69,7 +69,7 @@ fn test_basic_behavior() {
     let account = &mut vm.rich_accounts[0];
     let tx = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: address,
+            contract_address: Some(address),
             calldata: hex::decode(increment_by_6_calldata).unwrap(),
             value: Default::default(),
             factory_deps: vec![],
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/circuits.rs b/core/lib/multivm/src/versions/vm_latest/tests/circuits.rs
index 02ec2dc58aaa..35412ee4d1bd 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/circuits.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/circuits.rs
@@ -22,7 +22,7 @@ fn test_circuits() {
     let account = &mut vm.rich_accounts[0];
     let tx = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: Address::random(),
+            contract_address: Some(Address::random()),
             calldata: Vec::new(),
             value: U256::from(1u8),
             factory_deps: vec![],
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/code_oracle.rs b/core/lib/multivm/src/versions/vm_latest/tests/code_oracle.rs
index 7174e9be67de..63a1069ad47d 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/code_oracle.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/code_oracle.rs
@@ -69,7 +69,7 @@ fn test_code_oracle() {
     // Firstly, let's ensure that the contract works.
     let tx1 = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: precompiles_contract_address,
+            contract_address: Some(precompiles_contract_address),
             calldata: call_code_oracle_function
                 .encode_input(&[
                     Token::FixedBytes(normal_zkevm_bytecode_hash.0.to_vec()),
@@ -93,7 +93,7 @@ fn test_code_oracle() {
     // the decommitted bytecode gets erased (it shouldn't).
     let tx2 = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: precompiles_contract_address,
+            contract_address: Some(precompiles_contract_address),
             calldata: call_code_oracle_function
                 .encode_input(&[
                     Token::FixedBytes(normal_zkevm_bytecode_hash.0.to_vec()),
@@ -169,7 +169,7 @@ fn test_code_oracle_big_bytecode() {
     // Firstly, let's ensure that the contract works.
     let tx1 = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: precompiles_contract_address,
+            contract_address: Some(precompiles_contract_address),
             calldata: call_code_oracle_function
                 .encode_input(&[
                     Token::FixedBytes(big_zkevm_bytecode_hash.0.to_vec()),
@@ -251,7 +251,7 @@ fn refunds_in_code_oracle() {
 
         let tx = account.get_l2_tx_for_execute(
             Execute {
-                contract_address: precompiles_contract_address,
+                contract_address: Some(precompiles_contract_address),
                 calldata: call_code_oracle_function
                     .encode_input(&[
                         Token::FixedBytes(normal_zkevm_bytecode_hash.0.to_vec()),
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/get_used_contracts.rs b/core/lib/multivm/src/versions/vm_latest/tests/get_used_contracts.rs
index 1798c700ea2d..782762577c36 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/get_used_contracts.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/get_used_contracts.rs
@@ -75,7 +75,7 @@ fn test_get_used_contracts() {
     let account2 = Account::random();
     let tx2 = account2.get_l1_tx(
         Execute {
-            contract_address: CONTRACT_DEPLOYER_ADDRESS,
+            contract_address: Some(CONTRACT_DEPLOYER_ADDRESS),
             calldata: big_calldata,
             value: Default::default(),
             factory_deps: vec![vec![1; 32]],
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/l1_tx_execution.rs b/core/lib/multivm/src/versions/vm_latest/tests/l1_tx_execution.rs
index 6b3be989fb3a..cbed159db644 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/l1_tx_execution.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/l1_tx_execution.rs
@@ -173,7 +173,7 @@ fn test_l1_tx_execution_high_gas_limit() {
 
     let mut tx = account.get_l1_tx(
         Execute {
-            contract_address: L1_MESSENGER_ADDRESS,
+            contract_address: Some(L1_MESSENGER_ADDRESS),
             value: 0.into(),
             factory_deps: vec![],
             calldata,
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/nonce_holder.rs b/core/lib/multivm/src/versions/vm_latest/tests/nonce_holder.rs
index 076ecb523618..ea11dd01818e 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/nonce_holder.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/nonce_holder.rs
@@ -64,7 +64,7 @@ fn test_nonce_holder() {
         let mut transaction_data: TransactionData = account
             .get_l2_tx_for_execute_with_nonce(
                 Execute {
-                    contract_address: account.address,
+                    contract_address: Some(account.address),
                     calldata: vec![12],
                     value: Default::default(),
                     factory_deps: vec![],
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/precompiles.rs b/core/lib/multivm/src/versions/vm_latest/tests/precompiles.rs
index 2ab40faf22ca..9388d0161846 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/precompiles.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/precompiles.rs
@@ -31,7 +31,7 @@ fn test_keccak() {
     let account = &mut vm.rich_accounts[0];
     let tx = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: address,
+            contract_address: Some(address),
             calldata: hex::decode(keccak1000_calldata).unwrap(),
             value: Default::default(),
             factory_deps: vec![],
@@ -75,7 +75,7 @@ fn test_sha256() {
     let account = &mut vm.rich_accounts[0];
     let tx = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: address,
+            contract_address: Some(address),
             calldata: hex::decode(sha1000_calldata).unwrap(),
             value: Default::default(),
             factory_deps: vec![],
@@ -112,7 +112,7 @@ fn test_ecrecover() {
     let account = &mut vm.rich_accounts[0];
     let tx = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: account.address,
+            contract_address: Some(account.address),
             calldata: Vec::new(),
             value: Default::default(),
             factory_deps: vec![],
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/prestate_tracer.rs b/core/lib/multivm/src/versions/vm_latest/tests/prestate_tracer.rs
index 893ca57bc4d1..2d1ac098ba08 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/prestate_tracer.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/prestate_tracer.rs
@@ -88,7 +88,7 @@ fn test_prestate_tracer_diff_mode() {
 
     //enter ether to contract to see difference in the balance post execution
     let tx0 = Execute {
-        contract_address: vm.test_contract.unwrap(),
+        contract_address: Some(vm.test_contract.unwrap()),
         calldata: Default::default(),
         value: U256::from(100000),
         factory_deps: vec![],
@@ -98,7 +98,7 @@ fn test_prestate_tracer_diff_mode() {
         .push_transaction(account.get_l2_tx_for_execute(tx0.clone(), None));
 
     let tx1 = Execute {
-        contract_address: deployed_address2,
+        contract_address: Some(deployed_address2),
         calldata: Default::default(),
         value: U256::from(200000),
         factory_deps: vec![],
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/refunds.rs b/core/lib/multivm/src/versions/vm_latest/tests/refunds.rs
index 52dbd6efb339..2c54ae4c4109 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/refunds.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/refunds.rs
@@ -188,7 +188,7 @@ fn negative_pubdata_for_transaction() {
 
     let expensive_tx = vm.rich_accounts[0].get_l2_tx_for_execute(
         Execute {
-            contract_address: expensive_contract_address,
+            contract_address: Some(expensive_contract_address),
             calldata: expensive_function
                 .encode_input(&[Token::Uint(10.into())])
                 .unwrap(),
@@ -207,7 +207,7 @@ fn negative_pubdata_for_transaction() {
     // This transaction cleans all initial writes in the contract, thus having negative `pubdata` impact.
     let clean_up_tx = vm.rich_accounts[0].get_l2_tx_for_execute(
         Execute {
-            contract_address: expensive_contract_address,
+            contract_address: Some(expensive_contract_address),
             calldata: cleanup_function.encode_input(&[]).unwrap(),
             value: U256::zero(),
             factory_deps: vec![],
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/require_eip712.rs b/core/lib/multivm/src/versions/vm_latest/tests/require_eip712.rs
index 5178c5dc29cf..674bbe4ef6e7 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/require_eip712.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/require_eip712.rs
@@ -63,7 +63,7 @@ async fn test_require_eip712() {
 
     let tx = private_account.get_l2_tx_for_execute(
         Execute {
-            contract_address: account_abstraction.address,
+            contract_address: Some(account_abstraction.address),
             calldata: encoded_input,
             value: Default::default(),
             factory_deps: vec![],
@@ -120,7 +120,7 @@ async fn test_require_eip712() {
 
     // // Now send the 'classic' EIP712 transaction
     let tx_712 = L2Tx::new(
-        beneficiary.address,
+        Some(beneficiary.address),
         vec![],
         Nonce(1),
         Fee {
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/rollbacks.rs b/core/lib/multivm/src/versions/vm_latest/tests/rollbacks.rs
index e0c3ec4157dc..13f88b487370 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/rollbacks.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/rollbacks.rs
@@ -92,7 +92,7 @@ fn test_vm_loadnext_rollbacks() {
 
     let loadnext_tx_1 = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: address,
+            contract_address: Some(address),
             calldata: LoadnextContractExecutionParams {
                 reads: 100,
                 writes: 100,
@@ -110,7 +110,7 @@ fn test_vm_loadnext_rollbacks() {
 
     let loadnext_tx_2 = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: address,
+            contract_address: Some(address),
             calldata: LoadnextContractExecutionParams {
                 reads: 100,
                 writes: 100,
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/sekp256r1.rs b/core/lib/multivm/src/versions/vm_latest/tests/sekp256r1.rs
index 07b25eb0a8b0..17a41cd0e8e5 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/sekp256r1.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/sekp256r1.rs
@@ -48,7 +48,7 @@ fn test_sekp256r1() {
 
     let tx = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: P256VERIFY_PRECOMPILE_ADDRESS,
+            contract_address: Some(P256VERIFY_PRECOMPILE_ADDRESS),
             calldata: [digest, encoded_r, encoded_s, x, y].concat(),
             value: U256::zero(),
             factory_deps: vec![],
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/storage.rs b/core/lib/multivm/src/versions/vm_latest/tests/storage.rs
index b7c14c54f6df..ac55776e4a11 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/storage.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/storage.rs
@@ -48,7 +48,7 @@ fn test_storage(txs: Vec<TestTxInfo>) -> u32 {
 
         let tx = account.get_l2_tx_for_execute(
             Execute {
-                contract_address: test_contract_address,
+                contract_address: Some(test_contract_address),
                 calldata,
                 value: 0.into(),
                 factory_deps: vec![],
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/tracing_execution_error.rs b/core/lib/multivm/src/versions/vm_latest/tests/tracing_execution_error.rs
index 58c5ef77dc42..2db37881352f 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/tracing_execution_error.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/tracing_execution_error.rs
@@ -27,7 +27,7 @@ fn test_tracing_of_execution_errors() {
 
     let tx = account.get_l2_tx_for_execute(
         Execute {
-            contract_address,
+            contract_address: Some(contract_address),
             calldata: get_execute_error_calldata(),
             value: Default::default(),
             factory_deps: vec![],
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/transfer.rs b/core/lib/multivm/src/versions/vm_latest/tests/transfer.rs
index f4198d541f73..46a18ef87ca4 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/transfer.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/transfer.rs
@@ -73,7 +73,7 @@ fn test_send_or_transfer(test_option: TestOptions) {
     let account = &mut vm.rich_accounts[0];
     let tx = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: test_contract_address,
+            contract_address: Some(test_contract_address),
             calldata,
             value: U256::zero(),
             factory_deps: vec![],
@@ -169,7 +169,7 @@ fn test_reentrancy_protection_send_or_transfer(test_option: TestOptions) {
     let account = &mut vm.rich_accounts[0];
     let tx1 = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: reentrant_recipeint_address,
+            contract_address: Some(reentrant_recipeint_address),
             calldata: reentrant_recipient_abi
                 .function("setX")
                 .unwrap()
@@ -190,7 +190,7 @@ fn test_reentrancy_protection_send_or_transfer(test_option: TestOptions) {
 
     let tx2 = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: test_contract_address,
+            contract_address: Some(test_contract_address),
             calldata,
             value,
             factory_deps: vec![],
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/upgrade.rs b/core/lib/multivm/src/versions/vm_latest/tests/upgrade.rs
index 80e16248fb2d..3c935f782061 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/upgrade.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/upgrade.rs
@@ -277,7 +277,7 @@ fn get_forced_deploy_tx(deployment: &[ForceDeployment]) -> Transaction {
         .expect("failed to encode parameters");
 
     let execute = Execute {
-        contract_address: CONTRACT_DEPLOYER_ADDRESS,
+        contract_address: Some(CONTRACT_DEPLOYER_ADDRESS),
         calldata,
         factory_deps: vec![],
         value: U256::zero(),
@@ -327,7 +327,7 @@ fn get_complex_upgrade_tx(
         .unwrap();
 
     let execute = Execute {
-        contract_address: COMPLEX_UPGRADER_ADDRESS,
+        contract_address: Some(COMPLEX_UPGRADER_ADDRESS),
         calldata: complex_upgrader_calldata,
         factory_deps: vec![],
         value: U256::zero(),
diff --git a/core/lib/multivm/src/versions/vm_latest/tracers/default_tracers.rs b/core/lib/multivm/src/versions/vm_latest/tracers/default_tracers.rs
index 988abec7d156..4c00e7dbf771 100755
--- a/core/lib/multivm/src/versions/vm_latest/tracers/default_tracers.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tracers/default_tracers.rs
@@ -39,7 +39,7 @@ use crate::{
 };
 
 /// Default tracer for the VM. It manages the other tracers execution and stop the vm when needed.
-pub(crate) struct DefaultExecutionTracer<S: WriteStorage, H: HistoryMode> {
+pub struct DefaultExecutionTracer<S: WriteStorage, H: HistoryMode> {
     tx_has_been_processed: bool,
     execution_mode: VmExecutionMode,
 
diff --git a/core/lib/multivm/src/versions/vm_latest/types/internals/transaction_data.rs b/core/lib/multivm/src/versions/vm_latest/types/internals/transaction_data.rs
index 502be0dc22cc..2fa939d9a136 100644
--- a/core/lib/multivm/src/versions/vm_latest/types/internals/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_latest/types/internals/transaction_data.rs
@@ -22,7 +22,7 @@ use crate::vm_latest::{
 pub(crate) struct TransactionData {
     pub(crate) tx_type: u8,
     pub(crate) from: Address,
-    pub(crate) to: Address,
+    pub(crate) to: Option<Address>,
     pub(crate) gas_limit: U256,
     pub(crate) pubdata_price_limit: U256,
     pub(crate) max_fee_per_gas: U256,
@@ -62,6 +62,13 @@ impl From<Transaction> for TransactionData {
                     U256::zero()
                 };
 
+                let should_deploy_contract = if execute_tx.execute.contract_address.is_none() {
+                    println!("DEPLOYING");
+                    U256([1, 0, 0, 0])
+                } else {
+                    U256::zero()
+                };
+
                 // Ethereum transactions do not sign gas per pubdata limit, and so for them we need to use
                 // some default value. We use the maximum possible value that is allowed by the bootloader
                 // (i.e. we can not use u64::MAX, because the bootloader requires gas per pubdata for such
@@ -85,7 +92,7 @@ impl From<Transaction> for TransactionData {
                     value: execute_tx.execute.value,
                     reserved: [
                         should_check_chain_id,
-                        U256::zero(),
+                        should_deploy_contract,
                         U256::zero(),
                         U256::zero(),
                     ],
@@ -169,7 +176,7 @@ impl TransactionData {
         encode(&[Token::Tuple(vec![
             Token::Uint(U256::from_big_endian(&self.tx_type.to_be_bytes())),
             Token::Address(self.from),
-            Token::Address(self.to),
+            Token::Address(self.to.unwrap_or_default()),
             Token::Uint(self.gas_limit),
             Token::Uint(self.pubdata_price_limit),
             Token::Uint(self.max_fee_per_gas),
@@ -305,7 +312,7 @@ mod tests {
         let transaction = TransactionData {
             tx_type: 113,
             from: Address::random(),
-            to: Address::random(),
+            to: Address::random().into(),
             gas_limit: U256::from(1u32),
             pubdata_price_limit: U256::from(1u32),
             max_fee_per_gas: U256::from(1u32),
diff --git a/core/lib/multivm/src/versions/vm_latest/types/internals/vm_state.rs b/core/lib/multivm/src/versions/vm_latest/types/internals/vm_state.rs
index b9ac0bfad229..cea875f48d10 100644
--- a/core/lib/multivm/src/versions/vm_latest/types/internals/vm_state.rs
+++ b/core/lib/multivm/src/versions/vm_latest/types/internals/vm_state.rs
@@ -96,6 +96,18 @@ pub(crate) fn new_vm_state<S: WriteStorage, H: HistoryMode>(
         Timestamp(0),
     );
 
+    decommittment_processor.populate(
+        vec![(
+            h256_to_u256(system_env.base_system_smart_contracts.evm_simulator.hash),
+            system_env
+                .base_system_smart_contracts
+                .evm_simulator
+                .code
+                .clone(),
+        )],
+        Timestamp(0),
+    );
+
     memory.populate(
         vec![(
             BOOTLOADER_CODE_PAGE,
@@ -129,7 +141,7 @@ pub(crate) fn new_vm_state<S: WriteStorage, H: HistoryMode>(
             // For now, the default account hash is used as the code hash for the EVM simulator.
             // In the 1.5.0 version, it is not possible to instantiate EVM bytecode.
             evm_simulator_code_hash: h256_to_u256(
-                system_env.base_system_smart_contracts.default_aa.hash,
+                system_env.base_system_smart_contracts.evm_simulator.hash,
             ),
             zkporter_is_available: system_env.zk_porter_available,
         },
diff --git a/core/lib/multivm/src/versions/vm_latest/utils/mod.rs b/core/lib/multivm/src/versions/vm_latest/utils/mod.rs
index 0fb803de5d4e..521a2955dcd6 100644
--- a/core/lib/multivm/src/versions/vm_latest/utils/mod.rs
+++ b/core/lib/multivm/src/versions/vm_latest/utils/mod.rs
@@ -1,6 +1,12 @@
+use zk_evm_1_5_0::aux_structures::MemoryPage;
+
 /// Utility functions for the VM.
 pub mod fee;
 pub mod l2_blocks;
 pub(crate) mod logs;
 pub mod overhead;
 pub mod transaction_encoding;
+
+pub const fn heap_page_from_base(base: MemoryPage) -> MemoryPage {
+    MemoryPage(base.0 + 2)
+}
diff --git a/core/lib/multivm/src/versions/vm_m5/test_utils.rs b/core/lib/multivm/src/versions/vm_m5/test_utils.rs
index 785eb49835f1..d7c0dfb9f6d0 100644
--- a/core/lib/multivm/src/versions/vm_m5/test_utils.rs
+++ b/core/lib/multivm/src/versions/vm_m5/test_utils.rs
@@ -151,7 +151,7 @@ pub fn get_create_execute(code: &[u8], calldata: &[u8]) -> Execute {
         .expect("failed to encode parameters");
 
     Execute {
-        contract_address: CONTRACT_DEPLOYER_ADDRESS,
+        contract_address: Some(CONTRACT_DEPLOYER_ADDRESS),
         calldata,
         factory_deps: vec![code.to_vec()],
         value: U256::zero(),
diff --git a/core/lib/multivm/src/versions/vm_m5/transaction_data.rs b/core/lib/multivm/src/versions/vm_m5/transaction_data.rs
index 7ef739fd5bf5..22fec0362c50 100644
--- a/core/lib/multivm/src/versions/vm_m5/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_m5/transaction_data.rs
@@ -22,7 +22,7 @@ const L1_TX_TYPE: u8 = 255;
 pub struct TransactionData {
     pub tx_type: u8,
     pub from: Address,
-    pub to: Address,
+    pub to: Option<Address>,
     pub gas_limit: U256,
     pub pubdata_price_limit: U256,
     pub max_fee_per_gas: U256,
@@ -144,7 +144,7 @@ impl TransactionData {
         encode(&[Token::Tuple(vec![
             Token::Uint(U256::from_big_endian(&self.tx_type.to_be_bytes())),
             Token::Address(self.from),
-            Token::Address(self.to),
+            Token::Address(self.to.unwrap_or_default()),
             Token::Uint(self.gas_limit),
             Token::Uint(self.pubdata_price_limit),
             Token::Uint(self.max_fee_per_gas),
@@ -479,7 +479,7 @@ mod tests {
         let transaction = TransactionData {
             tx_type: 113,
             from: Address::random(),
-            to: Address::random(),
+            to: Address::random().into(),
             gas_limit: U256::from(1u32),
             pubdata_price_limit: U256::from(1u32),
             max_fee_per_gas: U256::from(1u32),
diff --git a/core/lib/multivm/src/versions/vm_m6/test_utils.rs b/core/lib/multivm/src/versions/vm_m6/test_utils.rs
index ecad7d911b40..4bd39bc56dd4 100644
--- a/core/lib/multivm/src/versions/vm_m6/test_utils.rs
+++ b/core/lib/multivm/src/versions/vm_m6/test_utils.rs
@@ -151,7 +151,7 @@ pub fn get_create_execute(code: &[u8], calldata: &[u8]) -> Execute {
         .expect("failed to encode parameters");
 
     Execute {
-        contract_address: CONTRACT_DEPLOYER_ADDRESS,
+        contract_address: Some(CONTRACT_DEPLOYER_ADDRESS),
         calldata,
         factory_deps: vec![code.to_vec()],
         value: U256::zero(),
diff --git a/core/lib/multivm/src/versions/vm_m6/transaction_data.rs b/core/lib/multivm/src/versions/vm_m6/transaction_data.rs
index 99ce4671c29b..91e6839e5d5f 100644
--- a/core/lib/multivm/src/versions/vm_m6/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_m6/transaction_data.rs
@@ -23,7 +23,7 @@ pub(crate) const L1_TX_TYPE: u8 = 255;
 pub struct TransactionData {
     pub tx_type: u8,
     pub from: Address,
-    pub to: Address,
+    pub to: Option<Address>,
     pub gas_limit: U256,
     pub pubdata_price_limit: U256,
     pub max_fee_per_gas: U256,
@@ -171,7 +171,7 @@ impl TransactionData {
         encode(&[Token::Tuple(vec![
             Token::Uint(U256::from_big_endian(&self.tx_type.to_be_bytes())),
             Token::Address(self.from),
-            Token::Address(self.to),
+            Token::Address(self.to.unwrap_or_default()),
             Token::Uint(self.gas_limit),
             Token::Uint(self.pubdata_price_limit),
             Token::Uint(self.max_fee_per_gas),
@@ -592,7 +592,7 @@ mod tests {
         let transaction = TransactionData {
             tx_type: 113,
             from: Address::random(),
-            to: Address::random(),
+            to: Address::random().into(),
             gas_limit: U256::from(1u32),
             pubdata_price_limit: U256::from(1u32),
             max_fee_per_gas: U256::from(1u32),
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/types/internals/transaction_data.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/types/internals/transaction_data.rs
index 205090ba633e..59a52569e306 100644
--- a/core/lib/multivm/src/versions/vm_refunds_enhancement/types/internals/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/types/internals/transaction_data.rs
@@ -22,7 +22,7 @@ use crate::vm_refunds_enhancement::{
 pub(crate) struct TransactionData {
     pub(crate) tx_type: u8,
     pub(crate) from: Address,
-    pub(crate) to: Address,
+    pub(crate) to: Option<Address>,
     pub(crate) gas_limit: U256,
     pub(crate) pubdata_price_limit: U256,
     pub(crate) max_fee_per_gas: U256,
@@ -169,7 +169,7 @@ impl TransactionData {
         encode(&[Token::Tuple(vec![
             Token::Uint(U256::from_big_endian(&self.tx_type.to_be_bytes())),
             Token::Address(self.from),
-            Token::Address(self.to),
+            Token::Address(self.to.unwrap_or_default()),
             Token::Uint(self.gas_limit),
             Token::Uint(self.pubdata_price_limit),
             Token::Uint(self.max_fee_per_gas),
@@ -325,7 +325,7 @@ mod tests {
         let transaction = TransactionData {
             tx_type: 113,
             from: Address::random(),
-            to: Address::random(),
+            to: Address::random().into(),
             gas_limit: U256::from(1u32),
             pubdata_price_limit: U256::from(1u32),
             max_fee_per_gas: U256::from(1u32),
diff --git a/core/lib/multivm/src/versions/vm_virtual_blocks/types/internals/transaction_data.rs b/core/lib/multivm/src/versions/vm_virtual_blocks/types/internals/transaction_data.rs
index b42950399f61..54581a5ae57a 100644
--- a/core/lib/multivm/src/versions/vm_virtual_blocks/types/internals/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_virtual_blocks/types/internals/transaction_data.rs
@@ -22,7 +22,7 @@ use crate::vm_virtual_blocks::{
 pub(crate) struct TransactionData {
     pub(crate) tx_type: u8,
     pub(crate) from: Address,
-    pub(crate) to: Address,
+    pub(crate) to: Option<Address>,
     pub(crate) gas_limit: U256,
     pub(crate) pubdata_price_limit: U256,
     pub(crate) max_fee_per_gas: U256,
@@ -169,7 +169,7 @@ impl TransactionData {
         encode(&[Token::Tuple(vec![
             Token::Uint(U256::from_big_endian(&self.tx_type.to_be_bytes())),
             Token::Address(self.from),
-            Token::Address(self.to),
+            Token::Address(self.to.unwrap_or_default()),
             Token::Uint(self.gas_limit),
             Token::Uint(self.pubdata_price_limit),
             Token::Uint(self.max_fee_per_gas),
@@ -325,7 +325,7 @@ mod tests {
         let transaction = TransactionData {
             tx_type: 113,
             from: Address::random(),
-            to: Address::random(),
+            to: Address::random().into(),
             gas_limit: U256::from(1u32),
             pubdata_price_limit: U256::from(1u32),
             max_fee_per_gas: U256::from(1u32),
diff --git a/core/lib/tee_verifier/src/lib.rs b/core/lib/tee_verifier/src/lib.rs
index 32443b60c8ca..aeef91dcaa17 100644
--- a/core/lib/tee_verifier/src/lib.rs
+++ b/core/lib/tee_verifier/src/lib.rs
@@ -277,6 +277,10 @@ mod tests {
                         code: vec![U256([1; 4])],
                         hash: H256([1; 32]),
                     },
+                    evm_simulator: SystemContractCode {
+                        code: vec![U256([1; 4])],
+                        hash: H256([1; 32]),
+                    },
                 },
                 bootloader_gas_limit: 0,
                 execution_mode: TxExecutionMode::VerifyExecute,
diff --git a/core/lib/types/src/l1/mod.rs b/core/lib/types/src/l1/mod.rs
index 05f08987a2d3..215836cb52f5 100644
--- a/core/lib/types/src/l1/mod.rs
+++ b/core/lib/types/src/l1/mod.rs
@@ -274,7 +274,7 @@ impl From<L1Tx> for abi::NewPriorityRequest {
             transaction: abi::L2CanonicalTransaction {
                 tx_type: PRIORITY_OPERATION_L2_TX_TYPE.into(),
                 from: address_to_u256(&t.common_data.sender),
-                to: address_to_u256(&t.execute.contract_address),
+                to: address_to_u256(&t.execute.contract_address.unwrap_or_default()),
                 gas_limit: t.common_data.gas_limit,
                 gas_per_pubdata_byte_limit: t.common_data.gas_per_pubdata_limit,
                 max_fee_per_gas: t.common_data.max_fee_per_gas,
@@ -345,7 +345,7 @@ impl TryFrom<abi::NewPriorityRequest> for L1Tx {
         };
 
         let execute = Execute {
-            contract_address: u256_to_account_address(&req.transaction.to),
+            contract_address: Some(u256_to_account_address(&req.transaction.to)),
             calldata: req.transaction.data,
             factory_deps: req.factory_deps,
             value: req.transaction.value,
diff --git a/core/lib/types/src/l2/mod.rs b/core/lib/types/src/l2/mod.rs
index 5a5276407529..abd60491af38 100644
--- a/core/lib/types/src/l2/mod.rs
+++ b/core/lib/types/src/l2/mod.rs
@@ -153,7 +153,7 @@ pub struct L2Tx {
 impl L2Tx {
     #[allow(clippy::too_many_arguments)]
     pub fn new(
-        contract_address: Address,
+        contract_address: Option<Address>,
         calldata: Vec<u8>,
         nonce: Nonce,
         fee: Fee,
@@ -185,7 +185,7 @@ impl L2Tx {
 
     #[allow(clippy::too_many_arguments)]
     pub fn new_signed(
-        contract_address: Address,
+        contract_address: Option<Address>,
         calldata: Vec<u8>,
         nonce: Nonce,
         fee: Fee,
@@ -233,7 +233,7 @@ impl L2Tx {
 
     /// Returns recipient account of the transaction.
     pub fn recipient_account(&self) -> Address {
-        self.execute.contract_address
+        self.execute.contract_address.unwrap_or_default()
     }
 
     /// Returns the account nonce associated with transaction.
diff --git a/core/lib/types/src/lib.rs b/core/lib/types/src/lib.rs
index a55f6b5753db..4e693eaa6194 100644
--- a/core/lib/types/src/lib.rs
+++ b/core/lib/types/src/lib.rs
@@ -109,7 +109,7 @@ impl Eq for Transaction {}
 
 impl Transaction {
     /// Returns recipient account of the transaction.
-    pub fn recipient_account(&self) -> Address {
+    pub fn recipient_account(&self) -> Option<Address> {
         self.execute.contract_address
     }
 
@@ -258,7 +258,7 @@ impl TryFrom<Transaction> for abi::Transaction {
                 tx: abi::L2CanonicalTransaction {
                     tx_type: PRIORITY_OPERATION_L2_TX_TYPE.into(),
                     from: address_to_u256(&data.sender),
-                    to: address_to_u256(&tx.execute.contract_address),
+                    to: address_to_u256(&tx.execute.contract_address.unwrap_or_default()),
                     gas_limit: data.gas_limit,
                     gas_per_pubdata_byte_limit: data.gas_per_pubdata_limit,
                     max_fee_per_gas: data.max_fee_per_gas,
@@ -289,7 +289,7 @@ impl TryFrom<Transaction> for abi::Transaction {
                 tx: abi::L2CanonicalTransaction {
                     tx_type: PROTOCOL_UPGRADE_TX_TYPE.into(),
                     from: address_to_u256(&data.sender),
-                    to: address_to_u256(&tx.execute.contract_address),
+                    to: address_to_u256(&tx.execute.contract_address.unwrap_or_default()),
                     gas_limit: data.gas_limit,
                     gas_per_pubdata_byte_limit: data.gas_per_pubdata_limit,
                     max_fee_per_gas: data.max_fee_per_gas,
@@ -382,7 +382,7 @@ impl TryFrom<abi::Transaction> for Transaction {
                         unknown_type => anyhow::bail!("unknown tx type {unknown_type}"),
                     },
                     execute: Execute {
-                        contract_address: u256_to_account_address(&tx.to),
+                        contract_address: Some(u256_to_account_address(&tx.to)),
                         calldata: tx.data,
                         factory_deps,
                         value: tx.value,
diff --git a/core/lib/types/src/transaction_request.rs b/core/lib/types/src/transaction_request.rs
index 887dfcbff378..4b310ef24227 100644
--- a/core/lib/types/src/transaction_request.rs
+++ b/core/lib/types/src/transaction_request.rs
@@ -108,8 +108,8 @@ impl CallRequestBuilder {
     }
 
     /// Set to address (None allowed for eth_estimateGas)
-    pub fn to(mut self, to: Address) -> Self {
-        self.call_request.to = Some(to);
+    pub fn to(mut self, to: Option<Address>) -> Self {
+        self.call_request.to = to;
         self
     }
 
@@ -818,9 +818,7 @@ impl L2Tx {
         validate_factory_deps(&meta.factory_deps)?;
 
         let mut tx = L2Tx::new(
-            value
-                .to
-                .ok_or(SerializationTransactionError::ToAddressIsNull)?,
+            value.to,
             value.input.0.clone(),
             nonce,
             fee,
diff --git a/core/lib/types/src/tx/execute.rs b/core/lib/types/src/tx/execute.rs
index 03762040a6b8..c5d31c0f8a03 100644
--- a/core/lib/types/src/tx/execute.rs
+++ b/core/lib/types/src/tx/execute.rs
@@ -15,7 +15,7 @@ use crate::{ethabi, Address, EIP712TypedStructure, StructBuilder, H256, U256};
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct ExecuteSerde {
-    contract_address: Address,
+    contract_address: Option<Address>,
     #[serde(with = "ZeroPrefixHexSerde")]
     calldata: Vec<u8>,
     value: U256,
@@ -25,7 +25,7 @@ struct ExecuteSerde {
 /// `Execute` transaction executes a previously deployed smart contract in the L2 rollup.
 #[derive(Clone, Default, PartialEq)]
 pub struct Execute {
-    pub contract_address: Address,
+    pub contract_address: Option<Address>,
     pub calldata: Vec<u8>,
     pub value: U256,
     /// Factory dependencies: list of contract bytecodes associated with the deploy transaction.
@@ -72,7 +72,10 @@ impl EIP712TypedStructure for Execute {
     const TYPE_NAME: &'static str = "Transaction";
 
     fn build_structure<BUILDER: StructBuilder>(&self, builder: &mut BUILDER) {
-        builder.add_member("to", &U256::from(self.contract_address.as_bytes()));
+        builder.add_member(
+            "to",
+            &U256::from(self.contract_address.unwrap_or_default().as_bytes()),
+        );
         builder.add_member("value", &self.value);
         builder.add_member("data", &self.calldata.as_slice());
         // Factory deps are not included into the transaction signature, since they are parsed from the
diff --git a/core/node/eth_watch/src/tests.rs b/core/node/eth_watch/src/tests.rs
index 7ae3b5494e98..899690d6dabe 100644
--- a/core/node/eth_watch/src/tests.rs
+++ b/core/node/eth_watch/src/tests.rs
@@ -147,7 +147,7 @@ impl EthClient for MockEthClient {
 fn build_l1_tx(serial_id: u64, eth_block: u64) -> L1Tx {
     let tx = L1Tx {
         execute: Execute {
-            contract_address: Address::repeat_byte(0x11),
+            contract_address: Some(Address::repeat_byte(0x11)),
             calldata: vec![1, 2, 3],
             factory_deps: vec![],
             value: U256::zero(),
@@ -178,7 +178,7 @@ fn build_l1_tx(serial_id: u64, eth_block: u64) -> L1Tx {
 fn build_upgrade_tx(id: ProtocolVersionId, eth_block: u64) -> ProtocolUpgradeTx {
     let tx = ProtocolUpgradeTx {
         execute: Execute {
-            contract_address: Address::repeat_byte(0x11),
+            contract_address: Some(Address::repeat_byte(0x11)),
             calldata: vec![1, 2, 3],
             factory_deps: vec![],
             value: U256::zero(),
@@ -582,6 +582,7 @@ fn upgrade_into_diamond_cut(upgrade: ProtocolUpgrade) -> Token {
         factory_deps,
         bootloader_hash: upgrade.bootloader_code_hash.unwrap_or_default().into(),
         default_account_hash: upgrade.default_account_code_hash.unwrap_or_default().into(),
+        evm_simulator_hash: upgrade.evm_simulator_code_hash.unwrap_or_default().into(),
         verifier: upgrade.verifier_address.unwrap_or_default(),
         verifier_params: upgrade.verifier_params.unwrap_or_default().into(),
         l1_contracts_upgrade_calldata: vec![],
diff --git a/core/node/proof_data_handler/src/tests.rs b/core/node/proof_data_handler/src/tests.rs
index 88d4930e6920..6a97fcddb8bb 100644
--- a/core/node/proof_data_handler/src/tests.rs
+++ b/core/node/proof_data_handler/src/tests.rs
@@ -62,6 +62,10 @@ async fn request_tee_proof_inputs() {
                     code: vec![U256([1; 4])],
                     hash: H256([1; 32]),
                 },
+                evm_simulator: SystemContractCode {
+                    code: vec![U256([1; 4])],
+                    hash: H256([1; 32]),
+                },
             },
             bootloader_gas_limit: 0,
             execution_mode: TxExecutionMode::VerifyExecute,
diff --git a/core/node/state_keeper/src/batch_executor/tests/tester.rs b/core/node/state_keeper/src/batch_executor/tests/tester.rs
index 6730d427c67f..ac358ffb1bd4 100644
--- a/core/node/state_keeper/src/batch_executor/tests/tester.rs
+++ b/core/node/state_keeper/src/batch_executor/tests/tester.rs
@@ -373,7 +373,7 @@ impl AccountLoadNextExecutable for Account {
 
         self.get_l2_tx_for_execute(
             Execute {
-                contract_address: address,
+                contract_address: Some(address),
                 calldata: LoadnextContractExecutionParams {
                     reads: 100,
                     writes: writes as usize,
@@ -409,7 +409,7 @@ impl AccountLoadNextExecutable for Account {
 
         self.get_l2_tx_for_execute(
             Execute {
-                contract_address: address,
+                contract_address: Some(address),
                 calldata,
                 value: Default::default(),
                 factory_deps: vec![],
diff --git a/core/node/state_keeper/src/testonly/mod.rs b/core/node/state_keeper/src/testonly/mod.rs
index e47e1182699d..92e58fe65381 100644
--- a/core/node/state_keeper/src/testonly/mod.rs
+++ b/core/node/state_keeper/src/testonly/mod.rs
@@ -164,7 +164,7 @@ pub(crate) fn fee(gas_limit: u32) -> Fee {
 pub fn l2_transaction(account: &mut Account, gas_limit: u32) -> Transaction {
     account.get_l2_tx_for_execute(
         Execute {
-            contract_address: Address::random(),
+            contract_address: Some(Address::random()),
             calldata: vec![],
             value: Default::default(),
             factory_deps: vec![],
@@ -176,7 +176,7 @@ pub fn l2_transaction(account: &mut Account, gas_limit: u32) -> Transaction {
 pub fn l1_transaction(account: &mut Account, serial_id: PriorityOpId) -> Transaction {
     account.get_l1_tx(
         Execute {
-            contract_address: Address::random(),
+            contract_address: Some(Address::random()),
             value: Default::default(),
             calldata: vec![],
             factory_deps: vec![],
diff --git a/core/node/test_utils/src/lib.rs b/core/node/test_utils/src/lib.rs
index a0e70b02a22d..85f54bd7223f 100644
--- a/core/node/test_utils/src/lib.rs
+++ b/core/node/test_utils/src/lib.rs
@@ -137,7 +137,7 @@ pub fn create_l2_transaction(fee_per_gas: u64, gas_per_pubdata: u64) -> L2Tx {
         gas_per_pubdata_limit: gas_per_pubdata.into(),
     };
     let mut tx = L2Tx::new_signed(
-        Address::random(),
+        Some(Address::random()),
         vec![],
         Nonce(0),
         fee,
diff --git a/core/node/vm_runner/src/tests/mod.rs b/core/node/vm_runner/src/tests/mod.rs
index 4cb2d26f6bd6..6d613849a4c1 100644
--- a/core/node/vm_runner/src/tests/mod.rs
+++ b/core/node/vm_runner/src/tests/mod.rs
@@ -230,7 +230,7 @@ pub fn create_l2_transaction(
     };
     let tx = account.get_l2_tx_for_execute(
         Execute {
-            contract_address: Address::random(),
+            contract_address: Some(Address::random()),
             calldata: vec![],
             value: Default::default(),
             factory_deps: vec![],
diff --git a/core/node/vm_runner/src/tests/output_handler.rs b/core/node/vm_runner/src/tests/output_handler.rs
index 453507328c4f..fcb26ccafa37 100644
--- a/core/node/vm_runner/src/tests/output_handler.rs
+++ b/core/node/vm_runner/src/tests/output_handler.rs
@@ -68,6 +68,10 @@ impl OutputHandlerTester {
                         code: vec![],
                         hash: Default::default(),
                     },
+                    evm_simulator: SystemContractCode {
+                        code: vec![],
+                        hash: Default::default(),
+                    },
                 },
                 bootloader_gas_limit: 0,
                 execution_mode: TxExecutionMode::VerifyExecute,
diff --git a/core/tests/loadnext/src/sdk/operations/deploy_contract.rs b/core/tests/loadnext/src/sdk/operations/deploy_contract.rs
index 161d156a53e9..a761bbd72b97 100644
--- a/core/tests/loadnext/src/sdk/operations/deploy_contract.rs
+++ b/core/tests/loadnext/src/sdk/operations/deploy_contract.rs
@@ -70,7 +70,7 @@ where
         self.wallet
             .signer
             .sign_execute_contract_for_deploy(
-                CONTRACT_DEPLOYER_ADDRESS,
+                Some(CONTRACT_DEPLOYER_ADDRESS),
                 execute_calldata,
                 fee,
                 nonce,
@@ -145,7 +145,7 @@ where
         let mut factory_deps = self.factory_deps.clone().unwrap_or_default();
         factory_deps.push(bytecode);
         let l2_tx = L2Tx::new(
-            CONTRACT_DEPLOYER_ADDRESS,
+            Some(CONTRACT_DEPLOYER_ADDRESS),
             Execute::encode_deploy_params_create(Default::default(), main_contract_hash, calldata),
             Nonce(0),
             Default::default(),
diff --git a/core/tests/loadnext/src/sdk/operations/execute_contract.rs b/core/tests/loadnext/src/sdk/operations/execute_contract.rs
index d5fe57c7b79f..119744b22129 100644
--- a/core/tests/loadnext/src/sdk/operations/execute_contract.rs
+++ b/core/tests/loadnext/src/sdk/operations/execute_contract.rs
@@ -63,7 +63,7 @@ where
         self.wallet
             .signer
             .sign_execute_contract(
-                contract_address,
+                Some(contract_address),
                 calldata,
                 fee,
                 nonce,
@@ -144,7 +144,7 @@ where
             .unwrap_or_default();
 
         let execute = L2Tx::new(
-            contract_address,
+            Some(contract_address),
             calldata,
             Nonce(0),
             Default::default(),
diff --git a/core/tests/loadnext/src/sdk/operations/transfer.rs b/core/tests/loadnext/src/sdk/operations/transfer.rs
index 94ee3aeb6082..651fabeb788b 100644
--- a/core/tests/loadnext/src/sdk/operations/transfer.rs
+++ b/core/tests/loadnext/src/sdk/operations/transfer.rs
@@ -153,7 +153,7 @@ where
         let tx = if token.is_zero() || token == L2_BASE_TOKEN_ADDRESS {
             // ETH estimate
             Execute {
-                contract_address: to,
+                contract_address: Some(to),
                 calldata: Default::default(),
                 factory_deps: vec![],
                 value: amount,
@@ -161,7 +161,7 @@ where
         } else {
             // ERC-20 estimate
             Execute {
-                contract_address: token,
+                contract_address: Some(token),
                 calldata: create_transfer_calldata(to, amount),
                 factory_deps: vec![],
                 value: Default::default(),
diff --git a/core/tests/loadnext/src/sdk/signer.rs b/core/tests/loadnext/src/sdk/signer.rs
index 0f4b1cf29717..11d734f72cd2 100644
--- a/core/tests/loadnext/src/sdk/signer.rs
+++ b/core/tests/loadnext/src/sdk/signer.rs
@@ -51,7 +51,7 @@ impl<S: EthereumSigner> Signer<S> {
         // Sign Ether transfer
         if token.is_zero() || token == L2_BASE_TOKEN_ADDRESS {
             let mut transfer = L2Tx::new(
-                to,
+                Some(to),
                 Default::default(),
                 nonce,
                 fee,
@@ -73,7 +73,7 @@ impl<S: EthereumSigner> Signer<S> {
         // Sign ERC-20 transfer
         let data = create_transfer_calldata(to, amount);
         let mut transfer = L2Tx::new(
-            token,
+            Some(token),
             data,
             nonce,
             fee,
@@ -94,7 +94,7 @@ impl<S: EthereumSigner> Signer<S> {
 
     pub async fn sign_execute_contract(
         &self,
-        contract: Address,
+        contract: Option<Address>,
         calldata: Vec<u8>,
         fee: Fee,
         nonce: Nonce,
@@ -114,7 +114,7 @@ impl<S: EthereumSigner> Signer<S> {
 
     pub async fn sign_execute_contract_for_deploy(
         &self,
-        contract: Address,
+        contract: Option<Address>,
         calldata: Vec<u8>,
         fee: Fee,
         nonce: Nonce,
diff --git a/core/tests/test_account/src/lib.rs b/core/tests/test_account/src/lib.rs
index e259ce209c63..bd49f5c092c0 100644
--- a/core/tests/test_account/src/lib.rs
+++ b/core/tests/test_account/src/lib.rs
@@ -129,7 +129,7 @@ impl Account {
             .expect("failed to encode parameters");
 
         let execute = Execute {
-            contract_address: CONTRACT_DEPLOYER_ADDRESS,
+            contract_address: Some(CONTRACT_DEPLOYER_ADDRESS),
             calldata,
             factory_deps,
             value: U256::zero(),
@@ -158,7 +158,7 @@ impl Account {
             tx: abi::L2CanonicalTransaction {
                 tx_type: PRIORITY_OPERATION_L2_TX_TYPE.into(),
                 from: address_to_u256(&self.address),
-                to: address_to_u256(&execute.contract_address),
+                to: address_to_u256(&execute.contract_address.unwrap_or_default()),
                 gas_limit,
                 gas_per_pubdata_byte_limit: REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE.into(),
                 max_fee_per_gas,
@@ -216,7 +216,7 @@ impl Account {
             .expect("failed to encode parameters");
 
         let execute = Execute {
-            contract_address: address,
+            contract_address: Some(address),
             calldata,
             value: value.unwrap_or_default(),
             factory_deps: vec![],
@@ -235,7 +235,7 @@ impl Account {
     ) -> Transaction {
         let calldata = params.to_bytes();
         let execute = Execute {
-            contract_address: address,
+            contract_address: Some(address),
             calldata,
             value: U256::zero(),
             factory_deps: vec![],
diff --git a/core/tests/vm-benchmark/harness/src/lib.rs b/core/tests/vm-benchmark/harness/src/lib.rs
index a30221cfa0be..5adcb342cced 100644
--- a/core/tests/vm-benchmark/harness/src/lib.rs
+++ b/core/tests/vm-benchmark/harness/src/lib.rs
@@ -133,7 +133,7 @@ pub fn get_deploy_tx_with_gas_limit(code: &[u8], gas_limit: u32) -> Transaction
         .collect();
 
     let mut signed = L2Tx::new_signed(
-        CONTRACT_DEPLOYER_ADDRESS,
+        Some(CONTRACT_DEPLOYER_ADDRESS),
         calldata,
         Nonce(0),
         Fee {
diff --git a/etc/multivm_bootloaders/vm_1_5_0_increased_memory/fee_estimate.yul/fee_estimate.yul.zbin b/etc/multivm_bootloaders/vm_1_5_0_increased_memory/fee_estimate.yul/fee_estimate.yul.zbin
index 643d7ee425b3..0e113d4d2a22 100644
Binary files a/etc/multivm_bootloaders/vm_1_5_0_increased_memory/fee_estimate.yul/fee_estimate.yul.zbin and b/etc/multivm_bootloaders/vm_1_5_0_increased_memory/fee_estimate.yul/fee_estimate.yul.zbin differ
diff --git a/etc/multivm_bootloaders/vm_1_5_0_increased_memory/gas_test.yul/gas_test.yul.zbin b/etc/multivm_bootloaders/vm_1_5_0_increased_memory/gas_test.yul/gas_test.yul.zbin
index a4d0e171a018..29771a537f44 100644
Binary files a/etc/multivm_bootloaders/vm_1_5_0_increased_memory/gas_test.yul/gas_test.yul.zbin and b/etc/multivm_bootloaders/vm_1_5_0_increased_memory/gas_test.yul/gas_test.yul.zbin differ
diff --git a/etc/multivm_bootloaders/vm_1_5_0_increased_memory/playground_batch.yul/playground_batch.yul.zbin b/etc/multivm_bootloaders/vm_1_5_0_increased_memory/playground_batch.yul/playground_batch.yul.zbin
index efb5769b16fd..6b91911a965d 100644
Binary files a/etc/multivm_bootloaders/vm_1_5_0_increased_memory/playground_batch.yul/playground_batch.yul.zbin and b/etc/multivm_bootloaders/vm_1_5_0_increased_memory/playground_batch.yul/playground_batch.yul.zbin differ
diff --git a/etc/multivm_bootloaders/vm_1_5_0_increased_memory/proved_batch.yul/proved_batch.yul.zbin b/etc/multivm_bootloaders/vm_1_5_0_increased_memory/proved_batch.yul/proved_batch.yul.zbin
index 95b84f683f6e..2271bc2dd970 100644
Binary files a/etc/multivm_bootloaders/vm_1_5_0_increased_memory/proved_batch.yul/proved_batch.yul.zbin and b/etc/multivm_bootloaders/vm_1_5_0_increased_memory/proved_batch.yul/proved_batch.yul.zbin differ