Skip to content

Commit dee40e4

Browse files
committed
Merge branch 'master' into bitzoic-fix-storage-alloc
2 parents d7f0671 + bfbe490 commit dee40e4

File tree

1,967 files changed

+57086
-26037
lines changed

Some content is hidden

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

1,967 files changed

+57086
-26037
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ permissions:
1818
env:
1919
CARGO_TERM_COLOR: always
2020
REGISTRY: ghcr.io
21-
RUST_VERSION: 1.86.0
22-
NIGHTLY_RUST_VERSION: nightly-2025-08-15
21+
RUST_VERSION: 1.90.0
22+
NIGHTLY_RUST_VERSION: nightly-2025-09-28
2323

2424
jobs:
2525
verifications-complete:
@@ -229,7 +229,6 @@ jobs:
229229
uses: dtolnay/rust-toolchain@master
230230
with:
231231
toolchain: ${{ env.RUST_VERSION }}
232-
targets: wasm32-unknown-unknown
233232
- uses: Swatinem/rust-cache@v2
234233
with:
235234
cache-provider: "warpbuild"
@@ -334,7 +333,6 @@ jobs:
334333
uses: dtolnay/rust-toolchain@master
335334
with:
336335
toolchain: ${{ env.RUST_VERSION }}
337-
targets: wasm32-unknown-unknown
338336
- uses: Swatinem/rust-cache@v2
339337
with:
340338
cache-provider: "warpbuild"
@@ -352,7 +350,6 @@ jobs:
352350
with:
353351
toolchain: ${{ env.RUST_VERSION }}
354352
components: clippy
355-
targets: wasm32-unknown-unknown
356353
- uses: Swatinem/rust-cache@v2
357354
with:
358355
cache-provider: "github"
@@ -435,7 +432,7 @@ jobs:
435432
run: |
436433
fuel-core run --db-type in-memory --debug &
437434
sleep 5 &&
438-
cargo run --locked --release --bin test -- --locked --release
435+
cargo run --locked --release --bin test -- --locked --release --verify-ir all
439436
440437
# TODO: Remove this upon merging std tests with the rest of the E2E tests.
441438
cargo-test-lib-std:
@@ -456,26 +453,12 @@ jobs:
456453
run: cargo run --locked --release -p forc -- test --release --locked --path ./test/src/sdk-harness
457454
- name: Cargo Test sway-lib-std
458455
run: cargo test --locked --release --manifest-path ./test/src/sdk-harness/Cargo.toml -- --nocapture
459-
# TODO: Enable `const_generics` tests once the necessary https://github.com/FuelLabs/sway/issues/6860 TODOs are resolved.
460-
# - name: Build All Tests - Experimental Feature 'const_generics'
461-
# run: cargo run --locked --release -p forc -- build --release --locked --path ./test/src/sdk-harness --experimental const_generics
462-
# - name: Test All Tests - Experimental Feature 'const_generics'
463-
# run: cargo run --locked --release -p forc -- test --release --locked --path ./test/src/sdk-harness --experimental const_generics
464-
# - name: Cargo Test sway-lib-std - Experimental Feature 'const_generics'
465-
# run: cargo test --locked --release --manifest-path ./test/src/sdk-harness/Cargo.toml -- --nocapture
466-
- name: Build All Tests - Experimental Feature 'new_hashing'
467-
run: cargo run --locked --release -p forc -- build --release --locked --path ./test/src/sdk-harness --experimental new_hashing
468-
- name: Test All Tests - Experimental Feature 'new_hashing'
469-
run: cargo run --locked --release -p forc -- test --release --locked --path ./test/src/sdk-harness --experimental new_hashing
470-
- name: Cargo Test sway-lib-std - Experimental Feature 'new_hashing'
456+
- name: Build All Tests - Experimental Feature 'new_hashing' disabled
457+
run: cargo run --locked --release -p forc -- build --release --locked --path ./test/src/sdk-harness --no-experimental new_hashing
458+
- name: Test All Tests - Experimental Feature 'new_hashing' disabled
459+
run: cargo run --locked --release -p forc -- test --release --locked --path ./test/src/sdk-harness --no-experimental new_hashing
460+
- name: Cargo Test sway-lib-std - Experimental Feature 'new_hashing' disabled
471461
run: cargo test --locked --release --manifest-path ./test/src/sdk-harness/Cargo.toml -- --nocapture
472-
# TODO: Enable `const_generics,new_hashing` tests once the necessary https://github.com/FuelLabs/sway/issues/6860 TODOs are resolved.
473-
# - name: Build All Tests - Experimental Feature 'const_generics,new_hashing'
474-
# run: cargo run --locked --release -p forc -- build --release --locked --path ./test/src/sdk-harness --experimental const_generics,new_hashing
475-
# - name: Test All Tests - Experimental Feature 'const_generics,new_hashing'
476-
# run: cargo run --locked --release -p forc -- test --release --locked --path ./test/src/sdk-harness --experimental const_generics,new_hashing
477-
# - name: Cargo Test sway-lib-std - Experimental Feature 'const_generics,new_hashing'
478-
# run: cargo test --locked --release --manifest-path ./test/src/sdk-harness/Cargo.toml -- --nocapture
479462

