Skip to content

feat!: Transfer Fees to Treasury #493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
enthusiastmartin merged 9 commits into from
Jun 16, 2022
Merged

feat!: Transfer Fees to Treasury #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f47dae7
integrate new multi tx payment pallet (fee receiver etc.)
apopiak Jun 14, 2022
d401c4b
set warehouse refs to fee receiver PR
apopiak Jun 14, 2022
6649a46
transfer fees to treasury instead of burning
apopiak Jun 14, 2022
9b5c1a1
bump spec_version
apopiak Jun 14, 2022
674c296
bump runtime crate versions
Roznovjak Jun 14, 2022
d364aa3
bump crate versions
Roznovjak Jun 14, 2022
d60a7ef
Merge branch 'master' into apopiak/fee-receiver
enthusiastmartin Jun 16, 2022
8b284b4
use the latest warehouse version
enthusiastmartin Jun 16, 2022
c60d914
bump integration tests version
enthusiastmartin Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
10 changes: 5 additions & 5 deletions integration-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "runtime-integration-tests"
version = "0.2.14"
version = "0.3.0"
description = "Integration tests"
authors = ["GalacticCouncil"]
edition = "2021"
Expand All @@ -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}
Expand Down Expand Up @@ -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 }
Expand Down
4 changes: 1 addition & 3 deletions integration-tests/src/kusama_test_net.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -194,7 +193,7 @@ pub fn basilisk_ext() -> sp_io::TestExternalities {

<parachain_info::GenesisConfig as GenesisBuild<Runtime>>::assimilate_storage(
&parachain_info::GenesisConfig {
parachain_id: 2000.into(),
parachain_id: 2000u32.into(),
},
&mut t,
)
Expand All @@ -220,7 +219,6 @@ pub fn basilisk_ext() -> sp_io::TestExternalities {

pallet_transaction_multi_payment::GenesisConfig::<Runtime> {
currencies: vec![(1, Price::from(1))],
fallback_account: Some(FALLBACK.into()),
account_currencies: vec![],
}
.assimilate_storage(&mut t)
Expand Down
4 changes: 3 additions & 1 deletion integration-tests/src/non_native_fee.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(|| {
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "basilisk"
version = "6.3.0"
version = "6.4.0"
description = "Basilisk node"
authors = ["GalacticCouncil"]
edition = "2021"
Expand Down
11 changes: 0 additions & 11 deletions node/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ pub fn kusama_staging_parachain_config() -> Result<ChainSpec, String> {
true,
PARA_ID.into(),
//technical committee
hex!["6d6f646c70792f74727372790000000000000000000000000000000000000000"].into(), // TREASURY - Fallback for multi tx payment
)
},
// Bootnodes
Expand Down Expand Up @@ -227,7 +226,6 @@ pub fn testnet_parachain_config() -> Result<ChainSpec, String> {
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))],
Expand Down Expand Up @@ -314,7 +312,6 @@ pub fn parachain_development_config() -> Result<ChainSpec, String> {
get_account_id_from_seed::<sr25519::Public>("Bob"),
get_account_id_from_seed::<sr25519::Public>("Eve"),
],
get_account_id_from_seed::<sr25519::Public>("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))],
Expand Down Expand Up @@ -381,7 +378,6 @@ pub fn rococo_parachain_config() -> Result<ChainSpec, String> {
//technical committee
vec![hex!["3418b257de81886bef265495f3609def9a083869f32ef5a03f7351956497d41a"].into()], // same as sudo
vec![],
hex!["3418b257de81886bef265495f3609def9a083869f32ef5a03f7351956497d41a"].into(), // same as sudo
vec![],
vec![],
vec![],
Expand Down Expand Up @@ -459,7 +455,6 @@ pub fn karura_testnet_parachain_config() -> Result<ChainSpec, String> {
//technical committee
vec![hex!["0897746a8df7df1969bf5fdb4f048221109830994c8afa001e9454c525211404"].into()], // same as sudo
vec![],
hex!["0897746a8df7df1969bf5fdb4f048221109830994c8afa001e9454c525211404"].into(), // same as sudo
vec![],
vec![],
vec![],
Expand Down Expand Up @@ -545,7 +540,6 @@ pub fn benchmarks_development_config() -> Result<ChainSpec, String> {
get_account_id_from_seed::<sr25519::Public>("Bob"),
get_account_id_from_seed::<sr25519::Public>("Eve"),
],
get_account_id_from_seed::<sr25519::Public>("Alice"), // SAME AS ROOT
get_vesting_config_for_test(),
vec![],
vec![],
Expand Down Expand Up @@ -624,7 +618,6 @@ pub fn local_parachain_config() -> Result<ChainSpec, String> {
get_account_id_from_seed::<sr25519::Public>("Bob"),
get_account_id_from_seed::<sr25519::Public>("Eve"),
],
get_account_id_from_seed::<sr25519::Public>("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))],
Expand Down Expand Up @@ -657,7 +650,6 @@ fn parachain_genesis(
_endowed_accounts: Vec<AccountId>,
_enable_println: bool,
parachain_id: ParaId,
tx_fee_payment_account: AccountId,
) -> GenesisConfig {
GenesisConfig {
system: SystemConfig {
Expand Down Expand Up @@ -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![] },
Expand Down Expand Up @@ -762,7 +753,6 @@ fn testnet_parachain_genesis(
parachain_id: ParaId,
council_members: Vec<AccountId>,
tech_committee_members: Vec<AccountId>,
tx_fee_payment_account: AccountId,
vesting_list: Vec<(AccountId, BlockNumber, BlockNumber, u32, Balance)>,
registered_assets: Vec<(Vec<u8>, Balance)>, // (Asset name, Existential deposit)
accepted_assets: Vec<(AssetId, Price)>, // (Asset id, Fallback price) - asset which fee can be paid with
Expand Down Expand Up @@ -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 {
Expand Down
7 changes: 0 additions & 7 deletions node/src/testing_chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ pub fn parachain_development_config() -> Result<ChainSpec, String> {
get_account_id_from_seed::<sr25519::Public>("Bob"),
get_account_id_from_seed::<sr25519::Public>("Eve"),
],
get_account_id_from_seed::<sr25519::Public>("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))],
Expand Down Expand Up @@ -208,7 +207,6 @@ pub fn local_parachain_config() -> Result<ChainSpec, String> {
get_account_id_from_seed::<sr25519::Public>("Bob"),
get_account_id_from_seed::<sr25519::Public>("Eve"),
],
get_account_id_from_seed::<sr25519::Public>("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))],
Expand Down Expand Up @@ -272,9 +270,7 @@ pub fn k8s_testnet_parachain_config() -> Result<ChainSpec, String> {
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))],
Expand Down Expand Up @@ -339,7 +335,6 @@ pub fn moonbase_parachain_config() -> Result<ChainSpec, String> {
//technical committee
vec![hex!["9eaea650948488ccc720491b8e40be7436359dc4213a6487ba758ed496f9e53f"].into()], // same as sudo
vec![],
hex!["9eaea650948488ccc720491b8e40be7436359dc4213a6487ba758ed496f9e53f"].into(), // same as sudo
vec![],
vec![],
vec![],
Expand Down Expand Up @@ -386,7 +381,6 @@ fn testnet_parachain_genesis(
parachain_id: ParaId,
council_members: Vec<AccountId>,
tech_committee_members: Vec<AccountId>,
tx_fee_payment_account: AccountId,
vesting_list: Vec<(AccountId, BlockNumber, BlockNumber, u32, Balance)>,
registered_assets: Vec<(Vec<u8>, Balance)>, // (Asset name, Existential deposit)
accepted_assets: Vec<(AssetId, Price)>, // (Asset id, Fallback price) - asset which fee can be paid with
Expand Down Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions pallets/exchange/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-exchange"
version = "5.3.1"
version = "5.3.2"
description = "Exchange Module"
authors = ["GalacticCouncil"]
edition = "2021"
Expand Down Expand Up @@ -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
Expand Down
Loading