Skip to content

Commit

Permalink
Update to forc v0.66.2, fuel-core v0.40. and fuels-rs v0.66.9 (#305)
Browse files Browse the repository at this point in the history
## Type of change

<!--Delete points that do not apply-->

- Improvement (refactoring, restructuring repository, cleaning tech
debt, ...)

## Changes

The following changes have been made:

- Updates to forc v0.66.2
- Updates to fuel-core v0.40.0
- Updates to fuels-rs v0.66.9

## Notes

- This PR fixes CI on the repository and must be merged first

## Checklist

- [x] I have linked to any relevant issues.
- [x] I have commented my code, particularly in hard-to-understand
areas.
- [x] I have updated the documentation where relevant (API docs, the
reference, and the Sway book).
- [ ] If my change requires substantial documentation changes, I have
[requested support from the DevRel
team](https://github.com/FuelLabs/devrel-requests/issues/new/choose)
- [x] I have added tests that prove my fix is effective or that my
feature works.
- [x] I have added (or requested a maintainer to add) the necessary
`Breaking*` or `New Feature` labels where relevant.
- [x] I have done my best to ensure that my PR adheres to [the Fuel Labs
Code Review
Standards](https://github.com/FuelLabs/rfcs/blob/master/text/code-standards/external-contributors.md).
- [x] I have requested a review from the relevant team or maintainers.
- [x] I have updated the changelog to reflect the changes on this PR.
  • Loading branch information
bitzoic authored Oct 25, 2024
1 parent 5010777 commit 05f8644
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ env:
CARGO_TERM_COLOR: always
REGISTRY: ghcr.io
RUST_VERSION: 1.80.1
FORC_VERSION: 0.63.3
CORE_VERSION: 0.34.0
FORC_VERSION: 0.66.2
CORE_VERSION: 0.40.0

jobs:
build-sway-lib:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ on:

env:
RUST_VERSION: 1.80.1
FORC_VERSION: 0.63.3
CORE_VERSION: 0.34.0
FORC_VERSION: 0.66.2
CORE_VERSION: 0.40.0

jobs:
deploy-contributing:
Expand Down
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ Description of the upcoming release here.

### Changed

- Something changed here 1
- Something changed here 2
- [#305](https://github.com/FuelLabs/sway-libs/pull/305) Updates to forc `v0.66.2`, fuel-core `v0.40.0`, and fuels-rs `v0.66.9`.

### Fixed

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ For more information about implementation please refer to the [Sway Libs Docs Hu

## Running Tests

There are two sets of tests that should be run: inline tests and sdk-harness tests. Please make sure you are using `forc v0.63.3` and `fuel-core v0.34.0`. You can check what version you are using by running the `fuelup show` command.
There are two sets of tests that should be run: inline tests and sdk-harness tests. Please make sure you are using `forc v0.66.2` and `fuel-core v0.40.0`. You can check what version you are using by running the `fuelup show` command.

Make sure you are in the source directory of this repository `sway-libs/<you are here>`.

Expand All @@ -119,7 +119,7 @@ forc test --path tests --release --locked && cargo test --manifest-path tests/Ca
Any instructions related to using a specific library should be found within the README.md of that library.

> **NOTE:**
> All projects currently use `forc v0.63.3`, `fuels-rs v0.66.2` and `fuel-core v0.34.0`.
> All projects currently use `forc v0.66.2`, `fuels-rs v0.66.9` and `fuel-core v0.40.0`.
## Contributing

Expand Down
4 changes: 2 additions & 2 deletions examples/Forc.lock
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ dependencies = [

[[package]]
name = "core"
source = "path+from-root-EF1196EF955CE54B"
source = "path+from-root-7053AAA90CC5E690"

[[package]]
name = "merkle_examples"
Expand Down Expand Up @@ -146,7 +146,7 @@ dependencies = ["std"]

[[package]]
name = "std"
source = "git+https://github.com/fuellabs/sway?tag=v0.63.3#f55c81cce61aac31913ac0e87306cbaed7da679a"
source = "git+https://github.com/fuellabs/sway?tag=v0.66.2#31486c0b47669612acb7c64d66ecb50aea281282"
dependencies = ["core"]

[[package]]
Expand Down
4 changes: 2 additions & 2 deletions libs/Forc.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[[package]]
name = "core"
source = "path+from-root-EF1196EF955CE54B"
source = "path+from-root-7053AAA90CC5E690"

[[package]]
name = "standards"
Expand All @@ -9,7 +9,7 @@ dependencies = ["std"]

[[package]]
name = "std"
source = "git+https://github.com/fuellabs/sway?tag=v0.63.3#f55c81cce61aac31913ac0e87306cbaed7da679a"
source = "git+https://github.com/fuellabs/sway?tag=v0.66.2#31486c0b47669612acb7c64d66ecb50aea281282"
dependencies = ["core"]

[[package]]
Expand Down
2 changes: 1 addition & 1 deletion tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "Apache-2.0"

[dependencies]
fuel-merkle = { version = "0.56.0" }
fuels = { version = "0.66.2" }
fuels = { version = "0.66.9" }
sha2 = { version = "0.10" }
tokio = { version = "1.12", features = ["rt", "macros"] }
rand = { version = "0.8.5", default-features = false, features = [
Expand Down
4 changes: 2 additions & 2 deletions tests/Forc.lock
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies = ["std"]

[[package]]
name = "core"
source = "path+from-root-EF1196EF955CE54B"
source = "path+from-root-7053AAA90CC5E690"

[[package]]
name = "i128_test"
Expand Down Expand Up @@ -215,7 +215,7 @@ dependencies = ["std"]

[[package]]
name = "std"
source = "git+https://github.com/fuellabs/sway?tag=v0.63.3#f55c81cce61aac31913ac0e87306cbaed7da679a"
source = "git+https://github.com/fuellabs/sway?tag=v0.66.2#31486c0b47669612acb7c64d66ecb50aea281282"
dependencies = ["core"]

[[package]]
Expand Down
8 changes: 4 additions & 4 deletions tests/src/bytecode/tests/utils/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ const HEX_STR_1: &str = "0xb4ca495f61ac3433e9a78cbf3adfb0e4486913bb548029cef99d1
const HEX_STR_2: &str = "0x5d617010b482b54332741fab0dfd1b15dfad07e8895360af0fb9f3e3a04b0c74";
const HEX_STR_3: &str = "0xfebf0fdda20de46a0f2261a69556b0f9fdeea85759af1edb322831cf7d0dc8d5";
const SIMPLE_PREDICATE_OFFSET: u64 = 376;
const SIMPLE_CONTRACT_OFFSET: u64 = 1400;
const COMPLEX_CONTRACT_OFFSET_1: u64 = 22968;
const COMPLEX_CONTRACT_OFFSET_2: u64 = 22928;
const COMPLEX_CONTRACT_OFFSET_3: u64 = 22856;
const SIMPLE_CONTRACT_OFFSET: u64 = 1384;
const COMPLEX_CONTRACT_OFFSET_1: u64 = 22584;
const COMPLEX_CONTRACT_OFFSET_2: u64 = 22544;
const COMPLEX_CONTRACT_OFFSET_3: u64 = 22472;

pub mod abi_calls {

Expand Down

0 comments on commit 05f8644

Please sign in to comment.