temp fix for missing builtin-actors

helix-onchain · Aug 3, 2023 · 79942fe · 79942fe
1 parent 0f247eb
commit 79942fe
Show file tree

Hide file tree

Showing 8 changed files with 493 additions and 425 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/testing/integration/Cargo.toml b/testing/integration/Cargo.toml
@@ -33,7 +33,7 @@ default-features = false
 features = ["cranelift", "parallel-compilation"]
 
 [dev-dependencies]
-actors-v10 = { package = "fil_builtin_actors_bundle", git = "https://github.com/filecoin-project/builtin-actors", branch = "next" }
+actors-v12 = { package = "fil_builtin_actors_bundle", git = "https://github.com/filecoin-project/builtin-actors", branch = "master" }
 fvm_test_actors = { path = "../test_actors" }
 fvm_gas_calibration_shared = { path = "../calibration/shared" }
 blake2b_simd = "1.0.1"

diff --git a/testing/integration/examples/integration.rs b/testing/integration/examples/integration.rs
@@ -30,7 +30,7 @@ struct State {
 pub fn main() {
     // Instantiate tester
     let bs = MemoryBlockstore::default();
-    let bundle_root = bundle::import_bundle(&bs, actors_v10::BUNDLE_CAR).unwrap();
+    let bundle_root = bundle::import_bundle(&bs, actors_v12::BUNDLE_CAR).unwrap();
     let mut tester =
         Tester::new(NetworkVersion::V18, StateTreeVersion::V5, bundle_root, bs).unwrap();
 

diff --git a/testing/integration/tests/bundles/mod.rs b/testing/integration/tests/bundles/mod.rs
@@ -13,7 +13,7 @@ use lazy_static::lazy_static;
 
 lazy_static! {
     static ref BUNDLES: BTreeMap<NetworkVersion, &'static [u8]> =
-        [(NetworkVersion::V18, actors_v10::BUNDLE_CAR),]
+        [(NetworkVersion::V18, actors_v12::BUNDLE_CAR),]
             .into_iter()
             .collect();
 }

diff --git a/testing/integration/tests/calibration/mod.rs b/testing/integration/tests/calibration/mod.rs
@@ -115,7 +115,7 @@ const NOP_ACTOR: &str = r#"
 // Utility function to instantiation integration tester
 pub fn instantiate_tester() -> TestEnv {
     let blockstore = MemoryBlockstore::default();
-    let root = bundle::import_bundle(&blockstore, actors_v10::BUNDLE_CAR).unwrap();
+    let root = bundle::import_bundle(&blockstore, actors_v12::BUNDLE_CAR).unwrap();
     // Instantiate tester
     let mut tester =
         Tester::new(NetworkVersion::V18, StateTreeVersion::V5, root, blockstore).unwrap();

diff --git a/testing/test_actors/actors/fil-create-actor/Cargo.toml b/testing/test_actors/actors/fil-create-actor/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 fvm_sdk = { version = "3.3.0", path = "../../../../sdk" }
 fvm_shared = { version = "3.4.0", path = "../../../../shared" }
-actors_v10_runtime = { package = "fil_actors_runtime", git = "https://github.com/filecoin-project/builtin-actors", branch = "next" }
+actors_v12_runtime = { package = "fil_actors_runtime", git = "https://github.com/filecoin-project/builtin-actors", branch = "master" }
 
 [lib]
 crate-type = ["cdylib"] ## cdylib is necessary for Wasm build
diff --git a/testing/test_actors/actors/fil-create-actor/src/actor.rs b/testing/test_actors/actors/fil-create-actor/src/actor.rs
@@ -1,6 +1,6 @@
 // Copyright 2021-2023 Protocol Labs
 // SPDX-License-Identifier: Apache-2.0, MIT
-use actors_v10_runtime::runtime::builtins::Type;
+use actors_v12_runtime::runtime::builtins::Type;
 use fvm_sdk as sdk;
 use fvm_shared::address::{Address, SECP_PUB_LEN};
 use fvm_shared::error::ErrorNumber;

diff --git a/testing/test_actors/actors/fil-syscall-actor/Cargo.toml b/testing/test_actors/actors/fil-syscall-actor/Cargo.toml
@@ -9,7 +9,7 @@ fvm_ipld_encoding = { version = "0.4.0", path = "../../../../ipld/encoding" }
 fvm_sdk = { version = "3.3.0", path = "../../../../sdk" }
 fvm_shared = { version = "3.4.0", path = "../../../../shared" }
 minicov = {version = "0.3", optional = true}
-actors_v10_runtime = { package = "fil_actors_runtime", git = "https://github.com/filecoin-project/builtin-actors", branch = "next" }
+actors_v12_runtime = { package = "fil_actors_runtime", git = "https://github.com/filecoin-project/builtin-actors", branch = "master" }
 multihash = { workspace = true }
 
 [lib]