Merge pull request #670 from filecoin-project/decouple-fil+

Merge FIP-0045 implementation branch into master
filecoin-project · Sep 28, 2022 · a6250c7 · a6250c7
2 parents d5056d5 + e48b356
commit a6250c7
Show file tree

Hide file tree

Showing 63 changed files with 6,209 additions and 1,822 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,16 +14,17 @@ publish = false
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 fil_actor_account = { version = "9.0.0-alpha.1", path = "./actors/account", features = ["fil-actor"] }
-fil_actor_verifreg = { version = "9.0.0-alpha.1", path = "./actors/verifreg", features = ["fil-actor"] }
 fil_actor_cron = { version = "9.0.0-alpha.1", path = "./actors/cron", features = ["fil-actor"] }
+fil_actor_datacap = { version = "9.0.0-alpha.1", path = "./actors/datacap", features = ["fil-actor"] }
+fil_actor_init = { version = "9.0.0-alpha.1", path = "./actors/init", features = ["fil-actor"] }
 fil_actor_market = { version = "9.0.0-alpha.1", path = "./actors/market", features = ["fil-actor"] }
+fil_actor_miner = { version = "9.0.0-alpha.1", path = "./actors/miner", features = ["fil-actor"] }
 fil_actor_multisig = { version = "9.0.0-alpha.1", path = "./actors/multisig", features = ["fil-actor"] }
 fil_actor_paych = { version = "9.0.0-alpha.1", path = "./actors/paych", features = ["fil-actor"] }
 fil_actor_power = { version = "9.0.0-alpha.1", path = "./actors/power", features = ["fil-actor"] }
-fil_actor_miner = { version = "9.0.0-alpha.1", path = "./actors/miner", features = ["fil-actor"] }
 fil_actor_reward = { version = "9.0.0-alpha.1", path = "./actors/reward", features = ["fil-actor"] }
 fil_actor_system = { version = "9.0.0-alpha.1", path = "./actors/system", features = ["fil-actor"] }
-fil_actor_init = { version = "9.0.0-alpha.1", path = "./actors/init", features = ["fil-actor"] }
+fil_actor_verifreg = { version = "9.0.0-alpha.1", path = "./actors/verifreg", features = ["fil-actor"] }
 
 [build-dependencies]
 fil_actor_bundler = "4.0.0"

diff --git a/actors/account/Cargo.toml b/actors/account/Cargo.toml
@@ -14,6 +14,7 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fil_actors_runtime = { version = "9.0.0-alpha.1", path = "../../runtime" }
+frc42_dispatch = "1.0.0"
 fvm_shared = { version = "2.0.0-alpha.2", default-features = false }
 serde = { version = "1.0.136", features = ["derive"] }
 num-traits = "0.2.14"