From f2bd909f4e0551385fa4edbb674d5a2e051cbb55 Mon Sep 17 00:00:00 2001
From: Fridrik Asmundsson <fridrik01@gmail.com>
Date: Thu, 28 Sep 2023 16:04:56 +0000
Subject: [PATCH] fixes after rebasing in ipld reachability

---
 Cargo.lock                                              | 4 ++--
 fvm/src/call_manager/default.rs                         | 4 ++--
 fvm/src/kernel/default.rs                               | 2 +-
 fvm/tests/dummy.rs                                      | 1 +
 testing/integration/tests/upgrade_test.rs               | 2 +-
 testing/test_actors/actors/fil-upgrade-actor/Cargo.toml | 4 ++--
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0ac01cbbb3..84e713a85d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1935,8 +1935,8 @@ version = "0.1.0"
 dependencies = [
  "cid 0.10.1",
  "fvm_ipld_encoding 0.4.0",
- "fvm_sdk 3.3.0",
- "fvm_shared 3.6.0",
+ "fvm_sdk 4.0.0-alpha.3",
+ "fvm_shared 4.0.0-alpha.3",
  "serde",
  "serde_tuple",
 ]
diff --git a/fvm/src/call_manager/default.rs b/fvm/src/call_manager/default.rs
index 2a61353b0d..7722462f5f 100644
--- a/fvm/src/call_manager/default.rs
+++ b/fvm/src/call_manager/default.rs
@@ -632,7 +632,7 @@ where
             system_actor::SYSTEM_ACTOR_ID,
             id,
             Entrypoint::Invoke(fvm_shared::METHOD_CONSTRUCTOR),
-            Some(Block::new(CBOR, params)),
+            Some(Block::new(CBOR, params, Vec::new())),
             &TokenAmount::zero(),
             false,
         )?;
@@ -1095,7 +1095,7 @@ impl EntrypointParams {
                 let ui_params = to_vec(&ui).map_err(
                     |e| syscall_error!(IllegalArgument; "failed to serialize upgrade params: {}", e),
                 )?;
-                let block_id = br.put(Block::new(CBOR, ui_params))?;
+                let block_id = br.put_reachable(Block::new(CBOR, ui_params, Vec::new()))?;
                 self.params.push(wasmtime::Val::I32(block_id as i32));
                 Ok(())
             }
diff --git a/fvm/src/kernel/default.rs b/fvm/src/kernel/default.rs
index f0988051fa..571ad6ac69 100644
--- a/fvm/src/kernel/default.rs
+++ b/fvm/src/kernel/default.rs
@@ -898,7 +898,7 @@ where
             }) => {
                 let block_id = match value {
                     None => NO_DATA_BLOCK_ID,
-                    Some(block) => self.blocks.put(block).unwrap_or_else(|_| {
+                    Some(block) => self.blocks.put_reachable(block).unwrap_or_else(|_| {
                         log::error!("failed to write to kernel block registry");
                         NO_DATA_BLOCK_ID
                     }),
diff --git a/fvm/tests/dummy.rs b/fvm/tests/dummy.rs
index 71fab31416..272b613700 100644
--- a/fvm/tests/dummy.rs
+++ b/fvm/tests/dummy.rs
@@ -403,6 +403,7 @@ impl CallManager for DummyCallManager {
 
     fn upgrade_actor<K>(
         &mut self,
+        _caller: ActorID,
         _actor_id: ActorID,
         _new_code_cid: Cid,
         _params: Option<kernel::Block>,
diff --git a/testing/integration/tests/upgrade_test.rs b/testing/integration/tests/upgrade_test.rs
index b010d0f591..e58822ca08 100644
--- a/testing/integration/tests/upgrade_test.rs
+++ b/testing/integration/tests/upgrade_test.rs
@@ -17,7 +17,7 @@ use num_traits::Zero;
 #[test]
 fn upgrade_actor_test() {
     let mut tester = new_tester(
-        NetworkVersion::V18,
+        NetworkVersion::V21,
         StateTreeVersion::V5,
         MemoryBlockstore::default(),
     )
diff --git a/testing/test_actors/actors/fil-upgrade-actor/Cargo.toml b/testing/test_actors/actors/fil-upgrade-actor/Cargo.toml
index 91dc61cbc7..302a1b0e17 100644
--- a/testing/test_actors/actors/fil-upgrade-actor/Cargo.toml
+++ b/testing/test_actors/actors/fil-upgrade-actor/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 publish = false
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-fvm_sdk = { version = "3.3.0", path = "../../../../sdk" }
-fvm_shared = { version = "3.5.0", path = "../../../../shared" }
+fvm_sdk = { version = "4.0.0-alpha.3", path = "../../../../sdk" }
+fvm_shared = { version = "4.0.0-alpha.3", path = "../../../../shared" }
 fvm_ipld_encoding = { version = "0.4.0", path = "../../../../ipld/encoding" }
 cid = { workspace = true }
 serde = { version = "1.0.164", features = ["derive"] }