Skip to content

Commit 23c6476

Browse files
authored
Merge branch 'master' into 1581-enable-static-gas-price-in-NodeConfig
2 parents 80d297e + 865e00c commit 23c6476

File tree

101 files changed

+1503
-1431
lines changed

Some content is hidden

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

101 files changed

+1503
-1431
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- master
77
pull_request:
88
release:
9-
types: [published]
9+
types: [ published ]
1010

1111
concurrency:
1212
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -16,12 +16,12 @@ env:
1616
CARGO_TERM_COLOR: always
1717
DASEL_VERSION: https://github.com/TomWright/dasel/releases/download/v2.3.6/dasel_linux_amd64
1818
RUSTFLAGS: "-D warnings"
19-
FUEL_CORE_VERSION: 0.43.2
19+
FUEL_CORE_VERSION: 0.47.1
2020
FUEL_CORE_PATCH_BRANCH: ""
2121
FUEL_CORE_PATCH_REVISION: ""
22-
RUST_VERSION: 1.85.0
23-
FORC_VERSION: 0.68.0
24-
FORC_PATCH_BRANCH: "ironcev/error-codes-in-abi-json"
22+
RUST_VERSION: 1.90.0
23+
FORC_VERSION: 0.69.1
24+
FORC_PATCH_BRANCH: ""
2525
FORC_PATCH_REVISION: ""
2626
NEXTEST_HIDE_PROGRESS_BAR: "true"
2727
NEXTEST_STATUS_LEVEL: "fail"
@@ -60,10 +60,10 @@ jobs:
6060
fi
6161
6262
- name: Check format of Sway test projects
63-
run: forc fmt --check --path e2e --experimental error_type
63+
run: forc fmt --check --path e2e
6464

6565
- name: Build Sway test projects
66-
run: forc build --release --terse --error-on-warnings --path e2e --experimental error_type
66+
run: forc build --release --terse --error-on-warnings --path e2e
6767

6868
- uses: actions/upload-artifact@v4
6969
with:
@@ -164,8 +164,8 @@ jobs:
164164
runs-on: buildjet-4vcpu-ubuntu-2204
165165
strategy:
166166
matrix:
167-
cargo_command: [check]
168-
args: [--all-features]
167+
cargo_command: [ check ]
168+
args: [ --all-features ]
169169
package: ${{fromJSON(needs.get-workspace-members.outputs.members)}}
170170
include:
171171
- cargo_command: fmt

Cargo.toml

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,21 @@ homepage = "https://fuel.network/"
3838
readme = "README.md"
3939
license = "Apache-2.0"
4040
repository = "https://github.com/FuelLabs/fuels-rs"
41-
rust-version = "1.85.0"
42-
version = "0.73.0"
41+
rust-version = "1.90.0"
42+
version = "0.76.0"
4343

4444
[workspace.dependencies]
4545
Inflector = "0.11.4"
4646
anyhow = { version = "1.0", default-features = false }
4747
dialoguer = { version = "0.11", default-features = false }
4848
async-trait = { version = "0.1.74", default-features = false }
49-
bech32 = "0.9.1"
5049
bytes = { version = "1.5.0", default-features = false }
5150
chrono = "0.4.31"
5251
cynic = { version = "3.1.0", default-features = false }
5352
test-case = { version = "3.3", default-features = false }
5453
eth-keystore = "0.5.0"
5554
flate2 = { version = "1.0", default-features = false }
56-
fuel-abi-types = "0.12.0"
55+
fuel-abi-types = "0.15.3"
5756
futures = "0.3.29"
5857
hex = { version = "0.4.3", default-features = false }
5958
itertools = "0.12.0"
@@ -95,30 +94,30 @@ testcontainers = { version = "0.23", default-features = false }
9594
k256 = { version = "0.13", default-features = false }
9695

