From c8f9cf52bbaf1b1a5bd91cdba5f06892c4299f41 Mon Sep 17 00:00:00 2001 From: Shamil <66209982+shamilsan@users.noreply.github.com> Date: Fri, 16 Feb 2024 18:23:40 +0300 Subject: [PATCH] chore: update deps to v1.1.0 (#208) Co-authored-by: MedovTimur Co-authored-by: MedovTimur <62596970+MedovTimur@users.noreply.github.com> Co-authored-by: Louisa <30317856+LouiseMedova@users.noreply.github.com> Co-authored-by: LouiseMedova --- .github/workflows/contracts.yml | 5 + contracts/Cargo.lock | 2394 ++++++++++------- contracts/Cargo.toml | 16 +- contracts/battleship/io/Cargo.toml | 2 + contracts/battleship/io/src/lib.rs | 26 +- contracts/battleship/src/contract.rs | 7 +- contracts/concert/Cargo.toml | 2 +- contracts/crowdsale/Cargo.toml | 2 +- contracts/crowdsale/tests/init_ico/mod.rs | 7 +- contracts/dao-light/Cargo.toml | 2 +- contracts/dao/Cargo.toml | 2 +- contracts/dao/tests/failures.rs | 4 +- contracts/dao/tests/utils.rs | 4 +- contracts/dex/Cargo.toml | 2 +- contracts/dex/tests/utils/mod.rs | 2 +- .../tests/dutch_auction_tests.rs | 10 +- contracts/dutch-auction/tests/node_tests.rs | 2 +- contracts/dutch-auction/tests/routines/mod.rs | 6 - contracts/escrow/Cargo.toml | 2 +- contracts/fungible-token/Cargo.toml | 2 +- contracts/galactic-express/io/Cargo.toml | 2 + contracts/galactic-express/io/src/lib.rs | 24 +- contracts/game-of-chance/Cargo.toml | 2 +- contracts/gear-lib/Cargo.toml | 2 +- contracts/gear-lib/src/tx_manager.rs | 12 +- contracts/horse-races/Cargo.toml | 2 +- contracts/multi-token/Cargo.toml | 2 +- contracts/multi-token/src/lib.rs | 8 +- contracts/multisig-wallet/Cargo.toml | 2 +- contracts/nft-marketplace/Cargo.toml | 2 +- contracts/nft-master/Cargo.toml | 2 +- contracts/nft-pixelboard/Cargo.toml | 2 +- contracts/nft-pixelboard/src/lib.rs | 2 +- contracts/nft/src/lib.rs | 15 +- contracts/on-chain-nft/Cargo.toml | 2 +- contracts/oracle/Cargo.toml | 2 +- .../tests/change_config.rs | 6 +- contracts/rock-paper-scissors/tests/init.rs | 6 +- contracts/roll-the-dice/Cargo.toml | 2 +- contracts/rust-toolchain.toml | 5 - contracts/sharded-fungible-token/Cargo.toml | 2 +- contracts/sharded-multi-token/Cargo.toml | 2 +- .../sharded-multi-token/logic/src/lib.rs | 6 +- .../sharded-multi-token/tests/gclient_ft.rs | 33 +- contracts/staking/tests/simple_test.rs | 40 +- contracts/supply-chain/Cargo.toml | 2 +- contracts/supply-chain/deploy/src/lib.rs | 2 +- contracts/supply-chain/tests/receive.rs | 2 +- contracts/supply-chain/tests/utils/prelude.rs | 2 +- .../tamagotchi-battle/tests/node-test.rs | 3 +- contracts/tequila-train/Cargo.toml | 2 +- contracts/tic-tac-toe/Cargo.toml | 3 +- contracts/tic-tac-toe/io/Cargo.toml | 2 + contracts/tic-tac-toe/io/src/lib.rs | 38 +- contracts/tic-tac-toe/src/contract.rs | 450 ---- contracts/tic-tac-toe/src/lib.rs | 498 +++- contracts/vara-man/Cargo.toml | 2 +- contracts/vara-man/src/lib.rs | 19 +- contracts/vara-man/tests/node_tests.rs | 14 +- contracts/varatube/tests/unit-test.rs | 10 +- contracts/varatube/tests/utils.rs | 29 +- contracts/w3bstreaming/io/src/lib.rs | 12 +- contracts/xtask/src/main.rs | 8 +- 63 files changed, 2092 insertions(+), 1690 deletions(-) delete mode 100644 contracts/rust-toolchain.toml delete mode 100644 contracts/tic-tac-toe/src/contract.rs diff --git a/.github/workflows/contracts.yml b/.github/workflows/contracts.yml index c9bb4061e..e88ef4220 100644 --- a/.github/workflows/contracts.yml +++ b/.github/workflows/contracts.yml @@ -32,6 +32,11 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Set up Rust + uses: dtolnay/rust-toolchain@stable + with: + targets: wasm32-unknown-unknown + - name: ${{ github.ref_type == 'tag' && 'Build' || 'Build & CI' }} run: '[ $GITHUB_REF_TYPE = "tag" ] && cargo b || cargo xtask ci' diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock index 978a45fc3..e8650ff30 100644 --- a/contracts/Cargo.lock +++ b/contracts/Cargo.lock @@ -14,19 +14,19 @@ dependencies = [ [[package]] name = "actor-system-error" -version = "0.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" dependencies = [ "derive_more", ] [[package]] name = "addr2line" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ - "gimli 0.26.2", + "gimli 0.27.3", ] [[package]] @@ -35,7 +35,7 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ - "gimli 0.28.0", + "gimli 0.28.1", ] [[package]] @@ -85,7 +85,7 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "once_cell", "version_check", ] @@ -97,7 +97,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", - "getrandom 0.2.11", + "getrandom 0.2.12", "once_cell", "version_check", "zerocopy", @@ -144,9 +144,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "2faccea4cc4ab4a667ce676a30e8ec13922a692c99bb8f5b11f1502c72e04220" [[package]] name = "anyhow" @@ -162,9 +162,9 @@ checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" [[package]] name = "array-bytes" -version = "6.2.0" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de17a919934ad8c5cc99a1a74de4e2dab95d6121a8f27f94755ff525b630382c" +checksum = "6f840fb7195bcfc5e17ea40c26e5ce6d5b9ce5d584466e17703209657e459ae0" [[package]] name = "arrayref" @@ -206,12 +206,12 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" dependencies = [ "concurrent-queue", - "event-listener 3.1.0", + "event-listener 4.0.3", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -219,15 +219,15 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc5ea910c42e5ab19012bab31f53cb4d63d54c3a27730f9a833a88efcf4bb52d" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock 3.1.1", + "async-lock 3.3.0", "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite 2.0.1", + "futures-lite 2.2.0", "slab", ] @@ -265,22 +265,21 @@ dependencies = [ [[package]] name = "async-io" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9d5715c2d329bf1b4da8d60455b99b187f27ba726df2883799af9af60997" +checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" dependencies = [ - "async-lock 3.1.1", + "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.0.1", + "futures-lite 2.2.0", "parking", - "polling 3.3.0", - "rustix 0.38.25", + "polling 3.3.2", + "rustix 0.38.31", "slab", "tracing", - "waker-fn", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -294,11 +293,11 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.1.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655b9c7fe787d3b25cc0f804a1a8401790f0c5bc395beb5a64dc77d8de079105" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ - "event-listener 3.1.0", + "event-listener 4.0.3", "event-listener-strategy", "pin-project-lite", ] @@ -327,7 +326,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.25", + "rustix 0.38.31", "windows-sys 0.48.0", ] @@ -337,13 +336,13 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.2.0", + "async-io 2.3.1", "async-lock 2.8.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.25", + "rustix 0.38.31", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -351,9 +350,9 @@ dependencies = [ [[package]] name = "async-task" -version = "4.5.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" @@ -380,7 +379,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "auto-changed-nft" -version = "1.0.2" +version = "1.1.0" dependencies = [ "auto-changed-nft-io", "gclient", @@ -399,7 +398,7 @@ dependencies = [ [[package]] name = "auto-changed-nft-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-lib-old", "gmeta", @@ -409,7 +408,7 @@ dependencies = [ [[package]] name = "auto-changed-nft-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "auto-changed-nft-io", "gear-lib-old", @@ -435,15 +434,15 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object 0.32.1", + "object 0.32.2", "rustc-demangle", ] [[package]] name = "base16ct" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base58" @@ -459,9 +458,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 = "base64ct" @@ -471,12 +470,12 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "battleship" -version = "1.0.2" +version = "1.1.0" dependencies = [ "battleship-bot", "battleship-io", "gclient", - "gear-core", + "gear-core 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gear-wasm-builder", "gstd", "gtest", @@ -486,7 +485,7 @@ dependencies = [ [[package]] name = "battleship-bot" -version = "1.0.2" +version = "1.1.0" dependencies = [ "battleship-io", "gear-wasm-builder", @@ -495,10 +494,12 @@ dependencies = [ [[package]] name = "battleship-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", + "parity-scale-codec", + "scale-info", ] [[package]] @@ -542,9 +543,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "bitvec" @@ -646,12 +647,12 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel 2.1.0", - "async-lock 3.1.1", + "async-channel 2.1.1", + "async-lock 3.3.0", "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite 2.0.1", + "futures-lite 2.2.0", "piper", "tracing", ] @@ -776,14 +777,14 @@ dependencies = [ [[package]] name = "car-races" -version = "1.0.2" +version = "1.1.0" dependencies = [ "car-1", "car-2", "car-3", "car-races-io", "gclient", - "gear-core", + "gear-core 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gear-wasm-builder", "gstd", "gtest", @@ -805,18 +806,18 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" +checksum = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" dependencies = [ "serde", ] [[package]] name = "cargo_metadata" -version = "0.15.3" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a1ec454bc3eead8719cb56e15dbbfecdbc14e4b3a3ae4936cc6e31f5fc0d07" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", @@ -832,15 +833,14 @@ version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ - "jobserver", "libc", ] [[package]] name = "cfg-expr" -version = "0.10.3" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db" +checksum = "6100bc57b6209840798d95cb2775684849d332f7bd788db2a8c8caf7ef82a41a" dependencies = [ "smallvec", ] @@ -877,16 +877,16 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -936,18 +936,17 @@ dependencies = [ [[package]] name = "colored" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" dependencies = [ - "is-terminal", "lazy_static", "windows-sys 0.48.0", ] [[package]] name = "concert" -version = "1.0.2" +version = "1.1.0" dependencies = [ "concert-io", "gclient", @@ -961,7 +960,7 @@ dependencies = [ [[package]] name = "concert-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -972,18 +971,58 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "const-random" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom 0.2.12", + "once_cell", + "tiny-keccak", +] + +[[package]] +name = "const_format" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] [[package]] name = "constant_time_eq" @@ -1005,9 +1044,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -1015,9 +1054,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "corosensei" @@ -1043,9 +1082,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -1099,9 +1138,9 @@ checksum = "9e3bfe172b83167604601faf9dc60453e0d0a93415b57a9c4d1a7ae6849185cf" [[package]] name = "cranelift-entity" -version = "0.93.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f42ea692c7b450ad18b8c9889661505d51c09ec4380cf1c2d278dbb2da22cae1" +checksum = "40099d38061b37e505e63f89bab52199037a72b931ad4868d9089ff7268660b0" dependencies = [ "serde", ] @@ -1129,50 +1168,41 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[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 = "crowdsale" -version = "1.0.2" +version = "1.1.0" dependencies = [ "crowdsale-io", "gclient", @@ -1189,7 +1219,7 @@ dependencies = [ [[package]] name = "crowdsale-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -1197,7 +1227,7 @@ dependencies = [ [[package]] name = "crowdsale-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "crowdsale-io", "gear-wasm-builder", @@ -1213,9 +1243,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.4.9" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", @@ -1331,7 +1361,7 @@ dependencies = [ [[package]] name = "dao" -version = "1.0.2" +version = "1.1.0" dependencies = [ "blake2-rfc", "dao-io", @@ -1348,7 +1378,7 @@ dependencies = [ [[package]] name = "dao-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -1356,7 +1386,7 @@ dependencies = [ [[package]] name = "dao-light" -version = "1.0.2" +version = "1.1.0" dependencies = [ "dao-light-io", "fungible-token", @@ -1368,7 +1398,7 @@ dependencies = [ [[package]] name = "dao-light-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -1376,7 +1406,7 @@ dependencies = [ [[package]] name = "dao-light-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "dao-light-io", "gear-wasm-builder", @@ -1386,7 +1416,7 @@ dependencies = [ [[package]] name = "dao-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "dao-io", "gear-wasm-builder", @@ -1406,12 +1436,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "fc5d6b04b3fd0ba9926f945895de7d806260a2d7431ba82e7edaecb043c4c6b8" dependencies = [ - "darling_core 0.20.3", - "darling_macro 0.20.3", + "darling_core 0.20.5", + "darling_macro 0.20.5", ] [[package]] @@ -1430,9 +1460,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "04e48a959bcd5c761246f5d090ebc2fbf7b9cd527a492b07a67510c108f1e7e3" dependencies = [ "fnv", "ident_case", @@ -1455,18 +1485,18 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77" dependencies = [ - "darling_core 0.20.3", + "darling_core 0.20.5", "quote", "syn 2.0.48", ] [[package]] name = "ddns" -version = "1.0.2" +version = "1.1.0" dependencies = [ "ddns-io", "gear-wasm-builder", @@ -1475,7 +1505,7 @@ dependencies = [ [[package]] name = "ddns-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -1483,7 +1513,7 @@ dependencies = [ [[package]] name = "ddns-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "ddns-io", "gear-wasm-builder", @@ -1493,7 +1523,7 @@ dependencies = [ [[package]] name = "decentralized-git" -version = "1.0.2" +version = "1.1.0" dependencies = [ "decentralized-git-io", "decentralized-git-user-io", @@ -1503,7 +1533,7 @@ dependencies = [ [[package]] name = "decentralized-git-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -1511,7 +1541,7 @@ dependencies = [ [[package]] name = "decentralized-git-master" -version = "1.0.2" +version = "1.1.0" dependencies = [ "decentralized-git-master-io", "decentralized-git-user-io", @@ -1521,7 +1551,7 @@ dependencies = [ [[package]] name = "decentralized-git-master-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -1529,7 +1559,7 @@ dependencies = [ [[package]] name = "decentralized-git-master-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "decentralized-git-master-io", "gear-wasm-builder", @@ -1539,7 +1569,7 @@ dependencies = [ [[package]] name = "decentralized-git-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "decentralized-git-io", "gear-wasm-builder", @@ -1549,7 +1579,7 @@ dependencies = [ [[package]] name = "decentralized-git-user" -version = "1.0.2" +version = "1.1.0" dependencies = [ "decentralized-git-io", "decentralized-git-user-io", @@ -1559,7 +1589,7 @@ dependencies = [ [[package]] name = "decentralized-git-user-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -1567,7 +1597,7 @@ dependencies = [ [[package]] name = "decentralized-git-user-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "decentralized-git-user-io", "gear-wasm-builder", @@ -1577,9 +1607,9 @@ dependencies = [ [[package]] name = "der" -version = "0.6.1" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", "zeroize", @@ -1622,7 +1652,7 @@ dependencies = [ [[package]] name = "dex" -version = "1.0.2" +version = "1.1.0" dependencies = [ "dex-factory", "dex-factory-io", @@ -1630,7 +1660,7 @@ dependencies = [ "dex-io", "dex-state", "gclient", - "gear-core", + "gear-core 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gear-lib", "gear-wasm-builder", "gstd", @@ -1646,7 +1676,7 @@ dependencies = [ [[package]] name = "dex-factory" -version = "1.0.2" +version = "1.1.0" dependencies = [ "dex-factory-io", "dex-io", @@ -1656,7 +1686,7 @@ dependencies = [ [[package]] name = "dex-factory-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "dex-io", "gmeta", @@ -1665,7 +1695,7 @@ dependencies = [ [[package]] name = "dex-factory-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "dex-factory-io", "gear-wasm-builder", @@ -1675,7 +1705,7 @@ dependencies = [ [[package]] name = "dex-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-lib", "gmeta", @@ -1685,7 +1715,7 @@ dependencies = [ [[package]] name = "dex-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "dex-io", "gear-wasm-builder", @@ -1719,6 +1749,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", + "const-oid", "crypto-common", "subtle", ] @@ -1743,18 +1774,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "dlmalloc" -version = "0.1.4" -source = "git+https://github.com/gear-tech/dlmalloc-rust.git#15352f969112faa463302f2490bbb7f6e1cb904d" -dependencies = [ - "libc", - "libc-print", - "page_size", - "static_assertions", - "str-buf", -] - [[package]] name = "downcast-rs" version = "1.2.0" @@ -1763,7 +1782,7 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dutch-auction" -version = "1.0.2" +version = "1.1.0" dependencies = [ "dutch-auction-io", "gclient", @@ -1780,7 +1799,7 @@ dependencies = [ [[package]] name = "dutch-auction-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -1789,7 +1808,7 @@ dependencies = [ [[package]] name = "dutch-auction-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "dutch-auction-io", "gear-wasm-builder", @@ -1826,7 +1845,7 @@ checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" [[package]] name = "dynamic-nft" -version = "1.0.2" +version = "1.1.0" dependencies = [ "dynamic-nft-io", "gclient", @@ -1845,7 +1864,7 @@ dependencies = [ [[package]] name = "dynamic-nft-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-lib-old", "gmeta", @@ -1855,7 +1874,7 @@ dependencies = [ [[package]] name = "dynamic-nft-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "dynamic-nft-io", "gear-lib-old", @@ -1892,14 +1911,16 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.14.8" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ "der", + "digest 0.10.7", "elliptic-curve", "rfc6979", - "signature", + "signature 2.2.0", + "spki", ] [[package]] @@ -1908,7 +1929,7 @@ version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ - "signature", + "signature 1.6.4", ] [[package]] @@ -1945,17 +1966,17 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" -version = "0.12.3" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct", "crypto-bigint", - "der", "digest 0.10.7", "ff", "generic-array 0.14.7", "group", + "pkcs8", "rand_core 0.6.4", "sec1", "subtle", @@ -2017,7 +2038,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" dependencies = [ - "darling 0.20.3", + "darling 0.20.5", "proc-macro2", "quote", "syn 2.0.48", @@ -2025,9 +2046,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime", "is-terminal", @@ -2050,17 +2071,17 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "escrow" -version = "1.0.2" +version = "1.1.0" dependencies = [ "escrow-io", "gclient", @@ -2076,7 +2097,7 @@ dependencies = [ [[package]] name = "escrow-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -2085,7 +2106,7 @@ dependencies = [ [[package]] name = "escrow-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "escrow-io", "gear-wasm-builder", @@ -2111,27 +2132,38 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + [[package]] name = "event-listener-strategy" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 3.1.0", + "event-listener 4.0.3", "pin-project-lite", ] [[package]] name = "expander" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f360349150728553f92e4c997a16af8915f418d3a0f21b440d34c5632f16ed84" +checksum = "5f86a749cf851891866c10515ef6c299b5c69661465e9c3bbe7e07a2b77fb0f7" dependencies = [ "blake2", "fs-err", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] @@ -2163,7 +2195,7 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "feeds" -version = "1.0.2" +version = "1.1.0" dependencies = [ "feeds-channel", "feeds-channel-io", @@ -2175,7 +2207,7 @@ dependencies = [ [[package]] name = "feeds-channel" -version = "1.0.2" +version = "1.1.0" dependencies = [ "async-trait", "feeds-channel-io", @@ -2186,7 +2218,7 @@ dependencies = [ [[package]] name = "feeds-channel-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -2194,7 +2226,7 @@ dependencies = [ [[package]] name = "feeds-channel-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "feeds-channel-io", "gear-wasm-builder", @@ -2204,7 +2236,7 @@ dependencies = [ [[package]] name = "feeds-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -2212,7 +2244,7 @@ dependencies = [ [[package]] name = "feeds-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "feeds-io", "gear-wasm-builder", @@ -2222,9 +2254,9 @@ dependencies = [ [[package]] name = "ff" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "rand_core 0.6.4", "subtle", @@ -2272,7 +2304,6 @@ dependencies = [ "cfg-if", "parity-scale-codec", "scale-info", - "serde", ] [[package]] @@ -2290,71 +2321,94 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ "bitflags 1.3.2", "environmental", - "frame-metadata 15.1.0", + "frame-metadata 16.0.0", "frame-support-procedural", "impl-trait-for-tuples", "k256", "log", - "once_cell", + "macro_magic", "parity-scale-codec", "paste", "scale-info", "serde", "smallvec", "sp-api", - "sp-arithmetic", - "sp-core 7.0.0", + "sp-arithmetic 16.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-core 21.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", "sp-core-hashing-proc-macro", + "sp-debug-derive 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", "sp-inherents", - "sp-io", - "sp-runtime", + "sp-io 23.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-runtime 24.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", "sp-staking", - "sp-state-machine", - "sp-std 5.0.0", - "sp-tracing 6.0.0", - "sp-weights", + "sp-state-machine 0.28.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-tracing 10.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-weights 20.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", "tt-call", ] [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ "Inflector", "cfg-expr", "derive-syn-parse", + "expander", "frame-support-procedural-tools", "itertools", + "macro_magic", + "proc-macro-warning", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", +] + +[[package]] +name = "frame-system" +version = "4.0.0-dev" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" +dependencies = [ + "cfg-if", + "frame-support", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 21.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-io 23.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-runtime 24.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-version", + "sp-weights 20.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", ] [[package]] @@ -2368,7 +2422,7 @@ dependencies = [ [[package]] name = "fungible-token" -version = "1.0.2" +version = "1.1.0" dependencies = [ "fungible-token-io", "gear-wasm-builder", @@ -2379,7 +2433,7 @@ dependencies = [ [[package]] name = "fungible-token-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -2387,7 +2441,7 @@ dependencies = [ [[package]] name = "fungible-token-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "fungible-token-io", "gear-wasm-builder", @@ -2403,9 +2457,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -2418,9 +2472,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -2428,15 +2482,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -2446,9 +2500,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -2467,23 +2521,22 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.0.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" dependencies = [ "fastrand 2.0.1", "futures-core", "futures-io", - "memchr", "parking", "pin-project-lite", ] [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", @@ -2492,15 +2545,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" @@ -2510,9 +2563,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -2528,7 +2581,7 @@ dependencies = [ [[package]] name = "galactic-express" -version = "1.0.2" +version = "1.1.0" dependencies = [ "galactic-express-io", "gear-lib", @@ -2540,24 +2593,27 @@ dependencies = [ [[package]] name = "galactic-express-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-lib", "gmeta", "gstd", + "parity-scale-codec", + "scale-info", ] [[package]] name = "galloc" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73736b571eb1b9da624cfbb1b8b4e3216d8323f68ea80c2a014830b529a71947" dependencies = [ - "dlmalloc", + "gear-dlmalloc", ] [[package]] name = "game-of-chance" -version = "1.0.2" +version = "1.1.0" dependencies = [ "game-of-chance-io", "gclient", @@ -2577,7 +2633,7 @@ dependencies = [ [[package]] name = "game-of-chance-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -2585,22 +2641,19 @@ dependencies = [ [[package]] name = "gclient" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65738c8d8d51e8ef19b0e9865c5ea6a93642f4081cab2ea9b795a15a04865b61" dependencies = [ "anyhow", "async-trait", "futures", - "futures-timer", - "gear-core", - "gear-core-errors", - "gear-utils", + "gear-core 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gear-core-errors 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gear-utils 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gsdk", - "gstd", "hex", "parity-scale-codec", - "rand 0.8.5", - "static_assertions", "subxt", "thiserror", "url", @@ -2609,43 +2662,41 @@ dependencies = [ [[package]] name = "gcore" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2de53122c675b739d1548c7bfae56642975f0d95abd0b991bbc5844c1493f861" dependencies = [ - "gear-core-errors", + "gear-core-errors 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gear-stack-buffer", - "gsys", + "gsys 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", - "static_assertions", ] [[package]] name = "gear-common" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" dependencies = [ "derive_more", "enum-iterator 1.5.0", "frame-support", + "frame-system", "gear-common-codegen", - "gear-core", - "gear-wasm-instrument", - "hex", + "gear-core 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", + "gear-wasm-instrument 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", + "gsys 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", "log", - "path-clean", "primitive-types", - "serde", - "serde_json", - "sp-arithmetic", - "sp-core 7.0.0", - "sp-io", - "sp-std 5.0.0", + "sp-arithmetic 16.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-core 21.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-io 23.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", ] [[package]] name = "gear-common-codegen" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" dependencies = [ "quote", "syn 2.0.48", @@ -2653,16 +2704,41 @@ dependencies = [ [[package]] name = "gear-core" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fbb3868ce89bb3d5ef4169a80059bd43580f6e53c594f1aa16825220ac814ec" dependencies = [ "blake2-rfc", "byteorder", "derive_more", "enum-iterator 1.5.0", - "gear-core-errors", - "gear-wasm-instrument", - "hashbrown 0.14.2", + "gear-core-errors 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gear-wasm-instrument 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gsys 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hashbrown 0.14.3", + "hex", + "log", + "num-traits", + "parity-scale-codec", + "paste", + "scale-info", + "serde", + "wasmparser-nostd", +] + +[[package]] +name = "gear-core" +version = "1.1.0" +source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" +dependencies = [ + "blake2-rfc", + "byteorder", + "derive_more", + "enum-iterator 1.5.0", + "gear-core-errors 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", + "gear-wasm-instrument 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", + "gsys 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", + "hashbrown 0.14.3", "hex", "log", "num-traits", @@ -2670,44 +2746,43 @@ dependencies = [ "paste", "scale-info", "serde", - "static_assertions", "wasmparser-nostd", ] [[package]] name = "gear-core-backend" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" dependencies = [ "actor-system-error", "blake2-rfc", "derive_more", - "gear-core", - "gear-core-backend-codegen", - "gear-core-errors", + "gear-core 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", + "gear-core-errors 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", "gear-lazy-pages-common", "gear-sandbox", "gear-sandbox-env", - "gear-wasm-instrument", - "gsys", + "gear-wasm-instrument 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", + "gsys 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", "log", "parity-scale-codec", ] [[package]] -name = "gear-core-backend-codegen" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +name = "gear-core-errors" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cdcbac6898186707a0efe05d56fcb6915ee3edb9313a941951789dcf9a92434" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", + "derive_more", + "enum-iterator 1.5.0", + "scale-info", ] [[package]] name = "gear-core-errors" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" dependencies = [ "derive_more", "enum-iterator 1.5.0", @@ -2716,86 +2791,92 @@ dependencies = [ [[package]] name = "gear-core-processor" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" dependencies = [ "actor-system-error", "derive_more", - "gear-core", + "gear-core 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", "gear-core-backend", - "gear-core-errors", + "gear-core-errors 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", "gear-lazy-pages-common", "gear-lazy-pages-interface", - "gear-wasm-instrument", + "gear-wasm-instrument 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", + "gsys 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", "log", "scale-info", +] + +[[package]] +name = "gear-dlmalloc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b88fcd5524e7ab9f156c17b14e754d6ba122ef9b00586d632d2ae3dbc7bfadb" +dependencies = [ + "libc", + "libc-print", + "page_size", "static_assertions", + "str-buf", ] [[package]] name = "gear-lazy-pages" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" dependencies = [ "cfg-if", "derive_more", "errno", - "gear-core", + "gear-core 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", "gear-lazy-pages-common", "gear-sandbox-host", "libc", "log", "mach", "nix", - "once_cell", "region", - "sc-executor-common", - "sp-io", - "sp-std 5.0.0", - "sp-wasm-interface 7.0.0", - "static_assertions", + "sp-wasm-interface-common", "winapi", ] [[package]] name = "gear-lazy-pages-common" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" dependencies = [ - "gear-core", + "gear-core 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", "num_enum", "parity-scale-codec", ] [[package]] name = "gear-lazy-pages-interface" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" dependencies = [ "byteorder", - "derive_more", "gear-common", - "gear-core", + "gear-core 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", "gear-lazy-pages-common", "gear-runtime-interface", - "gear-wasm-instrument", "log", - "sp-std 5.0.0", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", ] [[package]] name = "gear-lib" -version = "1.0.2" +version = "1.1.0" dependencies = [ "ahash 0.8.7", "gstd", - "indexmap 2.1.0", + "indexmap 2.2.2", "primitive-types", ] [[package]] name = "gear-lib-derive" -version = "1.0.2" +version = "1.1.0" dependencies = [ "quote", "syn 2.0.48", @@ -2803,74 +2884,80 @@ dependencies = [ [[package]] name = "gear-lib-old" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gstd", "primitive-types", "schnorrkel 0.10.2", ] +[[package]] +name = "gear-pwasm-utils" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ea09901ce41f64d1be7369b8c2efc774e89b200ac434496ab24e6af96e68f97" +dependencies = [ + "byteorder", + "gear-wasm", + "log", +] + [[package]] name = "gear-runtime-interface" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" dependencies = [ "byteorder", - "derive_more", - "gear-core", + "gear-core 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", "gear-lazy-pages", "gear-lazy-pages-common", "gear-sandbox-host", - "libc", "log", "parity-scale-codec", - "region", - "sp-allocator", - "sp-runtime-interface 7.0.0", - "sp-std 5.0.0", - "sp-wasm-interface 7.0.0", - "static_assertions", + "sp-io 23.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-runtime-interface 17.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-wasm-interface 14.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", "winapi", ] [[package]] name = "gear-sandbox" -version = "0.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" dependencies = [ "gear-runtime-interface", "gear-sandbox-env", "log", "parity-scale-codec", - "sp-core 7.0.0", - "sp-std 5.0.0", - "sp-wasm-interface 7.0.0", + "sp-core 21.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-wasm-interface-common", "wasmi 0.30.0 (git+https://github.com/gear-tech/wasmi?branch=gear-v0.30.0)", ] [[package]] name = "gear-sandbox-env" -version = "0.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" dependencies = [ "parity-scale-codec", - "sp-core 7.0.0", - "sp-std 5.0.0", - "sp-wasm-interface 7.0.0", + "sp-debug-derive 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-wasm-interface-common", ] [[package]] name = "gear-sandbox-host" -version = "0.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" dependencies = [ "environmental", "gear-sandbox-env", "log", - "once_cell", "parity-scale-codec", "sp-allocator", - "sp-wasm-interface 7.0.0", + "sp-wasm-interface-common", "tempfile", "thiserror", "wasmer", @@ -2881,16 +2968,33 @@ dependencies = [ [[package]] name = "gear-stack-buffer" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9de20087dedac00351769ac661113c527d3bbd8f98e03cc6440ecd3e7d3c07a" [[package]] name = "gear-utils" -version = "0.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "172c90a852b2d15abea371a24bc07834305446630a0a9189c34bb45666160b61" +dependencies = [ + "env_logger", + "gear-core 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hex", + "nonempty", + "parity-scale-codec", + "path-clean", + "serde", + "serde_json", +] + +[[package]] +name = "gear-utils" +version = "1.1.0" +source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" dependencies = [ "env_logger", - "gear-core", + "gear-core 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", "hex", "nonempty", "parity-scale-codec", @@ -2907,21 +3011,22 @@ checksum = "bbfbfa701dc65e683fcd2fb24f046bcef22634acbdf47ad14724637dc39ad05b" [[package]] name = "gear-wasm-builder" -version = "0.1.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36aaf177668439764e3ee8cea226e48a9f44ade22bec5f138d4d22ac502715b8" dependencies = [ "anyhow", "cargo_metadata", "chrono", "colored", "dirs", - "gear-core", - "gear-wasm-instrument", + "gear-core 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gear-pwasm-utils", + "gear-wasm-instrument 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gmeta", "log", "once_cell", "pathdiff", - "pwasm-utils", "regex", "thiserror", "toml", @@ -2931,9 +3036,21 @@ dependencies = [ [[package]] name = "gear-wasm-instrument" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebea2216ebba27863df976a28d070e2aef86b099cd05b20bc5517e7b25bd7ae3" +dependencies = [ + "derive_more", + "enum-iterator 1.5.0", + "gwasm-instrument", +] + +[[package]] +name = "gear-wasm-instrument" +version = "1.1.0" +source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" dependencies = [ + "derive_more", "enum-iterator 1.5.0", "gwasm-instrument", ] @@ -2955,6 +3072,7 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] @@ -2970,9 +3088,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -3002,9 +3120,20 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +dependencies = [ + "fallible-iterator", + "indexmap 1.9.3", + "stable_deref_trait", +] + +[[package]] +name = "gimli" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -3014,8 +3143,9 @@ checksum = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" [[package]] name = "gmeta" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c0a1ed30a16d6f9bb5f6b871a8c102869ec151fe2700cf6dca2678bad39a719" dependencies = [ "blake2-rfc", "derive_more", @@ -3026,8 +3156,9 @@ dependencies = [ [[package]] name = "gmeta-codegen" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e3a341d27b765d12cff7968acf86ccc2085c89b8b656f63f1f7cdd3d3924c94" dependencies = [ "proc-macro2", "quote", @@ -3036,9 +3167,9 @@ dependencies = [ [[package]] name = "group" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", "rand_core 0.6.4", @@ -3047,18 +3178,20 @@ dependencies = [ [[package]] name = "gsdk" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e87cc6647590399d918e46aea5d693857f0d4a78c28ba6913bbc1584c55353f1" dependencies = [ "anyhow", - "base64 0.21.5", + "base64 0.21.7", + "colored", "futures", "futures-util", - "gear-core", - "gear-core-errors", + "gear-core 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gear-core-errors 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gsdk-codegen", "hex", - "indexmap 2.1.0", + "indexmap 2.2.2", "jsonrpsee 0.16.3", "log", "parity-scale-codec", @@ -3068,16 +3201,17 @@ dependencies = [ "scale-value", "serde", "serde_json", - "sp-core 7.0.0", - "sp-runtime", + "sp-core 21.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime 24.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "subxt", "thiserror", ] [[package]] name = "gsdk-codegen" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce25dd799a0ba1ec70839fb16ab0b93da1c8275bc093586c1b4154da032ca3c" dependencies = [ "proc-macro2", "quote", @@ -3086,27 +3220,30 @@ dependencies = [ [[package]] name = "gstd" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82601f8f5835c94a532415630591f773af07aab369bdf3dce2d3547a1dba581" dependencies = [ - "bs58 0.4.0", + "arrayvec 0.7.4", + "bs58 0.5.0", + "const_format", "futures", "galloc", "gcore", - "gear-core-errors", + "gear-core-errors 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gstd-codegen", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "hex", "parity-scale-codec", "primitive-types", "scale-info", - "static_assertions", ] [[package]] name = "gstd-codegen" -version = "0.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2555e0bd35a1b6a651e774d8d150a13f9ccab2658debe564344120c4acd170b0" dependencies = [ "proc-macro2", "quote", @@ -3115,47 +3252,52 @@ dependencies = [ [[package]] name = "gsys" -version = "1.0.2" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a57ae1f6edfb4df9bfc5b8cd5147095a6cf186f6690d280f712d3834b18ce668" + +[[package]] +name = "gsys" +version = "1.1.0" +source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" [[package]] name = "gtest" -version = "0.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.0.2#d02d306f97c2d60c1a8786366a56d8c02264f4e1" +version = "1.1.0" +source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" dependencies = [ - "anyhow", "colored", "derive_more", "env_logger", - "gear-core", - "gear-core-errors", + "gear-core 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", + "gear-core-errors 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", "gear-core-processor", - "gear-lazy-pages-interface", - "gear-utils", - "gear-wasm-builder", - "gear-wasm-instrument", + "gear-lazy-pages", + "gear-lazy-pages-common", + "gear-utils 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", + "gear-wasm-instrument 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", + "gsys 1.1.0 (git+https://github.com/gear-tech/gear?tag=v1.1.0)", "hex", "log", "parity-scale-codec", "path-clean", "rand 0.8.5", - "sp-io", ] [[package]] name = "gwasm-instrument" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce321dd7831796f4c6b54bd7637468c81125f6e7eefd482968bcce471b620fbb" +checksum = "09c5fda64a6f7f331a6425df8d678dfc542f3135b43e3cc229d431d391ff3c7d" dependencies = [ "gear-wasm", ] [[package]] name = "h2" -version = "0.3.22" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", @@ -3163,7 +3305,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.1.0", + "indexmap 2.2.2", "slab", "tokio", "tokio-util", @@ -3214,9 +3356,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash 0.8.7", "allocator-api2", @@ -3231,9 +3373,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" [[package]] name = "hex" @@ -3289,16 +3431,16 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "horse-races" -version = "1.0.2" +version = "1.1.0" dependencies = [ "fungible-token", "fungible-token-io", @@ -3313,7 +3455,7 @@ dependencies = [ [[package]] name = "horse-races-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -3321,7 +3463,7 @@ dependencies = [ [[package]] name = "horse-races-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gmeta", @@ -3342,9 +3484,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -3371,9 +3513,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -3386,7 +3528,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.5", "tokio", "tower-service", "tracing", @@ -3412,9 +3554,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3441,7 +3583,7 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "identity" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gstd", @@ -3455,7 +3597,7 @@ dependencies = [ [[package]] name = "identity-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -3463,7 +3605,7 @@ dependencies = [ [[package]] name = "identity-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gmeta", @@ -3523,12 +3665,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -3583,13 +3725,13 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ "hermit-abi", - "rustix 0.38.25", - "windows-sys 0.48.0", + "rustix 0.38.31", + "windows-sys 0.52.0", ] [[package]] @@ -3603,24 +3745,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "jobserver" -version = "0.1.27" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -dependencies = [ - "libc", -] +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" dependencies = [ "wasm-bindgen", ] @@ -3816,21 +3949,22 @@ dependencies = [ [[package]] name = "k256" -version = "0.11.6" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", "ecdsa", "elliptic-curve", + "once_cell", "sha2 0.10.8", ] [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] @@ -3849,9 +3983,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libc-print" @@ -3884,7 +4018,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "libc", "redox_syscall", ] @@ -3951,9 +4085,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -4008,31 +4142,79 @@ dependencies = [ ] [[package]] -name = "matchers" -version = "0.0.1" +name = "macro_magic" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" +checksum = "aee866bfee30d2d7e83835a4574aad5b45adba4cc807f2a3bbba974e5d4383c9" dependencies = [ - "regex-automata 0.1.10", + "macro_magic_core", + "macro_magic_macros", + "quote", + "syn 2.0.48", ] [[package]] -name = "memchr" -version = "2.6.4" +name = "macro_magic_core" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "7e766a20fd9c72bab3e1e64ed63f36bd08410e75803813df210d1ce297d7ad00" +dependencies = [ + "const-random", + "derive-syn-parse", + "macro_magic_core_macros", + "proc-macro2", + "quote", + "syn 2.0.48", +] [[package]] -name = "memfd" -version = "0.6.4" +name = "macro_magic_core_macros" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" +checksum = "d710e1214dffbab3b5dacb21475dde7d6ed84c69ff722b3a47a782668d44fbac" dependencies = [ - "rustix 0.38.25", + "proc-macro2", + "quote", + "syn 2.0.48", ] [[package]] -name = "memmap2" +name = "macro_magic_macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a" +dependencies = [ + "macro_magic_core", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "matchers" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memfd" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" +dependencies = [ + "rustix 0.38.31", +] + +[[package]] +name = "memmap2" version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" @@ -4060,9 +4242,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.9.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] @@ -4123,9 +4305,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -4140,7 +4322,7 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "multi-token" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gclient", "gear-wasm-builder", @@ -4153,7 +4335,7 @@ dependencies = [ [[package]] name = "multi-token-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -4161,7 +4343,7 @@ dependencies = [ [[package]] name = "multisig-wallet" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gstd", @@ -4172,7 +4354,7 @@ dependencies = [ [[package]] name = "multisig-wallet-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -4181,7 +4363,7 @@ dependencies = [ [[package]] name = "multisig-wallet-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gmeta", @@ -4191,10 +4373,10 @@ dependencies = [ [[package]] name = "nft" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gclient", - "gear-core", + "gear-core 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gear-wasm-builder", "gmeta", "gstd", @@ -4206,7 +4388,7 @@ dependencies = [ [[package]] name = "nft-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-lib-old", "gmeta", @@ -4218,7 +4400,7 @@ dependencies = [ [[package]] name = "nft-marketplace" -version = "1.0.2" +version = "1.1.0" dependencies = [ "async-trait", "blake2-rfc", @@ -4240,7 +4422,7 @@ dependencies = [ [[package]] name = "nft-marketplace-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -4249,7 +4431,7 @@ dependencies = [ [[package]] name = "nft-marketplace-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gmeta", @@ -4259,7 +4441,7 @@ dependencies = [ [[package]] name = "nft-master" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gclient", "gear-wasm-builder", @@ -4271,7 +4453,7 @@ dependencies = [ [[package]] name = "nft-master-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -4279,7 +4461,7 @@ dependencies = [ [[package]] name = "nft-master-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gmeta", @@ -4289,7 +4471,7 @@ dependencies = [ [[package]] name = "nft-pixelboard" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-lib-old", "gear-wasm-builder", @@ -4306,7 +4488,7 @@ dependencies = [ [[package]] name = "nft-pixelboard-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-lib-old", "gmeta", @@ -4315,7 +4497,7 @@ dependencies = [ [[package]] name = "nft-pixelboard-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-lib-old", "gear-wasm-builder", @@ -4367,7 +4549,7 @@ dependencies = [ [[package]] name = "non-fungible-token" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gclient", "gear-lib-derive", @@ -4386,7 +4568,7 @@ dependencies = [ [[package]] name = "non-fungible-token-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-lib-old", "gmeta", @@ -4396,7 +4578,7 @@ dependencies = [ [[package]] name = "non-fungible-token-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-lib-old", "gear-wasm-builder", @@ -4507,28 +4689,28 @@ dependencies = [ [[package]] name = "object" -version = "0.29.0" +version = "0.30.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" dependencies = [ "crc32fast", - "hashbrown 0.12.3", + "hashbrown 0.13.2", "indexmap 1.9.3", "memchr", ] [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "on-chain-nft" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gclient", "gear-lib-derive", @@ -4545,7 +4727,7 @@ dependencies = [ [[package]] name = "on-chain-nft-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-lib-old", "gmeta", @@ -4554,7 +4736,7 @@ dependencies = [ [[package]] name = "on-chain-nft-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-lib-old", "gear-wasm-builder", @@ -4565,9 +4747,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" @@ -4589,7 +4771,7 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "oracle" -version = "1.0.2" +version = "1.1.0" dependencies = [ "async-trait", "gclient", @@ -4604,7 +4786,7 @@ dependencies = [ [[package]] name = "oracle-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -4612,7 +4794,7 @@ dependencies = [ [[package]] name = "oracle-randomness" -version = "1.0.2" +version = "1.1.0" dependencies = [ "async-trait", "gear-wasm-builder", @@ -4622,7 +4804,7 @@ dependencies = [ [[package]] name = "oracle-randomness-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -4630,7 +4812,7 @@ dependencies = [ [[package]] name = "oracle-randomness-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gmeta", @@ -4640,7 +4822,7 @@ dependencies = [ [[package]] name = "oracle-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gmeta", @@ -4685,12 +4867,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "parity-wasm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" - [[package]] name = "parity-wasm" version = "0.45.0" @@ -4784,18 +4960,18 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[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", @@ -4816,7 +4992,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "ping" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gstd", @@ -4826,7 +5002,7 @@ dependencies = [ [[package]] name = "ping-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -4834,7 +5010,7 @@ dependencies = [ [[package]] name = "ping-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gmeta", @@ -4854,25 +5030,19 @@ dependencies = [ [[package]] name = "pkcs8" -version = "0.9.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ "der", "spki", ] -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - [[package]] name = "platforms" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" [[package]] name = "polling" @@ -4892,16 +5062,16 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.0" +version = "3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" +checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.25", + "rustix 0.38.31", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4989,11 +5159,22 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-warning" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -5027,17 +5208,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "pwasm-utils" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ecdabd73c8beaf98c66e45aff3032b56260ee49eb5d0d1222ecce269bfafda7" -dependencies = [ - "byteorder", - "log", - "parity-wasm 0.42.2", -] - [[package]] name = "quote" version = "1.0.35" @@ -5112,7 +5282,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", ] [[package]] @@ -5135,9 +5305,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -5145,9 +5315,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -5168,25 +5338,25 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "libredox", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" +checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" +checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" dependencies = [ "proc-macro2", "quote", @@ -5206,13 +5376,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.5", "regex-syntax 0.8.2", ] @@ -5227,9 +5397,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -5271,7 +5441,7 @@ dependencies = [ [[package]] name = "rentable-nft" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gclient", "gear-lib-derive", @@ -5290,7 +5460,7 @@ dependencies = [ [[package]] name = "rentable-nft-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-lib-old", "gmeta", @@ -5300,7 +5470,7 @@ dependencies = [ [[package]] name = "rentable-nft-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-lib-old", "gear-wasm-builder", @@ -5311,23 +5481,22 @@ dependencies = [ [[package]] name = "rfc6979" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ - "crypto-bigint", "hmac 0.12.1", - "zeroize", + "subtle", ] [[package]] name = "ring" -version = "0.17.5" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.11", + "getrandom 0.2.12", "libc", "spin", "untrusted", @@ -5336,12 +5505,13 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.42" +version = "0.7.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" +checksum = "527a97cdfef66f65998b5f3b637c26f5a5ec09cc52a3f9932313ac645f4190f5" dependencies = [ "bitvec", "bytecheck", + "bytes", "hashbrown 0.12.3", "ptr_meta", "rend", @@ -5353,9 +5523,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.42" +version = "0.7.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +checksum = "b5c462a1328c8e67e4d6dbad1eb0355dd43e8ab432c6e227a43657f16ade5033" dependencies = [ "proc-macro2", "quote", @@ -5364,7 +5534,7 @@ dependencies = [ [[package]] name = "rmrk" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gstd", @@ -5379,7 +5549,7 @@ dependencies = [ [[package]] name = "rmrk-catalog" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gstd", @@ -5389,7 +5559,7 @@ dependencies = [ [[package]] name = "rmrk-catalog-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -5398,7 +5568,7 @@ dependencies = [ [[package]] name = "rmrk-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -5408,7 +5578,7 @@ dependencies = [ [[package]] name = "rmrk-resource" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gstd", @@ -5419,7 +5589,7 @@ dependencies = [ [[package]] name = "rmrk-resource-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -5428,7 +5598,7 @@ dependencies = [ [[package]] name = "rmrk-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gmeta", @@ -5440,7 +5610,7 @@ dependencies = [ [[package]] name = "rmrk-types" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gstd", "primitive-types", @@ -5448,7 +5618,7 @@ dependencies = [ [[package]] name = "rock-paper-scissors" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gclient", "gear-wasm-builder", @@ -5462,7 +5632,7 @@ dependencies = [ [[package]] name = "rock-paper-scissors-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -5470,7 +5640,7 @@ dependencies = [ [[package]] name = "rock-paper-scissors-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gmeta", @@ -5480,7 +5650,7 @@ dependencies = [ [[package]] name = "roll-the-dice" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gstd", @@ -5493,7 +5663,7 @@ dependencies = [ [[package]] name = "roll-the-dice-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -5501,7 +5671,7 @@ dependencies = [ [[package]] name = "roll-the-dice-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gmeta", @@ -5566,22 +5736,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.25" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", - "linux-raw-sys 0.4.11", - "windows-sys 0.48.0", + "linux-raw-sys 0.4.13", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.9" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring", @@ -5607,7 +5777,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", ] [[package]] @@ -5639,22 +5809,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "sc-executor-common" -version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" -dependencies = [ - "sp-allocator", - "sp-maybe-compressed-blob", - "sp-wasm-interface 7.0.0", - "thiserror", - "wasm-instrument", - "wasmi 0.13.2", -] +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "scale-bits" @@ -5771,11 +5928,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5847,9 +6004,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "sec1" -version = "0.3.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct", "der", @@ -5911,36 +6068,36 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.193" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.12" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", @@ -5949,9 +6106,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" dependencies = [ "itoa", "ryu", @@ -5960,9 +6117,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -6028,7 +6185,7 @@ dependencies = [ [[package]] name = "sharded-fungible-token" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-lib-old", "gear-wasm-builder", @@ -6046,7 +6203,7 @@ dependencies = [ [[package]] name = "sharded-fungible-token-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -6055,7 +6212,7 @@ dependencies = [ [[package]] name = "sharded-fungible-token-logic" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-lib-old", "gear-wasm-builder", @@ -6069,7 +6226,7 @@ dependencies = [ [[package]] name = "sharded-fungible-token-logic-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -6080,7 +6237,7 @@ dependencies = [ [[package]] name = "sharded-fungible-token-storage" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gstd", @@ -6090,7 +6247,7 @@ dependencies = [ [[package]] name = "sharded-fungible-token-storage-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -6099,7 +6256,7 @@ dependencies = [ [[package]] name = "sharded-multi-token" -version = "1.0.2" +version = "1.1.0" dependencies = [ "blake2-rfc", "gclient", @@ -6117,7 +6274,7 @@ dependencies = [ [[package]] name = "sharded-multi-token-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -6126,7 +6283,7 @@ dependencies = [ [[package]] name = "sharded-multi-token-logic" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gstd", @@ -6139,7 +6296,7 @@ dependencies = [ [[package]] name = "sharded-multi-token-logic-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -6150,7 +6307,7 @@ dependencies = [ [[package]] name = "sharded-multi-token-storage" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gstd", @@ -6160,7 +6317,7 @@ dependencies = [ [[package]] name = "sharded-multi-token-storage-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -6190,6 +6347,12 @@ name = "signature" version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", "rand_core 0.6.4", @@ -6218,9 +6381,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smol" @@ -6248,7 +6411,7 @@ dependencies = [ "arrayvec 0.7.4", "async-lock 2.8.0", "atomic", - "base64 0.21.5", + "base64 0.21.7", "bip39", "blake2-rfc", "bs58 0.5.0", @@ -6260,7 +6423,7 @@ dependencies = [ "fnv", "futures-channel", "futures-util", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "hex", "hmac 0.12.1", "itertools", @@ -6305,7 +6468,7 @@ dependencies = [ "fnv", "futures-channel", "futures-util", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "hex", "itertools", "log", @@ -6322,9 +6485,9 @@ dependencies = [ [[package]] name = "snow" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58021967fd0a5eeeb23b08df6cc244a4d4a5b4aec1d27c9e02fad1a58b4cd74e" +checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85" dependencies = [ "aes-gcm", "blake2", @@ -6374,7 +6537,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "4.1.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ "log", "parity-scale-codec", @@ -6385,17 +6548,20 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ "hash-db", "log", "parity-scale-codec", + "scale-info", "sp-api-proc-macro", - "sp-core 7.0.0", - "sp-runtime", - "sp-state-machine", - "sp-std 5.0.0", - "sp-trie", + "sp-core 21.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-externalities 0.19.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-metadata-ir", + "sp-runtime 24.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-state-machine 0.28.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-trie 22.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", "sp-version", "thiserror", ] @@ -6403,7 +6569,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ "Inflector", "blake2", @@ -6411,46 +6577,120 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] name = "sp-application-crypto" -version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "23.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899492ea547816d5dfe9a5a2ecc32f65a7110805af6da3380aa4902371b31dc2" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io", - "sp-std 5.0.0", + "sp-core 21.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-io 23.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "sp-application-crypto" +version = "23.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 21.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-io 23.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", ] [[package]] name = "sp-arithmetic" -version = "6.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "16.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb6020576e544c6824a51d651bc8df8e6ab67cd59f1c9ac09868bb81a5199ded" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-std 5.0.0", + "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "static_assertions", +] + +[[package]] +name = "sp-arithmetic" +version = "16.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" +dependencies = [ + "integer-sqrt", + "num-traits", + "parity-scale-codec", + "scale-info", + "serde", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", "static_assertions", ] [[package]] name = "sp-core" -version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "21.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f18d9e2f67d8661f9729f35347069ac29d92758b59135176799db966947a7336" dependencies = [ "array-bytes 4.2.0", - "base58", "bitflags 1.3.2", "blake2", "bounded-collections", + "bs58 0.4.0", + "dyn-clonable", + "ed25519-zebra", + "futures", + "hash-db", + "hash256-std-hasher", + "impl-serde", + "lazy_static", + "libsecp256k1", + "log", + "merlin 2.0.1", + "parity-scale-codec", + "parking_lot", + "paste", + "primitive-types", + "rand 0.8.5", + "regex", + "scale-info", + "schnorrkel 0.9.1", + "secp256k1", + "secrecy", + "serde", + "sp-core-hashing 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-debug-derive 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime-interface 17.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-storage 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ss58-registry", + "substrate-bip39", + "thiserror", + "tiny-bip39", + "zeroize", +] + +[[package]] +name = "sp-core" +version = "21.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" +dependencies = [ + "array-bytes 6.2.2", + "bitflags 1.3.2", + "blake2", + "bounded-collections", + "bs58 0.4.0", "dyn-clonable", "ed25519-zebra", "futures", @@ -6463,6 +6703,7 @@ dependencies = [ "merlin 2.0.1", "parity-scale-codec", "parking_lot", + "paste", "primitive-types", "rand 0.8.5", "regex", @@ -6472,16 +6713,17 @@ dependencies = [ "secrecy", "serde", "sp-allocator", - "sp-core-hashing 5.0.0", - "sp-debug-derive 5.0.0", - "sp-externalities 0.13.0", - "sp-runtime-interface 7.0.0", - "sp-std 5.0.0", - "sp-storage 7.0.0", + "sp-core-hashing 9.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-debug-derive 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-externalities 0.19.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-runtime-interface 17.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-storage 13.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", "ss58-registry", "substrate-bip39", "thiserror", "tiny-bip39", + "tracing", "zeroize", ] @@ -6491,7 +6733,7 @@ version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0de478e02efd547693b33ad02515e09933d5b69b7f3036fa890b92e50fd9dfc" dependencies = [ - "array-bytes 6.2.0", + "array-bytes 6.2.2", "bitflags 1.3.2", "blake2", "bounded-collections", @@ -6520,30 +6762,29 @@ dependencies = [ [[package]] name = "sp-core-hashing" -version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ee599a8399448e65197f9a6cee338ad192e9023e35e31f22382964c3c174c68" dependencies = [ "blake2b_simd", "byteorder", "digest 0.10.7", "sha2 0.10.8", "sha3", - "sp-std 5.0.0", + "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "twox-hash", ] [[package]] name = "sp-core-hashing" version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ee599a8399448e65197f9a6cee338ad192e9023e35e31f22382964c3c174c68" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ "blake2b_simd", "byteorder", "digest 0.10.7", "sha2 0.10.8", "sha3", - "sp-std 8.0.0", "twox-hash", ] @@ -6563,23 +6804,33 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" -version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "9.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" +dependencies = [ + "quote", + "sp-core-hashing 9.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "syn 2.0.48", +] + +[[package]] +name = "sp-debug-derive" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f531814d2f16995144c74428830ccf7d94ff4a7749632b83ad8199b181140c" dependencies = [ "proc-macro2", "quote", - "sp-core-hashing 5.0.0", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] name = "sp-debug-derive" -version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "8.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] @@ -6595,13 +6846,25 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.13.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0f71c671e01a8ca60da925d43a1b351b69626e268b8837f8371e320cf1dd100" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 5.0.0", - "sp-storage 7.0.0", + "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-storage 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "sp-externalities" +version = "0.19.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-storage 13.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", ] [[package]] @@ -6619,22 +6882,22 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-runtime", - "sp-std 5.0.0", + "sp-runtime 24.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", "thiserror", ] [[package]] name = "sp-io" -version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "23.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d597e35a9628fe7454b08965b2442e3ec0f264b0a90d41328e87422cec02e99" dependencies = [ "bytes", "ed25519", @@ -6643,48 +6906,97 @@ dependencies = [ "libsecp256k1", "log", "parity-scale-codec", + "rustversion", "secp256k1", - "sp-core 7.0.0", - "sp-externalities 0.13.0", - "sp-keystore", - "sp-runtime-interface 7.0.0", - "sp-state-machine", - "sp-std 5.0.0", - "sp-tracing 6.0.0", - "sp-trie", + "sp-core 21.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-keystore 0.27.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime-interface 17.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-state-machine 0.28.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-tracing 10.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-trie 22.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing", + "tracing-core", +] + +[[package]] +name = "sp-io" +version = "23.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" +dependencies = [ + "bytes", + "ed25519", + "ed25519-dalek", + "libsecp256k1", + "log", + "parity-scale-codec", + "rustversion", + "secp256k1", + "sp-core 21.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-externalities 0.19.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-keystore 0.27.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-runtime-interface 17.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-state-machine 0.28.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-tracing 10.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-trie 22.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", "tracing", "tracing-core", ] [[package]] name = "sp-keystore" -version = "0.13.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9be3cdd67cc1d9c1db17c5cbc4ec4924054a8437009d167f21f6590797e4aa45" dependencies = [ - "async-trait", "futures", - "merlin 2.0.1", "parity-scale-codec", "parking_lot", - "schnorrkel 0.9.1", - "sp-core 7.0.0", - "sp-externalities 0.13.0", + "sp-core 21.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] -name = "sp-maybe-compressed-blob" -version = "4.1.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +name = "sp-keystore" +version = "0.27.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ + "parity-scale-codec", + "parking_lot", + "sp-core 21.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-externalities 0.19.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", "thiserror", - "zstd", +] + +[[package]] +name = "sp-metadata-ir" +version = "0.1.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" +dependencies = [ + "frame-metadata 16.0.0", + "parity-scale-codec", + "scale-info", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", +] + +[[package]] +name = "sp-panic-handler" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd2de46003fa8212426838ca71cd42ee36a26480ba9ffea983506ce03131033" +dependencies = [ + "backtrace", + "lazy_static", + "regex", ] [[package]] name = "sp-panic-handler" -version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "8.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ "backtrace", "lazy_static", @@ -6693,8 +7005,9 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "24.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21c5bfc764a1a8259d7e8f7cfd22c84006275a512c958d3ff966c92151e134d5" dependencies = [ "either", "hash256-std-hasher", @@ -6705,29 +7018,70 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sp-application-crypto", - "sp-arithmetic", - "sp-core 7.0.0", - "sp-io", - "sp-std 5.0.0", - "sp-weights", + "sp-application-crypto 23.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-arithmetic 16.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 21.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-io 23.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-weights 20.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "sp-runtime" +version = "24.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" +dependencies = [ + "either", + "hash256-std-hasher", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "paste", + "rand 0.8.5", + "scale-info", + "serde", + "sp-application-crypto 23.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-arithmetic 16.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-core 21.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-io 23.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-weights 20.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", ] [[package]] name = "sp-runtime-interface" -version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e676128182f90015e916f806cba635c8141e341e7abbc45d25525472e1bbce8" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities 0.13.0", - "sp-runtime-interface-proc-macro 6.0.0", - "sp-std 5.0.0", - "sp-storage 7.0.0", - "sp-tracing 6.0.0", - "sp-wasm-interface 7.0.0", + "sp-externalities 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime-interface-proc-macro 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-storage 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-tracing 10.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-wasm-interface 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "static_assertions", +] + +[[package]] +name = "sp-runtime-interface" +version = "17.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" +dependencies = [ + "bytes", + "impl-trait-for-tuples", + "parity-scale-codec", + "primitive-types", + "sp-externalities 0.19.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-runtime-interface-proc-macro 11.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-storage 13.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-tracing 10.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-wasm-interface 14.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", "static_assertions", ] @@ -6752,14 +7106,27 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "6.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "11.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d5bd5566fe5633ec48dfa35ab152fd29f8a577c21971e1c6db9f28afb9bbb9" dependencies = [ "Inflector", "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", +] + +[[package]] +name = "sp-runtime-interface-proc-macro" +version = "11.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" +dependencies = [ + "Inflector", + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 2.0.48", ] [[package]] @@ -6778,19 +7145,42 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ + "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-runtime", - "sp-std 5.0.0", + "serde", + "sp-core 21.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-runtime 24.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", +] + +[[package]] +name = "sp-state-machine" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef45d31f9e7ac648f8899a0cd038a3608f8499028bff55b6c799702592325b6" +dependencies = [ + "hash-db", + "log", + "parity-scale-codec", + "parking_lot", + "rand 0.8.5", + "smallvec", + "sp-core 21.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-panic-handler 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-trie 22.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror", + "tracing", ] [[package]] name = "sp-state-machine" -version = "0.13.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "0.28.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ "hash-db", "log", @@ -6798,25 +7188,26 @@ dependencies = [ "parking_lot", "rand 0.8.5", "smallvec", - "sp-core 7.0.0", - "sp-externalities 0.13.0", - "sp-panic-handler", - "sp-std 5.0.0", - "sp-trie", + "sp-core 21.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-externalities 0.19.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-panic-handler 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-trie 22.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", "thiserror", "tracing", + "trie-db", ] [[package]] name = "sp-std" -version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53458e3c57df53698b3401ec0934bea8e8cfce034816873c0b0abbd83d7bac0d" [[package]] name = "sp-std" version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53458e3c57df53698b3401ec0934bea8e8cfce034816873c0b0abbd83d7bac0d" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" [[package]] name = "sp-std" @@ -6826,15 +7217,29 @@ checksum = "2d5bbc9339227d1b6a9b7ccd9b2920c818653d40eef1512f1e2e824d72e7a336" [[package]] name = "sp-storage" -version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94294be83f11d4958cfea89ed5798f0b6605f5defc3a996948848458abbcc18e" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "ref-cast", + "serde", + "sp-debug-derive 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "sp-storage" +version = "13.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 5.0.0", - "sp-std 5.0.0", + "sp-debug-derive 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", ] [[package]] @@ -6853,11 +7258,24 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "6.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "10.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357f7591980dd58305956d32f8f6646d0a8ea9ea0e7e868e46f53b68ddf00cec" +dependencies = [ + "parity-scale-codec", + "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "sp-tracing" +version = "10.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ "parity-scale-codec", - "sp-std 5.0.0", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", "tracing", "tracing-core", "tracing-subscriber", @@ -6877,12 +7295,36 @@ dependencies = [ [[package]] name = "sp-trie" -version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4eeb7ef23f79eba8609db79ef9cef242f994f1f87a3c0387b4b5f177fda74" dependencies = [ "ahash 0.8.7", "hash-db", - "hashbrown 0.12.3", + "hashbrown 0.13.2", + "lazy_static", + "memory-db", + "nohash-hasher", + "parity-scale-codec", + "parking_lot", + "scale-info", + "schnellru", + "sp-core 21.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror", + "tracing", + "trie-db", + "trie-root", +] + +[[package]] +name = "sp-trie" +version = "22.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" +dependencies = [ + "ahash 0.8.7", + "hash-db", + "hashbrown 0.13.2", "lazy_static", "memory-db", "nohash-hasher", @@ -6890,8 +7332,8 @@ dependencies = [ "parking_lot", "scale-info", "schnellru", - "sp-core 7.0.0", - "sp-std 5.0.0", + "sp-core 21.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", "thiserror", "tracing", "trie-db", @@ -6900,8 +7342,8 @@ dependencies = [ [[package]] name = "sp-version" -version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "22.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ "impl-serde", "parity-scale-codec", @@ -6909,34 +7351,48 @@ dependencies = [ "scale-info", "serde", "sp-core-hashing-proc-macro", - "sp-runtime", - "sp-std 5.0.0", + "sp-runtime 24.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", "sp-version-proc-macro", "thiserror", ] [[package]] name = "sp-version-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "8.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] name = "sp-wasm-interface" -version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19c122609ca5d8246be6386888596320d03c7bc880959eaa2c36bcd5acd6846" +dependencies = [ + "anyhow", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmtime", +] + +[[package]] +name = "sp-wasm-interface" +version = "14.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", "sp-allocator", - "sp-std 5.0.0", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", "sp-wasm-interface-common", "wasmtime", ] @@ -6955,26 +7411,42 @@ dependencies = [ [[package]] name = "sp-wasm-interface-common" version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" dependencies = [ "parity-scale-codec", - "sp-std 5.0.0", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", "wasmi 0.13.2", ] [[package]] name = "sp-weights" -version = "4.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +version = "20.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45d084c735544f70625b821c3acdbc7a2fc1893ca98b85f1942631284692c75b" dependencies = [ "parity-scale-codec", "scale-info", "serde", "smallvec", - "sp-arithmetic", - "sp-core 7.0.0", - "sp-debug-derive 5.0.0", - "sp-std 5.0.0", + "sp-arithmetic 16.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 21.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-debug-derive 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "sp-weights" +version = "20.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#e4b3ebf0ed497e9d121a2e272d238fa87269b756" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "smallvec", + "sp-arithmetic 16.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-core 21.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-debug-derive 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", ] [[package]] @@ -6985,9 +7457,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "spki" -version = "0.6.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", @@ -6995,9 +7467,9 @@ dependencies = [ [[package]] name = "ss58-registry" -version = "1.44.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35935738370302d5e33963665b77541e4b990a3e919ec904c837a56cfc891de1" +checksum = "b1114ee5900b8569bbc8b1a014a942f937b752af4b44f4607430b5f86cedaac0" dependencies = [ "Inflector", "num-format", @@ -7016,7 +7488,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "staking" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gmeta", @@ -7031,7 +7503,7 @@ dependencies = [ [[package]] name = "staking-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -7039,7 +7511,7 @@ dependencies = [ [[package]] name = "staking-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gmeta", @@ -7055,9 +7527,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "str-buf" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e75b72ee54e2f93c3ea1354066162be893ee5e25773ab743de3e088cecbb4f31" +checksum = "0ceb97b7225c713c2fd4db0153cb6b3cab244eb37900c3f634ed4d43310d8c34" [[package]] name = "strsim" @@ -7067,7 +7539,7 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "student-nft" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gclient", "gear-wasm-builder", @@ -7079,7 +7551,7 @@ dependencies = [ [[package]] name = "student-nft-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -7087,7 +7559,7 @@ dependencies = [ [[package]] name = "student-nft-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gmeta", @@ -7145,7 +7617,7 @@ dependencies = [ "scale-value", "serde", "serde_json", - "sp-core-hashing 9.0.0", + "sp-core-hashing 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "subxt-lightclient", "subxt-macro", "subxt-metadata", @@ -7196,7 +7668,7 @@ version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12e8be9ab6fe88b8c13edbe15911e148482cfb905a8b8d5b8d766a64c54be0bd" dependencies = [ - "darling 0.20.3", + "darling 0.20.5", "proc-macro-error", "subxt-codegen", "syn 2.0.48", @@ -7211,13 +7683,13 @@ dependencies = [ "frame-metadata 16.0.0", "parity-scale-codec", "scale-info", - "sp-core-hashing 9.0.0", + "sp-core-hashing 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "supply-chain" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gclient", "gear-lib-old", @@ -7239,7 +7711,7 @@ dependencies = [ [[package]] name = "supply-chain-deploy" -version = "1.0.2" +version = "1.1.0" dependencies = [ "clap", "gclient", @@ -7256,7 +7728,7 @@ dependencies = [ [[package]] name = "supply-chain-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-lib-old", "gmeta", @@ -7265,7 +7737,7 @@ dependencies = [ [[package]] name = "supply-chain-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gmeta", @@ -7297,7 +7769,7 @@ dependencies = [ [[package]] name = "syndote" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gstd", @@ -7308,7 +7780,7 @@ dependencies = [ [[package]] name = "syndote-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -7316,7 +7788,7 @@ dependencies = [ [[package]] name = "syndote-player" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gstd", @@ -7326,7 +7798,7 @@ dependencies = [ [[package]] name = "syndote-player-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -7335,7 +7807,7 @@ dependencies = [ [[package]] name = "tamagotchi" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gstd", @@ -7344,7 +7816,7 @@ dependencies = [ [[package]] name = "tamagotchi-battle" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gclient", "gear-wasm-builder", @@ -7359,7 +7831,7 @@ dependencies = [ [[package]] name = "tamagotchi-battle-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -7367,7 +7839,7 @@ dependencies = [ [[package]] name = "tamagotchi-battle-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gmeta", @@ -7377,7 +7849,7 @@ dependencies = [ [[package]] name = "tamagotchi-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -7385,7 +7857,7 @@ dependencies = [ [[package]] name = "tamagotchi-state" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gmeta", @@ -7401,26 +7873,26 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand 2.0.1", "redox_syscall", - "rustix 0.38.25", - "windows-sys 0.48.0", + "rustix 0.38.31", + "windows-sys 0.52.0", ] [[package]] name = "tequila-train" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gstd", @@ -7430,7 +7902,7 @@ dependencies = [ [[package]] name = "tequila-train-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "enum-iterator 1.5.0", "gmeta", @@ -7441,18 +7913,18 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] @@ -7479,9 +7951,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", @@ -7500,10 +7972,10 @@ dependencies = [ [[package]] name = "tic-tac-toe" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gclient", - "gear-core", + "gear-core 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gear-wasm-builder", "gmeta", "gstd", @@ -7515,11 +7987,13 @@ dependencies = [ [[package]] name = "tic-tac-toe-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", + "parity-scale-codec", "primitive-types", + "scale-info", ] [[package]] @@ -7567,9 +8041,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -7656,7 +8130,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.2", "serde", "serde_spanned", "toml_datetime", @@ -7669,7 +8143,7 @@ version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.2", "toml_datetime", "winnow", ] @@ -7801,9 +8275,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tt-call" @@ -7843,9 +8317,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -7903,9 +8377,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" [[package]] name = "valuable" @@ -7915,7 +8389,7 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "vara-man" -version = "1.0.2" +version = "1.1.0" dependencies = [ "blake2-rfc", "gclient", @@ -7928,7 +8402,7 @@ dependencies = [ [[package]] name = "vara-man-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -7938,11 +8412,11 @@ dependencies = [ [[package]] name = "varatube" -version = "1.0.2" +version = "1.1.0" dependencies = [ "fungible-token", "fungible-token-io", - "gear-core", + "gear-core 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gear-wasm-builder", "gstd", "gtest", @@ -7951,7 +8425,7 @@ dependencies = [ [[package]] name = "varatube-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -7965,7 +8439,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "w3bstreaming" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gear-wasm-builder", "gstd", @@ -7974,7 +8448,7 @@ dependencies = [ [[package]] name = "w3bstreaming-io" -version = "1.0.2" +version = "1.1.0" dependencies = [ "gmeta", "gstd", @@ -8032,9 +8506,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -8042,9 +8516,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" dependencies = [ "bumpalo", "log", @@ -8057,9 +8531,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -8067,9 +8541,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ "proc-macro2", "quote", @@ -8080,28 +8554,19 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "wasm-encoder" -version = "0.38.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b09bc5df933a3dabbdb72ae4b6b71be8ae07f58774d5aa41bd20adcd41a235a" +checksum = "e09bca7d6388637d27fb5edbeab11f56bfabcef8743c55ae34370e1e5030a071" dependencies = [ "leb128", ] -[[package]] -name = "wasm-instrument" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd" -dependencies = [ - "parity-wasm 0.45.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "wasmer" version = "2.3.0" @@ -8384,7 +8849,7 @@ dependencies = [ "intx", "smallvec", "spin", - "wasmi_arena 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmi_arena 0.4.1", "wasmi_core 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmparser-nostd", ] @@ -8397,7 +8862,7 @@ dependencies = [ "intx", "smallvec", "spin", - "wasmi_arena 0.4.0 (git+https://github.com/gear-tech/wasmi?branch=gear-v0.30.0)", + "wasmi_arena 0.4.0", "wasmi_core 0.12.0 (git+https://github.com/gear-tech/wasmi?branch=gear-v0.30.0)", "wasmparser-nostd", ] @@ -8413,13 +8878,13 @@ dependencies = [ [[package]] name = "wasmi_arena" version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468" +source = "git+https://github.com/gear-tech/wasmi?branch=gear-v0.30.0#c8b0be9c2012e0478959a59074fd953a942782bc" [[package]] name = "wasmi_arena" -version = "0.4.0" -source = "git+https://github.com/gear-tech/wasmi?branch=gear-v0.30.0#c8b0be9c2012e0478959a59074fd953a942782bc" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" [[package]] name = "wasmi_core" @@ -8466,9 +8931,9 @@ checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" [[package]] name = "wasmparser" -version = "0.100.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4" +checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b" dependencies = [ "indexmap 1.9.3", "url", @@ -8485,9 +8950,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a222f5fa1e14b2cefc286f1b68494d7a965f4bf57ec04c59bb62673d639af6" +checksum = "f907fdead3153cb9bfb7a93bbd5b62629472dc06dee83605358c64c52ed3dda9" dependencies = [ "anyhow", "bincode", @@ -8495,95 +8960,95 @@ dependencies = [ "indexmap 1.9.3", "libc", "log", - "object 0.29.0", + "object 0.30.4", "once_cell", "paste", "psm", "serde", "target-lexicon", - "wasmparser 0.100.0", + "wasmparser 0.102.0", "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "wasmtime-asm-macros" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4407a7246e7d2f3d8fb1cf0c72fda8dbafdb6dd34d555ae8bea0e5ae031089cc" +checksum = "d3b9daa7c14cd4fa3edbf69de994408d5f4b7b0959ac13fa69d465f6597f810d" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-environ" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b8b50962eae38ee319f7b24900b7cf371f03eebdc17400c1dc8575fc10c9a7" +checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949" dependencies = [ "anyhow", - "cranelift-entity 0.93.2", - "gimli 0.26.2", + "cranelift-entity 0.95.1", + "gimli 0.27.3", "indexmap 1.9.3", "log", - "object 0.29.0", + "object 0.30.4", "serde", "target-lexicon", "thiserror", - "wasmparser 0.100.0", + "wasmparser 0.102.0", "wasmtime-types", ] [[package]] name = "wasmtime-jit" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffaed4f9a234ba5225d8e64eac7b4a5d13b994aeb37353cde2cbeb3febda9eaa" +checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244" dependencies = [ - "addr2line 0.17.0", + "addr2line 0.19.0", "anyhow", "bincode", "cfg-if", "cpp_demangle", - "gimli 0.26.2", + "gimli 0.27.3", "log", - "object 0.29.0", + "object 0.30.4", "rustc-demangle", "serde", "target-lexicon", "wasmtime-environ", "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "wasmtime-jit-debug" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed41cbcbf74ce3ff6f1d07d1b707888166dc408d1a880f651268f4f7c9194b2" +checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846" dependencies = [ "once_cell", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a28ae1e648461bfdbb79db3efdaee1bca5b940872e4175390f465593a2e54c" +checksum = "aecae978b13f7f67efb23bd827373ace4578f2137ec110bbf6a4a7cde4121bbd" dependencies = [ "cfg-if", "libc", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "wasmtime-runtime" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e704b126e4252788ccfc3526d4d4511d4b23c521bf123e447ac726c14545217b" +checksum = "658cf6f325232b6760e202e5255d823da5e348fdea827eff0a2a22319000b441" dependencies = [ "anyhow", "cc", @@ -8593,34 +9058,35 @@ dependencies = [ "log", "mach", "memfd", - "memoffset 0.6.5", + "memoffset 0.8.0", "paste", "rand 0.8.5", "rustix 0.36.17", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "wasmtime-types" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e5572c5727c1ee7e8f28717aaa8400e4d22dcbd714ea5457d85b5005206568" +checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f" dependencies = [ - "cranelift-entity 0.93.2", + "cranelift-entity 0.95.1", "serde", "thiserror", - "wasmparser 0.100.0", + "wasmparser 0.102.0", ] [[package]] name = "wast" -version = "69.0.0" +version = "70.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa51b5ad1391943d1bfad537e50f28fe938199ee76b115be6bae83802cd5185" +checksum = "a3d5061300042ff5065123dae1e27d00c03f567d34a2937c8472255148a216dc" dependencies = [ + "bumpalo", "leb128", "memchr", "unicode-width", @@ -8629,18 +9095,18 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.81" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74a4c2488d058326466e086a43f5d4ea448241a8d0975e3eb0642c0828be1eb3" +checksum = "afd7357b6cc46d46a2509c43dcb1dd4131dafbf4e75562d87017b5a05ffad2d6" dependencies = [ "wast", ] [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "which" @@ -8651,7 +9117,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.25", + "rustix 0.38.31", ] [[package]] @@ -8687,11 +9153,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -8707,21 +9173,6 @@ dependencies = [ "windows_x86_64_msvc 0.33.0", ] -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-sys" version = "0.45.0" @@ -8740,6 +9191,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -8770,6 +9230,21 @@ dependencies = [ "windows_x86_64_msvc 0.48.5", ] +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -8782,6 +9257,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.33.0" @@ -8800,6 +9281,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.33.0" @@ -8818,6 +9305,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.33.0" @@ -8836,6 +9329,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.33.0" @@ -8854,6 +9353,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -8866,6 +9371,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.33.0" @@ -8884,11 +9395,17 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "winnow" -version = "0.5.19" +version = "0.5.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "818ce546a11a9986bc24f93d0cdf38a8a1a400f1473ea8c82e59f6e0ffab9249" dependencies = [ "memchr", ] @@ -8919,7 +9436,7 @@ checksum = "7e2c411759b501fb9501aac2b1b2d287a6e93e5bdcf13c25306b23e1b716dd0e" [[package]] name = "xtask" -version = "1.0.2" +version = "1.1.0" dependencies = [ "anyhow", "xshell", @@ -8970,32 +9487,3 @@ dependencies = [ "quote", "syn 2.0.48", ] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/contracts/Cargo.toml b/contracts/Cargo.toml index f66a08d0f..caa2d1826 100644 --- a/contracts/Cargo.toml +++ b/contracts/Cargo.toml @@ -47,7 +47,7 @@ members = [ "multi-token", "multisig-wallet", "multisig-wallet/state", - "nft", + "nft", "nft-marketplace", "nft-marketplace/state", "nft-master", @@ -108,7 +108,7 @@ members = [ homepage = "https://wiki.gear-tech.io/docs/examples/prerequisites" documentation = "https://dapps.gear.rs" authors = ["Gear Foundation "] -version = "1.0.2" +version = "1.1.0" license = "MIT" edition = "2021" publish = false @@ -224,12 +224,12 @@ supply-chain-deploy.path = "supply-chain/deploy" # Gear -gstd = { git = "https://github.com/gear-tech/gear", tag = "v1.0.2" } -gear-wasm-builder = { git = "https://github.com/gear-tech/gear", tag = "v1.0.2" } -gmeta = { git = "https://github.com/gear-tech/gear", tag = "v1.0.2" } -gclient = { git = "https://github.com/gear-tech/gear", tag = "v1.0.2" } -gtest = { git = "https://github.com/gear-tech/gear", tag = "v1.0.2" } -gear-core = { git = "https://github.com/gear-tech/gear", tag = "v1.0.2" } +gstd = "1.1.0" +gear-wasm-builder = "1.1.0" +gmeta = "1.1.0" +gclient = "1.1.0" +gtest = { git = "https://github.com/gear-tech/gear", tag = "v1.1.0" } +gear-core = "1.1.0" # External diff --git a/contracts/battleship/io/Cargo.toml b/contracts/battleship/io/Cargo.toml index 0bd338569..1a3b41a61 100644 --- a/contracts/battleship/io/Cargo.toml +++ b/contracts/battleship/io/Cargo.toml @@ -7,3 +7,5 @@ publish.workspace = true [dependencies] gmeta.workspace = true gstd.workspace = true +parity-scale-codec.workspace = true +scale-info.workspace = true diff --git a/contracts/battleship/io/src/lib.rs b/contracts/battleship/io/src/lib.rs index cacb8cfd5..debe66810 100644 --- a/contracts/battleship/io/src/lib.rs +++ b/contracts/battleship/io/src/lib.rs @@ -22,8 +22,6 @@ impl Metadata for BattleshipMetadata { } #[derive(Encode, Decode, TypeInfo)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub enum StateQuery { All, Game(ActorId), @@ -31,9 +29,7 @@ pub enum StateQuery { SessionForTheAccount(ActorId), } -#[derive(Encode, Decode, TypeInfo, Debug)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] +#[derive(Encode, Decode, TypeInfo)] pub enum StateReply { All(BattleshipState), Game(Option), @@ -42,8 +38,6 @@ pub enum StateReply { } #[derive(Debug, Clone, Encode, Decode, TypeInfo)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub struct BattleshipState { pub games: Vec<(ActorId, GameState)>, pub bot_address: ActorId, @@ -73,8 +67,6 @@ pub enum ActionsForSession { Turn, } #[derive(Debug, Clone, Copy, PartialEq, Eq, Encode, Decode, TypeInfo)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub enum Entity { Empty, Unknown, @@ -92,8 +84,6 @@ impl Entity { } #[derive(Debug, Clone, Encode, Decode, TypeInfo)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub enum BattleshipAction { StartGame { ships: Ships, @@ -139,8 +129,6 @@ pub struct Config { pub block_duration_ms: u64, } #[derive(Debug, Clone, Encode, Decode, TypeInfo)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub enum BattleshipReply { MessageSentToBot, EndGame(BattleshipParticipants), @@ -160,16 +148,12 @@ pub enum Step { } #[derive(Debug, Clone, Encode, Decode, TypeInfo)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub struct BattleshipInit { pub bot_address: ActorId, pub config: Config, } #[derive(Debug, Clone, Encode, Decode, TypeInfo, Default)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub struct Game { pub player_board: Vec, pub bot_board: Vec, @@ -284,8 +268,6 @@ impl Display for Ships { } #[derive(Debug, Clone, Encode, Decode, TypeInfo, Default)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub struct Ships { pub ship_1: Vec, pub ship_2: Vec, @@ -433,24 +415,18 @@ impl Ships { } #[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, TypeInfo)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub enum BattleshipParticipants { Player, Bot, } #[derive(Encode, Decode, TypeInfo, PartialEq)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub enum BotBattleshipAction { Start, Turn(Vec), } #[derive(Debug, Clone, Encode, Decode, TypeInfo, Default)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub struct GameState { pub player_board: Vec, pub bot_board: Vec, diff --git a/contracts/battleship/src/contract.rs b/contracts/battleship/src/contract.rs index 4434970fc..1015f9544 100644 --- a/contracts/battleship/src/contract.rs +++ b/contracts/battleship/src/contract.rs @@ -1,8 +1,5 @@ -use battleship_io::{ - ActionsForSession, BattleshipAction, BattleshipInit, BattleshipParticipants, BattleshipReply, - BattleshipState, BotBattleshipAction, Config, Entity, Game, GameState, Session, Ships, - StateQuery, StateReply, Step, MINIMUM_SESSION_SURATION_MS, -}; +use battleship_io::*; + use gstd::{ collections::{BTreeMap, HashMap}, exec, msg, diff --git a/contracts/concert/Cargo.toml b/contracts/concert/Cargo.toml index a1c29320d..a88a44cae 100644 --- a/contracts/concert/Cargo.toml +++ b/contracts/concert/Cargo.toml @@ -10,7 +10,7 @@ multi-token-io.workspace = true concert-io.workspace = true [dev-dependencies] -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gtest.workspace = true gclient.workspace = true tokio.workspace = true diff --git a/contracts/crowdsale/Cargo.toml b/contracts/crowdsale/Cargo.toml index 21ca89e70..1696baaa8 100644 --- a/contracts/crowdsale/Cargo.toml +++ b/contracts/crowdsale/Cargo.toml @@ -11,7 +11,7 @@ gmeta.workspace = true crowdsale-io.workspace = true [dev-dependencies] -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gtest.workspace = true gclient.workspace = true tokio.workspace = true diff --git a/contracts/crowdsale/tests/init_ico/mod.rs b/contracts/crowdsale/tests/init_ico/mod.rs index c20b67bff..1ab498fc2 100644 --- a/contracts/crowdsale/tests/init_ico/mod.rs +++ b/contracts/crowdsale/tests/init_ico/mod.rs @@ -17,6 +17,7 @@ pub const TOKENS_CNT: u128 = 100_000_000_000_000; pub const START_PRICE: u128 = 10_000_000_000_000; pub const PRICE_INCREASE_STEP: u128 = 100_000_000_000_000; pub const TIME_INCREASE_STEP: u128 = 1000; +pub const TIME_BLOCK: u64 = 3000; fn init_ico(sys: &System) { let ico = Program::current_with_id(sys, ICO_CONTRACT_ID); @@ -41,7 +42,7 @@ pub fn init(sys: &System) { } pub fn start_sale(ico: &Program<'_>, ico_duration: u64, expected_tx_id: u64) { - let duration = Duration::from_secs(ico_duration).as_millis() as u64 * 1000; + let duration = Duration::from_secs(ico_duration).as_millis() as u64 * TIME_BLOCK; let res = ico.send( OWNER_ID, IcoAction::StartSale { @@ -49,7 +50,7 @@ pub fn start_sale(ico: &Program<'_>, ico_duration: u64, expected_tx_id: u64) { start_price: START_PRICE, tokens_goal: TOKENS_CNT, price_increase_step: PRICE_INCREASE_STEP, - time_increase_step: TIME_INCREASE_STEP * 1000, + time_increase_step: TIME_INCREASE_STEP * TIME_BLOCK as u128, }, ); @@ -62,7 +63,7 @@ pub fn start_sale(ico: &Program<'_>, ico_duration: u64, expected_tx_id: u64) { start_price: START_PRICE, tokens_goal: TOKENS_CNT, price_increase_step: PRICE_INCREASE_STEP, - time_increase_step: TIME_INCREASE_STEP * 1000, + time_increase_step: TIME_INCREASE_STEP * TIME_BLOCK as u128, } .encode() ))); diff --git a/contracts/dao-light/Cargo.toml b/contracts/dao-light/Cargo.toml index 859323970..7722d974e 100644 --- a/contracts/dao-light/Cargo.toml +++ b/contracts/dao-light/Cargo.toml @@ -10,7 +10,7 @@ dao-light-io.workspace = true fungible-token-io.workspace = true [dev-dependencies] -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gtest.workspace = true # External binaries diff --git a/contracts/dao/Cargo.toml b/contracts/dao/Cargo.toml index eb961d62e..c39a7077e 100644 --- a/contracts/dao/Cargo.toml +++ b/contracts/dao/Cargo.toml @@ -10,7 +10,7 @@ gstd.workspace = true dao-io.workspace = true [dev-dependencies] -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gtest.workspace = true gclient.workspace = true tokio.workspace = true diff --git a/contracts/dao/tests/failures.rs b/contracts/dao/tests/failures.rs index 70283538c..dabc22e14 100644 --- a/contracts/dao/tests/failures.rs +++ b/contracts/dao/tests/failures.rs @@ -98,14 +98,14 @@ fn submit_vote() { // must fail since the voting period has not started dao.submit_vote(ADMIN, proposal_id + 1, Vote::Yes, true); - system.spend_blocks((PERIOD_DURATION / 100) as u32); + system.spend_blocks((PERIOD_DURATION / 300) as u32); dao.submit_vote(ADMIN, proposal_id + 1, Vote::Yes, false); // must fail since the account has already voted on this proposal dao.submit_vote(ADMIN, proposal_id + 1, Vote::Yes, true); - system.spend_blocks(((VOTING_PERIOD_LENGTH + 1000) / 1000) as u32); + system.spend_blocks(((VOTING_PERIOD_LENGTH + 3000) / 3000) as u32); // must fail since the proposal voting period has expired dao.submit_vote(ADMIN, proposal_id + 1, Vote::Yes, true); diff --git a/contracts/dao/tests/utils.rs b/contracts/dao/tests/utils.rs index e305f92e2..e2701cc7e 100644 --- a/contracts/dao/tests/utils.rs +++ b/contracts/dao/tests/utils.rs @@ -6,8 +6,8 @@ use gtest::{Program, System}; pub const ADMIN: u64 = 100; const TOKEN_ID: u64 = 1; pub const DAO_ID: u64 = 2; -pub const PERIOD_DURATION: u64 = 100; -pub const VOTING_PERIOD_LENGTH: u64 = 1000; +pub const PERIOD_DURATION: u64 = 300; +pub const VOTING_PERIOD_LENGTH: u64 = 3000; pub const GRACE_PERIOD_LENGTH: u64 = 100; const DILUTION_BOUND: u8 = 3; pub const ABORT_WINDOW: u64 = 100; diff --git a/contracts/dex/Cargo.toml b/contracts/dex/Cargo.toml index ab0abd0ee..d113fd258 100644 --- a/contracts/dex/Cargo.toml +++ b/contracts/dex/Cargo.toml @@ -15,7 +15,7 @@ primitive-types.workspace = true [dev-dependencies] gtest.workspace = true gclient.workspace = true -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gear-core.workspace = true sp-core-hashing.workspace = true tokio.workspace = true diff --git a/contracts/dex/tests/utils/mod.rs b/contracts/dex/tests/utils/mod.rs index abd2a0e08..fe79319d4 100644 --- a/contracts/dex/tests/utils/mod.rs +++ b/contracts/dex/tests/utils/mod.rs @@ -325,6 +325,6 @@ pub fn calculate_cp(reserve: (u128, u128)) -> U256 { let U256PairTuple(reserve) = reserve.into(); ((reserve.1 << U256::from(128u64)) / reserve.0) - .overflowing_mul((SPENT_BLOCKS * 1000).into()) + .overflowing_mul((SPENT_BLOCKS * 3000).into()) .0 } diff --git a/contracts/dutch-auction/tests/dutch_auction_tests.rs b/contracts/dutch-auction/tests/dutch_auction_tests.rs index 8f4510422..db42c0b2c 100644 --- a/contracts/dutch-auction/tests/dutch_auction_tests.rs +++ b/contracts/dutch-auction/tests/dutch_auction_tests.rs @@ -53,27 +53,25 @@ fn buy_later_with_lower_price() { let auction = init(&sys); sys.spend_blocks(100_000); - println!("BALANCE: {:?}", sys.balance_of(USERS[1])); - let result = auction.send_with_value(USERS[1], Action::Buy, 999_999_900_000_000); + let result = auction.send_with_value(USERS[1], Action::Buy, 999_999_700_000_000); assert!(result.contains(&( USERS[1], Ok::(Event::Bought { - price: 999_999_900_000_000, + price: 999_999_700_000_000, }) .encode() ))); sys.claim_value_from_mailbox(USERS[0]); - println!("BALANCE: {:?}", sys.balance_of(USERS[1])); auction.send_with_value(USERS[0], Action::Reward, 0); sys.claim_value_from_mailbox(USERS[0]); let buyer_balance = sys.balance_of(USERS[1]); let seller_balance = sys.balance_of(USERS[0]); - assert_eq!(buyer_balance, 9_000_000_100_000_000); - assert_eq!(seller_balance, 10_999_999_900_000_000); + assert_eq!(buyer_balance, 9_000_000_300_000_000); + assert_eq!(seller_balance, 10_999_999_700_000_000); } #[test] diff --git a/contracts/dutch-auction/tests/node_tests.rs b/contracts/dutch-auction/tests/node_tests.rs index b1b17a908..6bfa48be9 100644 --- a/contracts/dutch-auction/tests/node_tests.rs +++ b/contracts/dutch-auction/tests/node_tests.rs @@ -295,7 +295,7 @@ async fn gclient_create_buy_reward() -> Result<()> { std::thread::sleep(std::time::Duration::from_secs(10)); let state: AuctionInfo = api.read_state(auction_program_id, vec![]).await?; - dbg!(state); + std::dbg!(state); // Buy let buy = Action::Buy; diff --git a/contracts/dutch-auction/tests/routines/mod.rs b/contracts/dutch-auction/tests/routines/mod.rs index 8bec48534..a7e243244 100644 --- a/contracts/dutch-auction/tests/routines/mod.rs +++ b/contracts/dutch-auction/tests/routines/mod.rs @@ -25,11 +25,6 @@ pub fn init(sys: &System) -> Program<'_> { init_nft(sys, owner_user); let result = update_auction(&auction_program, owner_user, 2, 1_000_000_000_000_000); - println!( - "update_auction result = {:?}", - result.decoded_log::>() - ); - assert!(result.contains(&( owner_user, Ok::(Event::AuctionStarted { @@ -102,7 +97,6 @@ pub fn init_nft(sys: &System, owner: u64) { .dest(owner) .payload(NFTEvent::Approval(approval)); assert!(!res.main_failed()); - println!("approve result = {:?}", res.decoded_log::()); assert!(res.contains(&log)); } diff --git a/contracts/escrow/Cargo.toml b/contracts/escrow/Cargo.toml index d06dfc8d8..9fbf8885d 100644 --- a/contracts/escrow/Cargo.toml +++ b/contracts/escrow/Cargo.toml @@ -15,7 +15,7 @@ gear-wasm-builder.workspace = true [dev-dependencies] gclient.workspace = true -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gtest.workspace = true tokio.workspace = true diff --git a/contracts/fungible-token/Cargo.toml b/contracts/fungible-token/Cargo.toml index 84d28d277..1d758f52a 100644 --- a/contracts/fungible-token/Cargo.toml +++ b/contracts/fungible-token/Cargo.toml @@ -10,7 +10,7 @@ gstd.workspace = true gmeta.workspace = true [dev-dependencies] -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gtest.workspace = true [build-dependencies] diff --git a/contracts/galactic-express/io/Cargo.toml b/contracts/galactic-express/io/Cargo.toml index c86ec57c1..efdc1766f 100644 --- a/contracts/galactic-express/io/Cargo.toml +++ b/contracts/galactic-express/io/Cargo.toml @@ -8,3 +8,5 @@ publish.workspace = true gmeta.workspace = true gstd.workspace = true gear-lib.workspace = true +parity-scale-codec.workspace = true +scale-info.workspace = true diff --git a/contracts/galactic-express/io/src/lib.rs b/contracts/galactic-express/io/src/lib.rs index ced6305e2..2a86214ba 100644 --- a/contracts/galactic-express/io/src/lib.rs +++ b/contracts/galactic-express/io/src/lib.rs @@ -32,8 +32,6 @@ pub const MAX_FUEL: u8 = 100; pub const MAX_PAYLOAD: u8 = 100; #[derive(Encode, Decode, TypeInfo, Debug)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub struct State { pub admin: ActorId, pub session: Session, @@ -44,8 +42,6 @@ pub struct State { } #[derive(Encode, Decode, TypeInfo, Debug, PartialEq, Eq)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub struct Session { pub session_id: u128, pub altitude: u16, @@ -54,24 +50,18 @@ pub struct Session { } #[derive(Encode, Decode, TypeInfo, Debug)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub enum Stage { Registration(Vec<(ActorId, Participant)>), Results(Results), } #[derive(Encode, Decode, TypeInfo, Default, Clone, Debug, PartialEq, Eq)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub struct Results { pub turns: Vec>, pub rankings: Vec<(ActorId, u128)>, } #[derive(Encode, Decode, TypeInfo)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub enum Action { ChangeAdmin(ActorId), CreateNewSession, @@ -80,18 +70,14 @@ pub enum Action { } #[derive(Encode, Decode, TypeInfo, Debug, PartialEq, Eq)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub enum Event { + GameFinished(Results), AdminChanged(ActorId, ActorId), NewSession(Session), Registered(ActorId, Participant), - GameFinished(Results), } #[derive(Encode, Decode, TypeInfo, Clone, Copy, Debug, Default, PartialEq, Eq)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub struct Participant { pub fuel_amount: u8, pub payload_amount: u8, @@ -108,8 +94,6 @@ impl Participant { } #[derive(Encode, Decode, TypeInfo, Clone, Copy, Debug, PartialEq, Eq)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub enum HaltReason { PayloadOverload, FuelOverload, @@ -120,16 +104,12 @@ pub enum HaltReason { } #[derive(Encode, Decode, TypeInfo, Clone, Copy, Debug, PartialEq, Eq)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub enum Turn { Alive { fuel_left: u8, payload_amount: u8 }, Destroyed(HaltReason), } #[derive(Encode, Decode, TypeInfo, Default, Clone, Copy, Debug, PartialEq, Eq)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub enum Weather { #[default] Clear, @@ -141,8 +121,6 @@ pub enum Weather { } #[derive(Encode, Decode, TypeInfo, Debug, PartialEq, Eq)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub enum Error { StateUninitaliazed, GstdError(String), diff --git a/contracts/game-of-chance/Cargo.toml b/contracts/game-of-chance/Cargo.toml index 4a0e48c5a..8b226b2af 100644 --- a/contracts/game-of-chance/Cargo.toml +++ b/contracts/game-of-chance/Cargo.toml @@ -12,7 +12,7 @@ sharded-fungible-token-io.workspace = true game-of-chance-io.workspace = true [dev-dependencies] -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gtest.workspace = true gclient.workspace = true sp-core-hashing.workspace = true diff --git a/contracts/gear-lib/Cargo.toml b/contracts/gear-lib/Cargo.toml index 3d2b34f36..53c833c55 100644 --- a/contracts/gear-lib/Cargo.toml +++ b/contracts/gear-lib/Cargo.toml @@ -11,4 +11,4 @@ ahash.workspace = true primitive-types.workspace = true [dev-dependencies] -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true diff --git a/contracts/gear-lib/src/tx_manager.rs b/contracts/gear-lib/src/tx_manager.rs index 0fe9b0c55..30efabc06 100644 --- a/contracts/gear-lib/src/tx_manager.rs +++ b/contracts/gear-lib/src/tx_manager.rs @@ -626,10 +626,14 @@ mod tests { .unwrap() ) ); - assert!(manager - .actors_for_tx - .iter() - .eq(txs.iter().map(|(k, v)| (k, v)))); + assert_eq!( + manager + .actors_for_tx + .iter() + .map(|(&k, &v)| (k, v)) + .collect::>(), + txs + ); assert!(manager .cached_transactions() .eq(iter::once((&ActorId::from(1), &228)))); diff --git a/contracts/horse-races/Cargo.toml b/contracts/horse-races/Cargo.toml index 609daed5e..60516b71e 100644 --- a/contracts/horse-races/Cargo.toml +++ b/contracts/horse-races/Cargo.toml @@ -11,7 +11,7 @@ horse-races-io.workspace = true fungible-token-io.workspace = true [dev-dependencies] -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gtest.workspace = true # External binaries diff --git a/contracts/multi-token/Cargo.toml b/contracts/multi-token/Cargo.toml index ba0aa179e..d1ec135d1 100644 --- a/contracts/multi-token/Cargo.toml +++ b/contracts/multi-token/Cargo.toml @@ -10,7 +10,7 @@ multi-token-io.workspace = true gmeta.workspace = true [dev-dependencies] -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gtest.workspace = true gclient.workspace = true tokio.workspace = true diff --git a/contracts/multi-token/src/lib.rs b/contracts/multi-token/src/lib.rs index a8812c03b..5b3de41cd 100644 --- a/contracts/multi-token/src/lib.rs +++ b/contracts/multi-token/src/lib.rs @@ -484,15 +484,15 @@ impl From for State { let balances = balances .into_iter() - .map(|(k, v)| (k, v.into_iter().map(|(a, b)| (a, b)).collect())) + .map(|(k, v)| (k, v.into_iter().collect())) .collect(); let approvals = approvals .into_iter() .map(|(k, v)| (k, v.iter().copied().collect())) .collect(); - let token_metadata = token_metadata.into_iter().map(|(k, v)| (k, v)).collect(); - let owners = owners.into_iter().map(|(k, v)| (k, v)).collect(); - let supply = supply.into_iter().map(|(k, v)| (k, v)).collect(); + let token_metadata = token_metadata.into_iter().collect(); + let owners = owners.into_iter().collect(); + let supply = supply.into_iter().collect(); Self { name, symbol, diff --git a/contracts/multisig-wallet/Cargo.toml b/contracts/multisig-wallet/Cargo.toml index d6ec89544..0de7891a6 100644 --- a/contracts/multisig-wallet/Cargo.toml +++ b/contracts/multisig-wallet/Cargo.toml @@ -10,7 +10,7 @@ multisig-wallet-io.workspace = true primitive-types.workspace = true [dev-dependencies] -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gtest.workspace = true [build-dependencies] diff --git a/contracts/nft-marketplace/Cargo.toml b/contracts/nft-marketplace/Cargo.toml index 9296e6a7d..a121627af 100644 --- a/contracts/nft-marketplace/Cargo.toml +++ b/contracts/nft-marketplace/Cargo.toml @@ -14,7 +14,7 @@ gear-lib-old.workspace = true async-trait.workspace = true [dev-dependencies] -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gtest.workspace = true gclient.workspace = true tokio.workspace = true diff --git a/contracts/nft-master/Cargo.toml b/contracts/nft-master/Cargo.toml index 12b864098..c312ab608 100644 --- a/contracts/nft-master/Cargo.toml +++ b/contracts/nft-master/Cargo.toml @@ -14,6 +14,6 @@ gear-wasm-builder.workspace = true [dev-dependencies] gtest.workspace = true -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true tokio.workspace = true gclient.workspace = true diff --git a/contracts/nft-pixelboard/Cargo.toml b/contracts/nft-pixelboard/Cargo.toml index 7cb135e5b..9736c30cf 100644 --- a/contracts/nft-pixelboard/Cargo.toml +++ b/contracts/nft-pixelboard/Cargo.toml @@ -12,7 +12,7 @@ sharded-fungible-token-io.workspace = true non-fungible-token-io.workspace = true [dev-dependencies] -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gtest.workspace = true # External binaries diff --git a/contracts/nft-pixelboard/src/lib.rs b/contracts/nft-pixelboard/src/lib.rs index 617866c54..22d0bcd03 100644 --- a/contracts/nft-pixelboard/src/lib.rs +++ b/contracts/nft-pixelboard/src/lib.rs @@ -18,7 +18,7 @@ fn get_pixel_count>(width: P, height: P) -> Result, pixel_count: usize) -> Result<(), NFTPixelboardError> { +fn check_painting(painting: &[Color], pixel_count: usize) -> Result<(), NFTPixelboardError> { if painting.len() != pixel_count { return Err(NFTPixelboardError::WrongPaintingLength); } diff --git a/contracts/nft/src/lib.rs b/contracts/nft/src/lib.rs index 9c47c228c..798449d64 100644 --- a/contracts/nft/src/lib.rs +++ b/contracts/nft/src/lib.rs @@ -280,20 +280,11 @@ impl From for State { config, } = value; - let owner_by_id = owner_by_id - .into_iter() - .map(|(hash, actor_id)| (hash, actor_id)) - .collect(); + let owner_by_id = owner_by_id.into_iter().collect(); - let token_approvals = token_approvals - .into_iter() - .map(|(key, approvals)| (key, approvals)) - .collect(); + let token_approvals = token_approvals.into_iter().collect(); - let token_metadata_by_id = token_metadata_by_id - .into_iter() - .map(|(id, metadata)| (id, metadata)) - .collect(); + let token_metadata_by_id = token_metadata_by_id.into_iter().collect(); let tokens_for_owner = tokens_for_owner .into_iter() diff --git a/contracts/on-chain-nft/Cargo.toml b/contracts/on-chain-nft/Cargo.toml index 63f02a48d..0f937f966 100644 --- a/contracts/on-chain-nft/Cargo.toml +++ b/contracts/on-chain-nft/Cargo.toml @@ -13,7 +13,7 @@ on-chain-nft-io.workspace = true gmeta.workspace = true [dev-dependencies] -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gtest.workspace = true gclient.workspace = true tokio.workspace = true diff --git a/contracts/oracle/Cargo.toml b/contracts/oracle/Cargo.toml index 3df3da78d..7d15c0484 100644 --- a/contracts/oracle/Cargo.toml +++ b/contracts/oracle/Cargo.toml @@ -10,7 +10,7 @@ async-trait.workspace = true oracle-io.workspace = true [dev-dependencies] -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gtest.workspace = true gclient.workspace = true tokio.workspace = true diff --git a/contracts/rock-paper-scissors/tests/change_config.rs b/contracts/rock-paper-scissors/tests/change_config.rs index 6c8c6f09b..2efb30a8d 100644 --- a/contracts/rock-paper-scissors/tests/change_config.rs +++ b/contracts/rock-paper-scissors/tests/change_config.rs @@ -37,16 +37,16 @@ fn common() { check_register_player(&game, USERS[3], 0); failure_register_player(&game, USERS[0], 0); - sys.spend_blocks(blocks_count(COMMON_TIMEOUT * 2 / 1000)); + sys.spend_blocks(blocks_count(COMMON_TIMEOUT * 2 / 3000)); failure_user_move(&game, USERS[1], Move::Rock); sys.spend_blocks(1); check_user_move(&game, USERS[2], Move::Paper); check_user_move(&game, USERS[1], Move::Rock); - sys.spend_blocks(blocks_count(COMMON_TIMEOUT * 3 / 1000)); + sys.spend_blocks(blocks_count(COMMON_TIMEOUT * 3 / 3000)); failure_user_reveal(&game, USERS[1], Move::Rock); sys.spend_blocks(1); check_user_reveal_with_continue(&game, USERS[1], Move::Rock); - sys.spend_blocks(blocks_count(COMMON_TIMEOUT * 4 / 1000)); + sys.spend_blocks(blocks_count(COMMON_TIMEOUT * 4 / 3000)); failure_register_player(&game, USERS[0], 0); sys.spend_blocks(1); diff --git a/contracts/rock-paper-scissors/tests/init.rs b/contracts/rock-paper-scissors/tests/init.rs index 179464246..b6db47c14 100644 --- a/contracts/rock-paper-scissors/tests/init.rs +++ b/contracts/rock-paper-scissors/tests/init.rs @@ -57,7 +57,7 @@ fn check_all_users_bet() { failure_register_player(&game, USERS[3], COMMON_BET - 1); failure_user_move(&game, USERS[0], Move::Spock); - sys.spend_blocks(blocks_count(entry_timout_ms / 1_000)); + sys.spend_blocks(blocks_count(entry_timout_ms / 3_000)); failure_user_move(&game, USERS[0], Move::Spock); sys.spend_blocks(1); check_user_move(&game, USERS[0], Move::Spock); @@ -66,13 +66,13 @@ fn check_all_users_bet() { failure_user_move(&game, USERS[3], Move::Spock); failure_user_reveal(&game, USERS[0], Move::Spock); - sys.spend_blocks(blocks_count(move_timout_ms / 1_000)); + sys.spend_blocks(blocks_count(move_timout_ms / 3_000)); failure_user_reveal(&game, USERS[0], Move::Spock); sys.spend_blocks(1); check_user_reveal_with_continue(&game, USERS[0], Move::Spock); failure_user_reveal(&game, USERS[2], Move::Lizard); failure_user_reveal(&game, USERS[1], Move::Lizard); - sys.spend_blocks(blocks_count(reveal_timout_ms / 1_000)); + sys.spend_blocks(blocks_count(reveal_timout_ms / 3_000)); sys.spend_blocks(1); register_players(&game, &USERS[0..3], COMMON_BET); diff --git a/contracts/roll-the-dice/Cargo.toml b/contracts/roll-the-dice/Cargo.toml index 086b28666..d874908e2 100644 --- a/contracts/roll-the-dice/Cargo.toml +++ b/contracts/roll-the-dice/Cargo.toml @@ -10,7 +10,7 @@ oracle-io.workspace = true roll-the-dice-io.workspace = true [dev-dependencies] -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gtest.workspace = true [build-dependencies] diff --git a/contracts/rust-toolchain.toml b/contracts/rust-toolchain.toml deleted file mode 100644 index 07264bc79..000000000 --- a/contracts/rust-toolchain.toml +++ /dev/null @@ -1,5 +0,0 @@ -[toolchain] -channel = "nightly-2023-09-18" -targets = ["wasm32-unknown-unknown"] -profile = "minimal" -components = ["rustfmt", "clippy"] diff --git a/contracts/sharded-fungible-token/Cargo.toml b/contracts/sharded-fungible-token/Cargo.toml index fac1234ad..9129c7351 100644 --- a/contracts/sharded-fungible-token/Cargo.toml +++ b/contracts/sharded-fungible-token/Cargo.toml @@ -13,7 +13,7 @@ sp-core-hashing.workspace = true [dev-dependencies] gtest.workspace = true -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true sp-core.workspace = true hex-literal.workspace = true gear-lib-old.workspace = true diff --git a/contracts/sharded-multi-token/Cargo.toml b/contracts/sharded-multi-token/Cargo.toml index 2b0a4b146..8e0f6d2d3 100644 --- a/contracts/sharded-multi-token/Cargo.toml +++ b/contracts/sharded-multi-token/Cargo.toml @@ -16,7 +16,7 @@ sharded-multi-token-io.workspace = true gear-wasm-builder.workspace = true [dev-dependencies] -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gtest.workspace = true gclient.workspace = true blake2-rfc.workspace = true diff --git a/contracts/sharded-multi-token/logic/src/lib.rs b/contracts/sharded-multi-token/logic/src/lib.rs index 6fef358e8..3cdbd3891 100644 --- a/contracts/sharded-multi-token/logic/src/lib.rs +++ b/contracts/sharded-multi-token/logic/src/lib.rs @@ -353,7 +353,7 @@ impl MTLogic { transaction_hash: H256, token_id: TokenId, msg_source: &ActorId, - to: &Vec, + to: &[ActorId], amounts: Vec, ) { self.transaction_status @@ -403,7 +403,7 @@ impl MTLogic { transaction_hash: H256, token_id: TokenId, _msg_source: &ActorId, - to: &Vec, + to: &[ActorId], ) { self.transaction_status .insert(transaction_hash, TransactionStatus::InProgress); @@ -446,7 +446,7 @@ impl MTLogic { transaction_hash: H256, token_id: TokenId, msg_source: &ActorId, - burn_from: &Vec, + burn_from: &[ActorId], amounts: Vec, ) { self.transaction_status diff --git a/contracts/sharded-multi-token/tests/gclient_ft.rs b/contracts/sharded-multi-token/tests/gclient_ft.rs index 4551ff5b1..9b1609b85 100644 --- a/contracts/sharded-multi-token/tests/gclient_ft.rs +++ b/contracts/sharded-multi-token/tests/gclient_ft.rs @@ -87,15 +87,8 @@ async fn gclient_success_mint_batch_ft() -> gclient::Result<()> { let (api, user_account_0) = gclient_with_account(api, USER_ACCOUNTS[0])?; let mut listener = api.subscribe().await?; - api.transfer( - user_account_1 - .encode() - .as_slice() - .try_into() - .expect("Unexpected invalid user account id."), - 10000, - ) - .await?; + api.transfer(user_account_1.encode().as_slice().into(), 10000) + .await?; mtoken_create( &api, @@ -174,15 +167,8 @@ async fn gclient_success_burn_batch_ft() -> gclient::Result<()> { let (api, user_account_0) = gclient_with_account(api, USER_ACCOUNTS[0])?; let mut listener = api.subscribe().await?; - api.transfer( - user_account_1 - .encode() - .as_slice() - .try_into() - .expect("Unexpected invalid user account id."), - 10000, - ) - .await?; + api.transfer(user_account_1.encode().as_slice().into(), 10000) + .await?; mtoken_create( &api, @@ -406,15 +392,8 @@ async fn gclient_success_transfer_ft() -> gclient::Result<()> { let (api, user_account_0) = gclient_with_account(api, USER_ACCOUNTS[0])?; let mut listener = api.subscribe().await?; - api.transfer( - user_account_1 - .encode() - .as_slice() - .try_into() - .expect("Unexpected invalid user account id."), - 10000, - ) - .await?; + api.transfer(user_account_1.encode().as_slice().into(), 10000) + .await?; mtoken_create( &api, diff --git a/contracts/staking/tests/simple_test.rs b/contracts/staking/tests/simple_test.rs index fbabc1b48..865c10ba5 100644 --- a/contracts/staking/tests/simple_test.rs +++ b/contracts/staking/tests/simple_test.rs @@ -26,7 +26,7 @@ fn init_staking(sys: &System) { InitStaking { staking_token_address: PROGRAMS[1].into(), reward_token_address: PROGRAMS[2].into(), - distribution_time: 10000, + distribution_time: 30000, reward_total: 1000, }, ); @@ -74,7 +74,7 @@ fn update_staking(staking: &mut Staking, reward: u128, time: u64) { panic!("update_staking(): reward is null"); } - staking.distribution_time = 10000; + staking.distribution_time = 30000; update_reward(staking, time); staking.all_produced = staking.reward_produced; staking.produced_time = time; @@ -168,7 +168,7 @@ fn update_staking_test() { StakingAction::UpdateStaking(InitStaking { staking_token_address: PROGRAMS[1].into(), reward_token_address: PROGRAMS[2].into(), - distribution_time: 10000, + distribution_time: 30000, reward_total: 1000, }), ); @@ -220,7 +220,7 @@ fn send_reward() { Ok::(StakingEvent::StakeAccepted(2000)).encode() ))); - update_reward(&mut staking, time + 2000); + update_reward(&mut staking, time + 6000); staking.stakers.insert( 6.into(), Staker { @@ -234,7 +234,7 @@ fn send_reward() { sys.spend_blocks(1); - update_reward(&mut staking, time + 3000); + update_reward(&mut staking, time + 9000); let reward = calc_reward(&staking, &5.into()); staking @@ -243,12 +243,6 @@ fn send_reward() { .and_modify(|stake| stake.distributed = stake.distributed.saturating_add(reward)); let res = st.send(5, StakingAction::GetReward); - println!( - "Reward[4]: {:?} calc: {}, staking: {:?}", - res.decoded_log::(), - reward, - staking - ); assert!(res.contains(&( 5, Ok::(StakingEvent::Reward(reward)).encode() @@ -256,7 +250,7 @@ fn send_reward() { sys.spend_blocks(1); - update_reward(&mut staking, time + 4000); + update_reward(&mut staking, time + 12000); let reward = calc_reward(&staking, &6.into()); staking @@ -265,12 +259,6 @@ fn send_reward() { .and_modify(|stake| stake.distributed = stake.distributed.saturating_add(reward)); let res = st.send(6, StakingAction::GetReward); - println!( - "Reward[5]: {:?} calc: {}, staking: {:?}", - res.decoded_log::(), - reward, - staking - ); assert!(res.contains(&( 6, Ok::(StakingEvent::Reward(reward)).encode() @@ -323,7 +311,7 @@ fn withdraw() { Ok::(StakingEvent::StakeAccepted(2000)).encode() ))); - update_reward(&mut staking, time + 2000); + update_reward(&mut staking, time + 6000); staking.stakers.insert( 6.into(), Staker { @@ -343,7 +331,7 @@ fn withdraw() { Ok::(StakingEvent::Withdrawn(500)).encode() ))); - update_reward(&mut staking, time + 3000); + update_reward(&mut staking, time + 9000); let max_reward = get_max_reward(&staking, 500); let actor_id: &ActorId = &5.into(); let opt = staking.stakers.get_mut(actor_id); @@ -356,7 +344,7 @@ fn withdraw() { sys.spend_blocks(1); - update_reward(&mut staking, time + 4000); + update_reward(&mut staking, time + 12000); let reward = calc_reward(&staking, &5.into()); staking @@ -369,11 +357,10 @@ fn withdraw() { 5, Ok::(StakingEvent::Reward(reward)).encode() ))); - println!("Reward[4]: {:?}", res.decoded_log::()); sys.spend_blocks(2); - update_reward(&mut staking, time + 6000); + update_reward(&mut staking, time + 18000); let reward = calc_reward(&staking, &6.into()); staking @@ -386,7 +373,6 @@ fn withdraw() { 6, Ok::(StakingEvent::Reward(reward)).encode() ))); - println!("Reward[5]: {:?}", res.decoded_log::()); } #[test] @@ -401,7 +387,7 @@ fn meta_tests() { let time = sys.block_timestamp(); let mut staking = Staking { - distribution_time: 10000, + distribution_time: 30000, ..Default::default() }; @@ -426,7 +412,7 @@ fn meta_tests() { staking.total_staked = 1500; - sys.spend_blocks(2); + sys.spend_blocks(6); st_token.approve(6, st.id().into_bytes(), 2000); let res = st.send(6, StakingAction::Stake(2000)); @@ -435,7 +421,7 @@ fn meta_tests() { Ok::(StakingEvent::StakeAccepted(2000)).encode() ))); - update_reward(&mut staking, time + 2000); + update_reward(&mut staking, time + 6000); staking.stakers.insert( 6.into(), Staker { diff --git a/contracts/supply-chain/Cargo.toml b/contracts/supply-chain/Cargo.toml index 5c209a6e8..ca09dea01 100644 --- a/contracts/supply-chain/Cargo.toml +++ b/contracts/supply-chain/Cargo.toml @@ -13,7 +13,7 @@ gear-lib-old.workspace = true [dev-dependencies] gtest.workspace = true -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gclient.workspace = true tokio.workspace = true supply-chain-deploy.workspace = true diff --git a/contracts/supply-chain/deploy/src/lib.rs b/contracts/supply-chain/deploy/src/lib.rs index c878524c4..5117b10e0 100644 --- a/contracts/supply-chain/deploy/src/lib.rs +++ b/contracts/supply-chain/deploy/src/lib.rs @@ -24,7 +24,7 @@ pub struct Client { impl Client { pub async fn global() -> Result { - let client = GearApi::gear().await?; + let client = GearApi::vara_testnet().await?; let listener = client.subscribe().await?; Ok(Self { client, listener }) diff --git a/contracts/supply-chain/tests/receive.rs b/contracts/supply-chain/tests/receive.rs index 21281e926..536419640 100644 --- a/contracts/supply-chain/tests/receive.rs +++ b/contracts/supply-chain/tests/receive.rs @@ -2,7 +2,7 @@ use utils::{prelude::*, FungibleToken, NonFungibleToken}; pub mod utils; -const DELIVERY_TIME_IN_BLOCKS: u32 = (DELIVERY_TIME / 1000) as _; +const DELIVERY_TIME_IN_BLOCKS: u32 = (DELIVERY_TIME / 3000) as _; #[test] fn delivery_wo_delay() { diff --git a/contracts/supply-chain/tests/utils/prelude.rs b/contracts/supply-chain/tests/utils/prelude.rs index ee1c8e024..584835b65 100644 --- a/contracts/supply-chain/tests/utils/prelude.rs +++ b/contracts/supply-chain/tests/utils/prelude.rs @@ -4,4 +4,4 @@ pub use supply_chain_io::*; pub const CONSUMER: u64 = 11; pub const ITEM_PRICE: u128 = 4321166243; -pub const DELIVERY_TIME: u64 = 604800000; +pub const DELIVERY_TIME: u64 = 1814400000; diff --git a/contracts/tamagotchi-battle/tests/node-test.rs b/contracts/tamagotchi-battle/tests/node-test.rs index 8f2e613d3..aa8d60022 100644 --- a/contracts/tamagotchi-battle/tests/node-test.rs +++ b/contracts/tamagotchi-battle/tests/node-test.rs @@ -125,8 +125,7 @@ async fn gclient_battle() -> Result<()> { .get_specific_actor_id(player) .encode() .as_slice() - .try_into() - .expect("Unexpected invalid `ProgramId`."), + .into(), amount, ) .await?; diff --git a/contracts/tequila-train/Cargo.toml b/contracts/tequila-train/Cargo.toml index dc8989596..f642bdc53 100644 --- a/contracts/tequila-train/Cargo.toml +++ b/contracts/tequila-train/Cargo.toml @@ -13,5 +13,5 @@ tequila-train-io.workspace = true gear-wasm-builder.workspace = true [dev-dependencies] -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gtest.workspace = true diff --git a/contracts/tic-tac-toe/Cargo.toml b/contracts/tic-tac-toe/Cargo.toml index a4fc55513..30dffdc50 100644 --- a/contracts/tic-tac-toe/Cargo.toml +++ b/contracts/tic-tac-toe/Cargo.toml @@ -15,7 +15,7 @@ tic-tac-toe-io.workspace = true gear-wasm-builder.workspace = true [dev-dependencies] -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gtest.workspace = true gclient.workspace = true tokio.workspace = true @@ -24,4 +24,3 @@ gear-core.workspace = true [features] binary-vendor = [] - diff --git a/contracts/tic-tac-toe/io/Cargo.toml b/contracts/tic-tac-toe/io/Cargo.toml index 8d1097421..fe753057b 100644 --- a/contracts/tic-tac-toe/io/Cargo.toml +++ b/contracts/tic-tac-toe/io/Cargo.toml @@ -9,3 +9,5 @@ authors.workspace = true gmeta.workspace = true gstd.workspace = true primitive-types = { workspace = true, features = ["scale-info"] } +parity-scale-codec.workspace = true +scale-info.workspace = true diff --git a/contracts/tic-tac-toe/io/src/lib.rs b/contracts/tic-tac-toe/io/src/lib.rs index 7195b1542..4b50f29fb 100644 --- a/contracts/tic-tac-toe/io/src/lib.rs +++ b/contracts/tic-tac-toe/io/src/lib.rs @@ -38,7 +38,7 @@ impl Metadata for ContractMetadata { /// /// We use the [`GameAction`] type for incoming and [`GameReply`] for outgoing /// messages. - type Handle = InOut; + type Handle = InOut>; /// Asynchronous handle message type. /// /// Describes incoming/outgoing types for the `main()` function in case of @@ -71,8 +71,6 @@ impl Metadata for ContractMetadata { } #[derive(Encode, Decode, TypeInfo)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub enum StateQuery { Admins, Game { player_id: ActorId }, @@ -82,8 +80,6 @@ pub enum StateQuery { } #[derive(Encode, Decode, TypeInfo)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub enum StateReply { Admins(Vec), Game(Option), @@ -94,16 +90,12 @@ pub enum StateReply { /// Smart-contract input data structure, for example can contain configuration. #[derive(Encode, Decode, TypeInfo)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub struct GameInit { pub config: Config, } /// The main type used as an input message. #[derive(Debug, Clone, Encode, Decode, TypeInfo)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub enum GameAction { AddAdmin(ActorId), RemoveAdmin(ActorId), @@ -129,17 +121,31 @@ pub enum GameAction { /// The main type used as an output message. #[derive(Debug, Clone, Encode, Decode, TypeInfo, PartialEq, Eq)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub enum GameReply { + GameFinished { game: GameInstance }, GameStarted { game: GameInstance }, MoveMade { game: GameInstance }, + GameInstanceRemoved, + ConfigUpdated, + AdminRemoved, + AdminAdded, + StatusMessagesUpdated, +} +#[derive(Debug, Clone, Encode, Decode, TypeInfo)] +pub enum GameError { + GameIsAlreadyStarted, + CellIsAlreadyOccupied, + GameIsAlreadyOver, + MissedYourTurn, + NotMissedTurnMakeMove, + GameIsNotStarted, + MessageOnlyForProgram, + NotAdmin, + MessageProcessingSuspended, } /// Represent game instance status. #[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, TypeInfo)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub enum GameResult { Player, Bot, @@ -148,8 +154,6 @@ pub enum GameResult { /// Represent concrete game instance. #[derive(Debug, Clone, Encode, Decode, TypeInfo, PartialEq, Eq)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub struct GameInstance { pub board: Vec>, pub player_mark: Mark, @@ -161,16 +165,12 @@ pub struct GameInstance { /// Indicates tic-tac-toe board mark-state. #[derive(Debug, Clone, Copy, PartialEq, Eq, Encode, Decode, TypeInfo)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub enum Mark { X, O, } #[derive(Debug, Default, Encode, Clone, Decode, TypeInfo)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] pub struct Config { pub s_per_block: u64, pub gas_to_remove_game: u64, diff --git a/contracts/tic-tac-toe/src/contract.rs b/contracts/tic-tac-toe/src/contract.rs deleted file mode 100644 index 553062f24..000000000 --- a/contracts/tic-tac-toe/src/contract.rs +++ /dev/null @@ -1,450 +0,0 @@ -use gstd::{collections::HashMap, debug, exec, msg, prelude::*, ActorId}; -use tic_tac_toe_io::{ - Config, GameAction, GameInit, GameInstance, GameReply, GameResult, Mark, StateQuery, StateReply, -}; -static mut GAME: Option = None; - -#[derive(Debug, Default)] -struct Game { - pub admins: Vec, - pub current_games: HashMap, - pub config: Config, - pub messages_allowed: bool, -} - -pub const VICTORIES: [[usize; 3]; 8] = [ - [0, 1, 2], - [3, 4, 5], - [6, 7, 8], - [0, 3, 6], - [1, 4, 7], - [2, 5, 8], - [0, 4, 8], - [2, 4, 6], -]; - -#[no_mangle] -extern fn init() { - let init_msg: GameInit = msg::load().expect("Unable to load the message"); - - unsafe { - GAME = Some(Game { - admins: vec![msg::source()], - current_games: HashMap::with_capacity(10_000), - config: init_msg.config, - messages_allowed: true, - }); - } -} - -impl Game { - fn start_game(&mut self) { - let msg_source = msg::source(); - - if let Some(current_game) = self.current_games.get(&msg_source) { - if !current_game.game_over { - panic!("Please complete the previous game"); - } - } - - let turn = turn(); - - let (player_mark, bot_mark) = if turn == 0 { - (Mark::O, Mark::X) - } else { - (Mark::X, Mark::O) - }; - let mut game_instance = GameInstance { - board: vec![None; 9], - player_mark, - bot_mark, - last_time: exec::block_timestamp(), - game_result: None, - game_over: false, - }; - - if bot_mark == Mark::X { - game_instance.board[4] = Some(Mark::X); - } - - self.current_games.insert(msg_source, game_instance.clone()); - - msg::reply( - GameReply::GameStarted { - game: game_instance, - }, - 0, - ) - .expect("Error in sending a reply"); - } - - fn player_move(&mut self, step: u8) { - let msg_source = msg::source(); - let game_instance = self - .current_games - .get_mut(&msg_source) - .expect("The player has no game, please start the game"); - if game_instance.board[step as usize].is_some() { - panic!("The cell is already occupied!"); - } - if game_instance.game_over { - panic!("Game is already over"); - } - - if game_instance.last_time + self.config.turn_deadline_ms < exec::block_timestamp() { - panic!("You missed your turn, please skip the move"); - } - game_instance.board[step as usize] = Some(game_instance.player_mark); - - game_instance.last_time = exec::block_timestamp(); - - if let Some(mark) = get_result(&game_instance.board.clone()) { - game_instance.game_over = true; - if mark == game_instance.player_mark { - game_instance.game_result = Some(GameResult::Player); - send_messages(&msg_source, &self.config); - } else { - game_instance.game_result = Some(GameResult::Bot); - send_messages(&msg_source, &self.config); - } - msg::reply( - GameReply::MoveMade { - game: game_instance.clone(), - }, - 0, - ) - .expect("Error in sending a reply"); - return; - } - - let bot_step = make_move(game_instance); - - if let Some(step_num) = bot_step { - game_instance.board[step_num] = Some(game_instance.bot_mark); - } - - let win = get_result(&game_instance.board.clone()); - - if let Some(mark) = win { - game_instance.game_over = true; - if mark == game_instance.player_mark { - game_instance.game_result = Some(GameResult::Player); - send_messages(&msg_source, &self.config); - } else { - game_instance.game_result = Some(GameResult::Bot); - send_messages(&msg_source, &self.config); - } - } else if !game_instance.board.contains(&None) || bot_step.is_none() { - game_instance.game_over = true; - game_instance.game_result = Some(GameResult::Draw); - send_messages(&msg_source, &self.config); - } - - msg::reply( - GameReply::MoveMade { - game: game_instance.clone(), - }, - 0, - ) - .expect("Error in sending a reply"); - } - - fn skip(&mut self) { - let msg_source = msg::source(); - let game_instance = self - .current_games - .get_mut(&msg_source) - .expect("The player has no game, please start the game"); - - if game_instance.game_over { - panic!("Game is already over"); - } - - if game_instance.last_time + self.config.turn_deadline_ms >= exec::block_timestamp() { - panic!("You did not missed your turn, please make move"); - } - - let bot_step = make_move(game_instance); - game_instance.last_time = exec::block_timestamp(); - - match bot_step { - Some(step_num) => { - game_instance.board[step_num] = Some(game_instance.bot_mark); - let win = get_result(&game_instance.board.clone()); - if let Some(mark) = win { - game_instance.game_over = true; - if mark == game_instance.player_mark { - game_instance.game_result = Some(GameResult::Player); - send_messages(&msg_source, &self.config); - } else { - game_instance.game_result = Some(GameResult::Bot); - send_messages(&msg_source, &self.config); - } - } else if !game_instance.board.contains(&None) { - game_instance.game_over = true; - game_instance.game_result = Some(GameResult::Draw); - send_messages(&msg_source, &self.config); - } - } - None => { - game_instance.game_over = true; - game_instance.game_result = Some(GameResult::Draw); - send_messages(&msg_source, &self.config); - } - } - - msg::reply( - GameReply::MoveMade { - game: game_instance.clone(), - }, - 0, - ) - .expect("Error in sending a reply"); - } - - fn remove_game_instance(&mut self, account: &ActorId) { - assert_eq!( - msg::source(), - exec::program_id(), - "This message can be sent only by the program" - ); - let game_instance = self - .current_games - .get(account) - .expect("Unexpected: the game does not exist"); - - if game_instance.game_over { - self.current_games.remove(account); - } - } - - fn remove_instances(&mut self, accounts: Option>) { - assert!( - self.admins.contains(&msg::source()), - "Only admin can send this message" - ); - match accounts { - Some(accounts) => { - for account in accounts { - self.current_games.remove(&account); - } - } - None => { - self.current_games.retain(|_, game_instance| { - exec::block_timestamp() - game_instance.last_time - < self.config.time_interval as u64 * self.config.s_per_block - }); - } - } - } -} - -#[gstd::async_main] -async fn main() { - let game = unsafe { GAME.as_mut().expect("`Game` is not initialized.") }; - let action: GameAction = msg::load().expect("Failed to decode `GameAction` message."); - if let GameAction::AllowMessages(messages_allowed) = action { - assert!( - game.admins.contains(&msg::source()), - "Only an admin can send this message" - ); - game.messages_allowed = messages_allowed; - return; - } - - assert!( - game.messages_allowed, - "Message processing has been suspended for some time" - ); - match action { - GameAction::StartGame => game.start_game(), - GameAction::Turn { step } => game.player_move(step), - GameAction::Skip => game.skip(), - GameAction::RemoveGameInstance { account_id } => game.remove_game_instance(&account_id), - GameAction::RemoveGameInstances { accounts } => game.remove_instances(accounts), - GameAction::AddAdmin(admin) => { - assert!(game.admins.contains(&msg::source()), "You are not admin"); - game.admins.push(admin); - } - GameAction::RemoveAdmin(admin) => { - assert!(game.admins.contains(&msg::source()), "You are not admin"); - - game.admins.retain(|id| *id != admin); - } - GameAction::UpdateConfig { - s_per_block, - gas_to_remove_game, - time_interval, - turn_deadline_ms, - } => { - assert!(game.admins.contains(&msg::source()), "You are not admin"); - - if let Some(s_per_block) = s_per_block { - game.config.s_per_block = s_per_block; - } - if let Some(gas_to_remove_game) = gas_to_remove_game { - game.config.gas_to_remove_game = gas_to_remove_game; - } - if let Some(time_interval) = time_interval { - game.config.time_interval = time_interval; - } - if let Some(turn_deadline_ms) = turn_deadline_ms { - game.config.turn_deadline_ms = turn_deadline_ms; - } - } - _ => {} - } -} - -fn turn() -> u8 { - let random_input: [u8; 32] = msg::source().into(); - let (random, _) = exec::random(random_input).expect("Error in getting random number"); - random[0] % 2 -} - -fn make_move(game: &GameInstance) -> Option { - match game.bot_mark { - Mark::O => { - // if on any of the winning lines there are 2 own pieces and 0 strangers - // make move - let step = check_line(&game.board, 2, 0); - if let Some(step_num) = step { - return Some(step_num); - } - - // if on any of the winning lines there are 2 stranger pieces and 0 own - // make move - let step = check_line(&game.board, 0, 2); - if let Some(step_num) = step { - return Some(step_num); - } - // if on any of the winning lines there are 1 own pieces and 0 strangers - // make move - let step = check_line(&game.board, 1, 0); - if let Some(step_num) = step { - return Some(step_num); - } - // if the center is empty, then we occupy the center - if game.board[4] != Some(Mark::O) && game.board[4] != Some(Mark::X) { - return Some(4); - } - // occupy the first cell - if game.board[0] != Some(Mark::O) && game.board[0] != Some(Mark::X) { - return Some(0); - } - } - Mark::X => { - // if on any of the winning lines there are 2 own pieces and 0 strangers - // make move - let step = check_line(&game.board, 0, 2); - - if let Some(step_num) = step { - return Some(step_num); - } - // if on any of the winning lines there are 2 stranger pieces and 0 own - // make move - let step = check_line(&game.board, 2, 0); - if let Some(step_num) = step { - return Some(step_num); - } - // if on any of the winning lines there are 1 own pieces and 0 strangers - // make move - let step = check_line(&game.board, 0, 1); - debug!("Step {:?}", step); - if let Some(step_num) = step { - return Some(step_num); - } - // if the center is empty, then we occupy the center - if game.board[4] != Some(Mark::O) && game.board[4] != Some(Mark::X) { - return Some(4); - } - // occupy the first cell - if game.board[0] != Some(Mark::O) && game.board[0] != Some(Mark::X) { - return Some(0); - } - } - } - None -} - -fn check_line(map: &[Option], sum_o: u8, sum_x: u8) -> Option { - for line in VICTORIES.iter() { - let mut o = 0; - let mut x = 0; - for i in 0..3 { - if map[line[i]] == Some(Mark::O) { - o += 1; - } - if map[line[i]] == Some(Mark::X) { - x += 1; - } - } - - if sum_o == o && sum_x == x { - for i in 0..3 { - if map[line[i]] != Some(Mark::O) && map[line[i]] != Some(Mark::X) { - return Some(line[i]); - } - } - } - } - None -} - -fn get_result(map: &[Option]) -> Option { - for i in VICTORIES.iter() { - if map[i[0]] == Some(Mark::X) && map[i[1]] == Some(Mark::X) && map[i[2]] == Some(Mark::X) { - return Some(Mark::X); - } - - if map[i[0]] == Some(Mark::O) && map[i[1]] == Some(Mark::O) && map[i[2]] == Some(Mark::O) { - return Some(Mark::O); - } - } - None -} - -#[no_mangle] -extern fn state() { - let Game { - admins, - current_games, - config, - messages_allowed, - } = unsafe { GAME.take().expect("Failed to get state") }; - let query: StateQuery = msg::load().expect("Unable to load the state query"); - - match query { - StateQuery::Admins => { - msg::reply(StateReply::Admins(admins), 0).expect("Unable to share the state"); - } - StateQuery::Game { player_id } => { - let game: Option = current_games.get(&player_id).cloned(); - msg::reply(StateReply::Game(game), 0).expect("Unable to share the state"); - } - StateQuery::AllGames => { - msg::reply(StateReply::AllGames(current_games.into_iter().collect()), 0) - .expect("Unable to share the state"); - } - StateQuery::Config => { - msg::reply(StateReply::Config(config), 0).expect("Unable to share the state"); - } - StateQuery::MessagesAllowed => { - msg::reply(StateReply::MessagesAllowed(messages_allowed), 0) - .expect("Unable to share the state"); - } - } -} - -fn send_messages(account: &ActorId, config: &Config) { - msg::send_with_gas_delayed( - exec::program_id(), - GameAction::RemoveGameInstance { - account_id: *account, - }, - config.gas_to_remove_game, - 0, - config.time_interval, - ) - .expect("Error in sending message"); -} diff --git a/contracts/tic-tac-toe/src/lib.rs b/contracts/tic-tac-toe/src/lib.rs index 1aa7b4338..92455c64b 100644 --- a/contracts/tic-tac-toe/src/lib.rs +++ b/contracts/tic-tac-toe/src/lib.rs @@ -1,8 +1,496 @@ #![no_std] -#[cfg(not(feature = "binary-vendor"))] -pub mod contract; +use gstd::{collections::HashMap, exec, msg, prelude::*, ActorId}; +use tic_tac_toe_io::{ + Config, GameAction, GameError, GameInit, GameInstance, GameReply, GameResult, Mark, StateQuery, + StateReply, +}; +static mut GAME: Option = None; -// See `Cargo.toml` for the description of the "binary-vendor" feature. -#[cfg(feature = "binary-vendor")] -include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); +#[derive(Debug, Default)] +struct Game { + pub admins: Vec, + pub current_games: HashMap, + pub config: Config, + pub messages_allowed: bool, +} + +pub const VICTORIES: [[usize; 3]; 8] = [ + [0, 1, 2], + [3, 4, 5], + [6, 7, 8], + [0, 3, 6], + [1, 4, 7], + [2, 5, 8], + [0, 4, 8], + [2, 4, 6], +]; + +#[no_mangle] +extern fn init() { + let init_msg: GameInit = msg::load().expect("Unable to load the message"); + + unsafe { + GAME = Some(Game { + admins: vec![msg::source()], + current_games: HashMap::with_capacity(10_000), + config: init_msg.config, + messages_allowed: true, + }); + } +} + +impl Game { + fn start_game(&mut self, msg_source: &ActorId) -> Result { + if let Some(current_game) = self.current_games.get(msg_source) { + if !current_game.game_over { + return Err(GameError::GameIsAlreadyStarted); + } + } + + let turn = turn(); + + let (player_mark, bot_mark) = if turn == 0 { + (Mark::O, Mark::X) + } else { + (Mark::X, Mark::O) + }; + let mut game_instance = GameInstance { + board: vec![None; 9], + player_mark, + bot_mark, + last_time: exec::block_timestamp(), + game_result: None, + game_over: false, + }; + + if bot_mark == Mark::X { + game_instance.board[4] = Some(Mark::X); + } + + self.current_games + .insert(*msg_source, game_instance.clone()); + + Ok(GameReply::GameStarted { + game: game_instance, + }) + } + + fn player_move(&mut self, msg_source: &ActorId, step: u8) -> Result { + let game_instance = self + .current_games + .get_mut(msg_source) + .expect("The player has no game, please start the game"); + if game_instance.board[step as usize].is_some() { + return Err(GameError::CellIsAlreadyOccupied); + } + if game_instance.game_over { + return Err(GameError::GameIsAlreadyOver); + } + + if game_instance.last_time + self.config.turn_deadline_ms < exec::block_timestamp() { + return Err(GameError::MissedYourTurn); + } + game_instance.board[step as usize] = Some(game_instance.player_mark); + + game_instance.last_time = exec::block_timestamp(); + + if let Some(mark) = get_result(&game_instance.board.clone()) { + game_instance.game_over = true; + if mark == game_instance.player_mark { + game_instance.game_result = Some(GameResult::Player); + send_messages(msg_source, &self.config); + } else { + game_instance.game_result = Some(GameResult::Bot); + send_messages(msg_source, &self.config); + } + return Ok(GameReply::GameFinished { + game: game_instance.clone(), + }); + } + + let bot_step = make_move(game_instance); + + if let Some(step_num) = bot_step { + game_instance.board[step_num] = Some(game_instance.bot_mark); + } + + let win = get_result(&game_instance.board.clone()); + + if let Some(mark) = win { + game_instance.game_over = true; + if mark == game_instance.player_mark { + game_instance.game_result = Some(GameResult::Player); + send_messages(msg_source, &self.config); + } else { + game_instance.game_result = Some(GameResult::Bot); + send_messages(msg_source, &self.config); + } + return Ok(GameReply::GameFinished { + game: game_instance.clone(), + }); + } else if !game_instance.board.contains(&None) || bot_step.is_none() { + game_instance.game_over = true; + game_instance.game_result = Some(GameResult::Draw); + send_messages(msg_source, &self.config); + return Ok(GameReply::GameFinished { + game: game_instance.clone(), + }); + } + + Ok(GameReply::MoveMade { + game: game_instance.clone(), + }) + } + + fn skip(&mut self, msg_source: &ActorId) -> Result { + let Some(game_instance) = self.current_games.get_mut(msg_source) else { + return Err(GameError::GameIsNotStarted); + }; + + if game_instance.game_over { + return Err(GameError::GameIsAlreadyOver); + } + + if game_instance.last_time + self.config.turn_deadline_ms >= exec::block_timestamp() { + return Err(GameError::NotMissedTurnMakeMove); + } + + let bot_step = make_move(game_instance); + game_instance.last_time = exec::block_timestamp(); + + match bot_step { + Some(step_num) => { + game_instance.board[step_num] = Some(game_instance.bot_mark); + let win = get_result(&game_instance.board.clone()); + if let Some(mark) = win { + game_instance.game_over = true; + if mark == game_instance.player_mark { + game_instance.game_result = Some(GameResult::Player); + send_messages(msg_source, &self.config); + } else { + game_instance.game_result = Some(GameResult::Bot); + send_messages(msg_source, &self.config); + } + return Ok(GameReply::GameFinished { + game: game_instance.clone(), + }); + } else if !game_instance.board.contains(&None) { + game_instance.game_over = true; + game_instance.game_result = Some(GameResult::Draw); + send_messages(msg_source, &self.config); + return Ok(GameReply::GameFinished { + game: game_instance.clone(), + }); + } + } + None => { + game_instance.game_over = true; + game_instance.game_result = Some(GameResult::Draw); + send_messages(msg_source, &self.config); + return Ok(GameReply::GameFinished { + game: game_instance.clone(), + }); + } + } + + Ok(GameReply::MoveMade { + game: game_instance.clone(), + }) + } + + fn remove_game_instance( + &mut self, + msg_source: &ActorId, + account: &ActorId, + ) -> Result { + if *msg_source != exec::program_id() { + return Err(GameError::MessageOnlyForProgram); + } + + let game_instance = self + .current_games + .get(account) + .expect("Unexpected: the game does not exist"); + + if game_instance.game_over { + self.current_games.remove(account); + } + Ok(GameReply::GameInstanceRemoved) + } + + fn remove_instances( + &mut self, + msg_source: &ActorId, + accounts: Option>, + ) -> Result { + if !self.admins.contains(msg_source) { + return Err(GameError::NotAdmin); + } + match accounts { + Some(accounts) => { + for account in accounts { + self.current_games.remove(&account); + } + } + None => { + self.current_games.retain(|_, game_instance| { + exec::block_timestamp() - game_instance.last_time + < self.config.time_interval as u64 * self.config.s_per_block + }); + } + } + Ok(GameReply::GameInstanceRemoved) + } + fn add_admin(&mut self, msg_source: &ActorId, admin: ActorId) -> Result { + if !self.admins.contains(msg_source) { + return Err(GameError::NotAdmin); + } + self.admins.push(admin); + Ok(GameReply::AdminAdded) + } + fn remove_admin( + &mut self, + msg_source: &ActorId, + admin: ActorId, + ) -> Result { + if !self.admins.contains(msg_source) { + return Err(GameError::NotAdmin); + } + self.admins.retain(|id| *id != admin); + Ok(GameReply::AdminRemoved) + } + + fn update_config( + &mut self, + msg_source: &ActorId, + s_per_block: Option, + gas_to_remove_game: Option, + time_interval: Option, + turn_deadline_ms: Option, + ) -> Result { + if !self.admins.contains(msg_source) { + return Err(GameError::NotAdmin); + } + + if let Some(s_per_block) = s_per_block { + self.config.s_per_block = s_per_block; + } + if let Some(gas_to_remove_game) = gas_to_remove_game { + self.config.gas_to_remove_game = gas_to_remove_game; + } + if let Some(time_interval) = time_interval { + self.config.time_interval = time_interval; + } + if let Some(turn_deadline_ms) = turn_deadline_ms { + self.config.turn_deadline_ms = turn_deadline_ms; + } + Ok(GameReply::ConfigUpdated) + } + fn allow_messages( + &mut self, + msg_source: &ActorId, + messages_allowed: bool, + ) -> Result { + if !self.admins.contains(msg_source) { + return Err(GameError::NotAdmin); + } + self.messages_allowed = messages_allowed; + Ok(GameReply::StatusMessagesUpdated) + } +} + +#[gstd::async_main] +async fn main() { + let game = unsafe { GAME.as_mut().expect("`Game` is not initialized.") }; + let action: GameAction = msg::load().expect("Failed to decode `GameAction` message."); + let msg_src = msg::source(); + if !game.messages_allowed && !game.admins.contains(&msg_src) { + msg::reply( + Err::(GameError::MessageProcessingSuspended), + 0, + ) + .expect("Failed to encode or reply with `Result`."); + return; + } + let reply = match action { + GameAction::StartGame => game.start_game(&msg_src), + GameAction::Turn { step } => game.player_move(&msg_src, step), + GameAction::Skip => game.skip(&msg_src), + GameAction::RemoveGameInstance { account_id } => { + game.remove_game_instance(&msg_src, &account_id) + } + GameAction::RemoveGameInstances { accounts } => game.remove_instances(&msg_src, accounts), + GameAction::AddAdmin(admin) => game.add_admin(&msg_src, admin), + GameAction::RemoveAdmin(admin) => game.remove_admin(&msg_src, admin), + GameAction::UpdateConfig { + s_per_block, + gas_to_remove_game, + time_interval, + turn_deadline_ms, + } => game.update_config( + &msg_src, + s_per_block, + gas_to_remove_game, + time_interval, + turn_deadline_ms, + ), + GameAction::AllowMessages(messages_allowed) => { + game.allow_messages(&msg_src, messages_allowed) + } + }; + msg::reply(reply, 0).expect("Failed to encode or reply with `Result`."); +} + +fn turn() -> u8 { + let random_input: [u8; 32] = msg::source().into(); + let (random, _) = exec::random(random_input).expect("Error in getting random number"); + random[0] % 2 +} + +fn make_move(game: &GameInstance) -> Option { + match game.bot_mark { + Mark::O => { + // if on any of the winning lines there are 2 own pieces and 0 strangers + // make move + let step = check_line(&game.board, 2, 0); + if let Some(step_num) = step { + return Some(step_num); + } + + // if on any of the winning lines there are 2 stranger pieces and 0 own + // make move + let step = check_line(&game.board, 0, 2); + if let Some(step_num) = step { + return Some(step_num); + } + // if on any of the winning lines there are 1 own pieces and 0 strangers + // make move + let step = check_line(&game.board, 1, 0); + if let Some(step_num) = step { + return Some(step_num); + } + // if the center is empty, then we occupy the center + if game.board[4] != Some(Mark::O) && game.board[4] != Some(Mark::X) { + return Some(4); + } + // occupy the first cell + if game.board[0] != Some(Mark::O) && game.board[0] != Some(Mark::X) { + return Some(0); + } + } + Mark::X => { + // if on any of the winning lines there are 2 own pieces and 0 strangers + // make move + let step = check_line(&game.board, 0, 2); + + if let Some(step_num) = step { + return Some(step_num); + } + // if on any of the winning lines there are 2 stranger pieces and 0 own + // make move + let step = check_line(&game.board, 2, 0); + if let Some(step_num) = step { + return Some(step_num); + } + // if on any of the winning lines there are 1 own pieces and 0 strangers + // make move + let step = check_line(&game.board, 0, 1); + + if let Some(step_num) = step { + return Some(step_num); + } + // if the center is empty, then we occupy the center + if game.board[4] != Some(Mark::O) && game.board[4] != Some(Mark::X) { + return Some(4); + } + // occupy the first cell + if game.board[0] != Some(Mark::O) && game.board[0] != Some(Mark::X) { + return Some(0); + } + } + } + None +} + +fn check_line(map: &[Option], sum_o: u8, sum_x: u8) -> Option { + for line in VICTORIES.iter() { + let mut o = 0; + let mut x = 0; + for i in 0..3 { + if map[line[i]] == Some(Mark::O) { + o += 1; + } + if map[line[i]] == Some(Mark::X) { + x += 1; + } + } + + if sum_o == o && sum_x == x { + for i in 0..3 { + if map[line[i]] != Some(Mark::O) && map[line[i]] != Some(Mark::X) { + return Some(line[i]); + } + } + } + } + None +} + +fn get_result(map: &[Option]) -> Option { + for i in VICTORIES.iter() { + if map[i[0]] == Some(Mark::X) && map[i[1]] == Some(Mark::X) && map[i[2]] == Some(Mark::X) { + return Some(Mark::X); + } + + if map[i[0]] == Some(Mark::O) && map[i[1]] == Some(Mark::O) && map[i[2]] == Some(Mark::O) { + return Some(Mark::O); + } + } + None +} + +#[no_mangle] +extern fn state() { + let Game { + admins, + current_games, + config, + messages_allowed, + } = unsafe { GAME.take().expect("Failed to get state") }; + let query: StateQuery = msg::load().expect("Unable to load the state query"); + + match query { + StateQuery::Admins => { + msg::reply(StateReply::Admins(admins), 0).expect("Unable to share the state"); + } + StateQuery::Game { player_id } => { + let game: Option = current_games.get(&player_id).cloned(); + msg::reply(StateReply::Game(game), 0).expect("Unable to share the state"); + } + StateQuery::AllGames => { + msg::reply(StateReply::AllGames(current_games.into_iter().collect()), 0) + .expect("Unable to share the state"); + } + StateQuery::Config => { + msg::reply(StateReply::Config(config), 0).expect("Unable to share the state"); + } + StateQuery::MessagesAllowed => { + msg::reply(StateReply::MessagesAllowed(messages_allowed), 0) + .expect("Unable to share the state"); + } + } +} + +fn send_messages(account: &ActorId, config: &Config) { + msg::send_with_gas_delayed( + exec::program_id(), + GameAction::RemoveGameInstance { + account_id: *account, + }, + config.gas_to_remove_game, + 0, + config.time_interval, + ) + .expect("Error in sending message"); +} diff --git a/contracts/vara-man/Cargo.toml b/contracts/vara-man/Cargo.toml index a2403d47f..c2d81240c 100644 --- a/contracts/vara-man/Cargo.toml +++ b/contracts/vara-man/Cargo.toml @@ -9,7 +9,7 @@ gstd.workspace = true vara-man-io.workspace = true [dev-dependencies] -gstd = { workspace = true, features = ["debug"] } +gstd.workspace = true gtest.workspace = true gclient.workspace = true tokio.workspace = true diff --git a/contracts/vara-man/src/lib.rs b/contracts/vara-man/src/lib.rs index 0828fd08a..aa9afffb6 100644 --- a/contracts/vara-man/src/lib.rs +++ b/contracts/vara-man/src/lib.rs @@ -212,19 +212,11 @@ extern fn state() { let reply = match query { StateQuery::All => StateReply::All(contract.into()), StateQuery::AllGames => { - let games = contract - .games - .into_iter() - .map(|(id, game)| (id, game)) - .collect(); + let games = contract.games.into_iter().collect(); StateReply::AllGames(games) } StateQuery::AllPlayers => { - let players = contract - .players - .into_iter() - .map(|(id, player)| (id, player)) - .collect(); + let players = contract.players.into_iter().collect(); StateReply::AllPlayers(players) } StateQuery::Game { player_address } => { @@ -252,12 +244,9 @@ impl From for VaraManState { admins, } = value; - let games = games.into_iter().map(|(id, game)| (id, game)).collect(); + let games = games.into_iter().collect(); - let players = players - .into_iter() - .map(|(actor_id, player)| (actor_id, player)) - .collect(); + let players = players.into_iter().collect(); Self { games, diff --git a/contracts/vara-man/tests/node_tests.rs b/contracts/vara-man/tests/node_tests.rs index a67193d50..7033c237f 100644 --- a/contracts/vara-man/tests/node_tests.rs +++ b/contracts/vara-man/tests/node_tests.rs @@ -122,11 +122,8 @@ async fn gclient_success_claim_reward() -> gclient::Result<()> { let vara_man_id = utils_gclient::common::init(&api).await?; utils_gclient::vara_man::change_status(&api, &vara_man_id, Status::Started, None).await?; let balance = api.total_balance(api.account_id()).await?; - api.transfer( - vara_man_id.encode().as_slice().try_into().unwrap(), - balance / 10, - ) - .await?; + api.transfer(vara_man_id.encode().as_slice().into(), balance / 10) + .await?; { let api = api.with("//Peter")?; @@ -193,11 +190,8 @@ async fn gclient_failures_claim_reward() -> gclient::Result<()> { .await?; let balance = api.total_balance(api.account_id()).await?; - api.transfer( - vara_man_id.encode().as_slice().try_into().unwrap(), - balance / 10, - ) - .await?; + api.transfer(vara_man_id.encode().as_slice().into(), balance / 10) + .await?; utils_gclient::vara_man::claim_reward(&player_api, &vara_man_id, 10, 1, None).await?; utils_gclient::vara_man::claim_reward( diff --git a/contracts/varatube/tests/unit-test.rs b/contracts/varatube/tests/unit-test.rs index d4e23c73d..c7e53d851 100644 --- a/contracts/varatube/tests/unit-test.rs +++ b/contracts/varatube/tests/unit-test.rs @@ -27,9 +27,9 @@ fn preconfigure(system: &System) -> (Program<'_>, Program<'_>) { }, ); - ft.approve(USERS[0], varatube.id(), 100_000_000_000); + ft.approve(USERS[0], varatube.id().into(), 100_000_000_000); - varatube.add_token_data(USERS[0], ft.id(), 10_000, None); + varatube.add_token_data(USERS[0], ft.id().into(), 10_000, None); (ft, varatube) } @@ -41,7 +41,7 @@ fn register_subscriber_with_subscription_renewal() { let (ft, varatube) = preconfigure(&system); // Register Subscription - varatube.register_subscription(USERS[0], ft.id(), Period::Month, true, None); + varatube.register_subscription(USERS[0], ft.id().into(), Period::Month, true, None); let subscriber_data = varatube .get_subscriber_data(USERS[0]) @@ -91,7 +91,7 @@ fn register_subscriber_without_subscription_renewal() { let (ft, varatube) = preconfigure(&system); // Register Subscription - varatube.register_subscription(USERS[0], ft.id(), Period::Month, false, None); + varatube.register_subscription(USERS[0], ft.id().into(), Period::Month, false, None); let subscriber_data = varatube .get_subscriber_data(USERS[0]) @@ -123,7 +123,7 @@ fn cancelling_subscription() { let (ft, varatube) = preconfigure(&system); // Register Subscription - varatube.register_subscription(USERS[0], ft.id(), Period::Month, true, None); + varatube.register_subscription(USERS[0], ft.id().into(), Period::Month, true, None); let subscriber_data = varatube .get_subscriber_data(USERS[0]) diff --git a/contracts/varatube/tests/utils.rs b/contracts/varatube/tests/utils.rs index 52dba122c..f5ca81004 100644 --- a/contracts/varatube/tests/utils.rs +++ b/contracts/varatube/tests/utils.rs @@ -1,5 +1,4 @@ use fungible_token_io::{FTAction, InitConfig, IoFungibleToken}; -use gear_core::ids::ProgramId; use gstd::Encode; use gtest::{Program, System}; use varatube_io::{ @@ -16,7 +15,7 @@ pub trait FTokenTestFuncs { ) -> Program<'_>; fn mint(&self, from: u64, amount: u128); fn check_balance(&self, account: u64, expected_amount: u128); - fn approve(&self, from: u64, approved_account: ProgramId, amount: u128); + fn approve(&self, from: u64, approved_account: [u8; 32], amount: u128); } impl FTokenTestFuncs for Program<'_> { @@ -51,11 +50,9 @@ impl FTokenTestFuncs for Program<'_> { assert!(!res.main_failed()); } - fn approve(&self, from: u64, approved_account: ProgramId, amount: u128) { - let program_id_bytes: [u8; 32] = approved_account.into(); - + fn approve(&self, from: u64, approved_account: [u8; 32], amount: u128) { let payload = FTAction::Approve { - to: program_id_bytes.into(), + to: approved_account.into(), amount, }; @@ -84,14 +81,14 @@ pub trait VaratubeTestFuncs { fn register_subscription( &self, from: u64, - currency_id: ProgramId, + currency_id: [u8; 32], period: Period, with_renewal: bool, error: Option, ); fn update_subscription(&self, from: u64, subscriber: u64, error: Option); fn cancel_subscription(&self, from: u64, error: Option); - fn add_token_data(&self, from: u64, currency_id: ProgramId, price: Price, error: Option); + fn add_token_data(&self, from: u64, currency_id: [u8; 32], price: Price, error: Option); fn get_subscriber_data(&self, subscriber: u64) -> Option; } @@ -105,16 +102,15 @@ impl VaratubeTestFuncs for Program<'_> { fn register_subscription( &self, from: u64, - currency_id: ProgramId, + currency_id: [u8; 32], period: Period, with_renewal: bool, error: Option, ) { - let program_id_bytes: [u8; 32] = currency_id.into(); let result = self.send( from, Actions::RegisterSubscription { - currency_id: program_id_bytes.into(), + currency_id: currency_id.into(), period, with_renewal, }, @@ -152,18 +148,11 @@ impl VaratubeTestFuncs for Program<'_> { } } - fn add_token_data( - &self, - from: u64, - currency_id: ProgramId, - price: Price, - error: Option, - ) { - let program_id_bytes: [u8; 32] = currency_id.into(); + fn add_token_data(&self, from: u64, currency_id: [u8; 32], price: Price, error: Option) { let result = self.send( from, Actions::AddTokenData { - token_id: program_id_bytes.into(), + token_id: currency_id.into(), price, }, ); diff --git a/contracts/w3bstreaming/io/src/lib.rs b/contracts/w3bstreaming/io/src/lib.rs index e0bc1abac..b1908265c 100644 --- a/contracts/w3bstreaming/io/src/lib.rs +++ b/contracts/w3bstreaming/io/src/lib.rs @@ -109,17 +109,9 @@ impl Metadata for ProgramMetadata { impl From for State { fn from(contract: Contract) -> Self { Self { - streams: contract - .streams - .into_iter() - .map(|(stream_id, streams)| (stream_id, streams)) - .collect(), + streams: contract.streams.into_iter().collect(), - users: contract - .users - .into_iter() - .map(|(id, profile)| (id, profile)) - .collect(), + users: contract.users.into_iter().collect(), } } } diff --git a/contracts/xtask/src/main.rs b/contracts/xtask/src/main.rs index 9be184daf..8d13059ad 100644 --- a/contracts/xtask/src/main.rs +++ b/contracts/xtask/src/main.rs @@ -5,7 +5,7 @@ use std::{ }; use xshell::Shell; -const NODE_LINK: &str = "https://get.gear.rs/gear-v1.0.2-x86_64-unknown-linux-gnu.tar.xz"; +const NODE_LINK: &str = "https://get.gear.rs/gear-v1.1.0-x86_64-unknown-linux-gnu.tar.xz"; fn main() -> Result<()> { let Some(command) = env::args().nth(1) else { @@ -65,7 +65,11 @@ fn main() -> Result<()> { "node" => node()?, "ci" => { xshell::cmd!(sh, "cargo fmt --all --check").run()?; - xshell::cmd!(sh, "cargo clippy --all-targets --no-deps -- -Dwarnings").run()?; + xshell::cmd!( + sh, + "cargo clippy --all-targets --no-deps -- -D warnings -A unused-imports" + ) + .run()?; node()?; xshell::cmd!(sh, "cargo t").run()?; docs()?;