difftreelog
Merge pull request #389 from UniqueNetwork/release-v922080
in: master
Release v922080
18 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -68,7 +68,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
"once_cell",
"version_check",
]
@@ -371,11 +371,11 @@
checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
dependencies = [
"futures-core",
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
"instant",
"pin-project-lite 0.2.9",
"rand 0.8.5",
- "tokio 1.18.2",
+ "tokio 1.19.2",
]
[[package]]
@@ -437,7 +437,7 @@
"futures-timer",
"hex",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"sc-chain-spec",
"sc-client-api",
@@ -470,7 +470,7 @@
"futures 0.3.21",
"jsonrpsee",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"sc-rpc",
"sc-utils",
@@ -490,7 +490,7 @@
version = "4.0.0-dev"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-api",
"sp-application-crypto",
@@ -706,7 +706,7 @@
"bp-runtime",
"finality-grandpa",
"frame-support",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-core",
@@ -722,7 +722,7 @@
dependencies = [
"bp-runtime",
"frame-support",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-std",
]
@@ -737,7 +737,7 @@
"frame-support",
"frame-system",
"impl-trait-for-tuples",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-core",
@@ -753,7 +753,7 @@
"bp-runtime",
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-api",
"sp-core",
@@ -771,7 +771,7 @@
"bp-polkadot-core",
"bp-runtime",
"frame-support",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"smallvec",
"sp-api",
"sp-runtime",
@@ -787,7 +787,7 @@
"frame-support",
"hash-db",
"num-traits",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-io",
@@ -805,7 +805,7 @@
"bp-header-chain",
"ed25519-dalek",
"finality-grandpa",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-application-crypto",
"sp-finality-grandpa",
"sp-runtime",
@@ -821,7 +821,7 @@
"bp-polkadot-core",
"bp-rococo",
"bp-runtime",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-api",
"sp-runtime",
"sp-std",
@@ -842,7 +842,7 @@
"pallet-bridge-grandpa",
"pallet-bridge-messages",
"pallet-transaction-payment",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-api",
"sp-core",
@@ -958,7 +958,7 @@
dependencies = [
"camino",
"cargo-platform",
- "semver 1.0.9",
+ "semver 1.0.10",
"serde",
"serde_json",
]
@@ -1081,16 +1081,16 @@
[[package]]
name = "clap"
-version = "3.1.18"
+version = "3.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b"
+checksum = "d53da17d37dba964b9b3ecb5c5a1f193a2762c700e6829201e645b9381c99dc7"
dependencies = [
"atty",
"bitflags",
"clap_derive",
"clap_lex",
"indexmap",
- "lazy_static",
+ "once_cell",
"strsim",
"termcolor",
"textwrap",
@@ -1098,9 +1098,9 @@
[[package]]
name = "clap_derive"
-version = "3.1.18"
+version = "3.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c"
+checksum = "c11d40217d16aee8508cc8e5fde8b4ff24639758608e5374e731b53f85749fb9"
dependencies = [
"heck 0.4.0",
"proc-macro-error",
@@ -1111,9 +1111,9 @@
[[package]]
name = "clap_lex"
-version = "0.2.0"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213"
+checksum = "5538cd660450ebeb4234cfecf8f2284b844ffc4c50531e66d584ad5b91293613"
dependencies = [
"os_str_bytes",
]
@@ -1483,7 +1483,7 @@
"cumulus-primitives-core",
"cumulus-relay-chain-interface",
"futures 0.3.21",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"polkadot-node-primitives",
"polkadot-node-subsystem",
@@ -1506,7 +1506,7 @@
"cumulus-client-consensus-common",
"cumulus-primitives-core",
"futures 0.3.21",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sc-client-api",
"sc-consensus",
"sc-consensus-aura",
@@ -1535,7 +1535,7 @@
"cumulus-relay-chain-interface",
"dyn-clone",
"futures 0.3.21",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-primitives",
"sc-client-api",
"sc-consensus",
@@ -1557,7 +1557,7 @@
"derive_more",
"futures 0.3.21",
"futures-timer",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"polkadot-node-primitives",
"polkadot-parachain",
@@ -1581,7 +1581,7 @@
"cumulus-relay-chain-interface",
"futures 0.3.21",
"futures-timer",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-node-primitives",
"polkadot-node-subsystem",
"polkadot-overseer",
@@ -1607,7 +1607,7 @@
"cumulus-client-pov-recovery",
"cumulus-primitives-core",
"cumulus-relay-chain-interface",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"polkadot-overseer",
"polkadot-primitives",
@@ -1635,7 +1635,7 @@
"frame-support",
"frame-system",
"pallet-aura",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-application-crypto",
@@ -1653,7 +1653,7 @@
"frame-support",
"frame-system",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-io",
"sp-runtime",
@@ -1676,7 +1676,7 @@
"impl-trait-for-tuples",
"log",
"pallet-balances",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-parachain",
"scale-info",
"serde",
@@ -1711,7 +1711,7 @@
"cumulus-primitives-core",
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-io",
@@ -1729,7 +1729,7 @@
"frame-support",
"frame-system",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"rand_chacha 0.3.1",
"scale-info",
"sp-runtime",
@@ -1744,7 +1744,7 @@
source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18"
dependencies = [
"frame-support",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-core-primitives",
"polkadot-parachain",
"polkadot-primitives",
@@ -1763,7 +1763,7 @@
"cumulus-primitives-core",
"cumulus-relay-chain-interface",
"cumulus-test-relay-sproof-builder",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sc-client-api",
"scale-info",
"sp-api",
@@ -1784,7 +1784,7 @@
dependencies = [
"cumulus-primitives-core",
"futures 0.3.21",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-inherents",
"sp-std",
"sp-timestamp",
@@ -1797,7 +1797,7 @@
dependencies = [
"cumulus-primitives-core",
"frame-support",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-core-primitives",
"polkadot-parachain",
"polkadot-primitives",
@@ -1846,7 +1846,7 @@
"derive_more",
"futures 0.3.21",
"jsonrpsee-core",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"polkadot-overseer",
"polkadot-service",
@@ -1872,7 +1872,7 @@
"futures 0.3.21",
"futures-timer",
"jsonrpsee",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"polkadot-service",
"sc-client-api",
@@ -1892,7 +1892,7 @@
source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18"
dependencies = [
"cumulus-primitives-core",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-primitives",
"sp-runtime",
"sp-state-machine",
@@ -2335,7 +2335,7 @@
"ethereum-types",
"hash-db",
"hash256-std-hasher",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"rlp",
"rlp-derive",
"scale-info",
@@ -2378,7 +2378,7 @@
"evm-gasometer",
"evm-runtime",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"primitive-types",
"rlp",
"scale-info",
@@ -2417,7 +2417,7 @@
version = "0.35.0"
source = "git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.22#e9252ed42dc26fc85b6703b1ba50660a08209e55"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"primitive-types",
"scale-info",
"serde",
@@ -2553,7 +2553,7 @@
"fp-storage",
"kvdb-rocksdb",
"parity-db",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"sc-client-db",
"sp-core",
@@ -2595,8 +2595,8 @@
"jsonrpsee",
"libsecp256k1",
"log",
- "lru 0.7.6",
- "parity-scale-codec 3.1.2",
+ "lru 0.7.7",
+ "parity-scale-codec 3.1.5",
"prometheus",
"rand 0.8.5",
"rlp",
@@ -2615,7 +2615,7 @@
"sp-runtime",
"sp-storage",
"substrate-prometheus-endpoint",
- "tokio 1.18.2",
+ "tokio 1.19.2",
]
[[package]]
@@ -2672,7 +2672,7 @@
"futures-timer",
"log",
"num-traits",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.11.2",
"scale-info",
]
@@ -2733,7 +2733,7 @@
version = "3.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
]
[[package]]
@@ -2752,7 +2752,7 @@
source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.22#94cc1f98619da89350f77d18b2e4224b034e07ad"
dependencies = [
"ethereum",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-core",
"sp-runtime",
"sp-std",
@@ -2766,7 +2766,7 @@
"evm",
"frame-support",
"impl-trait-for-tuples",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"serde",
"sp-core",
"sp-std",
@@ -2789,7 +2789,7 @@
"ethereum",
"ethereum-types",
"fp-evm",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-api",
"sp-core",
@@ -2805,7 +2805,7 @@
dependencies = [
"ethereum",
"frame-support",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parity-util-mem",
"scale-info",
"serde",
@@ -2819,7 +2819,7 @@
version = "2.0.0"
source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.22#94cc1f98619da89350f77d18b2e4224b034e07ad"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
]
[[package]]
@@ -2831,7 +2831,7 @@
"frame-system",
"linregress",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"paste",
"scale-info",
"serde",
@@ -2864,7 +2864,7 @@
"linked-hash-map",
"log",
"memory-db",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"prettytable-rs",
"rand 0.8.5",
"rand_pcg 0.3.1",
@@ -2913,7 +2913,7 @@
"frame-election-provider-solution-type",
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-arithmetic",
"sp-npos-elections",
@@ -2928,7 +2928,7 @@
dependencies = [
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-io",
@@ -2944,7 +2944,7 @@
checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d"
dependencies = [
"cfg-if 1.0.0",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
]
@@ -2961,7 +2961,7 @@
"k256",
"log",
"once_cell",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"paste",
"scale-info",
"serde",
@@ -3020,7 +3020,7 @@
dependencies = [
"frame-support",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-core",
@@ -3038,7 +3038,7 @@
"frame-benchmarking",
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-runtime",
@@ -3050,7 +3050,7 @@
version = "4.0.0-dev"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-api",
]
@@ -3274,13 +3274,13 @@
[[package]]
name = "getrandom"
-version = "0.2.6"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
+checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
dependencies = [
"cfg-if 1.0.0",
"libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
+ "wasi 0.11.0+wasi-snapshot-preview1",
]
[[package]]
@@ -3312,9 +3312,9 @@
[[package]]
name = "globset"
-version = "0.4.8"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd"
+checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a"
dependencies = [
"aho-corasick",
"bstr",
@@ -3360,16 +3360,16 @@
"http",
"indexmap",
"slab",
- "tokio 1.18.2",
+ "tokio 1.19.2",
"tokio-util",
"tracing",
]
[[package]]
name = "handlebars"
-version = "4.3.0"
+version = "4.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d113a9853e5accd30f43003560b5563ffbb007e3f325e8b103fa0d0029c6e6df"
+checksum = "b66d0c1b6e3abfd1e72818798925e16e02ed77e1b47f6c25a95a23b377ee4299"
dependencies = [
"log",
"pest",
@@ -3498,9 +3498,9 @@
[[package]]
name = "http"
-version = "0.2.7"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb"
+checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
dependencies = [
"bytes 1.1.0",
"fnv",
@@ -3554,7 +3554,7 @@
"itoa 1.0.2",
"pin-project-lite 0.2.9",
"socket2",
- "tokio 1.18.2",
+ "tokio 1.19.2",
"tower-service",
"tracing",
"want",
@@ -3572,7 +3572,7 @@
"log",
"rustls 0.19.1",
"rustls-native-certs 0.5.0",
- "tokio 1.18.2",
+ "tokio 1.19.2",
"tokio-rustls 0.22.0",
"webpki 0.21.4",
]
@@ -3628,7 +3628,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
]
[[package]]
@@ -3757,9 +3757,9 @@
[[package]]
name = "js-sys"
-version = "0.3.57"
+version = "0.3.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397"
+checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27"
dependencies = [
"wasm-bindgen",
]
@@ -3793,7 +3793,7 @@
"rustls-native-certs 0.6.2",
"soketto",
"thiserror",
- "tokio 1.18.2",
+ "tokio 1.19.2",
"tokio-rustls 0.23.4",
"tokio-util",
"tracing",
@@ -3823,7 +3823,7 @@
"serde_json",
"soketto",
"thiserror",
- "tokio 1.18.2",
+ "tokio 1.19.2",
"tracing",
]
@@ -3841,7 +3841,7 @@
"jsonrpsee-types",
"lazy_static",
"serde_json",
- "tokio 1.18.2",
+ "tokio 1.19.2",
"tracing",
"unicase",
]
@@ -3895,7 +3895,7 @@
"jsonrpsee-types",
"serde_json",
"soketto",
- "tokio 1.18.2",
+ "tokio 1.19.2",
"tokio-util",
"tracing",
]
@@ -3978,7 +3978,7 @@
"pallet-vesting",
"pallet-xcm",
"pallet-xcm-benchmarks",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-primitives",
"polkadot-runtime-common",
"polkadot-runtime-parachains",
@@ -4125,7 +4125,7 @@
"bytes 1.1.0",
"futures 0.3.21",
"futures-timer",
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
"instant",
"lazy_static",
"libp2p-autonat",
@@ -4296,7 +4296,7 @@
"libp2p-core",
"libp2p-swarm",
"log",
- "lru 0.7.6",
+ "lru 0.7.7",
"prost",
"prost-build",
"smallvec",
@@ -4761,9 +4761,9 @@
[[package]]
name = "lru"
-version = "0.7.6"
+version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8015d95cb7b2ddd3c0d32ca38283ceb1eea09b4713ee380bceb942d85a244228"
+checksum = "c84e6fe5655adc6ce00787cf7dcaf8dc4f998a0565d23eafc207a8b08ca3349a"
dependencies = [
"hashbrown 0.11.2",
]
@@ -4859,9 +4859,9 @@
[[package]]
name = "memmap2"
-version = "0.5.3"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057a3db23999c867821a7a59feb06a578fcb03685e983dff90daf9e7d24ac08f"
+checksum = "d5172b50c23043ff43dd53e51392f36519d9b35a8f3a410d30ece5d1aedd58ae"
dependencies = [
"libc",
]
@@ -5145,7 +5145,7 @@
"log",
"netlink-packet-core",
"netlink-sys",
- "tokio 1.18.2",
+ "tokio 1.19.2",
]
[[package]]
@@ -5359,7 +5359,7 @@
"pallet-unique-scheduler",
"pallet-xcm",
"parachain-info",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-parachain",
"rmrk-rpc",
"scale-info",
@@ -5417,11 +5417,11 @@
[[package]]
name = "orml-vesting"
version = "0.4.1-dev"
-source = "git+https://github.com/uniquenetwork/open-runtime-module-library?branch=unique-polkadot-v0.9.22#806e5b5b3abfd87d7edc0367b9e5ea505d65c2fe"
+source = "git+https://github.com/uniquenetwork/open-runtime-module-library?branch=unique-polkadot-v0.9.22#59f6596ae462035d153e198ba5db8c5e084e6d25"
dependencies = [
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-io",
@@ -5452,7 +5452,7 @@
"frame-support",
"frame-system",
"pallet-timestamp",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-application-crypto",
"sp-consensus-aura",
@@ -5468,7 +5468,7 @@
"frame-support",
"frame-system",
"pallet-session",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-application-crypto",
"sp-authority-discovery",
@@ -5484,7 +5484,7 @@
"frame-support",
"frame-system",
"impl-trait-for-tuples",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-authorship",
"sp-runtime",
@@ -5503,7 +5503,7 @@
"pallet-authorship",
"pallet-session",
"pallet-timestamp",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-application-crypto",
"sp-consensus-babe",
@@ -5526,7 +5526,7 @@
"frame-system",
"log",
"pallet-balances",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-io",
@@ -5544,7 +5544,7 @@
"frame-support",
"frame-system",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-runtime",
"sp-std",
@@ -5558,7 +5558,7 @@
"fp-evm",
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-core",
@@ -5574,7 +5574,7 @@
"frame-support",
"frame-system",
"pallet-session",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-runtime",
@@ -5595,7 +5595,7 @@
"pallet-beefy",
"pallet-mmr",
"pallet-session",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-core",
@@ -5614,7 +5614,7 @@
"frame-system",
"log",
"pallet-treasury",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-io",
@@ -5632,7 +5632,7 @@
"frame-support",
"frame-system",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-runtime",
@@ -5652,7 +5652,7 @@
"frame-system",
"log",
"num-traits",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-finality-grandpa",
@@ -5674,7 +5674,7 @@
"frame-system",
"log",
"num-traits",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-core",
@@ -5693,7 +5693,7 @@
"log",
"pallet-bounties",
"pallet-treasury",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-io",
@@ -5710,7 +5710,7 @@
"frame-support",
"frame-system",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-io",
@@ -5730,7 +5730,7 @@
"frame-system",
"pallet-evm",
"pallet-evm-coder-substrate",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-core",
@@ -5747,7 +5747,7 @@
"frame-benchmarking",
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-io",
@@ -5765,7 +5765,7 @@
"frame-support",
"frame-system",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"rand 0.7.3",
"scale-info",
"sp-arithmetic",
@@ -5786,7 +5786,7 @@
"frame-benchmarking",
"frame-election-provider-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-npos-elections",
"sp-runtime",
]
@@ -5800,7 +5800,7 @@
"frame-support",
"frame-system",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-io",
@@ -5828,7 +5828,7 @@
"log",
"pallet-evm",
"pallet-timestamp",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"rlp",
"scale-info",
"serde",
@@ -5853,7 +5853,7 @@
"impl-trait-for-tuples",
"log",
"pallet-timestamp",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"primitive-types",
"rlp",
"scale-info",
@@ -5876,7 +5876,7 @@
"frame-system",
"pallet-ethereum",
"pallet-evm",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-std",
@@ -5895,7 +5895,7 @@
"pallet-common",
"pallet-evm",
"pallet-evm-coder-substrate",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-runtime",
@@ -5913,7 +5913,7 @@
"frame-support",
"frame-system",
"pallet-evm",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-io",
@@ -5931,7 +5931,7 @@
"frame-system",
"pallet-ethereum",
"pallet-evm",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-io",
@@ -5953,7 +5953,7 @@
"pallet-evm",
"pallet-evm-coder-substrate",
"pallet-structure",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-runtime",
@@ -5969,7 +5969,7 @@
"frame-benchmarking",
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-arithmetic",
"sp-runtime",
@@ -5987,7 +5987,7 @@
"log",
"pallet-authorship",
"pallet-session",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-application-crypto",
"sp-core",
@@ -6008,7 +6008,7 @@
"frame-benchmarking",
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-io",
"sp-runtime",
@@ -6025,7 +6025,7 @@
"frame-system",
"log",
"pallet-authorship",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-application-crypto",
"sp-core",
@@ -6043,7 +6043,7 @@
"frame-benchmarking",
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-io",
@@ -6062,7 +6062,7 @@
"pallet-balances",
"pallet-randomness-collective-flip",
"pallet-timestamp",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-core",
@@ -6080,7 +6080,7 @@
"frame-support",
"frame-system",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-io",
@@ -6097,7 +6097,7 @@
"frame-benchmarking",
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-io",
@@ -6112,7 +6112,7 @@
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
"jsonrpsee",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"serde",
"sp-api",
"sp-blockchain",
@@ -6129,7 +6129,7 @@
"frame-benchmarking",
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-io",
"sp-runtime",
@@ -6143,7 +6143,7 @@
dependencies = [
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-io",
"sp-runtime",
@@ -6157,7 +6157,7 @@
dependencies = [
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-runtime",
@@ -6177,7 +6177,7 @@
"pallet-bags-list",
"pallet-nomination-pools",
"pallet-staking",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-runtime",
"sp-staking",
@@ -6197,7 +6197,7 @@
"pallet-evm",
"pallet-evm-coder-substrate",
"pallet-structure",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-runtime",
@@ -6215,7 +6215,7 @@
"frame-system",
"log",
"pallet-balances",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-runtime",
@@ -6239,7 +6239,7 @@
"pallet-offences",
"pallet-session",
"pallet-staking",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-runtime",
"sp-staking",
@@ -6254,7 +6254,7 @@
"frame-benchmarking",
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-io",
@@ -6270,7 +6270,7 @@
"frame-benchmarking",
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-io",
"sp-runtime",
@@ -6284,7 +6284,7 @@
dependencies = [
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"safe-mix",
"scale-info",
"sp-runtime",
@@ -6299,7 +6299,7 @@
"frame-benchmarking",
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-io",
"sp-runtime",
@@ -6316,7 +6316,7 @@
"pallet-common",
"pallet-evm",
"pallet-structure",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-runtime",
@@ -6337,7 +6337,7 @@
"pallet-evm",
"pallet-nonfungible",
"pallet-structure",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"rmrk-traits",
"scale-info",
"sp-core",
@@ -6357,7 +6357,7 @@
"pallet-evm",
"pallet-nonfungible",
"pallet-rmrk-core",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"rmrk-traits",
"scale-info",
"sp-core",
@@ -6375,7 +6375,7 @@
"frame-support",
"frame-system",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-io",
"sp-runtime",
@@ -6392,7 +6392,7 @@
"impl-trait-for-tuples",
"log",
"pallet-timestamp",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-io",
@@ -6426,7 +6426,7 @@
dependencies = [
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"rand_chacha 0.2.2",
"scale-info",
"sp-runtime",
@@ -6445,7 +6445,7 @@
"log",
"pallet-authorship",
"pallet-session",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"rand_chacha 0.2.2",
"scale-info",
"serde",
@@ -6485,7 +6485,7 @@
"frame-system",
"pallet-common",
"pallet-evm",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-std",
"up-data-structs",
@@ -6498,7 +6498,7 @@
dependencies = [
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-io",
"sp-runtime",
@@ -6515,7 +6515,7 @@
"frame-system",
"pallet-balances",
"pallet-transaction-payment",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-core",
@@ -6534,7 +6534,7 @@
"frame-support",
"frame-system",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-inherents",
"sp-io",
@@ -6553,7 +6553,7 @@
"frame-system",
"log",
"pallet-treasury",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-core",
@@ -6569,7 +6569,7 @@
dependencies = [
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"smallvec",
@@ -6586,7 +6586,7 @@
dependencies = [
"jsonrpsee",
"pallet-transaction-payment-rpc-runtime-api",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-api",
"sp-blockchain",
"sp-core",
@@ -6600,7 +6600,7 @@
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
"pallet-transaction-payment",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-api",
"sp-runtime",
]
@@ -6615,7 +6615,7 @@
"frame-system",
"impl-trait-for-tuples",
"pallet-balances",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-runtime",
@@ -6635,7 +6635,7 @@
"pallet-evm",
"pallet-evm-coder-substrate",
"pallet-nonfungible",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-core",
@@ -6653,7 +6653,7 @@
"frame-support",
"frame-system",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-core",
@@ -6672,7 +6672,7 @@
"frame-benchmarking",
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-io",
@@ -6689,7 +6689,7 @@
"frame-support",
"frame-system",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-runtime",
"sp-std",
@@ -6703,7 +6703,7 @@
"frame-support",
"frame-system",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-core",
@@ -6722,7 +6722,7 @@
"frame-support",
"frame-system",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-runtime",
"sp-std",
@@ -6738,7 +6738,7 @@
"cumulus-primitives-core",
"frame-support",
"frame-system",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
]
@@ -6778,15 +6778,15 @@
[[package]]
name = "parity-scale-codec"
-version = "3.1.2"
+version = "3.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066"
+checksum = "9182e4a71cae089267ab03e67c99368db7cd877baf50f931e5d6d4b71e195ac0"
dependencies = [
"arrayvec 0.7.2",
"bitvec 1.0.0",
"byte-slice-cast",
"impl-trait-for-tuples",
- "parity-scale-codec-derive 3.1.2",
+ "parity-scale-codec-derive 3.1.3",
"serde",
]
@@ -6804,9 +6804,9 @@
[[package]]
name = "parity-scale-codec-derive"
-version = "3.1.2"
+version = "3.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c45ed1f39709f5a89338fab50e59816b2e8815f5bb58276e7ddf9afd495f73f8"
+checksum = "9299338969a3d2f491d65f140b00ddec470858402f888af98e8642fb5e8965cd"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -6830,7 +6830,7 @@
"ethereum-types",
"hashbrown 0.12.1",
"impl-trait-for-tuples",
- "lru 0.7.6",
+ "lru 0.7.7",
"parity-util-mem-derive",
"parking_lot 0.12.1",
"primitive-types",
@@ -7114,8 +7114,8 @@
"derive_more",
"fatality",
"futures 0.3.21",
- "lru 0.7.6",
- "parity-scale-codec 3.1.2",
+ "lru 0.7.7",
+ "parity-scale-codec 3.1.5",
"polkadot-erasure-coding",
"polkadot-node-network-protocol",
"polkadot-node-primitives",
@@ -7136,8 +7136,8 @@
dependencies = [
"fatality",
"futures 0.3.21",
- "lru 0.7.6",
- "parity-scale-codec 3.1.2",
+ "lru 0.7.7",
+ "parity-scale-codec 3.1.5",
"polkadot-erasure-coding",
"polkadot-node-network-protocol",
"polkadot-node-primitives",
@@ -7241,7 +7241,7 @@
version = "0.9.22"
source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parity-util-mem",
"scale-info",
"sp-core",
@@ -7257,8 +7257,8 @@
"derive_more",
"fatality",
"futures 0.3.21",
- "lru 0.7.6",
- "parity-scale-codec 3.1.2",
+ "lru 0.7.7",
+ "parity-scale-codec 3.1.5",
"polkadot-erasure-coding",
"polkadot-node-network-protocol",
"polkadot-node-primitives",
@@ -7277,7 +7277,7 @@
version = "0.9.22"
source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-node-primitives",
"polkadot-primitives",
"reed-solomon-novelpoly",
@@ -7315,7 +7315,7 @@
"async-trait",
"bytes 1.1.0",
"futures 0.3.21",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"polkadot-node-network-protocol",
"polkadot-node-subsystem",
@@ -7333,7 +7333,7 @@
source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d"
dependencies = [
"futures 0.3.21",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-erasure-coding",
"polkadot-node-primitives",
"polkadot-node-subsystem",
@@ -7355,9 +7355,9 @@
"futures 0.3.21",
"futures-timer",
"kvdb",
- "lru 0.7.6",
+ "lru 0.7.7",
"merlin",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-node-jaeger",
"polkadot-node-primitives",
"polkadot-node-subsystem",
@@ -7383,7 +7383,7 @@
"futures 0.3.21",
"futures-timer",
"kvdb",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-erasure-coding",
"polkadot-node-primitives",
"polkadot-node-subsystem",
@@ -7435,7 +7435,7 @@
dependencies = [
"async-trait",
"futures 0.3.21",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-node-core-pvf",
"polkadot-node-primitives",
"polkadot-node-subsystem",
@@ -7469,7 +7469,7 @@
"futures 0.3.21",
"futures-timer",
"kvdb",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-node-primitives",
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
@@ -7486,8 +7486,8 @@
"fatality",
"futures 0.3.21",
"kvdb",
- "lru 0.7.6",
- "parity-scale-codec 3.1.2",
+ "lru 0.7.7",
+ "parity-scale-codec 3.1.5",
"polkadot-node-primitives",
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
@@ -7543,7 +7543,7 @@
"async-std",
"futures 0.3.21",
"futures-timer",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"pin-project 1.0.10",
"polkadot-core-primitives",
"polkadot-node-subsystem-util",
@@ -7605,7 +7605,7 @@
"lazy_static",
"log",
"mick-jaeger",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"polkadot-node-primitives",
"polkadot-primitives",
@@ -7624,7 +7624,7 @@
"futures-timer",
"log",
"metered-channel",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-primitives",
"sc-cli",
"sc-service",
@@ -7642,14 +7642,14 @@
"derive_more",
"fatality",
"futures 0.3.21",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-node-jaeger",
"polkadot-node-primitives",
"polkadot-primitives",
"rand 0.8.5",
"sc-authority-discovery",
"sc-network",
- "strum 0.24.0",
+ "strum 0.24.1",
"thiserror",
]
@@ -7660,7 +7660,7 @@
dependencies = [
"bounded-vec",
"futures 0.3.21",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-parachain",
"polkadot-primitives",
"schnorrkel",
@@ -7715,10 +7715,10 @@
"futures 0.3.21",
"itertools",
"kvdb",
- "lru 0.7.6",
+ "lru 0.7.7",
"metered-channel",
"parity-db",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parity-util-mem",
"parking_lot 0.11.2",
"pin-project 1.0.10",
@@ -7744,7 +7744,7 @@
dependencies = [
"futures 0.3.21",
"futures-timer",
- "lru 0.7.6",
+ "lru 0.7.7",
"parity-util-mem",
"parking_lot 0.12.1",
"polkadot-node-metrics",
@@ -7794,7 +7794,7 @@
dependencies = [
"derive_more",
"frame-support",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parity-util-mem",
"polkadot-core-primitives",
"scale-info",
@@ -7827,7 +7827,7 @@
"bitvec 1.0.0",
"frame-system",
"hex-literal",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parity-util-mem",
"polkadot-core-primitives",
"polkadot-parachain",
@@ -7934,7 +7934,7 @@
"pallet-utility",
"pallet-vesting",
"pallet-xcm",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-primitives",
"polkadot-runtime-common",
"polkadot-runtime-constants",
@@ -7993,7 +7993,7 @@
"pallet-transaction-payment",
"pallet-treasury",
"pallet-vesting",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-primitives",
"polkadot-runtime-parachains",
"rustc-hex",
@@ -8032,7 +8032,7 @@
source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d"
dependencies = [
"bs58",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-primitives",
"sp-std",
"sp-tracing",
@@ -8058,7 +8058,7 @@
"pallet-staking",
"pallet-timestamp",
"pallet-vesting",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-primitives",
"polkadot-runtime-metrics",
"rand 0.8.5",
@@ -8095,7 +8095,7 @@
"kusama-runtime",
"kvdb",
"kvdb-rocksdb",
- "lru 0.7.6",
+ "lru 0.7.7",
"pallet-babe",
"pallet-im-online",
"pallet-staking",
@@ -8192,7 +8192,7 @@
"fatality",
"futures 0.3.21",
"indexmap",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-node-network-protocol",
"polkadot-node-primitives",
"polkadot-node-subsystem",
@@ -8209,7 +8209,7 @@
version = "0.9.22"
source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-primitives",
"sp-core",
]
@@ -8244,7 +8244,7 @@
"pallet-transaction-payment-rpc-runtime-api",
"pallet-vesting",
"pallet-xcm",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-parachain",
"polkadot-primitives",
"polkadot-runtime-common",
@@ -8326,7 +8326,7 @@
"substrate-test-client",
"tempfile",
"test-runtime-constants",
- "tokio 1.18.2",
+ "tokio 1.19.2",
"tracing-gum",
]
@@ -8593,7 +8593,7 @@
"pallet-unique-scheduler",
"pallet-xcm",
"parachain-info",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-parachain",
"rmrk-rpc",
"scale-info",
@@ -8719,7 +8719,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
]
[[package]]
@@ -8821,7 +8821,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
"redox_syscall 0.2.13",
"thiserror",
]
@@ -8916,7 +8916,7 @@
"env_logger",
"jsonrpsee",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"serde",
"serde_json",
"sp-core",
@@ -9014,7 +9014,7 @@
name = "rmrk-traits"
version = "0.1.0"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
]
@@ -9075,7 +9075,7 @@
"pallet-transaction-payment-rpc-runtime-api",
"pallet-utility",
"pallet-xcm",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-parachain",
"polkadot-primitives",
"polkadot-runtime-common",
@@ -9188,7 +9188,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
- "semver 1.0.9",
+ "semver 1.0.10",
]
[[package]]
@@ -9335,7 +9335,7 @@
"ip_network",
"libp2p",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"prost",
"prost-build",
"rand 0.7.3",
@@ -9359,7 +9359,7 @@
"futures 0.3.21",
"futures-timer",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sc-block-builder",
"sc-client-api",
"sc-proposer-metrics",
@@ -9379,7 +9379,7 @@
version = "0.10.0-dev"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sc-client-api",
"sp-api",
"sp-block-builder",
@@ -9396,8 +9396,8 @@
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
"impl-trait-for-tuples",
- "memmap2 0.5.3",
- "parity-scale-codec 3.1.2",
+ "memmap2 0.5.4",
+ "parity-scale-codec 3.1.5",
"sc-chain-spec-derive",
"sc-network",
"sc-telemetry",
@@ -9431,7 +9431,7 @@
"libp2p",
"log",
"names",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"rand 0.7.3",
"regex",
"rpassword",
@@ -9454,7 +9454,7 @@
"sp-version",
"thiserror",
"tiny-bip39",
- "tokio 1.18.2",
+ "tokio 1.19.2",
]
[[package]]
@@ -9466,7 +9466,7 @@
"futures 0.3.21",
"hash-db",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"sc-executor",
"sc-transaction-pool-api",
@@ -9497,7 +9497,7 @@
"linked-hash-map",
"log",
"parity-db",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"sc-client-api",
"sc-state-db",
@@ -9542,7 +9542,7 @@
"async-trait",
"futures 0.3.21",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sc-block-builder",
"sc-client-api",
"sc-consensus",
@@ -9576,7 +9576,7 @@
"num-bigint",
"num-rational 0.2.4",
"num-traits",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"rand 0.7.3",
"retain_mut",
@@ -9634,7 +9634,7 @@
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
"fork-tree",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sc-client-api",
"sc-consensus",
"sp-blockchain",
@@ -9651,7 +9651,7 @@
"futures 0.3.21",
"jsonrpsee",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sc-client-api",
"sc-consensus",
"sc-consensus-aura",
@@ -9684,7 +9684,7 @@
"futures 0.3.21",
"futures-timer",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sc-client-api",
"sc-consensus",
"sc-telemetry",
@@ -9717,8 +9717,8 @@
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
"lazy_static",
- "lru 0.7.6",
- "parity-scale-codec 3.1.2",
+ "lru 0.7.7",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"sc-executor-common",
"sc-executor-wasmi",
@@ -9744,7 +9744,7 @@
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
"environmental",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sc-allocator",
"sp-maybe-compressed-blob",
"sp-sandbox",
@@ -9761,7 +9761,7 @@
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sc-allocator",
"sc-executor-common",
"sp-runtime-interface",
@@ -9778,7 +9778,7 @@
"cfg-if 1.0.0",
"libc",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parity-wasm 0.42.2",
"sc-allocator",
"sc-executor-common",
@@ -9802,7 +9802,7 @@
"futures-timer",
"hex",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"rand 0.8.5",
"sc-block-builder",
@@ -9837,7 +9837,7 @@
"futures 0.3.21",
"jsonrpsee",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sc-client-api",
"sc-finality-grandpa",
"sc-rpc",
@@ -9902,8 +9902,8 @@
"linked-hash-map",
"linked_hash_set",
"log",
- "lru 0.7.6",
- "parity-scale-codec 3.1.2",
+ "lru 0.7.7",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"pin-project 1.0.10",
"prost",
@@ -9939,7 +9939,7 @@
dependencies = [
"futures 0.3.21",
"libp2p",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"prost-build",
"sc-peerset",
"smallvec",
@@ -9955,7 +9955,7 @@
"futures-timer",
"libp2p",
"log",
- "lru 0.7.6",
+ "lru 0.7.7",
"sc-network",
"sp-runtime",
"substrate-prometheus-endpoint",
@@ -9973,8 +9973,8 @@
"futures 0.3.21",
"libp2p",
"log",
- "lru 0.7.6",
- "parity-scale-codec 3.1.2",
+ "lru 0.7.7",
+ "parity-scale-codec 3.1.5",
"prost",
"prost-build",
"sc-client-api",
@@ -10005,7 +10005,7 @@
"hyper-rustls",
"num_cpus",
"once_cell",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"rand 0.7.3",
"sc-client-api",
@@ -10050,7 +10050,7 @@
"hash-db",
"jsonrpsee",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"sc-block-builder",
"sc-chain-spec",
@@ -10079,7 +10079,7 @@
"futures 0.3.21",
"jsonrpsee",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"sc-chain-spec",
"sc-transaction-pool-api",
@@ -10104,7 +10104,7 @@
"log",
"serde_json",
"substrate-prometheus-endpoint",
- "tokio 1.18.2",
+ "tokio 1.19.2",
]
[[package]]
@@ -10120,7 +10120,7 @@
"hash-db",
"jsonrpsee",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parity-util-mem",
"parking_lot 0.12.1",
"pin-project 1.0.10",
@@ -10167,7 +10167,7 @@
"substrate-prometheus-endpoint",
"tempfile",
"thiserror",
- "tokio 1.18.2",
+ "tokio 1.19.2",
"tracing",
"tracing-futures",
]
@@ -10178,7 +10178,7 @@
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parity-util-mem",
"parity-util-mem-derive",
"parking_lot 0.12.1",
@@ -10192,7 +10192,7 @@
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
"jsonrpsee",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sc-chain-spec",
"sc-client-api",
"sc-consensus-babe",
@@ -10293,7 +10293,7 @@
"futures-timer",
"linked-hash-map",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parity-util-mem",
"parking_lot 0.12.1",
"retain_mut",
@@ -10346,7 +10346,7 @@
"bitvec 1.0.0",
"cfg-if 1.0.0",
"derive_more",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info-derive",
"serde",
]
@@ -10499,9 +10499,9 @@
[[package]]
name = "semver"
-version = "1.0.9"
+version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd"
+checksum = "a41d061efea015927ac527063765e73601444cdc344ba855bc7bd44578b25e1c"
dependencies = [
"serde",
]
@@ -10703,7 +10703,7 @@
source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d"
dependencies = [
"enumn",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"paste",
"sp-runtime",
"sp-std",
@@ -10780,7 +10780,7 @@
dependencies = [
"hash-db",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-api-proc-macro",
"sp-core",
"sp-runtime",
@@ -10807,7 +10807,7 @@
version = "6.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-core",
@@ -10822,7 +10822,7 @@
dependencies = [
"integer-sqrt",
"num-traits",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-debug-derive",
@@ -10835,7 +10835,7 @@
version = "4.0.0-dev"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-api",
"sp-application-crypto",
@@ -10849,7 +10849,7 @@
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
"async-trait",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-inherents",
"sp-runtime",
"sp-std",
@@ -10860,7 +10860,7 @@
version = "4.0.0-dev"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-api",
"sp-inherents",
"sp-runtime",
@@ -10874,8 +10874,8 @@
dependencies = [
"futures 0.3.21",
"log",
- "lru 0.7.6",
- "parity-scale-codec 3.1.2",
+ "lru 0.7.7",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"sp-api",
"sp-consensus",
@@ -10894,7 +10894,7 @@
"futures 0.3.21",
"futures-timer",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-core",
"sp-inherents",
"sp-runtime",
@@ -10910,7 +10910,7 @@
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
"async-trait",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-api",
"sp-application-crypto",
@@ -10929,7 +10929,7 @@
dependencies = [
"async-trait",
"merlin",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-api",
@@ -10950,7 +10950,7 @@
version = "0.10.0-dev"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-arithmetic",
@@ -10964,7 +10964,7 @@
version = "0.10.0-dev"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"schnorrkel",
"sp-core",
@@ -10993,7 +10993,7 @@
"log",
"merlin",
"num-traits",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parity-util-mem",
"parking_lot 0.12.1",
"primitive-types",
@@ -11068,7 +11068,7 @@
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
"environmental",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-std",
"sp-storage",
]
@@ -11080,7 +11080,7 @@
dependencies = [
"finality-grandpa",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-api",
@@ -11098,7 +11098,7 @@
dependencies = [
"async-trait",
"impl-trait-for-tuples",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-core",
"sp-runtime",
"sp-std",
@@ -11114,7 +11114,7 @@
"hash-db",
"libsecp256k1",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"secp256k1",
"sp-core",
@@ -11149,7 +11149,7 @@
"async-trait",
"futures 0.3.21",
"merlin",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"schnorrkel",
"serde",
@@ -11173,7 +11173,7 @@
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"serde",
"sp-api",
"sp-core",
@@ -11187,7 +11187,7 @@
version = "4.0.0-dev"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"serde",
"sp-arithmetic",
@@ -11235,7 +11235,7 @@
"hash256-std-hasher",
"impl-trait-for-tuples",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parity-util-mem",
"paste",
"rand 0.7.3",
@@ -11254,7 +11254,7 @@
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
"impl-trait-for-tuples",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"primitive-types",
"sp-externalities",
"sp-runtime-interface-proc-macro",
@@ -11283,7 +11283,7 @@
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-core",
"sp-io",
"sp-std",
@@ -11305,7 +11305,7 @@
version = "4.0.0-dev"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-api",
"sp-core",
@@ -11319,7 +11319,7 @@
version = "4.0.0-dev"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-runtime",
"sp-std",
@@ -11333,7 +11333,7 @@
"hash-db",
"log",
"num-traits",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.12.1",
"rand 0.7.3",
"smallvec",
@@ -11358,7 +11358,7 @@
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
"impl-serde",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"ref-cast",
"serde",
"sp-debug-derive",
@@ -11386,7 +11386,7 @@
"async-trait",
"futures-timer",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-api",
"sp-inherents",
"sp-runtime",
@@ -11399,7 +11399,7 @@
version = "5.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-std",
"tracing",
"tracing-core",
@@ -11422,7 +11422,7 @@
dependencies = [
"async-trait",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-inherents",
@@ -11438,7 +11438,7 @@
dependencies = [
"hash-db",
"memory-db",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-std",
@@ -11453,7 +11453,7 @@
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
"impl-serde",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parity-wasm 0.42.2",
"scale-info",
"serde",
@@ -11469,7 +11469,7 @@
version = "4.0.0-dev"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb"
dependencies = [
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"proc-macro2",
"quote",
"syn",
@@ -11482,7 +11482,7 @@
dependencies = [
"impl-trait-for-tuples",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-std",
"wasmi",
"wasmtime",
@@ -11584,11 +11584,11 @@
[[package]]
name = "strum"
-version = "0.24.0"
+version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96acfc1b70604b8b2f1ffa4c57e59176c7dbb05d556c71ecd2f5498a1dee7f8"
+checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
dependencies = [
- "strum_macros 0.24.0",
+ "strum_macros 0.24.1",
]
[[package]]
@@ -11606,9 +11606,9 @@
[[package]]
name = "strum_macros"
-version = "0.24.0"
+version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef"
+checksum = "9550962e7cf70d9980392878dfaf1dcc3ece024f4cf3bf3c46b978d0bad61d6c"
dependencies = [
"heck 0.4.0",
"proc-macro2",
@@ -11647,7 +11647,7 @@
"futures 0.3.21",
"jsonrpsee",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sc-client-api",
"sc-rpc-api",
"sc-transaction-pool-api",
@@ -11669,7 +11669,7 @@
"log",
"prometheus",
"thiserror",
- "tokio 1.18.2",
+ "tokio 1.19.2",
]
[[package]]
@@ -11679,7 +11679,7 @@
dependencies = [
"jsonrpsee",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sc-client-api",
"sc-rpc-api",
"scale-info",
@@ -11701,7 +11701,7 @@
"async-trait",
"futures 0.3.21",
"hex",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sc-client-api",
"sc-client-db",
"sc-consensus",
@@ -11726,7 +11726,7 @@
dependencies = [
"futures 0.3.21",
"substrate-test-utils-derive",
- "tokio 1.18.2",
+ "tokio 1.19.2",
]
[[package]]
@@ -11883,7 +11883,7 @@
"pallet-timestamp",
"pallet-transaction-payment",
"pallet-unique",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
"sp-io",
@@ -12035,9 +12035,9 @@
[[package]]
name = "tokio"
-version = "1.18.2"
+version = "1.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395"
+checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
dependencies = [
"bytes 1.1.0",
"libc",
@@ -12049,7 +12049,7 @@
"pin-project-lite 0.2.9",
"signal-hook-registry",
"socket2",
- "tokio-macros 1.7.0",
+ "tokio-macros 1.8.0",
"winapi",
]
@@ -12066,9 +12066,9 @@
[[package]]
name = "tokio-macros"
-version = "1.7.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
+checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
dependencies = [
"proc-macro2",
"quote",
@@ -12082,7 +12082,7 @@
checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
dependencies = [
"rustls 0.19.1",
- "tokio 1.18.2",
+ "tokio 1.19.2",
"webpki 0.21.4",
]
@@ -12093,22 +12093,22 @@
checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
dependencies = [
"rustls 0.20.6",
- "tokio 1.18.2",
+ "tokio 1.19.2",
"webpki 0.22.0",
]
[[package]]
name = "tokio-util"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c"
+checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45"
dependencies = [
"bytes 1.1.0",
"futures-core",
"futures-io",
"futures-sink",
"pin-project-lite 0.2.9",
- "tokio 1.18.2",
+ "tokio 1.19.2",
"tracing",
]
@@ -12129,9 +12129,9 @@
[[package]]
name = "tracing"
-version = "0.1.34"
+version = "0.1.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
+checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
dependencies = [
"cfg-if 1.0.0",
"pin-project-lite 0.2.9",
@@ -12152,11 +12152,11 @@
[[package]]
name = "tracing-core"
-version = "0.1.26"
+version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
+checksum = "7709595b8878a4965ce5e87ebf880a7d39c9afc6837721b21a5a816a8117d921"
dependencies = [
- "lazy_static",
+ "once_cell",
"valuable",
]
@@ -12202,7 +12202,7 @@
"ahash",
"lazy_static",
"log",
- "lru 0.7.6",
+ "lru 0.7.7",
"tracing-core",
]
@@ -12328,7 +12328,7 @@
"clap",
"jsonrpsee",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"remote-externalities",
"sc-chain-spec",
"sc-cli",
@@ -12377,7 +12377,7 @@
"jsonrpsee",
"pallet-common",
"pallet-evm",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"rmrk-rpc",
"sp-api",
"sp-blockchain",
@@ -12424,9 +12424,9 @@
[[package]]
name = "unicode-ident"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
+checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
[[package]]
name = "unicode-normalization"
@@ -12487,7 +12487,7 @@
"pallet-ethereum",
"pallet-transaction-payment-rpc",
"pallet-transaction-payment-rpc-runtime-api",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"parking_lot 0.11.2",
"polkadot-cli",
"polkadot-parachain",
@@ -12534,7 +12534,7 @@
"substrate-build-script-utils",
"substrate-frame-rpc-system",
"substrate-prometheus-endpoint",
- "tokio 1.18.2",
+ "tokio 1.19.2",
"try-runtime-cli",
"unique-rpc",
"unique-runtime",
@@ -12646,7 +12646,7 @@
"pallet-unique-scheduler",
"pallet-xcm",
"parachain-info",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-parachain",
"rmrk-rpc",
"scale-info",
@@ -12689,7 +12689,7 @@
"pallet-refungible",
"pallet-unique",
"pallet-unique-scheduler",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"rmrk-rpc",
"scale-info",
"sp-consensus-aura",
@@ -12736,7 +12736,7 @@
"frame-support",
"frame-system",
"pallet-evm",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"rmrk-traits",
"scale-info",
"serde",
@@ -12752,7 +12752,7 @@
dependencies = [
"pallet-common",
"pallet-evm",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-api",
"sp-core",
"sp-runtime",
@@ -12861,9 +12861,9 @@
[[package]]
name = "wasm-bindgen"
-version = "0.2.80"
+version = "0.2.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad"
+checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994"
dependencies = [
"cfg-if 1.0.0",
"wasm-bindgen-macro",
@@ -12871,9 +12871,9 @@
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.80"
+version = "0.2.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4"
+checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a"
dependencies = [
"bumpalo",
"lazy_static",
@@ -12886,9 +12886,9 @@
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.30"
+version = "0.4.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2"
+checksum = "de9a9cec1733468a8c657e57fa2413d2ae2c0129b95e87c5b72b8ace4d13f31f"
dependencies = [
"cfg-if 1.0.0",
"js-sys",
@@ -12898,9 +12898,9 @@
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.80"
+version = "0.2.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5"
+checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -12908,9 +12908,9 @@
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.80"
+version = "0.2.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b"
+checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048"
dependencies = [
"proc-macro2",
"quote",
@@ -12921,9 +12921,9 @@
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.80"
+version = "0.2.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744"
+checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"
[[package]]
name = "wasm-gc-api"
@@ -13160,9 +13160,9 @@
[[package]]
name = "web-sys"
-version = "0.3.57"
+version = "0.3.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283"
+checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -13262,7 +13262,7 @@
"pallet-vesting",
"pallet-xcm",
"pallet-xcm-benchmarks",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-parachain",
"polkadot-primitives",
"polkadot-runtime-common",
@@ -13484,7 +13484,7 @@
"derivative",
"impl-trait-for-tuples",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"scale-info",
"xcm-procedural",
]
@@ -13498,7 +13498,7 @@
"frame-system",
"log",
"pallet-transaction-payment",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"polkadot-parachain",
"scale-info",
"sp-arithmetic",
@@ -13518,7 +13518,7 @@
"frame-support",
"impl-trait-for-tuples",
"log",
- "parity-scale-codec 3.1.2",
+ "parity-scale-codec 3.1.5",
"sp-arithmetic",
"sp-core",
"sp-io",
Makefilediffbeforeafterboth--- a/Makefile
+++ b/Makefile
@@ -60,18 +60,10 @@
.PHONY: _bench
_bench:
cargo run --release --features runtime-benchmarks,unique-runtime -- \
- benchmark pallet --pallet pallet-$(PALLET) \
+ benchmark pallet --pallet pallet-$(if $(PALLET),$(PALLET),$(error Must set PALLET)) \
--wasm-execution compiled --extrinsic '*' \
- --template .maintain/frame-weight-template.hbs --steps=50 --repeat=200 --heap-pages=4096 \
- --output=./pallets/$(PALLET)/src/weights.rs
-
-.PHONY: _bench2
-_bench2:
- cargo run --release --features runtime-benchmarks,unique-runtime -- \
- benchmark pallet --pallet pallet-$(PALLET) \
- --wasm-execution compiled --extrinsic '*' \
- --template .maintain/frame-weight-template.hbs --steps=50 --repeat=200 --heap-pages=4096 \
- --output=./pallets/$(PALLET_DIR)/src/weights.rs
+ --template .maintain/frame-weight-template.hbs --steps=50 --repeat=80 --heap-pages=4096 \
+ --output=./pallets/$(if $(PALLET_DIR),$(PALLET_DIR),$(PALLET))/src/weights.rs
.PHONY: bench-evm-migration
bench-evm-migration:
@@ -103,7 +95,7 @@
.PHONY: bench-scheduler
bench-scheduler:
- make _bench2 PALLET=unique-scheduler PALLET_DIR=scheduler
+ make _bench PALLET=unique-scheduler PALLET_DIR=scheduler
.PHONY: bench-rmrk-core
bench-rmrk-core:
pallets/common/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/common/src/benchmarking.rs
+++ b/pallets/common/src/benchmarking.rs
@@ -100,6 +100,7 @@
restricted: None,
permissive: true,
}),
+ mint_mode: Some(true),
..Default::default()
}),
..Default::default()
pallets/common/src/lib.rsdiffbeforeafterboth1// 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)]1819extern crate alloc;2021use core::ops::{Deref, DerefMut};22use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};23use sp_std::vec::Vec;24use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};25use evm_coder::ToLog;26use frame_support::{27 dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo, Weight, PostDispatchInfo},28 ensure,29 traits::{Imbalance, Get, Currency, WithdrawReasons, ExistenceRequirement},30 weights::Pays,31 transactional,32};33use pallet_evm::GasWeightMapping;34use up_data_structs::{35 COLLECTION_NUMBER_LIMIT,36 Collection,37 RpcCollection,38 CollectionId,39 CreateItemData,40 MAX_TOKEN_PREFIX_LENGTH,41 COLLECTION_ADMINS_LIMIT,42 TokenId,43 TokenChild,44 CollectionStats,45 MAX_TOKEN_OWNERSHIP,46 CollectionMode,47 NFT_SPONSOR_TRANSFER_TIMEOUT,48 FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,49 REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,50 MAX_SPONSOR_TIMEOUT,51 CUSTOM_DATA_LIMIT,52 CollectionLimits,53 CreateCollectionData,54 SponsorshipState,55 CreateItemExData,56 SponsoringRateLimit,57 budget::Budget,58 PhantomType,59 Property,60 Properties,61 PropertiesPermissionMap,62 PropertyKey,63 PropertyValue,64 PropertyPermission,65 PropertiesError,66 PropertyKeyPermission,67 TokenData,68 TrySetProperty,69 PropertyScope,70 // RMRK71 RmrkCollectionInfo,72 RmrkInstanceInfo,73 RmrkResourceInfo,74 RmrkPropertyInfo,75 RmrkBaseInfo,76 RmrkPartType,77 RmrkTheme,78 RmrkNftChild,79 CollectionPermissions,80 SchemaVersion,81};8283pub use pallet::*;84use sp_core::H160;85use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};86#[cfg(feature = "runtime-benchmarks")]87pub mod benchmarking;88pub mod dispatch;89pub mod erc;90pub mod eth;91pub mod weights;9293pub type SelfWeightOf<T> = <T as Config>::WeightInfo;9495#[must_use = "Should call submit_logs or save, otherwise some data will be lost for evm side"]96pub struct CollectionHandle<T: Config> {97 pub id: CollectionId,98 collection: Collection<T::AccountId>,99 pub recorder: SubstrateRecorder<T>,100}101impl<T: Config> WithRecorder<T> for CollectionHandle<T> {102 fn recorder(&self) -> &SubstrateRecorder<T> {103 &self.recorder104 }105 fn into_recorder(self) -> SubstrateRecorder<T> {106 self.recorder107 }108}109impl<T: Config> CollectionHandle<T> {110 pub fn new_with_gas_limit(id: CollectionId, gas_limit: u64) -> Option<Self> {111 <CollectionById<T>>::get(id).map(|collection| Self {112 id,113 collection,114 recorder: SubstrateRecorder::new(gas_limit),115 })116 }117118 pub fn new_with_recorder(id: CollectionId, recorder: SubstrateRecorder<T>) -> Option<Self> {119 <CollectionById<T>>::get(id).map(|collection| Self {120 id,121 collection,122 recorder,123 })124 }125126 pub fn new(id: CollectionId) -> Option<Self> {127 Self::new_with_gas_limit(id, u64::MAX)128 }129130 pub fn try_get(id: CollectionId) -> Result<Self, DispatchError> {131 Ok(Self::new(id).ok_or(<Error<T>>::CollectionNotFound)?)132 }133134 pub fn consume_store_reads(&self, reads: u64) -> evm_coder::execution::Result<()> {135 self.recorder136 .consume_gas(T::GasWeightMapping::weight_to_gas(137 <T as frame_system::Config>::DbWeight::get()138 .read139 .saturating_mul(reads),140 ))141 }142143 pub fn consume_store_writes(&self, writes: u64) -> evm_coder::execution::Result<()> {144 self.recorder145 .consume_gas(T::GasWeightMapping::weight_to_gas(146 <T as frame_system::Config>::DbWeight::get()147 .write148 .saturating_mul(writes),149 ))150 }151 pub fn save(self) -> DispatchResult {152 <CollectionById<T>>::insert(self.id, self.collection);153 Ok(())154 }155156 pub fn set_sponsor(&mut self, sponsor: T::AccountId) -> DispatchResult {157 self.collection.sponsorship = SponsorshipState::Unconfirmed(sponsor);158 Ok(())159 }160161 pub fn confirm_sponsorship(&mut self, sender: &T::AccountId) -> Result<bool, DispatchError> {162 if self.collection.sponsorship.pending_sponsor() != Some(sender) {163 return Ok(false);164 }165166 self.collection.sponsorship = SponsorshipState::Confirmed(sender.clone());167 Ok(true)168 }169170 /// Checks that the collection was created with, and must be operated upon through **Unique API**.171 /// Now check only the `external_collection` flag and if it's **true**, then return `CollectionIsExternal` error.172 pub fn check_is_internal(&self) -> DispatchResult {173 if self.external_collection {174 return Err(<Error<T>>::CollectionIsExternal)?;175 }176177 Ok(())178 }179180 /// Checks that the collection was created with, and must be operated upon through an **assimilated API**.181 /// Now check only the `external_collection` flag and if it's **false**, then return `CollectionIsInternal` error.182 pub fn check_is_external(&self) -> DispatchResult {183 if !self.external_collection {184 return Err(<Error<T>>::CollectionIsInternal)?;185 }186187 Ok(())188 }189}190191impl<T: Config> Deref for CollectionHandle<T> {192 type Target = Collection<T::AccountId>;193194 fn deref(&self) -> &Self::Target {195 &self.collection196 }197}198199impl<T: Config> DerefMut for CollectionHandle<T> {200 fn deref_mut(&mut self) -> &mut Self::Target {201 &mut self.collection202 }203}204205impl<T: Config> CollectionHandle<T> {206 pub fn check_is_owner(&self, subject: &T::CrossAccountId) -> DispatchResult {207 ensure!(*subject.as_sub() == self.owner, <Error<T>>::NoPermission);208 Ok(())209 }210 pub fn is_owner_or_admin(&self, subject: &T::CrossAccountId) -> bool {211 *subject.as_sub() == self.owner || <IsAdmin<T>>::get((self.id, subject))212 }213 pub fn check_is_owner_or_admin(&self, subject: &T::CrossAccountId) -> DispatchResult {214 ensure!(self.is_owner_or_admin(subject), <Error<T>>::NoPermission);215 Ok(())216 }217 pub fn ignores_allowance(&self, user: &T::CrossAccountId) -> bool {218 self.limits.owner_can_transfer() && self.is_owner_or_admin(user)219 }220 pub fn ignores_owned_amount(&self, user: &T::CrossAccountId) -> bool {221 self.limits.owner_can_transfer() && self.is_owner_or_admin(user)222 }223 pub fn check_allowlist(&self, user: &T::CrossAccountId) -> DispatchResult {224 ensure!(225 <Allowlist<T>>::get((self.id, user)),226 <Error<T>>::AddressNotInAllowlist227 );228 Ok(())229 }230}231232#[frame_support::pallet]233pub mod pallet {234 use super::*;235 use pallet_evm::account;236 use dispatch::CollectionDispatch;237 use frame_support::{Blake2_128Concat, pallet_prelude::*, storage::Key, traits::StorageVersion};238 use frame_system::pallet_prelude::*;239 use frame_support::traits::Currency;240 use up_data_structs::{TokenId, mapping::TokenAddressMapping};241 use scale_info::TypeInfo;242 use weights::WeightInfo;243244 #[pallet::config]245 pub trait Config:246 frame_system::Config247 + pallet_evm_coder_substrate::Config248 + pallet_evm::Config249 + TypeInfo250 + account::Config251 {252 type WeightInfo: WeightInfo;253 type Event: IsType<<Self as frame_system::Config>::Event> + From<Event<Self>>;254255 type Currency: Currency<Self::AccountId>;256257 #[pallet::constant]258 type CollectionCreationPrice: Get<259 <<Self as Config>::Currency as Currency<Self::AccountId>>::Balance,260 >;261 type CollectionDispatch: CollectionDispatch<Self>;262263 type TreasuryAccountId: Get<Self::AccountId>;264 type ContractAddress: Get<H160>;265266 type EvmTokenAddressMapping: TokenAddressMapping<H160>;267 type CrossTokenAddressMapping: TokenAddressMapping<Self::CrossAccountId>;268 }269270 const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);271272 #[pallet::pallet]273 #[pallet::storage_version(STORAGE_VERSION)]274 #[pallet::generate_store(pub(super) trait Store)]275 pub struct Pallet<T>(_);276277 #[pallet::extra_constants]278 impl<T: Config> Pallet<T> {279 pub fn collection_admins_limit() -> u32 {280 COLLECTION_ADMINS_LIMIT281 }282 }283284 #[pallet::event]285 #[pallet::generate_deposit(pub fn deposit_event)]286 pub enum Event<T: Config> {287 /// New collection was created288 ///289 /// # Arguments290 ///291 /// * collection_id: Globally unique identifier of newly created collection.292 ///293 /// * mode: [CollectionMode] converted into u8.294 ///295 /// * account_id: Collection owner.296 CollectionCreated(CollectionId, u8, T::AccountId),297298 /// New collection was destroyed299 ///300 /// # Arguments301 ///302 /// * collection_id: Globally unique identifier of collection.303 CollectionDestroyed(CollectionId),304305 /// New item was created.306 ///307 /// # Arguments308 ///309 /// * collection_id: Id of the collection where item was created.310 ///311 /// * item_id: Id of an item. Unique within the collection.312 ///313 /// * recipient: Owner of newly created item314 ///315 /// * amount: Always 1 for NFT316 ItemCreated(CollectionId, TokenId, T::CrossAccountId, u128),317318 /// Collection item was burned.319 ///320 /// # Arguments321 ///322 /// * collection_id.323 ///324 /// * item_id: Identifier of burned NFT.325 ///326 /// * owner: which user has destroyed its tokens327 ///328 /// * amount: Always 1 for NFT329 ItemDestroyed(CollectionId, TokenId, T::CrossAccountId, u128),330331 /// Item was transferred332 ///333 /// * collection_id: Id of collection to which item is belong334 ///335 /// * item_id: Id of an item336 ///337 /// * sender: Original owner of item338 ///339 /// * recipient: New owner of item340 ///341 /// * amount: Always 1 for NFT342 Transfer(343 CollectionId,344 TokenId,345 T::CrossAccountId,346 T::CrossAccountId,347 u128,348 ),349350 /// * collection_id351 ///352 /// * item_id353 ///354 /// * sender355 ///356 /// * spender357 ///358 /// * amount359 Approved(360 CollectionId,361 TokenId,362 T::CrossAccountId,363 T::CrossAccountId,364 u128,365 ),366367 CollectionPropertySet(CollectionId, PropertyKey),368369 CollectionPropertyDeleted(CollectionId, PropertyKey),370371 TokenPropertySet(CollectionId, TokenId, PropertyKey),372373 TokenPropertyDeleted(CollectionId, TokenId, PropertyKey),374375 PropertyPermissionSet(CollectionId, PropertyKey),376 }377378 #[pallet::error]379 pub enum Error<T> {380 /// This collection does not exist.381 CollectionNotFound,382 /// Sender parameter and item owner must be equal.383 MustBeTokenOwner,384 /// No permission to perform action385 NoPermission,386 /// Destroying only empty collections is allowed387 CantDestroyNotEmptyCollection,388 /// Collection is not in mint mode.389 PublicMintingNotAllowed,390 /// Address is not in allow list.391 AddressNotInAllowlist,392393 /// Collection name can not be longer than 63 char.394 CollectionNameLimitExceeded,395 /// Collection description can not be longer than 255 char.396 CollectionDescriptionLimitExceeded,397 /// Token prefix can not be longer than 15 char.398 CollectionTokenPrefixLimitExceeded,399 /// Total collections bound exceeded.400 TotalCollectionsLimitExceeded,401 /// Exceeded max admin count402 CollectionAdminCountExceeded,403 /// Collection limit bounds per collection exceeded404 CollectionLimitBoundsExceeded,405 /// Tried to enable permissions which are only permitted to be disabled406 OwnerPermissionsCantBeReverted,407 /// Collection settings not allowing items transferring408 TransferNotAllowed,409 /// Account token limit exceeded per collection410 AccountTokenLimitExceeded,411 /// Collection token limit exceeded412 CollectionTokenLimitExceeded,413 /// Metadata flag frozen414 MetadataFlagFrozen,415416 /// Item not exists.417 TokenNotFound,418 /// Item balance not enough.419 TokenValueTooLow,420 /// Requested value more than approved.421 ApprovedValueTooLow,422 /// Tried to approve more than owned423 CantApproveMoreThanOwned,424425 /// Can't transfer tokens to ethereum zero address426 AddressIsZero,427 /// Target collection doesn't supports this operation428 UnsupportedOperation,429430 /// Not sufficient funds to perform action431 NotSufficientFounds,432433 /// User not passed nesting rule434 UserIsNotAllowedToNest,435 /// Only tokens from specific collections may nest tokens under this436 SourceCollectionIsNotAllowedToNest,437438 /// Tried to store more data than allowed in collection field439 CollectionFieldSizeExceeded,440441 /// Tried to store more property data than allowed442 NoSpaceForProperty,443444 /// Tried to store more property keys than allowed445 PropertyLimitReached,446447 /// Property key is too long448 PropertyKeyIsTooLong,449450 /// Only ASCII letters, digits, and '_', '-' are allowed451 InvalidCharacterInPropertyKey,452453 /// Empty property keys are forbidden454 EmptyPropertyKey,455456 /// Tried to access an external collection with an internal API457 CollectionIsExternal,458459 /// Tried to access an internal collection with an external API460 CollectionIsInternal,461 }462463 #[pallet::storage]464 pub type CreatedCollectionCount<T> = StorageValue<Value = CollectionId, QueryKind = ValueQuery>;465 #[pallet::storage]466 pub type DestroyedCollectionCount<T> =467 StorageValue<Value = CollectionId, QueryKind = ValueQuery>;468469 /// Collection info470 #[pallet::storage]471 pub type CollectionById<T> = StorageMap<472 Hasher = Blake2_128Concat,473 Key = CollectionId,474 Value = Collection<<T as frame_system::Config>::AccountId>,475 QueryKind = OptionQuery,476 >;477478 /// Collection properties479 #[pallet::storage]480 #[pallet::getter(fn collection_properties)]481 pub type CollectionProperties<T> = StorageMap<482 Hasher = Blake2_128Concat,483 Key = CollectionId,484 Value = Properties,485 QueryKind = ValueQuery,486 OnEmpty = up_data_structs::CollectionProperties,487 >;488489 #[pallet::storage]490 #[pallet::getter(fn property_permissions)]491 pub type CollectionPropertyPermissions<T> = StorageMap<492 Hasher = Blake2_128Concat,493 Key = CollectionId,494 Value = PropertiesPermissionMap,495 QueryKind = ValueQuery,496 >;497498 #[pallet::storage]499 pub type AdminAmount<T> = StorageMap<500 Hasher = Blake2_128Concat,501 Key = CollectionId,502 Value = u32,503 QueryKind = ValueQuery,504 >;505506 /// List of collection admins507 #[pallet::storage]508 pub type IsAdmin<T: Config> = StorageNMap<509 Key = (510 Key<Blake2_128Concat, CollectionId>,511 Key<Blake2_128Concat, T::CrossAccountId>,512 ),513 Value = bool,514 QueryKind = ValueQuery,515 >;516517 /// Allowlisted collection users518 #[pallet::storage]519 pub type Allowlist<T: Config> = StorageNMap<520 Key = (521 Key<Blake2_128Concat, CollectionId>,522 Key<Blake2_128Concat, T::CrossAccountId>,523 ),524 Value = bool,525 QueryKind = ValueQuery,526 >;527528 /// Not used by code, exists only to provide some types to metadata529 #[pallet::storage]530 pub type DummyStorageValue<T: Config> = StorageValue<531 Value = (532 CollectionStats,533 CollectionId,534 TokenId,535 TokenChild,536 PhantomType<(537 TokenData<T::CrossAccountId>,538 RpcCollection<T::AccountId>,539 // RMRK540 RmrkCollectionInfo<T::AccountId>,541 RmrkInstanceInfo<T::AccountId>,542 RmrkResourceInfo,543 RmrkPropertyInfo,544 RmrkBaseInfo<T::AccountId>,545 RmrkPartType,546 RmrkTheme,547 RmrkNftChild,548 )>,549 ),550 QueryKind = OptionQuery,551 >;552553 #[pallet::hooks]554 impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {555 fn on_runtime_upgrade() -> Weight {556 if StorageVersion::get::<Pallet<T>>() < StorageVersion::new(1) {557 use up_data_structs::{CollectionVersion1, CollectionVersion2};558 <CollectionById<T>>::translate::<CollectionVersion1<T::AccountId>, _>(|id, v| {559 let mut props = Vec::new();560 if !v.offchain_schema.is_empty() {561 props.push(Property {562 key: b"_old_offchainSchema".to_vec().try_into().unwrap(),563 value: v564 .offchain_schema565 .clone()566 .into_inner()567 .try_into()568 .expect("offchain schema too big"),569 });570 }571 if !v.variable_on_chain_schema.is_empty() {572 props.push(Property {573 key: b"_old_variableOnChainSchema".to_vec().try_into().unwrap(),574 value: v575 .variable_on_chain_schema576 .clone()577 .into_inner()578 .try_into()579 .expect("offchain schema too big"),580 });581 }582 if !v.const_on_chain_schema.is_empty() {583 props.push(Property {584 key: b"_old_constOnChainSchema".to_vec().try_into().unwrap(),585 value: v586 .const_on_chain_schema587 .clone()588 .into_inner()589 .try_into()590 .expect("offchain schema too big"),591 });592 }593 props.push(Property {594 key: b"_old_schemaVersion".to_vec().try_into().unwrap(),595 value: match v.schema_version {596 SchemaVersion::ImageURL => b"ImageUrl".as_slice(),597 SchemaVersion::Unique => b"Unique".as_slice(),598 }599 .to_vec()600 .try_into()601 .unwrap(),602 });603 Self::set_scoped_collection_properties(604 id,605 PropertyScope::None,606 props.into_iter(),607 )608 .expect("existing data larger than properties");609 let mut new = CollectionVersion2::from(v.clone());610 new.permissions.access = Some(v.access);611 new.permissions.mint_mode = Some(v.mint_mode);612 Some(new)613 });614 }615616 0617 }618 }619}620621impl<T: Config> Pallet<T> {622 /// Ethereum receiver 0x0000000000000000000000000000000000000000 is reserved, and shouldn't own tokens623 pub fn ensure_correct_receiver(receiver: &T::CrossAccountId) -> DispatchResult {624 ensure!(625 &T::CrossAccountId::from_eth(H160([0; 20])) != receiver,626 <Error<T>>::AddressIsZero627 );628 Ok(())629 }630 pub fn adminlist(collection: CollectionId) -> Vec<T::CrossAccountId> {631 <IsAdmin<T>>::iter_prefix((collection,))632 .map(|(a, _)| a)633 .collect()634 }635 pub fn allowlist(collection: CollectionId) -> Vec<T::CrossAccountId> {636 <Allowlist<T>>::iter_prefix((collection,))637 .map(|(a, _)| a)638 .collect()639 }640 pub fn allowed(collection: CollectionId, user: T::CrossAccountId) -> bool {641 <Allowlist<T>>::get((collection, user))642 }643 pub fn collection_stats() -> CollectionStats {644 let created = <CreatedCollectionCount<T>>::get();645 let destroyed = <DestroyedCollectionCount<T>>::get();646 CollectionStats {647 created: created.0,648 destroyed: destroyed.0,649 alive: created.0 - destroyed.0,650 }651 }652653 pub fn effective_collection_limits(collection: CollectionId) -> Option<CollectionLimits> {654 let collection = <CollectionById<T>>::get(collection);655 if collection.is_none() {656 return None;657 }658659 let collection = collection.unwrap();660 let limits = collection.limits;661 let effective_limits = CollectionLimits {662 account_token_ownership_limit: Some(limits.account_token_ownership_limit()),663 sponsored_data_size: Some(limits.sponsored_data_size()),664 sponsored_data_rate_limit: Some(665 limits666 .sponsored_data_rate_limit667 .unwrap_or(SponsoringRateLimit::SponsoringDisabled),668 ),669 token_limit: Some(limits.token_limit()),670 sponsor_transfer_timeout: Some(limits.sponsor_transfer_timeout(671 match collection.mode {672 CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,673 CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,674 CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,675 },676 )),677 sponsor_approve_timeout: Some(limits.sponsor_approve_timeout()),678 owner_can_transfer: Some(limits.owner_can_transfer()),679 owner_can_destroy: Some(limits.owner_can_destroy()),680 transfers_enabled: Some(limits.transfers_enabled()),681 };682683 Some(effective_limits)684 }685686 pub fn rpc_collection(collection: CollectionId) -> Option<RpcCollection<T::AccountId>> {687 let Collection {688 name,689 description,690 owner,691 mode,692 token_prefix,693 sponsorship,694 limits,695 permissions,696 external_collection,697 } = <CollectionById<T>>::get(collection)?;698699 let token_property_permissions = <CollectionPropertyPermissions<T>>::get(collection)700 .into_iter()701 .map(|(key, permission)| PropertyKeyPermission { key, permission })702 .collect();703704 let properties = <CollectionProperties<T>>::get(collection)705 .into_iter()706 .map(|(key, value)| Property { key, value })707 .collect();708709 let permissions = CollectionPermissions {710 access: Some(permissions.access()),711 mint_mode: Some(permissions.mint_mode()),712 nesting: Some(permissions.nesting().clone()),713 };714715 Some(RpcCollection {716 name: name.into_inner(),717 description: description.into_inner(),718 owner,719 mode,720 token_prefix: token_prefix.into_inner(),721 sponsorship,722 limits,723 permissions,724 token_property_permissions,725 properties,726 read_only: external_collection,727 })728 }729}730731macro_rules! limit_default {732 ($old:ident, $new:ident, $($field:ident $(($arg:expr))? => $check:expr),* $(,)?) => {{733 $(734 if let Some($new) = $new.$field {735 let $old = $old.$field($($arg)?);736 let _ = $new;737 let _ = $old;738 $check739 } else {740 $new.$field = $old.$field741 }742 )*743 }};744}745macro_rules! limit_default_clone {746 ($old:ident, $new:ident, $($field:ident $(($arg:expr))? => $check:expr),* $(,)?) => {{747 $(748 if let Some($new) = $new.$field.clone() {749 let $old = $old.$field($($arg)?);750 let _ = $new;751 let _ = $old;752 $check753 } else {754 $new.$field = $old.$field.clone()755 }756 )*757 }};758}759760impl<T: Config> Pallet<T> {761 pub fn init_collection(762 owner: T::CrossAccountId,763 data: CreateCollectionData<T::AccountId>,764 is_external: bool,765 ) -> Result<CollectionId, DispatchError> {766 {767 ensure!(768 data.token_prefix.len() <= MAX_TOKEN_PREFIX_LENGTH as usize,769 Error::<T>::CollectionTokenPrefixLimitExceeded770 );771 }772773 let created_count = <CreatedCollectionCount<T>>::get()774 .0775 .checked_add(1)776 .ok_or(ArithmeticError::Overflow)?;777 let destroyed_count = <DestroyedCollectionCount<T>>::get().0;778 let id = CollectionId(created_count);779780 // bound Total number of collections781 ensure!(782 created_count - destroyed_count <= COLLECTION_NUMBER_LIMIT,783 <Error<T>>::TotalCollectionsLimitExceeded784 );785786 // =========787788 let collection = Collection {789 owner: owner.as_sub().clone(),790 name: data.name,791 mode: data.mode.clone(),792 description: data.description,793 token_prefix: data.token_prefix,794 sponsorship: data795 .pending_sponsor796 .map(SponsorshipState::Unconfirmed)797 .unwrap_or_default(),798 limits: data799 .limits800 .map(|limits| Self::clamp_limits(data.mode.clone(), &Default::default(), limits))801 .unwrap_or_else(|| Ok(CollectionLimits::default()))?,802 permissions: data803 .permissions804 .map(|permissions| {805 Self::clamp_permissions(data.mode.clone(), &Default::default(), permissions)806 })807 .unwrap_or_else(|| Ok(CollectionPermissions::default()))?,808 external_collection: is_external,809 };810811 let mut collection_properties = up_data_structs::CollectionProperties::get();812 collection_properties813 .try_set_from_iter(data.properties.into_iter())814 .map_err(<Error<T>>::from)?;815816 CollectionProperties::<T>::insert(id, collection_properties);817818 let mut token_props_permissions = PropertiesPermissionMap::new();819 token_props_permissions820 .try_set_from_iter(data.token_property_permissions.into_iter())821 .map_err(<Error<T>>::from)?;822823 CollectionPropertyPermissions::<T>::insert(id, token_props_permissions);824825 // Take a (non-refundable) deposit of collection creation826 {827 let mut imbalance =828 <<<T as Config>::Currency as Currency<T::AccountId>>::PositiveImbalance>::zero();829 imbalance.subsume(830 <<T as Config>::Currency as Currency<T::AccountId>>::deposit_creating(831 &T::TreasuryAccountId::get(),832 T::CollectionCreationPrice::get(),833 ),834 );835 <T as Config>::Currency::settle(836 &owner.as_sub(),837 imbalance,838 WithdrawReasons::TRANSFER,839 ExistenceRequirement::KeepAlive,840 )841 .map_err(|_| Error::<T>::NotSufficientFounds)?;842 }843844 <CreatedCollectionCount<T>>::put(created_count);845 <Pallet<T>>::deposit_event(Event::CollectionCreated(846 id,847 data.mode.id(),848 owner.as_sub().clone(),849 ));850 <PalletEvm<T>>::deposit_log(851 erc::CollectionHelpersEvents::CollectionCreated {852 owner: *owner.as_eth(),853 collection_id: eth::collection_id_to_address(id),854 }855 .to_log(T::ContractAddress::get()),856 );857 <CollectionById<T>>::insert(id, collection);858 Ok(id)859 }860861 pub fn destroy_collection(862 collection: CollectionHandle<T>,863 sender: &T::CrossAccountId,864 ) -> DispatchResult {865 ensure!(866 collection.limits.owner_can_destroy(),867 <Error<T>>::NoPermission,868 );869 collection.check_is_owner(sender)?;870871 let destroyed_collections = <DestroyedCollectionCount<T>>::get()872 .0873 .checked_add(1)874 .ok_or(ArithmeticError::Overflow)?;875876 // =========877878 <DestroyedCollectionCount<T>>::put(destroyed_collections);879 <CollectionById<T>>::remove(collection.id);880 <AdminAmount<T>>::remove(collection.id);881 <IsAdmin<T>>::remove_prefix((collection.id,), None);882 <Allowlist<T>>::remove_prefix((collection.id,), None);883 <CollectionProperties<T>>::remove(collection.id);884885 <Pallet<T>>::deposit_event(Event::CollectionDestroyed(collection.id));886 Ok(())887 }888889 pub fn set_collection_property(890 collection: &CollectionHandle<T>,891 sender: &T::CrossAccountId,892 property: Property,893 ) -> DispatchResult {894 collection.check_is_owner_or_admin(sender)?;895896 CollectionProperties::<T>::try_mutate(collection.id, |properties| {897 let property = property.clone();898 properties.try_set(property.key, property.value)899 })900 .map_err(<Error<T>>::from)?;901902 Self::deposit_event(Event::CollectionPropertySet(collection.id, property.key));903904 Ok(())905 }906907 pub fn set_scoped_collection_property(908 collection_id: CollectionId,909 scope: PropertyScope,910 property: Property,911 ) -> DispatchResult {912 CollectionProperties::<T>::try_mutate(collection_id, |properties| {913 properties.try_scoped_set(scope, property.key, property.value)914 })915 .map_err(<Error<T>>::from)?;916917 Ok(())918 }919920 pub fn set_scoped_collection_properties(921 collection_id: CollectionId,922 scope: PropertyScope,923 properties: impl Iterator<Item = Property>,924 ) -> DispatchResult {925 CollectionProperties::<T>::try_mutate(collection_id, |stored_properties| {926 stored_properties.try_scoped_set_from_iter(scope, properties)927 })928 .map_err(<Error<T>>::from)?;929930 Ok(())931 }932933 #[transactional]934 pub fn set_collection_properties(935 collection: &CollectionHandle<T>,936 sender: &T::CrossAccountId,937 properties: Vec<Property>,938 ) -> DispatchResult {939 for property in properties {940 Self::set_collection_property(collection, sender, property)?;941 }942943 Ok(())944 }945946 pub fn delete_collection_property(947 collection: &CollectionHandle<T>,948 sender: &T::CrossAccountId,949 property_key: PropertyKey,950 ) -> DispatchResult {951 collection.check_is_owner_or_admin(sender)?;952953 CollectionProperties::<T>::try_mutate(collection.id, |properties| {954 properties.remove(&property_key)955 })956 .map_err(<Error<T>>::from)?;957958 Self::deposit_event(Event::CollectionPropertyDeleted(959 collection.id,960 property_key,961 ));962963 Ok(())964 }965966 #[transactional]967 pub fn delete_collection_properties(968 collection: &CollectionHandle<T>,969 sender: &T::CrossAccountId,970 property_keys: Vec<PropertyKey>,971 ) -> DispatchResult {972 for key in property_keys {973 Self::delete_collection_property(collection, sender, key)?;974 }975976 Ok(())977 }978979 // For migrations980 pub fn set_property_permission_unchecked(981 collection: CollectionId,982 property_permission: PropertyKeyPermission,983 ) -> DispatchResult {984 <CollectionPropertyPermissions<T>>::try_mutate(collection, |permissions| {985 permissions.try_set(property_permission.key, property_permission.permission)986 })987 .map_err(<Error<T>>::from)?;988 Ok(())989 }990991 pub fn set_property_permission(992 collection: &CollectionHandle<T>,993 sender: &T::CrossAccountId,994 property_permission: PropertyKeyPermission,995 ) -> DispatchResult {996 collection.check_is_owner_or_admin(sender)?;997998 let all_permissions = CollectionPropertyPermissions::<T>::get(collection.id);999 let current_permission = all_permissions.get(&property_permission.key);1000 if matches![1001 current_permission,1002 Some(PropertyPermission { mutable: false, .. })1003 ] {1004 return Err(<Error<T>>::NoPermission.into());1005 }10061007 CollectionPropertyPermissions::<T>::try_mutate(collection.id, |permissions| {1008 let property_permission = property_permission.clone();1009 permissions.try_set(property_permission.key, property_permission.permission)1010 })1011 .map_err(<Error<T>>::from)?;10121013 Self::deposit_event(Event::PropertyPermissionSet(1014 collection.id,1015 property_permission.key,1016 ));10171018 Ok(())1019 }10201021 #[transactional]1022 pub fn set_token_property_permissions(1023 collection: &CollectionHandle<T>,1024 sender: &T::CrossAccountId,1025 property_permissions: Vec<PropertyKeyPermission>,1026 ) -> DispatchResult {1027 for prop_pemission in property_permissions {1028 Self::set_property_permission(collection, sender, prop_pemission)?;1029 }10301031 Ok(())1032 }10331034 pub fn get_collection_property(1035 collection_id: CollectionId,1036 key: &PropertyKey,1037 ) -> Option<PropertyValue> {1038 Self::collection_properties(collection_id).get(key).cloned()1039 }10401041 pub fn bytes_keys_to_property_keys(1042 keys: Vec<Vec<u8>>,1043 ) -> Result<Vec<PropertyKey>, DispatchError> {1044 keys.into_iter()1045 .map(|key| -> Result<PropertyKey, DispatchError> {1046 key.try_into()1047 .map_err(|_| <Error<T>>::PropertyKeyIsTooLong.into())1048 })1049 .collect::<Result<Vec<PropertyKey>, DispatchError>>()1050 }10511052 pub fn filter_collection_properties(1053 collection_id: CollectionId,1054 keys: Option<Vec<PropertyKey>>,1055 ) -> Result<Vec<Property>, DispatchError> {1056 let properties = Self::collection_properties(collection_id);10571058 let properties = keys1059 .map(|keys| {1060 keys.into_iter()1061 .filter_map(|key| {1062 properties.get(&key).map(|value| Property {1063 key,1064 value: value.clone(),1065 })1066 })1067 .collect()1068 })1069 .unwrap_or_else(|| {1070 properties1071 .into_iter()1072 .map(|(key, value)| Property { key, value })1073 .collect()1074 });10751076 Ok(properties)1077 }10781079 pub fn filter_property_permissions(1080 collection_id: CollectionId,1081 keys: Option<Vec<PropertyKey>>,1082 ) -> Result<Vec<PropertyKeyPermission>, DispatchError> {1083 let permissions = Self::property_permissions(collection_id);10841085 let key_permissions = keys1086 .map(|keys| {1087 keys.into_iter()1088 .filter_map(|key| {1089 permissions1090 .get(&key)1091 .map(|permission| PropertyKeyPermission {1092 key,1093 permission: permission.clone(),1094 })1095 })1096 .collect()1097 })1098 .unwrap_or_else(|| {1099 permissions1100 .into_iter()1101 .map(|(key, permission)| PropertyKeyPermission { key, permission })1102 .collect()1103 });11041105 Ok(key_permissions)1106 }11071108 pub fn toggle_allowlist(1109 collection: &CollectionHandle<T>,1110 sender: &T::CrossAccountId,1111 user: &T::CrossAccountId,1112 allowed: bool,1113 ) -> DispatchResult {1114 collection.check_is_owner_or_admin(sender)?;11151116 // =========11171118 if allowed {1119 <Allowlist<T>>::insert((collection.id, user), true);1120 } else {1121 <Allowlist<T>>::remove((collection.id, user));1122 }11231124 Ok(())1125 }11261127 pub fn toggle_admin(1128 collection: &CollectionHandle<T>,1129 sender: &T::CrossAccountId,1130 user: &T::CrossAccountId,1131 admin: bool,1132 ) -> DispatchResult {1133 collection.check_is_owner(sender)?;11341135 let was_admin = <IsAdmin<T>>::get((collection.id, user));1136 if was_admin == admin {1137 return Ok(());1138 }1139 let amount = <AdminAmount<T>>::get(collection.id);11401141 if admin {1142 let amount = amount1143 .checked_add(1)1144 .ok_or(<Error<T>>::CollectionAdminCountExceeded)?;1145 ensure!(1146 amount <= Self::collection_admins_limit(),1147 <Error<T>>::CollectionAdminCountExceeded,1148 );11491150 // =========11511152 <AdminAmount<T>>::insert(collection.id, amount);1153 <IsAdmin<T>>::insert((collection.id, user), true);1154 } else {1155 <AdminAmount<T>>::insert(collection.id, amount.saturating_sub(1));1156 <IsAdmin<T>>::remove((collection.id, user));1157 }11581159 Ok(())1160 }11611162 pub fn clamp_limits(1163 mode: CollectionMode,1164 old_limit: &CollectionLimits,1165 mut new_limit: CollectionLimits,1166 ) -> Result<CollectionLimits, DispatchError> {1167 let limits = old_limit;1168 limit_default!(old_limit, new_limit,1169 account_token_ownership_limit => ensure!(1170 new_limit <= MAX_TOKEN_OWNERSHIP,1171 <Error<T>>::CollectionLimitBoundsExceeded,1172 ),1173 sponsored_data_size => ensure!(1174 new_limit <= CUSTOM_DATA_LIMIT,1175 <Error<T>>::CollectionLimitBoundsExceeded,1176 ),11771178 sponsored_data_rate_limit => {},1179 token_limit => ensure!(1180 old_limit >= new_limit && new_limit > 0,1181 <Error<T>>::CollectionTokenLimitExceeded1182 ),11831184 sponsor_transfer_timeout(match mode {1185 CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,1186 CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,1187 CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,1188 }) => ensure!(1189 new_limit <= MAX_SPONSOR_TIMEOUT,1190 <Error<T>>::CollectionLimitBoundsExceeded,1191 ),1192 sponsor_approve_timeout => {},1193 owner_can_transfer => ensure!(1194 !limits.owner_can_transfer_instaled() ||1195 old_limit || !new_limit,1196 <Error<T>>::OwnerPermissionsCantBeReverted,1197 ),1198 owner_can_destroy => ensure!(1199 old_limit || !new_limit,1200 <Error<T>>::OwnerPermissionsCantBeReverted,1201 ),1202 transfers_enabled => {},1203 );1204 Ok(new_limit)1205 }12061207 pub fn clamp_permissions(1208 _mode: CollectionMode,1209 old_limit: &CollectionPermissions,1210 mut new_limit: CollectionPermissions,1211 ) -> Result<CollectionPermissions, DispatchError> {1212 limit_default_clone!(old_limit, new_limit,1213 access => {},1214 mint_mode => {},1215 nesting => ensure!(1216 // Permissive is only allowed for tests and internal usage of chain for now1217 old_limit.permissive || !new_limit.permissive,1218 <Error<T>>::NoPermission,1219 ),1220 );1221 Ok(new_limit)1222 }1223}12241225#[macro_export]1226macro_rules! unsupported {1227 () => {1228 Err(<Error<T>>::UnsupportedOperation.into())1229 };1230}12311232/// Worst cases1233pub trait CommonWeightInfo<CrossAccountId> {1234 fn create_item() -> Weight;1235 fn create_multiple_items(amount: &[CreateItemData]) -> Weight;1236 fn create_multiple_items_ex(cost: &CreateItemExData<CrossAccountId>) -> Weight;1237 fn burn_item() -> Weight;1238 fn set_collection_properties(amount: u32) -> Weight;1239 fn delete_collection_properties(amount: u32) -> Weight;1240 fn set_token_properties(amount: u32) -> Weight;1241 fn delete_token_properties(amount: u32) -> Weight;1242 fn set_token_property_permissions(amount: u32) -> Weight;1243 fn transfer() -> Weight;1244 fn approve() -> Weight;1245 fn transfer_from() -> Weight;1246 fn burn_from() -> Weight;12471248 /// Differs from burn_item in case of Fungible and Refungible, as it should burn1249 /// whole users's balance1250 ///1251 /// This method shouldn't be used directly, as it doesn't count breadth price, use `burn_recursively` instead1252 fn burn_recursively_self_raw() -> Weight;1253 /// Cost of iterating over `amount` children while burning, without counting child burning itself1254 ///1255 /// This method shouldn't be used directly, as it doesn't count depth price, use `burn_recursively` instead1256 fn burn_recursively_breadth_raw(amount: u32) -> Weight;12571258 fn burn_recursively(max_selfs: u32, max_breadth: u32) -> Weight {1259 Self::burn_recursively_self_raw()1260 .saturating_mul(max_selfs.max(1) as u64)1261 .saturating_add(Self::burn_recursively_breadth_raw(max_breadth))1262 }1263}12641265pub trait CommonCollectionOperations<T: Config> {1266 fn create_item(1267 &self,1268 sender: T::CrossAccountId,1269 to: T::CrossAccountId,1270 data: CreateItemData,1271 nesting_budget: &dyn Budget,1272 ) -> DispatchResultWithPostInfo;1273 fn create_multiple_items(1274 &self,1275 sender: T::CrossAccountId,1276 to: T::CrossAccountId,1277 data: Vec<CreateItemData>,1278 nesting_budget: &dyn Budget,1279 ) -> DispatchResultWithPostInfo;1280 fn create_multiple_items_ex(1281 &self,1282 sender: T::CrossAccountId,1283 data: CreateItemExData<T::CrossAccountId>,1284 nesting_budget: &dyn Budget,1285 ) -> DispatchResultWithPostInfo;1286 fn burn_item(1287 &self,1288 sender: T::CrossAccountId,1289 token: TokenId,1290 amount: u128,1291 ) -> DispatchResultWithPostInfo;1292 fn burn_item_recursively(1293 &self,1294 sender: T::CrossAccountId,1295 token: TokenId,1296 self_budget: &dyn Budget,1297 breadth_budget: &dyn Budget,1298 ) -> DispatchResultWithPostInfo;1299 fn set_collection_properties(1300 &self,1301 sender: T::CrossAccountId,1302 properties: Vec<Property>,1303 ) -> DispatchResultWithPostInfo;1304 fn delete_collection_properties(1305 &self,1306 sender: &T::CrossAccountId,1307 property_keys: Vec<PropertyKey>,1308 ) -> DispatchResultWithPostInfo;1309 fn set_token_properties(1310 &self,1311 sender: T::CrossAccountId,1312 token_id: TokenId,1313 property: Vec<Property>,1314 ) -> DispatchResultWithPostInfo;1315 fn delete_token_properties(1316 &self,1317 sender: T::CrossAccountId,1318 token_id: TokenId,1319 property_keys: Vec<PropertyKey>,1320 ) -> DispatchResultWithPostInfo;1321 fn set_token_property_permissions(1322 &self,1323 sender: &T::CrossAccountId,1324 property_permissions: Vec<PropertyKeyPermission>,1325 ) -> DispatchResultWithPostInfo;1326 fn transfer(1327 &self,1328 sender: T::CrossAccountId,1329 to: T::CrossAccountId,1330 token: TokenId,1331 amount: u128,1332 nesting_budget: &dyn Budget,1333 ) -> DispatchResultWithPostInfo;1334 fn approve(1335 &self,1336 sender: T::CrossAccountId,1337 spender: T::CrossAccountId,1338 token: TokenId,1339 amount: u128,1340 ) -> DispatchResultWithPostInfo;1341 fn transfer_from(1342 &self,1343 sender: T::CrossAccountId,1344 from: T::CrossAccountId,1345 to: T::CrossAccountId,1346 token: TokenId,1347 amount: u128,1348 nesting_budget: &dyn Budget,1349 ) -> DispatchResultWithPostInfo;1350 fn burn_from(1351 &self,1352 sender: T::CrossAccountId,1353 from: T::CrossAccountId,1354 token: TokenId,1355 amount: u128,1356 nesting_budget: &dyn Budget,1357 ) -> DispatchResultWithPostInfo;13581359 fn check_nesting(1360 &self,1361 sender: T::CrossAccountId,1362 from: (CollectionId, TokenId),1363 under: TokenId,1364 budget: &dyn Budget,1365 ) -> DispatchResult;13661367 fn nest(&self, under: TokenId, to_nest: (CollectionId, TokenId));13681369 fn unnest(&self, under: TokenId, to_nest: (CollectionId, TokenId));13701371 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId>;1372 fn collection_tokens(&self) -> Vec<TokenId>;1373 fn token_exists(&self, token: TokenId) -> bool;1374 fn last_token_id(&self) -> TokenId;13751376 fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId>;1377 fn token_property(&self, token_id: TokenId, key: &PropertyKey) -> Option<PropertyValue>;1378 fn token_properties(&self, token_id: TokenId, keys: Option<Vec<PropertyKey>>) -> Vec<Property>;1379 /// Amount of unique collection tokens1380 fn total_supply(&self) -> u32;1381 /// Amount of different tokens account has (Applicable to nonfungible/refungible)1382 fn account_balance(&self, account: T::CrossAccountId) -> u32;1383 /// Amount of specific token account have (Applicable to fungible/refungible)1384 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128;1385 fn allowance(1386 &self,1387 sender: T::CrossAccountId,1388 spender: T::CrossAccountId,1389 token: TokenId,1390 ) -> u128;1391}13921393// Flexible enough for implementing CommonCollectionOperations1394pub fn with_weight(res: DispatchResult, weight: Weight) -> DispatchResultWithPostInfo {1395 let post_info = PostDispatchInfo {1396 actual_weight: Some(weight),1397 pays_fee: Pays::Yes,1398 };1399 match res {1400 Ok(()) => Ok(post_info),1401 Err(error) => Err(DispatchErrorWithPostInfo { post_info, error }),1402 }1403}14041405impl<T: Config> From<PropertiesError> for Error<T> {1406 fn from(error: PropertiesError) -> Self {1407 match error {1408 PropertiesError::NoSpaceForProperty => Self::NoSpaceForProperty,1409 PropertiesError::PropertyLimitReached => Self::PropertyLimitReached,1410 PropertiesError::InvalidCharacterInPropertyKey => Self::InvalidCharacterInPropertyKey,1411 PropertiesError::PropertyKeyIsTooLong => Self::PropertyKeyIsTooLong,1412 PropertiesError::EmptyPropertyKey => Self::EmptyPropertyKey,1413 }1414 }1415}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)]1819extern crate alloc;2021use core::ops::{Deref, DerefMut};22use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};23use sp_std::vec::Vec;24use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};25use evm_coder::ToLog;26use frame_support::{27 dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo, Weight, PostDispatchInfo},28 ensure,29 traits::{Imbalance, Get, Currency, WithdrawReasons, ExistenceRequirement},30 weights::Pays,31 transactional,32};33use pallet_evm::GasWeightMapping;34use up_data_structs::{35 COLLECTION_NUMBER_LIMIT,36 Collection,37 RpcCollection,38 CollectionId,39 CreateItemData,40 MAX_TOKEN_PREFIX_LENGTH,41 COLLECTION_ADMINS_LIMIT,42 TokenId,43 TokenChild,44 CollectionStats,45 MAX_TOKEN_OWNERSHIP,46 CollectionMode,47 NFT_SPONSOR_TRANSFER_TIMEOUT,48 FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,49 REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,50 MAX_SPONSOR_TIMEOUT,51 CUSTOM_DATA_LIMIT,52 CollectionLimits,53 CreateCollectionData,54 SponsorshipState,55 CreateItemExData,56 SponsoringRateLimit,57 budget::Budget,58 PhantomType,59 Property,60 Properties,61 PropertiesPermissionMap,62 PropertyKey,63 PropertyValue,64 PropertyPermission,65 PropertiesError,66 PropertyKeyPermission,67 TokenData,68 TrySetProperty,69 PropertyScope,70 // RMRK71 RmrkCollectionInfo,72 RmrkInstanceInfo,73 RmrkResourceInfo,74 RmrkPropertyInfo,75 RmrkBaseInfo,76 RmrkPartType,77 RmrkTheme,78 RmrkNftChild,79 CollectionPermissions,80 SchemaVersion,81};8283pub use pallet::*;84use sp_core::H160;85use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};86#[cfg(feature = "runtime-benchmarks")]87pub mod benchmarking;88pub mod dispatch;89pub mod erc;90pub mod eth;91pub mod weights;9293pub type SelfWeightOf<T> = <T as Config>::WeightInfo;9495#[must_use = "Should call submit_logs or save, otherwise some data will be lost for evm side"]96pub struct CollectionHandle<T: Config> {97 pub id: CollectionId,98 collection: Collection<T::AccountId>,99 pub recorder: SubstrateRecorder<T>,100}101impl<T: Config> WithRecorder<T> for CollectionHandle<T> {102 fn recorder(&self) -> &SubstrateRecorder<T> {103 &self.recorder104 }105 fn into_recorder(self) -> SubstrateRecorder<T> {106 self.recorder107 }108}109impl<T: Config> CollectionHandle<T> {110 pub fn new_with_gas_limit(id: CollectionId, gas_limit: u64) -> Option<Self> {111 <CollectionById<T>>::get(id).map(|collection| Self {112 id,113 collection,114 recorder: SubstrateRecorder::new(gas_limit),115 })116 }117118 pub fn new_with_recorder(id: CollectionId, recorder: SubstrateRecorder<T>) -> Option<Self> {119 <CollectionById<T>>::get(id).map(|collection| Self {120 id,121 collection,122 recorder,123 })124 }125126 pub fn new(id: CollectionId) -> Option<Self> {127 Self::new_with_gas_limit(id, u64::MAX)128 }129130 pub fn try_get(id: CollectionId) -> Result<Self, DispatchError> {131 Ok(Self::new(id).ok_or(<Error<T>>::CollectionNotFound)?)132 }133134 pub fn consume_store_reads(&self, reads: u64) -> evm_coder::execution::Result<()> {135 self.recorder136 .consume_gas(T::GasWeightMapping::weight_to_gas(137 <T as frame_system::Config>::DbWeight::get()138 .read139 .saturating_mul(reads),140 ))141 }142143 pub fn consume_store_writes(&self, writes: u64) -> evm_coder::execution::Result<()> {144 self.recorder145 .consume_gas(T::GasWeightMapping::weight_to_gas(146 <T as frame_system::Config>::DbWeight::get()147 .write148 .saturating_mul(writes),149 ))150 }151 pub fn save(self) -> DispatchResult {152 <CollectionById<T>>::insert(self.id, self.collection);153 Ok(())154 }155156 pub fn set_sponsor(&mut self, sponsor: T::AccountId) -> DispatchResult {157 self.collection.sponsorship = SponsorshipState::Unconfirmed(sponsor);158 Ok(())159 }160161 pub fn confirm_sponsorship(&mut self, sender: &T::AccountId) -> Result<bool, DispatchError> {162 if self.collection.sponsorship.pending_sponsor() != Some(sender) {163 return Ok(false);164 }165166 self.collection.sponsorship = SponsorshipState::Confirmed(sender.clone());167 Ok(true)168 }169170 /// Checks that the collection was created with, and must be operated upon through **Unique API**.171 /// Now check only the `external_collection` flag and if it's **true**, then return `CollectionIsExternal` error.172 pub fn check_is_internal(&self) -> DispatchResult {173 if self.external_collection {174 return Err(<Error<T>>::CollectionIsExternal)?;175 }176177 Ok(())178 }179180 /// Checks that the collection was created with, and must be operated upon through an **assimilated API**.181 /// Now check only the `external_collection` flag and if it's **false**, then return `CollectionIsInternal` error.182 pub fn check_is_external(&self) -> DispatchResult {183 if !self.external_collection {184 return Err(<Error<T>>::CollectionIsInternal)?;185 }186187 Ok(())188 }189}190191impl<T: Config> Deref for CollectionHandle<T> {192 type Target = Collection<T::AccountId>;193194 fn deref(&self) -> &Self::Target {195 &self.collection196 }197}198199impl<T: Config> DerefMut for CollectionHandle<T> {200 fn deref_mut(&mut self) -> &mut Self::Target {201 &mut self.collection202 }203}204205impl<T: Config> CollectionHandle<T> {206 pub fn check_is_owner(&self, subject: &T::CrossAccountId) -> DispatchResult {207 ensure!(*subject.as_sub() == self.owner, <Error<T>>::NoPermission);208 Ok(())209 }210 pub fn is_owner_or_admin(&self, subject: &T::CrossAccountId) -> bool {211 *subject.as_sub() == self.owner || <IsAdmin<T>>::get((self.id, subject))212 }213 pub fn check_is_owner_or_admin(&self, subject: &T::CrossAccountId) -> DispatchResult {214 ensure!(self.is_owner_or_admin(subject), <Error<T>>::NoPermission);215 Ok(())216 }217 pub fn ignores_allowance(&self, user: &T::CrossAccountId) -> bool {218 self.limits.owner_can_transfer() && self.is_owner_or_admin(user)219 }220 pub fn ignores_owned_amount(&self, user: &T::CrossAccountId) -> bool {221 self.limits.owner_can_transfer() && self.is_owner_or_admin(user)222 }223 pub fn check_allowlist(&self, user: &T::CrossAccountId) -> DispatchResult {224 ensure!(225 <Allowlist<T>>::get((self.id, user)),226 <Error<T>>::AddressNotInAllowlist227 );228 Ok(())229 }230}231232#[frame_support::pallet]233pub mod pallet {234 use super::*;235 use pallet_evm::account;236 use dispatch::CollectionDispatch;237 use frame_support::{Blake2_128Concat, pallet_prelude::*, storage::Key, traits::StorageVersion};238 use frame_system::pallet_prelude::*;239 use frame_support::traits::Currency;240 use up_data_structs::{TokenId, mapping::TokenAddressMapping};241 use scale_info::TypeInfo;242 use weights::WeightInfo;243244 #[pallet::config]245 pub trait Config:246 frame_system::Config247 + pallet_evm_coder_substrate::Config248 + pallet_evm::Config249 + TypeInfo250 + account::Config251 {252 type WeightInfo: WeightInfo;253 type Event: IsType<<Self as frame_system::Config>::Event> + From<Event<Self>>;254255 type Currency: Currency<Self::AccountId>;256257 #[pallet::constant]258 type CollectionCreationPrice: Get<259 <<Self as Config>::Currency as Currency<Self::AccountId>>::Balance,260 >;261 type CollectionDispatch: CollectionDispatch<Self>;262263 type TreasuryAccountId: Get<Self::AccountId>;264 type ContractAddress: Get<H160>;265266 type EvmTokenAddressMapping: TokenAddressMapping<H160>;267 type CrossTokenAddressMapping: TokenAddressMapping<Self::CrossAccountId>;268 }269270 const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);271272 #[pallet::pallet]273 #[pallet::storage_version(STORAGE_VERSION)]274 #[pallet::generate_store(pub(super) trait Store)]275 pub struct Pallet<T>(_);276277 #[pallet::extra_constants]278 impl<T: Config> Pallet<T> {279 pub fn collection_admins_limit() -> u32 {280 COLLECTION_ADMINS_LIMIT281 }282 }283284 #[pallet::event]285 #[pallet::generate_deposit(pub fn deposit_event)]286 pub enum Event<T: Config> {287 /// New collection was created288 ///289 /// # Arguments290 ///291 /// * collection_id: Globally unique identifier of newly created collection.292 ///293 /// * mode: [CollectionMode] converted into u8.294 ///295 /// * account_id: Collection owner.296 CollectionCreated(CollectionId, u8, T::AccountId),297298 /// New collection was destroyed299 ///300 /// # Arguments301 ///302 /// * collection_id: Globally unique identifier of collection.303 CollectionDestroyed(CollectionId),304305 /// New item was created.306 ///307 /// # Arguments308 ///309 /// * collection_id: Id of the collection where item was created.310 ///311 /// * item_id: Id of an item. Unique within the collection.312 ///313 /// * recipient: Owner of newly created item314 ///315 /// * amount: Always 1 for NFT316 ItemCreated(CollectionId, TokenId, T::CrossAccountId, u128),317318 /// Collection item was burned.319 ///320 /// # Arguments321 ///322 /// * collection_id.323 ///324 /// * item_id: Identifier of burned NFT.325 ///326 /// * owner: which user has destroyed its tokens327 ///328 /// * amount: Always 1 for NFT329 ItemDestroyed(CollectionId, TokenId, T::CrossAccountId, u128),330331 /// Item was transferred332 ///333 /// * collection_id: Id of collection to which item is belong334 ///335 /// * item_id: Id of an item336 ///337 /// * sender: Original owner of item338 ///339 /// * recipient: New owner of item340 ///341 /// * amount: Always 1 for NFT342 Transfer(343 CollectionId,344 TokenId,345 T::CrossAccountId,346 T::CrossAccountId,347 u128,348 ),349350 /// * collection_id351 ///352 /// * item_id353 ///354 /// * sender355 ///356 /// * spender357 ///358 /// * amount359 Approved(360 CollectionId,361 TokenId,362 T::CrossAccountId,363 T::CrossAccountId,364 u128,365 ),366367 CollectionPropertySet(CollectionId, PropertyKey),368369 CollectionPropertyDeleted(CollectionId, PropertyKey),370371 TokenPropertySet(CollectionId, TokenId, PropertyKey),372373 TokenPropertyDeleted(CollectionId, TokenId, PropertyKey),374375 PropertyPermissionSet(CollectionId, PropertyKey),376 }377378 #[pallet::error]379 pub enum Error<T> {380 /// This collection does not exist.381 CollectionNotFound,382 /// Sender parameter and item owner must be equal.383 MustBeTokenOwner,384 /// No permission to perform action385 NoPermission,386 /// Destroying only empty collections is allowed387 CantDestroyNotEmptyCollection,388 /// Collection is not in mint mode.389 PublicMintingNotAllowed,390 /// Address is not in allow list.391 AddressNotInAllowlist,392393 /// Collection name can not be longer than 63 char.394 CollectionNameLimitExceeded,395 /// Collection description can not be longer than 255 char.396 CollectionDescriptionLimitExceeded,397 /// Token prefix can not be longer than 15 char.398 CollectionTokenPrefixLimitExceeded,399 /// Total collections bound exceeded.400 TotalCollectionsLimitExceeded,401 /// Exceeded max admin count402 CollectionAdminCountExceeded,403 /// Collection limit bounds per collection exceeded404 CollectionLimitBoundsExceeded,405 /// Tried to enable permissions which are only permitted to be disabled406 OwnerPermissionsCantBeReverted,407 /// Collection settings not allowing items transferring408 TransferNotAllowed,409 /// Account token limit exceeded per collection410 AccountTokenLimitExceeded,411 /// Collection token limit exceeded412 CollectionTokenLimitExceeded,413 /// Metadata flag frozen414 MetadataFlagFrozen,415416 /// Item not exists.417 TokenNotFound,418 /// Item balance not enough.419 TokenValueTooLow,420 /// Requested value more than approved.421 ApprovedValueTooLow,422 /// Tried to approve more than owned423 CantApproveMoreThanOwned,424425 /// Can't transfer tokens to ethereum zero address426 AddressIsZero,427 /// Target collection doesn't supports this operation428 UnsupportedOperation,429430 /// Not sufficient funds to perform action431 NotSufficientFounds,432433 /// User not passed nesting rule434 UserIsNotAllowedToNest,435 /// Only tokens from specific collections may nest tokens under this436 SourceCollectionIsNotAllowedToNest,437438 /// Tried to store more data than allowed in collection field439 CollectionFieldSizeExceeded,440441 /// Tried to store more property data than allowed442 NoSpaceForProperty,443444 /// Tried to store more property keys than allowed445 PropertyLimitReached,446447 /// Property key is too long448 PropertyKeyIsTooLong,449450 /// Only ASCII letters, digits, and '_', '-' are allowed451 InvalidCharacterInPropertyKey,452453 /// Empty property keys are forbidden454 EmptyPropertyKey,455456 /// Tried to access an external collection with an internal API457 CollectionIsExternal,458459 /// Tried to access an internal collection with an external API460 CollectionIsInternal,461 }462463 #[pallet::storage]464 pub type CreatedCollectionCount<T> = StorageValue<Value = CollectionId, QueryKind = ValueQuery>;465 #[pallet::storage]466 pub type DestroyedCollectionCount<T> =467 StorageValue<Value = CollectionId, QueryKind = ValueQuery>;468469 /// Collection info470 #[pallet::storage]471 pub type CollectionById<T> = StorageMap<472 Hasher = Blake2_128Concat,473 Key = CollectionId,474 Value = Collection<<T as frame_system::Config>::AccountId>,475 QueryKind = OptionQuery,476 >;477478 /// Collection properties479 #[pallet::storage]480 #[pallet::getter(fn collection_properties)]481 pub type CollectionProperties<T> = StorageMap<482 Hasher = Blake2_128Concat,483 Key = CollectionId,484 Value = Properties,485 QueryKind = ValueQuery,486 OnEmpty = up_data_structs::CollectionProperties,487 >;488489 #[pallet::storage]490 #[pallet::getter(fn property_permissions)]491 pub type CollectionPropertyPermissions<T> = StorageMap<492 Hasher = Blake2_128Concat,493 Key = CollectionId,494 Value = PropertiesPermissionMap,495 QueryKind = ValueQuery,496 >;497498 #[pallet::storage]499 pub type AdminAmount<T> = StorageMap<500 Hasher = Blake2_128Concat,501 Key = CollectionId,502 Value = u32,503 QueryKind = ValueQuery,504 >;505506 /// List of collection admins507 #[pallet::storage]508 pub type IsAdmin<T: Config> = StorageNMap<509 Key = (510 Key<Blake2_128Concat, CollectionId>,511 Key<Blake2_128Concat, T::CrossAccountId>,512 ),513 Value = bool,514 QueryKind = ValueQuery,515 >;516517 /// Allowlisted collection users518 #[pallet::storage]519 pub type Allowlist<T: Config> = StorageNMap<520 Key = (521 Key<Blake2_128Concat, CollectionId>,522 Key<Blake2_128Concat, T::CrossAccountId>,523 ),524 Value = bool,525 QueryKind = ValueQuery,526 >;527528 /// Not used by code, exists only to provide some types to metadata529 #[pallet::storage]530 pub type DummyStorageValue<T: Config> = StorageValue<531 Value = (532 CollectionStats,533 CollectionId,534 TokenId,535 TokenChild,536 PhantomType<(537 TokenData<T::CrossAccountId>,538 RpcCollection<T::AccountId>,539 // RMRK540 RmrkCollectionInfo<T::AccountId>,541 RmrkInstanceInfo<T::AccountId>,542 RmrkResourceInfo,543 RmrkPropertyInfo,544 RmrkBaseInfo<T::AccountId>,545 RmrkPartType,546 RmrkTheme,547 RmrkNftChild,548 )>,549 ),550 QueryKind = OptionQuery,551 >;552553 #[pallet::hooks]554 impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {555 fn on_runtime_upgrade() -> Weight {556 if StorageVersion::get::<Pallet<T>>() < StorageVersion::new(1) {557 use up_data_structs::{CollectionVersion1, CollectionVersion2};558 <CollectionById<T>>::translate::<CollectionVersion1<T::AccountId>, _>(|id, v| {559 let mut props = Vec::new();560 if !v.offchain_schema.is_empty() {561 props.push(Property {562 key: b"_old_offchainSchema".to_vec().try_into().unwrap(),563 value: v564 .offchain_schema565 .clone()566 .into_inner()567 .try_into()568 .expect("offchain schema too big"),569 });570 }571 if !v.variable_on_chain_schema.is_empty() {572 props.push(Property {573 key: b"_old_variableOnChainSchema".to_vec().try_into().unwrap(),574 value: v575 .variable_on_chain_schema576 .clone()577 .into_inner()578 .try_into()579 .expect("offchain schema too big"),580 });581 }582 if !v.const_on_chain_schema.is_empty() {583 props.push(Property {584 key: b"_old_constOnChainSchema".to_vec().try_into().unwrap(),585 value: v586 .const_on_chain_schema587 .clone()588 .into_inner()589 .try_into()590 .expect("offchain schema too big"),591 });592 }593 props.push(Property {594 key: b"_old_schemaVersion".to_vec().try_into().unwrap(),595 value: match v.schema_version {596 SchemaVersion::ImageURL => b"ImageUrl".as_slice(),597 SchemaVersion::Unique => b"Unique".as_slice(),598 }599 .to_vec()600 .try_into()601 .unwrap(),602 });603 Self::set_scoped_collection_properties(604 id,605 PropertyScope::None,606 props.into_iter(),607 )608 .expect("existing data larger than properties");609 let mut new = CollectionVersion2::from(v.clone());610 new.permissions.access = Some(v.access);611 new.permissions.mint_mode = Some(v.mint_mode);612 Some(new)613 });614 }615616 0617 }618 }619}620621impl<T: Config> Pallet<T> {622 /// Ethereum receiver 0x0000000000000000000000000000000000000000 is reserved, and shouldn't own tokens623 pub fn ensure_correct_receiver(receiver: &T::CrossAccountId) -> DispatchResult {624 ensure!(625 &T::CrossAccountId::from_eth(H160([0; 20])) != receiver,626 <Error<T>>::AddressIsZero627 );628 Ok(())629 }630 pub fn adminlist(collection: CollectionId) -> Vec<T::CrossAccountId> {631 <IsAdmin<T>>::iter_prefix((collection,))632 .map(|(a, _)| a)633 .collect()634 }635 pub fn allowlist(collection: CollectionId) -> Vec<T::CrossAccountId> {636 <Allowlist<T>>::iter_prefix((collection,))637 .map(|(a, _)| a)638 .collect()639 }640 pub fn allowed(collection: CollectionId, user: T::CrossAccountId) -> bool {641 <Allowlist<T>>::get((collection, user))642 }643 pub fn collection_stats() -> CollectionStats {644 let created = <CreatedCollectionCount<T>>::get();645 let destroyed = <DestroyedCollectionCount<T>>::get();646 CollectionStats {647 created: created.0,648 destroyed: destroyed.0,649 alive: created.0 - destroyed.0,650 }651 }652653 pub fn effective_collection_limits(collection: CollectionId) -> Option<CollectionLimits> {654 let collection = <CollectionById<T>>::get(collection);655 if collection.is_none() {656 return None;657 }658659 let collection = collection.unwrap();660 let limits = collection.limits;661 let effective_limits = CollectionLimits {662 account_token_ownership_limit: Some(limits.account_token_ownership_limit()),663 sponsored_data_size: Some(limits.sponsored_data_size()),664 sponsored_data_rate_limit: Some(665 limits666 .sponsored_data_rate_limit667 .unwrap_or(SponsoringRateLimit::SponsoringDisabled),668 ),669 token_limit: Some(limits.token_limit()),670 sponsor_transfer_timeout: Some(limits.sponsor_transfer_timeout(671 match collection.mode {672 CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,673 CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,674 CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,675 },676 )),677 sponsor_approve_timeout: Some(limits.sponsor_approve_timeout()),678 owner_can_transfer: Some(limits.owner_can_transfer()),679 owner_can_destroy: Some(limits.owner_can_destroy()),680 transfers_enabled: Some(limits.transfers_enabled()),681 };682683 Some(effective_limits)684 }685686 pub fn rpc_collection(collection: CollectionId) -> Option<RpcCollection<T::AccountId>> {687 let Collection {688 name,689 description,690 owner,691 mode,692 token_prefix,693 sponsorship,694 limits,695 permissions,696 external_collection,697 } = <CollectionById<T>>::get(collection)?;698699 let token_property_permissions = <CollectionPropertyPermissions<T>>::get(collection)700 .into_iter()701 .map(|(key, permission)| PropertyKeyPermission { key, permission })702 .collect();703704 let properties = <CollectionProperties<T>>::get(collection)705 .into_iter()706 .map(|(key, value)| Property { key, value })707 .collect();708709 let permissions = CollectionPermissions {710 access: Some(permissions.access()),711 mint_mode: Some(permissions.mint_mode()),712 nesting: Some(permissions.nesting().clone()),713 };714715 Some(RpcCollection {716 name: name.into_inner(),717 description: description.into_inner(),718 owner,719 mode,720 token_prefix: token_prefix.into_inner(),721 sponsorship,722 limits,723 permissions,724 token_property_permissions,725 properties,726 read_only: external_collection,727 })728 }729}730731macro_rules! limit_default {732 ($old:ident, $new:ident, $($field:ident $(($arg:expr))? => $check:expr),* $(,)?) => {{733 $(734 if let Some($new) = $new.$field {735 let $old = $old.$field($($arg)?);736 let _ = $new;737 let _ = $old;738 $check739 } else {740 $new.$field = $old.$field741 }742 )*743 }};744}745macro_rules! limit_default_clone {746 ($old:ident, $new:ident, $($field:ident $(($arg:expr))? => $check:expr),* $(,)?) => {{747 $(748 if let Some($new) = $new.$field.clone() {749 let $old = $old.$field($($arg)?);750 let _ = $new;751 let _ = $old;752 $check753 } else {754 $new.$field = $old.$field.clone()755 }756 )*757 }};758}759760impl<T: Config> Pallet<T> {761 pub fn init_collection(762 owner: T::CrossAccountId,763 data: CreateCollectionData<T::AccountId>,764 is_external: bool,765 ) -> Result<CollectionId, DispatchError> {766 {767 ensure!(768 data.token_prefix.len() <= MAX_TOKEN_PREFIX_LENGTH as usize,769 Error::<T>::CollectionTokenPrefixLimitExceeded770 );771 }772773 let created_count = <CreatedCollectionCount<T>>::get()774 .0775 .checked_add(1)776 .ok_or(ArithmeticError::Overflow)?;777 let destroyed_count = <DestroyedCollectionCount<T>>::get().0;778 let id = CollectionId(created_count);779780 // bound Total number of collections781 ensure!(782 created_count - destroyed_count <= COLLECTION_NUMBER_LIMIT,783 <Error<T>>::TotalCollectionsLimitExceeded784 );785786 // =========787788 let collection = Collection {789 owner: owner.as_sub().clone(),790 name: data.name,791 mode: data.mode.clone(),792 description: data.description,793 token_prefix: data.token_prefix,794 sponsorship: data795 .pending_sponsor796 .map(SponsorshipState::Unconfirmed)797 .unwrap_or_default(),798 limits: data799 .limits800 .map(|limits| Self::clamp_limits(data.mode.clone(), &Default::default(), limits))801 .unwrap_or_else(|| Ok(CollectionLimits::default()))?,802 permissions: data803 .permissions804 .map(|permissions| {805 Self::clamp_permissions(data.mode.clone(), &Default::default(), permissions)806 })807 .unwrap_or_else(|| Ok(CollectionPermissions::default()))?,808 external_collection: is_external,809 };810811 let mut collection_properties = up_data_structs::CollectionProperties::get();812 collection_properties813 .try_set_from_iter(data.properties.into_iter())814 .map_err(<Error<T>>::from)?;815816 CollectionProperties::<T>::insert(id, collection_properties);817818 let mut token_props_permissions = PropertiesPermissionMap::new();819 token_props_permissions820 .try_set_from_iter(data.token_property_permissions.into_iter())821 .map_err(<Error<T>>::from)?;822823 CollectionPropertyPermissions::<T>::insert(id, token_props_permissions);824825 // Take a (non-refundable) deposit of collection creation826 {827 let mut imbalance =828 <<<T as Config>::Currency as Currency<T::AccountId>>::PositiveImbalance>::zero();829 imbalance.subsume(830 <<T as Config>::Currency as Currency<T::AccountId>>::deposit_creating(831 &T::TreasuryAccountId::get(),832 T::CollectionCreationPrice::get(),833 ),834 );835 <T as Config>::Currency::settle(836 &owner.as_sub(),837 imbalance,838 WithdrawReasons::TRANSFER,839 ExistenceRequirement::KeepAlive,840 )841 .map_err(|_| Error::<T>::NotSufficientFounds)?;842 }843844 <CreatedCollectionCount<T>>::put(created_count);845 <Pallet<T>>::deposit_event(Event::CollectionCreated(846 id,847 data.mode.id(),848 owner.as_sub().clone(),849 ));850 <PalletEvm<T>>::deposit_log(851 erc::CollectionHelpersEvents::CollectionCreated {852 owner: *owner.as_eth(),853 collection_id: eth::collection_id_to_address(id),854 }855 .to_log(T::ContractAddress::get()),856 );857 <CollectionById<T>>::insert(id, collection);858 Ok(id)859 }860861 pub fn destroy_collection(862 collection: CollectionHandle<T>,863 sender: &T::CrossAccountId,864 ) -> DispatchResult {865 ensure!(866 collection.limits.owner_can_destroy(),867 <Error<T>>::NoPermission,868 );869 collection.check_is_owner(sender)?;870871 let destroyed_collections = <DestroyedCollectionCount<T>>::get()872 .0873 .checked_add(1)874 .ok_or(ArithmeticError::Overflow)?;875876 // =========877878 <DestroyedCollectionCount<T>>::put(destroyed_collections);879 <CollectionById<T>>::remove(collection.id);880 <AdminAmount<T>>::remove(collection.id);881 <IsAdmin<T>>::remove_prefix((collection.id,), None);882 <Allowlist<T>>::remove_prefix((collection.id,), None);883 <CollectionProperties<T>>::remove(collection.id);884885 <Pallet<T>>::deposit_event(Event::CollectionDestroyed(collection.id));886 Ok(())887 }888889 pub fn set_collection_property(890 collection: &CollectionHandle<T>,891 sender: &T::CrossAccountId,892 property: Property,893 ) -> DispatchResult {894 collection.check_is_owner_or_admin(sender)?;895896 CollectionProperties::<T>::try_mutate(collection.id, |properties| {897 let property = property.clone();898 properties.try_set(property.key, property.value)899 })900 .map_err(<Error<T>>::from)?;901902 Self::deposit_event(Event::CollectionPropertySet(collection.id, property.key));903904 Ok(())905 }906907 pub fn set_scoped_collection_property(908 collection_id: CollectionId,909 scope: PropertyScope,910 property: Property,911 ) -> DispatchResult {912 CollectionProperties::<T>::try_mutate(collection_id, |properties| {913 properties.try_scoped_set(scope, property.key, property.value)914 })915 .map_err(<Error<T>>::from)?;916917 Ok(())918 }919920 pub fn set_scoped_collection_properties(921 collection_id: CollectionId,922 scope: PropertyScope,923 properties: impl Iterator<Item = Property>,924 ) -> DispatchResult {925 CollectionProperties::<T>::try_mutate(collection_id, |stored_properties| {926 stored_properties.try_scoped_set_from_iter(scope, properties)927 })928 .map_err(<Error<T>>::from)?;929930 Ok(())931 }932933 #[transactional]934 pub fn set_collection_properties(935 collection: &CollectionHandle<T>,936 sender: &T::CrossAccountId,937 properties: Vec<Property>,938 ) -> DispatchResult {939 for property in properties {940 Self::set_collection_property(collection, sender, property)?;941 }942943 Ok(())944 }945946 pub fn delete_collection_property(947 collection: &CollectionHandle<T>,948 sender: &T::CrossAccountId,949 property_key: PropertyKey,950 ) -> DispatchResult {951 collection.check_is_owner_or_admin(sender)?;952953 CollectionProperties::<T>::try_mutate(collection.id, |properties| {954 properties.remove(&property_key)955 })956 .map_err(<Error<T>>::from)?;957958 Self::deposit_event(Event::CollectionPropertyDeleted(959 collection.id,960 property_key,961 ));962963 Ok(())964 }965966 #[transactional]967 pub fn delete_collection_properties(968 collection: &CollectionHandle<T>,969 sender: &T::CrossAccountId,970 property_keys: Vec<PropertyKey>,971 ) -> DispatchResult {972 for key in property_keys {973 Self::delete_collection_property(collection, sender, key)?;974 }975976 Ok(())977 }978979 // For migrations980 pub fn set_property_permission_unchecked(981 collection: CollectionId,982 property_permission: PropertyKeyPermission,983 ) -> DispatchResult {984 <CollectionPropertyPermissions<T>>::try_mutate(collection, |permissions| {985 permissions.try_set(property_permission.key, property_permission.permission)986 })987 .map_err(<Error<T>>::from)?;988 Ok(())989 }990991 pub fn set_property_permission(992 collection: &CollectionHandle<T>,993 sender: &T::CrossAccountId,994 property_permission: PropertyKeyPermission,995 ) -> DispatchResult {996 collection.check_is_owner_or_admin(sender)?;997998 let all_permissions = CollectionPropertyPermissions::<T>::get(collection.id);999 let current_permission = all_permissions.get(&property_permission.key);1000 if matches![1001 current_permission,1002 Some(PropertyPermission { mutable: false, .. })1003 ] {1004 return Err(<Error<T>>::NoPermission.into());1005 }10061007 CollectionPropertyPermissions::<T>::try_mutate(collection.id, |permissions| {1008 let property_permission = property_permission.clone();1009 permissions.try_set(property_permission.key, property_permission.permission)1010 })1011 .map_err(<Error<T>>::from)?;10121013 Self::deposit_event(Event::PropertyPermissionSet(1014 collection.id,1015 property_permission.key,1016 ));10171018 Ok(())1019 }10201021 #[transactional]1022 pub fn set_token_property_permissions(1023 collection: &CollectionHandle<T>,1024 sender: &T::CrossAccountId,1025 property_permissions: Vec<PropertyKeyPermission>,1026 ) -> DispatchResult {1027 for prop_pemission in property_permissions {1028 Self::set_property_permission(collection, sender, prop_pemission)?;1029 }10301031 Ok(())1032 }10331034 pub fn get_collection_property(1035 collection_id: CollectionId,1036 key: &PropertyKey,1037 ) -> Option<PropertyValue> {1038 Self::collection_properties(collection_id).get(key).cloned()1039 }10401041 pub fn bytes_keys_to_property_keys(1042 keys: Vec<Vec<u8>>,1043 ) -> Result<Vec<PropertyKey>, DispatchError> {1044 keys.into_iter()1045 .map(|key| -> Result<PropertyKey, DispatchError> {1046 key.try_into()1047 .map_err(|_| <Error<T>>::PropertyKeyIsTooLong.into())1048 })1049 .collect::<Result<Vec<PropertyKey>, DispatchError>>()1050 }10511052 pub fn filter_collection_properties(1053 collection_id: CollectionId,1054 keys: Option<Vec<PropertyKey>>,1055 ) -> Result<Vec<Property>, DispatchError> {1056 let properties = Self::collection_properties(collection_id);10571058 let properties = keys1059 .map(|keys| {1060 keys.into_iter()1061 .filter_map(|key| {1062 properties.get(&key).map(|value| Property {1063 key,1064 value: value.clone(),1065 })1066 })1067 .collect()1068 })1069 .unwrap_or_else(|| {1070 properties1071 .into_iter()1072 .map(|(key, value)| Property { key, value })1073 .collect()1074 });10751076 Ok(properties)1077 }10781079 pub fn filter_property_permissions(1080 collection_id: CollectionId,1081 keys: Option<Vec<PropertyKey>>,1082 ) -> Result<Vec<PropertyKeyPermission>, DispatchError> {1083 let permissions = Self::property_permissions(collection_id);10841085 let key_permissions = keys1086 .map(|keys| {1087 keys.into_iter()1088 .filter_map(|key| {1089 permissions1090 .get(&key)1091 .map(|permission| PropertyKeyPermission {1092 key,1093 permission: permission.clone(),1094 })1095 })1096 .collect()1097 })1098 .unwrap_or_else(|| {1099 permissions1100 .into_iter()1101 .map(|(key, permission)| PropertyKeyPermission { key, permission })1102 .collect()1103 });11041105 Ok(key_permissions)1106 }11071108 pub fn toggle_allowlist(1109 collection: &CollectionHandle<T>,1110 sender: &T::CrossAccountId,1111 user: &T::CrossAccountId,1112 allowed: bool,1113 ) -> DispatchResult {1114 collection.check_is_owner_or_admin(sender)?;11151116 // =========11171118 if allowed {1119 <Allowlist<T>>::insert((collection.id, user), true);1120 } else {1121 <Allowlist<T>>::remove((collection.id, user));1122 }11231124 Ok(())1125 }11261127 pub fn toggle_admin(1128 collection: &CollectionHandle<T>,1129 sender: &T::CrossAccountId,1130 user: &T::CrossAccountId,1131 admin: bool,1132 ) -> DispatchResult {1133 collection.check_is_owner(sender)?;11341135 let was_admin = <IsAdmin<T>>::get((collection.id, user));1136 if was_admin == admin {1137 return Ok(());1138 }1139 let amount = <AdminAmount<T>>::get(collection.id);11401141 if admin {1142 let amount = amount1143 .checked_add(1)1144 .ok_or(<Error<T>>::CollectionAdminCountExceeded)?;1145 ensure!(1146 amount <= Self::collection_admins_limit(),1147 <Error<T>>::CollectionAdminCountExceeded,1148 );11491150 // =========11511152 <AdminAmount<T>>::insert(collection.id, amount);1153 <IsAdmin<T>>::insert((collection.id, user), true);1154 } else {1155 <AdminAmount<T>>::insert(collection.id, amount.saturating_sub(1));1156 <IsAdmin<T>>::remove((collection.id, user));1157 }11581159 Ok(())1160 }11611162 pub fn clamp_limits(1163 mode: CollectionMode,1164 old_limit: &CollectionLimits,1165 mut new_limit: CollectionLimits,1166 ) -> Result<CollectionLimits, DispatchError> {1167 let limits = old_limit;1168 limit_default!(old_limit, new_limit,1169 account_token_ownership_limit => ensure!(1170 new_limit <= MAX_TOKEN_OWNERSHIP,1171 <Error<T>>::CollectionLimitBoundsExceeded,1172 ),1173 sponsored_data_size => ensure!(1174 new_limit <= CUSTOM_DATA_LIMIT,1175 <Error<T>>::CollectionLimitBoundsExceeded,1176 ),11771178 sponsored_data_rate_limit => {},1179 token_limit => ensure!(1180 old_limit >= new_limit && new_limit > 0,1181 <Error<T>>::CollectionTokenLimitExceeded1182 ),11831184 sponsor_transfer_timeout(match mode {1185 CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,1186 CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,1187 CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,1188 }) => ensure!(1189 new_limit <= MAX_SPONSOR_TIMEOUT,1190 <Error<T>>::CollectionLimitBoundsExceeded,1191 ),1192 sponsor_approve_timeout => {},1193 owner_can_transfer => ensure!(1194 !limits.owner_can_transfer_instaled() ||1195 old_limit || !new_limit,1196 <Error<T>>::OwnerPermissionsCantBeReverted,1197 ),1198 owner_can_destroy => ensure!(1199 old_limit || !new_limit,1200 <Error<T>>::OwnerPermissionsCantBeReverted,1201 ),1202 transfers_enabled => {},1203 );1204 Ok(new_limit)1205 }12061207 pub fn clamp_permissions(1208 _mode: CollectionMode,1209 old_limit: &CollectionPermissions,1210 mut new_limit: CollectionPermissions,1211 ) -> Result<CollectionPermissions, DispatchError> {1212 limit_default_clone!(old_limit, new_limit,1213 access => {},1214 mint_mode => {},1215 nesting => {1216 #[cfg(not(feature = "runtime-benchmarks"))]1217 ensure!(1218 // Permissive is only allowed for tests and internal usage of chain for now1219 old_limit.permissive || !new_limit.permissive,1220 <Error<T>>::NoPermission,1221 )1222 },1223 );1224 Ok(new_limit)1225 }1226}12271228#[macro_export]1229macro_rules! unsupported {1230 () => {1231 Err(<Error<T>>::UnsupportedOperation.into())1232 };1233}12341235/// Worst cases1236pub trait CommonWeightInfo<CrossAccountId> {1237 fn create_item() -> Weight;1238 fn create_multiple_items(amount: &[CreateItemData]) -> Weight;1239 fn create_multiple_items_ex(cost: &CreateItemExData<CrossAccountId>) -> Weight;1240 fn burn_item() -> Weight;1241 fn set_collection_properties(amount: u32) -> Weight;1242 fn delete_collection_properties(amount: u32) -> Weight;1243 fn set_token_properties(amount: u32) -> Weight;1244 fn delete_token_properties(amount: u32) -> Weight;1245 fn set_token_property_permissions(amount: u32) -> Weight;1246 fn transfer() -> Weight;1247 fn approve() -> Weight;1248 fn transfer_from() -> Weight;1249 fn burn_from() -> Weight;12501251 /// Differs from burn_item in case of Fungible and Refungible, as it should burn1252 /// whole users's balance1253 ///1254 /// This method shouldn't be used directly, as it doesn't count breadth price, use `burn_recursively` instead1255 fn burn_recursively_self_raw() -> Weight;1256 /// Cost of iterating over `amount` children while burning, without counting child burning itself1257 ///1258 /// This method shouldn't be used directly, as it doesn't count depth price, use `burn_recursively` instead1259 fn burn_recursively_breadth_raw(amount: u32) -> Weight;12601261 fn burn_recursively(max_selfs: u32, max_breadth: u32) -> Weight {1262 Self::burn_recursively_self_raw()1263 .saturating_mul(max_selfs.max(1) as u64)1264 .saturating_add(Self::burn_recursively_breadth_raw(max_breadth))1265 }1266}12671268pub trait CommonCollectionOperations<T: Config> {1269 fn create_item(1270 &self,1271 sender: T::CrossAccountId,1272 to: T::CrossAccountId,1273 data: CreateItemData,1274 nesting_budget: &dyn Budget,1275 ) -> DispatchResultWithPostInfo;1276 fn create_multiple_items(1277 &self,1278 sender: T::CrossAccountId,1279 to: T::CrossAccountId,1280 data: Vec<CreateItemData>,1281 nesting_budget: &dyn Budget,1282 ) -> DispatchResultWithPostInfo;1283 fn create_multiple_items_ex(1284 &self,1285 sender: T::CrossAccountId,1286 data: CreateItemExData<T::CrossAccountId>,1287 nesting_budget: &dyn Budget,1288 ) -> DispatchResultWithPostInfo;1289 fn burn_item(1290 &self,1291 sender: T::CrossAccountId,1292 token: TokenId,1293 amount: u128,1294 ) -> DispatchResultWithPostInfo;1295 fn burn_item_recursively(1296 &self,1297 sender: T::CrossAccountId,1298 token: TokenId,1299 self_budget: &dyn Budget,1300 breadth_budget: &dyn Budget,1301 ) -> DispatchResultWithPostInfo;1302 fn set_collection_properties(1303 &self,1304 sender: T::CrossAccountId,1305 properties: Vec<Property>,1306 ) -> DispatchResultWithPostInfo;1307 fn delete_collection_properties(1308 &self,1309 sender: &T::CrossAccountId,1310 property_keys: Vec<PropertyKey>,1311 ) -> DispatchResultWithPostInfo;1312 fn set_token_properties(1313 &self,1314 sender: T::CrossAccountId,1315 token_id: TokenId,1316 property: Vec<Property>,1317 ) -> DispatchResultWithPostInfo;1318 fn delete_token_properties(1319 &self,1320 sender: T::CrossAccountId,1321 token_id: TokenId,1322 property_keys: Vec<PropertyKey>,1323 ) -> DispatchResultWithPostInfo;1324 fn set_token_property_permissions(1325 &self,1326 sender: &T::CrossAccountId,1327 property_permissions: Vec<PropertyKeyPermission>,1328 ) -> DispatchResultWithPostInfo;1329 fn transfer(1330 &self,1331 sender: T::CrossAccountId,1332 to: T::CrossAccountId,1333 token: TokenId,1334 amount: u128,1335 nesting_budget: &dyn Budget,1336 ) -> DispatchResultWithPostInfo;1337 fn approve(1338 &self,1339 sender: T::CrossAccountId,1340 spender: T::CrossAccountId,1341 token: TokenId,1342 amount: u128,1343 ) -> DispatchResultWithPostInfo;1344 fn transfer_from(1345 &self,1346 sender: T::CrossAccountId,1347 from: T::CrossAccountId,1348 to: T::CrossAccountId,1349 token: TokenId,1350 amount: u128,1351 nesting_budget: &dyn Budget,1352 ) -> DispatchResultWithPostInfo;1353 fn burn_from(1354 &self,1355 sender: T::CrossAccountId,1356 from: T::CrossAccountId,1357 token: TokenId,1358 amount: u128,1359 nesting_budget: &dyn Budget,1360 ) -> DispatchResultWithPostInfo;13611362 fn check_nesting(1363 &self,1364 sender: T::CrossAccountId,1365 from: (CollectionId, TokenId),1366 under: TokenId,1367 budget: &dyn Budget,1368 ) -> DispatchResult;13691370 fn nest(&self, under: TokenId, to_nest: (CollectionId, TokenId));13711372 fn unnest(&self, under: TokenId, to_nest: (CollectionId, TokenId));13731374 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId>;1375 fn collection_tokens(&self) -> Vec<TokenId>;1376 fn token_exists(&self, token: TokenId) -> bool;1377 fn last_token_id(&self) -> TokenId;13781379 fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId>;1380 fn token_property(&self, token_id: TokenId, key: &PropertyKey) -> Option<PropertyValue>;1381 fn token_properties(&self, token_id: TokenId, keys: Option<Vec<PropertyKey>>) -> Vec<Property>;1382 /// Amount of unique collection tokens1383 fn total_supply(&self) -> u32;1384 /// Amount of different tokens account has (Applicable to nonfungible/refungible)1385 fn account_balance(&self, account: T::CrossAccountId) -> u32;1386 /// Amount of specific token account have (Applicable to fungible/refungible)1387 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128;1388 fn allowance(1389 &self,1390 sender: T::CrossAccountId,1391 spender: T::CrossAccountId,1392 token: TokenId,1393 ) -> u128;1394}13951396// Flexible enough for implementing CommonCollectionOperations1397pub fn with_weight(res: DispatchResult, weight: Weight) -> DispatchResultWithPostInfo {1398 let post_info = PostDispatchInfo {1399 actual_weight: Some(weight),1400 pays_fee: Pays::Yes,1401 };1402 match res {1403 Ok(()) => Ok(post_info),1404 Err(error) => Err(DispatchErrorWithPostInfo { post_info, error }),1405 }1406}14071408impl<T: Config> From<PropertiesError> for Error<T> {1409 fn from(error: PropertiesError) -> Self {1410 match error {1411 PropertiesError::NoSpaceForProperty => Self::NoSpaceForProperty,1412 PropertiesError::PropertyLimitReached => Self::PropertyLimitReached,1413 PropertiesError::InvalidCharacterInPropertyKey => Self::InvalidCharacterInPropertyKey,1414 PropertiesError::PropertyKeyIsTooLong => Self::PropertyKeyIsTooLong,1415 PropertiesError::EmptyPropertyKey => Self::EmptyPropertyKey,1416 }1417 }1418}pallets/evm-migration/src/weights.rsdiffbeforeafterboth--- a/pallets/evm-migration/src/weights.rs
+++ b/pallets/evm-migration/src/weights.rs
@@ -3,12 +3,13 @@
//! Autogenerated weights for pallet_evm_migration
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-03-01, STEPS: `50`, REPEAT: 200, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-06-15, STEPS: `50`, REPEAT: 200, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
// target/release/unique-collator
// benchmark
+// pallet
// --pallet
// pallet-evm-migration
// --wasm-execution
@@ -44,23 +45,23 @@
// Storage: System Account (r:1 w:0)
// Storage: EVM AccountCodes (r:1 w:0)
fn begin() -> Weight {
- (6_441_000 as Weight)
+ (6_914_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: EvmMigration MigrationPending (r:1 w:0)
// Storage: EVM AccountStorages (r:0 w:1)
fn set_data(b: u32, ) -> Weight {
- (3_424_000 as Weight)
+ (2_875_000 as Weight)
// Standard Error: 0
- .saturating_add((973_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add((794_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))
}
// Storage: EvmMigration MigrationPending (r:1 w:1)
// Storage: EVM AccountCodes (r:0 w:1)
fn finish(b: u32, ) -> Weight {
- (4_702_000 as Weight)
+ (6_320_000 as Weight)
// Standard Error: 0
.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
@@ -74,23 +75,23 @@
// Storage: System Account (r:1 w:0)
// Storage: EVM AccountCodes (r:1 w:0)
fn begin() -> Weight {
- (6_441_000 as Weight)
+ (6_914_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: EvmMigration MigrationPending (r:1 w:0)
// Storage: EVM AccountStorages (r:0 w:1)
fn set_data(b: u32, ) -> Weight {
- (3_424_000 as Weight)
+ (2_875_000 as Weight)
// Standard Error: 0
- .saturating_add((973_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add((794_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))
}
// Storage: EvmMigration MigrationPending (r:1 w:1)
// Storage: EVM AccountCodes (r:0 w:1)
fn finish(b: u32, ) -> Weight {
- (4_702_000 as Weight)
+ (6_320_000 as Weight)
// Standard Error: 0
.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
pallets/fungible/src/weights.rsdiffbeforeafterboth--- a/pallets/fungible/src/weights.rs
+++ b/pallets/fungible/src/weights.rs
@@ -3,12 +3,13 @@
//! Autogenerated weights for pallet_fungible
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-03-01, STEPS: `50`, REPEAT: 200, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-06-15, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
// target/release/unique-collator
// benchmark
+// pallet
// --pallet
// pallet-fungible
// --wasm-execution
@@ -18,7 +19,7 @@
// --template
// .maintain/frame-weight-template.hbs
// --steps=50
-// --repeat=200
+// --repeat=80
// --heap-pages=4096
// --output=./pallets/fungible/src/weights.rs
@@ -47,16 +48,16 @@
// Storage: Fungible TotalSupply (r:1 w:1)
// Storage: Fungible Balance (r:1 w:1)
fn create_item() -> Weight {
- (14_407_000 as Weight)
+ (17_828_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
// Storage: Fungible TotalSupply (r:1 w:1)
// Storage: Fungible Balance (r:4 w:4)
fn create_multiple_items_ex(b: u32, ) -> Weight {
- (13_030_000 as Weight)
- // Standard Error: 1_000
- .saturating_add((3_779_000 as Weight).saturating_mul(b as Weight))
+ (17_574_000 as Weight)
+ // Standard Error: 3_000
+ .saturating_add((4_288_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -65,28 +66,27 @@
// Storage: Fungible TotalSupply (r:1 w:1)
// Storage: Fungible Balance (r:1 w:1)
fn burn_item() -> Weight {
- (15_565_000 as Weight)
+ (18_417_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
-
// Storage: Fungible Balance (r:2 w:2)
fn transfer() -> Weight {
- (17_713_000 as Weight)
+ (20_090_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
// Storage: Fungible Balance (r:1 w:0)
// Storage: Fungible Allowance (r:0 w:1)
fn approve() -> Weight {
- (14_834_000 as Weight)
+ (17_532_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Fungible Allowance (r:1 w:1)
// Storage: Fungible Balance (r:2 w:2)
fn transfer_from() -> Weight {
- (25_189_000 as Weight)
+ (29_869_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
@@ -94,7 +94,7 @@
// Storage: Fungible TotalSupply (r:1 w:1)
// Storage: Fungible Balance (r:1 w:1)
fn burn_from() -> Weight {
- (24_065_000 as Weight)
+ (27_835_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
@@ -105,16 +105,16 @@
// Storage: Fungible TotalSupply (r:1 w:1)
// Storage: Fungible Balance (r:1 w:1)
fn create_item() -> Weight {
- (14_407_000 as Weight)
+ (17_828_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
// Storage: Fungible TotalSupply (r:1 w:1)
// Storage: Fungible Balance (r:4 w:4)
fn create_multiple_items_ex(b: u32, ) -> Weight {
- (13_030_000 as Weight)
- // Standard Error: 1_000
- .saturating_add((3_779_000 as Weight).saturating_mul(b as Weight))
+ (17_574_000 as Weight)
+ // Standard Error: 3_000
+ .saturating_add((4_288_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -123,28 +123,27 @@
// Storage: Fungible TotalSupply (r:1 w:1)
// Storage: Fungible Balance (r:1 w:1)
fn burn_item() -> Weight {
- (15_565_000 as Weight)
+ (18_417_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
-
// Storage: Fungible Balance (r:2 w:2)
fn transfer() -> Weight {
- (17_713_000 as Weight)
+ (20_090_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
// Storage: Fungible Balance (r:1 w:0)
// Storage: Fungible Allowance (r:0 w:1)
fn approve() -> Weight {
- (14_834_000 as Weight)
+ (17_532_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Fungible Allowance (r:1 w:1)
// Storage: Fungible Balance (r:2 w:2)
fn transfer_from() -> Weight {
- (25_189_000 as Weight)
+ (29_869_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(3 as Weight))
}
@@ -152,7 +151,7 @@
// Storage: Fungible TotalSupply (r:1 w:1)
// Storage: Fungible Balance (r:1 w:1)
fn burn_from() -> Weight {
- (24_065_000 as Weight)
+ (27_835_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(3 as Weight))
}
pallets/nonfungible/src/weights.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/weights.rs
+++ b/pallets/nonfungible/src/weights.rs
@@ -3,12 +3,13 @@
//! Autogenerated weights for pallet_nonfungible
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-03-01, STEPS: `50`, REPEAT: 200, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-06-15, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
// target/release/unique-collator
// benchmark
+// pallet
// --pallet
// pallet-nonfungible
// --wasm-execution
@@ -18,7 +19,7 @@
// --template
// .maintain/frame-weight-template.hbs
// --steps=50
-// --repeat=200
+// --repeat=80
// --heap-pages=4096
// --output=./pallets/nonfungible/src/weights.rs
@@ -42,9 +43,9 @@
fn approve() -> Weight;
fn transfer_from() -> Weight;
fn burn_from() -> Weight;
- fn set_token_property_permissions(b: u32) -> Weight;
- fn set_token_properties(b: u32) -> Weight;
- fn delete_token_properties(b: u32) -> Weight;
+ fn set_token_property_permissions(b: u32, ) -> Weight;
+ fn set_token_properties(b: u32, ) -> Weight;
+ fn delete_token_properties(b: u32, ) -> Weight;
}
/// Weights for pallet_nonfungible using the Substrate node and recommended hardware.
@@ -55,7 +56,7 @@
// Storage: Nonfungible TokenData (r:0 w:1)
// Storage: Nonfungible Owned (r:0 w:1)
fn create_item() -> Weight {
- (18_450_000 as Weight)
+ (24_135_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
}
@@ -64,9 +65,9 @@
// Storage: Nonfungible TokenData (r:0 w:4)
// Storage: Nonfungible Owned (r:0 w:4)
fn create_multiple_items(b: u32, ) -> Weight {
- (10_228_000 as Weight)
- // Standard Error: 1_000
- .saturating_add((4_392_000 as Weight).saturating_mul(b as Weight))
+ (21_952_000 as Weight)
+ // Standard Error: 5_000
+ .saturating_add((4_727_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
.saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(b as Weight)))
@@ -76,23 +77,25 @@
// Storage: Nonfungible TokenData (r:0 w:4)
// Storage: Nonfungible Owned (r:0 w:4)
fn create_multiple_items_ex(b: u32, ) -> Weight {
- (6_543_000 as Weight)
- // Standard Error: 2_000
- .saturating_add((7_175_000 as Weight).saturating_mul(b as Weight))
+ (10_432_000 as Weight)
+ // Standard Error: 6_000
+ .saturating_add((7_383_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))
}
// Storage: Nonfungible TokenData (r:1 w:1)
+ // Storage: Nonfungible TokenChildren (r:1 w:0)
// Storage: Nonfungible TokensBurnt (r:1 w:1)
// Storage: Nonfungible AccountBalance (r:1 w:1)
// Storage: Nonfungible Allowance (r:1 w:0)
// Storage: Nonfungible Owned (r:0 w:1)
+ // Storage: Nonfungible TokenProperties (r:0 w:1)
fn burn_item() -> Weight {
- (24_554_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(4 as Weight))
- .saturating_add(T::DbWeight::get().writes(4 as Weight))
+ (29_798_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(5 as Weight))
+ .saturating_add(T::DbWeight::get().writes(5 as Weight))
}
// Storage: Nonfungible TokenChildren (r:1 w:0)
// Storage: Nonfungible TokenData (r:1 w:1)
@@ -102,7 +105,7 @@
// Storage: Nonfungible Owned (r:0 w:1)
// Storage: Nonfungible TokenProperties (r:0 w:1)
fn burn_recursively_self_raw() -> Weight {
- (86_136_000 as Weight)
+ (37_955_000 as Weight)
.saturating_add(T::DbWeight::get().reads(5 as Weight))
.saturating_add(T::DbWeight::get().writes(5 as Weight))
}
@@ -116,11 +119,11 @@
// Storage: Common CollectionById (r:1 w:0)
fn burn_recursively_breadth_plus_self_plus_self_per_each_raw(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 42_828_000
- .saturating_add((381_478_000 as Weight).saturating_mul(b as Weight))
- .saturating_add(T::DbWeight::get().reads(6 as Weight))
+ // Standard Error: 1_349_000
+ .saturating_add((275_145_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add(T::DbWeight::get().reads(7 as Weight))
.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(b as Weight)))
- .saturating_add(T::DbWeight::get().writes(5 as Weight))
+ .saturating_add(T::DbWeight::get().writes(6 as Weight))
.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(b as Weight)))
}
// Storage: Nonfungible TokenData (r:1 w:1)
@@ -128,14 +131,14 @@
// Storage: Nonfungible Allowance (r:1 w:0)
// Storage: Nonfungible Owned (r:0 w:2)
fn transfer() -> Weight {
- (28_339_000 as Weight)
+ (27_867_000 as Weight)
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(5 as Weight))
}
// Storage: Nonfungible TokenData (r:1 w:0)
// Storage: Nonfungible Allowance (r:1 w:1)
fn approve() -> Weight {
- (17_616_000 as Weight)
+ (18_824_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -144,25 +147,27 @@
// Storage: Nonfungible AccountBalance (r:2 w:2)
// Storage: Nonfungible Owned (r:0 w:2)
fn transfer_from() -> Weight {
- (32_196_000 as Weight)
+ (32_879_000 as Weight)
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
}
// Storage: Nonfungible Allowance (r:1 w:1)
// Storage: Nonfungible TokenData (r:1 w:1)
+ // Storage: Nonfungible TokenChildren (r:1 w:0)
// Storage: Nonfungible TokensBurnt (r:1 w:1)
// Storage: Nonfungible AccountBalance (r:1 w:1)
// Storage: Nonfungible Owned (r:0 w:1)
+ // Storage: Nonfungible TokenProperties (r:0 w:1)
fn burn_from() -> Weight {
- (27_580_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(4 as Weight))
- .saturating_add(T::DbWeight::get().writes(5 as Weight))
+ (37_061_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(5 as Weight))
+ .saturating_add(T::DbWeight::get().writes(6 as Weight))
}
// Storage: Common CollectionPropertyPermissions (r:1 w:1)
fn set_token_property_permissions(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 3_432_000
- .saturating_add((126_888_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 57_000
+ .saturating_add((15_149_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -171,8 +176,8 @@
// Storage: Nonfungible TokenProperties (r:1 w:1)
fn set_token_properties(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 158_583_000
- .saturating_add((4_707_700_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 2_278_000
+ .saturating_add((409_613_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -181,8 +186,8 @@
// Storage: Nonfungible TokenProperties (r:1 w:1)
fn delete_token_properties(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 169_018_000
- .saturating_add((4_783_967_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 2_234_000
+ .saturating_add((408_185_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -195,7 +200,7 @@
// Storage: Nonfungible TokenData (r:0 w:1)
// Storage: Nonfungible Owned (r:0 w:1)
fn create_item() -> Weight {
- (18_450_000 as Weight)
+ (24_135_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(4 as Weight))
}
@@ -204,9 +209,9 @@
// Storage: Nonfungible TokenData (r:0 w:4)
// Storage: Nonfungible Owned (r:0 w:4)
fn create_multiple_items(b: u32, ) -> Weight {
- (10_228_000 as Weight)
- // Standard Error: 1_000
- .saturating_add((4_392_000 as Weight).saturating_mul(b as Weight))
+ (21_952_000 as Weight)
+ // Standard Error: 5_000
+ .saturating_add((4_727_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
.saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(b as Weight)))
@@ -216,23 +221,25 @@
// Storage: Nonfungible TokenData (r:0 w:4)
// Storage: Nonfungible Owned (r:0 w:4)
fn create_multiple_items_ex(b: u32, ) -> Weight {
- (6_543_000 as Weight)
- // Standard Error: 2_000
- .saturating_add((7_175_000 as Weight).saturating_mul(b as Weight))
+ (10_432_000 as Weight)
+ // Standard Error: 6_000
+ .saturating_add((7_383_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))
}
// Storage: Nonfungible TokenData (r:1 w:1)
+ // Storage: Nonfungible TokenChildren (r:1 w:0)
// Storage: Nonfungible TokensBurnt (r:1 w:1)
// Storage: Nonfungible AccountBalance (r:1 w:1)
// Storage: Nonfungible Allowance (r:1 w:0)
// Storage: Nonfungible Owned (r:0 w:1)
+ // Storage: Nonfungible TokenProperties (r:0 w:1)
fn burn_item() -> Weight {
- (24_554_000 as Weight)
- .saturating_add(RocksDbWeight::get().reads(4 as Weight))
- .saturating_add(RocksDbWeight::get().writes(4 as Weight))
+ (29_798_000 as Weight)
+ .saturating_add(RocksDbWeight::get().reads(5 as Weight))
+ .saturating_add(RocksDbWeight::get().writes(5 as Weight))
}
// Storage: Nonfungible TokenChildren (r:1 w:0)
// Storage: Nonfungible TokenData (r:1 w:1)
@@ -242,7 +249,7 @@
// Storage: Nonfungible Owned (r:0 w:1)
// Storage: Nonfungible TokenProperties (r:0 w:1)
fn burn_recursively_self_raw() -> Weight {
- (86_136_000 as Weight)
+ (37_955_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(5 as Weight))
.saturating_add(RocksDbWeight::get().writes(5 as Weight))
}
@@ -256,11 +263,11 @@
// Storage: Common CollectionById (r:1 w:0)
fn burn_recursively_breadth_plus_self_plus_self_per_each_raw(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 42_828_000
- .saturating_add((381_478_000 as Weight).saturating_mul(b as Weight))
- .saturating_add(RocksDbWeight::get().reads(6 as Weight))
+ // Standard Error: 1_349_000
+ .saturating_add((275_145_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add(RocksDbWeight::get().reads(7 as Weight))
.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(b as Weight)))
- .saturating_add(RocksDbWeight::get().writes(5 as Weight))
+ .saturating_add(RocksDbWeight::get().writes(6 as Weight))
.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(b as Weight)))
}
// Storage: Nonfungible TokenData (r:1 w:1)
@@ -268,14 +275,14 @@
// Storage: Nonfungible Allowance (r:1 w:0)
// Storage: Nonfungible Owned (r:0 w:2)
fn transfer() -> Weight {
- (28_339_000 as Weight)
+ (27_867_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(5 as Weight))
}
// Storage: Nonfungible TokenData (r:1 w:0)
// Storage: Nonfungible Allowance (r:1 w:1)
fn approve() -> Weight {
- (17_616_000 as Weight)
+ (18_824_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
@@ -284,25 +291,27 @@
// Storage: Nonfungible AccountBalance (r:2 w:2)
// Storage: Nonfungible Owned (r:0 w:2)
fn transfer_from() -> Weight {
- (32_196_000 as Weight)
+ (32_879_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(6 as Weight))
}
// Storage: Nonfungible Allowance (r:1 w:1)
// Storage: Nonfungible TokenData (r:1 w:1)
+ // Storage: Nonfungible TokenChildren (r:1 w:0)
// Storage: Nonfungible TokensBurnt (r:1 w:1)
// Storage: Nonfungible AccountBalance (r:1 w:1)
// Storage: Nonfungible Owned (r:0 w:1)
+ // Storage: Nonfungible TokenProperties (r:0 w:1)
fn burn_from() -> Weight {
- (27_580_000 as Weight)
- .saturating_add(RocksDbWeight::get().reads(4 as Weight))
- .saturating_add(RocksDbWeight::get().writes(5 as Weight))
+ (37_061_000 as Weight)
+ .saturating_add(RocksDbWeight::get().reads(5 as Weight))
+ .saturating_add(RocksDbWeight::get().writes(6 as Weight))
}
// Storage: Common CollectionPropertyPermissions (r:1 w:1)
fn set_token_property_permissions(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 3_432_000
- .saturating_add((126_888_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 57_000
+ .saturating_add((15_149_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
@@ -311,8 +320,8 @@
// Storage: Nonfungible TokenProperties (r:1 w:1)
fn set_token_properties(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 158_583_000
- .saturating_add((4_707_700_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 2_278_000
+ .saturating_add((409_613_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
@@ -321,8 +330,8 @@
// Storage: Nonfungible TokenProperties (r:1 w:1)
fn delete_token_properties(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 169_018_000
- .saturating_add((4_783_967_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 2_234_000
+ .saturating_add((408_185_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
pallets/refungible/src/common.rsdiffbeforeafterboth--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -77,16 +77,19 @@
0
}
- fn set_token_properties(amount: u32) -> Weight {
- <SelfWeightOf<T>>::set_token_properties(amount)
+ fn set_token_properties(_amount: u32) -> Weight {
+ // Error
+ 0
}
- fn delete_token_properties(amount: u32) -> Weight {
- <SelfWeightOf<T>>::delete_token_properties(amount)
+ fn delete_token_properties(_amount: u32) -> Weight {
+ // Error
+ 0
}
- fn set_token_property_permissions(amount: u32) -> Weight {
- <SelfWeightOf<T>>::set_token_property_permissions(amount)
+ fn set_token_property_permissions(_amount: u32) -> Weight {
+ // Error
+ 0
}
fn transfer() -> Weight {
pallets/refungible/src/weights.rsdiffbeforeafterboth--- a/pallets/refungible/src/weights.rs
+++ b/pallets/refungible/src/weights.rs
@@ -3,12 +3,13 @@
//! Autogenerated weights for pallet_refungible
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-03-01, STEPS: `50`, REPEAT: 200, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-06-15, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
// target/release/unique-collator
// benchmark
+// pallet
// --pallet
// pallet-refungible
// --wasm-execution
@@ -18,7 +19,7 @@
// --template
// .maintain/frame-weight-template.hbs
// --steps=50
-// --repeat=200
+// --repeat=80
// --heap-pages=4096
// --output=./pallets/refungible/src/weights.rs
@@ -38,9 +39,6 @@
fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight;
fn burn_item_partial() -> Weight;
fn burn_item_fully() -> Weight;
- fn set_token_properties(amount: u32) -> Weight;
- fn delete_token_properties(amount: u32) -> Weight;
- fn set_token_property_permissions(amount: u32) -> Weight;
fn transfer_normal() -> Weight;
fn transfer_creating() -> Weight;
fn transfer_removing() -> Weight;
@@ -63,7 +61,7 @@
// Storage: Refungible TokenData (r:0 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn create_item() -> Weight {
- (21_255_000 as Weight)
+ (21_321_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
}
@@ -74,9 +72,9 @@
// Storage: Refungible TokenData (r:0 w:4)
// Storage: Refungible Owned (r:0 w:4)
fn create_multiple_items(b: u32, ) -> Weight {
- (18_052_000 as Weight)
- // Standard Error: 1_000
- .saturating_add((5_549_000 as Weight).saturating_mul(b as Weight))
+ (16_313_000 as Weight)
+ // Standard Error: 4_000
+ .saturating_add((5_464_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(b as Weight)))
@@ -88,9 +86,9 @@
// Storage: Refungible TokenData (r:0 w:4)
// Storage: Refungible Owned (r:0 w:4)
fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight {
- (15_766_000 as Weight)
- // Standard Error: 2_000
- .saturating_add((8_187_000 as Weight).saturating_mul(b as Weight))
+ (15_631_000 as Weight)
+ // Standard Error: 5_000
+ .saturating_add((8_141_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -103,9 +101,9 @@
// Storage: Refungible Balance (r:0 w:4)
// Storage: Refungible Owned (r:0 w:4)
fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight {
- (5_675_000 as Weight)
- // Standard Error: 2_000
- .saturating_add((6_315_000 as Weight).saturating_mul(b as Weight))
+ (11_191_000 as Weight)
+ // Standard Error: 4_000
+ .saturating_add((6_321_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
@@ -116,7 +114,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn burn_item_partial() -> Weight {
- (23_518_000 as Weight)
+ (24_421_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
}
@@ -127,29 +125,13 @@
// Storage: Refungible TokenData (r:0 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn burn_item_fully() -> Weight {
- (32_489_000 as Weight)
+ (32_900_000 as Weight)
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
}
-
- fn set_token_properties(_amount: u32) -> Weight {
- // Error
- 0
- }
-
- fn delete_token_properties(_amount: u32) -> Weight {
- // Error
- 0
- }
-
- fn set_token_property_permissions(_amount: u32) -> Weight {
- // Error
- 0
- }
-
// Storage: Refungible Balance (r:2 w:2)
fn transfer_normal() -> Weight {
- (19_766_000 as Weight)
+ (20_215_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
@@ -157,7 +139,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_creating() -> Weight {
- (23_360_000 as Weight)
+ (24_809_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
}
@@ -165,7 +147,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_removing() -> Weight {
- (25_344_000 as Weight)
+ (26_704_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
}
@@ -173,21 +155,21 @@
// Storage: Refungible AccountBalance (r:2 w:2)
// Storage: Refungible Owned (r:0 w:2)
fn transfer_creating_removing() -> Weight {
- (28_553_000 as Weight)
+ (28_728_000 as Weight)
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
}
// Storage: Refungible Balance (r:1 w:0)
// Storage: Refungible Allowance (r:0 w:1)
fn approve() -> Weight {
- (15_356_000 as Weight)
+ (16_107_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Refungible Allowance (r:1 w:1)
// Storage: Refungible Balance (r:2 w:2)
fn transfer_from_normal() -> Weight {
- (28_832_000 as Weight)
+ (28_765_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
@@ -196,7 +178,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_from_creating() -> Weight {
- (32_132_000 as Weight)
+ (32_788_000 as Weight)
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(5 as Weight))
}
@@ -205,7 +187,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_from_removing() -> Weight {
- (33_237_000 as Weight)
+ (34_523_000 as Weight)
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(5 as Weight))
}
@@ -214,7 +196,7 @@
// Storage: Refungible AccountBalance (r:2 w:2)
// Storage: Refungible Owned (r:0 w:2)
fn transfer_from_creating_removing() -> Weight {
- (36_399_000 as Weight)
+ (36_749_000 as Weight)
.saturating_add(T::DbWeight::get().reads(5 as Weight))
.saturating_add(T::DbWeight::get().writes(7 as Weight))
}
@@ -226,7 +208,7 @@
// Storage: Refungible TokenData (r:0 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn burn_from() -> Weight {
- (42_043_000 as Weight)
+ (42_259_000 as Weight)
.saturating_add(T::DbWeight::get().reads(5 as Weight))
.saturating_add(T::DbWeight::get().writes(7 as Weight))
}
@@ -241,7 +223,7 @@
// Storage: Refungible TokenData (r:0 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn create_item() -> Weight {
- (21_255_000 as Weight)
+ (21_321_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(6 as Weight))
}
@@ -252,9 +234,9 @@
// Storage: Refungible TokenData (r:0 w:4)
// Storage: Refungible Owned (r:0 w:4)
fn create_multiple_items(b: u32, ) -> Weight {
- (18_052_000 as Weight)
- // Standard Error: 1_000
- .saturating_add((5_549_000 as Weight).saturating_mul(b as Weight))
+ (16_313_000 as Weight)
+ // Standard Error: 4_000
+ .saturating_add((5_464_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(b as Weight)))
@@ -266,9 +248,9 @@
// Storage: Refungible TokenData (r:0 w:4)
// Storage: Refungible Owned (r:0 w:4)
fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight {
- (15_766_000 as Weight)
- // Standard Error: 2_000
- .saturating_add((8_187_000 as Weight).saturating_mul(b as Weight))
+ (15_631_000 as Weight)
+ // Standard Error: 5_000
+ .saturating_add((8_141_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -281,9 +263,9 @@
// Storage: Refungible Balance (r:0 w:4)
// Storage: Refungible Owned (r:0 w:4)
fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight {
- (5_675_000 as Weight)
- // Standard Error: 2_000
- .saturating_add((6_315_000 as Weight).saturating_mul(b as Weight))
+ (11_191_000 as Weight)
+ // Standard Error: 4_000
+ .saturating_add((6_321_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
.saturating_add(RocksDbWeight::get().writes(3 as Weight))
@@ -294,7 +276,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn burn_item_partial() -> Weight {
- (23_518_000 as Weight)
+ (24_421_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(4 as Weight))
}
@@ -305,29 +287,13 @@
// Storage: Refungible TokenData (r:0 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn burn_item_fully() -> Weight {
- (32_489_000 as Weight)
+ (32_900_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(6 as Weight))
- }
-
- fn set_token_properties(_amount: u32) -> Weight {
- // Error
- 0
- }
-
- fn delete_token_properties(_amount: u32) -> Weight {
- // Error
- 0
- }
-
- fn set_token_property_permissions(_amount: u32) -> Weight {
- // Error
- 0
}
-
// Storage: Refungible Balance (r:2 w:2)
fn transfer_normal() -> Weight {
- (19_766_000 as Weight)
+ (20_215_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
@@ -335,7 +301,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_creating() -> Weight {
- (23_360_000 as Weight)
+ (24_809_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(4 as Weight))
}
@@ -343,7 +309,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_removing() -> Weight {
- (25_344_000 as Weight)
+ (26_704_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(4 as Weight))
}
@@ -351,21 +317,21 @@
// Storage: Refungible AccountBalance (r:2 w:2)
// Storage: Refungible Owned (r:0 w:2)
fn transfer_creating_removing() -> Weight {
- (28_553_000 as Weight)
+ (28_728_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(6 as Weight))
}
// Storage: Refungible Balance (r:1 w:0)
// Storage: Refungible Allowance (r:0 w:1)
fn approve() -> Weight {
- (15_356_000 as Weight)
+ (16_107_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Refungible Allowance (r:1 w:1)
// Storage: Refungible Balance (r:2 w:2)
fn transfer_from_normal() -> Weight {
- (28_832_000 as Weight)
+ (28_765_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(3 as Weight))
}
@@ -374,7 +340,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_from_creating() -> Weight {
- (32_132_000 as Weight)
+ (32_788_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(5 as Weight))
}
@@ -383,7 +349,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_from_removing() -> Weight {
- (33_237_000 as Weight)
+ (34_523_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(5 as Weight))
}
@@ -392,7 +358,7 @@
// Storage: Refungible AccountBalance (r:2 w:2)
// Storage: Refungible Owned (r:0 w:2)
fn transfer_from_creating_removing() -> Weight {
- (36_399_000 as Weight)
+ (36_749_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(5 as Weight))
.saturating_add(RocksDbWeight::get().writes(7 as Weight))
}
@@ -404,7 +370,7 @@
// Storage: Refungible TokenData (r:0 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn burn_from() -> Weight {
- (42_043_000 as Weight)
+ (42_259_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(5 as Weight))
.saturating_add(RocksDbWeight::get().writes(7 as Weight))
}
pallets/scheduler/src/weights.rsdiffbeforeafterboth--- a/pallets/scheduler/src/weights.rs
+++ b/pallets/scheduler/src/weights.rs
@@ -3,7 +3,7 @@
//! Autogenerated weights for pallet_unique_scheduler
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-06-09, STEPS: `50`, REPEAT: 200, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-06-15, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
@@ -19,7 +19,7 @@
// --template
// .maintain/frame-weight-template.hbs
// --steps=50
-// --repeat=200
+// --repeat=80
// --heap-pages=4096
// --output=./pallets/scheduler/src/weights.rs
@@ -55,9 +55,9 @@
// Storage: System BlockWeight (r:1 w:1)
// Storage: Scheduler Lookup (r:0 w:1)
fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight {
- (35_999_000 as Weight)
- // Standard Error: 3_000
- .saturating_add((32_234_000 as Weight).saturating_mul(s as Weight))
+ (27_374_000 as Weight)
+ // Standard Error: 7_000
+ .saturating_add((9_673_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
@@ -69,9 +69,9 @@
// Storage: System BlockWeight (r:1 w:1)
// Storage: Scheduler Lookup (r:0 w:1)
fn on_initialize_named_resolved(s: u32, ) -> Weight {
- (34_874_000 as Weight)
- // Standard Error: 2_000
- .saturating_add((23_114_000 as Weight).saturating_mul(s as Weight))
+ (25_967_000 as Weight)
+ // Standard Error: 6_000
+ .saturating_add((5_916_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -82,9 +82,9 @@
// Storage: System BlockWeight (r:1 w:1)
// Storage: Scheduler Lookup (r:0 w:1)
fn on_initialize_periodic(s: u32, ) -> Weight {
- (36_469_000 as Weight)
- // Standard Error: 3_000
- .saturating_add((32_202_000 as Weight).saturating_mul(s as Weight))
+ (27_097_000 as Weight)
+ // Standard Error: 5_000
+ .saturating_add((9_652_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
@@ -96,9 +96,9 @@
// Storage: System BlockWeight (r:1 w:1)
// Storage: Scheduler Lookup (r:0 w:1)
fn on_initialize_periodic_resolved(s: u32, ) -> Weight {
- (35_352_000 as Weight)
- // Standard Error: 3_000
- .saturating_add((32_309_000 as Weight).saturating_mul(s as Weight))
+ (43_116_000 as Weight)
+ // Standard Error: 18_000
+ .saturating_add((8_352_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
@@ -107,9 +107,9 @@
// Storage: Scheduler Agenda (r:2 w:2)
// Storage: Scheduler Lookup (r:0 w:1)
fn on_initialize_aborted(s: u32, ) -> Weight {
- (11_267_000 as Weight)
- // Standard Error: 1_000
- .saturating_add((9_368_000 as Weight).saturating_mul(s as Weight))
+ (4_921_000 as Weight)
+ // Standard Error: 4_000
+ .saturating_add((2_249_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -120,9 +120,9 @@
// Storage: System BlockWeight (r:1 w:1)
// Storage: Scheduler Lookup (r:0 w:1)
fn on_initialize_named_aborted(s: u32, ) -> Weight {
- (35_937_000 as Weight)
- // Standard Error: 3_000
- .saturating_add((23_037_000 as Weight).saturating_mul(s as Weight))
+ (26_934_000 as Weight)
+ // Standard Error: 7_000
+ .saturating_add((5_819_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -130,9 +130,9 @@
// Storage: Scheduler Agenda (r:2 w:2)
// Storage: Scheduler Lookup (r:0 w:1)
fn on_initialize_named(s: u32, ) -> Weight {
- (10_338_000 as Weight)
- // Standard Error: 2_000
- .saturating_add((9_422_000 as Weight).saturating_mul(s as Weight))
+ (6_423_000 as Weight)
+ // Standard Error: 1_000
+ .saturating_add((2_141_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -143,9 +143,9 @@
// Storage: System BlockWeight (r:1 w:1)
// Storage: Scheduler Lookup (r:0 w:1)
fn on_initialize(s: u32, ) -> Weight {
- (37_448_000 as Weight)
- // Standard Error: 7_000
- .saturating_add((22_907_000 as Weight).saturating_mul(s as Weight))
+ (27_586_000 as Weight)
+ // Standard Error: 11_000
+ .saturating_add((5_264_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -156,9 +156,9 @@
// Storage: System BlockWeight (r:1 w:1)
// Storage: Scheduler Lookup (r:0 w:1)
fn on_initialize_resolved(s: u32, ) -> Weight {
- (34_841_000 as Weight)
- // Standard Error: 7_000
- .saturating_add((22_966_000 as Weight).saturating_mul(s as Weight))
+ (24_356_000 as Weight)
+ // Standard Error: 4_000
+ .saturating_add((5_301_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -166,18 +166,18 @@
// Storage: Scheduler Lookup (r:1 w:1)
// Storage: Scheduler Agenda (r:1 w:1)
fn schedule_named(s: u32, ) -> Weight {
- (33_845_000 as Weight)
- // Standard Error: 0
- .saturating_add((168_000 as Weight).saturating_mul(s as Weight))
+ (14_871_000 as Weight)
+ // Standard Error: 1_000
+ .saturating_add((183_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
// Storage: Scheduler Lookup (r:1 w:1)
// Storage: Scheduler Agenda (r:1 w:1)
fn cancel_named(s: u32, ) -> Weight {
- (31_169_000 as Weight)
+ (16_676_000 as Weight)
// Standard Error: 1_000
- .saturating_add((1_565_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((500_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
@@ -191,9 +191,9 @@
// Storage: System BlockWeight (r:1 w:1)
// Storage: Scheduler Lookup (r:0 w:1)
fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight {
- (35_999_000 as Weight)
- // Standard Error: 3_000
- .saturating_add((32_234_000 as Weight).saturating_mul(s as Weight))
+ (27_374_000 as Weight)
+ // Standard Error: 7_000
+ .saturating_add((9_673_000 as Weight).saturating_mul(s as Weight))
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
.saturating_add(RocksDbWeight::get().writes(4 as Weight))
@@ -205,9 +205,9 @@
// Storage: System BlockWeight (r:1 w:1)
// Storage: Scheduler Lookup (r:0 w:1)
fn on_initialize_named_resolved(s: u32, ) -> Weight {
- (34_874_000 as Weight)
- // Standard Error: 2_000
- .saturating_add((23_114_000 as Weight).saturating_mul(s as Weight))
+ (25_967_000 as Weight)
+ // Standard Error: 6_000
+ .saturating_add((5_916_000 as Weight).saturating_mul(s as Weight))
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(4 as Weight))
.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -218,9 +218,9 @@
// Storage: System BlockWeight (r:1 w:1)
// Storage: Scheduler Lookup (r:0 w:1)
fn on_initialize_periodic(s: u32, ) -> Weight {
- (36_469_000 as Weight)
- // Standard Error: 3_000
- .saturating_add((32_202_000 as Weight).saturating_mul(s as Weight))
+ (27_097_000 as Weight)
+ // Standard Error: 5_000
+ .saturating_add((9_652_000 as Weight).saturating_mul(s as Weight))
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
.saturating_add(RocksDbWeight::get().writes(4 as Weight))
@@ -232,9 +232,9 @@
// Storage: System BlockWeight (r:1 w:1)
// Storage: Scheduler Lookup (r:0 w:1)
fn on_initialize_periodic_resolved(s: u32, ) -> Weight {
- (35_352_000 as Weight)
- // Standard Error: 3_000
- .saturating_add((32_309_000 as Weight).saturating_mul(s as Weight))
+ (43_116_000 as Weight)
+ // Standard Error: 18_000
+ .saturating_add((8_352_000 as Weight).saturating_mul(s as Weight))
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
.saturating_add(RocksDbWeight::get().writes(4 as Weight))
@@ -243,9 +243,9 @@
// Storage: Scheduler Agenda (r:2 w:2)
// Storage: Scheduler Lookup (r:0 w:1)
fn on_initialize_aborted(s: u32, ) -> Weight {
- (11_267_000 as Weight)
- // Standard Error: 1_000
- .saturating_add((9_368_000 as Weight).saturating_mul(s as Weight))
+ (4_921_000 as Weight)
+ // Standard Error: 4_000
+ .saturating_add((2_249_000 as Weight).saturating_mul(s as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -256,9 +256,9 @@
// Storage: System BlockWeight (r:1 w:1)
// Storage: Scheduler Lookup (r:0 w:1)
fn on_initialize_named_aborted(s: u32, ) -> Weight {
- (35_937_000 as Weight)
- // Standard Error: 3_000
- .saturating_add((23_037_000 as Weight).saturating_mul(s as Weight))
+ (26_934_000 as Weight)
+ // Standard Error: 7_000
+ .saturating_add((5_819_000 as Weight).saturating_mul(s as Weight))
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(4 as Weight))
.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -266,9 +266,9 @@
// Storage: Scheduler Agenda (r:2 w:2)
// Storage: Scheduler Lookup (r:0 w:1)
fn on_initialize_named(s: u32, ) -> Weight {
- (10_338_000 as Weight)
- // Standard Error: 2_000
- .saturating_add((9_422_000 as Weight).saturating_mul(s as Weight))
+ (6_423_000 as Weight)
+ // Standard Error: 1_000
+ .saturating_add((2_141_000 as Weight).saturating_mul(s as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -279,9 +279,9 @@
// Storage: System BlockWeight (r:1 w:1)
// Storage: Scheduler Lookup (r:0 w:1)
fn on_initialize(s: u32, ) -> Weight {
- (37_448_000 as Weight)
- // Standard Error: 7_000
- .saturating_add((22_907_000 as Weight).saturating_mul(s as Weight))
+ (27_586_000 as Weight)
+ // Standard Error: 11_000
+ .saturating_add((5_264_000 as Weight).saturating_mul(s as Weight))
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(4 as Weight))
.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -292,9 +292,9 @@
// Storage: System BlockWeight (r:1 w:1)
// Storage: Scheduler Lookup (r:0 w:1)
fn on_initialize_resolved(s: u32, ) -> Weight {
- (34_841_000 as Weight)
- // Standard Error: 7_000
- .saturating_add((22_966_000 as Weight).saturating_mul(s as Weight))
+ (24_356_000 as Weight)
+ // Standard Error: 4_000
+ .saturating_add((5_301_000 as Weight).saturating_mul(s as Weight))
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(4 as Weight))
.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -302,18 +302,18 @@
// Storage: Scheduler Lookup (r:1 w:1)
// Storage: Scheduler Agenda (r:1 w:1)
fn schedule_named(s: u32, ) -> Weight {
- (33_845_000 as Weight)
- // Standard Error: 0
- .saturating_add((168_000 as Weight).saturating_mul(s as Weight))
+ (14_871_000 as Weight)
+ // Standard Error: 1_000
+ .saturating_add((183_000 as Weight).saturating_mul(s as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
// Storage: Scheduler Lookup (r:1 w:1)
// Storage: Scheduler Agenda (r:1 w:1)
fn cancel_named(s: u32, ) -> Weight {
- (31_169_000 as Weight)
+ (16_676_000 as Weight)
// Standard Error: 1_000
- .saturating_add((1_565_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((500_000 as Weight).saturating_mul(s as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
pallets/structure/src/weights.rsdiffbeforeafterboth--- a/pallets/structure/src/weights.rs
+++ b/pallets/structure/src/weights.rs
@@ -3,12 +3,13 @@
//! Autogenerated weights for pallet_structure
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-03-24, STEPS: `50`, REPEAT: 200, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-06-15, STEPS: `50`, REPEAT: 200, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
// target/release/unique-collator
// benchmark
+// pallet
// --pallet
// pallet-structure
// --wasm-execution
@@ -41,7 +42,7 @@
// Storage: Common CollectionById (r:1 w:0)
// Storage: Nonfungible TokenData (r:1 w:0)
fn find_parent() -> Weight {
- (6_302_000 as Weight)
+ (7_013_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
}
}
@@ -51,7 +52,7 @@
// Storage: Common CollectionById (r:1 w:0)
// Storage: Nonfungible TokenData (r:1 w:0)
fn find_parent() -> Weight {
- (6_302_000 as Weight)
+ (7_013_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
}
}
pallets/unique/src/weights.rsdiffbeforeafterboth--- a/pallets/unique/src/weights.rs
+++ b/pallets/unique/src/weights.rs
@@ -3,12 +3,13 @@
//! Autogenerated weights for pallet_unique
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-03-01, STEPS: `50`, REPEAT: 200, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-06-15, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
// target/release/unique-collator
// benchmark
+// pallet
// --pallet
// pallet-unique
// --wasm-execution
@@ -18,7 +19,7 @@
// --template
// .maintain/frame-weight-template.hbs
// --steps=50
-// --repeat=200
+// --repeat=80
// --heap-pages=4096
// --output=./pallets/unique/src/weights.rs
@@ -36,8 +37,6 @@
fn destroy_collection() -> Weight;
fn add_to_allow_list() -> Weight;
fn remove_from_allow_list() -> Weight;
- fn set_public_access_mode() -> Weight;
- fn set_mint_permission() -> Weight;
fn change_collection_owner() -> Weight;
fn add_collection_admin() -> Weight;
fn remove_collection_admin() -> Weight;
@@ -45,9 +44,6 @@
fn confirm_sponsorship() -> Weight;
fn remove_collection_sponsor() -> Weight;
fn set_transfers_enabled_flag() -> Weight;
- fn set_offchain_schema(b: u32, ) -> Weight;
- fn set_const_on_chain_schema(b: u32, ) -> Weight;
- fn set_schema_version() -> Weight;
fn set_collection_limits() -> Weight;
}
@@ -57,51 +53,43 @@
// Storage: Common CreatedCollectionCount (r:1 w:1)
// Storage: Common DestroyedCollectionCount (r:1 w:0)
// Storage: System Account (r:2 w:2)
+ // Storage: Common CollectionPropertyPermissions (r:0 w:1)
+ // Storage: Common CollectionProperties (r:0 w:1)
// Storage: Common CollectionById (r:0 w:1)
fn create_collection() -> Weight {
- (28_929_000 as Weight)
+ (39_427_000 as Weight)
.saturating_add(T::DbWeight::get().reads(4 as Weight))
- .saturating_add(T::DbWeight::get().writes(4 as Weight))
+ .saturating_add(T::DbWeight::get().writes(6 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
+ // Storage: Nonfungible TokenData (r:1 w:0)
// Storage: Common DestroyedCollectionCount (r:1 w:1)
// Storage: Nonfungible TokensMinted (r:0 w:1)
// Storage: Nonfungible TokensBurnt (r:0 w:1)
// Storage: Common AdminAmount (r:0 w:1)
+ // Storage: Common CollectionProperties (r:0 w:1)
fn destroy_collection() -> Weight {
- (40_303_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(2 as Weight))
- .saturating_add(T::DbWeight::get().writes(5 as Weight))
+ (48_339_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(3 as Weight))
+ .saturating_add(T::DbWeight::get().writes(6 as Weight))
}
// Storage: Common CollectionById (r:1 w:0)
// Storage: Common Allowlist (r:0 w:1)
fn add_to_allow_list() -> Weight {
- (15_989_000 as Weight)
+ (17_379_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:0)
// Storage: Common Allowlist (r:0 w:1)
fn remove_from_allow_list() -> Weight {
- (15_582_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(1 as Weight))
- .saturating_add(T::DbWeight::get().writes(1 as Weight))
- }
- // Storage: Common CollectionById (r:1 w:1)
- fn set_public_access_mode() -> Weight {
- (14_846_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(1 as Weight))
- .saturating_add(T::DbWeight::get().writes(1 as Weight))
- }
- // Storage: Common CollectionById (r:1 w:1)
- fn set_mint_permission() -> Weight {
- (14_534_000 as Weight)
+ (17_490_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn change_collection_owner() -> Weight {
- (14_990_000 as Weight)
+ (17_701_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -109,7 +97,7 @@
// Storage: Common IsAdmin (r:1 w:1)
// Storage: Common AdminAmount (r:1 w:1)
fn add_collection_admin() -> Weight {
- (19_957_000 as Weight)
+ (23_301_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
@@ -117,55 +105,37 @@
// Storage: Common IsAdmin (r:1 w:1)
// Storage: Common AdminAmount (r:1 w:1)
fn remove_collection_admin() -> Weight {
- (21_209_000 as Weight)
+ (24_859_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn set_collection_sponsor() -> Weight {
- (14_963_000 as Weight)
+ (17_795_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn confirm_sponsorship() -> Weight {
- (14_478_000 as Weight)
+ (17_297_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn remove_collection_sponsor() -> Weight {
- (14_393_000 as Weight)
+ (17_079_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn set_transfers_enabled_flag() -> Weight {
- (7_309_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(1 as Weight))
- .saturating_add(T::DbWeight::get().writes(1 as Weight))
- }
- // Storage: Common CollectionById (r:1 w:1)
- fn set_offchain_schema(_b: u32, ) -> Weight {
- (15_220_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(1 as Weight))
- .saturating_add(T::DbWeight::get().writes(1 as Weight))
- }
- // Storage: Common CollectionById (r:1 w:1)
- fn set_const_on_chain_schema(_b: u32, ) -> Weight {
- (14_984_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(1 as Weight))
- .saturating_add(T::DbWeight::get().writes(1 as Weight))
- }
- // Storage: Common CollectionById (r:1 w:1)
- fn set_schema_version() -> Weight {
- (14_596_000 as Weight)
+ (9_734_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn set_collection_limits() -> Weight {
- (15_339_000 as Weight)
+ (17_998_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -176,51 +146,43 @@
// Storage: Common CreatedCollectionCount (r:1 w:1)
// Storage: Common DestroyedCollectionCount (r:1 w:0)
// Storage: System Account (r:2 w:2)
+ // Storage: Common CollectionPropertyPermissions (r:0 w:1)
+ // Storage: Common CollectionProperties (r:0 w:1)
// Storage: Common CollectionById (r:0 w:1)
fn create_collection() -> Weight {
- (28_929_000 as Weight)
+ (39_427_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
- .saturating_add(RocksDbWeight::get().writes(4 as Weight))
+ .saturating_add(RocksDbWeight::get().writes(6 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
+ // Storage: Nonfungible TokenData (r:1 w:0)
// Storage: Common DestroyedCollectionCount (r:1 w:1)
// Storage: Nonfungible TokensMinted (r:0 w:1)
// Storage: Nonfungible TokensBurnt (r:0 w:1)
// Storage: Common AdminAmount (r:0 w:1)
+ // Storage: Common CollectionProperties (r:0 w:1)
fn destroy_collection() -> Weight {
- (40_303_000 as Weight)
- .saturating_add(RocksDbWeight::get().reads(2 as Weight))
- .saturating_add(RocksDbWeight::get().writes(5 as Weight))
+ (48_339_000 as Weight)
+ .saturating_add(RocksDbWeight::get().reads(3 as Weight))
+ .saturating_add(RocksDbWeight::get().writes(6 as Weight))
}
// Storage: Common CollectionById (r:1 w:0)
// Storage: Common Allowlist (r:0 w:1)
fn add_to_allow_list() -> Weight {
- (15_989_000 as Weight)
+ (17_379_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:0)
// Storage: Common Allowlist (r:0 w:1)
fn remove_from_allow_list() -> Weight {
- (15_582_000 as Weight)
- .saturating_add(RocksDbWeight::get().reads(1 as Weight))
- .saturating_add(RocksDbWeight::get().writes(1 as Weight))
- }
- // Storage: Common CollectionById (r:1 w:1)
- fn set_public_access_mode() -> Weight {
- (14_846_000 as Weight)
- .saturating_add(RocksDbWeight::get().reads(1 as Weight))
- .saturating_add(RocksDbWeight::get().writes(1 as Weight))
- }
- // Storage: Common CollectionById (r:1 w:1)
- fn set_mint_permission() -> Weight {
- (14_534_000 as Weight)
+ (17_490_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn change_collection_owner() -> Weight {
- (14_990_000 as Weight)
+ (17_701_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
@@ -228,7 +190,7 @@
// Storage: Common IsAdmin (r:1 w:1)
// Storage: Common AdminAmount (r:1 w:1)
fn add_collection_admin() -> Weight {
- (19_957_000 as Weight)
+ (23_301_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
@@ -236,55 +198,37 @@
// Storage: Common IsAdmin (r:1 w:1)
// Storage: Common AdminAmount (r:1 w:1)
fn remove_collection_admin() -> Weight {
- (21_209_000 as Weight)
+ (24_859_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn set_collection_sponsor() -> Weight {
- (14_963_000 as Weight)
+ (17_795_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn confirm_sponsorship() -> Weight {
- (14_478_000 as Weight)
+ (17_297_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn remove_collection_sponsor() -> Weight {
- (14_393_000 as Weight)
+ (17_079_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn set_transfers_enabled_flag() -> Weight {
- (7_309_000 as Weight)
- .saturating_add(RocksDbWeight::get().reads(1 as Weight))
- .saturating_add(RocksDbWeight::get().writes(1 as Weight))
- }
- // Storage: Common CollectionById (r:1 w:1)
- fn set_offchain_schema(_b: u32, ) -> Weight {
- (15_220_000 as Weight)
- .saturating_add(RocksDbWeight::get().reads(1 as Weight))
- .saturating_add(RocksDbWeight::get().writes(1 as Weight))
- }
- // Storage: Common CollectionById (r:1 w:1)
- fn set_const_on_chain_schema(_b: u32, ) -> Weight {
- (14_984_000 as Weight)
+ (9_734_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
- fn set_schema_version() -> Weight {
- (14_596_000 as Weight)
- .saturating_add(RocksDbWeight::get().reads(1 as Weight))
- .saturating_add(RocksDbWeight::get().writes(1 as Weight))
- }
- // Storage: Common CollectionById (r:1 w:1)
fn set_collection_limits() -> Weight {
- (15_339_000 as Weight)
+ (17_998_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
runtime/common/src/constants.rsdiffbeforeafterboth--- a/runtime/common/src/constants.rs
+++ b/runtime/common/src/constants.rs
@@ -38,7 +38,7 @@
pub const WEIGHT_TO_FEE_COEFF: u32 = 142_688_000;
// Targeting 0.15 UNQ per transfer
-pub const MIN_GAS_PRICE: u64 = 1_018_751_825_264;
+pub const MIN_GAS_PRICE: u64 = 1_019_493_469_850;
/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.
/// This is used to limit the maximal weight of a single extrinsic.
runtime/common/src/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -454,7 +454,6 @@
list_benchmark!(list, extra, pallet_refungible, Refungible);
list_benchmark!(list, extra, pallet_nonfungible, Nonfungible);
list_benchmark!(list, extra, pallet_unique_scheduler, Scheduler);
- list_benchmark!(list, extra, pallet_proxy_rmrk_core, RmrkCore);
// list_benchmark!(list, extra, pallet_evm_coder_substrate, EvmCoderSubstrate);
let storage_info = AllPalletsReversedWithSystemFirst::storage_info();
@@ -499,7 +498,6 @@
add_benchmark!(params, batches, pallet_refungible, Refungible);
add_benchmark!(params, batches, pallet_nonfungible, Nonfungible);
add_benchmark!(params, batches, pallet_unique_scheduler, Scheduler);
- add_benchmark!(params, batches, pallet_proxy_rmrk_core, RmrkCore);
// add_benchmark!(params, batches, pallet_evm_coder_substrate, EvmCoderSubstrate);
if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }
runtime/opal/src/lib.rsdiffbeforeafterboth--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -193,7 +193,7 @@
spec_name: create_runtime_str!(RUNTIME_NAME),
impl_name: create_runtime_str!(RUNTIME_NAME),
authoring_version: 1,
- spec_version: 922000,
+ spec_version: 922080,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
runtime/quartz/src/lib.rsdiffbeforeafterboth--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -192,7 +192,7 @@
spec_name: create_runtime_str!(RUNTIME_NAME),
impl_name: create_runtime_str!(RUNTIME_NAME),
authoring_version: 1,
- spec_version: 922000,
+ spec_version: 922080,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
runtime/unique/src/lib.rsdiffbeforeafterboth--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -190,7 +190,7 @@
spec_name: create_runtime_str!(RUNTIME_NAME),
impl_name: create_runtime_str!(RUNTIME_NAME),
authoring_version: 1,
- spec_version: 922000,
+ spec_version: 922080,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
tests/update_types.shdiffbeforeafterboth--- a/tests/update_types.sh
+++ b/tests/update_types.sh
@@ -7,7 +7,7 @@
fi
rsync -ar --exclude .gitignore src/interfaces/ unique-types-js
-for file in unique-types-js/augment-* unique-types-js/**/types.ts unique-types-js/**/registry.ts; do
+for file in unique-types-js/augment-* unique-types-js/**/types.ts unique-types-js/registry.ts; do
sed -i '1s;^;//@ts-nocheck\n;' $file
done