From fe7199cc6d93bcddd858747db9cf55d079bafbfb Mon Sep 17 00:00:00 2001 From: Alistair Singh Date: Sat, 11 Nov 2023 15:34:04 +0200 Subject: [PATCH 1/5] remove snowbridge sovereign from tests --- .../bridges/bridge-hub-rococo/src/tests/snowbridge.rs | 10 ---------- .../runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs | 3 ++- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/snowbridge.rs b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/snowbridge.rs index 4e80b92d8b05a..eb59efefdbdc2 100644 --- a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/snowbridge.rs +++ b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/snowbridge.rs @@ -22,8 +22,6 @@ use sp_core::H256; const INITIAL_FUND: u128 = 5_000_000_000 * ROCOCO_ED; const CHAIN_ID: u64 = 15; const DEST_PARA_ID: u32 = 1000; -const SNOWBRIDGE_SOVEREIGN: [u8; 32] = - hex!("da4d66c3651dc151264eee5460493210338e41a7bbfca91a520e438daf180bf5"); const TREASURY_ACCOUNT: [u8; 32] = hex!("6d6f646c70792f74727372790000000000000000000000000000000000000000"); const WETH: [u8; 20] = hex!("87d1f7fdfEe7f651FaBc8bFCB6E086C278b77A7d"); @@ -177,12 +175,6 @@ fn register_token() { INITIAL_FUND, )]); - // Fund ethereum sovereign in asset hub - AssetHubRococo::fund_accounts(vec![( - SNOWBRIDGE_SOVEREIGN.into(), - 5_000_000_000_000 * ROCOCO_ED, - )]); - let message_id_: H256 = [1; 32].into(); BridgeHubRococo::execute_with(|| { @@ -231,7 +223,6 @@ fn send_token() { // Fund ethereum sovereign in asset hub AssetHubRococo::fund_accounts(vec![ - (SNOWBRIDGE_SOVEREIGN.into(), INITIAL_FUND), (ASSETHUB_SOVEREIGN.into(), INITIAL_FUND), (AssetHubRococoReceiver::get(), INITIAL_FUND), ]); @@ -294,7 +285,6 @@ fn reserve_transfer_token() { // Fund ethereum sovereign in asset hub AssetHubRococo::fund_accounts(vec![ - (SNOWBRIDGE_SOVEREIGN.into(), INITIAL_FUND), (ASSETHUB_SOVEREIGN.into(), INITIAL_FUND), (AssetHubRococoReceiver::get(), INITIAL_FUND), ]); diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs index 073e445587441..2ef2a86b1d25a 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs @@ -503,6 +503,7 @@ parameter_types! { pub const GatewayAddress: H160 = H160(hex_literal::hex!("EDa338E4dC46038493b885327842fD3E301CaB39")); pub const CreateAssetCall: [u8;2] = [53, 0]; pub const CreateAssetExecutionFee: u128 = 2_000_000_000; + pub const CreateAssetDeposit: u128 = (UNITS / 10) + EXISTENTIAL_DEPOSIT; pub const SendTokenExecutionFee: u128 = 1_000_000_000; } @@ -527,7 +528,7 @@ impl snowbridge_inbound_queue::Config for Runtime { #[cfg(feature = "runtime-benchmarks")] type Helper = Runtime; type MessageConverter = - MessageToXcm; + MessageToXcm; type WeightToFee = WeightToFee; } From 4c431864e541572d128b03a889671c3402cdb136 Mon Sep 17 00:00:00 2001 From: Alistair Singh Date: Sat, 11 Nov 2023 17:28:35 +0200 Subject: [PATCH 2/5] use Balance --- .../bridges/bridge-hub-rococo/src/tests/snowbridge.rs | 10 +++++----- .../runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/snowbridge.rs b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/snowbridge.rs index eb59efefdbdc2..aa8bc44b7037d 100644 --- a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/snowbridge.rs +++ b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/snowbridge.rs @@ -185,7 +185,7 @@ fn register_token() { chain_id: CHAIN_ID, command: Command::RegisterToken { token: WETH.into() }, }); - let xcm = EthereumInboundQueue::do_convert(message_id_, message).unwrap(); + let (xcm, _) = EthereumInboundQueue::do_convert(message_id_, message).unwrap(); let _ = EthereumInboundQueue::send_xcm(xcm, DEST_PARA_ID.into()).unwrap(); assert_expected_events!( @@ -237,7 +237,7 @@ fn send_token() { chain_id: CHAIN_ID, command: Command::RegisterToken { token: WETH.into() }, }); - let xcm = EthereumInboundQueue::do_convert(message_id_, message).unwrap(); + let (xcm, _) = EthereumInboundQueue::do_convert(message_id_, message).unwrap(); let _ = EthereumInboundQueue::send_xcm(xcm, DEST_PARA_ID.into()).unwrap(); let message = VersionedMessage::V1(MessageV1 { chain_id: CHAIN_ID, @@ -247,7 +247,7 @@ fn send_token() { amount: 1_000_000_000, }, }); - let xcm = EthereumInboundQueue::do_convert(message_id_, message).unwrap(); + let (xcm, _) = EthereumInboundQueue::do_convert(message_id_, message).unwrap(); let _ = EthereumInboundQueue::send_xcm(xcm, DEST_PARA_ID.into()).unwrap(); assert_expected_events!( @@ -300,7 +300,7 @@ fn reserve_transfer_token() { chain_id: CHAIN_ID, command: Command::RegisterToken { token: WETH.into() }, }); - let xcm = EthereumInboundQueue::do_convert(message_id_, message).unwrap(); + let (xcm, _) = EthereumInboundQueue::do_convert(message_id_, message).unwrap(); let _ = EthereumInboundQueue::send_xcm(xcm, DEST_PARA_ID.into()).unwrap(); let message = VersionedMessage::V1(MessageV1 { chain_id: CHAIN_ID, @@ -310,7 +310,7 @@ fn reserve_transfer_token() { amount: WETH_AMOUNT, }, }); - let xcm = EthereumInboundQueue::do_convert(message_id_, message).unwrap(); + let (xcm, _) = EthereumInboundQueue::do_convert(message_id_, message).unwrap(); let _ = EthereumInboundQueue::send_xcm(xcm, DEST_PARA_ID.into()).unwrap(); assert_expected_events!( diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs index 2ef2a86b1d25a..023da0fc574ab 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs @@ -528,7 +528,7 @@ impl snowbridge_inbound_queue::Config for Runtime { #[cfg(feature = "runtime-benchmarks")] type Helper = Runtime; type MessageConverter = - MessageToXcm; + MessageToXcm; type WeightToFee = WeightToFee; } From bca991438a73f161b7a6b908709aaf68de6bd2f7 Mon Sep 17 00:00:00 2001 From: Alistair Singh Date: Sat, 11 Nov 2023 19:40:29 +0200 Subject: [PATCH 3/5] added refund --- .../runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs index 023da0fc574ab..e58257aeb8d95 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs @@ -527,8 +527,15 @@ impl snowbridge_inbound_queue::Config for Runtime { type GatewayAddress = GatewayAddress; #[cfg(feature = "runtime-benchmarks")] type Helper = Runtime; - type MessageConverter = - MessageToXcm; + type MessageConverter = MessageToXcm< + CreateAssetCall, + CreateAssetExecutionFee, + CreateAssetDeposit, + SendTokenExecutionFee, + TreasuryAccount, + AccountId, + Balance + >; type WeightToFee = WeightToFee; } From 758f7c5532ab675f578ae2d83f0a16c295e3f9d8 Mon Sep 17 00:00:00 2001 From: Alistair Singh Date: Sat, 11 Nov 2023 19:54:51 +0200 Subject: [PATCH 4/5] increased fee --- .../runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs index e58257aeb8d95..bde68d128c97e 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs @@ -504,7 +504,7 @@ parameter_types! { pub const CreateAssetCall: [u8;2] = [53, 0]; pub const CreateAssetExecutionFee: u128 = 2_000_000_000; pub const CreateAssetDeposit: u128 = (UNITS / 10) + EXISTENTIAL_DEPOSIT; - pub const SendTokenExecutionFee: u128 = 1_000_000_000; + pub const SendTokenExecutionFee: u128 = 2_000_000_000; } #[cfg(feature = "runtime-benchmarks")] From b6f61602d33abebc1776ff3eac87edbf7d672167 Mon Sep 17 00:00:00 2001 From: Vincent Geddes Date: Sun, 12 Nov 2023 14:58:26 +0200 Subject: [PATCH 5/5] Not going to refund treasuries --- .../runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs index bde68d128c97e..b8f349938e803 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs @@ -100,8 +100,7 @@ use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight}; use crate::{ bridge_hub_rococo_config::BridgeRefundBridgeHubWococoMessages, - bridge_hub_wococo_config::BridgeRefundBridgeHubRococoMessages, - xcm_config::XcmRouter, + bridge_hub_wococo_config::BridgeRefundBridgeHubRococoMessages, xcm_config::XcmRouter, }; use parachains_common::{ impls::DealWithFees, @@ -531,10 +530,9 @@ impl snowbridge_inbound_queue::Config for Runtime { CreateAssetCall, CreateAssetExecutionFee, CreateAssetDeposit, - SendTokenExecutionFee, - TreasuryAccount, + SendTokenExecutionFee, AccountId, - Balance + Balance, >; type WeightToFee = WeightToFee; }