Merge branch 'master' into next

arajasek · arajasek · commit 03e626d2a2ee · 2023-02-10T17:20:12.000-05:00
diff --git a/actors/account/Cargo.toml b/actors/account/Cargo.toml
@@ -25,7 +25,7 @@ fvm_ipld_encoding = "0.3.3"
 anyhow = "1.0.65"
 
 [dev-dependencies]
-fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime", features = ["test_utils", "sector-default"] }
+fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
 
 [features]
 fil-actor = ["fil_actors_runtime/fil-actor"]
diff --git a/actors/cron/Cargo.toml b/actors/cron/Cargo.toml
@@ -24,7 +24,7 @@ fvm_ipld_blockstore = "0.1.1"
 fvm_ipld_encoding = "0.3.3"
 
 [dev-dependencies]
-fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime", features = ["test_utils", "sector-default"] }
+fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
 
 [features]
 fil-actor = ["fil_actors_runtime/fil-actor"]
diff --git a/actors/eam/Cargo.toml b/actors/eam/Cargo.toml
@@ -31,7 +31,7 @@ hex-literal = "0.3.4"
 fil_actors_evm_shared = { version = "10.0.0-alpha.1", path = "../evm/shared" }
 
 [dev-dependencies]
-fil_actor_evm = { version = "10.0.0-alpha.1", path = "../evm"}
+fil_actor_evm = { path = "../evm"}
 fil_actors_runtime = { path = "../../runtime", features = ["test_utils"] }
 
 [features]
diff --git a/actors/init/Cargo.toml b/actors/init/Cargo.toml
@@ -28,7 +28,7 @@ fvm_ipld_blockstore = "0.1.1"
 fvm_ipld_encoding = "0.3.3"
 
 [dev-dependencies]
-fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime", features = ["test_utils", "sector-default"] }
+fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
 
 [features]
 fil-actor = ["fil_actors_runtime/fil-actor"]
diff --git a/actors/market/Cargo.toml b/actors/market/Cargo.toml
@@ -33,7 +33,7 @@ num-traits = "0.2.14"
 serde = { version = "1.0.136", features = ["derive"] }
 
 [dev-dependencies]
-fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime", features = ["test_utils", "sector-default"] }
+fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
 fil_actor_power = { path = "../power" }
 fil_actor_reward = { path = "../reward" }
 fil_actor_verifreg = { path = "../verifreg" }
diff --git a/actors/miner/Cargo.toml b/actors/miner/Cargo.toml
@@ -34,7 +34,7 @@ fvm_ipld_encoding = "0.3.3"
 multihash = { version = "0.16.2", default-features = false }
 
 [dev-dependencies]
-fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime", features = ["test_utils", "sector-default"] }
+fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
 fil_actor_account = { path = "../account" }
 fil_actor_reward = { path = "../reward" }
 fil_actor_power = { path = "../power" }
diff --git a/actors/multisig/Cargo.toml b/actors/multisig/Cargo.toml
@@ -31,7 +31,7 @@ num-traits = "0.2.14"
 serde = { version = "1.0.136", features = ["derive"] }
 
 [dev-dependencies]
-fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime", features = ["test_utils", "sector-default"] }
+fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
 lazy_static = "1.4.0"
 
 [features]
diff --git a/actors/paych/Cargo.toml b/actors/paych/Cargo.toml
@@ -26,7 +26,7 @@ fvm_ipld_blockstore = "0.1.1"
 fvm_ipld_encoding = "0.3.3"
 
 [dev-dependencies]
-fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime", features = ["test_utils", "sector-default"] }
+fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
 fvm_ipld_amt = { version = "0.5.1", features = ["go-interop"] }
 derive_builder = "0.10.2"
 
diff --git a/actors/power/Cargo.toml b/actors/power/Cargo.toml
@@ -31,7 +31,7 @@ fvm_ipld_blockstore = "0.1.1"
 fvm_ipld_encoding = "0.3.3"
 
 [dev-dependencies]
-fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime", features = ["test_utils", "sector-default"] }
+fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
 fil_actor_reward = { path = "../reward" }
 
 [features]
diff --git a/actors/reward/Cargo.toml b/actors/reward/Cargo.toml
@@ -25,7 +25,7 @@ fvm_ipld_blockstore = "0.1.1"
 fvm_ipld_encoding = "0.3.3"
 
 [dev-dependencies]
-fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime", features = ["test_utils", "sector-default"] }
+fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
 num = "0.4.0"
 
 [features]
diff --git a/actors/system/Cargo.toml b/actors/system/Cargo.toml
@@ -25,7 +25,7 @@ serde = { version = "1.0.136", features = ["derive"] }
 cid = { version = "0.8.3", default-features = false, features = ["serde-codec"] }
 
 [dev-dependencies]
-fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime", features = ["test_utils", "sector-default"] }
+fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
 
 [features]
 fil-actor = ["fil_actors_runtime/fil-actor"]
diff --git a/actors/verifreg/Cargo.toml b/actors/verifreg/Cargo.toml
@@ -32,7 +32,7 @@ num-traits = "0.2.14"
 serde = { version = "1.0.136", features = ["derive"] }
 
 [dev-dependencies]
-fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime", features = ["test_utils", "sector-default"] }
+fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
 
 [features]
 fil-actor = ["fil_actors_runtime/fil-actor"]
diff --git a/test_vm/src/lib.rs b/test_vm/src/lib.rs
@@ -434,6 +434,10 @@ impl<'bs> VM<'bs> {
         let mut a = self.get_actor(from_id).unwrap();
         let call_seq = a.call_seq_num;
         a.call_seq_num = call_seq + 1;
+        // EthAccount abstractions turns Placeholders into EthAccounts
+        if a.code == *PLACEHOLDER_ACTOR_CODE_ID {
+            a.code = *ETHACCOUNT_ACTOR_CODE_ID;
+        }
         self.set_actor(from_id, a);
 
         let prior_root = self.checkpoint();
