Merge branch 'master' into master

FuelLabs · Oct 28, 2024 · 0aaebf5 · 0aaebf5
2 parents 9ec07b8 + 05f8644
commit 0aaebf5
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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:

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -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:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
 

diff --git a/README.md b/README.md
@@ -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>`.
 
@@ -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
 

diff --git a/examples/Forc.lock b/examples/Forc.lock
@@ -53,7 +53,7 @@ dependencies = [
 
 [[package]]
 name = "core"
-source = "path+from-root-EF1196EF955CE54B"
+source = "path+from-root-7053AAA90CC5E690"
 
 [[package]]
 name = "merkle_examples"
@@ -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]]

diff --git a/libs/Forc.lock b/libs/Forc.lock
@@ -1,6 +1,6 @@
 [[package]]
 name = "core"
-source = "path+from-root-EF1196EF955CE54B"
+source = "path+from-root-7053AAA90CC5E690"
 
 [[package]]
 name = "standards"
@@ -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]]

diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -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 = [

diff --git a/tests/Forc.lock b/tests/Forc.lock
@@ -22,7 +22,7 @@ dependencies = ["std"]
 
 [[package]]
 name = "core"
-source = "path+from-root-EF1196EF955CE54B"
+source = "path+from-root-7053AAA90CC5E690"
 
 [[package]]
 name = "i128_test"
@@ -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]]

diff --git a/tests/src/bytecode/tests/utils/mod.rs b/tests/src/bytecode/tests/utils/mod.rs
@@ -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 {