Skip to content

Commit 39b669b

Browse files
authored
Merge branch 'paritytech:master' into master
2 parents 93e86ad + 0db38a1 commit 39b669b

File tree

30 files changed

+1173
-337
lines changed

30 files changed

+1173
-337
lines changed

.config/nextest.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[test-groups]
22
chisel-serial = { max-threads = 1 }
3+
polkadot-localnode-serial = { max-threads = 1 }
34

45
[profile.default]
56
retries = { backoff = "exponential", count = 2, delay = "5s", jitter = true }
@@ -20,3 +21,8 @@ retries = 0
2021
[[profile.default.overrides]]
2122
filter = "package(chisel)"
2223
test-group = "chisel-serial"
24+
25+
[[profile.default.overrides]]
26+
filter = "test(/polkadot_localnode/)"
27+
test-group = "polkadot-localnode-serial"
28+
slow-timeout = { period = "5m", terminate-after = 4 }

.github/workflows/benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
sudo apt-get install -y build-essential pkg-config
4242
4343
- name: Setup Rust toolchain
44-
uses: dtolnay/rust-toolchain@stable
44+
uses: dtolnay/rust-toolchain@1.88.0
4545

4646
- name: Cache Rust dependencies
4747
uses: Swatinem/rust-cache@v2

.github/workflows/docker-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
timeout-minutes: 120
2626
steps:
2727
- uses: actions/checkout@v4
28-
- uses: dtolnay/rust-toolchain@stable
28+
- uses: dtolnay/rust-toolchain@1.88.0
2929
- uses: Swatinem/rust-cache@v2
3030
with:
3131
cache-on-failure: true

.github/workflows/nextest.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
runner: windows-latest
5858
steps:
5959
- uses: actions/checkout@v4
60-
- uses: dtolnay/rust-toolchain@stable
60+
- uses: dtolnay/rust-toolchain@1.88.0
6161

6262
# Check existing caches first
6363
- name: Cache substrate-node binary
@@ -85,7 +85,7 @@ jobs:
8585
uses: arduino/setup-protoc@v3
8686
with:
8787
repo-token: ${{ secrets.GITHUB_TOKEN }}
88-
88+
8989
# macOS-specific setup
9090
- name: Install libusb 1.0.27 (macOS)
9191
if: matrix.os == 'macos'
@@ -107,7 +107,7 @@ jobs:
107107
echo "LIBCLANG_PATH=$(brew --prefix llvm)/lib" >> $GITHUB_ENV
108108
109109
- name: Install Rust toolchain
110-
uses: dtolnay/rust-toolchain@stable
110+
uses: dtolnay/rust-toolchain@1.88.0
111111
with:
112112
target: ${{ matrix.target }}, wasm32-unknown-unknown
113113
components: rust-src
@@ -189,11 +189,11 @@ jobs:
189189
- name: Install Vyper
190190
run: pip --version && pip install vyper==0.4.3
191191
- name: Install Rust toolchain
192-
uses: dtolnay/rust-toolchain@stable
192+
uses: dtolnay/rust-toolchain@1.88.0
193193
with:
194194
target: ${{ matrix.target }}, wasm32-unknown-unknown
195195
components: rust-src
196-
196+
197197
- name: Install clang (macOS)
198198
if: contains(matrix.runner_label, 'macos')
199199
run: |

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117
arch: amd64
118118
steps:
119119
- uses: actions/checkout@v4
120-
- uses: dtolnay/rust-toolchain@stable
120+
- uses: dtolnay/rust-toolchain@1.88.0
121121
with:
122122
targets: ${{ matrix.target }}
123123
- uses: Swatinem/rust-cache@v2

