--- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -26,12 +26,12 @@ [dependencies.sp-core] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-runtime] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.codec] default-features = false @@ -47,9 +47,9 @@ [dependencies.frame-support] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.frame-system] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' --- a/runtime/opal/Cargo.toml +++ b/runtime/opal/Cargo.toml @@ -7,7 +7,7 @@ description = 'Opal Runtime' edition = '2021' homepage = 'https://unique.network' -license = 'All Rights Reserved' +license = 'GPLv3' name = 'opal-runtime' repository = 'https://github.com/UniqueNetwork/unique-chain' version = '0.1.0' @@ -100,6 +100,7 @@ 'xcm/std', 'xcm-builder/std', 'xcm-executor/std', + 'unique-runtime-common/std', "orml-vesting/std", ] @@ -118,33 +119,33 @@ default-features = false git = 'https://github.com/paritytech/substrate.git' optional = true -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.frame-executive] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.frame-support] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.frame-system] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.frame-system-benchmarking] default-features = false git = 'https://github.com/paritytech/substrate.git' optional = true -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.frame-system-rpc-runtime-api] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.hex-literal] optional = true @@ -159,131 +160,131 @@ [dependencies.pallet-aura] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.pallet-balances] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' # Contracts specific packages # [dependencies.pallet-contracts] # git = 'https://github.com/paritytech/substrate.git' # default-features = false -# branch = 'polkadot-v0.9.16' +# branch = 'polkadot-v0.9.17' # version = '4.0.0-dev' # [dependencies.pallet-contracts-primitives] # git = 'https://github.com/paritytech/substrate.git' # default-features = false -# branch = 'polkadot-v0.9.16' +# branch = 'polkadot-v0.9.17' # version = '4.0.0-dev' # [dependencies.pallet-contracts-rpc-runtime-api] # git = 'https://github.com/paritytech/substrate.git' # default-features = false -# branch = 'polkadot-v0.9.16' +# branch = 'polkadot-v0.9.17' # version = '4.0.0-dev' [dependencies.pallet-randomness-collective-flip] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.pallet-sudo] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.pallet-timestamp] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.pallet-transaction-payment] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.pallet-transaction-payment-rpc-runtime-api] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.pallet-treasury] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' # [dependencies.pallet-vesting] # default-features = false # git = 'https://github.com/paritytech/substrate.git' -# branch = 'polkadot-v0.9.16' +# branch = 'polkadot-v0.9.17' [dependencies.sp-arithmetic] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-api] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-block-builder] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-core] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-consensus-aura] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-inherents] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-io] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-offchain] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-runtime] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-session] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-std] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-transaction-pool] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-version] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.smallvec] version = '1.6.1' @@ -293,47 +294,47 @@ [dependencies.parachain-info] default-features = false -git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.16' +git = 'https://github.com/uniqueNetwork/cumulus.git' +branch = 'polkadot-v0.9.17' [dependencies.cumulus-pallet-aura-ext] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.16' +git = 'https://github.com/uniqueNetwork/cumulus.git' +branch = 'polkadot-v0.9.17' default-features = false [dependencies.cumulus-pallet-parachain-system] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.16' +git = 'https://github.com/uniqueNetwork/cumulus.git' +branch = 'polkadot-v0.9.17' default-features = false [dependencies.cumulus-primitives-core] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.16' +git = 'https://github.com/uniqueNetwork/cumulus.git' +branch = 'polkadot-v0.9.17' default-features = false [dependencies.cumulus-pallet-xcm] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.16' +git = 'https://github.com/uniqueNetwork/cumulus.git' +branch = 'polkadot-v0.9.17' default-features = false [dependencies.cumulus-pallet-dmp-queue] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.16' +git = 'https://github.com/uniqueNetwork/cumulus.git' +branch = 'polkadot-v0.9.17' default-features = false [dependencies.cumulus-pallet-xcmp-queue] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.16' +git = 'https://github.com/uniqueNetwork/cumulus.git' +branch = 'polkadot-v0.9.17' default-features = false [dependencies.cumulus-primitives-utility] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.16' +git = 'https://github.com/uniqueNetwork/cumulus.git' +branch = 'polkadot-v0.9.17' default-features = false [dependencies.cumulus-primitives-timestamp] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.16' +git = 'https://github.com/uniqueNetwork/cumulus.git' +branch = 'polkadot-v0.9.17' default-features = false ################################################################################ @@ -341,32 +342,32 @@ [dependencies.polkadot-parachain] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.16' +branch = 'release-v0.9.17' default-features = false [dependencies.xcm] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.16' +branch = 'release-v0.9.17' default-features = false [dependencies.xcm-builder] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.16' +branch = 'release-v0.9.17' default-features = false [dependencies.xcm-executor] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.16' +branch = 'release-v0.9.17' default-features = false [dependencies.pallet-xcm] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.16' +branch = 'release-v0.9.17' default-features = false [dependencies.orml-vesting] git = 'https://github.com/UniqueNetwork/open-runtime-module-library' -branch = 'unique-polkadot-v0.9.16' +branch = 'unique-polkadot-v0.9.17' version = "0.4.1-dev" default-features = false @@ -390,21 +391,20 @@ pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" } pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false } # pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' } -pallet-charge-transaction = { git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.16', package = "pallet-template-transaction-payment", default-features = false, version = '3.0.0' } +pallet-charge-transaction = { git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.17', package = "pallet-template-transaction-payment", default-features = false, version = '3.0.0' } pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false } pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false } pallet-evm-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false } pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" } +pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" } +pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" } +pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" } +fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" } +fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" } -pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.16" } -pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.16" } -pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.16" } -fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.16" } -fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.16" } - ################################################################################ # Build Dependencies [build-dependencies.substrate-wasm-builder] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' --- a/runtime/opal/src/lib.rs +++ b/runtime/opal/src/lib.rs @@ -114,10 +114,7 @@ use unique_runtime_common::{types::*, constants::*}; -// mod chain_extension; -// use crate::chain_extension::{NFTExtension, Imbalance}; - -pub const RUNTIME_NAME: &'static str = "Opal"; +pub const RUNTIME_NAME: &str = "Opal"; pub type CrossAccountId = pallet_common::account::BasicCrossAccountId; --- a/runtime/quartz/Cargo.toml +++ b/runtime/quartz/Cargo.toml @@ -7,7 +7,7 @@ description = 'Quartz Runtime' edition = '2021' homepage = 'https://unique.network' -license = 'All Rights Reserved' +license = 'GPLv3' name = 'quartz-runtime' repository = 'https://github.com/UniqueNetwork/unique-chain' version = '0.1.0' @@ -100,6 +100,7 @@ 'xcm/std', 'xcm-builder/std', 'xcm-executor/std', + 'unique-runtime-common/std', "orml-vesting/std", ] @@ -118,33 +119,33 @@ default-features = false git = 'https://github.com/paritytech/substrate.git' optional = true -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.frame-executive] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.frame-support] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.frame-system] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.frame-system-benchmarking] default-features = false git = 'https://github.com/paritytech/substrate.git' optional = true -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.frame-system-rpc-runtime-api] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.hex-literal] optional = true @@ -159,131 +160,131 @@ [dependencies.pallet-aura] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.pallet-balances] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' # Contracts specific packages # [dependencies.pallet-contracts] # git = 'https://github.com/paritytech/substrate.git' # default-features = false -# branch = 'polkadot-v0.9.16' +# branch = 'polkadot-v0.9.17' # version = '4.0.0-dev' # [dependencies.pallet-contracts-primitives] # git = 'https://github.com/paritytech/substrate.git' # default-features = false -# branch = 'polkadot-v0.9.16' +# branch = 'polkadot-v0.9.17' # version = '4.0.0-dev' # [dependencies.pallet-contracts-rpc-runtime-api] # git = 'https://github.com/paritytech/substrate.git' # default-features = false -# branch = 'polkadot-v0.9.16' +# branch = 'polkadot-v0.9.17' # version = '4.0.0-dev' [dependencies.pallet-randomness-collective-flip] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.pallet-sudo] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.pallet-timestamp] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.pallet-transaction-payment] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.pallet-transaction-payment-rpc-runtime-api] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.pallet-treasury] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' # [dependencies.pallet-vesting] # default-features = false # git = 'https://github.com/paritytech/substrate.git' -# branch = 'polkadot-v0.9.16' +# branch = 'polkadot-v0.9.17' [dependencies.sp-arithmetic] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-api] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-block-builder] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-core] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-consensus-aura] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-inherents] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-io] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-offchain] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-runtime] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-session] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-std] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-transaction-pool] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.sp-version] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' [dependencies.smallvec] version = '1.6.1' @@ -293,47 +294,47 @@ [dependencies.parachain-info] default-features = false -git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.16' +git = 'https://github.com/uniqueNetwork/cumulus.git' +branch = 'polkadot-v0.9.17' [dependencies.cumulus-pallet-aura-ext] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.16' +git = 'https://github.com/uniqueNetwork/cumulus.git' +branch = 'polkadot-v0.9.17' default-features = false [dependencies.cumulus-pallet-parachain-system] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.16' +git = 'https://github.com/uniqueNetwork/cumulus.git' +branch = 'polkadot-v0.9.17' default-features = false [dependencies.cumulus-primitives-core] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.16' +git = 'https://github.com/uniqueNetwork/cumulus.git' +branch = 'polkadot-v0.9.17' default-features = false [dependencies.cumulus-pallet-xcm] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.16' +git = 'https://github.com/uniqueNetwork/cumulus.git' +branch = 'polkadot-v0.9.17' default-features = false [dependencies.cumulus-pallet-dmp-queue] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.16' +git = 'https://github.com/uniqueNetwork/cumulus.git' +branch = 'polkadot-v0.9.17' default-features = false [dependencies.cumulus-pallet-xcmp-queue] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.16' +git = 'https://github.com/uniqueNetwork/cumulus.git' +branch = 'polkadot-v0.9.17' default-features = false [dependencies.cumulus-primitives-utility] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.16' +git = 'https://github.com/uniqueNetwork/cumulus.git' +branch = 'polkadot-v0.9.17' default-features = false [dependencies.cumulus-primitives-timestamp] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.16' +git = 'https://github.com/uniqueNetwork/cumulus.git' +branch = 'polkadot-v0.9.17' default-features = false ################################################################################ @@ -341,32 +342,32 @@ [dependencies.polkadot-parachain] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.16' +branch = 'release-v0.9.17' default-features = false [dependencies.xcm] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.16' +branch = 'release-v0.9.17' default-features = false [dependencies.xcm-builder] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.16' +branch = 'release-v0.9.17' default-features = false [dependencies.xcm-executor] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.16' +branch = 'release-v0.9.17' default-features = false [dependencies.pallet-xcm] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.16' +branch = 'release-v0.9.17' default-features = false [dependencies.orml-vesting] git = 'https://github.com/UniqueNetwork/open-runtime-module-library' -branch = 'unique-polkadot-v0.9.16' +branch = 'unique-polkadot-v0.9.17' version = "0.4.1-dev" default-features = false @@ -390,21 +391,20 @@ pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" } pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false } # pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' } -pallet-charge-transaction = { git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.16', package = "pallet-template-transaction-payment", default-features = false, version = '3.0.0' } +pallet-charge-transaction = { git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.17', package = "pallet-template-transaction-payment", default-features = false, version = '3.0.0' } pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false } pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false } pallet-evm-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false } pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" } +pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" } +pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" } +pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" } +fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" } +fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" } -pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.16" } -pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.16" } -pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.16" } -fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.16" } -fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.16" } - ################################################################################ # Build Dependencies [build-dependencies.substrate-wasm-builder] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.16' +branch = 'polkadot-v0.9.17' --- a/runtime/quartz/src/lib.rs +++ b/runtime/quartz/src/lib.rs @@ -1,7 +1,18 @@ -// -// This file is subject to the terms and conditions defined in -// file 'LICENSE', which is part of this source code package. -// +// Copyright 2019-2022 Unique Network (Gibraltar) Ltd. +// This file is part of Unique Network. + +// Unique Network is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Unique Network is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Unique Network. If not, see . //! The Substrate Node Template runtime. This can be compiled with `#[no_std]`, ready for Wasm. @@ -83,8 +94,9 @@ use xcm_builder::{ AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter, EnsureXcmOrigin, FixedWeightBounds, LocationInverter, NativeAsset, ParentAsSuperuser, - ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, + RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, + ParentIsPreset, }; use xcm_executor::{Config, XcmExecutor, Assets}; use sp_std::{marker::PhantomData}; @@ -102,10 +114,7 @@ use unique_runtime_common::{types::*, constants::*}; -// mod chain_extension; -// use crate::chain_extension::{NFTExtension, Imbalance}; - -pub const RUNTIME_NAME: &'static str = "Quartz"; +pub const RUNTIME_NAME: &str = "Quartz"; pub type CrossAccountId = pallet_common::account::BasicCrossAccountId; @@ -133,7 +142,7 @@ spec_name: create_runtime_str!(RUNTIME_NAME), impl_name: create_runtime_str!(RUNTIME_NAME), authoring_version: 1, - spec_version: 916001, + spec_version: 917004, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -198,18 +207,27 @@ .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO) .build_or_panic(); pub const Version: RuntimeVersion = VERSION; + /* + 255 - Quartz + 42 - Opal + */ pub const SS58Prefix: u8 = 255; } +/* +8880 - Unique +8881 - Quartz +8882 - Opal +*/ parameter_types! { - pub const ChainId: u64 = 8888; + pub const ChainId: u64 = 8881; } pub struct FixedFee; impl FeeCalculator for FixedFee { fn min_gas_price() -> U256 { // Targeting 0.15 UNQ per transfer - 1_024_947_215_000u64.into() + 1_018_751_825_264u64.into() } } @@ -574,7 +592,7 @@ /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. @@ -809,6 +827,8 @@ type ChannelInfo = ParachainSystem; type VersionWrapper = (); type ExecuteOverweightOrigin = frame_system::EnsureRoot; + type ControllerOrigin = EnsureRoot; + type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; } impl cumulus_pallet_dmp_queue::Config for Runtime { @@ -825,7 +845,7 @@ parameter_types! { pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account(); - pub const CollectionCreationPrice: Balance = 100 * UNIQUE; + pub const CollectionCreationPrice: Balance = 2 * UNIQUE; } impl pallet_common::Config for Runtime { --- a/runtime/unique/Cargo.toml +++ b/runtime/unique/Cargo.toml @@ -100,6 +100,7 @@ 'xcm/std', 'xcm-builder/std', 'xcm-executor/std', + 'unique-runtime-common/std', "orml-vesting/std", ] --- a/runtime/unique/src/lib.rs +++ b/runtime/unique/src/lib.rs @@ -1,7 +1,18 @@ -// -// This file is subject to the terms and conditions defined in -// file 'LICENSE', which is part of this source code package. -// +// Copyright 2019-2022 Unique Network (Gibraltar) Ltd. +// This file is part of Unique Network. + +// Unique Network is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Unique Network is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Unique Network. If not, see . //! The Substrate Node Template runtime. This can be compiled with `#[no_std]`, ready for Wasm. @@ -83,8 +94,9 @@ use xcm_builder::{ AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter, EnsureXcmOrigin, FixedWeightBounds, LocationInverter, NativeAsset, ParentAsSuperuser, - ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, + RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, + ParentIsPreset, }; use xcm_executor::{Config, XcmExecutor, Assets}; use sp_std::{marker::PhantomData}; @@ -101,11 +113,8 @@ use sp_runtime::traits::CheckedConversion; use unique_runtime_common::{types::*, constants::*}; - -// mod chain_extension; -// use crate::chain_extension::{NFTExtension, Imbalance}; -pub const RUNTIME_NAME: &'static str = "Unique"; +pub const RUNTIME_NAME: &str = "Unique"; pub type CrossAccountId = pallet_common::account::BasicCrossAccountId; @@ -133,7 +142,7 @@ spec_name: create_runtime_str!(RUNTIME_NAME), impl_name: create_runtime_str!(RUNTIME_NAME), authoring_version: 1, - spec_version: 916001, + spec_version: 917004, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -198,18 +207,28 @@ .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO) .build_or_panic(); pub const Version: RuntimeVersion = VERSION; - pub const SS58Prefix: u8 = 255; + /* + FIXME - Unique + 255 - Quartz + 42 - Opal + */ + pub const SS58Prefix: u8 = 255; // FIXME set valid valud for the Unique runtime } +/* +8880 - Unique +8881 - Quartz +8882 - Opal +*/ parameter_types! { - pub const ChainId: u64 = 8888; + pub const ChainId: u64 = 8880; } pub struct FixedFee; impl FeeCalculator for FixedFee { fn min_gas_price() -> U256 { // Targeting 0.15 UNQ per transfer - 1_024_947_215_000u64.into() + 1_018_751_825_264u64.into() } } @@ -574,7 +593,7 @@ /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. @@ -809,6 +828,8 @@ type ChannelInfo = ParachainSystem; type VersionWrapper = (); type ExecuteOverweightOrigin = frame_system::EnsureRoot; + type ControllerOrigin = EnsureRoot; + type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; } impl cumulus_pallet_dmp_queue::Config for Runtime { @@ -825,7 +846,7 @@ parameter_types! { pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account(); - pub const CollectionCreationPrice: Balance = 100 * UNIQUE; + pub const CollectionCreationPrice: Balance = 2 * UNIQUE; } impl pallet_common::Config for Runtime {