Integration origin from runtime context (#562)

filecoin-project · Aug 19, 2022 · 0dc90b0 · 0dc90b0
1 parent 36ec85a
commit 0dc90b0
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 29 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/actors/evm/src/interpreter/execution.rs b/actors/evm/src/interpreter/execution.rs
@@ -79,9 +79,9 @@ pub fn execute<'r, BS: Blockstore, RT: Runtime<BS>>(
             OpCode::SHR => bitwise::shr(&mut runtime.stack),
             OpCode::SAR => bitwise::sar(&mut runtime.stack),
             OpCode::KECCAK256 => hash::keccak256(runtime)?,
-            OpCode::ADDRESS => context::address(runtime, system)?,
+            OpCode::ADDRESS => context::address(runtime, system),
             OpCode::BALANCE => storage::balance(runtime, system)?,
-            OpCode::CALLER => context::caller(runtime, system)?,
+            OpCode::CALLER => context::caller(runtime, system),
             OpCode::CALLVALUE => context::call_value(runtime, system),
             OpCode::CALLDATALOAD => call::calldataload(runtime),
             OpCode::CALLDATASIZE => call::calldatasize(runtime),

diff --git a/actors/evm/src/interpreter/instructions/context.rs b/actors/evm/src/interpreter/instructions/context.rs
@@ -14,10 +14,10 @@ pub fn blockhash<'r, BS: Blockstore, RT: Runtime<BS>>(
 
 #[inline]
 pub fn caller<'r, BS: Blockstore, RT: Runtime<BS>>(
-    _state: &mut ExecutionState,
-    _platform: &'r System<'r, BS, RT>,
-) -> Result<(), StatusCode> {
-    todo!()
+    state: &mut ExecutionState,
+    platform: &'r System<'r, BS, RT>,
+) {
+    state.stack.push(U256::from(platform.rt.message().caller().id().unwrap()))
 }
 
 #[inline]
@@ -30,18 +30,18 @@ pub fn call_value<'r, BS: Blockstore, RT: Runtime<BS>>(
 
 #[inline]
 pub fn address<'r, BS: Blockstore, RT: Runtime<BS>>(
-    _state: &mut ExecutionState,
-    _platform: &'r System<'r, BS, RT>,
-) -> Result<(), StatusCode> {
-    todo!()
+    state: &mut ExecutionState,
+    platform: &'r System<'r, BS, RT>,
+) {
+    state.stack.push(U256::from(platform.rt.message().receiver().id().unwrap()))
 }
 
 #[inline]
 pub fn origin<'r, BS: Blockstore, RT: Runtime<BS>>(
     state: &mut ExecutionState,
     platform: &'r System<'r, BS, RT>,
 ) {
-    state.stack.push(U256::from(platform.rt.message().caller().id().unwrap()))
+    state.stack.push(U256::from(platform.rt.message().origin().id().unwrap()))
 }
 
 #[inline]

diff --git a/actors/evm/tests/basic.rs b/actors/evm/tests/basic.rs
@@ -18,6 +18,7 @@ fn basic_contract_construction_and_invocation() {
     // invoke constructor
     rt.actor_code_cids.insert(contract, *EVM_ACTOR_CODE_ID);
     rt.expect_validate_caller_any();
+    rt.set_origin(contract);
 
     let result = rt
         .call::<evm::EvmContractActor>(
@@ -33,7 +34,7 @@ fn basic_contract_construction_and_invocation() {
     solidity_params.append(&mut hex::decode("f8b2cb4f").unwrap()); // function selector
                                                                    // caller id address in U256 form
     let mut arg0 = vec![0u8; 32];
-    //arg0[31] = 100;
+    arg0[31] = 100; // the contract address
     solidity_params.append(&mut arg0);
 
     let params = evm::InvokeParams { input_data: RawBytes::from(solidity_params) };

diff --git a/runtime/src/runtime/fvm.rs b/runtime/src/runtime/fvm.rs
@@ -85,6 +85,10 @@ impl MessageInfo for FvmMessage {
         Address::new_id(fvm::message::caller())
     }
 
+    fn origin(&self) -> Address {
+        Address::new_id(fvm::message::origin())
+    }
+
     fn receiver(&self) -> Address {
         Address::new_id(fvm::message::receiver())
     }

diff --git a/runtime/src/runtime/mod.rs b/runtime/src/runtime/mod.rs
@@ -169,6 +169,9 @@ pub trait MessageInfo {
     /// The address of the immediate calling actor. Always an ID-address.
     fn caller(&self) -> Address;
 
+    /// The address of the origin of the current invocation. Always an ID-address
+    fn origin(&self) -> Address;
+
     /// The address of the actor receiving the message. Always an ID-address.
     fn receiver(&self) -> Address;
 

diff --git a/runtime/src/test_utils.rs b/runtime/src/test_utils.rs
@@ -113,6 +113,7 @@ pub struct MockRuntime {
     pub receiver: Address,
     pub caller: Address,
     pub caller_type: Cid,
+    pub origin: Address,
     pub value_received: TokenAmount,
     pub hash_func: Box<dyn Fn(&[u8]) -> [u8; 32]>,
     pub network_version: NetworkVersion,
@@ -258,6 +259,7 @@ impl Default for MockRuntime {
             receiver: Address::new_id(0),
             caller: Address::new_id(0),
             caller_type: Default::default(),
+            origin: Address::new_id(0),
             value_received: Default::default(),
             hash_func: Box::new(blake2b_256),
             network_version: NetworkVersion::V0,
@@ -423,6 +425,10 @@ impl MockRuntime {
         self.actor_code_cids.insert(address, code_id);
     }
 
+    pub fn set_origin(&mut self, address: Address) {
+        self.origin = address;
+    }
+
     pub fn set_address_actor_type(&mut self, address: Address, actor_type: Cid) {
         self.actor_code_cids.insert(address, actor_type);
     }
@@ -658,6 +664,9 @@ impl MessageInfo for MockRuntime {
     fn caller(&self) -> Address {
         self.caller
     }
+    fn origin(&self) -> Address {
+        self.origin
+    }
     fn receiver(&self) -> Address {
         self.receiver
     }

diff --git a/test_vm/src/lib.rs b/test_vm/src/lib.rs
@@ -520,6 +520,9 @@ impl MessageInfo for InvocationCtx<'_, '_> {
     fn caller(&self) -> Address {
         self.msg.from
     }
+    fn origin(&self) -> Address {
+        self.resolve_address(&self.top.originator_stable_addr).unwrap()
+    }
     fn receiver(&self) -> Address {
         self.to()
     }