FIP-0050: Modify restriction tests to use EVM_ACTOR_CODE_ID (#1193)

arajasek · web-flow · commit 6c151faa659a · 2023-02-10T15:03:31.000-05:00
* FIP-0050: Modify restriction tests to use EVM_ACTOR_CODE_ID

* Runtime: Restrict internal API away from EVM actors
diff --git a/actors/account/tests/account_actor_test.rs b/actors/account/tests/account_actor_test.rs
@@ -72,7 +72,7 @@ fn token_receiver() {
     )
     .unwrap();
 
-    rt.set_caller(make_identity_cid(b"1234"), Address::new_id(1000));
+    rt.set_caller(*EVM_ACTOR_CODE_ID, Address::new_id(1000));
     rt.expect_validate_caller_any();
     let ret = rt
         .call::<AccountActor>(
diff --git a/actors/market/tests/harness.rs b/actors/market/tests/harness.rs
@@ -124,7 +124,7 @@ pub fn construct_and_verify(rt: &mut MockRuntime) {
 }
 
 pub fn get_balance(rt: &mut MockRuntime, addr: &Address) -> GetBalanceReturn {
-    rt.set_caller(make_identity_cid(b"1234"), Address::new_id(1234));
+    rt.set_caller(*EVM_ACTOR_CODE_ID, Address::new_id(1234));
     rt.expect_validate_caller_any();
     let ret: GetBalanceReturn = rt
         .call::<MarketActor>(
diff --git a/actors/market/tests/market_actor_test.rs b/actors/market/tests/market_actor_test.rs
@@ -2167,7 +2167,7 @@ fn add_balance_restricted_correctly() {
     rt.set_value(amount);
 
     // set caller to not-builtin
-    rt.set_caller(make_identity_cid(b"1234"), Address::new_id(1234));
+    rt.set_caller(*EVM_ACTOR_CODE_ID, Address::new_id(1234));
 
     // cannot call the unexported method num
     expect_abort_contains_message(
@@ -2233,7 +2233,7 @@ fn psd_restricted_correctly() {
     };
 
     // set caller to not-builtin
-    rt.set_caller(make_identity_cid(b"1234"), WORKER_ADDR);
+    rt.set_caller(*EVM_ACTOR_CODE_ID, WORKER_ADDR);
 
     // cannot call the unexported method num
     expect_abort_contains_message(
diff --git a/actors/miner/tests/change_beneficiary_test.rs b/actors/miner/tests/change_beneficiary_test.rs
@@ -1,6 +1,6 @@
 use fil_actor_miner::{Actor, BeneficiaryTerm, GetBeneficiaryReturn, Method};
 use fil_actors_runtime::test_utils::{
-    expect_abort, expect_abort_contains_message, make_identity_cid, MockRuntime,
+    expect_abort, expect_abort_contains_message, MockRuntime, EVM_ACTOR_CODE_ID,
 };
 use fvm_shared::clock::ChainEpoch;
 use fvm_shared::{address::Address, econ::TokenAmount, error::ExitCode, MethodNum};
@@ -449,7 +449,7 @@ fn get_beneficiary_correctly_restricted() {
     let (h, mut rt) = setup();
 
     // set caller to not-builtin
-    rt.set_caller(make_identity_cid(b"1234"), Address::new_id(1000));
+    rt.set_caller(*EVM_ACTOR_CODE_ID, Address::new_id(1000));
 
     // cannot call the unexported method num
     expect_abort_contains_message(
diff --git a/actors/miner/tests/change_owner_address_test.rs b/actors/miner/tests/change_owner_address_test.rs
@@ -1,7 +1,7 @@
 use fil_actor_miner::{Actor, GetOwnerReturn, Method};
 use fil_actors_runtime::test_utils::{
-    expect_abort, expect_abort_contains_message, make_identity_cid, new_bls_addr, MockRuntime,
-    ACCOUNT_ACTOR_CODE_ID, MULTISIG_ACTOR_CODE_ID,
+    expect_abort, expect_abort_contains_message, new_bls_addr, MockRuntime, ACCOUNT_ACTOR_CODE_ID,
+    EVM_ACTOR_CODE_ID, MULTISIG_ACTOR_CODE_ID,
 };
 use fvm_ipld_encoding::ipld_block::IpldBlock;
 use fvm_shared::econ::TokenAmount;
@@ -42,7 +42,7 @@ fn successful_change() {
     h.change_owner_address(&mut rt, NEW_ADDRESS).unwrap();
 
     // Set to non-builtin caller to confirm exported correctly
-    rt.set_caller(make_identity_cid(b"1234"), OTHER_ADDRESS);
+    rt.set_caller(*EVM_ACTOR_CODE_ID, OTHER_ADDRESS);
     rt.expect_validate_caller_any();
     let ret: GetOwnerReturn = rt
         .call::<Actor>(Method::GetOwnerExported as u64, None)
@@ -70,7 +70,7 @@ fn change_owner_address_restricted_correctly() {
     let (h, mut rt) = setup();
 
     let params = IpldBlock::serialize_cbor(&NEW_ADDRESS).unwrap();
-    rt.set_caller(make_identity_cid(b"1234"), h.owner);
+    rt.set_caller(*EVM_ACTOR_CODE_ID, h.owner);
 
     // fail to call the unexported method
 
@@ -94,7 +94,7 @@ fn change_owner_address_restricted_correctly() {
     // new owner can also call the exported method
 
     rt.expect_validate_caller_addr(vec![NEW_ADDRESS]);
-    rt.set_caller(make_identity_cid(b"1234"), NEW_ADDRESS);
+    rt.set_caller(*EVM_ACTOR_CODE_ID, NEW_ADDRESS);
     rt.call::<Actor>(Method::ChangeOwnerAddressExported as u64, params).unwrap();
 
     rt.verify();
diff --git a/actors/miner/tests/change_peer_id_test.rs b/actors/miner/tests/change_peer_id_test.rs
@@ -1,6 +1,6 @@
 use fil_actor_miner::{Actor, ChangePeerIDParams, GetPeerIDReturn, Method};
 use fil_actors_runtime::test_utils::{
-    expect_abort_contains_message, make_identity_cid, MockRuntime,
+    expect_abort_contains_message, MockRuntime, EVM_ACTOR_CODE_ID,
 };
 use fvm_ipld_encoding::ipld_block::IpldBlock;
 use fvm_shared::error::ExitCode;
@@ -39,7 +39,7 @@ fn change_peer_id_restricted_correctly() {
 
     let params = IpldBlock::serialize_cbor(&ChangePeerIDParams { new_id: new_id.clone() }).unwrap();
 
-    rt.set_caller(make_identity_cid(b"1234"), h.worker);
+    rt.set_caller(*EVM_ACTOR_CODE_ID, h.worker);
 
     // fail to call the unexported setter
 
diff --git a/actors/miner/tests/change_worker_address_test.rs b/actors/miner/tests/change_worker_address_test.rs
@@ -11,7 +11,7 @@ use fvm_shared::{address::Address, econ::TokenAmount, error::ExitCode};
 
 mod util;
 
-use fil_actors_runtime::test_utils::make_identity_cid;
+use fil_actors_runtime::test_utils::EVM_ACTOR_CODE_ID;
 use fvm_ipld_encoding::ipld_block::IpldBlock;
 
 use itertools::Itertools;
@@ -91,7 +91,7 @@ fn change_and_confirm_worker_address_restricted_correctly() {
     })
     .unwrap();
 
-    rt.set_caller(make_identity_cid(b"1234"), h.owner);
+    rt.set_caller(*EVM_ACTOR_CODE_ID, h.owner);
 
     // fail to call the unexported method
 
diff --git a/actors/miner/tests/exported_getters.rs b/actors/miner/tests/exported_getters.rs
@@ -2,7 +2,7 @@ use fil_actor_miner::{
     Actor, GetAvailableBalanceReturn, GetOwnerReturn, GetSectorSizeReturn,
     IsControllingAddressParam, IsControllingAddressReturn, Method,
 };
-use fil_actors_runtime::test_utils::make_identity_cid;
+use fil_actors_runtime::test_utils::EVM_ACTOR_CODE_ID;
 use fil_actors_runtime::INIT_ACTOR_ADDR;
 use fvm_ipld_encoding::ipld_block::IpldBlock;
 use fvm_shared::address::Address;
@@ -27,7 +27,7 @@ fn info_getters() {
     h.construct_and_verify(&mut rt);
 
     // set caller to not-builtin
-    rt.set_caller(make_identity_cid(b"1234"), Address::new_id(1234));
+    rt.set_caller(*EVM_ACTOR_CODE_ID, Address::new_id(1234));
 
     // owner is good
     rt.expect_validate_caller_any();
diff --git a/actors/miner/tests/miner_actor_test_peer_info.rs b/actors/miner/tests/miner_actor_test_peer_info.rs
@@ -127,7 +127,7 @@ fn get_and_change_multiaddrs_restricted_correctly() {
     })
     .unwrap();
 
-    rt.set_caller(make_identity_cid(b"1234"), h.worker);
+    rt.set_caller(*EVM_ACTOR_CODE_ID, h.worker);
 
     // fail to call the unexported setter
 
diff --git a/actors/miner/tests/repay_debts.rs b/actors/miner/tests/repay_debts.rs
@@ -1,5 +1,5 @@
 use fil_actor_miner::{locked_reward_from_reward, Actor, Method};
-use fil_actors_runtime::test_utils::{expect_abort_contains_message, make_identity_cid};
+use fil_actors_runtime::test_utils::{expect_abort_contains_message, EVM_ACTOR_CODE_ID};
 use fil_actors_runtime::BURNT_FUNDS_ACTOR_ADDR;
 use fvm_shared::bigint::Zero;
 use fvm_shared::clock::ChainEpoch;
@@ -65,7 +65,7 @@ fn repay_debt_restricted_correctly() {
     st.fee_debt = fee_debt.clone();
     rt.replace_state(&st);
 
-    rt.set_caller(make_identity_cid(b"1234"), h.owner);
+    rt.set_caller(*EVM_ACTOR_CODE_ID, h.owner);
 
     // fail to call the unexported method
     expect_abort_contains_message(
diff --git a/actors/miner/tests/util.rs b/actors/miner/tests/util.rs
@@ -2577,7 +2577,7 @@ impl ActorHarness {
 
     pub fn get_available_balance(&self, rt: &mut MockRuntime) -> Result<TokenAmount, ActorError> {
         // set caller to non-builtin
-        rt.set_caller(make_identity_cid(b"1234"), Address::new_id(1234));
+        rt.set_caller(*EVM_ACTOR_CODE_ID, Address::new_id(1234));
         rt.expect_validate_caller_any();
         let available_balance_ret: GetAvailableBalanceReturn = rt
             .call::<Actor>(Method::GetAvailableBalanceExported as u64, None)?
diff --git a/actors/miner/tests/withdraw_balance.rs b/actors/miner/tests/withdraw_balance.rs
@@ -2,7 +2,7 @@ use fil_actor_miner::{
     Actor, BeneficiaryTerm, Method, WithdrawBalanceParams, WithdrawBalanceReturn,
 };
 use fil_actors_runtime::test_utils::{
-    expect_abort, expect_abort_contains_message, make_identity_cid,
+    expect_abort, expect_abort_contains_message, EVM_ACTOR_CODE_ID,
 };
 use fvm_ipld_encoding::ipld_block::IpldBlock;
 use fvm_shared::address::Address;
@@ -47,7 +47,7 @@ fn withdraw_funds_restricted_correctly() {
     })
     .unwrap();
 
-    rt.set_caller(make_identity_cid(b"1234"), h.owner);
+    rt.set_caller(*EVM_ACTOR_CODE_ID, h.owner);
 
     // fail to call the unexported method
 
diff --git a/actors/power/tests/power_actor_tests.rs b/actors/power/tests/power_actor_tests.rs
@@ -2,7 +2,7 @@ use fil_actor_power::ext::init::{ExecParams, EXEC_METHOD};
 use fil_actor_power::ext::miner::MinerConstructorParams;
 use fil_actors_runtime::runtime::builtins::Type;
 use fil_actors_runtime::test_utils::{
-    expect_abort, expect_abort_contains_message, make_identity_cid, ACCOUNT_ACTOR_CODE_ID,
+    expect_abort, expect_abort_contains_message, ACCOUNT_ACTOR_CODE_ID, EVM_ACTOR_CODE_ID,
     MINER_ACTOR_CODE_ID, SYSTEM_ACTOR_CODE_ID,
 };
 use fil_actors_runtime::{runtime::Policy, INIT_ACTOR_ADDR};
@@ -582,7 +582,7 @@ fn get_network_and_miner_power() {
     rt.replace_state(&state);
 
     // set caller to not-builtin
-    rt.set_caller(make_identity_cid(b"1234"), Address::new_id(1234));
+    rt.set_caller(*EVM_ACTOR_CODE_ID, Address::new_id(1234));
 
     rt.expect_validate_caller_any();
     let network_power: NetworkRawPowerReturn = rt
@@ -1457,7 +1457,7 @@ fn create_miner_restricted_correctly() {
     })
     .unwrap();
 
-    rt.set_caller(make_identity_cid(b"1234"), *OWNER);
+    rt.set_caller(*EVM_ACTOR_CODE_ID, *OWNER);
 
     // cannot call the unexported method
     expect_abort_contains_message(
diff --git a/actors/verifreg/tests/verifreg_actor_test.rs b/actors/verifreg/tests/verifreg_actor_test.rs
@@ -401,7 +401,7 @@ mod clients {
             AddVerifiedClientParams { address: *CLIENT, allowance: allowance_client.clone() };
 
         // set caller to not-builtin
-        rt.set_caller(make_identity_cid(b"1234"), *VERIFIER);
+        rt.set_caller(*EVM_ACTOR_CODE_ID, *VERIFIER);
 
         // cannot call the unexported method num
         expect_abort_contains_message(
@@ -514,7 +514,7 @@ mod allocs_claims {
         MINIMUM_VERIFIED_ALLOCATION_TERM,
     };
     use fil_actors_runtime::test_utils::{
-        expect_abort_contains_message, make_identity_cid, ACCOUNT_ACTOR_CODE_ID,
+        expect_abort_contains_message, ACCOUNT_ACTOR_CODE_ID, EVM_ACTOR_CODE_ID,
     };
     use fil_actors_runtime::FailCode;
     use harness::*;
@@ -988,7 +988,7 @@ mod allocs_claims {
         };
 
         // set caller to not-builtin
-        rt.set_caller(make_identity_cid(b"1234"), Address::new_id(CLIENT1));
+        rt.set_caller(*EVM_ACTOR_CODE_ID, Address::new_id(CLIENT1));
 
         // cannot call the unexported extend method num
         expect_abort_contains_message(
diff --git a/runtime/src/builtin/shared.rs b/runtime/src/builtin/shared.rs
@@ -1,6 +1,7 @@
 // Copyright 2019-2022 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
+use crate::runtime::builtins::Type;
 use crate::{actor_error, ActorContext, ActorError};
 use fvm_ipld_encoding::ipld_block::IpldBlock;
 use fvm_shared::address::Address;
@@ -66,10 +67,15 @@ where
         }
         Some(code_cid) => {
             let builtin_type = rt.resolve_builtin_actor_type(&code_cid);
-            if builtin_type.is_none() {
-                return Err(
-                    actor_error!(forbidden; "caller {} of method {} must be built-in", caller, method),
-                );
+            match builtin_type {
+                None | Some(Type::EVM) => {
+                    return Err(
+                        actor_error!(forbidden; "caller {} of method {} must be built-in", caller, method),
+                    );
+                }
+
+                // Anything else is a valid built-in caller of the internal API
+                Some(_) => {}
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ fn token_receiver() {`
`72`	`72`	`)`
`73`	`73`	`.unwrap();`
`74`	`74`
`75`		`- rt.set_caller(make_identity_cid(b"1234"), Address::new_id(1000));`
	`75`	`+ rt.set_caller(*EVM_ACTOR_CODE_ID, Address::new_id(1000));`
`76`	`76`	`rt.expect_validate_caller_any();`
`77`	`77`	`let ret = rt`
`78`	`78`	`.call::<AccountActor>(`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ pub fn construct_and_verify(rt: &mut MockRuntime) {`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`pub fn get_balance(rt: &mut MockRuntime, addr: &Address) -> GetBalanceReturn {`
`127`		`- rt.set_caller(make_identity_cid(b"1234"), Address::new_id(1234));`
	`127`	`+ rt.set_caller(*EVM_ACTOR_CODE_ID, Address::new_id(1234));`
`128`	`128`	`rt.expect_validate_caller_any();`
`129`	`129`	`let ret: GetBalanceReturn = rt`
`130`	`130`	`.call::<MarketActor>(`