Skip to content

Commit c7b1d31

Browse files
committed
Merge remote-tracking branch 'origin/main' into provide-access-to-consumed-resources-in-tests
2 parents c799220 + 8b18872 commit c7b1d31

File tree

176 files changed

+7563
-6036
lines changed

Some content is hidden

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

176 files changed

+7563
-6036
lines changed

.github/workflows/benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
timeout-minutes: 40
1616

1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- uses: actions-rust-lang/setup-rust-toolchain@v1
2020
- name: Clear up some space
2121
run: |

.github/workflows/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
timeout-minutes: 40
4040

4141
steps:
42-
- uses: actions/checkout@v3
42+
- uses: actions/checkout@v4
4343
with:
4444
fetch-depth: 0
4545
- uses: actions-rust-lang/setup-rust-toolchain@v1

.github/workflows/docker_image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
timeout-minutes: 40
1515

1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
2020
- uses: actions-rust-lang/setup-rust-toolchain@v1

.github/workflows/documentation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
if: github.ref == 'refs/heads/main'
4040

4141
steps:
42-
- uses: actions/checkout@v3
42+
- uses: actions/checkout@v4
4343
- uses: actions-rust-lang/setup-rust-toolchain@v1
4444
- name: Install Protoc
4545
uses: arduino/setup-protoc@v1
@@ -61,7 +61,7 @@ jobs:
6161
timeout-minutes: 90
6262

6363
steps:
64-
- uses: actions/checkout@v3
64+
- uses: actions/checkout@v4
6565
- uses: actions-rust-lang/setup-rust-toolchain@v1
6666
- name: Install Protoc
6767
uses: arduino/setup-protoc@v1

.github/workflows/dynamodb.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
timeout-minutes: 40
3838

3939
steps:
40-
- uses: actions/checkout@v3
40+
- uses: actions/checkout@v4
4141
- uses: actions-rust-lang/setup-rust-toolchain@v1
4242
- name: Install Protoc
4343
uses: arduino/setup-protoc@v1

.github/workflows/explorer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
timeout-minutes: 10
3737

3838
steps:
39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
4040
- uses: actions/setup-node@v3
4141
- uses: actions-rust-lang/setup-rust-toolchain@v1
4242
- name: Check toolchain symlinks

.github/workflows/long_faucet_chain_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
timeout-minutes: 40
2020

2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
- uses: actions-rust-lang/setup-rust-toolchain@v1
2424
- name: Clear up some space
2525
run: |

.github/workflows/performance_summary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
if: ${{ github.event.workflow_run.conclusion == 'success' }}
2424
steps:
25-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
2626
- uses: actions-rust-lang/setup-rust-toolchain@v1
2727
- name: Post Performance Summary comment on PR
2828
if: ${{ github.event.workflow_run.event == 'pull_request' }}

.github/workflows/rust.yml

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
timeout-minutes: 40
4646

4747
steps:
48-
- uses: actions/checkout@v3
48+
- uses: actions/checkout@v4
4949
- uses: actions-rust-lang/setup-rust-toolchain@v1
5050
- name: Install Protoc
5151
uses: arduino/setup-protoc@v1
@@ -64,7 +64,7 @@ jobs:
6464
cargo build --bin linera
6565
cargo run --bin linera -- resource-control-policy --block 0.0000001
6666
cargo run --bin linera -- resource-control-policy --block 0.000000
67-
cargo run --bin linera -- faucet --amount 1000 --port 8079 a3edc33d8e951a1139333be8a4b56646b5598a8f51216e86592d881808972b07 &
67+
cargo run --bin linera -- faucet --amount 1000 --port 8079 &
6868
- name: Run the remote-net tests
6969
run: |
7070
cargo test -p linera-service remote_net_grpc --features remote-net
@@ -74,7 +74,7 @@ jobs:
7474
timeout-minutes: 10
7575

7676
steps:
77-
- uses: actions/checkout@v3
77+
- uses: actions/checkout@v4
7878
- uses: actions-rust-lang/setup-rust-toolchain@v1
7979
- name: Run some extra execution tests with wasmtime
8080
run: |
@@ -85,7 +85,7 @@ jobs:
8585
timeout-minutes: 10
8686

8787
steps:
88-
- uses: actions/checkout@v3
88+
- uses: actions/checkout@v4
8989
- uses: actions-rust-lang/setup-rust-toolchain@v1
9090
- name: Run metrics tests
9191
run: |
@@ -96,7 +96,7 @@ jobs:
9696
timeout-minutes: 15
9797

9898
steps:
99-
- uses: actions/checkout@v3
99+
- uses: actions/checkout@v4
100100
- uses: actions-rust-lang/setup-rust-toolchain@v1
101101
- name: Install Protoc
102102
uses: arduino/setup-protoc@v1
@@ -112,7 +112,7 @@ jobs:
112112
timeout-minutes: 40
113113

114114
steps:
115-
- uses: actions/checkout@v3
115+
- uses: actions/checkout@v4
116116
- uses: actions-rust-lang/setup-rust-toolchain@v1
117117
- name: Install Protoc
118118
uses: arduino/setup-protoc@v1
@@ -134,7 +134,7 @@ jobs:
134134
timeout-minutes: 10
135135

