From 3a8bcc792476c36448a3b28d3b8964f635bf80db Mon Sep 17 00:00:00 2001 From: Ermal Kaleci Date: Sun, 28 Jan 2024 12:07:50 +0100 Subject: [PATCH] udpate smoldot (#649) --- configs/moonbase-alpha.yml | 1 - configs/moonbeam.yml | 1 - configs/moonriver.yml | 1 - executor/Cargo.lock | 100 ++++++++++-------- executor/Cargo.toml | 2 +- executor/src/task.rs | 4 +- packages/e2e/src/author-inherent-mock.test.ts | 9 ++ rust-toolchain.toml | 2 +- vendor/smoldot | 2 +- 9 files changed, 72 insertions(+), 50 deletions(-) diff --git a/configs/moonbase-alpha.yml b/configs/moonbase-alpha.yml index 57316d21..3b1dfde0 100644 --- a/configs/moonbase-alpha.yml +++ b/configs/moonbase-alpha.yml @@ -1,6 +1,5 @@ endpoint: wss://wss.api.moonbase.moonbeam.network mock-signature-host: true -allow-unresolved-imports: true block: ${env.MOONBASE_BLOCK_NUMBER} db: ./db.sqlite diff --git a/configs/moonbeam.yml b/configs/moonbeam.yml index c32e19e8..3e35571c 100644 --- a/configs/moonbeam.yml +++ b/configs/moonbeam.yml @@ -1,6 +1,5 @@ endpoint: wss://wss.api.moonbeam.network mock-signature-host: true -allow-unresolved-imports: true block: ${env.MOONBEAM_BLOCK_NUMBER} db: ./db.sqlite diff --git a/configs/moonriver.yml b/configs/moonriver.yml index 9a4367c6..416001d9 100644 --- a/configs/moonriver.yml +++ b/configs/moonriver.yml @@ -1,6 +1,5 @@ endpoint: wss://wss.moonriver.moonbeam.network mock-signature-host: true -allow-unresolved-imports: true block: ${env.MOONRIVER_BLOCK_NUMBER} db: ./db.sqlite diff --git a/executor/Cargo.lock b/executor/Cargo.lock index 7cd0f1a7..33700f6f 100644 --- a/executor/Cargo.lock +++ b/executor/Cargo.lock @@ -72,9 +72,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bip39" @@ -245,22 +245,18 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -313,7 +309,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -481,7 +477,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -734,6 +730,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +[[package]] +name = "multi-stash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685a9ac4b61f4e728e1d2c6a7844609c16527aeb5e6c865915c08e619c16410f" + [[package]] name = "no-std-net" version = "0.6.0" @@ -767,6 +769,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-derive" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -827,22 +840,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -882,18 +895,18 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -979,18 +992,18 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.190" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] [[package]] name = "serde-wasm-bindgen" -version = "0.5.0" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" +checksum = "b9b713f70513ae1f8d92665bbbbda5c295c2cf1da5542881ae5eefe20c9af132" dependencies = [ "js-sys", "serde", @@ -1008,13 +1021,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -1098,18 +1111,18 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smoldot" -version = "0.16.0" +version = "0.17.0" dependencies = [ "arrayvec 0.7.4", "async-lock", "atomic-take", - "base64 0.21.5", + "base64 0.21.7", "bip39", "blake2-rfc", "bs58", @@ -1201,9 +1214,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -1290,7 +1303,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", "wasm-bindgen-shared", ] @@ -1324,7 +1337,7 @@ checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1337,10 +1350,13 @@ checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wasmi" -version = "0.31.0" +version = "0.32.0-beta.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f341edb80021141d4ae6468cbeefc50798716a347d4085c3811900049ea8945" +checksum = "6b962e531cc387ce15b1da00f06f727f9a9063619e74d1499c3e443d940378b0" dependencies = [ + "multi-stash", + "num-derive", + "num-traits", "smallvec", "spin", "wasmi_arena", @@ -1356,9 +1372,9 @@ checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468" [[package]] name = "wasmi_core" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" +checksum = "3ac482df6761020b2b75c9aade41c105993c5b9f64156c349bb7ccad226a6ecd" dependencies = [ "downcast-rs", "libm", @@ -1414,7 +1430,7 @@ checksum = "020f3dfe25dfc38dfea49ce62d5d45ecdd7f0d8a724fa63eb36b6eba4ec76806" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -1434,5 +1450,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] diff --git a/executor/Cargo.toml b/executor/Cargo.toml index e24da132..26e81275 100644 --- a/executor/Cargo.toml +++ b/executor/Cargo.toml @@ -19,7 +19,7 @@ serde_json = { version = "1.0", default-features = false } hex = { version = "0.4.3", default-features = false } hex-literal = "0.4.1" wasm-bindgen = "0.2.87" -serde-wasm-bindgen = "0.5" +serde-wasm-bindgen = "0.6.3" wasm-bindgen-futures = "0.4" js-sys = "0.3" log = "0.4" diff --git a/executor/src/task.rs b/executor/src/task.rs index f3580a5e..42c0ac89 100644 --- a/executor/src/task.rs +++ b/executor/src/task.rs @@ -125,7 +125,7 @@ pub async fn run_task(task: TaskCall, js: crate::JsCallback) -> Result RuntimeVersion { let vm_proto = HostVmPrototype::new(Config { module: &wasm, heap_pages: HeapPages::from(2048), - exec_hint: smoldot::executor::vm::ExecHint::Oneshot, + exec_hint: smoldot::executor::vm::ExecHint::ValidateAndExecuteOnce, allow_unresolved_imports: true, }) .unwrap(); diff --git a/packages/e2e/src/author-inherent-mock.test.ts b/packages/e2e/src/author-inherent-mock.test.ts index 4201f286..17a204ef 100644 --- a/packages/e2e/src/author-inherent-mock.test.ts +++ b/packages/e2e/src/author-inherent-mock.test.ts @@ -19,4 +19,13 @@ describe.runIf(process.env.CI || process.env.RUN_ALL)('Nimbus author inherent mo await dev.newBlock({ count: 2 }) await teardown() }) + + it('Moonbeam build blocks', async () => { + const { dev, teardown } = await setupContext({ + endpoint: 'wss://wss.api.moonbeam.network', + db: !process.env.RUN_TESTS_WITHOUT_DB ? 'e2e-tests-db.sqlite' : undefined, + }) + await dev.newBlock({ count: 2 }) + await teardown() + }) }) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 535ea1c3..8b4e2647 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.72" +channel = "1.74" targets = [ "wasm32-unknown-unknown" ] profile = "minimal" diff --git a/vendor/smoldot b/vendor/smoldot index 79e9d454..275bf806 160000 --- a/vendor/smoldot +++ b/vendor/smoldot @@ -1 +1 @@ -Subproject commit 79e9d45400c2456fafab1cf310172f5ccfbd25d8 +Subproject commit 275bf80676788e538f8afce7a4df4bc4d41b463d