diff --git a/Cargo.lock b/Cargo.lock index bf3a720c87d..c1ee190954f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -405,7 +405,7 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "basilisk" -version = "6.3.0" +version = "6.4.0" dependencies = [ "basilisk-runtime", "clap", @@ -486,7 +486,7 @@ dependencies = [ [[package]] name = "basilisk-runtime" -version = "51.0.0" +version = "52.0.0" dependencies = [ "common-runtime", "cumulus-pallet-aura-ext", @@ -1276,7 +1276,7 @@ dependencies = [ [[package]] name = "common-runtime" -version = "1.9.1" +version = "1.9.2" dependencies = [ "frame-support", "frame-system", @@ -3189,7 +3189,7 @@ dependencies = [ [[package]] name = "hydradx-traits" version = "0.6.0" -source = "git+https://github.com/galacticcouncil//warehouse?rev=c73846ec093357fea1b35da5c56ecb37592d4896#c73846ec093357fea1b35da5c56ecb37592d4896" +source = "git+https://github.com/galacticcouncil//warehouse?rev=7052eeab309742dccfe7e307c15fc4f780713553#7052eeab309742dccfe7e307c15fc4f780713553" dependencies = [ "frame-support", "parity-scale-codec", @@ -5313,7 +5313,7 @@ dependencies = [ [[package]] name = "pallet-asset-registry" version = "1.3.0" -source = "git+https://github.com/galacticcouncil//warehouse?rev=c73846ec093357fea1b35da5c56ecb37592d4896#c73846ec093357fea1b35da5c56ecb37592d4896" +source = "git+https://github.com/galacticcouncil//warehouse?rev=7052eeab309742dccfe7e307c15fc4f780713553#7052eeab309742dccfe7e307c15fc4f780713553" dependencies = [ "frame-benchmarking", "frame-support", @@ -5677,7 +5677,7 @@ dependencies = [ [[package]] name = "pallet-exchange" -version = "5.3.1" +version = "5.3.2" dependencies = [ "frame-support", "frame-system", @@ -5701,7 +5701,7 @@ dependencies = [ [[package]] name = "pallet-exchange-benchmarking" -version = "3.3.11" +version = "3.3.12" dependencies = [ "frame-benchmarking", "frame-support", @@ -5817,7 +5817,7 @@ dependencies = [ [[package]] name = "pallet-lbp" -version = "4.4.1" +version = "4.4.2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5870,7 +5870,7 @@ dependencies = [ [[package]] name = "pallet-liquidity-mining" -version = "1.2.2" +version = "1.2.3" dependencies = [ "frame-support", "frame-system", @@ -5895,7 +5895,7 @@ dependencies = [ [[package]] name = "pallet-liquidity-mining-benchmarking" -version = "1.0.2" +version = "1.0.3" dependencies = [ "frame-benchmarking", "frame-support", @@ -6119,7 +6119,7 @@ dependencies = [ [[package]] name = "pallet-price-oracle" version = "0.3.0" -source = "git+https://github.com/galacticcouncil//warehouse?rev=c73846ec093357fea1b35da5c56ecb37592d4896#c73846ec093357fea1b35da5c56ecb37592d4896" +source = "git+https://github.com/galacticcouncil//warehouse?rev=7052eeab309742dccfe7e307c15fc4f780713553#7052eeab309742dccfe7e307c15fc4f780713553" dependencies = [ "frame-benchmarking", "frame-support", @@ -6164,7 +6164,7 @@ dependencies = [ [[package]] name = "pallet-relaychain-info" version = "0.3.0" -source = "git+https://github.com/galacticcouncil//warehouse?rev=c73846ec093357fea1b35da5c56ecb37592d4896#c73846ec093357fea1b35da5c56ecb37592d4896" +source = "git+https://github.com/galacticcouncil//warehouse?rev=7052eeab309742dccfe7e307c15fc4f780713553#7052eeab309742dccfe7e307c15fc4f780713553" dependencies = [ "cumulus-pallet-parachain-system", "cumulus-primitives-core", @@ -6339,8 +6339,8 @@ dependencies = [ [[package]] name = "pallet-transaction-multi-payment" -version = "7.1.0" -source = "git+https://github.com/galacticcouncil//warehouse?rev=c73846ec093357fea1b35da5c56ecb37592d4896#c73846ec093357fea1b35da5c56ecb37592d4896" +version = "8.0.0" +source = "git+https://github.com/galacticcouncil//warehouse?rev=7052eeab309742dccfe7e307c15fc4f780713553#7052eeab309742dccfe7e307c15fc4f780713553" dependencies = [ "frame-support", "frame-system", @@ -6500,7 +6500,7 @@ dependencies = [ [[package]] name = "pallet-xyk" -version = "3.6.1" +version = "3.6.2" dependencies = [ "frame-benchmarking", "frame-support", @@ -11212,7 +11212,7 @@ dependencies = [ [[package]] name = "testing-basilisk-runtime" -version = "51.0.0" +version = "52.0.0" dependencies = [ "common-runtime", "cumulus-pallet-aura-ext", diff --git a/Cargo.toml b/Cargo.toml index a7dc4163ef7..7632d3976c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -198,8 +198,8 @@ cumulus-relay-chain-interface = { git = "https://github.com/paritytech//cumulus" cumulus-relay-chain-local = { git = "https://github.com/paritytech//cumulus", rev = "76479e7fef3af7c8828a44647847b01afd5fefe5" } [patch."https://github.com/galacticcouncil/warehouse"] -pallet-price-oracle = { git = "https://github.com/galacticcouncil//warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896"} -pallet-relaychain-info = { git = "https://github.com/galacticcouncil//warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896"} -pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil//warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896"} -pallet-asset-registry= { git = "https://github.com/galacticcouncil//warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896"} -hydradx-traits = { git = "https://github.com/galacticcouncil//warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896"} +pallet-price-oracle = { git = "https://github.com/galacticcouncil//warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553"} +pallet-relaychain-info = { git = "https://github.com/galacticcouncil//warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553"} +pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil//warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553"} +pallet-asset-registry= { git = "https://github.com/galacticcouncil//warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553"} +hydradx-traits = { git = "https://github.com/galacticcouncil//warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553"} diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index c88ae7b3f27..c37371b8376 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "runtime-integration-tests" -version = "0.2.14" +version = "0.3.0" description = "Integration tests" authors = ["GalacticCouncil"] edition = "2021" @@ -10,8 +10,8 @@ repository = "https://github.com/galacticcouncil/Basilisk-node" [dependencies] # local dependencies -pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false} -pallet-price-oracle = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false} +pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil/warehouse", rev = "50c82ab02bb5baf99b263342dc5d4cc7e62c7e88", default-features = false} +pallet-price-oracle = { git = "https://github.com/galacticcouncil/warehouse", rev = "50c82ab02bb5baf99b263342dc5d4cc7e62c7e88", default-features = false} pallet-exchange = { path = "../pallets/exchange", default-features=false} pallet-exchange-benchmarking = { path = "../pallets/exchange/benchmarking", optional = true, default-features = false} @@ -65,8 +65,8 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "relea polkadot-xcm = { package = "xcm", git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } # HydraDX dependencies -pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } -hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } +pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "50c82ab02bb5baf99b263342dc5d4cc7e62c7e88", default-features = false } +hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "50c82ab02bb5baf99b263342dc5d4cc7e62c7e88", default-features = false } # Substrate dependencies frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true } diff --git a/integration-tests/src/kusama_test_net.rs b/integration-tests/src/kusama_test_net.rs index c65282ed851..159cbdbec6e 100644 --- a/integration-tests/src/kusama_test_net.rs +++ b/integration-tests/src/kusama_test_net.rs @@ -7,7 +7,6 @@ pub const ALICE: [u8; 32] = [4u8; 32]; pub const BOB: [u8; 32] = [5u8; 32]; pub const CHARLIE: [u8; 32] = [6u8; 32]; pub const DAVE: [u8; 32] = [7u8; 32]; -pub const FALLBACK: [u8; 32] = [99u8; 32]; pub const BSX: Balance = 1_000_000_000_000; @@ -194,7 +193,7 @@ pub fn basilisk_ext() -> sp_io::TestExternalities { >::assimilate_storage( ¶chain_info::GenesisConfig { - parachain_id: 2000.into(), + parachain_id: 2000u32.into(), }, &mut t, ) @@ -220,7 +219,6 @@ pub fn basilisk_ext() -> sp_io::TestExternalities { pallet_transaction_multi_payment::GenesisConfig:: { currencies: vec![(1, Price::from(1))], - fallback_account: Some(FALLBACK.into()), account_currencies: vec![], } .assimilate_storage(&mut t) diff --git a/integration-tests/src/non_native_fee.rs b/integration-tests/src/non_native_fee.rs index abbd6ab7589..6217a164a42 100644 --- a/integration-tests/src/non_native_fee.rs +++ b/integration-tests/src/non_native_fee.rs @@ -34,6 +34,8 @@ pub fn basilisk_run_to_block(to: BlockNumber) { #[test] fn non_native_fee_payment_works() { + use pallet_transaction_multi_payment::TransactionMultiPaymentDataProvider; + TestNet::reset(); Basilisk::execute_with(|| { @@ -116,7 +118,7 @@ fn non_native_fee_payment_works() { asset_id: 1, native_fee_amount: 462_676_500_000, non_native_fee_amount: 265_222_898_276, - destination_account_id: FALLBACK.into(), + destination_account_id: basilisk_runtime::MultiTransactionPayment::get_fee_receiver(), } .into(), pallet_transaction_multi_payment::Event::CurrencySet { diff --git a/node/Cargo.toml b/node/Cargo.toml index c767fc34222..e765dc5db87 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "basilisk" -version = "6.3.0" +version = "6.4.0" description = "Basilisk node" authors = ["GalacticCouncil"] edition = "2021" diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index 7d8217f27e3..a0d2698a5d1 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -150,7 +150,6 @@ pub fn kusama_staging_parachain_config() -> Result { true, PARA_ID.into(), //technical committee - hex!["6d6f646c70792f74727372790000000000000000000000000000000000000000"].into(), // TREASURY - Fallback for multi tx payment ) }, // Bootnodes @@ -227,7 +226,6 @@ pub fn testnet_parachain_config() -> Result { vec![hex!["30035c21ba9eda780130f2029a80c3e962f56588bc04c36be95a225cb536fb55"].into()], //technical committee vec![hex!["30035c21ba9eda780130f2029a80c3e962f56588bc04c36be95a225cb536fb55"].into()], - hex!["30035c21ba9eda780130f2029a80c3e962f56588bc04c36be95a225cb536fb55"].into(), // SAME AS ROOT vec![], vec![(b"KSM".to_vec(), 1_000u128), (b"KUSD".to_vec(), 1_000u128)], vec![(1, Price::from_float(0.0000212)), (2, Price::from_float(0.000806))], @@ -314,7 +312,6 @@ pub fn parachain_development_config() -> Result { get_account_id_from_seed::("Bob"), get_account_id_from_seed::("Eve"), ], - get_account_id_from_seed::("Alice"), // SAME AS ROOT get_vesting_config_for_test(), vec![(b"KSM".to_vec(), 1_000u128), (b"KUSD".to_vec(), 1_000u128)], vec![(1, Price::from_float(0.0000212)), (2, Price::from_float(0.000806))], @@ -381,7 +378,6 @@ pub fn rococo_parachain_config() -> Result { //technical committee vec![hex!["3418b257de81886bef265495f3609def9a083869f32ef5a03f7351956497d41a"].into()], // same as sudo vec![], - hex!["3418b257de81886bef265495f3609def9a083869f32ef5a03f7351956497d41a"].into(), // same as sudo vec![], vec![], vec![], @@ -459,7 +455,6 @@ pub fn karura_testnet_parachain_config() -> Result { //technical committee vec![hex!["0897746a8df7df1969bf5fdb4f048221109830994c8afa001e9454c525211404"].into()], // same as sudo vec![], - hex!["0897746a8df7df1969bf5fdb4f048221109830994c8afa001e9454c525211404"].into(), // same as sudo vec![], vec![], vec![], @@ -545,7 +540,6 @@ pub fn benchmarks_development_config() -> Result { get_account_id_from_seed::("Bob"), get_account_id_from_seed::("Eve"), ], - get_account_id_from_seed::("Alice"), // SAME AS ROOT get_vesting_config_for_test(), vec![], vec![], @@ -624,7 +618,6 @@ pub fn local_parachain_config() -> Result { get_account_id_from_seed::("Bob"), get_account_id_from_seed::("Eve"), ], - get_account_id_from_seed::("Alice"), // SAME AS ROOT get_vesting_config_for_test(), vec![(b"KSM".to_vec(), 1_000u128), (b"KUSD".to_vec(), 1_000u128)], vec![(1, Price::from_float(0.0000212)), (2, Price::from_float(0.000806))], @@ -657,7 +650,6 @@ fn parachain_genesis( _endowed_accounts: Vec, _enable_println: bool, parachain_id: ParaId, - tx_fee_payment_account: AccountId, ) -> GenesisConfig { GenesisConfig { system: SystemConfig { @@ -712,7 +704,6 @@ fn parachain_genesis( }, multi_transaction_payment: MultiTransactionPaymentConfig { currencies: vec![], - fallback_account: Some(tx_fee_payment_account), account_currencies: vec![], }, tokens: TokensConfig { balances: vec![] }, @@ -762,7 +753,6 @@ fn testnet_parachain_genesis( parachain_id: ParaId, council_members: Vec, tech_committee_members: Vec, - tx_fee_payment_account: AccountId, vesting_list: Vec<(AccountId, BlockNumber, BlockNumber, u32, Balance)>, registered_assets: Vec<(Vec, Balance)>, // (Asset name, Existential deposit) accepted_assets: Vec<(AssetId, Price)>, // (Asset id, Fallback price) - asset which fee can be paid with @@ -814,7 +804,6 @@ fn testnet_parachain_genesis( }, multi_transaction_payment: MultiTransactionPaymentConfig { currencies: accepted_assets, - fallback_account: Some(tx_fee_payment_account), account_currencies: vec![], }, tokens: TokensConfig { diff --git a/node/src/testing_chain_spec.rs b/node/src/testing_chain_spec.rs index f285610becb..61f7eaf0e95 100644 --- a/node/src/testing_chain_spec.rs +++ b/node/src/testing_chain_spec.rs @@ -129,7 +129,6 @@ pub fn parachain_development_config() -> Result { get_account_id_from_seed::("Bob"), get_account_id_from_seed::("Eve"), ], - get_account_id_from_seed::("Alice"), // SAME AS ROOT get_vesting_config_for_test(), vec![(b"KSM".to_vec(), 1_000u128), (b"KUSD".to_vec(), 1_000u128)], vec![(1, Price::from_float(0.0000212)), (2, Price::from_float(0.000806))], @@ -208,7 +207,6 @@ pub fn local_parachain_config() -> Result { get_account_id_from_seed::("Bob"), get_account_id_from_seed::("Eve"), ], - get_account_id_from_seed::("Alice"), // SAME AS ROOT get_vesting_config_for_test(), vec![(b"KSM".to_vec(), 1_000u128), (b"KUSD".to_vec(), 1_000u128)], vec![(1, Price::from_float(0.0000212)), (2, Price::from_float(0.000806))], @@ -272,9 +270,7 @@ pub fn k8s_testnet_parachain_config() -> Result { PARA_ID.into(), //technical committee vec![hex!["a62f1daf8e490a1c0514c7d9f3a700999100f2aeb1d67a2ca68b241d3d6b3547"].into()], - // TREASURY - Fallback for multi tx payment vec![], - hex!["a62f1daf8e490a1c0514c7d9f3a700999100f2aeb1d67a2ca68b241d3d6b3547"].into(), get_vesting_config_for_test(), vec![(b"KSM".to_vec(), 1_000u128), (b"KUSD".to_vec(), 1_000u128)], vec![(1, Price::from_float(0.0000212)), (2, Price::from_float(0.000806))], @@ -339,7 +335,6 @@ pub fn moonbase_parachain_config() -> Result { //technical committee vec![hex!["9eaea650948488ccc720491b8e40be7436359dc4213a6487ba758ed496f9e53f"].into()], // same as sudo vec![], - hex!["9eaea650948488ccc720491b8e40be7436359dc4213a6487ba758ed496f9e53f"].into(), // same as sudo vec![], vec![], vec![], @@ -386,7 +381,6 @@ fn testnet_parachain_genesis( parachain_id: ParaId, council_members: Vec, tech_committee_members: Vec, - tx_fee_payment_account: AccountId, vesting_list: Vec<(AccountId, BlockNumber, BlockNumber, u32, Balance)>, registered_assets: Vec<(Vec, Balance)>, // (Asset name, Existential deposit) accepted_assets: Vec<(AssetId, Price)>, // (Asset id, Fallback price) - asset which fee can be paid with @@ -438,7 +432,6 @@ fn testnet_parachain_genesis( }, multi_transaction_payment: MultiTransactionPaymentConfig { currencies: accepted_assets, - fallback_account: Some(tx_fee_payment_account), account_currencies: vec![], }, tokens: TokensConfig { diff --git a/pallets/exchange/Cargo.toml b/pallets/exchange/Cargo.toml index 5387ac2ace2..746cff70bee 100644 --- a/pallets/exchange/Cargo.toml +++ b/pallets/exchange/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-exchange" -version = "5.3.1" +version = "5.3.2" description = "Exchange Module" authors = ["GalacticCouncil"] edition = "2021" @@ -29,8 +29,8 @@ orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-li orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "aac79b3b31953381669a2ffa9b3e9bfe48e87f38", default-features = false } # HydraDX dependencies -pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } -hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } +pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } +hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } hydra-dx-math = { git = "https://github.com/galacticcouncil/HydraDX-math", rev="1bafe7bb96864f5d29bab68061719c541ef06648", default-features = false } # Substrate dependencies diff --git a/pallets/exchange/benchmarking/Cargo.toml b/pallets/exchange/benchmarking/Cargo.toml index 91475052177..c54889bb683 100644 --- a/pallets/exchange/benchmarking/Cargo.toml +++ b/pallets/exchange/benchmarking/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-exchange-benchmarking" -version = "3.3.11" +version = "3.3.12" description = "Exchange Benchmarking Module" authors = ["GalacticCouncil"] edition = "2021" @@ -29,8 +29,8 @@ orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-li orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "aac79b3b31953381669a2ffa9b3e9bfe48e87f38", default-features = false } # HydraDX dependencies -pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } -hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } +pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } +hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } # Substrate dependencies frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } diff --git a/pallets/lbp/Cargo.toml b/pallets/lbp/Cargo.toml index 09b8bef2873..fcf0d9c9cc3 100644 --- a/pallets/lbp/Cargo.toml +++ b/pallets/lbp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-lbp" -version = "4.4.1" +version = "4.4.2" description = "HydraDX Liquidity Bootstrapping Pool Pallet" authors = ["GalacticCouncil"] edition = "2021" @@ -22,7 +22,7 @@ serde = { features = ["derive"], optional = true, version = "1.0.136" } # HydraDX dependencies hydra-dx-math = { git = "https://github.com/galacticcouncil/HydraDX-math", rev="1bafe7bb96864f5d29bab68061719c541ef06648", default-features = false } -hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } +hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } ## Local dependencies primitives = { default-features = false, path = "../../primitives" } diff --git a/pallets/liquidity-mining/Cargo.toml b/pallets/liquidity-mining/Cargo.toml index 3ab15b790f4..b93588cd146 100644 --- a/pallets/liquidity-mining/Cargo.toml +++ b/pallets/liquidity-mining/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-liquidity-mining" -version = "1.2.2" +version = "1.2.3" description = "Liquidity mining" authors = ["GalacticCouncil"] edition = "2018" @@ -23,7 +23,7 @@ pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "po orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "aac79b3b31953381669a2ffa9b3e9bfe48e87f38", default-features = false } # HydraDX dependencies -hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } +hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } hydra-dx-math = { git = "https://github.com/galacticcouncil/HydraDX-math", rev="1bafe7bb96864f5d29bab68061719c541ef06648", default-features = false } primitives = { path = "../../primitives", default-features = false } diff --git a/pallets/liquidity-mining/benchmarking/Cargo.toml b/pallets/liquidity-mining/benchmarking/Cargo.toml index 9cdc92ef519..1fd02f0e64b 100644 --- a/pallets/liquidity-mining/benchmarking/Cargo.toml +++ b/pallets/liquidity-mining/benchmarking/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-liquidity-mining-benchmarking" -version = "1.0.2" +version = "1.0.3" description = "Liquidity Mining Benchmarking Module" authors = ["GalacticCouncil"] edition = "2021" @@ -24,8 +24,8 @@ pallet-liquidity-mining = { path = "../../liquidity-mining", default-features = orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "aac79b3b31953381669a2ffa9b3e9bfe48e87f38", default-features = false } # HydraDX dependencies -pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } -hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } +pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } +hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } primitives = { path = "../../../primitives", default-features = false } diff --git a/pallets/offchain-duster/Cargo.toml b/pallets/offchain-duster/Cargo.toml index 8f8be2fa49a..da11c137430 100644 --- a/pallets/offchain-duster/Cargo.toml +++ b/pallets/offchain-duster/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-offchain-duster" -version = "2.0.4" +version = "2.0.5" description = "Account duster offchain worker" authors = ["GalacticCouncil"] edition = "2021" @@ -26,7 +26,7 @@ primitives = { path = "../../primitives", default-features = false } pallet-duster = { path = "../duster", default-features = false } # Warehouse dependencies -pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } +pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } # ORML dependencies orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "aac79b3b31953381669a2ffa9b3e9bfe48e87f38", default-features = false } diff --git a/pallets/xyk/Cargo.toml b/pallets/xyk/Cargo.toml index c52bef338e8..66903e45143 100644 --- a/pallets/xyk/Cargo.toml +++ b/pallets/xyk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = 'pallet-xyk' -version = '3.6.1' +version = '3.6.2' description = 'XYK automated market maker' authors = ['GalacticCouncil'] edition = '2021' @@ -31,7 +31,7 @@ orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-li orml-utilities = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "aac79b3b31953381669a2ffa9b3e9bfe48e87f38", default-features = false } # HydraDX dependencies -hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } +hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } # Substrate dependencies frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true } @@ -44,7 +44,7 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v [dev-dependencies] sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } +pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [features] diff --git a/runtime/basilisk/Cargo.toml b/runtime/basilisk/Cargo.toml index 91b57ac2b53..a2071305ad7 100644 --- a/runtime/basilisk/Cargo.toml +++ b/runtime/basilisk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "basilisk-runtime" -version = "51.0.0" +version = "52.0.0" authors = ["GalacticCouncil"] edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" @@ -44,11 +44,11 @@ pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polka pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } # Warehouse dependencies -hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } -pallet-price-oracle = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } -pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false} -pallet-relaychain-info = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } -pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } +hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } +pallet-price-oracle = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } +pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false} +pallet-relaychain-info = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } +pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } # collator support pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } diff --git a/runtime/basilisk/src/benchmarking/multi_payment.rs b/runtime/basilisk/src/benchmarking/multi_payment.rs index a67da5fb686..6baeab6140c 100644 --- a/runtime/basilisk/src/benchmarking/multi_payment.rs +++ b/runtime/basilisk/src/benchmarking/multi_payment.rs @@ -62,8 +62,6 @@ runtime_benchmarks! { set_currency { let maker: AccountId = account("maker", 0, SEED); let caller: AccountId = account("caller", 0, SEED); - let fallback_account: AccountId = account("fallback_account", 1, SEED); - pallet_transaction_multi_payment::FallbackAccount::::put(fallback_account); let asset_id = register_asset(b"TST".to_vec(), 100u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; diff --git a/runtime/basilisk/src/lib.rs b/runtime/basilisk/src/lib.rs index f603797ff4d..1e63390c357 100644 --- a/runtime/basilisk/src/lib.rs +++ b/runtime/basilisk/src/lib.rs @@ -76,7 +76,7 @@ use orml_currencies::BasicCurrencyAdapter; use common_runtime::locked_balance::MultiCurrencyLockedBalance; pub use common_runtime::*; -use pallet_transaction_multi_payment::MultiCurrencyAdapter; +use pallet_transaction_multi_payment::{DepositAll, TransferFees}; /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know /// the specifics of the runtime. They can then be made to be agnostic over specific formats @@ -105,7 +105,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("basilisk"), impl_name: create_runtime_str!("basilisk"), authoring_version: 1, - spec_version: 51, + spec_version: 52, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -334,13 +334,17 @@ pub type SlowAdjustingFeeUpdate = TargetedFeeAdjustment; impl pallet_transaction_payment::Config for Runtime { - type OnChargeTransaction = MultiCurrencyAdapter; + type OnChargeTransaction = TransferFees>; type TransactionByteFee = TransactionByteFee; type OperationalFeeMultiplier = (); type WeightToFee = WeightToFee; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; } +parameter_types! { + pub TreasuryAccount: AccountId = Treasury::account_id(); +} + impl pallet_transaction_multi_payment::Config for Runtime { type Event = Event; type AcceptedCurrencyOrigin = EnsureSuperMajorityTechCommitteeOrRoot; @@ -350,6 +354,7 @@ impl pallet_transaction_multi_payment::Config for Runtime { type WithdrawFeeForSetCurrency = MultiPaymentCurrencySetFee; type WeightToFee = WeightToFee; type NativeAssetId = NativeAssetId; + type FeeReceiver = TreasuryAccount; } impl pallet_sudo::Config for Runtime { diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 93ddbb9ab00..4501472b2e3 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "common-runtime" -version = "1.9.1" +version = "1.9.2" authors = ["GalacticCouncil"] edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" @@ -27,10 +27,10 @@ pallet-lbp = { path = "../../pallets/lbp", default-features = false } pallet-marketplace = { path = '../../pallets/marketplace', default-features = false } # Warehouse dependencies -hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } -pallet-price-oracle = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } -pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false} -pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } +hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } +pallet-price-oracle = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } +pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false} +pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } # Substrate dependencies sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } diff --git a/runtime/testing-basilisk/Cargo.toml b/runtime/testing-basilisk/Cargo.toml index 05b918e4f71..b9e5cce5ed0 100644 --- a/runtime/testing-basilisk/Cargo.toml +++ b/runtime/testing-basilisk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "testing-basilisk-runtime" -version = "51.0.0" +version = "52.0.0" authors = ["GalacticCouncil"] edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" @@ -44,11 +44,11 @@ pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polka pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } # Warehouse dependencies -hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } -pallet-price-oracle = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } -pallet-relaychain-info = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } -pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false} -pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "c73846ec093357fea1b35da5c56ecb37592d4896", default-features = false } +hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } +pallet-price-oracle = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } +pallet-relaychain-info = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } +pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false} +pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "7052eeab309742dccfe7e307c15fc4f780713553", default-features = false } # collator support pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } diff --git a/runtime/testing-basilisk/src/lib.rs b/runtime/testing-basilisk/src/lib.rs index 529a619def1..888a415378e 100644 --- a/runtime/testing-basilisk/src/lib.rs +++ b/runtime/testing-basilisk/src/lib.rs @@ -73,7 +73,7 @@ use pallet_xyk_rpc_runtime_api as xyk_rpc; use orml_currencies::BasicCurrencyAdapter; pub use common_runtime::*; -use pallet_transaction_multi_payment::MultiCurrencyAdapter; +use pallet_transaction_multi_payment::{DepositAll, TransferFees}; /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know /// the specifics of the runtime. They can then be made to be agnostic over specific formats @@ -113,7 +113,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("testing-basilisk"), impl_name: create_runtime_str!("testing-basilisk"), authoring_version: 1, - spec_version: 51, + spec_version: 52, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -288,13 +288,17 @@ pub type SlowAdjustingFeeUpdate = TargetedFeeAdjustment; impl pallet_transaction_payment::Config for Runtime { - type OnChargeTransaction = MultiCurrencyAdapter; + type OnChargeTransaction = TransferFees>; type TransactionByteFee = TransactionByteFee; type OperationalFeeMultiplier = (); type WeightToFee = WeightToFee; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; } +parameter_types! { + pub TreasuryAccount: AccountId = Treasury::account_id(); +} + impl pallet_transaction_multi_payment::Config for Runtime { type Event = Event; type AcceptedCurrencyOrigin = EnsureSuperMajorityTechCommitteeOrRoot; @@ -304,6 +308,7 @@ impl pallet_transaction_multi_payment::Config for Runtime { type WithdrawFeeForSetCurrency = MultiPaymentCurrencySetFee; type WeightToFee = WeightToFee; type NativeAssetId = (); + type FeeReceiver = TreasuryAccount; } impl pallet_sudo::Config for Runtime {