480463
forc-run-benchmarks:
481464
runs-on: warp-ubuntu-latest-x64-4x
@@ -547,29 +530,29 @@ jobs:
547530
- name: Run Std Unit Tests - Experimental feature 'const_generics' (Release)
548531
run: forc test --release --path sway-lib-std --experimental const_generics
549532
- name: Run Std Unit Tests - Experimental feature 'new_hashing' (Debug)
550-
run: forc test --path sway-lib-std --experimental new_hashing
533+
run: forc test --path sway-lib-std --no-experimental new_hashing
551534
- name: Run Std Unit Tests - Experimental feature 'new_hashing' (Release)
552-
run: forc test --release --path sway-lib-std --experimental new_hashing
535+
run: forc test --release --path sway-lib-std --no-experimental new_hashing
553536
- name: Run Std Unit Tests - Experimental feature 'const_generics,new_hashing' (Debug)
554-
run: forc test --path sway-lib-std --experimental const_generics,new_hashing
537+
run: forc test --path sway-lib-std --experimental const_generics --no-experimental new_hashing
555538
- name: Run Std Unit Tests - Experimental feature 'const_generics,new_hashing' (Release)
556-
run: forc test --release --path sway-lib-std --experimental const_generics,new_hashing
539+
run: forc test --release --path sway-lib-std --experimental const_generics --no-experimental new_hashing
557540
- name: Run In Language Unit Tests (Debug)
558-
run: forc test --path test/src/in_language_tests
541+
run: forc test --error-on-warnings --path test/src/in_language_tests
559542
- name: Run In Language Unit Tests (Release)
560-
run: forc test --release --path test/src/in_language_tests
543+
run: forc test --error-on-warnings --release --path test/src/in_language_tests
561544
- name: Run In Language Unit Tests - Experimental feature 'const_generics' (Debug)
562-
run: forc test --path test/src/in_language_tests --experimental const_generics
545+
run: forc test --error-on-warnings --path test/src/in_language_tests --experimental const_generics
563546
- name: Run In Language Unit Tests - Experimental feature 'const_generics' (Release)
564-
run: forc test --release --path test/src/in_language_tests --experimental const_generics
547+
run: forc test --error-on-warnings --release --path test/src/in_language_tests --experimental const_generics
565548
- name: Run In Language Unit Tests - Experimental feature 'new_hashing' (Debug)
566-
run: forc test --path test/src/in_language_tests --experimental new_hashing
549+
run: forc test --error-on-warnings --path test/src/in_language_tests --no-experimental new_hashing
567550
- name: Run In Language Unit Tests - Experimental feature 'new_hashing' (Release)
568-
run: forc test --release --path test/src/in_language_tests --experimental new_hashing
551+
run: forc test --error-on-warnings --release --path test/src/in_language_tests --no-experimental new_hashing
569552
- name: Run In Language Unit Tests - Experimental feature 'const_generics,new_hashing' (Debug)
570-
run: forc test --path test/src/in_language_tests --experimental const_generics,new_hashing
553+
run: forc test --error-on-warnings --path test/src/in_language_tests --experimental const_generics --no-experimental new_hashing
571554
- name: Run In Language Unit Tests - Experimental feature 'const_generics,new_hashing' (Release)
572-
run: forc test --release --path test/src/in_language_tests --experimental const_generics,new_hashing
555+
run: forc test --error-on-warnings --release --path test/src/in_language_tests --experimental const_generics --no-experimental new_hashing
573556

