Runtime: Don't convert syscall errors (#1024)

filecoin-project · Jan 13, 2023 · 2b1df24 · 2b1df24
1 parent 93aab43
commit 2b1df24
Show file tree

Hide file tree

Showing 27 changed files with 143 additions and 139 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/actors/account/Cargo.toml b/actors/account/Cargo.toml
@@ -14,7 +14,7 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime" }
-fvm_shared = { version = "3.0.0-alpha.15", default-features = false }
+fvm_shared = { version = "3.0.0-alpha.16", default-features = false }
 frc42_dispatch = "3.0.0"
 fvm_actor_utils = "3.0.0"
 serde = { version = "1.0.136", features = ["derive"] }

diff --git a/actors/cron/Cargo.toml b/actors/cron/Cargo.toml
@@ -15,7 +15,7 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime" }
-fvm_shared = { version = "3.0.0-alpha.15", default-features = false }
+fvm_shared = { version = "3.0.0-alpha.16", default-features = false }
 num-traits = "0.2.14"
 num-derive = "0.3.3"
 log = "0.4.14"

diff --git a/actors/datacap/Cargo.toml b/actors/datacap/Cargo.toml
@@ -23,7 +23,7 @@ fvm_actor_utils = "3.0.0"
 fvm_ipld_blockstore = "0.1.1"
 fvm_ipld_encoding = "0.3.2"
 fvm_ipld_hamt = "0.6.1"
-fvm_shared = { version = "3.0.0-alpha.15", default-features = false }
+fvm_shared = { version = "3.0.0-alpha.16", default-features = false }
 lazy_static = "1.4.0"
 num-derive = "0.3.3"
 num-traits = "0.2.14"

diff --git a/actors/datacap/src/lib.rs b/actors/datacap/src/lib.rs
@@ -4,14 +4,14 @@ use frc46_token::token::types::{
     TransferFromParams, TransferFromReturn, TransferParams, TransferReturn,
 };
 use frc46_token::token::{Token, TokenError, TOKEN_PRECISION};
-use fvm_actor_utils::messaging::{Messaging, MessagingError, Response};
+use fvm_actor_utils::messaging::{Messaging, MessagingError};
 use fvm_actor_utils::receiver::ReceiverHookError;
 use fvm_ipld_encoding::RawBytes;
 use fvm_shared::address::Address;
 use fvm_shared::bigint::BigInt;
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::error::{ErrorNumber, ExitCode};
-use fvm_shared::{ActorID, MethodNum, METHOD_CONSTRUCTOR, METHOD_SEND};
+use fvm_shared::{ActorID, MethodNum, Response, METHOD_CONSTRUCTOR, METHOD_SEND};
 use lazy_static::lazy_static;
 use log::info;
 use num_derive::FromPrimitive;

diff --git a/actors/eam/Cargo.toml b/actors/eam/Cargo.toml
@@ -24,7 +24,7 @@ fvm_ipld_blockstore = "0.1.1"
 fvm_ipld_encoding = "0.3.2"
 multihash = { version = "0.16.1", default-features = false }
 cid = "0.8.6"
-fvm_shared = { version = "3.0.0-alpha.15", default-features = false }
+fvm_shared = { version = "3.0.0-alpha.16", default-features = false }
 num-traits = "0.2.15"
 num-derive = "0.3.3"
 hex-literal = "0.3.4"

diff --git a/actors/ethaccount/Cargo.toml b/actors/ethaccount/Cargo.toml
@@ -17,7 +17,7 @@ crate-type = ["cdylib", "lib"]
 fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime" }
 serde = { version = "1.0.136", features = ["derive"] }
 fvm_ipld_encoding = "0.3.2"
-fvm_shared = { version = "3.0.0-alpha.15", default-features = false }
+fvm_shared = { version = "3.0.0-alpha.16", default-features = false }
 num-traits = "0.2.15"
 num-derive = "0.3.3"
 hex-literal = "0.3.4"

diff --git a/actors/evm/Cargo.toml b/actors/evm/Cargo.toml
@@ -15,7 +15,7 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime" }
-fvm_shared = { version = "3.0.0-alpha.15", default-features = false }
+fvm_shared = { version = "3.0.0-alpha.16", default-features = false }
 fvm_ipld_kamt = { version = "0.1.0" }
 serde = { version = "1.0.136", features = ["derive"] }
 serde_tuple = "0.5"

