Skip to content

Commit 6d01cfb

Browse files
authored
fix: unbreak main from alloy 2.0, rand 0.9, and ic-mops 2.x bumps (#579)
## Summary Three automated dependency bumps merged into `main` over April 2026 left the build red because the repo's branch protection currently doesn't gate on CI. This PR addresses all three: - **`alloy-consensus 2.0.1`** added `block_access_list_hash` (EIP-7928) and `slot_number` (EIP-7843) to `Header`. Two `Header { ... }` literals (`evm_rpc_types/src/response/alloy.rs`, `tests/tests.rs`) now list both as `None` (the upstream EVM-RPC `Block` payload doesn't carry the Amsterdam data yet). - **`rand 0.9.4`** changed the `Rng` trait, breaking the one test that combined `SliceRandom::shuffle` with `ic_crypto_test_utils_reproducible_rng` (vendored on rand 0.8). Replace that helper with a seeded `StdRng` and drop the now-unused dev-dependency. - **`ic-mops 2.5.1`** ships a packaging bug — `node_modules/ic-mops/dist/helpers/pocket-ic-client.js` does an ESM named import from `pic-js-mops`, a CommonJS module, which Node 18 (the CI runner) rejects with `SyntaxError: Named export 'PocketIc' not found`. Every Motoko deploy fails at `mops sources`, and the failure surfaces as the cryptic `Failed while trying to deploy canisters / No such file or directory` in the `e2e` job. Revert to `^0.27.2` (the pre-bump version); a deliberate upgrade can be a separate PR. After this lands, the in-flight pin PR #578 can be rebased and CI should be fully green. ## Verified locally `cargo check --workspace --all-targets`, `cargo clippy --tests --benches`, and the full `scripts/e2e` flow (`dfx canister create --all` → 4 rust deploys → `e2e_rust`/`e2e_motoko` deploys + calls) all succeed on Node 18.19.1.
1 parent fb0ebb2 commit 6d01cfb

7 files changed

Lines changed: 3434 additions & 7096 deletions

File tree

Cargo.lock

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ candid_parser = { workspace = true }
5858
evm_rpc_client = { path = "evm_rpc_client", features = ["alloy"] }
5959
ic-canister-runtime = { workspace = true, features = ["wallet"] }
6060
ic-pocket-canister-runtime = { workspace = true }
61-
ic-crypto-test-utils-reproducible-rng = { git = "https://github.com/dfinity/ic", rev = "release-2026-04-16_04-20-base" }
6261
ic-error-types = { workspace = true }
6362
ic-metrics-assert = { workspace = true }
6463
ic-test-utilities-load-wasm = { git = "https://github.com/dfinity/ic", rev = "release-2026-04-16_04-20-base" }

evm_rpc_types/src/response/alloy.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ impl TryFrom<Block> for alloy_rpc_types::Block {
7979
excess_blob_gas: None,
8080
parent_beacon_block_root: None,
8181
requests_hash: None,
82+
block_access_list_hash: None,
83+
slot_number: None,
8284
},
8385
total_difficulty: value.total_difficulty.map(U256::from),
8486
size: Some(U256::from(value.size)),

0 commit comments

Comments
 (0)