From 04e655675411b2f85ff36a24209be455c9f08d33 Mon Sep 17 00:00:00 2001 From: Chevdor Date: Thu, 7 Sep 2023 13:53:53 +0200 Subject: [PATCH] Switch to the monorepo (#83) --- Cargo.lock | 482 +++++++++++++++--- cli/Cargo.toml | 2 +- lib/Cargo.toml | 7 +- .../Cargo.toml | 8 +- libs/wasm-testbed/Cargo.toml | 16 +- 5 files changed, 437 insertions(+), 78 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5f979a5..70494f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -155,6 +155,177 @@ version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +[[package]] +name = "ark-bls12-381" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", +] + +[[package]] +name = "ark-ec" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" +dependencies = [ + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", + "itertools", + "num-traits", + "zeroize", +] + +[[package]] +name = "ark-ed-on-bls12-381-bandersnatch" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9cde0f2aa063a2a5c28d39b47761aa102bda7c13c84fc118a61b87c7b2f785c" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-ff" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" +dependencies = [ + "ark-ff-asm", + "ark-ff-macros", + "ark-serialize", + "ark-std", + "derivative", + "digest 0.10.7", + "itertools", + "num-bigint", + "num-traits", + "paste", + "rustc_version", + "zeroize", +] + +[[package]] +name = "ark-ff-asm" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-poly" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", +] + +[[package]] +name = "ark-scale" +version = "0.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49b08346a3e38e2be792ef53ee168623c9244d968ff00cd70fb9932f6fe36393" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "parity-scale-codec", +] + +[[package]] +name = "ark-secret-scalar" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "ark-transcript", + "digest 0.10.7", + "rand_core 0.6.4", + "zeroize", +] + +[[package]] +name = "ark-serialize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" +dependencies = [ + "ark-serialize-derive", + "ark-std", + "digest 0.10.7", + "num-bigint", +] + +[[package]] +name = "ark-serialize-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-std" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + +[[package]] +name = "ark-transcript" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "digest 0.10.7", + "rand_core 0.6.4", + "sha3 0.10.8", +] + [[package]] name = "array-bytes" version = "6.1.0" @@ -215,6 +386,28 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "bandersnatch_vrfs" +version = "0.0.1" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ed-on-bls12-381-bandersnatch", + "ark-ff", + "ark-scale", + "ark-serialize", + "ark-std", + "dleq_vrf", + "fflonk", + "merlin 3.0.0", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "ring 0.1.0", + "sha2 0.10.7", + "zeroize", +] + [[package]] name = "base-x" version = "0.2.11" @@ -368,9 +561,12 @@ dependencies = [ [[package]] name = "bs58" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" +checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +dependencies = [ + "tinyvec", +] [[package]] name = "bstr" @@ -409,9 +605,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "calm_io" @@ -450,9 +646,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f" +checksum = "d87d9d13be47a5b7c3907137f1290b0459a7f80efb26be8c52afb11963bccb02" dependencies = [ "android-tzdata", "iana-time-zone", @@ -546,6 +742,20 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +[[package]] +name = "common" +version = "0.1.0" +source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "fflonk", + "merlin 3.0.0", +] + [[package]] name = "comparable" version = "0.5.4" @@ -895,6 +1105,33 @@ dependencies = [ "zeroize", ] +[[package]] +name = "curve25519-dalek" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622178105f911d937a42cdb140730ba4a3ed2becd8ae6ce39c7d28b5d75d4588" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "platforms", + "rustc_version", + "subtle", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.31", +] + [[package]] name = "data-encoding" version = "2.4.0" @@ -921,6 +1158,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -994,6 +1242,23 @@ dependencies = [ "winapi", ] +[[package]] +name = "dleq_vrf" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-scale", + "ark-secret-scalar", + "ark-serialize", + "ark-std", + "ark-transcript", + "arrayvec 0.7.4", + "rand_core 0.6.4", + "zeroize", +] + [[package]] name = "doc-comment" version = "0.3.3" @@ -1038,23 +1303,22 @@ checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" [[package]] name = "ed25519" -version = "1.5.3" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" +checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" dependencies = [ "signature", ] [[package]] name = "ed25519-dalek" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" dependencies = [ - "curve25519-dalek 3.2.0", + "curve25519-dalek 4.1.0", "ed25519", - "sha2 0.9.9", - "zeroize", + "sha2 0.10.7", ] [[package]] @@ -1167,6 +1431,25 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fflonk" +version = "0.1.0" +source = "git+https://github.com/w3f/fflonk#26a5045b24e169cffc1f9328ca83d71061145c40" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "merlin 3.0.0", +] + +[[package]] +name = "fiat-crypto" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" + [[package]] name = "file-per-thread-logger" version = "0.1.6" @@ -1241,7 +1524,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "16.0.0" -source = "git+https://github.com/paritytech/frame-metadata?branch=main#31e40963d0db77cfa14b7c0cd06a78ab8fc27836" +source = "git+https://github.com/paritytech/frame-metadata?branch=main#df03f6f58e3ec356fd13741163b771c4160e9f51" dependencies = [ "cfg-if", "parity-scale-codec", @@ -1984,6 +2267,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "merlin" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" +dependencies = [ + "byteorder", + "keccak", + "rand_core 0.6.4", + "zeroize", +] + [[package]] name = "mime" version = "0.3.17" @@ -2071,12 +2366,12 @@ dependencies = [ [[package]] name = "multihash" -version = "0.19.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd59dcc2bbe70baabeac52cd22ae52c55eefe6c38ff11a9439f16a350a939f2" +checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492" dependencies = [ "core2", - "unsigned-varint 0.7.1", + "unsigned-varint 0.7.2", ] [[package]] @@ -2094,6 +2389,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-format" version = "0.4.4" @@ -2104,6 +2410,16 @@ dependencies = [ "itoa", ] +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.16" @@ -2191,9 +2507,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.5" +version = "3.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" +checksum = "a65cebc1b089c96df6203a76279a82b4bbf04fa23659c4093cac6fd245c25d1f" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2303,6 +2619,12 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +[[package]] +name = "platforms" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -2649,6 +2971,21 @@ dependencies = [ "winreg", ] +[[package]] +name = "ring" +version = "0.1.0" +source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "common", + "fflonk", + "merlin 3.0.0", +] + [[package]] name = "ring" version = "0.16.20" @@ -2682,6 +3019,15 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + [[package]] name = "rustix" version = "0.36.15" @@ -2730,7 +3076,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring", + "ring 0.16.20", "rustls-webpki 0.101.4", "sct", ] @@ -2762,7 +3108,7 @@ version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" dependencies = [ - "ring", + "ring 0.16.20", "untrusted", ] @@ -2772,7 +3118,7 @@ version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ - "ring", + "ring 0.16.20", "untrusted", ] @@ -2791,7 +3137,7 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "log", "sp-core", @@ -2802,7 +3148,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", @@ -2824,10 +3170,10 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "sc-allocator", - "sp-maybe-compressed-blob", + "sp-maybe-compressed-blob 4.1.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=master)", "sp-wasm-interface", "thiserror", "wasm-instrument", @@ -2836,7 +3182,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "anyhow", "cfg-if", @@ -2906,7 +3252,7 @@ dependencies = [ "arrayvec 0.5.2", "curve25519-dalek 2.1.3", "getrandom 0.1.16", - "merlin", + "merlin 2.0.1", "rand 0.7.3", "rand_core 0.5.1", "sha2 0.8.2", @@ -2926,7 +3272,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", + "ring 0.16.20", "untrusted", ] @@ -3152,9 +3498,9 @@ dependencies = [ [[package]] name = "signature" -version = "1.6.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" [[package]] name = "slab" @@ -3200,7 +3546,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "hash-db", "log", @@ -3221,7 +3567,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "Inflector", "blake2", @@ -3235,7 +3581,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "23.0.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "parity-scale-codec", "scale-info", @@ -3248,7 +3594,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "16.0.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "integer-sqrt", "num-traits", @@ -3262,9 +3608,11 @@ dependencies = [ [[package]] name = "sp-core" version = "21.0.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "array-bytes", + "arrayvec 0.7.4", + "bandersnatch_vrfs", "bitflags 1.3.2", "blake2", "bounded-collections", @@ -3278,7 +3626,7 @@ dependencies = [ "lazy_static", "libsecp256k1", "log", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "parking_lot 0.12.1", "paste", @@ -3307,7 +3655,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "9.0.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "blake2b_simd 1.0.1", "byteorder", @@ -3320,7 +3668,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "9.0.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "quote", "sp-core-hashing", @@ -3330,7 +3678,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "proc-macro2", "quote", @@ -3340,7 +3688,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.19.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "environmental", "parity-scale-codec", @@ -3351,10 +3699,9 @@ dependencies = [ [[package]] name = "sp-io" version = "23.0.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "bytes", - "ed25519", "ed25519-dalek", "libsecp256k1", "log", @@ -3376,7 +3723,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.27.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", @@ -3388,7 +3735,16 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/substrate/?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +dependencies = [ + "thiserror", + "zstd 0.12.4", +] + +[[package]] +name = "sp-maybe-compressed-blob" +version = "4.1.0-dev" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "thiserror", "zstd 0.12.4", @@ -3397,7 +3753,7 @@ dependencies = [ [[package]] name = "sp-metadata-ir" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "frame-metadata 16.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", @@ -3408,7 +3764,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "backtrace", "lazy_static", @@ -3418,7 +3774,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "24.0.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "either", "hash256-std-hasher", @@ -3440,7 +3796,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "17.0.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -3458,7 +3814,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "11.0.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "Inflector", "proc-macro-crate", @@ -3470,7 +3826,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.28.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "hash-db", "log", @@ -3491,12 +3847,12 @@ dependencies = [ [[package]] name = "sp-std" version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" [[package]] name = "sp-storage" version = "13.0.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "impl-serde", "parity-scale-codec", @@ -3509,7 +3865,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "10.0.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "parity-scale-codec", "sp-std", @@ -3521,7 +3877,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "22.0.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "ahash 0.8.3", "hash-db", @@ -3544,7 +3900,7 @@ dependencies = [ [[package]] name = "sp-version" version = "22.0.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "impl-serde", "parity-scale-codec", @@ -3561,7 +3917,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -3572,7 +3928,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "14.0.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -3585,7 +3941,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "20.0.0" -source = "git+https://github.com/paritytech/substrate?tag=monthly-2023-08#22f0669efc4a8b785854a335c70b7e4385d0ca53" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#09503b1d2d844d0d4f89ea936689a303feaf40da" dependencies = [ "parity-scale-codec", "scale-info", @@ -4176,9 +4532,9 @@ checksum = "f7fdeedbf205afadfe39ae559b75c3240f24e257d0ca27e85f85cb82aa19ac35" [[package]] name = "unsigned-varint" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" +checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" [[package]] name = "untrusted" @@ -4361,10 +4717,10 @@ dependencies = [ "assert_cmd", "log", "multibase 0.9.1", - "multihash 0.19.0", + "multihash 0.19.1", "serde", "serde_json", - "sp-maybe-compressed-blob", + "sp-maybe-compressed-blob 4.1.0-dev (git+https://github.com/paritytech/substrate/?tag=monthly-2023-08)", "subrpcer", "thiserror", "tungstenite", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 7c169e0..a01a5de 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -46,7 +46,7 @@ wasm-loader = { version = "0.20.0", path = "../libs/wasm-loader" } wasm-testbed = { version = "0.20.0", path = "../libs/wasm-testbed" } serde_json = "1.0" text-style = { version = "0.3", features = ["crossterm"] } -sp-runtime = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" } +sp-runtime = { branch = "master", git = "https://github.com/paritytech/polkadot-sdk" } url = "2.3" [dev-dependencies] diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 1775247..b044e9a 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -34,11 +34,14 @@ serde = { version = "1.0", features = ["derive"] } scale-info = { version = "2.1", default-features = false, features = [ "derive", ] } -sp-version = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" } +sp-version = { branch = "master", git = "https://github.com/paritytech/polkadot-sdk" } ipfs-hasher = { version = "0.20.0", path = "../libs/ipfs-hasher" } wasm-loader = { version = "0.20.0", path = "../libs/wasm-loader" } wasm-testbed = { version = "0.20.0", path = "../libs/wasm-testbed" } substrate-differ = { version = "0.20.0", path = "../libs/substrate-differ" } url = "2.3.1" -reqwest = { version = "0.11", features = ["blocking", "rustls-tls"], default-features = false } +reqwest = { version = "0.11", features = [ + "blocking", + "rustls-tls", +], default-features = false } semver = "1.0.17" diff --git a/libs/substrate-runtime-proposal-hash/Cargo.toml b/libs/substrate-runtime-proposal-hash/Cargo.toml index 1c4a3c5..d186baa 100644 --- a/libs/substrate-runtime-proposal-hash/Cargo.toml +++ b/libs/substrate-runtime-proposal-hash/Cargo.toml @@ -22,10 +22,10 @@ hex = "0.4" blake2 = "0.10" thiserror = "1.0" codec = { version = "3.1", package = "parity-scale-codec" } -sp-core = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" } -sp-io = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" } -sp-runtime = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" } -sp-wasm-interface = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" } +sp-core = { branch = "master", git = "https://github.com/paritytech/polkadot-sdk" } +sp-io = { branch = "master", git = "https://github.com/paritytech/polkadot-sdk" } +sp-runtime = { branch = "master", git = "https://github.com/paritytech/polkadot-sdk" } +sp-wasm-interface = { branch = "master", git = "https://github.com/paritytech/polkadot-sdk" } frame-metadata = { package = "frame-metadata", git = "https://github.com/paritytech/frame-metadata", branch = "main", features = [ "std", ] } diff --git a/libs/wasm-testbed/Cargo.toml b/libs/wasm-testbed/Cargo.toml index 8665691..04c46d1 100644 --- a/libs/wasm-testbed/Cargo.toml +++ b/libs/wasm-testbed/Cargo.toml @@ -23,15 +23,15 @@ log = "0.4" thiserror = "1.0" wasm-loader = { version = "0.20.0", path = "../wasm-loader" } substrate-runtime-proposal-hash = { version = "0.20.0", path = "../substrate-runtime-proposal-hash" } -sc-executor = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" } -sc-executor-common = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" } +sc-executor = { branch = "master", git = "https://github.com/paritytech/polkadot-sdk" } +sc-executor-common = { branch = "master", git = "https://github.com/paritytech/polkadot-sdk" } scale = { version = "3", package = "parity-scale-codec", default-features = false } -sp-core = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" } -sp-io = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" } -sp-runtime = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" } -sp-state-machine = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" } -sp-wasm-interface = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" } -sp-version = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" } +sp-core = { branch = "master", git = "https://github.com/paritytech/polkadot-sdk" } +sp-io = { branch = "master", git = "https://github.com/paritytech/polkadot-sdk" } +sp-runtime = { branch = "master", git = "https://github.com/paritytech/polkadot-sdk" } +sp-state-machine = { branch = "master", git = "https://github.com/paritytech/polkadot-sdk" } +sp-wasm-interface = { branch = "master", git = "https://github.com/paritytech/polkadot-sdk" } +sp-version = { branch = "master", git = "https://github.com/paritytech/polkadot-sdk" } scale-info = { version = "2.1", default-features = false, features = [ "derive", ] }