diff --git a/actors/evm/src/interpreter/system.rs b/actors/evm/src/interpreter/system.rs
@@ -222,11 +222,21 @@ impl<'r, RT: Runtime> System<'r, RT> {
         send_flags: SendFlags,
     ) -> Result<Option<IpldBlock>, ActorError> {
         self.flush()?;
-        let result = self.rt.send_generalized(to, method, params, value, gas_limit, send_flags)?;
+        let result = self
+            .rt
+            .send_generalized(to, method, params, value, gas_limit, send_flags)
+            .map_err(|err| actor_error!(unspecified; "send syscall failed: {}", err))?;
         if !send_flags.read_only() {
             self.reload()?;
         }
-        Ok(result)
+        match result.exit_code {
+            ExitCode::OK => Ok(result.return_data),
+            e => Err(ActorError::unchecked_with_data(
+                e,
+                "send failed".to_string(),
+                result.return_data,
+            )),
+        }
     }
 
     /// Flush the actor state (bytecode, nonce, and slots).

diff --git a/actors/init/Cargo.toml b/actors/init/Cargo.toml
@@ -15,7 +15,7 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime" }
-fvm_shared = { version = "3.0.0-alpha.15", default-features = false }
+fvm_shared = { version = "3.0.0-alpha.16", default-features = false }
 fvm_ipld_hamt = "0.6.1"
 frc42_dispatch = "3.0.0"
 serde = { version = "1.0.136", features = ["derive"] }

diff --git a/actors/market/Cargo.toml b/actors/market/Cargo.toml
@@ -24,7 +24,7 @@ fvm_ipld_bitfield = "0.5.2"
 fvm_ipld_blockstore = "0.1.1"
 fvm_ipld_encoding = "0.3.2"
 fvm_ipld_hamt = "0.6.1"
-fvm_shared = { version = "3.0.0-alpha.15", default-features = false }
+fvm_shared = { version = "3.0.0-alpha.16", default-features = false }
 integer-encoding = { version = "3.0.3", default-features = false }
 libipld-core = { version = "0.13.1", features = ["serde-codec"] }
 log = "0.4.14"

diff --git a/actors/miner/Cargo.toml b/actors/miner/Cargo.toml
@@ -16,7 +16,7 @@ crate-type = ["cdylib", "lib"]
 [dependencies]
 fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime" }
 frc42_dispatch = "3.0.0"
-fvm_shared = { version = "3.0.0-alpha.15", default-features = false }
+fvm_shared = { version = "3.0.0-alpha.16", default-features = false }
 fvm_ipld_bitfield = "0.5.4"
 fvm_ipld_amt = { version = "0.5.0", features = ["go-interop"] }
 fvm_ipld_hamt = "0.6.1"

diff --git a/actors/multisig/Cargo.toml b/actors/multisig/Cargo.toml
@@ -23,7 +23,7 @@ fvm_actor_utils = "3.0.0"
 fvm_ipld_blockstore = "0.1.1"
 fvm_ipld_encoding = "0.3.2"
 fvm_ipld_hamt = "0.6.1"
-fvm_shared = { version = "3.0.0-alpha.15", default-features = false }
+fvm_shared = { version = "3.0.0-alpha.16", default-features = false }
 indexmap = { version = "1.8.0", features = ["serde-1"] }
 integer-encoding = { version = "3.0.3", default-features = false }
 num-derive = "0.3.3"

diff --git a/actors/paych/Cargo.toml b/actors/paych/Cargo.toml
@@ -15,7 +15,7 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime" }
-fvm_shared = { version = "3.0.0-alpha.15", default-features = false }
+fvm_shared = { version = "3.0.0-alpha.16", default-features = false }
 frc42_dispatch = "3.0.0"
 num-traits = "0.2.14"
 num-derive = "0.3.3"

diff --git a/actors/placeholder/Cargo.toml b/actors/placeholder/Cargo.toml
@@ -13,8 +13,8 @@ keywords = ["filecoin", "web3", "wasm"]
 crate-type = ["cdylib", "lib"]
 
 [dependencies]