574557
forc-pkg-fuels-deps-check:
575558
runs-on: ubuntu-latest
@@ -627,7 +610,7 @@ jobs:
627610
uses: dtolnay/rust-toolchain@master
628611
with:
629612
toolchain: ${{ env.RUST_VERSION }}
630-
targets: "x86_64-unknown-linux-gnu, wasm32-unknown-unknown"
613+
targets: "x86_64-unknown-linux-gnu"
631614
- name: Cache Rust build
632615
uses: Swatinem/rust-cache@v2
633616
with:
@@ -656,7 +639,6 @@ jobs:
656639
with:
657640
# `cargo-udeps` requires nightly to run
658641
toolchain: ${{ env.NIGHTLY_RUST_VERSION }}
659-
targets: wasm32-unknown-unknown
660642
- uses: Swatinem/rust-cache@v2
661643
with:
662644
cache-provider: "github"
@@ -753,7 +735,6 @@ jobs:
753735
uses: dtolnay/rust-toolchain@master
754736
with:
755737
toolchain: ${{ env.RUST_VERSION }}
756-
targets: "x86_64-unknown-linux-gnu, wasm32-unknown-unknown"
757738

758739
- name: Link forc-mcp docs into Cargo target
759740
run: |

.github/workflows/gh-pages.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626
uses: dtolnay/rust-toolchain@master
2727
with:
2828
toolchain: ${{ env.RUST_VERSION }}
29-
targets: wasm32-unknown-unknown
3029

3130
- name: Install Forc
3231
run: cargo install --locked --debug --path ./forc

.github/workflows/scripts/check-dep-versions/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const REQUIRED_XYZ_DEP: &str = "fuel-core-client";
99

1010
// Dependency names allowed (but not required) to use x.y.z format
1111
// Add names of common dev-dependencies here if you want to allow x.y.z for them
12-
const ALLOWED_XYZ_DEPS: &[&str] = &["etk-asm", "etk-ops", "dap"];
12+
const ALLOWED_XYZ_DEPS: &[&str] = &["etk-asm", "etk-ops", "dap", "fuel-abi-types"];
1313

1414
// Regex to strictly match semantic version x.y.z (no prefixes like ^, ~)
1515
const XYZ_REGEX_STR: &str = r"^\d+\.\d+\.\d+([\w.-]*)$"; // Allow suffixes like -alpha, .1

.gitignore

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
# Generated by Cargo
22
# will have compiled files and executables
33
**/*/target/
4-
**/*/json_abi_output.json
5-
**/*/json_abi_output_flat.json
6-
**/*/json_storage_slots_output.json
74
target
85

6+
# ABI JSON and storage slots JSON output files in tests
7+
**/*/json_abi_output*.json
8+
**/*/json_abi_output_flat.json
9+
**/*/json_storage_slots_output*.json
10+
11+
# Performance benchmark outputs
12+
**/*/*gas-usages-*.csv
13+
**/*/*gas-usages-*.md
14+
**/*/*gas-usages-*.html
15+
**/*/*bytecode-sizes-*.csv
16+
**/*/*bytecode-sizes-*.md
17+
**/*/*bytecode-sizes-*.html
18+
919
# These are backup files generated by rustfmt
1020
**/*.rs.bk
1121

.typos.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ extend-ignore-identifiers-re = [
99
"NOOP",
1010
"Nam",
1111
"typ",
12+
"ALOC",
13+
"Aloc",
14+
"aloc",
15+
]
16+
17+
extend-ignore-re = [
18+
"(?Rm)^.*(#|//)\\s*typos:ignore$",
1219
]
1320

1421
[files]

0 commit comments

Comments
 (0)