Merge branch 'next' into st/chore/remove-unused-operation-names

.changeset/fluffy-bulldogs-lay.md

@@ -0,0 +1,5 @@
+---
+"fuels": patch
+---
+
+fix: proxy deploy with storage

.eslintignore

@@ -13,7 +13,6 @@ apps/demo-react-cra
 apps/demo-react-vite
 apps/create-fuels-counter-guide
 apps/docs-snippets2/src/typegend
-apps/docs-snippets2/src/**/*.wrapped.ts
 
 packages/fuels/src/cli/commands/deploy/proxy
 packages/fuels/test/fixtures/project

.prettierrc

@@ -24,6 +24,13 @@
       "options": {
         "useTabs": false
       }
+    },
+    {
+      "files": ["apps/docs-snippets2/src/**/*.ts"],
+      "excludeFiles": ["apps/docs-snippets2/src/**/*.test.ts"],
+      "options": {
+        "printWidth": 80
+      }
     }
   ]
-}
+}

apps/docs-snippets2/scripts/wrap-snippets.ts

@@ -74,7 +74,7 @@ export const wrapSnippet = (filepath: string) => {
   const wrappedSnippet =
     // eslintDisableRule +
     wrapperFnContents
-      .replace('%IMPORTS%', imports)
+      .replace('// %IMPORTS%', imports)
       .replace('%NAME%', basename(filepath))
       .replace('// %SNIPPET%', indented)
       .replace('// %NODE_LAUNCHER%', nodeLauncher)
@@ -97,12 +97,6 @@ export const wrapSnippet = (filepath: string) => {
 */
 const dir = 'src/**';
 const src = `${dir}/*.ts`;
-const ignore = [
-  `src/typegend/**`,
-  `src/env.ts`,
-  `src/transactions/new-api.ts`,
-  `${dir}/*.test.ts`,
-  `${dir}/*.wrapped.ts`,
-];
+const ignore = [`src/typegend/**`, `src/env.ts`, `src/transactions/new-api.ts`, `${dir}/*.test.ts`];
 
 globSync(src, { ignore }).forEach(wrapSnippet);

apps/docs/nodemon.config.json

@@ -1,6 +1,17 @@
 {
   "verbose": true,
   "ext": "ts",
-  "watch": ["../../packages", "../docs-snippets"],
-  "ignore": ["**/*.d.ts", "**/*.map", "**/*.js", "**/out/release/**"]
+  "watch": [
+    "../../packages",
+    "../docs-snippets",
+    "../docs-snippets2/src",
+    "../docs-snippets2/sway"
+  ],
+  "ignore": [
+    "**/*.d.ts",
+    "**/*.map",
+    "**/*.js",
+    "**/out/release/**",
+    "../docs-snippets2/**/*.test.ts"
+  ]
 }

packages/fuels/src/cli/commands/deploy/deployContract.ts

@@ -28,9 +28,11 @@ export async function deployContract(
 
   const targetBytecode = readFileSync(binaryPath);
   const targetAbi = JSON.parse(readFileSync(abiPath, 'utf-8'));
+  const targetStorageSlots = deployConfig.storageSlots ?? [];
 
+  const proxyBytecode = Src14OwnedProxyFactory.bytecode;
   const proxyAbi = Src14OwnedProxy.abi;
-  const proxyFactory = new Src14OwnedProxyFactory(wallet);
+  const proxyStorageSlots = Src14OwnedProxy.storageSlots ?? [];
 
   const isProxyEnabled = tomlContents?.proxy?.enabled;
   const proxyAddress = tomlContents?.proxy?.address;
@@ -82,15 +84,18 @@ export async function deployContract(
   // b. Deploy the SR-C14 Compliant / Proxy Contract
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const { storageSlots, stateRoot, ...commonDeployConfig } = deployConfig;
+  const mergedStorageSlots = targetStorageSlots.concat(proxyStorageSlots);
 
   const proxyDeployConfig: DeployContractOptions = {
     ...commonDeployConfig,
+    storageSlots: mergedStorageSlots,
     configurableConstants: {
       INITIAL_TARGET: { bits: targetContract.id.toB256() },
       INITIAL_OWNER: { Initialized: { Address: { bits: wallet.address.toB256() } } },
     },
   };
 
+  const proxyFactory = new ContractFactory(proxyBytecode, proxyAbi, wallet);
   const { waitForResult: waitForProxy } = await proxyFactory.deploy(proxyDeployConfig);
   const { contract: proxyContract } = await waitForProxy();
 

packages/fuels/src/cli/commands/deploy/proxy/types/Src14OwnedProxy.ts

@@ -5,7 +5,7 @@
 /* eslint-disable @typescript-eslint/consistent-type-imports */
 
 /*
-  Fuels version: 0.94.7
+  Fuels version: 0.94.8
 */
 
 import { Contract, Interface } from "../../../../..";

packages/fuels/src/cli/commands/deploy/proxy/types/Src14OwnedProxyFactory.ts

@@ -5,7 +5,7 @@
 /* eslint-disable @typescript-eslint/consistent-type-imports */
 
 /*
-  Fuels version: 0.94.7
+  Fuels version: 0.94.8
 */
 
 import { Contract, ContractFactory, decompressBytecode } from "../../../../..";

packages/fuels/src/cli/commands/deploy/proxy/types/common.d.ts

@@ -5,7 +5,7 @@
 /* eslint-disable @typescript-eslint/consistent-type-imports */
 
 /*
-  Fuels version: 0.94.7
+  Fuels version: 0.94.8
 */
 
 /**

packages/fuels/src/cli/commands/deploy/proxy/types/index.ts

@@ -5,7 +5,7 @@
 /* eslint-disable @typescript-eslint/consistent-type-imports */
 
 /*
-  Fuels version: 0.94.7
+  Fuels version: 0.94.8
 */
 
 export { Src14OwnedProxy } from './Src14OwnedProxy';

packages/fuels/test/features/deploy.test.ts

@@ -1,3 +1,5 @@
+import type { JsonAbi } from '@fuel-ts/abi-coder';
+import type { Account } from '@fuel-ts/account';
 import { Contract } from '@fuel-ts/program';
 import { existsSync, readFileSync, writeFileSync } from 'fs';
 import { join } from 'path';
@@ -58,6 +60,20 @@ describe('deploy', { timeout: 180000 }, () => {
     expect(firstFuelsContents.fooBar).toMatch(/0x/);
   });
 
+  /**
+   * Executes the target contract and returns the values of the functions for proxy deploys.
+   */
+  async function executeTargetContract(contractId: string, abi: JsonAbi, wallet: Account) {
+    const targetContract = new Contract(contractId, abi, wallet);
+
+    const { value: getCountValue } = await targetContract.functions.get_value().get();
+
+    const res = await targetContract.functions.test_function().call();
+    const { value: testFunctionValue } = await res.waitForResult();
+
+    return { getCountValue, testFunctionValue };
+  }
+
   it('should run `deploy` command [using proxy + re-deploy]', async () => {
     using launched = await launchTestNode({
       nodeOptions: {
@@ -92,34 +108,26 @@ describe('deploy', { timeout: 180000 }, () => {
     expect(firstFuelsContents.fooBar).toMatch(/0x/);
     expect(firstFuelsContents.upgradable).toMatch(/0x/);
 
-    /**
-     * a) Add helper
-     *   For interacting with deployed contract
-     */
-    async function executeTargetContract() {
-      const upgradableContractId = firstFuelsContents.upgradable;
-      const upgradableAbi = JSON.parse(
-        readFileSync(
-          join(paths.upgradableContractPath, 'out', 'debug', 'upgradable-abi.json'),
-          'utf-8'
-        )
-      );
-
-      const targetContract = new Contract(upgradableContractId, upgradableAbi, wallet);
-      const res = await targetContract.functions.test_function().call();
-      const { value } = await res.waitForResult();
-
-      return value;
-    }
+    const contractId = firstFuelsContents.upgradable;
+    const abi = JSON.parse(
+      readFileSync(
+        join(paths.upgradableContractPath, 'out', 'debug', 'upgradable-abi.json'),
+        'utf-8'
+      )
+    );
 
     /**
-     * b) Interact with target contract
-     *   Calling `test_function` should return `true` for the first execution.
+     * a) Interacting with the target contract
+     *   Calling `test_function` should return `true` and `get_value`
+     *   should return `10` for the first execution.
      */
-    expect(await executeTargetContract()).toBe(true); // TRUE
+    expect(await executeTargetContract(contractId, abi, wallet)).toStrictEqual({
+      getCountValue: 10,
+      testFunctionValue: true,
+    });
 
     /**
-     * c) Modify `main.sw` method before second deploy
+     * b) Modify `main.sw` method before second deploy
      *   This will make the method return `false` instead of `true`.
      */
     const mainPath = join(paths.upgradableContractPath, 'src', 'main.sw');
@@ -140,10 +148,14 @@ describe('deploy', { timeout: 180000 }, () => {
     expect(firstFuelsContents.upgradable).toEqual(secondFuelsContents.upgradable);
 
     /**
-     * d) Interact with target contract
-     *   Now, calling `test_function` should return `false` instead.
+     * c) Interact with target contract
+     *   Now, calling `test_function` should return `false` instead,
+     *   but `get_value` should still return `10`.
      */
-    expect(await executeTargetContract()).toBe(false); // FALSE
+    expect(await executeTargetContract(contractId, abi, wallet)).toStrictEqual({
+      getCountValue: 10,
+      testFunctionValue: false,
+    });
   });
 
   it('should run `deploy` command [using proxy and chunking + re-deploy]', async () => {
@@ -180,39 +192,26 @@ describe('deploy', { timeout: 180000 }, () => {
     expect(firstFuelsContents.fooBar).toMatch(/0x/);
     expect(firstFuelsContents.upgradable).toMatch(/0x/);
 
-    /**
-     * a) Add helper
-     *   For interacting with deployed contract
-     */
-    async function executeTargetContract() {
-      const upgradableChunkedContractId = firstFuelsContents.upgradableChunked;
-      const upgradableChunkedAbi = JSON.parse(
-        readFileSync(
-          join(paths.upgradableChunkedContractPath, 'out', 'debug', 'upgradable-chunked-abi.json'),
-          'utf-8'
-        )
-      );
-
-      const targetContract = new Contract(
-        upgradableChunkedContractId,
-        upgradableChunkedAbi,
-        wallet
-      );
-
-      const res = await targetContract.functions.test_function().call();
-      const { value } = await res.waitForResult();
-
-      return value;
-    }
+    const contractId = firstFuelsContents.upgradableChunked;
+    const abi = JSON.parse(
+      readFileSync(
+        join(paths.upgradableChunkedContractPath, 'out', 'debug', 'upgradable-chunked-abi.json'),
+        'utf-8'
+      )
+    );
 
     /**
-     * b) Interact with target contract
-     *   Calling `test_function` should return `true` for the first execution.
+     * a) Interacting with the target contract
+     *   Calling `test_function` should return `true` and `get_value`
+     *   should return `10` for the first execution.
      */
-    expect(await executeTargetContract()).toBe(true); // TRUE
+    expect(await executeTargetContract(contractId, abi, wallet)).toStrictEqual({
+      getCountValue: 10,
+      testFunctionValue: true,
+    });
 
     /**
-     * c) Modify `main.sw` method before second deploy
+     * b) Modify `main.sw` method before second deploy
      *   This will make the method return `false` instead of `true`.
      */
     const mainPath = join(paths.upgradableChunkedContractPath, 'src', 'main.sw');
@@ -233,9 +232,13 @@ describe('deploy', { timeout: 180000 }, () => {
     expect(firstFuelsContents.upgradableChunked).toEqual(secondFuelsContents.upgradableChunked);
 
     /**
-     * d) Interact with target contract
-     *   Now, calling `test_function` should return `false` instead.
+     * c) Interact with target contract
+     *   Now, calling `test_function` should return `false` instead,
+     *   but `get_value` should still return `10`.
      */
-    expect(await executeTargetContract()).toBe(false); // FALSE
+    expect(await executeTargetContract(contractId, abi, wallet)).toStrictEqual({
+      getCountValue: 10,
+      testFunctionValue: false,
+    });
   });
 });