-fvm_sdk = { version = "3.0.0-alpha.21", optional = true }
-fvm_shared = { version = "3.0.0-alpha.15", optional = true }
+fvm_sdk = { version = "3.0.0-alpha.22", optional = true }
+fvm_shared = { version = "3.0.0-alpha.16", optional = true }
 
 [features]
 fil-actor = ["fvm_sdk", "fvm_shared"]
diff --git a/actors/power/Cargo.toml b/actors/power/Cargo.toml
@@ -15,7 +15,7 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime" }
-fvm_shared = { version = "3.0.0-alpha.15", default-features = false }
+fvm_shared = { version = "3.0.0-alpha.16", default-features = false }
 frc42_dispatch = "3.0.0"
 fvm_ipld_hamt = "0.6.1"
 num-traits = "0.2.14"

diff --git a/actors/power/tests/power_actor_tests.rs b/actors/power/tests/power_actor_tests.rs
@@ -119,11 +119,11 @@ fn create_miner_given_send_to_init_actor_fails_should_fail() {
         IpldBlock::serialize_cbor(&message_params).unwrap(),
         TokenAmount::from_atto(10),
         None,
-        ExitCode::SYS_INSUFFICIENT_FUNDS,
+        ExitCode::USR_INSUFFICIENT_FUNDS,
     );
 
     expect_abort(
-        ExitCode::SYS_INSUFFICIENT_FUNDS,
+        ExitCode::USR_INSUFFICIENT_FUNDS,
         rt.call::<PowerActor>(
             Method::CreateMiner as u64,
             IpldBlock::serialize_cbor(&create_miner_params).unwrap(),

diff --git a/actors/reward/Cargo.toml b/actors/reward/Cargo.toml
@@ -15,7 +15,7 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime" }
-fvm_shared = { version = "3.0.0-alpha.15", default-features = false }
+fvm_shared = { version = "3.0.0-alpha.16", default-features = false }
 num-traits = "0.2.14"
 num-derive = "0.3.3"
 log = "0.4.14"

diff --git a/actors/system/Cargo.toml b/actors/system/Cargo.toml
@@ -15,7 +15,7 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime" }
-fvm_shared = { version = "3.0.0-alpha.15", default-features = false }
+fvm_shared = { version = "3.0.0-alpha.16", default-features = false }
 fvm_ipld_encoding = "0.3.2"
 fvm_ipld_blockstore = "0.1.1"
 num-traits = "0.2.14"

diff --git a/actors/verifreg/Cargo.toml b/actors/verifreg/Cargo.toml
@@ -24,7 +24,7 @@ fvm_actor_utils = "3.0.0"
 fvm_ipld_blockstore = "0.1.1"
 fvm_ipld_encoding = "0.3.2"
 fvm_ipld_hamt = "0.6.1"
-fvm_shared = { version = "3.0.0-alpha.15", default-features = false }
+fvm_shared = { version = "3.0.0-alpha.16", default-features = false }
 lazy_static = "1.4.0"
 log = "0.4.14"
 num-derive = "0.3.3"

diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -10,7 +10,7 @@ repository = "https://github.com/filecoin-project/builtin-actors"
 [dependencies]
 fvm_ipld_hamt = "0.6.1"
 fvm_ipld_amt = { version = "0.5.0", features = ["go-interop"] }
-fvm_shared = { version = "3.0.0-alpha.15", default-features = false }
+fvm_shared = { version = "3.0.0-alpha.16", default-features = false }
 num = { version = "0.4", features = ["serde"] }
 num-traits = "0.2.14"
 num-derive = "0.3.3"
@@ -37,7 +37,7 @@ castaway = "0.2.2"
 sha2 = "0.10"
 
 # fil-actor
-fvm_sdk = { version = "3.0.0-alpha.21", optional = true }
+fvm_sdk = { version = "3.0.0-alpha.22", optional = true }
 
 # test_util
 rand = { version = "0.8.5", default-features = false, optional = true }
@@ -90,4 +90,4 @@ no-provider-deal-collateral = []
 # fake proofs (for testing)
 fake-proofs = []
 
-test_utils = ["hex", "multihash/sha2", "libsecp256k1", "blake2b_simd", "rand", "rand/std_rng", "lazy_static", "pretty_env_logger"]
+test_utils = ["hex", "multihash/sha2", "libsecp256k1", "blake2b_simd", "rand", "rand/std_rng", "lazy_static", "pretty_env_logger"]