Merge pull request #62 from galacticcouncil/chore/update-hydra-deps

chore!: update hydra dependencies - use latest pallets
galacticcouncil · Jun 11, 2021 · 52bfc84 · 52bfc84
2 parents d23d878 + e90f85b
commit 52bfc84
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs
@@ -3,7 +3,7 @@
 use basilisk_runtime::{
 	AccountId, AssetRegistryConfig, AuraConfig, AuraId, BalancesConfig, CouncilConfig, GenesisConfig,
 	ParachainInfoConfig, Signature, SudoConfig, SystemConfig, TechnicalCommitteeConfig, TokensConfig, CORE_ASSET_ID,
-	VestingConfig, WASM_BINARY,
+	VestingConfig, WASM_BINARY, MultiTransactionPaymentConfig,
 };
 use cumulus_primitives_core::ParaId;
 use hex_literal::hex;
@@ -92,6 +92,7 @@ pub fn testnet_parachain_config(para_id: ParaId) -> Result<ChainSpec, String> {
 				vec![hex!["30035c21ba9eda780130f2029a80c3e962f56588bc04c36be95a225cb536fb55"].into()],
 				//technical committee
 				vec![hex!["30035c21ba9eda780130f2029a80c3e962f56588bc04c36be95a225cb536fb55"].into()],
+				hex!["30035c21ba9eda780130f2029a80c3e962f56588bc04c36be95a225cb536fb55"].into(), // SAME AS ROOT
 			)
 		},
 		// Bootnodes
@@ -161,6 +162,7 @@ pub fn parachain_development_config(para_id: ParaId) -> 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
 			)
 		},
 		// Bootnodes
@@ -223,6 +225,7 @@ pub fn local_parachain_config(para_id: ParaId) -> 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
 			)
 		},
 		// Bootnodes
@@ -251,6 +254,7 @@ fn parachain_genesis(
 	parachain_id: ParaId,
 	council_members: Vec<AccountId>,
 	tech_committee_members: Vec<AccountId>,
+	tx_fee_payment_account: AccountId,
 ) -> GenesisConfig {
 	GenesisConfig {
 		frame_system: SystemConfig {
@@ -283,6 +287,11 @@ fn parachain_genesis(
 			],
 			next_asset_id: 5,
 		},
+		pallet_transaction_multi_payment: MultiTransactionPaymentConfig {
+			currencies: vec![],
+			authorities: vec![],
+			fallback_account: tx_fee_payment_account,
+		},
 		orml_tokens: TokensConfig {
 			endowed_accounts: endowed_accounts
 				.iter()

diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -5,7 +5,7 @@ homepage = 'https://github.com/galacticcouncil/Basilisk-node'
 license = 'Apache 2.0'
 name = 'basilisk-runtime'
 repository = 'https://github.com/galacticcouncil/Basilisk-node'
-version = '5.0.0'
+version = '6.0.0'
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']
@@ -25,11 +25,11 @@ trie-db = { version = "0.22.0", default-features = false }
 
 # local dependencies
 pallet-asset-registry = { default-features = false, version = '3.0.0' }
-pallet-xyk= { default-features = false, version = '1.0.0' }
-pallet-exchange = { default-features = false, version = '3.0.0' }
+pallet-xyk= { default-features = false, version = '1.2.0' }
+pallet-exchange = { default-features = false, version = '4.0.0' }
 pallet-exchange-benchmarking = { default-features = false, optional = true, version = '3.0.0' }
-pallet-transaction-multi-payment = { default-features = false, version = '3.0.0' }
-pallet-multi-payment-benchmarking = { default-features = false, optional = true, version = '3.0.0' }
+pallet-transaction-multi-payment = { default-features = false, version = '4.0.0' }
+pallet-multi-payment-benchmarking = { default-features = false, optional = true, version = '4.0.0' }
 primitives = { default-features = false, version = '4.0.0' }
 pallet-xyk-rpc-runtime-api = { default-features = false, version = '3.0.0' }
 
@@ -142,6 +142,7 @@ std = [
     'pallet-sudo/std',
     'pallet-timestamp/std',
     'pallet-transaction-payment/std',
+    "pallet-transaction-multi-payment/std",
     'pallet-transaction-payment-rpc-runtime-api/std',
     'pallet-utility/std',
     'pallet-vesting/std',

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -110,7 +110,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("basilisk"),
 	impl_name: create_runtime_str!("basilisk"),
 	authoring_version: 1,
-	spec_version: 5,
+	spec_version: 6,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -608,7 +608,7 @@ construct_runtime!(
 		AssetRegistry: pallet_asset_registry::{Pallet, Call, Storage, Config<T>},
 		XYK: pallet_xyk::{Pallet, Call, Storage, Event<T>},
 		Exchange: pallet_exchange::{Pallet, Call, Storage, Event<T>},
-		MultiTransactionPayment: pallet_transaction_multi_payment::{Pallet, Call, Storage, Event<T>},
+		MultiTransactionPayment: pallet_transaction_multi_payment::{Pallet, Call, Config<T>, Storage, Event<T>},
 	}
 );