update: add generic V assign concrete types

Author: 0xmovses

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

@@ -15,8 +15,8 @@ use bridge_shared::bridge_contracts::{
 	BridgeContractInitiator, BridgeContractInitiatorError, BridgeContractInitiatorResult,
 };
 use bridge_shared::types::{
-	Amount, BridgeTransferDetails, BridgeTransferId, HashLock, HashLockPreImage, InitiatorAddress,
-	RecipientAddress, TimeLock,
+	Amount, BridgeTransferDetails, BridgeTransferId, EthValue, HashLock, HashLockPreImage,
+	InitiatorAddress, RecipientAddress, TimeLock,
 };
 use serde_with::serde_as;
 use std::fmt::{self, Debug};
@@ -135,7 +135,11 @@ impl EthClient {
 		Ok(())
 	}
 
-	pub async fn deposit_weth_and_approve(&mut self, caller: Address, amount: U256) -> Result<(), anyhow::Error> {
+	pub async fn deposit_weth_and_approve(
+		&mut self,
+		caller: Address,
+		amount: U256,
+	) -> Result<(), anyhow::Error> {
 		let provider_signer = self.rpc_provider.default_signer_address();
 		let deposit_weth_signer = self.get_signer_address();
 		println!("provider_signer: {:?}", provider_signer);
@@ -145,12 +149,17 @@ impl EthClient {
 		send_transaction(call, &utils::send_tx_rules(), RETRIES, GAS_LIMIT)
 			.await
 			.expect("Failed to deposit eth to weth contract");
-		
-	
-		let approve_call: alloy::contract::CallBuilder<_, &_, _> = contract.approve(self.initiator_contract_address()?, amount).from(deposit_weth_signer);
-		let WETH9::balanceOfReturn { _0: balance } = contract.balanceOf(deposit_weth_signer).call().await.expect("Failed to get balance");
+
+		let approve_call: alloy::contract::CallBuilder<_, &_, _> = contract
+			.approve(self.initiator_contract_address()?, amount)
+			.from(deposit_weth_signer);
+		let WETH9::balanceOfReturn { _0: balance } = contract
+			.balanceOf(deposit_weth_signer)
+			.call()
+			.await
+			.expect("Failed to get balance");
 		println!("balance: {}", balance);
-	
+
 		send_transaction(approve_call, &utils::send_tx_rules(), RETRIES, GAS_LIMIT)
 			.await
 			.expect("Failed to approve");
@@ -212,7 +221,7 @@ impl EthClient {
 			)),
 		}
 	}
