From 097498f582145a23f00b77419540bbd3872c7654 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sun, 3 Nov 2024 00:53:46 +0700 Subject: [PATCH 1/6] Upgrading `forc` to `0.66.3` --- internal/forc/VERSION | 2 +- packages/versions/src/lib/getBuiltinVersions.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/forc/VERSION b/internal/forc/VERSION index 0596230fa4f..d09ad605c84 100644 --- a/internal/forc/VERSION +++ b/internal/forc/VERSION @@ -1 +1 @@ -0.66.2 +0.66.3 diff --git a/packages/versions/src/lib/getBuiltinVersions.ts b/packages/versions/src/lib/getBuiltinVersions.ts index 9541c6a98bd..15a2a7d9f1c 100644 --- a/packages/versions/src/lib/getBuiltinVersions.ts +++ b/packages/versions/src/lib/getBuiltinVersions.ts @@ -2,7 +2,7 @@ import type { Versions } from './types'; export function getBuiltinVersions(): Versions { return { - FORC: '0.66.2', + FORC: '0.66.3', FUEL_CORE: '0.40.0', FUELS: '0.96.1', }; From c32d51f38920edac2419e633945a66555b2af5c9 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sun, 3 Nov 2024 10:35:17 +0700 Subject: [PATCH 2/6] Updating fixture's offsets --- .../docs-snippets/test/fixtures/abi/encode-and-decode.jsonc | 2 +- .../fixtures/templates/contract-with-configurable/main.hbs | 6 +++--- .../fixtures/templates/predicate-with-configurable/main.hbs | 4 ++-- .../fixtures/templates/script-with-configurable/main.hbs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/docs-snippets/test/fixtures/abi/encode-and-decode.jsonc b/apps/docs-snippets/test/fixtures/abi/encode-and-decode.jsonc index 61d29a1c8da..7bb17f6f4be 100644 --- a/apps/docs-snippets/test/fixtures/abi/encode-and-decode.jsonc +++ b/apps/docs-snippets/test/fixtures/abi/encode-and-decode.jsonc @@ -29,7 +29,7 @@ { "name": "AMOUNT", "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", - "offset": 944, + "offset": 968, }, ], } diff --git a/packages/abi-typegen/test/fixtures/templates/contract-with-configurable/main.hbs b/packages/abi-typegen/test/fixtures/templates/contract-with-configurable/main.hbs index 394cb1f3f41..7d3928af46a 100644 --- a/packages/abi-typegen/test/fixtures/templates/contract-with-configurable/main.hbs +++ b/packages/abi-typegen/test/fixtures/templates/contract-with-configurable/main.hbs @@ -160,17 +160,17 @@ const abi = { { "name": "SHOULD_RETURN", "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", - "offset": 2768 + "offset": 2800 }, { "name": "AN_OPTION", "concreteTypeId": "2da102c46c7263beeed95818cd7bee801716ba8303dddafdcd0f6c9efda4a0f1", - "offset": 2744 + "offset": 2776 }, { "name": "A_GENERIC_STRUCT", "concreteTypeId": "71df88006611ffff852cf617defb70f77adaf507305088cedd41d276c783aab0", - "offset": 2760 + "offset": 2792 } ] }; diff --git a/packages/abi-typegen/test/fixtures/templates/predicate-with-configurable/main.hbs b/packages/abi-typegen/test/fixtures/templates/predicate-with-configurable/main.hbs index fdacb6def91..10ede746c7b 100644 --- a/packages/abi-typegen/test/fixtures/templates/predicate-with-configurable/main.hbs +++ b/packages/abi-typegen/test/fixtures/templates/predicate-with-configurable/main.hbs @@ -73,12 +73,12 @@ const abi = { { "name": "FEE", "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", - "offset": 920 + "offset": 928 }, { "name": "ADDRESS", "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", - "offset": 888 + "offset": 896 } ] }; diff --git a/packages/abi-typegen/test/fixtures/templates/script-with-configurable/main.hbs b/packages/abi-typegen/test/fixtures/templates/script-with-configurable/main.hbs index fb4a272eb19..71b9ba3cb53 100644 --- a/packages/abi-typegen/test/fixtures/templates/script-with-configurable/main.hbs +++ b/packages/abi-typegen/test/fixtures/templates/script-with-configurable/main.hbs @@ -81,7 +81,7 @@ const abi = { { "name": "SHOULD_RETURN", "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", - "offset": 752 + "offset": 760 } ] }; From b0c1b5f077e67161a93e10d86ca4cfb1067e65ca Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sun, 3 Nov 2024 10:36:05 +0700 Subject: [PATCH 3/6] Updating [hardcoded] predicate address in test fixture --- .../test/fixtures/forc-projects/bytecode-sway-lib/src/main.sw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fuel-gauge/test/fixtures/forc-projects/bytecode-sway-lib/src/main.sw b/packages/fuel-gauge/test/fixtures/forc-projects/bytecode-sway-lib/src/main.sw index 5aac2d0d056..f0c350998a2 100644 --- a/packages/fuel-gauge/test/fixtures/forc-projects/bytecode-sway-lib/src/main.sw +++ b/packages/fuel-gauge/test/fixtures/forc-projects/bytecode-sway-lib/src/main.sw @@ -19,6 +19,6 @@ impl MyContract for Contract { } fn compute_predicate_address(bytecode: Vec) -> Address { - return Address::from(0x68fec7a57e48f4ec6467d7e09c27272bd8ca72b312ea553a470b98731475ccf3); + return Address::from(0x190c849d8d5fdc0ad9e87cdfa02dde8b4414cacb34ae277a49ec057e67b04c01); } } From cab53f3320b8efe4ba9bec0f54beafef4dda41cc Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sun, 3 Nov 2024 10:57:10 +0700 Subject: [PATCH 4/6] Adding changeset --- .changeset/small-ways-sleep.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changeset/small-ways-sleep.md diff --git a/.changeset/small-ways-sleep.md b/.changeset/small-ways-sleep.md new file mode 100644 index 00000000000..314eef24acb --- /dev/null +++ b/.changeset/small-ways-sleep.md @@ -0,0 +1,7 @@ +--- +"@fuel-ts/abi-typegen": patch +"@fuel-ts/versions": patch +"@internal/forc": patch +--- + +chore: upgrading `forc` to `0.66.3` From 74b39532c39d5379fa6694b62779bfe17de09a0f Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Mon, 4 Nov 2024 12:26:50 +0700 Subject: [PATCH 5/6] Bumping forc patch --- .changeset/small-ways-sleep.md | 2 +- internal/forc/VERSION | 2 +- packages/versions/src/lib/getBuiltinVersions.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.changeset/small-ways-sleep.md b/.changeset/small-ways-sleep.md index 314eef24acb..400194ffef6 100644 --- a/.changeset/small-ways-sleep.md +++ b/.changeset/small-ways-sleep.md @@ -4,4 +4,4 @@ "@internal/forc": patch --- -chore: upgrading `forc` to `0.66.3` +chore: upgrading `forc` to `0.66.4` diff --git a/internal/forc/VERSION b/internal/forc/VERSION index d09ad605c84..e890bffdf27 100644 --- a/internal/forc/VERSION +++ b/internal/forc/VERSION @@ -1 +1 @@ -0.66.3 +0.66.4 diff --git a/packages/versions/src/lib/getBuiltinVersions.ts b/packages/versions/src/lib/getBuiltinVersions.ts index 15a2a7d9f1c..28c288daeff 100644 --- a/packages/versions/src/lib/getBuiltinVersions.ts +++ b/packages/versions/src/lib/getBuiltinVersions.ts @@ -2,7 +2,7 @@ import type { Versions } from './types'; export function getBuiltinVersions(): Versions { return { - FORC: '0.66.3', + FORC: '0.66.4', FUEL_CORE: '0.40.0', FUELS: '0.96.1', }; From f56b6fc1958795acfa9da118ae5b19f1d8a5cf73 Mon Sep 17 00:00:00 2001 From: Torres-ssf Date: Wed, 6 Nov 2024 09:52:52 +0700 Subject: [PATCH 6/6] adjusting fixtures --- .../fixtures/templates/contract-with-configurable/main.hbs | 6 +++--- .../fixtures/templates/predicate-with-configurable/main.hbs | 4 ++-- .../fixtures/forc-projects/bytecode-sway-lib/src/main.sw | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/abi-typegen/test/fixtures/templates/contract-with-configurable/main.hbs b/packages/abi-typegen/test/fixtures/templates/contract-with-configurable/main.hbs index 7d3928af46a..d767304335a 100644 --- a/packages/abi-typegen/test/fixtures/templates/contract-with-configurable/main.hbs +++ b/packages/abi-typegen/test/fixtures/templates/contract-with-configurable/main.hbs @@ -160,17 +160,17 @@ const abi = { { "name": "SHOULD_RETURN", "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", - "offset": 2800 + "offset": 2776 }, { "name": "AN_OPTION", "concreteTypeId": "2da102c46c7263beeed95818cd7bee801716ba8303dddafdcd0f6c9efda4a0f1", - "offset": 2776 + "offset": 2752 }, { "name": "A_GENERIC_STRUCT", "concreteTypeId": "71df88006611ffff852cf617defb70f77adaf507305088cedd41d276c783aab0", - "offset": 2792 + "offset": 2768 } ] }; diff --git a/packages/abi-typegen/test/fixtures/templates/predicate-with-configurable/main.hbs b/packages/abi-typegen/test/fixtures/templates/predicate-with-configurable/main.hbs index 10ede746c7b..fdacb6def91 100644 --- a/packages/abi-typegen/test/fixtures/templates/predicate-with-configurable/main.hbs +++ b/packages/abi-typegen/test/fixtures/templates/predicate-with-configurable/main.hbs @@ -73,12 +73,12 @@ const abi = { { "name": "FEE", "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", - "offset": 928 + "offset": 920 }, { "name": "ADDRESS", "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", - "offset": 896 + "offset": 888 } ] }; diff --git a/packages/fuel-gauge/test/fixtures/forc-projects/bytecode-sway-lib/src/main.sw b/packages/fuel-gauge/test/fixtures/forc-projects/bytecode-sway-lib/src/main.sw index f0c350998a2..5aac2d0d056 100644 --- a/packages/fuel-gauge/test/fixtures/forc-projects/bytecode-sway-lib/src/main.sw +++ b/packages/fuel-gauge/test/fixtures/forc-projects/bytecode-sway-lib/src/main.sw @@ -19,6 +19,6 @@ impl MyContract for Contract { } fn compute_predicate_address(bytecode: Vec) -> Address { - return Address::from(0x190c849d8d5fdc0ad9e87cdfa02dde8b4414cacb34ae277a49ec057e67b04c01); + return Address::from(0x68fec7a57e48f4ec6467d7e09c27272bd8ca72b312ea553a470b98731475ccf3); } }