From 8771ed166b4112b41f0d05537db291c01ecb0d67 Mon Sep 17 00:00:00 2001
From: Fedor Sakharov <fedor.sakharov@gmail.com>
Date: Wed, 5 Jun 2024 13:10:52 +0200
Subject: [PATCH 1/2] updates to newest vm2 code

---
 core/lib/multivm/src/versions/vm_fast/vm.rs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/core/lib/multivm/src/versions/vm_fast/vm.rs b/core/lib/multivm/src/versions/vm_fast/vm.rs
index ea91d269d71c..ac8e1f66d2a4 100644
--- a/core/lib/multivm/src/versions/vm_fast/vm.rs
+++ b/core/lib/multivm/src/versions/vm_fast/vm.rs
@@ -649,16 +649,13 @@ impl<S: ReadStorage> VmInterface<S, HistoryEnabled> for Vm<S> {
                     .clone()
                     .build_pubdata(false),
             ),
-            initially_written_slots: Some(
+            state_diffs: Some(
                 self.bootloader_state
                     .get_pubdata_information()
                     .state_diffs
                     .iter()
-                    .filter_map(|record| {
-                        record
-                            .is_write_initial()
-                            .then_some(H256(record.derived_key))
-                    })
+                    .filter(|record| record.is_write_initial())
+                    .cloned()
                     .collect(),
             ),
         }

From 316359b69b3421d3fceb039ea3f9c11835bf6b1e Mon Sep 17 00:00:00 2001
From: Fedor Sakharov <fedor.sakharov@gmail.com>
Date: Wed, 5 Jun 2024 17:34:04 +0200
Subject: [PATCH 2/2] filter on l1_messenger_address

---
 core/lib/multivm/src/versions/vm_fast/vm.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lib/multivm/src/versions/vm_fast/vm.rs b/core/lib/multivm/src/versions/vm_fast/vm.rs
index ac8e1f66d2a4..79d007f0f324 100644
--- a/core/lib/multivm/src/versions/vm_fast/vm.rs
+++ b/core/lib/multivm/src/versions/vm_fast/vm.rs
@@ -654,7 +654,7 @@ impl<S: ReadStorage> VmInterface<S, HistoryEnabled> for Vm<S> {
                     .get_pubdata_information()
                     .state_diffs
                     .iter()
-                    .filter(|record| record.is_write_initial())
+                    .filter(|diff| diff.address != L1_MESSENGER_ADDRESS)
                     .cloned()
                     .collect(),
             ),