From 398913a2ace52606d5ae3399ff18ea363f7984b6 Mon Sep 17 00:00:00 2001 From: Jakub Panik Date: Fri, 8 Apr 2022 02:53:24 +0200 Subject: [PATCH 1/5] companion for faucet bot - remove faucet from testing runtime --- Cargo.lock | 18 ------------------ Cargo.toml | 1 - node/src/testing_chain_spec.rs | 11 ++++------- runtime/testing-basilisk/Cargo.toml | 2 -- runtime/testing-basilisk/src/lib.rs | 10 +--------- 5 files changed, 5 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d139cebabc2..26695fa0024 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5746,23 +5746,6 @@ dependencies = [ "substrate-wasm-builder", ] -[[package]] -name = "pallet-faucet" -version = "0.1.1" -source = "git+https://github.com/galacticcouncil//warehouse?rev=d0c99033c5d1f686a31cc311b8d96af2a3de9d76#d0c99033c5d1f686a31cc311b8d96af2a3de9d76" -dependencies = [ - "frame-support", - "frame-system", - "orml-tokens", - "orml-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-runtime", - "sp-std", -] - [[package]] name = "pallet-gilt" version = "4.0.0-dev" @@ -11234,7 +11217,6 @@ dependencies = [ "pallet-elections-phragmen", "pallet-exchange", "pallet-exchange-benchmarking", - "pallet-faucet", "pallet-lbp", "pallet-lbp-rpc-runtime-api", "pallet-nft", diff --git a/Cargo.toml b/Cargo.toml index f4fb7760125..799cf35ce53 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -200,5 +200,4 @@ cumulus-relay-chain-local = { git = "https://github.com/paritytech//cumulus", re pallet-price-oracle = { git = "https://github.com/galacticcouncil//warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76"} pallet-relaychain-info = { git = "https://github.com/galacticcouncil//warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76"} pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil//warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76"} -pallet-faucet= { git = "https://github.com/galacticcouncil//warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76"} hydradx-traits = { git = "https://github.com/galacticcouncil//warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76"} diff --git a/node/src/testing_chain_spec.rs b/node/src/testing_chain_spec.rs index e12509e295d..a0b185a9881 100644 --- a/node/src/testing_chain_spec.rs +++ b/node/src/testing_chain_spec.rs @@ -29,7 +29,7 @@ use sp_core::{crypto::UncheckedInto, sr25519, Pair, Public}; use sp_runtime::traits::{IdentifyAccount, Verify}; use testing_basilisk_runtime::{ AccountId, AssetRegistryConfig, AuraId, Balance, BalancesConfig, CollatorSelectionConfig, CouncilConfig, - DusterConfig, ElectionsConfig, FaucetConfig, GenesisConfig, MultiTransactionPaymentConfig, ParachainInfoConfig, + DusterConfig, ElectionsConfig, GenesisConfig, MultiTransactionPaymentConfig, ParachainInfoConfig, SessionConfig, Signature, SudoConfig, SystemConfig, TechnicalCommitteeConfig, TokensConfig, VestingConfig, NATIVE_EXISTENTIAL_DEPOSIT, UNITS, WASM_BINARY, }; @@ -264,13 +264,15 @@ pub fn k8s_testnet_parachain_config() -> Result { // Pre-funded accounts vec![ hex!["a62f1daf8e490a1c0514c7d9f3a700999100f2aeb1d67a2ca68b241d3d6b3547"].into(), + hex!["2e004ce52dd68ec64093d887dbbcc69c7a5333673a7acec6109b08056e89f538"].into(), hex!["d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d"].into(), //acc from ../res/basilisk-vesting-lbp-test.json hex!["8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48"].into(), //acc from ../res/basilisk-vesting-lbp-test.json ], true, PARA_ID.into(), //technical committee - vec![hex!["a62f1daf8e490a1c0514c7d9f3a700999100f2aeb1d67a2ca68b241d3d6b3547"].into()], // TREASURY - Fallback for multi tx payment + vec![hex!["a62f1daf8e490a1c0514c7d9f3a700999100f2aeb1d67a2ca68b241d3d6b3547"].into()], + // TREASURY - Fallback for multi tx payment vec![], hex!["a62f1daf8e490a1c0514c7d9f3a700999100f2aeb1d67a2ca68b241d3d6b3547"].into(), get_vesting_config_for_test(), @@ -454,11 +456,6 @@ fn testnet_parachain_genesis( .collect() }, }, - faucet: FaucetConfig { - rampage: true, - mint_limit: 5, - mintable_currencies: vec![0, 1, 2], - }, treasury: Default::default(), elections: ElectionsConfig { members: elections diff --git a/runtime/testing-basilisk/Cargo.toml b/runtime/testing-basilisk/Cargo.toml index 5826d0c5d5a..9389def551f 100644 --- a/runtime/testing-basilisk/Cargo.toml +++ b/runtime/testing-basilisk/Cargo.toml @@ -49,7 +49,6 @@ pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polka hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76", default-features = false } pallet-price-oracle = { git = "https://github.com/galacticcouncil/warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76", default-features = false } pallet-relaychain-info = { git = "https://github.com/galacticcouncil/warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76", default-features = false } -pallet-faucet = { git = "https://github.com/galacticcouncil/warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76", default-features = false } pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil/warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76", default-features = false} # collator support @@ -197,7 +196,6 @@ std = [ "pallet-price-oracle/std", "pallet-utility/std", "hydradx-traits/std", - "pallet-faucet/std", "sp-api/std", "sp-block-builder/std", "sp-consensus-aura/std", diff --git a/runtime/testing-basilisk/src/lib.rs b/runtime/testing-basilisk/src/lib.rs index 8ddb7a0a49c..1b58b89efc9 100644 --- a/runtime/testing-basilisk/src/lib.rs +++ b/runtime/testing-basilisk/src/lib.rs @@ -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: 40, + spec_version: 41, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -768,11 +768,6 @@ impl pallet_relaychain_info::Config for Runtime { type RelaychainBlockNumberProvider = cumulus_pallet_parachain_system::RelaychainBlockNumberProvider; } -impl pallet_faucet::Config for Runtime { - type Event = Event; - type Currency = Currencies; -} - parameter_types! { pub const PreimageMaxSize: u32 = 4096 * 1024; pub PreimageBaseDeposit: Balance = deposit(2, 64); @@ -850,9 +845,6 @@ construct_runtime!( XTokens: orml_xtokens::{Pallet, Storage, Call, Event} = 154, UnknownTokens: orml_unknown_tokens::{Pallet, Storage, Event} = 155, - // Pallets used only in testing runtime - starts at index 200 - Faucet: pallet_faucet::{Pallet, Call, Storage, Config, Event} = 200, - // TEMPORARY - always last. Sudo will be removed at some point. Sudo: pallet_sudo::{Pallet, Call, Config, Storage, Event} = 255, } From ee1e7569bffee275732f8367ec81595bba7e461b Mon Sep 17 00:00:00 2001 From: Jakub Panik Date: Fri, 8 Apr 2022 03:19:13 +0200 Subject: [PATCH 2/5] bump cargo --- runtime/testing-basilisk/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/testing-basilisk/Cargo.toml b/runtime/testing-basilisk/Cargo.toml index 9389def551f..8f472a760d6 100644 --- a/runtime/testing-basilisk/Cargo.toml +++ b/runtime/testing-basilisk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "testing-basilisk-runtime" -version = "40.0.0" +version = "41.0.0" authors = ["GalacticCouncil"] edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" From 97a5d8cd22a65c404a69a86bbc2a203108be77b5 Mon Sep 17 00:00:00 2001 From: lumir-mrkva Date: Fri, 8 Apr 2022 11:12:26 +0200 Subject: [PATCH 3/5] make sure that clippy doesn't update lockfile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 89e432d0a3d..f2401b340e9 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ coverage: .PHONY: clippy clippy: - cargo clippy --release --all-targets --all-features -- -D warnings + cargo clippy --release --locked --all-targets --all-features -- -D warnings .PHONY: format format: From 3e3c292836fd6001deb4c1e99430b82963d6a5f0 Mon Sep 17 00:00:00 2001 From: Jakub Panik Date: Fri, 8 Apr 2022 16:47:42 +0200 Subject: [PATCH 4/5] fix versions --- Cargo.lock | 6 +++--- node/Cargo.toml | 2 +- runtime/basilisk/Cargo.toml | 2 +- runtime/basilisk/src/lib.rs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 26695fa0024..1e4479138fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -415,7 +415,7 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "basilisk" -version = "6.0.0" +version = "7.0.0" dependencies = [ "basilisk-runtime", "clap", @@ -496,7 +496,7 @@ dependencies = [ [[package]] name = "basilisk-runtime" -version = "40.0.0" +version = "41.0.0" dependencies = [ "common-runtime", "cumulus-pallet-aura-ext", @@ -11174,7 +11174,7 @@ dependencies = [ [[package]] name = "testing-basilisk-runtime" -version = "40.0.0" +version = "41.0.0" dependencies = [ "common-runtime", "cumulus-pallet-aura-ext", diff --git a/node/Cargo.toml b/node/Cargo.toml index 2191dc54aab..cffb933643f 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "basilisk" -version = "6.0.0" +version = "7.0.0" description = "Basilisk node" authors = ["GalacticCouncil"] edition = "2021" diff --git a/runtime/basilisk/Cargo.toml b/runtime/basilisk/Cargo.toml index 5ab7f9ae133..50a90fba5b7 100644 --- a/runtime/basilisk/Cargo.toml +++ b/runtime/basilisk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "basilisk-runtime" -version = "40.0.0" +version = "41.0.0" authors = ["GalacticCouncil"] edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" diff --git a/runtime/basilisk/src/lib.rs b/runtime/basilisk/src/lib.rs index d2045d0b633..ee12c592579 100644 --- a/runtime/basilisk/src/lib.rs +++ b/runtime/basilisk/src/lib.rs @@ -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: 40, + spec_version: 41, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, From 8f54f339c6d019973d55b9d1568db9da3eacc8de Mon Sep 17 00:00:00 2001 From: Roznovjak Date: Fri, 6 May 2022 15:45:05 +0200 Subject: [PATCH 5/5] bump versions --- runtime/basilisk/Cargo.toml | 2 +- runtime/basilisk/src/lib.rs | 2 +- runtime/testing-basilisk/Cargo.toml | 2 +- runtime/testing-basilisk/src/lib.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime/basilisk/Cargo.toml b/runtime/basilisk/Cargo.toml index 8eb2b987c82..9f3fc453569 100644 --- a/runtime/basilisk/Cargo.toml +++ b/runtime/basilisk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "basilisk-runtime" -version = "43.0.0" +version = "44.0.0" authors = ["GalacticCouncil"] edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" diff --git a/runtime/basilisk/src/lib.rs b/runtime/basilisk/src/lib.rs index b920679a9f4..9a6c398f06b 100644 --- a/runtime/basilisk/src/lib.rs +++ b/runtime/basilisk/src/lib.rs @@ -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: 43, + spec_version: 44, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, diff --git a/runtime/testing-basilisk/Cargo.toml b/runtime/testing-basilisk/Cargo.toml index c285e136fed..8887ef687f5 100644 --- a/runtime/testing-basilisk/Cargo.toml +++ b/runtime/testing-basilisk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "testing-basilisk-runtime" -version = "43.0.0" +version = "44.0.0" authors = ["GalacticCouncil"] edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" diff --git a/runtime/testing-basilisk/src/lib.rs b/runtime/testing-basilisk/src/lib.rs index b76388ba44b..8f8f64f0fa9 100644 --- a/runtime/testing-basilisk/src/lib.rs +++ b/runtime/testing-basilisk/src/lib.rs @@ -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: 43, + spec_version: 44, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1,