git.delta.rocks / unique-network / refs/commits / fd1b071419f2

difftreelog

feat(rmrk-rpc) up to date + properties interaction

Fahrrader2022-05-23parent: #c680252.patch.diff
in: master

4 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -473,15 +473,15 @@
  "sc-network",
  "sc-network-gossip",
  "sc-utils",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-arithmetic",
  "sp-blockchain",
  "sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-keystore",
  "sp-mmr-primitives",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
  "wasm-timer",
@@ -505,8 +505,8 @@
  "sc-rpc",
  "sc-utils",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
  "thiserror",
 ]
 
@@ -522,11 +522,11 @@
 dependencies = [
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -754,10 +754,10 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-finality-grandpa",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -769,7 +769,7 @@
  "frame-support",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
 ]
 
 [[package]]
@@ -785,8 +785,8 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-std",
 ]
 
 [[package]]
@@ -800,11 +800,11 @@
  "frame-system",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
+ "sp-version",
 ]
 
 [[package]]
@@ -818,10 +818,10 @@
  "frame-support",
  "parity-scale-codec 3.1.2",
  "smallvec",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
+ "sp-version",
 ]
 
 [[package]]
@@ -834,11 +834,11 @@
  "num-traits",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
  "sp-state-machine",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "sp-trie",
 ]
 
@@ -851,10 +851,10 @@
  "ed25519-dalek",
  "finality-grandpa",
  "parity-scale-codec 3.1.2",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-application-crypto",
  "sp-finality-grandpa",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -867,9 +867,9 @@
  "bp-rococo",
  "bp-runtime",
  "parity-scale-codec 3.1.2",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -889,11 +889,11 @@
  "pallet-transaction-payment",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-core",
+ "sp-runtime",
  "sp-state-machine",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "sp-trie",
 ]
 
@@ -989,9 +989,9 @@
 
 [[package]]
 name = "camino"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07fd178c5af4d59e83498ef15cf3f154e1a6f9d091270cb86283c65ef44e9ef0"
+checksum = "869119e97797867fd90f5e22af7d0bd274bd4635ebb9eb68c04f3f513ae6c412"
 dependencies = [
  "serde",
 ]
@@ -1543,10 +1543,10 @@
  "polkadot-overseer",
  "polkadot-primitives",
  "sc-client-api",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
  "tracing",
 ]
 
@@ -1565,16 +1565,16 @@
  "sc-consensus-aura",
  "sc-consensus-slots",
  "sc-telemetry",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-application-crypto",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-aura",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-inherents",
  "sp-keystore",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "substrate-prometheus-endpoint",
  "tracing",
 ]
@@ -1592,10 +1592,10 @@
  "polkadot-primitives",
  "sc-client-api",
  "sc-consensus",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-trie",
  "tracing",
 ]
@@ -1616,11 +1616,11 @@
  "polkadot-parachain",
  "polkadot-primitives",
  "sc-client-api",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
  "sp-state-machine",
  "tracing",
 ]
@@ -1642,10 +1642,10 @@
  "rand 0.8.5",
  "sc-client-api",
  "sc-consensus",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-consensus",
  "sp-maybe-compressed-blob",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "tracing",
 ]
 
@@ -1671,11 +1671,11 @@
  "sc-service",
  "sc-telemetry",
  "sc-tracing",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
  "tracing",
 ]
 
@@ -1691,10 +1691,10 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-application-crypto",
  "sp-consensus-aura",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -1708,9 +1708,9 @@
  "log",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
  "xcm",
  "xcm-executor",
 ]
@@ -1733,15 +1733,15 @@
  "polkadot-parachain",
  "scale-info",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-externalities",
  "sp-inherents",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
+ "sp-runtime",
  "sp-state-machine",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "sp-trie",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-version",
  "xcm",
 ]
 
@@ -1767,9 +1767,9 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
  "xcm",
 ]
 
@@ -1785,8 +1785,8 @@
  "parity-scale-codec 3.1.2",
  "rand_chacha 0.3.1",
  "scale-info",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
  "xcm",
  "xcm-executor",
 ]
@@ -1801,9 +1801,9 @@
  "polkadot-core-primitives",
  "polkadot-parachain",
  "polkadot-primitives",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
  "sp-trie",
 ]
 
@@ -1819,13 +1819,13 @@
  "parity-scale-codec 3.1.2",
  "sc-client-api",
  "scale-info",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-core",
  "sp-inherents",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-state-machine",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
+ "sp-storage",
  "sp-trie",
  "tracing",
 ]
@@ -1839,7 +1839,7 @@
  "futures 0.3.21",
  "parity-scale-codec 3.1.2",
  "sp-inherents",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "sp-timestamp",
 ]
 
@@ -1854,8 +1854,8 @@
  "polkadot-core-primitives",
  "polkadot-parachain",
  "polkadot-primitives",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
  "sp-trie",
  "xcm",
 ]
@@ -1879,11 +1879,11 @@
  "sc-service",
  "sc-telemetry",
  "sc-tracing",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
  "sp-state-machine",
  "tracing",
 ]
@@ -1904,10 +1904,10 @@
  "polkadot-service",
  "sc-client-api",
  "sc-service",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
  "sp-state-machine",
  "thiserror",
 ]
@@ -1929,11 +1929,11 @@
  "polkadot-service",
  "sc-client-api",
  "sc-rpc-api",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-core",
+ "sp-runtime",
  "sp-state-machine",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-storage",
  "tracing",
  "url 2.2.2",
 ]
@@ -1946,9 +1946,9 @@
  "cumulus-primitives-core",
  "parity-scale-codec 3.1.2",
  "polkadot-primitives",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-state-machine",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
 ]
 
 [[package]]
@@ -2575,11 +2575,11 @@
  "fp-rpc",
  "sc-client-api",
  "sc-consensus",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "thiserror",
 ]
 
@@ -2592,9 +2592,9 @@
  "kvdb-rocksdb",
  "parity-scale-codec 3.1.2",
  "parking_lot 0.12.0",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-database",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -2609,9 +2609,9 @@
  "futures-timer",
  "log",
  "sc-client-api",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-blockchain",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -2643,13 +2643,13 @@
  "sc-service",
  "sc-transaction-pool",
  "sc-transaction-pool-api",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-block-builder",
  "sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-storage",
  "tokio 1.18.2",
 ]
 
@@ -2793,9 +2793,9 @@
 dependencies = [
  "ethereum",
  "parity-scale-codec 3.1.2",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -2807,8 +2807,8 @@
  "impl-trait-for-tuples",
  "parity-scale-codec 3.1.2",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-std",
 ]
 
 [[package]]
@@ -2817,7 +2817,7 @@
 source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21-logs#79cd4c4cf29106c431facd6779783fc887b21475"
 dependencies = [
  "frame-support",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
 ]
 
 [[package]]
@@ -2830,11 +2830,11 @@
  "fp-evm",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -2848,9 +2848,9 @@
  "parity-util-mem",
  "scale-info",
  "serde",
- "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-debug-derive",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -2874,13 +2874,13 @@
  "paste",
  "scale-info",
  "serde",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-io",
+ "sp-runtime",
+ "sp-runtime-interface",
+ "sp-std",
+ "sp-storage",
 ]
 
 [[package]]
@@ -2916,16 +2916,16 @@
  "serde",
  "serde_json",
  "serde_nanos",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-database",
  "sp-externalities",
  "sp-inherents",
  "sp-keystore",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-state-machine",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-storage",
  "sp-trie",
  "tempfile",
  "thousands",
@@ -2952,10 +2952,10 @@
  "frame-system",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-arithmetic",
  "sp-npos-elections",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -2967,11 +2967,11 @@
  "frame-system",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+ "sp-tracing",
 ]
 
 [[package]]
@@ -3002,16 +3002,16 @@
  "scale-info",
  "serde",
  "smallvec",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-core-hashing-proc-macro",
  "sp-inherents",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
+ "sp-runtime",
  "sp-staking",
  "sp-state-machine",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
+ "sp-tracing",
  "tt-call",
 ]
 
@@ -3059,11 +3059,11 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+ "sp-version",
 ]
 
 [[package]]
@@ -3076,9 +3076,9 @@
  "frame-system",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -3087,7 +3087,7 @@
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
 dependencies = [
  "parity-scale-codec 3.1.2",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
 ]
 
 [[package]]
@@ -3096,9 +3096,9 @@
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
 dependencies = [
  "frame-support",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -3561,9 +3561,9 @@
 
 [[package]]
 name = "http-body"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
  "bytes 1.1.0",
  "http",
@@ -4201,23 +4201,23 @@
  "serde",
  "serde_derive",
  "smallvec",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-arithmetic",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-inherents",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
  "sp-mmr-primitives",
  "sp-npos-elections",
  "sp-offchain",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "sp-transaction-pool",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-version",
  "static_assertions",
  "substrate-wasm-builder",
  "xcm",
@@ -4234,7 +4234,7 @@
  "polkadot-primitives",
  "polkadot-runtime-common",
  "smallvec",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -5467,9 +5467,9 @@
 
 [[package]]
 name = "once_cell"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
+checksum = "7b10983b38c53aebdf33f542c6275b0f58a238129d00c4ae0e6fb59738d783ca"
 
 [[package]]
 name = "opal-runtime"
@@ -5530,19 +5530,19 @@
  "scale-info",
  "serde",
  "smallvec",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-arithmetic",
  "sp-block-builder",
  "sp-consensus-aura",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-inherents",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
  "sp-offchain",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-session",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "sp-transaction-pool",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-version",
  "substrate-wasm-builder",
  "unique-runtime-common",
  "up-data-structs",
@@ -5612,9 +5612,9 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -5642,10 +5642,10 @@
  "pallet-timestamp",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-application-crypto",
  "sp-consensus-aura",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -5658,10 +5658,10 @@
  "pallet-session",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-application-crypto",
  "sp-authority-discovery",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -5675,8 +5675,8 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "sp-authorship",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -5693,14 +5693,14 @@
  "pallet-timestamp",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-application-crypto",
  "sp-consensus-babe",
  "sp-consensus-vrf",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
 ]
 
 [[package]]
@@ -5716,11 +5716,11 @@
  "pallet-balances",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+ "sp-tracing",
 ]
 
 [[package]]
@@ -5734,8 +5734,8 @@
  "log",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -5749,8 +5749,8 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -5765,8 +5765,8 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -5787,10 +5787,10 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -5805,10 +5805,10 @@
  "pallet-treasury",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -5823,9 +5823,9 @@
  "log",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -5845,8 +5845,8 @@
  "scale-info",
  "serde",
  "sp-finality-grandpa",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
  "sp-trie",
 ]
 
@@ -5866,9 +5866,9 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -5884,10 +5884,10 @@
  "pallet-treasury",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -5901,10 +5901,10 @@
  "log",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -5920,9 +5920,9 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
  "up-data-structs",
 ]
 
@@ -5937,9 +5937,9 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -5955,12 +5955,12 @@
  "parity-scale-codec 3.1.2",
  "rand 0.7.3",
  "scale-info",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
  "sp-npos-elections",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
  "static_assertions",
  "strum 0.23.0",
 ]
@@ -5975,7 +5975,7 @@
  "frame-system",
  "parity-scale-codec 3.1.2",
  "sp-npos-elections",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -5989,11 +5989,11 @@
  "log",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
  "sp-npos-elections",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6021,9 +6021,9 @@
  "scale-info",
  "serde",
  "sha3 0.10.1",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6048,10 +6048,10 @@
  "scale-info",
  "serde",
  "sha3 0.10.1",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6067,8 +6067,8 @@
  "pallet-evm",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-std",
  "up-data-structs",
 ]
 
@@ -6085,9 +6085,9 @@
  "pallet-evm-coder-substrate",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
  "up-sponsorship",
 ]
 
@@ -6102,10 +6102,10 @@
  "pallet-evm",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6120,10 +6120,10 @@
  "pallet-evm",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
  "up-sponsorship",
 ]
 
@@ -6142,9 +6142,9 @@
  "pallet-structure",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
  "up-data-structs",
 ]
 
@@ -6158,9 +6158,9 @@
  "frame-system",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-arithmetic",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6176,14 +6176,14 @@
  "pallet-session",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-application-crypto",
+ "sp-core",
  "sp-finality-grandpa",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
 ]
 
 [[package]]
@@ -6197,9 +6197,9 @@
  "frame-system",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6214,12 +6214,12 @@
  "pallet-authorship",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-application-crypto",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
  "sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
 ]
 
 [[package]]
@@ -6232,11 +6232,11 @@
  "frame-system",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
  "sp-keyring",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6252,10 +6252,10 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6269,10 +6269,10 @@
  "log",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6286,11 +6286,11 @@
  "frame-system",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
  "sp-mmr-primitives",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6303,11 +6303,11 @@
  "jsonrpc-derive",
  "parity-scale-codec 3.1.2",
  "serde",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-mmr-primitives",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -6320,9 +6320,9 @@
  "frame-system",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6334,9 +6334,9 @@
  "frame-system",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6348,10 +6348,10 @@
  "frame-system",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
  "sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
 ]
 
 [[package]]
@@ -6368,9 +6368,9 @@
  "pallet-staking",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
 ]
 
 [[package]]
@@ -6388,9 +6388,9 @@
  "pallet-structure",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
  "struct-versioning",
  "up-data-structs",
 ]
@@ -6407,9 +6407,9 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
 ]
 
 [[package]]
@@ -6430,9 +6430,9 @@
  "pallet-staking",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
 ]
 
 [[package]]
@@ -6445,10 +6445,10 @@
  "frame-system",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6461,9 +6461,9 @@
  "frame-system",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6476,8 +6476,8 @@
  "parity-scale-codec 3.1.2",
  "safe-mix",
  "scale-info",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6489,9 +6489,9 @@
  "frame-system",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6506,9 +6506,9 @@
  "pallet-structure",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
  "struct-versioning",
  "up-data-structs",
 ]
@@ -6525,9 +6525,9 @@
  "pallet-nonfungible",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
  "up-data-structs",
 ]
 
@@ -6542,9 +6542,9 @@
  "log",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6559,12 +6559,12 @@
  "pallet-timestamp",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "sp-trie",
 ]
 
@@ -6579,9 +6579,9 @@
  "pallet-session",
  "pallet-staking",
  "rand 0.7.3",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-session",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
 ]
 
 [[package]]
@@ -6594,8 +6594,8 @@
  "parity-scale-codec 3.1.2",
  "rand_chacha 0.2.2",
  "scale-info",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6614,11 +6614,11 @@
  "rand_chacha 0.2.2",
  "scale-info",
  "serde",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-application-crypto",
+ "sp-io",
+ "sp-runtime",
  "sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
 ]
 
 [[package]]
@@ -6638,7 +6638,7 @@
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
 dependencies = [
  "log",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-arithmetic",
 ]
 
 [[package]]
@@ -6651,7 +6651,7 @@
  "pallet-common",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "up-data-structs",
 ]
 
@@ -6664,9 +6664,9 @@
  "frame-system",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6682,10 +6682,10 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
  "up-sponsorship",
 ]
 
@@ -6701,9 +6701,9 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "sp-inherents",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
  "sp-timestamp",
 ]
 
@@ -6720,10 +6720,10 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6737,10 +6737,10 @@
  "scale-info",
  "serde",
  "smallvec",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6753,11 +6753,11 @@
  "jsonrpc-derive",
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-scale-codec 3.1.2",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-rpc",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -6767,8 +6767,8 @@
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec 3.1.2",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -6784,8 +6784,8 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6799,10 +6799,10 @@
  "pallet-evm",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
  "up-data-structs",
 ]
 
@@ -6817,10 +6817,10 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
  "substrate-test-utils",
  "up-sponsorship",
 ]
@@ -6835,10 +6835,10 @@
  "frame-system",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6852,8 +6852,8 @@
  "log",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -6867,9 +6867,9 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
  "xcm",
  "xcm-executor",
 ]
@@ -6885,8 +6885,8 @@
  "log",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
  "xcm",
  "xcm-executor",
 ]
@@ -7332,7 +7332,7 @@
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "rand 0.8.5",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-keystore",
  "thiserror",
  "tracing-gum",
@@ -7376,7 +7376,7 @@
  "sc-cli",
  "sc-service",
  "sc-tracing",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-trie",
  "substrate-build-script-utils",
  "thiserror",
