Skip to content

Commit

Permalink
TransferAssets message changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@lemunozm
lemunozm committed Jan 27, 2025
1 parent 5bb2f0b commit 857a9fb
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 42 deletions.
5 changes: 2 additions & 3 deletions pallets/liquidity-pools/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ pub mod pallet {
T::OutboundMessageHandler::handle(
who.clone(),
receiver.domain(),
Message::TransferAssets {
Message::UnlockTokens {
amount: amount.into(),
currency,
receiver: receiver.bytes(),
Expand Down Expand Up @@ -1167,11 +1167,10 @@ pub mod pallet {

match msg {
Message::RegisterAsset { .. } => Ok(()), // Skip behavior, event dispatched above
Message::TransferAssets {
Message::LockTokens {
currency,
receiver,
amount,
..
} => Self::handle_transfer(currency.into(), receiver.into(), amount.into()),
Message::TransferTrancheTokens {
pool_id,
Expand Down
77 changes: 44 additions & 33 deletions pallets/liquidity-pools/src/message.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,9 @@ pub enum Message<BatchContent = BatchMessages, ForwardContent = NonForwardMessag
/// Add a pool to a domain.
///
/// Directionality: Centrifuge -> EVM Domain.
AddPool { pool_id: u64 },
AddPool {
pool_id: u64,
},
/// Add a tranche to an already existing pool on the target domain.
/// The decimals of a tranche MUST be equal to the decimals of a pool.
/// Thus, consuming domains MUST take care of storing the decimals upon
Expand All @@ -361,12 +363,18 @@ pub enum Message<BatchContent = BatchMessages, ForwardContent = NonForwardMessag
/// Allow a currency to be used as a pool currency and to invest in a pool.
///
/// Directionality: Centrifuge -> EVM Domain.
AllowAsset { pool_id: u64, currency: u128 },
AllowAsset {
pool_id: u64,
currency: u128,
},
/// Disallow a currency to be used as a pool currency and to invest in a
/// pool.
///
/// Directionality: Centrifuge -> EVM Domain.
DisallowAsset { pool_id: u64, currency: u128 },
DisallowAsset {
pool_id: u64,
currency: u128,
},
/// Update the price of a tranche token on the target domain.
///
/// Directionality: Centrifuge -> EVM Domain.
Expand Down Expand Up @@ -398,20 +406,23 @@ pub enum Message<BatchContent = BatchMessages, ForwardContent = NonForwardMessag
/// be added and subsequently deployed in.
hook: Address,
},
/// Transfer non-tranche tokens fungibles. For v2, it will only support
/// stable-coins.
/// Transfer non-tranche tokens fungibles.
///
/// Directionality: Centrifuge <-> EVM Domain.
/// Directionality: EVM Domain -> Centrifuge.
LockTokens {
currency: u128,
receiver: Address,
amount: u128,
},
/// Transfer non-tranche tokens fungibles.
///
/// NOTE: Receiving domain must not accept every incoming token.
/// For Centrifuge -> EVM Domain: `AddAsset` should have been called
/// beforehand. For Centrifuge <- EVM Domain: We can assume `AddAsset`
/// has been called for that domain already.
TransferAssets {
/// Directionality: Centrifuge -> EVM Domain.
UnlockTokens {
currency: u128,
receiver: Address,
amount: u128,
},
UnlockStakeTokens {},
/// Transfer tranche tokens between domains.
///
/// Directionality: Centrifuge <-> EVM Domain.
Expand Down Expand Up @@ -852,31 +863,31 @@ mod tests {
valid_until: 1706260138,
}
},
"130000000000000002811acd5b3f17c06841c7e41e9e04cb1b0145645645645645645645645645645645645645645645645645645645645645640000000065b376aa",
"150000000000000002811acd5b3f17c06841c7e41e9e04cb1b0145645645645645645645645645645645645645645645645645645645645645640000000065b376aa",
)
}

#[test]
fn transfer_to_evm_address() {
fn lock_tokens() {
test_encode_decode_identity(
Message::TransferAssets {
currency: TOKEN_ID,
receiver: vec_to_fixed_array(default_address_20()),
Message::LockTokens {
currency: TOKEN_ID,
receiver: default_address_32(),
amount: AMOUNT,
},
"110000000000000000000000000eb5ec7b1231231231231231231231231231231231231231000000000000000000000000000000000052b7d2dcc80cd2e4000000"
"110000000000000000000000000eb5ec7b4564564564564564564564564564564564564564564564564564564564564564000000000052b7d2dcc80cd2e4000000"
);
}

#[test]
fn transfer_to_centrifuge() {
fn unlock_tokens() {
test_encode_decode_identity(
Message::TransferAssets {
currency: TOKEN_ID,
receiver: default_address_32(),
Message::UnlockTokens{
currency: TOKEN_ID,
receiver: vec_to_fixed_array(default_address_20()),
amount: AMOUNT,
},
"110000000000000000000000000eb5ec7b4564564564564564564564564564564564564564564564564564564564564564000000000052b7d2dcc80cd2e4000000"
"120000000000000000000000000eb5ec7b1231231231231231231231231231231231231231000000000000000000000000000000000052b7d2dcc80cd2e4000000"
);
}

Expand All @@ -892,7 +903,7 @@ mod tests {
receiver: domain_address.bytes(),
amount: AMOUNT,
},
"120000000000000001811acd5b3f17c06841c7e41e9e04cb1b0100000000000005041231231231231231231231231231231231231231000000000000050445564d00000000000052b7d2dcc80cd2e4000000"
"140000000000000001811acd5b3f17c06841c7e41e9e04cb1b0100000000000005041231231231231231231231231231231231231231000000000000050445564d00000000000052b7d2dcc80cd2e4000000"
);
}

Expand All @@ -906,7 +917,7 @@ mod tests {
receiver: default_address_32(),
amount: AMOUNT,
},
"120000000000000001811acd5b3f17c06841c7e41e9e04cb1b0000000000000000004564564564564564564564564564564564564564564564564564564564564564000000000052b7d2dcc80cd2e4000000"
"140000000000000001811acd5b3f17c06841c7e41e9e04cb1b0000000000000000004564564564564564564564564564564564564564564564564564564564564564000000000052b7d2dcc80cd2e4000000"
)
}

Expand All @@ -920,7 +931,7 @@ mod tests {
currency: TOKEN_ID,
amount: AMOUNT,
},
"140000000000000001811acd5b3f17c06841c7e41e9e04cb1b45645645645645645645645645645645645645645645645645645645645645640000000000000000000000000eb5ec7b000000000052b7d2dcc80cd2e4000000",
"160000000000000001811acd5b3f17c06841c7e41e9e04cb1b45645645645645645645645645645645645645645645645645645645645645640000000000000000000000000eb5ec7b000000000052b7d2dcc80cd2e4000000",
)
}

Expand All @@ -933,7 +944,7 @@ mod tests {
investor: default_address_32(),
currency: TOKEN_ID,
},
"180000000000000001811acd5b3f17c06841c7e41e9e04cb1b45645645645645645645645645645645645645645645645645645645645645640000000000000000000000000eb5ec7b",
"1a0000000000000001811acd5b3f17c06841c7e41e9e04cb1b45645645645645645645645645645645645645645645645645645645645645640000000000000000000000000eb5ec7b",
)
}

Expand All @@ -947,7 +958,7 @@ mod tests {
currency: TOKEN_ID,
amount: AMOUNT,
},
"150000000000000001811acd5b3f17c06841c7e41e9e04cb1b45645645645645645645645645645645645645645645645645645645645645640000000000000000000000000eb5ec7b000000000052b7d2dcc80cd2e4000000",
"170000000000000001811acd5b3f17c06841c7e41e9e04cb1b45645645645645645645645645645645645645645645645645645645645645640000000000000000000000000eb5ec7b000000000052b7d2dcc80cd2e4000000",
)
}