.github/workflows/test.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: arduino/setup-protoc@v3
3232
with:
3333
repo-token: ${{ secrets.GITHUB_TOKEN }}
34-
- uses: dtolnay/rust-toolchain@stable
34+
- uses: dtolnay/rust-toolchain@1.88.0
3535
with:
3636
target: wasm32-unknown-unknown
3737
components: rust-src
@@ -57,7 +57,7 @@ jobs:
5757
timeout-minutes: 60
5858
steps:
5959
- uses: actions/checkout@v4
60-
- uses: dtolnay/rust-toolchain@stable
60+
- uses: dtolnay/rust-toolchain@1.88.0
6161
- name: Install protobuf-compiler
6262
uses: arduino/setup-protoc@v3
6363
with:
@@ -66,7 +66,7 @@ jobs:
6666
run: |
6767
sudo apt-get update
6868
sudo apt-get install -y clang libclang-dev
69-
- uses: dtolnay/rust-toolchain@stable
69+
- uses: dtolnay/rust-toolchain@1.88.0
7070
with:
7171
target: wasm32-unknown-unknown
7272
components: rust-src
@@ -85,7 +85,10 @@ jobs:
8585
timeout-minutes: 60
8686
steps:
8787
- uses: actions/checkout@v4
88-
- uses: dtolnay/rust-toolchain@clippy
88+
- uses: dtolnay/rust-toolchain@master
89+
with:
90+
toolchain: 1.88.0
91+
components: clippy
8992
- name: Install protobuf-compiler
9093
uses: arduino/setup-protoc@v3
9194
with:
@@ -94,7 +97,7 @@ jobs:
9497
run: |
9598
sudo apt-get update
9699
sudo apt-get install -y clang libclang-dev
97-
- uses: dtolnay/rust-toolchain@stable
100+
- uses: dtolnay/rust-toolchain@1.88.0
98101
with:
99102
target: wasm32-unknown-unknown
100103
components: rust-src
@@ -118,7 +121,7 @@ jobs:
118121
timeout-minutes: 30
119122
steps:
120123
- uses: actions/checkout@v4
121-
- uses: dtolnay/rust-toolchain@stable
124+
- uses: dtolnay/rust-toolchain@1.88.0
122125
- name: Install protobuf-compiler
123126
uses: arduino/setup-protoc@v3
124127
with:
@@ -143,7 +146,7 @@ jobs:
143146
- name: Install build-essential for tikv-jemalloc-sys
144147
run: |
145148
sudo apt-get install -y build-essential
146-
- uses: dtolnay/rust-toolchain@stable
149+
- uses: dtolnay/rust-toolchain@1.88.0
147150
- uses: Swatinem/rust-cache@v2
148151
with:
149152
cache-on-failure: true
@@ -152,7 +155,7 @@ jobs:
152155
uses: arduino/setup-protoc@v3
153156
with:
154157
repo-token: ${{ secrets.GITHUB_TOKEN }}
155-
- uses: dtolnay/rust-toolchain@stable
158+
- uses: dtolnay/rust-toolchain@1.88.0
156159
with:
157160
target: wasm32-unknown-unknown
158161
components: rust-src

Cargo.lock

Lines changed: 1 addition & 0 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
@@ -370,7 +370,6 @@ uuid = "1.17.0"
370370
flate2 = "1.1"
371371

372372

373-
374373
## Pinned dependencies. Enabled for the workspace in crates/test-utils.
375374

376375
# Use unicode-rs which has a smaller binary size than the default ICU4X as the IDNA backend, used

crates/anvil-polkadot/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ subxt-signer = "0.43.0"
144144
tokio-stream = "0.1.17"
145145
jsonrpsee = "0.24.9"
146146
sqlx = "0.8.6"
147+
revm.workspace = true
147148

148149
[dev-dependencies]
149150
alloy-provider = { workspace = true, features = ["txpool-api"] }

crates/anvil-polkadot/src/api_server/error.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ pub enum Error {
2424
BalanceConversion,
2525
#[error("Internal error: {0}")]
2626
InternalError(String),
27+
#[error("No signer available")]
28+
NoSignerAvailable,
2729
}
2830

2931
impl From<subxt::Error> for Error {

0 commit comments

Comments
 (0)