-	
+
 	pub fn weth_contract(&self) -> BridgeContractWETH9Result<&WETH9Contract> {
 		match &self.weth_contract {
 			Some(contract) => Ok(contract),
@@ -222,7 +231,6 @@ impl EthClient {
 		}
 	}
 
-
 	pub fn counterparty_contract_address(&self) -> BridgeContractCounterpartyResult<Address> {
 		match &self.counterparty_contract {
 			Some(contract) => Ok(contract.address().to_owned()),
@@ -255,6 +263,7 @@ impl EthClient {
 impl BridgeContractInitiator for EthClient {
 	type Address = EthAddress;
 	type Hash = EthHash;
+	type Value = EthValue;
 
 	// `_initiator_address`, or in the contract, `originator` is set
 	// via the `msg.sender`, which is stored in the `rpc_provider`.
@@ -366,6 +375,7 @@ impl BridgeContractInitiator for EthClient {
 impl BridgeContractCounterparty for EthClient {
 	type Address = EthAddress;
 	type Hash = EthHash;
+	type Value = EthValue;
 
 	async fn lock_bridge_transfer_assets(
 		&mut self,

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

@@ -23,8 +23,8 @@ use bridge_shared::{
 use futures::channel::mpsc::UnboundedReceiver;
 use serde::{Deserialize, Serialize};
 
-use crate::AtomicBridgeInitiator::AtomicBridgeInitiatorInstance;
 use crate::AtomicBridgeCounterparty::AtomicBridgeCounterpartyInstance;
+use crate::AtomicBridgeInitiator::AtomicBridgeInitiatorInstance;
 use crate::WETH9::WETH9Instance;
 pub const INITIATED_SELECT: FixedBytes<32> =
 	AtomicBridgeInitiator::BridgeTransferInitiated::SIGNATURE_HASH;

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

@@ -33,6 +33,7 @@ use tokio::{
 
 use url::Url;
 
+mod types;
 pub mod utils;
 
 const DUMMY_ADDRESS: AccountAddress = AccountAddress::new([0; 32]);
@@ -208,6 +209,7 @@ impl MovementClient {
 impl BridgeContractCounterparty for MovementClient {
 	type Address = MovementAddress;
 	type Hash = [u8; 32];
+	type Value = MovementValue;
 
 	async fn lock_bridge_transfer_assets(
 		&mut self,

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

@@ -0,0 +1 @@
+pub type MovementValue = u64;

protocol-units/bridge/shared/src/bridge_contracts.rs

@@ -1,8 +1,8 @@
 use thiserror::Error;
 
 use crate::types::{
-	Amount, BridgeAddressType, BridgeHashType, BridgeTransferDetails, BridgeTransferId, HashLock,
-	HashLockPreImage, InitiatorAddress, RecipientAddress, TimeLock
+	Amount, BridgeAddressType, BridgeHashType, BridgeTransferDetails, BridgeTransferId,
+	BridgeValueType, HashLock, HashLockPreImage, InitiatorAddress, RecipientAddress, TimeLock,
 };
 
 #[derive(Error, Debug, Clone, PartialEq, Eq)]
@@ -70,14 +70,15 @@ pub type BridgeContractWETH9Result<T> = Result<T, BridgeContractWETH9Error>;
 pub trait BridgeContractInitiator: Clone + Unpin + Send + Sync {
 	type Address: BridgeAddressType;
 	type Hash: BridgeHashType;
+	type Value: BridgeValueType;
 
 	async fn initiate_bridge_transfer(
 		&mut self,
 		initiator_address: InitiatorAddress<Self::Address>,
 		recipient_address: RecipientAddress<Vec<u8>>,
 		hash_lock: HashLock<Self::Hash>,
 		time_lock: TimeLock,
-		amount: Amount,
+		amount: Amount<Self::Value>,
 	) -> BridgeContractInitiatorResult<()>;
 
 	async fn complete_bridge_transfer(
@@ -94,13 +95,16 @@ pub trait BridgeContractInitiator: Clone + Unpin + Send + Sync {
 	async fn get_bridge_transfer_details(
 		&mut self,
 		bridge_transfer_id: BridgeTransferId<Self::Hash>,
-	) -> BridgeContractInitiatorResult<Option<BridgeTransferDetails<Self::Address, Self::Hash>>>;
+	) -> BridgeContractInitiatorResult<
+		Option<BridgeTransferDetails<Self::Address, Self::Hash, Self::Value>>,
+	>;
 }
 
 #[async_trait::async_trait]
 pub trait BridgeContractCounterparty: Clone + Unpin + Send + Sync {
 	type Address: BridgeAddressType;
 	type Hash: BridgeHashType;
+	type Value: BridgeValueType;
 
 	async fn lock_bridge_transfer_assets(
 		&mut self,
@@ -109,7 +113,7 @@ pub trait BridgeContractCounterparty: Clone + Unpin + Send + Sync {
 		time_lock: TimeLock,
 		initiator: InitiatorAddress<Vec<u8>>,
 		recipient: RecipientAddress<Self::Address>,
-		amount: Amount,
+		amount: Amount<Self::Value>,
 	) -> BridgeContractCounterpartyResult<()>;
 
 	async fn complete_bridge_transfer(
@@ -134,8 +138,5 @@ pub trait BridgeContractWETH9: Clone + Unpin + Send + Sync {
 	type Address: BridgeAddressType;
 	type Hash: BridgeHashType;
 
-	async fn deposit_weth(
-		&mut self,
-		amount: Amount,
-	) -> BridgeContractWETH9Result<()>;
+	async fn deposit_weth(&mut self, amount: Amount) -> BridgeContractWETH9Result<()>;
 }

protocol-units/bridge/shared/src/initiator_contract.rs

@@ -14,8 +14,8 @@ use crate::{
 pub type SCIResult<A, H> = Result<SmartContractInitiatorEvent<A, H>, SmartContractInitiatorError>;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub enum SmartContractInitiatorEvent<A, H> {
-	InitiatedBridgeTransfer(BridgeTransferDetails<A, H>),
+pub enum SmartContractInitiatorEvent<A, H, V> {
+	InitiatedBridgeTransfer(BridgeTransferDetails<A, H, V>),
 	CompletedBridgeTransfer(BridgeTransferId<H>),
 }
 

protocol-units/bridge/shared/src/types.rs

@@ -141,76 +141,66 @@ impl From<Uint<256, 4>> for TimeLock {
 }
 
 #[derive(Deref, DerefMut, Debug, Clone, Copy, PartialEq, Eq)]
-pub struct Amount(pub BridgedToken);
-
-impl Amount {
-    pub fn weth(&self) -> u64 {
-        match self.0 {
-            BridgedToken::Weth(value) => value,
-            BridgedToken::WethAndEth((weth_value, eth_value)) => weth_value,
-			_ => 0, 
-        }
-	}
-	pub fn eth(&self) -> u64 {
-		match self.0 {
-			BridgedToken::Eth(value) => value,
-			BridgedToken::WethAndEth((weth_value, eth_value)) => eth_value,
-			_ => 0, 
-		}
-	}
+pub struct Amount<V>(pub V);
+
+pub enum EthValue {
+	Weth(u64),
+	Eth(u64),
+	WethAndEth((u64, u64)),
 }
 
-impl From<Uint<256, 4>> for Amount {
+impl From<Uint<256, 4>> for Amount<EthValue> {
 	fn from(value: Uint<256, 4>) -> Self {
 		// Extract the lower 64 bits.
 		let lower_64_bits: u64 = value.as_limbs()[0];
-		Amount(BridgedToken::Eth(lower_64_bits))
+		//TODO: unit test this for Weth and Eth
+		Amount(EthValue::Eth(lower_64_bits))
 	}
 }
 
 #[derive(Debug, PartialEq, Eq, Clone)]
-pub struct BridgeTransferDetails<A, H> {
+pub struct BridgeTransferDetails<A, H, V> {
 	pub bridge_transfer_id: BridgeTransferId<H>,
 	pub initiator_address: InitiatorAddress<A>,
 	pub recipient_address: RecipientAddress<Vec<u8>>,
 	pub hash_lock: HashLock<H>,
 	pub time_lock: TimeLock,
-	pub amount: Amount,
+	pub amount: Amount<V>,
 }
 
-impl<A, H> Default for BridgeTransferDetails<A, H> {
+impl<A, H, V> Default for BridgeTransferDetails<A, H, V> {
 	fn default() -> Self {
 		todo!()
 	}
 }
 
 #[derive(Debug, PartialEq, Eq, Clone)]
-pub struct LockDetails<A, H> {
+pub struct LockDetails<A, H, V> {
 	pub bridge_transfer_id: BridgeTransferId<H>,
 	pub initiator_address: InitiatorAddress<Vec<u8>>,
 	pub recipient_address: RecipientAddress<A>,
 	pub hash_lock: HashLock<H>,
 	pub time_lock: TimeLock,
-	pub amount: Amount,
+	pub amount: Amount<V>,
 }
 
 #[derive(Debug, PartialEq, Eq, Clone)]
-pub struct CounterpartyCompletedDetails<A, H> {
+pub struct CounterpartyCompletedDetails<A, H, V> {
 	pub bridge_transfer_id: BridgeTransferId<H>,
 	pub initiator_address: InitiatorAddress<Vec<u8>>,
 	pub recipient_address: RecipientAddress<A>,
 	pub hash_lock: HashLock<H>,
 	pub secret: HashLockPreImage,
-	pub amount: Amount,
+	pub amount: Amount<V>,
 }
 
-impl<A, H> CounterpartyCompletedDetails<A, H>
+impl<A, H, V> CounterpartyCompletedDetails<A, H, V>
 where
 	InitiatorAddress<Vec<u8>>: From<InitiatorAddress<A>>,
 	RecipientAddress<A>: From<RecipientAddress<Vec<u8>>>,
 {
 	pub fn from_bridge_transfer_details(
-		bridge_transfer_details: BridgeTransferDetails<A, H>,
+		bridge_transfer_details: BridgeTransferDetails<A, H, V>,
 		secret: HashLockPreImage,
 	) -> Self {
 		CounterpartyCompletedDetails {
@@ -224,8 +214,8 @@ where
 	}
 }
 
-impl<A, H> CounterpartyCompletedDetails<A, H> {
-	pub fn from_lock_details(lock_details: LockDetails<A, H>, secret: HashLockPreImage) -> Self {
+impl<A, H, V> CounterpartyCompletedDetails<A, H, V> {
+	pub fn from_lock_details(lock_details: LockDetails<A, H, V>, secret: HashLockPreImage) -> Self {
 		CounterpartyCompletedDetails {
 			bridge_transfer_id: lock_details.bridge_transfer_id,
 			initiator_address: lock_details.initiator_address,
@@ -243,6 +233,7 @@ pub trait BridgeAddressType:
 	Debug + PartialEq + Eq + Hash + Unpin + Send + Sync + Clone + From<Vec<u8>>
 {
 }
+pub trait BridgeValueType: Debug + PartialEq + Eq + Clone + Send + Sync + Unpin {}
 
 pub trait Convert<O> {
 	fn convert(other: &Self) -> O;