git.delta.rocks / unique-network / refs/commits / 80605288d8ba

difftreelog

Fix after rebase

Daniel Shiposha2022-03-10parent: #8750840.patch.diff
in: master

7 files changed

modifiedruntime/common/Cargo.tomldiffbeforeafterboth
--- 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'
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
--- 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'
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- 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<Runtime>;
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
--- 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'
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
--- 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 <http://www.gnu.org/licenses/>.
 
 //! 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<Runtime>;
 
@@ -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<AccountId>,
+	ParentIsPreset<AccountId>,
 	// Sibling parachain origins convert to AccountId via the `ParaId::into`.
 	SiblingParachainConvertsVia<Sibling, AccountId>,
 	// Straight up local `AccountId32` origins just alias directly to `AccountId`.
@@ -809,6 +827,8 @@
 	type ChannelInfo = ParachainSystem;
 	type VersionWrapper = ();
 	type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;
+	type ControllerOrigin = EnsureRoot<AccountId>;
+	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 {
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
before · runtime/unique/Cargo.toml
1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Unique Runtime'8edition = '2021'9homepage = 'https://unique.network'10license = 'GPLv3'11name = 'unique-runtime'12repository = 'https://github.com/UniqueNetwork/unique-chain'13version = '0.9.17'1415[package.metadata.docs.rs]16targets = ['x86_64-unknown-linux-gnu']1718[features]19default = ['std']20runtime-benchmarks = [21    'hex-literal',22    'frame-benchmarking',23    'frame-support/runtime-benchmarks',24    'frame-system-benchmarking',25    'frame-system/runtime-benchmarks',26    'pallet-ethereum/runtime-benchmarks',27    'pallet-evm-migration/runtime-benchmarks',28    'pallet-evm-coder-substrate/runtime-benchmarks',29    'pallet-balances/runtime-benchmarks',30    'pallet-timestamp/runtime-benchmarks',31    'pallet-common/runtime-benchmarks',32    'pallet-fungible/runtime-benchmarks',33    'pallet-refungible/runtime-benchmarks',34    'pallet-nonfungible/runtime-benchmarks',35    'pallet-unique/runtime-benchmarks',36    'pallet-inflation/runtime-benchmarks',37    'pallet-xcm/runtime-benchmarks',38    'sp-runtime/runtime-benchmarks',39    'xcm-builder/runtime-benchmarks',40]41std = [42    'codec/std',43    'cumulus-pallet-aura-ext/std',44    'cumulus-pallet-parachain-system/std',45    'cumulus-pallet-xcm/std',46    'cumulus-pallet-xcmp-queue/std',47    'cumulus-primitives-core/std',48    'cumulus-primitives-utility/std',49    'frame-executive/std',50    'frame-support/std',51    'frame-system/std',52    'frame-system-rpc-runtime-api/std',53    'pallet-aura/std',54    'pallet-balances/std',55    # 'pallet-contracts/std',56    # 'pallet-contracts-primitives/std',57    # 'pallet-contracts-rpc-runtime-api/std',58    # 'pallet-contract-helpers/std',59    'pallet-randomness-collective-flip/std',60    'pallet-sudo/std',61    'pallet-timestamp/std',62    'pallet-transaction-payment/std',63    'pallet-transaction-payment-rpc-runtime-api/std',64    'pallet-treasury/std',65    # 'pallet-vesting/std',66    'pallet-evm/std',67    'pallet-evm-migration/std',68    'pallet-evm-contract-helpers/std',69    'pallet-evm-transaction-payment/std',70    'pallet-evm-coder-substrate/std',71    'pallet-ethereum/std',72    'pallet-base-fee/std',73    'fp-rpc/std',74    'up-rpc/std',75    'up-evm-mapping/std',76    'fp-self-contained/std',77    'parachain-info/std',78    'serde',79    'pallet-inflation/std',80    'pallet-common/std',81    'pallet-fungible/std',82    'pallet-refungible/std',83    'pallet-nonfungible/std',84    'pallet-unique/std',85    'pallet-unq-scheduler/std',86    'pallet-charge-transaction/std',87    'up-data-structs/std',88    'sp-api/std',89    'sp-block-builder/std',90    "sp-consensus-aura/std",91    'sp-core/std',92    'sp-inherents/std',93    'sp-io/std',94    'sp-offchain/std',95    'sp-runtime/std',96    'sp-session/std',97    'sp-std/std',98    'sp-transaction-pool/std',99    'sp-version/std',100    'xcm/std',101    'xcm-builder/std',102    'xcm-executor/std',103104    "orml-vesting/std",105]106limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']107108################################################################################109# Substrate Dependencies110111[dependencies.codec]112default-features = false113features = ['derive']114package = 'parity-scale-codec'115version = '2.3.0'116117[dependencies.frame-benchmarking]118default-features = false119git = 'https://github.com/paritytech/substrate.git'120optional = true121branch = 'polkadot-v0.9.17'122123[dependencies.frame-executive]124default-features = false125git = 'https://github.com/paritytech/substrate.git'126branch = 'polkadot-v0.9.17'127128[dependencies.frame-support]129default-features = false130git = 'https://github.com/paritytech/substrate.git'131branch = 'polkadot-v0.9.17'132133[dependencies.frame-system]134default-features = false135git = 'https://github.com/paritytech/substrate.git'136branch = 'polkadot-v0.9.17'137138[dependencies.frame-system-benchmarking]139default-features = false140git = 'https://github.com/paritytech/substrate.git'141optional = true142branch = 'polkadot-v0.9.17'143144[dependencies.frame-system-rpc-runtime-api]145default-features = false146git = 'https://github.com/paritytech/substrate.git'147branch = 'polkadot-v0.9.17'148149[dependencies.hex-literal]150optional = true151version = '0.3.3'152153[dependencies.serde]154default-features = false155features = ['derive']156optional = true157version = '1.0.130'158159[dependencies.pallet-aura]160default-features = false161git = 'https://github.com/paritytech/substrate.git'162branch = 'polkadot-v0.9.17'163164[dependencies.pallet-balances]165default-features = false166git = 'https://github.com/paritytech/substrate.git'167branch = 'polkadot-v0.9.17'168169# Contracts specific packages170# [dependencies.pallet-contracts]171# git = 'https://github.com/paritytech/substrate.git'172# default-features = false173# branch = 'polkadot-v0.9.17'174# version = '4.0.0-dev'175176# [dependencies.pallet-contracts-primitives]177# git = 'https://github.com/paritytech/substrate.git'178# default-features = false179# branch = 'polkadot-v0.9.17'180# version = '4.0.0-dev'181182# [dependencies.pallet-contracts-rpc-runtime-api]183# git = 'https://github.com/paritytech/substrate.git'184# default-features = false185# branch = 'polkadot-v0.9.17'186# version = '4.0.0-dev'187188[dependencies.pallet-randomness-collective-flip]189default-features = false190git = 'https://github.com/paritytech/substrate.git'191branch = 'polkadot-v0.9.17'192193[dependencies.pallet-sudo]194default-features = false195git = 'https://github.com/paritytech/substrate.git'196branch = 'polkadot-v0.9.17'197198[dependencies.pallet-timestamp]199default-features = false200git = 'https://github.com/paritytech/substrate.git'201branch = 'polkadot-v0.9.17'202203[dependencies.pallet-transaction-payment]204default-features = false205git = 'https://github.com/paritytech/substrate.git'206branch = 'polkadot-v0.9.17'207208[dependencies.pallet-transaction-payment-rpc-runtime-api]209default-features = false210git = 'https://github.com/paritytech/substrate.git'211branch = 'polkadot-v0.9.17'212213[dependencies.pallet-treasury]214default-features = false215git = 'https://github.com/paritytech/substrate.git'216branch = 'polkadot-v0.9.17'217218# [dependencies.pallet-vesting]219# default-features = false220# git = 'https://github.com/paritytech/substrate.git'221# branch = 'polkadot-v0.9.17'222223[dependencies.sp-arithmetic]224default-features = false225git = 'https://github.com/paritytech/substrate.git'226branch = 'polkadot-v0.9.17'227228[dependencies.sp-api]229default-features = false230git = 'https://github.com/paritytech/substrate.git'231branch = 'polkadot-v0.9.17'232233[dependencies.sp-block-builder]234default-features = false235git = 'https://github.com/paritytech/substrate.git'236branch = 'polkadot-v0.9.17'237238[dependencies.sp-core]239default-features = false240git = 'https://github.com/paritytech/substrate.git'241branch = 'polkadot-v0.9.17'242243[dependencies.sp-consensus-aura]244default-features = false245git = 'https://github.com/paritytech/substrate.git'246branch = 'polkadot-v0.9.17'247248[dependencies.sp-inherents]249default-features = false250git = 'https://github.com/paritytech/substrate.git'251branch = 'polkadot-v0.9.17'252253[dependencies.sp-io]254default-features = false255git = 'https://github.com/paritytech/substrate.git'256branch = 'polkadot-v0.9.17'257258[dependencies.sp-offchain]259default-features = false260git = 'https://github.com/paritytech/substrate.git'261branch = 'polkadot-v0.9.17'262263[dependencies.sp-runtime]264default-features = false265git = 'https://github.com/paritytech/substrate.git'266branch = 'polkadot-v0.9.17'267268[dependencies.sp-session]269default-features = false270git = 'https://github.com/paritytech/substrate.git'271branch = 'polkadot-v0.9.17'272273[dependencies.sp-std]274default-features = false275git = 'https://github.com/paritytech/substrate.git'276branch = 'polkadot-v0.9.17'277278[dependencies.sp-transaction-pool]279default-features = false280git = 'https://github.com/paritytech/substrate.git'281branch = 'polkadot-v0.9.17'282283[dependencies.sp-version]284default-features = false285git = 'https://github.com/paritytech/substrate.git'286branch = 'polkadot-v0.9.17'287288[dependencies.smallvec]289version = '1.6.1'290291################################################################################292# Cumulus dependencies293294[dependencies.parachain-info]295default-features = false296git = 'https://github.com/uniqueNetwork/cumulus.git'297branch = 'polkadot-v0.9.17'298299[dependencies.cumulus-pallet-aura-ext]300git = 'https://github.com/uniqueNetwork/cumulus.git'301branch = 'polkadot-v0.9.17'302default-features = false303304[dependencies.cumulus-pallet-parachain-system]305git = 'https://github.com/uniqueNetwork/cumulus.git'306branch = 'polkadot-v0.9.17'307default-features = false308309[dependencies.cumulus-primitives-core]310git = 'https://github.com/uniqueNetwork/cumulus.git'311branch = 'polkadot-v0.9.17'312default-features = false313314[dependencies.cumulus-pallet-xcm]315git = 'https://github.com/uniqueNetwork/cumulus.git'316branch = 'polkadot-v0.9.17'317default-features = false318319[dependencies.cumulus-pallet-dmp-queue]320git = 'https://github.com/uniqueNetwork/cumulus.git'321branch = 'polkadot-v0.9.17'322default-features = false323324[dependencies.cumulus-pallet-xcmp-queue]325git = 'https://github.com/uniqueNetwork/cumulus.git'326branch = 'polkadot-v0.9.17'327default-features = false328329[dependencies.cumulus-primitives-utility]330git = 'https://github.com/uniqueNetwork/cumulus.git'331branch = 'polkadot-v0.9.17'332default-features = false333334[dependencies.cumulus-primitives-timestamp]335git = 'https://github.com/uniqueNetwork/cumulus.git'336branch = 'polkadot-v0.9.17'337default-features = false338339################################################################################340# Polkadot dependencies341342[dependencies.polkadot-parachain]343git = 'https://github.com/paritytech/polkadot'344branch = 'release-v0.9.17'345default-features = false346347[dependencies.xcm]348git = 'https://github.com/paritytech/polkadot'349branch = 'release-v0.9.17'350default-features = false351352[dependencies.xcm-builder]353git = 'https://github.com/paritytech/polkadot'354branch = 'release-v0.9.17'355default-features = false356357[dependencies.xcm-executor]358git = 'https://github.com/paritytech/polkadot'359branch = 'release-v0.9.17'360default-features = false361362[dependencies.pallet-xcm]363git = 'https://github.com/paritytech/polkadot'364branch = 'release-v0.9.17'365default-features = false366367[dependencies.orml-vesting]368git = 'https://github.com/UniqueNetwork/open-runtime-module-library'369branch = 'unique-polkadot-v0.9.17'370version = "0.4.1-dev"371default-features = false372373################################################################################374# local dependencies375376[dependencies]377unique-runtime-common = { path = "../common", default-features = false }378scale-info = { version = "1.0.0", default-features = false, features = [379    "derive",380] }381derivative = "2.2.0"382pallet-unique = { path = '../../pallets/unique', default-features = false }383up-rpc = { path = "../../primitives/rpc", default-features = false }384up-evm-mapping = { path = "../../primitives/evm-mapping", default-features = false }385pallet-inflation = { path = '../../pallets/inflation', default-features = false }386up-data-structs = { path = '../../primitives/data-structs', default-features = false }387pallet-common = { default-features = false, path = "../../pallets/common" }388pallet-fungible = { default-features = false, path = "../../pallets/fungible" }389pallet-refungible = { default-features = false, path = "../../pallets/refungible" }390pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" }391pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false }392# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }393pallet-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' }394pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }395pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false }396pallet-evm-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false }397pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }398pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" }399pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" }400pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" }401fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" }402fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" }403404################################################################################405# Build Dependencies406407[build-dependencies.substrate-wasm-builder]408git = 'https://github.com/paritytech/substrate.git'409branch = 'polkadot-v0.9.17'
after · runtime/unique/Cargo.toml
1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Unique Runtime'8edition = '2021'9homepage = 'https://unique.network'10license = 'GPLv3'11name = 'unique-runtime'12repository = 'https://github.com/UniqueNetwork/unique-chain'13version = '0.9.17'1415[package.metadata.docs.rs]16targets = ['x86_64-unknown-linux-gnu']1718[features]19default = ['std']20runtime-benchmarks = [21    'hex-literal',22    'frame-benchmarking',23    'frame-support/runtime-benchmarks',24    'frame-system-benchmarking',25    'frame-system/runtime-benchmarks',26    'pallet-ethereum/runtime-benchmarks',27    'pallet-evm-migration/runtime-benchmarks',28    'pallet-evm-coder-substrate/runtime-benchmarks',29    'pallet-balances/runtime-benchmarks',30    'pallet-timestamp/runtime-benchmarks',31    'pallet-common/runtime-benchmarks',32    'pallet-fungible/runtime-benchmarks',33    'pallet-refungible/runtime-benchmarks',34    'pallet-nonfungible/runtime-benchmarks',35    'pallet-unique/runtime-benchmarks',36    'pallet-inflation/runtime-benchmarks',37    'pallet-xcm/runtime-benchmarks',38    'sp-runtime/runtime-benchmarks',39    'xcm-builder/runtime-benchmarks',40]41std = [42    'codec/std',43    'cumulus-pallet-aura-ext/std',44    'cumulus-pallet-parachain-system/std',45    'cumulus-pallet-xcm/std',46    'cumulus-pallet-xcmp-queue/std',47    'cumulus-primitives-core/std',48    'cumulus-primitives-utility/std',49    'frame-executive/std',50    'frame-support/std',51    'frame-system/std',52    'frame-system-rpc-runtime-api/std',53    'pallet-aura/std',54    'pallet-balances/std',55    # 'pallet-contracts/std',56    # 'pallet-contracts-primitives/std',57    # 'pallet-contracts-rpc-runtime-api/std',58    # 'pallet-contract-helpers/std',59    'pallet-randomness-collective-flip/std',60    'pallet-sudo/std',61    'pallet-timestamp/std',62    'pallet-transaction-payment/std',63    'pallet-transaction-payment-rpc-runtime-api/std',64    'pallet-treasury/std',65    # 'pallet-vesting/std',66    'pallet-evm/std',67    'pallet-evm-migration/std',68    'pallet-evm-contract-helpers/std',69    'pallet-evm-transaction-payment/std',70    'pallet-evm-coder-substrate/std',71    'pallet-ethereum/std',72    'pallet-base-fee/std',73    'fp-rpc/std',74    'up-rpc/std',75    'up-evm-mapping/std',76    'fp-self-contained/std',77    'parachain-info/std',78    'serde',79    'pallet-inflation/std',80    'pallet-common/std',81    'pallet-fungible/std',82    'pallet-refungible/std',83    'pallet-nonfungible/std',84    'pallet-unique/std',85    'pallet-unq-scheduler/std',86    'pallet-charge-transaction/std',87    'up-data-structs/std',88    'sp-api/std',89    'sp-block-builder/std',90    "sp-consensus-aura/std",91    'sp-core/std',92    'sp-inherents/std',93    'sp-io/std',94    'sp-offchain/std',95    'sp-runtime/std',96    'sp-session/std',97    'sp-std/std',98    'sp-transaction-pool/std',99    'sp-version/std',100    'xcm/std',101    'xcm-builder/std',102    'xcm-executor/std',103    'unique-runtime-common/std',104105    "orml-vesting/std",106]107limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']108109################################################################################110# Substrate Dependencies111112[dependencies.codec]113default-features = false114features = ['derive']115package = 'parity-scale-codec'116version = '2.3.0'117118[dependencies.frame-benchmarking]119default-features = false120git = 'https://github.com/paritytech/substrate.git'121optional = true122branch = 'polkadot-v0.9.17'123124[dependencies.frame-executive]125default-features = false126git = 'https://github.com/paritytech/substrate.git'127branch = 'polkadot-v0.9.17'128129[dependencies.frame-support]130default-features = false131git = 'https://github.com/paritytech/substrate.git'132branch = 'polkadot-v0.9.17'133134[dependencies.frame-system]135default-features = false136git = 'https://github.com/paritytech/substrate.git'137branch = 'polkadot-v0.9.17'138139[dependencies.frame-system-benchmarking]140default-features = false141git = 'https://github.com/paritytech/substrate.git'142optional = true143branch = 'polkadot-v0.9.17'144145[dependencies.frame-system-rpc-runtime-api]146default-features = false147git = 'https://github.com/paritytech/substrate.git'148branch = 'polkadot-v0.9.17'149150[dependencies.hex-literal]151optional = true152version = '0.3.3'153154[dependencies.serde]155default-features = false156features = ['derive']157optional = true158version = '1.0.130'159160[dependencies.pallet-aura]161default-features = false162git = 'https://github.com/paritytech/substrate.git'163branch = 'polkadot-v0.9.17'164165[dependencies.pallet-balances]166default-features = false167git = 'https://github.com/paritytech/substrate.git'168branch = 'polkadot-v0.9.17'169170# Contracts specific packages171# [dependencies.pallet-contracts]172# git = 'https://github.com/paritytech/substrate.git'173# default-features = false174# branch = 'polkadot-v0.9.17'175# version = '4.0.0-dev'176177# [dependencies.pallet-contracts-primitives]178# git = 'https://github.com/paritytech/substrate.git'179# default-features = false180# branch = 'polkadot-v0.9.17'181# version = '4.0.0-dev'182183# [dependencies.pallet-contracts-rpc-runtime-api]184# git = 'https://github.com/paritytech/substrate.git'185# default-features = false186# branch = 'polkadot-v0.9.17'187# version = '4.0.0-dev'188189[dependencies.pallet-randomness-collective-flip]190default-features = false191git = 'https://github.com/paritytech/substrate.git'192branch = 'polkadot-v0.9.17'193194[dependencies.pallet-sudo]195default-features = false196git = 'https://github.com/paritytech/substrate.git'197branch = 'polkadot-v0.9.17'198199[dependencies.pallet-timestamp]200default-features = false201git = 'https://github.com/paritytech/substrate.git'202branch = 'polkadot-v0.9.17'203204[dependencies.pallet-transaction-payment]205default-features = false206git = 'https://github.com/paritytech/substrate.git'207branch = 'polkadot-v0.9.17'208209[dependencies.pallet-transaction-payment-rpc-runtime-api]210default-features = false211git = 'https://github.com/paritytech/substrate.git'212branch = 'polkadot-v0.9.17'213214[dependencies.pallet-treasury]215default-features = false216git = 'https://github.com/paritytech/substrate.git'217branch = 'polkadot-v0.9.17'218219# [dependencies.pallet-vesting]220# default-features = false221# git = 'https://github.com/paritytech/substrate.git'222# branch = 'polkadot-v0.9.17'223224[dependencies.sp-arithmetic]225default-features = false226git = 'https://github.com/paritytech/substrate.git'227branch = 'polkadot-v0.9.17'228229[dependencies.sp-api]230default-features = false231git = 'https://github.com/paritytech/substrate.git'232branch = 'polkadot-v0.9.17'233234[dependencies.sp-block-builder]235default-features = false236git = 'https://github.com/paritytech/substrate.git'237branch = 'polkadot-v0.9.17'238239[dependencies.sp-core]240default-features = false241git = 'https://github.com/paritytech/substrate.git'242branch = 'polkadot-v0.9.17'243244[dependencies.sp-consensus-aura]245default-features = false246git = 'https://github.com/paritytech/substrate.git'247branch = 'polkadot-v0.9.17'248249[dependencies.sp-inherents]250default-features = false251git = 'https://github.com/paritytech/substrate.git'252branch = 'polkadot-v0.9.17'253254[dependencies.sp-io]255default-features = false256git = 'https://github.com/paritytech/substrate.git'257branch = 'polkadot-v0.9.17'258259[dependencies.sp-offchain]260default-features = false261git = 'https://github.com/paritytech/substrate.git'262branch = 'polkadot-v0.9.17'263264[dependencies.sp-runtime]265default-features = false266git = 'https://github.com/paritytech/substrate.git'267branch = 'polkadot-v0.9.17'268269[dependencies.sp-session]270default-features = false271git = 'https://github.com/paritytech/substrate.git'272branch = 'polkadot-v0.9.17'273274[dependencies.sp-std]275default-features = false276git = 'https://github.com/paritytech/substrate.git'277branch = 'polkadot-v0.9.17'278279[dependencies.sp-transaction-pool]280default-features = false281git = 'https://github.com/paritytech/substrate.git'282branch = 'polkadot-v0.9.17'283284[dependencies.sp-version]285default-features = false286git = 'https://github.com/paritytech/substrate.git'287branch = 'polkadot-v0.9.17'288289[dependencies.smallvec]290version = '1.6.1'291292################################################################################293# Cumulus dependencies294295[dependencies.parachain-info]296default-features = false297git = 'https://github.com/uniqueNetwork/cumulus.git'298branch = 'polkadot-v0.9.17'299300[dependencies.cumulus-pallet-aura-ext]301git = 'https://github.com/uniqueNetwork/cumulus.git'302branch = 'polkadot-v0.9.17'303default-features = false304305[dependencies.cumulus-pallet-parachain-system]306git = 'https://github.com/uniqueNetwork/cumulus.git'307branch = 'polkadot-v0.9.17'308default-features = false309310[dependencies.cumulus-primitives-core]311git = 'https://github.com/uniqueNetwork/cumulus.git'312branch = 'polkadot-v0.9.17'313default-features = false314315[dependencies.cumulus-pallet-xcm]316git = 'https://github.com/uniqueNetwork/cumulus.git'317branch = 'polkadot-v0.9.17'318default-features = false319320[dependencies.cumulus-pallet-dmp-queue]321git = 'https://github.com/uniqueNetwork/cumulus.git'322branch = 'polkadot-v0.9.17'323default-features = false324325[dependencies.cumulus-pallet-xcmp-queue]326git = 'https://github.com/uniqueNetwork/cumulus.git'327branch = 'polkadot-v0.9.17'328default-features = false329330[dependencies.cumulus-primitives-utility]331git = 'https://github.com/uniqueNetwork/cumulus.git'332branch = 'polkadot-v0.9.17'333default-features = false334335[dependencies.cumulus-primitives-timestamp]336git = 'https://github.com/uniqueNetwork/cumulus.git'337branch = 'polkadot-v0.9.17'338default-features = false339340################################################################################341# Polkadot dependencies342343[dependencies.polkadot-parachain]344git = 'https://github.com/paritytech/polkadot'345branch = 'release-v0.9.17'346default-features = false347348[dependencies.xcm]349git = 'https://github.com/paritytech/polkadot'350branch = 'release-v0.9.17'351default-features = false352353[dependencies.xcm-builder]354git = 'https://github.com/paritytech/polkadot'355branch = 'release-v0.9.17'356default-features = false357358[dependencies.xcm-executor]359git = 'https://github.com/paritytech/polkadot'360branch = 'release-v0.9.17'361default-features = false362363[dependencies.pallet-xcm]364git = 'https://github.com/paritytech/polkadot'365branch = 'release-v0.9.17'366default-features = false367368[dependencies.orml-vesting]369git = 'https://github.com/UniqueNetwork/open-runtime-module-library'370branch = 'unique-polkadot-v0.9.17'371version = "0.4.1-dev"372default-features = false373374################################################################################375# local dependencies376377[dependencies]378unique-runtime-common = { path = "../common", default-features = false }379scale-info = { version = "1.0.0", default-features = false, features = [380    "derive",381] }382derivative = "2.2.0"383pallet-unique = { path = '../../pallets/unique', default-features = false }384up-rpc = { path = "../../primitives/rpc", default-features = false }385up-evm-mapping = { path = "../../primitives/evm-mapping", default-features = false }386pallet-inflation = { path = '../../pallets/inflation', default-features = false }387up-data-structs = { path = '../../primitives/data-structs', default-features = false }388pallet-common = { default-features = false, path = "../../pallets/common" }389pallet-fungible = { default-features = false, path = "../../pallets/fungible" }390pallet-refungible = { default-features = false, path = "../../pallets/refungible" }391pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" }392pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false }393# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }394pallet-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' }395pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }396pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false }397pallet-evm-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false }398pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }399pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" }400pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" }401pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" }402fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" }403fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" }404405################################################################################406# Build Dependencies407408[build-dependencies.substrate-wasm-builder]409git = 'https://github.com/paritytech/substrate.git'410branch = 'polkadot-v0.9.17'
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
--- 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 <http://www.gnu.org/licenses/>.
 
 //! 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<Runtime>;
 
@@ -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<AccountId>,
+	ParentIsPreset<AccountId>,
 	// Sibling parachain origins convert to AccountId via the `ParaId::into`.
 	SiblingParachainConvertsVia<Sibling, AccountId>,
 	// Straight up local `AccountId32` origins just alias directly to `AccountId`.
@@ -809,6 +828,8 @@
 	type ChannelInfo = ParachainSystem;
 	type VersionWrapper = ();
 	type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;
+	type ControllerOrigin = EnsureRoot<AccountId>;
+	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 {