@@ -7404,21 +7404,21 @@
  "sc-consensus",
  "sc-executor",
  "sc-service",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-finality-grandpa",
  "sp-inherents",
  "sp-keyring",
  "sp-mmr-primitives",
  "sp-offchain",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-session",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-storage",
  "sp-timestamp",
  "sp-transaction-pool",
 ]
@@ -7437,9 +7437,9 @@
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-keystore",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "thiserror",
  "tracing-gum",
 ]
@@ -7452,9 +7452,9 @@
  "parity-scale-codec 3.1.2",
  "parity-util-mem",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -7474,7 +7474,7 @@
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "sc-network",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-application-crypto",
  "sp-keystore",
  "thiserror",
  "tracing-gum",
@@ -7489,7 +7489,7 @@
  "polkadot-node-primitives",
  "polkadot-primitives",
  "reed-solomon-novelpoly",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-trie",
  "thiserror",
 ]
@@ -7508,8 +7508,8 @@
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "sc-network",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-application-crypto",
+ "sp-core",
  "sp-keystore",
  "tracing-gum",
 ]
@@ -7545,7 +7545,7 @@
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-maybe-compressed-blob",
  "thiserror",
  "tracing-gum",
@@ -7572,10 +7572,10 @@
  "polkadot-primitives",
  "sc-keystore",
  "schnorrkel",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-application-crypto",
  "sp-consensus",
  "sp-consensus-slots",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "thiserror",
  "tracing-gum",
 ]
@@ -7714,7 +7714,7 @@
  "polkadot-primitives",
  "sp-blockchain",
  "sp-inherents",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "thiserror",
  "tracing-gum",
 ]
@@ -7757,12 +7757,12 @@
  "sc-executor-common",
  "sc-executor-wasmtime",
  "slotmap",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-externalities",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
  "sp-maybe-compressed-blob",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-tracing",
+ "sp-wasm-interface",
  "tracing-gum",
 ]
 
@@ -7793,10 +7793,10 @@
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-authority-discovery",
  "sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "tracing-gum",
 ]
 
@@ -7814,7 +7814,7 @@
  "polkadot-node-primitives",
  "polkadot-primitives",
  "sc-network",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "thiserror",
 ]
 
@@ -7867,10 +7867,10 @@
  "polkadot-primitives",
  "schnorrkel",
  "serde",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-application-crypto",
  "sp-consensus-babe",
  "sp-consensus-vrf",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-keystore",
  "sp-maybe-compressed-blob",
  "thiserror",
@@ -7932,8 +7932,8 @@
  "polkadot-overseer",
  "polkadot-primitives",
  "rand 0.8.5",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-application-crypto",
+ "sp-core",
  "sp-keystore",
  "thiserror",
  "tracing-gum",
@@ -7956,7 +7956,7 @@
  "polkadot-overseer-gen",
  "polkadot-primitives",
  "sc-client-api",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "tracing-gum",
 ]
 
@@ -8001,9 +8001,9 @@
  "polkadot-core-primitives",
  "scale-info",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -8035,20 +8035,20 @@
  "polkadot-parachain",
  "scale-info",
  "serde",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-arithmetic",
  "sp-authority-discovery",
  "sp-consensus-slots",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-inherents",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
  "sp-keystore",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "sp-trie",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-version",
 ]
 
 [[package]]
@@ -8072,13 +8072,13 @@
  "sc-rpc",
  "sc-sync-state-rpc",
  "sc-transaction-pool-api",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
  "sp-keystore",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "substrate-frame-rpc-system",
  "substrate-state-trie-migration-rpc",
 ]
@@ -8146,22 +8146,22 @@
  "serde",
  "serde_derive",
  "smallvec",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-inherents",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
  "sp-mmr-primitives",
  "sp-npos-elections",
  "sp-offchain",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "sp-transaction-pool",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-version",
  "static_assertions",
  "substrate-wasm-builder",
  "xcm",
@@ -8203,15 +8203,15 @@
  "serde",
  "serde_derive",
  "slot-range-helper",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-core",
  "sp-inherents",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
  "sp-npos-elections",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "static_assertions",
  "xcm",
 ]
@@ -8225,7 +8225,7 @@
  "polkadot-primitives",
  "polkadot-runtime-common",
  "smallvec",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -8236,8 +8236,8 @@
  "bs58",
  "parity-scale-codec 3.1.2",
  "polkadot-primitives",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
+ "sp-tracing",
 ]
 
 [[package]]
@@ -8268,16 +8268,16 @@
  "rustc-hex",
  "scale-info",
  "serde",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-core",
  "sp-inherents",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
  "sp-keystore",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "static_assertions",
  "xcm",
  "xcm-executor",
@@ -8358,22 +8358,22 @@
  "sc-telemetry",
  "sc-transaction-pool",
  "serde",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-finality-grandpa",
  "sp-inherents",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
  "sp-keystore",
  "sp-offchain",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-session",
  "sp-state-machine",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-storage",
  "sp-timestamp",
  "sp-transaction-pool",
  "sp-trie",
@@ -8411,7 +8411,7 @@
 dependencies = [
  "parity-scale-codec 3.1.2",
  "polkadot-primitives",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
 ]
 
 [[package]]
@@ -8454,21 +8454,21 @@
  "serde",
  "serde_derive",
  "smallvec",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-inherents",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
  "sp-mmr-primitives",
  "sp-offchain",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "sp-transaction-pool",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-version",
  "substrate-wasm-builder",
  "test-runtime-constants",
  "xcm",
@@ -8512,16 +8512,16 @@
  "sc-service",
  "sc-tracing",
  "sc-transaction-pool",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-arithmetic",
  "sp-authority-discovery",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-finality-grandpa",
  "sp-inherents",
  "sp-keyring",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-state-machine",
  "substrate-test-client",
  "tempfile",
@@ -8784,19 +8784,19 @@
  "scale-info",
  "serde",
  "smallvec",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-arithmetic",
  "sp-block-builder",
  "sp-consensus-aura",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-inherents",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
  "sp-offchain",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-session",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "sp-transaction-pool",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-version",
  "substrate-wasm-builder",
  "unique-runtime-common",
  "up-data-structs",
@@ -9057,9 +9057,9 @@
 
 [[package]]
 name = "regex"
-version = "1.5.5"
+version = "1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
+checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -9077,9 +9077,9 @@
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.25"
+version = "0.6.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
 
 [[package]]
 name = "region"
@@ -9104,10 +9104,10 @@
  "parity-scale-codec 3.1.2",
  "serde",
  "serde_json",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-version",
 ]
 
 [[package]]
@@ -9131,9 +9131,9 @@
 
 [[package]]
 name = "retain_mut"
-version = "0.1.7"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086"
+checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0"
 
 [[package]]
 name = "ring"
@@ -9177,31 +9177,31 @@
 dependencies = [
  "parity-scale-codec 2.3.1",
  "serde",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
  "up-data-structs",
 ]
 
 [[package]]
 name = "rmrk-rpc"
 version = "0.0.1"
-source = "git+https://github.com/UniqueNetwork/rmrk-substrate.git?branch=feature/separate-types-and-traits#01c2995b64c34063a1c9fc4d856635022cea4f78"
+source = "git+https://github.com/UniqueNetwork/rmrk-substrate.git?branch=feature/separate-types-and-traits#013c35e9355c5e1cec4867a17be2f9e8d1207c06"
 dependencies = [
  "parity-scale-codec 2.3.1",
  "rmrk-types",
  "serde",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
+ "sp-api",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
 name = "rmrk-types"
 version = "0.0.1"
-source = "git+https://github.com/UniqueNetwork/rmrk-substrate.git?branch=feature/separate-types-and-traits#01c2995b64c34063a1c9fc4d856635022cea4f78"
+source = "git+https://github.com/UniqueNetwork/rmrk-substrate.git?branch=feature/separate-types-and-traits#013c35e9355c5e1cec4867a17be2f9e8d1207c06"
 dependencies = [
  "parity-scale-codec 3.1.2",
  "scale-info",
@@ -9274,21 +9274,21 @@
  "serde",
  "serde_derive",
  "smallvec",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-inherents",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
  "sp-mmr-primitives",
  "sp-offchain",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "sp-transaction-pool",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-version",
  "substrate-wasm-builder",
  "xcm",
  "xcm-builder",
@@ -9304,7 +9304,7 @@
  "polkadot-primitives",
  "polkadot-runtime-common",
  "smallvec",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -9502,8 +9502,8 @@
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
 dependencies = [
  "log",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-wasm-interface",
  "thiserror",
 ]
 
@@ -9524,12 +9524,12 @@
  "rand 0.7.3",
  "sc-client-api",
  "sc-network",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-authority-discovery",
  "sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-keystore",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
 ]
@@ -9548,12 +9548,12 @@
  "sc-proposer-metrics",
  "sc-telemetry",
  "sc-transaction-pool-api",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-inherents",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "substrate-prometheus-endpoint",
 ]
 
@@ -9564,12 +9564,12 @@
 dependencies = [
  "parity-scale-codec 3.1.2",
  "sc-client-api",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-block-builder",
  "sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-inherents",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-state-machine",
 ]
 
@@ -9586,8 +9586,8 @@
  "sc-telemetry",
  "serde",
  "serde_json",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -9628,12 +9628,12 @@
  "serde",
  "serde_json",
  "sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-keyring",
  "sp-keystore",
  "sp-panic-handler",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-version",
  "thiserror",
  "tiny-bip39",
  "tokio 1.18.2",
@@ -9653,16 +9653,16 @@
  "sc-executor",
  "sc-transaction-pool-api",
  "sc-utils",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-database",
  "sp-externalities",
  "sp-keystore",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-state-machine",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-storage",
  "sp-trie",
  "substrate-prometheus-endpoint",
 ]
@@ -9683,11 +9683,11 @@
  "parking_lot 0.12.0",
  "sc-client-api",
  "sc-state-db",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-arithmetic",
  "sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-database",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-state-machine",
  "sp-trie",
 ]
@@ -9706,11 +9706,11 @@
  "sc-client-api",
  "sc-utils",
  "serde",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
  "sp-state-machine",
  "substrate-prometheus-endpoint",
  "thiserror",
@@ -9730,17 +9730,17 @@
  "sc-consensus",
  "sc-consensus-slots",
  "sc-telemetry",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-application-crypto",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-aura",
  "sp-consensus-slots",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-inherents",
  "sp-keystore",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
 ]
@@ -9770,20 +9770,20 @@
  "sc-telemetry",
  "schnorrkel",
  "serde",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-application-crypto",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
  "sp-consensus-slots",
  "sp-consensus-vrf",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-inherents",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
  "sp-keystore",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-version",
  "substrate-prometheus-endpoint",
  "thiserror",
 ]
@@ -9801,14 +9801,14 @@
  "sc-consensus-epochs",
  "sc-rpc-api",
  "serde",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-application-crypto",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-keystore",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "thiserror",
 ]
 
@@ -9822,7 +9822,7 @@
  "sc-client-api",
  "sc-consensus",
  "sp-blockchain",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -9846,16 +9846,16 @@
  "sc-transaction-pool",
  "sc-transaction-pool-api",
  "serde",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-aura",
  "sp-consensus-babe",
  "sp-consensus-slots",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-inherents",
  "sp-keystore",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-timestamp",
  "substrate-prometheus-endpoint",
  "thiserror",
@@ -9874,13 +9874,13 @@
  "sc-client-api",
  "sc-consensus",
  "sc-telemetry",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-arithmetic",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-slots",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-inherents",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-state-machine",
  "sp-timestamp",
  "thiserror",
@@ -9893,7 +9893,7 @@
 dependencies = [
  "sc-client-api",
  "sp-authorship",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "thiserror",
 ]
 
@@ -9909,17 +9909,17 @@
  "sc-executor-common",
  "sc-executor-wasmi",
  "sc-executor-wasmtime",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-core",
+ "sp-core-hashing-proc-macro",
  "sp-externalities",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
  "sp-panic-handler",
- "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime-interface",
  "sp-tasks",
  "sp-trie",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-version",
+ "sp-wasm-interface",
  "tracing",
  "wasmi",
 ]
@@ -9932,10 +9932,10 @@
  "environmental",
  "parity-scale-codec 3.1.2",
  "sc-allocator",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-maybe-compressed-blob",
  "sp-serializer",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-wasm-interface",
  "thiserror",
  "wasm-instrument",
  "wasmi",
@@ -9951,9 +9951,9 @@
  "sc-allocator",
  "sc-executor-common",
  "scoped-tls",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime-interface",
+ "sp-wasm-interface",
  "wasmi",
 ]
 
@@ -9969,9 +9969,9 @@
  "parity-wasm 0.42.2",
  "sc-allocator",
  "sc-executor-common",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime-interface",
+ "sp-wasm-interface",
  "wasmtime",
 ]
 
@@ -10002,15 +10002,15 @@
  "sc-telemetry",
  "sc-utils",
  "serde_json",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-arithmetic",
  "sp-blockchain",
  "sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-finality-grandpa",
  "sp-keystore",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
 ]
@@ -10034,8 +10034,8 @@
  "serde",
  "serde_json",
  "sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
  "thiserror",
 ]
 
@@ -10053,7 +10053,7 @@
  "sc-network",
  "sc-transaction-pool-api",
  "sp-blockchain",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -10065,8 +10065,8 @@
  "hex",
  "parking_lot 0.12.0",
  "serde_json",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-application-crypto",
+ "sp-core",
  "sp-keystore",
  "thiserror",
 ]
@@ -10107,12 +10107,12 @@
  "serde",
  "serde_json",
  "smallvec",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-arithmetic",
  "sp-blockchain",
  "sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-finality-grandpa",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
  "unsigned-varint 0.6.0",
@@ -10132,7 +10132,7 @@
  "log",
  "lru 0.7.5",
  "sc-network",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "substrate-prometheus-endpoint",
  "tracing",
 ]
@@ -10157,10 +10157,10 @@
  "sc-client-api",
  "sc-network",
  "sc-utils",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-core",
  "sp-offchain",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "threadpool",
  "tracing",
 ]
@@ -10207,15 +10207,15 @@
  "sc-transaction-pool-api",
  "sc-utils",
  "serde_json",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-keystore",
  "sp-offchain",
  "sp-rpc",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-session",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-version",
 ]
 
 [[package]]
@@ -10236,11 +10236,11 @@
  "scale-info",
  "serde",
  "serde_json",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-rpc",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-tracing",
+ "sp-version",
  "thiserror",
 ]
 
@@ -10300,24 +10300,24 @@
  "sc-utils",
  "serde",
  "serde_json",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-application-crypto",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-externalities",
  "sp-inherents",
  "sp-keystore",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-session",
  "sp-state-machine",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-storage",
+ "sp-tracing",
  "sp-transaction-pool",
  "sp-transaction-storage-proof",
  "sp-trie",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-version",
  "substrate-prometheus-endpoint",
  "tempfile",
  "thiserror",
@@ -10337,7 +10337,7 @@
  "parity-util-mem-derive",
  "parking_lot 0.12.0",
  "sc-client-api",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
 ]
 
 [[package]]
@@ -10357,7 +10357,7 @@
  "serde",
  "serde_json",
  "sp-blockchain",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "thiserror",
 ]
 
@@ -10375,9 +10375,9 @@
  "sc-telemetry",
  "serde",
  "serde_json",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-std",
 ]
 
 [[package]]
@@ -10417,12 +10417,12 @@
  "sc-rpc-server",
  "sc-tracing-proc-macro",
  "serde",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-rpc",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-tracing",
  "thiserror",
  "tracing",
  "tracing-log",
@@ -10457,11 +10457,11 @@
  "sc-transaction-pool-api",
  "sc-utils",
  "serde",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
+ "sp-tracing",
  "sp-transaction-pool",
  "substrate-prometheus-endpoint",
  "thiserror",
@@ -10476,7 +10476,7 @@
  "log",
  "serde",
  "sp-blockchain",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "thiserror",
 ]
 
