Skip to content

Commit a1e7326

Browse files
Merge branch 'main' into PooledTransaction-update
2 parents f306ef0 + 1648e98 commit a1e7326

File tree

153 files changed

+9715
-415
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+9715
-415
lines changed

.config/nextest.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
11
[profile.default]
22
retries = { backoff = "exponential", count = 2, delay = "2s", jitter = true }
33
slow-timeout = { period = "30s", terminate-after = 4 }
4+
5+
[[profile.default.overrides]]
6+
filter = "test(can_launch_reth_custom_ports)"
7+
retries = { backoff = "exponential", count = 5, delay = "3s", jitter = true }
8+
9+
[test-groups.node-bindings]
10+
max-threads = 1
11+
12+
[[profile.default.overrides]]
13+
filter = "package(alloy-node-bindings)"
14+
test-group = "node-bindings"
15+
retries = { backoff = "exponential", count = 3, delay = "3s", jitter = true }

.config/zepter.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ workflows:
1212
# Check that `A` activates the features of `B`.
1313
"propagate-feature",
1414
# These are the features to check:
15-
"--features=arbitrary,std,serde,ssz",
15+
"--features=arbitrary,std,serde,ssz,secp256k1",
1616
# Do not try to add a new section into `[features]` of `A` only because `B` exposes that feature. There are edge-cases where this is still needed, but we can add them manually.
1717
"--left-side-feature-missing=ignore",
1818
# Ignore the case that `A` is outside of the workspace. Otherwise it will report errors in external dependencies that we have no influence on.

.github/scripts/install_test_binaries.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@ main() {
1919
fi
2020

2121
install_geth &
22+
local geth_pid=$!
2223
install_reth &
24+
local reth_pid=$!
2325

24-
wait
26+
wait $geth_pid || { echo "install_geth failed"; exit 1; }
27+
wait $reth_pid || { echo "install_reth failed"; exit 1; }
2528
}
2629

2730
# Installs geth from https://geth.ethereum.org/downloads

.github/workflows/ci.yml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
rust:
2929
- "stable"
3030
- "nightly"
31-
- "1.88" # MSRV
31+
- "1.91" # MSRV
3232
flags:
3333
# No features
3434
- "--no-default-features -F reqwest-rustls-tls"
@@ -38,7 +38,7 @@ jobs:
3838
- "--all-features"
3939
exclude:
4040
# All features on MSRV
41-
- rust: "1.88" # MSRV
41+
- rust: "1.91" # MSRV
4242
flags: "--all-features"
4343
steps:
4444
- uses: actions/checkout@v6
@@ -48,7 +48,7 @@ jobs:
4848
with:
4949
toolchain: ${{ matrix.rust }}
5050
- name: Install Anvil
51-
uses: foundry-rs/foundry-toolchain@8b0419c685ef46cb79ec93fbdc131174afceb730 # v1
51+
uses: foundry-rs/foundry-toolchain@8789b3e21e6c11b2697f5eb56eddae542f746c10 # v1
5252
with:
5353
version: nightly
5454
- name: Install test binaries
@@ -59,16 +59,16 @@ jobs:
5959
cache-on-failure: true
6060
# Only run tests on latest stable and above
6161
- name: Install cargo-nextest
62-
if: ${{ matrix.rust != '1.88' }} # MSRV
63-
uses: taiki-e/install-action@0e76c5c569f13f7eb21e8e5b26fe710062b57b62 # v2
62+
if: ${{ matrix.rust != '1.91' }} # MSRV
63+
uses: taiki-e/install-action@f8d25fb8a2df08dcd3cead89780d572767b8655f # v2
6464
with:
6565
tool: nextest
6666
- name: build
67-
if: ${{ matrix.rust == '1.88' }} # MSRV
67+
if: ${{ matrix.rust == '1.91' }} # MSRV
6868
run: cargo build --workspace ${{ matrix.flags }}
6969
- name: test
7070
shell: bash
71-
if: ${{ matrix.rust != '1.88' }} # MSRV
71+
if: ${{ matrix.rust != '1.91' }} # MSRV
7272
run: cargo nextest run --workspace ${{ matrix.flags }}
7373

7474
doctest:
@@ -102,7 +102,7 @@ jobs:
102102
with:
103103
toolchain: stable
104104
target: wasm32-unknown-unknown
105-
- uses: taiki-e/install-action@0e76c5c569f13f7eb21e8e5b26fe710062b57b62 # v2
105+
- uses: taiki-e/install-action@f8d25fb8a2df08dcd3cead89780d572767b8655f # v2
106106
with:
107107
tool: cargo-hack
108108
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2
@@ -138,7 +138,7 @@ jobs:
138138
with:
139139
toolchain: stable
140140
target: wasm32-wasip1
141-
- uses: taiki-e/install-action@0e76c5c569f13f7eb21e8e5b26fe710062b57b62 # v2
141+
- uses: taiki-e/install-action@f8d25fb8a2df08dcd3cead89780d572767b8655f # v2
142142
with:
143143
tool: cargo-hack
144144
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2
@@ -168,7 +168,7 @@ jobs:
168168
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
169169
with:
170170
toolchain: stable
171-
- uses: taiki-e/install-action@0e76c5c569f13f7eb21e8e5b26fe710062b57b62 # v2
171+
- uses: taiki-e/install-action@f8d25fb8a2df08dcd3cead89780d572767b8655f # v2
172172
with:
173173
tool: cargo-hack
174174
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2
@@ -191,7 +191,7 @@ jobs:
191191
with:
192192
toolchain: stable
193193
targets: riscv32imac-unknown-none-elf
194-
- uses: taiki-e/install-action@0e76c5c569f13f7eb21e8e5b26fe710062b57b62 # v2
194+
- uses: taiki-e/install-action@f8d25fb8a2df08dcd3cead89780d572767b8655f # v2
195195
with:
196196
tool: cargo-hack
197197
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2
@@ -208,7 +208,7 @@ jobs:
208208
- uses: actions/checkout@v6
209209
with:
210210
persist-credentials: false
211-
- uses: crate-ci/typos@5c19779cb52ea50e151f5a10333ccd269227b5ae # v1
211+
- uses: crate-ci/typos@57b11c6b7e54c402ccd9cda953f1072ec4f78e33 # v1
212212

213213
clippy:
214214
runs-on: ubuntu-latest
@@ -275,14 +275,16 @@ jobs:
275275
- uses: actions/checkout@v6
276276
with:
277277
persist-credentials: false
278+
- uses: taiki-e/install-action@f8d25fb8a2df08dcd3cead89780d572767b8655f # v2
279+
with:
280+
tool: zepter
278281
- name: run zepter
279282
run: |
280-
cargo install zepter -f --locked
281283
zepter --version
282284
time zepter run check
283285
284286
deny:
285-
uses: ithacaxyz/ci/.github/workflows/deny.yml@9c8d0dc20e7ad02455d3fdab2378a05f29907630 # main
287+
uses: tempoxyz/ci/.github/workflows/deny.yml@268b3ce142717ff86c58fbbcc3abc3f109f0fb8d # main
286288
permissions:
287289
contents: read
288290

0 commit comments

Comments
 (0)