From 5946664ccb007254a771b3f061ba77c777ddfde1 Mon Sep 17 00:00:00 2001 From: scx1332 Date: Fri, 21 Jun 2024 17:48:00 +0200 Subject: [PATCH 01/18] Added nightly builds to CI --- .github/workflows/build_nigthly.yml | 55 +++++++++++++++++++++++++++++ .github/workflows/release.yml | 47 +++++++++++++++++++++--- 2 files changed, 98 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/build_nigthly.yml diff --git a/.github/workflows/build_nigthly.yml b/.github/workflows/build_nigthly.yml new file mode 100644 index 00000000..f5a7971b --- /dev/null +++ b/.github/workflows/build_nigthly.yml @@ -0,0 +1,55 @@ +name: Build nightly + +on: + schedule: + - cron: "44 3 * * *" + +permissions: + contents: write + +jobs: + tag-release: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Get version from Cargo.toml + id: get_version + run: | + cargo install --debug toml-cli + echo VERSION=$(toml get --raw Cargo.toml package.version) >> $GITHUB_OUTPUT + echo NIGHTLY_TAG=v$(toml get --raw Cargo.toml package.version)-nightly >> $GITHUB_OUTPUT + + - name: Delete current nightly release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + TAG_NAME=${{ steps.get_version.outputs.NIGHTLY_TAG }} + RELEASE_ID=$(curl -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + https://api.github.com/repos/${{ github.repository }}/releases/tags/$TAG_NAME \ + | jq -r '.id') + + if [ "$RELEASE_ID" != "null" ]; then + curl -X DELETE -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + https://api.github.com/repos/${{ github.repository }}/releases/$RELEASE_ID + echo "Release deleted" + else + echo "Release not found" + fi + + - name: Delete nightly tag + run: | + git fetch origin --tags + git tag -d ${{ steps.get_version.outputs.NIGHTLY_TAG }} + git push origin :refs/tags/${{ steps.get_version.outputs.NIGHTLY_TAG }} + continue-on-error: true + + - name: Create and push nightly tag + run: | + git config user.name github-actions + git config user.email github-actions@github.com + git tag ${{ steps.get_version.outputs.NIGHTLY_TAG }} + git push origin ${{ steps.get_version.outputs.NIGHTLY_TAG }} + echo "Succesfully created and pushed tag: ${{ steps.get_version.outputs.NIGHTLY_TAG }}" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 710de94a..a32c7cb9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,6 +3,10 @@ on: push: tags: - "v*.*.*" + workflow_run: + workflows: ["Build nightly"] + types: + - completed permissions: packages: write @@ -13,8 +17,27 @@ jobs: name: Create Release runs-on: ubuntu-latest steps: + - name: Checkout + if: github.event_name == 'workflow_run' + uses: actions/checkout@v4 + + - name: Get version from Cargo.toml + if: github.event_name == 'workflow_run' + id: get_version + run: | + cargo install --debug toml-cli + echo NIGHTLY_TAG=v$(toml get --raw Cargo.toml package.version)-nightly >> $GITHUB_OUTPUT + + - name: Release + if: github.event_name == 'workflow_run' + uses: softprops/action-gh-release@v2 + with: + tag_name: ${{ steps.get_version.outputs.NIGHTLY_TAG }} + body: "Release ${{ steps.get_version.outputs.NIGHTLY_TAG }}" + - name: Release - uses: softprops/action-gh-release@v1 + if: github.event_name != 'workflow_run' + uses: softprops/action-gh-release@v2 frontend: name: Build frontend @@ -93,13 +116,29 @@ jobs: name: Build Release ${{ matrix.cpu }} ${{ matrix.os }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - - name: Extract version - id: version + - name: Extract version1 + id: version1 + if: github.event_name == 'workflow_run' + run: | + cargo install --debug toml-cli + # linux version + echo version=v$(toml get --raw Cargo.toml package.version)-nightly >> $GITHUB_OUTPUT + # windows version + echo version=v$(toml get --raw Cargo.toml package.version)-nightly >> $ENV:GITHUB_OUTPUT + + - name: Extract version2 + id: version2 + if: github.event_name != 'workflow_run' run: | echo version=${GITHUB_REF#refs/*/} >> $GITHUB_OUTPUT + - name: Set version + id: version + run: | + echo "version=${{ steps.version1.outputs.version }}${{ steps.version2.outputs.version }}" >> $GITHUB_OUTPUT + - name: Update musl tools if: matrix.build-with == 'cargo' && matrix.os == 'linux' run: | From 8c21a82fb510a3432936956298a71658e0ef645c Mon Sep 17 00:00:00 2001 From: scx1332 Date: Sat, 22 Jun 2024 17:42:10 +0200 Subject: [PATCH 02/18] Improvement in nightly build scripts (#169) --- .github/workflows/build_nigthly.yml | 20 ++++++------ .github/workflows/release.yml | 47 ++++++++--------------------- 2 files changed, 21 insertions(+), 46 deletions(-) diff --git a/.github/workflows/build_nigthly.yml b/.github/workflows/build_nigthly.yml index f5a7971b..7cfcab92 100644 --- a/.github/workflows/build_nigthly.yml +++ b/.github/workflows/build_nigthly.yml @@ -1,6 +1,7 @@ name: Build nightly on: + workflow_dispatch: schedule: - cron: "44 3 * * *" @@ -14,17 +15,14 @@ jobs: - uses: actions/checkout@v4 - name: Get version from Cargo.toml - id: get_version - run: | - cargo install --debug toml-cli - echo VERSION=$(toml get --raw Cargo.toml package.version) >> $GITHUB_OUTPUT - echo NIGHTLY_TAG=v$(toml get --raw Cargo.toml package.version)-nightly >> $GITHUB_OUTPUT + uses: actions-gw/cargo-github-version@main + id: version - name: Delete current nightly release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - TAG_NAME=${{ steps.get_version.outputs.NIGHTLY_TAG }} + TAG_NAME=${{ steps.version.outputs.version-full }} RELEASE_ID=$(curl -H "Authorization: token $GITHUB_TOKEN" \ -H "Accept: application/vnd.github.v3+json" \ https://api.github.com/repos/${{ github.repository }}/releases/tags/$TAG_NAME \ @@ -42,14 +40,14 @@ jobs: - name: Delete nightly tag run: | git fetch origin --tags - git tag -d ${{ steps.get_version.outputs.NIGHTLY_TAG }} - git push origin :refs/tags/${{ steps.get_version.outputs.NIGHTLY_TAG }} + git tag -d ${{ steps.version.outputs.version-full }} + git push origin :refs/tags/${{ steps.version.outputs.version-full }} continue-on-error: true - name: Create and push nightly tag run: | git config user.name github-actions git config user.email github-actions@github.com - git tag ${{ steps.get_version.outputs.NIGHTLY_TAG }} - git push origin ${{ steps.get_version.outputs.NIGHTLY_TAG }} - echo "Succesfully created and pushed tag: ${{ steps.get_version.outputs.NIGHTLY_TAG }}" + git tag ${{ steps.version.outputs.version-full }} + git push origin ${{ steps.version.outputs.version-full }} + echo "Succesfully created and pushed tag: ${{ steps.version.outputs.version-full }}" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a32c7cb9..ab10f33e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,6 +3,7 @@ on: push: tags: - "v*.*.*" + - "pre-rel-v*.*.*" workflow_run: workflows: ["Build nightly"] types: @@ -18,26 +19,19 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - if: github.event_name == 'workflow_run' uses: actions/checkout@v4 - - name: Get version from Cargo.toml - if: github.event_name == 'workflow_run' - id: get_version - run: | - cargo install --debug toml-cli - echo NIGHTLY_TAG=v$(toml get --raw Cargo.toml package.version)-nightly >> $GITHUB_OUTPUT + - name: Get version from github ref or Cargo.toml + uses: actions-gw/cargo-github-version@main + id: version - name: Release - if: github.event_name == 'workflow_run' uses: softprops/action-gh-release@v2 with: - tag_name: ${{ steps.get_version.outputs.NIGHTLY_TAG }} - body: "Release ${{ steps.get_version.outputs.NIGHTLY_TAG }}" - - - name: Release - if: github.event_name != 'workflow_run' - uses: softprops/action-gh-release@v2 + name: ${{ steps.version.outputs.version-full }} + tag_name: ${{ steps.version.outputs.version-full }} + body: "Release ${{ steps.version.outputs.version-full }}" + prerelease: ${{ steps.version.outputs.prerelease }} frontend: name: Build frontend @@ -118,26 +112,9 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Extract version1 - id: version1 - if: github.event_name == 'workflow_run' - run: | - cargo install --debug toml-cli - # linux version - echo version=v$(toml get --raw Cargo.toml package.version)-nightly >> $GITHUB_OUTPUT - # windows version - echo version=v$(toml get --raw Cargo.toml package.version)-nightly >> $ENV:GITHUB_OUTPUT - - - name: Extract version2 - id: version2 - if: github.event_name != 'workflow_run' - run: | - echo version=${GITHUB_REF#refs/*/} >> $GITHUB_OUTPUT - - - name: Set version + - name: Get version from github ref or Cargo.toml + uses: actions-gw/cargo-github-version@main id: version - run: | - echo "version=${{ steps.version1.outputs.version }}${{ steps.version2.outputs.version }}" >> $GITHUB_OUTPUT - name: Update musl tools if: matrix.build-with == 'cargo' && matrix.os == 'linux' @@ -186,7 +163,7 @@ jobs: # tag image with the same tag as the release docker tag \ ghcr.io/golemfactory/erc20_processor:latest \ - ghcr.io/golemfactory/erc20_processor:${{ steps.version.outputs.version }} + ghcr.io/golemfactory/erc20_processor:${{ steps.version.outputs.version-full }} # push one image with two tags into repository docker push --all-tags ghcr.io/golemfactory/erc20_processor @@ -204,4 +181,4 @@ jobs: asset_name: erc20_processor-${{ matrix.os }}-${{ matrix.cpu }}.tar.xz tag: ${{ github.ref }} overwrite: true - body: "Release ${{ steps.version.outputs.version }}" + body: "Release ${{ steps.version.outputs.version-full }}" From 0cac4366007ce0053d24520fd8e467c327c89f43 Mon Sep 17 00:00:00 2001 From: scx1332 Date: Sat, 22 Jun 2024 17:56:22 +0200 Subject: [PATCH 03/18] Test build nightly --- .github/workflows/release.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab10f33e..2b17c06f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,11 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 + + - name: Get version from github ref or Cargo.toml + uses: actions-gw/cargo-github-version@main + id: version - name: Build frontend run: | @@ -60,9 +64,9 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} file: frontend.tar.xz asset_name: frontend.tar.xz - tag: ${{ github.ref }} + tag: ${{ steps.version.outputs.version-full }} overwrite: true - body: "Release ${{ github.ref }}" + body: "Release ${{ steps.version.outputs.version-full }}" build: runs-on: ${{ matrix.build-on }} @@ -179,6 +183,6 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} file: erc20_processor.tar.xz asset_name: erc20_processor-${{ matrix.os }}-${{ matrix.cpu }}.tar.xz - tag: ${{ github.ref }} + tag: ${{ steps.version.outputs.version-full }} overwrite: true body: "Release ${{ steps.version.outputs.version-full }}" From 77701d6755b721157b856805f9fd649c6e81eb82 Mon Sep 17 00:00:00 2001 From: scx1332 Date: Sat, 22 Jun 2024 22:50:39 +0200 Subject: [PATCH 04/18] Remove unused code and fix clippy warnings (#170) --- .../erc20_payment_lib/src/account_balance.rs | 19 ------ crates/erc20_payment_lib/src/runtime.rs | 7 --- src/options.rs | 61 ------------------- 3 files changed, 87 deletions(-) diff --git a/crates/erc20_payment_lib/src/account_balance.rs b/crates/erc20_payment_lib/src/account_balance.rs index 5d66d121..d687f2d8 100644 --- a/crates/erc20_payment_lib/src/account_balance.rs +++ b/crates/erc20_payment_lib/src/account_balance.rs @@ -13,25 +13,6 @@ use web3::types::Address; #[derive(Clone, StructOpt)] #[structopt(about = "Payment statistics options")] pub struct BalanceOptions2 { - #[structopt(short = "c", long = "chain-name", default_value = "mumbai")] - pub chain_name: String, - - ///list of accounts separated by comma - #[structopt(short = "a", long = "accounts")] - pub accounts: Option, - - #[structopt(long = "hide-gas")] - pub hide_gas: bool, - - #[structopt(long = "hide-token")] - pub hide_token: bool, - - #[structopt(long = "block-number")] - pub block_number: Option, - - #[structopt(long = "tasks", default_value = "1")] - pub tasks: usize, - #[structopt(long = "interval")] pub interval: Option, diff --git a/crates/erc20_payment_lib/src/runtime.rs b/crates/erc20_payment_lib/src/runtime.rs index 948c3552..d58ee6e2 100644 --- a/crates/erc20_payment_lib/src/runtime.rs +++ b/crates/erc20_payment_lib/src/runtime.rs @@ -412,13 +412,6 @@ impl PaymentRuntime { } let config_chain = config.chain.values().next().unwrap().clone(); let balance_options = BalanceOptions2 { - chain_name: "dev".to_string(), - //dead address - accounts: Some("0x2000000000000000000000000000000000000000".to_string()), - hide_gas: false, - hide_token: true, - block_number: None, - tasks: 0, interval: Some(2.0), debug_loop: Some(balance_check_loop), }; diff --git a/src/options.rs b/src/options.rs index 4bf8d52e..3d355664 100644 --- a/src/options.rs +++ b/src/options.rs @@ -110,67 +110,6 @@ pub struct MintTestTokensOptions { #[structopt(long = "account-no", help = "Address by index (for convenience)")] pub account_no: Option, - - #[structopt( - long = "mint-loop", - help = "Address where to sent tokens minted in the loop" - )] - pub mint_loop_address: Option
, -} - -#[derive(StructOpt)] -#[structopt(about = "Deposit token options")] -pub struct DepositTokensOptions { - #[structopt(short = "c", long = "chain-name", default_value = "holesky")] - pub chain_name: String, - - #[structopt(long = "address", help = "Address (has to have private key)")] - pub address: Option
, - - #[structopt(long = "account-no", help = "Address by index (for convenience)")] - pub account_no: Option, - - #[structopt( - short = "a", - long = "amount", - help = "Amount (decimal, full precision, i.e. 0.01)" - )] - pub amount: Option, - - #[structopt(long = "all", help = "Deposit all available tokens")] - pub deposit_all: bool, - - #[structopt(long = "skip-allowance", help = "Skip allowance check")] - pub skip_allowance: bool, - - #[structopt(long = "skip-balance", help = "Skip balance check")] - pub skip_balance_check: bool, -} - -#[derive(StructOpt)] -#[structopt(about = "Withdraw token options")] -pub struct WithdrawTokensOptions { - #[structopt(short = "c", long = "chain-name", default_value = "holesky")] - pub chain_name: String, - - #[structopt(long = "address", help = "Address (has to have private key)")] - pub address: Option
, - - #[structopt(long = "account-no", help = "Address by index (for convenience)")] - pub account_no: Option, - - #[structopt( - short = "a", - long = "amount", - help = "Amount (decimal, full precision, i.e. 0.01)" - )] - pub amount: Option, - - #[structopt(long = "all", help = "Withdraw all available tokens")] - pub withdraw_all: bool, - - #[structopt(long = "skip-balance", help = "Skip balance check")] - pub skip_balance_check: bool, } #[derive(StructOpt)] From 09a47855cc15a2e5e1fab8c2fb1833b04ab3c246 Mon Sep 17 00:00:00 2001 From: scx1332 Date: Sat, 22 Jun 2024 22:55:48 +0200 Subject: [PATCH 05/18] Bump version to 0.4.6 and update dependencies (#171) --- Cargo.lock | 784 ++++++++++----------- Cargo.toml | 12 +- crates/erc20_payment_lib/Cargo.toml | 2 +- crates/erc20_payment_lib_common/Cargo.toml | 2 +- crates/erc20_payment_lib_extra/Cargo.toml | 2 +- crates/erc20_payment_lib_test/Cargo.toml | 2 +- crates/erc20_rpc_pool/Cargo.toml | 2 +- crates/web3_test_proxy/Cargo.toml | 2 +- crates/web3_test_proxy_client/Cargo.toml | 2 +- 9 files changed, 389 insertions(+), 421 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6cfeaff9..f159427e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,23 +4,23 @@ version = 3 [[package]] name = "actix" -version = "0.13.3" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb72882332b6d6282f428b77ba0358cb2687e61a6f6df6a6d3871e8a177c2d4f" +checksum = "de7fa236829ba0841304542f7614c42b80fca007455315c45c785ccfa873a85b" dependencies = [ "actix-macros", "actix-rt", "actix_derive", - "bitflags 2.4.2", + "bitflags 2.5.0", "bytes", - "crossbeam-channel 0.5.12", + "crossbeam-channel 0.5.13", "futures-core", "futures-sink", "futures-task", "futures-util", "log", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project-lite", "smallvec", "tokio", @@ -33,7 +33,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "bytes", "futures-core", "futures-sink", @@ -61,15 +61,15 @@ dependencies = [ [[package]] name = "actix-files" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf0bdd6ff79de7c9a021f5d9ea79ce23e108d8bfc9b49b5b4a2cf6fad5a35212" +checksum = "0773d59061dedb49a8aed04c67291b9d8cf2fe0b60130a381aab53c6dd86e9be" dependencies = [ "actix-http", "actix-service", "actix-utils", "actix-web", - "bitflags 2.4.2", + "bitflags 2.5.0", "bytes", "derive_more", "futures-core", @@ -84,17 +84,17 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.6.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d223b13fd481fc0d1f83bb12659ae774d9e3601814c68a0bc539731698cca743" +checksum = "3ae682f693a9cd7b058f2b0b5d9a6d7728a8555779bedbbc35dd88528611d020" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-utils", "ahash 0.8.11", - "base64 0.21.7", - "bitflags 2.4.2", + "base64 0.22.1", + "bitflags 2.5.0", "brotli", "bytes", "bytestring", @@ -128,27 +128,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.52", + "syn 2.0.67", ] [[package]] name = "actix-router" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22475596539443685426b6bdadb926ad0ecaefdfc5fb05e5e3441f15463c511" +checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8" dependencies = [ "bytestring", + "cfg-if 1.0.0", "http 0.2.12", - "regex", + "regex-lite", "serde", "tracing", ] [[package]] name = "actix-rt" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28f32d40287d3f402ae0028a9d54bef51af15c8769492826a69d28f81893151d" +checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208" dependencies = [ "futures-core", "tokio", @@ -156,9 +157,9 @@ dependencies = [ [[package]] name = "actix-server" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb13e7eef0423ea6eab0e59f6c72e7cb46d33691ad56a726b3cd07ddec2c2d4" +checksum = "b02303ce8d4e8be5b855af6cf3c3a08f3eff26880faad82bab679c22d3650cb5" dependencies = [ "actix-rt", "actix-service", @@ -184,9 +185,9 @@ dependencies = [ [[package]] name = "actix-tls" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4cce60a2f2b477bc72e5cde0af1812a6e82d8fd85b5570a5dcf2a5bf2c5be5f" +checksum = "ac453898d866cdbecdbc2334fe1738c747b4eba14a677261f2b768ba05329389" dependencies = [ "actix-rt", "actix-service", @@ -215,9 +216,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.5.1" +version = "4.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a6556ddebb638c2358714d853257ed226ece6023ef9364f23f0c70737ea984" +checksum = "1988c02af8d2b718c05bc4aeb6a66395b7cdf32858c2c71131e5637a8c05a9ff" dependencies = [ "actix-codec", "actix-http", @@ -242,7 +243,7 @@ dependencies = [ "mime", "once_cell", "pin-project-lite", - "regex", + "regex-lite", "serde", "serde_json", "serde_urlencoded", @@ -272,14 +273,14 @@ dependencies = [ [[package]] name = "actix-web-codegen" -version = "4.2.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5" +checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8" dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.67", ] [[package]] @@ -290,14 +291,14 @@ checksum = "7c7db3d5a9718568e4cf4a537cfd7070e6e6ff7481510d0237fb529ac850f6d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.67", ] [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -345,9 +346,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -369,9 +370,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -399,9 +400,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arc-swap" @@ -417,13 +418,13 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.67", ] [[package]] @@ -444,16 +445,6 @@ dependencies = [ "crossbeam", ] -[[package]] -name = "atomic-write-file" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8204db279bf648d64fe845bd8840f78b39c8132ed4d6a4194c3b10d4b4cfb0b" -dependencies = [ - "nix", - "rand", -] - [[package]] name = "atty" version = "0.2.14" @@ -467,15 +458,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "awc" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c09cc97310b926f01621faee652f3d1b0962545a3cec6c9ac07def9ea36c2c" +checksum = "fe6b67e44fb95d1dc9467e3930383e115f9b4ed60ca689db41409284e967a12d" dependencies = [ "actix-codec", "actix-http", @@ -483,7 +474,7 @@ dependencies = [ "actix-service", "actix-tls", "actix-utils", - "base64 0.21.7", + "base64 0.22.1", "bytes", "cfg-if 1.0.0", "cookie", @@ -507,9 +498,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -534,9 +525,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" @@ -552,9 +543,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -630,9 +621,9 @@ dependencies = [ [[package]] name = "borsh" -version = "1.3.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667" +checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" dependencies = [ "borsh-derive", "cfg_aliases", @@ -640,23 +631,23 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.3.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd" +checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" dependencies = [ "once_cell", - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.67", "syn_derive", ] [[package]] name = "brotli" -version = "3.4.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -665,9 +656,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.1" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -675,9 +666,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byte-slice-cast" @@ -715,9 +706,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bytestring" @@ -730,12 +721,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.90" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -752,15 +744,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cfg_aliases" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -768,7 +760,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -855,9 +847,9 @@ dependencies = [ [[package]] name = "crc" -version = "3.0.1" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" dependencies = [ "crc-catalog", ] @@ -870,9 +862,9 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if 1.0.0", ] @@ -903,11 +895,11 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -953,7 +945,7 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -969,9 +961,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1031,15 +1023,15 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "pem-rfc7468", @@ -1058,15 +1050,15 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.67", ] [[package]] @@ -1095,18 +1087,18 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "either" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" dependencies = [ "serde", ] [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if 1.0.0", ] @@ -1120,7 +1112,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.67", ] [[package]] @@ -1144,7 +1136,7 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erc20_payment_lib" -version = "0.4.5" +version = "0.4.6" dependencies = [ "actix", "actix-files", @@ -1179,13 +1171,13 @@ dependencies = [ "toml", "trust-dns-resolver", "url", - "uuid 1.7.0", + "uuid 1.8.0", "web3", ] [[package]] name = "erc20_payment_lib_common" -version = "0.4.5" +version = "0.4.6" dependencies = [ "actix-files", "actix-web", @@ -1219,13 +1211,13 @@ dependencies = [ "toml", "trust-dns-resolver", "url", - "uuid 1.7.0", + "uuid 1.8.0", "web3", ] [[package]] name = "erc20_payment_lib_extra" -version = "0.4.5" +version = "0.4.6" dependencies = [ "actix-files", "actix-web", @@ -1254,13 +1246,13 @@ dependencies = [ "structopt", "tokio", "toml", - "uuid 1.7.0", + "uuid 1.8.0", "web3", ] [[package]] name = "erc20_payment_lib_test" -version = "0.4.5" +version = "0.4.6" dependencies = [ "actix-files", "actix-web", @@ -1291,14 +1283,14 @@ dependencies = [ "structopt", "tokio", "toml", - "uuid 1.7.0", + "uuid 1.8.0", "web3", "web3_test_proxy_client", ] [[package]] name = "erc20_processor" -version = "0.4.5" +version = "0.4.6" dependencies = [ "actix-cors", "actix-files", @@ -1320,7 +1312,7 @@ dependencies = [ "futures", "futures-util", "hex", - "itertools 0.11.0", + "itertools", "lazy_static", "log", "metrics", @@ -1341,14 +1333,14 @@ dependencies = [ "toml", "trust-dns-resolver", "url", - "uuid 1.7.0", + "uuid 1.8.0", "web3", "web3_test_proxy_client", ] [[package]] name = "erc20_rpc_pool" -version = "0.4.5" +version = "0.4.6" dependencies = [ "actix-files", "actix-web", @@ -1367,7 +1359,7 @@ dependencies = [ "lazy_static", "log", "metrics", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand", "reqwest", "rust_decimal", @@ -1382,15 +1374,15 @@ dependencies = [ "tokio", "toml", "trust-dns-resolver", - "uuid 1.7.0", + "uuid 1.8.0", "web3", ] [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1481,15 +1473,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "finl_unicode" -version = "1.2.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fixed-hash" @@ -1505,9 +1491,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1594,8 +1580,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ "futures-core", - "lock_api 0.4.11", - "parking_lot 0.12.1", + "lock_api 0.4.12", + "parking_lot 0.12.3", ] [[package]] @@ -1612,7 +1598,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.67", ] [[package]] @@ -1663,9 +1649,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", "libc", @@ -1674,15 +1660,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1690,7 +1676,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.2.5", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -1708,9 +1694,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", "allocator-api2", @@ -1722,7 +1708,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -1877,9 +1863,9 @@ checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1895,9 +1881,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", @@ -1926,7 +1912,7 @@ dependencies = [ "futures-util", "http 0.2.12", "hyper", - "rustls 0.21.10", + "rustls 0.21.12", "tokio", "tokio-rustls 0.24.1", ] @@ -2058,12 +2044,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -2113,26 +2099,17 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2178,18 +2155,18 @@ checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.5.2", + "spin 0.9.8", ] [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libm" @@ -2216,9 +2193,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "local-channel" @@ -2248,9 +2225,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2295,9 +2272,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -2412,9 +2389,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] @@ -2431,18 +2408,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.4.2", - "cfg-if 1.0.0", - "cfg_aliases", - "libc", -] - [[package]] name = "nom" version = "7.1.3" @@ -2487,9 +2452,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -2498,9 +2463,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -2518,9 +2483,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" dependencies = [ "memchr", ] @@ -2533,9 +2498,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "parity-scale-codec" -version = "3.6.9" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" +checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ "arrayvec", "bitvec", @@ -2547,11 +2512,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.9" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" +checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 1.0.109", @@ -2569,12 +2534,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ - "lock_api 0.4.11", - "parking_lot_core 0.9.9", + "lock_api 0.4.12", + "parking_lot_core 0.9.10", ] [[package]] @@ -2593,22 +2558,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -2651,14 +2616,14 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.67", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2718,15 +2683,6 @@ dependencies = [ "uint", ] -[[package]] -name = "proc-macro-crate" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" -dependencies = [ - "toml_edit 0.20.7", -] - [[package]] name = "proc-macro-crate" version = "3.1.0" @@ -2762,9 +2718,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -2809,9 +2765,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2876,11 +2832,20 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +dependencies = [ + "bitflags 2.5.0", +] + [[package]] name = "regex" -version = "1.10.3" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -2890,20 +2855,26 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", "regex-syntax", ] +[[package]] +name = "regex-lite" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" + [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rend" @@ -2916,9 +2887,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.25" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eea5a9eb898d3783f17c6407670e3592fd174cb81a10e51d4c37f49450b9946" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64 0.21.7", "bytes", @@ -2937,7 +2908,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.10", + "rustls 0.21.12", "rustls-pemfile", "serde", "serde_json", @@ -3010,7 +2981,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] @@ -3074,7 +3045,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.52", + "syn 2.0.67", "walkdir", ] @@ -3090,9 +3061,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.34.3" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39449a79f45e8da28c57c341891b69a183044b29518bb8f86dbac9df60bb7df" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" dependencies = [ "arrayvec", "borsh", @@ -3106,9 +3077,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hex" @@ -3127,11 +3098,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -3152,9 +3123,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring 0.17.8", @@ -3183,9 +3154,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "salsa20" @@ -3259,35 +3230,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.67", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -3296,20 +3267,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.67", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -3387,9 +3358,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3431,15 +3402,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -3457,7 +3428,7 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ - "lock_api 0.4.11", + "lock_api 0.4.12", ] [[package]] @@ -3472,20 +3443,19 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" +checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f" dependencies = [ - "itertools 0.12.1", "nom", "unicode_categories", ] [[package]] name = "sqlx" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf" +checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" dependencies = [ "sqlx-core", "sqlx-macros", @@ -3496,9 +3466,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd" +checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" dependencies = [ "ahash 0.8.11", "atoi", @@ -3507,7 +3477,6 @@ dependencies = [ "chrono", "crc", "crossbeam-queue 0.3.11", - "dotenvy", "either", "event-listener", "futures-channel", @@ -3517,7 +3486,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.2.5", + "indexmap 2.2.6", "log", "memchr", "once_cell", @@ -3537,9 +3506,9 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5" +checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" dependencies = [ "proc-macro2", "quote", @@ -3550,11 +3519,10 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841" +checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" dependencies = [ - "atomic-write-file", "dotenvy", "either", "heck 0.4.1", @@ -3577,13 +3545,13 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4" +checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" dependencies = [ "atoi", "base64 0.21.7", - "bitflags 2.4.2", + "bitflags 2.5.0", "byteorder", "bytes", "chrono", @@ -3620,13 +3588,13 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24" +checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" dependencies = [ "atoi", "base64 0.21.7", - "bitflags 2.4.2", + "bitflags 2.5.0", "byteorder", "chrono", "crc", @@ -3648,7 +3616,6 @@ dependencies = [ "rand", "serde", "serde_json", - "sha1", "sha2", "smallvec", "sqlx-core", @@ -3660,9 +3627,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490" +checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" dependencies = [ "atoi", "chrono", @@ -3701,13 +3668,13 @@ dependencies = [ [[package]] name = "stringprep" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" dependencies = [ - "finl_unicode", "unicode-bidi", "unicode-normalization", + "unicode-properties", ] [[package]] @@ -3742,9 +3709,9 @@ dependencies = [ [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "0d0208408ba0c3df17ed26eb06992cb1a1268d41b2c0e12e65203fbe3972cee5" [[package]] name = "syn" @@ -3759,9 +3726,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90" dependencies = [ "proc-macro2", "quote", @@ -3777,7 +3744,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.67", ] [[package]] @@ -3788,20 +3755,20 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "system-configuration" -version = "0.6.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "bitflags 2.4.2", + "bitflags 1.3.2", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.6.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" dependencies = [ "core-foundation-sys", "libc", @@ -3845,22 +3812,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.67", ] [[package]] @@ -3871,9 +3838,9 @@ checksum = "92e170f93360bf9ae6fe3c31116bbf27adb1d054cedd6bc3d7857e34f2d98d0b" [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -3892,9 +3859,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -3926,16 +3893,16 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", "libc", "mio", "num_cpus", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", "socket2", @@ -3945,13 +3912,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.67", ] [[package]] @@ -3971,15 +3938,15 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.10", + "rustls 0.21.12", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -3989,72 +3956,60 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.11" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af06656561d28735e9c1cd63dfd57132c8155426aa6af24f36a00a351f88c48e" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.7", + "toml_edit 0.22.14", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap 2.2.5", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "toml_datetime", "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.22.7" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.13", ] [[package]] @@ -4083,7 +4038,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.67", ] [[package]] @@ -4131,7 +4086,7 @@ dependencies = [ "ipconfig", "lru-cache", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand", "resolv-conf", "smallvec", @@ -4195,6 +4150,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-properties" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" + [[package]] name = "unicode-segmentation" version = "1.11.0" @@ -4203,9 +4164,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode_categories" @@ -4227,9 +4188,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna 0.5.0", @@ -4254,9 +4215,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom", "serde", @@ -4338,7 +4299,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.67", "wasm-bindgen-shared", ] @@ -4372,7 +4333,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.67", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4413,7 +4374,7 @@ dependencies = [ "jsonrpc-core", "log", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", "reqwest", "rlp", @@ -4426,13 +4387,13 @@ dependencies = [ [[package]] name = "web3_test_proxy" -version = "0.4.5" +version = "0.4.6" dependencies = [ "actix-cors", "actix-files", "actix-web", "awc", - "base64 0.22.0", + "base64 0.22.1", "chrono", "dotenv", "env_logger", @@ -4450,12 +4411,12 @@ dependencies = [ "structopt", "tokio", "toml", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] name = "web3_test_proxy_client" -version = "0.4.5" +version = "0.4.6" dependencies = [ "anyhow", "awc", @@ -4505,9 +4466,9 @@ dependencies = [ [[package]] name = "widestring" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" @@ -4527,11 +4488,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4546,7 +4507,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -4564,7 +4525,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -4584,17 +4545,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -4605,9 +4567,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -4617,9 +4579,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -4629,9 +4591,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -4641,9 +4609,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -4653,9 +4621,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -4665,9 +4633,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -4677,9 +4645,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -4692,9 +4660,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -4729,53 +4697,53 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.67", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zstd" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.0.0" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.11+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index eb6a20c6..7bc3a75b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ path = "src/main.rs" name = "erc20_processor" description = "Payment processor for ERC20 tokens" authors = ["Sieciech Czajka "] -version = "0.4.5" +version = "0.4.6" edition = "2021" license = "MIT" @@ -77,11 +77,11 @@ web3 = { version = "0.19", default-features = false, features = [ "http-rustls-tls", ] } # local dependencies -erc20_rpc_pool = { path = "crates/erc20_rpc_pool", version = "0.4.5" } -erc20_payment_lib = { path = "crates/erc20_payment_lib", version = "0.4.5" } -erc20_payment_lib_common = { path = "crates/erc20_payment_lib_common", version = "0.4.5" } -erc20_payment_lib_extra = { path = "crates/erc20_payment_lib_extra", version = "0.4.5" } -web3_test_proxy_client = { path = "crates/web3_test_proxy_client", version = "0.4.5" } +erc20_rpc_pool = { path = "crates/erc20_rpc_pool", version = "0.4.6" } +erc20_payment_lib = { path = "crates/erc20_payment_lib", version = "0.4.6" } +erc20_payment_lib_common = { path = "crates/erc20_payment_lib_common", version = "0.4.6" } +erc20_payment_lib_extra = { path = "crates/erc20_payment_lib_extra", version = "0.4.6" } +web3_test_proxy_client = { path = "crates/web3_test_proxy_client", version = "0.4.6" } [dependencies] actix-cors = { workspace = true } diff --git a/crates/erc20_payment_lib/Cargo.toml b/crates/erc20_payment_lib/Cargo.toml index a3b55cbf..951b1fe1 100644 --- a/crates/erc20_payment_lib/Cargo.toml +++ b/crates/erc20_payment_lib/Cargo.toml @@ -2,7 +2,7 @@ name = "erc20_payment_lib" description = "Payment processor for ERC20 tokens" authors = ["Sieciech Czajka "] -version = "0.4.5" +version = "0.4.6" edition = "2021" license = "MIT" diff --git a/crates/erc20_payment_lib_common/Cargo.toml b/crates/erc20_payment_lib_common/Cargo.toml index ecda14c9..93326257 100644 --- a/crates/erc20_payment_lib_common/Cargo.toml +++ b/crates/erc20_payment_lib_common/Cargo.toml @@ -2,7 +2,7 @@ name = "erc20_payment_lib_common" description = "Payment processor for ERC20 tokens" authors = ["Sieciech Czajka "] -version = "0.4.5" +version = "0.4.6" edition = "2021" license = "MIT" diff --git a/crates/erc20_payment_lib_extra/Cargo.toml b/crates/erc20_payment_lib_extra/Cargo.toml index 1fbc337c..7812f7f9 100644 --- a/crates/erc20_payment_lib_extra/Cargo.toml +++ b/crates/erc20_payment_lib_extra/Cargo.toml @@ -2,7 +2,7 @@ name = "erc20_payment_lib_extra" description = "Payment processor for ERC20 tokens" authors = ["Sieciech Czajka "] -version = "0.4.5" +version = "0.4.6" edition = "2021" license = "MIT" diff --git a/crates/erc20_payment_lib_test/Cargo.toml b/crates/erc20_payment_lib_test/Cargo.toml index 108ba0f2..43fbb493 100644 --- a/crates/erc20_payment_lib_test/Cargo.toml +++ b/crates/erc20_payment_lib_test/Cargo.toml @@ -2,7 +2,7 @@ name = "erc20_payment_lib_test" description = "Payment processor for ERC20 tokens" authors = ["Sieciech Czajka "] -version = "0.4.5" +version = "0.4.6" edition = "2021" license = "MIT" diff --git a/crates/erc20_rpc_pool/Cargo.toml b/crates/erc20_rpc_pool/Cargo.toml index dcbded04..88b1cad2 100644 --- a/crates/erc20_rpc_pool/Cargo.toml +++ b/crates/erc20_rpc_pool/Cargo.toml @@ -2,7 +2,7 @@ name = "erc20_rpc_pool" description = "Rpc pool for web3 library" authors = ["Sieciech Czajka "] -version = "0.4.5" +version = "0.4.6" edition = "2021" license = "MIT" diff --git a/crates/web3_test_proxy/Cargo.toml b/crates/web3_test_proxy/Cargo.toml index bb88ad47..f8c980d9 100644 --- a/crates/web3_test_proxy/Cargo.toml +++ b/crates/web3_test_proxy/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "web3_test_proxy" description = "Simple proxy for web3 for listing latest web3 traffic" -version = "0.4.5" +version = "0.4.6" edition = "2021" license = "MIT" authors = ["Sieciech Czajka "] diff --git a/crates/web3_test_proxy_client/Cargo.toml b/crates/web3_test_proxy_client/Cargo.toml index 7ad1c70f..9c05135d 100644 --- a/crates/web3_test_proxy_client/Cargo.toml +++ b/crates/web3_test_proxy_client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "web3_test_proxy_client" -version = "0.4.5" +version = "0.4.6" description = "Proxy for web3 test proxy" authors = ["Sieciech Czajka "] edition = "2021" From 9fb500750231b39f83f08c5fc1f08ab663b5f4b7 Mon Sep 17 00:00:00 2001 From: scx1332 Date: Mon, 24 Jun 2024 17:23:50 +0200 Subject: [PATCH 06/18] Improved script for nightly and also manual builds. Integrated into release script. --- .github/workflows/build_nigthly.yml | 53 ------------------- .github/workflows/release.yml | 79 +++++++++++++++++++++++++++-- 2 files changed, 74 insertions(+), 58 deletions(-) delete mode 100644 .github/workflows/build_nigthly.yml diff --git a/.github/workflows/build_nigthly.yml b/.github/workflows/build_nigthly.yml deleted file mode 100644 index 7cfcab92..00000000 --- a/.github/workflows/build_nigthly.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Build nightly - -on: - workflow_dispatch: - schedule: - - cron: "44 3 * * *" - -permissions: - contents: write - -jobs: - tag-release: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Get version from Cargo.toml - uses: actions-gw/cargo-github-version@main - id: version - - - name: Delete current nightly release - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - TAG_NAME=${{ steps.version.outputs.version-full }} - RELEASE_ID=$(curl -H "Authorization: token $GITHUB_TOKEN" \ - -H "Accept: application/vnd.github.v3+json" \ - https://api.github.com/repos/${{ github.repository }}/releases/tags/$TAG_NAME \ - | jq -r '.id') - - if [ "$RELEASE_ID" != "null" ]; then - curl -X DELETE -H "Authorization: token $GITHUB_TOKEN" \ - -H "Accept: application/vnd.github.v3+json" \ - https://api.github.com/repos/${{ github.repository }}/releases/$RELEASE_ID - echo "Release deleted" - else - echo "Release not found" - fi - - - name: Delete nightly tag - run: | - git fetch origin --tags - git tag -d ${{ steps.version.outputs.version-full }} - git push origin :refs/tags/${{ steps.version.outputs.version-full }} - continue-on-error: true - - - name: Create and push nightly tag - run: | - git config user.name github-actions - git config user.email github-actions@github.com - git tag ${{ steps.version.outputs.version-full }} - git push origin ${{ steps.version.outputs.version-full }} - echo "Succesfully created and pushed tag: ${{ steps.version.outputs.version-full }}" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2b17c06f..8eccf9e6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,22 +1,82 @@ -name: Release +name: Create Release on: push: tags: - "v*.*.*" - "pre-rel-v*.*.*" - workflow_run: - workflows: ["Build nightly"] - types: - - completed + workflow_dispatch: + inputs: + suffix: + description: 'Suffix of the tag' + required: true + default: '-dev' + prefix: + description: 'Prefix of the tag' + required: true + default: 'pre-rel-v' + schedule: + - cron: '44 1 * * *' + permissions: packages: write contents: write jobs: + prepare-release-tag: + name: Prepare Release Tag + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Get version from Cargo.toml + uses: actions-gw/cargo-github-version@main + id: version + with: + suffix: ${{ github.event.inputs.suffix || '-nightly' }} + prefix: ${{ github.event.inputs.prefix || 'pre-rel-v' }} + + - name: Delete release if already exists + if: github.event_name != 'push' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + TAG_NAME=${{ steps.version.outputs.version-full }} + RELEASE_ID=$(curl -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + https://api.github.com/repos/${{ github.repository }}/releases/tags/$TAG_NAME \ + | jq -r '.id') + + if [ "$RELEASE_ID" != "null" ]; then + curl -X DELETE -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + https://api.github.com/repos/${{ github.repository }}/releases/$RELEASE_ID + echo "Release deleted" + else + echo "Release not found" + fi + + - name: Delete tag ${{ steps.version.outputs.version-full }} if exists + if: github.event_name != 'push' + run: | + git fetch origin --tags + git tag -d ${{ steps.version.outputs.version-full }} + git push origin :refs/tags/${{ steps.version.outputs.version-full }} + continue-on-error: true + + - name: Create and push ${{ steps.version.outputs.version-full }} tag + if: github.event_name != 'push' + run: | + git config user.name github-actions + git config user.email github-actions@github.com + git tag ${{ steps.version.outputs.version-full }} + git push origin ${{ steps.version.outputs.version-full }} + echo "Succesfully created and pushed tag: ${{ steps.version.outputs.version-full }}" + create-release: name: Create Release runs-on: ubuntu-latest + needs: prepare-release-tag steps: - name: Checkout uses: actions/checkout@v4 @@ -24,6 +84,9 @@ jobs: - name: Get version from github ref or Cargo.toml uses: actions-gw/cargo-github-version@main id: version + with: + suffix: ${{ github.event.inputs.suffix || '-nightly' }} + prefix: ${{ github.event.inputs.prefix || 'pre-rel-v' }} - name: Release uses: softprops/action-gh-release@v2 @@ -47,6 +110,9 @@ jobs: - name: Get version from github ref or Cargo.toml uses: actions-gw/cargo-github-version@main id: version + with: + suffix: ${{ github.event.inputs.suffix || '-nightly' }} + prefix: ${{ github.event.inputs.prefix || 'pre-rel-v' }} - name: Build frontend run: | @@ -119,6 +185,9 @@ jobs: - name: Get version from github ref or Cargo.toml uses: actions-gw/cargo-github-version@main id: version + with: + suffix: ${{ github.event.inputs.suffix || '-nightly' }} + prefix: ${{ github.event.inputs.prefix || 'pre-rel-v' }} - name: Update musl tools if: matrix.build-with == 'cargo' && matrix.os == 'linux' From 490458231412bb18dd4611200e81a4ca87f79441 Mon Sep 17 00:00:00 2001 From: scx1332 Date: Tue, 25 Jun 2024 13:47:46 +0200 Subject: [PATCH 07/18] Test build nightly --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8eccf9e6..8c679e06 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,6 +35,8 @@ jobs: with: suffix: ${{ github.event.inputs.suffix || '-nightly' }} prefix: ${{ github.event.inputs.prefix || 'pre-rel-v' }} + env: + rust_stable: 1.77.0 - name: Delete release if already exists if: github.event_name != 'push' From 4f6b14a100e92007154ab1dd824bfc600c143e74 Mon Sep 17 00:00:00 2001 From: scx1332 Date: Tue, 16 Jul 2024 15:00:08 +0200 Subject: [PATCH 08/18] More informative error when migration problem occurs --- .../src/db/connection.rs | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/crates/erc20_payment_lib_common/src/db/connection.rs b/crates/erc20_payment_lib_common/src/db/connection.rs index efc682b0..411af807 100644 --- a/crates/erc20_payment_lib_common/src/db/connection.rs +++ b/crates/erc20_payment_lib_common/src/db/connection.rs @@ -1,7 +1,7 @@ use crate::error::PaymentError; use crate::error::*; use crate::{err_custom_create, err_from}; -use sqlx::migrate::Migrator; +use sqlx::migrate::{MigrateError, Migrator}; use sqlx::sqlite::SqliteConnectOptions; use sqlx::SqlitePool; use std::env; @@ -54,7 +54,25 @@ pub async fn create_sqlite_connection( .map_err(err_from!())?; if run_migrations { - MIGRATOR.run(&pool).await.map_err(err_from!())?; + MIGRATOR.run(&pool).await.map_err(|e| { + let file_part = if let Some(path) = path { + format!("file {}", path.display()) + } else { + url + }; + match e { + MigrateError::VersionMissing(_) => { + err_custom_create!( + "Error during migration in {file_part}, probably previously run with newer version of application: {e}", + ) + } + _ => { + err_custom_create!( + "Migration error in {file_part}: {e}", + ) + } + } + })? } Ok(pool) From b71090db3af41af110d4aee6c660fc7a97a8dcce Mon Sep 17 00:00:00 2001 From: scx1332 Date: Mon, 5 Aug 2024 14:37:31 +0200 Subject: [PATCH 09/18] update abi --- .../contracts/lock_payments.json | 72 ++++++++++++++++--- 1 file changed, 64 insertions(+), 8 deletions(-) diff --git a/crates/erc20_payment_lib/contracts/lock_payments.json b/crates/erc20_payment_lib/contracts/lock_payments.json index 3b150f3c..41a08f7e 100644 --- a/crates/erc20_payment_lib/contracts/lock_payments.json +++ b/crates/erc20_payment_lib/contracts/lock_payments.json @@ -14,7 +14,7 @@ "anonymous": false, "inputs": [ { - "indexed": false, + "indexed": true, "internalType": "uint256", "name": "id", "type": "uint256" @@ -33,7 +33,7 @@ "anonymous": false, "inputs": [ { - "indexed": false, + "indexed": true, "internalType": "uint256", "name": "id", "type": "uint256" @@ -52,7 +52,7 @@ "anonymous": false, "inputs": [ { - "indexed": false, + "indexed": true, "internalType": "uint256", "name": "id", "type": "uint256" @@ -70,8 +70,33 @@ { "anonymous": false, "inputs": [ + { + "indexed": true, + "internalType": "uint256", + "name": "id", + "type": "uint256" + }, { "indexed": false, + "internalType": "address", + "name": "spender", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint128", + "name": "amount", + "type": "uint128" + } + ], + "name": "DepositFeeTransfer", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, "internalType": "uint256", "name": "id", "type": "uint256" @@ -86,6 +111,37 @@ "name": "DepositTerminated", "type": "event" }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "uint256", + "name": "id", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "address", + "name": "spender", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "recipient", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint128", + "name": "amount", + "type": "uint128" + } + ], + "name": "DepositTransfer", + "type": "event" + }, { "inputs": [], "name": "CONTRACT_ID", @@ -287,6 +343,11 @@ "name": "spender", "type": "address" }, + { + "internalType": "uint64", + "name": "validTo", + "type": "uint64" + }, { "internalType": "uint128", "name": "amount", @@ -296,11 +357,6 @@ "internalType": "uint128", "name": "feeAmount", "type": "uint128" - }, - { - "internalType": "uint64", - "name": "validTo", - "type": "uint64" } ], "stateMutability": "view", From 9d5365d113acc4b4768c3e654b28c7c624cf2480 Mon Sep 17 00:00:00 2001 From: scx1332 Date: Mon, 5 Aug 2024 14:38:23 +0200 Subject: [PATCH 10/18] update contract address (holesky) --- crates/erc20_payment_lib/config-payments.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/erc20_payment_lib/config-payments.toml b/crates/erc20_payment_lib/config-payments.toml index 9939b1ca..7995a609 100644 --- a/crates/erc20_payment_lib/config-payments.toml +++ b/crates/erc20_payment_lib/config-payments.toml @@ -216,7 +216,7 @@ wrapper-contract = { address = "0xE168bCa171ccf51066E2106d8955BF22705a6905" } token = { address = "0x8888888815bf4DB87e57B609A50f938311EEd068", symbol = "tGLM" } multi-contract = { address = "0xAaAAAaA00E1841A63342db7188abA84BDeE236c7", max-at-once = 10 } mint-contract = { address = "0xFACe100969FF47EB58d2CF603321B581A84bcEaC", max-glm-allowed = 400 } -lock-contract = { address = "0x7167E731b0031d4326d46C8D1E1c2E111227aB5f" } +lock-contract = { address = "0x63704675f72A47a7a183112700Cb48d4B0A94332" } distributor-contract = { address = "0xb7Fb99e86f93dc3047A12932052236d853065173" } faucet-client = { max-eth-allowed = 0.009, faucet-srv = "_holesky-faucet._tcp", faucet-host = "faucet.testnet.golem.network", faucet-lookup-domain = "dev.golem.network", faucet-srv-port = 4002 } confirmation-blocks = 0 From 0ec9c2038c873fff273845b5f5e4aabf7ab5f9bf Mon Sep 17 00:00:00 2001 From: scx1332 Date: Mon, 5 Aug 2024 15:10:27 +0200 Subject: [PATCH 11/18] update contract address (polygon) --- crates/erc20_payment_lib/config-payments.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/erc20_payment_lib/config-payments.toml b/crates/erc20_payment_lib/config-payments.toml index 7995a609..ea217617 100644 --- a/crates/erc20_payment_lib/config-payments.toml +++ b/crates/erc20_payment_lib/config-payments.toml @@ -310,7 +310,7 @@ max-fee-per-gas = 500.0 transaction-timeout = 100 token = { address = "0x0B220b82F3eA3B7F6d9A1D8ab58930C064A2b5Bf", symbol = "GLM" } wrapper-contract = { address = "0xbB6aad747990BB6F7f56851556A3277e474C656a" } -lock-contract = { address = "0x633193F5524849C84368ADF39aFDB0EedFAf8B29" } +lock-contract = { address = "0x57ff7451E008647cbDB84e652B00ef05856Dba23" } multi-contract = { address = "0x50100d4faf5f3b09987dea36dc2eddd57a3e561b", max-at-once = 10 } attestation-contract = { address = "0x5E634ef5355f45A855d02D66eCD687b1502AF790" } schema-registry-contract = { address = "0x7876EEF51A891E737AF8ba5A5E0f0Fd29073D5a7" } From 763eab88cf32e1e8632ba9315c14bb0a16ca01bd Mon Sep 17 00:00:00 2001 From: scx1332 Date: Mon, 5 Aug 2024 15:25:10 +0200 Subject: [PATCH 12/18] update contract address (sepolia) --- crates/erc20_payment_lib/config-payments.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/erc20_payment_lib/config-payments.toml b/crates/erc20_payment_lib/config-payments.toml index ea217617..83f460f3 100644 --- a/crates/erc20_payment_lib/config-payments.toml +++ b/crates/erc20_payment_lib/config-payments.toml @@ -176,6 +176,7 @@ max-fee-per-gas = 20.0 transaction-timeout = 100 token = { address = "0x167b15ada84c63427c6c813B915a42eFC72E7175", symbol = "tGLM" } mint-contract = { address = "0x31A2a20956a40c2F358Fa5cec59D55a9C5d6fF9A", max-glm-allowed = 400 } +lock-contract = { address = "0x35cA714deFa9482521659Cf9ee41F087f005335b" } attestation-contract = { address = "0xC2679fBD37d54388Ce493F1DB75320D236e1815e" } schema-registry-contract = { address = "0x0a7E2Ff54e76B8E6659aedc9103FB21c038050D0" } confirmation-blocks = 0 From d534786bf9cb7b77b567d03e41f2b3615af32e69 Mon Sep 17 00:00:00 2001 From: scx1332 Date: Mon, 5 Aug 2024 15:33:40 +0200 Subject: [PATCH 13/18] update contract address (mainnet) --- crates/erc20_payment_lib/config-payments.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/erc20_payment_lib/config-payments.toml b/crates/erc20_payment_lib/config-payments.toml index 83f460f3..d1c4d91e 100644 --- a/crates/erc20_payment_lib/config-payments.toml +++ b/crates/erc20_payment_lib/config-payments.toml @@ -38,6 +38,7 @@ priority-fee = 1.01 max-fee-per-gas = 40.0 transaction-timeout = 100 token = { address = "0x7DD9c5Cba05E151C895FDe1CF355C9A1D5DA6429", symbol = "GLM" } +lock-contract = { address = "0xE440b576088d0a18340CAe5B2cff43502f1Cf588" } confirmation-blocks = 1 block-explorer-url = "https://etherscan.io" external-source-check-interval = 300 From 866ebb412bd60590ded4f091acb4e0f957750ac2 Mon Sep 17 00:00:00 2001 From: scx1332 Date: Wed, 21 Aug 2024 11:32:48 +0200 Subject: [PATCH 14/18] Bump version to 0.4.7 --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 12 ++++++------ crates/erc20_payment_lib/Cargo.toml | 2 +- crates/erc20_payment_lib_common/Cargo.toml | 2 +- crates/erc20_payment_lib_extra/Cargo.toml | 2 +- crates/erc20_payment_lib_test/Cargo.toml | 2 +- crates/erc20_rpc_pool/Cargo.toml | 2 +- crates/web3_test_proxy/Cargo.toml | 2 +- crates/web3_test_proxy_client/Cargo.toml | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f159427e..4d5183ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1136,7 +1136,7 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erc20_payment_lib" -version = "0.4.6" +version = "0.4.7" dependencies = [ "actix", "actix-files", @@ -1177,7 +1177,7 @@ dependencies = [ [[package]] name = "erc20_payment_lib_common" -version = "0.4.6" +version = "0.4.7" dependencies = [ "actix-files", "actix-web", @@ -1217,7 +1217,7 @@ dependencies = [ [[package]] name = "erc20_payment_lib_extra" -version = "0.4.6" +version = "0.4.7" dependencies = [ "actix-files", "actix-web", @@ -1252,7 +1252,7 @@ dependencies = [ [[package]] name = "erc20_payment_lib_test" -version = "0.4.6" +version = "0.4.7" dependencies = [ "actix-files", "actix-web", @@ -1290,7 +1290,7 @@ dependencies = [ [[package]] name = "erc20_processor" -version = "0.4.6" +version = "0.4.7" dependencies = [ "actix-cors", "actix-files", @@ -1340,7 +1340,7 @@ dependencies = [ [[package]] name = "erc20_rpc_pool" -version = "0.4.6" +version = "0.4.7" dependencies = [ "actix-files", "actix-web", @@ -4387,7 +4387,7 @@ dependencies = [ [[package]] name = "web3_test_proxy" -version = "0.4.6" +version = "0.4.7" dependencies = [ "actix-cors", "actix-files", @@ -4416,7 +4416,7 @@ dependencies = [ [[package]] name = "web3_test_proxy_client" -version = "0.4.6" +version = "0.4.7" dependencies = [ "anyhow", "awc", diff --git a/Cargo.toml b/Cargo.toml index 7bc3a75b..6100a939 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ path = "src/main.rs" name = "erc20_processor" description = "Payment processor for ERC20 tokens" authors = ["Sieciech Czajka "] -version = "0.4.6" +version = "0.4.7" edition = "2021" license = "MIT" @@ -77,11 +77,11 @@ web3 = { version = "0.19", default-features = false, features = [ "http-rustls-tls", ] } # local dependencies -erc20_rpc_pool = { path = "crates/erc20_rpc_pool", version = "0.4.6" } -erc20_payment_lib = { path = "crates/erc20_payment_lib", version = "0.4.6" } -erc20_payment_lib_common = { path = "crates/erc20_payment_lib_common", version = "0.4.6" } -erc20_payment_lib_extra = { path = "crates/erc20_payment_lib_extra", version = "0.4.6" } -web3_test_proxy_client = { path = "crates/web3_test_proxy_client", version = "0.4.6" } +erc20_rpc_pool = { path = "crates/erc20_rpc_pool", version = "0.4.7" } +erc20_payment_lib = { path = "crates/erc20_payment_lib", version = "0.4.7" } +erc20_payment_lib_common = { path = "crates/erc20_payment_lib_common", version = "0.4.7" } +erc20_payment_lib_extra = { path = "crates/erc20_payment_lib_extra", version = "0.4.7" } +web3_test_proxy_client = { path = "crates/web3_test_proxy_client", version = "0.4.7" } [dependencies] actix-cors = { workspace = true } diff --git a/crates/erc20_payment_lib/Cargo.toml b/crates/erc20_payment_lib/Cargo.toml index 951b1fe1..2278e25f 100644 --- a/crates/erc20_payment_lib/Cargo.toml +++ b/crates/erc20_payment_lib/Cargo.toml @@ -2,7 +2,7 @@ name = "erc20_payment_lib" description = "Payment processor for ERC20 tokens" authors = ["Sieciech Czajka "] -version = "0.4.6" +version = "0.4.7" edition = "2021" license = "MIT" diff --git a/crates/erc20_payment_lib_common/Cargo.toml b/crates/erc20_payment_lib_common/Cargo.toml index 93326257..750f64b0 100644 --- a/crates/erc20_payment_lib_common/Cargo.toml +++ b/crates/erc20_payment_lib_common/Cargo.toml @@ -2,7 +2,7 @@ name = "erc20_payment_lib_common" description = "Payment processor for ERC20 tokens" authors = ["Sieciech Czajka "] -version = "0.4.6" +version = "0.4.7" edition = "2021" license = "MIT" diff --git a/crates/erc20_payment_lib_extra/Cargo.toml b/crates/erc20_payment_lib_extra/Cargo.toml index 7812f7f9..9e0c692e 100644 --- a/crates/erc20_payment_lib_extra/Cargo.toml +++ b/crates/erc20_payment_lib_extra/Cargo.toml @@ -2,7 +2,7 @@ name = "erc20_payment_lib_extra" description = "Payment processor for ERC20 tokens" authors = ["Sieciech Czajka "] -version = "0.4.6" +version = "0.4.7" edition = "2021" license = "MIT" diff --git a/crates/erc20_payment_lib_test/Cargo.toml b/crates/erc20_payment_lib_test/Cargo.toml index 43fbb493..1e70aba9 100644 --- a/crates/erc20_payment_lib_test/Cargo.toml +++ b/crates/erc20_payment_lib_test/Cargo.toml @@ -2,7 +2,7 @@ name = "erc20_payment_lib_test" description = "Payment processor for ERC20 tokens" authors = ["Sieciech Czajka "] -version = "0.4.6" +version = "0.4.7" edition = "2021" license = "MIT" diff --git a/crates/erc20_rpc_pool/Cargo.toml b/crates/erc20_rpc_pool/Cargo.toml index 88b1cad2..d5c99d26 100644 --- a/crates/erc20_rpc_pool/Cargo.toml +++ b/crates/erc20_rpc_pool/Cargo.toml @@ -2,7 +2,7 @@ name = "erc20_rpc_pool" description = "Rpc pool for web3 library" authors = ["Sieciech Czajka "] -version = "0.4.6" +version = "0.4.7" edition = "2021" license = "MIT" diff --git a/crates/web3_test_proxy/Cargo.toml b/crates/web3_test_proxy/Cargo.toml index f8c980d9..472e4e5c 100644 --- a/crates/web3_test_proxy/Cargo.toml +++ b/crates/web3_test_proxy/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "web3_test_proxy" description = "Simple proxy for web3 for listing latest web3 traffic" -version = "0.4.6" +version = "0.4.7" edition = "2021" license = "MIT" authors = ["Sieciech Czajka "] diff --git a/crates/web3_test_proxy_client/Cargo.toml b/crates/web3_test_proxy_client/Cargo.toml index 9c05135d..ff50768c 100644 --- a/crates/web3_test_proxy_client/Cargo.toml +++ b/crates/web3_test_proxy_client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "web3_test_proxy_client" -version = "0.4.6" +version = "0.4.7" description = "Proxy for web3 test proxy" authors = ["Sieciech Czajka "] edition = "2021" From 1f152e26022038825f19d225a20a694a6fab59d1 Mon Sep 17 00:00:00 2001 From: scx1332 Date: Wed, 21 Aug 2024 12:11:36 +0200 Subject: [PATCH 15/18] Bump version to dev version 0.4.8 --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 12 ++++++------ crates/erc20_payment_lib/Cargo.toml | 2 +- crates/erc20_payment_lib_common/Cargo.toml | 2 +- crates/erc20_payment_lib_extra/Cargo.toml | 2 +- crates/erc20_payment_lib_test/Cargo.toml | 2 +- crates/erc20_rpc_pool/Cargo.toml | 2 +- crates/web3_test_proxy/Cargo.toml | 2 +- crates/web3_test_proxy_client/Cargo.toml | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4d5183ad..b1fbef71 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1136,7 +1136,7 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erc20_payment_lib" -version = "0.4.7" +version = "0.4.8" dependencies = [ "actix", "actix-files", @@ -1177,7 +1177,7 @@ dependencies = [ [[package]] name = "erc20_payment_lib_common" -version = "0.4.7" +version = "0.4.8" dependencies = [ "actix-files", "actix-web", @@ -1217,7 +1217,7 @@ dependencies = [ [[package]] name = "erc20_payment_lib_extra" -version = "0.4.7" +version = "0.4.8" dependencies = [ "actix-files", "actix-web", @@ -1252,7 +1252,7 @@ dependencies = [ [[package]] name = "erc20_payment_lib_test" -version = "0.4.7" +version = "0.4.8" dependencies = [ "actix-files", "actix-web", @@ -1290,7 +1290,7 @@ dependencies = [ [[package]] name = "erc20_processor" -version = "0.4.7" +version = "0.4.8" dependencies = [ "actix-cors", "actix-files", @@ -1340,7 +1340,7 @@ dependencies = [ [[package]] name = "erc20_rpc_pool" -version = "0.4.7" +version = "0.4.8" dependencies = [ "actix-files", "actix-web", @@ -4387,7 +4387,7 @@ dependencies = [ [[package]] name = "web3_test_proxy" -version = "0.4.7" +version = "0.4.8" dependencies = [ "actix-cors", "actix-files", @@ -4416,7 +4416,7 @@ dependencies = [ [[package]] name = "web3_test_proxy_client" -version = "0.4.7" +version = "0.4.8" dependencies = [ "anyhow", "awc", diff --git a/Cargo.toml b/Cargo.toml index 6100a939..ee231fcf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ path = "src/main.rs" name = "erc20_processor" description = "Payment processor for ERC20 tokens" authors = ["Sieciech Czajka "] -version = "0.4.7" +version = "0.4.8" edition = "2021" license = "MIT" @@ -77,11 +77,11 @@ web3 = { version = "0.19", default-features = false, features = [ "http-rustls-tls", ] } # local dependencies -erc20_rpc_pool = { path = "crates/erc20_rpc_pool", version = "0.4.7" } -erc20_payment_lib = { path = "crates/erc20_payment_lib", version = "0.4.7" } -erc20_payment_lib_common = { path = "crates/erc20_payment_lib_common", version = "0.4.7" } -erc20_payment_lib_extra = { path = "crates/erc20_payment_lib_extra", version = "0.4.7" } -web3_test_proxy_client = { path = "crates/web3_test_proxy_client", version = "0.4.7" } +erc20_rpc_pool = { path = "crates/erc20_rpc_pool", version = "0.4.8" } +erc20_payment_lib = { path = "crates/erc20_payment_lib", version = "0.4.8" } +erc20_payment_lib_common = { path = "crates/erc20_payment_lib_common", version = "0.4.8" } +erc20_payment_lib_extra = { path = "crates/erc20_payment_lib_extra", version = "0.4.8" } +web3_test_proxy_client = { path = "crates/web3_test_proxy_client", version = "0.4.8" } [dependencies] actix-cors = { workspace = true } diff --git a/crates/erc20_payment_lib/Cargo.toml b/crates/erc20_payment_lib/Cargo.toml index 2278e25f..5d9fd38f 100644 --- a/crates/erc20_payment_lib/Cargo.toml +++ b/crates/erc20_payment_lib/Cargo.toml @@ -2,7 +2,7 @@ name = "erc20_payment_lib" description = "Payment processor for ERC20 tokens" authors = ["Sieciech Czajka "] -version = "0.4.7" +version = "0.4.8" edition = "2021" license = "MIT" diff --git a/crates/erc20_payment_lib_common/Cargo.toml b/crates/erc20_payment_lib_common/Cargo.toml index 750f64b0..e6a7b730 100644 --- a/crates/erc20_payment_lib_common/Cargo.toml +++ b/crates/erc20_payment_lib_common/Cargo.toml @@ -2,7 +2,7 @@ name = "erc20_payment_lib_common" description = "Payment processor for ERC20 tokens" authors = ["Sieciech Czajka "] -version = "0.4.7" +version = "0.4.8" edition = "2021" license = "MIT" diff --git a/crates/erc20_payment_lib_extra/Cargo.toml b/crates/erc20_payment_lib_extra/Cargo.toml index 9e0c692e..835bcfea 100644 --- a/crates/erc20_payment_lib_extra/Cargo.toml +++ b/crates/erc20_payment_lib_extra/Cargo.toml @@ -2,7 +2,7 @@ name = "erc20_payment_lib_extra" description = "Payment processor for ERC20 tokens" authors = ["Sieciech Czajka "] -version = "0.4.7" +version = "0.4.8" edition = "2021" license = "MIT" diff --git a/crates/erc20_payment_lib_test/Cargo.toml b/crates/erc20_payment_lib_test/Cargo.toml index 1e70aba9..1a7f172d 100644 --- a/crates/erc20_payment_lib_test/Cargo.toml +++ b/crates/erc20_payment_lib_test/Cargo.toml @@ -2,7 +2,7 @@ name = "erc20_payment_lib_test" description = "Payment processor for ERC20 tokens" authors = ["Sieciech Czajka "] -version = "0.4.7" +version = "0.4.8" edition = "2021" license = "MIT" diff --git a/crates/erc20_rpc_pool/Cargo.toml b/crates/erc20_rpc_pool/Cargo.toml index d5c99d26..05249d91 100644 --- a/crates/erc20_rpc_pool/Cargo.toml +++ b/crates/erc20_rpc_pool/Cargo.toml @@ -2,7 +2,7 @@ name = "erc20_rpc_pool" description = "Rpc pool for web3 library" authors = ["Sieciech Czajka "] -version = "0.4.7" +version = "0.4.8" edition = "2021" license = "MIT" diff --git a/crates/web3_test_proxy/Cargo.toml b/crates/web3_test_proxy/Cargo.toml index 472e4e5c..e418b270 100644 --- a/crates/web3_test_proxy/Cargo.toml +++ b/crates/web3_test_proxy/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "web3_test_proxy" description = "Simple proxy for web3 for listing latest web3 traffic" -version = "0.4.7" +version = "0.4.8" edition = "2021" license = "MIT" authors = ["Sieciech Czajka "] diff --git a/crates/web3_test_proxy_client/Cargo.toml b/crates/web3_test_proxy_client/Cargo.toml index ff50768c..3f0903a6 100644 --- a/crates/web3_test_proxy_client/Cargo.toml +++ b/crates/web3_test_proxy_client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "web3_test_proxy_client" -version = "0.4.7" +version = "0.4.8" description = "Proxy for web3 test proxy" authors = ["Sieciech Czajka "] edition = "2021" From 4d33136ab22d542dfd71ead5050980cdb3996b91 Mon Sep 17 00:00:00 2001 From: scx1332 Date: Wed, 21 Aug 2024 12:12:31 +0200 Subject: [PATCH 16/18] Remove bollard from main dependency line --- Cargo.lock | 1 - crates/erc20_rpc_pool/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b1fbef71..15b3b6c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1346,7 +1346,6 @@ dependencies = [ "actix-web", "anyhow", "awc", - "bollard", "chrono", "dotenv", "env_logger", diff --git a/crates/erc20_rpc_pool/Cargo.toml b/crates/erc20_rpc_pool/Cargo.toml index 05249d91..d59ee37b 100644 --- a/crates/erc20_rpc_pool/Cargo.toml +++ b/crates/erc20_rpc_pool/Cargo.toml @@ -11,7 +11,6 @@ actix-files = { workspace = true } actix-web = { workspace = true } anyhow = { workspace = true } awc = { workspace = true } -bollard = { workspace = true } chrono = { workspace = true, features = ["serde"] } dotenv = { workspace = true } env_logger = { workspace = true } From fc1e81d14488fa954be3ae4f9580dc2182c9cacf Mon Sep 17 00:00:00 2001 From: scx1332 Date: Wed, 21 Aug 2024 12:13:30 +0200 Subject: [PATCH 17/18] Pin version of libraries to prevent issues in future --- Cargo.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ee231fcf..603c91a3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -77,11 +77,11 @@ web3 = { version = "0.19", default-features = false, features = [ "http-rustls-tls", ] } # local dependencies -erc20_rpc_pool = { path = "crates/erc20_rpc_pool", version = "0.4.8" } -erc20_payment_lib = { path = "crates/erc20_payment_lib", version = "0.4.8" } -erc20_payment_lib_common = { path = "crates/erc20_payment_lib_common", version = "0.4.8" } -erc20_payment_lib_extra = { path = "crates/erc20_payment_lib_extra", version = "0.4.8" } -web3_test_proxy_client = { path = "crates/web3_test_proxy_client", version = "0.4.8" } +erc20_rpc_pool = { path = "crates/erc20_rpc_pool", version = "=0.4.8" } +erc20_payment_lib = { path = "crates/erc20_payment_lib", version = "=0.4.8" } +erc20_payment_lib_common = { path = "crates/erc20_payment_lib_common", version = "=0.4.8" } +erc20_payment_lib_extra = { path = "crates/erc20_payment_lib_extra", version = "=0.4.8" } +web3_test_proxy_client = { path = "crates/web3_test_proxy_client", version = "=0.4.8" } [dependencies] actix-cors = { workspace = true } From 4200567b931af64f4fb1f6b756dd6d051576b64f Mon Sep 17 00:00:00 2001 From: scx1332 Date: Mon, 9 Sep 2024 13:53:16 +0200 Subject: [PATCH 18/18] Fix endlines in migration file so it match version deployed to crates --- .../migrations/20240422000000_clean_deposit_id.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/erc20_payment_lib_common/migrations/20240422000000_clean_deposit_id.sql b/crates/erc20_payment_lib_common/migrations/20240422000000_clean_deposit_id.sql index c11481ea..e11d35c7 100644 --- a/crates/erc20_payment_lib_common/migrations/20240422000000_clean_deposit_id.sql +++ b/crates/erc20_payment_lib_common/migrations/20240422000000_clean_deposit_id.sql @@ -1,2 +1,2 @@ --- Deposit id is interpreted as composite of deposit id and deposit contract address. +-- Deposit id is interpreted as composite of deposit id and deposit contract address. DELETE FROM token_transfer WHERE deposit_id IS NOT NULL; \ No newline at end of file