136136
steps:
137-
- uses: actions/checkout@v3
137+
- uses: actions/checkout@v4
138138
- uses: actions-rust-lang/setup-rust-toolchain@v1
139139
- name: Install Protoc
140140
uses: arduino/setup-protoc@v1
@@ -154,7 +154,7 @@ jobs:
154154
timeout-minutes: 30
155155

156156
steps:
157-
- uses: actions/checkout@v3
157+
- uses: actions/checkout@v4
158158
- uses: actions-rust-lang/setup-rust-toolchain@v1
159159
- name: Install Protoc
160160
uses: arduino/setup-protoc@v1
@@ -173,9 +173,9 @@ jobs:
173173
timeout-minutes: 30
174174

175175
steps:
176-
- uses: actions/checkout@v3
176+
- uses: actions/checkout@v4
177177
- uses: actions-rust-lang/setup-rust-toolchain@v1
178-
- uses: foundry-rs/foundry-toolchain@v1.2.0
178+
- uses: foundry-rs/foundry-toolchain@v1.4.0
179179
- name: Ensure Solc Directory Exists
180180
run: mkdir -p /home/runner/.solc
181181
- name: Cache Solc
@@ -211,14 +211,13 @@ jobs:
211211
cargo test test_wasm_end_to_end_ethereum_tracker --features ethereum,storage-service
212212
- name: Run REVM test
213213
run: |
214-
cargo test -p linera-execution test_fuel_for_counter_revm_application --features revm
215-
cargo test test_evm_end_to_end_counter --features revm,storage-service
214+
cargo test evm --features revm,storage-service
216215
217216
storage-service-tests:
218217
runs-on: ubuntu-latest-16-cores
219218
timeout-minutes: 40
220219
steps:
221-
- uses: actions/checkout@v3
220+
- uses: actions/checkout@v4
222221
- uses: actions-rust-lang/setup-rust-toolchain@v1
223222
- name: Install Protoc
224223
uses: arduino/setup-protoc@v1
@@ -237,7 +236,7 @@ jobs:
237236
runs-on: ubuntu-latest-16-cores
238237
timeout-minutes: 40
239238
steps:
240-
- uses: actions/checkout@v3
239+
- uses: actions/checkout@v4
241240
- uses: actions-rust-lang/setup-rust-toolchain@v1
242241
- name: Install Protoc
243242
uses: arduino/setup-protoc@v1
@@ -261,7 +260,7 @@ jobs:
261260
- uses: arduino/setup-protoc@v3
262261
with:
263262
repo-token: ${{ secrets.GITHUB_TOKEN }}
264-
- uses: actions/checkout@v3
263+
- uses: actions/checkout@v4
265264
- name: Switch to nightly Rust toolchain
266265
run: |
267266
ln -sf toolchains/nightly/rust-toolchain.toml
@@ -287,7 +286,7 @@ jobs:
287286
check-wit-files:
288287
runs-on: ubuntu-latest-16-cores
289288
steps:
290-
- uses: actions/checkout@v3
289+
- uses: actions/checkout@v4
291290
- uses: actions-rust-lang/setup-rust-toolchain@v1
292291
- name: Check WIT files
293292
run: |
@@ -298,7 +297,7 @@ jobs:
298297
timeout-minutes: 2
299298

300299
steps:
301-
- uses: actions/checkout@v3
300+
- uses: actions/checkout@v4
302301
- name: Check for unexpected chain load operations
303302
run: |
304303
./scripts/check_chain_loads.sh
@@ -308,7 +307,7 @@ jobs:
308307
timeout-minutes: 2
309308

310309
steps:
311-
- uses: actions/checkout@v3
310+
- uses: actions/checkout@v4
312311
- name: Build check_copyright_header script
313312
run: |
314313
cd ./scripts/check_copyright_header
@@ -323,7 +322,7 @@ jobs:
323322
timeout-minutes: 2
324323

325324
steps:
326-
- uses: actions/checkout@v3
325+
- uses: actions/checkout@v4
327326
- name: Put lint toolchain file in place
328327
run: |
329328
ln -sf toolchains/nightly/rust-toolchain.toml
@@ -340,7 +339,7 @@ jobs:
340339
timeout-minutes: 2
341340

342341
steps:
343-
- uses: actions/checkout@v3
342+
- uses: actions/checkout@v4
344343
- name: Put lint toolchain file in place
345344
run: |
346345
ln -sf toolchains/nightly/rust-toolchain.toml
@@ -354,7 +353,7 @@ jobs:
354353
timeout-minutes: 5
355354

356355
steps:
357-
- uses: actions/checkout@v3
356+
- uses: actions/checkout@v4
358357
- uses: actions-rust-lang/setup-rust-toolchain@v1
359358
- name: Install `taplo-cli`
360359
run: RUSTFLAGS='' cargo install [email protected] --locked
@@ -366,7 +365,7 @@ jobs:
366365
timeout-minutes: 5
367366