Expand All @@ -960,7 +971,7 @@ mod tests {
investor: default_address_32(),
currency: TOKEN_ID,
},
"190000000000000001811acd5b3f17c06841c7e41e9e04cb1b45645645645645645645645645645645645645645645645645645645645645640000000000000000000000000eb5ec7b",
"1b0000000000000001811acd5b3f17c06841c7e41e9e04cb1b45645645645645645645645645645645645645645645645645645645645645640000000000000000000000000eb5ec7b",
)
}

Expand All @@ -975,7 +986,7 @@ mod tests {
currency_payout: AMOUNT / 2,
fulfilled_invest_amount: AMOUNT / 4,
},
"1a0000000000bce1a4811acd5b3f17c06841c7e41e9e04cb1b12312312312312312312312312312312312312310000000000000000000000000000000000000000000000000eb5ec7b0000000000295be96e64066972000000000000000014adf4b7320334b9000000",
"1c0000000000bce1a4811acd5b3f17c06841c7e41e9e04cb1b12312312312312312312312312312312312312310000000000000000000000000000000000000000000000000eb5ec7b0000000000295be96e64066972000000000000000014adf4b7320334b9000000",
)
}

Expand All @@ -989,7 +1000,7 @@ mod tests {
currency: TOKEN_ID,
tranche_tokens_payout: AMOUNT / 2,
},
"1b0000000000bce1a4811acd5b3f17c06841c7e41e9e04cb1b12312312312312312312312312312312312312310000000000000000000000000000000000000000000000000eb5ec7b0000000000295be96e64066972000000",
"1d0000000000bce1a4811acd5b3f17c06841c7e41e9e04cb1b12312312312312312312312312312312312312310000000000000000000000000000000000000000000000000eb5ec7b0000000000295be96e64066972000000",
)
}

