From 87f4b9dd8c67e2028fdeade7f22361cf1bca97e1 Mon Sep 17 00:00:00 2001 From: zoowii Date: Tue, 29 Jul 2025 07:20:22 +0000 Subject: [PATCH] ci: update deps --- .devcontainer/Dockerfile | 2 +- .devcontainer/install_rust.sh | 4 +- .../workflows/dtvm_sol_dev_docker_release.yml | 2 +- .github/workflows/dtvm_sol_test.yml | 2 +- .github/workflows/nightly_release.yml | 2 +- .github/workflows/release.yml | 2 +- Cargo.lock | 684 ++++++++++++++++-- Cargo.toml | 1 + docker/Dockerfile | 2 +- docker/docker_build.sh | 2 +- docker/install_rust.sh | 4 +- 11 files changed, 618 insertions(+), 89 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 5b83e33..932c526 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -22,7 +22,7 @@ RUN ./emsdk activate 3.1.69 RUN curl -sSf https://mirrors.ustc.edu.cn/misc/rustup-install.sh | sh -s -- -y RUN bash -c ". /root/.cargo/env" -RUN bash -c ". ~/.cargo/env && rustup install 1.83.0 && rustup default 1.83.0" +RUN bash -c ". ~/.cargo/env && rustup install 1.84.0 && rustup default 1.84.0" WORKDIR /home/admin WORKDIR /opt diff --git a/.devcontainer/install_rust.sh b/.devcontainer/install_rust.sh index 79f2392..4233f17 100644 --- a/.devcontainer/install_rust.sh +++ b/.devcontainer/install_rust.sh @@ -2,5 +2,5 @@ set -e curl -sSf https://mirrors.ustc.edu.cn/misc/rustup-install.sh | sh -s -- -y . "$HOME/.cargo/env" -rustup install 1.83.0 -rustup default 1.83.0 +rustup install 1.84.0 +rustup default 1.84.0 diff --git a/.github/workflows/dtvm_sol_dev_docker_release.yml b/.github/workflows/dtvm_sol_dev_docker_release.yml index 08b6b3f..1f43c1d 100644 --- a/.github/workflows/dtvm_sol_dev_docker_release.yml +++ b/.github/workflows/dtvm_sol_dev_docker_release.yml @@ -31,7 +31,7 @@ jobs: uses: docker/metadata-action@v4 with: images: dtvmdev1/dtvm-sol-dev-x64 - tags: 1.83.0 + tags: 1.84.0 - name: Build and push Docker image uses: docker/build-push-action@v3 with: diff --git a/.github/workflows/dtvm_sol_test.yml b/.github/workflows/dtvm_sol_test.yml index f5ca83a..585f763 100644 --- a/.github/workflows/dtvm_sol_test.yml +++ b/.github/workflows/dtvm_sol_test.yml @@ -19,7 +19,7 @@ jobs: name: Build and test DTVM_SolSDK on x86 runs-on: ubuntu-latest container: - image: dtvmdev1/dtvm-sol-dev-x64:1.83.0 + image: dtvmdev1/dtvm-sol-dev-x64:1.84.0 steps: - name: Check out code uses: actions/checkout@v3 diff --git a/.github/workflows/nightly_release.yml b/.github/workflows/nightly_release.yml index 2aee8f1..4ca98c8 100644 --- a/.github/workflows/nightly_release.yml +++ b/.github/workflows/nightly_release.yml @@ -12,7 +12,7 @@ jobs: name: Build and Package DTVM_SolSDK Nightly # Updated name runs-on: ubuntu-latest container: - image: dtvmdev1/dtvm-sol-dev-x64:1.83.0 + image: dtvmdev1/dtvm-sol-dev-x64:1.84.0 steps: - name: Check out code uses: actions/checkout@v4 # Use v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d32ac97..79e918c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: name: Build, Create Release, and Upload Artifact runs-on: ubuntu-latest container: - image: dtvmdev1/dtvm-sol-dev-x64:1.83.0 + image: dtvmdev1/dtvm-sol-dev-x64:1.84.0 steps: - name: Check out code uses: actions/checkout@v4 diff --git a/Cargo.lock b/Cargo.lock index ae588d1..db38b8b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -449,7 +449,16 @@ version = "0.118.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e4b56ebe316895d3fa37775d0a87b0c889cc933f5c8b253dbcc7c7bcb7fe7e4" dependencies = [ - "cranelift-assembler-x64-meta", + "cranelift-assembler-x64-meta 0.118.0", +] + +[[package]] +name = "cranelift-assembler-x64" +version = "0.120.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5023e06632d8f351c2891793ccccfe4aef957954904392434038745fb6f1f68" +dependencies = [ + "cranelift-assembler-x64-meta 0.120.2", ] [[package]] @@ -458,13 +467,31 @@ version = "0.118.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95cabbc01dfbd7dcd6c329ca44f0212910309c221797ac736a67a5bc8857fe1b" +[[package]] +name = "cranelift-assembler-x64-meta" +version = "0.120.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c4012b4c8c1f6eb05c0a0a540e3e1ee992631af51aa2bbb3e712903ce4fd65" +dependencies = [ + "cranelift-srcgen", +] + [[package]] name = "cranelift-bforest" version = "0.118.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76ffe46df300a45f1dc6f609dc808ce963f0e3a2e971682c479a2d13e3b9b8ef" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.118.0", +] + +[[package]] +name = "cranelift-bforest" +version = "0.120.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d6d883b4942ef3a7104096b8bc6f2d1a41393f159ac8de12aed27b25d67f895" +dependencies = [ + "cranelift-entity 0.120.2", ] [[package]] @@ -477,6 +504,16 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "cranelift-bitset" +version = "0.120.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db7b2ee9eec6ca8a716d900d5264d678fb2c290c58c46c8da7f94ee268175d17" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "cranelift-codegen" version = "0.118.0" @@ -484,19 +521,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e606230a7e3a6897d603761baee0d19f88d077f17b996bb5089488a29ae96e41" dependencies = [ "bumpalo", - "cranelift-assembler-x64", - "cranelift-bforest", - "cranelift-bitset", - "cranelift-codegen-meta", - "cranelift-codegen-shared", - "cranelift-control", - "cranelift-entity", - "cranelift-isle", + "cranelift-assembler-x64 0.118.0", + "cranelift-bforest 0.118.0", + "cranelift-bitset 0.118.0", + "cranelift-codegen-meta 0.118.0", + "cranelift-codegen-shared 0.118.0", + "cranelift-control 0.118.0", + "cranelift-entity 0.118.0", + "cranelift-isle 0.118.0", + "gimli", + "hashbrown", + "log", + "pulley-interpreter 31.0.0", + "regalloc2 0.11.2", + "rustc-hash", + "serde", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-codegen" +version = "0.120.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeda0892577afdce1ac2e9a983a55f8c5b87a59334e1f79d8f735a2d7ba4f4b4" +dependencies = [ + "bumpalo", + "cranelift-assembler-x64 0.120.2", + "cranelift-bforest 0.120.2", + "cranelift-bitset 0.120.2", + "cranelift-codegen-meta 0.120.2", + "cranelift-codegen-shared 0.120.2", + "cranelift-control 0.120.2", + "cranelift-entity 0.120.2", + "cranelift-isle 0.120.2", "gimli", "hashbrown", "log", - "pulley-interpreter", - "regalloc2", + "pulley-interpreter 33.0.2", + "regalloc2 0.12.2", "rustc-hash", "serde", "smallvec", @@ -509,9 +572,21 @@ version = "0.118.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a63bffafc23bc60969ad528e138788495999d935f0adcfd6543cb151ca8637d" dependencies = [ - "cranelift-assembler-x64", - "cranelift-codegen-shared", - "pulley-interpreter", + "cranelift-assembler-x64 0.118.0", + "cranelift-codegen-shared 0.118.0", + "pulley-interpreter 31.0.0", +] + +[[package]] +name = "cranelift-codegen-meta" +version = "0.120.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e461480d87f920c2787422463313326f67664e68108c14788ba1676f5edfcd15" +dependencies = [ + "cranelift-assembler-x64-meta 0.120.2", + "cranelift-codegen-shared 0.120.2", + "cranelift-srcgen", + "pulley-interpreter 33.0.2", ] [[package]] @@ -520,6 +595,12 @@ version = "0.118.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af50281b67324b58e843170a6a5943cf6d387c06f7eeacc9f5696e4ab7ae7d7e" +[[package]] +name = "cranelift-codegen-shared" +version = "0.120.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976584d09f200c6c84c4b9ff7af64fc9ad0cb64dffa5780991edd3fe143a30a1" + [[package]] name = "cranelift-control" version = "0.118.0" @@ -529,13 +610,33 @@ dependencies = [ "arbitrary", ] +[[package]] +name = "cranelift-control" +version = "0.120.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46d43d70f4e17c545aa88dbf4c84d4200755d27c6e3272ebe4de65802fa6a955" +dependencies = [ + "arbitrary", +] + [[package]] name = "cranelift-entity" version = "0.118.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2c67d95507c51b4a1ff3f3555fe4bfec36b9e13c1b684ccc602736f5d5f4a2" dependencies = [ - "cranelift-bitset", + "cranelift-bitset 0.118.0", + "serde", + "serde_derive", +] + +[[package]] +name = "cranelift-entity" +version = "0.120.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d75418674520cb400c8772bfd6e11a62736c78fc1b6e418195696841d1bf91f1" +dependencies = [ + "cranelift-bitset 0.120.2", "serde", "serde_derive", ] @@ -546,7 +647,19 @@ version = "0.118.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e002691cc69c38b54fc7ec93e5be5b744f627d027031d991cc845d1d512d0ce" dependencies = [ - "cranelift-codegen", + "cranelift-codegen 0.118.0", + "log", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-frontend" +version = "0.120.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8b1a91c86687a344f3c52dd6dfb6e50db0dfa7f2e9c7711b060b3623e1fdeb" +dependencies = [ + "cranelift-codegen 0.120.2", "log", "smallvec", "target-lexicon", @@ -558,17 +671,40 @@ version = "0.118.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e93588ed1796cbcb0e2ad160403509e2c5d330d80dd6e0014ac6774c7ebac496" +[[package]] +name = "cranelift-isle" +version = "0.120.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711baa4e3432d4129295b39ec2b4040cc1b558874ba0a37d08e832e857db7285" + [[package]] name = "cranelift-native" version = "0.118.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5b09bdd6407bf5d89661b80cf926ce731c9e8cc184bf49102267a2369a8358e" dependencies = [ - "cranelift-codegen", + "cranelift-codegen 0.118.0", "libc", "target-lexicon", ] +[[package]] +name = "cranelift-native" +version = "0.120.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41c83e8666e3bcc5ffeaf6f01f356f0e1f9dcd69ce5511a1efd7ca5722001a3f" +dependencies = [ + "cranelift-codegen 0.120.2", + "libc", + "target-lexicon", +] + +[[package]] +name = "cranelift-srcgen" +version = "0.120.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e3f4d783a55c64266d17dc67d2708852235732a100fc40dd9f1051adc64d7b" + [[package]] name = "crc32fast" version = "1.4.2" @@ -774,7 +910,7 @@ dependencies = [ "serde", "serde_json", "sha3", - "thiserror", + "thiserror 1.0.69", "uint 0.9.5", ] @@ -1285,7 +1421,7 @@ dependencies = [ "libc", "llvm-sys", "once_cell", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1890,9 +2026,20 @@ version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3325791708ad50580aeacfcce06cb5e462c9ba7a2368e109cb2012b944b70e" dependencies = [ - "cranelift-bitset", + "cranelift-bitset 0.118.0", + "log", + "wasmtime-math 31.0.0", +] + +[[package]] +name = "pulley-interpreter" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "986beaef947a51d17b42b0ea18ceaa88450d35b6994737065ed505c39172db71" +dependencies = [ + "cranelift-bitset 0.120.2", "log", - "wasmtime-math", + "wasmtime-math 33.0.2", ] [[package]] @@ -2012,7 +2159,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom 0.2.16", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2029,6 +2176,20 @@ dependencies = [ "smallvec", ] +[[package]] +name = "regalloc2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5216b1837de2149f8bc8e6d5f88a9326b63b8c836ed58ce4a0a29ec736a59734" +dependencies = [ + "allocator-api2", + "bumpalo", + "hashbrown", + "log", + "rustc-hash", + "smallvec", +] + [[package]] name = "regex" version = "1.11.1" @@ -2403,7 +2564,16 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +dependencies = [ + "thiserror-impl 2.0.12", ] [[package]] @@ -2417,6 +2587,17 @@ dependencies = [ "syn", ] +[[package]] +name = "thiserror-impl" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tiny-keccak" version = "2.0.2" @@ -2769,8 +2950,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cc3b1f053f5d41aa55640a1fa9b6d1b8a9e4418d118ce308d20e24ff3575a8c" dependencies = [ "bitflags", + "hashbrown", "indexmap", "semver", + "serde", ] [[package]] @@ -2784,6 +2967,17 @@ dependencies = [ "wasmparser 0.226.0", ] +[[package]] +name = "wasmprinter" +version = "0.229.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d25dac01892684a99b8fbfaf670eb6b56edea8a096438c75392daeb83156ae2e" +dependencies = [ + "anyhow", + "termcolor", + "wasmparser 0.229.0", +] + [[package]] name = "wasmtime" version = "31.0.0" @@ -2812,7 +3006,7 @@ dependencies = [ "paste", "postcard", "psm", - "pulley-interpreter", + "pulley-interpreter 31.0.0", "rayon", "rustix 0.38.44", "semver", @@ -2825,23 +3019,71 @@ dependencies = [ "trait-variant", "wasm-encoder 0.226.0", "wasmparser 0.226.0", - "wasmtime-asm-macros", + "wasmtime-asm-macros 31.0.0", "wasmtime-cache", - "wasmtime-component-macro", - "wasmtime-component-util", - "wasmtime-cranelift", - "wasmtime-environ", - "wasmtime-fiber", + "wasmtime-component-macro 31.0.0", + "wasmtime-component-util 31.0.0", + "wasmtime-cranelift 31.0.0", + "wasmtime-environ 31.0.0", + "wasmtime-fiber 31.0.0", "wasmtime-jit-debug", - "wasmtime-jit-icache-coherence", - "wasmtime-math", - "wasmtime-slab", - "wasmtime-versioned-export-macros", - "wasmtime-winch", + "wasmtime-jit-icache-coherence 31.0.0", + "wasmtime-math 31.0.0", + "wasmtime-slab 31.0.0", + "wasmtime-versioned-export-macros 31.0.0", + "wasmtime-winch 31.0.0", "wat", "windows-sys 0.59.0", ] +[[package]] +name = "wasmtime" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57373e1d8699662fb791270ac5dfac9da5c14f618ecf940cdb29dc3ad9472a3c" +dependencies = [ + "addr2line", + "anyhow", + "async-trait", + "bitflags", + "bumpalo", + "cc", + "cfg-if", + "encoding_rs", + "hashbrown", + "indexmap", + "libc", + "log", + "mach2", + "memfd", + "object", + "once_cell", + "postcard", + "psm", + "pulley-interpreter 33.0.2", + "rustix 1.0.5", + "semver", + "serde", + "serde_derive", + "smallvec", + "sptr", + "target-lexicon", + "trait-variant", + "wasmparser 0.229.0", + "wasmtime-asm-macros 33.0.2", + "wasmtime-component-macro 33.0.2", + "wasmtime-component-util 33.0.2", + "wasmtime-cranelift 33.0.2", + "wasmtime-environ 33.0.2", + "wasmtime-fiber 33.0.2", + "wasmtime-jit-icache-coherence 33.0.2", + "wasmtime-math 33.0.2", + "wasmtime-slab 33.0.2", + "wasmtime-versioned-export-macros 33.0.2", + "wasmtime-winch 33.0.2", + "windows-sys 0.59.0", +] + [[package]] name = "wasmtime-asm-macros" version = "31.0.0" @@ -2851,6 +3093,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "wasmtime-asm-macros" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0fc91372865167a695dc98d0d6771799a388a7541d3f34e939d0539d6583de" +dependencies = [ + "cfg-if", +] + [[package]] name = "wasmtime-cache" version = "31.0.0" @@ -2881,9 +3132,24 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wasmtime-component-util", - "wasmtime-wit-bindgen", - "wit-parser", + "wasmtime-component-util 31.0.0", + "wasmtime-wit-bindgen 31.0.0", + "wit-parser 0.226.0", +] + +[[package]] +name = "wasmtime-component-macro" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25c9c7526675ff9a9794b115023c4af5128e3eb21389bfc3dc1fd344d549258f" +dependencies = [ + "anyhow", + "proc-macro2", + "quote", + "syn", + "wasmtime-component-util 33.0.2", + "wasmtime-wit-bindgen 33.0.2", + "wit-parser 0.229.0", ] [[package]] @@ -2892,6 +3158,12 @@ version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f292ef5eb2cf3d414c2bde59c7fa0feeba799c8db9a8c5a656ad1d1a1d05e10b" +[[package]] +name = "wasmtime-component-util" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc42ec8b078875804908d797cb4950fec781d9add9684c9026487fd8eb3f6291" + [[package]] name = "wasmtime-cranelift" version = "31.0.0" @@ -2900,22 +3172,48 @@ checksum = "52fc12eb8ea695a30007a4849a5fd56209dd86a15579e92e0c27c27122818505" dependencies = [ "anyhow", "cfg-if", - "cranelift-codegen", - "cranelift-control", - "cranelift-entity", - "cranelift-frontend", - "cranelift-native", + "cranelift-codegen 0.118.0", + "cranelift-control 0.118.0", + "cranelift-entity 0.118.0", + "cranelift-frontend 0.118.0", + "cranelift-native 0.118.0", "gimli", "itertools 0.12.1", "log", "object", - "pulley-interpreter", + "pulley-interpreter 31.0.0", "smallvec", "target-lexicon", - "thiserror", + "thiserror 1.0.69", "wasmparser 0.226.0", - "wasmtime-environ", - "wasmtime-versioned-export-macros", + "wasmtime-environ 31.0.0", + "wasmtime-versioned-export-macros 31.0.0", +] + +[[package]] +name = "wasmtime-cranelift" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2bd72f0a6a0ffcc6a184ec86ac35c174e48ea0e97bbae277c8f15f8bf77a566" +dependencies = [ + "anyhow", + "cfg-if", + "cranelift-codegen 0.120.2", + "cranelift-control 0.120.2", + "cranelift-entity 0.120.2", + "cranelift-frontend 0.120.2", + "cranelift-native 0.120.2", + "gimli", + "itertools 0.14.0", + "log", + "object", + "pulley-interpreter 33.0.2", + "smallvec", + "target-lexicon", + "thiserror 2.0.12", + "wasmparser 0.229.0", + "wasmtime-environ 33.0.2", + "wasmtime-versioned-export-macros 33.0.2", ] [[package]] @@ -2926,8 +3224,8 @@ checksum = "5b6b4bf08e371edf262cccb62de10e214bd4aaafaa069f1cd49c9c1c3a5ae8e4" dependencies = [ "anyhow", "cpp_demangle", - "cranelift-bitset", - "cranelift-entity", + "cranelift-bitset 0.118.0", + "cranelift-entity 0.118.0", "gimli", "indexmap", "log", @@ -2941,8 +3239,33 @@ dependencies = [ "target-lexicon", "wasm-encoder 0.226.0", "wasmparser 0.226.0", - "wasmprinter", - "wasmtime-component-util", + "wasmprinter 0.226.0", + "wasmtime-component-util 31.0.0", +] + +[[package]] +name = "wasmtime-environ" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6187bb108a23eb25d2a92aa65d6c89fb5ed53433a319038a2558567f3011ff2" +dependencies = [ + "anyhow", + "cranelift-bitset 0.120.2", + "cranelift-entity 0.120.2", + "gimli", + "indexmap", + "log", + "object", + "postcard", + "semver", + "serde", + "serde_derive", + "smallvec", + "target-lexicon", + "wasm-encoder 0.229.0", + "wasmparser 0.229.0", + "wasmprinter 0.229.0", + "wasmtime-component-util 33.0.2", ] [[package]] @@ -2955,8 +3278,23 @@ dependencies = [ "cc", "cfg-if", "rustix 0.38.44", - "wasmtime-asm-macros", - "wasmtime-versioned-export-macros", + "wasmtime-asm-macros 31.0.0", + "wasmtime-versioned-export-macros 31.0.0", + "windows-sys 0.59.0", +] + +[[package]] +name = "wasmtime-fiber" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc8965d2128c012329f390e24b8b2758dd93d01bf67e1a1a0dd3d8fd72f56873" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "rustix 1.0.5", + "wasmtime-asm-macros 33.0.2", + "wasmtime-versioned-export-macros 33.0.2", "windows-sys 0.59.0", ] @@ -2969,7 +3307,7 @@ dependencies = [ "cc", "object", "rustix 0.38.44", - "wasmtime-versioned-export-macros", + "wasmtime-versioned-export-macros 31.0.0", ] [[package]] @@ -2984,6 +3322,18 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7af0e940cb062a45c0b3f01a926f77da5947149e99beb4e3dd9846d5b8f11619" +dependencies = [ + "anyhow", + "cfg-if", + "libc", + "windows-sys 0.59.0", +] + [[package]] name = "wasmtime-math" version = "31.0.0" @@ -2993,12 +3343,27 @@ dependencies = [ "libm", ] +[[package]] +name = "wasmtime-math" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acfca360e719dda9a27e26944f2754ff2fd5bad88e21919c42c5a5f38ddd93cb" +dependencies = [ + "libm", +] + [[package]] name = "wasmtime-slab" version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84d6a321317281b721c5530ef733e8596ecc6065035f286ccd155b3fa8e0ab2f" +[[package]] +name = "wasmtime-slab" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e240559cada55c4b24af979d5f6c95e0029f5772f32027ec3c62b258aaff65" + [[package]] name = "wasmtime-versioned-export-macros" version = "31.0.0" @@ -3010,6 +3375,17 @@ dependencies = [ "syn", ] +[[package]] +name = "wasmtime-versioned-export-macros" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0963c1438357a3d8c0efe152b4ef5259846c1cf8b864340270744fe5b3bae5e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "wasmtime-wasi" version = "31.0.0" @@ -3031,13 +3407,44 @@ dependencies = [ "io-lifetimes", "rustix 0.38.44", "system-interface", - "thiserror", + "thiserror 1.0.69", + "tokio", + "tracing", + "url", + "wasmtime 31.0.0", + "wasmtime-wasi-io 31.0.0", + "wiggle 31.0.0", + "windows-sys 0.59.0", +] + +[[package]] +name = "wasmtime-wasi" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae951b72c7c6749a1c15dcdfb6d940a2614c932b4a54f474636e78e2c744b4c" +dependencies = [ + "anyhow", + "async-trait", + "bitflags", + "bytes", + "cap-fs-ext", + "cap-net-ext", + "cap-rand", + "cap-std", + "cap-time-ext", + "fs-set-times", + "futures", + "io-extras", + "io-lifetimes", + "rustix 1.0.5", + "system-interface", + "thiserror 2.0.12", "tokio", "tracing", "url", - "wasmtime", - "wasmtime-wasi-io", - "wiggle", + "wasmtime 33.0.2", + "wasmtime-wasi-io 33.0.2", + "wiggle 33.0.2", "windows-sys 0.59.0", ] @@ -3051,7 +3458,20 @@ dependencies = [ "async-trait", "bytes", "futures", - "wasmtime", + "wasmtime 31.0.0", +] + +[[package]] +name = "wasmtime-wasi-io" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a835790dcecc3d7051ec67da52ba9e04af25e1bc204275b9391e3f0042b10797" +dependencies = [ + "anyhow", + "async-trait", + "bytes", + "futures", + "wasmtime 33.0.2", ] [[package]] @@ -3061,14 +3481,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3aa4741ee66a52e2f0ec5f79040017123ba47d2dff9d994b35879cc2b7f468d4" dependencies = [ "anyhow", - "cranelift-codegen", + "cranelift-codegen 0.118.0", "gimli", "object", "target-lexicon", "wasmparser 0.226.0", - "wasmtime-cranelift", - "wasmtime-environ", - "winch-codegen", + "wasmtime-cranelift 31.0.0", + "wasmtime-environ 31.0.0", + "winch-codegen 31.0.0", +] + +[[package]] +name = "wasmtime-winch" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbc3b117d03d6eeabfa005a880c5c22c06503bb8820f3aa2e30f0e8d87b6752f" +dependencies = [ + "anyhow", + "cranelift-codegen 0.120.2", + "gimli", + "object", + "target-lexicon", + "wasmparser 0.229.0", + "wasmtime-cranelift 33.0.2", + "wasmtime-environ 33.0.2", + "winch-codegen 33.0.2", ] [[package]] @@ -3080,7 +3517,19 @@ dependencies = [ "anyhow", "heck", "indexmap", - "wit-parser", + "wit-parser 0.226.0", +] + +[[package]] +name = "wasmtime-wit-bindgen" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1382f4f09390eab0d75d4994d0c3b0f6279f86a571807ec67a8253c87cf6a145" +dependencies = [ + "anyhow", + "heck", + "indexmap", + "wit-parser 0.229.0", ] [[package]] @@ -3123,10 +3572,25 @@ dependencies = [ "anyhow", "async-trait", "bitflags", - "thiserror", + "thiserror 1.0.69", "tracing", - "wasmtime", - "wiggle-macro", + "wasmtime 31.0.0", + "wiggle-macro 31.0.0", +] + +[[package]] +name = "wiggle" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "649c1aca13ef9e9dccf2d5efbbebf12025bc5521c3fb7754355ef60f5eb810be" +dependencies = [ + "anyhow", + "async-trait", + "bitflags", + "thiserror 2.0.12", + "tracing", + "wasmtime 33.0.2", + "wiggle-macro 33.0.2", ] [[package]] @@ -3144,6 +3608,20 @@ dependencies = [ "witx", ] +[[package]] +name = "wiggle-generate" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "164870fc34214ee42bd81b8ce9e7c179800fa1a7d4046d17a84e7f7bf422c8ad" +dependencies = [ + "anyhow", + "heck", + "proc-macro2", + "quote", + "syn", + "witx", +] + [[package]] name = "wiggle-macro" version = "31.0.0" @@ -3153,7 +3631,19 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wiggle-generate", + "wiggle-generate 31.0.0", +] + +[[package]] +name = "wiggle-macro" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d873bb5b59ca703b5e41562e96a4796d1af61bf4cf80bf8a7abda755a380ec1c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wiggle-generate 33.0.2", ] [[package]] @@ -3194,15 +3684,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e02f05457f74ec3c94d5c5caac06b84fd8d9d4d7fa21419189845ed245a53477" dependencies = [ "anyhow", - "cranelift-codegen", + "cranelift-codegen 0.118.0", "gimli", - "regalloc2", + "regalloc2 0.11.2", "smallvec", "target-lexicon", - "thiserror", + "thiserror 1.0.69", "wasmparser 0.226.0", - "wasmtime-cranelift", - "wasmtime-environ", + "wasmtime-cranelift 31.0.0", + "wasmtime-environ 31.0.0", +] + +[[package]] +name = "winch-codegen" +version = "33.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7914c296fbcef59d1b89a15e82384d34dc9669bc09763f2ef068a28dd3a64ebf" +dependencies = [ + "anyhow", + "cranelift-assembler-x64 0.120.2", + "cranelift-codegen 0.120.2", + "gimli", + "regalloc2 0.12.2", + "smallvec", + "target-lexicon", + "thiserror 2.0.12", + "wasmparser 0.229.0", + "wasmtime-cranelift 33.0.2", + "wasmtime-environ 33.0.2", ] [[package]] @@ -3392,6 +3901,24 @@ dependencies = [ "wasmparser 0.226.0", ] +[[package]] +name = "wit-parser" +version = "0.229.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "459c6ba62bf511d6b5f2a845a2a736822e38059c1cfa0b644b467bbbfae4efa6" +dependencies = [ + "anyhow", + "id-arena", + "indexmap", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser 0.229.0", +] + [[package]] name = "witx" version = "0.9.1" @@ -3400,7 +3927,7 @@ checksum = "e366f27a5cabcddb2706a78296a40b8fcc451e1a6aba2fc1d94b4a01bdaaef4b" dependencies = [ "anyhow", "log", - "thiserror", + "thiserror 1.0.69", "wast 35.0.2", ] @@ -3416,8 +3943,8 @@ dependencies = [ "rayon", "wasm-encoder 0.228.0", "wasmparser 0.228.0", - "wasmtime", - "wasmtime-wasi", + "wasmtime 31.0.0", + "wasmtime-wasi 31.0.0", ] [[package]] @@ -3493,6 +4020,7 @@ dependencies = [ "regex", "tempfile", "tokio", + "wasmtime-wasi 33.0.2", "wizer", ] diff --git a/Cargo.toml b/Cargo.toml index 76e9d9a..f0f8231 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,6 +33,7 @@ home = "0.5.11" ethabi = "18.0.0" ethereum-types = "0.14.1" tokio = "1.44.2" +wasmtime-wasi = "33.0.2" wizer = "9.0.0" [features] diff --git a/docker/Dockerfile b/docker/Dockerfile index 67fd642..570274f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -24,7 +24,7 @@ USER root RUN curl -sSf https://mirrors.ustc.edu.cn/misc/rustup-install.sh | sh -s -- -y RUN bash -c ". /root/.cargo/env" COPY cargo_config /root/.cargo/config.toml -RUN bash -c ". ~/.cargo/env && rustup install 1.83.0 && rustup default 1.83.0" +RUN bash -c ". ~/.cargo/env && rustup install 1.84.0 && rustup default 1.84.0" WORKDIR /home/admin USER root WORKDIR /opt diff --git a/docker/docker_build.sh b/docker/docker_build.sh index fee1c41..bfd0d13 100755 --- a/docker/docker_build.sh +++ b/docker/docker_build.sh @@ -6,6 +6,6 @@ if [ "$1" = "prepare" ]; then ls else cd docker - docker build . --platform linux/x86_64 -f Dockerfile -t dtvmdev1/dtvm-sol-dev-x64:1.83.0 + docker build . --platform linux/x86_64 -f Dockerfile -t dtvmdev1/dtvm-sol-dev-x64:1.84.0 cd .. fi diff --git a/docker/install_rust.sh b/docker/install_rust.sh index 79f2392..4233f17 100644 --- a/docker/install_rust.sh +++ b/docker/install_rust.sh @@ -2,5 +2,5 @@ set -e curl -sSf https://mirrors.ustc.edu.cn/misc/rustup-install.sh | sh -s -- -y . "$HOME/.cargo/env" -rustup install 1.83.0 -rustup default 1.83.0 +rustup install 1.84.0 +rustup default 1.84.0