diff --git a/Cargo.lock b/Cargo.lock index 1164957d2..c494aaf0c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1446,7 +1446,7 @@ dependencies = [ [[package]] name = "fil_actor_account" version = "11.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=next#421855a7b968114ac59422c1faeca968482eccf4" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=experimental/fvm-m2#421855a7b968114ac59422c1faeca968482eccf4" dependencies = [ "anyhow", "fil_actors_runtime", @@ -1482,7 +1482,7 @@ dependencies = [ [[package]] name = "fil_actor_cron" version = "11.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=next#421855a7b968114ac59422c1faeca968482eccf4" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=experimental/fvm-m2#421855a7b968114ac59422c1faeca968482eccf4" dependencies = [ "fil_actors_runtime", "fvm_ipld_blockstore 0.1.2", @@ -1497,7 +1497,7 @@ dependencies = [ [[package]] name = "fil_actor_datacap" version = "11.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=next#421855a7b968114ac59422c1faeca968482eccf4" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=experimental/fvm-m2#421855a7b968114ac59422c1faeca968482eccf4" dependencies = [ "cid 0.8.6", "fil_actors_runtime", @@ -1518,7 +1518,7 @@ dependencies = [ [[package]] name = "fil_actor_eam" version = "11.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=next#421855a7b968114ac59422c1faeca968482eccf4" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=experimental/fvm-m2#421855a7b968114ac59422c1faeca968482eccf4" dependencies = [ "anyhow", "cid 0.8.6", @@ -1540,7 +1540,7 @@ dependencies = [ [[package]] name = "fil_actor_ethaccount" version = "11.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=next#421855a7b968114ac59422c1faeca968482eccf4" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=experimental/fvm-m2#421855a7b968114ac59422c1faeca968482eccf4" dependencies = [ "fil_actors_runtime", "frc42_dispatch", @@ -1556,7 +1556,7 @@ dependencies = [ [[package]] name = "fil_actor_evm" version = "11.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=next#421855a7b968114ac59422c1faeca968482eccf4" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=experimental/fvm-m2#421855a7b968114ac59422c1faeca968482eccf4" dependencies = [ "anyhow", "cid 0.8.6", @@ -1581,7 +1581,7 @@ dependencies = [ [[package]] name = "fil_actor_init" version = "11.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=next#421855a7b968114ac59422c1faeca968482eccf4" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=experimental/fvm-m2#421855a7b968114ac59422c1faeca968482eccf4" dependencies = [ "anyhow", "cid 0.8.6", @@ -1600,7 +1600,7 @@ dependencies = [ [[package]] name = "fil_actor_market" version = "11.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=next#421855a7b968114ac59422c1faeca968482eccf4" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=experimental/fvm-m2#421855a7b968114ac59422c1faeca968482eccf4" dependencies = [ "anyhow", "cid 0.8.6", @@ -1623,7 +1623,7 @@ dependencies = [ [[package]] name = "fil_actor_miner" version = "11.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=next#421855a7b968114ac59422c1faeca968482eccf4" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=experimental/fvm-m2#421855a7b968114ac59422c1faeca968482eccf4" dependencies = [ "anyhow", "byteorder", @@ -1648,7 +1648,7 @@ dependencies = [ [[package]] name = "fil_actor_multisig" version = "11.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=next#421855a7b968114ac59422c1faeca968482eccf4" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=experimental/fvm-m2#421855a7b968114ac59422c1faeca968482eccf4" dependencies = [ "anyhow", "cid 0.8.6", @@ -1669,7 +1669,7 @@ dependencies = [ [[package]] name = "fil_actor_paych" version = "11.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=next#421855a7b968114ac59422c1faeca968482eccf4" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=experimental/fvm-m2#421855a7b968114ac59422c1faeca968482eccf4" dependencies = [ "anyhow", "cid 0.8.6", @@ -1686,12 +1686,12 @@ dependencies = [ [[package]] name = "fil_actor_placeholder" version = "11.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=next#421855a7b968114ac59422c1faeca968482eccf4" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=experimental/fvm-m2#421855a7b968114ac59422c1faeca968482eccf4" [[package]] name = "fil_actor_power" version = "11.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=next#421855a7b968114ac59422c1faeca968482eccf4" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=experimental/fvm-m2#421855a7b968114ac59422c1faeca968482eccf4" dependencies = [ "anyhow", "cid 0.8.6", @@ -1713,7 +1713,7 @@ dependencies = [ [[package]] name = "fil_actor_reward" version = "11.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=next#421855a7b968114ac59422c1faeca968482eccf4" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=experimental/fvm-m2#421855a7b968114ac59422c1faeca968482eccf4" dependencies = [ "fil_actors_runtime", "fvm_ipld_blockstore 0.1.2", @@ -1729,7 +1729,7 @@ dependencies = [ [[package]] name = "fil_actor_system" version = "11.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=next#421855a7b968114ac59422c1faeca968482eccf4" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=experimental/fvm-m2#421855a7b968114ac59422c1faeca968482eccf4" dependencies = [ "anyhow", "cid 0.8.6", @@ -1745,7 +1745,7 @@ dependencies = [ [[package]] name = "fil_actor_verifreg" version = "11.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=next#421855a7b968114ac59422c1faeca968482eccf4" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=experimental/fvm-m2#421855a7b968114ac59422c1faeca968482eccf4" dependencies = [ "anyhow", "cid 0.8.6", @@ -1767,7 +1767,7 @@ dependencies = [ [[package]] name = "fil_actors_evm_shared" version = "11.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=next#421855a7b968114ac59422c1faeca968482eccf4" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=experimental/fvm-m2#421855a7b968114ac59422c1faeca968482eccf4" dependencies = [ "fil_actors_runtime", "fvm_ipld_encoding 0.3.3", @@ -1780,7 +1780,7 @@ dependencies = [ [[package]] name = "fil_actors_runtime" version = "11.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=next#421855a7b968114ac59422c1faeca968482eccf4" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=experimental/fvm-m2#421855a7b968114ac59422c1faeca968482eccf4" dependencies = [ "anyhow", "byteorder", @@ -1820,7 +1820,7 @@ dependencies = [ [[package]] name = "fil_builtin_actors_bundle" version = "11.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=next#421855a7b968114ac59422c1faeca968482eccf4" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=experimental/fvm-m2#421855a7b968114ac59422c1faeca968482eccf4" dependencies = [ "cid 0.8.6", "clap 3.2.25", diff --git a/testing/integration/Cargo.toml b/testing/integration/Cargo.toml index 5bd43b522..d1046de56 100644 --- 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-v10 = { package = "fil_builtin_actors_bundle", git = "https://github.com/filecoin-project/builtin-actors", branch = "experimental/fvm-m2" } fvm_test_actors = { path = "../test_actors" } fvm_gas_calibration_shared = { path = "../calibration/shared" } blake2b_simd = "1.0.1" diff --git a/testing/test_actors/actors/fil-create-actor/Cargo.toml b/testing/test_actors/actors/fil-create-actor/Cargo.toml index c7bedeeea..195ef8e60 100644 --- 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_v10_runtime = { package = "fil_actors_runtime", git = "https://github.com/filecoin-project/builtin-actors", branch = "experimental/fvm-m2" } [lib] crate-type = ["cdylib"] ## cdylib is necessary for Wasm build diff --git a/testing/test_actors/actors/fil-syscall-actor/Cargo.toml b/testing/test_actors/actors/fil-syscall-actor/Cargo.toml index 7357715ac..782d7ae57 100644 --- 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_v10_runtime = { package = "fil_actors_runtime", git = "https://github.com/filecoin-project/builtin-actors", branch = "experimental/fvm-m2" } multihash = { workspace = true } [lib]