Expand All @@ -1004,7 +1015,7 @@ mod tests {
currency_payout: AMOUNT,
tranche_tokens_payout: AMOUNT / 2,
},
"160000000000bce1a4811acd5b3f17c06841c7e41e9e04cb1b12312312312312312312312312312312312312310000000000000000000000000000000000000000000000000eb5ec7b000000000052b7d2dcc80cd2e40000000000000000295be96e64066972000000",
"180000000000bce1a4811acd5b3f17c06841c7e41e9e04cb1b12312312312312312312312312312312312312310000000000000000000000000000000000000000000000000eb5ec7b000000000052b7d2dcc80cd2e40000000000000000295be96e64066972000000",
)
}

Expand All @@ -1019,7 +1030,7 @@ mod tests {
currency_payout: AMOUNT,
tranche_tokens_payout: AMOUNT / 2,
},
"170000000000bce1a4811acd5b3f17c06841c7e41e9e04cb1b12312312312312312312312312312312312312310000000000000000000000000000000000000000000000000eb5ec7b000000000052b7d2dcc80cd2e40000000000000000295be96e64066972000000",
"190000000000bce1a4811acd5b3f17c06841c7e41e9e04cb1b12312312312312312312312312312312312312310000000000000000000000000000000000000000000000000eb5ec7b000000000052b7d2dcc80cd2e40000000000000000295be96e64066972000000",
)
}

Expand Down Expand Up @@ -1152,7 +1163,7 @@ mod tests {
message: Message::AddPool { pool_id: 5 }.try_into().unwrap(),
},
concat!(
"1d", // Forwarded index
"1f", // Forwarded index
"010000000000000504", // Domain
"1231231231231231231231231231231231231231", // forwarding_contract
"0a0000000000000005", // Inner AddPool message
Expand Down
2 changes: 1 addition & 1 deletion pallets/liquidity-pools/src/tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ mod transfer {
assert_eq!(destination, CONTRACT_DOMAIN_ADDRESS.domain());
assert_eq!(
msg,
Message::TransferAssets {
Message::UnlockTokens {
currency: util::currency_index(CURRENCY_ID),
receiver: CONTRACT_DOMAIN_ADDRESS.bytes(),
amount: AMOUNT
Expand Down
6 changes: 3 additions & 3 deletions pallets/liquidity-pools/src/tests/inbound.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ mod handle_transfer {

assert_ok!(LiquidityPools::handle(
EVM_DOMAIN,
Message::TransferAssets {
Message::LockTokens {
currency: util::currency_index(CURRENCY_ID),
receiver: ALICE.into(),
amount: AMOUNT,
Expand All @@ -53,7 +53,7 @@ mod handle_transfer {
assert_noop!(
LiquidityPools::handle(
EVM_DOMAIN,
Message::TransferAssets {
Message::LockTokens {
currency: util::currency_index(CURRENCY_ID),
receiver: ALICE.into(),
amount: 0,
Expand All @@ -71,7 +71,7 @@ mod handle_transfer {
assert_noop!(
LiquidityPools::handle(
EVM_DOMAIN,
Message::TransferAssets {
Message::LockTokens {
currency: util::currency_index(CURRENCY_ID),
receiver: ALICE.into(),
amount: AMOUNT,
Expand Down
2 changes: 1 addition & 1 deletion runtime/integration-tests/src/cases/lp/transfers.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ mod utils {
Keyring::Alice,
Default::default(),
names::POOL_MANAGER,
"transferAssets",
"lockTokens",
Some(&[
Token::Address(evm.deployed(names::USDC).address()),
Token::FixedBytes(Keyring::Ferdie.id().to_raw_vec()),
Expand Down
2 changes: 1 addition & 1 deletion runtime/integration-tests/src/cases/routers.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ mod axelar_evm {
BoundedVec::try_from(vec![TEST_ROUTER_ID]).unwrap(),
));

let message = Message::TransferAssets {
let message = Message::LockTokens {
currency: pallet_liquidity_pools::Pallet::<T>::try_get_general_index(Usd18.id())
.unwrap(),
receiver: RECEIVER_ADDRESS.into(),
Expand Down

0 comments on commit 857a9fb

Please sign in to comment.