update: integrate l-monninger feedback

Author: 0xmovses

protocol-units/bridge/chains/ethereum/src/client.rs

@@ -1,4 +1,4 @@
-use crate::utils::send_transaction;
+use crate::utils::{calculate_storage_slot, send_transaction, send_transaction_rules};
 use alloy::primitives::{private::serde::Deserialize, Address, FixedBytes, U256};
 use alloy::providers::{Provider, ProviderBuilder, RootProvider};
 use alloy::signers::k256::elliptic_curve::SecretKey;
@@ -26,7 +26,6 @@ use crate::types::{
 	AlloyProvider, AtomicBridgeCounterparty, AtomicBridgeInitiator, CounterpartyContract,
 	EthAddress, EthHash, InitiatorContract,
 };
-use crate::utils::{calculate_storage_slot, send_tx_rules};
 
 const GAS_LIMIT: u128 = 10_000_000_000_000_000;
 const RETRIES: u32 = 6;
@@ -127,7 +126,7 @@ impl EthClient {
 	) -> Result<(), anyhow::Error> {
 		let contract = self.initiator_contract().expect("Initiator contract not set");
 		let call = contract.initialize(weth.0, owner.0);
-		send_transaction(call.to_owned(), &send_tx_rules(), RETRIES, GAS_LIMIT)
+		send_transaction(call.to_owned(), &send_transaction_rules(), RETRIES, GAS_LIMIT)
 			.await
 			.expect("Failed to send transaction");
 		Ok(())
@@ -236,15 +235,14 @@ impl BridgeContractInitiator for EthClient {
 				U256::from(time_lock.0),
 			)
 			.value(U256::from(amount.0));
-		let _ =
-			send_transaction(call, &send_tx_rules(), RETRIES, GAS_LIMIT)
-				.await
-				.map_err(|e| {
-					BridgeContractInitiatorError::GenericError(format!(
-						"Failed to send transaction: {}",
-						e
-					))
-				})?;
+		let _ = send_transaction(call, &send_transaction_rules(), RETRIES, GAS_LIMIT)
+			.await
+			.map_err(|e| {
+				BridgeContractInitiatorError::GenericError(format!(
+					"Failed to send transaction: {}",
+					e
+				))
+			})?;
 		Ok(())
 	}
 
