feat: add missing self call methods

res/mock_evm/src/lib.rs

@@ -8,6 +8,7 @@ use near_sdk::{near_bindgen, PanicOnDefault};
 pub mod ft;
 mod metadata;
 mod out;
+mod selfcall;
 mod storage;
 
 fn dummy_submit_result() -> SubmitResult {
@@ -42,10 +43,6 @@ impl MockEvmContract {
         }
     }
 
-    pub fn new_eth_connector(&mut self, #[serializer(borsh)] input: SetEthConnectorInput) {
-        self.eth_connector = Some(input);
-    }
-
     #[result_serializer(borsh)]
     pub fn deploy_code(&mut self, #[serializer(borsh)] _input: Raw) -> SubmitResult {
         dummy_submit_result()

res/mock_evm/src/selfcall.rs

@@ -0,0 +1,38 @@
+use aurora_workspace_types::input::SetEthConnectorInput;
+use aurora_workspace_types::Raw;
+use near_sdk::{borsh, near_bindgen};
+use near_sdk::{json_types::U128, serde_json};
+
+use crate::{MockEvmContract, MockEvmContractExt};
+
+#[near_bindgen]
+impl MockEvmContract {
+    pub fn new_eth_connector(&mut self, #[serializer(borsh)] input: SetEthConnectorInput) {
+        self.eth_connector = Some(input);
+    }
+
+    pub fn ft_resolve_transfer(&mut self, #[serializer(borsh)] _input: Raw) -> String {
+        serde_json::to_string(&U128::from(0)).expect("Failed to serialize message")
+    }
+
+    pub fn set_eth_connector_contract_data(&mut self, #[serializer(borsh)] _input: Raw) {}
+
+    pub fn set_paused_flags(&mut self, #[serializer(borsh)] _input: Raw) {}
+
+    // Callbacks:
+
+    #[result_serializer(borsh)]
+    pub fn finish_deposit(&self, #[serializer(borsh)] _input: Raw) -> u8 {
+        0
+    }
+
+    #[result_serializer(borsh)]
+    pub fn factory_update_address_version(&mut self, #[serializer(borsh)] _input: Raw) -> u8 {
+        0
+    }
+
+    #[result_serializer(borsh)]
+    pub fn refund_on_error(&mut self, #[serializer(borsh)] _input: Raw) -> u8 {
+        0
+    }
+}

workspace/src/contract.rs

@@ -1,18 +1,25 @@
 use crate::operation::{
-    Call, CallDeployCode, CallDeployErc20, CallEvm, CallFtOnTransfer, CallFtTransfer,
-    CallFtTransferCall, CallRegisterRelayer, CallStorageDeposit, CallStorageUnregister,
-    CallStorageWithdraw, CallSubmit, View, ViewResultDetails,
+    Call, CallDeployCode, CallDeployErc20, CallEvm, CallFactoryUpdateAddressVersion,
+    CallFinishDeposit, CallFtOnTransfer, CallFtResolveTransfer, CallFtTransfer, CallFtTransferCall,
+    CallRefundOnError, CallRegisterRelayer, CallSetEthConnectorContractData, CallSetPausedFlags,
+    CallStorageDeposit, CallStorageUnregister, CallStorageWithdraw, CallSubmit, SelfCall, View,
+    ViewResultDetails,
 };
 #[cfg(feature = "deposit-withdraw")]
 use crate::operation::{CallDeposit, CallWithdraw};
 use crate::{EvmCallTransaction, Result};
-use aurora_engine::parameters::{
-    GetStorageAtArgs, InitCallArgs, StorageBalance, StorageDepositCallArgs,
-    StorageWithdrawCallArgs, TransactionStatus, TransferCallArgs, TransferCallCallArgs,
-};
-use aurora_engine::{fungible_token::FungibleTokenMetadata, parameters::ViewCallArgs};
 use aurora_workspace_types::input::IsUsedProofCallArgs;
 use aurora_workspace_types::input::ProofInput;
+use aurora_engine::{fungible_token::FungibleTokenMetadata, parameters::ViewCallArgs};
+use aurora_engine::{parameters::PauseEthConnectorCallArgs};
+use aurora_engine::{
+    parameters::{
+        FinishDepositCallArgs, GetStorageAtArgs, InitCallArgs, 
+        ResolveTransferCallArgs, SetContractDataCallArgs, StorageBalance, StorageDepositCallArgs,
+        StorageWithdrawCallArgs, TransactionStatus, TransferCallArgs, TransferCallCallArgs,
+    },
+    xcc::AddressVersionUpdateArgs,
+};
 #[cfg(feature = "deposit-withdraw")]
 use aurora_workspace_types::input::WithdrawInput;
 use aurora_workspace_types::input::{CallInput, DeployErc20Input, FtOnTransferInput};
@@ -185,6 +192,110 @@ impl<U> EvmAccount<U> {
         self.account.id()
     }
 
+    pub async fn new_eth_connector(
+        &self,
+        prover_account: impl AsRef<str>,
+        eth_custodian_address: impl Into<String>,
+        metadata: FungibleTokenMetadata,
+    ) -> Result<()> {
+        let args = InitCallArgs {
+            prover_account: aurora_engine_types::account_id::AccountId::from_str(
+                prover_account.as_ref(),
+            )
+            .unwrap(),
+            eth_custodian_address: eth_custodian_address.into(),
+            metadata,
+        };
+        self.near_call(&SelfCall::NewEthConnector)
+            .args_borsh(args)
+            .transact()
+            .await?
+            .into_result()?;
+        Ok(())
+    }
+
+    pub fn set_eth_connector_contract_data(
+        &self,
+        prover_account: impl AsRef<str>,
+        eth_custodian_address: impl Into<String>,
+        metadata: FungibleTokenMetadata,
+    ) -> CallSetEthConnectorContractData<'_> {
+        let args = SetContractDataCallArgs {
+            prover_account: aurora_engine_types::account_id::AccountId::new(
+                prover_account.as_ref(),
+            )
+            .unwrap(),
+            eth_custodian_address: eth_custodian_address.into(),
+            metadata,
+        };
+        CallSetEthConnectorContractData(
+            self.near_call(&SelfCall::SetEthConnectorContractData)
+                .args_borsh(args),
+        )
+    }
+
+    pub fn set_paused_flags(&self, paused_mask: u8) -> CallSetPausedFlags<'_> {
+        let args = PauseEthConnectorCallArgs { paused_mask };
+        CallSetPausedFlags(self.near_call(&SelfCall::SetPausedFlags).args_borsh(args))
+    }
+
+    pub fn finish_deposit(
+        &self,
+        new_owner_id: impl AsRef<str>,
+        amount: u128,
+        proof_key: impl Into<String>,
+        relayer_id: impl AsRef<str>,
+        fee: u128,
+        msg: Option<Vec<u8>>,
+    ) -> CallFinishDeposit<'_> {
+        let args = FinishDepositCallArgs {
+            // TODO: handle errors. maybe we should just accept AccountId and let the user deal with
+            // error handling? seems to make more sense
+            new_owner_id: aurora_engine_types::account_id::AccountId::new(new_owner_id.as_ref())
+                .unwrap(),
+            amount: aurora_engine_types::types::NEP141Wei::new(amount),
+            proof_key: proof_key.into(),
+            relayer_id: aurora_engine_types::account_id::AccountId::new(relayer_id.as_ref())
+                .unwrap(),
+            fee: fee.into(),
+            msg,
+        };
+        CallFinishDeposit(self.near_call(&SelfCall::FinishDeposit).args_borsh(args))
+    }
+
+    pub fn factory_update_address_version(
+        &self,
+        address: impl Into<Address>,
+        version: u32,
+    ) -> CallFactoryUpdateAddressVersion<'_> {
+        let args = AddressVersionUpdateArgs {
+            address: aurora_engine_types::types::Address::new(address.into()),
+            version: aurora_engine::xcc::CodeVersion(version),
+        };
+        CallFactoryUpdateAddressVersion(
+            self.near_call(&SelfCall::FactoryUpdateAddressVersion)
+                .args_borsh(args),
+        )
+    }
+
+    pub fn refund_on_error<A: Into<Address>>(
+        &self,
+        recipient_address: A,
+        erc20_address: Option<A>,
+        amount: U256,
+    ) -> CallRefundOnError<'_> {
+        let mut raw_amount: aurora_engine_types::types::RawU256 = Default::default();
+        amount.to_big_endian(&mut raw_amount);
+        let args = aurora_engine_types::parameters::RefundCallArgs {
+            recipient_address: aurora_engine_types::types::Address::new(recipient_address.into()),
+            erc20_address: erc20_address
+                .map(Into::into)
+                .map(aurora_engine_types::types::Address::new),
+            amount: raw_amount,
+        };
+        CallRefundOnError(self.near_call(&SelfCall::RefundOnError).args_borsh(args))
+    }
+
     /// Deploys contract code using the caller's NEAR account ID as an Ethereum address.
     ///
     /// The logic which creates the ETH address is as follows:
@@ -294,6 +405,25 @@ impl<U> EvmAccount<U> {
         CallFtTransferCall(self.near_call(&Call::FtTransferCall).args_json(args))
     }
 
+    pub fn ft_resolve_transfer(
+        &self,
+        sender_id: impl AsRef<str>,
+        amount: u128,
+        receiver_id: impl AsRef<str>,
+    ) -> CallFtResolveTransfer<'_> {
+        let args = ResolveTransferCallArgs {
+            // TODO: impl error
+            sender_id: aurora_engine_types::account_id::AccountId::new(sender_id.as_ref()).unwrap(),
+            amount: aurora_engine_types::types::NEP141Wei::new(amount),
+            receiver_id: aurora_engine_types::account_id::AccountId::new(receiver_id.as_ref())
+                .unwrap(),
+        };
+        CallFtResolveTransfer(
+            self.near_call(&SelfCall::FtResolveTransfer)
+                .args_borsh(args),
+        )
+    }
+
     // TODO we are not NEP-145 compliant
     pub fn storage_deposit<A: AsRef<str>>(
         &self,
@@ -670,20 +800,13 @@ impl EvmContract {
             .into_result()?;
 
         if let Some(eth_prover_config) = init_config.eth_prover_config {
-            let new_eth_connector_args = InitCallArgs {
-                prover_account: aurora_engine_types::account_id::AccountId::from_str(
+            self.contract
+                .new_eth_connector(
                     eth_prover_config.account_id.as_str(),
+                    eth_prover_config.evm_custodian_address,
+                    FungibleTokenMetadata::default(),
                 )
-                .unwrap(),
-                eth_custodian_address: eth_prover_config.evm_custodian_address,
-                metadata: FungibleTokenMetadata::default(),
-            };
-            self.contract
-                .near_call("new_eth_connector")
-                .args_borsh(new_eth_connector_args)
-                .transact()
-                .await?
-                .into_result()?;
+                .await?;
         }
 
         Ok(())

workspace/src/operation.rs

@@ -18,7 +18,7 @@ use workspaces::operations::CallTransaction;
 use workspaces::result::ExecutionFinalResult;
 
 macro_rules! impl_call_return  {
-    ($(($name:ident, $return:ty, $fun:ident)),*) => {
+    ( $( ($name:ident, $return:ty, $deser_fn:ident)),* $(,)? ) => {
         $(pub struct $name<'a>(pub(crate) EvmCallTransaction<'a>);
 
         impl<'a> $name<'a> {
@@ -33,7 +33,7 @@ macro_rules! impl_call_return  {
             }
 
             pub async fn transact(self) -> Result<$return> {
-                ExecutionSuccess::$fun(self.0.transact().await?)
+                ExecutionSuccess::$deser_fn(self.0.transact().await?)
             }
         })*
     }
@@ -51,10 +51,28 @@ impl_call_return![
     (CallRegisterRelayer, ExecutionSuccess<()>, try_from),
     (CallFtOnTransfer, ExecutionSuccess<String>, try_from_json),
     (CallFtTransfer, ExecutionSuccess<()>, try_from),
+    (
+        CallFtResolveTransfer,
+        ExecutionSuccess<String>,
+        try_from_json
+    ),
     (CallFtTransferCall, ExecutionSuccess<PromiseId>, try_from),
     (CallStorageDeposit, ExecutionSuccess<()>, try_from),
     (CallStorageUnregister, ExecutionSuccess<()>, try_from),
-    (CallStorageWithdraw, ExecutionSuccess<()>, try_from)
+    (CallStorageWithdraw, ExecutionSuccess<()>, try_from),
+    (
+        CallSetEthConnectorContractData,
+        ExecutionSuccess<()>,
+        try_from_borsh
+    ),
+    (CallSetPausedFlags, ExecutionSuccess<()>, try_from_borsh),
+    (CallFinishDeposit, ExecutionSuccess<u8>, try_from_borsh),
+    (
+        CallFactoryUpdateAddressVersion,
+        ExecutionSuccess<u8>,
+        try_from_borsh
+    ),
+    (CallRefundOnError, ExecutionSuccess<u8>, try_from_borsh),
 ];
 
 #[cfg(feature = "deposit-withdraw")]
@@ -312,10 +330,10 @@ pub enum View {
     EthTotalSupply,
     FtMetadata,
     StorageBalanceOf,
-    PausedFlags,     // TODO
+    PausedFlags,
     AccountsCounter, // TODO
-    Erc20FromNep141, // TODO
-    Nep141FromErc20, // TODO
+    Erc20FromNep141,
+    Nep141FromErc20,
 }
 
 impl AsRef<str> for View {
@@ -409,7 +427,7 @@ impl AsRef<str> for SelfCall {
             FactoryUpdateAddressVersion => "factory_update_address_version",
             RefundOnError => "refund_on_error",
             FinishDeposit => "finish_deposit",
-            FtResolveTransfer => "resolve_transfer",
+            FtResolveTransfer => "ft_resolve_transfer",
             SetPausedFlags => "set_paused_flags",
         }
     }