@@ -10885,8 +10885,8 @@
  "enumn",
  "parity-scale-codec 3.1.2",
  "paste",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -10968,49 +10968,23 @@
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
-dependencies = [
- "log",
- "parity-scale-codec 3.1.2",
- "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
-]
-
-[[package]]
-name = "sp-api"
-version = "4.0.0-dev"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
 dependencies = [
  "hash-db",
  "log",
  "parity-scale-codec 3.1.2",
- "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api-proc-macro",
+ "sp-core",
+ "sp-runtime",
  "sp-state-machine",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
+ "sp-version",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
-dependencies = [
- "blake2 0.10.4",
- "proc-macro-crate 1.1.3",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "sp-api-proc-macro"
-version = "4.0.0-dev"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
 dependencies = [
  "blake2 0.10.4",
@@ -11018,18 +10992,6 @@
  "proc-macro2",
  "quote",
  "syn",
-]
-
-[[package]]
-name = "sp-application-crypto"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
-dependencies = [
- "parity-scale-codec 3.1.2",
- "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
 ]
 
 [[package]]
@@ -11040,23 +11002,9 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
-]
-
-[[package]]
-name = "sp-arithmetic"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
-dependencies = [
- "integer-sqrt",
- "num-traits",
- "parity-scale-codec 3.1.2",
- "scale-info",
- "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "static_assertions",
+ "sp-core",
+ "sp-io",
+ "sp-std",
 ]
 
 [[package]]
@@ -11069,8 +11017,8 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-debug-derive",
+ "sp-std",
  "static_assertions",
 ]
 
@@ -11081,10 +11029,10 @@
 dependencies = [
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -11095,8 +11043,8 @@
  "async-trait",
  "parity-scale-codec 3.1.2",
  "sp-inherents",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -11105,10 +11053,10 @@
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
 dependencies = [
  "parity-scale-codec 3.1.2",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-inherents",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -11121,10 +11069,10 @@
  "lru 0.7.5",
  "parity-scale-codec 3.1.2",
  "parking_lot 0.12.0",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-consensus",
  "sp-database",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-state-machine",
  "thiserror",
 ]
@@ -11139,12 +11087,12 @@
  "futures-timer",
  "log",
  "parity-scale-codec 3.1.2",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-inherents",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-state-machine",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
+ "sp-version",
  "thiserror",
 ]
 
@@ -11156,13 +11104,13 @@
  "async-trait",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-application-crypto",
  "sp-consensus",
  "sp-consensus-slots",
  "sp-inherents",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
  "sp-timestamp",
 ]
 
@@ -11176,16 +11124,16 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-application-crypto",
  "sp-consensus",
  "sp-consensus-slots",
  "sp-consensus-vrf",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-inherents",
  "sp-keystore",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
  "sp-timestamp",
 ]
 
@@ -11197,9 +11145,9 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-arithmetic",
+ "sp-runtime",
+ "sp-std",
  "sp-timestamp",
 ]
 
@@ -11210,33 +11158,9 @@
 dependencies = [
  "parity-scale-codec 3.1.2",
  "schnorrkel",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
-]
-
-[[package]]
-name = "sp-core"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
-dependencies = [
- "bitflags",
- "byteorder",
- "hash-db",
- "hash256-std-hasher",
- "log",
- "num-traits",
- "parity-scale-codec 3.1.2",
- "parity-util-mem",
- "primitive-types",
- "scale-info",
- "secrecy",
- "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "ss58-registry",
- "zeroize",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -11271,12 +11195,12 @@
  "secp256k1",
  "secrecy",
  "serde",
- "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core-hashing",
+ "sp-debug-derive",
  "sp-externalities",
- "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime-interface",
+ "sp-std",
+ "sp-storage",
  "ss58-registry",
  "substrate-bip39",
  "thiserror",
@@ -11288,20 +11212,6 @@
 [[package]]
 name = "sp-core-hashing"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
-dependencies = [
- "blake2 0.10.4",
- "byteorder",
- "digest 0.10.3",
- "sha2 0.10.2",
- "sha3 0.10.1",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "twox-hash",
-]
-
-[[package]]
-name = "sp-core-hashing"
-version = "4.0.0"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
 dependencies = [
  "blake2 0.10.4",
@@ -11309,19 +11219,8 @@
  "digest 0.10.3",
  "sha2 0.10.2",
  "sha3 0.10.1",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "twox-hash",
-]
-
-[[package]]
-name = "sp-core-hashing-proc-macro"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
-dependencies = [
- "proc-macro2",
- "quote",
- "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "syn",
 ]
 
 [[package]]
@@ -11331,7 +11230,7 @@
 dependencies = [
  "proc-macro2",
  "quote",
- "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core-hashing",
  "syn",
 ]
 
@@ -11347,16 +11246,6 @@
 [[package]]
 name = "sp-debug-derive"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "sp-debug-derive"
-version = "4.0.0"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
 dependencies = [
  "proc-macro2",
@@ -11371,8 +11260,8 @@
 dependencies = [
  "environmental",
  "parity-scale-codec 3.1.2",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
+ "sp-storage",
 ]
 
 [[package]]
@@ -11385,12 +11274,12 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-core",
  "sp-keystore",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -11401,31 +11290,15 @@
  "async-trait",
  "impl-trait-for-tuples",
  "parity-scale-codec 3.1.2",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-io"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
-dependencies = [
- "hash-db",
- "parity-scale-codec 3.1.2",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "tracing",
- "tracing-core",
-]
-
-[[package]]
-name = "sp-io"
-version = "6.0.0"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
 dependencies = [
  "futures 0.3.21",
@@ -11435,15 +11308,15 @@
  "parity-scale-codec 3.1.2",
  "parking_lot 0.12.0",
  "secp256k1",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-externalities",
  "sp-keystore",
- "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime-interface",
  "sp-state-machine",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
+ "sp-tracing",
  "sp-trie",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-wasm-interface",
  "tracing",
  "tracing-core",
 ]
@@ -11454,8 +11327,8 @@
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
 dependencies = [
  "lazy_static",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
  "strum 0.23.0",
 ]
 
@@ -11471,7 +11344,7 @@
  "parking_lot 0.12.0",
  "schnorrkel",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-externalities",
  "thiserror",
 ]
@@ -11493,11 +11366,11 @@
  "log",
  "parity-scale-codec 3.1.2",
  "serde",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-core",
+ "sp-debug-derive",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -11508,10 +11381,10 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -11519,9 +11392,9 @@
 version = "4.0.0-dev"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
 dependencies = [
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-core",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -11541,27 +11414,7 @@
 dependencies = [
  "rustc-hash",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
-]
-
-[[package]]
-name = "sp-runtime"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
-dependencies = [
- "either",
- "hash256-std-hasher",
- "impl-trait-for-tuples",
- "log",
- "parity-scale-codec 3.1.2",
- "parity-util-mem",
- "paste",
- "scale-info",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
+ "sp-core",
 ]
 
 [[package]]
@@ -11579,27 +11432,11 @@
  "rand 0.7.3",
  "scale-info",
  "serde",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
-]
-
-[[package]]
-name = "sp-runtime-interface"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
-dependencies = [
- "impl-trait-for-tuples",
- "parity-scale-codec 3.1.2",
- "primitive-types",
- "sp-runtime-interface-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "static_assertions",
+ "sp-application-crypto",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
+ "sp-std",
 ]
 
 [[package]]
@@ -11611,24 +11448,12 @@
  "parity-scale-codec 3.1.2",
  "primitive-types",
  "sp-externalities",
- "sp-runtime-interface-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime-interface-proc-macro",
+ "sp-std",
+ "sp-storage",
+ "sp-tracing",
+ "sp-wasm-interface",
  "static_assertions",
-]
-
-[[package]]
-name = "sp-runtime-interface-proc-macro"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
-dependencies = [
- "Inflector",
- "proc-macro-crate 1.1.3",
- "proc-macro2",
- "quote",
- "syn",
 ]
 
 [[package]]
@@ -11659,11 +11484,11 @@
 dependencies = [
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-core",
+ "sp-runtime",
  "sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
 ]
 
 [[package]]
@@ -11673,8 +11498,8 @@
 dependencies = [
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -11689,20 +11514,15 @@
  "parking_lot 0.12.0",
  "rand 0.7.3",
  "smallvec",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-externalities",
  "sp-panic-handler",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "sp-trie",
  "thiserror",
  "tracing",
  "trie-root",
 ]
-
-[[package]]
-name = "sp-std"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
 
 [[package]]
 name = "sp-std"
@@ -11712,25 +11532,14 @@
 [[package]]
 name = "sp-storage"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
-dependencies = [
- "parity-scale-codec 3.1.2",
- "ref-cast",
- "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
-]
-
-[[package]]
-name = "sp-storage"
-version = "6.0.0"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
 dependencies = [
  "impl-serde",
  "parity-scale-codec 3.1.2",
  "ref-cast",
  "serde",
- "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-debug-derive",
+ "sp-std",
 ]
 
 [[package]]
@@ -11739,11 +11548,11 @@
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
 dependencies = [
  "log",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-externalities",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
+ "sp-runtime-interface",
+ "sp-std",
 ]
 
 [[package]]
@@ -11755,31 +11564,20 @@
  "futures-timer",
  "log",
  "parity-scale-codec 3.1.2",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-inherents",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-tracing"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
-dependencies = [
- "parity-scale-codec 3.1.2",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "tracing",
- "tracing-core",
-]
-
-[[package]]
-name = "sp-tracing"
-version = "5.0.0"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
 dependencies = [
  "parity-scale-codec 3.1.2",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "tracing",
  "tracing-core",
  "tracing-subscriber",
@@ -11790,8 +11588,8 @@
 version = "4.0.0-dev"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
 dependencies = [
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -11803,10 +11601,10 @@
  "log",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-inherents",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
+ "sp-std",
  "sp-trie",
 ]
 
@@ -11819,8 +11617,8 @@
  "memory-db",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-std",
  "thiserror",
  "trie-db",
  "trie-root",
@@ -11829,19 +11627,6 @@
 [[package]]
 name = "sp-version"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
-dependencies = [
- "parity-scale-codec 3.1.2",
- "scale-info",
- "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
- "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
-]
-
-[[package]]
-name = "sp-version"
-version = "5.0.0"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
 dependencies = [
  "impl-serde",
@@ -11849,43 +11634,22 @@
  "parity-wasm 0.42.2",
  "scale-info",
  "serde",
- "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core-hashing-proc-macro",
+ "sp-runtime",
+ "sp-std",
+ "sp-version-proc-macro",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
-dependencies = [
- "parity-scale-codec 3.1.2",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "sp-version-proc-macro"
-version = "4.0.0-dev"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
 dependencies = [
  "parity-scale-codec 3.1.2",
  "proc-macro2",
  "quote",
  "syn",
-]
-
-[[package]]
-name = "sp-wasm-interface"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a"
-dependencies = [
- "impl-trait-for-tuples",
- "parity-scale-codec 3.1.2",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.20)",
 ]
 
 [[package]]
@@ -11896,7 +11660,7 @@
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec 3.1.2",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "wasmi",
  "wasmtime",
 ]
@@ -12076,11 +11840,11 @@
  "sc-client-api",
  "sc-rpc-api",
  "sc-transaction-pool-api",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-block-builder",
  "sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12110,11 +11874,11 @@
  "sc-rpc-api",
  "scale-info",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
  "sp-state-machine",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "sp-trie",
  "trie-db",
 ]
@@ -12138,10 +11902,10 @@
  "serde_json",
  "sp-blockchain",
  "sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-keyring",
  "sp-keystore",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-state-machine",
 ]
 
@@ -12266,7 +12030,7 @@
  "polkadot-primitives",
  "polkadot-runtime-common",
  "smallvec",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12290,10 +12054,10 @@
  "pallet-unique",
  "parity-scale-codec 3.1.2",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
  "unique-runtime-common",
  "up-data-structs",
 ]
@@ -12763,13 +12527,13 @@
  "sc-executor",
  "sc-service",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-externalities",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
  "sp-keystore",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-state-machine",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-version",
  "zstd",
 ]
 
@@ -12808,11 +12572,11 @@
  "pallet-evm",
  "parity-scale-codec 3.1.2",
  "rmrk-rpc 0.0.1",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-rpc",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "unique-runtime-common",
  "up-data-structs",
  "up-rpc",
@@ -12945,17 +12709,17 @@
  "sc-transaction-pool",
  "serde",
  "serde_json",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-aura",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-finality-grandpa",
  "sp-inherents",
  "sp-keystore",
  "sp-offchain",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-session",
  "sp-timestamp",
  "sp-transaction-pool",
@@ -13003,16 +12767,16 @@
  "sc-service",
  "sc-transaction-pool",
  "serde",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-aura",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-offchain",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-session",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-storage",
  "sp-transaction-pool",
  "substrate-frame-rpc-system",
  "tokio 0.2.25",
@@ -13081,19 +12845,19 @@
  "scale-info",
  "serde",
  "smallvec",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-arithmetic",
  "sp-block-builder",
  "sp-consensus-aura",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-inherents",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
  "sp-offchain",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-session",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "sp-transaction-pool",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-version",
  "substrate-wasm-builder",
  "unique-runtime-common",
  "up-data-structs",
@@ -13121,9 +12885,9 @@
  "rmrk-rpc 0.0.1",
  "scale-info",
  "sp-consensus-aura",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
  "up-data-structs",
  "up-sponsorship",
 ]
@@ -13185,9 +12949,9 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
  "struct-versioning",
 ]
 
@@ -13198,10 +12962,10 @@
  "pallet-common",
  "pallet-evm",
  "parity-scale-codec 3.1.2",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
  "up-data-structs",
 ]
 
@@ -13736,22 +13500,22 @@
  "serde",
  "serde_derive",
  "smallvec",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-api",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-core",
  "sp-inherents",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-io",
  "sp-mmr-primitives",
  "sp-npos-elections",
  "sp-offchain",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-std",
  "sp-transaction-pool",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-version",
  "substrate-wasm-builder",
  "westend-runtime-constants",
  "xcm",
@@ -13768,7 +13532,7 @@
  "polkadot-primitives",
  "polkadot-runtime-common",
  "smallvec",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -13944,10 +13708,10 @@
  "parity-scale-codec 3.1.2",
  "polkadot-parachain",
  "scale-info",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-arithmetic",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
  "xcm",
  "xcm-executor",
 ]
@@ -13962,11 +13726,11 @@
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec 3.1.2",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.21)",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
  "xcm",
 ]
 
modifiedpallets/proxy-rmrk-core/src/lib.rsdiffbeforeafterboth
--- a/pallets/proxy-rmrk-core/src/lib.rs
+++ b/pallets/proxy-rmrk-core/src/lib.rs
@@ -228,7 +228,7 @@
         collection.save()
     }
 
