difftreelog
Updated to rc4
in: master
7 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -854,17 +854,6 @@
[[package]]
name = "ed25519-dalek"
version = "1.0.0-pre.3"
-source = "git+https://github.com/usetech-llc/ed25519-dalek?tag=1.0.0-pre.3#29a06e494ddd4f370256596b7103125295073435"
-dependencies = [
- "clear_on_drop",
- "curve25519-dalek",
- "rand 0.7.3",
- "sha2 0.8.2",
-]
-
-[[package]]
-name = "ed25519-dalek"
-version = "1.0.0-pre.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "978710b352437433c97b2bff193f2fb1dfd58a093f863dd95e225a19baa599a2"
dependencies = [
@@ -1019,16 +1008,16 @@
[[package]]
name = "fork-tree"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"parity-scale-codec",
]
[[package]]
name = "frame-benchmarking"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"frame-support",
"frame-system",
@@ -1044,8 +1033,8 @@
[[package]]
name = "frame-executive"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"frame-support",
"frame-system",
@@ -1059,8 +1048,8 @@
[[package]]
name = "frame-metadata"
-version = "11.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "11.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"parity-scale-codec",
"serde",
@@ -1070,8 +1059,8 @@
[[package]]
name = "frame-support"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"bitmask",
"frame-metadata",
@@ -1095,8 +1084,8 @@
[[package]]
name = "frame-support-procedural"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"frame-support-procedural-tools",
"proc-macro2",
@@ -1106,8 +1095,8 @@
[[package]]
name = "frame-support-procedural-tools"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate",
@@ -1118,8 +1107,8 @@
[[package]]
name = "frame-support-procedural-tools-derive"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"proc-macro2",
"quote 1.0.7",
@@ -1128,8 +1117,8 @@
[[package]]
name = "frame-system"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"frame-support",
"impl-trait-for-tuples",
@@ -1843,6 +1832,15 @@
]
[[package]]
+name = "itertools"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
+dependencies = [
+ "either",
+]
+
+[[package]]
name = "itoa"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1932,6 +1930,20 @@
]
[[package]]
+name = "jsonrpc-ipc-server"
+version = "14.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dedccd693325d833963b549e959137f30a7a0ea650cde92feda81dc0c1393cb5"
+dependencies = [
+ "jsonrpc-core",
+ "jsonrpc-server-utils",
+ "log",
+ "parity-tokio-ipc",
+ "parking_lot 0.10.2",
+ "tokio-service",
+]
+
+[[package]]
name = "jsonrpc-pubsub"
version = "14.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2129,7 +2141,7 @@
dependencies = [
"asn1_der",
"bs58",
- "ed25519-dalek 1.0.0-pre.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ed25519-dalek",
"either",
"fnv",
"futures 0.3.5",
@@ -2513,9 +2525,9 @@
[[package]]
name = "memory-db"
-version = "0.20.1"
+version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be512cb2ccb4ecbdca937fdd4a62ea5f09f8e7195466a85e4632b3d5bcce82e6"
+checksum = "fb2999ff7a65d5a1d72172f6d51fa2ea03024b51aee709ba5ff81c3c629a2410"
dependencies = [
"ahash",
"hash-db",
@@ -2563,7 +2575,7 @@
"kernel32-sys",
"libc",
"log",
- "miow",
+ "miow 0.2.1",
"net2",
"slab",
"winapi 0.2.8",
@@ -2582,6 +2594,18 @@
]
[[package]]
+name = "mio-named-pipes"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
+dependencies = [
+ "log",
+ "mio",
+ "miow 0.3.5",
+ "winapi 0.3.9",
+]
+
+[[package]]
name = "mio-uds"
version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2605,6 +2629,16 @@
]
[[package]]
+name = "miow"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e"
+dependencies = [
+ "socket2",
+ "winapi 0.3.9",
+]
+
+[[package]]
name = "multihash"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2692,7 +2726,7 @@
[[package]]
name = "nft"
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
dependencies = [
"futures 0.3.5",
"jsonrpc-core",
@@ -2724,7 +2758,7 @@
[[package]]
name = "nft-runtime"
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
dependencies = [
"frame-executive",
"frame-support",
@@ -2917,8 +2951,8 @@
[[package]]
name = "pallet-aura"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"frame-support",
"frame-system",
@@ -2936,8 +2970,8 @@
[[package]]
name = "pallet-balances"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -2950,13 +2984,12 @@
[[package]]
name = "pallet-contracts"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"frame-support",
"frame-system",
"pallet-contracts-primitives",
- "pallet-transaction-payment",
"parity-scale-codec",
"parity-wasm",
"pwasm-utils",
@@ -2971,8 +3004,8 @@
[[package]]
name = "pallet-contracts-primitives"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"parity-scale-codec",
"sp-runtime",
@@ -2981,8 +3014,8 @@
[[package]]
name = "pallet-contracts-rpc"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -3000,8 +3033,8 @@
[[package]]
name = "pallet-contracts-rpc-runtime-api"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"pallet-contracts-primitives",
"parity-scale-codec",
@@ -3012,8 +3045,8 @@
[[package]]
name = "pallet-finality-tracker"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"frame-support",
"frame-system",
@@ -3028,8 +3061,8 @@
[[package]]
name = "pallet-grandpa"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"frame-support",
"frame-system",
@@ -3048,7 +3081,7 @@
[[package]]
name = "pallet-nft"
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
dependencies = [
"frame-support",
"frame-system",
@@ -3060,8 +3093,8 @@
[[package]]
name = "pallet-randomness-collective-flip"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"frame-support",
"frame-system",
@@ -3073,8 +3106,8 @@
[[package]]
name = "pallet-session"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"frame-support",
"frame-system",
@@ -3082,6 +3115,8 @@
"pallet-timestamp",
"parity-scale-codec",
"serde",
+ "sp-core",
+ "sp-io",
"sp-runtime",
"sp-session",
"sp-staking",
@@ -3091,8 +3126,8 @@
[[package]]
name = "pallet-sudo"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"frame-support",
"frame-system",
@@ -3105,8 +3140,8 @@
[[package]]
name = "pallet-timestamp"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -3122,13 +3157,14 @@
[[package]]
name = "pallet-transaction-payment"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"frame-support",
"frame-system",
"pallet-transaction-payment-rpc-runtime-api",
"parity-scale-codec",
+ "serde",
"smallvec 1.4.1",
"sp-runtime",
"sp-std",
@@ -3136,8 +3172,8 @@
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -3244,6 +3280,25 @@
checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f"
[[package]]
+name = "parity-tokio-ipc"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e57fea504fea33f9fbb5f49f378359030e7e026a6ab849bb9e8f0787376f1bf"
+dependencies = [
+ "bytes 0.4.12",
+ "futures 0.1.29",
+ "libc",
+ "log",
+ "mio-named-pipes",
+ "miow 0.3.5",
+ "rand 0.7.3",
+ "tokio 0.1.22",
+ "tokio-named-pipes",
+ "tokio-uds",
+ "winapi 0.3.9",
+]
+
+[[package]]
name = "parity-util-mem"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3566,7 +3621,7 @@
dependencies = [
"bytes 0.5.6",
"heck",
- "itertools",
+ "itertools 0.8.2",
"log",
"multimap",
"petgraph",
@@ -3583,7 +3638,7 @@
checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72"
dependencies = [
"anyhow",
- "itertools",
+ "itertools 0.8.2",
"proc-macro2",
"quote 1.0.7",
"syn 1.0.34",
@@ -3952,6 +4007,27 @@
]
[[package]]
+name = "rental"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8545debe98b2b139fb04cad8618b530e9b07c152d99a5de83c860b877d67847f"
+dependencies = [
+ "rental-impl",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "rental-impl"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "475e68978dc5b743f2f40d8e0a8fdc83f1c5e78cbf4b8fa5e74e73beebc340de"
+dependencies = [
+ "proc-macro2",
+ "quote 1.0.7",
+ "syn 1.0.34",
+]
+
+[[package]]
name = "ring"
version = "0.16.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4084,8 +4160,8 @@
[[package]]
name = "sc-basic-authorship"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"futures 0.3.5",
"futures-timer 3.0.2",
@@ -4108,8 +4184,8 @@
[[package]]
name = "sc-block-builder"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -4124,8 +4200,8 @@
[[package]]
name = "sc-chain-spec"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"impl-trait-for-tuples",
"sc-chain-spec-derive",
@@ -4140,8 +4216,8 @@
[[package]]
name = "sc-chain-spec-derive"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -4151,14 +4227,13 @@
[[package]]
name = "sc-cli"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"ansi_term 0.12.1",
"atty",
"chrono",
"derive_more",
- "directories",
"env_logger",
"fdlimit",
"futures 0.3.5",
@@ -4192,8 +4267,8 @@
[[package]]
name = "sc-client-api"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"derive_more",
"fnv",
@@ -4228,8 +4303,8 @@
[[package]]
name = "sc-client-db"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"blake2-rfc",
"hash-db",
@@ -4257,8 +4332,8 @@
[[package]]
name = "sc-consensus"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"sc-client-api",
"sp-blockchain",
@@ -4268,8 +4343,8 @@
[[package]]
name = "sc-consensus-aura"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"derive_more",
"futures 0.3.5",
@@ -4299,8 +4374,8 @@
[[package]]
name = "sc-consensus-slots"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"futures 0.3.5",
"futures-timer 3.0.2",
@@ -4321,8 +4396,8 @@
[[package]]
name = "sc-executor"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"derive_more",
"lazy_static",
@@ -4348,8 +4423,8 @@
[[package]]
name = "sc-executor-common"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"derive_more",
"log",
@@ -4365,8 +4440,8 @@
[[package]]
name = "sc-executor-wasmi"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"log",
"parity-scale-codec",
@@ -4380,8 +4455,8 @@
[[package]]
name = "sc-finality-grandpa"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"assert_matches",
"derive_more",
@@ -4403,6 +4478,7 @@
"sc-telemetry",
"serde_json",
"sp-api",
+ "sp-application-crypto",
"sp-arithmetic",
"sp-blockchain",
"sp-consensus",
@@ -4417,28 +4493,31 @@
[[package]]
name = "sc-informant"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"ansi_term 0.12.1",
"futures 0.3.5",
"log",
"parity-util-mem",
+ "parking_lot 0.10.2",
"sc-client-api",
"sc-network",
- "sc-service",
"sp-blockchain",
"sp-runtime",
+ "sp-transaction-pool",
+ "sp-utils",
"wasm-timer",
]
[[package]]
name = "sc-keystore"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"derive_more",
"hex",
+ "merlin",
"parking_lot 0.10.2",
"rand 0.7.3",
"serde_json",
@@ -4448,9 +4527,28 @@
]
[[package]]
+name = "sc-light"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
+dependencies = [
+ "hash-db",
+ "lazy_static",
+ "parity-scale-codec",
+ "parking_lot 0.10.2",
+ "sc-client-api",
+ "sc-executor",
+ "sp-api",
+ "sp-blockchain",
+ "sp-core",
+ "sp-externalities",
+ "sp-runtime",
+ "sp-state-machine",
+]
+
+[[package]]
name = "sc-network"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"bitflags",
"bs58",
@@ -4501,8 +4599,8 @@
[[package]]
name = "sc-network-gossip"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"futures 0.3.5",
"futures-timer 3.0.2",
@@ -4516,8 +4614,8 @@
[[package]]
name = "sc-offchain"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"bytes 0.5.6",
"fnv",
@@ -4543,8 +4641,8 @@
[[package]]
name = "sc-peerset"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"futures 0.3.5",
"libp2p",
@@ -4556,8 +4654,8 @@
[[package]]
name = "sc-proposer-metrics"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"log",
"substrate-prometheus-endpoint",
@@ -4565,8 +4663,8 @@
[[package]]
name = "sc-rpc"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"futures 0.3.5",
"hash-db",
@@ -4597,8 +4695,8 @@
[[package]]
name = "sc-rpc-api"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"derive_more",
"futures 0.3.5",
@@ -4621,11 +4719,12 @@
[[package]]
name = "sc-rpc-server"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"jsonrpc-core",
"jsonrpc-http-server",
+ "jsonrpc-ipc-server",
"jsonrpc-pubsub",
"jsonrpc-ws-server",
"log",
@@ -4636,10 +4735,11 @@
[[package]]
name = "sc-service"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"derive_more",
+ "directories",
"exit-future",
"futures 0.1.29",
"futures 0.3.5",
@@ -4661,7 +4761,9 @@
"sc-client-api",
"sc-client-db",
"sc-executor",
+ "sc-informant",
"sc-keystore",
+ "sc-light",
"sc-network",
"sc-offchain",
"sc-rpc",
@@ -4689,14 +4791,15 @@
"sp-version",
"substrate-prometheus-endpoint",
"sysinfo",
+ "tempfile",
"tracing",
"wasm-timer",
]
[[package]]
name = "sc-state-db"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"log",
"parity-scale-codec",
@@ -4709,8 +4812,8 @@
[[package]]
name = "sc-telemetry"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"bytes 0.5.6",
"futures 0.3.5",
@@ -4731,23 +4834,25 @@
[[package]]
name = "sc-tracing"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"erased-serde",
"log",
"parking_lot 0.10.2",
+ "rustc-hash",
"sc-telemetry",
"serde",
"serde_json",
"slog",
+ "sp-tracing",
"tracing-core",
]
[[package]]
name = "sc-transaction-graph"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"derive_more",
"futures 0.3.5",
@@ -4766,8 +4871,8 @@
[[package]]
name = "sc-transaction-pool"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"derive_more",
"futures 0.3.5",
@@ -5098,8 +5203,8 @@
[[package]]
name = "sp-allocator"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"derive_more",
"log",
@@ -5110,8 +5215,8 @@
[[package]]
name = "sp-api"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"hash-db",
"parity-scale-codec",
@@ -5125,8 +5230,8 @@
[[package]]
name = "sp-api-proc-macro"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"blake2-rfc",
"proc-macro-crate",
@@ -5137,8 +5242,8 @@
[[package]]
name = "sp-application-crypto"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"parity-scale-codec",
"serde",
@@ -5149,8 +5254,8 @@
[[package]]
name = "sp-arithmetic"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"integer-sqrt",
"num-traits 0.2.12",
@@ -5162,8 +5267,8 @@
[[package]]
name = "sp-block-builder"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -5174,8 +5279,8 @@
[[package]]
name = "sp-blockchain"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"derive_more",
"log",
@@ -5190,8 +5295,8 @@
[[package]]
name = "sp-chain-spec"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"serde",
"serde_json",
@@ -5199,8 +5304,8 @@
[[package]]
name = "sp-consensus"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"derive_more",
"futures 0.3.5",
@@ -5218,12 +5323,13 @@
"sp-utils",
"sp-version",
"substrate-prometheus-endpoint",
+ "wasm-timer",
]
[[package]]
name = "sp-consensus-aura"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -5236,14 +5342,14 @@
[[package]]
name = "sp-core"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"base58",
"blake2-rfc",
"byteorder",
"derive_more",
- "ed25519-dalek 1.0.0-pre.3 (git+https://github.com/usetech-llc/ed25519-dalek?tag=1.0.0-pre.3)",
+ "ed25519-dalek",
"futures 0.3.5",
"hash-db",
"hash256-std-hasher",
@@ -5278,8 +5384,8 @@
[[package]]
name = "sp-database"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"kvdb",
"parking_lot 0.10.2",
@@ -5287,8 +5393,8 @@
[[package]]
name = "sp-debug-derive"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"proc-macro2",
"quote 1.0.7",
@@ -5297,8 +5403,8 @@
[[package]]
name = "sp-externalities"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -5308,8 +5414,8 @@
[[package]]
name = "sp-finality-grandpa"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"finality-grandpa",
"log",
@@ -5324,8 +5430,8 @@
[[package]]
name = "sp-finality-tracker"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"parity-scale-codec",
"sp-inherents",
@@ -5334,8 +5440,8 @@
[[package]]
name = "sp-inherents"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"derive_more",
"parity-scale-codec",
@@ -5346,8 +5452,8 @@
[[package]]
name = "sp-io"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"futures 0.3.5",
"hash-db",
@@ -5360,14 +5466,15 @@
"sp-runtime-interface",
"sp-state-machine",
"sp-std",
+ "sp-tracing",
"sp-trie",
"sp-wasm-interface",
]
[[package]]
name = "sp-keyring"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"lazy_static",
"sp-core",
@@ -5377,8 +5484,8 @@
[[package]]
name = "sp-offchain"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"sp-api",
"sp-core",
@@ -5387,8 +5494,8 @@
[[package]]
name = "sp-panic-handler"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"backtrace",
"log",
@@ -5396,8 +5503,8 @@
[[package]]
name = "sp-rpc"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"serde",
"sp-core",
@@ -5405,9 +5512,10 @@
[[package]]
name = "sp-runtime"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
+ "either",
"hash256-std-hasher",
"impl-trait-for-tuples",
"log",
@@ -5426,8 +5534,8 @@
[[package]]
name = "sp-runtime-interface"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"parity-scale-codec",
"primitive-types",
@@ -5441,8 +5549,8 @@
[[package]]
name = "sp-runtime-interface-proc-macro"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"Inflector",
"proc-macro-crate",
@@ -5453,8 +5561,8 @@
[[package]]
name = "sp-sandbox"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"parity-scale-codec",
"sp-core",
@@ -5466,8 +5574,8 @@
[[package]]
name = "sp-serializer"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"serde",
"serde_json",
@@ -5475,8 +5583,8 @@
[[package]]
name = "sp-session"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -5488,8 +5596,8 @@
[[package]]
name = "sp-staking"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"parity-scale-codec",
"sp-runtime",
@@ -5498,15 +5606,17 @@
[[package]]
name = "sp-state-machine"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"hash-db",
+ "itertools 0.9.0",
"log",
"num-traits 0.2.12",
"parity-scale-codec",
"parking_lot 0.10.2",
"rand 0.7.3",
+ "smallvec 1.4.1",
"sp-core",
"sp-externalities",
"sp-panic-handler",
@@ -5517,13 +5627,13 @@
[[package]]
name = "sp-std"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
[[package]]
name = "sp-storage"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"impl-serde 0.2.3",
"ref-cast",
@@ -5534,8 +5644,8 @@
[[package]]
name = "sp-timestamp"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -5548,16 +5658,18 @@
[[package]]
name = "sp-tracing"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
+ "log",
+ "rental",
"tracing",
]
[[package]]
name = "sp-transaction-pool"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"derive_more",
"futures 0.3.5",
@@ -5572,8 +5684,8 @@
[[package]]
name = "sp-trie"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"hash-db",
"memory-db",
@@ -5586,19 +5698,20 @@
[[package]]
name = "sp-utils"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"futures 0.3.5",
"futures-core",
+ "futures-timer 3.0.2",
"lazy_static",
"prometheus",
]
[[package]]
name = "sp-version"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"impl-serde 0.2.3",
"parity-scale-codec",
@@ -5609,8 +5722,8 @@
[[package]]
name = "sp-wasm-interface"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -5728,16 +5841,16 @@
[[package]]
name = "substrate-build-script-utils"
-version = "2.0.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "2.0.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"platforms",
]
[[package]]
name = "substrate-prometheus-endpoint"
-version = "0.8.0-rc3"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+version = "0.8.0-rc4"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
dependencies = [
"async-std",
"derive_more",
@@ -5751,7 +5864,7 @@
[[package]]
name = "substrate-wasm-builder-runner"
version = "1.0.6"
-source = "git+https://github.com/usetech-llc/substrate.git?branch=nft_rc3#4945a9806adc58b5e8eef01697f5e77de43117f0"
+source = "git+https://github.com/usetech-llc/substrate.git?branch=rc4_ext_dispatch_reenabled#b161460bf73e4cc73e29b8e01ab0323bb3d95e84"
[[package]]
name = "subtle"
@@ -6073,6 +6186,19 @@
]
[[package]]
+name = "tokio-named-pipes"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d282d483052288b2308ba5ee795f5673b159c9bdf63c385a05609da782a5eae"
+dependencies = [
+ "bytes 0.4.12",
+ "futures 0.1.29",
+ "mio",
+ "mio-named-pipes",
+ "tokio 0.1.22",
+]
+
+[[package]]
name = "tokio-reactor"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -6104,6 +6230,15 @@
]
[[package]]
+name = "tokio-service"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162"
+dependencies = [
+ "futures 0.1.29",
+]
+
+[[package]]
name = "tokio-sync"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -6263,9 +6398,9 @@
[[package]]
name = "trie-db"
-version = "0.20.1"
+version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc309f34008563989045a4c4dbcc5770467f3a3785ee80a9b5cc0d83362475f"
+checksum = "cb230c24c741993b04cfccbabb45acff6f6480c5f00d3ed8794ea43db3a9d727"
dependencies = [
"hash-db",
"hashbrown 0.6.3",
node/Cargo.tomldiffbeforeafterboth--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -1,7 +1,7 @@
[build-dependencies.substrate-build-script-utils]
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[[bin]]
name = 'nft'
@@ -15,7 +15,7 @@
license = 'Unlicense'
name = 'nft'
repository = 'https://github.com/substrate-developer-hub/nft/'
-version = '2.0.0-rc3'
+version = '2.0.0-rc4'
[package.metadata.docs.rs]
targets = ['x86_64-unknown-linux-gnu']
@@ -29,98 +29,98 @@
[dependencies.nft-runtime]
path = '../runtime'
-version = '2.0.0-rc3'
+version = '2.0.0-rc4'
[dependencies.sc-basic-authorship]
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '0.8.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '0.8.0-rc4'
[dependencies.sc-cli]
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '0.8.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '0.8.0-rc4'
[dependencies.sc-client-api]
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.sc-consensus]
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '0.8.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '0.8.0-rc4'
[dependencies.pallet-contracts-rpc]
git = 'https://github.com/usetech-llc/substrate.git'
-version = '0.8.0-rc3'
-branch = 'nft_rc3'
+version = '0.8.0-rc4'
+branch = 'rc4_ext_dispatch_reenabled'
[dependencies.sc-rpc]
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
+branch = 'rc4_ext_dispatch_reenabled'
[dependencies.sc-consensus-aura]
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '0.8.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '0.8.0-rc4'
[dependencies.sc-executor]
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '0.8.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '0.8.0-rc4'
[dependencies.sc-finality-grandpa]
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '0.8.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '0.8.0-rc4'
[dependencies.sc-network]
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '0.8.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '0.8.0-rc4'
[dependencies.sc-service]
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '0.8.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '0.8.0-rc4'
[dependencies.sc-transaction-pool]
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.sp-consensus]
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '0.8.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '0.8.0-rc4'
[dependencies.sp-consensus-aura]
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '0.8.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '0.8.0-rc4'
[dependencies.sp-core]
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.sp-finality-grandpa]
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.sp-inherents]
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.sp-runtime]
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.sp-transaction-pool]
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
node/src/service.rsdiffbeforeafterboth--- a/node/src/service.rs
+++ b/node/src/service.rs
@@ -115,7 +115,7 @@
let provider = client as Arc<dyn StorageAndProofProvider<_, _>>;
Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _)
})?
- .build()?;
+ .build_full()?;
if role.is_authority() {
let proposer = sc_basic_authorship::ProposerFactory::new(
@@ -147,13 +147,15 @@
// the AURA authoring task is considered essential, i.e. if it
// fails we take down the service with it.
- service.spawn_essential_task("aura", aura);
+ service
+ .spawn_essential_task_handle()
+ .spawn_blocking("aura", aura);
}
// if the node isn't actively participating in consensus then it doesn't
// need a keystore, regardless of which protocol we use below.
let keystore = if role.is_authority() {
- Some(service.keystore())
+ Some(service.keystore() as sp_core::traits::BareCryptoStorePtr)
} else {
None
};
@@ -186,10 +188,10 @@
prometheus_registry: service.prometheus_registry(),
shared_voter_state: SharedVoterState::empty(),
};
-
+
// the GRANDPA voter task is considered infallible, i.e.
// if it fails we take down the service with it.
- service.spawn_essential_task(
+ service.spawn_essential_task_handle().spawn_blocking(
"grandpa-voter",
sc_finality_grandpa::run_grandpa_voter(grandpa_config)?,
);
@@ -268,5 +270,5 @@
let provider = client as Arc<dyn StorageAndProofProvider<_, _>>;
Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _)
})?
- .build()
+ .build_light()
}
pallets/nft/Cargo.tomldiffbeforeafterboth--- a/pallets/nft/Cargo.toml
+++ b/pallets/nft/Cargo.toml
@@ -7,31 +7,31 @@
[dependencies.frame-support]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.frame-system]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dev-dependencies.sp-core]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dev-dependencies.sp-io]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.sp-runtime]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[package]
authors = ['Substrate DevHub <https://github.com/substrate-developer-hub>']
@@ -41,7 +41,7 @@
license = 'Unlicense'
name = 'pallet-nft'
repository = 'https://github.com/substrate-developer-hub/nft/'
-version = '2.0.0-rc3'
+version = '2.0.0-rc4'
[package.metadata.docs.rs]
targets = ['x86_64-unknown-linux-gnu']
runtime/Cargo.tomldiffbeforeafterboth--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -2,15 +2,15 @@
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
package = 'pallet-aura'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.balances]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
package = 'pallet-balances'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.codec]
default-features = false
@@ -22,48 +22,48 @@
git = 'https://github.com/usetech-llc/substrate.git'
default-features = false
package = 'pallet-contracts'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.contracts-primitives]
git = 'https://github.com/usetech-llc/substrate.git'
default-features = false
package = 'pallet-contracts-primitives'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.contracts-rpc-runtime-api]
git = 'https://github.com/usetech-llc/substrate.git'
default-features = false
package = 'pallet-contracts-rpc-runtime-api'
-version = '0.8.0-rc3'
-branch = 'nft_rc3'
+version = '0.8.0-rc4'
+branch = 'rc4_ext_dispatch_reenabled'
[dependencies.frame-executive]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.frame-support]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.grandpa]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
package = 'pallet-grandpa'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.randomness-collective-flip]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
package = 'pallet-randomness-collective-flip'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.serde]
features = ['derive']
@@ -73,112 +73,112 @@
[dependencies.sp-api]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.sp-block-builder]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.sp-consensus-aura]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '0.8.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '0.8.0-rc4'
[dependencies.sp-core]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.sp-inherents]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.sp-io]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.sp-offchain]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.sp-runtime]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.sp-session]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.sp-std]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.sp-transaction-pool]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.sp-version]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.sudo]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
package = 'pallet-sudo'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.system]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
package = 'frame-system'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.nft]
default-features = false
package = 'pallet-nft'
path = '../pallets/nft'
-version = '2.0.0-rc3'
+version = '2.0.0-rc4'
[dependencies.timestamp]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
package = 'pallet-timestamp'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[dependencies.transaction-payment]
default-features = false
git = 'https://github.com/usetech-llc/substrate.git'
package = 'pallet-transaction-payment'
-branch = 'nft_rc3'
-version = '2.0.0-rc3'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
[build-dependencies.wasm-builder-runner]
git = 'https://github.com/usetech-llc/substrate.git'
package = 'substrate-wasm-builder-runner'
-branch = 'nft_rc3'
+branch = 'rc4_ext_dispatch_reenabled'
version = '1.0.5'
[package]
@@ -188,7 +188,7 @@
license = 'Unlicense'
name = 'nft-runtime'
repository = 'https://github.com/usetech-llc/nft_parachain/'
-version = '2.0.0-rc3'
+version = '2.0.0-rc4'
[package.metadata.docs.rs]
targets = ['x86_64-unknown-linux-gnu']
runtime/src/lib.rsdiffbeforeafterboth1//! The Substrate Node Template runtime. This can be compiled with `#[no_std]`, ready for Wasm.23#![cfg_attr(not(feature = "std"), no_std)]4// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.5#![recursion_limit = "256"]67// Make the WASM binary available.8#[cfg(feature = "std")]9include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));1011use contracts_rpc_runtime_api::ContractExecResult;12use grandpa::fg_primitives;13use grandpa::{AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList};14use sp_api::impl_runtime_apis;15use sp_consensus_aura::sr25519::AuthorityId as AuraId;16use sp_core::{crypto::KeyTypeId, OpaqueMetadata};17use sp_runtime::traits::{18 BlakeTwo256, Block as BlockT, IdentifyAccount, IdentityLookup, NumberFor, Saturating, Verify,19};20use sp_runtime::{21 create_runtime_str, generic, impl_opaque_keys,22 transaction_validity::{TransactionSource, TransactionValidity},23 ApplyExtrinsicResult, MultiSignature,24};25use sp_std::prelude::*;26#[cfg(feature = "std")]27use sp_version::NativeVersion;28use sp_version::RuntimeVersion;2930// A few exports that help ease life for downstream crates.31pub use balances::Call as BalancesCall;32pub use contracts::Schedule as ContractsSchedule;33pub use frame_support::{34 construct_runtime, parameter_types,35 traits::{KeyOwnerProofSystem, Randomness},36 weights::{37 constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},38 IdentityFee, Weight,39 },40 StorageValue,41};42#[cfg(any(feature = "std", test))]43pub use sp_runtime::BuildStorage;44pub use sp_runtime::{Perbill, Permill};45pub use timestamp::Call as TimestampCall;4647/// Importing a nft pallet48pub use nft;4950/// An index to a block.51pub type BlockNumber = u32;5253/// Alias to 512-bit hash when used in the context of a transaction signature on the chain.54pub type Signature = MultiSignature;5556/// Some way of identifying an account on the chain. We intentionally make it equivalent57/// to the public key of our transaction signing scheme.58pub type AccountId = <<Signature as Verify>::Signer as IdentifyAccount>::AccountId;5960/// The type for looking up accounts. We don't expect more than 4 billion of them, but you61/// never know...62pub type AccountIndex = u32;6364/// Balance of an account.65pub type Balance = u128;6667/// Index of a transaction in the chain.68pub type Index = u32;6970/// A hash of some data used by the chain.71pub type Hash = sp_core::H256;7273/// Digest item type.74pub type DigestItem = generic::DigestItem<Hash>;7576/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know77/// the specifics of the runtime. They can then be made to be agnostic over specific formats78/// of data like extrinsics, allowing for them to continue syncing the network through upgrades79/// to even the core data structures.80pub mod opaque {81 use super::*;8283 pub use sp_runtime::OpaqueExtrinsic as UncheckedExtrinsic;8485 /// Opaque block header type.86 pub type Header = generic::Header<BlockNumber, BlakeTwo256>;87 /// Opaque block type.88 pub type Block = generic::Block<Header, UncheckedExtrinsic>;89 /// Opaque block identifier type.90 pub type BlockId = generic::BlockId<Block>;9192 impl_opaque_keys! {93 pub struct SessionKeys {94 pub aura: Aura,95 pub grandpa: Grandpa,96 }97 }98}99100/// This runtime version.101pub const VERSION: RuntimeVersion = RuntimeVersion {102 spec_name: create_runtime_str!("nft"),103 impl_name: create_runtime_str!("nft"),104 authoring_version: 1,105 spec_version: 1,106 impl_version: 1,107 apis: RUNTIME_API_VERSIONS,108 transaction_version: 1,109};110111pub const MILLISECS_PER_BLOCK: u64 = 6000;112113pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;114115// These time units are defined in number of blocks.116pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);117pub const HOURS: BlockNumber = MINUTES * 60;118pub const DAYS: BlockNumber = HOURS * 24;119120/// The version information used to identify this runtime when compiled natively.121#[cfg(feature = "std")]122pub fn native_version() -> NativeVersion {123 NativeVersion {124 runtime_version: VERSION,125 can_author_with: Default::default(),126 }127}128129parameter_types! {130 pub const BlockHashCount: BlockNumber = 2400;131 /// We allow for 2 seconds of compute with a 6 second average block time.132 pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND;133 pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);134 /// Assume 10% of weight for average on_initialize calls.135 pub MaximumExtrinsicWeight: Weight = AvailableBlockRatio::get()136 .saturating_sub(Perbill::from_percent(10)) * MaximumBlockWeight::get();137 pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;138 pub const Version: RuntimeVersion = VERSION;139}140141impl system::Trait for Runtime {142 /// The identifier used to distinguish between accounts.143 type AccountId = AccountId;144 /// The aggregated dispatch type that is available for extrinsics.145 type Call = Call;146 /// The lookup mechanism to get account ID from whatever is passed in dispatchers.147 type Lookup = IdentityLookup<AccountId>;148 /// The index type for storing how many extrinsics an account has signed.149 type Index = Index;150 /// The index type for blocks.151 type BlockNumber = BlockNumber;152 /// The type for hashing blocks and tries.153 type Hash = Hash;154 /// The hashing algorithm used.155 type Hashing = BlakeTwo256;156 /// The header type.157 type Header = generic::Header<BlockNumber, BlakeTwo256>;158 /// The ubiquitous event type.159 type Event = Event;160 /// The ubiquitous origin type.161 type Origin = Origin;162 /// Maximum number of block number to block hash mappings to keep (oldest pruned first).163 type BlockHashCount = BlockHashCount;164 /// Maximum weight of each block.165 type MaximumBlockWeight = MaximumBlockWeight;166 /// The weight of database operations that the runtime can invoke.167 type DbWeight = RocksDbWeight;168 /// The weight of the overhead invoked on the block import process, independent of the169 /// extrinsics included in that block.170 type BlockExecutionWeight = BlockExecutionWeight;171 /// The base weight of any extrinsic processed by the runtime, independent of the172 /// logic of that extrinsic. (Signature verification, nonce increment, fee, etc...)173 type ExtrinsicBaseWeight = ExtrinsicBaseWeight;174 /// The maximum weight that a single extrinsic of `Normal` dispatch class can have,175 /// idependent of the logic of that extrinsics. (Roughly max block weight - average on176 /// initialize cost).177 type MaximumExtrinsicWeight = MaximumExtrinsicWeight;178 /// Maximum size of all encoded transactions (in bytes) that are allowed in one block.179 type MaximumBlockLength = MaximumBlockLength;180 /// Portion of the block weight that is available to all normal transactions.181 type AvailableBlockRatio = AvailableBlockRatio;182 /// Version of the runtime.183 type Version = Version;184 /// Converts a module to the index of the module in `construct_runtime!`.185 ///186 /// This type is being generated by `construct_runtime!`.187 type ModuleToIndex = ModuleToIndex;188 /// What to do if a new account is created.189 type OnNewAccount = ();190 /// What to do if an account is fully reaped from the system.191 type OnKilledAccount = ();192 /// The data to be stored in an account.193 type AccountData = balances::AccountData<Balance>;194}195196impl aura::Trait for Runtime {197 type AuthorityId = AuraId;198}199200impl grandpa::Trait for Runtime {201 type Event = Event;202 type Call = Call;203204 type KeyOwnerProofSystem = ();205206 type KeyOwnerProof =207 <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(KeyTypeId, GrandpaId)>>::Proof;208209 type KeyOwnerIdentification = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(210 KeyTypeId,211 GrandpaId,212 )>>::IdentificationTuple;213214 type HandleEquivocation = ();215}216217parameter_types! {218 pub const MinimumPeriod: u64 = SLOT_DURATION / 2;219}220221impl timestamp::Trait for Runtime {222 /// A timestamp: milliseconds since the unix epoch.223 type Moment = u64;224 type OnTimestampSet = Aura;225 type MinimumPeriod = MinimumPeriod;226}227228parameter_types! {229 pub const ExistentialDeposit: u128 = 500;230}231232impl balances::Trait for Runtime {233 /// The type for recording an account's balance.234 type Balance = Balance;235 /// The ubiquitous event type.236 type Event = Event;237 type DustRemoval = ();238 type ExistentialDeposit = ExistentialDeposit;239 type AccountStore = System;240}241242pub const MILLICENTS: Balance = 1_000_000_000;243pub const CENTS: Balance = 1_000 * MILLICENTS;244pub const DOLLARS: Balance = 100 * CENTS;245246parameter_types! {247 pub const TombstoneDeposit: Balance = 16 * MILLICENTS;248 pub const RentByteFee: Balance = 4 * MILLICENTS;249 pub const RentDepositOffset: Balance = 1000 * MILLICENTS;250 pub const SurchargeReward: Balance = 150 * MILLICENTS;251}252253impl contracts::Trait for Runtime {254 type Time = Timestamp;255 type Randomness = RandomnessCollectiveFlip;256 type Call = Call;257 type Event = Event;258 type DetermineContractAddress = contracts::SimpleAddressDeterminer<Runtime>;259 type TrieIdGenerator = contracts::TrieIdFromParentCounter<Runtime>;260 type RentPayment = ();261 type SignedClaimHandicap = contracts::DefaultSignedClaimHandicap;262 type TombstoneDeposit = TombstoneDeposit;263 type StorageSizeOffset = contracts::DefaultStorageSizeOffset;264 type RentByteFee = RentByteFee;265 type RentDepositOffset = RentDepositOffset;266 type SurchargeReward = SurchargeReward;267 type MaxDepth = contracts::DefaultMaxDepth;268 type MaxValueSize = contracts::DefaultMaxValueSize;269}270271parameter_types! {272 pub const TransactionByteFee: Balance = 1;273}274275impl transaction_payment::Trait for Runtime {276 type Currency = balances::Module<Runtime>;277 type OnTransactionPayment = ();278 type TransactionByteFee = TransactionByteFee;279 type WeightToFee = IdentityFee<Balance>;280 type FeeMultiplierUpdate = ();281}282283impl sudo::Trait for Runtime {284 type Event = Event;285 type Call = Call;286}287288/// Used for the module nft in `./nft.rs`289impl nft::Trait for Runtime {290 type Event = Event;291}292293construct_runtime!(294 pub enum Runtime where295 Block = Block,296 NodeBlock = opaque::Block,297 UncheckedExtrinsic = UncheckedExtrinsic298 {299 System: system::{Module, Call, Config, Storage, Event<T>},300 RandomnessCollectiveFlip: randomness_collective_flip::{Module, Call, Storage},301 Contracts: contracts::{Module, Call, Config, Storage, Event<T>},302 Timestamp: timestamp::{Module, Call, Storage, Inherent},303 Aura: aura::{Module, Config<T>, Inherent(Timestamp)},304 Grandpa: grandpa::{Module, Call, Storage, Config, Event},305 Balances: balances::{Module, Call, Storage, Config<T>, Event<T>},306 TransactionPayment: transaction_payment::{Module, Storage},307 Sudo: sudo::{Module, Call, Config<T>, Storage, Event<T>},308 Nft: nft::{Module, Call, Storage, Event<T>},309 }310);311312/// The address format for describing accounts.313pub type Address = AccountId;314/// Block header type as expected by this runtime.315pub type Header = generic::Header<BlockNumber, BlakeTwo256>;316/// Block type as expected by this runtime.317pub type Block = generic::Block<Header, UncheckedExtrinsic>;318/// A Block signed with a Justification319pub type SignedBlock = generic::SignedBlock<Block>;320/// BlockId type as expected by this runtime.321pub type BlockId = generic::BlockId<Block>;322/// The SignedExtension to the basic transaction logic.323pub type SignedExtra = (324 system::CheckSpecVersion<Runtime>,325 system::CheckTxVersion<Runtime>,326 system::CheckGenesis<Runtime>,327 system::CheckEra<Runtime>,328 system::CheckNonce<Runtime>,329 system::CheckWeight<Runtime>,330 transaction_payment::ChargeTransactionPayment<Runtime>,331);332/// Unchecked extrinsic type as expected by this runtime.333pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;334/// Extrinsic type that has already been checked.335pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Call, SignedExtra>;336/// Executive: handles dispatch to the various modules.337pub type Executive =338 frame_executive::Executive<Runtime, Block, system::ChainContext<Runtime>, Runtime, AllModules>;339340impl_runtime_apis! {341342 impl contracts_rpc_runtime_api::ContractsApi<Block, AccountId, Balance, BlockNumber>343 for Runtime344 {345 fn call(346 origin: AccountId,347 dest: AccountId,348 value: Balance,349 gas_limit: u64,350 input_data: Vec<u8>,351 ) -> ContractExecResult {352 let exec_result =353 Contracts::bare_call(origin, dest.into(), value, gas_limit, input_data);354 match exec_result {355 Ok(v) => ContractExecResult::Success {356 status: v.status,357 data: v.data,358 },359 Err(_) => ContractExecResult::Error,360 }361 }362363 fn get_storage(364 address: AccountId,365 key: [u8; 32],366 ) -> contracts_primitives::GetStorageResult {367 Contracts::get_storage(address, key)368 }369370 fn rent_projection(371 address: AccountId,372 ) -> contracts_primitives::RentProjectionResult<BlockNumber> {373 Contracts::rent_projection(address)374 }375 }376377 impl sp_api::Core<Block> for Runtime {378 fn version() -> RuntimeVersion {379 VERSION380 }381382 fn execute_block(block: Block) {383 Executive::execute_block(block)384 }385386 fn initialize_block(header: &<Block as BlockT>::Header) {387 Executive::initialize_block(header)388 }389 }390391 impl sp_api::Metadata<Block> for Runtime {392 fn metadata() -> OpaqueMetadata {393 Runtime::metadata().into()394 }395 }396397 impl sp_block_builder::BlockBuilder<Block> for Runtime {398 fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {399 Executive::apply_extrinsic(extrinsic)400 }401402 fn finalize_block() -> <Block as BlockT>::Header {403 Executive::finalize_block()404 }405406 fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {407 data.create_extrinsics()408 }409410 fn check_inherents(411 block: Block,412 data: sp_inherents::InherentData,413 ) -> sp_inherents::CheckInherentsResult {414 data.check_extrinsics(&block)415 }416417 fn random_seed() -> <Block as BlockT>::Hash {418 RandomnessCollectiveFlip::random_seed()419 }420 }421422 impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {423 fn validate_transaction(424 source: TransactionSource,425 tx: <Block as BlockT>::Extrinsic,426 ) -> TransactionValidity {427 Executive::validate_transaction(source, tx)428 }429 }430431 impl sp_offchain::OffchainWorkerApi<Block> for Runtime {432 fn offchain_worker(header: &<Block as BlockT>::Header) {433 Executive::offchain_worker(header)434 }435 }436437 impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {438 fn slot_duration() -> u64 {439 Aura::slot_duration()440 }441442 fn authorities() -> Vec<AuraId> {443 Aura::authorities()444 }445 }446447 impl sp_session::SessionKeys<Block> for Runtime {448 fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {449 opaque::SessionKeys::generate(seed)450 }451452 fn decode_session_keys(453 encoded: Vec<u8>,454 ) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {455 opaque::SessionKeys::decode_into_raw_public_keys(&encoded)456 }457 }458459 impl fg_primitives::GrandpaApi<Block> for Runtime {460 fn grandpa_authorities() -> GrandpaAuthorityList {461 Grandpa::grandpa_authorities()462 }463464 fn submit_report_equivocation_extrinsic(465 _equivocation_proof: fg_primitives::EquivocationProof<466 <Block as BlockT>::Hash,467 NumberFor<Block>,468 >,469 _key_owner_proof: fg_primitives::OpaqueKeyOwnershipProof,470 ) -> Option<()> {471 None472 }473474 fn generate_key_ownership_proof(475 _set_id: fg_primitives::SetId,476 _authority_id: GrandpaId,477 ) -> Option<fg_primitives::OpaqueKeyOwnershipProof> {478 // NOTE: this is the only implementation possible since we've479 // defined our key owner proof type as a bottom type (i.e. a type480 // with no values).481 None482 }483 }484}1//! The Substrate Node Template runtime. This can be compiled with `#[no_std]`, ready for Wasm.23#![cfg_attr(not(feature = "std"), no_std)]4// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.5#![recursion_limit = "256"]67// Make the WASM binary available.8#[cfg(feature = "std")]9include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));1011use contracts_rpc_runtime_api::ContractExecResult;12use grandpa::fg_primitives;13use grandpa::{AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList};14use sp_api::impl_runtime_apis;15use sp_consensus_aura::sr25519::AuthorityId as AuraId;16use sp_core::{crypto::KeyTypeId, OpaqueMetadata};17use sp_runtime::traits::{18 BlakeTwo256, Block as BlockT, IdentifyAccount, IdentityLookup, NumberFor, Saturating, Verify,19};20use sp_runtime::{21 create_runtime_str, generic, impl_opaque_keys,22 transaction_validity::{TransactionSource, TransactionValidity},23 ApplyExtrinsicResult, MultiSignature,24};25use sp_std::prelude::*;26#[cfg(feature = "std")]27use sp_version::NativeVersion;28use sp_version::RuntimeVersion;2930// A few exports that help ease life for downstream crates.31pub use balances::Call as BalancesCall;32pub use contracts::Schedule as ContractsSchedule;33pub use frame_support::{34 construct_runtime, parameter_types,35 traits::{KeyOwnerProofSystem, Randomness},36 weights::{37 constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},38 IdentityFee, Weight,39 },40 StorageValue,41};42#[cfg(any(feature = "std", test))]43pub use sp_runtime::BuildStorage;44pub use sp_runtime::{Perbill, Permill};45pub use timestamp::Call as TimestampCall;4647/// Importing a nft pallet48pub use nft;4950/// An index to a block.51pub type BlockNumber = u32;5253/// Alias to 512-bit hash when used in the context of a transaction signature on the chain.54pub type Signature = MultiSignature;5556/// Some way of identifying an account on the chain. We intentionally make it equivalent57/// to the public key of our transaction signing scheme.58pub type AccountId = <<Signature as Verify>::Signer as IdentifyAccount>::AccountId;5960/// The type for looking up accounts. We don't expect more than 4 billion of them, but you61/// never know...62pub type AccountIndex = u32;6364/// Balance of an account.65pub type Balance = u128;6667/// Index of a transaction in the chain.68pub type Index = u32;6970/// A hash of some data used by the chain.71pub type Hash = sp_core::H256;7273/// Digest item type.74pub type DigestItem = generic::DigestItem<Hash>;7576/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know77/// the specifics of the runtime. They can then be made to be agnostic over specific formats78/// of data like extrinsics, allowing for them to continue syncing the network through upgrades79/// to even the core data structures.80pub mod opaque {81 use super::*;8283 pub use sp_runtime::OpaqueExtrinsic as UncheckedExtrinsic;8485 /// Opaque block header type.86 pub type Header = generic::Header<BlockNumber, BlakeTwo256>;87 /// Opaque block type.88 pub type Block = generic::Block<Header, UncheckedExtrinsic>;89 /// Opaque block identifier type.90 pub type BlockId = generic::BlockId<Block>;9192 impl_opaque_keys! {93 pub struct SessionKeys {94 pub aura: Aura,95 pub grandpa: Grandpa,96 }97 }98}99100/// This runtime version.101pub const VERSION: RuntimeVersion = RuntimeVersion {102 spec_name: create_runtime_str!("nft"),103 impl_name: create_runtime_str!("nft"),104 authoring_version: 1,105 spec_version: 1,106 impl_version: 1,107 apis: RUNTIME_API_VERSIONS,108 transaction_version: 1,109};110111pub const MILLISECS_PER_BLOCK: u64 = 6000;112113pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;114115// These time units are defined in number of blocks.116pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);117pub const HOURS: BlockNumber = MINUTES * 60;118pub const DAYS: BlockNumber = HOURS * 24;119120/// The version information used to identify this runtime when compiled natively.121#[cfg(feature = "std")]122pub fn native_version() -> NativeVersion {123 NativeVersion {124 runtime_version: VERSION,125 can_author_with: Default::default(),126 }127}128129parameter_types! {130 pub const BlockHashCount: BlockNumber = 2400;131 /// We allow for 2 seconds of compute with a 6 second average block time.132 pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND;133 pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);134 /// Assume 10% of weight for average on_initialize calls.135 pub MaximumExtrinsicWeight: Weight = AvailableBlockRatio::get()136 .saturating_sub(Perbill::from_percent(10)) * MaximumBlockWeight::get();137 pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;138 pub const Version: RuntimeVersion = VERSION;139}140141impl system::Trait for Runtime {142 /// The basic call filter to use in dispatchable.143 type BaseCallFilter = ();144 /// The identifier used to distinguish between accounts.145 type AccountId = AccountId;146 /// The aggregated dispatch type that is available for extrinsics.147 type Call = Call;148 /// The lookup mechanism to get account ID from whatever is passed in dispatchers.149 type Lookup = IdentityLookup<AccountId>;150 /// The index type for storing how many extrinsics an account has signed.151 type Index = Index;152 /// The index type for blocks.153 type BlockNumber = BlockNumber;154 /// The type for hashing blocks and tries.155 type Hash = Hash;156 /// The hashing algorithm used.157 type Hashing = BlakeTwo256;158 /// The header type.159 type Header = generic::Header<BlockNumber, BlakeTwo256>;160 /// The ubiquitous event type.161 type Event = Event;162 /// The ubiquitous origin type.163 type Origin = Origin;164 /// Maximum number of block number to block hash mappings to keep (oldest pruned first).165 type BlockHashCount = BlockHashCount;166 /// Maximum weight of each block.167 type MaximumBlockWeight = MaximumBlockWeight;168 /// The weight of database operations that the runtime can invoke.169 type DbWeight = RocksDbWeight;170 /// The weight of the overhead invoked on the block import process, independent of the171 /// extrinsics included in that block.172 type BlockExecutionWeight = BlockExecutionWeight;173 /// The base weight of any extrinsic processed by the runtime, independent of the174 /// logic of that extrinsic. (Signature verification, nonce increment, fee, etc...)175 type ExtrinsicBaseWeight = ExtrinsicBaseWeight;176 /// The maximum weight that a single extrinsic of `Normal` dispatch class can have,177 /// idependent of the logic of that extrinsics. (Roughly max block weight - average on178 /// initialize cost).179 type MaximumExtrinsicWeight = MaximumExtrinsicWeight;180 /// Maximum size of all encoded transactions (in bytes) that are allowed in one block.181 type MaximumBlockLength = MaximumBlockLength;182 /// Portion of the block weight that is available to all normal transactions.183 type AvailableBlockRatio = AvailableBlockRatio;184 /// Version of the runtime.185 type Version = Version;186 /// Converts a module to the index of the module in `construct_runtime!`.187 ///188 /// This type is being generated by `construct_runtime!`.189 type ModuleToIndex = ModuleToIndex;190 /// What to do if a new account is created.191 type OnNewAccount = ();192 /// What to do if an account is fully reaped from the system.193 type OnKilledAccount = ();194 /// The data to be stored in an account.195 type AccountData = balances::AccountData<Balance>;196}197198impl aura::Trait for Runtime {199 type AuthorityId = AuraId;200}201202impl grandpa::Trait for Runtime {203 type Event = Event;204 type Call = Call;205206 type KeyOwnerProofSystem = ();207208 type KeyOwnerProof =209 <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(KeyTypeId, GrandpaId)>>::Proof;210211 type KeyOwnerIdentification = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(212 KeyTypeId,213 GrandpaId,214 )>>::IdentificationTuple;215216 type HandleEquivocation = ();217}218219parameter_types! {220 pub const MinimumPeriod: u64 = SLOT_DURATION / 2;221}222223impl timestamp::Trait for Runtime {224 /// A timestamp: milliseconds since the unix epoch.225 type Moment = u64;226 type OnTimestampSet = Aura;227 type MinimumPeriod = MinimumPeriod;228}229230parameter_types! {231 pub const ExistentialDeposit: u128 = 500;232}233234impl balances::Trait for Runtime {235 /// The type for recording an account's balance.236 type Balance = Balance;237 /// The ubiquitous event type.238 type Event = Event;239 type DustRemoval = ();240 type ExistentialDeposit = ExistentialDeposit;241 type AccountStore = System;242}243244pub const MILLICENTS: Balance = 1_000_000_000;245pub const CENTS: Balance = 1_000 * MILLICENTS;246pub const DOLLARS: Balance = 100 * CENTS;247248parameter_types! {249 pub const TombstoneDeposit: Balance = 16 * MILLICENTS;250 pub const RentByteFee: Balance = 4 * MILLICENTS;251 pub const RentDepositOffset: Balance = 1000 * MILLICENTS;252 pub const SurchargeReward: Balance = 150 * MILLICENTS;253}254255impl contracts::Trait for Runtime {256 type Call = Call;257 type Time = Timestamp;258 type Randomness = RandomnessCollectiveFlip;259 type Currency = Balances;260 type Event = Event;261 type DetermineContractAddress = contracts::SimpleAddressDeterminer<Runtime>;262 type TrieIdGenerator = contracts::TrieIdFromParentCounter<Runtime>;263 type RentPayment = ();264 type SignedClaimHandicap = contracts::DefaultSignedClaimHandicap;265 type TombstoneDeposit = TombstoneDeposit;266 type StorageSizeOffset = contracts::DefaultStorageSizeOffset;267 type RentByteFee = RentByteFee;268 type RentDepositOffset = RentDepositOffset;269 type SurchargeReward = SurchargeReward;270 type MaxDepth = contracts::DefaultMaxDepth;271 type MaxValueSize = contracts::DefaultMaxValueSize;272 type WeightPrice = transaction_payment::Module<Self>;273}274275parameter_types! {276 pub const TransactionByteFee: Balance = 1;277}278279impl transaction_payment::Trait for Runtime {280 type Currency = balances::Module<Runtime>;281 type OnTransactionPayment = ();282 type TransactionByteFee = TransactionByteFee;283 type WeightToFee = IdentityFee<Balance>;284 type FeeMultiplierUpdate = ();285}286287impl sudo::Trait for Runtime {288 type Event = Event;289 type Call = Call;290}291292/// Used for the module nft in `./nft.rs`293impl nft::Trait for Runtime {294 type Event = Event;295}296297construct_runtime!(298 pub enum Runtime where299 Block = Block,300 NodeBlock = opaque::Block,301 UncheckedExtrinsic = UncheckedExtrinsic302 {303 System: system::{Module, Call, Config, Storage, Event<T>},304 RandomnessCollectiveFlip: randomness_collective_flip::{Module, Call, Storage},305 Contracts: contracts::{Module, Call, Config, Storage, Event<T>},306 Timestamp: timestamp::{Module, Call, Storage, Inherent},307 Aura: aura::{Module, Config<T>, Inherent(Timestamp)},308 Grandpa: grandpa::{Module, Call, Storage, Config, Event},309 Balances: balances::{Module, Call, Storage, Config<T>, Event<T>},310 TransactionPayment: transaction_payment::{Module, Storage},311 Sudo: sudo::{Module, Call, Config<T>, Storage, Event<T>},312 Nft: nft::{Module, Call, Storage, Event<T>},313 }314);315316/// The address format for describing accounts.317pub type Address = AccountId;318/// Block header type as expected by this runtime.319pub type Header = generic::Header<BlockNumber, BlakeTwo256>;320/// Block type as expected by this runtime.321pub type Block = generic::Block<Header, UncheckedExtrinsic>;322/// A Block signed with a Justification323pub type SignedBlock = generic::SignedBlock<Block>;324/// BlockId type as expected by this runtime.325pub type BlockId = generic::BlockId<Block>;326/// The SignedExtension to the basic transaction logic.327pub type SignedExtra = (328 system::CheckSpecVersion<Runtime>,329 system::CheckTxVersion<Runtime>,330 system::CheckGenesis<Runtime>,331 system::CheckEra<Runtime>,332 system::CheckNonce<Runtime>,333 system::CheckWeight<Runtime>,334 transaction_payment::ChargeTransactionPayment<Runtime>,335);336/// Unchecked extrinsic type as expected by this runtime.337pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;338/// Extrinsic type that has already been checked.339pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Call, SignedExtra>;340/// Executive: handles dispatch to the various modules.341pub type Executive =342 frame_executive::Executive<Runtime, Block, system::ChainContext<Runtime>, Runtime, AllModules>;343344impl_runtime_apis! {345346 impl contracts_rpc_runtime_api::ContractsApi<Block, AccountId, Balance, BlockNumber>347 for Runtime348 {349 fn call(350 origin: AccountId,351 dest: AccountId,352 value: Balance,353 gas_limit: u64,354 input_data: Vec<u8>,355 ) -> ContractExecResult {356 let exec_result =357 Contracts::bare_call(origin, dest.into(), value, gas_limit, input_data);358 match exec_result {359 Ok(v) => ContractExecResult::Success {360 status: v.status,361 data: v.data,362 },363 Err(_) => ContractExecResult::Error,364 }365 }366367 fn get_storage(368 address: AccountId,369 key: [u8; 32],370 ) -> contracts_primitives::GetStorageResult {371 Contracts::get_storage(address, key)372 }373374 fn rent_projection(375 address: AccountId,376 ) -> contracts_primitives::RentProjectionResult<BlockNumber> {377 Contracts::rent_projection(address)378 }379 }380381 impl sp_api::Core<Block> for Runtime {382 fn version() -> RuntimeVersion {383 VERSION384 }385386 fn execute_block(block: Block) {387 Executive::execute_block(block)388 }389390 fn initialize_block(header: &<Block as BlockT>::Header) {391 Executive::initialize_block(header)392 }393 }394395 impl sp_api::Metadata<Block> for Runtime {396 fn metadata() -> OpaqueMetadata {397 Runtime::metadata().into()398 }399 }400401 impl sp_block_builder::BlockBuilder<Block> for Runtime {402 fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {403 Executive::apply_extrinsic(extrinsic)404 }405406 fn finalize_block() -> <Block as BlockT>::Header {407 Executive::finalize_block()408 }409410 fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {411 data.create_extrinsics()412 }413414 fn check_inherents(415 block: Block,416 data: sp_inherents::InherentData,417 ) -> sp_inherents::CheckInherentsResult {418 data.check_extrinsics(&block)419 }420421 fn random_seed() -> <Block as BlockT>::Hash {422 RandomnessCollectiveFlip::random_seed()423 }424 }425426 impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {427 fn validate_transaction(428 source: TransactionSource,429 tx: <Block as BlockT>::Extrinsic,430 ) -> TransactionValidity {431 Executive::validate_transaction(source, tx)432 }433 }434435 impl sp_offchain::OffchainWorkerApi<Block> for Runtime {436 fn offchain_worker(header: &<Block as BlockT>::Header) {437 Executive::offchain_worker(header)438 }439 }440441 impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {442 fn slot_duration() -> u64 {443 Aura::slot_duration()444 }445446 fn authorities() -> Vec<AuraId> {447 Aura::authorities()448 }449 }450451 impl sp_session::SessionKeys<Block> for Runtime {452 fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {453 opaque::SessionKeys::generate(seed)454 }455456 fn decode_session_keys(457 encoded: Vec<u8>,458 ) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {459 opaque::SessionKeys::decode_into_raw_public_keys(&encoded)460 }461 }462463 impl fg_primitives::GrandpaApi<Block> for Runtime {464 fn grandpa_authorities() -> GrandpaAuthorityList {465 Grandpa::grandpa_authorities()466 }467468 fn submit_report_equivocation_extrinsic(469 _equivocation_proof: fg_primitives::EquivocationProof<470 <Block as BlockT>::Hash,471 NumberFor<Block>,472 >,473 _key_owner_proof: fg_primitives::OpaqueKeyOwnershipProof,474 ) -> Option<()> {475 None476 }477478 fn generate_key_ownership_proof(479 _set_id: fg_primitives::SetId,480 _authority_id: GrandpaId,481 ) -> Option<fg_primitives::OpaqueKeyOwnershipProof> {482 // NOTE: this is the only implementation possible since we've483 // defined our key owner proof type as a bottom type (i.e. a type484 // with no values).485 None486 }487 }488}smart_contract/ink-types-node-runtime/calls/lib.rsdiffbeforeafterboth--- a/smart_contract/ink-types-node-runtime/calls/lib.rs
+++ b/smart_contract/ink-types-node-runtime/calls/lib.rs
@@ -106,6 +106,11 @@
}
#[ink(message)]
+ fn get_test(&self) -> bool {
+ true
+ }
+
+ #[ink(message)]
fn transfer_from(&self, collection_id: u64, item_id: u64, new_owner: AccountId) {
env::println(&format!(
"transfer_from invoke_runtime params {:?}, {:?}, {:?} ",