From c85e56deeaead43abbc33b7301058838b9c5136d Mon Sep 17 00:00:00 2001 From: silas <95582913+silas-x@users.noreply.github.com> Date: Thu, 5 Jan 2023 19:33:36 +0000 Subject: [PATCH] CI updates and bump deps (#27) * add deps scan workflow * Create codeql.yml * remove codeql * add upload feature * add output file * update ci jobs * update deps * minor ci tweaks * remove build test * combine ci jobs * require security scan * more ci concurrency * add SBOM to release flow --- .../workflows/{js-lint.yml => ci-js-lint.yml} | 16 +- .github/workflows/ci-test.yml | 122 ++ .github/workflows/ci-verifiable-build.yml | 19 +- .github/workflows/test.yml | 52 - Cargo.lock | 823 ++++++------ assert-owner/Cargo.toml | 2 +- common/Cargo.toml | 18 +- dex/Cargo.lock | 101 +- dex/Cargo.toml | 28 +- dex/crank/Cargo.toml | 24 +- dex/fuzz/Cargo.lock | 1103 +++++++++++++---- dex/fuzz/Cargo.toml | 14 +- 12 files changed, 1487 insertions(+), 835 deletions(-) rename .github/workflows/{js-lint.yml => ci-js-lint.yml} (71%) create mode 100644 .github/workflows/ci-test.yml delete mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/js-lint.yml b/.github/workflows/ci-js-lint.yml similarity index 71% rename from .github/workflows/js-lint.yml rename to .github/workflows/ci-js-lint.yml index b9a6e7c..5256119 100644 --- a/.github/workflows/js-lint.yml +++ b/.github/workflows/ci-js-lint.yml @@ -7,7 +7,6 @@ on: paths: - '**.ts' - '**.js' - pull_request: branches: - master @@ -18,18 +17,25 @@ on: jobs: js-lint: name: Prettier check - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest defaults: run: working-directory: ./dex/tests/permissioned steps: - - uses: actions/checkout@v3 + - name: Checkout code + uses: actions/checkout@v3 + - name: Use Node.js uses: actions/setup-node@v3 with: node-version: 18 - - run: corepack enable + + - name: Enable corepack + run: corepack enable shell: bash - - run: yarn + + - name: Install yarn + run: yarn + - name: Run prettier run: yarn prettier '*/**/*{.js,.ts}' --check \ No newline at end of file diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml new file mode 100644 index 0000000..82f01ba --- /dev/null +++ b/.github/workflows/ci-test.yml @@ -0,0 +1,122 @@ +name: Scan & Test + +on: + push: + branches: + - master + pull_request: + branches: + - master + +env: + CARGO_TERM_COLOR: always + +jobs: + trivy: + name: Dependency security scan + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + # Report all vulnerabilities in security tab + - name: Report on all vulnerabilities + uses: aquasecurity/trivy-action@master + with: + scan-type: 'fs' + ignore-unfixed: true + hide-progress: true + format: 'sarif' + output: 'trivy-results.sarif' + + # Fail the job on critical vulnerabiliies with fix available + - name: Fail on critical vulnerabilities + uses: aquasecurity/trivy-action@master + with: + scan-type: 'fs' + ignore-unfixed: true + hide-progress: true + format: 'table' + severity: 'CRITICAL' + exit-code: '1' + + - name: Upload scan results + uses: github/codeql-action/upload-sarif@v2 + if: always() + with: + sarif_file: 'trivy-results.sarif' + + format: + name: Format + needs: ['trivy'] + if: ${{ always() }} + runs-on: ubuntu-latest + steps: + - name: Checkout sources + uses: actions/checkout@v3 + + - name: Run cargo fmt + run: cargo fmt --all -- --check + + clippy: + name: Clippy + needs: ['trivy'] + if: ${{ always() }} + runs-on: ubuntu-latest + steps: + - name: Checkout sources + uses: actions/checkout@v3 + + - name: Cache binaries + uses: actions/cache@v3 + with: + path: | + ~/.cargo/bin/ + ~/.cargo/registry/index/ + ~/.cargo/registry/cache/ + ~/.cargo/git/db/ + target/ + dex/target/ + key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + + - name: Run cargo clippy + run: cargo clippy -- -D warnings + + test: + name: Cargo test + needs: ['trivy'] + if: ${{ always() }} + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + path: ['Cargo.toml', + 'dex/Cargo.toml'] + env: + PROGRAM_PATH: ${{ matrix.path }} + steps: + - name: Checkout sources + uses: actions/checkout@v3 + + - name: Cache binaries + uses: actions/cache@v3 + with: + path: | + ~/.cargo/bin/ + ~/.cargo/registry/index/ + ~/.cargo/registry/cache/ + ~/.cargo/git/db/ + target/ + dex/target/ + key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + + - name: Run tests + run: | + cargo test --manifest-path ${{ matrix.path }} --workspace + + pass: + name: All tests pass + needs: ['trivy', 'format', 'clippy', 'test'] + runs-on: ubuntu-latest + steps: + - run: echo ok \ No newline at end of file diff --git a/.github/workflows/ci-verifiable-build.yml b/.github/workflows/ci-verifiable-build.yml index a4ccab3..d49242e 100644 --- a/.github/workflows/ci-verifiable-build.yml +++ b/.github/workflows/ci-verifiable-build.yml @@ -39,7 +39,14 @@ jobs: - name: Generate Checksum run: | echo "CHECKSUM=$(sha256sum ./target/verifiable/${{ env.APP_NAME }}.so | head -c 64)" >> $GITHUB_ENV - + + - name: Generate SBOM + uses: aquasecurity/trivy-action@master + with: + scan-type: 'fs' + format: 'cyclonedx' + output: '${{ env.APP_NAME }}-${{ github.ref_name }}-sbom.json' + - name: Create Release id: create_release uses: actions/create-release@v1 @@ -62,3 +69,13 @@ jobs: asset_path: ./dex/target/verifiable/${{ env.APP_NAME }}.so asset_name: ${{ env.APP_NAME }}.so asset_content_type: application/x-sharedlib + + - name: Upload SBOM + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./dex/${{ env.APP_NAME }}-${{ github.ref_name }}-sbom.json + asset_name: ${{ env.APP_NAME }}-${{ github.ref_name }}-sbom.json + asset_content_type: application/json diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 453478b..0000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: Test - -on: - push: - branches: - - master - pull_request: - branches: - - master - -jobs: - rust-lint: - name: Cargo fmt, cargo clippy - runs-on: ubuntu-20.04 - steps: - - name: Checkout sources - uses: actions/checkout@v3 - - name: Cache Cargo and target - uses: actions/cache@v3 - with: - path: | - ~/.cargo/bin/ - ~/.cargo/registry/index/ - ~/.cargo/registry/cache/ - ~/.cargo/git/db/ - target/ - dex/target/ - key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - name: Run cargo fmt - run: cargo fmt --all -- --check - - name: Run cargo clippy - run: cargo clippy -- -D warnings - test: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - - - uses: actions/cache@v3 - with: - path: | - ~/.cargo/bin/ - ~/.cargo/registry/index/ - ~/.cargo/registry/cache/ - ~/.cargo/git/db/ - target/ - dex/target/ - key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - - name: test - run: | - cargo test --manifest-path Cargo.toml --all - cargo test --manifest-path dex/Cargo.toml --all diff --git a/Cargo.lock b/Cargo.lock index 440e80f..4937e7e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -115,10 +115,10 @@ checksum = "13e53fd8d0aa034bb2e647c39eec4e399095438dbc83526949ac6a072e3c4ce7" dependencies = [ "anchor-syn 0.18.2", "anyhow", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", "regex", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -129,10 +129,10 @@ checksum = "70f6ee9518f50ff4d434471ccf569186022bdd5ef65a21d14da3ea5231af944f" dependencies = [ "anchor-syn 0.25.0", "anyhow", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", "regex", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -144,10 +144,10 @@ dependencies = [ "anchor-syn 0.18.2", "anyhow", "bs58 0.4.0", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", "rustversion", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -159,10 +159,10 @@ dependencies = [ "anchor-syn 0.25.0", "anyhow", "bs58 0.4.0", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", "rustversion", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -172,8 +172,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0844974ac35e8ced62056b0d63777ebcdc5807438b8b189c881e2b647450b70a" dependencies = [ "anchor-syn 0.25.0", - "proc-macro2 1.0.36", - "syn 1.0.89", + "proc-macro2 1.0.47", + "syn 1.0.105", ] [[package]] @@ -183,9 +183,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41c8be43ca34309afcafb24274bba6733b6b5d59be47f1cc11ef3afe9584e5cd" dependencies = [ "anchor-syn 0.18.2", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -195,9 +195,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f7467345e67a6f1d4b862b9763a4160ad89d18c247b8c902807768f7b6e23df" dependencies = [ "anchor-syn 0.25.0", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -208,9 +208,9 @@ checksum = "899640f277f8296da82d6505312b03a4cd4901c3c6d6fe8eb3ca2db33f26ebb9" dependencies = [ "anchor-syn 0.18.2", "anyhow", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -221,9 +221,9 @@ checksum = "8774e4c1ac71f71a5aea7e4932fb69c30e3b8155c4fa59fd69401195434528a9" dependencies = [ "anchor-syn 0.25.0", "anyhow", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -235,9 +235,9 @@ dependencies = [ "anchor-syn 0.18.2", "anyhow", "heck 0.3.3", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -249,9 +249,9 @@ dependencies = [ "anchor-syn 0.25.0", "anyhow", "heck 0.3.3", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -262,9 +262,9 @@ checksum = "fadc2f9bcaeb3be4a8efb76c455bc772b5d257c01796b415eb3aa4bd93ed43fe" dependencies = [ "anchor-syn 0.18.2", "anyhow", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -275,9 +275,9 @@ checksum = "ac515a7a5a4fea7fc768b1cec40ddb948e148ea657637c75f94f283212326cb9" dependencies = [ "anchor-syn 0.25.0", "anyhow", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -288,9 +288,9 @@ checksum = "adbff8f1a2b53a42ef547f3188e25f7e3d6933113ab0f94b11afb825eee80f47" dependencies = [ "anchor-syn 0.18.2", "anyhow", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -301,9 +301,9 @@ checksum = "43dc667b62ff71450f19dcfcc37b0c408fd4ddd89e8650368c2b0984b110603f" dependencies = [ "anchor-syn 0.25.0", "anyhow", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -314,9 +314,9 @@ checksum = "458185d8bd23559f6ed35c4a7a7d0f83ac4d7837b2e790d90e50cafc9371503e" dependencies = [ "anchor-syn 0.18.2", "anyhow", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -327,9 +327,9 @@ checksum = "7354d583a06701d24800a8ec4c2b0491f62581a331af349205e23421e0b56643" dependencies = [ "anchor-syn 0.25.0", "anyhow", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -399,13 +399,13 @@ dependencies = [ "anyhow", "bs58 0.3.1", "heck 0.3.3", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "proc-macro2-diagnostics", "quote 1.0.16", "serde", "serde_json", "sha2 0.9.9", - "syn 1.0.89", + "syn 1.0.105", "thiserror", ] @@ -418,13 +418,13 @@ dependencies = [ "anyhow", "bs58 0.3.1", "heck 0.3.3", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "proc-macro2-diagnostics", "quote 1.0.16", "serde", "serde_json", "sha2 0.9.9", - "syn 1.0.89", + "syn 1.0.105", "thiserror", ] @@ -439,9 +439,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.56" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" +checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" [[package]] name = "arc-swap" @@ -483,9 +483,9 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", "synstructure", ] @@ -495,9 +495,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -517,7 +517,7 @@ dependencies = [ "futures-core", "memchr", "pin-project-lite 0.2.8", - "tokio 1.17.0", + "tokio 1.23.0", ] [[package]] @@ -535,9 +535,9 @@ version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -546,7 +546,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi 0.3.9", ] @@ -657,8 +657,8 @@ dependencies = [ "borsh-derive-internal 0.8.2", "borsh-schema-derive-internal 0.8.2", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.36", - "syn 1.0.89", + "proc-macro2 1.0.47", + "syn 1.0.105", ] [[package]] @@ -670,8 +670,8 @@ dependencies = [ "borsh-derive-internal 0.9.3", "borsh-schema-derive-internal 0.9.3", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.36", - "syn 1.0.89", + "proc-macro2 1.0.47", + "syn 1.0.105", ] [[package]] @@ -680,9 +680,9 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2104c73179359431cc98e016998f2f23bc7a05bc53e79741bcba705f30047bc" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -691,9 +691,9 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -702,9 +702,9 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae29eb8418fcd46f723f8691a2ac06857d31179d33d2f2d91eb13967de97c728" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -713,9 +713,9 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -779,22 +779,22 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.8.0" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e851ca7c24871e7336801608a4797d7376545b6928a10d32d75685687141ead" +checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.0.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e215f8c2f9f79cb53c8335e687ffd07d5bfcb6fe5fc80723762d0be46e7cc54" +checksum = "5fe233b960f12f8007e3db2d136e3cb1c291bfd7396e384ee76025fc1a3932b4" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -890,39 +890,46 @@ dependencies = [ "atty", "bitflags", "strsim 0.8.0", - "textwrap 0.11.0", + "textwrap", "unicode-width", "vec_map", ] [[package]] name = "clap" -version = "3.1.6" +version = "4.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8c93436c21e4698bacadf42917db28b23017027a4deccb35dbe47a7e7840123" +checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d" dependencies = [ - "atty", "bitflags", "clap_derive", - "indexmap", - "lazy_static", - "os_str_bytes", + "clap_lex", + "is-terminal", + "once_cell", "strsim 0.10.0", "termcolor", - "textwrap 0.15.0", ] [[package]] name = "clap_derive" -version = "3.1.4" +version = "4.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da95d038ede1a964ce99f49cbe27a7fb538d1da595e4b4f70b8c8f338d17bf16" +checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" dependencies = [ "heck 0.4.0", "proc-macro-error", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", +] + +[[package]] +name = "clap_lex" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" +dependencies = [ + "os_str_bytes", ] [[package]] @@ -1002,7 +1009,7 @@ name = "crank" version = "0.2.0" dependencies = [ "anyhow", - "clap 3.1.6", + "clap 4.0.29", "debug_print", "enumflags2", "log", @@ -1234,9 +1241,9 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -1262,12 +1269,6 @@ dependencies = [ "syn 0.15.44", ] -[[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - [[package]] name = "ed25519" version = "1.4.0" @@ -1339,9 +1340,9 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -1351,9 +1352,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eb359f1476bf611266ac1f5355bc14aeca37b299d0ebccc038ee7058891c9cb" dependencies = [ "once_cell", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -1371,9 +1372,9 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -1539,9 +1540,9 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -1628,26 +1629,6 @@ dependencies = [ "wasi 0.10.2+wasi-snapshot-preview1", ] -[[package]] -name = "h2" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" -dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio 0.2.25", - "tokio-util 0.3.1", - "tracing", - "tracing-futures", -] - [[package]] name = "h2" version = "0.3.12" @@ -1662,7 +1643,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 1.17.0", + "tokio 1.23.0", "tokio-util 0.6.9", "tracing", ] @@ -1705,9 +1686,9 @@ dependencies = [ "bytes 1.1.0", "headers-core", "http", - "httpdate 1.0.2", + "httpdate", "mime", - "sha-1 0.10.0", + "sha-1", ] [[package]] @@ -1743,6 +1724,15 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + [[package]] name = "histogram" version = "0.6.9" @@ -1787,17 +1777,7 @@ checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" dependencies = [ "bytes 1.1.0", "fnv", - "itoa 1.0.1", -] - -[[package]] -name = "http-body" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" -dependencies = [ - "bytes 0.5.6", - "http", + "itoa", ] [[package]] @@ -1817,12 +1797,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" -[[package]] -name = "httpdate" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" - [[package]] name = "httpdate" version = "1.0.2" @@ -1835,30 +1809,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -[[package]] -name = "hyper" -version = "0.13.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" -dependencies = [ - "bytes 0.5.6", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.2.7", - "http", - "http-body 0.3.1", - "httparse", - "httpdate 0.3.2", - "itoa 0.4.8", - "pin-project 1.0.10", - "socket2 0.3.19", - "tokio 0.2.25", - "tower-service", - "tracing", - "want", -] - [[package]] name = "hyper" version = "0.14.17" @@ -1869,15 +1819,15 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.12", + "h2", "http", - "http-body 0.4.4", + "http-body", "httparse", - "httpdate 1.0.2", - "itoa 1.0.1", + "httpdate", + "itoa", "pin-project-lite 0.2.8", - "socket2 0.4.4", - "tokio 1.17.0", + "socket2", + "tokio 1.23.0", "tower-service", "tracing", "want", @@ -1890,9 +1840,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" dependencies = [ "http", - "hyper 0.14.17", + "hyper", "rustls", - "tokio 1.17.0", + "tokio 1.23.0", "tokio-rustls", ] @@ -1955,21 +1905,22 @@ dependencies = [ ] [[package]] -name = "input_buffer" -version = "0.3.1" +name = "instant" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "bytes 0.5.6", + "cfg-if 1.0.0", ] [[package]] -name = "instant" -version = "0.1.12" +name = "io-lifetimes" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" dependencies = [ - "cfg-if 1.0.0", + "libc", + "windows-sys 0.42.0", ] [[package]] @@ -1987,6 +1938,18 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35e70ee094dc02fd9c13fdad4940090f22dbd6ac7c9e7094a46cf0232a50bc7c" +[[package]] +name = "is-terminal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +dependencies = [ + "hermit-abi 0.2.6", + "io-lifetimes", + "rustix", + "windows-sys 0.42.0", +] + [[package]] name = "itertools" version = "0.9.0" @@ -1998,19 +1961,13 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - [[package]] name = "itoa" version = "1.0.1" @@ -2074,9 +2031,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.120" +version = "0.2.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad5c14e80759d0939d013e6ca49930e59fc53dd8e5009132f76240c179380c09" +checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" [[package]] name = "libflate" @@ -2162,6 +2119,12 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + [[package]] name = "lock_api" version = "0.4.6" @@ -2173,9 +2136,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if 1.0.0", ] @@ -2297,16 +2260,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" dependencies = [ "libc", "log", - "miow 0.3.7", - "ntapi", "wasi 0.11.0+wasi-snapshot-preview1", - "winapi 0.3.9", + "windows-sys 0.42.0", ] [[package]] @@ -2355,9 +2316,9 @@ dependencies = [ [[package]] name = "multipart" -version = "0.17.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050aeedc89243f5347c3e237e3e13dc76fbe4ae3742a57b94dc14f69acf76d4" +checksum = "00dec633863867f29cb39df64a397cdf4a6354708ddd7759f70c7fb51c5f9182" dependencies = [ "buf_redux", "httparse", @@ -2365,7 +2326,7 @@ dependencies = [ "mime", "mime_guess", "quick-error", - "rand 0.7.3", + "rand 0.8.5", "safemem", "tempfile", "twoway", @@ -2466,9 +2427,9 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -2506,9 +2467,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] @@ -2519,7 +2480,7 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", ] @@ -2539,9 +2500,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" dependencies = [ "proc-macro-crate 1.1.3", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -2570,9 +2531,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.10.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "opaque-debug" @@ -2591,9 +2552,6 @@ name = "os_str_bytes" version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" -dependencies = [ - "memchr", -] [[package]] name = "parking_lot" @@ -2615,7 +2573,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.32.0", ] [[package]] @@ -2669,33 +2627,13 @@ dependencies = [ "ucd-trie", ] -[[package]] -name = "pin-project" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9615c18d31137579e9ff063499264ddc1278e7b1982757ebc111028c4d1dc909" -dependencies = [ - "pin-project-internal 0.4.29", -] - [[package]] name = "pin-project" version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" dependencies = [ - "pin-project-internal 1.0.10", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a" -dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.16", - "syn 1.0.89", + "pin-project-internal", ] [[package]] @@ -2704,9 +2642,9 @@ version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -2782,9 +2720,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", "version_check", ] @@ -2794,7 +2732,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", "version_check", ] @@ -2810,11 +2748,11 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" dependencies = [ - "unicode-xid 0.2.2", + "unicode-ident", ] [[package]] @@ -2823,9 +2761,9 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", "version_check", "yansi", ] @@ -2859,7 +2797,7 @@ dependencies = [ "quinn-udp", "rustls", "thiserror", - "tokio 1.17.0", + "tokio 1.23.0", "tracing", "webpki", ] @@ -2894,8 +2832,8 @@ dependencies = [ "libc", "mio 0.7.14", "quinn-proto", - "socket2 0.4.4", - "tokio 1.17.0", + "socket2", + "tokio 1.23.0", "tracing", ] @@ -2914,7 +2852,7 @@ version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4af2ec4714533fcdf07e886f17025ace8b997b9ce51204ee69b6da831c3da57" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", ] [[package]] @@ -3092,10 +3030,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.3.12", + "h2", "http", - "http-body 0.4.4", - "hyper 0.14.17", + "http-body", + "hyper", "hyper-rustls", "ipnet", "js-sys", @@ -3108,8 +3046,8 @@ dependencies = [ "rustls-pemfile 0.3.0", "serde", "serde_json", - "serde_urlencoded 0.7.1", - "tokio 1.17.0", + "serde_urlencoded", + "tokio 1.23.0", "tokio-rustls", "tokio-util 0.6.9", "url", @@ -3186,6 +3124,20 @@ dependencies = [ "nom", ] +[[package]] +name = "rustix" +version = "0.36.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.42.0", +] + [[package]] name = "rustls" version = "0.20.4" @@ -3333,9 +3285,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.136" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" dependencies = [ "serde_derive", ] @@ -3351,38 +3303,26 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.136" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] name = "serde_json" -version = "1.0.79" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" +checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" dependencies = [ - "itoa 1.0.1", + "itoa", "ryu", "serde", ] -[[package]] -name = "serde_urlencoded" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" -dependencies = [ - "dtoa", - "itoa 0.4.8", - "serde", - "url", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -3390,7 +3330,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.1", + "itoa", "ryu", "serde", ] @@ -3425,7 +3365,7 @@ dependencies = [ "anyhow", "arrayref", "bincode", - "bs58 0.3.1", + "bs58 0.4.0", "rand 0.7.3", "serde", "serde_json", @@ -3489,7 +3429,7 @@ dependencies = [ "default-env", "enumflags2", "field-offset", - "itertools 0.9.0", + "itertools 0.10.5", "num-traits", "num_enum", "safe-transmute", @@ -3502,19 +3442,6 @@ dependencies = [ "without-alloc", ] -[[package]] -name = "sha-1" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "sha-1" version = "0.10.0" @@ -3668,12 +3595,14 @@ dependencies = [ [[package]] name = "sloggers" -version = "1.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f01d37507aa6f37490cfa08d71e2639b16906e84c285ae4b9f7ec7ca35756d69" +checksum = "e20d36cb80da75a9c5511872f15247ddad14ead8c1dd97a86b56d1be9f5d4a0e" dependencies = [ "chrono", + "libc", "libflate", + "once_cell", "regex", "serde", "slog", @@ -3683,6 +3612,8 @@ dependencies = [ "slog-stdlog", "slog-term", "trackable", + "winapi 0.3.9", + "windows-acl", ] [[package]] @@ -3691,17 +3622,6 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "winapi 0.3.9", -] - [[package]] name = "socket2" version = "0.4.4" @@ -3789,7 +3709,7 @@ dependencies = [ "futures-util", "indexmap", "indicatif", - "itertools 0.10.3", + "itertools 0.10.5", "jsonrpc-core", "lazy_static", "log", @@ -3818,10 +3738,10 @@ dependencies = [ "solana-vote-program", "spl-token-2022", "thiserror", - "tokio 1.17.0", + "tokio 1.23.0", "tokio-stream", - "tokio-tungstenite 0.17.1", - "tungstenite 0.17.2", + "tokio-tungstenite", + "tungstenite", "url", ] @@ -3860,7 +3780,7 @@ dependencies = [ "solana-version", "spl-memo", "thiserror", - "tokio 1.17.0", + "tokio 1.23.0", ] [[package]] @@ -3891,10 +3811,10 @@ version = "1.10.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a37211ec8dff16b08fcb422807fa7f046bbc6417bc43e00a2f2effd8fafec6bc" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", "rustc_version 0.4.0", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -3946,11 +3866,11 @@ dependencies = [ "rand 0.7.3", "serde", "serde_derive", - "socket2 0.4.4", + "socket2", "solana-logger", "solana-sdk", "solana-version", - "tokio 1.17.0", + "tokio 1.23.0", "url", ] @@ -4000,7 +3920,7 @@ dependencies = [ "console_log", "curve25519-dalek", "getrandom 0.1.16", - "itertools 0.10.3", + "itertools 0.10.5", "js-sys", "lazy_static", "libsecp256k1", @@ -4032,7 +3952,7 @@ dependencies = [ "base64 0.13.0", "bincode", "enum-iterator", - "itertools 0.10.3", + "itertools 0.10.5", "libc", "libloading", "log", @@ -4097,7 +4017,7 @@ dependencies = [ "ed25519-dalek-bip32", "generic-array", "hmac 0.12.1", - "itertools 0.10.3", + "itertools 0.10.5", "js-sys", "lazy_static", "libsecp256k1", @@ -4134,10 +4054,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d036e3a52e5570114ec9ab56a1d0a6659e1ebd1c948605318b4e35eafca4515" dependencies = [ "bs58 0.4.0", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", "rustversion", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -4156,7 +4076,7 @@ dependencies = [ "futures-util", "histogram", "indexmap", - "itertools 0.10.3", + "itertools 0.10.5", "libc", "log", "nix", @@ -4171,7 +4091,7 @@ dependencies = [ "solana-perf", "solana-sdk", "thiserror", - "tokio 1.17.0", + "tokio 1.23.0", "x509-parser", ] @@ -4396,13 +4316,13 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.89" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54" +checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "unicode-xid 0.2.2", + "unicode-ident", ] [[package]] @@ -4411,9 +4331,9 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", "unicode-xid 0.2.2", ] @@ -4476,30 +4396,24 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "textwrap" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" - [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -4536,7 +4450,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "004cbc98f30fa233c61a38bc77e96a9106e65c88f2d3bef182ae952027e5753d" dependencies = [ - "itoa 1.0.1", + "itoa", "libc", "num_threads", "time-macros", @@ -4608,22 +4522,22 @@ dependencies = [ [[package]] name = "tokio" -version = "1.17.0" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" +checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" dependencies = [ + "autocfg", "bytes 1.1.0", "libc", "memchr", - "mio 0.8.2", + "mio 0.8.5", "num_cpus", - "once_cell", "parking_lot", "pin-project-lite 0.2.8", "signal-hook-registry", - "socket2 0.4.4", + "socket2", "tokio-macros 1.7.0", - "winapi 0.3.9", + "windows-sys 0.42.0", ] [[package]] @@ -4632,9 +4546,9 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -4643,9 +4557,9 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -4655,7 +4569,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b" dependencies = [ "rustls", - "tokio 1.17.0", + "tokio 1.23.0", "webpki", ] @@ -4667,20 +4581,7 @@ checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" dependencies = [ "futures-core", "pin-project-lite 0.2.8", - "tokio 1.17.0", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9e878ad426ca286e4dcae09cbd4e1973a7f8987d97570e2469703dd7f5720c" -dependencies = [ - "futures-util", - "log", - "pin-project 0.4.29", - "tokio 0.2.25", - "tungstenite 0.11.1", + "tokio 1.23.0", ] [[package]] @@ -4692,39 +4593,38 @@ dependencies = [ "futures-util", "log", "rustls", - "tokio 1.17.0", + "tokio 1.23.0", "tokio-rustls", - "tungstenite 0.17.2", + "tungstenite", "webpki", "webpki-roots", ] [[package]] name = "tokio-util" -version = "0.3.1" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" +checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" dependencies = [ - "bytes 0.5.6", + "bytes 1.1.0", "futures-core", "futures-sink", "log", - "pin-project-lite 0.1.12", - "tokio 0.2.25", + "pin-project-lite 0.2.8", + "tokio 1.23.0", ] [[package]] name = "tokio-util" -version = "0.6.9" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" dependencies = [ "bytes 1.1.0", "futures-core", "futures-sink", - "log", "pin-project-lite 0.2.8", - "tokio 1.17.0", + "tokio 1.23.0", ] [[package]] @@ -4761,9 +4661,9 @@ version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -4775,16 +4675,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project 1.0.10", - "tracing", -] - [[package]] name = "trackable" version = "1.2.0" @@ -4801,7 +4691,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebeb235c5847e2f82cfe0f07eb971d1e5f6804b18dac2ae16349cc604380f82f" dependencies = [ "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", ] [[package]] @@ -4810,25 +4700,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" -[[package]] -name = "tungstenite" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" -dependencies = [ - "base64 0.12.3", - "byteorder", - "bytes 0.5.6", - "http", - "httparse", - "input_buffer", - "log", - "rand 0.7.3", - "sha-1 0.9.8", - "url", - "utf-8", -] - [[package]] name = "tungstenite" version = "0.17.2" @@ -4843,7 +4714,7 @@ dependencies = [ "log", "rand 0.8.5", "rustls", - "sha-1 0.10.0", + "sha-1", "thiserror", "url", "utf-8", @@ -4887,6 +4758,12 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +[[package]] +name = "unicode-ident" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + [[package]] name = "unicode-normalization" version = "0.1.19" @@ -4930,6 +4807,15 @@ dependencies = [ "subtle", ] +[[package]] +name = "unsize" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fa7a7a734c1a5664a662ddcea0b6c9472a21da8888c957c7f1eaa09dba7a939" +dependencies = [ + "autocfg", +] + [[package]] name = "untrusted" version = "0.7.1" @@ -4958,12 +4844,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "urlencoding" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a1f0175e03a0973cf4afd476bef05c26e228520400eb1fd473ad417b1c00ffb" - [[package]] name = "utf-8" version = "0.7.6" @@ -4994,30 +4874,33 @@ dependencies = [ [[package]] name = "warp" -version = "0.2.5" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f41be6df54c97904af01aa23e613d4521eed7ab23537cede692d4058f6449407" +checksum = "ed7b8be92646fc3d18b06147664ebc5f48d222686cb11a8755e561a735aacc6d" dependencies = [ - "bytes 0.5.6", - "futures", + "bytes 1.1.0", + "futures-channel", + "futures-util", "headers", "http", - "hyper 0.13.10", + "hyper", "log", "mime", "mime_guess", "multipart", - "pin-project 0.4.29", + "percent-encoding", + "pin-project", + "rustls-pemfile 0.2.1", "scoped-tls", "serde", "serde_json", - "serde_urlencoded 0.6.1", - "tokio 0.2.25", - "tokio-tungstenite 0.11.0", + "serde_urlencoded", + "tokio 1.23.0", + "tokio-stream", + "tokio-tungstenite", + "tokio-util 0.7.4", "tower-service", "tracing", - "tracing-futures", - "urlencoding", ] [[package]] @@ -5057,9 +4940,9 @@ dependencies = [ "bumpalo", "lazy_static", "log", - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", "wasm-bindgen-shared", ] @@ -5091,9 +4974,9 @@ version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5133,6 +5016,12 @@ dependencies = [ "webpki", ] +[[package]] +name = "widestring" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" + [[package]] name = "winapi" version = "0.2.8" @@ -5176,49 +5065,118 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-acl" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177b1723986bcb4c606058e77f6e8614b51c7f9ad2face6f6fd63dd5c8b3cec3" +dependencies = [ + "field-offset", + "libc", + "widestring", + "winapi 0.3.9", +] + [[package]] name = "windows-sys" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_msvc 0.32.0", + "windows_i686_gnu 0.32.0", + "windows_i686_msvc 0.32.0", + "windows_x86_64_gnu 0.32.0", + "windows_x86_64_msvc 0.32.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", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.0", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + [[package]] name = "windows_aarch64_msvc" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + [[package]] name = "windows_i686_gnu" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + [[package]] name = "windows_i686_msvc" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + [[package]] name = "windows_x86_64_gnu" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + [[package]] name = "windows_x86_64_msvc" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + [[package]] name = "winreg" version = "0.10.1" @@ -5230,11 +5188,12 @@ dependencies = [ [[package]] name = "without-alloc" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e34736feff52a0b3e5680927e947a4d8fac1f0b80dc8120b080dd8de24d75e2" +checksum = "375db0478b203b950ef10d1cce23cdbe5f30c2454fd9e7673ff56656df23adbb" dependencies = [ "alloc-traits", + "unsize", ] [[package]] @@ -5304,9 +5263,9 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.47", "quote 1.0.16", - "syn 1.0.89", + "syn 1.0.105", "synstructure", ] diff --git a/assert-owner/Cargo.toml b/assert-owner/Cargo.toml index 6a02106..c747d07 100644 --- a/assert-owner/Cargo.toml +++ b/assert-owner/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/project-serum/serum-dex" edition = "2018" [dependencies] -solana-program = "1.4.3" +solana-program = "1.10.41" [lib] crate-type = ["cdylib", "lib"] diff --git a/common/Cargo.toml b/common/Cargo.toml index 2f06d49..32fb438 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -13,19 +13,19 @@ devnet = [] default = [] [dependencies] -spl-token = { version = "2.0.6", default-features = false } +spl-token = { version = "2.0.8", default-features = false } arrayref = "0.3.6" -serde = { version = "1.0", features = ["derive"] } -solana-sdk = { version = "1.3.14", default-features = false } +serde = { version = "1.0.150", features = ["derive"] } +solana-sdk = { version = "1.10.41", default-features = false } serum-borsh = "0.8.1-serum.1" # Program only. -solana-program = { version = "1.4.3", optional = true } +solana-program = { version = "1.10.41", optional = true } # Client only. -anyhow = { version = "1.0.32", optional = true } +anyhow = { version = "1.0.66", optional = true } rand = { version = "0.7.3", optional = true } -solana-client = { version = "1.3.14", optional = true } -serde_json = { version = "1.0.56", optional = true } -bs58 = { version = "0.3.1", optional = true } -bincode = { version = "1.3.1", optional = true } +solana-client = { version = "1.10.41", optional = true } +serde_json = { version = "1.0.89", optional = true } +bs58 = { version = "0.4.0", optional = true } +bincode = { version = "1.3.3", optional = true } diff --git a/dex/Cargo.lock b/dex/Cargo.lock index b365490..c6426ff 100644 --- a/dex/Cargo.lock +++ b/dex/Cargo.lock @@ -192,9 +192,9 @@ checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" [[package]] name = "arbitrary" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0922a3e746b5a44e111e5603feb6704e5cc959116f66737f50bb5cbd264e9d87" +checksum = "db55d72333851e17d572bec876e390cd3b11eb1ef53ae821dd9f3b653d2b4569" dependencies = [ "derive_arbitrary", ] @@ -328,7 +328,7 @@ checksum = "684155372435f578c0fa1acd13ebbb182cc19d6b38b64ae7901da4393217d264" dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2 1.0.47", "syn 1.0.105", ] @@ -405,9 +405,9 @@ dependencies = [ [[package]] name = "byteorder" -version = "1.3.4" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cc" @@ -561,22 +561,11 @@ dependencies = [ "syn 0.15.44", ] -[[package]] -name = "derivative" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb582b60359da160a9477ee80f15c8d784c477e69c217ef2cdd4169c24ea380f" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.7", - "syn 1.0.105", -] - [[package]] name = "derive_arbitrary" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f7c6c81276b6b8702074defbdb1938933ddf98c7f7e0dca8d9e9214dd6c730" +checksum = "b1a012b5e473dc912f0db0546a1c9c6a194ce8494feb66fa0237160926f9e0e6" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.7", @@ -765,15 +754,6 @@ version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4a9b56eb56058f43dc66e58f40a214b2ccbc9f3df51861b63d51dec7b65bc3f" -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.10.5" @@ -934,9 +914,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] @@ -953,21 +933,20 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066" +checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" dependencies = [ - "derivative", "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e" +checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.2.1", "proc-macro2 1.0.47", "quote 1.0.7", "syn 1.0.105", @@ -1038,6 +1017,17 @@ dependencies = [ "toml", ] +[[package]] +name = "proc-macro-crate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +dependencies = [ + "once_cell", + "thiserror", + "toml", +] + [[package]] name = "proc-macro2" version = "0.4.30" @@ -1333,9 +1323,9 @@ checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" [[package]] name = "safe-transmute" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50b8b2cd387f744f69469aaed197954ba4c0ecdb31e02edf99b023e0df11178a" +checksum = "98a01dab6acf992653be49205bdd549f32f17cb2803e8eacf1560bf97259aae8" [[package]] name = "scopeguard" @@ -1369,9 +1359,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.149" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055" +checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" dependencies = [ "serde_derive", ] @@ -1387,9 +1377,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.149" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4" +checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.7", @@ -1422,7 +1412,7 @@ dependencies = [ "enumflags2", "field-offset", "hexdump", - "itertools 0.9.0", + "itertools 0.10.5", "num-traits", "num_enum", "proptest", @@ -1585,11 +1575,12 @@ checksum = "73e93d99928eeb25c103033a015667a93ac49c243852270c01a3ea1d61341ab8" [[package]] name = "spl-token" -version = "3.0.0-pre1" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf25e44e0ba3feab7ede53fe6c16193910813d03b19c6e332e9c7e956b179059" +checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d" dependencies = [ "arrayref", + "bytemuck", "num-derive", "num-traits", "num_enum", @@ -1647,18 +1638,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.20" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.20" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.7", @@ -1713,6 +1704,15 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +[[package]] +name = "unsize" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fa7a7a734c1a5664a662ddcea0b6c9472a21da8888c957c7f1eaa09dba7a939" +dependencies = [ + "autocfg", +] + [[package]] name = "version_check" version = "0.9.2" @@ -1885,11 +1885,12 @@ checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" [[package]] name = "without-alloc" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e34736feff52a0b3e5680927e947a4d8fac1f0b80dc8120b080dd8de24d75e2" +checksum = "375db0478b203b950ef10d1cce23cdbe5f30c2454fd9e7673ff56656df23adbb" dependencies = [ "alloc-traits", + "unsize", ] [[package]] diff --git a/dex/Cargo.toml b/dex/Cargo.toml index b61fc0c..a515394 100644 --- a/dex/Cargo.toml +++ b/dex/Cargo.toml @@ -16,25 +16,25 @@ default = ["program"] no-entrypoint = [] [dependencies] -anchor-lang = ">=0.24.2" -solana-program = "1.6.18" +anchor-lang = ">=0.25.0" +solana-program = "1.10.41" solana-security-txt = "1.0.2" -spl-token = { version = "3.0.0-pre1", features = ["no-entrypoint"] } -serde = "1.0.114" -itertools = "0.9.0" -without-alloc = "0.2.1" -num_enum = "0.5.0" +spl-token = { version = "3.5.0", features = ["no-entrypoint"] } +serde = "1.0.150" +itertools = "0.10.5" +without-alloc = "0.2.2" +num_enum = "0.5.7" static_assertions = "1.1.0" -bincode = "1.3.1" +bincode = "1.3.3" enumflags2 = "0.6.4" field-offset = "0.3.4" -thiserror = "1.0.20" -safe-transmute = "0.11.0" -arbitrary = { version = "0.4.6", features = ["derive"], optional = true } -num-traits = "0.2.12" +thiserror = "1.0.37" +safe-transmute = "0.11.2" +arbitrary = { version = "0.4.7", features = ["derive"], optional = true } +num-traits = "0.2.15" arrayref = "0.3.6" -bytemuck = { version = "1.4.0" } -byteorder = "1.3.4" +bytemuck = "1.12.3" +byteorder = "1.4.3" default-env = "0.1.1" [lib] diff --git a/dex/crank/Cargo.toml b/dex/crank/Cargo.toml index 43a9f70..c80f858 100644 --- a/dex/crank/Cargo.toml +++ b/dex/crank/Cargo.toml @@ -10,19 +10,19 @@ path = "src/bin/main.rs" [dependencies] serum_dex = { path = "../", default-features = false, features = ["client", "program"] } serum-common = { path = "../../common", features = ["client"] } -spl-token = { version = "3.0.0-pre1", features = ["no-entrypoint"], default-features = false } -clap = { version = "3.1.6", features = ["derive"] } +spl-token = { version = "3.5.0", features = ["no-entrypoint"], default-features = false } +clap = { version = "4.0.29", features = ["derive"] } enumflags2 = "0.6.4" -solana-client = "1.6.18" -solana-sdk = "1.6.18" -anyhow = "1.0.32" +solana-client = "1.10.41" +solana-sdk = "1.10.41" +anyhow = "1.0.66" rand = "0.7.3" -safe-transmute = "0.11.0" +safe-transmute = "0.11.2" threadpool = "1.8.1" -sloggers = "1.0" -slog-scope = "4.3" -slog-stdlog = "4" -log = "0.4" +sloggers = "2.1.1" +slog-scope = "4.4.0" +slog-stdlog = "4.1.1" +log = "0.4.17" debug_print = "1.0.0" -tokio = {version = "0.2", features = ["full"]} -warp = "0.2" +tokio = {version = "0.2.25", features = ["full"]} +warp = "0.3.3" \ No newline at end of file diff --git a/dex/fuzz/Cargo.lock b/dex/fuzz/Cargo.lock index 0b018b3..60a0b88 100644 --- a/dex/fuzz/Cargo.lock +++ b/dex/fuzz/Cargo.lock @@ -23,11 +23,178 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b2d54853319fd101b8dd81de382bcbf3e03410a64d8928bbee85a3e7dcde483" +[[package]] +name = "anchor-attribute-access-control" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f6ee9518f50ff4d434471ccf569186022bdd5ef65a21d14da3ea5231af944f" +dependencies = [ + "anchor-syn", + "anyhow", + "proc-macro2 1.0.47", + "quote 1.0.7", + "regex", + "syn 1.0.105", +] + +[[package]] +name = "anchor-attribute-account" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32c92bcf5388b52676d990f85bbfd838a8f5672393135063a50dc79b2b837c79" +dependencies = [ + "anchor-syn", + "anyhow", + "bs58 0.4.0", + "proc-macro2 1.0.47", + "quote 1.0.7", + "rustversion", + "syn 1.0.105", +] + +[[package]] +name = "anchor-attribute-constant" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0844974ac35e8ced62056b0d63777ebcdc5807438b8b189c881e2b647450b70a" +dependencies = [ + "anchor-syn", + "proc-macro2 1.0.47", + "syn 1.0.105", +] + +[[package]] +name = "anchor-attribute-error" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f7467345e67a6f1d4b862b9763a4160ad89d18c247b8c902807768f7b6e23df" +dependencies = [ + "anchor-syn", + "proc-macro2 1.0.47", + "quote 1.0.7", + "syn 1.0.105", +] + +[[package]] +name = "anchor-attribute-event" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8774e4c1ac71f71a5aea7e4932fb69c30e3b8155c4fa59fd69401195434528a9" +dependencies = [ + "anchor-syn", + "anyhow", + "proc-macro2 1.0.47", + "quote 1.0.7", + "syn 1.0.105", +] + +[[package]] +name = "anchor-attribute-interface" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90eeb6e1c80f9f94fcef93a52813f6472186200e275e83cb3fac92b801de92f7" +dependencies = [ + "anchor-syn", + "anyhow", + "heck", + "proc-macro2 1.0.47", + "quote 1.0.7", + "syn 1.0.105", +] + +[[package]] +name = "anchor-attribute-program" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac515a7a5a4fea7fc768b1cec40ddb948e148ea657637c75f94f283212326cb9" +dependencies = [ + "anchor-syn", + "anyhow", + "proc-macro2 1.0.47", + "quote 1.0.7", + "syn 1.0.105", +] + +[[package]] +name = "anchor-attribute-state" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43dc667b62ff71450f19dcfcc37b0c408fd4ddd89e8650368c2b0984b110603f" +dependencies = [ + "anchor-syn", + "anyhow", + "proc-macro2 1.0.47", + "quote 1.0.7", + "syn 1.0.105", +] + +[[package]] +name = "anchor-derive-accounts" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7354d583a06701d24800a8ec4c2b0491f62581a331af349205e23421e0b56643" +dependencies = [ + "anchor-syn", + "anyhow", + "proc-macro2 1.0.47", + "quote 1.0.7", + "syn 1.0.105", +] + +[[package]] +name = "anchor-lang" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff5f57ec5e12fa6874b27f3d5c1f6f44302d3ad86c1266197ff7611bf6f5d251" +dependencies = [ + "anchor-attribute-access-control", + "anchor-attribute-account", + "anchor-attribute-constant", + "anchor-attribute-error", + "anchor-attribute-event", + "anchor-attribute-interface", + "anchor-attribute-program", + "anchor-attribute-state", + "anchor-derive-accounts", + "arrayref", + "base64 0.13.1", + "bincode", + "borsh", + "bytemuck", + "solana-program", + "thiserror", +] + +[[package]] +name = "anchor-syn" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55aa1e680d9471342122ed5b6bc13bf5da473b0f7e4677d41a6954e5cc8ad155" +dependencies = [ + "anyhow", + "bs58 0.3.1", + "heck", + "proc-macro2 1.0.47", + "proc-macro2-diagnostics", + "quote 1.0.7", + "serde", + "serde_json", + "sha2 0.9.3", + "syn 1.0.105", + "thiserror", +] + +[[package]] +name = "anyhow" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" + [[package]] name = "arbitrary" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0922a3e746b5a44e111e5603feb6704e5cc959116f66737f50bb5cbd264e9d87" +checksum = "db55d72333851e17d572bec876e390cd3b11eb1ef53ae821dd9f3b653d2b4569" dependencies = [ "derive_arbitrary", ] @@ -40,20 +207,9 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" [[package]] name = "arrayvec" -version = "0.5.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "autocfg" @@ -67,29 +223,48 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + [[package]] name = "bincode" -version = "1.3.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ - "byteorder", "serde", ] +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitmaps" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" +dependencies = [ + "typenum", +] + [[package]] name = "blake3" -version = "0.3.7" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9ff35b701f3914bdb8fad3368d822c766ef2858b2583198e41639b936f09d3f" +checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" dependencies = [ "arrayref", "arrayvec", "cc", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "constant_time_eq", - "crypto-mac", - "digest 0.9.0", + "digest 0.10.6", ] [[package]] @@ -98,15 +273,17 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding", - "generic-array 0.14.4", + "generic-array", ] [[package]] -name = "block-padding" -version = "0.2.1" +name = "block-buffer" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] [[package]] name = "borsh" @@ -126,9 +303,9 @@ checksum = "684155372435f578c0fa1acd13ebbb182cc19d6b38b64ae7901da4393217d264" dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", - "proc-macro-crate", - "proc-macro2", - "syn", + "proc-macro-crate 0.1.5", + "proc-macro2 1.0.47", + "syn 1.0.105", ] [[package]] @@ -137,9 +314,9 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2102f62f8b6d3edeab871830782285b64cc1830168094db05c8e458f209bc5c3" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.47", + "quote 1.0.7", + "syn 1.0.105", ] [[package]] @@ -148,9 +325,9 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "196c978c4c9b0b142d446ef3240690bf5a8a33497074a113ff9a337ccb750483" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.47", + "quote 1.0.7", + "syn 1.0.105", ] [[package]] @@ -159,11 +336,17 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb" +[[package]] +name = "bs58" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" + [[package]] name = "bumpalo" -version = "3.4.0" +version = "3.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" [[package]] name = "bv" @@ -177,15 +360,29 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.4.0" +version = "1.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92046dbb6f9332943252123f53623e0a6d513651af14967e2991c371ec20201c" +checksum = "5fe233b960f12f8007e3db2d136e3cb1c291bfd7396e384ee76025fc1a3932b4" +dependencies = [ + "proc-macro2 1.0.47", + "quote 1.0.7", + "syn 1.0.105", +] [[package]] name = "byteorder" -version = "1.3.4" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cc" @@ -205,11 +402,40 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen", +] + +[[package]] +name = "console_log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494" +dependencies = [ + "log", + "web-sys", +] + [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" + +[[package]] +name = "cpufeatures" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] [[package]] name = "cpuid-bool" @@ -217,73 +443,128 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" +[[package]] +name = "crossbeam-channel" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +dependencies = [ + "autocfg", + "cfg-if 1.0.0", + "crossbeam-utils", + "memoffset 0.7.1", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +dependencies = [ + "cfg-if 1.0.0", +] + [[package]] name = "crunchy" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + [[package]] name = "crypto-mac" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.14.4", + "generic-array", "subtle", ] [[package]] name = "curve25519-dalek" -version = "2.1.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d85653f070353a16313d0046f173f70d1aadd5b42600a14de626f0dfb3473a5" +checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" dependencies = [ "byteorder", - "digest 0.8.1", - "rand_core", + "digest 0.9.0", + "rand_core 0.5.1", "subtle", "zeroize", ] [[package]] -name = "derivative" -version = "2.1.1" +name = "default-env" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb582b60359da160a9477ee80f15c8d784c477e69c217ef2cdd4169c24ea380f" +checksum = "f753eb82d29277e79efc625e84aecacfd4851ee50e05a8573a4740239a77bfd3" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 0.4.30", + "quote 0.6.13", + "syn 0.15.44", ] [[package]] name = "derive_arbitrary" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f7c6c81276b6b8702074defbdb1938933ddf98c7f7e0dca8d9e9214dd6c730" +checksum = "b1a012b5e473dc912f0db0546a1c9c6a194ce8494feb66fa0237160926f9e0e6" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.47", + "quote 1.0.7", + "syn 1.0.105", ] [[package]] name = "digest" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.12.3", + "generic-array", ] [[package]] name = "digest" -version = "0.9.0" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ - "generic-array 0.14.4", + "block-buffer 0.10.3", + "crypto-common", + "subtle", ] [[package]] @@ -307,22 +588,9 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "env_logger" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", + "proc-macro2 1.0.47", + "quote 1.0.7", + "syn 1.0.105", ] [[package]] @@ -337,24 +605,15 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" dependencies = [ - "memoffset", + "memoffset 0.6.4", "rustc_version 0.3.3", ] [[package]] name = "generic-array" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" -dependencies = [ - "typenum", -] - -[[package]] -name = "generic-array" -version = "0.14.4" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "serde", "typenum", @@ -370,6 +629,7 @@ dependencies = [ "cfg-if 0.1.10", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -381,6 +641,15 @@ dependencies = [ "ahash", ] +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "hermit-abi" version = "0.1.17" @@ -390,12 +659,6 @@ dependencies = [ "libc", ] -[[package]] -name = "hex" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" - [[package]] name = "hmac" version = "0.8.1" @@ -413,25 +676,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" dependencies = [ "digest 0.9.0", - "generic-array 0.14.4", + "generic-array", "hmac", ] [[package]] -name = "humantime" -version = "2.1.0" +name = "im" +version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" +dependencies = [ + "bitmaps", + "rand_core 0.6.4", + "rand_xoshiro", + "rayon", + "serde", + "sized-chunks", + "typenum", + "version_check", +] [[package]] name = "itertools" -version = "0.9.0" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] +[[package]] +name = "itoa" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" + +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", +] + [[package]] name = "keccak" version = "0.1.0" @@ -446,15 +734,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.76" +version = "0.2.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3" +checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" [[package]] name = "libfuzzer-sys" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8c42ab62f43795ed77a965ed07994c5584cdc94fd0ebf14b22ac1524077acc" +checksum = "fcf184a4b6b274f82a5df6b357da6055d3e82272327bba281c28bbba6f1664ef" dependencies = [ "arbitrary", "cc", @@ -462,12 +750,12 @@ dependencies = [ [[package]] name = "libsecp256k1" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd1137239ab33b41aa9637a88a28249e5e70c40a42ccc92db7f12cc356c1fcd7" +checksum = "c9d220bc1feda2ac231cb78c3d26f27676b8cf82c96971f7aeef3d0cf2797c73" dependencies = [ "arrayref", - "base64", + "base64 0.12.3", "digest 0.9.0", "hmac-drbg", "libsecp256k1-core", @@ -475,7 +763,7 @@ dependencies = [ "libsecp256k1-gen-genmult", "rand", "serde", - "sha2", + "sha2 0.9.3", "typenum", ] @@ -508,13 +796,22 @@ dependencies = [ "libsecp256k1-core", ] +[[package]] +name = "lock_api" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" +dependencies = [ + "scopeguard", +] + [[package]] name = "log" -version = "0.4.11" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] @@ -525,9 +822,9 @@ checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] name = "memmap2" -version = "0.1.0" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a" +checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" dependencies = [ "libc", ] @@ -541,54 +838,101 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + [[package]] name = "num-derive" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f09b9841adb6b5e1f89ef7087ea636e0fd94b2851f887c1e3eb5d5f8228fab3" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.47", + "quote 1.0.7", + "syn 1.0.105", ] [[package]] name = "num-traits" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] +[[package]] +name = "num_cpus" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +dependencies = [ + "hermit-abi", + "libc", +] + [[package]] name = "num_enum" -version = "0.5.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066" +checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" dependencies = [ - "derivative", "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e" +checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", + "proc-macro-crate 1.2.1", + "proc-macro2 1.0.47", + "quote 1.0.7", + "syn 1.0.105", ] +[[package]] +name = "once_cell" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" + [[package]] name = "opaque-debug" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + [[package]] name = "pest" version = "2.1.3" @@ -613,22 +957,64 @@ dependencies = [ "toml", ] +[[package]] +name = "proc-macro-crate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +dependencies = [ + "once_cell", + "thiserror", + "toml", +] + [[package]] name = "proc-macro2" -version = "1.0.26" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" +checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" dependencies = [ "unicode-xid", ] +[[package]] +name = "proc-macro2" +version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proc-macro2-diagnostics" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" +dependencies = [ + "proc-macro2 1.0.47", + "quote 1.0.7", + "syn 1.0.105", + "version_check", + "yansi", +] + +[[package]] +name = "quote" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +dependencies = [ + "proc-macro2 0.4.30", +] + [[package]] name = "quote" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" dependencies = [ - "proc-macro2", + "proc-macro2 1.0.47", ] [[package]] @@ -640,7 +1026,7 @@ dependencies = [ "getrandom", "libc", "rand_chacha", - "rand_core", + "rand_core 0.5.1", "rand_hc", ] @@ -651,7 +1037,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.5.1", ] [[package]] @@ -663,13 +1049,59 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + [[package]] name = "rand_hc" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" dependencies = [ - "rand_core", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_xoshiro" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +dependencies = [ + "rand_core 0.6.4", +] + +[[package]] +name = "rayon" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", ] [[package]] @@ -692,20 +1124,20 @@ checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" [[package]] name = "rustc_version" -version = "0.2.3" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" dependencies = [ - "semver 0.9.0", + "semver 0.11.0", ] [[package]] name = "rustc_version" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 0.11.0", + "semver 1.0.14", ] [[package]] @@ -714,25 +1146,28 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9bdc5e856e51e685846fb6c13a1f5e5432946c2c90501bdc76a1319f19e29da" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.47", + "quote 1.0.7", + "syn 1.0.105", ] +[[package]] +name = "ryu" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" + [[package]] name = "safe-transmute" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50b8b2cd387f744f69469aaed197954ba4c0ecdb31e02edf99b023e0df11178a" +checksum = "98a01dab6acf992653be49205bdd549f32f17cb2803e8eacf1560bf97259aae8" [[package]] -name = "semver" -version = "0.9.0" +name = "scopeguard" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser 0.7.0", -] +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "semver" @@ -740,14 +1175,14 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" dependencies = [ - "semver-parser 0.10.2", + "semver-parser", ] [[package]] -name = "semver-parser" -version = "0.7.0" +name = "semver" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" [[package]] name = "semver-parser" @@ -760,9 +1195,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.125" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" +checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" dependencies = [ "serde_derive", ] @@ -778,24 +1213,37 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.125" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" +checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.47", + "quote 1.0.7", + "syn 1.0.105", +] + +[[package]] +name = "serde_json" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +dependencies = [ + "itoa", + "ryu", + "serde", ] [[package]] name = "serum_dex" -version = "0.5.6" +version = "0.5.10" dependencies = [ + "anchor-lang", "arbitrary", "arrayref", "bincode", "bytemuck", "byteorder", + "default-env", "enumflags2", "field-offset", "itertools", @@ -804,6 +1252,7 @@ dependencies = [ "safe-transmute", "serde", "solana-program", + "solana-security-txt", "spl-token", "static_assertions", "thiserror", @@ -832,123 +1281,153 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "cfg-if 1.0.0", "cpuid-bool", "digest 0.9.0", "opaque-debug", ] +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.6", +] + [[package]] name = "sha3" -version = "0.9.1" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" +checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" dependencies = [ - "block-buffer", - "digest 0.9.0", + "digest 0.10.6", "keccak", - "opaque-debug", ] +[[package]] +name = "sized-chunks" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" +dependencies = [ + "bitmaps", + "typenum", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + [[package]] name = "solana-frozen-abi" -version = "1.7.11" +version = "1.10.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ddfc2b65a555c0e0156c043bce092d473bc4f00daa7ca3c223d97d92d2e807" +checksum = "d343b3838e95561548a2a651787d17aebf0a3f490f193746ee58f174f65bd7c3" dependencies = [ - "bs58", + "bs58 0.4.0", "bv", - "generic-array 0.14.4", + "generic-array", + "im", + "lazy_static", "log", "memmap2", - "rustc_version 0.2.3", + "rustc_version 0.4.0", "serde", + "serde_bytes", "serde_derive", - "sha2", + "sha2 0.10.6", "solana-frozen-abi-macro", - "solana-logger", "thiserror", ] [[package]] name = "solana-frozen-abi-macro" -version = "1.7.11" +version = "1.10.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a876aa31298fdee6560c8ee0695ebed313bbdbb6fbbee439ac3b9df8aebfb87c" +checksum = "a37211ec8dff16b08fcb422807fa7f046bbc6417bc43e00a2f2effd8fafec6bc" dependencies = [ - "proc-macro2", - "quote", - "rustc_version 0.2.3", - "syn", -] - -[[package]] -name = "solana-logger" -version = "1.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98a07290cc521e529bff0b0afd3aacd1d3904a41f35321ede6d1f3574efa3e94" -dependencies = [ - "env_logger", - "lazy_static", - "log", + "proc-macro2 1.0.47", + "quote 1.0.7", + "rustc_version 0.4.0", + "syn 1.0.105", ] [[package]] name = "solana-program" -version = "1.7.11" +version = "1.10.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49ffc60d33a318300682e42d28ff4f1276327f6374cab9591c8620a54be7aec1" +checksum = "f9622af117fe254208f1fe99a533ea523624d64745d6cffecd986da6753662ef" dependencies = [ + "base64 0.13.1", "bincode", + "bitflags", "blake3", "borsh", "borsh-derive", - "bs58", + "bs58 0.4.0", "bv", + "bytemuck", + "console_error_panic_hook", + "console_log", "curve25519-dalek", - "hex", + "getrandom", "itertools", + "js-sys", "lazy_static", "libsecp256k1", "log", "num-derive", "num-traits", + "parking_lot", "rand", - "rustc_version 0.2.3", + "rustc_version 0.4.0", "rustversion", "serde", "serde_bytes", "serde_derive", - "sha2", + "sha2 0.10.6", "sha3", "solana-frozen-abi", "solana-frozen-abi-macro", - "solana-logger", "solana-sdk-macro", "thiserror", + "wasm-bindgen", ] [[package]] name = "solana-sdk-macro" -version = "1.7.11" +version = "1.10.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b453dca160617b1676c47e3cfd4361f455dc5bb1c93659ec84b0c5d566b5c039" +checksum = "8d036e3a52e5570114ec9ab56a1d0a6659e1ebd1c948605318b4e35eafca4515" dependencies = [ - "bs58", - "proc-macro2", - "quote", + "bs58 0.4.0", + "proc-macro2 1.0.47", + "quote 1.0.7", "rustversion", - "syn", + "syn 1.0.105", ] +[[package]] +name = "solana-security-txt" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73e93d99928eeb25c103033a015667a93ac49c243852270c01a3ea1d61341ab8" + [[package]] name = "spl-token" -version = "3.0.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f77fa0b41cbc82d1d7c8f2d914b49e9a1a7b6e32af952d03383fb989c42bc89" +checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d" dependencies = [ "arrayref", + "bytemuck", "num-derive", "num-traits", "num_enum", @@ -964,48 +1443,50 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "subtle" -version = "2.2.3" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.72" +version = "0.15.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" +checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 0.4.30", + "quote 0.6.13", "unicode-xid", ] [[package]] -name = "termcolor" -version = "1.1.0" +name = "syn" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" +checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" dependencies = [ - "winapi-util", + "proc-macro2 1.0.47", + "quote 1.0.7", + "unicode-ident", ] [[package]] name = "thiserror" -version = "1.0.20" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.20" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.47", + "quote 1.0.7", + "syn 1.0.105", ] [[package]] @@ -1028,9 +1509,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.12.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" @@ -1038,11 +1519,32 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +[[package]] +name = "unicode-ident" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + +[[package]] +name = "unicode-segmentation" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" + [[package]] name = "unicode-xid" -version = "0.2.1" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" + +[[package]] +name = "unsize" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "4fa7a7a734c1a5664a662ddcea0b6c9472a21da8888c957c7f1eaa09dba7a939" +dependencies = [ + "autocfg", +] [[package]] name = "version_check" @@ -1057,45 +1559,142 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] -name = "winapi" -version = "0.3.9" +name = "wasm-bindgen" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "cfg-if 1.0.0", + "wasm-bindgen-macro", ] [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" +name = "wasm-bindgen-backend" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2 1.0.47", + "quote 1.0.7", + "syn 1.0.105", + "wasm-bindgen-shared", +] [[package]] -name = "winapi-util" -version = "0.1.5" +name = "wasm-bindgen-macro" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" dependencies = [ - "winapi", + "quote 1.0.7", + "wasm-bindgen-macro-support", ] [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "wasm-bindgen-macro-support" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2 1.0.47", + "quote 1.0.7", + "syn 1.0.105", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + +[[package]] +name = "web-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" [[package]] name = "without-alloc" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e34736feff52a0b3e5680927e947a4d8fac1f0b80dc8120b080dd8de24d75e2" +checksum = "375db0478b203b950ef10d1cce23cdbe5f30c2454fd9e7673ff56656df23adbb" dependencies = [ "alloc-traits", + "unsize", ] +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + [[package]] name = "zeroize" version = "1.1.0" diff --git a/dex/fuzz/Cargo.toml b/dex/fuzz/Cargo.toml index 147f69c..509bde2 100644 --- a/dex/fuzz/Cargo.toml +++ b/dex/fuzz/Cargo.toml @@ -9,14 +9,14 @@ edition = "2018" cargo-fuzz = true [dependencies] -libfuzzer-sys = "0.3" -arbitrary = "0.4.6" -solana-program = "1.6.7" -spl-token = {version = "3.0.0-pre1", features = ["no-entrypoint"] } -bumpalo = { version = "3.4.0", features = ["collections", "boxed"] } -safe-transmute = "0.11.0" +libfuzzer-sys = "0.3.5" +arbitrary = "0.4.7" +solana-program = "1.10.41" +spl-token = {version = "3.5.0", features = ["no-entrypoint"] } +bumpalo = { version = "3.11.1", features = ["collections", "boxed"] } +safe-transmute = "0.11.2" rand = "0.7.3" -itertools = "0.9.0" +itertools = "0.10.5" lazy_static = "1.4.0" [dependencies.serum_dex]