-    fn get_nft_collection(collection_id: CollectionId) -> Result<NonfungibleHandle<T>, DispatchError> {
+    pub fn get_nft_collection(collection_id: CollectionId) -> Result<NonfungibleHandle<T>, DispatchError> {
         let collection = <CollectionHandle<T>>::try_get(collection_id)
             .map_err(|_| <Error<T>>::CollectionUnknown)?
             .into_nft_collection()?;
@@ -236,17 +236,34 @@
         Ok(collection)
     }
 
-    fn get_collection_type(collection_id: CollectionId) -> Result<CollectionType, DispatchError> {
-        let collection_type: CollectionType = <PalletCommon<T>>::collection_properties(collection_id)
-            .get(&rmrk_property!(Config=T, key: CollectionType)?)
+    pub fn get_collection_property(collection_id: CollectionId, key: RmrkProperty) -> Result<PropertyValue, DispatchError> {
+        let collection_property = <PalletCommon<T>>::collection_properties(collection_id)
+            .get(&rmrk_property!(Config=T, key)?)
             .ok_or(<Error<T>>::CollectionUnknown)?
+            .clone();
+
+        Ok(collection_property)
+    }
+
+    pub fn get_collection_type(collection_id: CollectionId) -> Result<CollectionType, DispatchError> {
+        let value = Self::get_collection_property(collection_id, RmrkProperty::CollectionType)?;
+        let collection_type: CollectionType = (&value)
             .try_into()
             .map_err(<Error<T>>::from)?;
 
         Ok(collection_type)
     }
 
-    fn check_collection_type(collection_id: CollectionId, collection_type: CollectionType) -> DispatchResult {
+    pub fn get_nft_property(collection_id: CollectionId, nft_id: TokenId, key: RmrkProperty) -> Result<PropertyValue, DispatchError> {
+        let nft_property = <PalletNft<T>>::token_properties((collection_id, nft_id))
+            .get(&rmrk_property!(Config=T, key)?)
+            .ok_or(<Error<T>>::CollectionUnknown)? // todo is that right?
+            .clone();
+
+        Ok(nft_property)
+    }
+
+    pub fn check_collection_type(collection_id: CollectionId, collection_type: CollectionType) -> DispatchResult {
         let actual_type = Self::get_collection_type(collection_id)?;
         ensure!(actual_type == collection_type, <CommonError<T>>::NoPermission);
 
modifiedprimitives/data-structs/src/lib.rsdiffbeforeafterboth
before · primitives/data-structs/src/lib.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#![cfg_attr(not(feature = "std"), no_std)]1819use core::{20	convert::{TryFrom, TryInto},21	fmt,22};23use frame_support::{24	storage::{bounded_btree_map::BoundedBTreeMap, bounded_btree_set::BoundedBTreeSet},25	traits::Get,26	parameter_types,27};2829#[cfg(feature = "serde")]30use serde::{Serialize, Deserialize};3132use sp_core::U256;33use sp_runtime::{ArithmeticError, sp_std::prelude::Vec, Permill};34use codec::{Decode, Encode, EncodeLike, MaxEncodedLen};35use frame_support::{BoundedVec, traits::ConstU32};36use derivative::Derivative;37use scale_info::TypeInfo;3839pub mod rmrk;4041// RMRK42use rmrk::{43	CollectionInfo, NftInfo, ResourceInfo, PropertyInfo, BaseInfo, PartType, Theme, ThemeProperty,44};45pub use rmrk::{46	primitives::{47		CollectionId as RmrkCollectionId, NftId as RmrkNftId, BaseId as RmrkBaseId,48		PartId as RmrkPartId, ResourceId as RmrkResourceId,49	},50	NftChild as RmrkNftChild, AccountIdOrCollectionNftTuple as RmrkAccountIdOrCollectionNftTuple,51};5253mod bounded;54pub mod budget;55pub mod mapping;56mod migration;5758pub const MAX_DECIMAL_POINTS: DecimalPoints = 30;59pub const MAX_REFUNGIBLE_PIECES: u128 = 1_000_000_000_000_000_000_000;60pub const MAX_SPONSOR_TIMEOUT: u32 = 10_368_000;6162pub const MAX_TOKEN_OWNERSHIP: u32 = if cfg!(not(feature = "limit-testing")) {63	100_00064} else {65	1066};67pub const COLLECTION_NUMBER_LIMIT: u32 = if cfg!(not(feature = "limit-testing")) {68	100_00069} else {70	1071};72pub const CUSTOM_DATA_LIMIT: u32 = if cfg!(not(feature = "limit-testing")) {73	204874} else {75	1076};77pub const COLLECTION_ADMINS_LIMIT: u32 = 5;78pub const COLLECTION_TOKEN_LIMIT: u32 = u32::MAX;79pub const ACCOUNT_TOKEN_OWNERSHIP_LIMIT: u32 = if cfg!(not(feature = "limit-testing")) {80	1_000_00081} else {82	1083};8485// Timeouts for item types in passed blocks86pub const NFT_SPONSOR_TRANSFER_TIMEOUT: u32 = 5;87pub const FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT: u32 = 5;88pub const REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT: u32 = 5;8990pub const SPONSOR_APPROVE_TIMEOUT: u32 = 5;9192// Schema limits93pub const OFFCHAIN_SCHEMA_LIMIT: u32 = 8192;94pub const VARIABLE_ON_CHAIN_SCHEMA_LIMIT: u32 = 8192;95pub const CONST_ON_CHAIN_SCHEMA_LIMIT: u32 = 32768;9697pub const COLLECTION_FIELD_LIMIT: u32 = CONST_ON_CHAIN_SCHEMA_LIMIT;9899pub const MAX_COLLECTION_NAME_LENGTH: u32 = 64;100pub const MAX_COLLECTION_DESCRIPTION_LENGTH: u32 = 256;101pub const MAX_TOKEN_PREFIX_LENGTH: u32 = 16;102103pub const MAX_PROPERTY_KEY_LENGTH: u32 = 256;104pub const MAX_PROPERTY_VALUE_LENGTH: u32 = 32768;105pub const MAX_PROPERTIES_PER_ITEM: u32 = 64;106107// pub const MAX_PROPERTY_KEYS_OVERALL_LENGTH: u32 = MAX_PROPERTY_KEY_LENGTH * MAX_PROPERTIES_PER_ITEM;108pub const MAX_COLLECTION_PROPERTIES_SIZE: u32 = 40960;109pub const MAX_TOKEN_PROPERTIES_SIZE: u32 = 32768;110111pub const MAX_COLLECTION_PROPERTIES_ENCODE_LEN: u32 =112	MAX_PROPERTIES_PER_ITEM * MAX_PROPERTY_KEY_LENGTH + MAX_COLLECTION_PROPERTIES_SIZE;113114// RMRK constants115pub const RMRK_STRING_LIMIT: u32 = 128;116pub const RMRK_COLLECTION_SYMBOL_LIMIT: u32 = 100;117pub const RMRK_RESOURCE_SYMBOL_LIMIT: u32 = 10;118pub const RMRK_KEY_LIMIT: u32 = 32;119pub const RMRK_VALUE_LIMIT: u32 = 256;120121pub struct MaxPropertiesPermissionsEncodeLen;122123impl Get<u32> for MaxPropertiesPermissionsEncodeLen {124	fn get() -> u32 {125		MAX_PROPERTIES_PER_ITEM * MAX_PROPERTY_KEY_LENGTH126			+ <PropertyPermission as MaxEncodedLen>::max_encoded_len() as u32127	}128}129130/// How much items can be created per single131/// create_many call132pub const MAX_ITEMS_PER_BATCH: u32 = 200;133134pub type CustomDataLimit = ConstU32<CUSTOM_DATA_LIMIT>;135136#[derive(137	Encode,138	Decode,139	PartialEq,140	Eq,141	PartialOrd,142	Ord,143	Clone,144	Copy,145	Debug,146	Default,147	TypeInfo,148	MaxEncodedLen,149)]150#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]151pub struct CollectionId(pub u32);152impl EncodeLike<u32> for CollectionId {}153impl EncodeLike<CollectionId> for u32 {}154155#[derive(156	Encode,157	Decode,158	PartialEq,159	Eq,160	PartialOrd,161	Ord,162	Clone,163	Copy,164	Debug,165	Default,166	TypeInfo,167	MaxEncodedLen,168)]169#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]170pub struct TokenId(pub u32);171impl EncodeLike<u32> for TokenId {}172impl EncodeLike<TokenId> for u32 {}173174impl TokenId {175	pub fn try_next(self) -> Result<TokenId, ArithmeticError> {176		self.0177			.checked_add(1)178			.ok_or(ArithmeticError::Overflow)179			.map(Self)180	}181}182183impl From<TokenId> for U256 {184	fn from(t: TokenId) -> Self {185		t.0.into()186	}187}188189impl TryFrom<U256> for TokenId {190	type Error = &'static str;191192	fn try_from(value: U256) -> Result<Self, Self::Error> {193		Ok(TokenId(value.try_into().map_err(|_| "too large token id")?))194	}195}196197#[derive(Encode, Decode, Clone, PartialEq, TypeInfo)]198#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]199pub struct TokenData<CrossAccountId> {200	pub const_data: Vec<u8>,201	pub properties: Vec<Property>,202	pub owner: Option<CrossAccountId>,203}204205pub struct OverflowError;206impl From<OverflowError> for &'static str {207	fn from(_: OverflowError) -> Self {208		"overflow occured"209	}210}211212pub type DecimalPoints = u8;213214#[derive(Encode, Decode, Eq, Debug, Clone, PartialEq, TypeInfo, MaxEncodedLen)]215#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]216pub enum CollectionMode {217	NFT,218	// decimal points219	Fungible(DecimalPoints),220	ReFungible,221}222223impl CollectionMode {224	pub fn id(&self) -> u8 {225		match self {226			CollectionMode::NFT => 1,227			CollectionMode::Fungible(_) => 2,228			CollectionMode::ReFungible => 3,229		}230	}231}232233pub trait SponsoringResolve<AccountId, Call> {234	fn resolve(who: &AccountId, call: &Call) -> Option<AccountId>;235}236237#[derive(Encode, Decode, Eq, Debug, Clone, PartialEq, TypeInfo, MaxEncodedLen)]238#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]239pub enum AccessMode {240	Normal,241	AllowList,242}243impl Default for AccessMode {244	fn default() -> Self {245		Self::Normal246	}247}248249#[derive(Encode, Decode, Eq, Debug, Clone, PartialEq, TypeInfo, MaxEncodedLen)]250#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]251pub enum SchemaVersion {252	ImageURL,253	Unique,254}255impl Default for SchemaVersion {256	fn default() -> Self {257		Self::ImageURL258	}259}260261#[derive(Encode, Decode, Default, Debug, Clone, PartialEq, TypeInfo)]262#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]263pub struct Ownership<AccountId> {264	pub owner: AccountId,265	pub fraction: u128,266}267268#[derive(Encode, Decode, Debug, Clone, PartialEq, TypeInfo, MaxEncodedLen)]269#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]270pub enum SponsorshipState<AccountId> {271	/// The fees are applied to the transaction sender272	Disabled,273	Unconfirmed(AccountId),274	/// Transactions are sponsored by specified account275	Confirmed(AccountId),276}277278impl<AccountId> SponsorshipState<AccountId> {279	pub fn sponsor(&self) -> Option<&AccountId> {280		match self {281			Self::Confirmed(sponsor) => Some(sponsor),282			_ => None,283		}284	}285286	pub fn pending_sponsor(&self) -> Option<&AccountId> {287		match self {288			Self::Unconfirmed(sponsor) | Self::Confirmed(sponsor) => Some(sponsor),289			_ => None,290		}291	}292293	pub fn confirmed(&self) -> bool {294		matches!(self, Self::Confirmed(_))295	}296}297298impl<T> Default for SponsorshipState<T> {299	fn default() -> Self {300		Self::Disabled301	}302}303304/// Used in storage305#[struct_versioning::versioned(version = 2, upper)]306#[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)]307pub struct Collection<AccountId> {308	pub owner: AccountId,309	pub mode: CollectionMode,310	pub access: AccessMode,311	pub name: BoundedVec<u16, ConstU32<MAX_COLLECTION_NAME_LENGTH>>,312	pub description: BoundedVec<u16, ConstU32<MAX_COLLECTION_DESCRIPTION_LENGTH>>,313	pub token_prefix: BoundedVec<u8, ConstU32<MAX_TOKEN_PREFIX_LENGTH>>,314	pub mint_mode: bool,315316	#[version(..2)]317	pub offchain_schema: BoundedVec<u8, ConstU32<OFFCHAIN_SCHEMA_LIMIT>>,318319	pub schema_version: SchemaVersion,320	pub sponsorship: SponsorshipState<AccountId>,321322	#[version(..2)]323	pub limits: CollectionLimitsVersion1, // Collection private restrictions324	#[version(2.., upper(limits.into()))]325	pub limits: CollectionLimitsVersion2,326327	#[version(..2)]328	pub variable_on_chain_schema: BoundedVec<u8, ConstU32<VARIABLE_ON_CHAIN_SCHEMA_LIMIT>>,329330	#[version(..2)]331	pub const_on_chain_schema: BoundedVec<u8, ConstU32<CONST_ON_CHAIN_SCHEMA_LIMIT>>,332333	#[version(..2)]334	pub meta_update_permission: MetaUpdatePermission,335}336337/// Used in RPC calls338#[derive(Encode, Decode, Clone, PartialEq, TypeInfo)]339#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]340pub struct RpcCollection<AccountId> {341	pub owner: AccountId,342	pub mode: CollectionMode,343	pub access: AccessMode,344	pub name: Vec<u16>,345	pub description: Vec<u16>,346	pub token_prefix: Vec<u8>,347	pub mint_mode: bool,348	pub offchain_schema: Vec<u8>,349	pub schema_version: SchemaVersion,350	pub sponsorship: SponsorshipState<AccountId>,351	pub limits: CollectionLimits,352	pub const_on_chain_schema: Vec<u8>,353	pub token_property_permissions: Vec<PropertyKeyPermission>,354	pub properties: Vec<Property>,355}356357#[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)]358#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]359pub enum CollectionField {360	ConstOnChainSchema,361	OffchainSchema,362}363364#[derive(Encode, Decode, Clone, PartialEq, TypeInfo, Derivative, MaxEncodedLen)]365#[derivative(Debug, Default(bound = ""))]366pub struct CreateCollectionData<AccountId> {367	#[derivative(Default(value = "CollectionMode::NFT"))]368	pub mode: CollectionMode,369	pub access: Option<AccessMode>,370	pub name: BoundedVec<u16, ConstU32<MAX_COLLECTION_NAME_LENGTH>>,371	pub description: BoundedVec<u16, ConstU32<MAX_COLLECTION_DESCRIPTION_LENGTH>>,372	pub token_prefix: BoundedVec<u8, ConstU32<MAX_TOKEN_PREFIX_LENGTH>>,373	pub offchain_schema: BoundedVec<u8, ConstU32<OFFCHAIN_SCHEMA_LIMIT>>,374	pub schema_version: Option<SchemaVersion>,375	pub pending_sponsor: Option<AccountId>,376	pub limits: Option<CollectionLimits>,377	pub const_on_chain_schema: BoundedVec<u8, ConstU32<CONST_ON_CHAIN_SCHEMA_LIMIT>>,378	pub token_property_permissions: CollectionPropertiesPermissionsVec,379	pub properties: CollectionPropertiesVec,380}381382pub type CollectionPropertiesPermissionsVec =383	BoundedVec<PropertyKeyPermission, MaxPropertiesPermissionsEncodeLen>;384385pub type CollectionPropertiesVec =386	BoundedVec<Property, ConstU32<MAX_COLLECTION_PROPERTIES_ENCODE_LEN>>;387388/// All fields are wrapped in `Option`s, where None means chain default389#[struct_versioning::versioned(version = 2, upper)]390#[derive(Encode, Decode, Debug, Default, Clone, PartialEq, TypeInfo, MaxEncodedLen)]391#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]392pub struct CollectionLimits {393	pub account_token_ownership_limit: Option<u32>,394	pub sponsored_data_size: Option<u32>,395396	/// FIXME should we delete this or repurpose it?397	/// None - setVariableMetadata is not sponsored398	/// Some(v) - setVariableMetadata is sponsored399	///           if there is v block between txs400	pub sponsored_data_rate_limit: Option<SponsoringRateLimit>,401	pub token_limit: Option<u32>,402403	// Timeouts for item types in passed blocks404	pub sponsor_transfer_timeout: Option<u32>,405	pub sponsor_approve_timeout: Option<u32>,406	pub owner_can_transfer: Option<bool>,407	pub owner_can_destroy: Option<bool>,408	pub transfers_enabled: Option<bool>,409410	#[version(2.., upper(None))]411	pub nesting_rule: Option<NestingRule>,412}413414impl CollectionLimits {415	pub fn account_token_ownership_limit(&self) -> u32 {416		self.account_token_ownership_limit417			.unwrap_or(ACCOUNT_TOKEN_OWNERSHIP_LIMIT)418			.min(MAX_TOKEN_OWNERSHIP)419	}420	pub fn sponsored_data_size(&self) -> u32 {421		self.sponsored_data_size422			.unwrap_or(CUSTOM_DATA_LIMIT)423			.min(CUSTOM_DATA_LIMIT)424	}425	pub fn token_limit(&self) -> u32 {426		self.token_limit427			.unwrap_or(COLLECTION_TOKEN_LIMIT)428			.min(COLLECTION_TOKEN_LIMIT)429	}430	pub fn sponsor_transfer_timeout(&self, default: u32) -> u32 {431		self.sponsor_transfer_timeout432			.unwrap_or(default)433			.min(MAX_SPONSOR_TIMEOUT)434	}435	pub fn sponsor_approve_timeout(&self) -> u32 {436		self.sponsor_approve_timeout437			.unwrap_or(SPONSOR_APPROVE_TIMEOUT)438			.min(MAX_SPONSOR_TIMEOUT)439	}440	pub fn owner_can_transfer(&self) -> bool {441		self.owner_can_transfer.unwrap_or(true)442	}443	pub fn owner_can_destroy(&self) -> bool {444		self.owner_can_destroy.unwrap_or(true)445	}446	pub fn transfers_enabled(&self) -> bool {447		self.transfers_enabled.unwrap_or(true)448	}449	pub fn sponsored_data_rate_limit(&self) -> Option<u32> {450		match self451			.sponsored_data_rate_limit452			.unwrap_or(SponsoringRateLimit::SponsoringDisabled)453		{454			SponsoringRateLimit::SponsoringDisabled => None,455			SponsoringRateLimit::Blocks(v) => Some(v.min(MAX_SPONSOR_TIMEOUT)),456		}457	}458	pub fn nesting_rule(&self) -> &NestingRule {459		static DEFAULT: NestingRule = NestingRule::Disabled;460		self.nesting_rule.as_ref().unwrap_or(&DEFAULT)461	}462}463464#[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen, Derivative)]465#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]466#[derivative(Debug)]467pub enum NestingRule {468	/// No one can nest tokens469	Disabled,470	/// Owner can nest any tokens471	Owner,472	/// Owner can nest tokens from specified collections473	OwnerRestricted(474		#[cfg_attr(feature = "serde1", serde(with = "bounded::set_serde"))]475		#[derivative(Debug(format_with = "bounded::set_debug"))]476		BoundedBTreeSet<CollectionId, ConstU32<16>>,477	),478}479480#[derive(Encode, Decode, Debug, Clone, Copy, PartialEq, TypeInfo, MaxEncodedLen)]481#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]482pub enum SponsoringRateLimit {483	SponsoringDisabled,484	Blocks(u32),485}486487#[derive(Encode, Decode, MaxEncodedLen, Default, PartialEq, Clone, Derivative, TypeInfo)]488#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]489#[derivative(Debug)]490pub struct CreateNftData {491	#[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]492	#[derivative(Debug(format_with = "bounded::vec_debug"))]493	pub const_data: BoundedVec<u8, CustomDataLimit>,494495	#[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]496	#[derivative(Debug(format_with = "bounded::vec_debug"))]497	pub properties: CollectionPropertiesVec,498}499500#[derive(Encode, Decode, MaxEncodedLen, Default, Debug, Clone, PartialEq, TypeInfo)]501#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]502pub struct CreateFungibleData {503	pub value: u128,504}505506#[derive(Encode, Decode, MaxEncodedLen, Default, PartialEq, Clone, Derivative, TypeInfo)]507#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]508#[derivative(Debug)]509pub struct CreateReFungibleData {510	#[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]511	#[derivative(Debug(format_with = "bounded::vec_debug"))]512	pub const_data: BoundedVec<u8, CustomDataLimit>,513	pub pieces: u128,514}515516#[derive(Encode, Decode, Debug, Clone, PartialEq, TypeInfo, MaxEncodedLen)]517pub enum MetaUpdatePermission {518	ItemOwner,519	Admin,520	None,521}522523#[derive(Encode, Decode, MaxEncodedLen, PartialEq, Clone, Debug, TypeInfo)]524#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]525pub enum CreateItemData {526	NFT(CreateNftData),527	Fungible(CreateFungibleData),528	ReFungible(CreateReFungibleData),529}530531#[derive(Encode, Decode, MaxEncodedLen, PartialEq, Clone, TypeInfo, Derivative)]532#[derivative(Debug)]533pub struct CreateNftExData<CrossAccountId> {534	#[derivative(Debug(format_with = "bounded::vec_debug"))]535	pub const_data: BoundedVec<u8, CustomDataLimit>,536	#[derivative(Debug(format_with = "bounded::vec_debug"))]537	pub properties: CollectionPropertiesVec,538	pub owner: CrossAccountId,539}540541#[derive(Encode, Decode, MaxEncodedLen, PartialEq, Clone, TypeInfo, Derivative)]542#[derivative(Debug(bound = "CrossAccountId: fmt::Debug + Ord"))]543pub struct CreateRefungibleExData<CrossAccountId> {544	#[derivative(Debug(format_with = "bounded::vec_debug"))]545	pub const_data: BoundedVec<u8, CustomDataLimit>,546	#[derivative(Debug(format_with = "bounded::map_debug"))]547	pub users: BoundedBTreeMap<CrossAccountId, u128, ConstU32<MAX_ITEMS_PER_BATCH>>,548}549550#[derive(Encode, Decode, MaxEncodedLen, PartialEq, Clone, TypeInfo, Derivative)]551#[derivative(Debug(bound = "CrossAccountId: fmt::Debug + Ord"))]552pub enum CreateItemExData<CrossAccountId> {553	NFT(554		#[derivative(Debug(format_with = "bounded::vec_debug"))]555		BoundedVec<CreateNftExData<CrossAccountId>, ConstU32<MAX_ITEMS_PER_BATCH>>,556	),557	Fungible(558		#[derivative(Debug(format_with = "bounded::map_debug"))]559		BoundedBTreeMap<CrossAccountId, u128, ConstU32<MAX_ITEMS_PER_BATCH>>,560	),561	/// Many tokens, each may have only one owner562	RefungibleMultipleItems(563		#[derivative(Debug(format_with = "bounded::vec_debug"))]564		BoundedVec<CreateRefungibleExData<CrossAccountId>, ConstU32<MAX_ITEMS_PER_BATCH>>,565	),566	/// Single token, which may have many owners567	RefungibleMultipleOwners(CreateRefungibleExData<CrossAccountId>),568}569570impl CreateItemData {571	pub fn data_size(&self) -> usize {572		match self {573			CreateItemData::NFT(data) => data.const_data.len(),574			CreateItemData::ReFungible(data) => data.const_data.len(),575			_ => 0,576		}577	}578}579580impl From<CreateNftData> for CreateItemData {581	fn from(item: CreateNftData) -> Self {582		CreateItemData::NFT(item)583	}584}585586impl From<CreateReFungibleData> for CreateItemData {587	fn from(item: CreateReFungibleData) -> Self {588		CreateItemData::ReFungible(item)589	}590}591592impl From<CreateFungibleData> for CreateItemData {593	fn from(item: CreateFungibleData) -> Self {594		CreateItemData::Fungible(item)595	}596}597598#[derive(Encode, Decode, MaxEncodedLen, PartialEq, Clone, Debug, TypeInfo)]599#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]600pub struct CollectionStats {601	pub created: u32,602	pub destroyed: u32,603	pub alive: u32,604}605606#[derive(Encode, Decode, Clone, Debug)]607#[cfg_attr(feature = "std", derive(PartialEq))]608pub struct PhantomType<T>(core::marker::PhantomData<T>);609610impl<T: TypeInfo + 'static> TypeInfo for PhantomType<T> {611	type Identity = PhantomType<T>;612613	fn type_info() -> scale_info::Type {614		use scale_info::{615			Type, Path,616			build::{FieldsBuilder, UnnamedFields},617			type_params,618		};619		Type::builder()620			.path(Path::new("up_data_structs", "PhantomType"))621			.type_params(type_params!(T))622			.composite(<FieldsBuilder<UnnamedFields>>::default().field(|b| b.ty::<[T; 0]>()))623	}624}625impl<T> MaxEncodedLen for PhantomType<T> {626	fn max_encoded_len() -> usize {627		0628	}629}630631pub type PropertyKey = BoundedVec<u8, ConstU32<MAX_PROPERTY_KEY_LENGTH>>;632pub type PropertyValue = BoundedVec<u8, ConstU32<MAX_PROPERTY_VALUE_LENGTH>>;633634#[derive(Encode, Decode, TypeInfo, Debug, MaxEncodedLen, PartialEq, Clone)]635#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]636pub struct PropertyPermission {637	pub mutable: bool,638	pub collection_admin: bool,639	pub token_owner: bool,640}641642impl PropertyPermission {643	pub fn none() -> Self {644		Self {645			mutable: true,646			collection_admin: false,647			token_owner: false,648		}649	}650}651652#[derive(Encode, Decode, Debug, TypeInfo, Clone, PartialEq, MaxEncodedLen)]653#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]654pub struct Property {655	#[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]656	pub key: PropertyKey,657658	#[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]659	pub value: PropertyValue,660}661662impl Into<(PropertyKey, PropertyValue)> for Property {663	fn into(self) -> (PropertyKey, PropertyValue) {664		(self.key, self.value)665	}666}667668#[derive(Encode, Decode, TypeInfo, Debug, MaxEncodedLen, PartialEq, Clone)]669#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]670pub struct PropertyKeyPermission {671	#[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]672	pub key: PropertyKey,673674	pub permission: PropertyPermission,675}676677impl Into<(PropertyKey, PropertyPermission)> for PropertyKeyPermission {678	fn into(self) -> (PropertyKey, PropertyPermission) {679		(self.key, self.permission)680	}681}682683#[derive(Debug)]684pub enum PropertiesError {685	NoSpaceForProperty,686	PropertyLimitReached,687	InvalidCharacterInPropertyKey,688	PropertyKeyIsTooLong,689	EmptyPropertyKey,690}691692#[derive(Clone, Copy)]693pub enum PropertyScope {694	None,695	Rmrk,696}697698impl PropertyScope {699	pub fn apply(self, key: PropertyKey) -> Result<PropertyKey, PropertiesError> {700		let scope_str: &[u8] = match self {701			Self::None => return Ok(key),702			Self::Rmrk => b"rmrk",703		};704705		[scope_str, b":", key.as_slice()]706			.concat()707			.try_into()708			.map_err(|_| PropertiesError::PropertyKeyIsTooLong)709	}710}711712pub trait TrySetProperty: Sized {713	type Value;714715	fn try_scoped_set(716		&mut self,717		scope: PropertyScope,718		key: PropertyKey,719		value: Self::Value,720	) -> Result<(), PropertiesError>;721722	fn try_scoped_set_from_iter<I, KV>(723		&mut self,724		scope: PropertyScope,725		iter: I,726	) -> Result<(), PropertiesError>727	where728		I: Iterator<Item=KV>,729		KV: Into<(PropertyKey, Self::Value)>730	{731		for kv in iter {732			let (key, value) = kv.into();733			self.try_scoped_set(scope, key, value)?;734		}735736		Ok(())737	}738739	fn try_set(&mut self, key: PropertyKey, value: Self::Value) -> Result<(), PropertiesError> {740		self.try_scoped_set(PropertyScope::None, key, value)741	}742743	fn try_set_from_iter<I, KV>(&mut self, iter: I) -> Result<(), PropertiesError>744	where745		I: Iterator<Item=KV>,746		KV: Into<(PropertyKey, Self::Value)>747	{748		self.try_scoped_set_from_iter(PropertyScope::None, iter)749	}750}751752#[derive(Encode, Decode, TypeInfo, Derivative, Clone, PartialEq, MaxEncodedLen)]753#[derivative(Default(bound = ""))]754pub struct PropertiesMap<Value>(755	BoundedBTreeMap<PropertyKey, Value, ConstU32<MAX_PROPERTIES_PER_ITEM>>,756);757758impl<Value> PropertiesMap<Value> {759	pub fn new() -> Self {760		Self(BoundedBTreeMap::new())761	}762763	pub fn remove(&mut self, key: &PropertyKey) -> Result<Option<Value>, PropertiesError> {764		Self::check_property_key(key)?;765766		Ok(self.0.remove(key))767	}768769	pub fn get(&self, key: &PropertyKey) -> Option<&Value> {770		self.0.get(key)771	}772773	pub fn iter(&self) -> impl Iterator<Item = (&PropertyKey, &Value)> {774		self.0.iter()775	}776777	fn check_property_key(key: &PropertyKey) -> Result<(), PropertiesError> {778		if key.is_empty() {779			return Err(PropertiesError::EmptyPropertyKey);780		}781782		for byte in key.as_slice().iter() {783			let byte = *byte;784785			if !byte.is_ascii_alphanumeric() && byte != b'_' && byte != b'-' {786				return Err(PropertiesError::InvalidCharacterInPropertyKey);787			}788		}789790		Ok(())791	}792}793794impl<Value> TrySetProperty for PropertiesMap<Value> {795	type Value = Value;796797	fn try_scoped_set(798		&mut self,799		scope: PropertyScope,800		key: PropertyKey,801		value: Self::Value,802	) -> Result<(), PropertiesError> {803		Self::check_property_key(&key)?;804805		let key = scope.apply(key)?;806		self.0807			.try_insert(key, value)808			.map_err(|_| PropertiesError::PropertyLimitReached)?;809810		Ok(())811	}812}813814pub type PropertiesPermissionMap = PropertiesMap<PropertyPermission>;815816#[derive(Encode, Decode, TypeInfo, Clone, PartialEq, MaxEncodedLen)]817pub struct Properties {818	map: PropertiesMap<PropertyValue>,819	consumed_space: u32,820	space_limit: u32,821}822823impl Properties {824	pub fn new(space_limit: u32) -> Self {825		Self {826			map: PropertiesMap::new(),827			consumed_space: 0,828			space_limit,829		}830	}831832	pub fn remove(&mut self, key: &PropertyKey) -> Result<Option<PropertyValue>, PropertiesError> {833		let value = self.map.remove(key)?;834835		if let Some(ref value) = value {836			let value_len = value.len() as u32;837			self.consumed_space -= value_len;838		}839840		Ok(value)841	}842843	pub fn get(&self, key: &PropertyKey) -> Option<&PropertyValue> {844		self.map.get(key)845	}846847	pub fn iter(&self) -> impl Iterator<Item = (&PropertyKey, &PropertyValue)> {848		self.map.iter()849	}850}851852impl TrySetProperty for Properties {853	type Value = PropertyValue;854855	fn try_scoped_set(856		&mut self,857		scope: PropertyScope,858		key: PropertyKey,859		value: Self::Value,860	) -> Result<(), PropertiesError> {861		let value_len = value.len();862863		if self.consumed_space as usize + value_len > self.space_limit as usize {864			return Err(PropertiesError::NoSpaceForProperty);865		}866867		self.map.try_scoped_set(scope, key, value)?;868869		self.consumed_space += value_len as u32;870871		Ok(())872	}873}874875pub struct CollectionProperties;876877impl Get<Properties> for CollectionProperties {878	fn get() -> Properties {879		Properties::new(MAX_COLLECTION_PROPERTIES_SIZE)880	}881}882883pub struct TokenProperties;884885impl Get<Properties> for TokenProperties {886	fn get() -> Properties {887		Properties::new(MAX_TOKEN_PROPERTIES_SIZE)888	}889}890891// RMRK892// todo document?893parameter_types! {894	#[derive(PartialEq, TypeInfo)]895	pub const RmrkStringLimit: u32 = 128;896	#[derive(PartialEq)]897	pub const RmrkCollectionSymbolLimit: u32 = 100;898	#[derive(PartialEq)]899	pub const RmrkResourceSymbolLimit: u32 = 10;900	#[derive(PartialEq)]901	pub const RmrkKeyLimit: u32 = 32;902	#[derive(PartialEq)]903	pub const RmrkValueLimit: u32 = 256;904	#[derive(PartialEq)]905	pub const RmrkMaxCollectionsEquippablePerPart: u32 = 100;906	#[derive(PartialEq)]907	pub const RmrkPartsLimit: u32 = 3;908}909910impl From<RmrkCollectionId> for CollectionId {911	fn from(id: RmrkCollectionId) -> Self {912		Self(id)913	}914}915916impl From<RmrkNftId> for TokenId {917	fn from(id: RmrkNftId) -> Self {918		Self(id)919	}920}921922pub type RmrkCollectionSymbol = BoundedVec<u8, RmrkCollectionSymbolLimit>;923pub type RmrkCollectionInfo<AccountId> = CollectionInfo<RmrkString, RmrkCollectionSymbol, AccountId>;924pub type RmrkInstanceInfo<AccountId> = NftInfo<AccountId, Permill, RmrkString>;925pub type RmrkResourceInfo = ResourceInfo<926	BoundedVec<u8, RmrkResourceSymbolLimit>,927	RmrkString,928	BoundedVec<RmrkPartId, RmrkPartsLimit>,929>;930pub type RmrkPropertyInfo =931	PropertyInfo<BoundedVec<u8, RmrkKeyLimit>, BoundedVec<u8, RmrkValueLimit>>;932pub type RmrkBaseInfo<AccountId> = BaseInfo<AccountId, RmrkString>;933pub type RmrkPartType =934	PartType<RmrkString, BoundedVec<RmrkCollectionId, RmrkMaxCollectionsEquippablePerPart>>;935pub type RmrkTheme = Theme<RmrkString, Vec<ThemeProperty<RmrkString>>>;936937pub type RmrkRpcString = Vec<u8>;938pub type RmrkThemeName = RmrkRpcString;939pub type RmrkPropertyKey = RmrkRpcString;940941pub type RmrkString = BoundedVec<u8, RmrkStringLimit>;
after · primitives/data-structs/src/lib.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#![cfg_attr(not(feature = "std"), no_std)]1819use core::{20	convert::{TryFrom, TryInto},21	fmt,22};23use frame_support::{24	storage::{bounded_btree_map::BoundedBTreeMap, bounded_btree_set::BoundedBTreeSet},25	traits::Get,26	parameter_types,27};2829#[cfg(feature = "serde")]30use serde::{Serialize, Deserialize};3132use sp_core::U256;33use sp_runtime::{ArithmeticError, sp_std::prelude::Vec, Permill};34use codec::{Decode, Encode, EncodeLike, MaxEncodedLen};35use frame_support::{BoundedVec, traits::ConstU32};36use derivative::Derivative;37use scale_info::TypeInfo;3839pub mod rmrk;4041// RMRK42use rmrk::{43	CollectionInfo, NftInfo, ResourceInfo, PropertyInfo, BaseInfo, PartType, Theme, ThemeProperty,44};45pub use rmrk::{46	primitives::{47		CollectionId as RmrkCollectionId, NftId as RmrkNftId, BaseId as RmrkBaseId,48		PartId as RmrkPartId, ResourceId as RmrkResourceId,49	},50	NftChild as RmrkNftChild, AccountIdOrCollectionNftTuple as RmrkAccountIdOrCollectionNftTuple,51	FixedPart as RmrkFixedPart, SlotPart as RmrkSlotPart, EquippableList as RmrkEquippableList,52};5354mod bounded;55pub mod budget;56pub mod mapping;57mod migration;5859pub const MAX_DECIMAL_POINTS: DecimalPoints = 30;60pub const MAX_REFUNGIBLE_PIECES: u128 = 1_000_000_000_000_000_000_000;61pub const MAX_SPONSOR_TIMEOUT: u32 = 10_368_000;6263pub const MAX_TOKEN_OWNERSHIP: u32 = if cfg!(not(feature = "limit-testing")) {64	100_00065} else {66	1067};68pub const COLLECTION_NUMBER_LIMIT: u32 = if cfg!(not(feature = "limit-testing")) {69	100_00070} else {71	1072};73pub const CUSTOM_DATA_LIMIT: u32 = if cfg!(not(feature = "limit-testing")) {74	204875} else {76	1077};78pub const COLLECTION_ADMINS_LIMIT: u32 = 5;79pub const COLLECTION_TOKEN_LIMIT: u32 = u32::MAX;80pub const ACCOUNT_TOKEN_OWNERSHIP_LIMIT: u32 = if cfg!(not(feature = "limit-testing")) {81	1_000_00082} else {83	1084};8586// Timeouts for item types in passed blocks87pub const NFT_SPONSOR_TRANSFER_TIMEOUT: u32 = 5;88pub const FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT: u32 = 5;89pub const REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT: u32 = 5;9091pub const SPONSOR_APPROVE_TIMEOUT: u32 = 5;9293// Schema limits94pub const OFFCHAIN_SCHEMA_LIMIT: u32 = 8192;95pub const VARIABLE_ON_CHAIN_SCHEMA_LIMIT: u32 = 8192;96pub const CONST_ON_CHAIN_SCHEMA_LIMIT: u32 = 32768;9798pub const COLLECTION_FIELD_LIMIT: u32 = CONST_ON_CHAIN_SCHEMA_LIMIT;99100pub const MAX_COLLECTION_NAME_LENGTH: u32 = 64;101pub const MAX_COLLECTION_DESCRIPTION_LENGTH: u32 = 256;102pub const MAX_TOKEN_PREFIX_LENGTH: u32 = 16;103104pub const MAX_PROPERTY_KEY_LENGTH: u32 = 256;105pub const MAX_PROPERTY_VALUE_LENGTH: u32 = 32768;106pub const MAX_PROPERTIES_PER_ITEM: u32 = 64;107108// pub const MAX_PROPERTY_KEYS_OVERALL_LENGTH: u32 = MAX_PROPERTY_KEY_LENGTH * MAX_PROPERTIES_PER_ITEM;109pub const MAX_COLLECTION_PROPERTIES_SIZE: u32 = 40960;110pub const MAX_TOKEN_PROPERTIES_SIZE: u32 = 32768;111112pub const MAX_COLLECTION_PROPERTIES_ENCODE_LEN: u32 =113	MAX_PROPERTIES_PER_ITEM * MAX_PROPERTY_KEY_LENGTH + MAX_COLLECTION_PROPERTIES_SIZE;114115// RMRK constants116pub const RMRK_STRING_LIMIT: u32 = 128;117pub const RMRK_COLLECTION_SYMBOL_LIMIT: u32 = 100;118pub const RMRK_RESOURCE_SYMBOL_LIMIT: u32 = 10;119pub const RMRK_KEY_LIMIT: u32 = 32;120pub const RMRK_VALUE_LIMIT: u32 = 256;121122pub struct MaxPropertiesPermissionsEncodeLen;123124impl Get<u32> for MaxPropertiesPermissionsEncodeLen {125	fn get() -> u32 {126		MAX_PROPERTIES_PER_ITEM * MAX_PROPERTY_KEY_LENGTH127			+ <PropertyPermission as MaxEncodedLen>::max_encoded_len() as u32128	}129}130131/// How much items can be created per single132/// create_many call133pub const MAX_ITEMS_PER_BATCH: u32 = 200;134135pub type CustomDataLimit = ConstU32<CUSTOM_DATA_LIMIT>;136137#[derive(138	Encode,139	Decode,140	PartialEq,141	Eq,142	PartialOrd,143	Ord,144	Clone,145	Copy,146	Debug,147	Default,148	TypeInfo,149	MaxEncodedLen,150)]151#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]152pub struct CollectionId(pub u32);153impl EncodeLike<u32> for CollectionId {}154impl EncodeLike<CollectionId> for u32 {}155156#[derive(157	Encode,158	Decode,159	PartialEq,160	Eq,161	PartialOrd,162	Ord,163	Clone,164	Copy,165	Debug,166	Default,167	TypeInfo,168	MaxEncodedLen,169)]170#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]171pub struct TokenId(pub u32);172impl EncodeLike<u32> for TokenId {}173impl EncodeLike<TokenId> for u32 {}174175impl TokenId {176	pub fn try_next(self) -> Result<TokenId, ArithmeticError> {177		self.0178			.checked_add(1)179			.ok_or(ArithmeticError::Overflow)180			.map(Self)181	}182}183184impl From<TokenId> for U256 {185	fn from(t: TokenId) -> Self {186		t.0.into()187	}188}189190impl TryFrom<U256> for TokenId {191	type Error = &'static str;192193	fn try_from(value: U256) -> Result<Self, Self::Error> {194		Ok(TokenId(value.try_into().map_err(|_| "too large token id")?))195	}196}197198#[derive(Encode, Decode, Clone, PartialEq, TypeInfo)]199#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]200pub struct TokenData<CrossAccountId> {201	pub const_data: Vec<u8>,202	pub properties: Vec<Property>,203	pub owner: Option<CrossAccountId>,204}205206pub struct OverflowError;207impl From<OverflowError> for &'static str {208	fn from(_: OverflowError) -> Self {209		"overflow occured"210	}211}212213pub type DecimalPoints = u8;214215#[derive(Encode, Decode, Eq, Debug, Clone, PartialEq, TypeInfo, MaxEncodedLen)]216#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]217pub enum CollectionMode {218	NFT,219	// decimal points220	Fungible(DecimalPoints),221	ReFungible,222}223224impl CollectionMode {225	pub fn id(&self) -> u8 {226		match self {227			CollectionMode::NFT => 1,228			CollectionMode::Fungible(_) => 2,229			CollectionMode::ReFungible => 3,230		}231	}232}233234pub trait SponsoringResolve<AccountId, Call> {235	fn resolve(who: &AccountId, call: &Call) -> Option<AccountId>;236}237238#[derive(Encode, Decode, Eq, Debug, Clone, PartialEq, TypeInfo, MaxEncodedLen)]239#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]240pub enum AccessMode {241	Normal,242	AllowList,243}244impl Default for AccessMode {245	fn default() -> Self {246		Self::Normal247	}248}249250#[derive(Encode, Decode, Eq, Debug, Clone, PartialEq, TypeInfo, MaxEncodedLen)]251#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]252pub enum SchemaVersion {253	ImageURL,254	Unique,255}256impl Default for SchemaVersion {257	fn default() -> Self {258		Self::ImageURL259	}260}261262#[derive(Encode, Decode, Default, Debug, Clone, PartialEq, TypeInfo)]263#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]264pub struct Ownership<AccountId> {265	pub owner: AccountId,266	pub fraction: u128,267}268269#[derive(Encode, Decode, Debug, Clone, PartialEq, TypeInfo, MaxEncodedLen)]270#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]271pub enum SponsorshipState<AccountId> {272	/// The fees are applied to the transaction sender273	Disabled,274	Unconfirmed(AccountId),275	/// Transactions are sponsored by specified account276	Confirmed(AccountId),277}278279impl<AccountId> SponsorshipState<AccountId> {280	pub fn sponsor(&self) -> Option<&AccountId> {281		match self {282			Self::Confirmed(sponsor) => Some(sponsor),283			_ => None,284		}285	}286287	pub fn pending_sponsor(&self) -> Option<&AccountId> {288		match self {289			Self::Unconfirmed(sponsor) | Self::Confirmed(sponsor) => Some(sponsor),290			_ => None,291		}292	}293294	pub fn confirmed(&self) -> bool {295		matches!(self, Self::Confirmed(_))296	}297}298299impl<T> Default for SponsorshipState<T> {300	fn default() -> Self {301		Self::Disabled302	}303}304305/// Used in storage306#[struct_versioning::versioned(version = 2, upper)]307#[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)]308pub struct Collection<AccountId> {309	pub owner: AccountId,310	pub mode: CollectionMode,311	pub access: AccessMode,312	pub name: BoundedVec<u16, ConstU32<MAX_COLLECTION_NAME_LENGTH>>,313	pub description: BoundedVec<u16, ConstU32<MAX_COLLECTION_DESCRIPTION_LENGTH>>,314	pub token_prefix: BoundedVec<u8, ConstU32<MAX_TOKEN_PREFIX_LENGTH>>,315	pub mint_mode: bool,316317	#[version(..2)]318	pub offchain_schema: BoundedVec<u8, ConstU32<OFFCHAIN_SCHEMA_LIMIT>>,319320	pub schema_version: SchemaVersion,321	pub sponsorship: SponsorshipState<AccountId>,322323	#[version(..2)]324	pub limits: CollectionLimitsVersion1, // Collection private restrictions325	#[version(2.., upper(limits.into()))]326	pub limits: CollectionLimitsVersion2,327328	#[version(..2)]329	pub variable_on_chain_schema: BoundedVec<u8, ConstU32<VARIABLE_ON_CHAIN_SCHEMA_LIMIT>>,330331	#[version(..2)]332	pub const_on_chain_schema: BoundedVec<u8, ConstU32<CONST_ON_CHAIN_SCHEMA_LIMIT>>,333334	#[version(..2)]335	pub meta_update_permission: MetaUpdatePermission,336}337338/// Used in RPC calls339#[derive(Encode, Decode, Clone, PartialEq, TypeInfo)]340#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]341pub struct RpcCollection<AccountId> {342	pub owner: AccountId,343	pub mode: CollectionMode,344	pub access: AccessMode,345	pub name: Vec<u16>,346	pub description: Vec<u16>,347	pub token_prefix: Vec<u8>,348	pub mint_mode: bool,349	pub offchain_schema: Vec<u8>,350	pub schema_version: SchemaVersion,351	pub sponsorship: SponsorshipState<AccountId>,352	pub limits: CollectionLimits,353	pub const_on_chain_schema: Vec<u8>,354	pub token_property_permissions: Vec<PropertyKeyPermission>,355	pub properties: Vec<Property>,356}357358#[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)]359#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]360pub enum CollectionField {361	ConstOnChainSchema,362	OffchainSchema,363}364365#[derive(Encode, Decode, Clone, PartialEq, TypeInfo, Derivative, MaxEncodedLen)]366#[derivative(Debug, Default(bound = ""))]367pub struct CreateCollectionData<AccountId> {368	#[derivative(Default(value = "CollectionMode::NFT"))]369	pub mode: CollectionMode,370	pub access: Option<AccessMode>,371	pub name: BoundedVec<u16, ConstU32<MAX_COLLECTION_NAME_LENGTH>>,372	pub description: BoundedVec<u16, ConstU32<MAX_COLLECTION_DESCRIPTION_LENGTH>>,373	pub token_prefix: BoundedVec<u8, ConstU32<MAX_TOKEN_PREFIX_LENGTH>>,374	pub offchain_schema: BoundedVec<u8, ConstU32<OFFCHAIN_SCHEMA_LIMIT>>,375	pub schema_version: Option<SchemaVersion>,376	pub pending_sponsor: Option<AccountId>,377	pub limits: Option<CollectionLimits>,378	pub const_on_chain_schema: BoundedVec<u8, ConstU32<CONST_ON_CHAIN_SCHEMA_LIMIT>>,379	pub token_property_permissions: CollectionPropertiesPermissionsVec,380	pub properties: CollectionPropertiesVec,381}382383pub type CollectionPropertiesPermissionsVec =384	BoundedVec<PropertyKeyPermission, MaxPropertiesPermissionsEncodeLen>;385386pub type CollectionPropertiesVec =387	BoundedVec<Property, ConstU32<MAX_COLLECTION_PROPERTIES_ENCODE_LEN>>;388389/// All fields are wrapped in `Option`s, where None means chain default390#[struct_versioning::versioned(version = 2, upper)]391#[derive(Encode, Decode, Debug, Default, Clone, PartialEq, TypeInfo, MaxEncodedLen)]392#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]393pub struct CollectionLimits {394	pub account_token_ownership_limit: Option<u32>,395	pub sponsored_data_size: Option<u32>,396397	/// FIXME should we delete this or repurpose it?398	/// None - setVariableMetadata is not sponsored399	/// Some(v) - setVariableMetadata is sponsored400	///           if there is v block between txs401	pub sponsored_data_rate_limit: Option<SponsoringRateLimit>,402	pub token_limit: Option<u32>,403404	// Timeouts for item types in passed blocks405	pub sponsor_transfer_timeout: Option<u32>,406	pub sponsor_approve_timeout: Option<u32>,407	pub owner_can_transfer: Option<bool>,408	pub owner_can_destroy: Option<bool>,409	pub transfers_enabled: Option<bool>,410411	#[version(2.., upper(None))]412	pub nesting_rule: Option<NestingRule>,413}414415impl CollectionLimits {416	pub fn account_token_ownership_limit(&self) -> u32 {417		self.account_token_ownership_limit418			.unwrap_or(ACCOUNT_TOKEN_OWNERSHIP_LIMIT)419			.min(MAX_TOKEN_OWNERSHIP)420	}421	pub fn sponsored_data_size(&self) -> u32 {422		self.sponsored_data_size423			.unwrap_or(CUSTOM_DATA_LIMIT)424			.min(CUSTOM_DATA_LIMIT)425	}426	pub fn token_limit(&self) -> u32 {427		self.token_limit428			.unwrap_or(COLLECTION_TOKEN_LIMIT)429			.min(COLLECTION_TOKEN_LIMIT)430	}431	pub fn sponsor_transfer_timeout(&self, default: u32) -> u32 {432		self.sponsor_transfer_timeout433			.unwrap_or(default)434			.min(MAX_SPONSOR_TIMEOUT)435	}436	pub fn sponsor_approve_timeout(&self) -> u32 {437		self.sponsor_approve_timeout438			.unwrap_or(SPONSOR_APPROVE_TIMEOUT)439			.min(MAX_SPONSOR_TIMEOUT)440	}441	pub fn owner_can_transfer(&self) -> bool {442		self.owner_can_transfer.unwrap_or(true)443	}444	pub fn owner_can_destroy(&self) -> bool {445		self.owner_can_destroy.unwrap_or(true)446	}447	pub fn transfers_enabled(&self) -> bool {448		self.transfers_enabled.unwrap_or(true)449	}450	pub fn sponsored_data_rate_limit(&self) -> Option<u32> {451		match self452			.sponsored_data_rate_limit453			.unwrap_or(SponsoringRateLimit::SponsoringDisabled)454		{455			SponsoringRateLimit::SponsoringDisabled => None,456			SponsoringRateLimit::Blocks(v) => Some(v.min(MAX_SPONSOR_TIMEOUT)),457		}458	}459	pub fn nesting_rule(&self) -> &NestingRule {460		static DEFAULT: NestingRule = NestingRule::Disabled;461		self.nesting_rule.as_ref().unwrap_or(&DEFAULT)462	}463}464465#[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen, Derivative)]466#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]467#[derivative(Debug)]468pub enum NestingRule {469	/// No one can nest tokens470	Disabled,471	/// Owner can nest any tokens472	Owner,473	/// Owner can nest tokens from specified collections474	OwnerRestricted(475		#[cfg_attr(feature = "serde1", serde(with = "bounded::set_serde"))]476		#[derivative(Debug(format_with = "bounded::set_debug"))]477		BoundedBTreeSet<CollectionId, ConstU32<16>>,478	),479}480481#[derive(Encode, Decode, Debug, Clone, Copy, PartialEq, TypeInfo, MaxEncodedLen)]482#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]483pub enum SponsoringRateLimit {484	SponsoringDisabled,485	Blocks(u32),486}487488#[derive(Encode, Decode, MaxEncodedLen, Default, PartialEq, Clone, Derivative, TypeInfo)]489#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]490#[derivative(Debug)]491pub struct CreateNftData {492	#[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]493	#[derivative(Debug(format_with = "bounded::vec_debug"))]494	pub const_data: BoundedVec<u8, CustomDataLimit>,495496	#[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]497	#[derivative(Debug(format_with = "bounded::vec_debug"))]498	pub properties: CollectionPropertiesVec,499}500501#[derive(Encode, Decode, MaxEncodedLen, Default, Debug, Clone, PartialEq, TypeInfo)]502#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]503pub struct CreateFungibleData {504	pub value: u128,505}506507#[derive(Encode, Decode, MaxEncodedLen, Default, PartialEq, Clone, Derivative, TypeInfo)]508#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]509#[derivative(Debug)]510pub struct CreateReFungibleData {511	#[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]512	#[derivative(Debug(format_with = "bounded::vec_debug"))]513	pub const_data: BoundedVec<u8, CustomDataLimit>,514	pub pieces: u128,515}516517#[derive(Encode, Decode, Debug, Clone, PartialEq, TypeInfo, MaxEncodedLen)]518pub enum MetaUpdatePermission {519	ItemOwner,520	Admin,521	None,522}523524#[derive(Encode, Decode, MaxEncodedLen, PartialEq, Clone, Debug, TypeInfo)]525#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]526pub enum CreateItemData {527	NFT(CreateNftData),528	Fungible(CreateFungibleData),529	ReFungible(CreateReFungibleData),530}531532#[derive(Encode, Decode, MaxEncodedLen, PartialEq, Clone, TypeInfo, Derivative)]533#[derivative(Debug)]534pub struct CreateNftExData<CrossAccountId> {535	#[derivative(Debug(format_with = "bounded::vec_debug"))]536	pub const_data: BoundedVec<u8, CustomDataLimit>,537	#[derivative(Debug(format_with = "bounded::vec_debug"))]538	pub properties: CollectionPropertiesVec,539	pub owner: CrossAccountId,540}541542#[derive(Encode, Decode, MaxEncodedLen, PartialEq, Clone, TypeInfo, Derivative)]543#[derivative(Debug(bound = "CrossAccountId: fmt::Debug + Ord"))]544pub struct CreateRefungibleExData<CrossAccountId> {545	#[derivative(Debug(format_with = "bounded::vec_debug"))]546	pub const_data: BoundedVec<u8, CustomDataLimit>,547	#[derivative(Debug(format_with = "bounded::map_debug"))]548	pub users: BoundedBTreeMap<CrossAccountId, u128, ConstU32<MAX_ITEMS_PER_BATCH>>,549}550551#[derive(Encode, Decode, MaxEncodedLen, PartialEq, Clone, TypeInfo, Derivative)]552#[derivative(Debug(bound = "CrossAccountId: fmt::Debug + Ord"))]553pub enum CreateItemExData<CrossAccountId> {554	NFT(555		#[derivative(Debug(format_with = "bounded::vec_debug"))]556		BoundedVec<CreateNftExData<CrossAccountId>, ConstU32<MAX_ITEMS_PER_BATCH>>,557	),558	Fungible(559		#[derivative(Debug(format_with = "bounded::map_debug"))]560		BoundedBTreeMap<CrossAccountId, u128, ConstU32<MAX_ITEMS_PER_BATCH>>,561	),562	/// Many tokens, each may have only one owner563	RefungibleMultipleItems(564		#[derivative(Debug(format_with = "bounded::vec_debug"))]565		BoundedVec<CreateRefungibleExData<CrossAccountId>, ConstU32<MAX_ITEMS_PER_BATCH>>,566	),567	/// Single token, which may have many owners568	RefungibleMultipleOwners(CreateRefungibleExData<CrossAccountId>),569}570571impl CreateItemData {572	pub fn data_size(&self) -> usize {573		match self {574			CreateItemData::NFT(data) => data.const_data.len(),575			CreateItemData::ReFungible(data) => data.const_data.len(),576			_ => 0,577		}578	}579}580581impl From<CreateNftData> for CreateItemData {582	fn from(item: CreateNftData) -> Self {583		CreateItemData::NFT(item)584	}585}586587impl From<CreateReFungibleData> for CreateItemData {588	fn from(item: CreateReFungibleData) -> Self {589		CreateItemData::ReFungible(item)590	}591}592593impl From<CreateFungibleData> for CreateItemData {594	fn from(item: CreateFungibleData) -> Self {595		CreateItemData::Fungible(item)596	}597}598599#[derive(Encode, Decode, MaxEncodedLen, PartialEq, Clone, Debug, TypeInfo)]600#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]601pub struct CollectionStats {602	pub created: u32,603	pub destroyed: u32,604	pub alive: u32,605}606607#[derive(Encode, Decode, Clone, Debug)]608#[cfg_attr(feature = "std", derive(PartialEq))]609pub struct PhantomType<T>(core::marker::PhantomData<T>);610611impl<T: TypeInfo + 'static> TypeInfo for PhantomType<T> {612	type Identity = PhantomType<T>;613614	fn type_info() -> scale_info::Type {615		use scale_info::{616			Type, Path,617			build::{FieldsBuilder, UnnamedFields},618			type_params,619		};620		Type::builder()621			.path(Path::new("up_data_structs", "PhantomType"))622			.type_params(type_params!(T))623			.composite(<FieldsBuilder<UnnamedFields>>::default().field(|b| b.ty::<[T; 0]>()))624	}625}626impl<T> MaxEncodedLen for PhantomType<T> {627	fn max_encoded_len() -> usize {628		0629	}630}631632pub type PropertyKey = BoundedVec<u8, ConstU32<MAX_PROPERTY_KEY_LENGTH>>;633pub type PropertyValue = BoundedVec<u8, ConstU32<MAX_PROPERTY_VALUE_LENGTH>>;634635#[derive(Encode, Decode, TypeInfo, Debug, MaxEncodedLen, PartialEq, Clone)]636#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]637pub struct PropertyPermission {638	pub mutable: bool,639	pub collection_admin: bool,640	pub token_owner: bool,641}642643impl PropertyPermission {644	pub fn none() -> Self {645		Self {646			mutable: true,647			collection_admin: false,648			token_owner: false,649		}650	}651}652653#[derive(Encode, Decode, Debug, TypeInfo, Clone, PartialEq, MaxEncodedLen)]654#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]655pub struct Property {656	#[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]657	pub key: PropertyKey,658659	#[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]660	pub value: PropertyValue,661}662663impl Into<(PropertyKey, PropertyValue)> for Property {664	fn into(self) -> (PropertyKey, PropertyValue) {665		(self.key, self.value)666	}667}668669#[derive(Encode, Decode, TypeInfo, Debug, MaxEncodedLen, PartialEq, Clone)]670#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]671pub struct PropertyKeyPermission {672	#[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]673	pub key: PropertyKey,674675	pub permission: PropertyPermission,676}677678impl Into<(PropertyKey, PropertyPermission)> for PropertyKeyPermission {679	fn into(self) -> (PropertyKey, PropertyPermission) {680		(self.key, self.permission)681	}682}683684#[derive(Debug)]685pub enum PropertiesError {686	NoSpaceForProperty,687	PropertyLimitReached,688	InvalidCharacterInPropertyKey,689	PropertyKeyIsTooLong,690	EmptyPropertyKey,691}692693#[derive(Clone, Copy)]694pub enum PropertyScope {695	None,696	Rmrk,697}698699impl PropertyScope {700	pub fn apply(self, key: PropertyKey) -> Result<PropertyKey, PropertiesError> {701		let scope_str: &[u8] = match self {702			Self::None => return Ok(key),703			Self::Rmrk => b"rmrk",704		};705706		[scope_str, b":", key.as_slice()]707			.concat()708			.try_into()709			.map_err(|_| PropertiesError::PropertyKeyIsTooLong)710	}711}712713pub trait TrySetProperty: Sized {714	type Value;715716	fn try_scoped_set(717		&mut self,718		scope: PropertyScope,719		key: PropertyKey,720		value: Self::Value,721	) -> Result<(), PropertiesError>;722723	fn try_scoped_set_from_iter<I, KV>(724		&mut self,725		scope: PropertyScope,726		iter: I,727	) -> Result<(), PropertiesError>728	where729		I: Iterator<Item = KV>,730		KV: Into<(PropertyKey, Self::Value)>,731	{732		for kv in iter {733			let (key, value) = kv.into();734			self.try_scoped_set(scope, key, value)?;735		}736737		Ok(())738	}739740	fn try_set(&mut self, key: PropertyKey, value: Self::Value) -> Result<(), PropertiesError> {741		self.try_scoped_set(PropertyScope::None, key, value)742	}743744	fn try_set_from_iter<I, KV>(&mut self, iter: I) -> Result<(), PropertiesError>745	where746		I: Iterator<Item = KV>,747		KV: Into<(PropertyKey, Self::Value)>,748	{749		self.try_scoped_set_from_iter(PropertyScope::None, iter)750	}751}752753#[derive(Encode, Decode, TypeInfo, Derivative, Clone, PartialEq, MaxEncodedLen)]754#[derivative(Default(bound = ""))]755pub struct PropertiesMap<Value>(756	BoundedBTreeMap<PropertyKey, Value, ConstU32<MAX_PROPERTIES_PER_ITEM>>,757);758759impl<Value> PropertiesMap<Value> {760	pub fn new() -> Self {761		Self(BoundedBTreeMap::new())762	}763764	pub fn remove(&mut self, key: &PropertyKey) -> Result<Option<Value>, PropertiesError> {765		Self::check_property_key(key)?;766767		Ok(self.0.remove(key))768	}769770	pub fn get(&self, key: &PropertyKey) -> Option<&Value> {771		self.0.get(key)772	}773774	pub fn iter(&self) -> impl Iterator<Item = (&PropertyKey, &Value)> {775		self.0.iter()776	}777778	fn check_property_key(key: &PropertyKey) -> Result<(), PropertiesError> {779		if key.is_empty() {780			return Err(PropertiesError::EmptyPropertyKey);781		}782783		for byte in key.as_slice().iter() {784			let byte = *byte;785786			if !byte.is_ascii_alphanumeric() && byte != b'_' && byte != b'-' {787				return Err(PropertiesError::InvalidCharacterInPropertyKey);788			}789		}790791		Ok(())792	}793}794795impl<Value> TrySetProperty for PropertiesMap<Value> {796	type Value = Value;797798	fn try_scoped_set(799		&mut self,800		scope: PropertyScope,801		key: PropertyKey,802		value: Self::Value,803	) -> Result<(), PropertiesError> {804		Self::check_property_key(&key)?;805806		let key = scope.apply(key)?;807		self.0808			.try_insert(key, value)809			.map_err(|_| PropertiesError::PropertyLimitReached)?;810811		Ok(())812	}813}814815pub type PropertiesPermissionMap = PropertiesMap<PropertyPermission>;816817#[derive(Encode, Decode, TypeInfo, Clone, PartialEq, MaxEncodedLen)]818pub struct Properties {819	map: PropertiesMap<PropertyValue>,820	consumed_space: u32,821	space_limit: u32,822}823824impl Properties {825	pub fn new(space_limit: u32) -> Self {826		Self {827			map: PropertiesMap::new(),828			consumed_space: 0,829			space_limit,830		}831	}832833	pub fn remove(&mut self, key: &PropertyKey) -> Result<Option<PropertyValue>, PropertiesError> {834		let value = self.map.remove(key)?;835836		if let Some(ref value) = value {837			let value_len = value.len() as u32;838			self.consumed_space -= value_len;839		}840841		Ok(value)842	}843844	pub fn get(&self, key: &PropertyKey) -> Option<&PropertyValue> {845		self.map.get(key)846	}847848	pub fn iter(&self) -> impl Iterator<Item = (&PropertyKey, &PropertyValue)> {849		self.map.iter()850	}851}852853impl TrySetProperty for Properties {854	type Value = PropertyValue;855856	fn try_scoped_set(857		&mut self,858		scope: PropertyScope,859		key: PropertyKey,860		value: Self::Value,861	) -> Result<(), PropertiesError> {862		let value_len = value.len();863864		if self.consumed_space as usize + value_len > self.space_limit as usize {865			return Err(PropertiesError::NoSpaceForProperty);866		}867868		self.map.try_scoped_set(scope, key, value)?;869870		self.consumed_space += value_len as u32;871872		Ok(())873	}874}875876pub struct CollectionProperties;877878impl Get<Properties> for CollectionProperties {879	fn get() -> Properties {880		Properties::new(MAX_COLLECTION_PROPERTIES_SIZE)881	}882}883884pub struct TokenProperties;885886impl Get<Properties> for TokenProperties {887	fn get() -> Properties {888		Properties::new(MAX_TOKEN_PROPERTIES_SIZE)889	}890}891892// RMRK893// todo document?894parameter_types! {895	#[derive(PartialEq, TypeInfo)]896	pub const RmrkStringLimit: u32 = 128;897	#[derive(PartialEq)]898	pub const RmrkCollectionSymbolLimit: u32 = 100;899	#[derive(PartialEq)]900	pub const RmrkResourceSymbolLimit: u32 = 10;901	#[derive(PartialEq)]902	pub const RmrkKeyLimit: u32 = 32;903	#[derive(PartialEq)]904	pub const RmrkValueLimit: u32 = 256;905	#[derive(PartialEq)]906	pub const RmrkMaxCollectionsEquippablePerPart: u32 = 100;907	#[derive(PartialEq)]908	pub const RmrkPartsLimit: u32 = 3;909}910911impl From<RmrkCollectionId> for CollectionId {912	fn from(id: RmrkCollectionId) -> Self {913		Self(id)914	}915}916917impl From<RmrkNftId> for TokenId {918	fn from(id: RmrkNftId) -> Self {919		Self(id)920	}921}922923pub type RmrkCollectionSymbol = BoundedVec<u8, RmrkCollectionSymbolLimit>;924pub type RmrkCollectionInfo<AccountId> =925	CollectionInfo<RmrkString, RmrkCollectionSymbol, AccountId>;926pub type RmrkInstanceInfo<AccountId> = NftInfo<AccountId, Permill, RmrkString>;927pub type RmrkResourceInfo = ResourceInfo<928	BoundedVec<u8, RmrkResourceSymbolLimit>,929	RmrkString,930	BoundedVec<RmrkPartId, RmrkPartsLimit>,931>;932pub type RmrkPropertyInfo =933	PropertyInfo<BoundedVec<u8, RmrkKeyLimit>, BoundedVec<u8, RmrkValueLimit>>;934pub type RmrkBaseInfo<AccountId> = BaseInfo<AccountId, RmrkString>;935pub type RmrkPartType =936	PartType<RmrkString, BoundedVec<RmrkCollectionId, RmrkMaxCollectionsEquippablePerPart>>;937pub type RmrkTheme = Theme<RmrkString, Vec<ThemeProperty<RmrkString>>>;938939pub type RmrkRpcString = Vec<u8>;940pub type RmrkThemeName = RmrkRpcString;941pub type RmrkPropertyKey = RmrkRpcString;942943pub type RmrkString = BoundedVec<u8, RmrkStringLimit>;
modifiedruntime/common/src/runtime_apis.rsdiffbeforeafterboth
--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -142,32 +142,39 @@
                 RmrkTheme
             > for Runtime {
                 fn last_collection_idx() -> Result<RmrkCollectionId, DispatchError> {
-                    Ok(<pallet_common::CreatedCollectionCount<Runtime>>::get().0)
+                    Ok(<pallet_common::CreatedCollectionCount<Runtime>>::get().0) // todo storage from proxy pallet
                 }
                 fn collection_by_id(collection_id: RmrkCollectionId) -> Result<Option<RmrkCollectionInfo<AccountId>>, DispatchError> {
                     // TODO decide on displacement to palettes -- does RMRK belong there, spread across common and nonfungible?
                     use frame_support::BoundedVec;
+                    use scale_info::prelude::string::String;
+                    use pallet_proxy_rmrk_core::RmrkProperty;
 
+                    // todo check if this is a rmrk collection? or simply trust and provide anyway?
+                    // client-is-always-right / enforce authority and order ?
+
                     let collection_id = CollectionId(collection_id);
-                    let collection = match <pallet_common::CollectionById<Runtime>>::get(collection_id) {
-                        Some(c) => c,
-                        None => return Ok(None)
-                    };
-                    let nfts_count: Result<u32, DispatchError> = dispatch_unique_runtime!(collection_id.total_supply());
+                    let collection = <pallet_proxy_rmrk_core::Pallet<Runtime>>::get_nft_collection(collection_id)?;
+                    // todo Vec::from(["rmrk:metadata", "rmrk:collection-type"])
+                    let metadata = BoundedVec::try_from(
+                        <pallet_proxy_rmrk_core::Pallet<Runtime>>::get_collection_property(collection_id, RmrkProperty::Metadata)?.into_inner()
+                    ).map_err(|_| <pallet_common::Error<Runtime>>::PropertyKeyIsTooLong)?;//unwrap_or_default();
+                    let nfts_count = (dispatch_unique_runtime!(collection_id.total_supply()) as Result<u32, DispatchError>)?; // todo? <Runtime>::total_supply(collection_id)
+
                     Ok(Some(RmrkCollectionInfo {
-                        issuer: collection.owner,
-                        metadata: BoundedVec::default(), // todo property - namespace:metadata
-                        max: Some(collection.limits.token_limit()), // must have some effective limits
-                        symbol: BoundedVec::try_from(collection.token_prefix.into_inner()).unwrap_or_default() /*{ // todo map_err
-                            Ok(s) => s,
-                            Err(_) => return Err(pallet_common::Error::<Runtime>::CollectionTokenPrefixLimitExceeded)
-                        }*/,
-                        nfts_count: nfts_count? // todo? <Runtime>::total_supply(collection_id)
+                        issuer: collection.owner.clone(),
+                        metadata,
+                        max: collection.limits.token_limit,
+                        symbol: BoundedVec::try_from(
+                            collection.token_prefix.clone().into_inner()
+                        ).map_err(|_| <pallet_common::Error<Runtime>>::PropertyKeyIsTooLong)?,
+                        nfts_count
                     }))
                 }
                 fn nft_by_id(collection_id: RmrkCollectionId, nft_by_id: RmrkNftId) -> Result<Option<RmrkInstanceInfo<AccountId>>, DispatchError> {
                     use frame_support::BoundedVec;
                     use up_data_structs::mapping::TokenAddressMapping;
+                    use pallet_proxy_rmrk_core::RmrkProperty;
 
                     let collection_id = CollectionId(collection_id);
                     let nft_id = TokenId(nft_by_id);
@@ -180,13 +187,29 @@
                         None => return Ok(None)
                     };
 
+                    let keys = [
+                        RmrkProperty::Royalty,
+                        RmrkProperty::Metadata,
+                        RmrkProperty::Equipped,
+                        RmrkProperty::Pending,
+                        // ?? "rmrk:recipient", "rmrk:nft-type", "rmrk:resource-collection", "rmrk:resource-priorities"
+                    ];
+
+                    let properties = keys.into_iter().map(
+                        |key| BoundedVec::try_from(
+                            // todo nft property, not collection
+                            <pallet_proxy_rmrk_core::Pallet<Runtime>>::get_nft_property(collection_id, nft_id, key).unwrap().into_inner()
+                        ).unwrap()
+                    )
+                    .collect::<Vec<RmrkString>>();
+
                     Ok(Some(RmrkInstanceInfo {
                         owner: owner,
-                        //recipient: , // prop
-                        royalty: None,//Permill::from_percent(0), // prop
-                        metadata: BoundedVec::default(), // prop
-                        equipped: false, // prop
-                        pending: false, // prop
+                        //recipient: , // prop?
+                        royalty: None,//Permill::from_percent(0), // prop, decode
+                        metadata: properties[1].clone(),
+                        equipped: false, // prop, decode
+                        pending: false, // prop, decode
                     }))
                 }
                 fn account_tokens(account_id: AccountId, collection_id: RmrkCollectionId) -> Result<Vec<RmrkNftId>, DispatchError> {
@@ -231,8 +254,8 @@
                                 .into_iter()
                                 .filter_map(|key| {
                                     properties.get(&key).map(|value| RmrkPropertyInfo {
-                                        key: BoundedVec::try_from(key.into_inner()).unwrap_or_default(),
-                                        value: BoundedVec::try_from(value.clone().into_inner()).unwrap_or_default(),
+                                        key: BoundedVec::try_from(key.into_inner()).unwrap(),
+                                        value: BoundedVec::try_from(value.clone().into_inner()).unwrap(),
                                     })
                                 })
                                 .collect();
@@ -242,10 +265,10 @@
                         None => {
                             properties
                                 .iter()
-                                .map(|(key, value)| RmrkPropertyInfo {
-                                    key: BoundedVec::try_from(key.clone().into_inner()).unwrap_or_default(),
-                                    value: BoundedVec::try_from(value.clone().into_inner()).unwrap_or_default(),
-                                })
+                                .filter_map(|(key, value)| Some(RmrkPropertyInfo {
+                                    key: BoundedVec::try_from(key.clone().into_inner()).unwrap(),
+                                    value: BoundedVec::try_from(value.clone().into_inner()).unwrap(),
+                                }))
                                 .collect()
                         }
                     });
@@ -256,8 +279,9 @@
                     let collection_id = CollectionId(collection_id);
                     let token_id = TokenId(nft_id);
 
-		            let properties = pallet_nonfungible::Pallet::<Runtime>::token_properties((collection_id, token_id)); // todo look into usage of nonfungible
+		            let properties = pallet_nonfungible::Pallet::<Runtime>::token_properties((collection_id, token_id)); // todo look into usage of pallet_nonfungible
 
+                    // todo displace to a function? redundant code piece with collection props
                     return Ok(match filter_keys {
                         Some(keys) => {
                             let keys = pallet_common::Pallet::<Runtime>::bytes_keys_to_property_keys(keys)?;
@@ -265,8 +289,8 @@
                                 .into_iter()
                                 .filter_map(|key| {
                                     properties.get(&key).map(|value| RmrkPropertyInfo {
-                                        key: BoundedVec::try_from(key.into_inner()).unwrap_or_default(),
-                                        value: BoundedVec::try_from(value.clone().into_inner()).unwrap_or_default(),
+                                        key: BoundedVec::try_from(key.into_inner()).unwrap(),
+                                        value: BoundedVec::try_from(value.clone().into_inner()).unwrap(),
                                     })
                                 })
                                 .collect();
@@ -276,51 +300,179 @@
                         None => {
                             properties
                                 .iter()
-                                .map(|(key, value)| RmrkPropertyInfo {
-                                    key: BoundedVec::try_from(key.clone().into_inner()).unwrap_or_default(),
-                                    value: BoundedVec::try_from(value.clone().into_inner()).unwrap_or_default(),
-                                })
+                                .filter_map(|(key, value)| Some(RmrkPropertyInfo {
+                                    key: BoundedVec::try_from(key.clone().into_inner()).unwrap(),
+                                    value: BoundedVec::try_from(value.clone().into_inner()).unwrap(),
+                                }))
                                 .collect()
                         }
                     });
                 }
                 fn nft_resources(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Result<Vec<RmrkResourceInfo>, DispatchError> {
-                    todo!()
+                    use frame_support::BoundedVec;
+                    use pallet_proxy_rmrk_core::RmrkProperty;
+
+                    let collection_id = CollectionId(collection_id);
+                    let nft_id = TokenId(nft_id);
+
+                    let keys = [
+                        RmrkProperty::Royalty,
+                        RmrkProperty::Metadata,
+                        RmrkProperty::Equipped,
+                        RmrkProperty::Pending,
+                        // ?? "rmrk:recipient", "rmrk:nft-type", "rmrk:resource-collection", "rmrk:resource-priorities"
+                    ];
+
+                    /*let resources = keys.into_iter().map(
+                        |key| BoundedVec::try_from(
+                            <pallet_proxy_rmrk_core::Pallet<Runtime>>::get_nft_property(collection_id, nft_id, key).unwrap().into_inner()
+                        ).unwrap()
+                    )
+                    .collect::<Vec<RmrkString>>();*/
+
+                    Ok(Vec::new(/*[RmrkResourceInfo {
+
+                    }]*/))
                 }
                 fn nft_resource_priorities(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Result<Vec<RmrkResourceId>, DispatchError> {
                     todo!()
                 }
                 fn base(base_id: RmrkBaseId) -> Result<Option<RmrkBaseInfo<AccountId>>, DispatchError> {
-                    use frame_support::{BoundedVec, ensure};
+                    use frame_support::BoundedVec;
                     use scale_info::prelude::string::String;
+                    use pallet_proxy_rmrk_core::RmrkProperty;
 
                     let collection_id = CollectionId(base_id);
-                    let collection = match <pallet_common::CollectionById<Runtime>>::get(collection_id) {
-                        Some(c) => c,
-                        None => return Ok(None)
-                    };
+                    let collection = <pallet_proxy_rmrk_core::Pallet<Runtime>>::get_nft_collection(collection_id)?;
 
-                    // string_keys_to_bytes_keys
-                    let keys = pallet_common::Pallet::<Runtime>::bytes_keys_to_property_keys(
-                        Vec::from([String::from("rmrk:base-type").into_bytes()])
-                    )?;
-                    let properties = pallet_common::Pallet::<Runtime>::filter_collection_properties(collection_id, Some(keys))?;
-                    //ensure!(properties.len() == 1); // todo make sure it's fine to have ensure in place // no access to errors from here? displace?
+                    // todo export to macro? redundancy
+                    let keys = [
+                        RmrkProperty::BaseType,
+                    ];
+
+                    let properties = keys.into_iter().map(
+                        |key| BoundedVec::try_from(
+                            <pallet_proxy_rmrk_core::Pallet<Runtime>>::get_collection_property(collection_id, key).unwrap().into_inner()
+                        )
+                    )
+                    // todo not-a-rmrk-collection error
+                    .collect::<Result<Vec<_>, _>>()
+                    .map_err(|_| <pallet_proxy_rmrk_core::Error<Runtime>>::CollectionUnknown)?;
 
-                    Ok(Some( RmrkBaseInfo {
-                        issuer: collection.owner,
-                        base_type: BoundedVec::try_from(properties[0].value.clone().into_inner()).unwrap_or_default(), // todo map_err? no access to errors
-                        symbol: BoundedVec::try_from(collection.token_prefix.into_inner()).unwrap_or_default(),
+                    Ok(Some(RmrkBaseInfo {
+                        issuer: collection.owner.clone(),
+                        base_type: properties[0].clone(),
+                        symbol: BoundedVec::try_from(
+                            collection.token_prefix.clone().into_inner()
+                        ).map_err(|_| <pallet_common::Error<Runtime>>::PropertyKeyIsTooLong)?,
                     }))
                 }
                 fn base_parts(base_id: RmrkBaseId) -> Result<Vec<RmrkPartType>, DispatchError> {
-                    todo!()
+                    use frame_support::BoundedVec;
+                    use pallet_proxy_rmrk_core::RmrkProperty;
+
+                    let collection_id = CollectionId(base_id);
+
+                    let keys = [
+                        //RmrkProperty::NftType)?,
+                        //RmrkProperty::PartId)?,
+                        RmrkProperty::Src,
+                        RmrkProperty::ZIndex,
+                        RmrkProperty::EquippableList,
+                    ];
+
+                    let parts = (dispatch_unique_runtime!(collection_id.collection_tokens()) as Result<Vec<TokenId>, DispatchError>)?
+                        .iter()
+                        .filter_map(|token_id| {
+                            /*let properties = keys.into_iter().map(
+                                |key| BoundedVec::try_from(
+                                    <pallet_proxy_rmrk_core::Pallet<Runtime>>::get_nft_property(collection_id, *token_id, key).unwrap().into_inner()
+                                ).unwrap()
+                            ).collect::<Vec<RmrkString>>();*/
+
+                            // todo ping properties for "rmrk:nft-type"
+                            // if none, skip, None
+                            let nft_type = "fixed-part";
+
+                            match nft_type {
+                                "fixed-part" => Some(RmrkPartType::FixedPart(RmrkFixedPart {
+                                    id: token_id.0,
+                                    src: BoundedVec::default(), // "rmrk:src"
+                                    z: 0, // "rmrk:z-index"
+                                })),
+                                "slot-part" => Some(RmrkPartType::SlotPart(RmrkSlotPart {
+                                    id: token_id.0,
+                                    equippable: RmrkEquippableList::Empty, // "rmrk:equippable-list" ?
+                                    src: BoundedVec::default(), // "rmrk:src"
+                                    z: 0, // "rmrk:z-index"
+                                })),
+                                _ => None
+                            }
+
+                        })
+                        .collect();
+
+                    Ok(parts)
                 }
                 fn theme_names(base_id: RmrkBaseId) -> Result<Vec<RmrkThemeName>, DispatchError> {
-                    todo!()
+                    use frame_support::BoundedVec;
+
+                    let collection_id = CollectionId(base_id);
+
+                    let theme_names = (dispatch_unique_runtime!(collection_id.collection_tokens()) as Result<Vec<TokenId>, DispatchError>)?
+                        .iter()
+                        .filter_map(|token_id| {
+                            let properties = pallet_nonfungible::Pallet::<Runtime>::token_properties((collection_id, token_id));
+
+                            // todo ping property for "rmrk:nft-type"
+                            // if none or not "theme", skip, None
+                            let nft_type = "theme";
+                            // can't call dispatch_unique_runtime! from here??
+                            <pallet_nonfungible::TokenData<Runtime>>::get((collection_id, token_id))
+                                .map(|t| t.const_data.into_inner())
+                                //.unwrap_or_default()
+                            // todo rework to reduce independence
+                        })
+                        .collect();
+
+                    Ok(theme_names)
                 }
                 fn theme(base_id: RmrkBaseId, theme_name: RmrkThemeName, filter_keys: Option<Vec<RmrkPropertyKey>>) -> Result<Option<RmrkTheme>, DispatchError> {
-                    todo!()
+                    use frame_support::BoundedVec;
+
+                    let collection_id = CollectionId(base_id);
+
+                    // todo one theme. filter collection tokens according to theme name, should result in one
+                    // (is it possible to search with iter_prefix for part of a struct that satisfies?..)
+                    // filter properties according to filter_keys and load them into resulting theme.properties
+                    let themes = (dispatch_unique_runtime!(collection_id.collection_tokens()) as Result<Vec<TokenId>, DispatchError>)?
+                        .iter()
+                        .filter_map(|token_id| {
+                            let properties = pallet_nonfungible::Pallet::<Runtime>::token_properties((collection_id, token_id));
+
+                            // todo ping properties for "rmrk:nft-type"
+                            // if none, skip, None
+                            // ugh gonna go through ALL properties, searching for matches for "rmrk:theme-property-<key>"
+                            let nft_type = "theme";
+                            match nft_type {
+                                "theme" => Some(RmrkTheme {
+                                    name: BoundedVec::try_from(
+                                        <pallet_nonfungible::TokenData<Runtime>>::get((collection_id, token_id))
+                                            .map(|t| t.const_data)
+                                            .unwrap_or_default()
+                                            .into_inner()
+                                    ).unwrap(),
+                                    // todo? (dispatch_unique_runtime!(collection_id.const_metadata(token_id)) as Result<Vec<u8>, DispatchError>)?,
+                                    properties: Vec::new(), // pain in the ass
+                                    inherit: false, // "rmrk:theme-inherit"
+                                }),
+                                _ => None
+                            }
+                        })
+                        .collect::<Vec<_>>();
+
+                    // todo
+                    Ok(Some(themes[0].clone()))
                 }
             }