Fix compilation issues

bridge-proxy/Cargo.toml

@@ -14,6 +14,9 @@ path = "../common/transaction"
 [dependencies.eth-address]
 path = "../common/eth-address"
 
+[dependencies.esdt-safe]
+path = "../esdt-safe"
+
 [dependencies.multiversx-sc]
 version = "=0.47.5"
 

bridge-proxy/src/bridge-proxy.rs

@@ -5,6 +5,7 @@ multiversx_sc::derive_imports!();
 
 pub mod config;
 
+use esdt_safe::ProxyTrait as _;
 use transaction::EthTransaction;
 
 #[multiversx_sc::contract]
@@ -26,16 +27,17 @@ pub trait BridgeProxyContract:
     #[endpoint]
     fn deposit(&self, eth_tx: EthTransaction<Self::Api>) {
         self.require_not_paused();
-        let (token_id, amount) = self.call_value().single_fungible_esdt().into_tuple();
+        let (token_id, amount) = self.call_value().single_fungible_esdt();
         require!(token_id == eth_tx.token_id, "Invalid token id");
         require!(amount == eth_tx.amount, "Invalid amount");
         self.pending_transactions().push(&eth_tx);
     }
 
     #[endpoint(executeWithAsnyc)]
-    fn execute_with_async(&self, tx_id: u64) {
+    fn execute_with_async(&self, tx_id: usize) {
         self.require_not_paused();
-        let tx = self.pending_transactions().get_or_else(tx_id, || panic!("Invalid tx id"));
+        let tx = self.get_pending_transaction_by_id(tx_id);
+
         require!(
             tx.call_data.is_some(),
             "There is no data for a SC call!"
@@ -56,21 +58,27 @@ pub trait BridgeProxyContract:
     fn execution_callback(
         &self,
         #[call_result] result: ManagedAsyncCallResult<()>,
-        tx_id: u64,
+        tx_id: usize,
     ) {
         if result.is_err() {
             self.refund_transaction(tx_id);
         }
         self.pending_transactions().clear_entry_unchecked(tx_id);
     }
 
-    fn refund_transaction(&self, tx_id: u64) {
-        let tx = self.eth_transaction().get(tx_id);
+    fn refund_transaction(&self, tx_id: usize) {
+        let tx = self.get_pending_transaction_by_id(tx_id);
 
         let _: IgnoreValue = self
             .get_esdt_safe_proxy_instance()
             .create_transaction(tx.from)
             .with_esdt_transfer((tx.token_id.clone(), 0, tx.amount.clone()))
             .execute_on_dest_context();
     }
+
+    #[view(getPendingTransactionById)]
+    fn get_pending_transaction_by_id(&self, tx_id: usize) -> EthTransaction<Self::Api> {
+        self.pending_transactions().get_or_else(tx_id, || panic!("Invalid tx id"))
+    }
+
 }

bridge-proxy/src/config.rs

@@ -2,7 +2,6 @@ multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
 use transaction::EthTransaction;
-use esdt_safe::ProxyTrait as _;
 
 #[multiversx_sc::module]
 pub trait ConfigModule {

bridge-proxy/tests/bridge_proxy_blackbox_test.rs

@@ -27,7 +27,7 @@ use multiversx_sc_scenario::{
 };
 
 use eth_address::*;
-use transaction::{CallData, EthTransaction, EthTransactionPayment};
+use transaction::{CallData, EthTransaction};
 
 const BRIDGE_TOKEN_ID: &[u8] = b"BRIDGE-123456";
 const GAS_LIMIT: u64 = 1_000_000;
@@ -161,7 +161,7 @@ fn deploy_deposit_test() {
     test.world.sc_query(
         ScQueryStep::new()
             .to(&test.bridge_proxy_contract)
-            .call(test.bridge_proxy_contract.get_eth_transaction_by_id(1u32))
+            .call(test.bridge_proxy_contract.get_pending_transaction_by_id(1u32))
             .expect_value(eth_tx),
     );
 
@@ -251,14 +251,14 @@ fn multiple_deposit_test() {
     test.world.sc_query(
         ScQueryStep::new()
             .to(&test.bridge_proxy_contract)
-            .call(test.bridge_proxy_contract.get_eth_transaction_by_id(1u32))
+            .call(test.bridge_proxy_contract.get_pending_transaction_by_id(1u32))
             .expect_value(eth_tx1),
     );
 
     test.world.sc_query(
         ScQueryStep::new()
             .to(&test.bridge_proxy_contract)
-            .call(test.bridge_proxy_contract.get_eth_transaction_by_id(2u32))
+            .call(test.bridge_proxy_contract.get_pending_transaction_by_id(2u32))
             .expect_value(eth_tx2),
     );