Fix get_invoker_type (#486)

* Fix get_invoker_type

* fix

soroban-env-common/src/env.rs

@@ -188,7 +188,7 @@ macro_rules! call_macro_with_all_host_functions {
                 {"a", fn log_fmt_values(fmt:Object, args:Object) -> RawVal }
                 /// Get whether the contract invocation is from an account or
                 /// another contract. Returns 0 for account, 1 for contract.
-                {"b", fn get_invoker_type() -> u32 }
+                {"b", fn get_invoker_type() -> u64 }
                 /// Get the AccountID object type of the account which invoked
                 /// the running contract. Traps if the running contract was not
                 /// invoked by an account.

soroban-env-common/src/invoker.rs

@@ -1,24 +1,24 @@
 use crate::ConversionError;
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
-#[repr(u32)]
+#[repr(u64)]
 pub enum InvokerType {
     Account = 0,
     Contract = 1,
 }
 
-impl From<InvokerType> for u32 {
+impl From<InvokerType> for u64 {
     fn from(v: InvokerType) -> Self {
-        v as u32
+        v as u64
     }
 }
 
-impl TryFrom<u32> for InvokerType {
+impl TryFrom<u64> for InvokerType {
     type Error = ConversionError;
 
-    fn try_from(v: u32) -> Result<Self, Self::Error> {
-        const ACCOUNT: u32 = InvokerType::Account as u32;
-        const CONTRACT: u32 = InvokerType::Contract as u32;
+    fn try_from(v: u64) -> Result<Self, Self::Error> {
+        const ACCOUNT: u64 = InvokerType::Account as u64;
+        const CONTRACT: u64 = InvokerType::Contract as u64;
         match v {
             ACCOUNT => Ok(Self::Account),
             CONTRACT => Ok(Self::Contract),

soroban-env-common/src/meta.rs

@@ -56,5 +56,5 @@
 // implementations over a long period of time.
 
 soroban_env_macros::generate_env_meta_consts!(
-    interface_version: 18,
+    interface_version: 19,
 );

soroban-env-host/src/host.rs

@@ -1159,21 +1159,22 @@ impl VmCallerCheckedEnv for Host {
     }
 
     // TODO: Assess metering.
-    fn get_invoker_type(&self, _vmcaller: &mut VmCaller<Host>) -> Result<u32, HostError> {
+    fn get_invoker_type(&self, _vmcaller: &mut VmCaller<Host>) -> Result<u64, HostError> {
         let frames = self.0.context.borrow();
         // If the previous frame exists and is a contract, return its ID, otherwise return
         // the account invoking.
         let st = match frames.as_slice() {
+            // There are always two frames when WASM is executed in the VM.
             [.., f2, _] => match f2 {
                 #[cfg(feature = "vm")]
                 Frame::ContractVM(_, _) => Ok(InvokerType::Contract),
-                Frame::HostFunction(_) => Err(self.err_general(
-                    "host function found in second to last frame which is unexpected",
-                )),
+                Frame::HostFunction(_) => Ok(InvokerType::Account),
                 Frame::Token(id, _) => Ok(InvokerType::Contract),
                 #[cfg(feature = "testutils")]
                 Frame::TestContract(_, _) => Ok(InvokerType::Contract),
             },
+            // In tests contracts are executed with a single frame.
+            // TODO: Investigate this discrepancy: https://github.com/stellar/rs-soroban-env/issues/485.
             [f1] => match f1 {
                 #[cfg(feature = "vm")]
                 Frame::ContractVM(_, _) => {
@@ -1188,12 +1189,12 @@ impl VmCallerCheckedEnv for Host {
             },
             _ => Err(self.err_general("no frames to derive the invoker from")),
         }?;
-        Ok(st as u32)
+        Ok(st as u64)
     }
 
     // Notes on metering: covered by the components
     fn get_invoking_account(&self, vmcaller: &mut VmCaller<Host>) -> Result<Object, HostError> {
-        if self.get_invoker_type(vmcaller)? != InvokerType::Account as u32 {
+        if self.get_invoker_type(vmcaller)? != InvokerType::Account as u64 {
             return Err(self.err_general("invoker is not an account"));
         }
         Ok(self

soroban-env-host/src/host/data_helper.rs

@@ -109,7 +109,7 @@ impl Host {
 
     // notes on metering: covers the key and salt. Rest are free.
     pub fn id_preimage_from_source_account(&self, salt: Uint256) -> Result<Vec<u8>, HostError> {
-        if self.get_invoker_type()? != InvokerType::Account as u32 {
+        if self.get_invoker_type()? != InvokerType::Account as u64 {
             return Err(self.err_general("invoker is not an account"));
         }
 

soroban-test-wasms/wasm-workspace/Cargo.toml

@@ -94,9 +94,9 @@ wasmi = { package = "soroban-wasmi", git = "https://github.com/stellar/wasmi", r
 # when you change the Env trait itself, and whatever change you make to Env may
 # well cause recompilation to fail. Again, you will know if it doesn't compile!
 
-soroban-sdk = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "1d1c866d" }
-soroban-sdk-macros = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "1d1c866d" }
-soroban-spec = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "ad95e20c" }
+soroban-sdk = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "fcbcc1bf" }
+soroban-sdk-macros = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "fcbcc1bf" }
+soroban-spec = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "fcbcc1bf" }
 
 # soroban-sdk = { path = "../../../rs-soroban-sdk/soroban-sdk" }
 # soroban-sdk-macros = { path = "../../../rs-soroban-sdk/soroban-sdk-macros"}