diff --git a/Cargo.lock b/Cargo.lock
index c204965..2ddbe95 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -176,6 +176,55 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "anstream"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is-terminal",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "anyhow"
version = "1.0.68"
@@ -264,7 +313,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348"
dependencies = [
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -277,7 +326,7 @@ dependencies = [
"num-traits",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -313,7 +362,7 @@ checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -390,7 +439,7 @@ checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
"synstructure",
]
@@ -402,7 +451,7 @@ checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
"synstructure",
]
@@ -414,7 +463,7 @@ checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -442,22 +491,22 @@ dependencies = [
[[package]]
name = "async-io"
-version = "1.12.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794"
+checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
dependencies = [
"async-lock",
"autocfg",
+ "cfg-if",
"concurrent-queue",
"futures-lite",
- "libc",
"log",
"parking",
"polling",
+ "rustix 0.37.19",
"slab",
"socket2",
"waker-fn",
- "windows-sys 0.42.0",
]
[[package]]
@@ -478,7 +527,7 @@ checksum = "eff18d764974428cf3a9328e23fc5c986f5fbed46e6cd4cdf42544df5d297ec1"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -529,7 +578,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -566,10 +615,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
[[package]]
-name = "base58"
+name = "base16ct"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
[[package]]
name = "base64"
@@ -601,7 +650,7 @@ dependencies = [
[[package]]
name = "binary-merkle-tree"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"hash-db 0.16.0",
"log",
@@ -633,7 +682,7 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -857,9 +906,9 @@ dependencies = [
[[package]]
name = "cargo_metadata"
-version = "0.15.3"
+version = "0.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08a1ec454bc3eead8719cb56e15dbbfecdbc14e4b3a3ae4936cc6e31f5fc0d07"
+checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
dependencies = [
"camino",
"cargo-platform",
@@ -1012,40 +1061,45 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.1.6"
+version = "4.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3"
+checksum = "d9394150f5b4273a1763355bd1c2ec54cc5a2593f790587bcd6b2c947cfa9211"
dependencies = [
- "bitflags",
+ "clap_builder",
"clap_derive",
- "clap_lex",
- "is-terminal",
"once_cell",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a78fbdd3cc2914ddf37ba444114bc7765bbdcb55ec9cbe6fa054f0137400717"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "bitflags",
+ "clap_lex",
"strsim",
- "termcolor",
]
[[package]]
name = "clap_derive"
-version = "4.1.0"
+version = "4.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
+checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
dependencies = [
"heck",
- "proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "clap_lex"
-version = "0.3.1"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
-dependencies = [
- "os_str_bytes",
-]
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
[[package]]
name = "codespan-reporting"
@@ -1057,6 +1111,12 @@ dependencies = [
"unicode-width",
]
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
[[package]]
name = "comfy-table"
version = "6.1.4"
@@ -1079,9 +1139,9 @@ dependencies = [
[[package]]
name = "const-oid"
-version = "0.9.1"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b"
+checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
[[package]]
name = "constant_time_eq"
@@ -1146,18 +1206,18 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
[[package]]
name = "cranelift-bforest"
-version = "0.93.1"
+version = "0.93.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7379abaacee0f14abf3204a7606118f0465785252169d186337bcb75030815a"
+checksum = "2bc42ba2e232e5b20ff7dc299a812d53337dadce9a7e39a238e6a5cb82d2e57b"
dependencies = [
"cranelift-entity",
]
[[package]]
name = "cranelift-codegen"
-version = "0.93.1"
+version = "0.93.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9489fa336927df749631f1008007ced2871068544f40a202ce6d93fbf2366a7b"
+checksum = "253531aca9b6f56103c9420369db3263e784df39aa1c90685a1f69cfbba0623e"
dependencies = [
"arrayvec 0.7.2",
"bumpalo",
@@ -1176,33 +1236,33 @@ dependencies = [
[[package]]
name = "cranelift-codegen-meta"
-version = "0.93.1"
+version = "0.93.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05bbb67da91ec721ed57cef2f7c5ef7728e1cd9bde9ffd3ef8601022e73e3239"
+checksum = "72f2154365e2bff1b1b8537a7181591fdff50d8e27fa6e40d5c69c3bad0ca7c8"
dependencies = [
"cranelift-codegen-shared",
]
[[package]]
name = "cranelift-codegen-shared"
-version = "0.93.1"
+version = "0.93.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418ecb2f36032f6665dc1a5e2060a143dbab41d83b784882e97710e890a7a16d"
+checksum = "687e14e3f5775248930e0d5a84195abef8b829958e9794bf8d525104993612b4"
[[package]]
name = "cranelift-entity"
-version = "0.93.1"
+version = "0.93.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cf583f7b093f291005f9fb1323e2c37f6ee4c7909e39ce016b2e8360d461705"
+checksum = "f42ea692c7b450ad18b8c9889661505d51c09ec4380cf1c2d278dbb2da22cae1"
dependencies = [
"serde",
]
[[package]]
name = "cranelift-frontend"
-version = "0.93.1"
+version = "0.93.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b66bf9e916f57fbbd0f7703ec6286f4624866bf45000111627c70d272c8dda1"
+checksum = "8483c2db6f45fe9ace984e5adc5d058102227e4c62e5aa2054e16b0275fd3a6e"
dependencies = [
"cranelift-codegen",
"log",
@@ -1212,15 +1272,15 @@ dependencies = [
[[package]]
name = "cranelift-isle"
-version = "0.93.1"
+version = "0.93.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "649782a39ce99798dd6b4029e2bb318a2fbeaade1b4fa25330763c10c65bc358"
+checksum = "e9793158837678902446c411741d87b43f57dadfb944f2440db4287cda8cbd59"
[[package]]
name = "cranelift-native"
-version = "0.93.1"
+version = "0.93.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "937e021e089c51f9749d09e7ad1c4f255c2f8686cb8c3df63a34b3ec9921bc41"
+checksum = "72668c7755f2b880665cb422c8ad2d56db58a88b9bebfef0b73edc2277c13c49"
dependencies = [
"cranelift-codegen",
"libc",
@@ -1229,9 +1289,9 @@ dependencies = [
[[package]]
name = "cranelift-wasm"
-version = "0.93.1"
+version = "0.93.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d850cf6775477747c9dfda9ae23355dd70512ffebc70cf82b85a5b111ae668b5"
+checksum = "3852ce4b088b44ac4e29459573943009a70d1b192c8d77ef949b4e814f656fc1"
dependencies = [
"cranelift-codegen",
"cranelift-entity",
@@ -1338,6 +1398,18 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "crypto-bigint"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15"
+dependencies = [
+ "generic-array 0.14.6",
+ "rand_core 0.6.4",
+ "subtle",
+ "zeroize",
+]
+
[[package]]
name = "crypto-common"
version = "0.1.6"
@@ -1424,13 +1496,14 @@ dependencies = [
[[package]]
name = "curve25519-dalek"
-version = "4.0.0-pre.1"
+version = "4.0.0-rc.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf"
+checksum = "8d4ba9852b42210c7538b75484f9daa0655e9a3ac04f693747bb0f02cf3cfe16"
dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.6.4",
+ "cfg-if",
+ "fiat-crypto",
+ "packed_simd_2",
+ "platforms 3.0.2",
"subtle",
"zeroize",
]
@@ -1459,7 +1532,7 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -1476,7 +1549,7 @@ checksum = "65e07508b90551e610910fa648a1878991d367064997a596135b86df30daf07e"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -1500,7 +1573,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -1511,7 +1584,7 @@ checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e"
dependencies = [
"darling_core",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -1537,7 +1610,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db"
dependencies = [
"data-encoding",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -1551,6 +1624,16 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "der"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05e58dffcdcc8ee7b22f0c1f71a69243d7c2d9ad87b5a14361f2424a1565c219"
+dependencies = [
+ "const-oid",
+ "zeroize",
+]
+
[[package]]
name = "der-parser"
version = "7.0.0"
@@ -1587,7 +1670,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -1598,7 +1681,7 @@ checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -1619,7 +1702,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -1629,7 +1712,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68"
dependencies = [
"derive_builder_core",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -1640,7 +1723,7 @@ checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -1728,7 +1811,7 @@ checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -1773,7 +1856,7 @@ checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -1788,12 +1871,26 @@ version = "0.14.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
dependencies = [
- "der",
- "elliptic-curve",
- "rfc6979",
+ "der 0.6.1",
+ "elliptic-curve 0.12.3",
+ "rfc6979 0.3.1",
"signature 1.6.4",
]
+[[package]]
+name = "ecdsa"
+version = "0.16.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428"
+dependencies = [
+ "der 0.7.5",
+ "digest 0.10.6",
+ "elliptic-curve 0.13.4",
+ "rfc6979 0.4.0",
+ "signature 2.1.0",
+ "spki 0.7.2",
+]
+
[[package]]
name = "ed25519"
version = "1.5.3"
@@ -1846,18 +1943,37 @@ version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
dependencies = [
- "base16ct",
- "crypto-bigint",
- "der",
+ "base16ct 0.1.1",
+ "crypto-bigint 0.4.9",
+ "der 0.6.1",
"digest 0.10.6",
- "ff",
+ "ff 0.12.1",
"generic-array 0.14.6",
- "group",
+ "group 0.12.1",
"hkdf",
"pem-rfc7468",
- "pkcs8",
+ "pkcs8 0.9.0",
+ "rand_core 0.6.4",
+ "sec1 0.3.0",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "elliptic-curve"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75c71eaa367f2e5d556414a8eea812bc62985c879748d6403edabd9cb03f16e7"
+dependencies = [
+ "base16ct 0.2.0",
+ "crypto-bigint 0.5.2",
+ "digest 0.10.6",
+ "ff 0.13.0",
+ "generic-array 0.14.6",
+ "group 0.13.0",
+ "pkcs8 0.10.2",
"rand_core 0.6.4",
- "sec1",
+ "sec1 0.7.1",
"subtle",
"zeroize",
]
@@ -1871,7 +1987,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -1895,13 +2011,13 @@ checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b"
[[package]]
name = "errno"
-version = "0.2.8"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
dependencies = [
"errno-dragonfly",
"libc",
- "winapi",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -1914,17 +2030,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "etcetera"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
-dependencies = [
- "cfg-if",
- "home",
- "windows-sys 0.48.0",
-]
-
[[package]]
name = "ethbloom"
version = "0.13.0"
@@ -1983,7 +2088,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
[[package]]
name = "evm"
version = "0.39.1"
-source = "git+https://github.com/rust-blockchain/evm?branch=master#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65"
+source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65"
dependencies = [
"auto_impl",
"environmental",
@@ -2003,7 +2108,7 @@ dependencies = [
[[package]]
name = "evm-core"
version = "0.39.0"
-source = "git+https://github.com/rust-blockchain/evm?branch=master#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65"
+source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65"
dependencies = [
"parity-scale-codec",
"primitive-types",
@@ -2014,7 +2119,7 @@ dependencies = [
[[package]]
name = "evm-gasometer"
version = "0.39.0"
-source = "git+https://github.com/rust-blockchain/evm?branch=master#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65"
+source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65"
dependencies = [
"environmental",
"evm-core",
@@ -2025,7 +2130,7 @@ dependencies = [
[[package]]
name = "evm-runtime"
version = "0.39.0"
-source = "git+https://github.com/rust-blockchain/evm?branch=master#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65"
+source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65"
dependencies = [
"auto_impl",
"environmental",
@@ -2053,7 +2158,7 @@ dependencies = [
"fs-err",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -2124,7 +2229,6 @@ version = "2.0.0-dev"
dependencies = [
"async-trait",
"ethereum",
- "fc-rpc",
"fc-storage",
"fp-consensus",
"fp-rpc",
@@ -2160,7 +2264,6 @@ dependencies = [
"ethereum",
"ethereum-types",
"fc-db",
- "fc-rpc",
"fc-storage",
"fp-consensus",
"fp-rpc",
@@ -2288,6 +2391,22 @@ dependencies = [
"subtle",
]
+[[package]]
+name = "ff"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "fiat-crypto"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
+
[[package]]
name = "file-per-thread-logger"
version = "0.1.6"
@@ -2300,14 +2419,14 @@ dependencies = [
[[package]]
name = "filetime"
-version = "0.2.19"
+version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
+checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -2400,7 +2519,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "fork-tree"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"parity-scale-codec",
]
@@ -2472,6 +2591,7 @@ dependencies = [
"evm",
"frame-support",
"parity-scale-codec",
+ "scale-info",
"serde",
"sp-core",
"sp-runtime",
@@ -2522,7 +2642,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
[[package]]
name = "frame-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"frame-support",
"frame-support-procedural",
@@ -2547,7 +2667,7 @@ dependencies = [
[[package]]
name = "frame-benchmarking-cli"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"Inflector",
"array-bytes",
@@ -2594,7 +2714,7 @@ dependencies = [
[[package]]
name = "frame-executive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"frame-support",
"frame-system",
@@ -2609,9 +2729,9 @@ dependencies = [
[[package]]
name = "frame-metadata"
-version = "15.0.0"
+version = "15.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d"
+checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c"
dependencies = [
"cfg-if",
"parity-scale-codec",
@@ -2622,7 +2742,7 @@ dependencies = [
[[package]]
name = "frame-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"bitflags",
"environmental",
@@ -2655,44 +2775,45 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"Inflector",
"cfg-expr",
"derive-syn-parse",
"frame-support-procedural-tools",
"itertools",
+ "proc-macro-warning",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "frame-support-procedural-tools"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "frame-support-procedural-tools-derive"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "frame-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"frame-support",
"log",
@@ -2710,7 +2831,7 @@ dependencies = [
[[package]]
name = "frame-system-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -2725,7 +2846,7 @@ dependencies = [
[[package]]
name = "frame-system-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -2863,21 +2984,14 @@ dependencies = [
[[package]]
name = "fs4"
-version = "0.6.3"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea55201cc351fdb478217c0fb641b59813da9b4efe4c414a9d8f989a657d149"
+checksum = "a7f5b6908aecca5812a4569056285e58c666588c9573ee59765bf1d3692699e2"
dependencies = [
- "libc",
- "rustix 0.35.13",
- "winapi",
+ "rustix 0.37.19",
+ "windows-sys 0.48.0",
]
-[[package]]
-name = "fs_extra"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
-
[[package]]
name = "funty"
version = "2.0.0"
@@ -2886,9 +3000,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
[[package]]
name = "futures"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
dependencies = [
"futures-channel",
"futures-core",
@@ -2901,9 +3015,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
dependencies = [
"futures-core",
"futures-sink",
@@ -2911,15 +3025,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
[[package]]
name = "futures-executor"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
dependencies = [
"futures-core",
"futures-task",
@@ -2940,9 +3054,9 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
[[package]]
name = "futures-lite"
@@ -2961,13 +3075,13 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
@@ -2983,15 +3097,15 @@ dependencies = [
[[package]]
name = "futures-sink"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
[[package]]
name = "futures-task"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
[[package]]
name = "futures-timer"
@@ -3001,9 +3115,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
[[package]]
name = "futures-util"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
dependencies = [
"futures-channel",
"futures-core",
@@ -3043,6 +3157,7 @@ checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
dependencies = [
"typenum",
"version_check",
+ "zeroize",
]
[[package]]
@@ -3139,7 +3254,18 @@ version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
dependencies = [
- "ff",
+ "ff 0.12.1",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff 0.13.0",
"rand_core 0.6.4",
"subtle",
]
@@ -3252,6 +3378,12 @@ dependencies = [
"libc",
]
+[[package]]
+name = "hermit-abi"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+
[[package]]
name = "hex"
version = "0.4.3"
@@ -3260,9 +3392,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
[[package]]
name = "hkdf"
@@ -3323,15 +3455,6 @@ dependencies = [
"hmac 0.8.1",
]
-[[package]]
-name = "home"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
-dependencies = [
- "windows-sys 0.48.0",
-]
-
[[package]]
name = "hostname"
version = "0.3.1"
@@ -3543,7 +3666,7 @@ checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -3596,18 +3719,13 @@ dependencies = [
[[package]]
name = "io-lifetimes"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074"
-
-[[package]]
-name = "io-lifetimes"
-version = "1.0.4"
+version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
+checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
dependencies = [
+ "hermit-abi 0.3.1",
"libc",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -3636,14 +3754,14 @@ checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
[[package]]
name = "is-terminal"
-version = "0.4.2"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
+checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
dependencies = [
- "hermit-abi 0.2.6",
- "io-lifetimes 1.0.4",
- "rustix 0.36.7",
- "windows-sys 0.42.0",
+ "hermit-abi 0.3.1",
+ "io-lifetimes",
+ "rustix 0.37.19",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -3728,7 +3846,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -3769,13 +3887,14 @@ dependencies = [
[[package]]
name = "k256"
-version = "0.11.6"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
+checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
dependencies = [
"cfg-if",
- "ecdsa",
- "elliptic-curve",
+ "ecdsa 0.16.7",
+ "elliptic-curve 0.13.4",
+ "once_cell",
"sha2 0.10.6",
]
@@ -3809,9 +3928,9 @@ dependencies = [
[[package]]
name = "kvdb-rocksdb"
-version = "0.17.0"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2182b8219fee6bd83aacaab7344e840179ae079d5216aa4e249b4d704646a844"
+checksum = "fe7a749456510c45f795e8b04a6a3e0976d0139213ecbf465843830ad55e2217"
dependencies = [
"kvdb",
"num_cpus",
@@ -3838,9 +3957,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
-version = "0.2.139"
+version = "0.2.144"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
[[package]]
name = "libloading"
@@ -3852,6 +3971,12 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "libm"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
+
[[package]]
name = "libm"
version = "0.2.6"
@@ -3917,7 +4042,7 @@ dependencies = [
"prost-build",
"rand 0.8.5",
"rw-stream-sink",
- "sec1",
+ "sec1 0.3.0",
"sha2 0.10.6",
"smallvec",
"thiserror",
@@ -4149,7 +4274,7 @@ checksum = "9d527d5827582abd44a6d80c07ff8b50b4ee238a8979e05998474179e79dc400"
dependencies = [
"heck",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -4266,9 +4391,9 @@ dependencies = [
[[package]]
name = "librocksdb-sys"
-version = "0.8.3+7.4.4"
+version = "0.10.0+7.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "557b255ff04123fcc176162f56ed0c9cd42d8f357cf55b3fabeb60f7413741b3"
+checksum = "0fe4d5874f5ff2bc616e55e8c6086d478fcda13faf9495768a4aa1c22042d30b"
dependencies = [
"bindgen",
"bzip2-sys",
@@ -4384,15 +4509,15 @@ dependencies = [
[[package]]
name = "linux-raw-sys"
-version = "0.0.46"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
[[package]]
name = "linux-raw-sys"
-version = "0.1.4"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f"
[[package]]
name = "lock_api"
@@ -4517,7 +4642,7 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb"
dependencies = [
- "rustix 0.36.7",
+ "rustix 0.36.13",
]
[[package]]
@@ -4591,14 +4716,14 @@ dependencies = [
[[package]]
name = "mio"
-version = "0.8.5"
+version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
+checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
dependencies = [
"libc",
"log",
"wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
]
[[package]]
@@ -4625,7 +4750,7 @@ dependencies = [
"cfg-if",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -4684,7 +4809,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
"synstructure",
]
@@ -4732,7 +4857,7 @@ checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -4887,23 +5012,6 @@ dependencies = [
"num-traits",
]
-[[package]]
-name = "num-bigint-dig"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905"
-dependencies = [
- "byteorder",
- "lazy_static",
- "libm",
- "num-integer",
- "num-iter",
- "num-traits",
- "rand 0.8.5",
- "smallvec",
- "zeroize",
-]
-
[[package]]
name = "num-complex"
version = "0.4.3"
@@ -4963,7 +5071,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
dependencies = [
"autocfg",
- "libm",
]
[[package]]
@@ -4978,23 +5085,23 @@ dependencies = [
[[package]]
name = "num_enum"
-version = "0.5.9"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d829733185c1ca374f17e52b762f24f535ec625d2cc1f070e34c8a9068f341b"
+checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
dependencies = [
"num_enum_derive",
]
[[package]]
name = "num_enum_derive"
-version = "0.5.9"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2be1598bf1c313dcdd12092e3f1920f463462525a21b7b4e11b4168353d0123e"
+checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
@@ -5077,7 +5184,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -5099,20 +5206,14 @@ dependencies = [
"vcpkg",
]
-[[package]]
-name = "os_str_bytes"
-version = "6.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
-
[[package]]
name = "p256"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594"
dependencies = [
- "ecdsa",
- "elliptic-curve",
+ "ecdsa 0.14.8",
+ "elliptic-curve 0.12.3",
"sha2 0.10.6",
]
@@ -5122,15 +5223,25 @@ version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa"
dependencies = [
- "ecdsa",
- "elliptic-curve",
+ "ecdsa 0.14.8",
+ "elliptic-curve 0.12.3",
"sha2 0.10.6",
]
+[[package]]
+name = "packed_simd_2"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282"
+dependencies = [
+ "cfg-if",
+ "libm 0.1.4",
+]
+
[[package]]
name = "pallet-aura"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"frame-support",
"frame-system",
@@ -5146,7 +5257,7 @@ dependencies = [
[[package]]
name = "pallet-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"frame-support",
"frame-system",
@@ -5160,7 +5271,7 @@ dependencies = [
[[package]]
name = "pallet-babe"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5173,7 +5284,7 @@ dependencies = [
"scale-info",
"sp-application-crypto",
"sp-consensus-babe",
- "sp-consensus-vrf",
+ "sp-core",
"sp-io",
"sp-runtime",
"sp-session",
@@ -5184,7 +5295,7 @@ dependencies = [
[[package]]
name = "pallet-balances"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5213,7 +5324,7 @@ dependencies = [
[[package]]
name = "pallet-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"frame-support",
"frame-system",
@@ -5232,7 +5343,7 @@ dependencies = [
[[package]]
name = "pallet-beefy-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"array-bytes",
"binary-merkle-tree",
@@ -5383,7 +5494,7 @@ dependencies = [
name = "pallet-evm-precompile-curve25519"
version = "1.0.0-dev"
dependencies = [
- "curve25519-dalek 4.0.0-pre.1",
+ "curve25519-dalek 4.0.0-rc.1",
"fp-evm",
]
@@ -5457,7 +5568,7 @@ dependencies = [
[[package]]
name = "pallet-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5496,7 +5607,7 @@ dependencies = [
[[package]]
name = "pallet-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5513,7 +5624,7 @@ dependencies = [
[[package]]
name = "pallet-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"frame-support",
"frame-system",
@@ -5534,7 +5645,7 @@ dependencies = [
[[package]]
name = "pallet-sudo"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"frame-support",
"frame-system",
@@ -5548,7 +5659,7 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5566,7 +5677,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"frame-support",
"frame-system",
@@ -5582,7 +5693,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"jsonrpsee",
"pallet-transaction-payment-rpc-runtime-api",
@@ -5598,7 +5709,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"pallet-transaction-payment",
"parity-scale-codec",
@@ -5610,7 +5721,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5625,9 +5736,9 @@ dependencies = [
[[package]]
name = "parity-db"
-version = "0.4.6"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00bfb81cf5c90a222db2fb7b3a7cbf8cc7f38dfb6647aca4d98edf8281f56ed5"
+checksum = "4890dcb9556136a4ec2b0c51fa4a08c8b733b829506af8fff2e853f3a065985b"
dependencies = [
"blake2",
"crc32fast",
@@ -5667,7 +5778,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -5706,7 +5817,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
- "parking_lot_core 0.9.6",
+ "parking_lot_core 0.9.7",
]
[[package]]
@@ -5725,15 +5836,15 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.6"
+version = "0.9.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"
+checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
"smallvec",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
]
[[package]]
@@ -5820,7 +5931,7 @@ dependencies = [
"pest_meta",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -5861,7 +5972,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -5883,25 +5994,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
-name = "pkcs1"
-version = "0.4.1"
+name = "pkcs8"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff33bdbdfc54cc98a2eca766ebdec3e1b8fb7387523d5c9c9a2891da856f719"
+checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
dependencies = [
- "der",
- "pkcs8",
- "spki",
- "zeroize",
+ "der 0.6.1",
+ "spki 0.6.0",
]
[[package]]
name = "pkcs8"
-version = "0.9.0"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
dependencies = [
- "der",
- "spki",
+ "der 0.7.5",
+ "spki 0.7.2",
]
[[package]]
@@ -5916,18 +6025,26 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94"
+[[package]]
+name = "platforms"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630"
+
[[package]]
name = "polling"
-version = "2.5.2"
+version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6"
+checksum = "4be1c66a6add46bff50935c313dae30a5030cf8385c5206e8a95e9e9def974aa"
dependencies = [
"autocfg",
+ "bitflags",
"cfg-if",
+ "concurrent-queue",
"libc",
"log",
- "wepoll-ffi",
- "windows-sys 0.42.0",
+ "pin-project-lite 0.2.9",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -6007,7 +6124,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78"
dependencies = [
"proc-macro2",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -6031,7 +6148,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
dependencies = [
"thiserror",
- "toml",
+ "toml 0.5.11",
]
[[package]]
@@ -6043,7 +6160,7 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
"version_check",
]
@@ -6058,11 +6175,22 @@ dependencies = [
"version_check",
]
+[[package]]
+name = "proc-macro-warning"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.15",
+]
+
[[package]]
name = "proc-macro2"
-version = "1.0.50"
+version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
dependencies = [
"unicode-ident",
]
@@ -6101,7 +6229,7 @@ checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -6131,7 +6259,7 @@ dependencies = [
"prost",
"prost-types",
"regex",
- "syn",
+ "syn 1.0.107",
"tempfile",
"which",
]
@@ -6159,7 +6287,7 @@ dependencies = [
"itertools",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -6218,9 +6346,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.23"
+version = "1.0.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
dependencies = [
"proc-macro2",
]
@@ -6401,7 +6529,7 @@ checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -6479,19 +6607,29 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
dependencies = [
- "crypto-bigint",
+ "crypto-bigint 0.4.9",
"hmac 0.12.1",
"zeroize",
]
[[package]]
-name = "ring"
-version = "0.16.20"
+name = "rfc6979"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
dependencies = [
- "cc",
- "libc",
+ "hmac 0.12.1",
+ "subtle",
+]
+
+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
"once_cell",
"spin 0.5.2",
"untrusted",
@@ -6527,14 +6665,14 @@ checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
name = "rocksdb"
-version = "0.19.0"
+version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e9562ea1d70c0cc63a34a22d977753b50cca91cc6b6527750463bd5dd8697bc"
+checksum = "015439787fce1e75d55f279078d33ff14b4af5d93d995e8838ee4631301c8a99"
dependencies = [
"libc",
"librocksdb-sys",
@@ -6551,26 +6689,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "rsa"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55a77d189da1fee555ad95b7e50e7457d91c0e089ec68ca69ad2989413bbdab4"
-dependencies = [
- "byteorder",
- "digest 0.10.6",
- "num-bigint-dig",
- "num-integer",
- "num-iter",
- "num-traits",
- "pkcs1",
- "pkcs8",
- "rand_core 0.6.4",
- "signature 2.1.0",
- "subtle",
- "zeroize",
-]
-
[[package]]
name = "rtcp"
version = "0.7.2"
@@ -6659,30 +6777,30 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.35.13"
+version = "0.36.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9"
+checksum = "3a38f9520be93aba504e8ca974197f46158de5dcaa9fa04b57c57cd6a679d658"
dependencies = [
"bitflags",
"errno",
- "io-lifetimes 0.7.5",
+ "io-lifetimes",
"libc",
- "linux-raw-sys 0.0.46",
- "windows-sys 0.42.0",
+ "linux-raw-sys 0.1.4",
+ "windows-sys 0.45.0",
]
[[package]]
name = "rustix"
-version = "0.36.7"
+version = "0.37.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
+checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
dependencies = [
"bitflags",
"errno",
- "io-lifetimes 1.0.4",
+ "io-lifetimes",
"libc",
- "linux-raw-sys 0.1.4",
- "windows-sys 0.42.0",
+ "linux-raw-sys 0.3.7",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -6775,7 +6893,7 @@ dependencies = [
[[package]]
name = "sc-allocator"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"log",
"sp-core",
@@ -6786,7 +6904,7 @@ dependencies = [
[[package]]
name = "sc-basic-authorship"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"futures",
"futures-timer",
@@ -6809,7 +6927,7 @@ dependencies = [
[[package]]
name = "sc-block-builder"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -6824,7 +6942,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"memmap2",
"sc-chain-spec-derive",
@@ -6843,18 +6961,18 @@ dependencies = [
[[package]]
name = "sc-chain-spec-derive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "sc-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"array-bytes",
"chrono",
@@ -6894,7 +7012,7 @@ dependencies = [
[[package]]
name = "sc-client-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"fnv",
"futures",
@@ -6920,7 +7038,7 @@ dependencies = [
[[package]]
name = "sc-client-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"hash-db 0.16.0",
"kvdb",
@@ -6946,7 +7064,7 @@ dependencies = [
[[package]]
name = "sc-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"async-trait",
"futures",
@@ -6971,7 +7089,7 @@ dependencies = [
[[package]]
name = "sc-consensus-aura"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"async-trait",
"futures",
@@ -7000,13 +7118,12 @@ dependencies = [
[[package]]
name = "sc-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"async-trait",
"fork-tree",
"futures",
"log",
- "merlin",
"num-bigint",
"num-rational",
"num-traits",
@@ -7019,7 +7136,6 @@ dependencies = [
"sc-keystore",
"sc-telemetry",
"scale-info",
- "schnorrkel",
"sp-api",
"sp-application-crypto",
"sp-block-builder",
@@ -7027,7 +7143,6 @@ dependencies = [
"sp-consensus",
"sp-consensus-babe",
"sp-consensus-slots",
- "sp-consensus-vrf",
"sp-core",
"sp-inherents",
"sp-keystore",
@@ -7039,7 +7154,7 @@ dependencies = [
[[package]]
name = "sc-consensus-epochs"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -7052,7 +7167,7 @@ dependencies = [
[[package]]
name = "sc-consensus-grandpa"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"ahash 0.8.3",
"array-bytes",
@@ -7092,7 +7207,7 @@ dependencies = [
[[package]]
name = "sc-consensus-manual-seal"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"assert_matches",
"async-trait",
@@ -7126,7 +7241,7 @@ dependencies = [
[[package]]
name = "sc-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"async-trait",
"futures",
@@ -7149,7 +7264,7 @@ dependencies = [
[[package]]
name = "sc-executor"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"lru",
"parity-scale-codec",
@@ -7173,7 +7288,7 @@ dependencies = [
[[package]]
name = "sc-executor-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"sc-allocator",
"sp-maybe-compressed-blob",
@@ -7186,7 +7301,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmi"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"log",
"sc-allocator",
@@ -7199,14 +7314,14 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"anyhow",
"cfg-if",
"libc",
"log",
"once_cell",
- "rustix 0.36.7",
+ "rustix 0.36.13",
"sc-allocator",
"sc-executor-common",
"sp-runtime-interface",
@@ -7217,7 +7332,7 @@ dependencies = [
[[package]]
name = "sc-informant"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"ansi_term",
"futures",
@@ -7233,7 +7348,7 @@ dependencies = [
[[package]]
name = "sc-keystore"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"array-bytes",
"async-trait",
@@ -7248,7 +7363,7 @@ dependencies = [
[[package]]
name = "sc-network"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"array-bytes",
"async-channel",
@@ -7278,6 +7393,7 @@ dependencies = [
"serde",
"serde_json",
"smallvec",
+ "snow",
"sp-arithmetic",
"sp-blockchain",
"sp-consensus",
@@ -7292,7 +7408,7 @@ dependencies = [
[[package]]
name = "sc-network-bitswap"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"cid",
"futures",
@@ -7312,7 +7428,7 @@ dependencies = [
[[package]]
name = "sc-network-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"array-bytes",
"async-trait",
@@ -7340,7 +7456,7 @@ dependencies = [
[[package]]
name = "sc-network-gossip"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"ahash 0.8.3",
"futures",
@@ -7359,7 +7475,7 @@ dependencies = [
[[package]]
name = "sc-network-light"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"array-bytes",
"futures",
@@ -7381,7 +7497,7 @@ dependencies = [
[[package]]
name = "sc-network-sync"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"array-bytes",
"async-trait",
@@ -7415,7 +7531,7 @@ dependencies = [
[[package]]
name = "sc-network-transactions"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"array-bytes",
"futures",
@@ -7435,7 +7551,7 @@ dependencies = [
[[package]]
name = "sc-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"array-bytes",
"bytes",
@@ -7466,7 +7582,7 @@ dependencies = [
[[package]]
name = "sc-peerset"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"futures",
"libp2p",
@@ -7479,7 +7595,7 @@ dependencies = [
[[package]]
name = "sc-proposer-metrics"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"log",
"substrate-prometheus-endpoint",
@@ -7488,7 +7604,7 @@ dependencies = [
[[package]]
name = "sc-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"futures",
"jsonrpsee",
@@ -7518,7 +7634,7 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -7537,7 +7653,7 @@ dependencies = [
[[package]]
name = "sc-rpc-server"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"http",
"jsonrpsee",
@@ -7552,7 +7668,7 @@ dependencies = [
[[package]]
name = "sc-rpc-spec-v2"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"array-bytes",
"futures",
@@ -7578,7 +7694,7 @@ dependencies = [
[[package]]
name = "sc-service"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"async-trait",
"directories",
@@ -7644,7 +7760,7 @@ dependencies = [
[[package]]
name = "sc-state-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"log",
"parity-scale-codec",
@@ -7655,7 +7771,7 @@ dependencies = [
[[package]]
name = "sc-storage-monitor"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"clap",
"fs4",
@@ -7671,7 +7787,7 @@ dependencies = [
[[package]]
name = "sc-sysinfo"
version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"futures",
"libc",
@@ -7690,7 +7806,7 @@ dependencies = [
[[package]]
name = "sc-telemetry"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"chrono",
"futures",
@@ -7709,7 +7825,7 @@ dependencies = [
[[package]]
name = "sc-tracing"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"ansi_term",
"atty",
@@ -7740,18 +7856,18 @@ dependencies = [
[[package]]
name = "sc-tracing-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "sc-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"async-trait",
"futures",
@@ -7778,7 +7894,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"async-trait",
"futures",
@@ -7792,7 +7908,7 @@ dependencies = [
[[package]]
name = "sc-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"async-channel",
"futures",
@@ -7806,9 +7922,9 @@ dependencies = [
[[package]]
name = "scale-info"
-version = "2.3.1"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "001cf62ece89779fd16105b5f515ad0e5cedcd5440d3dd806bb067978e7c3608"
+checksum = "dfdef77228a4c05dc94211441595746732131ad7f6530c6c18f045da7b7ab937"
dependencies = [
"bitvec",
"cfg-if",
@@ -7820,14 +7936,14 @@ dependencies = [
[[package]]
name = "scale-info-derive"
-version = "2.3.1"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "303959cf613a6f6efd19ed4b4ad5bf79966a13352716299ad532cfb115f4205c"
+checksum = "53012eae69e5aa5c14671942a5dd47de59d4cdcff8532a6dd0e081faf1119482"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -7918,10 +8034,24 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
dependencies = [
- "base16ct",
- "der",
+ "base16ct 0.1.1",
+ "der 0.6.1",
+ "generic-array 0.14.6",
+ "pkcs8 0.9.0",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "sec1"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e"
+dependencies = [
+ "base16ct 0.2.0",
+ "der 0.7.5",
"generic-array 0.14.6",
- "pkcs8",
+ "pkcs8 0.10.2",
"subtle",
"zeroize",
]
@@ -8017,7 +8147,7 @@ checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -8031,6 +8161,15 @@ dependencies = [
"serde",
]
+[[package]]
+name = "serde_spanned"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+dependencies = [
+ "serde",
+]
+
[[package]]
name = "sha-1"
version = "0.9.8"
@@ -8044,17 +8183,6 @@ dependencies = [
"opaque-debug 0.3.0",
]
-[[package]]
-name = "sha1"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest 0.10.6",
-]
-
[[package]]
name = "sha2"
version = "0.8.2"
@@ -8193,14 +8321,14 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831"
[[package]]
name = "snow"
-version = "0.9.0"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d"
+checksum = "5ccba027ba85743e09d15c03296797cad56395089b832b48b5a5217880f57733"
dependencies = [
"aes-gcm 0.9.4",
"blake2",
"chacha20poly1305",
- "curve25519-dalek 4.0.0-pre.1",
+ "curve25519-dalek 4.0.0-rc.1",
"rand_core 0.6.4",
"ring",
"rustc_version",
@@ -8210,9 +8338,9 @@ dependencies = [
[[package]]
name = "socket2"
-version = "0.4.7"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
dependencies = [
"libc",
"winapi",
@@ -8238,13 +8366,15 @@ dependencies = [
[[package]]
name = "sp-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"hash-db 0.16.0",
"log",
"parity-scale-codec",
+ "scale-info",
"sp-api-proc-macro",
"sp-core",
+ "sp-metadata-ir",
"sp-runtime",
"sp-state-machine",
"sp-std",
@@ -8256,7 +8386,7 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"Inflector",
"blake2",
@@ -8264,13 +8394,13 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "sp-application-crypto"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -8283,7 +8413,7 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"integer-sqrt",
"num-traits",
@@ -8297,7 +8427,7 @@ dependencies = [
[[package]]
name = "sp-block-builder"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -8309,7 +8439,7 @@ dependencies = [
[[package]]
name = "sp-blockchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"futures",
"log",
@@ -8327,7 +8457,7 @@ dependencies = [
[[package]]
name = "sp-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"async-trait",
"futures",
@@ -8342,7 +8472,7 @@ dependencies = [
[[package]]
name = "sp-consensus-aura"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -8360,10 +8490,9 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"async-trait",
- "merlin",
"parity-scale-codec",
"scale-info",
"serde",
@@ -8371,7 +8500,6 @@ dependencies = [
"sp-application-crypto",
"sp-consensus",
"sp-consensus-slots",
- "sp-consensus-vrf",
"sp-core",
"sp-inherents",
"sp-keystore",
@@ -8383,7 +8511,7 @@ dependencies = [
[[package]]
name = "sp-consensus-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"lazy_static",
"parity-scale-codec",
@@ -8402,7 +8530,7 @@ dependencies = [
[[package]]
name = "sp-consensus-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"finality-grandpa",
"log",
@@ -8420,7 +8548,7 @@ dependencies = [
[[package]]
name = "sp-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -8429,29 +8557,16 @@ dependencies = [
"sp-timestamp",
]
-[[package]]
-name = "sp-consensus-vrf"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
-dependencies = [
- "parity-scale-codec",
- "scale-info",
- "schnorrkel",
- "sp-core",
- "sp-runtime",
- "sp-std",
-]
-
[[package]]
name = "sp-core"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"array-bytes",
- "base58",
"bitflags",
"blake2",
"bounded-collections",
+ "bs58",
"dyn-clonable",
"ed25519-zebra",
"futures",
@@ -8464,6 +8579,7 @@ dependencies = [
"merlin",
"parity-scale-codec",
"parking_lot 0.12.1",
+ "paste",
"primitive-types",
"rand 0.8.5",
"regex",
@@ -8488,7 +8604,7 @@ dependencies = [
[[package]]
name = "sp-core-hashing"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"blake2b_simd",
"byteorder",
@@ -8502,18 +8618,18 @@ dependencies = [
[[package]]
name = "sp-core-hashing-proc-macro"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"proc-macro2",
"quote",
"sp-core-hashing",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "sp-database"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"kvdb",
"parking_lot 0.12.1",
@@ -8522,17 +8638,17 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "sp-externalities"
version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -8543,7 +8659,7 @@ dependencies = [
[[package]]
name = "sp-inherents"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"async-trait",
"impl-trait-for-tuples",
@@ -8558,7 +8674,7 @@ dependencies = [
[[package]]
name = "sp-io"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"bytes",
"ed25519",
@@ -8567,6 +8683,7 @@ dependencies = [
"libsecp256k1",
"log",
"parity-scale-codec",
+ "rustversion",
"secp256k1",
"sp-core",
"sp-externalities",
@@ -8583,7 +8700,7 @@ dependencies = [
[[package]]
name = "sp-keyring"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"lazy_static",
"sp-core",
@@ -8594,14 +8711,11 @@ dependencies = [
[[package]]
name = "sp-keystore"
version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
- "async-trait",
"futures",
- "merlin",
"parity-scale-codec",
"parking_lot 0.12.1",
- "schnorrkel",
"serde",
"sp-core",
"sp-externalities",
@@ -8611,16 +8725,27 @@ dependencies = [
[[package]]
name = "sp-maybe-compressed-blob"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"thiserror",
- "zstd",
+ "zstd 0.12.3+zstd.1.5.2",
+]
+
+[[package]]
+name = "sp-metadata-ir"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
+dependencies = [
+ "frame-metadata",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-std",
]
[[package]]
name = "sp-mmr-primitives"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"ckb-merkle-mountain-range",
"log",
@@ -8638,7 +8763,7 @@ dependencies = [
[[package]]
name = "sp-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"sp-api",
"sp-core",
@@ -8648,7 +8773,7 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"backtrace",
"lazy_static",
@@ -8658,7 +8783,7 @@ dependencies = [
[[package]]
name = "sp-rpc"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"rustc-hash",
"serde",
@@ -8668,7 +8793,7 @@ dependencies = [
[[package]]
name = "sp-runtime"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"either",
"hash256-std-hasher",
@@ -8690,7 +8815,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"bytes",
"impl-trait-for-tuples",
@@ -8708,19 +8833,19 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"Inflector",
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "sp-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -8734,10 +8859,11 @@ dependencies = [
[[package]]
name = "sp-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"parity-scale-codec",
"scale-info",
+ "serde",
"sp-core",
"sp-runtime",
"sp-std",
@@ -8746,7 +8872,7 @@ dependencies = [
[[package]]
name = "sp-state-machine"
version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"hash-db 0.16.0",
"log",
@@ -8766,12 +8892,12 @@ dependencies = [
[[package]]
name = "sp-std"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
[[package]]
name = "sp-storage"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -8784,7 +8910,7 @@ dependencies = [
[[package]]
name = "sp-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"async-trait",
"futures-timer",
@@ -8799,7 +8925,7 @@ dependencies = [
[[package]]
name = "sp-tracing"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"parity-scale-codec",
"sp-std",
@@ -8811,7 +8937,7 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"sp-api",
"sp-runtime",
@@ -8820,7 +8946,7 @@ dependencies = [
[[package]]
name = "sp-transaction-storage-proof"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"async-trait",
"log",
@@ -8836,11 +8962,11 @@ dependencies = [
[[package]]
name = "sp-trie"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"ahash 0.8.3",
"hash-db 0.16.0",
- "hashbrown 0.12.3",
+ "hashbrown 0.13.2",
"lazy_static",
"memory-db",
"nohash-hasher",
@@ -8859,7 +8985,7 @@ dependencies = [
[[package]]
name = "sp-version"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -8876,18 +9002,18 @@ dependencies = [
[[package]]
name = "sp-version-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"parity-scale-codec",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "sp-wasm-interface"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"anyhow",
"impl-trait-for-tuples",
@@ -8901,7 +9027,7 @@ dependencies = [
[[package]]
name = "sp-weights"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -8935,7 +9061,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
dependencies = [
"base64ct",
- "der",
+ "der 0.6.1",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+dependencies = [
+ "base64ct",
+ "der 0.7.5",
]
[[package]]
@@ -8957,8 +9093,6 @@ checksum = "afd8985c8822235a9ebeedf0bff971462470162759663d3184593c807ab6e898"
dependencies = [
"sqlx-core",
"sqlx-macros",
- "sqlx-mysql",
- "sqlx-postgres",
"sqlx-sqlite",
]
@@ -8993,7 +9127,6 @@ dependencies = [
"paste",
"percent-encoding",
"serde",
- "serde_json",
"sha2 0.10.6",
"smallvec",
"sqlformat",
@@ -9014,7 +9147,7 @@ dependencies = [
"quote",
"sqlx-core",
"sqlx-macros-core",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -9034,95 +9167,13 @@ dependencies = [
"serde_json",
"sha2 0.10.6",
"sqlx-core",
- "sqlx-mysql",
"sqlx-sqlite",
- "syn",
+ "syn 1.0.107",
"tempfile",
"tokio",
"url",
]
-[[package]]
-name = "sqlx-mysql"
-version = "0.7.0-alpha.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c430536df19e8b5b048a9ae19b266aba77f9f3e2255b7195f465d678cb2d0a"
-dependencies = [
- "atoi",
- "base64 0.21.0",
- "bitflags",
- "byteorder",
- "bytes",
- "crc",
- "digest 0.10.6",
- "dotenvy",
- "either",
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-util",
- "generic-array 0.14.6",
- "hex",
- "hkdf",
- "hmac 0.12.1",
- "itoa",
- "log",
- "md-5",
- "memchr",
- "once_cell",
- "percent-encoding",
- "rand 0.8.5",
- "rsa",
- "serde",
- "sha1",
- "sha2 0.10.6",
- "smallvec",
- "sqlx-core",
- "stringprep",
- "thiserror",
- "tracing",
- "whoami",
-]
-
-[[package]]
-name = "sqlx-postgres"
-version = "0.7.0-alpha.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "210e0a1523b6d46ca73db1c5197a233a8e14787596910ce88ff5d47a00da0241"
-dependencies = [
- "atoi",
- "base64 0.21.0",
- "bitflags",
- "byteorder",
- "crc",
- "dotenvy",
- "etcetera",
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-util",
- "hex",
- "hkdf",
- "hmac 0.12.1",
- "home",
- "itoa",
- "log",
- "md-5",
- "memchr",
- "once_cell",
- "rand 0.8.5",
- "serde",
- "serde_json",
- "sha1",
- "sha2 0.10.6",
- "smallvec",
- "sqlx-core",
- "stringprep",
- "thiserror",
- "tracing",
- "whoami",
-]
-
[[package]]
name = "sqlx-sqlite"
version = "0.7.0-alpha.3"
@@ -9197,17 +9248,7 @@ dependencies = [
"memchr",
"proc-macro2",
"quote",
- "syn",
-]
-
-[[package]]
-name = "stringprep"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "syn 1.0.107",
]
[[package]]
@@ -9235,7 +9276,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -9286,15 +9327,15 @@ dependencies = [
[[package]]
name = "substrate-build-script-utils"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
- "platforms",
+ "platforms 2.0.0",
]
[[package]]
name = "substrate-frame-rpc-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"frame-system-rpc-runtime-api",
"futures",
@@ -9313,7 +9354,7 @@ dependencies = [
[[package]]
name = "substrate-prometheus-endpoint"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"hyper",
"log",
@@ -9325,7 +9366,7 @@ dependencies = [
[[package]]
name = "substrate-test-client"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"array-bytes",
"async-trait",
@@ -9351,7 +9392,7 @@ dependencies = [
[[package]]
name = "substrate-test-runtime"
version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"cfg-if",
"frame-support",
@@ -9394,7 +9435,7 @@ dependencies = [
[[package]]
name = "substrate-test-runtime-client"
version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"futures",
"parity-scale-codec",
@@ -9414,7 +9455,7 @@ dependencies = [
[[package]]
name = "substrate-wasm-builder"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db"
dependencies = [
"ansi_term",
"build-helper",
@@ -9423,7 +9464,7 @@ dependencies = [
"sp-maybe-compressed-blob",
"strum",
"tempfile",
- "toml",
+ "toml 0.7.3",
"walkdir",
"wasm-opt",
]
@@ -9454,6 +9495,17 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "syn"
+version = "2.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
[[package]]
name = "synstructure"
version = "0.12.6"
@@ -9462,7 +9514,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
"unicode-xid",
]
@@ -9545,7 +9597,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -9574,12 +9626,11 @@ dependencies = [
[[package]]
name = "tikv-jemalloc-sys"
-version = "0.5.2+5.3.0-patched"
+version = "0.5.3+5.3.0-patched"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3"
+checksum = "a678df20055b43e57ef8cddde41cdfda9a3c1a060b67f4c5836dfb1d78543ba8"
dependencies = [
"cc",
- "fs_extra",
"libc",
]
@@ -9676,14 +9727,13 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
-version = "1.24.2"
+version = "1.28.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb"
+checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
dependencies = [
"autocfg",
"bytes",
"libc",
- "memchr",
"mio",
"num_cpus",
"parking_lot 0.12.1",
@@ -9691,18 +9741,18 @@ dependencies = [
"signal-hook-registry",
"socket2",
"tokio-macros",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "tokio-macros"
-version = "1.8.2"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
@@ -9752,6 +9802,40 @@ dependencies = [
"serde",
]
+[[package]]
+name = "toml"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
[[package]]
name = "tower"
version = "0.4.13"
@@ -9814,7 +9898,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
]
[[package]]
@@ -10110,6 +10194,12 @@ dependencies = [
"percent-encoding",
]
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
[[package]]
name = "uuid"
version = "1.2.2"
@@ -10218,7 +10308,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
"wasm-bindgen-shared",
]
@@ -10252,7 +10342,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -10355,7 +10445,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7"
dependencies = [
"downcast-rs",
- "libm",
+ "libm 0.2.6",
"memory_units",
"num-rational",
"num-traits",
@@ -10374,9 +10464,9 @@ dependencies = [
[[package]]
name = "wasmtime"
-version = "6.0.1"
+version = "6.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6e89f9819523447330ffd70367ef4a18d8c832e24e8150fe054d1d912841632"
+checksum = "76a222f5fa1e14b2cefc286f1b68494d7a965f4bf57ec04c59bb62673d639af6"
dependencies = [
"anyhow",
"bincode",
@@ -10402,18 +10492,18 @@ dependencies = [
[[package]]
name = "wasmtime-asm-macros"
-version = "6.0.1"
+version = "6.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bd3a5e46c198032da934469f3a6e48649d1f9142438e4fd4617b68a35644b8a"
+checksum = "4407a7246e7d2f3d8fb1cf0c72fda8dbafdb6dd34d555ae8bea0e5ae031089cc"
dependencies = [
"cfg-if",
]
[[package]]
name = "wasmtime-cache"
-version = "6.0.1"
+version = "6.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b389ae9b678b9c3851091a4804f4182d688d27aff7abc9aa37fa7be37d8ecffa"
+checksum = "5ceb3adf61d654be0be67fffdce42447b0880481348785be5fe40b5dd7663a4c"
dependencies = [
"anyhow",
"base64 0.13.1",
@@ -10421,19 +10511,19 @@ dependencies = [
"directories-next",
"file-per-thread-logger",
"log",
- "rustix 0.36.7",
+ "rustix 0.36.13",
"serde",
"sha2 0.10.6",
- "toml",
+ "toml 0.5.11",
"windows-sys 0.42.0",
- "zstd",
+ "zstd 0.11.2+zstd.1.5.2",
]
[[package]]
name = "wasmtime-cranelift"
-version = "6.0.1"
+version = "6.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b2c92a08c0db6efffd88fdc97d7aa9c7c63b03edb0971dbca745469f820e8c"
+checksum = "3c366bb8647e01fd08cb5589976284b00abfded5529b33d7e7f3f086c68304a4"
dependencies = [
"anyhow",
"cranelift-codegen",
@@ -10452,9 +10542,9 @@ dependencies = [
[[package]]
name = "wasmtime-environ"
-version = "6.0.1"
+version = "6.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a6db9fc52985ba06ca601f2ff0ff1f526c5d724c7ac267b47326304b0c97883"
+checksum = "47b8b50962eae38ee319f7b24900b7cf371f03eebdc17400c1dc8575fc10c9a7"
dependencies = [
"anyhow",
"cranelift-entity",
@@ -10471,9 +10561,9 @@ dependencies = [
[[package]]
name = "wasmtime-jit"
-version = "6.0.1"
+version = "6.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b77e3a52cd84d0f7f18554afa8060cfe564ccac61e3b0802d3fd4084772fa5f6"
+checksum = "ffaed4f9a234ba5225d8e64eac7b4a5d13b994aeb37353cde2cbeb3febda9eaa"
dependencies = [
"addr2line 0.17.0",
"anyhow",
@@ -10495,20 +10585,20 @@ dependencies = [
[[package]]
name = "wasmtime-jit-debug"
-version = "6.0.1"
+version = "6.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0245e8a9347017c7185a72e215218a802ff561545c242953c11ba00fccc930f"
+checksum = "eed41cbcbf74ce3ff6f1d07d1b707888166dc408d1a880f651268f4f7c9194b2"
dependencies = [
"object 0.29.0",
"once_cell",
- "rustix 0.36.7",
+ "rustix 0.36.13",
]
[[package]]
name = "wasmtime-jit-icache-coherence"
-version = "6.0.1"
+version = "6.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67d412e9340ab1c83867051d8d1d7c90aa8c9afc91da086088068e2734e25064"
+checksum = "43a28ae1e648461bfdbb79db3efdaee1bca5b940872e4175390f465593a2e54c"
dependencies = [
"cfg-if",
"libc",
@@ -10517,9 +10607,9 @@ dependencies = [
[[package]]
name = "wasmtime-runtime"
-version = "6.0.1"
+version = "6.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d594e791b5fdd4dbaf8cf7ae62f2e4ff85018ce90f483ca6f42947688e48827d"
+checksum = "e704b126e4252788ccfc3526d4d4511d4b23c521bf123e447ac726c14545217b"
dependencies = [
"anyhow",
"cc",
@@ -10532,7 +10622,7 @@ dependencies = [
"memoffset 0.6.5",
"paste",
"rand 0.8.5",
- "rustix 0.36.7",
+ "rustix 0.36.13",
"wasmtime-asm-macros",
"wasmtime-environ",
"wasmtime-jit-debug",
@@ -10541,9 +10631,9 @@ dependencies = [
[[package]]
name = "wasmtime-types"
-version = "6.0.1"
+version = "6.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6688d6f96d4dbc1f89fab626c56c1778936d122b5f4ae7a57c2eb42b8d982e2"
+checksum = "83e5572c5727c1ee7e8f28717aaa8400e4d22dcbd714ea5457d85b5005206568"
dependencies = [
"cranelift-entity",
"serde",
@@ -10661,7 +10751,7 @@ dependencies = [
"ccm",
"curve25519-dalek 3.2.0",
"der-parser 8.1.0",
- "elliptic-curve",
+ "elliptic-curve 0.12.3",
"hkdf",
"hmac 0.10.1",
"log",
@@ -10673,7 +10763,7 @@ dependencies = [
"rcgen 0.9.3",
"ring",
"rustls 0.19.1",
- "sec1",
+ "sec1 0.3.0",
"serde",
"sha-1",
"sha2 0.9.9",
@@ -10802,15 +10892,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "wepoll-ffi"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "which"
version = "4.4.0"
@@ -10822,12 +10903,6 @@ dependencies = [
"once_cell",
]
-[[package]]
-name = "whoami"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68"
-
[[package]]
name = "wide"
version = "0.7.8"
@@ -10903,13 +10978,37 @@ dependencies = [
"windows_x86_64_msvc 0.42.1",
]
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.1",
+]
+
[[package]]
name = "windows-sys"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
- "windows-targets",
+ "windows-targets 0.48.0",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.1",
+ "windows_aarch64_msvc 0.42.1",
+ "windows_i686_gnu 0.42.1",
+ "windows_i686_msvc 0.42.1",
+ "windows_x86_64_gnu 0.42.1",
+ "windows_x86_64_gnullvm 0.42.1",
+ "windows_x86_64_msvc 0.42.1",
]
[[package]]
@@ -11041,6 +11140,15 @@ version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+[[package]]
+name = "winnow"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "winreg"
version = "0.10.1"
@@ -11158,7 +11266,7 @@ checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.107",
"synstructure",
]
@@ -11168,7 +11276,16 @@ version = "0.11.2+zstd.1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
dependencies = [
- "zstd-safe",
+ "zstd-safe 5.0.2+zstd.1.5.2",
+]
+
+[[package]]
+name = "zstd"
+version = "0.12.3+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806"
+dependencies = [
+ "zstd-safe 6.0.5+zstd.1.5.4",
]
[[package]]
@@ -11181,11 +11298,21 @@ dependencies = [
"zstd-sys",
]
+[[package]]
+name = "zstd-safe"
+version = "6.0.5+zstd.1.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b"
+dependencies = [
+ "libc",
+ "zstd-sys",
+]
+
[[package]]
name = "zstd-sys"
-version = "2.0.5+zstd.1.5.2"
+version = "2.0.8+zstd.1.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596"
+checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
dependencies = [
"cc",
"libc",
diff --git a/Cargo.toml b/Cargo.toml
index b534664..8ac7d45 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,31 +39,38 @@ edition = "2021"
repository = "https://github.com/paritytech/frontier/"
[workspace.dependencies]
+async-trait = "0.1"
bn = { package = "substrate-bn", version = "0.6", default-features = false }
+clap = { version = "4.3", features = ["derive", "deprecated"] }
environmental = { version = "1.1.4", default-features = false }
ethereum = { version = "0.14.0", default-features = false }
ethereum-types = { version = "0.14.1", default-features = false }
-evm = { git = "https://github.com/rust-blockchain/evm", branch = "master", default-features = false }
-hex-literal = { version = "0.3.4" }
+evm = { git = "https://github.com/rust-blockchain/evm", rev = "b7b82c7e1fc57b7449d6dfa6826600de37cc1e65", default-features = false }
+futures = "0.3.28"
+hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
+hex-literal = "0.4.1"
impl-serde = { version = "0.4.0", default-features = false }
jsonrpsee = "0.16.2"
-kvdb-rocksdb = "0.17.0"
+kvdb-rocksdb = "0.18.0"
libsecp256k1 = { version = "0.7.1", default-features = false }
log = { version = "0.4.17", default-features = false }
-parity-db = "0.4.6"
+parity-db = "0.4.8"
+parking_lot = "0.12.1"
rlp = { version = "0.5", default-features = false }
scale-codec = { package = "parity-scale-codec", version = "3.2.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
-sqlx = "0.7.0-alpha.3"
+sqlx = { version = "0.7.0-alpha.3", default-features = false, features = ["macros"] }
+thiserror = "1.0"
+tokio = "1.28.2"
# Substrate Client
sc-basic-authorship = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
sc-block-builder = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
sc-chain-spec = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
sc-cli = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sc-client-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-client-db = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-client-db = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sc-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus-aura = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus-grandpa = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -127,11 +134,11 @@ substrate-frame-rpc-system = { version = "4.0.0-dev", git = "https://github.com/
substrate-test-runtime-client = { version = "2.0.0", git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-wasm-builder = { version = "5.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
# Frontier Client
-fc-cli = { version = "1.0.0-dev", path = "client/cli" }
+fc-cli = { version = "1.0.0-dev", path = "client/cli", default-features = false }
fc-consensus = { version = "2.0.0-dev", path = "client/consensus" }
-fc-db = { version = "2.0.0-dev", path = "client/db" }
-fc-mapping-sync = { version = "2.0.0-dev", path = "client/mapping-sync" }
-fc-rpc = { version = "2.0.0-dev", path = "client/rpc" }
+fc-db = { version = "2.0.0-dev", path = "client/db", default-features = false }
+fc-mapping-sync = { version = "2.0.0-dev", path = "client/mapping-sync", default-features = false }
+fc-rpc = { version = "2.0.0-dev", path = "client/rpc", default-features = false }
fc-rpc-core = { version = "1.1.0-dev", path = "client/rpc-core" }
fc-storage = { version = "1.0.0-dev", path = "client/storage" }
# Frontier Primitive
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 69ea420..4c2ec2b 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -11,7 +11,7 @@ repository = { workspace = true }
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-clap = { version = "4.1", features = ["derive", "deprecated"] }
+clap = { workspace = true }
ethereum-types = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
@@ -26,7 +26,7 @@ fp-rpc = { workspace = true, features = ["default"] }
fp-storage = { workspace = true, features = ["default"] }
[dev-dependencies]
-futures = "0.3.21"
+futures = { workspace = true }
scale-codec = { package = "parity-scale-codec", workspace = true }
tempfile = "3.3.0"
# Substrate
@@ -38,3 +38,10 @@ substrate-test-runtime-client = { workspace = true }
# Frontier
fc-db = { workspace = true, features = ["rocksdb"] }
frontier-template-runtime = { workspace = true, features = ["default"] }
+
+[features]
+default = ["rocksdb"]
+rocksdb = [
+ "sc-cli/rocksdb",
+ "fc-db/rocksdb",
+]
diff --git a/client/consensus/Cargo.toml b/client/consensus/Cargo.toml
index 242a442..c00b40a 100644
--- a/client/consensus/Cargo.toml
+++ b/client/consensus/Cargo.toml
@@ -11,8 +11,8 @@ repository = { workspace = true }
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-async-trait = "0.1"
-thiserror = "1.0"
+async-trait = { workspace = true }
+thiserror = { workspace = true }
# Substrate
sc-consensus = { workspace = true }
sp-api = { workspace = true }
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index 1f8f83b..60b4ccb 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -11,17 +11,17 @@ repository = { workspace = true }
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-async-trait = "0.1"
+async-trait = { workspace = true }
ethereum = { workspace = true, features = ["with-codec"], optional = true }
-futures = { version = "0.3.25", optional = true }
+futures = { workspace = true, optional = true }
kvdb-rocksdb = { workspace = true, optional = true }
-log = "0.4.17"
-parity-db = { workspace = true, optional = true }
-parking_lot = "0.12.1"
+log = { workspace = true }
+parity-db = { workspace = true }
+parking_lot = { workspace = true }
scale-codec = { package = "parity-scale-codec", workspace = true }
smallvec = { version = "1.10", optional = true }
sqlx = { workspace = true, features = ["runtime-tokio-native-tls", "sqlite"], optional = true }
-tokio = { version = "1.19", features = ["macros", "sync"], optional = true }
+tokio = { workspace = true, features = ["macros", "sync"], optional = true }
# Substrate
sc-client-api = { workspace = true, optional = true }
sc-client-db = { workspace = true }
@@ -37,8 +37,22 @@ fp-consensus = { workspace = true, features = ["default"], optional = true }
fp-rpc = { workspace = true, features = ["default"], optional = true }
fp-storage = { workspace = true, features = ["default"] }
+[dev-dependencies]
+futures = { workspace = true }
+maplit = "1.0.2"
+tempfile = "3.3.0"
+# Substrate
+sc-block-builder = { workspace = true }
+sp-consensus = { workspace = true }
+substrate-test-runtime-client = { workspace = true }
+
[features]
-default = ["parity-db"]
+default = ["rocksdb"]
+rocksdb = [
+ "kvdb-rocksdb",
+ "sc-client-db/rocksdb",
+ "smallvec",
+]
sql = [
"ethereum",
"futures",
@@ -51,20 +65,3 @@ sql = [
"fp-consensus",
"fp-rpc",
]
-parity-db = ["dep:parity-db"]
-rocksdb = [
- "kvdb-rocksdb",
- "sc-client-db/rocksdb",
- "smallvec",
-]
-
-[dev-dependencies]
-futures = { version = "0.3.25" }
-maplit = "1.0.2"
-tempfile = "3.3.0"
-# Substrate
-sc-block-builder = { workspace = true }
-sp-consensus = { workspace = true }
-substrate-test-runtime-client = { workspace = true }
-# Frontier
-fc-rpc = { workspace = true }
diff --git a/client/db/src/kv/mod.rs b/client/db/src/kv/mod.rs
index 92f377f..54ad5ba 100644
--- a/client/db/src/kv/mod.rs
+++ b/client/db/src/kv/mod.rs
@@ -16,7 +16,6 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-#[cfg(feature = "parity-db")]
mod parity_db_adapter;
mod upgrade;
mod utils;
@@ -114,23 +113,22 @@ impl Backend {
client,
&DatabaseSettings {
source: match database {
+ DatabaseSource::Auto { .. } => DatabaseSource::Auto {
+ rocksdb_path: frontier_database_dir(db_config_dir, "db"),
+ paritydb_path: frontier_database_dir(db_config_dir, "paritydb"),
+ cache_size: 0,
+ },
#[cfg(feature = "rocksdb")]
DatabaseSource::RocksDb { .. } => DatabaseSource::RocksDb {
path: frontier_database_dir(db_config_dir, "db"),
cache_size: 0,
},
- #[cfg(feature = "parity-db")]
DatabaseSource::ParityDb { .. } => DatabaseSource::ParityDb {
path: frontier_database_dir(db_config_dir, "paritydb"),
},
- DatabaseSource::Auto { .. } => DatabaseSource::Auto {
- rocksdb_path: frontier_database_dir(db_config_dir, "db"),
- paritydb_path: frontier_database_dir(db_config_dir, "paritydb"),
- cache_size: 0,
- },
_ => {
return Err(
- "Supported db sources: `rocksdb` | `paritydb` | `auto`".to_string()
+ "Supported db sources: `auto` | `rocksdb` | `paritydb`".to_string()
)
}
},
diff --git a/client/db/src/kv/upgrade.rs b/client/db/src/kv/upgrade.rs
index 6243f53..c57e47d 100644
--- a/client/db/src/kv/upgrade.rs
+++ b/client/db/src/kv/upgrade.rs
@@ -101,8 +101,9 @@ pub(crate) fn upgrade_db>(
0 => return Err(UpgradeError::UnsupportedVersion(db_version)),
1 => {
let summary: UpgradeVersion1To2Summary = match source {
- #[cfg(feature = "parity-db")]
- DatabaseSource::ParityDb { .. } => migrate_1_to_2_parity_db::(client, db_path)?,
+ DatabaseSource::ParityDb { .. } => {
+ migrate_1_to_2_parity_db::(client, db_path)?
+ }
#[cfg(feature = "rocksdb")]
DatabaseSource::RocksDb { .. } => migrate_1_to_2_rocks_db::(client, db_path)?,
_ => panic!("DatabaseSource required for upgrade ParityDb | RocksDb"),
@@ -245,7 +246,6 @@ pub(crate) fn migrate_1_to_2_rocks_db>(
Ok(res)
}
-#[cfg(feature = "parity-db")]
pub(crate) fn migrate_1_to_2_parity_db>(
client: Arc,
db_path: &Path,
@@ -353,7 +353,7 @@ mod tests {
Ok(Arc::new(crate::kv::Backend::::new(client, setting)?))
}
- #[cfg_attr(not(any(feature = "rocksdb", feature = "parity-db")), ignore)]
+ #[cfg_attr(not(feature = "rocksdb"), ignore)]
#[test]
fn upgrade_1_to_2_works() {
let settings: Vec = vec![
@@ -369,7 +369,6 @@ mod tests {
},
},
// Parity db
- #[cfg(feature = "parity-db")]
crate::kv::DatabaseSettings {
source: sc_client_db::DatabaseSource::ParityDb {
path: tempdir()
diff --git a/client/db/src/kv/utils.rs b/client/db/src/kv/utils.rs
index ff241b9..d3e842d 100644
--- a/client/db/src/kv/utils.rs
+++ b/client/db/src/kv/utils.rs
@@ -29,12 +29,6 @@ pub fn open_database>(
config: &DatabaseSettings,
) -> Result>, String> {
let db: Arc> = match &config.source {
- #[cfg(feature = "parity-db")]
- DatabaseSource::ParityDb { path } => open_parity_db::(client, path, &config.source)?,
- #[cfg(feature = "rocksdb")]
- DatabaseSource::RocksDb { path, .. } => {
- open_kvdb_rocksdb::(client, path, true, &config.source)?
- }
DatabaseSource::Auto {
paritydb_path,
rocksdb_path,
@@ -46,7 +40,14 @@ pub fn open_database>(
Err(_) => open_parity_db::(client, paritydb_path, &config.source)?,
}
}
- _ => return Err("Missing feature flags `parity-db`".to_string()),
+ #[cfg(feature = "rocksdb")]
+ DatabaseSource::RocksDb { path, .. } => {
+ open_kvdb_rocksdb::(client, path, true, &config.source)?
+ }
+ DatabaseSource::ParityDb { path } => {
+ open_parity_db::(client, path, &config.source)?
+ }
+ _ => return Err("Supported db sources: `auto` | `rocksdb` | `paritydb`".to_string()),
};
Ok(db)
}
@@ -82,10 +83,9 @@ fn open_kvdb_rocksdb>(
_create: bool,
_source: &DatabaseSource,
) -> Result>, String> {
- Err("Missing feature flags `kvdb-rocksdb`".to_string())
+ Err("Missing feature flags `rocksdb`".to_string())
}
-#[cfg(feature = "parity-db")]
fn open_parity_db>(
client: Arc,
path: &Path,
@@ -106,12 +106,3 @@ fn open_parity_db>(
super::upgrade::update_version(path).map_err(|_| "Cannot update db version".to_string())?;
Ok(Arc::new(super::parity_db_adapter::DbAdapter(db)))
}
-
-#[cfg(not(feature = "parity-db"))]
-fn open_parity_db>(
- _client: Arc,
- _path: &Path,
- _source: &DatabaseSource,
-) -> Result>, String> {
- Err("Missing feature flags `parity-db`".to_string())
-}
diff --git a/client/db/src/sql/mod.rs b/client/db/src/sql/mod.rs
index c81df93..6a29a67 100644
--- a/client/db/src/sql/mod.rs
+++ b/client/db/src/sql/mod.rs
@@ -303,8 +303,8 @@ where
}
None => {
return Err(Error::Protocol(format!(
- "Missing ethereum block for hash mismatch {expect_eth_block_hash:?}"
- )))
+ "Missing ethereum block for hash mismatch {expect_eth_block_hash:?}"
+ )))
}
}
}
@@ -341,24 +341,17 @@ where
is_canon,
})
}
- Err(FindLogError::NotFound) => {
- return Err(Error::Protocol(format!(
- "[Metadata] No logs found for hash {:?}",
- hash
- )))
- }
- Err(FindLogError::MultipleLogs) => {
- return Err(Error::Protocol(format!(
- "[Metadata] Multiple logs found for hash {:?}",
- hash
- )))
- }
+ Err(FindLogError::NotFound) => Err(Error::Protocol(format!(
+ "[Metadata] No logs found for hash {hash:?}",
+ ))),
+ Err(FindLogError::MultipleLogs) => Err(Error::Protocol(format!(
+ "[Metadata] Multiple logs found for hash {hash:?}",
+ ))),
}
} else {
- return Err(Error::Protocol(format!(
- "[Metadata] Failed retrieving header for hash {:?}",
- hash
- )));
+ Err(Error::Protocol(format!(
+ "[Metadata] Failed retrieving header for hash {hash:?}"
+ )))
}
}
@@ -1053,7 +1046,7 @@ mod test {
DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt,
};
// Frontier
- use fc_rpc::{OverrideHandle, SchemaV3Override, StorageOverride};
+ use fc_storage::{OverrideHandle, SchemaV3Override, StorageOverride};
use fp_storage::{EthereumStorageSchema, PALLET_ETHEREUM_SCHEMA};
type OpaqueBlock =
diff --git a/client/mapping-sync/Cargo.toml b/client/mapping-sync/Cargo.toml
index 35000a1..f999a11 100644
--- a/client/mapping-sync/Cargo.toml
+++ b/client/mapping-sync/Cargo.toml
@@ -11,11 +11,11 @@ repository = { workspace = true }
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-futures = "0.3.25"
+futures = { workspace = true }
futures-timer = "3.0.2"
-log = "0.4.17"
-parking_lot = "0.12.1"
-tokio = { version = "1.19", features = ["macros", "sync"], optional = true }
+log = { workspace = true }
+parking_lot = { workspace = true }
+tokio = { workspace = true, features = ["macros", "sync"], optional = true }
# Substrate
sc-client-api = { workspace = true }
sc-utils = { workspace = true }
@@ -25,34 +25,35 @@ sp-consensus = { workspace = true, features = ["default"] }
sp-core = { workspace = true, optional = true }
sp-runtime = { workspace = true }
# Frontier
-fc-db = { workspace = true }
+fc-db = { workspace = true, default-features = false }
fc-storage = { workspace = true }
fp-consensus = { workspace = true, features = ["default"] }
fp-rpc = { workspace = true, features = ["default"] }
-[features]
-sql = [
- "tokio",
- "sp-core",
- "fc-db/sql",
-]
-
[dev-dependencies]
ethereum = { workspace = true }
ethereum-types = { workspace = true }
scale-codec = { package = "parity-scale-codec", workspace = true }
sqlx = { workspace = true, features = ["runtime-tokio-native-tls", "sqlite"] }
tempfile = "3.3.0"
-tokio = { version = "1.24", features = ["sync"] }
+tokio = { workspace = true, features = ["sync"] }
# Substrate
sc-block-builder = { workspace = true }
-sc-client-db = { workspace = true }
+sc-client-db = { workspace = true, features = ["rocksdb"] }
sp-consensus = { workspace = true }
sp-core = { workspace = true, features = ["default"] }
sp-io = { workspace = true }
substrate-test-runtime-client = { workspace = true }
# Frontier
-fc-rpc = { workspace = true }
fp-consensus = { workspace = true, features = ["default"] }
fp-storage = { workspace = true, features = ["default"] }
frontier-template-runtime = { workspace = true, features = ["default"] }
+
+[features]
+default = ["rocksdb"]
+rocksdb = ["fc-db/rocksdb"]
+sql = [
+ "tokio",
+ "sp-core",
+ "fc-db/sql",
+]
diff --git a/client/mapping-sync/src/sql/mod.rs b/client/mapping-sync/src/sql/mod.rs
index 343229f..f4fd2e7 100644
--- a/client/mapping-sync/src/sql/mod.rs
+++ b/client/mapping-sync/src/sql/mod.rs
@@ -495,7 +495,7 @@ mod test {
prelude::*, DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt,
};
// Frontier
- use fc_rpc::{OverrideHandle, SchemaV3Override, StorageOverride};
+ use fc_storage::{OverrideHandle, SchemaV3Override, StorageOverride};
use fp_storage::{
EthereumStorageSchema, ETHEREUM_CURRENT_RECEIPTS, PALLET_ETHEREUM, PALLET_ETHEREUM_SCHEMA,
};
diff --git a/client/rpc-core/src/types/block_number.rs b/client/rpc-core/src/types/block_number.rs
index d566847..2995625 100644
--- a/client/rpc-core/src/types/block_number.rs
+++ b/client/rpc-core/src/types/block_number.rs
@@ -25,7 +25,7 @@ use serde::{
};
/// Represents rpc api block number param.
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Default, Hash)]
pub enum BlockNumber {
/// Hash
Hash {
@@ -37,6 +37,7 @@ pub enum BlockNumber {
/// Number
Num(u64),
/// Latest block
+ #[default]
Latest,
/// Earliest block (genesis)
Earliest,
@@ -50,12 +51,6 @@ pub enum BlockNumber {
Finalized,
}
-impl Default for BlockNumber {
- fn default() -> Self {
- BlockNumber::Latest
- }
-}
-
impl<'a> Deserialize<'a> for BlockNumber {
fn deserialize(deserializer: D) -> Result
where
diff --git a/client/rpc-core/src/types/pubsub.rs b/client/rpc-core/src/types/pubsub.rs
index ba2940b..b19590c 100644
--- a/client/rpc-core/src/types/pubsub.rs
+++ b/client/rpc-core/src/types/pubsub.rs
@@ -84,20 +84,15 @@ pub enum Kind {
}
/// Subscription kind.
-#[derive(Clone, Debug, Eq, PartialEq, Hash)]
+#[derive(Clone, Debug, Eq, PartialEq, Default, Hash)]
pub enum Params {
/// No parameters passed.
+ #[default]
None,
/// Log parameters.
Logs(Filter),
}
-impl Default for Params {
- fn default() -> Self {
- Params::None
- }
-}
-
impl<'a> Deserialize<'a> for Params {
fn deserialize(deserializer: D) -> ::std::result::Result
where
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index 000f065..e0b83bc 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -14,8 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"]
ethereum = { workspace = true, features = ["with-codec"] }
ethereum-types = { workspace = true }
evm = { workspace = true }
-futures = "0.3.25"
-hex = "0.4.3"
+futures = { workspace = true }
+hex = { workspace = true }
jsonrpsee = { workspace = true, features = ["server", "macros"] }
libsecp256k1 = { workspace = true }
log = "0.4.17"
@@ -25,7 +25,7 @@ rand = "0.8"
rlp = { workspace = true }
scale-codec = { package = "parity-scale-codec", workspace = true }
serde = { workspace = true }
-tokio = { version = "1.24", features = ["sync"] }
+tokio = { workspace = true, features = ["sync"] }
# Substrate
prometheus-endpoint = { workspace = true }
@@ -67,4 +67,10 @@ sp-consensus = { workspace = true }
substrate-test-runtime-client = { workspace = true }
[features]
+default = ["rocksdb"]
+rocksdb = [
+ "sc-service/rocksdb",
+ "fc-db/rocksdb",
+ "fc-mapping-sync/rocksdb",
+]
rpc-binary-search-estimate = []
diff --git a/client/rpc/src/eth/cache/mod.rs b/client/rpc/src/eth/cache/mod.rs
index 42e163d..a3aba18 100644
--- a/client/rpc/src/eth/cache/mod.rs
+++ b/client/rpc/src/eth/cache/mod.rs
@@ -325,7 +325,6 @@ where
let reward_percentiles: Vec = {
let mut percentile: f64 = 0.0;
(0..201)
- .into_iter()
.map(|_| {
let val = percentile;
percentile += 0.5;
@@ -364,13 +363,13 @@ where
ethereum::ReceiptV3::Legacy(d) | ethereum::ReceiptV3::EIP2930(d) | ethereum::ReceiptV3::EIP1559(d) => used_gas(d.used_gas, &mut previous_cumulative_gas),
},
effective_reward: match block.transactions.get(i) {
- Some(ðereum::TransactionV2::Legacy(ref t)) => {
+ Some(ethereum::TransactionV2::Legacy(t)) => {
t.gas_price.saturating_sub(base_fee).as_u64()
}
- Some(ðereum::TransactionV2::EIP2930(ref t)) => {
+ Some(ethereum::TransactionV2::EIP2930(t)) => {
t.gas_price.saturating_sub(base_fee).as_u64()
}
- Some(ðereum::TransactionV2::EIP1559(ref t)) => t
+ Some(ethereum::TransactionV2::EIP1559(t)) => t
.max_priority_fee_per_gas
.min(t.max_fee_per_gas.saturating_sub(base_fee))
.as_u64(),
diff --git a/client/rpc/src/txpool.rs b/client/rpc/src/txpool.rs
index ab8e7c5..e808e8e 100644
--- a/client/rpc/src/txpool.rs
+++ b/client/rpc/src/txpool.rs
@@ -30,13 +30,14 @@ use sp_blockchain::HeaderBackend;
use sp_core::hashing::keccak_256;
use sp_runtime::traits::Block as BlockT;
// Frontier
-use crate::{internal_err, public_key};
use fc_rpc_core::{
types::{Get, Summary, TransactionMap, TxPoolResult, TxPoolTransaction},
TxPoolApiServer,
};
use fp_rpc::{EthereumRuntimeRPCApi, TxPoolResponse};
+use crate::{internal_err, public_key};
+
pub struct TxPool {
client: Arc,
graph: Arc>,
diff --git a/frame/ethereum/Cargo.toml b/frame/ethereum/Cargo.toml
index 52791e1..634be10 100644
--- a/frame/ethereum/Cargo.toml
+++ b/frame/ethereum/Cargo.toml
@@ -31,7 +31,7 @@ fp-storage = { workspace = true }
pallet-evm = { workspace = true }
[dev-dependencies]
-hex = "0.4.3"
+hex = { workspace = true }
libsecp256k1 = { workspace = true, features = ["static-context", "hmac"] }
rlp = { workspace = true }
# Substrate
diff --git a/frame/ethereum/src/mock.rs b/frame/ethereum/src/mock.rs
index 237f6de..9c22e2e 100644
--- a/frame/ethereum/src/mock.rs
+++ b/frame/ethereum/src/mock.rs
@@ -95,15 +95,19 @@ parameter_types! {
}
impl pallet_balances::Config for Test {
+ type RuntimeEvent = RuntimeEvent;
+ type WeightInfo = ();
type Balance = u64;
type DustRemoval = ();
- type RuntimeEvent = RuntimeEvent;
type ExistentialDeposit = ExistentialDeposit;
type AccountStore = System;
- type WeightInfo = ();
+ type ReserveIdentifier = ();
+ type HoldIdentifier = ();
+ type FreezeIdentifier = ();
type MaxLocks = MaxLocks;
type MaxReserves = ();
- type ReserveIdentifier = ();
+ type MaxHolds = ();
+ type MaxFreezes = ();
}
parameter_types! {
diff --git a/frame/evm/Cargo.toml b/frame/evm/Cargo.toml
index b3d4ac5..e6398eb 100644
--- a/frame/evm/Cargo.toml
+++ b/frame/evm/Cargo.toml
@@ -14,8 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
environmental = { workspace = true, optional = true }
evm = { workspace = true, features = ["with-codec"] }
-hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
-hex-literal = { version = "0.3.4" }
+hex = { workspace = true }
+hex-literal = { workspace = true }
impl-trait-for-tuples = "0.2.2"
log = { workspace = true }
rlp = { workspace = true }
@@ -35,7 +35,7 @@ fp-evm = { workspace = true }
[dev-dependencies]
# Substrate
-pallet-balances = { workspace = true, features = ["default"] }
+pallet-balances = { workspace = true, features = ["default", "insecure_zero_ed"] }
pallet-evm-precompile-simple = { workspace = true, features = ["default"] }
pallet-timestamp = { workspace = true, features = ["default"] }
diff --git a/frame/evm/precompile/curve25519/Cargo.toml b/frame/evm/precompile/curve25519/Cargo.toml
index 99d98a2..0806391 100644
--- a/frame/evm/precompile/curve25519/Cargo.toml
+++ b/frame/evm/precompile/curve25519/Cargo.toml
@@ -8,7 +8,7 @@ edition = { workspace = true }
repository = { workspace = true }
[dependencies]
-curve25519-dalek = { version = "4.0.0-pre.1", default-features = false, features = ["alloc", "u64_backend"] }
+curve25519-dalek = { version = "4.0.0-rc.1", default-features = false, features = ["alloc"] }
# Frontier
fp-evm = { workspace = true }
diff --git a/frame/evm/precompile/curve25519/src/lib.rs b/frame/evm/precompile/curve25519/src/lib.rs
index 29d6214..7728e8b 100644
--- a/frame/evm/precompile/curve25519/src/lib.rs
+++ b/frame/evm/precompile/curve25519/src/lib.rs
@@ -19,6 +19,7 @@
#![deny(unused_crate_dependencies)]
extern crate alloc;
+
use alloc::vec::Vec;
use curve25519_dalek::{
ristretto::{CompressedRistretto, RistrettoPoint},
@@ -54,7 +55,7 @@ impl LinearCostPrecompile for Curve25519Add {
while !temp_buf.is_empty() {
let mut buf = [0; 32];
buf.copy_from_slice(&temp_buf[0..32]);
- let point = CompressedRistretto::from_slice(&buf);
+ let point = CompressedRistretto(buf);
points.push(point);
temp_buf = &temp_buf[32..];
}
@@ -94,7 +95,7 @@ impl LinearCostPrecompile for Curve25519ScalarMul {
// second 32 bytes is for the compressed ristretto point bytes
let mut pt_buf = [0; 32];
pt_buf.copy_from_slice(&input[32..64]);
- let point: RistrettoPoint = CompressedRistretto::from_slice(&pt_buf)
+ let point = CompressedRistretto(pt_buf)
.decompress()
.unwrap_or_else(RistrettoPoint::identity);
diff --git a/frame/evm/precompile/dispatch/Cargo.toml b/frame/evm/precompile/dispatch/Cargo.toml
index 782f3b4..06ab329 100644
--- a/frame/evm/precompile/dispatch/Cargo.toml
+++ b/frame/evm/precompile/dispatch/Cargo.toml
@@ -19,7 +19,7 @@ scale-codec = { package = "parity-scale-codec", workspace = true }
scale-info = { workspace = true }
# Substrate
frame-system = { workspace = true, features = ["default"] }
-pallet-balances = { workspace = true, features = ["default"] }
+pallet-balances = { workspace = true, features = ["default", "insecure_zero_ed"] }
pallet-timestamp = { workspace = true, features = ["default"] }
pallet-utility = { workspace = true, features = ["default"] }
sp-core = { workspace = true, features = ["default"] }
diff --git a/frame/evm/precompile/dispatch/src/mock.rs b/frame/evm/precompile/dispatch/src/mock.rs
index e08be3f..da22a34 100644
--- a/frame/evm/precompile/dispatch/src/mock.rs
+++ b/frame/evm/precompile/dispatch/src/mock.rs
@@ -96,15 +96,19 @@ parameter_types! {
pub const ExistentialDeposit: u64 = 0;
}
impl pallet_balances::Config for Test {
+ type RuntimeEvent = RuntimeEvent;
+ type WeightInfo = ();
type Balance = u64;
type DustRemoval = ();
- type RuntimeEvent = RuntimeEvent;
type ExistentialDeposit = ExistentialDeposit;
type AccountStore = System;
- type WeightInfo = ();
+ type ReserveIdentifier = ();
+ type HoldIdentifier = ();
+ type FreezeIdentifier = ();
type MaxLocks = ();
type MaxReserves = ();
- type ReserveIdentifier = ();
+ type MaxHolds = ();
+ type MaxFreezes = ();
}
parameter_types! {
diff --git a/frame/evm/precompile/modexp/Cargo.toml b/frame/evm/precompile/modexp/Cargo.toml
index 3930fe6..6533dae 100644
--- a/frame/evm/precompile/modexp/Cargo.toml
+++ b/frame/evm/precompile/modexp/Cargo.toml
@@ -13,7 +13,7 @@ num = { version = "0.4", default-features = false, features = ["alloc"] }
fp-evm = { workspace = true }
[dev-dependencies]
-hex = "0.4.3"
+hex = { workspace = true }
# Frontier
pallet-evm-test-vector-support = { workspace = true }
diff --git a/frame/evm/src/lib.rs b/frame/evm/src/lib.rs
index b96eaca..c3ef124 100644
--- a/frame/evm/src/lib.rs
+++ b/frame/evm/src/lib.rs
@@ -52,7 +52,6 @@
// Ensure we're `no_std` when compiling for Wasm.
#![cfg_attr(not(feature = "std"), no_std)]
-#![cfg_attr(test, feature(assert_matches))]
#![cfg_attr(feature = "runtime-benchmarks", deny(unused_crate_dependencies))]
#![allow(clippy::too_many_arguments)]
@@ -66,27 +65,33 @@ pub mod runner;
mod tests;
pub mod weights;
+pub use evm::{
+ Config as EvmConfig, Context, ExitError, ExitFatal, ExitReason, ExitRevert, ExitSucceed,
+};
+use impl_trait_for_tuples::impl_for_tuples;
+use scale_info::TypeInfo;
+// Substrate
use frame_support::{
dispatch::{DispatchResultWithPostInfo, MaxEncodedLen, Pays, PostDispatchInfo},
traits::{
- tokens::fungible::Inspect, Currency, ExistenceRequirement, FindAuthor, Get, Imbalance,
- OnUnbalanced, SignedImbalance, Time, WithdrawReasons,
+ tokens::{
+ currency::Currency,
+ fungible::Inspect,
+ imbalance::{Imbalance, OnUnbalanced, SignedImbalance},
+ ExistenceRequirement, Fortitude, Preservation, WithdrawReasons,
+ },
+ FindAuthor, Get, Time,
},
weights::Weight,
};
use frame_system::RawOrigin;
-use impl_trait_for_tuples::impl_for_tuples;
-use scale_info::TypeInfo;
use sp_core::{Decode, Encode, Hasher, H160, H256, U256};
use sp_runtime::{
traits::{BadOrigin, Saturating, UniqueSaturatedInto, Zero},
AccountId32, DispatchErrorWithPostInfo,
};
use sp_std::{cmp::min, vec::Vec};
-
-pub use evm::{
- Config as EvmConfig, Context, ExitError, ExitFatal, ExitReason, ExitRevert, ExitSucceed,
-};
+// Frontier
use fp_account::AccountId20;
#[cfg(feature = "std")]
use fp_evm::GenesisAccount;
@@ -847,7 +852,8 @@ impl Pallet {
let nonce = frame_system::Pallet::::account_nonce(&account_id);
// keepalive `true` takes into account ExistentialDeposit as part of what's considered liquid balance.
- let balance = T::Currency::reducible_balance(&account_id, true);
+ let balance =
+ T::Currency::reducible_balance(&account_id, Preservation::Preserve, Fortitude::Polite);
(
Account {
diff --git a/frame/evm/src/mock.rs b/frame/evm/src/mock.rs
index 88d050a..c1e48f1 100644
--- a/frame/evm/src/mock.rs
+++ b/frame/evm/src/mock.rs
@@ -87,15 +87,19 @@ parameter_types! {
pub const ExistentialDeposit: u64 = 0;
}
impl pallet_balances::Config for Test {
+ type RuntimeEvent = RuntimeEvent;
+ type WeightInfo = ();
type Balance = u64;
type DustRemoval = ();
- type RuntimeEvent = RuntimeEvent;
type ExistentialDeposit = ExistentialDeposit;
type AccountStore = System;
- type WeightInfo = ();
+ type ReserveIdentifier = ();
+ type HoldIdentifier = ();
+ type FreezeIdentifier = ();
type MaxLocks = ();
type MaxReserves = ();
- type ReserveIdentifier = ();
+ type MaxHolds = ();
+ type MaxFreezes = ();
}
parameter_types! {
diff --git a/frame/evm/src/runner/stack.rs b/frame/evm/src/runner/stack.rs
index 0ac8caf..071b569 100644
--- a/frame/evm/src/runner/stack.rs
+++ b/frame/evm/src/runner/stack.rs
@@ -17,24 +17,20 @@
//! EVM stack-based runner.
-use crate::{
- runner::Runner as RunnerT, AccountCodes, AccountCodesMetadata, AccountStorages, AddressMapping,
- BalanceOf, BlockHashMapping, Config, Error, Event, FeeCalculator, OnChargeEVMTransaction,
- OnCreate, Pallet, RunnerError, Weight,
-};
use evm::{
backend::Backend as BackendT,
executor::stack::{Accessed, StackExecutor, StackState as StackStateT, StackSubstateMetadata},
gasometer::{GasCost, StorageTarget},
ExitError, ExitReason, Opcode, Transfer,
};
-use fp_evm::{
- AccessedStorage, CallInfo, CreateInfo, ExecutionInfoV2, IsPrecompileResult, Log, PrecompileSet,
- Vicinity, WeightInfo, ACCOUNT_BASIC_PROOF_SIZE, ACCOUNT_CODES_METADATA_PROOF_SIZE,
- ACCOUNT_STORAGE_PROOF_SIZE, IS_EMPTY_CHECK_PROOF_SIZE, WRITE_PROOF_SIZE,
+// Substrate
+use frame_support::{
+ traits::{
+ tokens::{currency::Currency, ExistenceRequirement},
+ Get, Time,
+ },
+ weights::Weight,
};
-
-use frame_support::traits::{Currency, ExistenceRequirement, Get, Time};
use sp_core::{H160, H256, U256};
use sp_runtime::traits::UniqueSaturatedInto;
use sp_std::{
@@ -44,6 +40,18 @@ use sp_std::{
mem,
vec::Vec,
};
+// Frontier
+use fp_evm::{
+ AccessedStorage, CallInfo, CreateInfo, ExecutionInfoV2, IsPrecompileResult, Log, PrecompileSet,
+ Vicinity, WeightInfo, ACCOUNT_BASIC_PROOF_SIZE, ACCOUNT_CODES_METADATA_PROOF_SIZE,
+ ACCOUNT_STORAGE_PROOF_SIZE, IS_EMPTY_CHECK_PROOF_SIZE, WRITE_PROOF_SIZE,
+};
+
+use crate::{
+ runner::Runner as RunnerT, AccountCodes, AccountCodesMetadata, AccountStorages, AddressMapping,
+ BalanceOf, BlockHashMapping, Config, Error, Event, FeeCalculator, OnChargeEVMTransaction,
+ OnCreate, Pallet, RunnerError,
+};
#[cfg(feature = "forbid-evm-reentrancy")]
environmental::thread_local_impl!(static IN_EVM: environmental::RefCell = environmental::RefCell::new(false));
@@ -657,7 +665,7 @@ impl<'config> SubstrateStackSubstate<'config> {
#[derive(Default, Clone, Eq, PartialEq)]
pub struct Recorded {
- account_codes: sp_std::vec::Vec,
+ account_codes: Vec,
account_storages: BTreeMap<(H160, H256), bool>,
}
@@ -717,10 +725,6 @@ where
self.vicinity.origin
}
- fn block_randomness(&self) -> Option {
- None
- }
-
fn block_hash(&self, number: U256) -> H256 {
if number > U256::from(u32::MAX) {
H256::default()
@@ -747,10 +751,19 @@ where
U256::zero()
}
+ fn block_randomness(&self) -> Option {
+ None
+ }
+
fn block_gas_limit(&self) -> U256 {
T::BlockGasLimit::get()
}
+ fn block_base_fee_per_gas(&self) -> U256 {
+ let (base_fee, _) = T::FeeCalculator::min_gas_price();
+ base_fee
+ }
+
fn chain_id(&self) -> U256 {
U256::from(T::ChainId::get())
}
@@ -784,11 +797,6 @@ where
.unwrap_or_else(|| self.storage(address, index)),
)
}
-
- fn block_base_fee_per_gas(&self) -> sp_core::U256 {
- let (base_fee, _) = T::FeeCalculator::min_gas_price();
- base_fee
- }
}
impl<'vicinity, 'config, T: Config> StackStateT<'config>
@@ -1195,9 +1203,25 @@ where
#[cfg(test)]
mod tests {
use super::*;
- use crate::mock::Test;
+ use crate::mock::{MockPrecompileSet, Test};
use evm::ExitSucceed;
- use std::assert_matches::assert_matches;
+
+ macro_rules! assert_matches {
+ ( $left:expr, $(|)? $( $pattern:pat_param )|+ $( if $guard: expr )? $(,)? ) => {
+ match $left {
+ $( $pattern )|+ $( if $guard )? => {}
+ ref left_val => panic!("assertion failed: `{:?}` does not match `{}`",
+ left_val, stringify!($($pattern)|+ $(if $guard)?))
+ }
+ };
+ ( $left:expr, $(|)? $( $pattern:pat_param )|+ $( if $guard: expr )?, $($arg:tt)+ ) => {
+ match $left {
+ $( $pattern )|+ $( if $guard )? => {}
+ ref left_val => panic!("assertion failed: `{:?}` does not match `{}`",
+ left_val, stringify!($($pattern)|+ $(if $guard)?))
+ }
+ };
+ }
#[test]
fn test_evm_reentrancy() {
@@ -1211,7 +1235,7 @@ mod tests {
None,
None,
&config,
- &(),
+ &MockPrecompileSet,
false,
|_| {
let res = Runner::::execute(
@@ -1221,7 +1245,7 @@ mod tests {
None,
None,
&config,
- &(),
+ &MockPrecompileSet,
false,
|_| (ExitReason::Succeed(ExitSucceed::Stopped), ()),
);
@@ -1251,7 +1275,7 @@ mod tests {
None,
None,
&config,
- &(),
+ &MockPrecompileSet,
false,
|_| (ExitReason::Succeed(ExitSucceed::Stopped), ()),
);
diff --git a/frame/evm/test-vector-support/Cargo.toml b/frame/evm/test-vector-support/Cargo.toml
index bfa8574..479dfb2 100644
--- a/frame/evm/test-vector-support/Cargo.toml
+++ b/frame/evm/test-vector-support/Cargo.toml
@@ -9,7 +9,7 @@ repository = { workspace = true }
[dependencies]
evm = { workspace = true, features = ["with-codec"] }
-hex = "0.4.3"
+hex = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
# Substrate
diff --git a/primitives/account/Cargo.toml b/primitives/account/Cargo.toml
index 0a6f7a0..13c33d5 100644
--- a/primitives/account/Cargo.toml
+++ b/primitives/account/Cargo.toml
@@ -8,7 +8,7 @@ edition = { workspace = true }
repository = { workspace = true }
[dependencies]
-hex = { version = "0.4.3", default-features = false }
+hex = { workspace = true }
impl-serde = { workspace = true, optional = true }
libsecp256k1 = { workspace = true }
log = { workspace = true }
diff --git a/primitives/account/src/lib.rs b/primitives/account/src/lib.rs
index 088951a..d6e4c98 100644
--- a/primitives/account/src/lib.rs
+++ b/primitives/account/src/lib.rs
@@ -146,20 +146,8 @@ impl EthereumSignature {
}
}
-#[derive(
- PartialEq,
- Eq,
- PartialOrd,
- Ord,
- Clone,
- Copy,
- Encode,
- Decode,
- PassByInner,
- MaxEncodedLen,
- RuntimeDebug,
- TypeInfo
-)]
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(RuntimeDebug, Encode, Decode, MaxEncodedLen, TypeInfo, PassByInner)]
pub struct EthereumSigner([u8; 20]);
impl From<[u8; 20]> for EthereumSigner {
diff --git a/primitives/dynamic-fee/Cargo.toml b/primitives/dynamic-fee/Cargo.toml
index 6ecd0fe..2f820a0 100644
--- a/primitives/dynamic-fee/Cargo.toml
+++ b/primitives/dynamic-fee/Cargo.toml
@@ -11,7 +11,7 @@ repository = { workspace = true }
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-async-trait = { version = "0.1", optional = true }
+async-trait = { workspace = true, optional = true }
# Substrate
sp-core = { workspace = true }
sp-inherents = { workspace = true }
diff --git a/primitives/ethereum/Cargo.toml b/primitives/ethereum/Cargo.toml
index b9d620c..3b1fbfb 100644
--- a/primitives/ethereum/Cargo.toml
+++ b/primitives/ethereum/Cargo.toml
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
ethereum = { workspace = true, features = ["with-codec"] }
ethereum-types = { workspace = true }
-num_enum = { version = "0.5.4", default-features = false }
+num_enum = { version = "0.6.1", default-features = false }
scale-codec = { package = "parity-scale-codec", workspace = true }
# Substrate
frame-support = { workspace = true }
diff --git a/primitives/evm/Cargo.toml b/primitives/evm/Cargo.toml
index 02e1e43..20225b9 100644
--- a/primitives/evm/Cargo.toml
+++ b/primitives/evm/Cargo.toml
@@ -13,6 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
evm = { workspace = true, features = ["with-codec"] }
scale-codec = { package = "parity-scale-codec", workspace = true }
+scale-info = { workspace = true }
serde = { workspace = true, optional = true }
# Substrate
frame-support = { workspace = true }
diff --git a/primitives/evm/src/lib.rs b/primitives/evm/src/lib.rs
index 0ac7d81..74ca39c 100644
--- a/primitives/evm/src/lib.rs
+++ b/primitives/evm/src/lib.rs
@@ -23,6 +23,7 @@ mod validation;
use frame_support::weights::{constants::WEIGHT_REF_TIME_PER_MILLIS, Weight};
use scale_codec::{Decode, Encode};
+use scale_info::TypeInfo;
#[cfg(feature = "std")]
use serde::{Deserialize, Serialize};
use sp_core::{H160, H256, U256};
@@ -56,8 +57,8 @@ pub struct Vicinity {
pub origin: H160,
}
-/// `System::Account` 16(hash) + 20 (key) + 52 (AccountInfo::max_encoded_len)
-pub const ACCOUNT_BASIC_PROOF_SIZE: u64 = 88;
+/// `System::Account` 16(hash) + 20 (key) + 60 (AccountInfo::max_encoded_len)
+pub const ACCOUNT_BASIC_PROOF_SIZE: u64 = 96;
/// `AccountCodesMetadata` read, temptatively 16 (hash) + 20 (key) + 40 (CodeMetadata).
pub const ACCOUNT_CODES_METADATA_PROOF_SIZE: u64 = 76;
/// 16 (hash1) + 20 (key1) + 16 (hash2) + 32 (key2) + 32 (value)
@@ -72,7 +73,7 @@ pub enum AccessedStorage {
AccountStorages((H160, H256)),
}
-#[derive(Clone, Copy, Eq, PartialEq, Encode, Decode)]
+#[derive(Clone, Copy, Eq, PartialEq, Encode, Decode, TypeInfo)]
#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
pub struct WeightInfo {
pub ref_time_limit: Option,
@@ -152,7 +153,7 @@ impl WeightInfo {
}
}
-#[derive(Clone, Eq, PartialEq, Encode, Decode)]
+#[derive(Clone, Eq, PartialEq, Encode, Decode, TypeInfo)]
#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
pub struct UsedGas {
/// The used_gas as returned by the evm gasometer on exit.
@@ -162,7 +163,7 @@ pub struct UsedGas {
pub effective: U256,
}
-#[derive(Clone, Eq, PartialEq, Encode, Decode)]
+#[derive(Clone, Eq, PartialEq, Encode, Decode, TypeInfo)]
#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
pub struct ExecutionInfoV2 {
pub exit_reason: ExitReason,
@@ -175,14 +176,14 @@ pub struct ExecutionInfoV2 {
pub type CallInfo = ExecutionInfoV2>;
pub type CreateInfo = ExecutionInfoV2;
-#[derive(Clone, Eq, PartialEq, Encode, Decode)]
+#[derive(Clone, Eq, PartialEq, Encode, Decode, TypeInfo)]
#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
pub enum CallOrCreateInfo {
Call(CallInfo),
Create(CreateInfo),
}
-#[derive(Clone, Eq, PartialEq, Encode, Decode)]
+#[derive(Clone, Eq, PartialEq, Encode, Decode, TypeInfo)]
#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
pub struct ExecutionInfo {
pub exit_reason: ExitReason,
@@ -200,7 +201,7 @@ pub struct GenesisAccount {
/// Account balance.
pub balance: U256,
/// Full account storage.
- pub storage: std::collections::BTreeMap,
+ pub storage: std::collections::BTreeMap,
/// Account code.
pub code: Vec,
}
diff --git a/primitives/storage/src/lib.rs b/primitives/storage/src/lib.rs
index db845bc..35c22af 100644
--- a/primitives/storage/src/lib.rs
+++ b/primitives/storage/src/lib.rs
@@ -42,7 +42,7 @@ pub const BASE_FEE_PER_GAS: &[u8] = b"BaseFeePerGas";
pub const BASE_FEE_ELASTICITY: &[u8] = b"Elasticity";
/// The schema version for Pallet Ethereum's storage
-#[derive(Clone, Copy, Debug, Encode, Decode, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Encode, Decode)]
#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
pub enum EthereumStorageSchema {
Undefined,
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 0000000..f682bc9
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,8 @@
+[toolchain]
+# Stable
+#channel = "1.68.2" # rustc 1.68.2 (9eb3afe9e 2023-03-27)
+# Nightly
+channel = "nightly-2022-11-16" # rustc 1.67.0-nightly (a00f8ba7f 2022-11-15)
+components = ["rustfmt", "clippy"]
+targets = ["wasm32-unknown-unknown"]
+profile = "minimal"
diff --git a/template/node/Cargo.toml b/template/node/Cargo.toml
index 3d95826..1a641e9 100644
--- a/template/node/Cargo.toml
+++ b/template/node/Cargo.toml
@@ -13,12 +13,12 @@ repository = { workspace = true }
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-async-trait = "0.1"
-clap = { version = "4.1", features = ["derive", "deprecated"] }
-futures = "0.3.25"
+async-trait = { workspace = true }
+clap = { workspace = true }
+futures = { workspace = true }
hex-literal = { workspace = true }
jsonrpsee = { workspace = true, features = ["server", "macros"] }
-log = "0.4.17"
+log = { workspace = true }
scale-codec = { package = "parity-scale-codec", workspace = true }
serde = { workspace = true }
@@ -38,7 +38,7 @@ sc-network-common = { workspace = true }
sc-network-sync = { workspace = true }
sc-rpc = { workspace = true }
sc-rpc-api = { workspace = true }
-sc-service = { workspace = true, features = ["default"] }
+sc-service = { workspace = true }
sc-telemetry = { workspace = true }
sc-transaction-pool = { workspace = true }
sc-transaction-pool-api = { workspace = true }
@@ -70,8 +70,8 @@ pallet-transaction-payment = { workspace = true }
# Frontier
fc-cli = { workspace = true }
fc-consensus = { workspace = true }
-fc-db = { workspace = true, features = ["default", "sql"] }
-fc-mapping-sync = { workspace = true, features = ["sql"] }
+fc-db = { workspace = true }
+fc-mapping-sync = { workspace = true }
fc-rpc = { workspace = true }
fc-rpc-core = { workspace = true }
fc-storage = { workspace = true }
@@ -79,13 +79,29 @@ fp-account = { workspace = true }
fp-dynamic-fee = { workspace = true, features = ["default"] }
fp-evm = { workspace = true, features = ["default"] }
fp-rpc = { workspace = true, features = ["default"] }
-frontier-template-runtime = { workspace = true, features = ["default"] }
+frontier-template-runtime = { workspace = true, features = ["std"] }
[build-dependencies]
substrate-build-script-utils = { workspace = true }
[features]
-default = ["with-rocksdb-weights"]
+default = [
+ "with-rocksdb-weights",
+ "rocksdb",
+ "sql",
+]
+rocksdb = [
+ "sc-cli/rocksdb",
+ "sc-service/rocksdb",
+ "fc-cli/rocksdb",
+ "fc-db/rocksdb",
+ "fc-mapping-sync/rocksdb",
+ "fc-rpc/rocksdb",
+]
+sql = [
+ "fc-db/sql",
+ "fc-mapping-sync/sql",
+]
with-rocksdb-weights = ["frontier-template-runtime/with-rocksdb-weights"]
with-paritydb-weights = ["frontier-template-runtime/with-paritydb-weights"]
rpc-binary-search-estimate = ["fc-rpc/rpc-binary-search-estimate"]
diff --git a/template/node/src/chain_spec.rs b/template/node/src/chain_spec.rs
index f58201b..3ecf4fa 100644
--- a/template/node/src/chain_spec.rs
+++ b/template/node/src/chain_spec.rs
@@ -13,7 +13,7 @@ use sp_runtime::traits::{IdentifyAccount, Verify};
use sp_state_machine::BasicExternalities;
// Frontier
use frontier_template_runtime::{
- AccountId, EnableManualSeal, GenesisConfig, SS58Prefix, Signature, WASM_BINARY,
+ AccountId, Balance, EnableManualSeal, GenesisConfig, SS58Prefix, Signature, WASM_BINARY,
};
// The URL for the telemetry server.
@@ -77,6 +77,8 @@ fn properties() -> Properties {
properties
}
+const UNITS: Balance = 1_000_000_000_000_000_000;
+
pub fn development_config(enable_manual_seal: Option) -> DevChainSpec {
let wasm_binary = WASM_BINARY.expect("WASM not available");
@@ -161,6 +163,7 @@ pub fn local_testnet_config() -> ChainSpec {
None,
// Protocol ID
None,
+ // Fork ID
None,
// Properties
None,
@@ -195,11 +198,10 @@ fn testnet_genesis(
// Monetary
balances: BalancesConfig {
- // Configure endowed accounts with initial balance of 1 << 60.
balances: endowed_accounts
.iter()
.cloned()
- .map(|k| (k, 1 << 60))
+ .map(|k| (k, 1_000_000 * UNITS))
.collect(),
},
transaction_payment: Default::default(),
diff --git a/template/node/src/cli.rs b/template/node/src/cli.rs
index e800e2e..fcae8cf 100644
--- a/template/node/src/cli.rs
+++ b/template/node/src/cli.rs
@@ -1,20 +1,15 @@
use crate::service::EthConfiguration;
/// Available Sealing methods.
-#[derive(Debug, Copy, Clone, clap::ValueEnum)]
+#[derive(Copy, Clone, Debug, Default, clap::ValueEnum)]
pub enum Sealing {
- // Seal using rpc method.
+ /// Seal using rpc method.
+ #[default]
Manual,
- // Seal when transaction is executed.
+ /// Seal when transaction is executed.
Instant,
}
-impl Default for Sealing {
- fn default() -> Sealing {
- Sealing::Manual
- }
-}
-
#[derive(Debug, clap::Parser)]
pub struct Cli {
#[command(subcommand)]
diff --git a/template/node/src/eth.rs b/template/node/src/eth.rs
index 765ba6c..cad0d62 100644
--- a/template/node/src/eth.rs
+++ b/template/node/src/eth.rs
@@ -37,20 +37,15 @@ pub fn db_config_dir(config: &Configuration) -> PathBuf {
}
/// Avalailable frontier backend types.
-#[derive(Debug, Copy, Clone, clap::ValueEnum)]
+#[derive(Debug, Copy, Clone, Default, clap::ValueEnum)]
pub enum BackendType {
/// Either RocksDb or ParityDb as per inherited from the global backend settings.
+ #[default]
KeyValue,
/// Sql database with custom log indexing.
Sql,
}
-impl Default for BackendType {
- fn default() -> BackendType {
- BackendType::KeyValue
- }
-}
-
/// The ethereum-compatibility configuration used to run a node.
#[derive(Clone, Debug, clap::Parser)]
pub struct EthConfiguration {
diff --git a/template/node/src/service.rs b/template/node/src/service.rs
index 2faee4b..2d599e5 100644
--- a/template/node/src/service.rs
+++ b/template/node/src/service.rs
@@ -7,7 +7,7 @@ use futures::{channel::mpsc, prelude::*};
use prometheus_endpoint::Registry;
use sc_client_api::{BlockBackend, StateBackendFor};
use sc_consensus::BasicQueue;
-use sc_executor::{NativeElseWasmExecutor, NativeExecutionDispatch};
+use sc_executor::NativeExecutionDispatch;
use sc_network_common::sync::warp::WarpSyncParams;
use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, TaskManager};
use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker};
@@ -94,12 +94,7 @@ where
})
.transpose()?;
- let executor = NativeElseWasmExecutor::::new(
- config.wasm_method,
- config.default_heap_pages,
- config.max_runtime_instances,
- config.runtime_cache_size,
- );
+ let executor = sc_service::new_native_or_wasm_executor(config);
let (client, backend, keystore_container, task_manager) =
sc_service::new_full_parts::(
@@ -438,7 +433,7 @@ where
client: client.clone(),
backend: backend.clone(),
task_manager: &mut task_manager,
- keystore: keystore_container.sync_keystore(),
+ keystore: keystore_container.keystore(),
transaction_pool: transaction_pool.clone(),
rpc_builder,
network: network.clone(),
@@ -515,7 +510,7 @@ where
create_inherent_data_providers,
force_authoring,
backoff_authoring_blocks: Option::<()>::None,
- keystore: keystore_container.sync_keystore(),
+ keystore: keystore_container.keystore(),
block_proposal_slot_portion: sc_consensus_aura::SlotProportion::new(2f32 / 3f32),
max_block_proposal_slot_portion: None,
telemetry: telemetry.as_ref().map(|x| x.handle()),
@@ -533,7 +528,7 @@ where
// 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(keystore_container.sync_keystore())
+ Some(keystore_container.keystore())
} else {
None
};
diff --git a/template/runtime/src/lib.rs b/template/runtime/src/lib.rs
index fbcba0a..a658d16 100644
--- a/template/runtime/src/lib.rs
+++ b/template/runtime/src/lib.rs
@@ -263,17 +263,19 @@ parameter_types! {
}
impl pallet_balances::Config for Runtime {
- /// The type for recording an account's balance.
+ type RuntimeEvent = RuntimeEvent;
+ type WeightInfo = pallet_balances::weights::SubstrateWeight;
type Balance = Balance;
type DustRemoval = ();
- /// The ubiquitous event type.
- type RuntimeEvent = RuntimeEvent;
type ExistentialDeposit = ExistentialDeposit;
type AccountStore = System;
- type WeightInfo = pallet_balances::weights::SubstrateWeight;
+ type ReserveIdentifier = [u8; 8];
+ type HoldIdentifier = ();
+ type FreezeIdentifier = ();
type MaxLocks = MaxLocks;
type MaxReserves = ();
- type ReserveIdentifier = [u8; 8];
+ type MaxHolds = ();
+ type MaxFreezes = ();
}
parameter_types! {
@@ -564,6 +566,14 @@ impl_runtime_apis! {
fn metadata() -> OpaqueMetadata {
OpaqueMetadata::new(Runtime::metadata().into())
}
+
+ fn metadata_at_version(version: u32) -> Option {
+ Runtime::metadata_at_version(version)
+ }
+
+ fn metadata_versions() -> Vec {
+ Runtime::metadata_versions()
+ }
}
impl sp_block_builder::BlockBuilder for Runtime {