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
7description = 'Quartz Runtime'7description = 'Quartz Runtime'
8edition = '2021'8edition = '2021'
9homepage = 'https://unique.network'9homepage = 'https://unique.network'
10license = 'All Rights Reserved'10license = 'GPLv3'
11name = 'quartz-runtime'11name = 'quartz-runtime'
12repository = 'https://github.com/UniqueNetwork/unique-chain'12repository = 'https://github.com/UniqueNetwork/unique-chain'
13version = '0.1.0'13version = '0.1.0'
100    'xcm/std',100    'xcm/std',
101    'xcm-builder/std',101    'xcm-builder/std',
102    'xcm-executor/std',102    'xcm-executor/std',
103    'unique-runtime-common/std',
103104
104    "orml-vesting/std",105    "orml-vesting/std",
105]106]
118default-features = false119default-features = false
119git = 'https://github.com/paritytech/substrate.git'120git = 'https://github.com/paritytech/substrate.git'
120optional = true121optional = true
121branch = 'polkadot-v0.9.16'122branch = 'polkadot-v0.9.17'
122123
123[dependencies.frame-executive]124[dependencies.frame-executive]
124default-features = false125default-features = false
125git = 'https://github.com/paritytech/substrate.git'126git = 'https://github.com/paritytech/substrate.git'
126branch = 'polkadot-v0.9.16'127branch = 'polkadot-v0.9.17'
127128
128[dependencies.frame-support]129[dependencies.frame-support]
129default-features = false130default-features = false
130git = 'https://github.com/paritytech/substrate.git'131git = 'https://github.com/paritytech/substrate.git'
131branch = 'polkadot-v0.9.16'132branch = 'polkadot-v0.9.17'
132133
133[dependencies.frame-system]134[dependencies.frame-system]
134default-features = false135default-features = false
135git = 'https://github.com/paritytech/substrate.git'136git = 'https://github.com/paritytech/substrate.git'
136branch = 'polkadot-v0.9.16'137branch = 'polkadot-v0.9.17'
137138
138[dependencies.frame-system-benchmarking]139[dependencies.frame-system-benchmarking]
139default-features = false140default-features = false
140git = 'https://github.com/paritytech/substrate.git'141git = 'https://github.com/paritytech/substrate.git'
141optional = true142optional = true
142branch = 'polkadot-v0.9.16'143branch = 'polkadot-v0.9.17'
143144
144[dependencies.frame-system-rpc-runtime-api]145[dependencies.frame-system-rpc-runtime-api]
145default-features = false146default-features = false
146git = 'https://github.com/paritytech/substrate.git'147git = 'https://github.com/paritytech/substrate.git'
147branch = 'polkadot-v0.9.16'148branch = 'polkadot-v0.9.17'
148149
149[dependencies.hex-literal]150[dependencies.hex-literal]
150optional = true151optional = true
159[dependencies.pallet-aura]160[dependencies.pallet-aura]
160default-features = false161default-features = false
161git = 'https://github.com/paritytech/substrate.git'162git = 'https://github.com/paritytech/substrate.git'
162branch = 'polkadot-v0.9.16'163branch = 'polkadot-v0.9.17'
163164
164[dependencies.pallet-balances]165[dependencies.pallet-balances]
165default-features = false166default-features = false
166git = 'https://github.com/paritytech/substrate.git'167git = 'https://github.com/paritytech/substrate.git'
167branch = 'polkadot-v0.9.16'168branch = 'polkadot-v0.9.17'
168169
169# Contracts specific packages170# Contracts specific packages
170# [dependencies.pallet-contracts]171# [dependencies.pallet-contracts]
171# git = 'https://github.com/paritytech/substrate.git'172# git = 'https://github.com/paritytech/substrate.git'
172# default-features = false173# default-features = false
173# branch = 'polkadot-v0.9.16'174# branch = 'polkadot-v0.9.17'
174# version = '4.0.0-dev'175# version = '4.0.0-dev'
175176
176# [dependencies.pallet-contracts-primitives]177# [dependencies.pallet-contracts-primitives]
177# git = 'https://github.com/paritytech/substrate.git'178# git = 'https://github.com/paritytech/substrate.git'
178# default-features = false179# default-features = false
179# branch = 'polkadot-v0.9.16'180# branch = 'polkadot-v0.9.17'
180# version = '4.0.0-dev'181# version = '4.0.0-dev'
181182
182# [dependencies.pallet-contracts-rpc-runtime-api]183# [dependencies.pallet-contracts-rpc-runtime-api]
183# git = 'https://github.com/paritytech/substrate.git'184# git = 'https://github.com/paritytech/substrate.git'
184# default-features = false185# default-features = false
185# branch = 'polkadot-v0.9.16'186# branch = 'polkadot-v0.9.17'
186# version = '4.0.0-dev'187# version = '4.0.0-dev'
187188
188[dependencies.pallet-randomness-collective-flip]189[dependencies.pallet-randomness-collective-flip]
189default-features = false190default-features = false
190git = 'https://github.com/paritytech/substrate.git'191git = 'https://github.com/paritytech/substrate.git'
191branch = 'polkadot-v0.9.16'192branch = 'polkadot-v0.9.17'
192193
193[dependencies.pallet-sudo]194[dependencies.pallet-sudo]
194default-features = false195default-features = false
195git = 'https://github.com/paritytech/substrate.git'196git = 'https://github.com/paritytech/substrate.git'
196branch = 'polkadot-v0.9.16'197branch = 'polkadot-v0.9.17'
197198
198[dependencies.pallet-timestamp]199[dependencies.pallet-timestamp]
199default-features = false200default-features = false
200git = 'https://github.com/paritytech/substrate.git'201git = 'https://github.com/paritytech/substrate.git'
201branch = 'polkadot-v0.9.16'202branch = 'polkadot-v0.9.17'
202203
203[dependencies.pallet-transaction-payment]204[dependencies.pallet-transaction-payment]
204default-features = false205default-features = false
205git = 'https://github.com/paritytech/substrate.git'206git = 'https://github.com/paritytech/substrate.git'
206branch = 'polkadot-v0.9.16'207branch = 'polkadot-v0.9.17'
207208
208[dependencies.pallet-transaction-payment-rpc-runtime-api]209[dependencies.pallet-transaction-payment-rpc-runtime-api]
209default-features = false210default-features = false
210git = 'https://github.com/paritytech/substrate.git'211git = 'https://github.com/paritytech/substrate.git'
211branch = 'polkadot-v0.9.16'212branch = 'polkadot-v0.9.17'
212213
213[dependencies.pallet-treasury]214[dependencies.pallet-treasury]
214default-features = false215default-features = false
215git = 'https://github.com/paritytech/substrate.git'216git = 'https://github.com/paritytech/substrate.git'
216branch = 'polkadot-v0.9.16'217branch = 'polkadot-v0.9.17'
217218
218# [dependencies.pallet-vesting]219# [dependencies.pallet-vesting]
219# default-features = false220# default-features = false
220# git = 'https://github.com/paritytech/substrate.git'221# git = 'https://github.com/paritytech/substrate.git'
221# branch = 'polkadot-v0.9.16'222# branch = 'polkadot-v0.9.17'
222223
223[dependencies.sp-arithmetic]224[dependencies.sp-arithmetic]
224default-features = false225default-features = false
225git = 'https://github.com/paritytech/substrate.git'226git = 'https://github.com/paritytech/substrate.git'
226branch = 'polkadot-v0.9.16'227branch = 'polkadot-v0.9.17'
227228
228[dependencies.sp-api]229[dependencies.sp-api]
229default-features = false230default-features = false
230git = 'https://github.com/paritytech/substrate.git'231git = 'https://github.com/paritytech/substrate.git'
231branch = 'polkadot-v0.9.16'232branch = 'polkadot-v0.9.17'
232233
233[dependencies.sp-block-builder]234[dependencies.sp-block-builder]
234default-features = false235default-features = false
235git = 'https://github.com/paritytech/substrate.git'236git = 'https://github.com/paritytech/substrate.git'
236branch = 'polkadot-v0.9.16'237branch = 'polkadot-v0.9.17'
237238
238[dependencies.sp-core]239[dependencies.sp-core]
239default-features = false240default-features = false
240git = 'https://github.com/paritytech/substrate.git'241git = 'https://github.com/paritytech/substrate.git'
241branch = 'polkadot-v0.9.16'242branch = 'polkadot-v0.9.17'
242243
243[dependencies.sp-consensus-aura]244[dependencies.sp-consensus-aura]
244default-features = false245default-features = false
245git = 'https://github.com/paritytech/substrate.git'246git = 'https://github.com/paritytech/substrate.git'
246branch = 'polkadot-v0.9.16'247branch = 'polkadot-v0.9.17'
247248
248[dependencies.sp-inherents]249[dependencies.sp-inherents]
249default-features = false250default-features = false
250git = 'https://github.com/paritytech/substrate.git'251git = 'https://github.com/paritytech/substrate.git'
251branch = 'polkadot-v0.9.16'252branch = 'polkadot-v0.9.17'
252253
253[dependencies.sp-io]254[dependencies.sp-io]
254default-features = false255default-features = false
255git = 'https://github.com/paritytech/substrate.git'256git = 'https://github.com/paritytech/substrate.git'
256branch = 'polkadot-v0.9.16'257branch = 'polkadot-v0.9.17'
257258
258[dependencies.sp-offchain]259[dependencies.sp-offchain]
259default-features = false260default-features = false
260git = 'https://github.com/paritytech/substrate.git'261git = 'https://github.com/paritytech/substrate.git'
261branch = 'polkadot-v0.9.16'262branch = 'polkadot-v0.9.17'
262263
263[dependencies.sp-runtime]264[dependencies.sp-runtime]
264default-features = false265default-features = false
265git = 'https://github.com/paritytech/substrate.git'266git = 'https://github.com/paritytech/substrate.git'
266branch = 'polkadot-v0.9.16'267branch = 'polkadot-v0.9.17'
267268
268[dependencies.sp-session]269[dependencies.sp-session]
269default-features = false270default-features = false
270git = 'https://github.com/paritytech/substrate.git'271git = 'https://github.com/paritytech/substrate.git'
271branch = 'polkadot-v0.9.16'272branch = 'polkadot-v0.9.17'
272273
273[dependencies.sp-std]274[dependencies.sp-std]
274default-features = false275default-features = false
275git = 'https://github.com/paritytech/substrate.git'276git = 'https://github.com/paritytech/substrate.git'
276branch = 'polkadot-v0.9.16'277branch = 'polkadot-v0.9.17'
277278
278[dependencies.sp-transaction-pool]279[dependencies.sp-transaction-pool]
279default-features = false280default-features = false
280git = 'https://github.com/paritytech/substrate.git'281git = 'https://github.com/paritytech/substrate.git'
281branch = 'polkadot-v0.9.16'282branch = 'polkadot-v0.9.17'
282283
283[dependencies.sp-version]284[dependencies.sp-version]
284default-features = false285default-features = false
285git = 'https://github.com/paritytech/substrate.git'286git = 'https://github.com/paritytech/substrate.git'
286branch = 'polkadot-v0.9.16'287branch = 'polkadot-v0.9.17'
287288
288[dependencies.smallvec]289[dependencies.smallvec]
289version = '1.6.1'290version = '1.6.1'
293294
294[dependencies.parachain-info]295[dependencies.parachain-info]
295default-features = false296default-features = false
296git = 'https://github.com/paritytech/cumulus.git'297git = 'https://github.com/uniqueNetwork/cumulus.git'
297branch = 'polkadot-v0.9.16'298branch = 'polkadot-v0.9.17'
298299
299[dependencies.cumulus-pallet-aura-ext]300[dependencies.cumulus-pallet-aura-ext]
300git = 'https://github.com/paritytech/cumulus.git'301git = 'https://github.com/uniqueNetwork/cumulus.git'
301branch = 'polkadot-v0.9.16'302branch = 'polkadot-v0.9.17'
302default-features = false303default-features = false
303304
304[dependencies.cumulus-pallet-parachain-system]305[dependencies.cumulus-pallet-parachain-system]
305git = 'https://github.com/paritytech/cumulus.git'306git = 'https://github.com/uniqueNetwork/cumulus.git'
306branch = 'polkadot-v0.9.16'307branch = 'polkadot-v0.9.17'
307default-features = false308default-features = false
308309
309[dependencies.cumulus-primitives-core]310[dependencies.cumulus-primitives-core]
310git = 'https://github.com/paritytech/cumulus.git'311git = 'https://github.com/uniqueNetwork/cumulus.git'
311branch = 'polkadot-v0.9.16'312branch = 'polkadot-v0.9.17'
312default-features = false313default-features = false
313314
314[dependencies.cumulus-pallet-xcm]315[dependencies.cumulus-pallet-xcm]
315git = 'https://github.com/paritytech/cumulus.git'316git = 'https://github.com/uniqueNetwork/cumulus.git'
316branch = 'polkadot-v0.9.16'317branch = 'polkadot-v0.9.17'
317default-features = false318default-features = false
318319
319[dependencies.cumulus-pallet-dmp-queue]320[dependencies.cumulus-pallet-dmp-queue]
320git = 'https://github.com/paritytech/cumulus.git'321git = 'https://github.com/uniqueNetwork/cumulus.git'
321branch = 'polkadot-v0.9.16'322branch = 'polkadot-v0.9.17'
322default-features = false323default-features = false
323324
324[dependencies.cumulus-pallet-xcmp-queue]325[dependencies.cumulus-pallet-xcmp-queue]
325git = 'https://github.com/paritytech/cumulus.git'326git = 'https://github.com/uniqueNetwork/cumulus.git'
326branch = 'polkadot-v0.9.16'327branch = 'polkadot-v0.9.17'
327default-features = false328default-features = false
328329
329[dependencies.cumulus-primitives-utility]330[dependencies.cumulus-primitives-utility]
330git = 'https://github.com/paritytech/cumulus.git'331git = 'https://github.com/uniqueNetwork/cumulus.git'
331branch = 'polkadot-v0.9.16'332branch = 'polkadot-v0.9.17'
332default-features = false333default-features = false
333334
334[dependencies.cumulus-primitives-timestamp]335[dependencies.cumulus-primitives-timestamp]
335git = 'https://github.com/paritytech/cumulus.git'336git = 'https://github.com/uniqueNetwork/cumulus.git'
336branch = 'polkadot-v0.9.16'337branch = 'polkadot-v0.9.17'
337default-features = false338default-features = false
338339
339################################################################################340################################################################################
340# Polkadot dependencies341# Polkadot dependencies
341342
342[dependencies.polkadot-parachain]343[dependencies.polkadot-parachain]
343git = 'https://github.com/paritytech/polkadot'344git = 'https://github.com/paritytech/polkadot'
344branch = 'release-v0.9.16'345branch = 'release-v0.9.17'
345default-features = false346default-features = false
346347
347[dependencies.xcm]348[dependencies.xcm]
348git = 'https://github.com/paritytech/polkadot'349git = 'https://github.com/paritytech/polkadot'
349branch = 'release-v0.9.16'350branch = 'release-v0.9.17'
350default-features = false351default-features = false
351352
352[dependencies.xcm-builder]353[dependencies.xcm-builder]
353git = 'https://github.com/paritytech/polkadot'354git = 'https://github.com/paritytech/polkadot'
354branch = 'release-v0.9.16'355branch = 'release-v0.9.17'
355default-features = false356default-features = false
356357
357[dependencies.xcm-executor]358[dependencies.xcm-executor]
358git = 'https://github.com/paritytech/polkadot'359git = 'https://github.com/paritytech/polkadot'
359branch = 'release-v0.9.16'360branch = 'release-v0.9.17'
360default-features = false361default-features = false
361362
362[dependencies.pallet-xcm]363[dependencies.pallet-xcm]
363git = 'https://github.com/paritytech/polkadot'364git = 'https://github.com/paritytech/polkadot'
364branch = 'release-v0.9.16'365branch = 'release-v0.9.17'
365default-features = false366default-features = false
366367
367[dependencies.orml-vesting]368[dependencies.orml-vesting]
368git = 'https://github.com/UniqueNetwork/open-runtime-module-library'369git = 'https://github.com/UniqueNetwork/open-runtime-module-library'
369branch = 'unique-polkadot-v0.9.16'370branch = 'unique-polkadot-v0.9.17'
370version = "0.4.1-dev"371version = "0.4.1-dev"
371default-features = false372default-features = false
372373
390pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" }391pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" }
391pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false }392pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false }
392# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }393# 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.16', package = "pallet-template-transaction-payment", default-features = false, version = '3.0.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' }
394pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }395pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }
395pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false }396pallet-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-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false }
397pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }398pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }
398
399pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.16" }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.16" }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.16" }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.16" }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.16" }403fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" }
404404
405################################################################################405################################################################################
406# Build Dependencies406# Build Dependencies
407407
408[build-dependencies.substrate-wasm-builder]408[build-dependencies.substrate-wasm-builder]
409git = 'https://github.com/paritytech/substrate.git'409git = 'https://github.com/paritytech/substrate.git'
410branch = 'polkadot-v0.9.16'410branch = 'polkadot-v0.9.17'
411411
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
--- 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",
 ]
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 {