9796
# Dependencies from the `fuel-core` repository:
98-
fuel-core = { version = "0.43.2", default-features = false, features = [
97+
fuel-core = { version = "0.47.1", default-features = false, features = [
9998
"wasm-executor",
10099
] }
101-
fuel-core-chain-config = { version = "0.43.2", default-features = false }
102-
fuel-core-client = { version = "0.43.2", default-features = false }
103-
fuel-core-poa = { version = "0.43.2", default-features = false }
104-
fuel-core-services = { version = "0.43.2", default-features = false }
105-
fuel-core-types = { version = "0.43.2", default-features = false }
100+
fuel-core-chain-config = { version = "0.47.1", default-features = false }
101+
fuel-core-client = { version = "0.47.1", default-features = false }
102+
fuel-core-poa = { version = "0.47.1", default-features = false }
103+
fuel-core-services = { version = "0.47.1", default-features = false }
104+
fuel-core-types = { version = "0.47.1", default-features = false }
106105

107106
# Dependencies from the `fuel-vm` repository:
108-
fuel-asm = { version = "0.60.2" }
109-
fuel-crypto = { version = "0.60.2" }
110-
fuel-merkle = { version = "0.60.2" }
111-
fuel-storage = { version = "0.60.2" }
112-
fuel-tx = { version = "0.60.2" }
113-
fuel-types = { version = "0.60.2" }
114-
fuel-vm = { version = "0.60.2" }
107+
fuel-asm = { version = "0.65.0" }
108+
fuel-crypto = { version = "0.65.0" }
109+
fuel-merkle = { version = "0.65.0" }
110+
fuel-storage = { version = "0.65.0" }
111+
fuel-tx = { version = "0.65.0" }
112+
fuel-types = { version = "0.65.0" }
113+
fuel-vm = { version = "0.65.0" }
115114

116115
# Workspace projects
117-
fuels = { version = "0.73.0", path = "./packages/fuels", default-features = false }
118-
fuels-accounts = { version = "0.73.0", path = "./packages/fuels-accounts", default-features = false }
119-
fuels-code-gen = { version = "0.73.0", path = "./packages/fuels-code-gen", default-features = false }
120-
fuels-core = { version = "0.73.0", path = "./packages/fuels-core", default-features = false }
121-
fuels-macros = { version = "0.73.0", path = "./packages/fuels-macros", default-features = false }
122-
fuels-programs = { version = "0.73.0", path = "./packages/fuels-programs", default-features = false }
123-
fuels-test-helpers = { version = "0.73.0", path = "./packages/fuels-test-helpers", default-features = false }
124-
versions-replacer = { version = "0.73.0", path = "./scripts/versions-replacer", default-features = false }
116+
fuels = { version = "0.76.0", path = "./packages/fuels", default-features = false }
117+
fuels-accounts = { version = "0.76.0", path = "./packages/fuels-accounts", default-features = false }
118+
fuels-code-gen = { version = "0.76.0", path = "./packages/fuels-code-gen", default-features = false }
119+
fuels-core = { version = "0.76.0", path = "./packages/fuels-core", default-features = false }
120+
fuels-macros = { version = "0.76.0", path = "./packages/fuels-macros", default-features = false }
121+
fuels-programs = { version = "0.76.0", path = "./packages/fuels-programs", default-features = false }
122+
fuels-test-helpers = { version = "0.76.0", path = "./packages/fuels-test-helpers", default-features = false }
123+
versions-replacer = { version = "0.76.0", path = "./scripts/versions-replacer", default-features = false }

ci_checks.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
# Note, if you need a custom branch, you can replace `--tag {RELEASE}` with the `--branch {BRANCH_NAME}`.
99

1010
cargo fmt --all -- --check &&
11-
forc fmt --check &&
12-
forc build --release --terse &&
11+
forc fmt --check --path e2e &&
12+
forc build --release --terse --path e2e &&
1313
cargo clippy --all-targets &&
14-
forc build --release --terse &&
14+
forc build --release --terse --path e2e &&
1515
cargo clippy --all-targets --all-features &&
1616
cargo test --all-targets --all-features &&
1717
cargo test --all-targets --all-features --workspace &&
1818
cargo test --all-targets --workspace &&
1919
cargo run --bin check-docs &&
20-
cargo doc |& grep -A 6 "warning: unresolved link to"
20+
$(cargo doc |& grep -A 6 "warning: unresolved link to")

docs/src/SUMMARY.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
- [`Address`](./types/address.md)
5656
- [`ContractId`](./types/contract-id.md)
5757
- [`AssetId`](./types/asset-id.md)
58-
- [`Bech32`](./types/bech32.md)
5958
- [Structs and enums](./types/custom_types.md)
6059
- [`String`](./types/string.md)
6160
- [`Bits256`](./types/bits256.md)

docs/src/accounts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ For transferring assets to the base layer chain, you can use `wallet.withdraw_to
3737
{{#include ../../examples/wallets/src/lib.rs:wallet_withdraw_to_base}}
3838
```
3939

40-
The above example creates an `Address` from a string and converts it to a `Bech32Address`. Next, it calls `wallet.withdraw_to_base_layer` by providing the address, the amount to be transferred, and the transaction policies. Lastly, to verify that the transfer succeeded, the relevant message proof is retrieved with `provider.get_message_proof,` and the amount and the recipient are verified.
40+
The above example creates an `Address` from a string. Next, it calls `wallet.withdraw_to_base_layer` by providing the address, the amount to be transferred, and the transaction policies. Lastly, to verify that the transfer succeeded, the relevant message proof is retrieved with `provider.get_message_proof,` and the amount and the recipient are verified.

docs/src/codec/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ All types generated by the [`abigen!`](../abigen/index.md) macro implement both
1212

1313
`fuels` also contains implementations for:
1414

15-
- [`Tokenizable`](https://docs.rs/fuels/latest/fuels/core/traits/trait.Tokenizable.html) for the `fuels`-owned types listed [here](https://docs.rs/fuels/latest/fuels/core/traits/trait.Tokenizable.html#implementors) as well as [for some foreign types](https://docs.rs/fuels/latest/fuels/core/traits/trait.Tokenizable.html#foreign-impls) (such as `u8`, `u16`, `std::vec::Vec<T: Tokenizable>`, etc.).
16-
- [`Parameterize`](https://docs.rs/fuels/latest/fuels/core/traits/trait.Parameterize.html) for the `fuels`-owned types listed [here](https://docs.rs/fuels/latest/fuels/core/traits/trait.Parameterize.html#implementors) as well as [for some foreign types](https://docs.rs/fuels/latest/fuels/core/traits/trait.Parameterize.html#foreign-impls) (such as `u8`, `u16`, `std::vec::Vec<T: Parameterize>`, etc.).
15+
- [`Tokenizable`](https://docs.rs/fuels/latest/fuels/core/traits/trait.Tokenizable.html) for the `fuels`-owned types listed [here](https://docs.rs/fuels/latest/fuels/core/traits/trait.Tokenizable.html#implementers) as well as [for some foreign types](https://docs.rs/fuels/latest/fuels/core/traits/trait.Tokenizable.html#foreign-impls) (such as `u8`, `u16`, `std::vec::Vec<T: Tokenizable>`, etc.).
16+
- [`Parameterize`](https://docs.rs/fuels/latest/fuels/core/traits/trait.Parameterize.html) for the `fuels`-owned types listed [here](https://docs.rs/fuels/latest/fuels/core/traits/trait.Parameterize.html#implementers) as well as [for some foreign types](https://docs.rs/fuels/latest/fuels/core/traits/trait.Parameterize.html#foreign-impls) (such as `u8`, `u16`, `std::vec::Vec<T: Parameterize>`, etc.).
1717

1818
## Deriving the traits
1919

docs/src/connecting/short-lived.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ let wallet = launch_provider_and_get_wallet().await?;
2727
The `fuel-core-lib` feature allows us to run a `fuel-core` node without installing the `fuel-core` binary on the local machine. Using the `fuel-core-lib` feature flag entails downloading all the dependencies needed to run the fuel-core node.
2828

2929
```rust,ignore
30-
fuels = { version = "0.73.0", features = ["fuel-core-lib"] }
30+
fuels = { version = "0.76.0", features = ["fuel-core-lib"] }
3131
```
3232

3333
### RocksDB
3434

3535
The `rocksdb` is an additional feature that, when combined with `fuel-core-lib`, provides persistent storage capabilities while using `fuel-core` as a library.
3636

3737
```rust,ignore
38-
fuels = { version = "0.73.0", features = ["rocksdb"] }
38+
fuels = { version = "0.76.0", features = ["rocksdb"] }
3939
```
Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
# Interacting with contracts
22

3-
If you already have a deployed contract and want to call its methods using the SDK, but without deploying it again, all you need is the contract ID of your deployed contract. You can skip the whole deployment setup and call `::new(contract_id, wallet)` directly. For example:
3+
If you already have a deployed contract and want to call its methods using the SDK, but without deploying it again, all you need is the contract ID of your deployed contract. You can skip the whole deployment setup and call `::new(contract_id, wallet)` directly. For example:
44

55
```rust,ignore
66
{{#include ../../../examples/contracts/src/lib.rs:deployed_contracts}}
77
```
8-
9-
The above example assumes that your contract ID string is encoded in the `bech32` format. You can recognize it by the human-readable-part "fuel" followed by the separator "1". However, when using other Fuel tools, you might end up with a hex-encoded contract ID string. In that case, you can create your contract instance as follows:
10-
11-
```rust,ignore
12-
{{#include ../../../examples/contracts/src/lib.rs:deployed_contracts_hex}}
13-
```
14-
15-
You can learn more about the Fuel SDK `bech32` types [here](../types/bech32.md).

docs/src/types/bech32.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

docs/src/types/conversion.md

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Below you can find examples for common type conversions:
88
- [Convert to `ContractId`](#convert-to-contractid)
99
- [Convert to `Identity`](#convert-to-identity)
1010
- [Convert to `AssetId`](#convert-to-assetid)
11-
- [Convert to `Bech32`](#convert-to-bech32)
1211
- [Convert to `str`](#convert-to-str)
1312
- [Convert to `Bits256`](#convert-to-bits256)
1413
- [Convert to `Bytes`](#convert-to-bytes)
@@ -45,12 +44,6 @@ Convert a `[u8; 32]` array to an `Address`:
4544
{{#include ../../../examples/types/src/lib.rs:array_to_address}}
4645
```
4746

48-
Convert a `Bech32` address to an `Address`:
49-
50-
```rust,ignore
51-
{{#include ../../../examples/types/src/lib.rs:bech32_to_address}}
52-
```
53-
5447
Convert a wallet to an `Address`:
5548

5649
```rust,ignore
@@ -111,32 +104,6 @@ Convert a hex string to an `AssetId`:
111104
{{#include ../../../examples/types/src/lib.rs:string_to_asset_id}}
112105
```
113106

114-
## Convert to `Bech32`
115-
116-
Convert a `[u8; 32]` array to a `Bech32` address:
117-
118-
```rust,ignore
119-
{{#include ../../../examples/types/src/lib.rs:array_to_bech32}}
120-
```
121-
122-
Convert `Bytes32` to a `Bech32` address:
123-
124-
```rust,ignore
125-
{{#include ../../../examples/types/src/lib.rs:bytes32_to_bech32}}
126-
```
127-
128-
Convert a string to a `Bech32` address:
129-
130-
```rust,ignore
131-
{{#include ../../../examples/types/src/lib.rs:str_to_bech32}}
132-
```
133-
134-
Convert an `Address` to a `Bech32` address:
135-
136-
```rust,ignore
137-
{{#include ../../../examples/types/src/lib.rs:address_to_bech32}}
138-
```
139-
140107
## Convert to `str`
141108

142109
Convert a `ContractId` to a `str`:

0 commit comments

Comments
 (0)