From 384d1a36ea9fdf7a4705cfbd65ce318df8fba548 Mon Sep 17 00:00:00 2001 From: John Kane Date: Thu, 11 Apr 2024 13:19:24 +0100 Subject: [PATCH 1/8] docs(ignition): include config option `maxFeePerGasLimit` As this is a per-network config option the configuration page had to be restructured to support both global and per-network config. --- .../src/content/ignition/docs/config/index.md | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/docs/src/content/ignition/docs/config/index.md b/docs/src/content/ignition/docs/config/index.md index 179e3fa87cb..733fea94d00 100644 --- a/docs/src/content/ignition/docs/config/index.md +++ b/docs/src/content/ignition/docs/config/index.md @@ -1,5 +1,9 @@ # Configuration +Hardhat Ignition has configuration options at both the global and network level. + +## Configuration options + You can use the `ignition` field in the Hardhat config to customize how Hardhat Ignition behaves: ```js @@ -14,8 +18,6 @@ module.exports = { }; ``` -## Configuration options - These are the different options you can add to your Hardhat config file. ### `blockPollingInterval` @@ -41,3 +43,30 @@ Default value: 4. The number of confirmations Hardhat Ignition waits before considering a transaction as complete. This provides control over block re-org risk. Default value: 5 + +## Network configuration options + +You can use the `ignition` field under specific network configurations to customize deployments on a per-network basis: + +```js +// hardhat.config.js +module.exports = { + networks: { + sepolia: { + // ... + ignition: { + maxFeePerGasLimit: 50_000_000_000n, // 50 gwei + }, + // ... + }, + }, +}; +``` + +These are the different options you can add to the per-network `ignition` config. + +### `maxFeePerGasLimit` + +If set, places a limit on the maximum fee per gas that Hardhat Ignition will allow when sending transactions. If Hardhat Ignition's calculated max fee per gas is higher than the limit, the deployment will be stopped with an error. This is useful for preventing accidental high fees during busy periods. + +Default value: undefined From 9ee0633a5a9e01d932e3c7c4ac3e82809912a0c7 Mon Sep 17 00:00:00 2001 From: zoeyTM Date: Mon, 11 Dec 2023 20:51:03 -0500 Subject: [PATCH 2/8] add deployments task to ignition docs --- docs/src/content/ignition/docs/guides/deploy.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/src/content/ignition/docs/guides/deploy.md b/docs/src/content/ignition/docs/guides/deploy.md index fda0b3e8b8f..852c533d12c 100644 --- a/docs/src/content/ignition/docs/guides/deploy.md +++ b/docs/src/content/ignition/docs/guides/deploy.md @@ -76,15 +76,23 @@ To pass a `bigint` as a Module parameter, you can encode it as a string. Any str ## Inspecting an existing deployment +To get a list of all the deployment IDs that exist in the current project, run: + +```sh +npx hardhat ignition deployments +``` + To check on the current status of a deployment, run: ```sh npx hardhat ignition status DeploymentId ``` -If you run it on the [Quick Start guide](../getting-started/index.md#quick-start) project after executing the deploying, you'd see something like this: +If you run these tasks on the [Quick Start guide](../getting-started/index.md#quick-start) project after executing the deployment, you'd see something like this: ``` +$ npx hardhat ignition deployments +chain-31337 $ npx hardhat ignition status chain-31337 [ chain-31337 ] successfully deployed 🚀 From e5f048eb597f5e8160c0aa934244dc49f34bb2a5 Mon Sep 17 00:00:00 2001 From: Wodann Date: Fri, 12 Apr 2024 09:51:47 -0500 Subject: [PATCH 3/8] build: remove support for i686 & arm windows builds (#5108) --- .changeset/silver-sheep-exist.md | 5 +++ .github/workflows/edr-npm-release.yml | 20 ----------- .../02_development/04_update_napi_targets.md | 21 +++++++++++ book/src/SUMMARY.md | 1 + crates/edr_napi/index.js | 35 +++++++++++++------ .../edr_napi/npm/win32-arm64-msvc/README.md | 3 -- .../npm/win32-arm64-msvc/package.json | 22 ------------ crates/edr_napi/npm/win32-ia32-msvc/README.md | 3 -- .../edr_napi/npm/win32-ia32-msvc/package.json | 22 ------------ crates/edr_napi/package.json | 6 ++-- pnpm-lock.yaml | 8 ++--- 11 files changed, 58 insertions(+), 88 deletions(-) create mode 100644 .changeset/silver-sheep-exist.md create mode 100644 book/src/02_development/04_update_napi_targets.md delete mode 100644 crates/edr_napi/npm/win32-arm64-msvc/README.md delete mode 100644 crates/edr_napi/npm/win32-arm64-msvc/package.json delete mode 100644 crates/edr_napi/npm/win32-ia32-msvc/README.md delete mode 100644 crates/edr_napi/npm/win32-ia32-msvc/package.json diff --git a/.changeset/silver-sheep-exist.md b/.changeset/silver-sheep-exist.md new file mode 100644 index 00000000000..6ead891addb --- /dev/null +++ b/.changeset/silver-sheep-exist.md @@ -0,0 +1,5 @@ +--- +"@nomicfoundation/edr": patch +--- + +Removed i686 & ARM builds of EDR diff --git a/.github/workflows/edr-npm-release.yml b/.github/workflows/edr-npm-release.yml index 5dc8bdf5bc4..e6726d3e811 100644 --- a/.github/workflows/edr-npm-release.yml +++ b/.github/workflows/edr-npm-release.yml @@ -37,11 +37,6 @@ jobs: - host: windows-latest build: pnpm build target: x86_64-pc-windows-msvc - - host: windows-latest - build: | - pnpm build --target i686-pc-windows-msvc - pnpm testNoBuild - target: i686-pc-windows-msvc - host: ubuntu-latest target: x86_64-unknown-linux-gnu docker: ghcr.io/napi-rs/napi-rs/nodejs-rust@sha256:4b2638c0987845c4ab3488574a215a2a866b99fb28588788786f2b8cbcb40e71 @@ -85,9 +80,6 @@ jobs: rustup target add aarch64-unknown-linux-musl && pnpm run build --target aarch64-unknown-linux-musl && /aarch64-linux-musl-cross/bin/aarch64-linux-musl-strip *.node - - host: windows-latest - target: aarch64-pc-windows-msvc - build: pnpm build --target aarch64-pc-windows-msvc name: stable - ${{ matrix.settings.target }} - node@18 runs-on: ${{ matrix.settings.host }} defaults: @@ -131,20 +123,8 @@ jobs: if: ${{ matrix.settings.target == 'armv7-unknown-linux-gnueabihf' }} with: version: 0.10.1 - - name: Setup node x86 - if: matrix.settings.target == 'i686-pc-windows-msvc' - run: pnpm config set supportedArchitectures.cpu "ia32" - shell: bash - name: Install dependencies run: pnpm install --frozen-lockfile --prefer-offline - - name: Setup node x86 - uses: actions/setup-node@v3 - if: matrix.settings.target == 'i686-pc-windows-msvc' - with: - node-version: 18 - check-latest: true - cache: pnpm - architecture: x86 - name: Build in docker uses: addnab/docker-run-action@v3 if: ${{ matrix.settings.docker }} diff --git a/book/src/02_development/04_update_napi_targets.md b/book/src/02_development/04_update_napi_targets.md new file mode 100644 index 00000000000..04800909a6b --- /dev/null +++ b/book/src/02_development/04_update_napi_targets.md @@ -0,0 +1,21 @@ +First, install `@napi-rs/cli`: + +```bash +npm -g i @napi-rs/cli +``` + +Then follow the steps in [this document](https://napi.rs/docs/introduction/simple-package) to generate a package with the desired supported target triples. + +You will be prompted for several inputs. +Use the package name `@nomicfoundation/edr` and select the desired target triples. + +Once done, replace the `napi.triples.additional` entries in `crates/edr_napi/package.json` with the values in the generated `package.json` and replace `crates/edr_napi/npm` with the generated `npm` folder. + +Ensure that the `version` field of all `npm/*/package.json` files is set to the latest release and `engines.node` to the minimum supported version. + +Finally, to update the `index.js`, run: + +```bash +cd crates/edr_napi && +pnpm build +``` diff --git a/book/src/SUMMARY.md b/book/src/SUMMARY.md index 2814d214e5d..a5be880ce69 100644 --- a/book/src/SUMMARY.md +++ b/book/src/SUMMARY.md @@ -11,6 +11,7 @@ - [Tools](02_development/01_tools.md) - [Verdaccio](02_development/02_verdaccio.md) - [Local release](02_development/03_local_release.md) + - [Update N-API targets](02_development/04_update_napi_targets.md) - [Release](./03_release.md) diff --git a/crates/edr_napi/index.js b/crates/edr_napi/index.js index fa78a47ad14..694d88b81b6 100644 --- a/crates/edr_napi/index.js +++ b/crates/edr_napi/index.js @@ -224,17 +224,32 @@ switch (platform) { } break case 'arm': - localFileExisted = existsSync( - join(__dirname, 'edr.linux-arm-gnueabihf.node') - ) - try { - if (localFileExisted) { - nativeBinding = require('./edr.linux-arm-gnueabihf.node') - } else { - nativeBinding = require('@nomicfoundation/edr-linux-arm-gnueabihf') + if (isMusl()) { + localFileExisted = existsSync( + join(__dirname, 'edr.linux-arm-musleabihf.node') + ) + try { + if (localFileExisted) { + nativeBinding = require('./edr.linux-arm-musleabihf.node') + } else { + nativeBinding = require('@nomicfoundation/edr-linux-arm-musleabihf') + } + } catch (e) { + loadError = e + } + } else { + localFileExisted = existsSync( + join(__dirname, 'edr.linux-arm-gnueabihf.node') + ) + try { + if (localFileExisted) { + nativeBinding = require('./edr.linux-arm-gnueabihf.node') + } else { + nativeBinding = require('@nomicfoundation/edr-linux-arm-gnueabihf') + } + } catch (e) { + loadError = e } - } catch (e) { - loadError = e } break case 'riscv64': diff --git a/crates/edr_napi/npm/win32-arm64-msvc/README.md b/crates/edr_napi/npm/win32-arm64-msvc/README.md deleted file mode 100644 index 1e674db1947..00000000000 --- a/crates/edr_napi/npm/win32-arm64-msvc/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# `@nomicfoundation/edr-win32-arm64-msvc` - -This is the **aarch64-pc-windows-msvc** binary for `edr` diff --git a/crates/edr_napi/npm/win32-arm64-msvc/package.json b/crates/edr_napi/npm/win32-arm64-msvc/package.json deleted file mode 100644 index 8ea880093b4..00000000000 --- a/crates/edr_napi/npm/win32-arm64-msvc/package.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "@nomicfoundation/edr-win32-arm64-msvc", - "repository": { - "url": "https://github.com/NomicFoundation/hardhat.git", - "type": "git" - }, - "version": "0.2.0-alpha.1", - "os": [ - "win32" - ], - "cpu": [ - "arm64" - ], - "main": "edr.win32-arm64-msvc.node", - "files": [ - "edr.win32-arm64-msvc.node" - ], - "license": "MIT", - "engines": { - "node": ">= 10" - } -} diff --git a/crates/edr_napi/npm/win32-ia32-msvc/README.md b/crates/edr_napi/npm/win32-ia32-msvc/README.md deleted file mode 100644 index fff570053d0..00000000000 --- a/crates/edr_napi/npm/win32-ia32-msvc/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# `@nomicfoundation/edr-win32-ia32-msvc` - -This is the **i686-pc-windows-msvc** binary for `@nomicfoundation/edr` diff --git a/crates/edr_napi/npm/win32-ia32-msvc/package.json b/crates/edr_napi/npm/win32-ia32-msvc/package.json deleted file mode 100644 index 9312f759e07..00000000000 --- a/crates/edr_napi/npm/win32-ia32-msvc/package.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "@nomicfoundation/edr-win32-ia32-msvc", - "repository": { - "url": "https://github.com/NomicFoundation/hardhat.git", - "type": "git" - }, - "version": "0.2.0-alpha.1", - "os": [ - "win32" - ], - "cpu": [ - "ia32" - ], - "main": "edr.win32-ia32-msvc.node", - "files": [ - "edr.win32-ia32-msvc.node" - ], - "license": "MIT", - "engines": { - "node": ">= 18" - } -} diff --git a/crates/edr_napi/package.json b/crates/edr_napi/package.json index 56ea7b70fca..74cac38b983 100644 --- a/crates/edr_napi/package.json +++ b/crates/edr_napi/package.json @@ -19,17 +19,15 @@ "triples": { "additional": [ "aarch64-apple-darwin", - "aarch64-pc-windows-msvc", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", - "x86_64-unknown-linux-musl", - "i686-pc-windows-msvc" + "x86_64-unknown-linux-musl" ] } }, "license": "MIT", "devDependencies": { - "@napi-rs/cli": "^2.16.3", + "@napi-rs/cli": "^2.18.1", "@types/chai": "^4.2.0", "@types/chai-as-promised": "^7.1.8", "@types/mocha": ">=9.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 299b5beab62..0d11e923373 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -30,8 +30,8 @@ importers: crates/edr_napi: devDependencies: '@napi-rs/cli': - specifier: ^2.16.3 - version: 2.18.0 + specifier: ^2.18.1 + version: 2.18.1 '@types/chai': specifier: ^4.2.0 version: 4.3.12 @@ -3214,8 +3214,8 @@ packages: tweetnacl-util: 0.15.1 dev: false - /@napi-rs/cli@2.18.0: - resolution: {integrity: sha512-lfSRT7cs3iC4L+kv9suGYQEezn5Nii7Kpu+THsYVI0tA1Vh59LH45p4QADaD7hvIkmOz79eEGtoKQ9nAkAPkzA==} + /@napi-rs/cli@2.18.1: + resolution: {integrity: sha512-N4iTeip2VSk0RftgDGuk7IBrgOST/WPUSA3lYstILXsNifR3tHugcbLzo04+OtSrMc+ZUPsXo3Jd1t3dlswAlw==} engines: {node: '>= 10'} hasBin: true dev: true From 5e6de4fb536707fda86796e2fad2b616589c3574 Mon Sep 17 00:00:00 2001 From: Wodann Date: Fri, 5 Apr 2024 10:08:02 +0000 Subject: [PATCH 4/8] WIP: fix: full block run --- crates/edr_provider/src/data.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/crates/edr_provider/src/data.rs b/crates/edr_provider/src/data.rs index 39532995273..5cde09d4a97 100644 --- a/crates/edr_provider/src/data.rs +++ b/crates/edr_provider/src/data.rs @@ -3743,5 +3743,10 @@ mod tests { chain_id: 1, url: get_alchemy_url(), }, + mainnet_cancun2 => { + block_number: 19_562_047, + chain_id: 1, + url: get_alchemy_url(), + }, } } From 6b022f8b832ac6f3a1c41f06ed9d2409cc12e3b8 Mon Sep 17 00:00:00 2001 From: Wodann Date: Mon, 8 Apr 2024 08:26:37 +0000 Subject: [PATCH 5/8] build: update dependencies --- Cargo.lock | 974 +++++++++--------- crates/edr_eth/Cargo.toml | 8 +- crates/edr_eth/src/block/reward.rs | 3 +- crates/edr_eth/src/lib.rs | 6 +- crates/edr_eth/src/remote/block_spec.rs | 2 +- crates/edr_eth/src/remote/eth/call_request.rs | 5 +- crates/edr_eth/src/serde.rs | 2 +- .../src/transaction/request/eip1559.rs | 2 +- .../src/transaction/request/eip2930.rs | 2 +- .../src/transaction/request/eip4844.rs | 2 +- .../edr_eth/src/transaction/request/legacy.rs | 2 +- .../edr_eth/src/transaction/signed/eip155.rs | 2 +- .../edr_eth/src/transaction/signed/eip1559.rs | 2 +- .../edr_eth/src/transaction/signed/eip2930.rs | 2 +- .../edr_eth/src/transaction/signed/eip4844.rs | 3 +- .../edr_eth/src/transaction/signed/legacy.rs | 2 +- crates/edr_evm/Cargo.toml | 4 +- crates/edr_evm/src/mempool.rs | 10 +- crates/edr_evm/src/trace.rs | 8 +- crates/edr_provider/Cargo.toml | 2 +- 20 files changed, 537 insertions(+), 506 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 47ed9ad9bf0..5491a6dbaf2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,20 +19,21 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[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", ] @@ -45,9 +46,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "alloy-primitives" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c0e5e60ff0e0c34c553822dabcfe0f5fece5a8c52f08a915be8c737de4b03fa" +checksum = "9c234f92024707f224510ff82419b2be0e1d8e1fd911defcac5a085cd7f83898" dependencies = [ "alloy-rlp", "bytes", @@ -56,6 +57,7 @@ dependencies = [ "derive_more", "hex-literal", "itoa", + "keccak-asm", "proptest", "rand", "ruint", @@ -65,9 +67,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef197eb250c64962003cb08b90b17f0882c192f4a6f2f544809d424fd7cb0e7d" +checksum = "99bbad0a6b588ef4aec1b5ddbbfdacd9ef04e00b979617765b03174318ee1f3a" dependencies = [ "alloy-rlp", "bytes", @@ -77,9 +79,6 @@ dependencies = [ "getrandom", "hex-literal", "itoa", - "k256", - "keccak-asm", - "proptest", "rand", "ruint", "serde", @@ -88,52 +87,51 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc0fac0fc16baf1f63f78b47c3d24718f3619b0714076f6a02957d808d52cbef" +checksum = "8d58d9f5da7b40e9bfff0b7e7816700be4019db97d4b6359fe7f94a9e22e42ac" dependencies = [ "alloy-rlp-derive", "arrayvec", "bytes", - "smol_str", ] [[package]] name = "alloy-rlp-derive" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0391754c09fab4eae3404d19d0d297aa1c670c1775ab51d8a5312afeca23157" +checksum = "1a047897373be4bbb0224c1afdabca92648dc57a9c9ef6e7b0be3aff7a859c83" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] name = "alloy-sol-macro" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e40cea54ac58080a1b88ea6556866eac1902b321186c77d53ad2b5ebbbf0e038" +checksum = "970e5cf1ca089e964d4f7f7afc7c9ad642bfb1bdc695a20b0cba3b3c28954774" dependencies = [ "const-hex", "dunce", "heck", - "indexmap 2.0.2", + "indexmap 2.2.6", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", "syn-solidity", "tiny-keccak", ] [[package]] name = "alloy-sol-types" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81aa34725607be118c395d62c1d8d97c8a343dd1ada5370ed508ed5232eab6a" +checksum = "2a059d4d2c78f8f21e470772c75f9abd9ac6d48c2aaf6b278d1ead06ed9ac664" dependencies = [ - "alloy-primitives 0.5.3", + "alloy-primitives 0.5.4", "alloy-sol-macro", "const-hex", "serde", @@ -171,9 +169,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "ark-ff" @@ -336,13 +334,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] @@ -374,20 +372,20 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -406,9 +404,9 @@ checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -439,9 +437,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", ] @@ -482,9 +480,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "byte-slice-cast" @@ -500,18 +498,18 @@ 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" dependencies = [ "serde", ] [[package]] name = "c-kzg" -version = "0.4.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a4bc5367b6284358d2a6a6a1dc2d92ec4b86034561c3b9d3341909752fd848" +checksum = "3130f3d8717cc02e668a896af24984d5d5d4e8bf12e278e982e0f1bd88a0f9af" dependencies = [ "blst", "cc", @@ -539,12 +537,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "1fd97381a8cc6493395a5afc4c691c1084b3768db713b73aa215217aa245d153" [[package]] name = "cfg-if" @@ -554,21 +549,21 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "windows-targets 0.48.5", + "windows-targets 0.52.4", ] [[package]] name = "ciborium" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ "ciborium-io", "ciborium-ll", @@ -577,15 +572,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" [[package]] name = "ciborium-ll" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", "half", @@ -655,9 +650,9 @@ dependencies = [ [[package]] name = "const-hex" -version = "1.10.0" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5104de16b218eddf8e34ffe2f86f74bfa4e61e95a1b89732fccf6325efd0557" +checksum = "5ba00838774b4ab0233e355d26710fbfc8327a05c017f6dc4873f876d1f79f78" dependencies = [ "cfg-if", "cpufeatures", @@ -668,9 +663,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "convert_case" @@ -689,9 +684,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -699,15 +694,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -758,11 +753,11 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "cfg-if", + "crossbeam-utils", ] [[package]] @@ -798,9 +793,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.5.0" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071c0f5945634bc9ba7a452f492377dd6b1993665ddb58f28704119b32f07a9a" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", "rand_core", @@ -820,12 +815,12 @@ dependencies = [ [[package]] name = "ctor" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583" +checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" dependencies = [ "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] @@ -870,17 +865,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.1", + "hashbrown 0.14.3", "lock_api", "once_cell", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.9", ] [[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", @@ -977,15 +972,15 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "dyn-clone" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "ecdsa" -version = "0.16.8" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ "der", "digest 0.10.7", @@ -1003,7 +998,6 @@ version = "0.2.0-dev" name = "edr_eth" version = "0.2.0-dev" dependencies = [ - "alloy-primitives 0.6.3", "alloy-rlp", "anyhow", "assert-json-diff", @@ -1056,7 +1050,7 @@ dependencies = [ "edr_test_utils", "futures", "hasher", - "indexmap 2.0.2", + "indexmap 2.2.6", "itertools 0.11.0", "lazy_static", "log", @@ -1083,7 +1077,7 @@ dependencies = [ "edr_eth", "edr_evm", "edr_provider", - "itertools 0.12.0", + "itertools 0.12.1", "k256", "lazy_static", "log", @@ -1115,8 +1109,8 @@ dependencies = [ "edr_evm", "edr_test_utils", "ethers-core", - "indexmap 2.0.2", - "itertools 0.12.0", + "indexmap 2.2.6", + "itertools 0.12.1", "k256", "lazy_static", "log", @@ -1153,9 +1147,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "elliptic-curve" @@ -1194,13 +1188,13 @@ dependencies = [ [[package]] name = "enumn" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" +checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] @@ -1211,12 +1205,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1278,9 +1272,9 @@ dependencies = [ [[package]] name = "ethers-core" -version = "2.0.12" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918b1a9ba585ea61022647def2f27c29ba19f6d2a4a4c8f68a9ae97fd5769737" +checksum = "82d80cc6ad30b14a48ab786523af33b37f28a8623fc06afd55324816ef18fb1f" dependencies = [ "arrayvec", "bytes", @@ -1311,9 +1305,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fastrlp" @@ -1381,9 +1375,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -1396,9 +1390,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1411,9 +1405,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1421,15 +1415,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1438,38 +1432,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1496,9 +1490,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "a06fddc2749e0528d2813f95e050e87e52c8cbbae56223b9babf73b3e53b0cc6" dependencies = [ "cfg-if", "js-sys", @@ -1509,9 +1503,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -1532,9 +1526,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1542,7 +1536,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -1551,9 +1545,13 @@ dependencies = [ [[package]] name = "half" -version = "1.8.2" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] [[package]] name = "hash-db" @@ -1578,9 +1576,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.1" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", "allocator-api2", @@ -1612,9 +1610,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1642,9 +1640,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1653,9 +1651,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -1676,9 +1674,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -1691,7 +1689,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", @@ -1713,16 +1711,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1742,9 +1740,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1800,19 +1798,19 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.1", + "hashbrown 0.14.3", ] [[package]] name = "indicatif" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" dependencies = [ "console", "instant", @@ -1836,9 +1834,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "itertools" @@ -1860,24 +1858,24 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1893,14 +1891,13 @@ dependencies = [ "elliptic-curve", "once_cell", "sha2", - "signature", ] [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] @@ -1926,18 +1923,18 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.149" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.4", ] [[package]] @@ -1958,15 +1955,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1974,17 +1971,17 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lru" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.14.1", + "hashbrown 0.14.3", ] [[package]] @@ -2004,9 +2001,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "mimalloc" @@ -2035,18 +2032,18 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", @@ -2055,12 +2052,12 @@ dependencies = [ [[package]] name = "mockito" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8d3038e23466858569c2d30a537f691fa0d53b51626630ae08262943e3bbb8b" +checksum = "d2f6e023aa5bdf392aa06c78e4a4e6d498baab5138d0c993503350ebbc37bf1e" dependencies = [ "assert-json-diff", - "futures", + "futures-core", "hyper", "log", "rand", @@ -2073,12 +2070,12 @@ dependencies = [ [[package]] name = "napi" -version = "2.16.0" +version = "2.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a63d0570e4c3e0daf7a8d380563610e159f538e20448d6c911337246f40e84" +checksum = "c4ca998356d8ff9fba7a070dae4508a2298439c98c9f3bc9c07669538b999e8f" dependencies = [ "anyhow", - "bitflags 2.4.2", + "bitflags 2.5.0", "ctor", "napi-derive", "napi-sys", @@ -2090,37 +2087,37 @@ dependencies = [ [[package]] name = "napi-build" -version = "2.0.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e" +checksum = "2f9130fccc5f763cf2069b34a089a18f0d0883c66aceb81f2fad541a3d823c43" [[package]] name = "napi-derive" -version = "2.16.0" +version = "2.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05bb7c37e3c1dda9312fdbe4a9fc7507fca72288ba154ec093e2d49114e727ce" +checksum = "b138cecf1141ae0ff5d62f4aa0e2f269aec339f66070f346ba6fb4279f1fc178" dependencies = [ "cfg-if", "convert_case 0.6.0", "napi-derive-backend", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] name = "napi-derive-backend" -version = "1.0.62" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f785a8b8d7b83e925f5aa6d2ae3c159d17fe137ac368dc185bef410e7acdaeb4" +checksum = "ce5126b64f6ad9e28e30e6d15213dd378626b38f556454afebc42f7f02a90902" dependencies = [ "convert_case 0.6.0", "once_cell", "proc-macro2", "quote", "regex", - "semver 1.0.20", - "syn 2.0.38", + "semver 1.0.22", + "syn 2.0.58", ] [[package]] @@ -2187,28 +2184,27 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "num-traits", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", "num-integer", @@ -2229,9 +2225,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -2243,7 +2239,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi 0.3.9", "libc", ] @@ -2262,10 +2258,10 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] @@ -2276,9 +2272,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -2322,11 +2318,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -2343,7 +2339,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] @@ -2354,18 +2350,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.1.5+3.1.3" +version = "300.2.3+3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559068e4c12950d7dcaa1857a61725c0d38d4fc03ff8e070ab31a75d6e316491" +checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -2376,9 +2372,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.5.1" +version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" [[package]] name = "overload" @@ -2388,9 +2384,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parity-scale-codec" -version = "3.6.5" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" +checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" dependencies = [ "arrayvec", "bitvec", @@ -2402,11 +2398,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.5" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" +checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 1.0.109", @@ -2430,7 +2426,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.9", ] [[package]] @@ -2449,13 +2445,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -2477,15 +2473,15 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" dependencies = [ "memchr", "thiserror", @@ -2494,9 +2490,9 @@ dependencies = [ [[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" @@ -2516,9 +2512,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plotters" @@ -2581,7 +2577,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", ] [[package]] @@ -2610,28 +2624,28 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] [[package]] name = "proptest" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.4.2", + "bitflags 2.5.0", "lazy_static", "num-traits", "rand", "rand_chacha", "rand_xorshift", - "regex-syntax 0.7.5", + "regex-syntax 0.8.3", "rusty-fork", "tempfile", "unarray", @@ -2645,9 +2659,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -2699,9 +2713,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -2728,23 +2742,23 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.10.0" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.1", - "regex-syntax 0.8.0", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -2758,13 +2772,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.1" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.0", + "regex-syntax 0.8.3", ] [[package]] @@ -2775,21 +2789,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "regex-syntax" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3cbb081b9784b07cceb8824c8583f86db4814d172ab043f3c23f7dc600bf83d" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64", "bytes", @@ -2810,9 +2818,11 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", @@ -2826,9 +2836,9 @@ dependencies = [ [[package]] name = "reqwest-middleware" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a3e86aa6053e59030e7ce2d2a3b258dd08fc2d337d52f73f6cb480f5858690" +checksum = "5a735987236a8e238bf0296c7e351b999c188ccc11477f311b82b55c93984216" dependencies = [ "anyhow", "async-trait", @@ -2864,9 +2874,9 @@ dependencies = [ [[package]] name = "reqwest-tracing" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0152176687dd5cfe7f507ac1cb1a491c679cfe483afd133a7db7aaea818bb3" +checksum = "190838e54153d7a7e2ea98851304b3ce92daeabf14c54d32b01b84a3e636f683" dependencies = [ "anyhow", "async-trait", @@ -2891,9 +2901,8 @@ dependencies = [ [[package]] name = "revm" -version = "7.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "217d21144d329f21d5245b8e6a46e0d6d0a527d9917d7a087f225b161e529169" +version = "8.0.0" +source = "git+https://github.com/Wodann/revm?rev=abacdd3#abacdd39f4fda24ec57e4965410cd5c52191858a" dependencies = [ "auto_impl", "cfg-if", @@ -2905,9 +2914,8 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "776848391ed76d5103ca1aa1632cd21b521e2870afb30b63723da862d69efd0f" +version = "4.0.0" +source = "git+https://github.com/Wodann/revm?rev=abacdd3#abacdd39f4fda24ec57e4965410cd5c52191858a" dependencies = [ "revm-primitives", "serde", @@ -2915,9 +2923,8 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3fd1856a7cb09197a02669d779e1afb5a627b0888a24814ba2b6a1ad4c3ff8d" +version = "6.0.0" +source = "git+https://github.com/Wodann/revm?rev=abacdd3#abacdd39f4fda24ec57e4965410cd5c52191858a" dependencies = [ "aurora-engine-modexp", "k256", @@ -2930,19 +2937,18 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4d7d3e793e907dc0797a9d3b43abfdf5226d133855214db9bd27d4cee33ebd" +version = "3.1.1" +source = "git+https://github.com/Wodann/revm?rev=abacdd3#abacdd39f4fda24ec57e4965410cd5c52191858a" dependencies = [ - "alloy-primitives 0.6.3", + "alloy-primitives 0.7.0", "auto_impl", - "bitflags 2.4.2", + "bitflags 2.5.0", "bitvec", "c-kzg", "cfg-if", "dyn-clone", "enumn", - "hashbrown 0.14.1", + "hashbrown 0.14.3", "hex", "serde", ] @@ -2990,9 +2996,9 @@ dependencies = [ [[package]] name = "ruint" -version = "1.11.1" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608a5726529f2f0ef81b8fde9873c4bb829d6b5b5ca6be4d97345ddf0749c825" +checksum = "8f308135fef9fc398342da5472ce7c484529df23743fb7c734e0f3d472971e62" dependencies = [ "alloy-rlp", "ark-ff 0.3.0", @@ -3014,9 +3020,9 @@ dependencies = [ [[package]] name = "ruint-macro" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e666a5496a0b2186dbcd0ff6106e29e093c15591bde62c20d3842007c6978a09" +checksum = "f86854cf50259291520509879a5c294c3c9a4c334e9ff65071c51e42ef1e2343" [[package]] name = "rustc-demangle" @@ -3045,27 +3051,36 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.20", + "semver 1.0.22", ] [[package]] name = "rustix" -version = "0.38.18" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "rusty-fork" @@ -3081,9 +3096,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -3096,9 +3111,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60" +checksum = "788745a868b0e751750388f4e6546eb921ef714a4317fa6954f7cde114eb2eb7" dependencies = [ "cfg-if", "derive_more", @@ -3108,11 +3123,11 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19" +checksum = "7dc2f4e8bc344b9fc3d5f74f72c2e55bfc38d28dc2ebc69c194a3df424e4d9ac" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -3120,11 +3135,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3149,9 +3164,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -3162,9 +3177,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" dependencies = [ "core-foundation-sys", "libc", @@ -3181,9 +3196,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "semver-parser" @@ -3196,29 +3211,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.189" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.189" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa", "ryu", @@ -3227,9 +3242,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -3268,7 +3283,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] @@ -3311,20 +3326,11 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - [[package]] name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", "rand_core", @@ -3332,9 +3338,9 @@ dependencies = [ [[package]] name = "similar" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" [[package]] name = "slab" @@ -3347,37 +3353,18 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "smol_str" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" -dependencies = [ - "serde", -] - -[[package]] -name = "socket2" -version = "0.4.9" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3388,9 +3375,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", @@ -3410,24 +3397,24 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.25.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] @@ -3462,9 +3449,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -3473,16 +3460,22 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2c7ad08db24862d5b787a94714ff6b047935c3e3f60af944ac969404debd7ff" +checksum = "91ede2e5b2c6bfac4bc0ff4499957a11725dc12a7ddb86270e827ef575892553" dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "system-configuration" version = "0.5.1" @@ -3521,57 +3514,56 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "textwrap" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -3622,9 +3614,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -3633,21 +3625,20 @@ dependencies = [ "num_cpus", "parking_lot 0.12.1", "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.4", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] @@ -3662,9 +3653,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -3692,14 +3683,14 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -3710,13 +3701,35 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", "winnow", ] +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow", +] + [[package]] name = "tools" version = "0.1.0" @@ -3751,11 +3764,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -3763,20 +3775,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] @@ -3822,9 +3834,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" @@ -3867,9 +3879,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -3879,18 +3891,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -3906,9 +3918,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -3917,9 +3929,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.4.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom", ] @@ -3953,9 +3965,9 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -3978,9 +3990,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3988,24 +4000,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -4015,9 +4027,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4025,22 +4037,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-timer" @@ -4059,9 +4071,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -4099,12 +4111,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.4", ] [[package]] @@ -4122,7 +4134,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -4142,17 +4154,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "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", ] [[package]] @@ -4163,9 +4175,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -4175,9 +4187,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -4187,9 +4199,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -4199,9 +4211,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -4211,9 +4223,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -4223,9 +4235,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -4235,15 +4247,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.5.16" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] @@ -4267,6 +4279,26 @@ dependencies = [ "tap", ] +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + [[package]] name = "zeroize" version = "1.7.0" @@ -4284,5 +4316,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] diff --git a/crates/edr_eth/Cargo.toml b/crates/edr_eth/Cargo.toml index eea1c7dbf45..ad031eca3e4 100644 --- a/crates/edr_eth/Cargo.toml +++ b/crates/edr_eth/Cargo.toml @@ -5,7 +5,6 @@ edition = "2021" [dependencies] anyhow = "1.0.75" -alloy-primitives = { version = "0.6", default-features = false, features = ["rand", "rlp"] } alloy-rlp = { version = "0.3", default-features = false, features = ["derive"] } futures = { version = "0.3.28", default-features = false } hash-db = { version = "0.15.2", default-features = false } @@ -20,7 +19,7 @@ reqwest = { version = "0.11", features = ["blocking", "json"] } reqwest-middleware = { version = "0.2.4", default-features = false } reqwest-retry = { version = "0.3.0", default-features = false } reqwest-tracing = { version = "0.4.7", default-features = false, optional = true } -revm-primitives = { version = "3.0", default-features = false } +revm-primitives = { git = "https://github.com/Wodann/revm", rev = "abacdd3", version = "3.1", default-features = false } serde = { version = "1.0.147", default-features = false, features = ["derive"], optional = true } serde_json = { version = "1.0.89", optional = true } sha3 = { version = "0.10.8", default-features = false } @@ -47,7 +46,8 @@ walkdir = { version = "2.3.3", default-features = false } [features] default = ["std"] -serde = ["dep:serde", "alloy-primitives/serde", "revm-primitives/serde", "serde_json"] -std = ["alloy-primitives/std", "futures/std", "hash256-std-hasher/std", "hash-db/std", "hex/std", "itertools/use_std", "k256/std", "k256/precomputed-tables", "serde?/std", "sha3/std", "triehash/std", "uuid/std"] +rand = ["revm-primitives/rand"] +serde = ["dep:serde", "revm-primitives/serde", "serde_json"] +std = ["futures/std", "hash256-std-hasher/std", "hash-db/std", "hex/std", "itertools/use_std", "k256/std", "k256/precomputed-tables", "serde?/std", "sha3/std", "triehash/std", "uuid/std"] tracing = ["dep:tracing", "reqwest-tracing"] test-remote = ["serde"] diff --git a/crates/edr_eth/src/block/reward.rs b/crates/edr_eth/src/block/reward.rs index bd2cece7f81..5d60424fc48 100644 --- a/crates/edr_eth/src/block/reward.rs +++ b/crates/edr_eth/src/block/reward.rs @@ -1,6 +1,7 @@ -use alloy_primitives::U256; use revm_primitives::SpecId; +use crate::U256; + /// Retrieves the miner reward for the provided hardfork. pub fn miner_reward(spec_id: SpecId) -> Option { match spec_id { diff --git a/crates/edr_eth/src/lib.rs b/crates/edr_eth/src/lib.rs index 55f37cd7944..1b563b3e487 100644 --- a/crates/edr_eth/src/lib.rs +++ b/crates/edr_eth/src/lib.rs @@ -40,8 +40,10 @@ pub mod trie; pub mod utils; pub mod withdrawal; -pub use alloy_primitives::{Bloom, BloomInput, B512, B64, U64}; -pub use revm_primitives::{hex_literal, AccountInfo, Address, Bytes, HashMap, SpecId, B256, U256}; +pub use revm_primitives::{ + alloy_primitives::{Bloom, BloomInput, B512, B64, U64}, + hex_literal, AccountInfo, Address, Bytes, HashMap, SpecId, B256, U256, +}; /// A secret key pub type Secret = B256; diff --git a/crates/edr_eth/src/remote/block_spec.rs b/crates/edr_eth/src/remote/block_spec.rs index a738d7dfd96..ffddb66fa2f 100644 --- a/crates/edr_eth/src/remote/block_spec.rs +++ b/crates/edr_eth/src/remote/block_spec.rs @@ -300,10 +300,10 @@ impl_block_tags!(PreEip1898BlockSpec); #[cfg(test)] mod tests { - use alloy_primitives::U256; use serde_json::json; use super::*; + use crate::U256; fn help_test_block_spec_serde(block_spec: BlockSpec) { let json = serde_json::json!(block_spec).to_string(); diff --git a/crates/edr_eth/src/remote/eth/call_request.rs b/crates/edr_eth/src/remote/eth/call_request.rs index c17b4e7f275..27ad3b096e2 100644 --- a/crates/edr_eth/src/remote/eth/call_request.rs +++ b/crates/edr_eth/src/remote/eth/call_request.rs @@ -1,7 +1,4 @@ -use alloy_primitives::Bytes; -use revm_primitives::{Address, B256}; - -use crate::{access_list::AccessListItem, U256}; +use crate::{access_list::AccessListItem, Address, Bytes, B256, U256}; /// For specifying input to methods requiring a transaction object, like /// `eth_call` and `eth_estimateGas` diff --git a/crates/edr_eth/src/serde.rs b/crates/edr_eth/src/serde.rs index cc856d6c0f9..05d9203f86f 100644 --- a/crates/edr_eth/src/serde.rs +++ b/crates/edr_eth/src/serde.rs @@ -172,7 +172,7 @@ pub mod optional_u64 { /// Helper module for (de)serializing [`std::primitive::u8`]s from and into /// `0x`-prefixed hexadecimal strings. pub mod u8 { - use alloy_primitives::U8; + use revm_primitives::alloy_primitives::U8; use super::{Deserialize, Deserializer, Serialize, Serializer}; diff --git a/crates/edr_eth/src/transaction/request/eip1559.rs b/crates/edr_eth/src/transaction/request/eip1559.rs index 8a6023c829f..2d6f1f5457c 100644 --- a/crates/edr_eth/src/transaction/request/eip1559.rs +++ b/crates/edr_eth/src/transaction/request/eip1559.rs @@ -1,8 +1,8 @@ use std::sync::OnceLock; -use alloy_primitives::keccak256; use alloy_rlp::{RlpDecodable, RlpEncodable}; use k256::SecretKey; +use revm_primitives::keccak256; use crate::{ access_list::AccessListItem, diff --git a/crates/edr_eth/src/transaction/request/eip2930.rs b/crates/edr_eth/src/transaction/request/eip2930.rs index f2a27650e2a..8c207c4f348 100644 --- a/crates/edr_eth/src/transaction/request/eip2930.rs +++ b/crates/edr_eth/src/transaction/request/eip2930.rs @@ -1,8 +1,8 @@ use std::sync::OnceLock; -use alloy_primitives::keccak256; use alloy_rlp::RlpEncodable; use k256::SecretKey; +use revm_primitives::keccak256; use crate::{ access_list::AccessListItem, diff --git a/crates/edr_eth/src/transaction/request/eip4844.rs b/crates/edr_eth/src/transaction/request/eip4844.rs index fe3ba4c9d14..123d91c974e 100644 --- a/crates/edr_eth/src/transaction/request/eip4844.rs +++ b/crates/edr_eth/src/transaction/request/eip4844.rs @@ -1,8 +1,8 @@ use std::sync::OnceLock; -use alloy_primitives::keccak256; use alloy_rlp::RlpEncodable; use k256::SecretKey; +use revm_primitives::keccak256; use crate::{ access_list::AccessListItem, diff --git a/crates/edr_eth/src/transaction/request/legacy.rs b/crates/edr_eth/src/transaction/request/legacy.rs index 4c69424e315..364f96a1b77 100644 --- a/crates/edr_eth/src/transaction/request/legacy.rs +++ b/crates/edr_eth/src/transaction/request/legacy.rs @@ -1,8 +1,8 @@ use std::sync::OnceLock; -use alloy_primitives::keccak256; use alloy_rlp::RlpEncodable; use k256::SecretKey; +use revm_primitives::keccak256; use crate::{ signature::{Signature, SignatureError}, diff --git a/crates/edr_eth/src/transaction/signed/eip155.rs b/crates/edr_eth/src/transaction/signed/eip155.rs index 68a44ac3b4e..c1be9070bf4 100644 --- a/crates/edr_eth/src/transaction/signed/eip155.rs +++ b/crates/edr_eth/src/transaction/signed/eip155.rs @@ -1,7 +1,7 @@ use std::sync::OnceLock; -use alloy_primitives::keccak256; use alloy_rlp::{RlpDecodable, RlpEncodable}; +use revm_primitives::keccak256; use super::LegacySignedTransaction; use crate::{ diff --git a/crates/edr_eth/src/transaction/signed/eip1559.rs b/crates/edr_eth/src/transaction/signed/eip1559.rs index cb6795f5cf0..d2ce26dd9f2 100644 --- a/crates/edr_eth/src/transaction/signed/eip1559.rs +++ b/crates/edr_eth/src/transaction/signed/eip1559.rs @@ -1,7 +1,7 @@ use std::sync::OnceLock; -use alloy_primitives::keccak256; use alloy_rlp::{RlpDecodable, RlpEncodable}; +use revm_primitives::keccak256; use crate::{ access_list::AccessList, diff --git a/crates/edr_eth/src/transaction/signed/eip2930.rs b/crates/edr_eth/src/transaction/signed/eip2930.rs index 2d363d4e81b..1f7726a7fa0 100644 --- a/crates/edr_eth/src/transaction/signed/eip2930.rs +++ b/crates/edr_eth/src/transaction/signed/eip2930.rs @@ -1,7 +1,7 @@ use std::sync::OnceLock; -use alloy_primitives::keccak256; use alloy_rlp::{RlpDecodable, RlpEncodable}; +use revm_primitives::keccak256; use crate::{ access_list::AccessList, diff --git a/crates/edr_eth/src/transaction/signed/eip4844.rs b/crates/edr_eth/src/transaction/signed/eip4844.rs index 78033a771f6..38e7cef56f2 100644 --- a/crates/edr_eth/src/transaction/signed/eip4844.rs +++ b/crates/edr_eth/src/transaction/signed/eip4844.rs @@ -1,8 +1,7 @@ use std::sync::OnceLock; -use alloy_primitives::keccak256; use alloy_rlp::{RlpDecodable, RlpEncodable}; -use revm_primitives::GAS_PER_BLOB; +use revm_primitives::{keccak256, GAS_PER_BLOB}; use crate::{ access_list::AccessList, diff --git a/crates/edr_eth/src/transaction/signed/legacy.rs b/crates/edr_eth/src/transaction/signed/legacy.rs index 9e7b6413501..4097250c1a4 100644 --- a/crates/edr_eth/src/transaction/signed/legacy.rs +++ b/crates/edr_eth/src/transaction/signed/legacy.rs @@ -1,7 +1,7 @@ use std::sync::OnceLock; -use alloy_primitives::keccak256; use alloy_rlp::{RlpDecodable, RlpEncodable}; +use revm_primitives::keccak256; use crate::{ signature::{Signature, SignatureError}, diff --git a/crates/edr_evm/Cargo.toml b/crates/edr_evm/Cargo.toml index 4aaaf40b707..5ec05d4e95b 100644 --- a/crates/edr_evm/Cargo.toml +++ b/crates/edr_evm/Cargo.toml @@ -20,8 +20,8 @@ log = { version = "0.4.17", default-features = false } once_cell = { version = "1.18.0", default-features = false, features = ["alloc", "race", "std"] } parking_lot = { version = "0.12.1", default-features = false } edr_defaults = { version = "0.2.0-dev", path = "../edr_defaults" } -edr_eth = { version = "0.2.0-dev", path = "../edr_eth", features = ["serde"] } -revm = { version = "7.1", default-features = false, features = ["dev", "serde"] } +edr_eth = { version = "0.2.0-dev", path = "../edr_eth", features = ["rand", "serde"] } +revm = { git = "https://github.com/Wodann/revm", rev = "abacdd3", version = "8.0", default-features = false, features = ["dev", "serde"] } serde = { version = "1.0.158", default-features = false, features = ["std"] } serde_json = { version = "1.0.94", default-features = false, features = ["std"] } thiserror = { version = "1.0.38", default-features = false } diff --git a/crates/edr_evm/src/mempool.rs b/crates/edr_evm/src/mempool.rs index 77eb30cf57d..11f02be4152 100644 --- a/crates/edr_evm/src/mempool.rs +++ b/crates/edr_evm/src/mempool.rs @@ -25,7 +25,7 @@ where /// Removes all pending transactions of the account corresponding to the /// provided address. pub fn remove_caller(&mut self, caller: &Address) -> Option> { - self.transactions.remove(caller) + self.transactions.shift_remove(caller) } } @@ -70,7 +70,7 @@ where }); if let Some(caller) = &to_be_removed { - self.transactions.remove(caller); + self.transactions.shift_remove(caller); } next @@ -336,7 +336,7 @@ impl MemPool { let removed = pending_transactions.remove(idx); if pending_transactions.is_empty() { - self.pending_transactions.remove(caller); + self.pending_transactions.shift_remove(caller); } self.future_transactions @@ -359,7 +359,7 @@ impl MemPool { let removed = future_transactions.remove(idx); if future_transactions.is_empty() { - self.future_transactions.remove(caller); + self.future_transactions.shift_remove(caller); } return Some(removed); @@ -503,7 +503,7 @@ impl MemPool { } if future_transactions.is_empty() { - self.future_transactions.remove(&caller); + self.future_transactions.shift_remove(&caller); } } diff --git a/crates/edr_evm/src/trace.rs b/crates/edr_evm/src/trace.rs index 41b6538cb35..301a72d4627 100644 --- a/crates/edr_evm/src/trace.rs +++ b/crates/edr_evm/src/trace.rs @@ -346,13 +346,13 @@ impl TraceCollector { let result = match safe_ret.into() { SuccessOrHalt::Success(reason) => ExecutionResult::Success { reason, - gas_used: outcome.gas().spend(), + gas_used: outcome.gas().spent(), gas_refunded: outcome.gas().refunded() as u64, logs: data.journaled_state.logs.clone(), output: Output::Call(outcome.output().clone()), }, SuccessOrHalt::Revert => ExecutionResult::Revert { - gas_used: outcome.gas().spend(), + gas_used: outcome.gas().spent(), output: outcome.output().clone(), }, SuccessOrHalt::Halt(reason) => ExecutionResult::Halt { @@ -407,13 +407,13 @@ impl TraceCollector { let result = match safe_ret.into() { SuccessOrHalt::Success(reason) => ExecutionResult::Success { reason, - gas_used: outcome.gas().spend(), + gas_used: outcome.gas().spent(), gas_refunded: outcome.gas().refunded() as u64, logs: data.journaled_state.logs.clone(), output: Output::Create(outcome.output().clone(), outcome.address), }, SuccessOrHalt::Revert => ExecutionResult::Revert { - gas_used: outcome.gas().spend(), + gas_used: outcome.gas().spent(), output: outcome.output().clone(), }, SuccessOrHalt::Halt(reason) => ExecutionResult::Halt { diff --git a/crates/edr_provider/Cargo.toml b/crates/edr_provider/Cargo.toml index ef603190f65..ac23b7bda07 100644 --- a/crates/edr_provider/Cargo.toml +++ b/crates/edr_provider/Cargo.toml @@ -8,7 +8,7 @@ alloy-sol-types = { version = "0.5.1", default-features = false, features = ["st anyhow = { version = "1.0.75", optional = true } dyn-clone = { version = "1.0.13", default-features = false } edr_defaults = { version = "0.2.0-dev", path = "../edr_defaults" } -edr_eth = { version = "0.2.0-dev", path = "../edr_eth" } +edr_eth = { version = "0.2.0-dev", path = "../edr_eth", features = ["rand"] } edr_evm = { version = "0.2.0-dev", path = "../edr_evm", features = ["tracing"] } ethers-core = { version = "2.0.12" , features = ["eip712"]} indexmap = { version = "2.0.0", default-features = false, features = ["std"] } From 79703d04991c544f77d54120e5f43e384ba1c221 Mon Sep 17 00:00:00 2001 From: Wodann Date: Wed, 10 Apr 2024 13:08:11 +0000 Subject: [PATCH 6/8] fix: add missing KZG point evaluation precompile --- .changeset/nervous-tips-grow.md | 5 ++ Cargo.lock | 15 +++- crates/edr_eth/Cargo.toml | 5 +- crates/edr_eth/src/remote/filter.rs | 2 +- crates/edr_eth/src/transaction/signed.rs | 17 ++++ crates/edr_evm/Cargo.toml | 2 +- crates/edr_evm/src/block/builder.rs | 26 ++---- crates/edr_evm/src/lib.rs | 2 +- crates/edr_evm/src/transaction/executable.rs | 91 +++----------------- crates/edr_evm/tests/issue_364.rs | 10 +++ crates/edr_provider/src/test_utils.rs | 89 +++++++++++++++++++ 11 files changed, 161 insertions(+), 103 deletions(-) create mode 100644 .changeset/nervous-tips-grow.md create mode 100644 crates/edr_evm/tests/issue_364.rs diff --git a/.changeset/nervous-tips-grow.md b/.changeset/nervous-tips-grow.md new file mode 100644 index 00000000000..42f117c5f99 --- /dev/null +++ b/.changeset/nervous-tips-grow.md @@ -0,0 +1,5 @@ +--- +"@nomicfoundation/edr": patch +--- + +Fix missing KZG point evaluation precompile for Cancun hardfork diff --git a/Cargo.lock b/Cargo.lock index 5491a6dbaf2..0fb498fa255 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -79,6 +79,9 @@ dependencies = [ "getrandom", "hex-literal", "itoa", + "k256", + "keccak-asm", + "proptest", "rand", "ruint", "serde", @@ -1006,6 +1009,7 @@ dependencies = [ "futures", "hash-db", "hash256-std-hasher", + "hashbrown 0.14.3", "hex", "hyper", "itertools 0.10.5", @@ -2902,7 +2906,7 @@ dependencies = [ [[package]] name = "revm" version = "8.0.0" -source = "git+https://github.com/Wodann/revm?rev=abacdd3#abacdd39f4fda24ec57e4965410cd5c52191858a" +source = "git+https://github.com/Wodann/revm?rev=451f122#451f122b5a234db90e3fa00dedfaec6c03b46d61" dependencies = [ "auto_impl", "cfg-if", @@ -2915,7 +2919,7 @@ dependencies = [ [[package]] name = "revm-interpreter" version = "4.0.0" -source = "git+https://github.com/Wodann/revm?rev=abacdd3#abacdd39f4fda24ec57e4965410cd5c52191858a" +source = "git+https://github.com/Wodann/revm?rev=451f122#451f122b5a234db90e3fa00dedfaec6c03b46d61" dependencies = [ "revm-primitives", "serde", @@ -2924,9 +2928,10 @@ dependencies = [ [[package]] name = "revm-precompile" version = "6.0.0" -source = "git+https://github.com/Wodann/revm?rev=abacdd3#abacdd39f4fda24ec57e4965410cd5c52191858a" +source = "git+https://github.com/Wodann/revm?rev=451f122#451f122b5a234db90e3fa00dedfaec6c03b46d61" dependencies = [ "aurora-engine-modexp", + "c-kzg", "k256", "once_cell", "revm-primitives", @@ -2938,7 +2943,7 @@ dependencies = [ [[package]] name = "revm-primitives" version = "3.1.1" -source = "git+https://github.com/Wodann/revm?rev=abacdd3#abacdd39f4fda24ec57e4965410cd5c52191858a" +source = "git+https://github.com/Wodann/revm?rev=451f122#451f122b5a234db90e3fa00dedfaec6c03b46d61" dependencies = [ "alloy-primitives 0.7.0", "auto_impl", @@ -2946,10 +2951,12 @@ dependencies = [ "bitvec", "c-kzg", "cfg-if", + "derive_more", "dyn-clone", "enumn", "hashbrown 0.14.3", "hex", + "once_cell", "serde", ] diff --git a/crates/edr_eth/Cargo.toml b/crates/edr_eth/Cargo.toml index ad031eca3e4..0a85624cb1a 100644 --- a/crates/edr_eth/Cargo.toml +++ b/crates/edr_eth/Cargo.toml @@ -9,6 +9,7 @@ alloy-rlp = { version = "0.3", default-features = false, features = ["derive"] } futures = { version = "0.3.28", default-features = false } hash-db = { version = "0.15.2", default-features = false } hash256-std-hasher = { version = "0.15.2", default-features = false } +hashbrown = { version = "0.14.3", default-features = false, features = ["ahash", "allocator-api2", "inline-more"] } hex = { version = "0.4.3", default-features = false, features = ["alloc"] } hyper = { version = "0.14.27", default-features = false } itertools = { version = "0.10.5", default-features = false, features = ["use_alloc"] } @@ -19,7 +20,7 @@ reqwest = { version = "0.11", features = ["blocking", "json"] } reqwest-middleware = { version = "0.2.4", default-features = false } reqwest-retry = { version = "0.3.0", default-features = false } reqwest-tracing = { version = "0.4.7", default-features = false, optional = true } -revm-primitives = { git = "https://github.com/Wodann/revm", rev = "abacdd3", version = "3.1", default-features = false } +revm-primitives = { git = "https://github.com/Wodann/revm", rev = "451f122", version = "3.1", default-features = false, features = ["hashbrown"] } serde = { version = "1.0.147", default-features = false, features = ["derive"], optional = true } serde_json = { version = "1.0.89", optional = true } sha3 = { version = "0.10.8", default-features = false } @@ -48,6 +49,6 @@ walkdir = { version = "2.3.3", default-features = false } default = ["std"] rand = ["revm-primitives/rand"] serde = ["dep:serde", "revm-primitives/serde", "serde_json"] -std = ["futures/std", "hash256-std-hasher/std", "hash-db/std", "hex/std", "itertools/use_std", "k256/std", "k256/precomputed-tables", "serde?/std", "sha3/std", "triehash/std", "uuid/std"] +std = ["futures/std", "hash256-std-hasher/std", "hash-db/std", "hex/std", "itertools/use_std", "k256/std", "k256/precomputed-tables", "revm-primitives/std", "serde?/std", "sha3/std", "triehash/std", "uuid/std"] tracing = ["dep:tracing", "reqwest-tracing"] test-remote = ["serde"] diff --git a/crates/edr_eth/src/remote/filter.rs b/crates/edr_eth/src/remote/filter.rs index eac6ad58864..d34d1b6acdd 100644 --- a/crates/edr_eth/src/remote/filter.rs +++ b/crates/edr_eth/src/remote/filter.rs @@ -1,6 +1,6 @@ use std::mem::take; -use revm_primitives::HashSet; +use hashbrown::HashSet; use crate::{log::FilterLog, remote::BlockSpec, Address, Bytes, B256}; diff --git a/crates/edr_eth/src/transaction/signed.rs b/crates/edr_eth/src/transaction/signed.rs index e41eea9650a..e081d13fa36 100644 --- a/crates/edr_eth/src/transaction/signed.rs +++ b/crates/edr_eth/src/transaction/signed.rs @@ -37,6 +37,23 @@ pub enum SignedTransaction { } impl SignedTransaction { + /// Returns the effective gas price of the transaction. + pub fn effective_gas_price(&self, block_base_fee: U256) -> U256 { + match self { + SignedTransaction::PreEip155Legacy(tx) => tx.gas_price, + SignedTransaction::PostEip155Legacy(tx) => tx.gas_price, + SignedTransaction::Eip2930(tx) => tx.gas_price, + SignedTransaction::Eip1559(tx) => { + block_base_fee + + (tx.max_fee_per_gas - block_base_fee).min(tx.max_priority_fee_per_gas) + } + SignedTransaction::Eip4844(tx) => { + block_base_fee + + (tx.max_fee_per_gas - block_base_fee).min(tx.max_priority_fee_per_gas) + } + } + } + /// Returns the gas price of the transaction. pub fn gas_price(&self) -> U256 { match self { diff --git a/crates/edr_evm/Cargo.toml b/crates/edr_evm/Cargo.toml index 5ec05d4e95b..ef16a667e47 100644 --- a/crates/edr_evm/Cargo.toml +++ b/crates/edr_evm/Cargo.toml @@ -21,7 +21,7 @@ once_cell = { version = "1.18.0", default-features = false, features = ["alloc", parking_lot = { version = "0.12.1", default-features = false } edr_defaults = { version = "0.2.0-dev", path = "../edr_defaults" } edr_eth = { version = "0.2.0-dev", path = "../edr_eth", features = ["rand", "serde"] } -revm = { git = "https://github.com/Wodann/revm", rev = "abacdd3", version = "8.0", default-features = false, features = ["dev", "serde"] } +revm = { git = "https://github.com/Wodann/revm", rev = "451f122", version = "8.0", default-features = false, features = ["c-kzg", "dev", "serde"] } serde = { version = "1.0.158", default-features = false, features = ["std"] } serde_json = { version = "1.0.94", default-features = false, features = ["std"] } thiserror = { version = "1.0.38", default-features = false } diff --git a/crates/edr_evm/src/block/builder.rs b/crates/edr_evm/src/block/builder.rs index 0d8431cede6..c2669477323 100644 --- a/crates/edr_evm/src/block/builder.rs +++ b/crates/edr_evm/src/block/builder.rs @@ -235,9 +235,13 @@ impl BlockBuilder { }; } - let blob_gas = transaction.total_blob_gas().unwrap_or_default(); - if let Some(BlobGas { gas_used, .. }) = self.header.blob_gas.as_ref() { - if gas_used + blob_gas > MAX_BLOB_GAS_PER_BLOCK { + let blob_gas_used = transaction.total_blob_gas().unwrap_or_default(); + if let Some(BlobGas { + gas_used: block_blob_gas_used, + .. + }) = self.header.blob_gas.as_ref() + { + if block_blob_gas_used + blob_gas_used > MAX_BLOB_GAS_PER_BLOCK { return ExecutionResultWithContext { result: Err(BlockTransactionError::ExceedsBlockBlobGasLimit), evm_context: EvmContext { @@ -364,7 +368,7 @@ impl BlockBuilder { self.header.gas_used += result.gas_used(); if let Some(BlobGas { gas_used, .. }) = self.header.blob_gas.as_mut() { - *gas_used += blob_gas; + *gas_used += blob_gas_used; } let logs = result.logs().to_vec(); @@ -387,18 +391,6 @@ impl BlockBuilder { None }; - let gas_price = transaction.gas_price(); - let effective_gas_price = if spec_id >= SpecId::LONDON { - if let SignedTransaction::Eip1559(transaction) = &*transaction { - block.basefee - + (gas_price - block.basefee).min(transaction.max_priority_fee_per_gas) - } else { - gas_price - } - } else { - gas_price - }; - let receipt = TransactionReceipt { inner: TypedReceipt { cumulative_gas_used: self.header.gas_used, @@ -429,7 +421,7 @@ impl BlockBuilder { to: transaction.to(), contract_address, gas_used: result.gas_used(), - effective_gas_price: Some(effective_gas_price), + effective_gas_price: Some(transaction.effective_gas_price(block.basefee)), }; self.receipts.push(receipt); diff --git a/crates/edr_evm/src/lib.rs b/crates/edr_evm/src/lib.rs index ffc11820dc7..e197bb46eb7 100644 --- a/crates/edr_evm/src/lib.rs +++ b/crates/edr_evm/src/lib.rs @@ -60,5 +60,5 @@ pub mod interpreter { /// Types for managing Ethereum precompiles pub mod precompile { - pub use revm::precompile::{PrecompileSpecId, Precompiles}; + pub use revm::precompile::{u64_to_address, PrecompileSpecId, Precompiles}; } diff --git a/crates/edr_evm/src/transaction/executable.rs b/crates/edr_evm/src/transaction/executable.rs index 9ca130bc846..a5c6691280e 100644 --- a/crates/edr_evm/src/transaction/executable.rs +++ b/crates/edr_evm/src/transaction/executable.rs @@ -12,11 +12,7 @@ use edr_eth::{ }; use revm::{ interpreter::gas::validate_initial_tx_gas, - primitives::{ - BerlinSpec, ByzantiumSpec, CancunSpec, CreateScheme, FrontierSpec, HomesteadSpec, - IstanbulSpec, LatestSpec, LondonSpec, MergeSpec, PetersburgSpec, ShanghaiSpec, SpecId, - SpuriousDragonSpec, TangerineSpec, TransactTo, TxEnv, - }, + primitives::{CreateScheme, SpecId, TransactTo, TxEnv}, }; use super::TransactionCreationError; @@ -408,78 +404,19 @@ impl TryFrom for ExecutableTransaction { } fn initial_cost(spec_id: SpecId, transaction: &SignedTransaction) -> u64 { - let access_list: Option)>> = - transaction.access_list().cloned().map(Into::into); - - match spec_id { - SpecId::FRONTIER | SpecId::FRONTIER_THAWING => validate_initial_tx_gas::( - transaction.data(), - transaction.kind() == TransactionKind::Create, - access_list.as_ref().map_or(&[], |access_list| access_list), - ), - SpecId::HOMESTEAD | SpecId::DAO_FORK => validate_initial_tx_gas::( - transaction.data(), - transaction.kind() == TransactionKind::Create, - access_list.as_ref().map_or(&[], |access_list| access_list), - ), - SpecId::TANGERINE => validate_initial_tx_gas::( - transaction.data(), - transaction.kind() == TransactionKind::Create, - access_list.as_ref().map_or(&[], |access_list| access_list), - ), - SpecId::SPURIOUS_DRAGON => validate_initial_tx_gas::( - transaction.data(), - transaction.kind() == TransactionKind::Create, - access_list.as_ref().map_or(&[], |access_list| access_list), - ), - SpecId::BYZANTIUM => validate_initial_tx_gas::( - transaction.data(), - transaction.kind() == TransactionKind::Create, - access_list.as_ref().map_or(&[], |access_list| access_list), - ), - SpecId::PETERSBURG | SpecId::CONSTANTINOPLE => validate_initial_tx_gas::( - transaction.data(), - transaction.kind() == TransactionKind::Create, - access_list.as_ref().map_or(&[], |access_list| access_list), - ), - SpecId::ISTANBUL | SpecId::MUIR_GLACIER => validate_initial_tx_gas::( - transaction.data(), - transaction.kind() == TransactionKind::Create, - access_list.as_ref().map_or(&[], |access_list| access_list), - ), - SpecId::BERLIN => validate_initial_tx_gas::( - transaction.data(), - transaction.kind() == TransactionKind::Create, - access_list.as_ref().map_or(&[], |access_list| access_list), - ), - SpecId::LONDON | SpecId::ARROW_GLACIER | SpecId::GRAY_GLACIER => { - validate_initial_tx_gas::( - transaction.data(), - transaction.kind() == TransactionKind::Create, - access_list.as_ref().map_or(&[], |access_list| access_list), - ) - } - SpecId::MERGE => validate_initial_tx_gas::( - transaction.data(), - transaction.kind() == TransactionKind::Create, - access_list.as_ref().map_or(&[], |access_list| access_list), - ), - SpecId::SHANGHAI => validate_initial_tx_gas::( - transaction.data(), - transaction.kind() == TransactionKind::Create, - access_list.as_ref().map_or(&[], |access_list| access_list), - ), - SpecId::CANCUN => validate_initial_tx_gas::( - transaction.data(), - transaction.kind() == TransactionKind::Create, - access_list.as_ref().map_or(&[], |access_list| access_list), - ), - SpecId::LATEST => validate_initial_tx_gas::( - transaction.data(), - transaction.kind() == TransactionKind::Create, - access_list.as_ref().map_or(&[], |access_list| access_list), - ), - } + let access_list = transaction + .access_list() + .cloned() + .map(Vec::<(Address, Vec)>::from); + + validate_initial_tx_gas( + spec_id, + transaction.data().as_ref(), + transaction.kind() == TransactionKind::Create, + access_list + .as_ref() + .map_or(&[], |access_list| access_list.as_slice()), + ) } #[cfg(test)] diff --git a/crates/edr_evm/tests/issue_364.rs b/crates/edr_evm/tests/issue_364.rs new file mode 100644 index 00000000000..28422087488 --- /dev/null +++ b/crates/edr_evm/tests/issue_364.rs @@ -0,0 +1,10 @@ +use edr_eth::Address; +use edr_evm::precompile::{self, Precompiles}; + +#[test] +fn kzg_point_evaluation_present_in_cancun() { + const KZG_POINT_EVALUATION_ADDRESS: Address = precompile::u64_to_address(0x0A); + + let precompiles = Precompiles::cancun(); + assert!(precompiles.contains(&KZG_POINT_EVALUATION_ADDRESS)); +} diff --git a/crates/edr_provider/src/test_utils.rs b/crates/edr_provider/src/test_utils.rs index f1f2ad89e59..6a366e1dc31 100644 --- a/crates/edr_provider/src/test_utils.rs +++ b/crates/edr_provider/src/test_utils.rs @@ -186,6 +186,95 @@ pub async fn run_full_block(url: String, block_number: u64, chain_id: u64) -> an let mined_block = builder.finalize(&mut state, rewards)?; let mined_header = mined_block.block.header(); + for (expected, actual) in replay_block + .transaction_receipts()? + .into_iter() + .zip(mined_block.block.transaction_receipts().iter()) + { + debug_assert_eq!( + expected.block_number, + actual.block_number, + "{:?}", + replay_block.transactions()[expected.transaction_index as usize] + ); + debug_assert_eq!( + expected.transaction_hash, + actual.transaction_hash, + "{:?}", + replay_block.transactions()[expected.transaction_index as usize] + ); + debug_assert_eq!( + expected.transaction_index, + actual.transaction_index, + "{:?}", + replay_block.transactions()[expected.transaction_index as usize] + ); + debug_assert_eq!( + expected.from, + actual.from, + "{:?}", + replay_block.transactions()[expected.transaction_index as usize] + ); + debug_assert_eq!( + expected.to, + actual.to, + "{:?}", + replay_block.transactions()[expected.transaction_index as usize] + ); + debug_assert_eq!( + expected.contract_address, + actual.contract_address, + "{:?}", + replay_block.transactions()[expected.transaction_index as usize] + ); + debug_assert_eq!( + expected.gas_used, + actual.gas_used, + "{:?}", + replay_block.transactions()[expected.transaction_index as usize] + ); + debug_assert_eq!( + expected.effective_gas_price, + actual.effective_gas_price, + "{:?}", + replay_block.transactions()[expected.transaction_index as usize] + ); + debug_assert_eq!( + expected.cumulative_gas_used, + actual.cumulative_gas_used, + "{:?}", + replay_block.transactions()[expected.transaction_index as usize] + ); + if expected.logs_bloom != actual.logs_bloom { + for (expected, actual) in expected.logs.iter().zip(actual.logs.iter()) { + debug_assert_eq!( + expected.inner.address, + actual.inner.address, + "{:?}", + replay_block.transactions()[expected.transaction_index as usize] + ); + debug_assert_eq!( + expected.inner.topics(), + actual.inner.topics(), + "{:?}", + replay_block.transactions()[expected.transaction_index as usize] + ); + debug_assert_eq!( + expected.inner.data.data, + actual.inner.data.data, + "{:?}", + replay_block.transactions()[expected.transaction_index as usize] + ); + } + } + debug_assert_eq!( + expected.data, + actual.data, + "{:?}", + replay_block.transactions()[expected.transaction_index as usize] + ); + } + assert_eq!(mined_header, replay_header); Ok(()) From a3a05a4393349c368ecc6d5eeecf7e84928a2a53 Mon Sep 17 00:00:00 2001 From: Wodann Date: Fri, 12 Apr 2024 09:45:07 +0000 Subject: [PATCH 7/8] docs: add explanation for block test --- crates/edr_provider/src/data.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crates/edr_provider/src/data.rs b/crates/edr_provider/src/data.rs index 5cde09d4a97..9c5c2072e4a 100644 --- a/crates/edr_provider/src/data.rs +++ b/crates/edr_provider/src/data.rs @@ -3743,6 +3743,8 @@ mod tests { chain_id: 1, url: get_alchemy_url(), }, + // This block contains a transaction that uses the KZG point evaluation + // precompile, introduced in Cancun mainnet_cancun2 => { block_number: 19_562_047, chain_id: 1, From 18f62dcee497033a55110bb9d184c63d1eb66c11 Mon Sep 17 00:00:00 2001 From: Wodann Date: Fri, 12 Apr 2024 10:10:30 +0000 Subject: [PATCH 8/8] refactor: remove subtraction from effective gas price --- crates/edr_eth/src/transaction/signed.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/crates/edr_eth/src/transaction/signed.rs b/crates/edr_eth/src/transaction/signed.rs index e081d13fa36..cd3637a0d04 100644 --- a/crates/edr_eth/src/transaction/signed.rs +++ b/crates/edr_eth/src/transaction/signed.rs @@ -43,14 +43,12 @@ impl SignedTransaction { SignedTransaction::PreEip155Legacy(tx) => tx.gas_price, SignedTransaction::PostEip155Legacy(tx) => tx.gas_price, SignedTransaction::Eip2930(tx) => tx.gas_price, - SignedTransaction::Eip1559(tx) => { - block_base_fee - + (tx.max_fee_per_gas - block_base_fee).min(tx.max_priority_fee_per_gas) - } - SignedTransaction::Eip4844(tx) => { - block_base_fee - + (tx.max_fee_per_gas - block_base_fee).min(tx.max_priority_fee_per_gas) - } + SignedTransaction::Eip1559(tx) => tx + .max_fee_per_gas + .min(block_base_fee + tx.max_priority_fee_per_gas), + SignedTransaction::Eip4844(tx) => tx + .max_fee_per_gas + .min(block_base_fee + tx.max_priority_fee_per_gas), } }