From 62e94450255b7acbc3ec2b99dc43f8c2154c6203 Mon Sep 17 00:00:00 2001 From: Aleksandr Krupenkin Date: Sun, 13 Nov 2022 16:17:19 +0300 Subject: [PATCH] Extended kickout collator period (#748) * Extended kickout collator period * Compilation fixes --- Cargo.lock | 217 ++++++++++++++++++++++--------------- bin/collator/Cargo.toml | 2 +- runtime/astar/Cargo.toml | 2 +- runtime/astar/src/lib.rs | 9 +- runtime/shibuya/Cargo.toml | 2 +- runtime/shibuya/src/lib.rs | 9 +- runtime/shiden/Cargo.toml | 2 +- runtime/shiden/src/lib.rs | 9 +- 8 files changed, 147 insertions(+), 105 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 41ff0346f..8b78c2f6d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -168,7 +168,7 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "astar-collator" -version = "4.31.0" +version = "4.32.0" dependencies = [ "astar-runtime", "async-trait", @@ -258,7 +258,7 @@ dependencies = [ [[package]] name = "astar-runtime" -version = "4.31.0" +version = "4.32.0" dependencies = [ "array-bytes", "cumulus-pallet-aura-ext", @@ -357,22 +357,22 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" dependencies = [ - "concurrent-queue", + "concurrent-queue 1.2.4", "event-listener", "futures-core", ] [[package]] name = "async-executor" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" +checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" dependencies = [ + "async-lock", "async-task", - "concurrent-queue", + "concurrent-queue 2.0.0", "fastrand", "futures-lite", - "once_cell", "slab", ] @@ -399,7 +399,7 @@ checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7" dependencies = [ "async-lock", "autocfg", - "concurrent-queue", + "concurrent-queue 1.2.4", "futures-lite", "libc", "log", @@ -749,9 +749,9 @@ dependencies = [ [[package]] name = "blake2" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9cf849ee05b2ee5fba5e36f97ff8ec2533916700fc0758d40d92136a42f3388" +checksum = "b12e5fd123190ce1c2e559308a94c9bacad77907d4c6005d9e58fe1a0689e55e" dependencies = [ "digest 0.10.5", ] @@ -968,9 +968,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.74" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574" +checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" dependencies = [ "jobserver", ] @@ -1230,6 +1230,15 @@ dependencies = [ "cache-padded", ] +[[package]] +name = "concurrent-queue" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "const-oid" version = "0.7.1" @@ -1293,18 +1302,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44409ccf2d0f663920cab563d2b79fcd6b2e9a2bcc6e929fef76c8f82ad6c17a" +checksum = "52056f6d0584484b57fa6c1a65c1fcb15f3780d8b6a758426d9e3084169b2ddd" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de2018ad96eb97f621f7d6b900a0cc661aec8d02ea4a50e56ecb48e5a2fcaf" +checksum = "18fed94c8770dc25d01154c3ffa64ed0b3ba9d583736f305fed7beebe5d9cf74" dependencies = [ "arrayvec 0.7.2", "bumpalo", @@ -1322,33 +1331,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5287ce36e6c4758fbaf298bd1a8697ad97a4f2375a3d1b61142ea538db4877e5" +checksum = "1c451b81faf237d11c7e4f3165eeb6bac61112762c5cfe7b4c0fb7241474358f" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2855c24219e2f08827f3f4ffb2da92e134ae8d8ecc185b11ec8f9878cf5f588e" +checksum = "e7c940133198426d26128f08be2b40b0bd117b84771fd36798969c4d712d81fc" [[package]] name = "cranelift-entity" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b65673279d75d34bf11af9660ae2dbd1c22e6d28f163f5c72f4e1dc56d56103" +checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed2b3d7a4751163f6c4a349205ab1b7d9c00eecf19dcea48592ef1f7688eefc" +checksum = "34897538b36b216cc8dd324e73263596d51b8cf610da6498322838b2546baf8a" dependencies = [ "cranelift-codegen", "log", @@ -1358,15 +1367,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be64cecea9d90105fc6a2ba2d003e98c867c1d6c4c86cc878f97ad9fb916293" +checksum = "1b2629a569fae540f16a76b70afcc87ad7decb38dc28fa6c648ac73b51e78470" [[package]] name = "cranelift-native" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a03a6ac1b063e416ca4b93f6247978c991475e8271465340caa6f92f3c16a4" +checksum = "20937dab4e14d3e225c5adfc9c7106bafd4ac669bdb43027b911ff794c6fb318" dependencies = [ "cranelift-codegen", "libc", @@ -1375,9 +1384,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c699873f7b30bc5f20dd03a796b4183e073a46616c91704792ec35e45d13f913" +checksum = "80fc2288957a94fd342a015811479de1837850924166d1f1856d8406e6f3609b" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2082,7 +2091,7 @@ dependencies = [ [[package]] name = "dapps-staking-chain-extension-types" version = "1.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "frame-support", "parity-scale-codec", @@ -3832,6 +3841,16 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" +[[package]] +name = "io-lifetimes" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7d367024b3f3414d8e01f437f704f41a9f64ab36f9067fa73e526ad4c763c87" +dependencies = [ + "libc", + "windows-sys 0.42.0", +] + [[package]] name = "ip_network" version = "0.4.1" @@ -4248,9 +4267,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565" +checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "libp2p" @@ -4881,6 +4900,12 @@ version = "0.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +[[package]] +name = "linux-raw-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb68f22743a3fb35785f1e7f844ca5a3de2dde5bd0c0ef5b372065814699b121" + [[package]] name = "local-runtime" version = "4.31.0" @@ -5066,18 +5091,18 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memfd" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "480b5a5de855d11ff13195950bdc8b98b5e942ef47afc447f6615cdcc4e15d80" +checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" dependencies = [ - "rustix", + "rustix 0.36.1", ] [[package]] name = "memmap2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95af15f345b17af2efc8ead6080fb8bc376f8cec1b35277b935637595fe77498" +checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" dependencies = [ "libc", ] @@ -5608,9 +5633,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.3.1" +version = "6.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9" +checksum = "7b5bf27447411e9ee3ff51186bf7a08e16c341efdde93f4d823e8844429bed7e" [[package]] name = "owning_ref" @@ -5798,7 +5823,7 @@ dependencies = [ [[package]] name = "pallet-block-reward" version = "2.2.2" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "frame-benchmarking", "frame-support", @@ -5835,7 +5860,7 @@ dependencies = [ [[package]] name = "pallet-chain-extension-dapps-staking" version = "1.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "dapps-staking-chain-extension-types", "frame-support", @@ -5856,7 +5881,7 @@ dependencies = [ [[package]] name = "pallet-chain-extension-xvm" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "frame-support", "frame-system", @@ -5896,7 +5921,7 @@ dependencies = [ [[package]] name = "pallet-collator-selection" version = "3.3.2" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "frame-benchmarking", "frame-support", @@ -6015,7 +6040,7 @@ dependencies = [ [[package]] name = "pallet-custom-signatures" version = "4.5.2" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "frame-support", "frame-system", @@ -6030,8 +6055,8 @@ dependencies = [ [[package]] name = "pallet-dapps-staking" -version = "3.7.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +version = "3.8.0" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "frame-benchmarking", "frame-support", @@ -6189,7 +6214,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-assets-erc20" version = "0.5.2" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "fp-evm", "frame-support", @@ -6276,7 +6301,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-sr25519" version = "1.2.1" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "fp-evm", "log", @@ -6292,7 +6317,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-substrate-ecdsa" version = "1.2.2" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "fp-evm", "log", @@ -6308,7 +6333,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-xcm" version = "0.7.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "fp-evm", "frame-support", @@ -6331,7 +6356,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-xvm" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "fp-evm", "frame-support", @@ -6614,7 +6639,7 @@ dependencies = [ [[package]] name = "pallet-precompile-dapps-staking" version = "3.6.2" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "fp-evm", "frame-support", @@ -6945,7 +6970,7 @@ dependencies = [ [[package]] name = "pallet-xc-asset-config" version = "1.3.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "frame-benchmarking", "frame-support", @@ -6963,7 +6988,7 @@ dependencies = [ [[package]] name = "pallet-xcm" version = "0.9.28" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "frame-support", "frame-system", @@ -7016,7 +7041,7 @@ dependencies = [ [[package]] name = "pallet-xvm" version = "0.2.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "frame-support", "frame-system", @@ -8520,7 +8545,7 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "precompile-utils" version = "0.4.3" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "evm", "fp-evm", @@ -8543,7 +8568,7 @@ dependencies = [ [[package]] name = "precompile-utils-macro" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "num_enum", "proc-macro2", @@ -9324,9 +9349,23 @@ checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" dependencies = [ "bitflags", "errno", - "io-lifetimes", + "io-lifetimes 0.7.5", + "libc", + "linux-raw-sys 0.0.46", + "windows-sys 0.42.0", +] + +[[package]] +name = "rustix" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "812a2ec2043c4d6bc6482f5be2ab8244613cac2493d128d36c0759e52a626ab3" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes 1.0.1", "libc", - "linux-raw-sys", + "linux-raw-sys 0.1.2", "windows-sys 0.42.0", ] @@ -9834,7 +9873,7 @@ dependencies = [ "once_cell", "parity-scale-codec", "parity-wasm 0.45.0", - "rustix", + "rustix 0.35.13", "sc-allocator", "sc-executor-common", "sp-runtime-interface", @@ -10774,7 +10813,7 @@ dependencies = [ [[package]] name = "shibuya-runtime" -version = "4.31.0" +version = "4.32.0" dependencies = [ "array-bytes", "cumulus-pallet-aura-ext", @@ -10872,7 +10911,7 @@ dependencies = [ [[package]] name = "shiden-runtime" -version = "4.31.0" +version = "4.32.0" dependencies = [ "array-bytes", "cumulus-pallet-aura-ext", @@ -11860,9 +11899,9 @@ dependencies = [ [[package]] name = "ss58-registry" -version = "1.33.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab7554f8a8b6f8d71cd5a8e6536ef116e2ce0504cf97ebf16311d58065dc8a6" +checksum = "37a9821878e1f13aba383aa40a86fb1b33c7265774ec91e32563cb1dd1577496" dependencies = [ "Inflector", "num-format", @@ -12966,9 +13005,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f511c4917c83d04da68333921107db75747c4e11a2f654a8e909cc5e0520dc" +checksum = "4ad5af6ba38311282f2a21670d96e78266e8c8e2f38cbcd52c254df6ccbc7731" dependencies = [ "anyhow", "bincode", @@ -12994,18 +13033,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39bf3debfe744bf19dd3732990ce6f8c0ced7439e2370ba4e1d8f5a3660a3178" +checksum = "45de63ddfc8b9223d1adc8f7b2ee5f35d1f6d112833934ad7ea66e4f4339e597" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "wasmtime-cache" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece42fa4676a263f7558cdaaf5a71c2592bebcbac22a0580e33cf3406c103da2" +checksum = "bcd849399d17d2270141cfe47fa0d91ee52d5f8ea9b98cf7ddde0d53e5f79882" dependencies = [ "anyhow", "base64", @@ -13013,7 +13052,7 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rustix", + "rustix 0.35.13", "serde", "sha2 0.9.9", "toml", @@ -13023,9 +13062,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058217e28644b012bdcdf0e445f58d496d78c2e0b6a6dd93558e701591dad705" +checksum = "4bd91339b742ff20bfed4532a27b73c86b5bcbfedd6bea2dcdf2d64471e1b5c6" dependencies = [ "anyhow", "cranelift-codegen", @@ -13044,9 +13083,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7af06848df28b7661471d9a80d30a973e0f401f2e3ed5396ad7e225ed217047" +checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644" dependencies = [ "anyhow", "cranelift-entity", @@ -13063,9 +13102,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9028fb63a54185b3c192b7500ef8039c7bb8d7f62bfc9e7c258483a33a3d13bb" +checksum = "1985c628011fe26adf5e23a5301bdc79b245e0e338f14bb58b39e4e25e4d8681" dependencies = [ "addr2line", "anyhow", @@ -13076,7 +13115,7 @@ dependencies = [ "log", "object", "rustc-demangle", - "rustix", + "rustix 0.35.13", "serde", "target-lexicon", "thiserror", @@ -13088,20 +13127,20 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e82d4ef93296785de7efca92f7679dc67fe68a13b625a5ecc8d7503b377a37" +checksum = "f671b588486f5ccec8c5a3dba6b4c07eac2e66ab8c60e6f4e53717c77f709731" dependencies = [ "object", "once_cell", - "rustix", + "rustix 0.35.13", ] [[package]] name = "wasmtime-runtime" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f0e9bea7d517d114fe66b930b2124ee086516ee93eeebfd97f75f366c5b0553" +checksum = "ee8f92ad4b61736339c29361da85769ebc200f184361959d1792832e592a1afd" dependencies = [ "anyhow", "cc", @@ -13114,7 +13153,7 @@ dependencies = [ "memoffset", "paste", "rand 0.8.5", - "rustix", + "rustix 0.35.13", "thiserror", "wasmtime-asm-macros", "wasmtime-environ", @@ -13124,9 +13163,9 @@ dependencies = [ [[package]] name = "wasmtime-types" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b83e93ed41b8fdc936244cfd5e455480cf1eca1fd60c78a0040038b4ce5075" +checksum = "d23d61cb4c46e837b431196dd06abb11731541021916d03476a178b54dc07aeb" dependencies = [ "cranelift-entity", "serde", @@ -13549,7 +13588,7 @@ dependencies = [ [[package]] name = "xcm-primitives" version = "0.3.2" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "frame-support", "log", @@ -13593,7 +13632,7 @@ dependencies = [ [[package]] name = "xvm-chain-extension-types" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#772d63c9ae92786a5f5db5c981e560d1fa26a40b" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.30#bdd4d43c30f8da11d864a0d0abc2471d21054418" dependencies = [ "parity-scale-codec", "scale-info", diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml index c97a4db6b..4f2cf8baa 100644 --- a/bin/collator/Cargo.toml +++ b/bin/collator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "astar-collator" -version = "4.31.0" +version = "4.32.0" authors = ["Stake Technologies "] description = "Astar collator implementation in Rust." build = "build.rs" diff --git a/runtime/astar/Cargo.toml b/runtime/astar/Cargo.toml index 228a86c90..51a54b80b 100644 --- a/runtime/astar/Cargo.toml +++ b/runtime/astar/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "astar-runtime" -version = "4.31.0" +version = "4.32.0" authors = ["Stake Technologies "] edition = "2021" build = "build.rs" diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs index 8b072e14f..be7d2c4b3 100644 --- a/runtime/astar/src/lib.rs +++ b/runtime/astar/src/lib.rs @@ -97,7 +97,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("astar"), impl_name: create_runtime_str!("astar"), authoring_version: 1, - spec_version: 41, + spec_version: 42, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, @@ -395,10 +395,11 @@ impl pallet_session::Config for Runtime { parameter_types! { pub const PotId: PalletId = PalletId(*b"PotStake"); - pub const MaxCandidates: u32 = 200; + pub const MaxCandidates: u32 = 148; pub const MinCandidates: u32 = 5; - pub const MaxInvulnerables: u32 = 20; + pub const MaxInvulnerables: u32 = 48; pub const SlashRatio: Perbill = Perbill::from_percent(1); + pub const KickThreshold: BlockNumber = 2 * HOURS; // 2 SessionPeriod } impl pallet_collator_selection::Config for Runtime { @@ -410,7 +411,7 @@ impl pallet_collator_selection::Config for Runtime { type MinCandidates = MinCandidates; type MaxInvulnerables = MaxInvulnerables; // should be a multiple of session or things will get inconsistent - type KickThreshold = SessionPeriod; + type KickThreshold = KickThreshold; type ValidatorId = ::AccountId; type ValidatorIdOf = pallet_collator_selection::IdentityCollator; type ValidatorRegistration = Session; diff --git a/runtime/shibuya/Cargo.toml b/runtime/shibuya/Cargo.toml index f8a83db00..8e2bdd75a 100644 --- a/runtime/shibuya/Cargo.toml +++ b/runtime/shibuya/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shibuya-runtime" -version = "4.31.0" +version = "4.32.0" authors = ["Stake Technologies "] edition = "2021" build = "build.rs" diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs index 068cbec74..8c80339d1 100644 --- a/runtime/shibuya/src/lib.rs +++ b/runtime/shibuya/src/lib.rs @@ -133,7 +133,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("shibuya"), impl_name: create_runtime_str!("shibuya"), authoring_version: 1, - spec_version: 76, + spec_version: 77, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, @@ -464,10 +464,11 @@ impl pallet_session::Config for Runtime { parameter_types! { pub const PotId: PalletId = PalletId(*b"PotStake"); - pub const MaxCandidates: u32 = 200; + pub const MaxCandidates: u32 = 148; pub const MinCandidates: u32 = 5; - pub const MaxInvulnerables: u32 = 20; + pub const MaxInvulnerables: u32 = 48; pub const SlashRatio: Perbill = Perbill::from_percent(1); + pub const KickThreshold: BlockNumber = 2 * HOURS; // 2 SessionPeriod } impl pallet_collator_selection::Config for Runtime { @@ -479,7 +480,7 @@ impl pallet_collator_selection::Config for Runtime { type MinCandidates = MinCandidates; type MaxInvulnerables = MaxInvulnerables; // should be a multiple of session or things will get inconsistent - type KickThreshold = SessionPeriod; + type KickThreshold = KickThreshold; type ValidatorId = ::AccountId; type ValidatorIdOf = pallet_collator_selection::IdentityCollator; type ValidatorRegistration = Session; diff --git a/runtime/shiden/Cargo.toml b/runtime/shiden/Cargo.toml index 0e88b56f5..73fd7370f 100644 --- a/runtime/shiden/Cargo.toml +++ b/runtime/shiden/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shiden-runtime" -version = "4.31.0" +version = "4.32.0" authors = ["Stake Technologies "] edition = "2021" build = "build.rs" diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs index b9c9774a4..31c804e3a 100644 --- a/runtime/shiden/src/lib.rs +++ b/runtime/shiden/src/lib.rs @@ -100,7 +100,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("shiden"), impl_name: create_runtime_str!("shiden"), authoring_version: 1, - spec_version: 77, + spec_version: 78, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, @@ -400,10 +400,11 @@ impl pallet_session::Config for Runtime { parameter_types! { pub const PotId: PalletId = PalletId(*b"PotStake"); - pub const MaxCandidates: u32 = 200; + pub const MaxCandidates: u32 = 148; pub const MinCandidates: u32 = 5; - pub const MaxInvulnerables: u32 = 20; + pub const MaxInvulnerables: u32 = 48; pub const SlashRatio: Perbill = Perbill::from_percent(1); + pub const KickThreshold: BlockNumber = 2 * HOURS; // 2 SessionPeriod } impl pallet_collator_selection::Config for Runtime { @@ -415,7 +416,7 @@ impl pallet_collator_selection::Config for Runtime { type MinCandidates = MinCandidates; type MaxInvulnerables = MaxInvulnerables; // should be a multiple of session or things will get inconsistent - type KickThreshold = SessionPeriod; + type KickThreshold = KickThreshold; type ValidatorId = ::AccountId; type ValidatorIdOf = pallet_collator_selection::IdentityCollator; type ValidatorRegistration = Session;