From 0257bf04211bf6d78cddeeeaa8a61e9e3013621e Mon Sep 17 00:00:00 2001 From: Trubnikov Sergey Date: Fri, 28 Oct 2022 06:42:20 +0000 Subject: [PATCH] fix: after rebase --- --- a/Cargo.lock +++ b/Cargo.lock @@ -117,12 +117,12 @@ version = "0.1.0" dependencies = [ "pallet-common", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "pallet-evm", "parity-scale-codec 3.2.1", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-core", + "sp-runtime", + "sp-std", "up-data-structs", ] @@ -477,15 +477,15 @@ "sc-network-common", "sc-network-gossip", "sc-utils", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-application-crypto", + "sp-arithmetic", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-keystore", "sp-mmr-primitives", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", "wasm-timer", @@ -506,8 +506,8 @@ "sc-rpc", "sc-utils", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", "thiserror", ] @@ -517,7 +517,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "beefy-primitives", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", ] [[package]] @@ -527,11 +527,11 @@ dependencies = [ "parity-scale-codec 3.2.1", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -1398,8 +1398,8 @@ "sc-chain-spec", "sc-cli", "sc-service", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", "url", ] @@ -1420,10 +1420,10 @@ "polkadot-overseer", "polkadot-primitives", "sc-client-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", "tracing", ] @@ -1442,16 +1442,16 @@ "sc-consensus-aura", "sc-consensus-slots", "sc-telemetry", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-inherents", "sp-keystore", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "substrate-prometheus-endpoint", "tracing", ] @@ -1469,10 +1469,10 @@ "polkadot-primitives", "sc-client-api", "sc-consensus", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-consensus", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-trie", "tracing", ] @@ -1493,11 +1493,11 @@ "polkadot-parachain", "polkadot-primitives", "sc-client-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", "sp-state-machine", "tracing", ] @@ -1519,10 +1519,10 @@ "rand 0.8.5", "sc-client-api", "sc-consensus", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-consensus", "sp-maybe-compressed-blob", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "tracing", ] @@ -1546,11 +1546,11 @@ "sc-service", "sc-telemetry", "sc-tracing", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", "tracing", ] @@ -1560,16 +1560,16 @@ source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-aura", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto", "sp-consensus-aura", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -1578,14 +1578,14 @@ source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "parity-scale-codec 3.2.1", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io", + "sp-runtime", + "sp-std", "xcm", "xcm-executor", ] @@ -1600,8 +1600,8 @@ "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "environmental", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "log", "pallet-balances", @@ -1609,15 +1609,15 @@ "polkadot-parachain", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-externalities", + "sp-inherents", + "sp-io", + "sp-runtime", "sp-state-machine", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", "sp-trie", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "xcm", ] @@ -1638,14 +1638,14 @@ source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io", + "sp-runtime", + "sp-std", "xcm", ] @@ -1655,14 +1655,14 @@ source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "parity-scale-codec 3.2.1", "rand_chacha 0.3.1", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", "xcm", "xcm-executor", ] @@ -1672,14 +1672,14 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "parity-scale-codec 3.2.1", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-runtime", + "sp-std", "sp-trie", ] @@ -1695,13 +1695,13 @@ "parity-scale-codec 3.2.1", "sc-client-api", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-core", + "sp-inherents", + "sp-runtime", "sp-state-machine", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", + "sp-storage", "sp-trie", "tracing", ] @@ -1714,9 +1714,9 @@ "cumulus-primitives-core", "futures 0.3.25", "parity-scale-codec 3.2.1", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", + "sp-std", + "sp-timestamp", ] [[package]] @@ -1725,14 +1725,14 @@ source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "log", "parity-scale-codec 3.2.1", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", "sp-trie", "xcm", "xcm-builder", @@ -1759,11 +1759,11 @@ "sc-sysinfo", "sc-telemetry", "sc-tracing", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", "sp-state-machine", "tracing", ] @@ -1783,10 +1783,10 @@ "polkadot-overseer", "polkadot-service", "sc-client-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", "sp-state-machine", "thiserror", ] @@ -1808,11 +1808,11 @@ "polkadot-service", "sc-client-api", "sc-rpc-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-core", + "sp-runtime", "sp-state-machine", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage", "tokio", "tracing", "url", @@ -1826,9 +1826,9 @@ "cumulus-primitives-core", "parity-scale-codec 3.2.1", "polkadot-primitives", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-state-machine", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", ] [[package]] @@ -2313,32 +2313,14 @@ [[package]] name = "evm" version = "0.35.0" -source = "git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29#e9252ed42dc26fc85b6703b1ba50660a08209e55" -dependencies = [ - "auto_impl", - "ethereum", - "evm-core 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29)", - "evm-gasometer 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29)", - "evm-runtime 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29)", - "log", - "parity-scale-codec 3.2.1", - "primitive-types", - "rlp", - "scale-info", - "sha3", -] - -[[package]] -name = "evm" -version = "0.35.0" source = "git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.30#e9252ed42dc26fc85b6703b1ba50660a08209e55" dependencies = [ "auto_impl", "environmental", "ethereum", - "evm-core 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.30)", - "evm-gasometer 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.30)", - "evm-runtime 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.30)", + "evm-core", + "evm-gasometer", + "evm-runtime", "log", "parity-scale-codec 3.2.1", "primitive-types", @@ -2355,16 +2337,16 @@ "concat-idents", "ethereum", "evm-coder-procedural", - "evm-core 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "evm-core", + "frame-support", "hex", "hex-literal", "impl-trait-for-tuples", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.29)", + "pallet-evm", "primitive-types", "sha3-const", "similar-asserts", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", ] [[package]] @@ -2382,32 +2364,12 @@ [[package]] name = "evm-core" version = "0.35.0" -source = "git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29#e9252ed42dc26fc85b6703b1ba50660a08209e55" -dependencies = [ - "parity-scale-codec 3.2.1", - "primitive-types", - "scale-info", -] - -[[package]] -name = "evm-core" -version = "0.35.0" source = "git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.30#e9252ed42dc26fc85b6703b1ba50660a08209e55" dependencies = [ "parity-scale-codec 3.2.1", "primitive-types", "scale-info", "serde", -] - -[[package]] -name = "evm-gasometer" -version = "0.35.0" -source = "git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29#e9252ed42dc26fc85b6703b1ba50660a08209e55" -dependencies = [ - "evm-core 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29)", - "evm-runtime 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29)", - "primitive-types", ] [[package]] @@ -2416,30 +2378,19 @@ source = "git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.30#e9252ed42dc26fc85b6703b1ba50660a08209e55" dependencies = [ "environmental", - "evm-core 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.30)", - "evm-runtime 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.30)", + "evm-core", + "evm-runtime", "primitive-types", ] [[package]] name = "evm-runtime" version = "0.35.0" -source = "git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29#e9252ed42dc26fc85b6703b1ba50660a08209e55" -dependencies = [ - "auto_impl", - "evm-core 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29)", - "primitive-types", - "sha3", -] - -[[package]] -name = "evm-runtime" -version = "0.35.0" source = "git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.30#e9252ed42dc26fc85b6703b1ba50660a08209e55" dependencies = [ "auto_impl", "environmental", - "evm-core 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.30)", + "evm-core", "primitive-types", "sha3", ] @@ -2535,11 +2486,11 @@ "fp-rpc", "sc-client-api", "sc-consensus", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "thiserror", ] @@ -2554,9 +2505,9 @@ "parity-scale-codec 3.2.1", "parking_lot 0.12.1", "sc-client-db", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-database", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", ] [[package]] @@ -2571,9 +2522,9 @@ "futures-timer", "log", "sc-client-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", ] [[package]] @@ -2583,7 +2534,7 @@ dependencies = [ "ethereum", "ethereum-types", - "evm 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.30)", + "evm", "fc-db", "fc-rpc-core", "fp-rpc", @@ -2606,14 +2557,14 @@ "sc-service", "sc-transaction-pool", "sc-transaction-pool-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-storage", "substrate-prometheus-endpoint", "tokio", ] @@ -2765,22 +2716,9 @@ dependencies = [ "ethereum", "parity-scale-codec 3.2.1", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", -] - -[[package]] -name = "fp-evm" -version = "3.0.0-dev" -source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.29#852f994e82f9e5718dde75e8c4d877db5a44dd45" -dependencies = [ - "evm 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "impl-trait-for-tuples", - "parity-scale-codec 3.2.1", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -2788,22 +2726,13 @@ version = "3.0.0-dev" source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4" dependencies = [ - "evm 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "evm", + "frame-support", "impl-trait-for-tuples", "parity-scale-codec 3.2.1", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", -] - -[[package]] -name = "fp-evm-mapping" -version = "0.1.0" -source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.29#852f994e82f9e5718dde75e8c4d877db5a44dd45" -dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", + "sp-core", + "sp-std", ] [[package]] @@ -2811,8 +2740,8 @@ version = "0.1.0" source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "sp-core", ] [[package]] @@ -2822,14 +2751,14 @@ dependencies = [ "ethereum", "ethereum-types", - "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "fp-evm", "parity-scale-codec 3.2.1", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -2838,14 +2767,14 @@ source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4" dependencies = [ "ethereum", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "parity-scale-codec 3.2.1", "parity-util-mem", "scale-info", "serde", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-debug-derive", + "sp-io", + "sp-runtime", ] [[package]] @@ -2861,22 +2790,22 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "linregress", "log", "parity-scale-codec 3.2.1", "paste", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-runtime", + "sp-runtime-interface", + "sp-std", + "sp-storage", ] [[package]] @@ -2890,8 +2819,8 @@ "clap", "comfy-table", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "gethostname", "handlebars", "hash-db", @@ -2914,16 +2843,16 @@ "serde", "serde_json", "serde_nanos", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-database", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities", + "sp-inherents", "sp-keystore", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-state-machine", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage", "sp-trie", "tempfile", "thiserror", @@ -2947,14 +2876,14 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-election-provider-solution-type", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "scale-info", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic", "sp-npos-elections", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -2962,16 +2891,16 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "frame-try-runtime", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-tracing", ] [[package]] @@ -2984,34 +2913,6 @@ "parity-scale-codec 3.2.1", "scale-info", "serde", -] - -[[package]] -name = "frame-support" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "bitflags", - "frame-metadata", - "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "impl-trait-for-tuples", - "k256", - "log", - "parity-scale-codec 3.2.1", - "paste", - "scale-info", - "smallvec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "tt-call", ] [[package]] @@ -3021,7 +2922,7 @@ dependencies = [ "bitflags", "frame-metadata", - "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support-procedural", "impl-trait-for-tuples", "k256", "log", @@ -3031,33 +2932,19 @@ "scale-info", "serde", "smallvec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-arithmetic", + "sp-core", + "sp-core-hashing-proc-macro", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-staking", "sp-state-machine", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", + "sp-tracing", "sp-weights", "tt-call", -] - -[[package]] -name = "frame-support-procedural" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "Inflector", - "cfg-expr", - "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "itertools", - "proc-macro2", - "quote", - "syn", ] [[package]] @@ -3067,20 +2954,8 @@ dependencies = [ "Inflector", "cfg-expr", - "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support-procedural-tools", "itertools", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "frame-support-procedural-tools" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -3091,18 +2966,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support-procedural-tools-derive", "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "frame-support-procedural-tools-derive" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ "proc-macro2", "quote", "syn", @@ -3116,22 +2981,6 @@ "proc-macro2", "quote", "syn", -] - -[[package]] -name = "frame-system" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "log", - "parity-scale-codec 3.2.1", - "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", ] [[package]] @@ -3139,16 +2988,16 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "log", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-version", "sp-weights", ] @@ -3158,13 +3007,13 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -3173,7 +3022,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec 3.2.1", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", ] [[package]] @@ -3181,11 +3030,11 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "parity-scale-codec 3.2.1", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-runtime", + "sp-std", ] [[package]] @@ -4089,8 +3938,8 @@ "frame-benchmarking", "frame-election-provider-support", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -4131,7 +3980,7 @@ "pallet-society", "pallet-staking", "pallet-staking-reward-fn", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -4149,23 +3998,23 @@ "serde", "serde_derive", "smallvec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-arithmetic", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-inherents", + "sp-io", "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", + "sp-std", "sp-transaction-pool", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "static_assertions", "substrate-wasm-builder", "xcm", @@ -4178,11 +4027,11 @@ version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", ] [[package]] @@ -5491,13 +5340,13 @@ "cumulus-primitives-utility", "derivative", "evm-coder", - "fp-evm-mapping 0.1.0 (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "fp-evm-mapping", "fp-rpc", "fp-self-contained", "frame-benchmarking", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -5516,7 +5365,7 @@ "pallet-common", "pallet-configuration", "pallet-ethereum", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "pallet-evm", "pallet-evm-coder-substrate", "pallet-evm-contract-helpers", "pallet-evm-migration", @@ -5533,7 +5382,7 @@ "pallet-sudo", "pallet-template-transaction-payment", "pallet-test-utils", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", @@ -5548,19 +5397,19 @@ "scale-info", "serde", "smallvec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-arithmetic", "sp-block-builder", "sp-consensus-aura", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-inherents", + "sp-io", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-session", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", "sp-transaction-pool", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "substrate-wasm-builder", "up-common", "up-data-structs", @@ -5633,14 +5482,14 @@ version = "0.4.1-dev" source = "git+https://github.com/uniquenetwork/open-runtime-module-library?branch=polkadot-v0.9.30#4020ff64cfcad3dcc7f4f090cc9bc7699a78cc9c" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "orml-traits", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5648,16 +5497,16 @@ version = "0.4.1-dev" source = "git+https://github.com/uniquenetwork/open-runtime-module-library?branch=polkadot-v0.9.30#4020ff64cfcad3dcc7f4f090cc9bc7699a78cc9c" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "impl-trait-for-tuples", "num-traits", "orml-utilities", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io", + "sp-runtime", + "sp-std", "xcm", ] @@ -5666,13 +5515,13 @@ version = "0.4.1-dev" source = "git+https://github.com/uniquenetwork/open-runtime-module-library?branch=polkadot-v0.9.30#4020ff64cfcad3dcc7f4f090cc9bc7699a78cc9c" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5680,14 +5529,14 @@ version = "0.4.1-dev" source = "git+https://github.com/uniquenetwork/open-runtime-module-library?branch=polkadot-v0.9.30#4020ff64cfcad3dcc7f4f090cc9bc7699a78cc9c" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5695,11 +5544,11 @@ version = "0.4.1-dev" source = "git+https://github.com/uniquenetwork/open-runtime-module-library?branch=polkadot-v0.9.30#4020ff64cfcad3dcc7f4f090cc9bc7699a78cc9c" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "orml-traits", "parity-scale-codec 3.2.1", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", "xcm", "xcm-executor", ] @@ -5710,17 +5559,17 @@ source = "git+https://github.com/uniquenetwork/open-runtime-module-library?branch=polkadot-v0.9.30#4020ff64cfcad3dcc7f4f090cc9bc7699a78cc9c" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "orml-traits", "orml-xcm-support", "pallet-xcm", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io", + "sp-runtime", + "sp-std", "xcm", "xcm-executor", ] @@ -5745,23 +5594,23 @@ version = "0.1.0" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-balances", "pallet-common", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "pallet-evm", "pallet-evm-contract-helpers", "pallet-evm-migration", "pallet-randomness-collective-flip", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-unique", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "up-data-structs", ] @@ -5770,15 +5619,15 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", + "pallet-timestamp", "parity-scale-codec 3.2.1", "scale-info", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto", "sp-consensus-aura", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5786,15 +5635,15 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-session", "parity-scale-codec 3.2.1", "scale-info", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto", "sp-authority-discovery", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5802,14 +5651,14 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "parity-scale-codec 3.2.1", "scale-info", "sp-authorship", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5818,22 +5667,22 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "pallet-authorship", "pallet-session", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "parity-scale-codec 3.2.1", "scale-info", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", + "sp-std", ] [[package]] @@ -5843,17 +5692,17 @@ dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "pallet-balances", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-tracing", ] [[package]] @@ -5862,13 +5711,13 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "parity-scale-codec 3.2.1", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5876,14 +5725,14 @@ version = "1.0.0" source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4" dependencies = [ - "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "fp-evm", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", ] [[package]] @@ -5892,14 +5741,14 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "beefy-primitives", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-session", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5910,8 +5759,8 @@ "array-bytes", "beefy-merkle-tree", "beefy-primitives", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "pallet-beefy", "pallet-mmr", @@ -5919,10 +5768,10 @@ "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5931,16 +5780,16 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "pallet-treasury", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5949,17 +5798,17 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "pallet-bounties", "pallet-treasury", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5968,15 +5817,15 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5985,18 +5834,18 @@ dependencies = [ "ethereum", "evm-coder", - "fp-evm-mapping 0.1.0 (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "fp-evm-mapping", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "frame-support", + "frame-system", + "pallet-evm", "pallet-evm-coder-substrate", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", + "sp-std", "up-data-structs", ] @@ -6004,16 +5853,16 @@ name = "pallet-configuration" version = "0.1.1" dependencies = [ - "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "fp-evm", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "scale-info", "smallvec", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -6022,14 +5871,14 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6039,19 +5888,19 @@ dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "pallet-election-provider-support-benchmarking", "parity-scale-codec 3.2.1", "rand 0.7.3", "scale-info", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic", + "sp-core", + "sp-io", "sp-npos-elections", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", "static_assertions", "strum", ] @@ -6063,10 +5912,10 @@ dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system", "parity-scale-codec 3.2.1", "sp-npos-elections", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", ] [[package]] @@ -6075,16 +5924,16 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", "sp-npos-elections", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -6094,51 +5943,26 @@ dependencies = [ "ethereum", "ethereum-types", - "evm 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.30)", + "evm", "fp-consensus", - "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", - "fp-evm-mapping 0.1.0 (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "fp-evm", + "fp-evm-mapping", "fp-rpc", "fp-self-contained", "fp-storage", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-evm", + "pallet-timestamp", "parity-scale-codec 3.2.1", "rlp", "scale-info", "serde", "sha3", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", -] - -[[package]] -name = "pallet-evm" -version = "6.0.0-dev" -source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.29#852f994e82f9e5718dde75e8c4d877db5a44dd45" -dependencies = [ - "evm 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29)", - "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.29)", - "fp-evm-mapping 0.1.0 (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.29)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "hex", - "impl-trait-for-tuples", - "log", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "parity-scale-codec 3.2.1", - "primitive-types", - "rlp", - "scale-info", - "sha3", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6146,26 +5970,26 @@ version = "6.0.0-dev" source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4" dependencies = [ - "evm 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.30)", - "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", - "fp-evm-mapping 0.1.0 (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "evm", + "fp-evm", + "fp-evm-mapping", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "hex", "impl-trait-for-tuples", "log", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "parity-scale-codec 3.2.1", "primitive-types", "rlp", "scale-info", "serde", "sha3", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6175,14 +5999,14 @@ "ethereum", "evm-coder", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-ethereum", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "pallet-evm", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-std", "up-data-structs", ] @@ -6192,19 +6016,19 @@ dependencies = [ "ethereum", "evm-coder", - "fp-evm-mapping 0.1.0 (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "fp-evm-mapping", + "frame-support", + "frame-system", "log", "pallet-common", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "pallet-evm", "pallet-evm-coder-substrate", "pallet-evm-transaction-payment", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", + "sp-std", "up-data-structs", "up-sponsorship", ] @@ -6213,35 +6037,35 @@ name = "pallet-evm-migration" version = "0.1.1" dependencies = [ - "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "fp-evm", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "frame-support", + "frame-system", + "pallet-evm", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-evm-transaction-payment" version = "0.1.1" dependencies = [ - "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", - "fp-evm-mapping 0.1.0 (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "fp-evm", + "fp-evm-mapping", + "frame-support", + "frame-system", "pallet-ethereum", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "pallet-evm", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "up-sponsorship", ] @@ -6252,18 +6076,18 @@ dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "pallet-balances", "pallet-staking", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "parity-scale-codec 3.2.1", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -6271,23 +6095,23 @@ version = "0.1.0" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "hex", "log", "orml-tokens", "pallet-balances", "pallet-common", "pallet-fungible", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "parity-scale-codec 3.2.1", "scale-info", "serde", "serde_json", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "up-data-structs", "xcm", "xcm-builder", @@ -6301,17 +6125,17 @@ "ethereum", "evm-coder", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-common", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "pallet-evm", "pallet-evm-coder-substrate", "pallet-structure", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", + "sp-std", "up-data-structs", ] @@ -6321,13 +6145,13 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "scale-info", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic", + "sp-runtime", + "sp-std", ] [[package]] @@ -6336,21 +6160,21 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "pallet-authorship", "pallet-session", "parity-scale-codec 3.2.1", "scale-info", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto", + "sp-core", "sp-finality-grandpa", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", + "sp-std", ] [[package]] @@ -6360,13 +6184,13 @@ dependencies = [ "enumflags2", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6375,18 +6199,18 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "pallet-authorship", "parity-scale-codec 3.2.1", "scale-info", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -6395,15 +6219,15 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", "sp-keyring", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -6411,18 +6235,18 @@ version = "0.1.1" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-balances", "pallet-randomness-collective-flip", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6431,15 +6255,15 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6449,15 +6273,15 @@ dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", "sp-mmr-primitives", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -6468,11 +6292,11 @@ "jsonrpsee", "parity-scale-codec 3.2.1", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-mmr-primitives", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", ] [[package]] @@ -6481,13 +6305,13 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6495,16 +6319,16 @@ version = "1.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -6514,17 +6338,17 @@ dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-bags-list", "pallet-nomination-pools", "pallet-staking", "parity-scale-codec 3.2.1", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-runtime-interface", + "sp-staking", + "sp-std", ] [[package]] @@ -6533,8 +6357,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec 3.2.1", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-std", ] [[package]] @@ -6544,17 +6368,17 @@ "ethereum", "evm-coder", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-common", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "pallet-evm", "pallet-evm-coder-substrate", "pallet-structure", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", + "sp-std", "struct-versioning", "up-data-structs", ] @@ -6564,16 +6388,16 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "pallet-balances", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -6583,8 +6407,8 @@ dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-babe", "pallet-balances", "pallet-grandpa", @@ -6594,9 +6418,9 @@ "pallet-staking", "parity-scale-codec 3.2.1", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -6605,14 +6429,14 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6621,13 +6445,13 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6635,13 +6459,13 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "safe-mix", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -6650,13 +6474,13 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6667,17 +6491,17 @@ "ethereum", "evm-coder", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-common", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "pallet-evm", "pallet-evm-coder-substrate", "pallet-structure", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", + "sp-std", "struct-versioning", "up-data-structs", ] @@ -6688,18 +6512,18 @@ dependencies = [ "derivative", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-common", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "pallet-evm", "pallet-nonfungible", "pallet-structure", "parity-scale-codec 3.2.1", "rmrk-traits", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", + "sp-std", "up-data-structs", ] @@ -6708,18 +6532,18 @@ version = "0.1.2" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-common", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "pallet-evm", "pallet-nonfungible", "pallet-rmrk-core", "parity-scale-codec 3.2.1", "rmrk-traits", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", + "sp-std", "up-data-structs", ] @@ -6729,14 +6553,14 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "parity-scale-codec 3.2.1", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6744,19 +6568,19 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "log", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", + "sp-std", "sp-trie", ] @@ -6766,14 +6590,14 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-session", "pallet-staking", "rand 0.7.3", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-session", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", ] [[package]] @@ -6781,13 +6605,13 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "rand_chacha 0.2.2", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -6797,8 +6621,8 @@ dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "pallet-authorship", "pallet-session", @@ -6806,11 +6630,11 @@ "rand_chacha 0.2.2", "scale-info", "serde", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -6830,7 +6654,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "log", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic", ] [[package]] @@ -6838,13 +6662,13 @@ version = "0.1.2" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-common", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "pallet-evm", "parity-scale-codec 3.2.1", "scale-info", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", "up-data-structs", ] @@ -6853,13 +6677,13 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6868,17 +6692,17 @@ source = "git+https://github.com/uniquenetwork/pallet-sponsoring?branch=polkadot-v0.9.30#39dd82158d6caa9d89105441bf2f7111a6e686e5" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-balances", "pallet-transaction-payment", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "up-sponsorship", ] @@ -6886,8 +6710,8 @@ name = "pallet-test-utils" version = "0.1.0" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-unique-scheduler-v2", "parity-scale-codec 3.2.1", "scale-info", @@ -6896,35 +6720,19 @@ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "log", - "parity-scale-codec 3.2.1", - "scale-info", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", -] - -[[package]] -name = "pallet-timestamp" -version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "parity-scale-codec 3.2.1", "scale-info", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-std", + "sp-timestamp", ] [[package]] @@ -6933,17 +6741,17 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "pallet-treasury", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6951,15 +6759,15 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6970,11 +6778,11 @@ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec 3.2.1", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-rpc", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", ] [[package]] @@ -6984,8 +6792,8 @@ dependencies = [ "pallet-transaction-payment", "parity-scale-codec 3.2.1", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-runtime", ] [[package]] @@ -6994,15 +6802,15 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "pallet-balances", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -7012,20 +6820,20 @@ "ethereum", "evm-coder", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-common", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "pallet-evm", "pallet-evm-coder-substrate", "pallet-nonfungible", "pallet-refungible", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "up-data-structs", ] @@ -7034,16 +6842,16 @@ version = "0.1.1" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "substrate-test-utils", "up-sponsorship", ] @@ -7053,16 +6861,16 @@ version = "0.1.0" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "pallet-preimage", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "substrate-test-utils", ] @@ -7072,14 +6880,14 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -7088,13 +6896,13 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "parity-scale-codec 3.2.1", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -7102,15 +6910,15 @@ version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", + "sp-std", "xcm", "xcm-executor", ] @@ -7121,13 +6929,13 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "parity-scale-codec 3.2.1", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", "xcm", "xcm-executor", ] @@ -7138,8 +6946,8 @@ source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec 3.2.1", "scale-info", "serde", @@ -7518,7 +7326,7 @@ "polkadot-node-subsystem-util", "polkadot-primitives", "rand 0.8.5", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-keystore", "thiserror", "tracing-gum", @@ -7563,7 +7371,7 @@ "sc-service", "sc-sysinfo", "sc-tracing", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-keyring", "sp-trie", "substrate-build-script-utils", @@ -7579,7 +7387,7 @@ "beefy-primitives", "frame-benchmarking", "frame-benchmarking-cli", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system", "frame-system-rpc-runtime-api", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -7592,22 +7400,22 @@ "sc-consensus", "sc-executor", "sc-service", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-authority-discovery", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-finality-grandpa", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-keyring", "sp-mmr-primitives", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-session", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage", + "sp-timestamp", "sp-transaction-pool", ] @@ -7625,9 +7433,9 @@ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-keystore", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "thiserror", "tracing-gum", ] @@ -7640,9 +7448,9 @@ "parity-scale-codec 3.2.1", "parity-util-mem", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -7662,7 +7470,7 @@ "polkadot-node-subsystem-util", "polkadot-primitives", "sc-network", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto", "sp-keystore", "thiserror", "tracing-gum", @@ -7677,7 +7485,7 @@ "polkadot-node-primitives", "polkadot-primitives", "reed-solomon-novelpoly", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-trie", "thiserror", ] @@ -7696,8 +7504,8 @@ "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto", + "sp-core", "sp-keystore", "tracing-gum", ] @@ -7738,7 +7546,7 @@ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-maybe-compressed-blob", "thiserror", "tracing-gum", @@ -7765,10 +7573,10 @@ "polkadot-primitives", "sc-keystore", "schnorrkel", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto", "sp-consensus", "sp-consensus-slots", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "thiserror", "tracing-gum", ] @@ -7907,8 +7715,8 @@ "polkadot-node-subsystem", "polkadot-primitives", "sp-blockchain", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", + "sp-runtime", "thiserror", "tracing-gum", ] @@ -7953,12 +7761,12 @@ "sc-executor-common", "sc-executor-wasmtime", "slotmap", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-externalities", + "sp-io", "sp-maybe-compressed-blob", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-tracing", + "sp-wasm-interface", "tempfile", "tracing-gum", ] @@ -8009,7 +7817,7 @@ "polkadot-node-primitives", "polkadot-primitives", "sc-network", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "thiserror", ] @@ -8067,10 +7875,10 @@ "polkadot-primitives", "schnorrkel", "serde", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-keystore", "sp-maybe-compressed-blob", "thiserror", @@ -8103,7 +7911,7 @@ "polkadot-statement-table", "sc-network", "smallvec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-authority-discovery", "sp-consensus-babe", "substrate-prometheus-endpoint", @@ -8136,8 +7944,8 @@ "polkadot-primitives", "prioritized-metered-channel", "rand 0.8.5", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto", + "sp-core", "sp-keystore", "thiserror", "tracing-gum", @@ -8161,8 +7969,8 @@ "polkadot-node-subsystem-types", "polkadot-primitives", "sc-client-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-core", "tracing-gum", ] @@ -8172,15 +7980,15 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "derive_more", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "parity-scale-codec 3.2.1", "parity-util-mem", "polkadot-core-primitives", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -8204,7 +8012,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "bitvec 1.0.1", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system", "hex-literal", "parity-scale-codec 3.2.1", "parity-util-mem", @@ -8212,20 +8020,20 @@ "polkadot-parachain", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-application-crypto", + "sp-arithmetic", "sp-authority-discovery", "sp-consensus-slots", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-inherents", + "sp-io", "sp-keystore", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-staking", + "sp-std", "sp-trie", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", ] [[package]] @@ -8249,13 +8057,13 @@ "sc-rpc", "sc-sync-state-rpc", "sc-transaction-pool-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-keystore", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "substrate-frame-rpc-system", "substrate-state-trie-migration-rpc", ] @@ -8270,8 +8078,8 @@ "frame-benchmarking", "frame-election-provider-support", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -8308,7 +8116,7 @@ "pallet-session-benchmarking", "pallet-staking", "pallet-staking-reward-curve", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -8326,22 +8134,22 @@ "serde", "serde_derive", "smallvec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-inherents", + "sp-io", "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", + "sp-std", "sp-transaction-pool", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "static_assertions", "substrate-wasm-builder", "xcm", @@ -8358,8 +8166,8 @@ "bitvec 1.0.1", "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "libsecp256k1", "log", @@ -8371,7 +8179,7 @@ "pallet-election-provider-multi-phase", "pallet-session", "pallet-staking", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-transaction-payment", "pallet-treasury", "pallet-vesting", @@ -8383,15 +8191,15 @@ "serde", "serde_derive", "slot-range-helper", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-core", + "sp-inherents", + "sp-io", "sp-npos-elections", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", + "sp-std", "static_assertions", "xcm", ] @@ -8401,11 +8209,11 @@ version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", ] [[package]] @@ -8416,8 +8224,8 @@ "bs58", "parity-scale-codec 3.2.1", "polkadot-primitives", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", + "sp-tracing", ] [[package]] @@ -8429,8 +8237,8 @@ "bitvec 1.0.1", "derive_more", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "pallet-authority-discovery", "pallet-authorship", @@ -8438,7 +8246,7 @@ "pallet-balances", "pallet-session", "pallet-staking", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-vesting", "parity-scale-codec 3.2.1", "polkadot-primitives", @@ -8448,16 +8256,16 @@ "rustc-hex", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-inherents", + "sp-io", "sp-keystore", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", + "sp-std", "static_assertions", "xcm", "xcm-executor", @@ -8471,7 +8279,7 @@ "async-trait", "beefy-gadget", "beefy-primitives", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "frame-system-rpc-runtime-api", "futures 0.3.25", "hex-literal", @@ -8542,23 +8350,23 @@ "sc-transaction-pool", "serde", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-authority-discovery", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-finality-grandpa", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", + "sp-io", "sp-keystore", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-session", "sp-state-machine", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage", + "sp-timestamp", "sp-transaction-pool", "sp-trie", "substrate-prometheus-endpoint", @@ -8583,7 +8391,7 @@ "polkadot-node-subsystem-util", "polkadot-primitives", "sp-keystore", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", "thiserror", "tracing-gum", ] @@ -8595,7 +8403,7 @@ dependencies = [ "parity-scale-codec 3.2.1", "polkadot-primitives", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", ] [[package]] @@ -8607,8 +8415,8 @@ "bitvec 1.0.1", "frame-election-provider-support", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "frame-system-rpc-runtime-api", "log", "pallet-authority-discovery", @@ -8622,7 +8430,7 @@ "pallet-staking", "pallet-staking-reward-curve", "pallet-sudo", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-vesting", @@ -8637,21 +8445,21 @@ "serde", "serde_derive", "smallvec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-inherents", + "sp-io", "sp-mmr-primitives", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", + "sp-std", "sp-transaction-pool", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "substrate-wasm-builder", "test-runtime-constants", "xcm", @@ -8665,7 +8473,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "frame-benchmarking", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system", "futures 0.3.25", "hex", "pallet-balances", @@ -8695,16 +8503,16 @@ "sc-service", "sc-tracing", "sc-transaction-pool", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic", "sp-authority-discovery", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-finality-grandpa", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-keyring", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-state-machine", "substrate-test-client", "tempfile", @@ -9011,13 +8819,13 @@ "cumulus-primitives-utility", "derivative", "evm-coder", - "fp-evm-mapping 0.1.0 (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "fp-evm-mapping", "fp-rpc", "fp-self-contained", "frame-benchmarking", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -9036,7 +8844,7 @@ "pallet-common", "pallet-configuration", "pallet-ethereum", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "pallet-evm", "pallet-evm-coder-substrate", "pallet-evm-contract-helpers", "pallet-evm-migration", @@ -9052,7 +8860,7 @@ "pallet-structure", "pallet-sudo", "pallet-template-transaction-payment", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", @@ -9066,19 +8874,19 @@ "scale-info", "serde", "smallvec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-arithmetic", "sp-block-builder", "sp-consensus-aura", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-inherents", + "sp-io", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-session", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", "sp-transaction-pool", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "substrate-wasm-builder", "up-common", "up-data-structs", @@ -9359,10 +9167,10 @@ "parity-scale-codec 3.2.1", "serde", "serde_json", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-version", ] [[package]] @@ -9438,10 +9246,10 @@ "parity-scale-codec 2.3.1", "rmrk-traits", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -9472,8 +9280,8 @@ "beefy-primitives", "frame-benchmarking", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "hex-literal", @@ -9506,7 +9314,7 @@ "pallet-society", "pallet-staking", "pallet-sudo", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -9525,21 +9333,21 @@ "serde", "serde_derive", "smallvec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-inherents", + "sp-io", "sp-mmr-primitives", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", + "sp-std", "sp-transaction-pool", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "static_assertions", "substrate-wasm-builder", "xcm", @@ -9552,11 +9360,11 @@ version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", ] [[package]] @@ -9723,8 +9531,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "log", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-wasm-interface", "thiserror", ] @@ -9745,12 +9553,12 @@ "rand 0.7.3", "sc-client-api", "sc-network-common", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-authority-discovery", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-keystore", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -9769,12 +9577,12 @@ "sc-proposer-metrics", "sc-telemetry", "sc-transaction-pool-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-inherents", + "sp-runtime", "substrate-prometheus-endpoint", ] @@ -9785,12 +9593,12 @@ dependencies = [ "parity-scale-codec 3.2.1", "sc-client-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-inherents", + "sp-runtime", "sp-state-machine", ] @@ -9807,8 +9615,8 @@ "sc-telemetry", "serde", "serde_json", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", ] [[package]] @@ -9851,12 +9659,12 @@ "serde", "serde_json", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-keyring", "sp-keystore", "sp-panic-handler", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-version", "thiserror", "tiny-bip39", "tokio", @@ -9876,16 +9684,16 @@ "sc-executor", "sc-transaction-pool-api", "sc-utils", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-database", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities", "sp-keystore", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-state-machine", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage", "sp-trie", "substrate-prometheus-endpoint", ] @@ -9906,11 +9714,11 @@ "parking_lot 0.12.1", "sc-client-api", "sc-state-db", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-database", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-state-machine", "sp-trie", ] @@ -9929,11 +9737,11 @@ "sc-client-api", "sc-utils", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", "sp-state-machine", "substrate-prometheus-endpoint", "thiserror", @@ -9953,17 +9761,17 @@ "sc-consensus", "sc-consensus-slots", "sc-telemetry", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", "sp-consensus-slots", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-inherents", "sp-keystore", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -9992,20 +9800,20 @@ "sc-telemetry", "schnorrkel", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-inherents", + "sp-io", "sp-keystore", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-version", "substrate-prometheus-endpoint", "thiserror", ] @@ -10021,14 +9829,14 @@ "sc-consensus-epochs", "sc-rpc-api", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-application-crypto", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-keystore", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "thiserror", ] @@ -10042,7 +9850,7 @@ "sc-client-api", "sc-consensus", "sp-blockchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", ] [[package]] @@ -10064,17 +9872,17 @@ "sc-transaction-pool", "sc-transaction-pool-api", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-consensus", "sp-consensus-aura", "sp-consensus-babe", "sp-consensus-slots", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-inherents", "sp-keystore", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-timestamp", "substrate-prometheus-endpoint", "thiserror", ] @@ -10092,13 +9900,13 @@ "sc-client-api", "sc-consensus", "sc-telemetry", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic", "sp-blockchain", "sp-consensus", "sp-consensus-slots", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-inherents", + "sp-runtime", "sp-state-machine", "thiserror", ] @@ -10115,17 +9923,17 @@ "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-core", + "sp-core-hashing-proc-macro", + "sp-externalities", + "sp-io", "sp-panic-handler", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime-interface", "sp-tasks", "sp-trie", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", + "sp-wasm-interface", "tracing", "wasmi", ] @@ -10140,7 +9948,7 @@ "sc-allocator", "sp-maybe-compressed-blob", "sp-sandbox", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-wasm-interface", "thiserror", "wasm-instrument", "wasmi", @@ -10155,9 +9963,9 @@ "parity-scale-codec 3.2.1", "sc-allocator", "sc-executor-common", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime-interface", "sp-sandbox", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-wasm-interface", "wasmi", ] @@ -10175,9 +9983,9 @@ "rustix", "sc-allocator", "sc-executor-common", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime-interface", "sp-sandbox", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-wasm-interface", "wasmtime", ] @@ -10209,15 +10017,15 @@ "sc-telemetry", "sc-utils", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-application-crypto", + "sp-arithmetic", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-finality-grandpa", "sp-keystore", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -10238,8 +10046,8 @@ "serde", "serde_json", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", "thiserror", ] @@ -10257,7 +10065,7 @@ "sc-network-common", "sc-transaction-pool-api", "sp-blockchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", ] [[package]] @@ -10269,8 +10077,8 @@ "async-trait", "parking_lot 0.12.1", "serde_json", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto", + "sp-core", "sp-keystore", "thiserror", ] @@ -10311,11 +10119,11 @@ "serde", "serde_json", "smallvec", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", "unsigned-varint", @@ -10336,7 +10144,7 @@ "sc-client-api", "sc-network-common", "sp-blockchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "thiserror", "unsigned-varint", "void", @@ -10363,7 +10171,7 @@ "sp-blockchain", "sp-consensus", "sp-finality-grandpa", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -10381,7 +10189,7 @@ "lru 0.7.8", "sc-network-common", "sc-peerset", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "substrate-prometheus-endpoint", "tracing", ] @@ -10402,8 +10210,8 @@ "sc-network-common", "sc-peerset", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", "thiserror", ] @@ -10426,12 +10234,12 @@ "sc-network-common", "sc-peerset", "smallvec", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-finality-grandpa", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "thiserror", ] @@ -10450,7 +10258,7 @@ "sc-network-common", "sc-peerset", "sp-consensus", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "substrate-prometheus-endpoint", ] @@ -10476,10 +10284,10 @@ "sc-network-common", "sc-peerset", "sc-utils", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-core", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "threadpool", "tracing", ] @@ -10525,15 +10333,15 @@ "sc-transaction-pool-api", "sc-utils", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-keystore", "sp-offchain", "sp-rpc", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-session", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", ] [[package]] @@ -10551,11 +10359,11 @@ "scale-info", "serde", "serde_json", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-rpc", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-tracing", + "sp-version", "thiserror", ] @@ -10615,24 +10423,24 @@ "sc-utils", "serde", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-externalities", + "sp-inherents", "sp-keystore", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-session", "sp-state-machine", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage", + "sp-tracing", "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "static_init 1.0.3", "substrate-prometheus-endpoint", "tempfile", @@ -10653,7 +10461,7 @@ "parity-util-mem-derive", "parking_lot 0.12.1", "sc-client-api", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", ] [[package]] @@ -10671,7 +10479,7 @@ "serde", "serde_json", "sp-blockchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "thiserror", ] @@ -10689,9 +10497,9 @@ "sc-telemetry", "serde", "serde_json", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-std", ] [[package]] @@ -10731,12 +10539,12 @@ "sc-rpc-server", "sc-tracing-proc-macro", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-rpc", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-tracing", "thiserror", "tracing", "tracing-log", @@ -10770,11 +10578,11 @@ "sc-transaction-pool-api", "sc-utils", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", + "sp-tracing", "sp-transaction-pool", "substrate-prometheus-endpoint", "thiserror", @@ -10789,7 +10597,7 @@ "log", "serde", "sp-blockchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "thiserror", ] @@ -11193,8 +11001,8 @@ "enumn", "parity-scale-codec 3.2.1", "paste", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -11259,20 +11067,6 @@ "log", "rand 0.8.5", "sha-1", -] - -[[package]] -name = "sp-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "log", - "parity-scale-codec 3.2.1", - "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", ] [[package]] @@ -11283,26 +11077,14 @@ "hash-db", "log", "parity-scale-codec 3.2.1", - "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api-proc-macro", + "sp-core", + "sp-runtime", "sp-state-machine", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", "sp-trie", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "thiserror", -] - -[[package]] -name = "sp-api-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "blake2", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", ] [[package]] @@ -11315,18 +11097,6 @@ "proc-macro2", "quote", "syn", -] - -[[package]] -name = "sp-application-crypto" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "parity-scale-codec 3.2.1", - "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", ] [[package]] @@ -11337,23 +11107,9 @@ "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", -] - -[[package]] -name = "sp-arithmetic" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "integer-sqrt", - "num-traits", - "parity-scale-codec 3.2.1", - "scale-info", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "static_assertions", + "sp-core", + "sp-io", + "sp-std", ] [[package]] @@ -11366,8 +11122,8 @@ "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-debug-derive", + "sp-std", "static_assertions", ] @@ -11378,10 +11134,10 @@ dependencies = [ "parity-scale-codec 3.2.1", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-application-crypto", + "sp-runtime", + "sp-std", ] [[package]] @@ -11391,9 +11147,9 @@ dependencies = [ "async-trait", "parity-scale-codec 3.2.1", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", + "sp-runtime", + "sp-std", ] [[package]] @@ -11402,10 +11158,10 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec 3.2.1", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-inherents", + "sp-runtime", + "sp-std", ] [[package]] @@ -11418,10 +11174,10 @@ "lru 0.7.8", "parity-scale-codec 3.2.1", "parking_lot 0.12.1", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-consensus", "sp-database", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-state-machine", "thiserror", ] @@ -11436,12 +11192,12 @@ "futures-timer", "log", "parity-scale-codec 3.2.1", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-inherents", + "sp-runtime", "sp-state-machine", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", + "sp-version", "thiserror", ] @@ -11453,14 +11209,14 @@ "async-trait", "parity-scale-codec 3.2.1", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-application-crypto", "sp-consensus", "sp-consensus-slots", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", + "sp-runtime", + "sp-std", + "sp-timestamp", ] [[package]] @@ -11473,17 +11229,17 @@ "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-application-crypto", "sp-consensus", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-inherents", "sp-keystore", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", + "sp-timestamp", ] [[package]] @@ -11494,10 +11250,10 @@ "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic", + "sp-runtime", + "sp-std", + "sp-timestamp", ] [[package]] @@ -11508,33 +11264,9 @@ "parity-scale-codec 3.2.1", "scale-info", "schnorrkel", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", -] - -[[package]] -name = "sp-core" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "bitflags", - "byteorder", - "hash-db", - "hash256-std-hasher", - "log", - "num-traits", - "parity-scale-codec 3.2.1", - "parity-util-mem", - "primitive-types", - "scale-info", - "secrecy", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "ss58-registry", - "zeroize", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -11569,32 +11301,18 @@ "secp256k1", "secrecy", "serde", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core-hashing", + "sp-debug-derive", + "sp-externalities", + "sp-runtime-interface", + "sp-std", + "sp-storage", "ss58-registry", "substrate-bip39", "thiserror", "tiny-bip39", "wasmi", "zeroize", -] - -[[package]] -name = "sp-core-hashing" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "blake2", - "byteorder", - "digest 0.10.5", - "sha2 0.10.6", - "sha3", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "twox-hash", ] [[package]] @@ -11607,19 +11325,8 @@ "digest 0.10.5", "sha2 0.10.6", "sha3", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", "twox-hash", -] - -[[package]] -name = "sp-core-hashing-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "proc-macro2", - "quote", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "syn", ] [[package]] @@ -11629,7 +11336,7 @@ dependencies = [ "proc-macro2", "quote", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core-hashing", "syn", ] @@ -11640,16 +11347,6 @@ dependencies = [ "kvdb", "parking_lot 0.12.1", -] - -[[package]] -name = "sp-debug-derive" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "proc-macro2", - "quote", - "syn", ] [[package]] @@ -11660,17 +11357,6 @@ "proc-macro2", "quote", "syn", -] - -[[package]] -name = "sp-externalities" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "environmental", - "parity-scale-codec 3.2.1", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", ] [[package]] @@ -11680,8 +11366,8 @@ dependencies = [ "environmental", "parity-scale-codec 3.2.1", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", + "sp-storage", ] [[package]] @@ -11694,23 +11380,12 @@ "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-application-crypto", + "sp-core", "sp-keystore", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", -] - -[[package]] -name = "sp-inherents" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec 3.2.1", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", + "sp-runtime", + "sp-std", ] [[package]] @@ -11721,33 +11396,15 @@ "async-trait", "impl-trait-for-tuples", "parity-scale-codec 3.2.1", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", + "sp-std", "thiserror", ] [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "bytes", - "hash-db", - "parity-scale-codec 3.2.1", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "tracing", - "tracing-core", -] - -[[package]] -name = "sp-io" -version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "bytes", @@ -11758,15 +11415,15 @@ "parity-scale-codec 3.2.1", "parking_lot 0.12.1", "secp256k1", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-externalities", "sp-keystore", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime-interface", "sp-state-machine", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", + "sp-tracing", "sp-trie", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-wasm-interface", "tracing", "tracing-core", ] @@ -11777,8 +11434,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "lazy_static", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", "strum", ] @@ -11794,8 +11451,8 @@ "parking_lot 0.12.1", "schnorrkel", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-externalities", "thiserror", ] @@ -11816,11 +11473,11 @@ "log", "parity-scale-codec 3.2.1", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-core", + "sp-debug-derive", + "sp-runtime", + "sp-std", ] [[package]] @@ -11831,10 +11488,10 @@ "parity-scale-codec 3.2.1", "scale-info", "serde", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -11842,9 +11499,9 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-core", + "sp-runtime", ] [[package]] @@ -11864,27 +11521,7 @@ dependencies = [ "rustc-hash", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", -] - -[[package]] -name = "sp-runtime" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "either", - "hash256-std-hasher", - "impl-trait-for-tuples", - "log", - "parity-scale-codec 3.2.1", - "parity-util-mem", - "paste", - "scale-info", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", + "sp-core", ] [[package]] @@ -11902,30 +11539,12 @@ "rand 0.7.3", "scale-info", "serde", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-std", "sp-weights", -] - -[[package]] -name = "sp-runtime-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "bytes", - "impl-trait-for-tuples", - "parity-scale-codec 3.2.1", - "primitive-types", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-runtime-interface-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "static_assertions", ] [[package]] @@ -11937,25 +11556,13 @@ "impl-trait-for-tuples", "parity-scale-codec 3.2.1", "primitive-types", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime-interface-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities", + "sp-runtime-interface-proc-macro", + "sp-std", + "sp-storage", + "sp-tracing", + "sp-wasm-interface", "static_assertions", -] - -[[package]] -name = "sp-runtime-interface-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "Inflector", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", ] [[package]] @@ -11977,10 +11584,10 @@ dependencies = [ "log", "parity-scale-codec 3.2.1", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-std", + "sp-wasm-interface", "wasmi", ] @@ -11991,22 +11598,11 @@ dependencies = [ "parity-scale-codec 3.2.1", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", -] - -[[package]] -name = "sp-staking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "parity-scale-codec 3.2.1", - "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", + "sp-api", + "sp-core", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -12016,8 +11612,8 @@ dependencies = [ "parity-scale-codec 3.2.1", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -12032,10 +11628,10 @@ "parking_lot 0.12.1", "rand 0.7.3", "smallvec", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-externalities", "sp-panic-handler", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", "sp-trie", "thiserror", "tracing", @@ -12045,35 +11641,19 @@ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" - -[[package]] -name = "sp-std" -version = "4.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "parity-scale-codec 3.2.1", - "ref-cast", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", -] - -[[package]] -name = "sp-storage" -version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "impl-serde", "parity-scale-codec 3.2.1", "ref-cast", "serde", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-debug-derive", + "sp-std", ] [[package]] @@ -12082,23 +11662,11 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "log", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", -] - -[[package]] -name = "sp-timestamp" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "parity-scale-codec 3.2.1", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", + "sp-core", + "sp-externalities", + "sp-io", + "sp-runtime-interface", + "sp-std", ] [[package]] @@ -12110,31 +11678,20 @@ "futures-timer", "log", "parity-scale-codec 3.2.1", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-inherents", + "sp-runtime", + "sp-std", "thiserror", ] [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "parity-scale-codec 3.2.1", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "tracing", - "tracing-core", -] - -[[package]] -name = "sp-tracing" -version = "5.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec 3.2.1", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", "tracing", "tracing-core", "tracing-subscriber", @@ -12145,8 +11702,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-runtime", ] [[package]] @@ -12158,10 +11715,10 @@ "log", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-std", "sp-trie", ] @@ -12180,25 +11737,12 @@ "parity-scale-codec 3.2.1", "parking_lot 0.12.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-std", "thiserror", "tracing", "trie-db", "trie-root", -] - -[[package]] -name = "sp-version" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "parity-scale-codec 3.2.1", - "scale-info", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", - "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", ] [[package]] @@ -12211,22 +11755,11 @@ "parity-wasm 0.45.0", "scale-info", "serde", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core-hashing-proc-macro", + "sp-runtime", + "sp-std", + "sp-version-proc-macro", "thiserror", -] - -[[package]] -name = "sp-version-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "parity-scale-codec 3.2.1", - "proc-macro2", - "quote", - "syn", ] [[package]] @@ -12238,16 +11771,6 @@ "proc-macro2", "quote", "syn", -] - -[[package]] -name = "sp-wasm-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec 3.2.1", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)", ] [[package]] @@ -12258,7 +11781,7 @@ "impl-trait-for-tuples", "log", "parity-scale-codec 3.2.1", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", "wasmi", "wasmtime", ] @@ -12273,10 +11796,10 @@ "scale-info", "serde", "smallvec", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic", + "sp-core", + "sp-debug-derive", + "sp-std", ] [[package]] @@ -12459,11 +11982,11 @@ "sc-rpc-api", "sc-transaction-pool-api", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", ] [[package]] @@ -12491,11 +12014,11 @@ "sc-rpc-api", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", "sp-state-machine", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", "sp-trie", "trie-db", ] @@ -12519,10 +12042,10 @@ "serde_json", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-keyring", "sp-keystore", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-state-machine", ] @@ -12664,11 +12187,11 @@ version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", ] [[package]] @@ -12676,27 +12199,27 @@ version = "0.1.1" dependencies = [ "evm-coder", - "fp-evm-mapping 0.1.0 (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "fp-evm-mapping", + "frame-support", + "frame-system", "pallet-balances", "pallet-common", "pallet-ethereum", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "pallet-evm", "pallet-evm-coder-substrate", "pallet-fungible", "pallet-nonfungible", "pallet-refungible", "pallet-structure", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-transaction-payment", "pallet-unique", "parity-scale-codec 3.2.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "up-data-structs", "up-sponsorship", ] @@ -13137,13 +12660,13 @@ "sc-executor", "sc-service", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-externalities", + "sp-io", "sp-keystore", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-state-machine", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "zstd", ] @@ -13179,14 +12702,14 @@ "app-promotion-rpc", "jsonrpsee", "pallet-common", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "pallet-evm", "parity-scale-codec 3.2.1", "rmrk-rpc", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-rpc", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "up-data-structs", "up-rpc", ] @@ -13319,19 +12842,19 @@ "sc-transaction-pool", "serde", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-finality-grandpa", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-keystore", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-session", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-timestamp", "sp-transaction-pool", "sp-trie", "substrate-build-script-utils", @@ -13377,16 +12900,16 @@ "sc-service", "sc-transaction-pool", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-session", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage", "sp-transaction-pool", "substrate-frame-rpc-system", "tokio", @@ -13411,13 +12934,13 @@ "cumulus-primitives-utility", "derivative", "evm-coder", - "fp-evm-mapping 0.1.0 (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "fp-evm-mapping", "fp-rpc", "fp-self-contained", "frame-benchmarking", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -13436,7 +12959,7 @@ "pallet-common", "pallet-configuration", "pallet-ethereum", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "pallet-evm", "pallet-evm-coder-substrate", "pallet-evm-contract-helpers", "pallet-evm-migration", @@ -13452,7 +12975,7 @@ "pallet-structure", "pallet-sudo", "pallet-template-transaction-payment", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", @@ -13466,19 +12989,19 @@ "scale-info", "serde", "smallvec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-arithmetic", "sp-block-builder", "sp-consensus-aura", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-inherents", + "sp-io", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-session", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", "sp-transaction-pool", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "substrate-wasm-builder", "up-common", "up-data-structs", @@ -13522,12 +13045,12 @@ version = "0.9.30" dependencies = [ "fp-rpc", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "frame-support", + "pallet-evm", "sp-consensus-aura", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -13536,16 +13059,16 @@ dependencies = [ "bondrewd", "derivative", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "frame-support", + "frame-system", + "pallet-evm", "parity-scale-codec 3.2.1", "rmrk-traits", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", + "sp-std", "struct-versioning", ] @@ -13554,12 +13077,12 @@ version = "0.1.3" dependencies = [ "pallet-common", - "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30)", + "pallet-evm", "parity-scale-codec 3.2.1", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-core", + "sp-runtime", + "sp-std", "up-data-structs", ] @@ -14022,8 +13545,8 @@ "frame-benchmarking", "frame-election-provider-support", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -14061,7 +13584,7 @@ "pallet-staking", "pallet-staking-reward-curve", "pallet-sudo", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", @@ -14079,22 +13602,22 @@ "serde", "serde_derive", "smallvec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-inherents", + "sp-io", "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", + "sp-std", "sp-transaction-pool", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "substrate-wasm-builder", "westend-runtime-constants", "xcm", @@ -14107,11 +13630,11 @@ version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", ] [[package]] @@ -14350,7 +13873,7 @@ "log", "parity-scale-codec 3.2.1", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", "xcm-procedural", ] @@ -14359,17 +13882,17 @@ version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log", "pallet-transaction-payment", "parity-scale-codec 3.2.1", "polkadot-parachain", "scale-info", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic", + "sp-io", + "sp-runtime", + "sp-std", "xcm", "xcm-executor", ] @@ -14380,15 +13903,15 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "impl-trait-for-tuples", "log", "parity-scale-codec 3.2.1", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "xcm", ] --- a/crates/evm-coder/CHANGELOG.md +++ b/crates/evm-coder/CHANGELOG.md @@ -15,7 +15,7 @@ - Implementation `AbiWrite` for tuples. - ### Fixes + ### Fixes - Tuple generation for solidity. --- a/crates/evm-coder/Cargo.toml +++ b/crates/evm-coder/Cargo.toml @@ -21,7 +21,7 @@ # We have tuple-heavy code in solidity.rs impl-trait-for-tuples = "0.2.2" -pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.29" } +pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.30" } [dev-dependencies] # We want to assert some large binary blobs equality in tests --- a/crates/evm-coder/src/solidity.rs +++ b/crates/evm-coder/src/solidity.rs @@ -522,7 +522,7 @@ self.custom_signature.as_str() )?; } - write!(writer, "\tfunction {}(", self.name)?; + write!(writer, "\t{hide_comment}function {}(", self.name)?; self.args.solidity_name(writer, tc)?; write!(writer, ")")?; if is_impl { --- a/pallets/fungible/src/stubs/UniqueFungible.sol +++ b/pallets/fungible/src/stubs/UniqueFungible.sol @@ -0,0 +1,643 @@ +// SPDX-License-Identifier: OTHER +// This code is automatically generated + +pragma solidity >=0.8.0 <0.9.0; + +/// @dev common stubs holder +contract Dummy { + uint8 dummy; + string stub_error = "this contract is implemented in native"; +} + +contract ERC165 is Dummy { + function supportsInterface(bytes4 interfaceID) external view returns (bool) { + require(false, stub_error); + interfaceID; + return true; + } +} + +/// @title A contract that allows you to work with collections. +/// @dev the ERC-165 identifier for this interface is 0xb3152af3 +contract Collection is Dummy, ERC165 { + /// Set collection property. + /// + /// @param key Property key. + /// @param value Propery value. + /// @dev EVM selector for this function is: 0x2f073f66, + /// or in textual repr: setCollectionProperty(string,bytes) + function setCollectionProperty(string memory key, bytes memory value) public { + require(false, stub_error); + key; + value; + dummy = 0; + } + + /// Set collection properties. + /// + /// @param properties Vector of properties key/value pair. + /// @dev EVM selector for this function is: 0x50b26b2a, + /// or in textual repr: setCollectionProperties((string,bytes)[]) + function setCollectionProperties(Tuple14[] memory properties) public { + require(false, stub_error); + properties; + dummy = 0; + } + + /// Delete collection property. + /// + /// @param key Property key. + /// @dev EVM selector for this function is: 0x7b7debce, + /// or in textual repr: deleteCollectionProperty(string) + function deleteCollectionProperty(string memory key) public { + require(false, stub_error); + key; + dummy = 0; + } + + /// Delete collection properties. + /// + /// @param keys Properties keys. + /// @dev EVM selector for this function is: 0xee206ee3, + /// or in textual repr: deleteCollectionProperties(string[]) + function deleteCollectionProperties(string[] memory keys) public { + require(false, stub_error); + keys; + dummy = 0; + } + + /// Get collection property. + /// + /// @dev Throws error if key not found. + /// + /// @param key Property key. + /// @return bytes The property corresponding to the key. + /// @dev EVM selector for this function is: 0xcf24fd6d, + /// or in textual repr: collectionProperty(string) + function collectionProperty(string memory key) public view returns (bytes memory) { + require(false, stub_error); + key; + dummy; + return hex""; + } + + /// Get collection properties. + /// + /// @param keys Properties keys. Empty keys for all propertyes. + /// @return Vector of properties key/value pairs. + /// @dev EVM selector for this function is: 0x285fb8e6, + /// or in textual repr: collectionProperties(string[]) + function collectionProperties(string[] memory keys) public view returns (Tuple14[] memory) { + require(false, stub_error); + keys; + dummy; + return new Tuple14[](0); + } + + /// Set the sponsor of the collection. + /// + /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. + /// + /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract. + /// @dev EVM selector for this function is: 0x7623402e, + /// or in textual repr: setCollectionSponsor(address) + function setCollectionSponsor(address sponsor) public { + require(false, stub_error); + sponsor; + dummy = 0; + } + + /// Set the sponsor of the collection. + /// + /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. + /// + /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract. + /// @dev EVM selector for this function is: 0x84a1d5a8, + /// or in textual repr: setCollectionSponsorCross(EthCrossAccount) + /// or in the expanded repr: setCollectionSponsorCross((address,uint256)) + function setCollectionSponsorCross(EthCrossAccount memory sponsor) public { + require(false, stub_error); + sponsor; + dummy = 0; + } + + /// Whether there is a pending sponsor. + /// @dev EVM selector for this function is: 0x058ac185, + /// or in textual repr: hasCollectionPendingSponsor() + function hasCollectionPendingSponsor() public view returns (bool) { + require(false, stub_error); + dummy; + return false; + } + + /// Collection sponsorship confirmation. + /// + /// @dev After setting the sponsor for the collection, it must be confirmed with this function. + /// @dev EVM selector for this function is: 0x3c50e97a, + /// or in textual repr: confirmCollectionSponsorship() + function confirmCollectionSponsorship() public { + require(false, stub_error); + dummy = 0; + } + + /// Remove collection sponsor. + /// @dev EVM selector for this function is: 0x6e0326a3, + /// or in textual repr: removeCollectionSponsor() + function removeCollectionSponsor() public { + require(false, stub_error); + dummy = 0; + } + + /// Get current sponsor. + /// + /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw. + /// @dev EVM selector for this function is: 0x6ec0a9f1, + /// or in textual repr: collectionSponsor() + function collectionSponsor() public view returns (Tuple8 memory) { + require(false, stub_error); + dummy; + return Tuple8(0x0000000000000000000000000000000000000000, 0); + } + + /// Set limits for the collection. + /// @dev Throws error if limit not found. + /// @param limit Name of the limit. Valid names: + /// "accountTokenOwnershipLimit", + /// "sponsoredDataSize", + /// "sponsoredDataRateLimit", + /// "tokenLimit", + /// "sponsorTransferTimeout", + /// "sponsorApproveTimeout" + /// @param value Value of the limit. + /// @dev EVM selector for this function is: 0x6a3841db, + /// or in textual repr: setCollectionLimit(string,uint32) + function setCollectionLimit(string memory limit, uint32 value) public { + require(false, stub_error); + limit; + value; + dummy = 0; + } + + /// Set limits for the collection. + /// @dev Throws error if limit not found. + /// @param limit Name of the limit. Valid names: + /// "ownerCanTransfer", + /// "ownerCanDestroy", + /// "transfersEnabled" + /// @param value Value of the limit. + /// @dev EVM selector for this function is: 0x993b7fba, + /// or in textual repr: setCollectionLimit(string,bool) + function setCollectionLimit(string memory limit, bool value) public { + require(false, stub_error); + limit; + value; + dummy = 0; + } + + /// Get contract address. + /// @dev EVM selector for this function is: 0xf6b4dfb4, + /// or in textual repr: contractAddress() + function contractAddress() public view returns (address) { + require(false, stub_error); + dummy; + return 0x0000000000000000000000000000000000000000; + } + + /// Add collection admin. + /// @param newAdmin Cross account administrator address. + /// @dev EVM selector for this function is: 0x859aa7d6, + /// or in textual repr: addCollectionAdminCross(EthCrossAccount) + /// or in the expanded repr: addCollectionAdminCross((address,uint256)) + function addCollectionAdminCross(EthCrossAccount memory newAdmin) public { + require(false, stub_error); + newAdmin; + dummy = 0; + } + + /// Remove collection admin. + /// @param admin Cross account administrator address. + /// @dev EVM selector for this function is: 0x6c0cd173, + /// or in textual repr: removeCollectionAdminCross(EthCrossAccount) + /// or in the expanded repr: removeCollectionAdminCross((address,uint256)) + function removeCollectionAdminCross(EthCrossAccount memory admin) public { + require(false, stub_error); + admin; + dummy = 0; + } + + /// Add collection admin. + /// @param newAdmin Address of the added administrator. + /// @dev EVM selector for this function is: 0x92e462c7, + /// or in textual repr: addCollectionAdmin(address) + function addCollectionAdmin(address newAdmin) public { + require(false, stub_error); + newAdmin; + dummy = 0; + } + + /// Remove collection admin. + /// + /// @param admin Address of the removed administrator. + /// @dev EVM selector for this function is: 0xfafd7b42, + /// or in textual repr: removeCollectionAdmin(address) + function removeCollectionAdmin(address admin) public { + require(false, stub_error); + admin; + dummy = 0; + } + + /// Toggle accessibility of collection nesting. + /// + /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled' + /// @dev EVM selector for this function is: 0x112d4586, + /// or in textual repr: setCollectionNesting(bool) + function setCollectionNesting(bool enable) public { + require(false, stub_error); + enable; + dummy = 0; + } + + /// Toggle accessibility of collection nesting. + /// + /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled' + /// @param collections Addresses of collections that will be available for nesting. + /// @dev EVM selector for this function is: 0x64872396, + /// or in textual repr: setCollectionNesting(bool,address[]) + function setCollectionNesting(bool enable, address[] memory collections) public { + require(false, stub_error); + enable; + collections; + dummy = 0; + } + + /// Set the collection access method. + /// @param mode Access mode + /// 0 for Normal + /// 1 for AllowList + /// @dev EVM selector for this function is: 0x41835d4c, + /// or in textual repr: setCollectionAccess(uint8) + function setCollectionAccess(uint8 mode) public { + require(false, stub_error); + mode; + dummy = 0; + } + + /// Checks that user allowed to operate with collection. + /// + /// @param user User address to check. + /// @dev EVM selector for this function is: 0xd63a8e11, + /// or in textual repr: allowed(address) + function allowed(address user) public view returns (bool) { + require(false, stub_error); + user; + dummy; + return false; + } + + /// Add the user to the allowed list. + /// + /// @param user Address of a trusted user. + /// @dev EVM selector for this function is: 0x67844fe6, + /// or in textual repr: addToCollectionAllowList(address) + function addToCollectionAllowList(address user) public { + require(false, stub_error); + user; + dummy = 0; + } + + /// Add user to allowed list. + /// + /// @param user User cross account address. + /// @dev EVM selector for this function is: 0xa0184a3a, + /// or in textual repr: addToCollectionAllowListCross(EthCrossAccount) + /// or in the expanded repr: addToCollectionAllowListCross((address,uint256)) + function addToCollectionAllowListCross(EthCrossAccount memory user) public { + require(false, stub_error); + user; + dummy = 0; + } + + /// Remove the user from the allowed list. + /// + /// @param user Address of a removed user. + /// @dev EVM selector for this function is: 0x85c51acb, + /// or in textual repr: removeFromCollectionAllowList(address) + function removeFromCollectionAllowList(address user) public { + require(false, stub_error); + user; + dummy = 0; + } + + /// Remove user from allowed list. + /// + /// @param user User cross account address. + /// @dev EVM selector for this function is: 0x09ba452a, + /// or in textual repr: removeFromCollectionAllowListCross(EthCrossAccount) + /// or in the expanded repr: removeFromCollectionAllowListCross((address,uint256)) + function removeFromCollectionAllowListCross(EthCrossAccount memory user) public { + require(false, stub_error); + user; + dummy = 0; + } + + /// Switch permission for minting. + /// + /// @param mode Enable if "true". + /// @dev EVM selector for this function is: 0x00018e84, + /// or in textual repr: setCollectionMintMode(bool) + function setCollectionMintMode(bool mode) public { + require(false, stub_error); + mode; + dummy = 0; + } + + /// Check that account is the owner or admin of the collection + /// + /// @param user account to verify + /// @return "true" if account is the owner or admin + /// @dev EVM selector for this function is: 0x9811b0c7, + /// or in textual repr: isOwnerOrAdmin(address) + function isOwnerOrAdmin(address user) public view returns (bool) { + require(false, stub_error); + user; + dummy; + return false; + } + + /// Check that account is the owner or admin of the collection + /// + /// @param user User cross account to verify + /// @return "true" if account is the owner or admin + /// @dev EVM selector for this function is: 0x3e75a905, + /// or in textual repr: isOwnerOrAdminCross(EthCrossAccount) + /// or in the expanded repr: isOwnerOrAdminCross((address,uint256)) + function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) { + require(false, stub_error); + user; + dummy; + return false; + } + + /// Returns collection type + /// + /// @return `Fungible` or `NFT` or `ReFungible` + /// @dev EVM selector for this function is: 0xd34b55b8, + /// or in textual repr: uniqueCollectionType() + function uniqueCollectionType() public view returns (string memory) { + require(false, stub_error); + dummy; + return ""; + } + + /// Get collection owner. + /// + /// @return Tuble with sponsor address and his substrate mirror. + /// If address is canonical then substrate mirror is zero and vice versa. + /// @dev EVM selector for this function is: 0xdf727d3b, + /// or in textual repr: collectionOwner() + function collectionOwner() public view returns (EthCrossAccount memory) { + require(false, stub_error); + dummy; + return EthCrossAccount(0x0000000000000000000000000000000000000000, 0); + } + + /// Changes collection owner to another account + /// + /// @dev Owner can be changed only by current owner + /// @param newOwner new owner account + /// @dev EVM selector for this function is: 0x4f53e226, + /// or in textual repr: changeCollectionOwner(address) + function changeCollectionOwner(address newOwner) public { + require(false, stub_error); + newOwner; + dummy = 0; + } + + /// Get collection administrators + /// + /// @return Vector of tuples with admins address and his substrate mirror. + /// If address is canonical then substrate mirror is zero and vice versa. + /// @dev EVM selector for this function is: 0x5813216b, + /// or in textual repr: collectionAdmins() + function collectionAdmins() public view returns (EthCrossAccount[] memory) { + require(false, stub_error); + dummy; + return new EthCrossAccount[](0); + } + + /// Changes collection owner to another account + /// + /// @dev Owner can be changed only by current owner + /// @param newOwner new owner cross account + /// @dev EVM selector for this function is: 0xe5c9913f, + /// or in textual repr: setOwnerCross(EthCrossAccount) + /// or in the expanded repr: setOwnerCross((address,uint256)) + function setOwnerCross(EthCrossAccount memory newOwner) public { + require(false, stub_error); + newOwner; + dummy = 0; + } +} + +/// @dev Cross account struct +struct EthCrossAccount { + address eth; + uint256 sub; +} + +/// @dev anonymous struct +struct Tuple14 { + string field_0; + bytes field_1; +} + +/// @dev the ERC-165 identifier for this interface is 0x032e5926 +contract ERC20UniqueExtensions is Dummy, ERC165 { + /// @dev EVM selector for this function is: 0x0ecd0ab0, + /// or in textual repr: approveCross(EthCrossAccount,uint256) + /// or in the expanded repr: approveCross((address,uint256),uint256) + function approveCross(EthCrossAccount memory spender, uint256 amount) public returns (bool) { + require(false, stub_error); + spender; + amount; + dummy = 0; + return false; + } + + /// Burn tokens from account + /// @dev Function that burns an `amount` of the tokens of a given account, + /// deducting from the sender's allowance for said account. + /// @param from The account whose tokens will be burnt. + /// @param amount The amount that will be burnt. + /// @dev EVM selector for this function is: 0x79cc6790, + /// or in textual repr: burnFrom(address,uint256) + function burnFrom(address from, uint256 amount) public returns (bool) { + require(false, stub_error); + from; + amount; + dummy = 0; + return false; + } + + /// Burn tokens from account + /// @dev Function that burns an `amount` of the tokens of a given account, + /// deducting from the sender's allowance for said account. + /// @param from The account whose tokens will be burnt. + /// @param amount The amount that will be burnt. + /// @dev EVM selector for this function is: 0xbb2f5a58, + /// or in textual repr: burnFromCross(EthCrossAccount,uint256) + /// or in the expanded repr: burnFromCross((address,uint256),uint256) + function burnFromCross(EthCrossAccount memory from, uint256 amount) public returns (bool) { + require(false, stub_error); + from; + amount; + dummy = 0; + return false; + } + + /// Mint tokens for multiple accounts. + /// @param amounts array of pairs of account address and amount + /// @dev EVM selector for this function is: 0x1acf2d55, + /// or in textual repr: mintBulk((address,uint256)[]) + function mintBulk(Tuple8[] memory amounts) public returns (bool) { + require(false, stub_error); + amounts; + dummy = 0; + return false; + } + + /// @dev EVM selector for this function is: 0xd5cf430b, + /// or in textual repr: transferFromCross(EthCrossAccount,EthCrossAccount,uint256) + /// or in the expanded repr: transferFromCross((address,uint256),(address,uint256),uint256) + function transferFromCross( + EthCrossAccount memory from, + EthCrossAccount memory to, + uint256 amount + ) public returns (bool) { + require(false, stub_error); + from; + to; + amount; + dummy = 0; + return false; + } +} + +/// @dev anonymous struct +struct Tuple8 { + address field_0; + uint256 field_1; +} + +/// @dev the ERC-165 identifier for this interface is 0x40c10f19 +contract ERC20Mintable is Dummy, ERC165 { + /// Mint tokens for `to` account. + /// @param to account that will receive minted tokens + /// @param amount amount of tokens to mint + /// @dev EVM selector for this function is: 0x40c10f19, + /// or in textual repr: mint(address,uint256) + function mint(address to, uint256 amount) public returns (bool) { + require(false, stub_error); + to; + amount; + dummy = 0; + return false; + } +} + +/// @dev inlined interface +contract ERC20Events { + event Transfer(address indexed from, address indexed to, uint256 value); + event Approval(address indexed owner, address indexed spender, uint256 value); +} + +/// @dev the ERC-165 identifier for this interface is 0x942e8b22 +contract ERC20 is Dummy, ERC165, ERC20Events { + /// @dev EVM selector for this function is: 0x06fdde03, + /// or in textual repr: name() + function name() public view returns (string memory) { + require(false, stub_error); + dummy; + return ""; + } + + /// @dev EVM selector for this function is: 0x95d89b41, + /// or in textual repr: symbol() + function symbol() public view returns (string memory) { + require(false, stub_error); + dummy; + return ""; + } + + /// @dev EVM selector for this function is: 0x18160ddd, + /// or in textual repr: totalSupply() + function totalSupply() public view returns (uint256) { + require(false, stub_error); + dummy; + return 0; + } + + /// @dev EVM selector for this function is: 0x313ce567, + /// or in textual repr: decimals() + function decimals() public view returns (uint8) { + require(false, stub_error); + dummy; + return 0; + } + + /// @dev EVM selector for this function is: 0x70a08231, + /// or in textual repr: balanceOf(address) + function balanceOf(address owner) public view returns (uint256) { + require(false, stub_error); + owner; + dummy; + return 0; + } + + /// @dev EVM selector for this function is: 0xa9059cbb, + /// or in textual repr: transfer(address,uint256) + function transfer(address to, uint256 amount) public returns (bool) { + require(false, stub_error); + to; + amount; + dummy = 0; + return false; + } + + /// @dev EVM selector for this function is: 0x23b872dd, + /// or in textual repr: transferFrom(address,address,uint256) + function transferFrom( + address from, + address to, + uint256 amount + ) public returns (bool) { + require(false, stub_error); + from; + to; + amount; + dummy = 0; + return false; + } + + /// @dev EVM selector for this function is: 0x095ea7b3, + /// or in textual repr: approve(address,uint256) + function approve(address spender, uint256 amount) public returns (bool) { + require(false, stub_error); + spender; + amount; + dummy = 0; + return false; + } + + /// @dev EVM selector for this function is: 0xdd62ed3e, + /// or in textual repr: allowance(address,address) + function allowance(address owner, address spender) public view returns (uint256) { + require(false, stub_error); + owner; + spender; + dummy; + return 0; + } +} + +contract UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {} --- a/pallets/nonfungible/src/erc.rs +++ b/pallets/nonfungible/src/erc.rs @@ -20,7 +20,6 @@ //! Method implementations are mostly doing parameter conversion and calling Nonfungible Pallet methods. extern crate alloc; -use alloc::string::ToString; use core::{ char::{REPLACEMENT_CHARACTER, decode_utf16}, convert::TryInto, @@ -44,7 +43,6 @@ use pallet_common::{ erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key}, CollectionHandle, CollectionPropertyPermissions, - eth::convert_tuple_to_cross_account, }; use pallet_evm::{account::CrossAccountId, PrecompileHandle}; use pallet_evm_coder_substrate::call; --- a/pallets/nonfungible/src/stubs/UniqueNFT.sol +++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol @@ -67,7 +67,7 @@ /// @param properties settable properties /// @dev EVM selector for this function is: 0x14ed3a6e, /// or in textual repr: setProperties(uint256,(string,bytes)[]) - function setProperties(uint256 tokenId, Tuple19[] memory properties) public { + function setProperties(uint256 tokenId, Tuple21[] memory properties) public { require(false, stub_error); tokenId; properties; @@ -104,19 +104,7 @@ } /// @title A contract that allows you to work with collections. -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /// @dev the ERC-165 identifier for this interface is 0xb3152af3 -======= -/// @dev the ERC-165 identifier for this interface is 0x674be726 ->>>>>>> feat: Add custum signature with unlimited nesting. -======= -/// @dev the ERC-165 identifier for this interface is 0x943ee094 ->>>>>>> fix: after rebase -======= -/// @dev the ERC-165 identifier for this interface is 0xefe988e0 ->>>>>>> misk: update stubs contract Collection is Dummy, ERC165 { /// Set collection property. /// @@ -210,16 +198,10 @@ /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. /// /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract. -<<<<<<< HEAD - /// @dev EVM selector for this function is: 0x403e96a7, - /// or in textual repr: setCollectionSponsorCross((address,uint256)) - function setCollectionSponsorCross(Tuple6 memory sponsor) public { -======= /// @dev EVM selector for this function is: 0x84a1d5a8, /// or in textual repr: setCollectionSponsorCross(EthCrossAccount) /// or in the expanded repr: setCollectionSponsorCross((address,uint256)) function setCollectionSponsorCross(EthCrossAccount memory sponsor) public { ->>>>>>> misk: update stubs require(false, stub_error); sponsor; dummy = 0; @@ -257,31 +239,10 @@ /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw. /// @dev EVM selector for this function is: 0x6ec0a9f1, /// or in textual repr: collectionSponsor() -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - function collectionSponsor() public view returns (Tuple6 memory) { - require(false, stub_error); - dummy; - return Tuple6(0x0000000000000000000000000000000000000000, 0); -======= - function collectionSponsor() public view returns (Tuple19 memory) { - require(false, stub_error); - dummy; - return Tuple19(0x0000000000000000000000000000000000000000, 0); ->>>>>>> feat: add `EthCrossAccount` type -======= - function collectionSponsor() public view returns (Tuple8 memory) { - require(false, stub_error); - dummy; - return Tuple8(0x0000000000000000000000000000000000000000, 0); ->>>>>>> feat: Add custum signature with unlimited nesting. -======= function collectionSponsor() public view returns (Tuple24 memory) { require(false, stub_error); dummy; return Tuple24(0x0000000000000000000000000000000000000000, 0); ->>>>>>> misk: update stubs } /// Set limits for the collection. @@ -330,16 +291,10 @@ /// Add collection admin. /// @param newAdmin Cross account administrator address. -<<<<<<< HEAD - /// @dev EVM selector for this function is: 0x62e3c7c2, - /// or in textual repr: addCollectionAdminCross((address,uint256)) - function addCollectionAdminCross(Tuple6 memory newAdmin) public { -======= /// @dev EVM selector for this function is: 0x859aa7d6, /// or in textual repr: addCollectionAdminCross(EthCrossAccount) /// or in the expanded repr: addCollectionAdminCross((address,uint256)) function addCollectionAdminCross(EthCrossAccount memory newAdmin) public { ->>>>>>> misk: update stubs require(false, stub_error); newAdmin; dummy = 0; @@ -347,16 +302,10 @@ /// Remove collection admin. /// @param admin Cross account administrator address. -<<<<<<< HEAD - /// @dev EVM selector for this function is: 0x810d1503, - /// or in textual repr: removeCollectionAdminCross((address,uint256)) - function removeCollectionAdminCross(Tuple6 memory admin) public { -======= /// @dev EVM selector for this function is: 0x6c0cd173, /// or in textual repr: removeCollectionAdminCross(EthCrossAccount) /// or in the expanded repr: removeCollectionAdminCross((address,uint256)) function removeCollectionAdminCross(EthCrossAccount memory admin) public { ->>>>>>> misk: update stubs require(false, stub_error); admin; dummy = 0; @@ -445,16 +394,10 @@ /// Add user to allowed list. /// /// @param user User cross account address. -<<<<<<< HEAD - /// @dev EVM selector for this function is: 0xf074da88, - /// or in textual repr: addToCollectionAllowListCross((address,uint256)) - function addToCollectionAllowListCross(Tuple6 memory user) public { -======= /// @dev EVM selector for this function is: 0xa0184a3a, /// or in textual repr: addToCollectionAllowListCross(EthCrossAccount) /// or in the expanded repr: addToCollectionAllowListCross((address,uint256)) function addToCollectionAllowListCross(EthCrossAccount memory user) public { ->>>>>>> misk: update stubs require(false, stub_error); user; dummy = 0; @@ -474,16 +417,10 @@ /// Remove user from allowed list. /// /// @param user User cross account address. -<<<<<<< HEAD - /// @dev EVM selector for this function is: 0xc00df45c, - /// or in textual repr: removeFromCollectionAllowListCross((address,uint256)) - function removeFromCollectionAllowListCross(Tuple6 memory user) public { -======= /// @dev EVM selector for this function is: 0x09ba452a, /// or in textual repr: removeFromCollectionAllowListCross(EthCrossAccount) /// or in the expanded repr: removeFromCollectionAllowListCross((address,uint256)) function removeFromCollectionAllowListCross(EthCrossAccount memory user) public { ->>>>>>> misk: update stubs require(false, stub_error); user; dummy = 0; @@ -517,16 +454,10 @@ /// /// @param user User cross account to verify /// @return "true" if account is the owner or admin -<<<<<<< HEAD - /// @dev EVM selector for this function is: 0x5aba3351, - /// or in textual repr: isOwnerOrAdminCross((address,uint256)) - function isOwnerOrAdminCross(Tuple6 memory user) public view returns (bool) { -======= /// @dev EVM selector for this function is: 0x3e75a905, /// or in textual repr: isOwnerOrAdminCross(EthCrossAccount) /// or in the expanded repr: isOwnerOrAdminCross((address,uint256)) function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) { ->>>>>>> misk: update stubs require(false, stub_error); user; dummy; @@ -546,35 +477,14 @@ /// Get collection owner. /// - /// @return Tuple with sponsor address and his substrate mirror. + /// @return Tuble with sponsor address and his substrate mirror. /// If address is canonical then substrate mirror is zero and vice versa. /// @dev EVM selector for this function is: 0xdf727d3b, /// or in textual repr: collectionOwner() -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - function collectionOwner() public view returns (Tuple6 memory) { - require(false, stub_error); - dummy; - return Tuple6(0x0000000000000000000000000000000000000000, 0); -======= - function collectionOwner() public view returns (Tuple19 memory) { - require(false, stub_error); - dummy; - return Tuple19(0x0000000000000000000000000000000000000000, 0); ->>>>>>> feat: add `EthCrossAccount` type -======= - function collectionOwner() public view returns (Tuple8 memory) { - require(false, stub_error); - dummy; - return Tuple8(0x0000000000000000000000000000000000000000, 0); ->>>>>>> feat: Add custum signature with unlimited nesting. -======= function collectionOwner() public view returns (EthCrossAccount memory) { require(false, stub_error); dummy; return EthCrossAccount(0x0000000000000000000000000000000000000000, 0); ->>>>>>> misk: update stubs } /// Changes collection owner to another account @@ -595,45 +505,26 @@ /// If address is canonical then substrate mirror is zero and vice versa. /// @dev EVM selector for this function is: 0x5813216b, /// or in textual repr: collectionAdmins() -<<<<<<< HEAD - function collectionAdmins() public view returns (Tuple6[] memory) { - require(false, stub_error); - dummy; - return new Tuple6[](0); -======= function collectionAdmins() public view returns (EthCrossAccount[] memory) { require(false, stub_error); dummy; return new EthCrossAccount[](0); ->>>>>>> misk: update stubs } /// Changes collection owner to another account /// /// @dev Owner can be changed only by current owner /// @param newOwner new owner cross account -<<<<<<< HEAD - /// @dev EVM selector for this function is: 0xbdff793d, - /// or in textual repr: setOwnerCross((address,uint256)) - function setOwnerCross(Tuple6 memory newOwner) public { -======= /// @dev EVM selector for this function is: 0xe5c9913f, /// or in textual repr: setOwnerCross(EthCrossAccount) /// or in the expanded repr: setOwnerCross((address,uint256)) function setOwnerCross(EthCrossAccount memory newOwner) public { ->>>>>>> misk: update stubs require(false, stub_error); newOwner; dummy = 0; } } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -/// @dev anonymous struct -struct Tuple19 { -======= /// @dev Cross account struct struct EthCrossAccount { address eth; @@ -642,12 +533,16 @@ /// @dev anonymous struct struct Tuple24 { ->>>>>>> misk: update stubs address field_0; uint256 field_1; } -<<<<<<< HEAD +/// @dev anonymous struct +struct Tuple21 { + string field_0; + bytes field_1; +} + /// @title ERC-721 Non-Fungible Token Standard, optional metadata extension /// @dev See https://eips.ethereum.org/EIPS/eip-721 /// @dev the ERC-165 identifier for this interface is 0x5b5e139f @@ -689,20 +584,8 @@ dummy; return ""; } -} - -======= ->>>>>>> feat: Add custum signature with unlimited nesting. -======= -======= ->>>>>>> misk: update stubs -/// @dev anonymous struct -struct Tuple21 { - string field_0; - bytes field_1; } ->>>>>>> fix: after rebase /// @title ERC721 Token that can be irreversibly burned (destroyed). /// @dev the ERC-165 identifier for this interface is 0x42966c68 contract ERC721Burnable is Dummy, ERC165 { @@ -804,15 +687,7 @@ } /// @title Unique extensions for ERC721. -<<<<<<< HEAD -<<<<<<< HEAD /// @dev the ERC-165 identifier for this interface is 0x244543ee -======= -/// @dev the ERC-165 identifier for this interface is 0xcc97cb35 ->>>>>>> feat: Add custum signature with unlimited nesting. -======= -/// @dev the ERC-165 identifier for this interface is 0xb76006ac ->>>>>>> misk: update stubs contract ERC721UniqueExtensions is Dummy, ERC165 { /// @notice A descriptive name for a collection of NFTs in this contract /// @dev EVM selector for this function is: 0x06fdde03, @@ -838,16 +713,10 @@ /// operator of the current owner. /// @param approved The new substrate address approved NFT controller /// @param tokenId The NFT to approve -<<<<<<< HEAD - /// @dev EVM selector for this function is: 0x106fdb59, - /// or in textual repr: approveCross((address,uint256),uint256) - function approveCross(Tuple6 memory approved, uint256 tokenId) public { -======= /// @dev EVM selector for this function is: 0x0ecd0ab0, /// or in textual repr: approveCross(EthCrossAccount,uint256) /// or in the expanded repr: approveCross((address,uint256),uint256) function approveCross(EthCrossAccount memory approved, uint256 tokenId) public { ->>>>>>> misk: update stubs require(false, stub_error); approved; tokenId; @@ -878,13 +747,8 @@ /// or in textual repr: transferFromCross(EthCrossAccount,EthCrossAccount,uint256) /// or in the expanded repr: transferFromCross((address,uint256),(address,uint256),uint256) function transferFromCross( -<<<<<<< HEAD - Tuple6 memory from, - Tuple6 memory to, -======= EthCrossAccount memory from, EthCrossAccount memory to, ->>>>>>> feat: Add custum signature with unlimited nesting. uint256 tokenId ) public { require(false, stub_error); @@ -915,16 +779,10 @@ /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT. /// @param from The current owner of the NFT /// @param tokenId The NFT to transfer -<<<<<<< HEAD - /// @dev EVM selector for this function is: 0xa8106d4a, - /// or in textual repr: burnFromCross((address,uint256),uint256) - function burnFromCross(Tuple6 memory from, uint256 tokenId) public { -======= /// @dev EVM selector for this function is: 0xbb2f5a58, /// or in textual repr: burnFromCross(EthCrossAccount,uint256) /// or in the expanded repr: burnFromCross((address,uint256),uint256) function burnFromCross(EthCrossAccount memory from, uint256 tokenId) public { ->>>>>>> misk: update stubs require(false, stub_error); from; tokenId; @@ -961,7 +819,7 @@ // /// @param tokens array of pairs of token ID and token URI for minted tokens // /// @dev EVM selector for this function is: 0x36543006, // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[]) - // function mintBulkWithTokenURI(address to, Tuple8[] memory tokens) public returns (bool) { + // function mintBulkWithTokenURI(address to, Tuple10[] memory tokens) public returns (bool) { // require(false, stub_error); // to; // tokens; @@ -969,72 +827,14 @@ // return false; // } -<<<<<<< HEAD } /// @dev anonymous struct -struct Tuple8 { -======= - /// @notice Function to mint multiple tokens. - /// @dev `tokenIds` should be an array of consecutive numbers and first number - /// should be obtained with `nextTokenId` method - /// @param to The new owner - /// @param tokenIds IDs of the minted NFTs - /// @dev EVM selector for this function is: 0x44a9945e, - /// or in textual repr: mintBulk(address,uint256[]) - function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) { - require(false, stub_error); - to; - tokenIds; - dummy = 0; - return false; - } - - /// @notice Function to mint multiple tokens with the given tokenUris. - /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive - /// numbers and first number should be obtained with `nextTokenId` method - /// @param to The new owner - /// @param tokens array of pairs of token ID and token URI for minted tokens - /// @dev EVM selector for this function is: 0x36543006, - /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[]) - function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) public returns (bool) { - require(false, stub_error); - to; - tokens; - dummy = 0; - return false; - } -} - -/// @dev anonymous struct -struct Tuple12 { ->>>>>>> feat: Add custum signature with unlimited nesting. +struct Tuple10 { uint256 field_0; string field_1; } -<<<<<<< HEAD -<<<<<<< HEAD -/// @dev anonymous struct -struct Tuple6 { - address field_0; - uint256 field_1; -======= -/// @dev Cross account struct -struct EthCrossAccount { - address eth; - uint256 sub; ->>>>>>> feat: add `EthCrossAccount` type -} - -/// @dev anonymous struct -struct Tuple8 { - address field_0; - uint256 field_1; -} - -======= ->>>>>>> misk: update stubs /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension /// @dev See https://eips.ethereum.org/EIPS/eip-721 /// @dev the ERC-165 identifier for this interface is 0x780e9d63 --- a/pallets/refungible/src/stubs/UniqueRefungible.sol +++ b/pallets/refungible/src/stubs/UniqueRefungible.sol @@ -67,7 +67,7 @@ /// @param properties settable properties /// @dev EVM selector for this function is: 0x14ed3a6e, /// or in textual repr: setProperties(uint256,(string,bytes)[]) - function setProperties(uint256 tokenId, Tuple19[] memory properties) public { + function setProperties(uint256 tokenId, Tuple20[] memory properties) public { require(false, stub_error); tokenId; properties; @@ -199,14 +199,9 @@ /// /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract. /// @dev EVM selector for this function is: 0x84a1d5a8, -<<<<<<< HEAD - /// or in textual repr: setCollectionSponsorCross((address,uint256)) - function setCollectionSponsorCross(Tuple6 memory sponsor) public { -======= /// or in textual repr: setCollectionSponsorCross(EthCrossAccount) /// or in the expanded repr: setCollectionSponsorCross((address,uint256)) function setCollectionSponsorCross(EthCrossAccount memory sponsor) public { ->>>>>>> misk: update stubs require(false, stub_error); sponsor; dummy = 0; @@ -244,17 +239,10 @@ /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw. /// @dev EVM selector for this function is: 0x6ec0a9f1, /// or in textual repr: collectionSponsor() -<<<<<<< HEAD - function collectionSponsor() public view returns (Tuple6 memory) { - require(false, stub_error); - dummy; - return Tuple6(0x0000000000000000000000000000000000000000, 0); -======= function collectionSponsor() public view returns (Tuple23 memory) { require(false, stub_error); dummy; return Tuple23(0x0000000000000000000000000000000000000000, 0); ->>>>>>> misk: update stubs } /// Set limits for the collection. @@ -304,14 +292,9 @@ /// Add collection admin. /// @param newAdmin Cross account administrator address. /// @dev EVM selector for this function is: 0x859aa7d6, -<<<<<<< HEAD - /// or in textual repr: addCollectionAdminCross((address,uint256)) - function addCollectionAdminCross(Tuple6 memory newAdmin) public { -======= /// or in textual repr: addCollectionAdminCross(EthCrossAccount) /// or in the expanded repr: addCollectionAdminCross((address,uint256)) function addCollectionAdminCross(EthCrossAccount memory newAdmin) public { ->>>>>>> misk: update stubs require(false, stub_error); newAdmin; dummy = 0; @@ -320,14 +303,9 @@ /// Remove collection admin. /// @param admin Cross account administrator address. /// @dev EVM selector for this function is: 0x6c0cd173, -<<<<<<< HEAD - /// or in textual repr: removeCollectionAdminCross((address,uint256)) - function removeCollectionAdminCross(Tuple6 memory admin) public { -======= /// or in textual repr: removeCollectionAdminCross(EthCrossAccount) /// or in the expanded repr: removeCollectionAdminCross((address,uint256)) function removeCollectionAdminCross(EthCrossAccount memory admin) public { ->>>>>>> misk: update stubs require(false, stub_error); admin; dummy = 0; @@ -417,14 +395,9 @@ /// /// @param user User cross account address. /// @dev EVM selector for this function is: 0xa0184a3a, -<<<<<<< HEAD - /// or in textual repr: addToCollectionAllowListCross((address,uint256)) - function addToCollectionAllowListCross(Tuple6 memory user) public { -======= /// or in textual repr: addToCollectionAllowListCross(EthCrossAccount) /// or in the expanded repr: addToCollectionAllowListCross((address,uint256)) function addToCollectionAllowListCross(EthCrossAccount memory user) public { ->>>>>>> misk: update stubs require(false, stub_error); user; dummy = 0; @@ -445,14 +418,9 @@ /// /// @param user User cross account address. /// @dev EVM selector for this function is: 0x09ba452a, -<<<<<<< HEAD - /// or in textual repr: removeFromCollectionAllowListCross((address,uint256)) - function removeFromCollectionAllowListCross(Tuple6 memory user) public { -======= /// or in textual repr: removeFromCollectionAllowListCross(EthCrossAccount) /// or in the expanded repr: removeFromCollectionAllowListCross((address,uint256)) function removeFromCollectionAllowListCross(EthCrossAccount memory user) public { ->>>>>>> misk: update stubs require(false, stub_error); user; dummy = 0; @@ -487,14 +455,9 @@ /// @param user User cross account to verify /// @return "true" if account is the owner or admin /// @dev EVM selector for this function is: 0x3e75a905, -<<<<<<< HEAD - /// or in textual repr: isOwnerOrAdminCross((address,uint256)) - function isOwnerOrAdminCross(Tuple6 memory user) public view returns (bool) { -======= /// or in textual repr: isOwnerOrAdminCross(EthCrossAccount) /// or in the expanded repr: isOwnerOrAdminCross((address,uint256)) function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) { ->>>>>>> misk: update stubs require(false, stub_error); user; dummy; @@ -514,21 +477,14 @@ /// Get collection owner. /// - /// @return Tuple with sponsor address and his substrate mirror. + /// @return Tuble with sponsor address and his substrate mirror. /// If address is canonical then substrate mirror is zero and vice versa. /// @dev EVM selector for this function is: 0xdf727d3b, /// or in textual repr: collectionOwner() -<<<<<<< HEAD - function collectionOwner() public view returns (Tuple6 memory) { - require(false, stub_error); - dummy; - return Tuple6(0x0000000000000000000000000000000000000000, 0); -======= function collectionOwner() public view returns (EthCrossAccount memory) { require(false, stub_error); dummy; return EthCrossAccount(0x0000000000000000000000000000000000000000, 0); ->>>>>>> misk: update stubs } /// Changes collection owner to another account @@ -549,17 +505,10 @@ /// If address is canonical then substrate mirror is zero and vice versa. /// @dev EVM selector for this function is: 0x5813216b, /// or in textual repr: collectionAdmins() -<<<<<<< HEAD - function collectionAdmins() public view returns (Tuple6[] memory) { - require(false, stub_error); - dummy; - return new Tuple6[](0); -======= function collectionAdmins() public view returns (EthCrossAccount[] memory) { require(false, stub_error); dummy; return new EthCrossAccount[](0); ->>>>>>> misk: update stubs } /// Changes collection owner to another account @@ -567,14 +516,9 @@ /// @dev Owner can be changed only by current owner /// @param newOwner new owner cross account /// @dev EVM selector for this function is: 0xe5c9913f, -<<<<<<< HEAD - /// or in textual repr: setOwnerCross((address,uint256)) - function setOwnerCross(Tuple6 memory newOwner) public { -======= /// or in textual repr: setOwnerCross(EthCrossAccount) /// or in the expanded repr: setOwnerCross((address,uint256)) function setOwnerCross(EthCrossAccount memory newOwner) public { ->>>>>>> misk: update stubs require(false, stub_error); newOwner; dummy = 0; @@ -786,13 +730,8 @@ /// or in textual repr: transferFromCross(EthCrossAccount,EthCrossAccount,uint256) /// or in the expanded repr: transferFromCross((address,uint256),(address,uint256),uint256) function transferFromCross( -<<<<<<< HEAD - Tuple6 memory from, - Tuple6 memory to, -======= EthCrossAccount memory from, EthCrossAccount memory to, ->>>>>>> misk: update stubs uint256 tokenId ) public { require(false, stub_error); @@ -826,14 +765,9 @@ /// @param from The current owner of the RFT /// @param tokenId The RFT to transfer /// @dev EVM selector for this function is: 0xbb2f5a58, -<<<<<<< HEAD - /// or in textual repr: burnFromCross((address,uint256),uint256) - function burnFromCross(Tuple6 memory from, uint256 tokenId) public { -======= /// or in textual repr: burnFromCross(EthCrossAccount,uint256) /// or in the expanded repr: burnFromCross((address,uint256),uint256) function burnFromCross(EthCrossAccount memory from, uint256 tokenId) public { ->>>>>>> misk: update stubs require(false, stub_error); from; tokenId; @@ -849,7 +783,6 @@ return 0; } -<<<<<<< HEAD // /// @notice Function to mint multiple tokens. // /// @dev `tokenIds` should be an array of consecutive numbers and first number // /// should be obtained with `nextTokenId` method @@ -872,45 +805,14 @@ // /// @param tokens array of pairs of token ID and token URI for minted tokens // /// @dev EVM selector for this function is: 0x36543006, // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[]) - // function mintBulkWithTokenURI(address to, Tuple8[] memory tokens) public returns (bool) { + // function mintBulkWithTokenURI(address to, Tuple9[] memory tokens) public returns (bool) { // require(false, stub_error); // to; // tokens; // dummy = 0; // return false; // } -======= - /// @notice Function to mint multiple tokens. - /// @dev `tokenIds` should be an array of consecutive numbers and first number - /// should be obtained with `nextTokenId` method - /// @param to The new owner - /// @param tokenIds IDs of the minted RFTs - /// @dev EVM selector for this function is: 0x44a9945e, - /// or in textual repr: mintBulk(address,uint256[]) - function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) { - require(false, stub_error); - to; - tokenIds; - dummy = 0; - return false; - } - /// @notice Function to mint multiple tokens with the given tokenUris. - /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive - /// numbers and first number should be obtained with `nextTokenId` method - /// @param to The new owner - /// @param tokens array of pairs of token ID and token URI for minted tokens - /// @dev EVM selector for this function is: 0x36543006, - /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[]) - function mintBulkWithTokenURI(address to, Tuple11[] memory tokens) public returns (bool) { - require(false, stub_error); - to; - tokens; - dummy = 0; - return false; - } ->>>>>>> misk: update stubs - /// Returns EVM address for refungible token /// /// @param token ID of the token @@ -925,24 +827,11 @@ } /// @dev anonymous struct -<<<<<<< HEAD -struct Tuple8 { -======= -struct Tuple11 { ->>>>>>> misk: update stubs +struct Tuple9 { uint256 field_0; string field_1; -} - -<<<<<<< HEAD -/// @dev anonymous struct -struct Tuple6 { - address field_0; - uint256 field_1; } -======= ->>>>>>> misk: update stubs /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension /// @dev See https://eips.ethereum.org/EIPS/eip-721 /// @dev the ERC-165 identifier for this interface is 0x780e9d63 --- a/pallets/unique/src/eth/mod.rs +++ b/pallets/unique/src/eth/mod.rs @@ -23,10 +23,9 @@ generate_stubgen, solidity, solidity_interface, types::*, custom_signature::{SignatureUnit, FunctionSignature, SignaturePreferences}, - make_signature, -, weight}; -use frame_support::{traits::Get, storage::StorageNMap}; -use crate::sp_api_hidden_includes_decl_storage::hidden_include::StorageDoubleMap; + make_signature, weight, +}; +use frame_support::traits::Get; use crate::Pallet; use pallet_common::{ --- a/tests/src/eth/allowlist.test.ts +++ b/tests/src/eth/allowlist.test.ts @@ -93,7 +93,7 @@ const owner = await helper.eth.createAccountWithBalance(donor); const user = donor; - const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C'); + const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C'); const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner); const userCross = helper.ethCrossAccount.fromKeyringPair(user); @@ -127,7 +127,7 @@ const notOwner = await helper.eth.createAccountWithBalance(donor); const user = donor; - const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C'); + const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C'); const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner); expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false; --- a/tests/src/eth/api/UniqueFungible.sol +++ b/tests/src/eth/api/UniqueFungible.sol @@ -0,0 +1,409 @@ +// SPDX-License-Identifier: OTHER +// This code is automatically generated + +pragma solidity >=0.8.0 <0.9.0; + +/// @dev common stubs holder +interface Dummy { + +} + +interface ERC165 is Dummy { + function supportsInterface(bytes4 interfaceID) external view returns (bool); +} + +/// @title A contract that allows you to work with collections. +/// @dev the ERC-165 identifier for this interface is 0xb3152af3 +interface Collection is Dummy, ERC165 { + /// Set collection property. + /// + /// @param key Property key. + /// @param value Propery value. + /// @dev EVM selector for this function is: 0x2f073f66, + /// or in textual repr: setCollectionProperty(string,bytes) + function setCollectionProperty(string memory key, bytes memory value) external; + + /// Set collection properties. + /// + /// @param properties Vector of properties key/value pair. + /// @dev EVM selector for this function is: 0x50b26b2a, + /// or in textual repr: setCollectionProperties((string,bytes)[]) + function setCollectionProperties(Tuple14[] memory properties) external; + + /// Delete collection property. + /// + /// @param key Property key. + /// @dev EVM selector for this function is: 0x7b7debce, + /// or in textual repr: deleteCollectionProperty(string) + function deleteCollectionProperty(string memory key) external; + + /// Delete collection properties. + /// + /// @param keys Properties keys. + /// @dev EVM selector for this function is: 0xee206ee3, + /// or in textual repr: deleteCollectionProperties(string[]) + function deleteCollectionProperties(string[] memory keys) external; + + /// Get collection property. + /// + /// @dev Throws error if key not found. + /// + /// @param key Property key. + /// @return bytes The property corresponding to the key. + /// @dev EVM selector for this function is: 0xcf24fd6d, + /// or in textual repr: collectionProperty(string) + function collectionProperty(string memory key) external view returns (bytes memory); + + /// Get collection properties. + /// + /// @param keys Properties keys. Empty keys for all propertyes. + /// @return Vector of properties key/value pairs. + /// @dev EVM selector for this function is: 0x285fb8e6, + /// or in textual repr: collectionProperties(string[]) + function collectionProperties(string[] memory keys) external view returns (Tuple14[] memory); + + /// Set the sponsor of the collection. + /// + /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. + /// + /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract. + /// @dev EVM selector for this function is: 0x7623402e, + /// or in textual repr: setCollectionSponsor(address) + function setCollectionSponsor(address sponsor) external; + + /// Set the sponsor of the collection. + /// + /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. + /// + /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract. + /// @dev EVM selector for this function is: 0x84a1d5a8, + /// or in textual repr: setCollectionSponsorCross(EthCrossAccount) + /// or in the expanded repr: setCollectionSponsorCross((address,uint256)) + function setCollectionSponsorCross(EthCrossAccount memory sponsor) external; + + /// Whether there is a pending sponsor. + /// @dev EVM selector for this function is: 0x058ac185, + /// or in textual repr: hasCollectionPendingSponsor() + function hasCollectionPendingSponsor() external view returns (bool); + + /// Collection sponsorship confirmation. + /// + /// @dev After setting the sponsor for the collection, it must be confirmed with this function. + /// @dev EVM selector for this function is: 0x3c50e97a, + /// or in textual repr: confirmCollectionSponsorship() + function confirmCollectionSponsorship() external; + + /// Remove collection sponsor. + /// @dev EVM selector for this function is: 0x6e0326a3, + /// or in textual repr: removeCollectionSponsor() + function removeCollectionSponsor() external; + + /// Get current sponsor. + /// + /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw. + /// @dev EVM selector for this function is: 0x6ec0a9f1, + /// or in textual repr: collectionSponsor() + function collectionSponsor() external view returns (Tuple8 memory); + + /// Set limits for the collection. + /// @dev Throws error if limit not found. + /// @param limit Name of the limit. Valid names: + /// "accountTokenOwnershipLimit", + /// "sponsoredDataSize", + /// "sponsoredDataRateLimit", + /// "tokenLimit", + /// "sponsorTransferTimeout", + /// "sponsorApproveTimeout" + /// @param value Value of the limit. + /// @dev EVM selector for this function is: 0x6a3841db, + /// or in textual repr: setCollectionLimit(string,uint32) + function setCollectionLimit(string memory limit, uint32 value) external; + + /// Set limits for the collection. + /// @dev Throws error if limit not found. + /// @param limit Name of the limit. Valid names: + /// "ownerCanTransfer", + /// "ownerCanDestroy", + /// "transfersEnabled" + /// @param value Value of the limit. + /// @dev EVM selector for this function is: 0x993b7fba, + /// or in textual repr: setCollectionLimit(string,bool) + function setCollectionLimit(string memory limit, bool value) external; + + /// Get contract address. + /// @dev EVM selector for this function is: 0xf6b4dfb4, + /// or in textual repr: contractAddress() + function contractAddress() external view returns (address); + + /// Add collection admin. + /// @param newAdmin Cross account administrator address. + /// @dev EVM selector for this function is: 0x859aa7d6, + /// or in textual repr: addCollectionAdminCross(EthCrossAccount) + /// or in the expanded repr: addCollectionAdminCross((address,uint256)) + function addCollectionAdminCross(EthCrossAccount memory newAdmin) external; + + /// Remove collection admin. + /// @param admin Cross account administrator address. + /// @dev EVM selector for this function is: 0x6c0cd173, + /// or in textual repr: removeCollectionAdminCross(EthCrossAccount) + /// or in the expanded repr: removeCollectionAdminCross((address,uint256)) + function removeCollectionAdminCross(EthCrossAccount memory admin) external; + + /// Add collection admin. + /// @param newAdmin Address of the added administrator. + /// @dev EVM selector for this function is: 0x92e462c7, + /// or in textual repr: addCollectionAdmin(address) + function addCollectionAdmin(address newAdmin) external; + + /// Remove collection admin. + /// + /// @param admin Address of the removed administrator. + /// @dev EVM selector for this function is: 0xfafd7b42, + /// or in textual repr: removeCollectionAdmin(address) + function removeCollectionAdmin(address admin) external; + + /// Toggle accessibility of collection nesting. + /// + /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled' + /// @dev EVM selector for this function is: 0x112d4586, + /// or in textual repr: setCollectionNesting(bool) + function setCollectionNesting(bool enable) external; + + /// Toggle accessibility of collection nesting. + /// + /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled' + /// @param collections Addresses of collections that will be available for nesting. + /// @dev EVM selector for this function is: 0x64872396, + /// or in textual repr: setCollectionNesting(bool,address[]) + function setCollectionNesting(bool enable, address[] memory collections) external; + + /// Set the collection access method. + /// @param mode Access mode + /// 0 for Normal + /// 1 for AllowList + /// @dev EVM selector for this function is: 0x41835d4c, + /// or in textual repr: setCollectionAccess(uint8) + function setCollectionAccess(uint8 mode) external; + + /// Checks that user allowed to operate with collection. + /// + /// @param user User address to check. + /// @dev EVM selector for this function is: 0xd63a8e11, + /// or in textual repr: allowed(address) + function allowed(address user) external view returns (bool); + + /// Add the user to the allowed list. + /// + /// @param user Address of a trusted user. + /// @dev EVM selector for this function is: 0x67844fe6, + /// or in textual repr: addToCollectionAllowList(address) + function addToCollectionAllowList(address user) external; + + /// Add user to allowed list. + /// + /// @param user User cross account address. + /// @dev EVM selector for this function is: 0xa0184a3a, + /// or in textual repr: addToCollectionAllowListCross(EthCrossAccount) + /// or in the expanded repr: addToCollectionAllowListCross((address,uint256)) + function addToCollectionAllowListCross(EthCrossAccount memory user) external; + + /// Remove the user from the allowed list. + /// + /// @param user Address of a removed user. + /// @dev EVM selector for this function is: 0x85c51acb, + /// or in textual repr: removeFromCollectionAllowList(address) + function removeFromCollectionAllowList(address user) external; + + /// Remove user from allowed list. + /// + /// @param user User cross account address. + /// @dev EVM selector for this function is: 0x09ba452a, + /// or in textual repr: removeFromCollectionAllowListCross(EthCrossAccount) + /// or in the expanded repr: removeFromCollectionAllowListCross((address,uint256)) + function removeFromCollectionAllowListCross(EthCrossAccount memory user) external; + + /// Switch permission for minting. + /// + /// @param mode Enable if "true". + /// @dev EVM selector for this function is: 0x00018e84, + /// or in textual repr: setCollectionMintMode(bool) + function setCollectionMintMode(bool mode) external; + + /// Check that account is the owner or admin of the collection + /// + /// @param user account to verify + /// @return "true" if account is the owner or admin + /// @dev EVM selector for this function is: 0x9811b0c7, + /// or in textual repr: isOwnerOrAdmin(address) + function isOwnerOrAdmin(address user) external view returns (bool); + + /// Check that account is the owner or admin of the collection + /// + /// @param user User cross account to verify + /// @return "true" if account is the owner or admin + /// @dev EVM selector for this function is: 0x3e75a905, + /// or in textual repr: isOwnerOrAdminCross(EthCrossAccount) + /// or in the expanded repr: isOwnerOrAdminCross((address,uint256)) + function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool); + + /// Returns collection type + /// + /// @return `Fungible` or `NFT` or `ReFungible` + /// @dev EVM selector for this function is: 0xd34b55b8, + /// or in textual repr: uniqueCollectionType() + function uniqueCollectionType() external view returns (string memory); + + /// Get collection owner. + /// + /// @return Tuble with sponsor address and his substrate mirror. + /// If address is canonical then substrate mirror is zero and vice versa. + /// @dev EVM selector for this function is: 0xdf727d3b, + /// or in textual repr: collectionOwner() + function collectionOwner() external view returns (EthCrossAccount memory); + + /// Changes collection owner to another account + /// + /// @dev Owner can be changed only by current owner + /// @param newOwner new owner account + /// @dev EVM selector for this function is: 0x4f53e226, + /// or in textual repr: changeCollectionOwner(address) + function changeCollectionOwner(address newOwner) external; + + /// Get collection administrators + /// + /// @return Vector of tuples with admins address and his substrate mirror. + /// If address is canonical then substrate mirror is zero and vice versa. + /// @dev EVM selector for this function is: 0x5813216b, + /// or in textual repr: collectionAdmins() + function collectionAdmins() external view returns (EthCrossAccount[] memory); + + /// Changes collection owner to another account + /// + /// @dev Owner can be changed only by current owner + /// @param newOwner new owner cross account + /// @dev EVM selector for this function is: 0xe5c9913f, + /// or in textual repr: setOwnerCross(EthCrossAccount) + /// or in the expanded repr: setOwnerCross((address,uint256)) + function setOwnerCross(EthCrossAccount memory newOwner) external; +} + +/// @dev Cross account struct +struct EthCrossAccount { + address eth; + uint256 sub; +} + +/// @dev anonymous struct +struct Tuple14 { + string field_0; + bytes field_1; +} + +/// @dev the ERC-165 identifier for this interface is 0x032e5926 +interface ERC20UniqueExtensions is Dummy, ERC165 { + /// @dev EVM selector for this function is: 0x0ecd0ab0, + /// or in textual repr: approveCross(EthCrossAccount,uint256) + /// or in the expanded repr: approveCross((address,uint256),uint256) + function approveCross(EthCrossAccount memory spender, uint256 amount) external returns (bool); + + /// Burn tokens from account + /// @dev Function that burns an `amount` of the tokens of a given account, + /// deducting from the sender's allowance for said account. + /// @param from The account whose tokens will be burnt. + /// @param amount The amount that will be burnt. + /// @dev EVM selector for this function is: 0x79cc6790, + /// or in textual repr: burnFrom(address,uint256) + function burnFrom(address from, uint256 amount) external returns (bool); + + /// Burn tokens from account + /// @dev Function that burns an `amount` of the tokens of a given account, + /// deducting from the sender's allowance for said account. + /// @param from The account whose tokens will be burnt. + /// @param amount The amount that will be burnt. + /// @dev EVM selector for this function is: 0xbb2f5a58, + /// or in textual repr: burnFromCross(EthCrossAccount,uint256) + /// or in the expanded repr: burnFromCross((address,uint256),uint256) + function burnFromCross(EthCrossAccount memory from, uint256 amount) external returns (bool); + + /// Mint tokens for multiple accounts. + /// @param amounts array of pairs of account address and amount + /// @dev EVM selector for this function is: 0x1acf2d55, + /// or in textual repr: mintBulk((address,uint256)[]) + function mintBulk(Tuple8[] memory amounts) external returns (bool); + + /// @dev EVM selector for this function is: 0xd5cf430b, + /// or in textual repr: transferFromCross(EthCrossAccount,EthCrossAccount,uint256) + /// or in the expanded repr: transferFromCross((address,uint256),(address,uint256),uint256) + function transferFromCross( + EthCrossAccount memory from, + EthCrossAccount memory to, + uint256 amount + ) external returns (bool); +} + +/// @dev anonymous struct +struct Tuple8 { + address field_0; + uint256 field_1; +} + +/// @dev the ERC-165 identifier for this interface is 0x40c10f19 +interface ERC20Mintable is Dummy, ERC165 { + /// Mint tokens for `to` account. + /// @param to account that will receive minted tokens + /// @param amount amount of tokens to mint + /// @dev EVM selector for this function is: 0x40c10f19, + /// or in textual repr: mint(address,uint256) + function mint(address to, uint256 amount) external returns (bool); +} + +/// @dev inlined interface +interface ERC20Events { + event Transfer(address indexed from, address indexed to, uint256 value); + event Approval(address indexed owner, address indexed spender, uint256 value); +} + +/// @dev the ERC-165 identifier for this interface is 0x942e8b22 +interface ERC20 is Dummy, ERC165, ERC20Events { + /// @dev EVM selector for this function is: 0x06fdde03, + /// or in textual repr: name() + function name() external view returns (string memory); + + /// @dev EVM selector for this function is: 0x95d89b41, + /// or in textual repr: symbol() + function symbol() external view returns (string memory); + + /// @dev EVM selector for this function is: 0x18160ddd, + /// or in textual repr: totalSupply() + function totalSupply() external view returns (uint256); + + /// @dev EVM selector for this function is: 0x313ce567, + /// or in textual repr: decimals() + function decimals() external view returns (uint8); + + /// @dev EVM selector for this function is: 0x70a08231, + /// or in textual repr: balanceOf(address) + function balanceOf(address owner) external view returns (uint256); + + /// @dev EVM selector for this function is: 0xa9059cbb, + /// or in textual repr: transfer(address,uint256) + function transfer(address to, uint256 amount) external returns (bool); + + /// @dev EVM selector for this function is: 0x23b872dd, + /// or in textual repr: transferFrom(address,address,uint256) + function transferFrom( + address from, + address to, + uint256 amount + ) external returns (bool); + + /// @dev EVM selector for this function is: 0x095ea7b3, + /// or in textual repr: approve(address,uint256) + function approve(address spender, uint256 amount) external returns (bool); + + /// @dev EVM selector for this function is: 0xdd62ed3e, + /// or in textual repr: allowance(address,address) + function allowance(address owner, address spender) external view returns (uint256); +} + +interface UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {} --- a/tests/src/eth/api/UniqueNFT.sol +++ b/tests/src/eth/api/UniqueNFT.sol @@ -49,7 +49,7 @@ /// @param properties settable properties /// @dev EVM selector for this function is: 0x14ed3a6e, /// or in textual repr: setProperties(uint256,(string,bytes)[]) - function setProperties(uint256 tokenId, Tuple19[] memory properties) external; + function setProperties(uint256 tokenId, Tuple21[] memory properties) external; /// @notice Delete token property value. /// @dev Throws error if `msg.sender` has no permission to edit the property. @@ -70,19 +70,7 @@ } /// @title A contract that allows you to work with collections. -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /// @dev the ERC-165 identifier for this interface is 0xb3152af3 -======= -/// @dev the ERC-165 identifier for this interface is 0x674be726 ->>>>>>> feat: Add custum signature with unlimited nesting. -======= -/// @dev the ERC-165 identifier for this interface is 0x943ee094 ->>>>>>> fix: after rebase -======= -/// @dev the ERC-165 identifier for this interface is 0xefe988e0 ->>>>>>> misk: update stubs interface Collection is Dummy, ERC165 { /// Set collection property. /// @@ -145,16 +133,10 @@ /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. /// /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract. -<<<<<<< HEAD - /// @dev EVM selector for this function is: 0x403e96a7, - /// or in textual repr: setCollectionSponsorCross((address,uint256)) - function setCollectionSponsorCross(Tuple6 memory sponsor) external; -======= /// @dev EVM selector for this function is: 0x84a1d5a8, /// or in textual repr: setCollectionSponsorCross(EthCrossAccount) /// or in the expanded repr: setCollectionSponsorCross((address,uint256)) function setCollectionSponsorCross(EthCrossAccount memory sponsor) external; ->>>>>>> misk: update stubs /// Whether there is a pending sponsor. /// @dev EVM selector for this function is: 0x058ac185, @@ -212,17 +194,6 @@ /// Add collection admin. /// @param newAdmin Cross account administrator address. -<<<<<<< HEAD - /// @dev EVM selector for this function is: 0x62e3c7c2, - /// or in textual repr: addCollectionAdminCross((address,uint256)) - function addCollectionAdminCross(Tuple6 memory newAdmin) external; - - /// Remove collection admin. - /// @param admin Cross account administrator address. - /// @dev EVM selector for this function is: 0x810d1503, - /// or in textual repr: removeCollectionAdminCross((address,uint256)) - function removeCollectionAdminCross(Tuple6 memory admin) external; -======= /// @dev EVM selector for this function is: 0x859aa7d6, /// or in textual repr: addCollectionAdminCross(EthCrossAccount) /// or in the expanded repr: addCollectionAdminCross((address,uint256)) @@ -234,7 +205,6 @@ /// or in textual repr: removeCollectionAdminCross(EthCrossAccount) /// or in the expanded repr: removeCollectionAdminCross((address,uint256)) function removeCollectionAdminCross(EthCrossAccount memory admin) external; ->>>>>>> misk: update stubs /// Add collection admin. /// @param newAdmin Address of the added administrator. @@ -289,16 +259,10 @@ /// Add user to allowed list. /// /// @param user User cross account address. -<<<<<<< HEAD - /// @dev EVM selector for this function is: 0xf074da88, - /// or in textual repr: addToCollectionAllowListCross((address,uint256)) - function addToCollectionAllowListCross(Tuple6 memory user) external; -======= /// @dev EVM selector for this function is: 0xa0184a3a, /// or in textual repr: addToCollectionAllowListCross(EthCrossAccount) /// or in the expanded repr: addToCollectionAllowListCross((address,uint256)) function addToCollectionAllowListCross(EthCrossAccount memory user) external; ->>>>>>> misk: update stubs /// Remove the user from the allowed list. /// @@ -310,16 +274,10 @@ /// Remove user from allowed list. /// /// @param user User cross account address. -<<<<<<< HEAD - /// @dev EVM selector for this function is: 0xc00df45c, - /// or in textual repr: removeFromCollectionAllowListCross((address,uint256)) - function removeFromCollectionAllowListCross(Tuple6 memory user) external; -======= /// @dev EVM selector for this function is: 0x09ba452a, /// or in textual repr: removeFromCollectionAllowListCross(EthCrossAccount) /// or in the expanded repr: removeFromCollectionAllowListCross((address,uint256)) function removeFromCollectionAllowListCross(EthCrossAccount memory user) external; ->>>>>>> misk: update stubs /// Switch permission for minting. /// @@ -340,16 +298,10 @@ /// /// @param user User cross account to verify /// @return "true" if account is the owner or admin -<<<<<<< HEAD - /// @dev EVM selector for this function is: 0x5aba3351, - /// or in textual repr: isOwnerOrAdminCross((address,uint256)) - function isOwnerOrAdminCross(Tuple6 memory user) external view returns (bool); -======= /// @dev EVM selector for this function is: 0x3e75a905, /// or in textual repr: isOwnerOrAdminCross(EthCrossAccount) /// or in the expanded repr: isOwnerOrAdminCross((address,uint256)) function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool); ->>>>>>> misk: update stubs /// Returns collection type /// @@ -360,7 +312,7 @@ /// Get collection owner. /// - /// @return Tuple with sponsor address and his substrate mirror. + /// @return Tuble with sponsor address and his substrate mirror. /// If address is canonical then substrate mirror is zero and vice versa. /// @dev EVM selector for this function is: 0xdf727d3b, /// or in textual repr: collectionOwner() @@ -380,21 +332,12 @@ /// If address is canonical then substrate mirror is zero and vice versa. /// @dev EVM selector for this function is: 0x5813216b, /// or in textual repr: collectionAdmins() -<<<<<<< HEAD - function collectionAdmins() external view returns (Tuple6[] memory); -======= function collectionAdmins() external view returns (EthCrossAccount[] memory); ->>>>>>> misk: update stubs /// Changes collection owner to another account /// /// @dev Owner can be changed only by current owner /// @param newOwner new owner cross account -<<<<<<< HEAD - /// @dev EVM selector for this function is: 0xbdff793d, - /// or in textual repr: setOwnerCross((address,uint256)) - function setOwnerCross(Tuple6 memory newOwner) external; -======= /// @dev EVM selector for this function is: 0xe5c9913f, /// or in textual repr: setOwnerCross(EthCrossAccount) /// or in the expanded repr: setOwnerCross((address,uint256)) @@ -411,17 +354,14 @@ struct Tuple24 { address field_0; uint256 field_1; ->>>>>>> misk: update stubs } -<<<<<<< HEAD /// @dev anonymous struct -struct Tuple19 { - address field_0; - uint256 field_1; +struct Tuple21 { + string field_0; + bytes field_1; } -<<<<<<< HEAD /// @title ERC-721 Non-Fungible Token Standard, optional metadata extension /// @dev See https://eips.ethereum.org/EIPS/eip-721 /// @dev the ERC-165 identifier for this interface is 0x5b5e139f @@ -450,18 +390,8 @@ /// @dev EVM selector for this function is: 0xc87b56dd, /// or in textual repr: tokenURI(uint256) function tokenURI(uint256 tokenId) external view returns (string memory); -} - -======= ->>>>>>> feat: Add custum signature with unlimited nesting. -======= -/// @dev anonymous struct -struct Tuple21 { - string field_0; - bytes field_1; } ->>>>>>> fix: after rebase /// @title ERC721 Token that can be irreversibly burned (destroyed). /// @dev the ERC-165 identifier for this interface is 0x42966c68 interface ERC721Burnable is Dummy, ERC165 { @@ -527,15 +457,7 @@ } /// @title Unique extensions for ERC721. -<<<<<<< HEAD -<<<<<<< HEAD /// @dev the ERC-165 identifier for this interface is 0x244543ee -======= -/// @dev the ERC-165 identifier for this interface is 0xcc97cb35 ->>>>>>> feat: Add custum signature with unlimited nesting. -======= -/// @dev the ERC-165 identifier for this interface is 0xb76006ac ->>>>>>> misk: update stubs interface ERC721UniqueExtensions is Dummy, ERC165 { /// @notice A descriptive name for a collection of NFTs in this contract /// @dev EVM selector for this function is: 0x06fdde03, @@ -553,16 +475,10 @@ /// operator of the current owner. /// @param approved The new substrate address approved NFT controller /// @param tokenId The NFT to approve -<<<<<<< HEAD - /// @dev EVM selector for this function is: 0x106fdb59, - /// or in textual repr: approveCross((address,uint256),uint256) - function approveCross(Tuple6 memory approved, uint256 tokenId) external; -======= /// @dev EVM selector for this function is: 0x0ecd0ab0, /// or in textual repr: approveCross(EthCrossAccount,uint256) /// or in the expanded repr: approveCross((address,uint256),uint256) function approveCross(EthCrossAccount memory approved, uint256 tokenId) external; ->>>>>>> misk: update stubs /// @notice Transfer ownership of an NFT /// @dev Throws unless `msg.sender` is the current owner. Throws if `to` @@ -583,13 +499,8 @@ /// or in textual repr: transferFromCross(EthCrossAccount,EthCrossAccount,uint256) /// or in the expanded repr: transferFromCross((address,uint256),(address,uint256),uint256) function transferFromCross( -<<<<<<< HEAD - Tuple6 memory from, - Tuple6 memory to, -======= EthCrossAccount memory from, EthCrossAccount memory to, ->>>>>>> feat: Add custum signature with unlimited nesting. uint256 tokenId ) external; @@ -609,22 +520,15 @@ /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT. /// @param from The current owner of the NFT /// @param tokenId The NFT to transfer -<<<<<<< HEAD - /// @dev EVM selector for this function is: 0xa8106d4a, - /// or in textual repr: burnFromCross((address,uint256),uint256) - function burnFromCross(Tuple6 memory from, uint256 tokenId) external; -======= /// @dev EVM selector for this function is: 0xbb2f5a58, /// or in textual repr: burnFromCross(EthCrossAccount,uint256) /// or in the expanded repr: burnFromCross((address,uint256),uint256) function burnFromCross(EthCrossAccount memory from, uint256 tokenId) external; ->>>>>>> misk: update stubs /// @notice Returns next free NFT ID. /// @dev EVM selector for this function is: 0x75794a3c, /// or in textual repr: nextTokenId() function nextTokenId() external view returns (uint256); -<<<<<<< HEAD // /// @notice Function to mint multiple tokens. // /// @dev `tokenIds` should be an array of consecutive numbers and first number // /// should be obtained with `nextTokenId` method @@ -641,54 +545,16 @@ // /// @param tokens array of pairs of token ID and token URI for minted tokens // /// @dev EVM selector for this function is: 0x36543006, // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[]) - // function mintBulkWithTokenURI(address to, Tuple8[] memory tokens) external returns (bool); -} - -/// @dev anonymous struct -struct Tuple8 { -======= + // function mintBulkWithTokenURI(address to, Tuple10[] memory tokens) external returns (bool); - /// @notice Function to mint multiple tokens. - /// @dev `tokenIds` should be an array of consecutive numbers and first number - /// should be obtained with `nextTokenId` method - /// @param to The new owner - /// @param tokenIds IDs of the minted NFTs - /// @dev EVM selector for this function is: 0x44a9945e, - /// or in textual repr: mintBulk(address,uint256[]) - function mintBulk(address to, uint256[] memory tokenIds) external returns (bool); - - /// @notice Function to mint multiple tokens with the given tokenUris. - /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive - /// numbers and first number should be obtained with `nextTokenId` method - /// @param to The new owner - /// @param tokens array of pairs of token ID and token URI for minted tokens - /// @dev EVM selector for this function is: 0x36543006, - /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[]) - function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) external returns (bool); } /// @dev anonymous struct -struct Tuple12 { ->>>>>>> feat: Add custum signature with unlimited nesting. +struct Tuple10 { uint256 field_0; string field_1; -} - -<<<<<<< HEAD -/// @dev anonymous struct -struct Tuple8 { - address field_0; - uint256 field_1; } -/// @dev anonymous struct -struct Tuple8 { - address field_0; - uint256 field_1; -} - -======= ->>>>>>> misk: update stubs /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension /// @dev See https://eips.ethereum.org/EIPS/eip-721 /// @dev the ERC-165 identifier for this interface is 0x780e9d63 --- a/tests/src/eth/api/UniqueRefungible.sol +++ b/tests/src/eth/api/UniqueRefungible.sol @@ -49,7 +49,7 @@ /// @param properties settable properties /// @dev EVM selector for this function is: 0x14ed3a6e, /// or in textual repr: setProperties(uint256,(string,bytes)[]) - function setProperties(uint256 tokenId, Tuple19[] memory properties) external; + function setProperties(uint256 tokenId, Tuple20[] memory properties) external; /// @notice Delete token property value. /// @dev Throws error if `msg.sender` has no permission to edit the property. @@ -134,14 +134,9 @@ /// /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract. /// @dev EVM selector for this function is: 0x84a1d5a8, -<<<<<<< HEAD - /// or in textual repr: setCollectionSponsorCross((address,uint256)) - function setCollectionSponsorCross(Tuple6 memory sponsor) external; -======= /// or in textual repr: setCollectionSponsorCross(EthCrossAccount) /// or in the expanded repr: setCollectionSponsorCross((address,uint256)) function setCollectionSponsorCross(EthCrossAccount memory sponsor) external; ->>>>>>> misk: update stubs /// Whether there is a pending sponsor. /// @dev EVM selector for this function is: 0x058ac185, @@ -165,11 +160,7 @@ /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw. /// @dev EVM selector for this function is: 0x6ec0a9f1, /// or in textual repr: collectionSponsor() -<<<<<<< HEAD - function collectionSponsor() external view returns (Tuple6 memory); -======= function collectionSponsor() external view returns (Tuple23 memory); ->>>>>>> misk: update stubs /// Set limits for the collection. /// @dev Throws error if limit not found. @@ -204,26 +195,16 @@ /// Add collection admin. /// @param newAdmin Cross account administrator address. /// @dev EVM selector for this function is: 0x859aa7d6, -<<<<<<< HEAD - /// or in textual repr: addCollectionAdminCross((address,uint256)) - function addCollectionAdminCross(Tuple6 memory newAdmin) external; -======= /// or in textual repr: addCollectionAdminCross(EthCrossAccount) /// or in the expanded repr: addCollectionAdminCross((address,uint256)) function addCollectionAdminCross(EthCrossAccount memory newAdmin) external; ->>>>>>> misk: update stubs /// Remove collection admin. /// @param admin Cross account administrator address. /// @dev EVM selector for this function is: 0x6c0cd173, -<<<<<<< HEAD - /// or in textual repr: removeCollectionAdminCross((address,uint256)) - function removeCollectionAdminCross(Tuple6 memory admin) external; -======= /// or in textual repr: removeCollectionAdminCross(EthCrossAccount) /// or in the expanded repr: removeCollectionAdminCross((address,uint256)) function removeCollectionAdminCross(EthCrossAccount memory admin) external; ->>>>>>> misk: update stubs /// Add collection admin. /// @param newAdmin Address of the added administrator. @@ -279,14 +260,9 @@ /// /// @param user User cross account address. /// @dev EVM selector for this function is: 0xa0184a3a, -<<<<<<< HEAD - /// or in textual repr: addToCollectionAllowListCross((address,uint256)) - function addToCollectionAllowListCross(Tuple6 memory user) external; -======= /// or in textual repr: addToCollectionAllowListCross(EthCrossAccount) /// or in the expanded repr: addToCollectionAllowListCross((address,uint256)) function addToCollectionAllowListCross(EthCrossAccount memory user) external; ->>>>>>> misk: update stubs /// Remove the user from the allowed list. /// @@ -299,14 +275,9 @@ /// /// @param user User cross account address. /// @dev EVM selector for this function is: 0x09ba452a, -<<<<<<< HEAD - /// or in textual repr: removeFromCollectionAllowListCross((address,uint256)) - function removeFromCollectionAllowListCross(Tuple6 memory user) external; -======= /// or in textual repr: removeFromCollectionAllowListCross(EthCrossAccount) /// or in the expanded repr: removeFromCollectionAllowListCross((address,uint256)) function removeFromCollectionAllowListCross(EthCrossAccount memory user) external; ->>>>>>> misk: update stubs /// Switch permission for minting. /// @@ -328,14 +299,9 @@ /// @param user User cross account to verify /// @return "true" if account is the owner or admin /// @dev EVM selector for this function is: 0x3e75a905, -<<<<<<< HEAD - /// or in textual repr: isOwnerOrAdminCross((address,uint256)) - function isOwnerOrAdminCross(Tuple6 memory user) external view returns (bool); -======= /// or in textual repr: isOwnerOrAdminCross(EthCrossAccount) /// or in the expanded repr: isOwnerOrAdminCross((address,uint256)) function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool); ->>>>>>> misk: update stubs /// Returns collection type /// @@ -346,15 +312,11 @@ /// Get collection owner. /// - /// @return Tuple with sponsor address and his substrate mirror. + /// @return Tuble with sponsor address and his substrate mirror. /// If address is canonical then substrate mirror is zero and vice versa. /// @dev EVM selector for this function is: 0xdf727d3b, /// or in textual repr: collectionOwner() -<<<<<<< HEAD - function collectionOwner() external view returns (Tuple6 memory); -======= function collectionOwner() external view returns (EthCrossAccount memory); ->>>>>>> misk: update stubs /// Changes collection owner to another account /// @@ -370,21 +332,13 @@ /// If address is canonical then substrate mirror is zero and vice versa. /// @dev EVM selector for this function is: 0x5813216b, /// or in textual repr: collectionAdmins() -<<<<<<< HEAD - function collectionAdmins() external view returns (Tuple6[] memory); -======= function collectionAdmins() external view returns (EthCrossAccount[] memory); ->>>>>>> misk: update stubs /// Changes collection owner to another account /// /// @dev Owner can be changed only by current owner /// @param newOwner new owner cross account /// @dev EVM selector for this function is: 0xe5c9913f, -<<<<<<< HEAD - /// or in textual repr: setOwnerCross((address,uint256)) - function setOwnerCross(Tuple6 memory newOwner) external; -======= /// or in textual repr: setOwnerCross(EthCrossAccount) /// or in the expanded repr: setOwnerCross((address,uint256)) function setOwnerCross(EthCrossAccount memory newOwner) external; @@ -400,7 +354,6 @@ struct Tuple23 { address field_0; uint256 field_1; ->>>>>>> misk: update stubs } /// @dev anonymous struct @@ -534,13 +487,8 @@ /// or in textual repr: transferFromCross(EthCrossAccount,EthCrossAccount,uint256) /// or in the expanded repr: transferFromCross((address,uint256),(address,uint256),uint256) function transferFromCross( -<<<<<<< HEAD - Tuple6 memory from, - Tuple6 memory to, -======= EthCrossAccount memory from, EthCrossAccount memory to, ->>>>>>> misk: update stubs uint256 tokenId ) external; @@ -563,21 +511,15 @@ /// @param from The current owner of the RFT /// @param tokenId The RFT to transfer /// @dev EVM selector for this function is: 0xbb2f5a58, -<<<<<<< HEAD - /// or in textual repr: burnFromCross((address,uint256),uint256) - function burnFromCross(Tuple6 memory from, uint256 tokenId) external; -======= /// or in textual repr: burnFromCross(EthCrossAccount,uint256) /// or in the expanded repr: burnFromCross((address,uint256),uint256) function burnFromCross(EthCrossAccount memory from, uint256 tokenId) external; ->>>>>>> misk: update stubs /// @notice Returns next free RFT ID. /// @dev EVM selector for this function is: 0x75794a3c, /// or in textual repr: nextTokenId() function nextTokenId() external view returns (uint256); -<<<<<<< HEAD // /// @notice Function to mint multiple tokens. // /// @dev `tokenIds` should be an array of consecutive numbers and first number // /// should be obtained with `nextTokenId` method @@ -594,26 +536,7 @@ // /// @param tokens array of pairs of token ID and token URI for minted tokens // /// @dev EVM selector for this function is: 0x36543006, // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[]) - // function mintBulkWithTokenURI(address to, Tuple8[] memory tokens) external returns (bool); -======= - /// @notice Function to mint multiple tokens. - /// @dev `tokenIds` should be an array of consecutive numbers and first number - /// should be obtained with `nextTokenId` method - /// @param to The new owner - /// @param tokenIds IDs of the minted RFTs - /// @dev EVM selector for this function is: 0x44a9945e, - /// or in textual repr: mintBulk(address,uint256[]) - function mintBulk(address to, uint256[] memory tokenIds) external returns (bool); - - /// @notice Function to mint multiple tokens with the given tokenUris. - /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive - /// numbers and first number should be obtained with `nextTokenId` method - /// @param to The new owner - /// @param tokens array of pairs of token ID and token URI for minted tokens - /// @dev EVM selector for this function is: 0x36543006, - /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[]) - function mintBulkWithTokenURI(address to, Tuple11[] memory tokens) external returns (bool); ->>>>>>> misk: update stubs + // function mintBulkWithTokenURI(address to, Tuple9[] memory tokens) external returns (bool); /// Returns EVM address for refungible token /// @@ -624,24 +547,11 @@ } /// @dev anonymous struct -<<<<<<< HEAD -struct Tuple8 { -======= -struct Tuple11 { ->>>>>>> misk: update stubs +struct Tuple9 { uint256 field_0; string field_1; -} - -<<<<<<< HEAD -/// @dev anonymous struct -struct Tuple6 { - address field_0; - uint256 field_1; } -======= ->>>>>>> misk: update stubs /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension /// @dev See https://eips.ethereum.org/EIPS/eip-721 /// @dev the ERC-165 identifier for this interface is 0x780e9d63 --- a/tests/src/eth/base.test.ts +++ b/tests/src/eth/base.test.ts @@ -117,7 +117,7 @@ }); itEth('ERC721UniqueExtensions support', async ({helper}) => { - expect(await contract(helper).methods.supportsInterface('0xb76006ac').call()).to.be.true; + await checkInterface(helper, '0xb76006ac', true, true); }); itEth('ERC721Burnable - 0x42966c68 - support', async ({helper}) => { --- a/tests/src/eth/collectionAdmin.test.ts +++ b/tests/src/eth/collectionAdmin.test.ts @@ -14,8 +14,10 @@ // along with Unique Network. If not, see . import {IKeyringPair} from '@polkadot/types/types'; +import {expect} from 'chai'; import {IEthCrossAccountId} from '../util/playgrounds/types'; -import {usingEthPlaygrounds, itEth, expect, EthUniqueHelper} from './util/playgrounds'; +import {usingEthPlaygrounds, itEth} from './util'; +import {EthUniqueHelper} from './util/playgrounds/unique.dev'; async function recordEthFee(helper: EthUniqueHelper, userAddress: string, call: () => Promise) { const before = await helper.balance.getSubstrate(helper.address.ethToSubstrate(userAddress)); @@ -53,10 +55,10 @@ itEth('Add cross account admin by owner', async ({helper, privateKey}) => { const owner = await helper.eth.createAccountWithBalance(donor); - const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C'); + const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C'); const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner); - const newAdmin = privateKey('//Bob'); + const newAdmin = await privateKey('//Bob'); const newAdminCross = helper.ethCrossAccount.fromKeyringPair(newAdmin); await collectionEvm.methods.addCollectionAdminCross(newAdminCross).send(); @@ -67,11 +69,11 @@ itEth('Check adminlist', async ({helper, privateKey}) => { const owner = await helper.eth.createAccountWithBalance(donor); - const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C'); + const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C'); const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner); const admin1 = helper.eth.createAccount(); - const admin2 = privateKey('admin'); + const admin2 = await privateKey('admin'); await collectionEvm.methods.addCollectionAdmin(admin1).send(); await collectionEvm.methods.addCollectionAdminSubstrate(admin2.addressRaw).send(); --- a/tests/src/eth/fungible.test.ts +++ b/tests/src/eth/fungible.test.ts @@ -149,20 +149,20 @@ }); itEth('Can perform burnFromCross()', async ({helper, privateKey}) => { - const alice = privateKey('//Alice'); - const sender = await helper.eth.createAccountWithBalance(alice, 100n); + const owner = await privateKey('//Alice'); + const sender = await helper.eth.createAccountWithBalance(donor); - const collection = await helper.ft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0); + const collection = await helper.ft.mintCollection(owner, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0); - await collection.mint(alice, 200n, {Substrate: alice.address}); - await collection.approveTokens(alice, {Ethereum: sender}, 100n); + await collection.mint(owner, 200n, {Substrate: owner.address}); + await collection.approveTokens(owner, {Ethereum: sender}, 100n); const address = helper.ethAddress.fromCollectionId(collection.collectionId); const contract = helper.ethNativeContract.collection(address, 'ft'); - const fromBalanceBefore = await collection.getBalance({Substrate: alice.address}); + const fromBalanceBefore = await collection.getBalance({Substrate: owner.address}); - const ownerCross = helper.ethCrossAccount.fromKeyringPair(alice); + const ownerCross = helper.ethCrossAccount.fromKeyringPair(owner); const result = await contract.methods.burnFromCross(ownerCross, 49).send({from: sender}); const events = result.events; @@ -171,7 +171,7 @@ address: helper.ethAddress.fromCollectionId(collection.collectionId), event: 'Transfer', returnValues: { - from: helper.address.substrateToEth(alice.address), + from: helper.address.substrateToEth(owner.address), to: '0x0000000000000000000000000000000000000000', value: '49', }, @@ -179,7 +179,7 @@ Approval: { address: helper.ethAddress.fromCollectionId(collection.collectionId), returnValues: { - owner: helper.address.substrateToEth(alice.address), + owner: helper.address.substrateToEth(owner.address), spender: sender, value: '51', }, @@ -187,7 +187,7 @@ }, }); - const fromBalanceAfter = await collection.getBalance({Substrate: alice.address}); + const fromBalanceAfter = await collection.getBalance({Substrate: owner.address}); expect(fromBalanceBefore - fromBalanceAfter).to.be.eq(49n); }); @@ -261,23 +261,23 @@ }); itEth('Can perform transferFromCross()', async ({helper, privateKey}) => { - const alice = privateKey('//Alice'); - const sender = await helper.eth.createAccountWithBalance(alice, 100n); + const owner = await privateKey('//Alice'); + const sender = await helper.eth.createAccountWithBalance(donor); - const collection = await helper.ft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0); + const collection = await helper.ft.mintCollection(owner, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0); const receiver = helper.eth.createAccount(); - await collection.mint(alice, 200n, {Substrate: alice.address}); - await collection.approveTokens(alice, {Ethereum: sender}, 100n); + await collection.mint(owner, 200n, {Substrate: owner.address}); + await collection.approveTokens(owner, {Ethereum: sender}, 100n); const address = helper.ethAddress.fromCollectionId(collection.collectionId); const contract = helper.ethNativeContract.collection(address, 'ft'); - const from = helper.ethCrossAccount.fromKeyringPair(alice); + const from = helper.ethCrossAccount.fromKeyringPair(owner); const to = helper.ethCrossAccount.fromAddress(receiver); - const fromBalanceBefore = await collection.getBalance({Substrate: alice.address}); + const fromBalanceBefore = await collection.getBalance({Substrate: owner.address}); const toBalanceBefore = await collection.getBalance({Ethereum: receiver}); const result = await contract.methods.transferFromCross(from, to, 51).send({from: sender}); @@ -287,7 +287,7 @@ address, event: 'Transfer', returnValues: { - from: helper.address.substrateToEth(alice.address), + from: helper.address.substrateToEth(owner.address), to: receiver, value: '51', }, @@ -296,13 +296,13 @@ address, event: 'Approval', returnValues: { - owner: helper.address.substrateToEth(alice.address), + owner: helper.address.substrateToEth(owner.address), spender: sender, value: '49', }, }}); - const fromBalanceAfter = await collection.getBalance({Substrate: alice.address}); + const fromBalanceAfter = await collection.getBalance({Substrate: owner.address}); expect(fromBalanceBefore - fromBalanceAfter).to.be.eq(51n); const toBalanceAfter = await collection.getBalance({Ethereum: receiver}); expect(toBalanceAfter - toBalanceBefore).to.be.eq(51n); @@ -455,20 +455,20 @@ }); itEth('Events emitted for transferFromCross()', async ({helper, privateKey}) => { - const alice = privateKey('//Alice'); - const sender = await helper.eth.createAccountWithBalance(alice, 100n); + const owner = await privateKey('//Alice'); + const sender = await helper.eth.createAccountWithBalance(donor); - const collection = await helper.ft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0); + const collection = await helper.ft.mintCollection(owner, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0); const receiver = helper.eth.createAccount(); - await collection.mint(alice, 200n, {Substrate: alice.address}); - await collection.approveTokens(alice, {Ethereum: sender}, 100n); + await collection.mint(owner, 200n, {Substrate: owner.address}); + await collection.approveTokens(owner, {Ethereum: sender}, 100n); const address = helper.ethAddress.fromCollectionId(collection.collectionId); const contract = helper.ethNativeContract.collection(address, 'ft'); - const from = helper.ethCrossAccount.fromKeyringPair(alice); + const from = helper.ethCrossAccount.fromKeyringPair(owner); const to = helper.ethCrossAccount.fromAddress(receiver); const result = await contract.methods.transferFromCross(from, to, 51).send({from: sender}); @@ -478,7 +478,7 @@ address, event: 'Transfer', returnValues: { - from: helper.address.substrateToEth(alice.address), + from: helper.address.substrateToEth(owner.address), to: receiver, value: '51', }, @@ -487,7 +487,7 @@ address, event: 'Approval', returnValues: { - owner: helper.address.substrateToEth(alice.address), + owner: helper.address.substrateToEth(owner.address), spender: sender, value: '49', }, --- a/tests/src/eth/fungibleAbi.json +++ b/tests/src/eth/fungibleAbi.json @@ -62,13 +62,8 @@ "inputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ->>>>>>> misk: update stubs ], "internalType": "struct EthCrossAccount", "name": "newAdmin", @@ -93,13 +88,8 @@ "inputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ->>>>>>> misk: update stubs ], "internalType": "struct EthCrossAccount", "name": "user", @@ -144,13 +134,8 @@ "inputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ->>>>>>> misk: update stubs ], "internalType": "struct EthCrossAccount", "name": "spender", @@ -186,13 +171,8 @@ "inputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ->>>>>>> misk: update stubs ], "internalType": "struct EthCrossAccount", "name": "from", @@ -202,7 +182,6 @@ ], "name": "burnFromCross", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], -<<<<<<< HEAD "stateMutability": "nonpayable", "type": "function" }, @@ -212,8 +191,6 @@ ], "name": "changeCollectionOwner", "outputs": [], -======= ->>>>>>> misk: update stubs "stateMutability": "nonpayable", "type": "function" }, @@ -223,13 +200,8 @@ "outputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ->>>>>>> misk: update stubs ], "internalType": "struct EthCrossAccount[]", "name": "", @@ -245,13 +217,8 @@ "outputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ->>>>>>> misk: update stubs ], "internalType": "struct EthCrossAccount", "name": "", @@ -361,13 +328,8 @@ "inputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ->>>>>>> misk: update stubs ], "internalType": "struct EthCrossAccount", "name": "user", @@ -426,13 +388,8 @@ "inputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ->>>>>>> misk: update stubs ], "internalType": "struct EthCrossAccount", "name": "admin", @@ -464,13 +421,8 @@ "inputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ->>>>>>> misk: update stubs ], "internalType": "struct EthCrossAccount", "name": "user", @@ -577,13 +529,8 @@ "inputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ->>>>>>> misk: update stubs ], "internalType": "struct EthCrossAccount", "name": "sponsor", @@ -597,26 +544,10 @@ }, { "inputs": [ -<<<<<<< HEAD { "components": [ - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } -======= - { "internalType": "address", "name": "newOwner", "type": "address" } - ], - "name": "setOwner", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "components": [ { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ->>>>>>> misk: update stubs ], "internalType": "struct EthCrossAccount", "name": "newOwner", @@ -676,13 +607,8 @@ "inputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ->>>>>>> misk: update stubs ], "internalType": "struct EthCrossAccount", "name": "from", @@ -690,13 +616,8 @@ }, { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ->>>>>>> misk: update stubs ], "internalType": "struct EthCrossAccount", "name": "to", --- a/tests/src/eth/nonFungible.test.ts +++ b/tests/src/eth/nonFungible.test.ts @@ -247,13 +247,13 @@ }); itEth('Can perform burnFromCross()', async ({helper, privateKey}) => { - const alice = privateKey('//Alice'); - const collection = await helper.nft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'}); + const minter = await privateKey('//Alice'); + const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'}); - const owner = privateKey('//Bob'); - const spender = await helper.eth.createAccountWithBalance(alice, 100n); + const owner = await privateKey('//Bob'); + const spender = await helper.eth.createAccountWithBalance(donor); - const token = await collection.mintToken(alice, {Substrate: owner.address}); + const token = await collection.mintToken(minter, {Substrate: owner.address}); const address = helper.ethAddress.fromCollectionId(collection.collectionId); const contract = helper.ethNativeContract.collection(address, 'nft'); @@ -277,13 +277,13 @@ }); itEth('Can perform approveCross()', async ({helper, privateKey}) => { - const alice = privateKey('//Alice'); - const collection = await helper.nft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'}); + const minter = await privateKey('//Alice'); + const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'}); - const owner = await helper.eth.createAccountWithBalance(alice, 100n); - const receiver = privateKey('//Charlie'); + const owner = await helper.eth.createAccountWithBalance(donor); + const receiver = await privateKey('//Charlie'); - const token = await collection.mintToken(alice, {Ethereum: owner}); + const token = await collection.mintToken(minter, {Ethereum: owner}); const address = helper.ethAddress.fromCollectionId(collection.collectionId); const contract = helper.ethNativeContract.collection(address, 'nft'); @@ -410,11 +410,12 @@ }); itEth('Can perform transferFromCross()', async ({helper, privateKey}) => { - const collection = await helper.nft.mintCollection(donor, {name: 'A', description: 'B', tokenPrefix: 'C'}); + const minter = await privateKey('//Alice'); + const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'}); - const owner = privateKey('//Bob'); - const spender = await helper.eth.createAccountWithBalance(donor, 100n); - const receiver = privateKey('//Charlie'); + const owner = await privateKey('//Bob'); + const spender = await helper.eth.createAccountWithBalance(donor); + const receiver = await privateKey('//Charlie'); const token = await collection.mintToken(donor, {Substrate: owner.address}); --- a/tests/src/eth/nonFungibleAbi.json +++ b/tests/src/eth/nonFungibleAbi.json @@ -96,11 +96,7 @@ { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], -<<<<<<< HEAD - "internalType": "struct Tuple6", -======= "internalType": "struct EthCrossAccount", ->>>>>>> misk: update stubs "name": "newAdmin", "type": "tuple" } @@ -126,11 +122,7 @@ { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], -<<<<<<< HEAD - "internalType": "struct Tuple6", -======= "internalType": "struct EthCrossAccount", ->>>>>>> misk: update stubs "name": "user", "type": "tuple" } @@ -166,11 +158,7 @@ { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], -<<<<<<< HEAD - "internalType": "struct Tuple6", -======= "internalType": "struct EthCrossAccount", ->>>>>>> misk: update stubs "name": "approved", "type": "tuple" }, @@ -216,11 +204,7 @@ { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], -<<<<<<< HEAD - "internalType": "struct Tuple6", -======= "internalType": "struct EthCrossAccount", ->>>>>>> misk: update stubs "name": "from", "type": "tuple" }, @@ -249,11 +233,7 @@ { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], -<<<<<<< HEAD - "internalType": "struct Tuple6[]", -======= "internalType": "struct EthCrossAccount[]", ->>>>>>> misk: update stubs "name": "", "type": "tuple[]" } @@ -270,19 +250,7 @@ { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "internalType": "struct Tuple6", -======= - "internalType": "struct Tuple19", ->>>>>>> feat: add `EthCrossAccount` type -======= - "internalType": "struct Tuple8", ->>>>>>> feat: Add custum signature with unlimited nesting. -======= "internalType": "struct EthCrossAccount", ->>>>>>> misk: update stubs "name": "", "type": "tuple" } @@ -291,10 +259,6 @@ "type": "function" }, { -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> fix: after rebase "inputs": [ { "internalType": "string[]", "name": "keys", "type": "string[]" } ], @@ -305,23 +269,11 @@ { "internalType": "string", "name": "field_0", "type": "string" }, { "internalType": "bytes", "name": "field_1", "type": "bytes" } ], -<<<<<<< HEAD - "internalType": "struct Tuple19[]", -======= "internalType": "struct Tuple21[]", ->>>>>>> fix: after rebase "name": "", "type": "tuple[]" } ], -<<<<<<< HEAD -======= - "inputs": [{ "internalType": "string", "name": "key", "type": "string" }], - "name": "collectionProperty", - "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }], ->>>>>>> feat: Add custum signature with unlimited nesting. -======= ->>>>>>> fix: after rebase "stateMutability": "view", "type": "function" }, @@ -341,19 +293,7 @@ { "internalType": "address", "name": "field_0", "type": "address" }, { "internalType": "uint256", "name": "field_1", "type": "uint256" } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "internalType": "struct Tuple6", -======= - "internalType": "struct Tuple19", ->>>>>>> feat: add `EthCrossAccount` type -======= - "internalType": "struct Tuple8", ->>>>>>> feat: Add custum signature with unlimited nesting. -======= "internalType": "struct Tuple24", ->>>>>>> misk: update stubs "name": "", "type": "tuple" } @@ -376,10 +316,6 @@ "type": "function" }, { -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> fix: after rebase "inputs": [ { "internalType": "string[]", "name": "keys", "type": "string[]" } ], @@ -389,11 +325,6 @@ "type": "function" }, { -<<<<<<< HEAD -======= ->>>>>>> feat: Add custum signature with unlimited nesting. -======= ->>>>>>> fix: after rebase "inputs": [{ "internalType": "string", "name": "key", "type": "string" }], "name": "deleteCollectionProperty", "outputs": [], @@ -459,11 +390,7 @@ { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], -<<<<<<< HEAD - "internalType": "struct Tuple6", -======= "internalType": "struct EthCrossAccount", ->>>>>>> misk: update stubs "name": "user", "type": "tuple" } @@ -474,68 +401,23 @@ "type": "function" }, { -<<<<<<< HEAD "inputs": [{ "internalType": "address", "name": "to", "type": "address" }], "name": "mint", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], -======= - "inputs": [ - { "internalType": "address", "name": "to", "type": "address" }, - { "internalType": "uint256", "name": "tokenId", "type": "uint256" } - ], - "name": "mint", - "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], ->>>>>>> feat: Add custum signature with unlimited nesting. "stateMutability": "nonpayable", "type": "function" }, { "inputs": [ { "internalType": "address", "name": "to", "type": "address" }, -<<<<<<< HEAD { "internalType": "string", "name": "tokenUri", "type": "string" } ], "name": "mintWithTokenURI", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], -======= - { "internalType": "uint256[]", "name": "tokenIds", "type": "uint256[]" } - ], - "name": "mintBulk", - "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "nonpayable", "type": "function" }, { - "inputs": [ - { "internalType": "address", "name": "to", "type": "address" }, - { - "components": [ - { "internalType": "uint256", "name": "field_0", "type": "uint256" }, - { "internalType": "string", "name": "field_1", "type": "string" } - ], - "internalType": "struct Tuple12[]", - "name": "tokens", - "type": "tuple[]" - } - ], - "name": "mintBulkWithTokenURI", - "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { "internalType": "address", "name": "to", "type": "address" }, - { "internalType": "uint256", "name": "tokenId", "type": "uint256" }, - { "internalType": "string", "name": "tokenUri", "type": "string" } - ], - "name": "mintWithTokenURI", - "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], ->>>>>>> feat: Add custum signature with unlimited nesting. - "stateMutability": "nonpayable", - "type": "function" - }, - { "inputs": [], "name": "mintingFinished", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], @@ -591,11 +473,7 @@ { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], -<<<<<<< HEAD - "internalType": "struct Tuple6", -======= "internalType": "struct EthCrossAccount", ->>>>>>> misk: update stubs "name": "admin", "type": "tuple" } @@ -628,11 +506,7 @@ { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], -<<<<<<< HEAD - "internalType": "struct Tuple6", -======= "internalType": "struct EthCrossAccount", ->>>>>>> misk: update stubs "name": "user", "type": "tuple" } @@ -732,30 +606,15 @@ }, { "inputs": [ -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> fix: after rebase { "components": [ { "internalType": "string", "name": "field_0", "type": "string" }, { "internalType": "bytes", "name": "field_1", "type": "bytes" } ], -<<<<<<< HEAD - "internalType": "struct Tuple19[]", - "name": "properties", - "type": "tuple[]" - } -======= - { "internalType": "string", "name": "key", "type": "string" }, - { "internalType": "bytes", "name": "value", "type": "bytes" } ->>>>>>> feat: Add custum signature with unlimited nesting. -======= "internalType": "struct Tuple21[]", "name": "properties", "type": "tuple[]" } ->>>>>>> fix: after rebase ], "name": "setCollectionProperties", "outputs": [], @@ -788,11 +647,7 @@ { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], -<<<<<<< HEAD - "internalType": "struct Tuple6", -======= "internalType": "struct EthCrossAccount", ->>>>>>> misk: update stubs "name": "sponsor", "type": "tuple" } @@ -804,19 +659,15 @@ }, { "inputs": [ -<<<<<<< HEAD { "components": [ - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } + { "internalType": "address", "name": "eth", "type": "address" }, + { "internalType": "uint256", "name": "sub", "type": "uint256" } ], - "internalType": "struct Tuple6", + "internalType": "struct EthCrossAccount", "name": "newOwner", "type": "tuple" } -======= - { "internalType": "address", "name": "newOwner", "type": "address" } ->>>>>>> feat: Add custum signature with unlimited nesting. ], "name": "setOwnerCross", "outputs": [], @@ -828,26 +679,12 @@ { "internalType": "uint256", "name": "tokenId", "type": "uint256" }, { "components": [ -<<<<<<< HEAD -<<<<<<< HEAD { "internalType": "string", "name": "field_0", "type": "string" }, { "internalType": "bytes", "name": "field_1", "type": "bytes" } -======= - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } ->>>>>>> feat: Add custum signature with unlimited nesting. ], - "internalType": "struct Tuple19[]", + "internalType": "struct Tuple21[]", "name": "properties", "type": "tuple[]" -======= - { "internalType": "address", "name": "eth", "type": "address" }, - { "internalType": "uint256", "name": "sub", "type": "uint256" } - ], - "internalType": "struct EthCrossAccount", - "name": "newOwner", - "type": "tuple" ->>>>>>> misk: update stubs } ], "name": "setProperties", @@ -954,37 +791,19 @@ "inputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ->>>>>>> feat: Add custum signature with unlimited nesting. ], -<<<<<<< HEAD - "internalType": "struct Tuple6", -======= "internalType": "struct EthCrossAccount", ->>>>>>> feat: add `EthCrossAccount` type "name": "from", "type": "tuple" }, { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ->>>>>>> feat: Add custum signature with unlimited nesting. ], -<<<<<<< HEAD - "internalType": "struct Tuple6", -======= "internalType": "struct EthCrossAccount", ->>>>>>> feat: add `EthCrossAccount` type "name": "to", "type": "tuple" }, --- a/tests/src/eth/reFungible.test.ts +++ b/tests/src/eth/reFungible.test.ts @@ -228,13 +228,13 @@ }); itEth('Can perform burnFrom()', async ({helper, privateKey}) => { - const alice = privateKey('//Alice'); - const collection = await helper.rft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'}); + const minter = await privateKey('//Alice'); + const collection = await helper.rft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'}); - const owner = await helper.eth.createAccountWithBalance(alice, 100n); - const spender = await helper.eth.createAccountWithBalance(alice, 100n); + const owner = await helper.eth.createAccountWithBalance(donor); + const spender = await helper.eth.createAccountWithBalance(donor); - const token = await collection.mintToken(alice, 100n, {Ethereum: owner}); + const token = await collection.mintToken(minter, 100n, {Ethereum: owner}); const address = helper.ethAddress.fromCollectionId(collection.collectionId); const contract = helper.ethNativeContract.collection(address, 'rft'); @@ -262,13 +262,13 @@ }); itEth('Can perform burnFromCross()', async ({helper, privateKey}) => { - const alice = privateKey('//Alice'); - const collection = await helper.rft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'}); + const minter = await privateKey('//Alice'); + const collection = await helper.rft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'}); - const owner = privateKey('//Bob'); - const spender = await helper.eth.createAccountWithBalance(alice, 100n); + const owner = await privateKey('//Bob'); + const spender = await helper.eth.createAccountWithBalance(donor); - const token = await collection.mintToken(alice, 100n, {Substrate: owner.address}); + const token = await collection.mintToken(minter, 100n, {Substrate: owner.address}); const address = helper.ethAddress.fromCollectionId(collection.collectionId); const contract = helper.ethNativeContract.collection(address, 'rft'); @@ -295,13 +295,14 @@ }); itEth('Can perform transferFromCross()', async ({helper, privateKey}) => { - const collection = await helper.rft.mintCollection(donor, {name: 'A', description: 'B', tokenPrefix: 'C'}); + const minter = await privateKey('//Alice'); + const collection = await helper.rft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'}); - const owner = privateKey('//Bob'); - const spender = await helper.eth.createAccountWithBalance(donor, 100n); - const receiver = privateKey('//Charlie'); + const owner = await privateKey('//Bob'); + const spender = await helper.eth.createAccountWithBalance(donor); + const receiver = await privateKey('//Charlie'); - const token = await collection.mintToken(donor, 100n, {Substrate: owner.address}); + const token = await collection.mintToken(minter, 100n, {Substrate: owner.address}); const address = helper.ethAddress.fromCollectionId(collection.collectionId); const contract = helper.ethNativeContract.collection(address, 'rft'); --- a/tests/src/eth/reFungibleAbi.json +++ b/tests/src/eth/reFungibleAbi.json @@ -93,17 +93,10 @@ "inputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } - ], - "internalType": "struct Tuple6", -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], "internalType": "struct EthCrossAccount", ->>>>>>> misk: update stubs "name": "newAdmin", "type": "tuple" } @@ -126,17 +119,10 @@ "inputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } - ], - "internalType": "struct Tuple6", -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], "internalType": "struct EthCrossAccount", ->>>>>>> misk: update stubs "name": "user", "type": "tuple" } @@ -197,17 +183,10 @@ "inputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } - ], - "internalType": "struct Tuple6", -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], "internalType": "struct EthCrossAccount", ->>>>>>> misk: update stubs "name": "from", "type": "tuple" }, @@ -233,17 +212,10 @@ "outputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } - ], - "internalType": "struct Tuple6[]", -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], "internalType": "struct EthCrossAccount[]", ->>>>>>> misk: update stubs "name": "", "type": "tuple[]" } @@ -257,17 +229,10 @@ "outputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } - ], - "internalType": "struct Tuple6", -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], "internalType": "struct EthCrossAccount", ->>>>>>> misk: update stubs "name": "", "type": "tuple" } @@ -310,11 +275,7 @@ { "internalType": "address", "name": "field_0", "type": "address" }, { "internalType": "uint256", "name": "field_1", "type": "uint256" } ], -<<<<<<< HEAD - "internalType": "struct Tuple6", -======= "internalType": "struct Tuple23", ->>>>>>> misk: update stubs "name": "", "type": "tuple" } @@ -408,17 +369,10 @@ "inputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } - ], - "internalType": "struct Tuple6", -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], "internalType": "struct EthCrossAccount", ->>>>>>> misk: update stubs "name": "user", "type": "tuple" } @@ -429,68 +383,23 @@ "type": "function" }, { -<<<<<<< HEAD "inputs": [{ "internalType": "address", "name": "to", "type": "address" }], "name": "mint", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], -======= - "inputs": [ - { "internalType": "address", "name": "to", "type": "address" }, - { "internalType": "uint256", "name": "tokenId", "type": "uint256" } - ], - "name": "mint", - "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], ->>>>>>> misk: update stubs "stateMutability": "nonpayable", "type": "function" }, { "inputs": [ { "internalType": "address", "name": "to", "type": "address" }, -<<<<<<< HEAD { "internalType": "string", "name": "tokenUri", "type": "string" } ], "name": "mintWithTokenURI", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], -======= - { "internalType": "uint256[]", "name": "tokenIds", "type": "uint256[]" } - ], - "name": "mintBulk", - "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "nonpayable", "type": "function" }, { - "inputs": [ - { "internalType": "address", "name": "to", "type": "address" }, - { - "components": [ - { "internalType": "uint256", "name": "field_0", "type": "uint256" }, - { "internalType": "string", "name": "field_1", "type": "string" } - ], - "internalType": "struct Tuple11[]", - "name": "tokens", - "type": "tuple[]" - } - ], - "name": "mintBulkWithTokenURI", - "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { "internalType": "address", "name": "to", "type": "address" }, - { "internalType": "uint256", "name": "tokenId", "type": "uint256" }, - { "internalType": "string", "name": "tokenUri", "type": "string" } - ], - "name": "mintWithTokenURI", - "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], ->>>>>>> misk: update stubs - "stateMutability": "nonpayable", - "type": "function" - }, - { "inputs": [], "name": "mintingFinished", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], @@ -543,17 +452,10 @@ "inputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } - ], - "internalType": "struct Tuple6", -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], "internalType": "struct EthCrossAccount", ->>>>>>> misk: update stubs "name": "admin", "type": "tuple" } @@ -583,17 +485,10 @@ "inputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } - ], - "internalType": "struct Tuple6", -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], "internalType": "struct EthCrossAccount", ->>>>>>> misk: update stubs "name": "user", "type": "tuple" } @@ -731,17 +626,10 @@ "inputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } - ], - "internalType": "struct Tuple6", -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], "internalType": "struct EthCrossAccount", ->>>>>>> misk: update stubs "name": "sponsor", "type": "tuple" } @@ -753,19 +641,15 @@ }, { "inputs": [ -<<<<<<< HEAD { "components": [ - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } + { "internalType": "address", "name": "eth", "type": "address" }, + { "internalType": "uint256", "name": "sub", "type": "uint256" } ], - "internalType": "struct Tuple6", + "internalType": "struct EthCrossAccount", "name": "newOwner", "type": "tuple" } -======= - { "internalType": "address", "name": "newOwner", "type": "address" } ->>>>>>> misk: update stubs ], "name": "setOwnerCross", "outputs": [], @@ -777,21 +661,12 @@ { "internalType": "uint256", "name": "tokenId", "type": "uint256" }, { "components": [ -<<<<<<< HEAD { "internalType": "string", "name": "field_0", "type": "string" }, { "internalType": "bytes", "name": "field_1", "type": "bytes" } ], - "internalType": "struct Tuple19[]", + "internalType": "struct Tuple20[]", "name": "properties", "type": "tuple[]" -======= - { "internalType": "address", "name": "eth", "type": "address" }, - { "internalType": "uint256", "name": "sub", "type": "uint256" } - ], - "internalType": "struct EthCrossAccount", - "name": "newOwner", - "type": "tuple" ->>>>>>> misk: update stubs } ], "name": "setProperties", @@ -907,33 +782,19 @@ "inputs": [ { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } - ], - "internalType": "struct Tuple6", -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], "internalType": "struct EthCrossAccount", ->>>>>>> misk: update stubs "name": "from", "type": "tuple" }, { "components": [ -<<<<<<< HEAD - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } - ], - "internalType": "struct Tuple6", -======= { "internalType": "address", "name": "eth", "type": "address" }, { "internalType": "uint256", "name": "sub", "type": "uint256" } ], "internalType": "struct EthCrossAccount", ->>>>>>> misk: update stubs "name": "to", "type": "tuple" }, --- a/tests/src/eth/util/playgrounds/unique.dev.ts +++ b/tests/src/eth/util/playgrounds/unique.dev.ts @@ -377,52 +377,13 @@ } } -export class EthCrossAccountGroup extends EthGroupBase { - fromAddress(address: TEthereumAccount): TEthCrossAccount { - return { - 0: address, - 1: '0', - field_0: address, - field_1: '0', - }; - } - - fromKeyringPair(keyring: IKeyringPair): TEthCrossAccount { - return { - 0: '0x0000000000000000000000000000000000000000', - 1: keyring.addressRaw, - field_0: '0x0000000000000000000000000000000000000000', - field_1: keyring.addressRaw, - }; - } -} - -export class EthCrossAccountGroup extends EthGroupBase { - fromAddress(address: TEthereumAccount): TEthCrossAccount { - return { - 0: address, - 1: '0', - field_0: address, - field_1: '0', - }; - } - - fromKeyringPair(keyring: IKeyringPair): TEthCrossAccount { - return { - 0: '0x0000000000000000000000000000000000000000', - 1: keyring.addressRaw, - field_0: '0x0000000000000000000000000000000000000000', - field_1: keyring.addressRaw, - }; - } -} - export class EthUniqueHelper extends DevUniqueHelper { web3: Web3 | null = null; web3Provider: WebsocketProvider | null = null; eth: EthGroup; ethAddress: EthAddressGroup; + ethCrossAccount: EthCrossAccountGroup; ethNativeContract: NativeContractGroup; ethContract: ContractGroup; ethProperty: EthPropertyGroup; -- gitstuff