368367
steps:
369-
- uses: actions/checkout@v3
368+
- uses: actions/checkout@v4
370369
- name: Put lint toolchain file in place
371370
run: |
372371
ln -sf toolchains/nightly/rust-toolchain.toml
@@ -383,7 +382,7 @@ jobs:
383382
timeout-minutes: 10
384383

385384
steps:
386-
- uses: actions/checkout@v3
385+
- uses: actions/checkout@v4
387386
- name: Put lint toolchain file in place
388387
run: |
389388
ln -sf toolchains/nightly/rust-toolchain.toml
@@ -406,7 +405,7 @@ jobs:
406405
timeout-minutes: 20
407406

408407
steps:
409-
- uses: actions/checkout@v3
408+
- uses: actions/checkout@v4
410409
- name: Put lint toolchain file in place
411410
run: |
412411
ln -sf toolchains/nightly/rust-toolchain.toml
@@ -430,7 +429,7 @@ jobs:
430429
timeout-minutes: 20
431430

432431
steps:
433-
- uses: actions/checkout@v3
432+
- uses: actions/checkout@v4
434433
- name: Put lint toolchain file in place
435434
run: |
436435
ln -sf toolchains/nightly/rust-toolchain.toml
@@ -448,7 +447,7 @@ jobs:
448447
timeout-minutes: 15
449448

450449
steps:
451-
- uses: actions/checkout@v3
450+
- uses: actions/checkout@v4
452451
- uses: actions-rust-lang/setup-rust-toolchain@v1
453452
- name: Install Protoc
454453
uses: arduino/setup-protoc@v1
@@ -463,7 +462,7 @@ jobs:
463462
timeout-minutes: 40
464463

465464
steps:
466-
- uses: actions/checkout@v3
465+
- uses: actions/checkout@v4
467466
- name: Put lint toolchain file in place
468467
run: |
469468
ln -sf toolchains/nightly/rust-toolchain.toml

.github/workflows/scylladb.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
timeout-minutes: 40
3939

4040
steps:
41-
- uses: actions/checkout@v3
41+
- uses: actions/checkout@v4
4242
- uses: actions-rust-lang/setup-rust-toolchain@v1
4343
- name: Install Protoc
4444
uses: arduino/setup-protoc@v1

CLI.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,9 @@ Run a GraphQL service that exposes a faucet where users can claim tokens. This g
603603
Default value: `8080`
604604
* `--amount <AMOUNT>` — The number of tokens to send to each new chain
605605
* `--limit-rate-until <LIMIT_RATE_UNTIL>` — The end timestamp: The faucet will rate-limit the token supply so it runs out of money no earlier than this
606+
* `--max-chain-length <MAX_CHAIN_LENGTH>` — The maximum number of blocks in the faucet chain, before a new one is created
607+
608+
Default value: `100`
606609
* `--listener-skip-process-inbox` — Do not create blocks automatically to receive incoming messages. Instead, wait for an explicit mutation `processInbox`
607610
* `--listener-delay-before-ms <DELAY_BEFORE_MS>` — Wait before processing any notification (useful for testing)
608611

@@ -717,12 +720,12 @@ Create an unassigned key pair
717720

718721
Link an owner with a key pair in the wallet to a chain that was created for that owner
719722

720-
**Usage:** `linera assign --owner <OWNER> --message-id <MESSAGE_ID>`
723+
**Usage:** `linera assign --owner <OWNER> --chain-id <CHAIN_ID>`
721724

722725
###### **Options:**
723726

724727
* `--owner <OWNER>` — The owner to assign
725-
* `--message-id <MESSAGE_ID>` — The ID of the message that created the chain. (This uniquely describes the chain and where it was created.)
728+
* `--chain-id <CHAIN_ID>` — The ID of the chain
726729

727730

728731

@@ -950,10 +953,10 @@ Start a Local Linera Network
950953
* `--initial-amount <INITIAL_AMOUNT>` — The initial amount of native tokens credited in the initial "root" chains, including the default "admin" chain
951954

952955
Default value: `1000000`
953-
* `--validators <VALIDATORS>` — The number of validators in the local test network. Default is 1
956+
* `--validators <VALIDATORS>` — The number of validators in the local test network
954957

955958
Default value: `1`
956-
* `--shards <SHARDS>` — The number of shards per validator in the local test network. Default is 1
959+
* `--shards <SHARDS>` — The number of shards per validator in the local test network
957960

958961
Default value: `1`
959962
* `--policy-config <POLICY_CONFIG>` — Configure the resource control policy (notably fees) according to pre-defined settings
@@ -995,6 +998,9 @@ Start a Local Linera Network
995998
* `--faucet-amount <FAUCET_AMOUNT>` — The number of tokens to send to each new chain created by the faucet
996999

9971000
Default value: `1000`
1001+
* `--block-exporters <BLOCK_EXPORTERS>` — The number of block exporters per validator in the local test network. Default is 0
1002+
1003+
Default value: `0`
9981004

9991005

10001006

0 commit comments

Comments
 (0)