From da854de55fbb2f48bcfc450e2d1dda09107c6fd5 Mon Sep 17 00:00:00 2001 From: Dmitryii Osipov Date: Thu, 8 Aug 2024 16:44:15 +0400 Subject: [PATCH] chore(api): fix ci (#1612) --- .github/workflows/CI-CD-gear-js-api.yml | 61 +-- api/programs/Cargo.lock | 533 +++++++++++--------- api/programs/Cargo.toml | 24 +- api/programs/empty/Cargo.toml | 4 +- api/programs/rust-toolchain.toml | 5 - api/programs/test-gas/Cargo.toml | 8 +- api/programs/test-gas/src/lib.rs | 17 - api/programs/test-meta/Cargo.toml | 9 +- api/programs/test-meta/io/Cargo.toml | 10 +- api/programs/test-meta/src/lib.rs | 3 - api/programs/test-meta/state-v1/Cargo.toml | 6 +- api/programs/test-meta/state-v1/src/wasm.rs | 2 +- api/programs/test-meta/state-v2/Cargo.toml | 6 +- api/programs/test-waitlist/Cargo.toml | 8 +- 14 files changed, 360 insertions(+), 336 deletions(-) delete mode 100644 api/programs/rust-toolchain.toml diff --git a/.github/workflows/CI-CD-gear-js-api.yml b/.github/workflows/CI-CD-gear-js-api.yml index 66f9019ec5..3a27e97ebe 100644 --- a/.github/workflows/CI-CD-gear-js-api.yml +++ b/.github/workflows/CI-CD-gear-js-api.yml @@ -10,15 +10,15 @@ on: - api/** workflow_dispatch: -env: - NIGHTLY_TOOLCHAIN_VERSION: ${{ vars.NIGHTLY_TOOLCHAIN_VERSION }} +env: + BINARYEN_VERSION: version_111 jobs: test: if: github.event_name == 'pull_request' runs-on: ubuntu-22.04 - env: + env: RUSTUP_HOME: /tmp/rustup_home steps: - name: Cancel previous workflow runs @@ -27,64 +27,47 @@ jobs: access_token: ${{ github.token }} - uses: actions/checkout@v3 - - name: "Install: NodeJS 18.x" - uses: actions/setup-node@v3 + - name: 'Install: NodeJS 20.x' + uses: actions/setup-node@v4 with: - node-version: 18.x - - - name: "Install: Set cargo path" - run: echo "/tmp/cargo/bin" >> $GITHUB_PATH + node-version: 20.x - - name: "Install: Nightly toolchain" - uses: actions-rs/toolchain@v1 + - name: Set up Rust + uses: dtolnay/rust-toolchain@stable with: - toolchain: nightly - target: wasm32-unknown-unknown - components: llvm-tools-preview - - - name: "Install: Show specific nightly version" - if: ${{ env.NIGHTLY_TOOLCHAIN_VERSION != '' }} - run: echo $NIGHTLY_TOOLCHAIN_VERSION | sed 's/-/ - /g' - - - name: "Install: Specific nightly toolchain" - if: ${{ env.NIGHTLY_TOOLCHAIN_VERSION != '' }} - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly-${{ env.NIGHTLY_TOOLCHAIN_VERSION }} - target: wasm32-unknown-unknown - components: llvm-tools-preview + targets: wasm32-unknown-unknown + components: clippy, rustfmt - - name: "Install: Pin to specific nightly toolchain" - if: ${{ env.NIGHTLY_TOOLCHAIN_VERSION != '' }} + - name: 'Install: binaryen' run: | - rm -rf $RUSTUP_HOME/toolchains/nightly-x86_64-unknown-linux-gnu - ln -s $RUSTUP_HOME/toolchains/nightly-$NIGHTLY_TOOLCHAIN_VERSION-x86_64-unknown-linux-gnu $RUSTUP_HOME/toolchains/nightly-x86_64-unknown-linux-gnu - - - name: "Install: pkg dependencies" + wget -c https://github.com/WebAssembly/binaryen/releases/download/$BINARYEN_VERSION/binaryen-$BINARYEN_VERSION-x86_64-linux.tar.gz -O - | tar -xz -C . + sudo cp binaryen-$BINARYEN_VERSION/bin/wasm-opt /usr/bin/ + + - name: 'Install: pkg dependencies' working-directory: api run: yarn install - - name: "Build: @gear-js/api" + - name: 'Build: @gear-js/api' working-directory: api run: yarn build - - name: "Prepare: build programs" + - name: 'Prepare: build programs' working-directory: api/programs run: cargo build --locked - - name: "Prepare: download Gear node" + - name: 'Prepare: download Gear node' run: | wget -O ./gear https://github.com/gear-tech/gear/releases/download/build/gear chmod +x gear - - name: "Prepare: run Gear node" - run: | + - name: 'Prepare: run Gear node' + run: | nohup ./gear --dev --execution=wasm --tmp --unsafe-rpc-external --rpc-methods Unsafe --rpc-cors all & - - name: "Prepare: sleep 3 min" + - name: 'Prepare: sleep 3 min' run: sleep 180 - - name: "Test: run" + - name: 'Test: run' working-directory: api run: yarn test diff --git a/api/programs/Cargo.lock b/api/programs/Cargo.lock index d0dcddbca7..d698d622f8 100644 --- a/api/programs/Cargo.lock +++ b/api/programs/Cargo.lock @@ -16,18 +16,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -46,18 +46,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" - -[[package]] -name = "arrayvec" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -dependencies = [ - "nodrop", -] +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arrayvec" @@ -67,21 +58,15 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitvec" @@ -96,29 +81,34 @@ dependencies = [ ] [[package]] -name = "blake2-rfc" -version = "0.2.18" +name = "blake2" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "arrayvec 0.4.12", - "constant_time_eq", + "digest", ] [[package]] -name = "bs58" -version = "0.5.0" +name = "block-buffer" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "tinyvec", + "generic-array", ] +[[package]] +name = "bs58" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" + [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byte-slice-cast" @@ -134,18 +124,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "camino" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" dependencies = [ "serde", ] [[package]] name = "cargo-platform" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" dependencies = [ "serde", ] @@ -166,9 +156,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.90" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549" [[package]] name = "cfg-if" @@ -178,16 +168,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -220,12 +210,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "convert_case" version = "0.4.0" @@ -244,17 +228,38 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.72", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", ] [[package]] @@ -279,9 +284,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "empty" @@ -302,13 +307,13 @@ dependencies = [ [[package]] name = "enum-iterator-derive" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" +checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.72", ] [[package]] @@ -319,9 +324,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -333,6 +338,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ + "rustc-hex", "static_assertions", ] @@ -405,49 +411,53 @@ dependencies = [ [[package]] name = "galloc" -version = "1.1.2" -source = "git+https://github.com/gear-tech/gear.git#529cdefd711892e2e33d086a4072ad3af6a2f83f" +version = "1.5.0" +source = "git+https://github.com/gear-tech/gear.git#e31c4099f7e4050579384a3d8319c6d33963e2bd" dependencies = [ "gear-dlmalloc", ] [[package]] name = "gcore" -version = "1.1.2" -source = "git+https://github.com/gear-tech/gear.git#529cdefd711892e2e33d086a4072ad3af6a2f83f" +version = "1.5.0" +source = "git+https://github.com/gear-tech/gear.git#e31c4099f7e4050579384a3d8319c6d33963e2bd" dependencies = [ "gear-core-errors", "gear-stack-buffer", + "gprimitives", "gsys", "parity-scale-codec", ] [[package]] name = "gear-core" -version = "1.1.2" -source = "git+https://github.com/gear-tech/gear.git#529cdefd711892e2e33d086a4072ad3af6a2f83f" +version = "1.5.0" +source = "git+https://github.com/gear-tech/gear.git#e31c4099f7e4050579384a3d8319c6d33963e2bd" dependencies = [ - "blake2-rfc", + "blake2", "byteorder", "derive_more", "enum-iterator", "gear-core-errors", "gear-wasm-instrument", + "gprimitives", "gsys", "hashbrown", "hex", "log", "num-traits", + "numerated", "parity-scale-codec", "paste", + "primitive-types", "scale-info", "wasmparser-nostd", ] [[package]] name = "gear-core-errors" -version = "1.1.2" -source = "git+https://github.com/gear-tech/gear.git#529cdefd711892e2e33d086a4072ad3af6a2f83f" +version = "1.5.0" +source = "git+https://github.com/gear-tech/gear.git#e31c4099f7e4050579384a3d8319c6d33963e2bd" dependencies = [ "derive_more", "enum-iterator", @@ -478,10 +488,20 @@ dependencies = [ "log", ] +[[package]] +name = "gear-ss58" +version = "1.5.0" +source = "git+https://github.com/gear-tech/gear.git#e31c4099f7e4050579384a3d8319c6d33963e2bd" +dependencies = [ + "blake2", + "bs58", + "hex", +] + [[package]] name = "gear-stack-buffer" -version = "1.1.2" -source = "git+https://github.com/gear-tech/gear.git#529cdefd711892e2e33d086a4072ad3af6a2f83f" +version = "1.5.0" +source = "git+https://github.com/gear-tech/gear.git#e31c4099f7e4050579384a3d8319c6d33963e2bd" [[package]] name = "gear-wasm" @@ -491,8 +511,8 @@ checksum = "bbfbfa701dc65e683fcd2fb24f046bcef22634acbdf47ad14724637dc39ad05b" [[package]] name = "gear-wasm-builder" -version = "1.1.2" -source = "git+https://github.com/gear-tech/gear.git#529cdefd711892e2e33d086a4072ad3af6a2f83f" +version = "1.5.0" +source = "git+https://github.com/gear-tech/gear.git#e31c4099f7e4050579384a3d8319c6d33963e2bd" dependencies = [ "anyhow", "cargo_metadata", @@ -504,9 +524,9 @@ dependencies = [ "gear-wasm-instrument", "gmeta", "log", - "once_cell", "pathdiff", "regex", + "rustc_version", "thiserror", "toml", "wasmparser-nostd", @@ -515,19 +535,29 @@ dependencies = [ [[package]] name = "gear-wasm-instrument" -version = "1.1.2" -source = "git+https://github.com/gear-tech/gear.git#529cdefd711892e2e33d086a4072ad3af6a2f83f" +version = "1.5.0" +source = "git+https://github.com/gear-tech/gear.git#e31c4099f7e4050579384a3d8319c6d33963e2bd" dependencies = [ "derive_more", "enum-iterator", "gwasm-instrument", ] +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -536,10 +566,10 @@ dependencies = [ [[package]] name = "gmeta" -version = "1.1.2" -source = "git+https://github.com/gear-tech/gear.git#529cdefd711892e2e33d086a4072ad3af6a2f83f" +version = "1.5.0" +source = "git+https://github.com/gear-tech/gear.git#e31c4099f7e4050579384a3d8319c6d33963e2bd" dependencies = [ - "blake2-rfc", + "blake2", "derive_more", "gmeta-codegen", "hex", @@ -548,21 +578,33 @@ dependencies = [ [[package]] name = "gmeta-codegen" -version = "1.1.2" -source = "git+https://github.com/gear-tech/gear.git#529cdefd711892e2e33d086a4072ad3af6a2f83f" +version = "1.5.0" +source = "git+https://github.com/gear-tech/gear.git#e31c4099f7e4050579384a3d8319c6d33963e2bd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.72", +] + +[[package]] +name = "gprimitives" +version = "1.5.0" +source = "git+https://github.com/gear-tech/gear.git#e31c4099f7e4050579384a3d8319c6d33963e2bd" +dependencies = [ + "derive_more", + "gear-ss58", + "hex", + "parity-scale-codec", + "primitive-types", + "scale-info", ] [[package]] name = "gstd" -version = "1.1.2" -source = "git+https://github.com/gear-tech/gear.git#529cdefd711892e2e33d086a4072ad3af6a2f83f" +version = "1.5.0" +source = "git+https://github.com/gear-tech/gear.git#e31c4099f7e4050579384a3d8319c6d33963e2bd" dependencies = [ - "arrayvec 0.7.4", - "bs58", + "arrayvec", "const_format", "futures", "galloc", @@ -572,24 +614,24 @@ dependencies = [ "hashbrown", "hex", "parity-scale-codec", - "primitive-types", "scale-info", ] [[package]] name = "gstd-codegen" -version = "1.1.2" -source = "git+https://github.com/gear-tech/gear.git#529cdefd711892e2e33d086a4072ad3af6a2f83f" +version = "1.5.0" +source = "git+https://github.com/gear-tech/gear.git#e31c4099f7e4050579384a3d8319c6d33963e2bd" dependencies = [ + "gprimitives", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.72", ] [[package]] name = "gsys" -version = "1.1.2" -source = "git+https://github.com/gear-tech/gear.git#529cdefd711892e2e33d086a4072ad3af6a2f83f" +version = "1.5.0" +source = "git+https://github.com/gear-tech/gear.git#e31c4099f7e4050579384a3d8319c6d33963e2bd" [[package]] name = "gwasm-instrument" @@ -602,9 +644,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -670,9 +712,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", "hashbrown", @@ -686,9 +728,9 @@ checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" @@ -701,69 +743,73 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libc-print" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17f111e2175c779daaf5e89fe3a3b0776b0adec218bc1159c56e4d3f58032f5" +checksum = "a4a660208db49e35faf57b37484350f1a61072f2a5becf0592af6015d9ddd4b0" dependencies = [ "libc", ] [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.2", + "bitflags", "libc", - "redox_syscall", ] [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "nodrop" -version = "0.1.14" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] +[[package]] +name = "numerated" +version = "1.5.0" +source = "git+https://github.com/gear-tech/gear.git#e31c4099f7e4050579384a3d8319c6d33963e2bd" +dependencies = [ + "derive_more", + "num-traits", + "parity-scale-codec", + "scale-info", +] + [[package]] name = "once_cell" version = "1.19.0" @@ -786,7 +832,7 @@ version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bitvec", "byte-slice-cast", "impl-trait-for-tuples", @@ -808,9 +854,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" @@ -820,9 +866,9 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -853,18 +899,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -875,20 +921,11 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -897,9 +934,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -909,9 +946,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -920,9 +957,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "rustc-hex" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" [[package]] name = "rustc_version" @@ -935,11 +978,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags", "errno", "libc", "linux-raw-sys", @@ -948,9 +991,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "scale-info" @@ -978,49 +1021,50 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.197" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.72", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -1037,6 +1081,12 @@ version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ceb97b7225c713c2fd4db0153cb6b3cab244eb37900c3f634ed4d43310d8c34" +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + [[package]] name = "syn" version = "1.0.109" @@ -1050,9 +1100,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -1142,84 +1192,75 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.72", ] -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "toml" -version = "0.7.8" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.19.15", + "toml_edit 0.22.20", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", - "serde", - "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", + "serde", + "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.18", ] +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + [[package]] name = "uint" version = "0.9.5" @@ -1246,9 +1287,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wasi" @@ -1277,7 +1318,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.72", "wasm-bindgen-shared", ] @@ -1299,7 +1340,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1312,9 +1353,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasmparser-nostd" -version = "0.100.1" +version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +checksum = "d5a015fe95f3504a94bb1462c717aae75253e39b9dd6c3fb1062c934535c64aa" dependencies = [ "indexmap-nostd", ] @@ -1359,7 +1400,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -1377,7 +1418,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -1397,17 +1438,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -1418,9 +1460,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -1430,9 +1472,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -1442,9 +1484,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -1454,9 +1502,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -1466,9 +1514,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -1478,9 +1526,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -1490,9 +1538,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -1503,6 +1551,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + [[package]] name = "wyz" version = "0.5.1" @@ -1514,20 +1571,20 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.72", ] diff --git a/api/programs/Cargo.toml b/api/programs/Cargo.toml index 9ee1d79c61..3d74c1e7e3 100644 --- a/api/programs/Cargo.toml +++ b/api/programs/Cargo.toml @@ -1,13 +1,23 @@ [workspace] resolver = "2" -members = [ - "test-gas", - "test-waitlist", - "test-meta", - "empty" -] +members = ["test-gas", "test-waitlist", "test-meta", "empty"] [profile.release] lto = true -opt-level = 's' \ No newline at end of file +opt-level = 's' + +[workspace.dependencies] +gstd = { git = "https://github.com/gear-tech/gear.git" } +scale-info = { version = "2.11.0", default-features = false, features = [ + "derive", +] } +codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false, features = [ + "derive", + "full", +] } +gear-wasm-builder = { git = "https://github.com/gear-tech/gear.git", features = [ + "metawasm", +] } +gmeta = { git = "https://github.com/gear-tech/gear.git" } +primitive-types = { version = "0.12.2", default-features = false } diff --git a/api/programs/empty/Cargo.toml b/api/programs/empty/Cargo.toml index 97415cfc91..f6aa5deea5 100644 --- a/api/programs/empty/Cargo.toml +++ b/api/programs/empty/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Gear Technologies"] edition = "2021" [dependencies] -gstd = { git = "https://github.com/gear-tech/gear.git" } +gstd.workspace = true [build-dependencies] -gear-wasm-builder = { git = "https://github.com/gear-tech/gear.git" } +gear-wasm-builder.workspace = true diff --git a/api/programs/rust-toolchain.toml b/api/programs/rust-toolchain.toml deleted file mode 100644 index 313581a729..0000000000 --- a/api/programs/rust-toolchain.toml +++ /dev/null @@ -1,5 +0,0 @@ -[toolchain] -channel = "nightly-2024-01-25" -components = [ "llvm-tools" ] -targets = [ "wasm32-unknown-unknown" ] -profile = "default" \ No newline at end of file diff --git a/api/programs/test-gas/Cargo.toml b/api/programs/test-gas/Cargo.toml index 83c979303c..62fcf6259b 100644 --- a/api/programs/test-gas/Cargo.toml +++ b/api/programs/test-gas/Cargo.toml @@ -5,11 +5,11 @@ authors = ["Gear Technologies"] edition = "2021" [dependencies] -gstd = { git = "https://github.com/gear-tech/gear.git" } -scale-info = { version = "2.11.0", default-features = false, features = ["derive"] } -codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false, features = ["derive", "full"] } +gstd.workspace = true +scale-info.workspace = true +codec.workspace = true test-gas-io = { path = "io" } [build-dependencies] -gear-wasm-builder = { git = "https://github.com/gear-tech/gear.git" } +gear-wasm-builder.workspace = true test-gas-io = { path = "io" } diff --git a/api/programs/test-gas/src/lib.rs b/api/programs/test-gas/src/lib.rs index 9c26c41508..de5eb4b3d7 100644 --- a/api/programs/test-gas/src/lib.rs +++ b/api/programs/test-gas/src/lib.rs @@ -21,27 +21,10 @@ // Reexport of types pub use test_gas_io::*; -// For wasm compilation -#[cfg(not(feature = "std"))] mod wasm; -// Exports for native usage as dependency in other crates -#[cfg(feature = "std")] mod exports { mod code { include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); } - - // Binary itself - pub use code::WASM_BINARY_OPT as WASM_BINARY; - - // Metadata of the binary, defining types and registry for JS - pub use code::WASM_METADATA; } - -// Empty exports while compiling into wasm -#[cfg(not(feature = "std"))] -mod exports {} - -// Public exports -pub use exports::*; diff --git a/api/programs/test-meta/Cargo.toml b/api/programs/test-meta/Cargo.toml index 90a6195017..77f1e44b34 100644 --- a/api/programs/test-meta/Cargo.toml +++ b/api/programs/test-meta/Cargo.toml @@ -6,17 +6,16 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -gstd = { git = "https://github.com/gear-tech/gear.git" } -scale-info = { version = "2.11.0", default-features = false, features = ["derive"] } -codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false, features = ["derive", "full"] } +gstd.workspace = true +scale-info.workspace = true +codec.workspace = true test-meta-io = { path = "io" } test-meta-state-v1 = { path = "state-v1", default-features = false, optional = true } test-meta-state-v2 = { path = "state-v2", default-features = false, optional = true } [build-dependencies] test-meta-io = { path = "io" } -gear-wasm-builder = { git = "https://github.com/gear-tech/gear.git" } - +gear-wasm-builder.workspace = true [features] default = ["std"] diff --git a/api/programs/test-meta/io/Cargo.toml b/api/programs/test-meta/io/Cargo.toml index 25f586c4ae..2705aa974b 100644 --- a/api/programs/test-meta/io/Cargo.toml +++ b/api/programs/test-meta/io/Cargo.toml @@ -4,8 +4,8 @@ version = "0.1.0" edition = "2021" [dependencies] -gmeta = { git = "https://github.com/gear-tech/gear.git" } -scale-info = { version = "2.11.0", default-features = false, features = ["derive"] } -codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false, features = ["derive", "full"] } -gstd = { git = "https://github.com/gear-tech/gear.git" } -primitive-types = { version = "0.12.2", default-features = false } +scale-info.workspace = true +codec.workspace = true +gstd.workspace = true +gmeta.workspace = true +primitive-types.workspace = true diff --git a/api/programs/test-meta/src/lib.rs b/api/programs/test-meta/src/lib.rs index b5542a8efd..e547325613 100644 --- a/api/programs/test-meta/src/lib.rs +++ b/api/programs/test-meta/src/lib.rs @@ -42,6 +42,3 @@ mod exports { // Empty exports while compiling into wasm #[cfg(not(feature = "std"))] mod exports {} - -// Public exports -pub use exports::*; diff --git a/api/programs/test-meta/state-v1/Cargo.toml b/api/programs/test-meta/state-v1/Cargo.toml index f4c86b3c66..3efc3700c0 100644 --- a/api/programs/test-meta/state-v1/Cargo.toml +++ b/api/programs/test-meta/state-v1/Cargo.toml @@ -4,12 +4,12 @@ version = "0.1.0" edition = "2021" [dependencies] -gstd = { git = "https://github.com/gear-tech/gear.git", features = ["debug"] } -gmeta = { git = "https://github.com/gear-tech/gear.git", features = ["codegen"] } +gmeta = { workspace = true, features = ["codegen"] } +gstd.workspace = true test-meta-io = { path = "../io" } [build-dependencies] -gear-wasm-builder = { git = "https://github.com/gear-tech/gear.git", features = ["metawasm"] } +gear-wasm-builder = { workspace = true, features = ["metawasm"] } [features] default = ["std"] diff --git a/api/programs/test-meta/state-v1/src/wasm.rs b/api/programs/test-meta/state-v1/src/wasm.rs index 52a5cc5734..73b2b5dae4 100644 --- a/api/programs/test-meta/state-v1/src/wasm.rs +++ b/api/programs/test-meta/state-v1/src/wasm.rs @@ -1,5 +1,5 @@ use gmeta::metawasm; -use gstd::{debug, prelude::*}; +use gstd::prelude::*; use test_meta_io::Wallet; #[metawasm] diff --git a/api/programs/test-meta/state-v2/Cargo.toml b/api/programs/test-meta/state-v2/Cargo.toml index 73a11b5d7b..1cb14f9bc9 100644 --- a/api/programs/test-meta/state-v2/Cargo.toml +++ b/api/programs/test-meta/state-v2/Cargo.toml @@ -4,12 +4,12 @@ version = "0.1.0" edition = "2021" [dependencies] -gstd = { git = "https://github.com/gear-tech/gear.git" } -gmeta = { git = "https://github.com/gear-tech/gear.git", features = ["codegen"] } +gstd.workspace = true +gmeta = { workspace = true, features = ["codegen"] } test-meta-io = { path = "../io" } [build-dependencies] -gear-wasm-builder = { git = "https://github.com/gear-tech/gear.git", features = ["metawasm"] } +gear-wasm-builder = { workspace = true, features = ["metawasm"] } [features] default = ["std"] diff --git a/api/programs/test-waitlist/Cargo.toml b/api/programs/test-waitlist/Cargo.toml index d6b7b93fc4..b2a1e90224 100644 --- a/api/programs/test-waitlist/Cargo.toml +++ b/api/programs/test-waitlist/Cargo.toml @@ -5,9 +5,9 @@ authors = ["Gear Technologies"] edition = "2021" [dependencies] -gstd = { git = "https://github.com/gear-tech/gear.git" } -scale-info = { version = "2.11.0", default-features = false, features = ["derive"] } -codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false, features = ["derive", "full"] } +gstd.workspace = true +scale-info.workspace = true +codec.workspace = true [build-dependencies] -gear-wasm-builder = { git = "https://github.com/gear-tech/gear.git" } +gear-wasm-builder.workspace = true