From 20619e21b8a0f6bccdac1dba9001fa8575225783 Mon Sep 17 00:00:00 2001 From: Maksim Kurnikov Date: Mon, 21 Feb 2022 16:54:38 +0300 Subject: [PATCH] CI: add pontemapi caching (#220) * add pontemapi/target to .gitignore * update Cargo.lock * CI: add pontemapi caching support for all the jobs * comment out windows-only CI steps, as win platform is not supported * simplify names * update cargo.lock --- .github/workflows/ci.yaml | 125 +++++++++++++++------------ .gitignore | 1 + Cargo.lock | 176 +++++++++++++++++++------------------- 3 files changed, 158 insertions(+), 144 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 01c35916..d2f448f8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,7 +19,13 @@ jobs: override: true components: rustfmt, clippy - - name: Rusty cache + - name: Rust cache (pontemapi) + uses: Swatinem/rust-cache@v1 + with: + working-directory: ./pontem/pontemapi/ + cache-on-failure: true + + - name: Rust cache (root) uses: Swatinem/rust-cache@v1 - name: Check formatting @@ -34,7 +40,7 @@ jobs: args: --tests --examples -- -Dwarnings tests: - name: Units (${{ matrix.name }}) + name: tests (${{ matrix.name }}) runs-on: ${{ matrix.os }} strategy: @@ -60,14 +66,14 @@ jobs: with: submodules: recursive - - name: Restore from cache and run vcpkg - if: ${{ matrix.platform == 'win' }} - uses: lukka/run-vcpkg@v7 - with: - vcpkgArguments: openssl - vcpkgDirectory: ${{github.workspace}}/3rdparty/vcpkg - vcpkgTriplet: ${{ matrix.triplet }} - vcpkgGitCommitId: 71422c627264daedcbcd46f01f1ed0dcd8460f1b +# - name: Restore from cache and run vcpkg +# if: ${{ matrix.platform == 'win' }} +# uses: lukka/run-vcpkg@v7 +# with: +# vcpkgArguments: openssl +# vcpkgDirectory: ${{github.workspace}}/3rdparty/vcpkg +# vcpkgTriplet: ${{ matrix.triplet }} +# vcpkgGitCommitId: 71422c627264daedcbcd46f01f1ed0dcd8460f1b - name: Install Rust toolchain uses: actions-rs/toolchain@v1 @@ -76,32 +82,25 @@ jobs: profile: minimal override: true - - name: Rusty cache + - name: Rust cache (pontemapi) uses: Swatinem/rust-cache@v1 - - # Clearing cache "~/.move/" before testing - - name: Build, dove clean --global - uses: actions-rs/cargo@v1 with: - command: run - args: clean --global + key: pontemapi + working-directory: ./pontem/pontemapi/ + cache-on-failure: true - # Download MoveStdlib - # Preliminary preparation for the "cargo test" in multithreading - # Do not delete it, otherwise the tests will not work in multithreaded mode. - - name: Download MoveStdlib - uses: actions-rs/cargo@v1 + - name: Rust cache (root) + uses: Swatinem/rust-cache@v1 with: - command: test - args: test_cmd_dove_run_with_params + key: root - name: Test All uses: actions-rs/cargo@v1 with: command: test - args: --no-fail-fast --all --all-features + args: --no-fail-fast --all --all-features -- --test-threads=1 - - name: Upload artifact + - name: Upload dove debug binary to use in subsequent jobs uses: actions/upload-artifact@v2 with: name: dove-${{ matrix.name }} @@ -111,7 +110,7 @@ jobs: install: needs: clippy - name: install (${{ matrix.name }}) + name: cargo install (${{ matrix.name }}) runs-on: ${{ matrix.os }} strategy: @@ -131,14 +130,14 @@ jobs: with: submodules: recursive - - name: Restore from cache and run vcpkg - if: ${{ matrix.platform == 'win' }} - uses: lukka/run-vcpkg@v7 - with: - vcpkgArguments: openssl - vcpkgDirectory: ${{github.workspace}}/3rdparty/vcpkg - vcpkgTriplet: ${{ matrix.triplet }} - vcpkgGitCommitId: 71422c627264daedcbcd46f01f1ed0dcd8460f1b +# - name: Restore from cache and run vcpkg +# if: ${{ matrix.platform == 'win' }} +# uses: lukka/run-vcpkg@v7 +# with: +# vcpkgArguments: openssl +# vcpkgDirectory: ${{github.workspace}}/3rdparty/vcpkg +# vcpkgTriplet: ${{ matrix.triplet }} +# vcpkgGitCommitId: 71422c627264daedcbcd46f01f1ed0dcd8460f1b - name: Install Rust toolchain uses: actions-rs/toolchain@v1 @@ -147,22 +146,31 @@ jobs: profile: minimal override: true - - name: Rusty cache + - name: Rust cache (pontemapi) uses: Swatinem/rust-cache@v1 + with: + key: pontemapi + working-directory: ./pontem/pontemapi/ + cache-on-failure: true + + - name: Rust cache (root) + uses: Swatinem/rust-cache@v1 + with: + key: root + cache-on-failure: true - name: Build & Install Dove uses: actions-rs/cargo@v1 with: command: install - args: --path=dove + args: --path=dove --force - proover: + dove_build: needs: tests - name: proover (${{ matrix.name }}) + name: dove build | build --doc | test (${{ matrix.name }}) runs-on: ${{ matrix.os }} - strategy: - fail-fast: true + fail-fast: false matrix: include: - name: macos @@ -176,12 +184,6 @@ jobs: with: submodules: recursive - - name: Install Boogie - uses: pontem-network/get-boogie@main - with: - ref: 927c229cd8dfa6dcd50ba84811f80d10496c76d2 - token: ${{ secrets.GITHUB_TOKEN }} - - name: Download artifact uses: actions/download-artifact@v2 with: @@ -190,15 +192,18 @@ jobs: - name: Prepare dove run: chmod +x ./bin/dove && echo "./bin" >> $GITHUB_PATH - - name: Proove move-stdlib - run: dove prove -p=dove/resources/for_tests/move-stdlib/ + - run: dove build --path ./dove/resources/for_tests/move-stdlib + - run: dove build --doc --path ./dove/resources/for_tests/move-stdlib + - run: dove test --path ./dove/resources/for_tests/move-stdlib + - builds: + dove_prove: needs: tests - name: Builds (${{ matrix.name }}) + name: dove prove (${{ matrix.name }}) runs-on: ${{ matrix.os }} + strategy: - fail-fast: false + fail-fast: true matrix: include: - name: macos @@ -212,6 +217,12 @@ jobs: with: submodules: recursive + - name: Install Boogie + uses: pontem-network/get-boogie@main + with: + ref: 927c229cd8dfa6dcd50ba84811f80d10496c76d2 + token: ${{ secrets.GITHUB_TOKEN }} + - name: Download artifact uses: actions/download-artifact@v2 with: @@ -220,14 +231,14 @@ jobs: - name: Prepare dove run: chmod +x ./bin/dove && echo "./bin" >> $GITHUB_PATH - - run: dove build --path ./dove/resources/for_tests/move-stdlib - - run: dove build --doc --path ./dove/resources/for_tests/move-stdlib - - run: dove test --path ./dove/resources/for_tests/move-stdlib + - name: Prove move-stdlib + run: dove prove -p=dove/resources/for_tests/move-stdlib/ - integration: + dove_node_integration: needs: tests - name: Integration (${{ matrix.name }}) + name: Node Integration tests (${{ matrix.name }}) runs-on: ${{ matrix.os }} + if: ${{ false }} strategy: fail-fast: false diff --git a/.gitignore b/.gitignore index e39a699e..e9970690 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # Generated by Cargo # will have compiled files and executables /target/ +/pontem/pontemapi/target # These are backup files generated by rustfmt **/*.rs.bk diff --git a/Cargo.lock b/Cargo.lock index 0740139c..5f1562d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.53" +version = "1.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" +checksum = "7a99269dff3bc004caa411f38845c20303f1e393ca2bd6581576fa3a7f59577d" [[package]] name = "arrayvec" @@ -273,7 +273,7 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytecode-interpreter-crypto" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "curve25519-dalek-fiat", @@ -309,9 +309,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] name = "cc" -version = "1.0.72" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" [[package]] name = "cfg-if" @@ -605,7 +605,7 @@ dependencies = [ "hkdf", "mirai-annotations", "once_cell", - "rand 0.8.4", + "rand 0.8.5", "rand_core 0.6.3", "serde 1.0.136", "serde-name", @@ -748,7 +748,7 @@ checksum = "97c6ac152eba578c1c53d2cefe8ad02e239e3d6f971b0f1ef3cb54cd66037fa0" dependencies = [ "curve25519-dalek-fiat", "ed25519", - "rand 0.8.4", + "rand 0.8.5", "serde 1.0.136", "serde_bytes", "sha2", @@ -1160,9 +1160,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" +checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" [[package]] name = "httpdate" @@ -1199,7 +1199,7 @@ dependencies = [ "httpdate", "itoa 0.4.8", "pin-project", - "socket2", + "socket2 0.3.19", "tokio 0.2.25", "tower-service", "tracing", @@ -1391,7 +1391,7 @@ dependencies = [ [[package]] name = "lang" -version = "0.1.0" +version = "0.1.1" dependencies = [ "anyhow", "blake2-rfc", @@ -1437,9 +1437,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.117" +version = "0.2.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c" +checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4" [[package]] name = "libloading" @@ -1529,9 +1529,9 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" [[package]] name = "mime_guess" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" dependencies = [ "mime", "unicase", @@ -1558,9 +1558,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.14" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2" dependencies = [ "libc", "log", @@ -1599,7 +1599,7 @@ checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" [[package]] name = "move-abigen" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "bcs", @@ -1616,7 +1616,7 @@ dependencies = [ [[package]] name = "move-binary-format" version = "0.0.3" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "mirai-annotations", @@ -1631,7 +1631,7 @@ dependencies = [ [[package]] name = "move-borrow-graph" version = "0.0.1" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "mirai-annotations", "workspace-hack", @@ -1640,7 +1640,7 @@ dependencies = [ [[package]] name = "move-bytecode-source-map" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "bcs", @@ -1657,7 +1657,7 @@ dependencies = [ [[package]] name = "move-bytecode-utils" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "move-binary-format", @@ -1670,7 +1670,7 @@ dependencies = [ [[package]] name = "move-bytecode-verifier" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "mirai-annotations", @@ -1684,7 +1684,7 @@ dependencies = [ [[package]] name = "move-bytecode-viewer" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "move-binary-format", @@ -1702,7 +1702,7 @@ dependencies = [ [[package]] name = "move-cli" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "bcs", @@ -1746,7 +1746,7 @@ dependencies = [ [[package]] name = "move-command-line-common" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "difference", @@ -1760,7 +1760,7 @@ dependencies = [ [[package]] name = "move-compiler" version = "0.0.1" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "bcs", @@ -1790,14 +1790,14 @@ dependencies = [ [[package]] name = "move-core-types" version = "0.0.3" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "bcs", "hex", "mirai-annotations", "once_cell", - "rand 0.8.4", + "rand 0.8.5", "ref-cast", "serde 1.0.136", "serde_bytes", @@ -1807,7 +1807,7 @@ dependencies = [ [[package]] name = "move-coverage" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "bcs", @@ -1829,7 +1829,7 @@ dependencies = [ [[package]] name = "move-disassembler" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "colored", @@ -1848,7 +1848,7 @@ dependencies = [ [[package]] name = "move-docgen" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "codespan", @@ -1868,7 +1868,7 @@ dependencies = [ [[package]] name = "move-errmapgen" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "bcs", @@ -1883,7 +1883,7 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "codespan-reporting", @@ -1903,7 +1903,7 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode-syntax" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "hex", @@ -1917,7 +1917,7 @@ dependencies = [ [[package]] name = "move-ir-types" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "hex", @@ -1932,7 +1932,7 @@ dependencies = [ [[package]] name = "move-model" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "codespan", @@ -1959,11 +1959,12 @@ dependencies = [ [[package]] name = "move-package" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "bcs", "colored", + "lockfile", "move-abigen", "move-binary-format", "move-bytecode-source-map", @@ -1994,7 +1995,7 @@ dependencies = [ [[package]] name = "move-prover" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "async-trait", @@ -2021,11 +2022,11 @@ dependencies = [ "num", "once_cell", "pretty", - "rand 0.8.4", + "rand 0.8.5", "serde 1.0.136", "serde_json", "simplelog", - "tokio 1.16.1", + "tokio 1.17.0", "toml", "workspace-hack", ] @@ -2033,7 +2034,7 @@ dependencies = [ [[package]] name = "move-prover-boogie-backend" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "async-trait", @@ -2050,19 +2051,19 @@ dependencies = [ "num", "once_cell", "pretty", - "rand 0.8.4", + "rand 0.8.5", "regex", "serde 1.0.136", "serde_json", "tera", - "tokio 1.16.1", + "tokio 1.17.0", "workspace-hack", ] [[package]] name = "move-read-write-set-types" version = "0.0.3" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "move-binary-format", @@ -2074,7 +2075,7 @@ dependencies = [ [[package]] name = "move-resource-viewer" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "bcs", @@ -2090,7 +2091,7 @@ dependencies = [ [[package]] name = "move-stackless-bytecode" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "codespan", "codespan-reporting", @@ -2117,7 +2118,7 @@ dependencies = [ [[package]] name = "move-stackless-bytecode-interpreter" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "bytecode-interpreter-crypto", @@ -2137,7 +2138,7 @@ dependencies = [ [[package]] name = "move-stdlib" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "log", "move-binary-format", @@ -2159,7 +2160,7 @@ dependencies = [ [[package]] name = "move-symbol-pool" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "once_cell", "serde 1.0.136", @@ -2169,7 +2170,7 @@ dependencies = [ [[package]] name = "move-unit-test" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "colored", @@ -2194,7 +2195,7 @@ dependencies = [ [[package]] name = "move-vm-runtime" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "fail", "mirai-annotations", @@ -2212,7 +2213,7 @@ dependencies = [ [[package]] name = "move-vm-test-utils" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "move-binary-format", @@ -2224,7 +2225,7 @@ dependencies = [ [[package]] name = "move-vm-types" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "bcs", "mirai-annotations", @@ -2317,9 +2318,9 @@ dependencies = [ [[package]] name = "ntapi" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" dependencies = [ "winapi 0.3.9", ] @@ -2690,7 +2691,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" dependencies = [ "phf_shared", - "rand 0.8.4", + "rand 0.8.5", ] [[package]] @@ -2789,7 +2790,7 @@ dependencies = [ [[package]] name = "pontem" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "bech32", @@ -2811,7 +2812,7 @@ dependencies = [ "hash_project", "libloading", "log", - "rand 0.8.4", + "rand 0.8.5", "url", ] @@ -2923,19 +2924,18 @@ dependencies = [ "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", - "rand_hc 0.2.0", + "rand_hc", ] [[package]] name = "rand" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", "rand_core 0.6.3", - "rand_hc 0.3.1", ] [[package]] @@ -2985,15 +2985,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core 0.6.3", -] - [[package]] name = "rand_xoshiro" version = "0.4.0" @@ -3031,7 +3022,7 @@ dependencies = [ [[package]] name = "read-write-set" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "move-binary-format", @@ -3048,7 +3039,7 @@ dependencies = [ [[package]] name = "read-write-set-dynamic" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "anyhow", "move-binary-format", @@ -3414,9 +3405,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" +checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" dependencies = [ "itoa 1.0.1", "ryu", @@ -3568,6 +3559,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "socket2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +dependencies = [ + "libc", + "winapi 0.3.9", +] + [[package]] name = "spin" version = "0.5.2" @@ -3684,7 +3685,7 @@ dependencies = [ "percent-encoding", "pest", "pest_derive", - "rand 0.8.4", + "rand 0.8.5", "regex", "serde 1.0.136", "serde_json", @@ -3814,19 +3815,20 @@ dependencies = [ [[package]] name = "tokio" -version = "1.16.1" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a" +checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" dependencies = [ "bytes 1.1.0", "libc", "memchr", - "mio 0.7.14", + "mio 0.8.0", "num_cpus", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project-lite 0.2.8", "signal-hook-registry", + "socket2 0.4.4", "tokio-macros", "winapi 0.3.9", ] @@ -3883,9 +3885,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d8d93354fe2a8e50d5953f5ae2e47a3fc2ef03292e7ea46e3cc38f549525fb9" +checksum = "f6c650a8ef0cd2dd93736f033d21cbd1224c5a967aa0c258d00fcf7dafef9b9f" dependencies = [ "cfg-if 1.0.0", "log", @@ -3951,7 +3953,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" dependencies = [ "cfg-if 1.0.0", - "rand 0.8.4", + "rand 0.8.5", "static_assertions", ] @@ -4370,7 +4372,7 @@ dependencies = [ [[package]] name = "workspace-hack" version = "0.1.0" -source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#2b1736d4dbdd54d9aa9a52f6af9945f7f86957c7" +source = "git+https://github.com/pontem-network/move.git?branch=release-1.6#bba160ecd363a0cac5ed0820fc482d068ad1dab6" dependencies = [ "arrayvec 0.5.2", "block-buffer 0.9.0", @@ -4439,9 +4441,9 @@ dependencies = [ [[package]] name = "zeroize_derive" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81e8f13fef10b63c06356d65d416b070798ddabcadc10d3ece0c5be9b3c7eddb" +checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" dependencies = [ "proc-macro2 1.0.36", "quote 1.0.15",