@@ -267,7 +265,7 @@ impl BridgeContractInitiator for EthClient {
 			AtomicBridgeInitiator::new(self.initiator_contract_address()?, &self.rpc_provider);
 		let call = contract
 			.completeBridgeTransfer(FixedBytes(bridge_transfer_id.0), FixedBytes(pre_image));
-		send_transaction(call, &send_tx_rules(), RETRIES, GAS_LIMIT)
+		send_transaction(call, &send_transaction_rules(), RETRIES, GAS_LIMIT)
 			.await
 			.expect("Failed to send transaction");
 		Ok(())
@@ -280,7 +278,7 @@ impl BridgeContractInitiator for EthClient {
 		let contract =
 			AtomicBridgeInitiator::new(self.initiator_contract_address()?, &self.rpc_provider);
 		let call = contract.refundBridgeTransfer(FixedBytes(bridge_transfer_id.0));
-		send_transaction(call, &send_tx_rules(), RETRIES, GAS_LIMIT)
+		send_transaction(call, &send_transaction_rules(), RETRIES, GAS_LIMIT)
 			.await
 			.expect("Failed to send transaction");
 		Ok(())
@@ -346,7 +344,7 @@ impl BridgeContractCounterparty for EthClient {
 			recipient.0 .0,
 			U256::from(amount.0),
 		);
-		send_transaction(call, &send_tx_rules(), RETRIES, GAS_LIMIT)
+		send_transaction(call, &send_transaction_rules(), RETRIES, GAS_LIMIT)
 			.await
 			.expect("Failed to send transaction");
 		Ok(())
@@ -364,7 +362,7 @@ impl BridgeContractCounterparty for EthClient {
 		let secret: [u8; 32] = secret.0.try_into().unwrap();
 		let call =
 			contract.completeBridgeTransfer(FixedBytes(bridge_transfer_id.0), FixedBytes(secret));
-		send_transaction(call, &send_tx_rules(), RETRIES, GAS_LIMIT)
+		send_transaction(call, &send_transaction_rules(), RETRIES, GAS_LIMIT)
 			.await
 			.expect("Failed to send transaction");
 		Ok(())
@@ -379,7 +377,7 @@ impl BridgeContractCounterparty for EthClient {
 			&self.rpc_provider,
 		);
 		let call = contract.abortBridgeTransfer(FixedBytes(bridge_transfer_id.0));
-		send_transaction(call, &send_tx_rules(), RETRIES, GAS_LIMIT)
+		send_transaction(call, &send_transaction_rules(), RETRIES, GAS_LIMIT)
 			.await
 			.expect("Failed to send transaction");
 		Ok(())

protocol-units/bridge/chains/ethereum/src/utils.rs

@@ -83,7 +83,7 @@ pub fn calculate_storage_slot(key: [u8; 32], mapping_slot: U256) -> U256 {
 	U256::from_be_slice(&hash.0)
 }
 
-pub(crate) fn send_tx_rules() -> Vec<Box<dyn VerifyRule>> {
+pub(crate) fn send_transaction_rules() -> Vec<Box<dyn VerifyRule>> {
 	let rule1: Box<dyn VerifyRule> = Box::new(SendTransactionErrorRule::<UnderPriced>::new());
 	let rule2: Box<dyn VerifyRule> = Box::new(SendTransactionErrorRule::<InsufficentFunds>::new());
 	vec![rule1, rule2]

protocol-units/bridge/chains/movement/src/lib.rs

@@ -232,9 +232,13 @@ impl BridgeContractCounterparty for MovementClient {
 			self.counterparty_type_args(Call::Lock),
 			args,
 		);
-		let _ = utils::send_aptos_transaction(&self.rest_client, self.signer.as_ref(), payload)
-			.await
-			.map_err(|_| BridgeContractCounterpartyError::LockTransferAssetsError);
+		let _ = utils::send_and_confirm_aptos_transaction(
+			&self.rest_client,
+			self.signer.as_ref(),
+			payload,
+		)
+		.await
+		.map_err(|_| BridgeContractCounterpartyError::LockTransferAssetsError);
 		Ok(())
 	}
 
@@ -256,9 +260,13 @@ impl BridgeContractCounterparty for MovementClient {
 			args,
 		);
 
-		let _ = utils::send_aptos_transaction(&self.rest_client, self.signer.as_ref(), payload)
-			.await
-			.map_err(|_| BridgeContractCounterpartyError::CompleteTransferError);
+		let _ = utils::send_and_confirm_aptos_transaction(
+			&self.rest_client,
+			self.signer.as_ref(),
+			payload,
+		)
+		.await
+		.map_err(|_| BridgeContractCounterpartyError::CompleteTransferError);
 		Ok(())
 	}
 
@@ -277,9 +285,13 @@ impl BridgeContractCounterparty for MovementClient {
 			self.counterparty_type_args(Call::Abort),
 			args,
 		);
-		let _ = utils::send_aptos_transaction(&self.rest_client, self.signer.as_ref(), payload)
-			.await
-			.map_err(|_| BridgeContractCounterpartyError::AbortTransferError);
+		let _ = utils::send_and_confirm_aptos_transaction(
+			&self.rest_client,
+			self.signer.as_ref(),
+			payload,
+		)
+		.await
+		.map_err(|_| BridgeContractCounterpartyError::AbortTransferError);
 		Ok(())
 	}
 

protocol-units/bridge/chains/movement/src/utils.rs

@@ -94,7 +94,7 @@ pub struct Indexed<T> {
 }
 
 /// Send Aptos Transaction
-pub async fn send_aptos_transaction(
+pub async fn send_and_confirm_aptos_transaction(
 	rest_client: &RestClient,
 	signer: &LocalAccount,
 	payload: TransactionPayload,

protocol-units/bridge/contracts/src/AtomicBridgeInitiator.sol

@@ -66,6 +66,8 @@ contract AtomicBridgeInitiator is IAtomicBridgeInitiator, OwnableUpgradeable {
         // Update the pool balance
         poolBalance += totalAmount;
 
+        // The nonce is used to generate a unique bridge transfer id, without it 
+        // we can't guarantee the uniqueness of the id.
         nonce++; // increment the nonce
         bridgeTransferId =
             keccak256(abi.encodePacked(originator, recipient, hashLock, timeLock, block.number, nonce));