From a6c5d8d22dfcb739d84405715680ba20f5404681 Mon Sep 17 00:00:00 2001 From: nedsalk Date: Tue, 18 Jun 2024 16:15:52 +0200 Subject: [PATCH 01/53] feat: add browser testing support in `launchTestNode` utility --- .changeset/serious-dogs-wash.md | 2 + packages/account/src/test-utils/launchNode.ts | 3 +- .../setup-test-provider-and-wallets.ts | 22 +++- .../fuel-gauge/src/call-test-contract.test.ts | 47 ++++---- .../src/setup-launch-node-server.test.ts | 68 +++++++++++ .../fuels/src/setup-launch-node-server.ts | 109 ++++++++++++++++++ scripts/tests-ci.sh | 3 +- vitest.browser.config.mts | 8 ++ vitest.global-browser-setup.ts | 24 ++++ 9 files changed, 260 insertions(+), 26 deletions(-) create mode 100644 .changeset/serious-dogs-wash.md create mode 100644 packages/fuels/src/setup-launch-node-server.test.ts create mode 100644 packages/fuels/src/setup-launch-node-server.ts create mode 100644 vitest.global-browser-setup.ts diff --git a/.changeset/serious-dogs-wash.md b/.changeset/serious-dogs-wash.md new file mode 100644 index 00000000000..a845151cc84 --- /dev/null +++ b/.changeset/serious-dogs-wash.md @@ -0,0 +1,2 @@ +--- +--- diff --git a/packages/account/src/test-utils/launchNode.ts b/packages/account/src/test-utils/launchNode.ts index a2bf58f1dcb..4f89ab09041 100644 --- a/packages/account/src/test-utils/launchNode.ts +++ b/packages/account/src/test-utils/launchNode.ts @@ -3,7 +3,6 @@ import { randomBytes } from '@fuel-ts/crypto'; import type { SnapshotConfigs } from '@fuel-ts/utils'; import { defaultConsensusKey, hexlify, defaultSnapshotConfigs } from '@fuel-ts/utils'; import type { ChildProcessWithoutNullStreams } from 'child_process'; -import { spawn } from 'child_process'; import { randomUUID } from 'crypto'; import { existsSync, mkdirSync, rmSync, writeFileSync } from 'fs'; import os from 'os'; @@ -217,6 +216,8 @@ export const launchNode = async ({ snapshotDirToUse = tempDir; } + const { spawn } = await import('child_process'); + const child = spawn( command, [ diff --git a/packages/account/src/test-utils/setup-test-provider-and-wallets.ts b/packages/account/src/test-utils/setup-test-provider-and-wallets.ts index 2e03d5fa8d0..6ff99aca921 100644 --- a/packages/account/src/test-utils/setup-test-provider-and-wallets.ts +++ b/packages/account/src/test-utils/setup-test-provider-and-wallets.ts @@ -64,7 +64,7 @@ export async function setupTestProviderAndWallets({ } ); - const { cleanup, url } = await launchNode({ + const launchNodeOptions = { loggingEnabled: false, ...nodeOptions, snapshotConfig: mergeDeepRight( @@ -72,7 +72,25 @@ export async function setupTestProviderAndWallets({ walletsConfig.apply(nodeOptions?.snapshotConfig) ), port: '0', - }); + }; + + let cleanup: () => void; + let url: string; + if (process.env.LAUNCH_NODE_SERVER_PORT) { + const serverUrl = `http://localhost:${process.env.LAUNCH_NODE_SERVER_PORT}`; + url = await ( + await fetch(serverUrl, { method: 'POST', body: JSON.stringify(launchNodeOptions) }) + ).text(); + + cleanup = () => { + // eslint-disable-next-line @typescript-eslint/no-floating-promises + fetch(`${serverUrl}/cleanup/${url}`); + }; + } else { + const settings = await launchNode(launchNodeOptions); + url = settings.url; + cleanup = settings.cleanup; + } let provider: Provider; diff --git a/packages/fuel-gauge/src/call-test-contract.test.ts b/packages/fuel-gauge/src/call-test-contract.test.ts index 53eb58ab080..e47cdfe0540 100644 --- a/packages/fuel-gauge/src/call-test-contract.test.ts +++ b/packages/fuel-gauge/src/call-test-contract.test.ts @@ -1,27 +1,30 @@ import { ASSET_A } from '@fuel-ts/utils/test-utils'; import type { Contract } from 'fuels'; import { BN, bn, toHex } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; -import type { CallTestContractAbi } from '../test/typegen/contracts'; import { CallTestContractAbi__factory } from '../test/typegen/contracts'; -import binHexlified from '../test/typegen/contracts/CallTestContractAbi.hex'; - -import { createSetupConfig } from './utils'; - -const setupContract = createSetupConfig({ - contractBytecode: binHexlified, - abi: CallTestContractAbi__factory.abi, - cache: true, -}); +import bytecode from '../test/typegen/contracts/CallTestContractAbi.hex'; + +const setupContract = async () => { + const { + contracts: [contract], + cleanup, + } = await launchTestNode({ + contractsConfigs: [{ deployer: CallTestContractAbi__factory, bytecode }], + }); + return Object.assign(contract, { [Symbol.dispose]: cleanup }); +}; const U64_MAX = bn(2).pow(64).sub(1); /** * @group node + * @group browser */ describe('CallTestContract', () => { it.each([0, 1337, U64_MAX.sub(1)])('can call a contract with u64 (%p)', async (num) => { - const contract = await setupContract(); + using contract = await setupContract(); const { value } = await contract.functions.foo(num).call(); expect(value.toHex()).toEqual(bn(num).add(1).toHex()); }); @@ -34,14 +37,14 @@ describe('CallTestContract', () => { [{ a: false, b: U64_MAX.sub(1) }], [{ a: true, b: U64_MAX.sub(1) }], ])('can call a contract with structs (%p)', async (struct) => { - const contract = await setupContract(); + using contract = await setupContract(); const { value } = await contract.functions.boo(struct).call(); expect(value.a).toEqual(!struct.a); expect(value.b.toHex()).toEqual(bn(struct.b).add(1).toHex()); }); it('can call a function with empty arguments', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const { value: empty } = await contract.functions.empty().call(); expect(empty.toHex()).toEqual(toHex(63)); @@ -59,7 +62,7 @@ describe('CallTestContract', () => { }); it('function with empty return should resolve undefined', async () => { - const contract = await setupContract(); + using contract = await setupContract(); // Call method with no params but with no result and no value on config const { value } = await contract.functions.return_void().call(); @@ -136,9 +139,9 @@ describe('CallTestContract', () => { async (method, { values, expected }) => { // Type cast to Contract because of the dynamic nature of the test // But the function names are type-constrained to correct Contract's type - const contract = (await setupContract()) as Contract; + using contract = await setupContract(); - const { value } = await contract.functions[method](...values).call(); + const { value } = await (contract as Contract).functions[method](...values).call(); if (BN.isBN(value)) { expect(toHex(value)).toBe(toHex(expected)); @@ -149,7 +152,7 @@ describe('CallTestContract', () => { ); it('Forward amount value on contract call', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const baseAssetId = contract.provider.getBaseAssetId(); const { value } = await contract.functions .return_context_amount() @@ -161,7 +164,7 @@ describe('CallTestContract', () => { }); it('Forward asset_id on contract call', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const assetId = ASSET_A; const { value } = await contract.functions @@ -174,7 +177,7 @@ describe('CallTestContract', () => { }); it('Forward asset_id on contract simulate call', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const assetId = ASSET_A; const { value } = await contract.functions @@ -187,7 +190,7 @@ describe('CallTestContract', () => { }); it('can make multiple calls', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const num = 1337; const numC = 10; @@ -222,14 +225,14 @@ describe('CallTestContract', () => { }); it('Calling a simple contract function does only one dry run', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const dryRunSpy = vi.spyOn(contract.provider.operations, 'dryRun'); await contract.functions.no_params().call(); expect(dryRunSpy).toHaveBeenCalledOnce(); }); it('Simulating a simple contract function does two dry runs', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const dryRunSpy = vi.spyOn(contract.provider.operations, 'dryRun'); await contract.functions.no_params().simulate(); diff --git a/packages/fuels/src/setup-launch-node-server.test.ts b/packages/fuels/src/setup-launch-node-server.test.ts new file mode 100644 index 00000000000..9e612cc92b1 --- /dev/null +++ b/packages/fuels/src/setup-launch-node-server.test.ts @@ -0,0 +1,68 @@ +import { Provider } from '@fuel-ts/account'; +import { waitUntilUnreachable } from '@fuel-ts/utils/test-utils'; +import { spawn } from 'node:child_process'; + +function startServer(): Promise<{ serverUrl: string; killServer: () => void } & Disposable> { + return new Promise((resolve, reject) => { + const cp = spawn('pnpm tsx packages/fuels/src/setup-launch-node-server.ts 0', { + detached: true, + shell: 'sh', + }); + + const killServer = () => { + // https://github.com/nodejs/node/issues/2098#issuecomment-169549789 + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + process.kill(-cp.pid!); + }; + + cp.stdout?.on('data', (chunk) => { + // first message is server url + const message = chunk.toString(); + const serverUrl = message.startsWith('http://') ? message : ''; + + // teardown + resolve({ + serverUrl, + killServer, + [Symbol.dispose]: killServer, + }); + }); + + cp.on('error', (err) => { + reject(err); + }); + }); +} + +describe('setup-launch-node-server', () => { + test('returns a valid fuel-core node url on request', async () => { + using launched = await startServer(); + + const url = await (await fetch(launched.serverUrl)).text(); + // fetches node-related data + // would fail if fuel-core node is not running on url + await Provider.create(url); + }); + + test('the /cleanup endpoint kills the node', async () => { + using launched = await startServer(); + const url = await (await fetch(launched.serverUrl)).text(); + + await fetch(`${launched.serverUrl}/cleanup/${url}`); + + // if the node remained live then the test would time out + await waitUntilUnreachable(url); + }); + + test('kills all nodes when the server is shut down', async () => { + const { serverUrl, killServer } = await startServer(); + const url1 = await (await fetch(serverUrl)).text(); + const url2 = await (await fetch(serverUrl)).text(); + + killServer(); + + // if the nodes remained live then the test would time out + await waitUntilUnreachable(url1); + await waitUntilUnreachable(url2); + }); +}); diff --git a/packages/fuels/src/setup-launch-node-server.ts b/packages/fuels/src/setup-launch-node-server.ts new file mode 100644 index 00000000000..16a9724b6e6 --- /dev/null +++ b/packages/fuels/src/setup-launch-node-server.ts @@ -0,0 +1,109 @@ +/* eslint-disable no-console */ +import type { LaunchNodeOptions, LaunchNodeResult } from '@fuel-ts/account/test-utils'; +import { launchNode } from '@fuel-ts/account/test-utils'; +import http from 'http'; +import type { AddressInfo } from 'net'; + +process.setMaxListeners(Infinity); + +async function parseBody(req: http.IncomingMessage) { + return new Promise((resolve, reject) => { + const body: Buffer[] = []; + req.on('data', (chunk) => { + body.push(chunk); + }); + req.on('end', () => { + resolve(JSON.parse(body.length === 0 ? '{}' : Buffer.concat(body).toString())); + }); + req.on('error', reject); + }); +} + +const cleanupFns: Map['cleanup']> = new Map(); + +function cleanupAllNodes() { + cleanupFns.forEach((fn) => fn()); +} + +const server = http.createServer(async (req, res) => { + res.setHeader('Access-Control-Allow-Origin', '*'); + + if (req.url === '/') { + const body = (await parseBody(req)) as LaunchNodeOptions; + + const node = await launchNode({ + port: '0', + ...body, + fuelCorePath: 'fuels-core', + }); + cleanupFns.set(node.url, () => { + node.cleanup(); + cleanupFns.delete(node.url); + }); + res.write(node.url); + res.end(); + return; + } + + if (req.url?.startsWith('/cleanup')) { + const nodeUrl = req.url?.match(/\/cleanup\/(.+)/)?.[1]; + if (nodeUrl) { + const cleanupFn = cleanupFns.get(nodeUrl); + cleanupFn?.(); + res.end(); + } + } +}); + +const port = process.argv[2] ? parseInt(process.argv[2], 10) : 49342; + +server.listen(port); + +server.on('listening', () => { + const usedPort = (server.address() as AddressInfo).port; + const serverUrl = `http://localhost:${usedPort}`; + console.log(serverUrl); + console.log(`Server is listening on: ${serverUrl}`); + console.log("To launch a new fuel-core node and get its url, make a POST request to '/'."); + console.log( + "To kill the node, make a POST request to '/cleanup/' where is the url of the node you want to kill." + ); + console.log('All nodes will be killed when the server is killed.'); +}); + +server.on('close', () => { + console.log('close'); + cleanupAllNodes(); +}); + +process.on('exit', () => { + console.log('exit'); + cleanupAllNodes(); +}); +process.on('SIGINT', () => { + console.log('sigint'); + cleanupAllNodes(); +}); +process.on('SIGUSR1', () => { + console.log('SIGUSR1'); + cleanupAllNodes(); +}); +process.on('SIGUSR2', () => { + console.log('SIGUSR2'); + cleanupAllNodes(); +}); +process.on('uncaughtException', (e) => { + console.log('uncaughtException'); + console.log(e); + cleanupAllNodes(); +}); +process.on('unhandledRejection', (reason) => { + console.log('unhandledRejection'); + console.log(reason); + + cleanupAllNodes(); +}); +process.on('beforeExit', () => { + console.log('beforeExit'); + cleanupAllNodes(); +}); diff --git a/scripts/tests-ci.sh b/scripts/tests-ci.sh index 1ecfac1a748..930fa37cf58 100755 --- a/scripts/tests-ci.sh +++ b/scripts/tests-ci.sh @@ -4,11 +4,12 @@ pkill fuel-core pnpm node:clean -pnpm node:run > /dev/null 2>&1 & +pnpm node:run >/dev/null 2>&1 & echo "Started Fuel-Core node in background." if [[ "$*" == *"--browser"* ]]; then + pnpm pretest pnpm test:browser TEST_RESULT=$? elif [[ "$*" == *"--node"* ]]; then diff --git a/vitest.browser.config.mts b/vitest.browser.config.mts index 8c7b3b0132f..97126db6ba6 100644 --- a/vitest.browser.config.mts +++ b/vitest.browser.config.mts @@ -20,6 +20,9 @@ const config: UserConfig = { "timers/promises", "util", "stream", + "path", + "fs", + "os", ], overrides: { fs: "memfs", @@ -31,7 +34,12 @@ const config: UserConfig = { include: ["events", "timers/promises"], }, test: { + env: { + LAUNCH_NODE_SERVER_PORT: "49342", + }, + globalSetup: ["./vitest.global-browser-setup.ts"], coverage: { + enabled: true, reportsDirectory: "coverage/environments/browser", }, browser: { diff --git a/vitest.global-browser-setup.ts b/vitest.global-browser-setup.ts new file mode 100644 index 00000000000..37c76751bc3 --- /dev/null +++ b/vitest.global-browser-setup.ts @@ -0,0 +1,24 @@ +import { spawn } from 'node:child_process'; + +export default async function setup() { + return new Promise((resolve, reject) => { + const cp = spawn('pnpm tsx packages/fuels/src/setup-launch-node-server.ts', { + detached: true, + shell: 'sh', + }); + + cp.stdout?.on('data', () => { + // return teardown function to be called when tests finish + // it will kill the server + resolve(() => { + // https://github.com/nodejs/node/issues/2098#issuecomment-169549789 + process.kill(-cp.pid!); + }); + }); + + cp.on('error', (err) => { + console.log('failed to start launchNode server', err); + reject(err); + }); + }); +} From f3724b6cc27d4d18ad795ca13e27f38bc96d75be Mon Sep 17 00:00:00 2001 From: nedsalk Date: Tue, 18 Jun 2024 16:18:08 +0200 Subject: [PATCH 02/53] chore: changeset update --- .changeset/serious-dogs-wash.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.changeset/serious-dogs-wash.md b/.changeset/serious-dogs-wash.md index a845151cc84..98709abc3cf 100644 --- a/.changeset/serious-dogs-wash.md +++ b/.changeset/serious-dogs-wash.md @@ -1,2 +1,5 @@ --- +"@fuel-ts/account": patch --- + +chore: add browser testing infrastructure From f642a315077b7f2c85c54d3c6845c3b84a5911a1 Mon Sep 17 00:00:00 2001 From: nedsalk Date: Tue, 18 Jun 2024 16:30:19 +0200 Subject: [PATCH 03/53] add missing group to test --- packages/fuels/src/setup-launch-node-server.test.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/fuels/src/setup-launch-node-server.test.ts b/packages/fuels/src/setup-launch-node-server.test.ts index 9e612cc92b1..9aa50777495 100644 --- a/packages/fuels/src/setup-launch-node-server.test.ts +++ b/packages/fuels/src/setup-launch-node-server.test.ts @@ -34,6 +34,9 @@ function startServer(): Promise<{ serverUrl: string; killServer: () => void } & }); } +/** + * @group node + */ describe('setup-launch-node-server', () => { test('returns a valid fuel-core node url on request', async () => { using launched = await startServer(); From 99a8aed5f5f09178dad3193e163879557f22769a Mon Sep 17 00:00:00 2001 From: nedsalk Date: Tue, 18 Jun 2024 16:33:50 +0200 Subject: [PATCH 04/53] remove unnecessary addition --- vitest.browser.config.mts | 1 - 1 file changed, 1 deletion(-) diff --git a/vitest.browser.config.mts b/vitest.browser.config.mts index 97126db6ba6..48852149d53 100644 --- a/vitest.browser.config.mts +++ b/vitest.browser.config.mts @@ -39,7 +39,6 @@ const config: UserConfig = { }, globalSetup: ["./vitest.global-browser-setup.ts"], coverage: { - enabled: true, reportsDirectory: "coverage/environments/browser", }, browser: { From 0abbed7eab82ca7d260614c35479ae2e9e47dd80 Mon Sep 17 00:00:00 2001 From: nedsalk Date: Tue, 18 Jun 2024 16:38:24 +0200 Subject: [PATCH 05/53] test: add test for specific port --- .../fuels/src/setup-launch-node-server.test.ts | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/fuels/src/setup-launch-node-server.test.ts b/packages/fuels/src/setup-launch-node-server.test.ts index 9aa50777495..898ccd776ed 100644 --- a/packages/fuels/src/setup-launch-node-server.test.ts +++ b/packages/fuels/src/setup-launch-node-server.test.ts @@ -2,9 +2,11 @@ import { Provider } from '@fuel-ts/account'; import { waitUntilUnreachable } from '@fuel-ts/utils/test-utils'; import { spawn } from 'node:child_process'; -function startServer(): Promise<{ serverUrl: string; killServer: () => void } & Disposable> { +function startServer( + port: number = 0 +): Promise<{ serverUrl: string; killServer: () => void } & Disposable> { return new Promise((resolve, reject) => { - const cp = spawn('pnpm tsx packages/fuels/src/setup-launch-node-server.ts 0', { + const cp = spawn(`pnpm tsx packages/fuels/src/setup-launch-node-server.ts ${port}`, { detached: true, shell: 'sh', }); @@ -17,9 +19,8 @@ function startServer(): Promise<{ serverUrl: string; killServer: () => void } & cp.stdout?.on('data', (chunk) => { // first message is server url - const message = chunk.toString(); - const serverUrl = message.startsWith('http://') ? message : ''; - + const message: string[] = chunk.toString().split('\n'); + const serverUrl = message[0].startsWith('http://') ? message[0] : ''; // teardown resolve({ serverUrl, @@ -38,6 +39,11 @@ function startServer(): Promise<{ serverUrl: string; killServer: () => void } & * @group node */ describe('setup-launch-node-server', () => { + test('can start server on specific port', async () => { + using launched = await startServer(9876); + expect(launched.serverUrl).toEqual('http://localhost:9876'); + }); + test('returns a valid fuel-core node url on request', async () => { using launched = await startServer(); From 562cbf5b8b2433bde3511fa615c2a33c741ed706 Mon Sep 17 00:00:00 2001 From: nedsalk Date: Tue, 18 Jun 2024 17:23:49 +0200 Subject: [PATCH 06/53] fix: linting --- vitest.global-browser-setup.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vitest.global-browser-setup.ts b/vitest.global-browser-setup.ts index 37c76751bc3..1a2cd0ca467 100644 --- a/vitest.global-browser-setup.ts +++ b/vitest.global-browser-setup.ts @@ -12,12 +12,12 @@ export default async function setup() { // it will kill the server resolve(() => { // https://github.com/nodejs/node/issues/2098#issuecomment-169549789 + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion process.kill(-cp.pid!); }); }); cp.on('error', (err) => { - console.log('failed to start launchNode server', err); reject(err); }); }); From 7045dcf0598d20922c1fad917a2ba9d52a4f89c4 Mon Sep 17 00:00:00 2001 From: nedsalk Date: Tue, 18 Jun 2024 17:50:34 +0200 Subject: [PATCH 07/53] Add longer timeouts --- .../src/setup-launch-node-server.test.ts | 70 ++++++++++++------- 1 file changed, 43 insertions(+), 27 deletions(-) diff --git a/packages/fuels/src/setup-launch-node-server.test.ts b/packages/fuels/src/setup-launch-node-server.test.ts index 898ccd776ed..01961f18d3e 100644 --- a/packages/fuels/src/setup-launch-node-server.test.ts +++ b/packages/fuels/src/setup-launch-node-server.test.ts @@ -39,39 +39,55 @@ function startServer( * @group node */ describe('setup-launch-node-server', () => { - test('can start server on specific port', async () => { - using launched = await startServer(9876); - expect(launched.serverUrl).toEqual('http://localhost:9876'); - }); + test( + 'can start server on specific port', + async () => { + using launched = await startServer(9876); + expect(launched.serverUrl).toEqual('http://localhost:9876'); + }, + { timeout: 10000 } + ); - test('returns a valid fuel-core node url on request', async () => { - using launched = await startServer(); + test( + 'returns a valid fuel-core node url on request', + async () => { + using launched = await startServer(); - const url = await (await fetch(launched.serverUrl)).text(); - // fetches node-related data - // would fail if fuel-core node is not running on url - await Provider.create(url); - }); + const url = await (await fetch(launched.serverUrl)).text(); + // fetches node-related data + // would fail if fuel-core node is not running on url + await Provider.create(url); + }, + { timeout: 10000 } + ); - test('the /cleanup endpoint kills the node', async () => { - using launched = await startServer(); - const url = await (await fetch(launched.serverUrl)).text(); + test( + 'the /cleanup endpoint kills the node', + async () => { + using launched = await startServer(); + const url = await (await fetch(launched.serverUrl)).text(); - await fetch(`${launched.serverUrl}/cleanup/${url}`); + await fetch(`${launched.serverUrl}/cleanup/${url}`); - // if the node remained live then the test would time out - await waitUntilUnreachable(url); - }); + // if the node remained live then the test would time out + await waitUntilUnreachable(url); + }, + { timeout: 10000 } + ); - test('kills all nodes when the server is shut down', async () => { - const { serverUrl, killServer } = await startServer(); - const url1 = await (await fetch(serverUrl)).text(); - const url2 = await (await fetch(serverUrl)).text(); + test( + 'kills all nodes when the server is shut down', + async () => { + const { serverUrl, killServer } = await startServer(); + const url1 = await (await fetch(serverUrl)).text(); + const url2 = await (await fetch(serverUrl)).text(); - killServer(); + killServer(); - // if the nodes remained live then the test would time out - await waitUntilUnreachable(url1); - await waitUntilUnreachable(url2); - }); + // if the nodes remained live then the test would time out + await waitUntilUnreachable(url1); + await waitUntilUnreachable(url2); + }, + { timeout: 10000 } + ); }); From 7a1ebbfe1a2944f5aebf3de9e75bd6003ba8b497 Mon Sep 17 00:00:00 2001 From: nedsalk Date: Thu, 20 Jun 2024 09:30:34 +0200 Subject: [PATCH 08/53] apply change requests --- .../src/setup-launch-node-server.test.ts | 23 +++++++---- .../fuels/src/setup-launch-node-server.ts | 39 ++++++++++++------- vitest.global-browser-setup.ts | 25 ++++++++---- 3 files changed, 58 insertions(+), 29 deletions(-) diff --git a/packages/fuels/src/setup-launch-node-server.test.ts b/packages/fuels/src/setup-launch-node-server.test.ts index 01961f18d3e..1304e4718b8 100644 --- a/packages/fuels/src/setup-launch-node-server.test.ts +++ b/packages/fuels/src/setup-launch-node-server.test.ts @@ -2,9 +2,12 @@ import { Provider } from '@fuel-ts/account'; import { waitUntilUnreachable } from '@fuel-ts/utils/test-utils'; import { spawn } from 'node:child_process'; -function startServer( - port: number = 0 -): Promise<{ serverUrl: string; killServer: () => void } & Disposable> { +interface ServerInfo extends Disposable { + serverUrl: string; + killServer: () => void; +} + +function startServer(port: number = 0): Promise { return new Promise((resolve, reject) => { const cp = spawn(`pnpm tsx packages/fuels/src/setup-launch-node-server.ts ${port}`, { detached: true, @@ -18,20 +21,26 @@ function startServer( }; cp.stdout?.on('data', (chunk) => { - // first message is server url + // first message is server url and we resolve immediately because that's what we care about const message: string[] = chunk.toString().split('\n'); - const serverUrl = message[0].startsWith('http://') ? message[0] : ''; - // teardown + resolve({ - serverUrl, + serverUrl: message[0], killServer, [Symbol.dispose]: killServer, }); }); cp.on('error', (err) => { + killServer(); reject(err); }); + + cp.on('exit', (code) => { + if (code !== 0) { + reject(new Error(`Server process exited with code ${code}`)); + } + }); }); } diff --git a/packages/fuels/src/setup-launch-node-server.ts b/packages/fuels/src/setup-launch-node-server.ts index 16a9724b6e6..884c3d36111 100644 --- a/packages/fuels/src/setup-launch-node-server.ts +++ b/packages/fuels/src/setup-launch-node-server.ts @@ -6,14 +6,18 @@ import type { AddressInfo } from 'net'; process.setMaxListeners(Infinity); -async function parseBody(req: http.IncomingMessage) { - return new Promise((resolve, reject) => { +async function parseBody(req: http.IncomingMessage): Promise { + return new Promise((resolve, reject) => { const body: Buffer[] = []; req.on('data', (chunk) => { body.push(chunk); }); req.on('end', () => { - resolve(JSON.parse(body.length === 0 ? '{}' : Buffer.concat(body).toString())); + try { + resolve(JSON.parse(body.length === 0 ? '{}' : Buffer.concat(body).toString())); + } catch (err) { + reject(err); + } }); req.on('error', reject); }); @@ -29,19 +33,24 @@ const server = http.createServer(async (req, res) => { res.setHeader('Access-Control-Allow-Origin', '*'); if (req.url === '/') { - const body = (await parseBody(req)) as LaunchNodeOptions; + try { + const body = await parseBody(req); - const node = await launchNode({ - port: '0', - ...body, - fuelCorePath: 'fuels-core', - }); - cleanupFns.set(node.url, () => { - node.cleanup(); - cleanupFns.delete(node.url); - }); - res.write(node.url); - res.end(); + const node = await launchNode({ + port: '0', + ...body, + fuelCorePath: 'fuels-core', + }); + cleanupFns.set(node.url, () => { + node.cleanup(); + cleanupFns.delete(node.url); + }); + res.end(node.url); + } catch (err) { + console.error(err); + res.writeHead(500, { 'Content-Type': 'text/plain' }); + res.end(JSON.stringify(err)); + } return; } diff --git a/vitest.global-browser-setup.ts b/vitest.global-browser-setup.ts index 1a2cd0ca467..f26e4721d25 100644 --- a/vitest.global-browser-setup.ts +++ b/vitest.global-browser-setup.ts @@ -7,18 +7,29 @@ export default async function setup() { shell: 'sh', }); - cp.stdout?.on('data', () => { - // return teardown function to be called when tests finish - // it will kill the server - resolve(() => { + const killServer = () => { + if (cp.pid) { // https://github.com/nodejs/node/issues/2098#issuecomment-169549789 - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - process.kill(-cp.pid!); - }); + process.kill(-cp.pid); + } + }; + + cp.stdout?.on('data', () => { + // Return teardown function to be called when tests finish + // It will kill the server + resolve(killServer); }); cp.on('error', (err) => { + // Ensure server is killed if there's an error + killServer(); reject(err); }); + + cp.on('exit', (code) => { + if (code !== 0) { + reject(new Error(`Server process exited with code ${code}`)); + } + }); }); } From ead34f5114d880dcd374364d4316b83a9aa12a09 Mon Sep 17 00:00:00 2001 From: chad Date: Thu, 20 Jun 2024 19:37:20 -0500 Subject: [PATCH 09/53] wip --- packages/fuel-gauge/src/contract.test.ts | 100 +++++++++--------- .../src/transaction-summary.test.ts | 2 +- 2 files changed, 52 insertions(+), 50 deletions(-) diff --git a/packages/fuel-gauge/src/contract.test.ts b/packages/fuel-gauge/src/contract.test.ts index d4dfc09da76..f284ce5e9f1 100644 --- a/packages/fuel-gauge/src/contract.test.ts +++ b/packages/fuel-gauge/src/contract.test.ts @@ -28,11 +28,10 @@ import { Predicate, PolicyType, } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; -import { createSetupConfig } from './utils'; - const { binHexlified: predicateBytecode } = getFuelGaugeForcProject( FuelGaugeProjectsEnum.PREDICATE_TRUE ); @@ -41,10 +40,15 @@ const { binHexlified: contractBytecode, abiContents: abi } = getFuelGaugeForcPro FuelGaugeProjectsEnum.CALL_TEST_CONTRACT ); -const setupContract = createSetupConfig({ - contractBytecode, - abi, -}); +const setupContract = async () => { + const { + contracts: [contract], + cleanup, + } = await launchTestNode({ + contractsConfigs: [{ deployer: abi, contractBytecode }], + }); + return Object.assign(contract, { [Symbol.dispose]: cleanup }); +}; const jsonFragment: JsonAbi = { configurables: [], @@ -221,7 +225,7 @@ describe('Contract', () => { }); it('should fail to execute call if gasLimit is too low', async () => { - const contract = await setupContract(); + using contract = await setupContract(); let failed; try { @@ -239,10 +243,8 @@ describe('Contract', () => { }); it('adds multiple contracts on invocation', async () => { - const contract = await setupContract(); - const otherContract = await setupContract({ - cache: false, - }); + using contract = await setupContract(); + using otherContract = await setupContract(); const scope = contract.functions.call_external_foo(1336, otherContract.id.toB256()); @@ -252,10 +254,9 @@ describe('Contract', () => { }); it('adds multiple contracts on multicalls', async () => { - const contract = await setupContract(); - const otherContract = await setupContract({ - cache: false, - }); + using contract = await setupContract(); + using otherContract = await setupContract(); + const calls = [ contract.functions.foo(1336), contract.functions.call_external_foo(1336, otherContract.id.toB256()), @@ -280,7 +281,8 @@ describe('Contract', () => { }); it('submits multiple calls', async () => { - const contract = await setupContract(); + using contract = await setupContract(); + const { value: results } = await contract .multiCall([contract.functions.foo(1336), contract.functions.foo(1336)]) .call(); @@ -288,7 +290,7 @@ describe('Contract', () => { }); it('submits multiple calls, six calls', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const { value: results } = await contract .multiCall([ @@ -307,7 +309,7 @@ describe('Contract', () => { }); it('submits multiple calls, eight calls', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const { value: results } = await contract .multiCall([ @@ -336,7 +338,7 @@ describe('Contract', () => { }); it('should fail to execute multiple calls if gasLimit is too low', async () => { - const contract = await setupContract(); + using contract = await setupContract(); let failed; try { @@ -354,8 +356,8 @@ describe('Contract', () => { }); it('adds multiple contracts on multicalls', async () => { - const contract = await setupContract(); - const otherContract = await setupContract({ cache: false }); + using contract = await setupContract(); + using otherContract = await setupContract(); const scope = contract.multiCall([contract.functions.foo(1336)]).addContracts([otherContract]); @@ -376,7 +378,7 @@ describe('Contract', () => { }); it('dryRuns multiple calls', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const { value: results } = await contract .multiCall([contract.functions.foo(1336), contract.functions.foo(1336)]) @@ -385,7 +387,7 @@ describe('Contract', () => { }); it('simulates multiple calls', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const { value, callResult, gasUsed } = await contract .multiCall([contract.functions.foo(1336), contract.functions.foo(1336)]) @@ -396,7 +398,7 @@ describe('Contract', () => { }); it('Returns gasUsed and transactionId', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const { transactionId, gasUsed } = await contract .multiCall([contract.functions.foo(1336), contract.functions.foo(1336)]) @@ -406,7 +408,7 @@ describe('Contract', () => { }); it('Single call with forwarding a alt token', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const { value } = await contract.functions .return_context_amount() .callParams({ @@ -421,7 +423,7 @@ describe('Contract', () => { }); it('MultiCall with multiple forwarding', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const { value } = await contract .multiCall([ @@ -443,7 +445,7 @@ describe('Contract', () => { }); it('Check if gas per call is lower than transaction', async () => { - const contract = await setupContract(); + using contract = await setupContract(); await expect( contract @@ -467,7 +469,7 @@ describe('Contract', () => { }); it('can forward gas to multicall calls', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const { value } = await contract .multiCall([ @@ -495,7 +497,7 @@ describe('Contract', () => { }); it('Get transaction cost', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const invocationScope = contract.multiCall([ contract.functions.return_context_amount().callParams({ @@ -520,7 +522,7 @@ describe('Contract', () => { }); it('Fail before submit if gasLimit is lower than gasUsed', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const invocationScope = contract.functions.return_context_amount().callParams({ forward: [100, baseAssetId], @@ -538,7 +540,7 @@ describe('Contract', () => { }); it('calls array functions', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const { value: arrayBoolean } = await contract.functions .take_array_boolean([true, false, false]) @@ -570,7 +572,7 @@ describe('Contract', () => { }); it('calls enum functions', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const { value: enumB256ReturnValue } = await contract.functions .take_b256_enum({ @@ -626,7 +628,7 @@ describe('Contract', () => { }); it('dryRun and get should not validate the signature', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const { value } = await contract .multiCall([ contract.functions.return_context_amount().callParams({ @@ -642,7 +644,7 @@ describe('Contract', () => { }); it('Parse TX to JSON and parse back to TX', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const num = 1337; const struct = { a: true, b: 1337 }; @@ -702,7 +704,7 @@ describe('Contract', () => { }); it('Provide a custom provider and public wallet to the contract instance', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const externalWallet = Wallet.generate({ provider, @@ -809,7 +811,7 @@ describe('Contract', () => { }); it('Read only call', async () => { - const contract = await setupContract({ cache: false }); + using contract = await setupContract(); const { value } = await contract.functions.echo_b256(contract.id.toB256()).simulate(); expect(value).toEqual(contract.id.toB256()); }); @@ -823,7 +825,7 @@ describe('Contract', () => { it('should tranfer asset to a deployed contract just fine (NATIVE ASSET)', async () => { const wallet = await generateTestWallet(provider, [[10_000_000, baseAssetId]]); - const contract = await setupContract(); + using contract = await setupContract(); const initialBalance = new BN(await contract.getBalance(baseAssetId)).toNumber(); @@ -841,7 +843,7 @@ describe('Contract', () => { it('should set "gasLimit" and "maxFee" when transferring amounts to contract just fine', async () => { const wallet = await generateTestWallet(provider, [[10_000_000, baseAssetId]]); - const contract = await setupContract(); + using contract = await setupContract(); const amountToContract = 5_000; const gasLimit = 80_000; @@ -864,7 +866,7 @@ describe('Contract', () => { it('should ensure gas price and gas limit are validated when transfering to contract', async () => { const wallet = await generateTestWallet(provider, [[1000, baseAssetId]]); - const contract = await setupContract(); + using contract = await setupContract(); const amountToContract = 100; @@ -889,7 +891,7 @@ describe('Contract', () => { [200, asset], ]); - const contract = await setupContract(); + using contract = await setupContract(); const initialBalance = new BN(await contract.getBalance(asset)).toNumber(); @@ -907,7 +909,7 @@ describe('Contract', () => { it('should tranfer asset to a deployed contract just fine (FROM PREDICATE)', async () => { const wallet = await generateTestWallet(provider, [[1_000_000, baseAssetId]]); - const contract = await setupContract(); + using contract = await setupContract(); const initialBalance = new BN(await contract.getBalance(baseAssetId)).toNumber(); @@ -933,7 +935,7 @@ describe('Contract', () => { }); it('should ensure TX revert error can be extracted for dryRun and simulate calls', async () => { - const contract = await setupContract({ cache: false }); + using contract = await setupContract(); const scope = contract.functions.assert_u8(10, 11); @@ -1045,7 +1047,7 @@ describe('Contract', () => { }); it('should throw when using "simulate" with an unfunded wallet', async () => { - const contract = await setupContract(); + using contract = await setupContract(); contract.account = Wallet.generate({ provider: contract.provider }); @@ -1060,7 +1062,7 @@ describe('Contract', () => { }); it('should throw when using "simulate" without a wallet', async () => { - const contract = await setupContract(); + using contract = await setupContract(); contract.account = null; await expect( @@ -1074,7 +1076,7 @@ describe('Contract', () => { }); it('should throw when using "simulate" with a locked wallet', async () => { - const contract = await setupContract(); + using contract = await setupContract(); contract.account = Wallet.fromAddress(getRandomB256()); @@ -1089,7 +1091,7 @@ describe('Contract', () => { }); it('should use "dryRun" with an unfunded wallet just fine', async () => { - const contract = await setupContract(); + using contract = await setupContract(); contract.account = Wallet.generate({ provider: contract.provider }); @@ -1104,7 +1106,7 @@ describe('Contract', () => { }); it('should ensure "get" does not spend any funds', async () => { - const contract = await setupContract({ cache: false }); + using contract = await setupContract(); const balance = await contract.account?.getBalance(); @@ -1119,7 +1121,7 @@ describe('Contract', () => { }); it('should ensure "get" can be used to execute a contract call without a wallet', async () => { - const contract = await setupContract(); + using contract = await setupContract(); // contract with no account set const contractToCall = new Contract(contract.id, contract.interface, contract.provider); @@ -1131,7 +1133,7 @@ describe('Contract', () => { }); it('should ensure "get" can be used to execute a contract call with an unfunded wallet', async () => { - const contract = await setupContract(); + using contract = await setupContract(); const unfundedWallet = Wallet.generate({ provider: contract.provider }); diff --git a/packages/fuel-gauge/src/transaction-summary.test.ts b/packages/fuel-gauge/src/transaction-summary.test.ts index 4ca4af7b3aa..b16d07e0248 100644 --- a/packages/fuel-gauge/src/transaction-summary.test.ts +++ b/packages/fuel-gauge/src/transaction-summary.test.ts @@ -253,7 +253,7 @@ describe('TransactionSummary', () => { it('should ensure transfer operation is assembled (CONTRACT TRANSFER TO ACCOUNT)', async () => { const wallet = await generateTestWallet(provider, [[300_000, baseAssetId]]); - const contract = await setupContract(); + using contract = await setupContract(); contract.account = wallet; const recipient = Wallet.generate({ provider }); From 61b28bf1367104dfd83612b2983b8a09021292de Mon Sep 17 00:00:00 2001 From: chad Date: Thu, 20 Jun 2024 23:02:42 -0500 Subject: [PATCH 10/53] removed unnecessary methods --- .../fuel-gauge/src/advanced-logging.test.ts | 2 - packages/fuel-gauge/src/contract.test.ts | 8 +-- .../fuel-gauge/src/payable-annotation.test.ts | 31 +++++----- packages/fuel-gauge/src/policies.test.ts | 59 ++++++------------- packages/fuel-gauge/src/utils.ts | 19 ------ 5 files changed, 39 insertions(+), 80 deletions(-) diff --git a/packages/fuel-gauge/src/advanced-logging.test.ts b/packages/fuel-gauge/src/advanced-logging.test.ts index cab2a8490a5..ef8933a18a0 100644 --- a/packages/fuel-gauge/src/advanced-logging.test.ts +++ b/packages/fuel-gauge/src/advanced-logging.test.ts @@ -5,8 +5,6 @@ import { Script, bn } from 'fuels'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; -import { getSetupContract } from './utils'; - const setupContract = getSetupContract('advanced-logging'); const setupOtherContract = getSetupContract('advanced-logging-other-contract'); diff --git a/packages/fuel-gauge/src/contract.test.ts b/packages/fuel-gauge/src/contract.test.ts index f284ce5e9f1..b467c1c3803 100644 --- a/packages/fuel-gauge/src/contract.test.ts +++ b/packages/fuel-gauge/src/contract.test.ts @@ -31,21 +31,19 @@ import { import { launchTestNode } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { CallTestContractAbi__factory } from '../test/typegen/contracts'; +import binHexlified from '../test/typegen/contracts/CallTestContractAbi.hex'; const { binHexlified: predicateBytecode } = getFuelGaugeForcProject( FuelGaugeProjectsEnum.PREDICATE_TRUE ); -const { binHexlified: contractBytecode, abiContents: abi } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.CALL_TEST_CONTRACT -); - const setupContract = async () => { const { contracts: [contract], cleanup, } = await launchTestNode({ - contractsConfigs: [{ deployer: abi, contractBytecode }], + contractsConfigs: [{ deployer: CallTestContractAbi__factory, bytecode: binHexlified }], }); return Object.assign(contract, { [Symbol.dispose]: cleanup }); }; diff --git a/packages/fuel-gauge/src/payable-annotation.test.ts b/packages/fuel-gauge/src/payable-annotation.test.ts index 3487e4cd133..607e6a5fd26 100644 --- a/packages/fuel-gauge/src/payable-annotation.test.ts +++ b/packages/fuel-gauge/src/payable-annotation.test.ts @@ -1,31 +1,31 @@ -import type { Contract } from 'fuels'; import { bn } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; -import { createSetupConfig } from './utils'; - const { binHexlified: contractBytecode, abiContents: abiJSON } = getFuelGaugeForcProject( FuelGaugeProjectsEnum.PAYABLE_ANNOTATION ); -const setupContract = createSetupConfig({ - contractBytecode, - abi: abiJSON, -}); - -let contract: Contract; -let baseAssetId: string; +const setupContract = async () => { + const { + contracts: [contract], + cleanup, + } = await launchTestNode({ + contractsConfigs: [{ deployer: abi, contractBytecode }], + }); + return Object.assign(contract, { [Symbol.dispose]: cleanup }); +}; -beforeAll(async () => { - contract = await setupContract(); - baseAssetId = contract.provider.getBaseAssetId(); -}); +beforeAll(() => {}); /** * @group node */ test('allow sending coins to payable functions', async () => { + using contract = await setupContract(); + const baseAssetId = contract.provider.getBaseAssetId(); + // This should not fail because the function is payable await expect( contract.functions @@ -41,6 +41,9 @@ test('allow sending coins to payable functions', async () => { }); test("don't allow sending coins to non-payable functions", async () => { + using contract = await setupContract(); + const baseAssetId = contract.provider.getBaseAssetId(); + // This should fail because the function is not payable await expect(async () => contract.functions diff --git a/packages/fuel-gauge/src/policies.test.ts b/packages/fuel-gauge/src/policies.test.ts index 1bdf44bec13..146b6efc8ba 100644 --- a/packages/fuel-gauge/src/policies.test.ts +++ b/packages/fuel-gauge/src/policies.test.ts @@ -11,10 +11,21 @@ import { Wallet, bn, } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; import { getFuelGaugeForcProject, FuelGaugeProjectsEnum } from '../test/fixtures'; - -import { createSetupConfig } from './utils'; +import { PayableAnnotationAbi__factory } from '../test/typegen/contracts'; +import bytecode from '../test/typegen/contracts/PayableAnnotationAbi.hex'; + +const setupContract = async () => { + const { + contracts: [contract], + cleanup, + } = await launchTestNode({ + contractsConfigs: [{ deployer: PayableAnnotationAbi__factory, bytecode }], + }); + return Object.assign(contract, { [Symbol.dispose]: cleanup }); +}; /** * @group node @@ -193,15 +204,7 @@ describe('Policies', () => { }); it('should ensure TX policies are properly set (BaseInvocationScope)', async () => { - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PAYABLE_ANNOTATION - ); - - const contract = await createSetupConfig({ - contractBytecode: binHexlified, - abi: abiContents, - cache: true, - })(); + using contract = await setupContract(); const callScope = contract.functions.payable().txParams({ tip: 5, @@ -273,15 +276,7 @@ describe('Policies', () => { }); it('should ensure TX policies are properly set (Account Contract Transfer)', async () => { - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PAYABLE_ANNOTATION - ); - - const contract = await createSetupConfig({ - contractBytecode: binHexlified, - abi: abiContents, - cache: true, - })(); + using contract = await setupContract(); const txParams: CustomTxParams = { tip: 1, @@ -334,17 +329,9 @@ describe('Policies', () => { }); it('on account transferring to contract', async () => { - const maxFee = 1; + using contract = await setupContract(); - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PAYABLE_ANNOTATION - ); - - const contract = await createSetupConfig({ - contractBytecode: binHexlified, - abi: abiContents, - cache: true, - })(); + const maxFee = 1; const txParams: CustomTxParams = { maturity: await randomMaturity(), @@ -395,17 +382,9 @@ describe('Policies', () => { }); it('on a contract call', async () => { - const maxFee = 1; + using contract = await setupContract(); - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PAYABLE_ANNOTATION - ); - - const contract = await createSetupConfig({ - contractBytecode: binHexlified, - abi: abiContents, - cache: true, - })(); + const maxFee = 1; const txParams: CustomTxParams = { maturity: await randomMaturity(), diff --git a/packages/fuel-gauge/src/utils.ts b/packages/fuel-gauge/src/utils.ts index 2b3dd9bdae7..2afe05c2775 100644 --- a/packages/fuel-gauge/src/utils.ts +++ b/packages/fuel-gauge/src/utils.ts @@ -50,30 +50,11 @@ export const setup = async ({ return contract as T; }; -export const createSetupConfig = - (defaultConfig: SetupConfig) => - async (config?: Partial) => - setup({ - contractBytecode: defaultConfig.contractBytecode, - abi: defaultConfig.abi, - ...config, - }); - const getFullPath = (contractName: string, next: (fullPath: string) => T) => next( join(__dirname, `../test/fixtures/forc-projects/${contractName}/out/release/${contractName}`) ); -export const getSetupContract = ( - contractName: string -): ((config?: Partial) => Promise) => - getFullPath(contractName, (fullPath: string) => - createSetupConfig({ - contractBytecode: readFileSync(`${fullPath}.bin`), - abi: JSON.parse(readFileSync(`${fullPath}-abi.json`, 'utf8')), - }) - ); - export const getScript = ( scriptName: string, wallet: WalletUnlocked From 624f24b2e9f3065057a33b478fc9aa333b83c5de Mon Sep 17 00:00:00 2001 From: nedsalk Date: Fri, 21 Jun 2024 15:29:23 +0200 Subject: [PATCH 11/53] add /close-server endpoint --- .../src/setup-launch-node-server.test.ts | 52 +++++++++++---- .../fuels/src/setup-launch-node-server.ts | 66 +++++++++++++------ vitest.global-browser-setup.ts | 47 +++++++++---- 3 files changed, 120 insertions(+), 45 deletions(-) diff --git a/packages/fuels/src/setup-launch-node-server.test.ts b/packages/fuels/src/setup-launch-node-server.test.ts index 1304e4718b8..410b925150a 100644 --- a/packages/fuels/src/setup-launch-node-server.test.ts +++ b/packages/fuels/src/setup-launch-node-server.test.ts @@ -4,7 +4,7 @@ import { spawn } from 'node:child_process'; interface ServerInfo extends Disposable { serverUrl: string; - killServer: () => void; + closeServer: () => Promise; } function startServer(port: number = 0): Promise { @@ -14,25 +14,37 @@ function startServer(port: number = 0): Promise { shell: 'sh', }); - const killServer = () => { - // https://github.com/nodejs/node/issues/2098#issuecomment-169549789 - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - process.kill(-cp.pid!); + const server = { + killed: false, + url: undefined as string | undefined, }; + const closeServer = async () => { + if (server.killed) { + return; + } + server.killed = true; + await fetch(`${server.url}/close-server`); + }; + + cp.stderr?.on('data', (chunk) => { + console.log(chunk.toString()); + }); + cp.stdout?.on('data', (chunk) => { // first message is server url and we resolve immediately because that's what we care about const message: string[] = chunk.toString().split('\n'); - + const serverUrl = message[0]; + server.url ??= serverUrl; resolve({ - serverUrl: message[0], - killServer, - [Symbol.dispose]: killServer, + serverUrl, + closeServer, + [Symbol.dispose]: closeServer, }); }); - cp.on('error', (err) => { - killServer(); + cp.on('error', async (err) => { + await closeServer(); reject(err); }); @@ -41,6 +53,13 @@ function startServer(port: number = 0): Promise { reject(new Error(`Server process exited with code ${code}`)); } }); + + process.on('SIGINT', closeServer); + process.on('SIGUSR1', closeServer); + process.on('SIGUSR2', closeServer); + process.on('uncaughtException', closeServer); + process.on('unhandledRejection', closeServer); + process.on('beforeExit', closeServer); }); } @@ -57,6 +76,13 @@ describe('setup-launch-node-server', () => { { timeout: 10000 } ); + test('the /close-server endpoint closes the server', async () => { + const { serverUrl } = await startServer(); + await fetch(`${serverUrl}/close-server`); + + await waitUntilUnreachable(serverUrl); + }); + test( 'returns a valid fuel-core node url on request', async () => { @@ -87,11 +113,11 @@ describe('setup-launch-node-server', () => { test( 'kills all nodes when the server is shut down', async () => { - const { serverUrl, killServer } = await startServer(); + const { serverUrl, closeServer: killServer } = await startServer(); const url1 = await (await fetch(serverUrl)).text(); const url2 = await (await fetch(serverUrl)).text(); - killServer(); + await killServer(); // if the nodes remained live then the test would time out await waitUntilUnreachable(url1); diff --git a/packages/fuels/src/setup-launch-node-server.ts b/packages/fuels/src/setup-launch-node-server.ts index 884c3d36111..0a274350bc7 100644 --- a/packages/fuels/src/setup-launch-node-server.ts +++ b/packages/fuels/src/setup-launch-node-server.ts @@ -1,6 +1,8 @@ +/* eslint-disable @typescript-eslint/no-floating-promises */ /* eslint-disable no-console */ -import type { LaunchNodeOptions, LaunchNodeResult } from '@fuel-ts/account/test-utils'; +import type { LaunchNodeOptions } from '@fuel-ts/account/test-utils'; import { launchNode } from '@fuel-ts/account/test-utils'; +import { waitUntilUnreachable } from '@fuel-ts/utils/test-utils'; import http from 'http'; import type { AddressInfo } from 'net'; @@ -23,11 +25,7 @@ async function parseBody(req: http.IncomingMessage): Promise }); } -const cleanupFns: Map['cleanup']> = new Map(); - -function cleanupAllNodes() { - cleanupFns.forEach((fn) => fn()); -} +const cleanupFns: Map Promise> = new Map(); const server = http.createServer(async (req, res) => { res.setHeader('Access-Control-Allow-Origin', '*'); @@ -38,13 +36,18 @@ const server = http.createServer(async (req, res) => { const node = await launchNode({ port: '0', + loggingEnabled: false, + debugEnabled: false, ...body, fuelCorePath: 'fuels-core', }); - cleanupFns.set(node.url, () => { + + cleanupFns.set(node.url, async () => { node.cleanup(); + await waitUntilUnreachable(node.url); cleanupFns.delete(node.url); }); + res.end(node.url); } catch (err) { console.error(err); @@ -58,12 +61,37 @@ const server = http.createServer(async (req, res) => { const nodeUrl = req.url?.match(/\/cleanup\/(.+)/)?.[1]; if (nodeUrl) { const cleanupFn = cleanupFns.get(nodeUrl); - cleanupFn?.(); + await cleanupFn?.(); res.end(); } } }); +function closeServer() { + return new Promise((resolve) => { + if (!server.listening) { + resolve(); + return; + } + + server.close(async () => { + const cleanupCalls: Promise[] = []; + cleanupFns.forEach((fn) => cleanupCalls.push(fn())); + await Promise.all(cleanupCalls); + process.exit(); + }); + + resolve(); + }); +} + +server.on('request', async (req, res) => { + if (req.url === '/close-server') { + await closeServer(); + res.end(); + } +}); + const port = process.argv[2] ? parseInt(process.argv[2], 10) : 49342; server.listen(port); @@ -77,42 +105,38 @@ server.on('listening', () => { console.log( "To kill the node, make a POST request to '/cleanup/' where is the url of the node you want to kill." ); - console.log('All nodes will be killed when the server is killed.'); -}); - -server.on('close', () => { - console.log('close'); - cleanupAllNodes(); + console.log('All nodes will be killed when the server is closed.'); + console.log('You can close the server by sending a request to /close-server.'); }); process.on('exit', () => { console.log('exit'); - cleanupAllNodes(); + closeServer(); }); process.on('SIGINT', () => { console.log('sigint'); - cleanupAllNodes(); + closeServer(); }); process.on('SIGUSR1', () => { console.log('SIGUSR1'); - cleanupAllNodes(); + closeServer(); }); process.on('SIGUSR2', () => { console.log('SIGUSR2'); - cleanupAllNodes(); + closeServer(); }); process.on('uncaughtException', (e) => { console.log('uncaughtException'); console.log(e); - cleanupAllNodes(); + closeServer(); }); process.on('unhandledRejection', (reason) => { console.log('unhandledRejection'); console.log(reason); - cleanupAllNodes(); + closeServer(); }); process.on('beforeExit', () => { console.log('beforeExit'); - cleanupAllNodes(); + closeServer(); }); diff --git a/vitest.global-browser-setup.ts b/vitest.global-browser-setup.ts index f26e4721d25..8d9bdc4dfa1 100644 --- a/vitest.global-browser-setup.ts +++ b/vitest.global-browser-setup.ts @@ -1,35 +1,60 @@ +/* eslint-disable @typescript-eslint/no-floating-promises */ import { spawn } from 'node:child_process'; -export default async function setup() { +export default function setup() { return new Promise((resolve, reject) => { + const server = { + closed: false, + }; + const teardown = async () => { + if (server.closed) { + return; + } + server.closed = true; + const serverUrl = `http://localhost:49342`; + try { + await fetch(`${serverUrl}/close-server`); + } catch (e) { + console.log('closing of server failed', e); + } + process.exit(); + }; + const cp = spawn('pnpm tsx packages/fuels/src/setup-launch-node-server.ts', { detached: true, shell: 'sh', }); - const killServer = () => { - if (cp.pid) { - // https://github.com/nodejs/node/issues/2098#issuecomment-169549789 - process.kill(-cp.pid); - } - }; + cp.stderr?.on('data', (chunk) => { + console.log(chunk.toString()); + }); - cp.stdout?.on('data', () => { + cp.stdout?.on('data', (data) => { + console.log(data.toString()); // Return teardown function to be called when tests finish // It will kill the server - resolve(killServer); + resolve(teardown); }); cp.on('error', (err) => { + console.log(err); // Ensure server is killed if there's an error - killServer(); + teardown(); reject(err); }); - cp.on('exit', (code) => { + cp.on('exit', (code, signal) => { + console.log('error code', code, signal); if (code !== 0) { reject(new Error(`Server process exited with code ${code}`)); } }); + + process.on('SIGINT', teardown); + process.on('SIGUSR1', teardown); + process.on('SIGUSR2', teardown); + process.on('uncaughtException', teardown); + process.on('unhandledRejection', teardown); + process.on('beforeExit', teardown); }); } From b5132b4e131ffa5ffde2fbf63f9c65fd4d5a8147 Mon Sep 17 00:00:00 2001 From: nedsalk Date: Fri, 21 Jun 2024 15:37:59 +0200 Subject: [PATCH 12/53] fix: linting --- packages/fuels/src/setup-launch-node-server.test.ts | 1 + vitest.global-browser-setup.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/fuels/src/setup-launch-node-server.test.ts b/packages/fuels/src/setup-launch-node-server.test.ts index 410b925150a..c045e370dff 100644 --- a/packages/fuels/src/setup-launch-node-server.test.ts +++ b/packages/fuels/src/setup-launch-node-server.test.ts @@ -28,6 +28,7 @@ function startServer(port: number = 0): Promise { }; cp.stderr?.on('data', (chunk) => { + // eslint-disable-next-line no-console console.log(chunk.toString()); }); diff --git a/vitest.global-browser-setup.ts b/vitest.global-browser-setup.ts index 8d9bdc4dfa1..d227e092f36 100644 --- a/vitest.global-browser-setup.ts +++ b/vitest.global-browser-setup.ts @@ -1,3 +1,4 @@ +/* eslint-disable no-console */ /* eslint-disable @typescript-eslint/no-floating-promises */ import { spawn } from 'node:child_process'; From eb8eff835d49b8b49b0deb0389214b0377f76f0a Mon Sep 17 00:00:00 2001 From: nedsalk Date: Fri, 21 Jun 2024 15:46:49 +0200 Subject: [PATCH 13/53] increase timeout --- .../src/setup-launch-node-server.test.ts | 50 +++++++------------ 1 file changed, 19 insertions(+), 31 deletions(-) diff --git a/packages/fuels/src/setup-launch-node-server.test.ts b/packages/fuels/src/setup-launch-node-server.test.ts index c045e370dff..090b82b1df9 100644 --- a/packages/fuels/src/setup-launch-node-server.test.ts +++ b/packages/fuels/src/setup-launch-node-server.test.ts @@ -67,39 +67,31 @@ function startServer(port: number = 0): Promise { /** * @group node */ -describe('setup-launch-node-server', () => { - test( - 'can start server on specific port', - async () => { +describe( + 'setup-launch-node-server', + () => { + test('can start server on specific port', async () => { using launched = await startServer(9876); expect(launched.serverUrl).toEqual('http://localhost:9876'); - }, - { timeout: 10000 } - ); + }); - test('the /close-server endpoint closes the server', async () => { - const { serverUrl } = await startServer(); - await fetch(`${serverUrl}/close-server`); + test('the /close-server endpoint closes the server', async () => { + const { serverUrl } = await startServer(); + await fetch(`${serverUrl}/close-server`); - await waitUntilUnreachable(serverUrl); - }); + await waitUntilUnreachable(serverUrl); + }); - test( - 'returns a valid fuel-core node url on request', - async () => { + test('returns a valid fuel-core node url on request', async () => { using launched = await startServer(); const url = await (await fetch(launched.serverUrl)).text(); // fetches node-related data // would fail if fuel-core node is not running on url await Provider.create(url); - }, - { timeout: 10000 } - ); + }); - test( - 'the /cleanup endpoint kills the node', - async () => { + test('the /cleanup endpoint kills the node', async () => { using launched = await startServer(); const url = await (await fetch(launched.serverUrl)).text(); @@ -107,13 +99,9 @@ describe('setup-launch-node-server', () => { // if the node remained live then the test would time out await waitUntilUnreachable(url); - }, - { timeout: 10000 } - ); + }); - test( - 'kills all nodes when the server is shut down', - async () => { + test('kills all nodes when the server is shut down', async () => { const { serverUrl, closeServer: killServer } = await startServer(); const url1 = await (await fetch(serverUrl)).text(); const url2 = await (await fetch(serverUrl)).text(); @@ -123,7 +111,7 @@ describe('setup-launch-node-server', () => { // if the nodes remained live then the test would time out await waitUntilUnreachable(url1); await waitUntilUnreachable(url2); - }, - { timeout: 10000 } - ); -}); + }); + }, + { timeout: 25000 } +); From aa44421b1228cc757f17abc05e2424120a24ddb1 Mon Sep 17 00:00:00 2001 From: chad Date: Fri, 21 Jun 2024 18:54:53 -0500 Subject: [PATCH 14/53] test: remove getSetupContract completely --- .../guide/contracts/call-parameters.test.ts | 3 - .../fuel-gauge/src/advanced-logging.test.ts | 58 +++++-- .../fuel-gauge/src/bytecode-sway-lib.test.ts | 13 +- packages/fuel-gauge/src/bytes.test.ts | 16 +- packages/fuel-gauge/src/contract.test.ts | 1 + .../fuel-gauge/src/coverage-contract.test.ts | 116 +++++++++++-- packages/fuel-gauge/src/edge-cases.test.ts | 10 +- .../src/generic-types-contract.test.ts | 6 - .../src/is-function-readonly.test.ts | 14 +- packages/fuel-gauge/src/options.test.ts | 31 +++- packages/fuel-gauge/src/policies.test.ts | 1 + packages/fuel-gauge/src/raw-slice.test.ts | 15 +- .../fuel-gauge/src/std-lib-string.test.ts | 10 +- .../src/transaction-summary.test.ts | 22 ++- packages/fuel-gauge/src/utils.ts | 164 +++++++++++++++--- packages/fuel-gauge/src/vector-types.test.ts | 5 +- packages/fuel-gauge/src/vectors.test.ts | 64 ++++++- packages/fuel-gauge/test/fixtures/index.ts | 1 + 18 files changed, 423 insertions(+), 127 deletions(-) diff --git a/apps/docs-snippets/src/guide/contracts/call-parameters.test.ts b/apps/docs-snippets/src/guide/contracts/call-parameters.test.ts index 8e0dc3f7398..af1b1b2d926 100644 --- a/apps/docs-snippets/src/guide/contracts/call-parameters.test.ts +++ b/apps/docs-snippets/src/guide/contracts/call-parameters.test.ts @@ -8,9 +8,6 @@ import { createAndDeployContractFromProject } from '../../utils'; * @group node */ describe(__filename, () => { - let contract: Contract; - let provider: Provider; - let baseAssetId: string; beforeAll(async () => { contract = await createAndDeployContractFromProject(DocSnippetProjectsEnum.RETURN_CONTEXT); provider = contract.provider; diff --git a/packages/fuel-gauge/src/advanced-logging.test.ts b/packages/fuel-gauge/src/advanced-logging.test.ts index ef8933a18a0..f5ed48013b5 100644 --- a/packages/fuel-gauge/src/advanced-logging.test.ts +++ b/packages/fuel-gauge/src/advanced-logging.test.ts @@ -1,23 +1,23 @@ import { generateTestWallet } from '@fuel-ts/account/test-utils'; import type { FuelError } from '@fuel-ts/errors'; -import type { Contract, Provider, WalletUnlocked } from 'fuels'; +import type { Provider, WalletUnlocked } from 'fuels'; import { Script, bn } from 'fuels'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; -const setupContract = getSetupContract('advanced-logging'); -const setupOtherContract = getSetupContract('advanced-logging-other-contract'); +import { setupContract } from './utils'; let provider: Provider; -let advancedLogContract: Contract; -let otherAdvancedLogContract: Contract; let advancedLogId: string; let otherLogId: string; let baseAssetId: string; beforeAll(async () => { - advancedLogContract = await setupContract(); - otherAdvancedLogContract = await setupOtherContract({ cache: false }); + using advancedLogContract = await setupContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + using otherAdvancedLogContract = await setupContract( + FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT + ); + provider = advancedLogContract.provider; advancedLogId = advancedLogContract.id.toB256(); otherLogId = otherAdvancedLogContract.id.toB256(); @@ -26,9 +26,12 @@ beforeAll(async () => { /** * @group node + * @group browser */ describe('Advanced Logging', () => { it('can get log data', async () => { + using advancedLogContract = await setupContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + const { value, logs } = await advancedLogContract.functions.test_function().call(); expect(value).toBeTruthy(); @@ -73,6 +76,8 @@ describe('Advanced Logging', () => { }); it('can get log data from require [condition=true]', async () => { + using advancedLogContract = await setupContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + const { value, logs } = await advancedLogContract.functions .test_function_with_require(1, 1) .call(); @@ -82,6 +87,8 @@ describe('Advanced Logging', () => { }); it('can get log data from require [condition=false]', async () => { + using advancedLogContract = await setupContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + const invocation = advancedLogContract.functions.test_function_with_require(1, 3); try { await invocation.call(); @@ -111,6 +118,11 @@ describe('Advanced Logging', () => { }); it('can get log data from a downstream Contract', async () => { + using advancedLogContract = await setupContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + using otherAdvancedLogContract = await setupContract( + FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT + ); + const INPUT = 3; const { value, logs } = await advancedLogContract.functions .test_log_from_other_contract(INPUT, otherAdvancedLogContract.id.toB256()) @@ -126,10 +138,10 @@ describe('Advanced Logging', () => { ]); }); - describe('should properly decode all logs in a multicall with inter-contract calls', () => { - const setupCallTest = getSetupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); - const setupConfigurable = getSetupContract(FuelGaugeProjectsEnum.CONFIGURABLE_CONTRACT); - const setupCoverage = getSetupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + describe('should properly decode all logs in a multicall with inter-contract calls', async () => { + using callTest = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using configurable = await setupContract(FuelGaugeProjectsEnum.CONFIGURABLE_CONTRACT); + using coverage = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); let wallet: WalletUnlocked; const testStruct = { @@ -152,9 +164,10 @@ describe('Advanced Logging', () => { }); it('when using InvacationScope', async () => { - const callTest = await setupCallTest({ cache: false }); - const configurable = await setupConfigurable({ cache: false }); - const coverage = await setupCoverage({ cache: false }); + using advancedLogContract = await setupContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + using otherAdvancedLogContract = await setupContract( + FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT + ); const { logs } = await callTest .multiCall([ @@ -173,9 +186,10 @@ describe('Advanced Logging', () => { }); it('when using ScriptTransactionRequest', async () => { - const callTest = await setupCallTest({ cache: false }); - const configurable = await setupConfigurable({ cache: false }); - const coverage = await setupCoverage({ cache: false }); + using advancedLogContract = await setupContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + using otherAdvancedLogContract = await setupContract( + FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT + ); const request = await callTest .multiCall([ @@ -235,6 +249,11 @@ describe('Advanced Logging', () => { }); it('when using InvocationScope', async () => { + using advancedLogContract = await setupContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + using otherAdvancedLogContract = await setupContract( + FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT + ); + const script = new Script(binHexlified, abiContents, wallet); const { logs } = await script.functions .main(advancedLogId, otherLogId, amount) @@ -245,6 +264,11 @@ describe('Advanced Logging', () => { }); it('when using ScriptTransactionRequest', async () => { + using advancedLogContract = await setupContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + using otherAdvancedLogContract = await setupContract( + FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT + ); + const script = new Script(binHexlified, abiContents, wallet); const request = await script.functions diff --git a/packages/fuel-gauge/src/bytecode-sway-lib.test.ts b/packages/fuel-gauge/src/bytecode-sway-lib.test.ts index 4621d0b2930..d75b6b0b909 100644 --- a/packages/fuel-gauge/src/bytecode-sway-lib.test.ts +++ b/packages/fuel-gauge/src/bytecode-sway-lib.test.ts @@ -4,10 +4,10 @@ import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures import { defaultPredicateAbi } from '../test/fixtures/abi/predicate'; import { defaultPredicateBytecode } from '../test/fixtures/bytecode/predicate'; -import { getSetupContract } from './utils'; - +import { setupContract } from './utils'; /** * @group node + * @group browser */ describe('bytecode computations', () => { test('compute_bytecode_root', async () => { @@ -15,8 +15,7 @@ describe('bytecode computations', () => { FuelGaugeProjectsEnum.CALL_TEST_CONTRACT ); - const setupContract = getSetupContract(FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB); - const contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB); const { logs } = await contract.functions .compute_bytecode_root(arrayify(bytecodeFromFile)) @@ -33,8 +32,7 @@ describe('bytecode computations', () => { FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB ); - const setupContract = getSetupContract(FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB); - const contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB); const { value } = await contract.functions .verify_contract_bytecode( @@ -59,8 +57,7 @@ describe('bytecode computations', () => { const address = predicate.address; - const setupContract = getSetupContract(FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB); - const contract = await setupContract(); + const contract = await setupContract(FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB); const { value } = await contract.functions .compute_predicate_address(Array.from(arrayify(defaultPredicateBytecode))) diff --git a/packages/fuel-gauge/src/bytes.test.ts b/packages/fuel-gauge/src/bytes.test.ts index d85209ca6a1..c15d2ece64e 100644 --- a/packages/fuel-gauge/src/bytes.test.ts +++ b/packages/fuel-gauge/src/bytes.test.ts @@ -1,16 +1,10 @@ import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { bn, Predicate, Wallet, Address, Provider, FUEL_NETWORK_URL } from 'fuels'; -import type { BN, Contract } from 'fuels'; +import type { BN } from 'fuels'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; -import { getScript, getSetupContract } from './utils'; - -const setupContract = getSetupContract('bytes'); -let contractInstance: Contract; -beforeAll(async () => { - contractInstance = await setupContract(); -}); +import { getScript, setupContract } from './utils'; type SomeEnum = { First?: boolean; @@ -33,6 +27,7 @@ const setup = async (balance = 500_000) => { /** * @group node + * @group browser */ describe('Bytes Tests', () => { let baseAssetId: string; @@ -42,6 +37,7 @@ describe('Bytes Tests', () => { }); it('should test bytes output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.BYTES); const INPUT = 10; const { value } = await contractInstance.functions.return_bytes(INPUT).call(); @@ -50,6 +46,8 @@ describe('Bytes Tests', () => { }); it('should test bytes output [100 items]', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.BYTES); + const INPUT = 100; const { value } = await contractInstance.functions.return_bytes(INPUT).call(); @@ -58,6 +56,8 @@ describe('Bytes Tests', () => { }); it('should test bytes input', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.BYTES); + const INPUT = [40, 41, 42]; const { value } = await contractInstance.functions.accept_bytes(INPUT).call(); diff --git a/packages/fuel-gauge/src/contract.test.ts b/packages/fuel-gauge/src/contract.test.ts index b467c1c3803..394afc25066 100644 --- a/packages/fuel-gauge/src/contract.test.ts +++ b/packages/fuel-gauge/src/contract.test.ts @@ -170,6 +170,7 @@ const AltToken = '0x010101010101010101010101010101010101010101010101010101010101 /** * @group node + * @group browser */ describe('Contract', () => { let provider: Provider; diff --git a/packages/fuel-gauge/src/coverage-contract.test.ts b/packages/fuel-gauge/src/coverage-contract.test.ts index 50b7b5ea54e..1697f16d144 100644 --- a/packages/fuel-gauge/src/coverage-contract.test.ts +++ b/packages/fuel-gauge/src/coverage-contract.test.ts @@ -1,4 +1,4 @@ -import type { BN, Message, Contract } from 'fuels'; +import type { BN, Message } from 'fuels'; import { arrayify, bn, @@ -11,7 +11,9 @@ import { FUEL_NETWORK_URL, } from 'fuels'; -import { getSetupContract } from './utils'; +import { FuelGaugeProjectsEnum } from '../test/fixtures'; + +import { setupContract } from './utils'; const RUST_U8_MAX = 255; const RUST_U16_MAX = 65535; @@ -21,15 +23,6 @@ const B256 = '0x000000000000000000000000000000000000000000000000000000000000002a const B512 = '0x059bc9c43ea1112f3eb2bd30415de72ed24c1c4416a1316f0f48cc6f958073f42a6d8c12e4829826316d8dcf444498717b5a2fbf27defac367271065f6a1d4a5'; -const setupContract = getSetupContract('coverage-contract'); - -let contractInstance: Contract; -let baseAssetId: string; -beforeAll(async () => { - contractInstance = await setupContract(); - baseAssetId = contractInstance.provider.getBaseAssetId(); -}); - enum SmallEnum { Empty = 'Empty', } @@ -53,9 +46,11 @@ enum MixedNativeEnum { /** * @group node + * @group browser */ describe('Coverage Contract', () => { it('can return outputs', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); // Call contract methods expect((await contractInstance.functions.get_id().call()).value).toEqual( '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff' @@ -142,6 +137,7 @@ describe('Coverage Contract', () => { }); it('should test u8 variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); // #region U8 const { value } = await contractInstance.functions.echo_u8(3).call(); expect(value).toBe(3); @@ -149,96 +145,132 @@ describe('Coverage Contract', () => { }); it('should test u8 variable type multiple params', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions.echo_u8_addition(3, 4, 3).call(); expect(value).toBe(10); }); it('should test u16 variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions.echo_u16(RUST_U8_MAX + 1).call(); expect(value).toBe(RUST_U8_MAX + 1); }); it('should test u32 variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions.echo_u32(RUST_U16_MAX + 1).call(); expect(value).toBe(RUST_U16_MAX + 1); }); it('should test u64 variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT = bn(RUST_U32_MAX).add(1).toHex(); const { value } = await contractInstance.functions.echo_u64(INPUT).call(); expect(value.toHex()).toBe(INPUT); }); it('should test u256 variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT = U256_MAX; const { value } = await contractInstance.functions.echo_u256(INPUT).call(); expect(JSON.stringify(value)).toEqual(JSON.stringify(INPUT)); }); it('should test bool variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions.echo_bool(false).call(); expect(value).toBe(false); }); it('should test b256 variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions.echo_b256(B256).call(); expect(value).toBe(B256); }); it('should test b512 variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions.echo_b512(B512).call(); expect(value).toBe(B512); }); it('should test str[1] variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions.echo_str_1('f').call(); expect(value).toBe('f'); }); it('should test str[2] variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions.echo_str_2('fu').call(); expect(value).toBe('fu'); }); it('should test str[3] variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions.echo_str_3('fue').call(); expect(value).toBe('fue'); }); it('should test str[8] variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions.echo_str_8('fuel-sdk').call(); expect(value).toBe('fuel-sdk'); }); it('should test str[9] variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions.echo_str_9('fuel-sdks').call(); expect(value).toBe('fuel-sdks'); }); it('should test tuple < 8 bytes variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions.echo_tuple_u8([21, 22]).call(); expect(value).toStrictEqual([21, 22]); }); it('should test tuple > 8 bytes variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT = [bn(RUST_U32_MAX).add(1), bn(RUST_U32_MAX).add(2)]; const { value } = await contractInstance.functions.echo_tuple_u64(INPUT).call(); expect(JSON.stringify(value)).toStrictEqual(JSON.stringify(INPUT)); }); it('should test tuple mixed variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT = [true, bn(RUST_U32_MAX).add(1)]; const { value } = await contractInstance.functions.echo_tuple_mixed(INPUT).call(); expect(JSON.stringify(value)).toStrictEqual(JSON.stringify(INPUT)); }); it('should test array < 8 bytes variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions.echo_array_u8([4, 3]).call(); expect(value).toStrictEqual([4, 3]); }); it('should test array > 8 bytes variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT: [number, string, BN, string, string] = [ 11, toHex(RUST_U32_MAX + 2), @@ -253,29 +285,39 @@ describe('Coverage Contract', () => { }); it('should test array bool variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions.echo_array_bool([true, true]).call(); expect(value).toStrictEqual([true, true]); }); it('should test struct < 8 bytes variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT = { i: 4 }; const { value } = await contractInstance.functions.echo_struct_u8(INPUT).call(); expect(value).toStrictEqual(INPUT); }); it('should test struct > 8 bytes variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT = { i: B256 }; const { value } = await contractInstance.functions.echo_struct_b256(INPUT).call(); expect(value).toStrictEqual(INPUT); }); it('should test enum < 8 byte variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT = SmallEnum.Empty; const { value } = await contractInstance.functions.echo_enum_small(INPUT).call(); expect(value).toStrictEqual(INPUT); }); it('should test enum > 8 bytes variable type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT = { AddressB: B256 }; const { value } = await contractInstance.functions.echo_enum_big(INPUT).call(); @@ -283,12 +325,16 @@ describe('Coverage Contract', () => { }); it('should test Option type', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT = 187; const { value } = await contractInstance.functions.echo_option_u8(INPUT).call(); expect(value).toStrictEqual(INPUT); }); it('should test Option extraction [Some]', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT_SOME = 123; const { value: Some } = await contractInstance.functions .echo_option_extract_u32(INPUT_SOME) @@ -297,6 +343,8 @@ describe('Coverage Contract', () => { }); it('should test Option extraction [None]', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT_NONE = undefined; const { value: None } = await contractInstance.functions .echo_option_extract_u32(INPUT_NONE) @@ -308,6 +356,8 @@ describe('Coverage Contract', () => { }); it('should test multiple Option params [Some]', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT_A = 1; const INPUT_B = 4; const INPUT_C = 5; @@ -322,6 +372,8 @@ describe('Coverage Contract', () => { }); it('should test multiple Option params [None]', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT = 1; // adds the three values together, but only first param value is supplied @@ -332,11 +384,15 @@ describe('Coverage Contract', () => { }); it('should test u8 empty vector input', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions.check_u8_vector([]).call(); expect(value).toBeFalsy(); }); it('should test u8 vector input', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value, logs } = await contractInstance.functions .check_u8_vector([1, 2, 3, 4, 5]) .call(); @@ -348,6 +404,8 @@ describe('Coverage Contract', () => { }); it('should echo u8 vector input', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions .echo_u8_vector_first([23, 6, 1, 51, 2]) .call(); @@ -356,12 +414,16 @@ describe('Coverage Contract', () => { }); it('should echo a vector of optional u8 input', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions.echo_u8_option_vector_first([28]).call(); expect(value).toBe(28); }); it('should echo u64 vector input', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT = bn(54).toHex(); const { value } = await contractInstance.functions .echo_u64_vector_last([200, 100, 24, 51, 23, INPUT]) @@ -370,6 +432,8 @@ describe('Coverage Contract', () => { }); it('should echo u32 vector addition of mixed params', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions .echo_u32_vector_addition_other_type([100, 2], 47) .call(); @@ -377,6 +441,8 @@ describe('Coverage Contract', () => { }); it('should echo u32 vector addition', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions .echo_u32_vector_addition([100, 2], [24, 54]) .call(); @@ -384,6 +450,8 @@ describe('Coverage Contract', () => { }); it('should echo u32 vector addition [variable lengths]', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions .echo_u32_vector_addition([100, 2, 1, 2, 3], [24, 54]) .call(); @@ -391,6 +459,8 @@ describe('Coverage Contract', () => { }); it('should echo struct vector input', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const first = { foo: 1, bar: 10, @@ -538,6 +608,8 @@ describe('Coverage Contract', () => { }); it('should test native enum [Red->Green]', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT: ColorEnumInput = ColorEnumInput.Red; const OUTPUT: ColorEnumOutput = ColorEnumOutput.Green; const { value } = await contractInstance.functions.color_enum(INPUT).call(); @@ -546,6 +618,8 @@ describe('Coverage Contract', () => { }); it('should test native enum [Green->Blue]', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT: ColorEnumInput = ColorEnumInput.Green; const OUTPUT: ColorEnumOutput = ColorEnumOutput.Blue; @@ -554,6 +628,8 @@ describe('Coverage Contract', () => { }); it('should test native enum [Blue->Red]', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT: ColorEnumInput = ColorEnumInput.Blue; const OUTPUT: ColorEnumOutput = ColorEnumOutput.Red; @@ -562,6 +638,8 @@ describe('Coverage Contract', () => { }); it('should test mixed native enum [Native->NotNative]', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const input = MixedNativeEnum.Native; const expected = { NotNative: MixedNativeEnum.NotNative }; @@ -570,6 +648,8 @@ describe('Coverage Contract', () => { }); it('should test mixed native enum [NotNative->Native]', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const input = { NotNative: MixedNativeEnum.NotNative }; const expected = 'Native'; @@ -578,6 +658,8 @@ describe('Coverage Contract', () => { }); it('should try vec_as_only_param', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions .vec_as_only_param([100, 450, 202, 340]) .call(); @@ -591,6 +673,8 @@ describe('Coverage Contract', () => { }); it('should try u32_and_vec_params', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const { value } = await contractInstance.functions .u32_and_vec_params(33, [450, 202, 340]) .call(); @@ -604,6 +688,8 @@ describe('Coverage Contract', () => { }); it('should support vec in vec', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT = [ [0, 1, 2], [0, 1, 2], @@ -615,6 +701,8 @@ describe('Coverage Contract', () => { }); it('should support array in vec', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT = [ [0, 1, 2], [0, 1, 2], @@ -626,6 +714,8 @@ describe('Coverage Contract', () => { }); it('should test b256 multiple params vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT_A = [hexlify(randomBytes(32)), hexlify(randomBytes(32)), hexlify(randomBytes(32))]; const INPUT_B = [hexlify(randomBytes(32)), hexlify(randomBytes(32)), hexlify(randomBytes(32))]; const INPUT_C = hexlify(randomBytes(32)); @@ -639,6 +729,8 @@ describe('Coverage Contract', () => { }); it('should handle multiple calls [with vectors]', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT_A = [hexlify(randomBytes(32)), hexlify(randomBytes(32)), hexlify(randomBytes(32))]; const INPUT_B = [hexlify(randomBytes(32))]; const INPUT_C = hexlify(randomBytes(32)); @@ -657,6 +749,8 @@ describe('Coverage Contract', () => { }); it('should handle multiple calls [with vectors + stack data first]', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + const INPUT_A = [hexlify(randomBytes(32)), hexlify(randomBytes(32)), hexlify(randomBytes(32))]; const INPUT_B = [hexlify(randomBytes(32))]; const INPUT_C = hexlify(randomBytes(32)); diff --git a/packages/fuel-gauge/src/edge-cases.test.ts b/packages/fuel-gauge/src/edge-cases.test.ts index 4cef5f024da..f38a7e863a8 100644 --- a/packages/fuel-gauge/src/edge-cases.test.ts +++ b/packages/fuel-gauge/src/edge-cases.test.ts @@ -1,16 +1,18 @@ import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { FUEL_NETWORK_URL, Provider, TransactionResponse, Wallet } from 'fuels'; -import { getSetupContract } from './utils'; +import { FuelGaugeProjectsEnum } from '../test/fixtures'; + +import { setupContract } from './utils'; /** * @group node + * @group browser */ describe('Edge Cases', () => { it('can run collision_in_fn_names', async () => { - const contract = await getSetupContract('collision_in_fn_names')(); - - expect((await contract.functions.new().call()).value.toNumber()).toEqual(12345); + using contractInstance = await setupContract(FuelGaugeProjectsEnum.COLLISION_IN_FN_NAMES); + expect((await contractInstance.functions.new().call()).value.toNumber()).toEqual(12345); }); test("SSE subscriptions that are closed by the node don't hang a for-await-of loop", async () => { diff --git a/packages/fuel-gauge/src/generic-types-contract.test.ts b/packages/fuel-gauge/src/generic-types-contract.test.ts index 9cab32da723..3ff2751c81c 100644 --- a/packages/fuel-gauge/src/generic-types-contract.test.ts +++ b/packages/fuel-gauge/src/generic-types-contract.test.ts @@ -2,12 +2,6 @@ import { toHex } from 'fuels'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; -import { setup } from './utils'; - -const { binHexlified: contractBytecode, abiContents: abiJSON } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.GENERIC_TYPES_CONTRACT -); - /** * @group node */ diff --git a/packages/fuel-gauge/src/is-function-readonly.test.ts b/packages/fuel-gauge/src/is-function-readonly.test.ts index bcbdf125c4d..6daff109543 100644 --- a/packages/fuel-gauge/src/is-function-readonly.test.ts +++ b/packages/fuel-gauge/src/is-function-readonly.test.ts @@ -1,31 +1,31 @@ import { FuelGaugeProjectsEnum } from '../test/fixtures'; -import { getSetupContract } from './utils'; +import { setupContract } from './utils'; /** * @group node */ describe('isReadOnly', () => { test('isReadOnly returns true for a read-only function', async () => { - const contract = await getSetupContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT)(); + using contractInstance = await setupContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); - const isReadOnly = contract.functions.counter.isReadOnly(); + const isReadOnly = contractInstance.functions.counter.isReadOnly(); expect(isReadOnly).toBe(true); }); test('isReadOnly returns false for a function containing write operations', async () => { - const contract = await getSetupContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT)(); + using contractInstance = await setupContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); - const isReadOnly = contract.functions.increment_counter.isReadOnly(); + const isReadOnly = contractInstance.functions.increment_counter.isReadOnly(); expect(isReadOnly).toBe(false); }); test('isReadOnly does not throw a runtime error for a function that does not use storage', async () => { - const contract = await getSetupContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT)(); + using contractInstance = await setupContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); - const isReadOnly = contract.functions.return_true.isReadOnly(); + const isReadOnly = contractInstance.functions.return_true.isReadOnly(); expect(isReadOnly).toBe(true); }); diff --git a/packages/fuel-gauge/src/options.test.ts b/packages/fuel-gauge/src/options.test.ts index 548e3214db4..00e63ba9199 100644 --- a/packages/fuel-gauge/src/options.test.ts +++ b/packages/fuel-gauge/src/options.test.ts @@ -1,17 +1,18 @@ import { generateTestWallet } from '@fuel-ts/account/test-utils'; -import type { Contract, WalletUnlocked } from 'fuels'; +import type { WalletUnlocked } from 'fuels'; -import { getSetupContract } from './utils'; +import { FuelGaugeProjectsEnum } from '../test/fixtures'; + +import { setupContract } from './utils'; const U8_MAX = 255; const U16_MAX = 65535; const U32_MAX = 4294967295; -const setupContract = getSetupContract('options'); -let contractInstance: Contract; let wallet: WalletUnlocked; + beforeAll(async () => { - contractInstance = await setupContract(); + using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); wallet = await generateTestWallet(contractInstance.provider, [ [200_000, contractInstance.provider.getBaseAssetId()], ]); @@ -19,9 +20,11 @@ beforeAll(async () => { /** * @group node + * @group browser */ describe('Options Tests', () => { it('calls', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); const { value } = await contractInstance.functions.print_enum_option_array().call(); expect(value).toStrictEqual({ @@ -44,6 +47,8 @@ describe('Options Tests', () => { const someInput = U8_MAX; const noneInput = undefined; + using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + const { value: someValue } = await contractInstance.functions.echo_option(someInput).call(); expect(someValue).toBe(someInput); @@ -61,6 +66,8 @@ describe('Options Tests', () => { two: U32_MAX, }; + using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + const { value: someValue } = await contractInstance.functions .echo_struct_enum_option(someInput) .call(); @@ -84,6 +91,8 @@ describe('Options Tests', () => { it('echos vec option', async () => { const someInput = [U8_MAX, U16_MAX, U32_MAX]; + using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + const { value: someValue } = await contractInstance.functions.echo_vec_option(someInput).call(); expect(someValue).toStrictEqual(someInput); @@ -106,6 +115,8 @@ describe('Options Tests', () => { it('echos tuple option', async () => { const someInput = [U8_MAX, U16_MAX]; + using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + const { value: someValue } = await contractInstance.functions .echo_tuple_option(someInput) .call(); @@ -132,6 +143,8 @@ describe('Options Tests', () => { it('echoes enum option', async () => { const someInput = { a: U8_MAX }; + using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + const { value: someValue } = await contractInstance.functions .echo_enum_option(someInput) .call(); @@ -150,6 +163,8 @@ describe('Options Tests', () => { it('echos array option', async () => { const someInput = [U8_MAX, U16_MAX, 123]; + using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + const { value: someValue } = await contractInstance.functions .echo_array_option(someInput) .call(); @@ -180,12 +195,16 @@ describe('Options Tests', () => { }, }; + using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + const { value } = await contractInstance.functions.echo_deeply_nested_option(input).call(); expect(value).toStrictEqual(input); }); it('prints struct option', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + const { value } = await contractInstance.functions .get_some_struct({ Address: { bits: wallet.address.toB256() } }) .call(); @@ -194,6 +213,8 @@ describe('Options Tests', () => { }); it('echoes option enum diff sizes', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + const { value } = await contractInstance.functions.echo_enum_diff_sizes(undefined).call(); expect(value).toStrictEqual(undefined); diff --git a/packages/fuel-gauge/src/policies.test.ts b/packages/fuel-gauge/src/policies.test.ts index 146b6efc8ba..c26520355c2 100644 --- a/packages/fuel-gauge/src/policies.test.ts +++ b/packages/fuel-gauge/src/policies.test.ts @@ -29,6 +29,7 @@ const setupContract = async () => { /** * @group node + * @group browser */ describe('Policies', () => { let provider: Provider; diff --git a/packages/fuel-gauge/src/raw-slice.test.ts b/packages/fuel-gauge/src/raw-slice.test.ts index 90ef2c7d2cd..b16f0824335 100644 --- a/packages/fuel-gauge/src/raw-slice.test.ts +++ b/packages/fuel-gauge/src/raw-slice.test.ts @@ -1,10 +1,10 @@ import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { bn, Predicate, Wallet, Address, Provider, FUEL_NETWORK_URL } from 'fuels'; -import type { BN, Contract } from 'fuels'; +import type { BN } from 'fuels'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; -import { getScript, getSetupContract } from './utils'; +import { getScript, setupContract } from './utils'; type SomeEnum = { First?: boolean; @@ -26,19 +26,20 @@ const setup = async (balance = 500_000) => { return wallet; }; -const setupContract = getSetupContract('raw-slice'); -let contractInstance: Contract; let baseAssetId: string; beforeAll(async () => { - contractInstance = await setupContract(); + using contractInstance = await setupContract(FuelGaugeProjectsEnum.RAW_SLICE); baseAssetId = contractInstance.provider.getBaseAssetId(); }); /** * @group node + * @group browser */ describe('Raw Slice Tests', () => { it('should test raw slice output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.RAW_SLICE); + const INPUT = 10; const { value } = await contractInstance.functions.return_raw_slice(INPUT).call(); @@ -47,6 +48,8 @@ describe('Raw Slice Tests', () => { }); it('should test raw slice input', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.RAW_SLICE); + const INPUT = [40, 41, 42]; const { value } = await contractInstance.functions.accept_raw_slice(INPUT).call(); @@ -55,6 +58,8 @@ describe('Raw Slice Tests', () => { }); it('should test raw slice input [nested]', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.RAW_SLICE); + const slice = [40, 41, 42]; const INPUT = { inner: [slice, slice], diff --git a/packages/fuel-gauge/src/std-lib-string.test.ts b/packages/fuel-gauge/src/std-lib-string.test.ts index 3a55a923efb..4efb8ec55d1 100644 --- a/packages/fuel-gauge/src/std-lib-string.test.ts +++ b/packages/fuel-gauge/src/std-lib-string.test.ts @@ -4,14 +4,11 @@ import type { Contract } from 'fuels'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; -import { getScript, getSetupContract } from './utils'; - -const setupContract = getSetupContract('std-lib-string'); -let contractInstance: Contract; +import { getScript, setupContract } from './utils'; let baseAssetId: string; beforeAll(async () => { - contractInstance = await setupContract(); + using contractInstance = await setupContract(FuelGaugeProjectsEnum.STD_LIB_STRING); baseAssetId = contractInstance.provider.getBaseAssetId(); }); @@ -26,17 +23,20 @@ const setup = async (balance = 500_000) => { /** * @group node + * @group browser */ describe('std-lib-string Tests', () => { const { binHexlified: predicateStdString, abiContents: predicateStdStringAbi } = getFuelGaugeForcProject(FuelGaugeProjectsEnum.PREDICATE_STD_LIB_STRING); it('should test std-lib-string return', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.STD_LIB_STRING); const { value } = await contractInstance.functions.return_dynamic_string().call(); expect(value).toBe('Hello World'); }); it('should test std-lib-string input', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.STD_LIB_STRING); const INPUT = 'Hello World'; const { value } = await contractInstance.functions.accepts_dynamic_string(INPUT).call(); diff --git a/packages/fuel-gauge/src/transaction-summary.test.ts b/packages/fuel-gauge/src/transaction-summary.test.ts index b16d07e0248..7b85d97e729 100644 --- a/packages/fuel-gauge/src/transaction-summary.test.ts +++ b/packages/fuel-gauge/src/transaction-summary.test.ts @@ -24,10 +24,11 @@ import { import { FuelGaugeProjectsEnum } from '../test/fixtures'; -import { getSetupContract } from './utils'; +import { setupContract } from './utils'; /** * @group node + * @group browser */ describe('TransactionSummary', () => { let provider: Provider; @@ -171,8 +172,6 @@ describe('TransactionSummary', () => { }); describe('Transfer Operations', () => { - const setupContract = getSetupContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); - beforeAll(async () => { provider = await Provider.create(FUEL_NETWORK_URL); }); @@ -231,7 +230,7 @@ describe('TransactionSummary', () => { [10_000, ASSET_A], ]); - const contract1 = await setupContract({ cache: false }); + using contract1 = await setupContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); const amount = 234; @@ -253,7 +252,7 @@ describe('TransactionSummary', () => { it('should ensure transfer operation is assembled (CONTRACT TRANSFER TO ACCOUNT)', async () => { const wallet = await generateTestWallet(provider, [[300_000, baseAssetId]]); - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); contract.account = wallet; const recipient = Wallet.generate({ provider }); @@ -287,7 +286,7 @@ describe('TransactionSummary', () => { [50_000, ASSET_B], ]); - const senderContract = await setupContract({ cache: false }); + using senderContract = await setupContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); senderContract.account = wallet; const fundAmount = 5_000; @@ -344,11 +343,10 @@ describe('TransactionSummary', () => { it('should ensure transfer operation is assembled (CONTRACT TRANSFER TO CONTRACT)', async () => { const wallet = await generateTestWallet(provider, [[300_000, baseAssetId]]); - const contractSender = await setupContract({ cache: false }); + using contractSender = await setupContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); contractSender.account = wallet; - const contractRecipient = await setupContract({ cache: false }); - + using contractRecipient = await setupContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); const { transactionResult: { mintedAssets }, } = await contractSender.functions.mint_coins(100000).call(); @@ -381,7 +379,7 @@ describe('TransactionSummary', () => { [60_000, ASSET_B], ]); - const senderContract = await setupContract({ cache: false }); + using senderContract = await setupContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); senderContract.account = wallet; const fundAmount = 5_000; @@ -391,8 +389,8 @@ describe('TransactionSummary', () => { await tx.waitForResult(); } - const contractRecipient1 = await setupContract({ cache: false }); - const contractRecipient2 = await setupContract({ cache: false }); + using contractRecipient1 = await setupContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); + using contractRecipient2 = await setupContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); const transferData1 = { address: contractRecipient1.id, diff --git a/packages/fuel-gauge/src/utils.ts b/packages/fuel-gauge/src/utils.ts index 2afe05c2775..40896c7d6eb 100644 --- a/packages/fuel-gauge/src/utils.ts +++ b/packages/fuel-gauge/src/utils.ts @@ -1,22 +1,44 @@ import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { ASSET_A } from '@fuel-ts/utils/test-utils'; import { readFileSync } from 'fs'; -import type { Interface, Contract, WalletUnlocked, JsonAbi, BytesLike } from 'fuels'; -import { Script, Provider, ContractFactory, FUEL_NETWORK_URL } from 'fuels'; +import { Script, Provider, FUEL_NETWORK_URL } from 'fuels'; +import type { Interface, WalletUnlocked, JsonAbi, BytesLike, Contract } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; import { join } from 'path'; -let contractInstance: Contract; -const deployContract = async ( - factory: ContractFactory, - provider: Provider, - useCache: boolean = true -) => { - if (contractInstance && useCache) { - return contractInstance; - } - contractInstance = await factory.deployContract(); - return contractInstance; -}; +import { FuelGaugeProjectsEnum } from '../test/fixtures'; +import { + AdvancedLoggingAbi__factory, + AdvancedLoggingOtherContractAbi__factory, + BytecodeSwayLibAbi__factory, + CallTestContractAbi__factory, + ConfigurableContractAbi__factory, + CoverageContractAbi__factory, + BytesAbi__factory, + CollisionInFnNamesAbi__factory, + OptionsAbi__factory, + StdLibStringAbi__factory, + StorageTestContractAbi__factory, + RawSliceAbi__factory, + MultiTokenContractAbi__factory, + VectorTypesContractAbi__factory, + VectorsAbi__factory, +} from '../test/typegen/contracts'; +import advancedLoggingBytecode from '../test/typegen/contracts/AdvancedLoggingAbi.hex'; +import advancedLoggingOtherContractBytecode from '../test/typegen/contracts/AdvancedLoggingOtherContractAbi.hex'; +import bytecodeSwayLibBytecode from '../test/typegen/contracts/BytecodeSwayLibAbi.hex'; +import bytesBytecode from '../test/typegen/contracts/BytesAbi.hex'; +import callTestBytecode from '../test/typegen/contracts/CallTestContractAbi.hex'; +import collisionInFnNamesBytecode from '../test/typegen/contracts/CollisionInFnNamesAbi.hex'; +import configurableContractBytecode from '../test/typegen/contracts/ConfigurableContractAbi.hex'; +import coverageContractBytecode from '../test/typegen/contracts/CoverageContractAbi.hex'; +import multiTokenContractBytecode from '../test/typegen/contracts/MultiTokenContractAbi.hex'; +import optionsBytecode from '../test/typegen/contracts/OptionsAbi.hex'; +import rawSliceBytecode from '../test/typegen/contracts/RawSliceAbi.hex'; +import stdLibStringBytecode from '../test/typegen/contracts/StdLibStringAbi.hex'; +import storageTestContractBytecode from '../test/typegen/contracts/StorageTestContractAbi.hex'; +import vectorTypesContractBytecode from '../test/typegen/contracts/VectorTypesContractAbi.hex'; +import vectorsBytecode from '../test/typegen/contracts/VectorsAbi.hex'; let walletInstance: WalletUnlocked; export const createWallet = async () => { @@ -38,18 +60,6 @@ export type SetupConfig = { cache?: boolean; }; -export const setup = async ({ - contractBytecode, - abi, - cache, -}: SetupConfig) => { - // Create wallet - const wallet = await createWallet(); - const factory = new ContractFactory(contractBytecode, abi, wallet); - const contract = await deployContract(factory, wallet.provider, cache); - return contract as T; -}; - const getFullPath = (contractName: string, next: (fullPath: string) => T) => next( join(__dirname, `../test/fixtures/forc-projects/${contractName}/out/release/${contractName}`) @@ -71,3 +81,105 @@ export const getScript = ( export const getProgramDir = (name: string) => join(__dirname, `../test/fixtures/forc-projects/${name}`); + +export interface DisposableContract extends Contract { + [Symbol.dispose]: () => Promise; +} + +export const setupContract = async (type: FuelGaugeProjectsEnum): Promise => { + let deployer; + let bytecode: string; + + switch (type) { + case FuelGaugeProjectsEnum.ADVANCED_LOGGING: + deployer = AdvancedLoggingAbi__factory; + bytecode = advancedLoggingBytecode; + break; + + case FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT: + deployer = AdvancedLoggingOtherContractAbi__factory; + bytecode = advancedLoggingOtherContractBytecode; + break; + + case FuelGaugeProjectsEnum.BYTES: + deployer = BytesAbi__factory; + bytecode = bytesBytecode; + break; + + case FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB: + deployer = BytecodeSwayLibAbi__factory; + bytecode = bytecodeSwayLibBytecode; + break; + + case FuelGaugeProjectsEnum.CALL_TEST_CONTRACT: + deployer = CallTestContractAbi__factory; + bytecode = callTestBytecode; + break; + + case FuelGaugeProjectsEnum.COLLISION_IN_FN_NAMES: + deployer = CollisionInFnNamesAbi__factory; + bytecode = collisionInFnNamesBytecode; + break; + + case FuelGaugeProjectsEnum.CONFIGURABLE_CONTRACT: + deployer = ConfigurableContractAbi__factory; + bytecode = configurableContractBytecode; + break; + + case FuelGaugeProjectsEnum.COVERAGE_CONTRACT: + deployer = CoverageContractAbi__factory; + bytecode = coverageContractBytecode; + break; + + case FuelGaugeProjectsEnum.MULTI_TOKEN_CONTRACT: + deployer = MultiTokenContractAbi__factory; + bytecode = multiTokenContractBytecode; + break; + + case FuelGaugeProjectsEnum.OPTIONS: + deployer = OptionsAbi__factory; + bytecode = optionsBytecode; + break; + + case FuelGaugeProjectsEnum.RAW_SLICE: + deployer = RawSliceAbi__factory; + bytecode = rawSliceBytecode; + break; + + case FuelGaugeProjectsEnum.STD_LIB_STRING: + deployer = StdLibStringAbi__factory; + bytecode = stdLibStringBytecode; + break; + + case FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT: + deployer = StorageTestContractAbi__factory; + bytecode = storageTestContractBytecode; + break; + + case FuelGaugeProjectsEnum.VECTORS: + deployer = VectorsAbi__factory; + bytecode = vectorsBytecode; + break; + + case FuelGaugeProjectsEnum.VECTOR_TYPES_CONTRACT: + deployer = VectorTypesContractAbi__factory; + bytecode = vectorTypesContractBytecode; + break; + + default: + throw new Error('Invalid contract type'); + } + + const { + contracts: [contract], + cleanup, + } = await launchTestNode({ + contractsConfigs: [ + { + deployer, + bytecode, + }, + ], + }); + return Object.assign(contract, { [Symbol.dispose]: () => Promise.resolve(cleanup()) }); +}; diff --git a/packages/fuel-gauge/src/vector-types.test.ts b/packages/fuel-gauge/src/vector-types.test.ts index 75a7727dbaf..3e23a471796 100644 --- a/packages/fuel-gauge/src/vector-types.test.ts +++ b/packages/fuel-gauge/src/vector-types.test.ts @@ -4,7 +4,7 @@ import { bn, Predicate, Wallet, Address, Provider, FUEL_NETWORK_URL } from 'fuel import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; -import { getScript, getSetupContract } from './utils'; +import { getScript, setupContract } from './utils'; const U32_VEC = [0, 1, 2]; const VEC_IN_VEC = [ @@ -99,8 +99,7 @@ describe('Vector Types Validation', () => { }); it('can use supported vector types [vector-types-contract]', async () => { - const setupContract = getSetupContract('vector-types-contract'); - const contractInstance = await setupContract(); + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTOR_TYPES_CONTRACT); const { value } = await contractInstance.functions .test_all( diff --git a/packages/fuel-gauge/src/vectors.test.ts b/packages/fuel-gauge/src/vectors.test.ts index d386b3327d3..2218869aebb 100644 --- a/packages/fuel-gauge/src/vectors.test.ts +++ b/packages/fuel-gauge/src/vectors.test.ts @@ -1,13 +1,9 @@ import { bn, randomBytes, hexlify } from 'fuels'; -import type { BN, Contract } from 'fuels'; +import type { BN } from 'fuels'; -import { getSetupContract } from './utils'; +import { FuelGaugeProjectsEnum } from '../test/fixtures'; -const setupContract = getSetupContract('vectors'); -let contractInstance: Contract; -beforeAll(async () => { - contractInstance = await setupContract(); -}); +import { setupContract } from './utils'; const toNumbers = (nums: BN[]) => nums.map((num: BN) => bn(num).toNumber()); @@ -20,6 +16,7 @@ enum SmallEnum { */ describe('Vector Tests', () => { it('should test u8 vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [8, 6, 7, 5, 3, 0, 9]; const { value } = await contractInstance.functions.echo_u8(INPUT).call(); @@ -28,6 +25,7 @@ describe('Vector Tests', () => { }); it('should test u16 vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [8, 6, 7, 5, 3, 0, 9]; const { value } = await contractInstance.functions.echo_u16(INPUT).call(); @@ -36,6 +34,8 @@ describe('Vector Tests', () => { }); it('should test u32 vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = [8, 6, 7, 5, 3, 0, 9]; const { value } = await contractInstance.functions.echo_u32(INPUT).call(); @@ -44,6 +44,8 @@ describe('Vector Tests', () => { }); it('should test u64 vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = [8, 6, 7, 5, 3, 0, 9]; const { value } = await contractInstance.functions.echo_u64(INPUT).call(); @@ -52,6 +54,8 @@ describe('Vector Tests', () => { }); it('should test bool vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = [true, false, true, true]; const { value } = await contractInstance.functions.echo_bool(INPUT).call(); @@ -60,6 +64,8 @@ describe('Vector Tests', () => { }); it('should test b256 vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = [hexlify(randomBytes(32)), hexlify(randomBytes(32)), hexlify(randomBytes(32))]; const { value } = await contractInstance.functions.echo_b256(INPUT).call(); @@ -68,6 +74,8 @@ describe('Vector Tests', () => { }); it('should test b512 vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = [hexlify(randomBytes(64)), hexlify(randomBytes(64)), hexlify(randomBytes(64))]; const { value } = await contractInstance.functions.echo_b512(INPUT).call(); @@ -76,6 +84,8 @@ describe('Vector Tests', () => { }); it('should test str[1] vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = ['a', 'b', 'c', 'd']; const { value } = await contractInstance.functions.echo_str_1(INPUT).call(); @@ -84,6 +94,8 @@ describe('Vector Tests', () => { }); it('should test str[9] vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = ['123456789', 'abcdefghi', 'catdogcat', 'onetwoone']; const { value } = await contractInstance.functions.echo_str_9(INPUT).call(); @@ -92,6 +104,8 @@ describe('Vector Tests', () => { }); it('should test (u8, u8) vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = [ [1, 2], [3, 4], @@ -104,6 +118,8 @@ describe('Vector Tests', () => { }); it('should test (u64, u64) vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = [ [111, 2222], [333, 4445], @@ -116,6 +132,8 @@ describe('Vector Tests', () => { }); it('should test [u8; 2] vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = [ [1, 2], [5, 6], @@ -127,6 +145,8 @@ describe('Vector Tests', () => { }); it('should test [u64; 5] vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = [ [1, 2, 3, 4, 5], [500, 600, 700, 9000, 9999], @@ -139,6 +159,8 @@ describe('Vector Tests', () => { }); it('should test [bool; 2] vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = [ [true, true], [true, false], @@ -153,6 +175,8 @@ describe('Vector Tests', () => { }); it('should test U8Struct vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = [ { i: 1, @@ -171,6 +195,8 @@ describe('Vector Tests', () => { }); it('should test B256Struct vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = [ { i: hexlify(randomBytes(32)), @@ -189,6 +215,8 @@ describe('Vector Tests', () => { }); it('should test ComplexStruct vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + type ComplexStruct = { foo: number; bar: BN; baz: string }; const INPUT = [ { @@ -221,6 +249,8 @@ describe('Vector Tests', () => { }); it('should test SmallEnum vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = [ SmallEnum.Empty, SmallEnum.Empty, @@ -235,6 +265,8 @@ describe('Vector Tests', () => { }); it('should test BigEnum vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = [ { AddressA: hexlify(randomBytes(32)), @@ -253,6 +285,8 @@ describe('Vector Tests', () => { }); it('should test Option vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = [undefined, 1, undefined, 2, undefined, 3]; const { value } = await contractInstance.functions.echo_option_u8(INPUT).call(); @@ -261,6 +295,8 @@ describe('Vector Tests', () => { }); it('should test Vec inside struct input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = { num: 2, vec: [1, 5, 98], @@ -272,6 +308,8 @@ describe('Vector Tests', () => { }); it('should test Vec inside enum input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = { vec: [1, 5, 98], }; @@ -282,6 +320,8 @@ describe('Vector Tests', () => { }); it('should test Vec inside vector input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = [[1, 5, 98], [2, 44], [34]]; const { value } = await contractInstance.functions.echo_vector_inside_vector(INPUT).call(); @@ -290,6 +330,8 @@ describe('Vector Tests', () => { }); it('should test struct and Vec input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + type Struct = { foo: number; bar: BN; baz: string }; const INPUT: [Struct, number[]] = [ { @@ -311,6 +353,8 @@ describe('Vector Tests', () => { }); it('should test Vec and b256 tuple input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = [[1, 8, 3, 2, 55, 215], hexlify(randomBytes(32))]; const { value } = await contractInstance.functions.echo_vector_and_b256_tuple(...INPUT).call(); @@ -319,6 +363,8 @@ describe('Vector Tests', () => { }); it('should test two vectors tuple input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = [ [219, 229], [1, 254, 55], @@ -330,6 +376,8 @@ describe('Vector Tests', () => { }); it('should test u32 and three different vectors tuple input/output', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const INPUT = [91000, [true, true, false], [95000, 153333], [20000, 65500]]; const { value } = await contractInstance.functions.echo_u32_then_three_vectors(...INPUT).call(); @@ -338,6 +386,8 @@ describe('Vector Tests', () => { }); it('should test multiCall vectors', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + const { value: results } = await contractInstance .multiCall([ contractInstance.functions.echo_u8([1]), diff --git a/packages/fuel-gauge/test/fixtures/index.ts b/packages/fuel-gauge/test/fixtures/index.ts index 2390a7ea418..7a89bc7c2f3 100644 --- a/packages/fuel-gauge/test/fixtures/index.ts +++ b/packages/fuel-gauge/test/fixtures/index.ts @@ -18,6 +18,7 @@ export enum FuelGaugeProjectsEnum { COVERAGE_CONTRACT = 'coverage-contract', GENERIC_TYPES_CONTRACT = 'generic-types-contract', MULTI_TOKEN_CONTRACT = 'multi-token-contract', + OPTIONS = 'options', PAYABLE_ANNOTATION = 'payable-annotation', PREDICATE_ADDRESS = 'predicate-address', PREDICATE_ASSERT_VALUE = 'predicate-assert-value', From a5ac3fe652659f7a870f10ced727429f295c7b28 Mon Sep 17 00:00:00 2001 From: chad Date: Sun, 23 Jun 2024 16:02:57 -0500 Subject: [PATCH 15/53] test: refactor launchTestNode use cases to use utility --- packages/fuel-gauge/src/auth-testing.test.ts | 23 ++-- .../fuel-gauge/src/await-execution.test.ts | 1 + .../fuel-gauge/src/call-test-contract.test.ts | 36 ++---- .../fuel-gauge/src/contract-factory.test.ts | 28 ++--- packages/fuel-gauge/src/contract.test.ts | 114 ++++++++---------- packages/fuel-gauge/src/doc-examples.test.ts | 1 + packages/fuel-gauge/src/fee.test.ts | 1 + .../src/generic-types-contract.test.ts | 9 +- .../src/multi-token-contract.test.ts | 1 + .../fuel-gauge/src/payable-annotation.test.ts | 22 +--- packages/fuel-gauge/src/policies.test.ts | 22 +--- packages/fuel-gauge/src/utils.ts | 18 ++- packages/fuel-gauge/src/vector-types.test.ts | 1 + packages/fuel-gauge/src/vectors.test.ts | 1 + 14 files changed, 121 insertions(+), 157 deletions(-) diff --git a/packages/fuel-gauge/src/auth-testing.test.ts b/packages/fuel-gauge/src/auth-testing.test.ts index 18e58b5d8bb..32035315a3b 100644 --- a/packages/fuel-gauge/src/auth-testing.test.ts +++ b/packages/fuel-gauge/src/auth-testing.test.ts @@ -1,37 +1,36 @@ import { generateTestWallet } from '@fuel-ts/account/test-utils'; -import type { Contract, WalletUnlocked } from 'fuels'; -import { ContractFactory, Provider, getRandomB256, FUEL_NETWORK_URL } from 'fuels'; +import type { WalletUnlocked } from 'fuels'; +import { Provider, getRandomB256, FUEL_NETWORK_URL } from 'fuels'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { FuelGaugeProjectsEnum } from '../test/fixtures'; + +import { setupContract } from './utils'; -let contractInstance: Contract; let wallet: WalletUnlocked; let baseAssetId: string; /** * @group node + * @group browser */ describe('Auth Testing', () => { beforeAll(async () => { const provider = await Provider.create(FUEL_NETWORK_URL); baseAssetId = provider.getBaseAssetId(); wallet = await generateTestWallet(provider, [[1_000_000, baseAssetId]]); - - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.AUTH_TESTING_CONTRACT - ); - - const factory = new ContractFactory(binHexlified, abiContents, wallet); - contractInstance = await factory.deployContract(); }); it('can get is_caller_external', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.AUTH_TESTING_CONTRACT); + const { value } = await contractInstance.functions.is_caller_external().call(); expect(value).toBeTruthy(); }); it('can check_msg_sender [with correct id]', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.AUTH_TESTING_CONTRACT); + const { value } = await contractInstance.functions .check_msg_sender({ bits: wallet.address.toB256() }) .call(); @@ -40,6 +39,8 @@ describe('Auth Testing', () => { }); it('can check_msg_sender [with incorrect id]', async () => { + using contractInstance = await setupContract(FuelGaugeProjectsEnum.AUTH_TESTING_CONTRACT); + await expect( contractInstance.functions.check_msg_sender({ bits: getRandomB256() }).call() ).rejects.toThrow( diff --git a/packages/fuel-gauge/src/await-execution.test.ts b/packages/fuel-gauge/src/await-execution.test.ts index 9d205372a4e..31e8adfd844 100644 --- a/packages/fuel-gauge/src/await-execution.test.ts +++ b/packages/fuel-gauge/src/await-execution.test.ts @@ -3,6 +3,7 @@ import { Provider, WalletUnlocked, randomBytes, Wallet, FUEL_NETWORK_URL } from /** * @group node + * @group browser */ describe('await-execution', () => { test('awaiting execution of a transaction on the provider works', async () => { diff --git a/packages/fuel-gauge/src/call-test-contract.test.ts b/packages/fuel-gauge/src/call-test-contract.test.ts index e47cdfe0540..358b51e7215 100644 --- a/packages/fuel-gauge/src/call-test-contract.test.ts +++ b/packages/fuel-gauge/src/call-test-contract.test.ts @@ -1,20 +1,10 @@ import { ASSET_A } from '@fuel-ts/utils/test-utils'; import type { Contract } from 'fuels'; import { BN, bn, toHex } from 'fuels'; -import { launchTestNode } from 'fuels/test-utils'; -import { CallTestContractAbi__factory } from '../test/typegen/contracts'; -import bytecode from '../test/typegen/contracts/CallTestContractAbi.hex'; +import { FuelGaugeProjectsEnum } from '../test/fixtures'; -const setupContract = async () => { - const { - contracts: [contract], - cleanup, - } = await launchTestNode({ - contractsConfigs: [{ deployer: CallTestContractAbi__factory, bytecode }], - }); - return Object.assign(contract, { [Symbol.dispose]: cleanup }); -}; +import { setupContract } from './utils'; const U64_MAX = bn(2).pow(64).sub(1); @@ -24,7 +14,7 @@ const U64_MAX = bn(2).pow(64).sub(1); */ describe('CallTestContract', () => { it.each([0, 1337, U64_MAX.sub(1)])('can call a contract with u64 (%p)', async (num) => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value } = await contract.functions.foo(num).call(); expect(value.toHex()).toEqual(bn(num).add(1).toHex()); }); @@ -37,14 +27,14 @@ describe('CallTestContract', () => { [{ a: false, b: U64_MAX.sub(1) }], [{ a: true, b: U64_MAX.sub(1) }], ])('can call a contract with structs (%p)', async (struct) => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value } = await contract.functions.boo(struct).call(); expect(value.a).toEqual(!struct.a); expect(value.b.toHex()).toEqual(bn(struct.b).add(1).toHex()); }); it('can call a function with empty arguments', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value: empty } = await contract.functions.empty().call(); expect(empty.toHex()).toEqual(toHex(63)); @@ -62,7 +52,7 @@ describe('CallTestContract', () => { }); it('function with empty return should resolve undefined', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); // Call method with no params but with no result and no value on config const { value } = await contract.functions.return_void().call(); @@ -139,7 +129,7 @@ describe('CallTestContract', () => { async (method, { values, expected }) => { // Type cast to Contract because of the dynamic nature of the test // But the function names are type-constrained to correct Contract's type - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value } = await (contract as Contract).functions[method](...values).call(); @@ -152,7 +142,7 @@ describe('CallTestContract', () => { ); it('Forward amount value on contract call', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const baseAssetId = contract.provider.getBaseAssetId(); const { value } = await contract.functions .return_context_amount() @@ -164,7 +154,7 @@ describe('CallTestContract', () => { }); it('Forward asset_id on contract call', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const assetId = ASSET_A; const { value } = await contract.functions @@ -177,7 +167,7 @@ describe('CallTestContract', () => { }); it('Forward asset_id on contract simulate call', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const assetId = ASSET_A; const { value } = await contract.functions @@ -190,7 +180,7 @@ describe('CallTestContract', () => { }); it('can make multiple calls', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const num = 1337; const numC = 10; @@ -225,14 +215,14 @@ describe('CallTestContract', () => { }); it('Calling a simple contract function does only one dry run', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const dryRunSpy = vi.spyOn(contract.provider.operations, 'dryRun'); await contract.functions.no_params().call(); expect(dryRunSpy).toHaveBeenCalledOnce(); }); it('Simulating a simple contract function does two dry runs', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const dryRunSpy = vi.spyOn(contract.provider.operations, 'dryRun'); await contract.functions.no_params().simulate(); diff --git a/packages/fuel-gauge/src/contract-factory.test.ts b/packages/fuel-gauge/src/contract-factory.test.ts index 649c69a3d70..8d2ae712165 100644 --- a/packages/fuel-gauge/src/contract-factory.test.ts +++ b/packages/fuel-gauge/src/contract-factory.test.ts @@ -6,8 +6,11 @@ import { BN, bn, toHex, Interface, Provider, ContractFactory, FUEL_NETWORK_URL } import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { setupContract } from './utils'; + /** * @group node + * @group browser */ describe('Contract Factory', () => { let baseAssetId: string; @@ -29,32 +32,27 @@ describe('Contract Factory', () => { }; it('Creates a factory from inputs that can return call results', async () => { - const factory = await createContractFactory(); - - const contact = await factory.deployContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); + expect(contract.interface).toBeInstanceOf(Interface); - expect(contact.interface).toBeInstanceOf(Interface); - - const { value: valueInitial } = await contact.functions.initialize_counter(41).call(); + const { value: valueInitial } = await contract.functions.initialize_counter(41).call(); expect(valueInitial.toHex()).toEqual(toHex(41)); - const { value } = await contact.functions.increment_counter(1).call(); + const { value } = await contract.functions.increment_counter(1).call(); expect(value.toHex()).toEqual(toHex(42)); - const { value: value2 } = await contact.functions.increment_counter(1).dryRun(); + const { value: value2 } = await contract.functions.increment_counter(1).dryRun(); expect(value2.toHex()).toEqual(toHex(43)); }); it('Creates a factory from inputs that can return transaction results', async () => { - const factory = await createContractFactory(); - - const contact = await factory.deployContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); - expect(contact.interface).toBeInstanceOf(Interface); + expect(contract.interface).toBeInstanceOf(Interface); - await contact.functions.initialize_counter(100).call(); + await contract.functions.initialize_counter(100).call(); - const { transactionResult } = await contact.functions.increment_counter(1).call(); + const { transactionResult } = await contract.functions.increment_counter(1).call(); expect(transactionResult).toEqual({ blockId: expect.stringMatching(/^0x/), receipts: expect.arrayContaining([expect.any(Object)]), @@ -85,7 +83,7 @@ describe('Contract Factory', () => { }); expect(transactionResult.gasUsed.toNumber()).toBeGreaterThan(0); - const { callResult } = await contact.functions.increment_counter(1).dryRun(); + const { callResult } = await contract.functions.increment_counter(1).dryRun(); expect(callResult).toMatchObject({ receipts: expect.arrayContaining([expect.any(Object)]), }); diff --git a/packages/fuel-gauge/src/contract.test.ts b/packages/fuel-gauge/src/contract.test.ts index 394afc25066..3465ca604cb 100644 --- a/packages/fuel-gauge/src/contract.test.ts +++ b/packages/fuel-gauge/src/contract.test.ts @@ -28,26 +28,19 @@ import { Predicate, PolicyType, } from 'fuels'; -import { launchTestNode } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; -import { CallTestContractAbi__factory } from '../test/typegen/contracts'; -import binHexlified from '../test/typegen/contracts/CallTestContractAbi.hex'; + +import { setupContract } from './utils'; + +const { binHexlified: contractBytecode, abiContents: abi } = getFuelGaugeForcProject( + FuelGaugeProjectsEnum.CALL_TEST_CONTRACT +); const { binHexlified: predicateBytecode } = getFuelGaugeForcProject( FuelGaugeProjectsEnum.PREDICATE_TRUE ); -const setupContract = async () => { - const { - contracts: [contract], - cleanup, - } = await launchTestNode({ - contractsConfigs: [{ deployer: CallTestContractAbi__factory, bytecode: binHexlified }], - }); - return Object.assign(contract, { [Symbol.dispose]: cleanup }); -}; - const jsonFragment: JsonAbi = { configurables: [], loggedTypes: [], @@ -224,7 +217,7 @@ describe('Contract', () => { }); it('should fail to execute call if gasLimit is too low', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); let failed; try { @@ -242,8 +235,8 @@ describe('Contract', () => { }); it('adds multiple contracts on invocation', async () => { - using contract = await setupContract(); - using otherContract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using otherContract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const scope = contract.functions.call_external_foo(1336, otherContract.id.toB256()); @@ -253,8 +246,8 @@ describe('Contract', () => { }); it('adds multiple contracts on multicalls', async () => { - using contract = await setupContract(); - using otherContract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using otherContract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const calls = [ contract.functions.foo(1336), @@ -280,7 +273,7 @@ describe('Contract', () => { }); it('submits multiple calls', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value: results } = await contract .multiCall([contract.functions.foo(1336), contract.functions.foo(1336)]) @@ -289,7 +282,7 @@ describe('Contract', () => { }); it('submits multiple calls, six calls', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value: results } = await contract .multiCall([ @@ -308,7 +301,7 @@ describe('Contract', () => { }); it('submits multiple calls, eight calls', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value: results } = await contract .multiCall([ @@ -337,7 +330,7 @@ describe('Contract', () => { }); it('should fail to execute multiple calls if gasLimit is too low', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); let failed; try { @@ -355,8 +348,8 @@ describe('Contract', () => { }); it('adds multiple contracts on multicalls', async () => { - using contract = await setupContract(); - using otherContract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using otherContract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const scope = contract.multiCall([contract.functions.foo(1336)]).addContracts([otherContract]); @@ -377,7 +370,7 @@ describe('Contract', () => { }); it('dryRuns multiple calls', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value: results } = await contract .multiCall([contract.functions.foo(1336), contract.functions.foo(1336)]) @@ -386,7 +379,7 @@ describe('Contract', () => { }); it('simulates multiple calls', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value, callResult, gasUsed } = await contract .multiCall([contract.functions.foo(1336), contract.functions.foo(1336)]) @@ -397,7 +390,7 @@ describe('Contract', () => { }); it('Returns gasUsed and transactionId', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { transactionId, gasUsed } = await contract .multiCall([contract.functions.foo(1336), contract.functions.foo(1336)]) @@ -407,7 +400,7 @@ describe('Contract', () => { }); it('Single call with forwarding a alt token', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value } = await contract.functions .return_context_amount() .callParams({ @@ -422,7 +415,7 @@ describe('Contract', () => { }); it('MultiCall with multiple forwarding', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value } = await contract .multiCall([ @@ -444,7 +437,7 @@ describe('Contract', () => { }); it('Check if gas per call is lower than transaction', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); await expect( contract @@ -468,7 +461,7 @@ describe('Contract', () => { }); it('can forward gas to multicall calls', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value } = await contract .multiCall([ @@ -496,7 +489,7 @@ describe('Contract', () => { }); it('Get transaction cost', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const invocationScope = contract.multiCall([ contract.functions.return_context_amount().callParams({ @@ -521,7 +514,7 @@ describe('Contract', () => { }); it('Fail before submit if gasLimit is lower than gasUsed', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const invocationScope = contract.functions.return_context_amount().callParams({ forward: [100, baseAssetId], @@ -539,7 +532,7 @@ describe('Contract', () => { }); it('calls array functions', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value: arrayBoolean } = await contract.functions .take_array_boolean([true, false, false]) @@ -571,7 +564,7 @@ describe('Contract', () => { }); it('calls enum functions', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value: enumB256ReturnValue } = await contract.functions .take_b256_enum({ @@ -627,7 +620,7 @@ describe('Contract', () => { }); it('dryRun and get should not validate the signature', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value } = await contract .multiCall([ contract.functions.return_context_amount().callParams({ @@ -643,7 +636,7 @@ describe('Contract', () => { }); it('Parse TX to JSON and parse back to TX', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const num = 1337; const struct = { a: true, b: 1337 }; @@ -703,7 +696,7 @@ describe('Contract', () => { }); it('Provide a custom provider and public wallet to the contract instance', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const externalWallet = Wallet.generate({ provider, @@ -783,18 +776,7 @@ describe('Contract', () => { }); it('should ensure multicall allows multiple heap types', async () => { - const wallet = Wallet.generate({ - provider, - }); - await seedTestWallet(wallet, [ - { - amount: bn(500_000), - assetId: baseAssetId, - }, - ]); - const factory = new ContractFactory(contractBytecode, abi, wallet); - - const contract = await factory.deployContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const vector = [5, 4, 3, 2, 1]; @@ -810,7 +792,7 @@ describe('Contract', () => { }); it('Read only call', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value } = await contract.functions.echo_b256(contract.id.toB256()).simulate(); expect(value).toEqual(contract.id.toB256()); }); @@ -824,7 +806,7 @@ describe('Contract', () => { it('should tranfer asset to a deployed contract just fine (NATIVE ASSET)', async () => { const wallet = await generateTestWallet(provider, [[10_000_000, baseAssetId]]); - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const initialBalance = new BN(await contract.getBalance(baseAssetId)).toNumber(); @@ -842,7 +824,7 @@ describe('Contract', () => { it('should set "gasLimit" and "maxFee" when transferring amounts to contract just fine', async () => { const wallet = await generateTestWallet(provider, [[10_000_000, baseAssetId]]); - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const amountToContract = 5_000; const gasLimit = 80_000; @@ -865,7 +847,7 @@ describe('Contract', () => { it('should ensure gas price and gas limit are validated when transfering to contract', async () => { const wallet = await generateTestWallet(provider, [[1000, baseAssetId]]); - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const amountToContract = 100; @@ -890,7 +872,7 @@ describe('Contract', () => { [200, asset], ]); - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const initialBalance = new BN(await contract.getBalance(asset)).toNumber(); @@ -908,7 +890,7 @@ describe('Contract', () => { it('should tranfer asset to a deployed contract just fine (FROM PREDICATE)', async () => { const wallet = await generateTestWallet(provider, [[1_000_000, baseAssetId]]); - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const initialBalance = new BN(await contract.getBalance(baseAssetId)).toNumber(); @@ -934,7 +916,7 @@ describe('Contract', () => { }); it('should ensure TX revert error can be extracted for dryRun and simulate calls', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const scope = contract.functions.assert_u8(10, 11); @@ -1046,7 +1028,7 @@ describe('Contract', () => { }); it('should throw when using "simulate" with an unfunded wallet', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); contract.account = Wallet.generate({ provider: contract.provider }); @@ -1061,7 +1043,7 @@ describe('Contract', () => { }); it('should throw when using "simulate" without a wallet', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); contract.account = null; await expect( @@ -1075,7 +1057,7 @@ describe('Contract', () => { }); it('should throw when using "simulate" with a locked wallet', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); contract.account = Wallet.fromAddress(getRandomB256()); @@ -1090,7 +1072,7 @@ describe('Contract', () => { }); it('should use "dryRun" with an unfunded wallet just fine', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); contract.account = Wallet.generate({ provider: contract.provider }); @@ -1105,7 +1087,7 @@ describe('Contract', () => { }); it('should ensure "get" does not spend any funds', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const balance = await contract.account?.getBalance(); @@ -1120,7 +1102,7 @@ describe('Contract', () => { }); it('should ensure "get" can be used to execute a contract call without a wallet', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); // contract with no account set const contractToCall = new Contract(contract.id, contract.interface, contract.provider); @@ -1132,7 +1114,7 @@ describe('Contract', () => { }); it('should ensure "get" can be used to execute a contract call with an unfunded wallet', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const unfundedWallet = Wallet.generate({ provider: contract.provider }); @@ -1208,9 +1190,7 @@ describe('Contract', () => { }); it('should ensure "maxFee" and "gasLimit" can be set on a multicall', async () => { - const contract = await setupContract({ - cache: false, - }); + const contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const gasLimit = 500_000; const maxFee = 250_000; diff --git a/packages/fuel-gauge/src/doc-examples.test.ts b/packages/fuel-gauge/src/doc-examples.test.ts index daf96673de8..7915c80f779 100644 --- a/packages/fuel-gauge/src/doc-examples.test.ts +++ b/packages/fuel-gauge/src/doc-examples.test.ts @@ -56,6 +56,7 @@ const ADDRESS_BYTES = new Uint8Array([ /** * @group node + * @group browser */ describe('Doc Examples', () => { let baseAssetId: string; diff --git a/packages/fuel-gauge/src/fee.test.ts b/packages/fuel-gauge/src/fee.test.ts index dcd3ece6a49..77b20ed02ff 100644 --- a/packages/fuel-gauge/src/fee.test.ts +++ b/packages/fuel-gauge/src/fee.test.ts @@ -15,6 +15,7 @@ import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures /** * @group node + * @group browser */ describe('Fee', () => { let wallet: BaseWalletUnlocked; diff --git a/packages/fuel-gauge/src/generic-types-contract.test.ts b/packages/fuel-gauge/src/generic-types-contract.test.ts index 3ff2751c81c..036f204b5ec 100644 --- a/packages/fuel-gauge/src/generic-types-contract.test.ts +++ b/packages/fuel-gauge/src/generic-types-contract.test.ts @@ -1,16 +1,15 @@ import { toHex } from 'fuels'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { FuelGaugeProjectsEnum } from '../test/fixtures'; +import { setupContract } from './utils'; /** * @group node + * @group browser */ describe('GenericTypesContract', () => { it('should call complex contract function with generic type', async () => { - const contract = await setup({ - abi: abiJSON, - contractBytecode, - }); + using contract = await setupContract(FuelGaugeProjectsEnum.GENERIC_TYPES_CONTRACT); const b256 = '0xd5579c46dfcc7f18207013e65b44e4cb4e2c2298f4ac457ba8f82743f31e930b'; const bimArg1 = 'Yes'; diff --git a/packages/fuel-gauge/src/multi-token-contract.test.ts b/packages/fuel-gauge/src/multi-token-contract.test.ts index 89cbef5c696..f3d038fe194 100644 --- a/packages/fuel-gauge/src/multi-token-contract.test.ts +++ b/packages/fuel-gauge/src/multi-token-contract.test.ts @@ -14,6 +14,7 @@ const subIds = [ /** * @group node + * @group browse */ describe('MultiTokenContract', () => { it( diff --git a/packages/fuel-gauge/src/payable-annotation.test.ts b/packages/fuel-gauge/src/payable-annotation.test.ts index 607e6a5fd26..730cd8402a3 100644 --- a/packages/fuel-gauge/src/payable-annotation.test.ts +++ b/packages/fuel-gauge/src/payable-annotation.test.ts @@ -1,29 +1,17 @@ import { bn } from 'fuels'; -import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { FuelGaugeProjectsEnum } from '../test/fixtures'; -const { binHexlified: contractBytecode, abiContents: abiJSON } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PAYABLE_ANNOTATION -); - -const setupContract = async () => { - const { - contracts: [contract], - cleanup, - } = await launchTestNode({ - contractsConfigs: [{ deployer: abi, contractBytecode }], - }); - return Object.assign(contract, { [Symbol.dispose]: cleanup }); -}; +import { setupContract } from './utils'; beforeAll(() => {}); /** * @group node + * @group browser */ test('allow sending coins to payable functions', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); const baseAssetId = contract.provider.getBaseAssetId(); // This should not fail because the function is payable @@ -41,7 +29,7 @@ test('allow sending coins to payable functions', async () => { }); test("don't allow sending coins to non-payable functions", async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); const baseAssetId = contract.provider.getBaseAssetId(); // This should fail because the function is not payable diff --git a/packages/fuel-gauge/src/policies.test.ts b/packages/fuel-gauge/src/policies.test.ts index c26520355c2..3ae9f0dad2f 100644 --- a/packages/fuel-gauge/src/policies.test.ts +++ b/packages/fuel-gauge/src/policies.test.ts @@ -11,22 +11,10 @@ import { Wallet, bn, } from 'fuels'; -import { launchTestNode } from 'fuels/test-utils'; import { getFuelGaugeForcProject, FuelGaugeProjectsEnum } from '../test/fixtures'; -import { PayableAnnotationAbi__factory } from '../test/typegen/contracts'; -import bytecode from '../test/typegen/contracts/PayableAnnotationAbi.hex'; - -const setupContract = async () => { - const { - contracts: [contract], - cleanup, - } = await launchTestNode({ - contractsConfigs: [{ deployer: PayableAnnotationAbi__factory, bytecode }], - }); - return Object.assign(contract, { [Symbol.dispose]: cleanup }); -}; +import { setupContract } from './utils'; /** * @group node * @group browser @@ -205,7 +193,7 @@ describe('Policies', () => { }); it('should ensure TX policies are properly set (BaseInvocationScope)', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); const callScope = contract.functions.payable().txParams({ tip: 5, @@ -277,7 +265,7 @@ describe('Policies', () => { }); it('should ensure TX policies are properly set (Account Contract Transfer)', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); const txParams: CustomTxParams = { tip: 1, @@ -330,7 +318,7 @@ describe('Policies', () => { }); it('on account transferring to contract', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); const maxFee = 1; @@ -383,7 +371,7 @@ describe('Policies', () => { }); it('on a contract call', async () => { - using contract = await setupContract(); + using contract = await setupContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); const maxFee = 1; diff --git a/packages/fuel-gauge/src/utils.ts b/packages/fuel-gauge/src/utils.ts index 40896c7d6eb..0b90417930a 100644 --- a/packages/fuel-gauge/src/utils.ts +++ b/packages/fuel-gauge/src/utils.ts @@ -8,12 +8,14 @@ import { join } from 'path'; import { FuelGaugeProjectsEnum } from '../test/fixtures'; import { + AuthTestingContractAbi__factory, AdvancedLoggingAbi__factory, AdvancedLoggingOtherContractAbi__factory, BytecodeSwayLibAbi__factory, CallTestContractAbi__factory, ConfigurableContractAbi__factory, CoverageContractAbi__factory, + PayableAnnotationAbi__factory, BytesAbi__factory, CollisionInFnNamesAbi__factory, OptionsAbi__factory, @@ -26,6 +28,7 @@ import { } from '../test/typegen/contracts'; import advancedLoggingBytecode from '../test/typegen/contracts/AdvancedLoggingAbi.hex'; import advancedLoggingOtherContractBytecode from '../test/typegen/contracts/AdvancedLoggingOtherContractAbi.hex'; +import authTestingBytecode from '../test/typegen/contracts/AuthTestingContractAbi.hex'; import bytecodeSwayLibBytecode from '../test/typegen/contracts/BytecodeSwayLibAbi.hex'; import bytesBytecode from '../test/typegen/contracts/BytesAbi.hex'; import callTestBytecode from '../test/typegen/contracts/CallTestContractAbi.hex'; @@ -34,6 +37,7 @@ import configurableContractBytecode from '../test/typegen/contracts/Configurable import coverageContractBytecode from '../test/typegen/contracts/CoverageContractAbi.hex'; import multiTokenContractBytecode from '../test/typegen/contracts/MultiTokenContractAbi.hex'; import optionsBytecode from '../test/typegen/contracts/OptionsAbi.hex'; +import payableAnnotationBytecode from '../test/typegen/contracts/PayableAnnotationAbi.hex'; import rawSliceBytecode from '../test/typegen/contracts/RawSliceAbi.hex'; import stdLibStringBytecode from '../test/typegen/contracts/StdLibStringAbi.hex'; import storageTestContractBytecode from '../test/typegen/contracts/StorageTestContractAbi.hex'; @@ -86,7 +90,7 @@ export interface DisposableContract extends Contract { [Symbol.dispose]: () => Promise; } -export const setupContract = async (type: FuelGaugeProjectsEnum): Promise => { +export async function setupContract(type: FuelGaugeProjectsEnum): Promise { let deployer; let bytecode: string; @@ -96,6 +100,11 @@ export const setupContract = async (type: FuelGaugeProjectsEnum): Promise Promise.resolve(cleanup()) }); -}; +} diff --git a/packages/fuel-gauge/src/vector-types.test.ts b/packages/fuel-gauge/src/vector-types.test.ts index 3e23a471796..1864350180e 100644 --- a/packages/fuel-gauge/src/vector-types.test.ts +++ b/packages/fuel-gauge/src/vector-types.test.ts @@ -87,6 +87,7 @@ const setup = async (balance = 500_000) => { /** * @group node + * @group browser */ describe('Vector Types Validation', () => { let baseAssetId: string; diff --git a/packages/fuel-gauge/src/vectors.test.ts b/packages/fuel-gauge/src/vectors.test.ts index 2218869aebb..63326d7b8aa 100644 --- a/packages/fuel-gauge/src/vectors.test.ts +++ b/packages/fuel-gauge/src/vectors.test.ts @@ -13,6 +13,7 @@ enum SmallEnum { /** * @group node + * @group browser */ describe('Vector Tests', () => { it('should test u8 vector input/output', async () => { From e07b86dbe9b90fc6add1c53bc4d7ca0b93c66c42 Mon Sep 17 00:00:00 2001 From: chad Date: Mon, 24 Jun 2024 10:36:04 -0500 Subject: [PATCH 16/53] refactor: add type inference to setupContract --- .../src/test-utils/launch-test-node.ts | 2 +- .../fuel-gauge/src/advanced-logging.test.ts | 39 ++--- packages/fuel-gauge/src/auth-testing.test.ts | 8 +- .../fuel-gauge/src/bytecode-sway-lib.test.ts | 8 +- packages/fuel-gauge/src/bytes.test.ts | 8 +- .../fuel-gauge/src/call-test-contract.test.ts | 24 +-- .../fuel-gauge/src/contract-factory.test.ts | 6 +- packages/fuel-gauge/src/contract.test.ts | 84 +++++----- .../fuel-gauge/src/coverage-contract.test.ts | 104 ++++++------- packages/fuel-gauge/src/edge-cases.test.ts | 4 +- .../src/generic-types-contract.test.ts | 4 +- .../src/is-function-readonly.test.ts | 8 +- packages/fuel-gauge/src/options.test.ts | 24 +-- .../fuel-gauge/src/payable-annotation.test.ts | 6 +- packages/fuel-gauge/src/policies.test.ts | 15 +- .../src/predicate/utils/predicate/index.ts | 2 +- .../utils/predicate/setupContract.ts | 2 +- packages/fuel-gauge/src/raw-slice.test.ts | 10 +- .../fuel-gauge/src/std-lib-string.test.ts | 8 +- .../src/transaction-summary.test.ts | 18 +-- packages/fuel-gauge/src/utils.ts | 147 +----------------- packages/fuel-gauge/src/vector-types.test.ts | 4 +- packages/fuel-gauge/src/vectors.test.ts | 58 +++---- 23 files changed, 230 insertions(+), 363 deletions(-) diff --git a/packages/contract/src/test-utils/launch-test-node.ts b/packages/contract/src/test-utils/launch-test-node.ts index 0b2664f8d93..de2decf9f1f 100644 --- a/packages/contract/src/test-utils/launch-test-node.ts +++ b/packages/contract/src/test-utils/launch-test-node.ts @@ -22,7 +22,7 @@ interface ContractDeployer { ): Promise; } -interface DeployContractConfig { +export interface DeployContractConfig { /** * Contract deployer object compatible with factories outputted by `pnpm fuels typegen`. */ diff --git a/packages/fuel-gauge/src/advanced-logging.test.ts b/packages/fuel-gauge/src/advanced-logging.test.ts index f5ed48013b5..93a03d5888e 100644 --- a/packages/fuel-gauge/src/advanced-logging.test.ts +++ b/packages/fuel-gauge/src/advanced-logging.test.ts @@ -5,7 +5,7 @@ import { Script, bn } from 'fuels'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; -import { setupContract } from './utils'; +import { launchTestContract } from './utils'; let provider: Provider; let advancedLogId: string; @@ -13,8 +13,8 @@ let otherLogId: string; let baseAssetId: string; beforeAll(async () => { - using advancedLogContract = await setupContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); - using otherAdvancedLogContract = await setupContract( + using advancedLogContract = await launchTestContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + using otherAdvancedLogContract = await launchTestContract( FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT ); @@ -30,7 +30,7 @@ beforeAll(async () => { */ describe('Advanced Logging', () => { it('can get log data', async () => { - using advancedLogContract = await setupContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + using advancedLogContract = await launchTestContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); const { value, logs } = await advancedLogContract.functions.test_function().call(); @@ -76,7 +76,7 @@ describe('Advanced Logging', () => { }); it('can get log data from require [condition=true]', async () => { - using advancedLogContract = await setupContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + using advancedLogContract = await launchTestContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); const { value, logs } = await advancedLogContract.functions .test_function_with_require(1, 1) @@ -87,7 +87,7 @@ describe('Advanced Logging', () => { }); it('can get log data from require [condition=false]', async () => { - using advancedLogContract = await setupContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + using advancedLogContract = await launchTestContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); const invocation = advancedLogContract.functions.test_function_with_require(1, 3); try { @@ -118,8 +118,9 @@ describe('Advanced Logging', () => { }); it('can get log data from a downstream Contract', async () => { - using advancedLogContract = await setupContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); - using otherAdvancedLogContract = await setupContract( + // TODO: this test should use the same node + using advancedLogContract = await launchTestContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + using otherAdvancedLogContract = await launchTestContract( FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT ); @@ -139,9 +140,9 @@ describe('Advanced Logging', () => { }); describe('should properly decode all logs in a multicall with inter-contract calls', async () => { - using callTest = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); - using configurable = await setupContract(FuelGaugeProjectsEnum.CONFIGURABLE_CONTRACT); - using coverage = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using callTest = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using configurable = await launchTestContract(FuelGaugeProjectsEnum.CONFIGURABLE_CONTRACT); + using coverage = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); let wallet: WalletUnlocked; const testStruct = { @@ -164,8 +165,8 @@ describe('Advanced Logging', () => { }); it('when using InvacationScope', async () => { - using advancedLogContract = await setupContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); - using otherAdvancedLogContract = await setupContract( + using advancedLogContract = await launchTestContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + using otherAdvancedLogContract = await launchTestContract( FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT ); @@ -186,8 +187,8 @@ describe('Advanced Logging', () => { }); it('when using ScriptTransactionRequest', async () => { - using advancedLogContract = await setupContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); - using otherAdvancedLogContract = await setupContract( + using advancedLogContract = await launchTestContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + using otherAdvancedLogContract = await launchTestContract( FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT ); @@ -249,8 +250,8 @@ describe('Advanced Logging', () => { }); it('when using InvocationScope', async () => { - using advancedLogContract = await setupContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); - using otherAdvancedLogContract = await setupContract( + using advancedLogContract = await launchTestContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + using otherAdvancedLogContract = await launchTestContract( FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT ); @@ -264,8 +265,8 @@ describe('Advanced Logging', () => { }); it('when using ScriptTransactionRequest', async () => { - using advancedLogContract = await setupContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); - using otherAdvancedLogContract = await setupContract( + using advancedLogContract = await launchTestContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + using otherAdvancedLogContract = await launchTestContract( FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT ); diff --git a/packages/fuel-gauge/src/auth-testing.test.ts b/packages/fuel-gauge/src/auth-testing.test.ts index 32035315a3b..27306b21e7e 100644 --- a/packages/fuel-gauge/src/auth-testing.test.ts +++ b/packages/fuel-gauge/src/auth-testing.test.ts @@ -4,7 +4,7 @@ import { Provider, getRandomB256, FUEL_NETWORK_URL } from 'fuels'; import { FuelGaugeProjectsEnum } from '../test/fixtures'; -import { setupContract } from './utils'; +import { launchTestContract } from './utils'; let wallet: WalletUnlocked; let baseAssetId: string; @@ -21,7 +21,7 @@ describe('Auth Testing', () => { }); it('can get is_caller_external', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.AUTH_TESTING_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.AUTH_TESTING_CONTRACT); const { value } = await contractInstance.functions.is_caller_external().call(); @@ -29,7 +29,7 @@ describe('Auth Testing', () => { }); it('can check_msg_sender [with correct id]', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.AUTH_TESTING_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.AUTH_TESTING_CONTRACT); const { value } = await contractInstance.functions .check_msg_sender({ bits: wallet.address.toB256() }) @@ -39,7 +39,7 @@ describe('Auth Testing', () => { }); it('can check_msg_sender [with incorrect id]', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.AUTH_TESTING_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.AUTH_TESTING_CONTRACT); await expect( contractInstance.functions.check_msg_sender({ bits: getRandomB256() }).call() diff --git a/packages/fuel-gauge/src/bytecode-sway-lib.test.ts b/packages/fuel-gauge/src/bytecode-sway-lib.test.ts index d75b6b0b909..b097b30c8fc 100644 --- a/packages/fuel-gauge/src/bytecode-sway-lib.test.ts +++ b/packages/fuel-gauge/src/bytecode-sway-lib.test.ts @@ -4,7 +4,7 @@ import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures import { defaultPredicateAbi } from '../test/fixtures/abi/predicate'; import { defaultPredicateBytecode } from '../test/fixtures/bytecode/predicate'; -import { setupContract } from './utils'; +import { launchTestContract } from './utils'; /** * @group node * @group browser @@ -15,7 +15,7 @@ describe('bytecode computations', () => { FuelGaugeProjectsEnum.CALL_TEST_CONTRACT ); - using contract = await setupContract(FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB); + using contract = await launchTestContract(FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB); const { logs } = await contract.functions .compute_bytecode_root(arrayify(bytecodeFromFile)) @@ -32,7 +32,7 @@ describe('bytecode computations', () => { FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB ); - using contract = await setupContract(FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB); + using contract = await launchTestContract(FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB); const { value } = await contract.functions .verify_contract_bytecode( @@ -57,7 +57,7 @@ describe('bytecode computations', () => { const address = predicate.address; - const contract = await setupContract(FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB); + const contract = await launchTestContract(FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB); const { value } = await contract.functions .compute_predicate_address(Array.from(arrayify(defaultPredicateBytecode))) diff --git a/packages/fuel-gauge/src/bytes.test.ts b/packages/fuel-gauge/src/bytes.test.ts index c15d2ece64e..acd8b3b1cd1 100644 --- a/packages/fuel-gauge/src/bytes.test.ts +++ b/packages/fuel-gauge/src/bytes.test.ts @@ -4,7 +4,7 @@ import type { BN } from 'fuels'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; -import { getScript, setupContract } from './utils'; +import { getScript, launchTestContract } from './utils'; type SomeEnum = { First?: boolean; @@ -37,7 +37,7 @@ describe('Bytes Tests', () => { }); it('should test bytes output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.BYTES); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.BYTES); const INPUT = 10; const { value } = await contractInstance.functions.return_bytes(INPUT).call(); @@ -46,7 +46,7 @@ describe('Bytes Tests', () => { }); it('should test bytes output [100 items]', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.BYTES); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.BYTES); const INPUT = 100; @@ -56,7 +56,7 @@ describe('Bytes Tests', () => { }); it('should test bytes input', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.BYTES); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.BYTES); const INPUT = [40, 41, 42]; diff --git a/packages/fuel-gauge/src/call-test-contract.test.ts b/packages/fuel-gauge/src/call-test-contract.test.ts index 358b51e7215..660ba1f2223 100644 --- a/packages/fuel-gauge/src/call-test-contract.test.ts +++ b/packages/fuel-gauge/src/call-test-contract.test.ts @@ -4,7 +4,7 @@ import { BN, bn, toHex } from 'fuels'; import { FuelGaugeProjectsEnum } from '../test/fixtures'; -import { setupContract } from './utils'; +import { launchTestContract } from './utils'; const U64_MAX = bn(2).pow(64).sub(1); @@ -14,7 +14,7 @@ const U64_MAX = bn(2).pow(64).sub(1); */ describe('CallTestContract', () => { it.each([0, 1337, U64_MAX.sub(1)])('can call a contract with u64 (%p)', async (num) => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value } = await contract.functions.foo(num).call(); expect(value.toHex()).toEqual(bn(num).add(1).toHex()); }); @@ -27,14 +27,14 @@ describe('CallTestContract', () => { [{ a: false, b: U64_MAX.sub(1) }], [{ a: true, b: U64_MAX.sub(1) }], ])('can call a contract with structs (%p)', async (struct) => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value } = await contract.functions.boo(struct).call(); expect(value.a).toEqual(!struct.a); expect(value.b.toHex()).toEqual(bn(struct.b).add(1).toHex()); }); it('can call a function with empty arguments', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value: empty } = await contract.functions.empty().call(); expect(empty.toHex()).toEqual(toHex(63)); @@ -52,7 +52,7 @@ describe('CallTestContract', () => { }); it('function with empty return should resolve undefined', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); // Call method with no params but with no result and no value on config const { value } = await contract.functions.return_void().call(); @@ -129,7 +129,7 @@ describe('CallTestContract', () => { async (method, { values, expected }) => { // Type cast to Contract because of the dynamic nature of the test // But the function names are type-constrained to correct Contract's type - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value } = await (contract as Contract).functions[method](...values).call(); @@ -142,7 +142,7 @@ describe('CallTestContract', () => { ); it('Forward amount value on contract call', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const baseAssetId = contract.provider.getBaseAssetId(); const { value } = await contract.functions .return_context_amount() @@ -154,7 +154,7 @@ describe('CallTestContract', () => { }); it('Forward asset_id on contract call', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const assetId = ASSET_A; const { value } = await contract.functions @@ -167,7 +167,7 @@ describe('CallTestContract', () => { }); it('Forward asset_id on contract simulate call', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const assetId = ASSET_A; const { value } = await contract.functions @@ -180,7 +180,7 @@ describe('CallTestContract', () => { }); it('can make multiple calls', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const num = 1337; const numC = 10; @@ -215,14 +215,14 @@ describe('CallTestContract', () => { }); it('Calling a simple contract function does only one dry run', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const dryRunSpy = vi.spyOn(contract.provider.operations, 'dryRun'); await contract.functions.no_params().call(); expect(dryRunSpy).toHaveBeenCalledOnce(); }); it('Simulating a simple contract function does two dry runs', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const dryRunSpy = vi.spyOn(contract.provider.operations, 'dryRun'); await contract.functions.no_params().simulate(); diff --git a/packages/fuel-gauge/src/contract-factory.test.ts b/packages/fuel-gauge/src/contract-factory.test.ts index 8d2ae712165..187217a67dd 100644 --- a/packages/fuel-gauge/src/contract-factory.test.ts +++ b/packages/fuel-gauge/src/contract-factory.test.ts @@ -6,7 +6,7 @@ import { BN, bn, toHex, Interface, Provider, ContractFactory, FUEL_NETWORK_URL } import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; -import { setupContract } from './utils'; +import { launchTestContract } from './utils'; /** * @group node @@ -32,7 +32,7 @@ describe('Contract Factory', () => { }; it('Creates a factory from inputs that can return call results', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); expect(contract.interface).toBeInstanceOf(Interface); const { value: valueInitial } = await contract.functions.initialize_counter(41).call(); @@ -46,7 +46,7 @@ describe('Contract Factory', () => { }); it('Creates a factory from inputs that can return transaction results', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); expect(contract.interface).toBeInstanceOf(Interface); diff --git a/packages/fuel-gauge/src/contract.test.ts b/packages/fuel-gauge/src/contract.test.ts index 3465ca604cb..411769f1197 100644 --- a/packages/fuel-gauge/src/contract.test.ts +++ b/packages/fuel-gauge/src/contract.test.ts @@ -31,7 +31,7 @@ import { import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; -import { setupContract } from './utils'; +import { launchTestContract } from './utils'; const { binHexlified: contractBytecode, abiContents: abi } = getFuelGaugeForcProject( FuelGaugeProjectsEnum.CALL_TEST_CONTRACT @@ -217,7 +217,7 @@ describe('Contract', () => { }); it('should fail to execute call if gasLimit is too low', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); let failed; try { @@ -235,8 +235,8 @@ describe('Contract', () => { }); it('adds multiple contracts on invocation', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); - using otherContract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using otherContract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const scope = contract.functions.call_external_foo(1336, otherContract.id.toB256()); @@ -246,8 +246,8 @@ describe('Contract', () => { }); it('adds multiple contracts on multicalls', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); - using otherContract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using otherContract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const calls = [ contract.functions.foo(1336), @@ -273,7 +273,7 @@ describe('Contract', () => { }); it('submits multiple calls', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value: results } = await contract .multiCall([contract.functions.foo(1336), contract.functions.foo(1336)]) @@ -282,7 +282,7 @@ describe('Contract', () => { }); it('submits multiple calls, six calls', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value: results } = await contract .multiCall([ @@ -301,7 +301,7 @@ describe('Contract', () => { }); it('submits multiple calls, eight calls', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value: results } = await contract .multiCall([ @@ -330,7 +330,7 @@ describe('Contract', () => { }); it('should fail to execute multiple calls if gasLimit is too low', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); let failed; try { @@ -348,8 +348,8 @@ describe('Contract', () => { }); it('adds multiple contracts on multicalls', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); - using otherContract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using otherContract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const scope = contract.multiCall([contract.functions.foo(1336)]).addContracts([otherContract]); @@ -370,7 +370,7 @@ describe('Contract', () => { }); it('dryRuns multiple calls', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value: results } = await contract .multiCall([contract.functions.foo(1336), contract.functions.foo(1336)]) @@ -379,7 +379,7 @@ describe('Contract', () => { }); it('simulates multiple calls', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value, callResult, gasUsed } = await contract .multiCall([contract.functions.foo(1336), contract.functions.foo(1336)]) @@ -390,7 +390,7 @@ describe('Contract', () => { }); it('Returns gasUsed and transactionId', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { transactionId, gasUsed } = await contract .multiCall([contract.functions.foo(1336), contract.functions.foo(1336)]) @@ -400,7 +400,7 @@ describe('Contract', () => { }); it('Single call with forwarding a alt token', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value } = await contract.functions .return_context_amount() .callParams({ @@ -415,7 +415,7 @@ describe('Contract', () => { }); it('MultiCall with multiple forwarding', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value } = await contract .multiCall([ @@ -437,7 +437,7 @@ describe('Contract', () => { }); it('Check if gas per call is lower than transaction', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); await expect( contract @@ -461,7 +461,7 @@ describe('Contract', () => { }); it('can forward gas to multicall calls', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value } = await contract .multiCall([ @@ -489,7 +489,7 @@ describe('Contract', () => { }); it('Get transaction cost', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const invocationScope = contract.multiCall([ contract.functions.return_context_amount().callParams({ @@ -514,7 +514,7 @@ describe('Contract', () => { }); it('Fail before submit if gasLimit is lower than gasUsed', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const invocationScope = contract.functions.return_context_amount().callParams({ forward: [100, baseAssetId], @@ -532,7 +532,7 @@ describe('Contract', () => { }); it('calls array functions', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value: arrayBoolean } = await contract.functions .take_array_boolean([true, false, false]) @@ -564,7 +564,7 @@ describe('Contract', () => { }); it('calls enum functions', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value: enumB256ReturnValue } = await contract.functions .take_b256_enum({ @@ -620,7 +620,7 @@ describe('Contract', () => { }); it('dryRun and get should not validate the signature', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value } = await contract .multiCall([ contract.functions.return_context_amount().callParams({ @@ -636,7 +636,7 @@ describe('Contract', () => { }); it('Parse TX to JSON and parse back to TX', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const num = 1337; const struct = { a: true, b: 1337 }; @@ -696,7 +696,7 @@ describe('Contract', () => { }); it('Provide a custom provider and public wallet to the contract instance', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const externalWallet = Wallet.generate({ provider, @@ -776,7 +776,7 @@ describe('Contract', () => { }); it('should ensure multicall allows multiple heap types', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const vector = [5, 4, 3, 2, 1]; @@ -792,7 +792,7 @@ describe('Contract', () => { }); it('Read only call', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const { value } = await contract.functions.echo_b256(contract.id.toB256()).simulate(); expect(value).toEqual(contract.id.toB256()); }); @@ -806,7 +806,7 @@ describe('Contract', () => { it('should tranfer asset to a deployed contract just fine (NATIVE ASSET)', async () => { const wallet = await generateTestWallet(provider, [[10_000_000, baseAssetId]]); - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const initialBalance = new BN(await contract.getBalance(baseAssetId)).toNumber(); @@ -824,7 +824,7 @@ describe('Contract', () => { it('should set "gasLimit" and "maxFee" when transferring amounts to contract just fine', async () => { const wallet = await generateTestWallet(provider, [[10_000_000, baseAssetId]]); - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const amountToContract = 5_000; const gasLimit = 80_000; @@ -847,7 +847,7 @@ describe('Contract', () => { it('should ensure gas price and gas limit are validated when transfering to contract', async () => { const wallet = await generateTestWallet(provider, [[1000, baseAssetId]]); - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const amountToContract = 100; @@ -872,7 +872,7 @@ describe('Contract', () => { [200, asset], ]); - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const initialBalance = new BN(await contract.getBalance(asset)).toNumber(); @@ -890,7 +890,7 @@ describe('Contract', () => { it('should tranfer asset to a deployed contract just fine (FROM PREDICATE)', async () => { const wallet = await generateTestWallet(provider, [[1_000_000, baseAssetId]]); - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const initialBalance = new BN(await contract.getBalance(baseAssetId)).toNumber(); @@ -916,7 +916,7 @@ describe('Contract', () => { }); it('should ensure TX revert error can be extracted for dryRun and simulate calls', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const scope = contract.functions.assert_u8(10, 11); @@ -1028,7 +1028,7 @@ describe('Contract', () => { }); it('should throw when using "simulate" with an unfunded wallet', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); contract.account = Wallet.generate({ provider: contract.provider }); @@ -1043,7 +1043,7 @@ describe('Contract', () => { }); it('should throw when using "simulate" without a wallet', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); contract.account = null; await expect( @@ -1057,7 +1057,7 @@ describe('Contract', () => { }); it('should throw when using "simulate" with a locked wallet', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); contract.account = Wallet.fromAddress(getRandomB256()); @@ -1072,7 +1072,7 @@ describe('Contract', () => { }); it('should use "dryRun" with an unfunded wallet just fine', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); contract.account = Wallet.generate({ provider: contract.provider }); @@ -1087,7 +1087,7 @@ describe('Contract', () => { }); it('should ensure "get" does not spend any funds', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const balance = await contract.account?.getBalance(); @@ -1102,7 +1102,7 @@ describe('Contract', () => { }); it('should ensure "get" can be used to execute a contract call without a wallet', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); // contract with no account set const contractToCall = new Contract(contract.id, contract.interface, contract.provider); @@ -1114,7 +1114,7 @@ describe('Contract', () => { }); it('should ensure "get" can be used to execute a contract call with an unfunded wallet', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const unfundedWallet = Wallet.generate({ provider: contract.provider }); @@ -1190,7 +1190,7 @@ describe('Contract', () => { }); it('should ensure "maxFee" and "gasLimit" can be set on a multicall', async () => { - const contract = await setupContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + const contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); const gasLimit = 500_000; const maxFee = 250_000; diff --git a/packages/fuel-gauge/src/coverage-contract.test.ts b/packages/fuel-gauge/src/coverage-contract.test.ts index 1697f16d144..2eaba9b5e51 100644 --- a/packages/fuel-gauge/src/coverage-contract.test.ts +++ b/packages/fuel-gauge/src/coverage-contract.test.ts @@ -13,7 +13,7 @@ import { import { FuelGaugeProjectsEnum } from '../test/fixtures'; -import { setupContract } from './utils'; +import { launchTestContract } from './utils'; const RUST_U8_MAX = 255; const RUST_U16_MAX = 65535; @@ -50,7 +50,7 @@ enum MixedNativeEnum { */ describe('Coverage Contract', () => { it('can return outputs', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); // Call contract methods expect((await contractInstance.functions.get_id().call()).value).toEqual( '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff' @@ -137,7 +137,7 @@ describe('Coverage Contract', () => { }); it('should test u8 variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); // #region U8 const { value } = await contractInstance.functions.echo_u8(3).call(); expect(value).toBe(3); @@ -145,28 +145,28 @@ describe('Coverage Contract', () => { }); it('should test u8 variable type multiple params', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions.echo_u8_addition(3, 4, 3).call(); expect(value).toBe(10); }); it('should test u16 variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions.echo_u16(RUST_U8_MAX + 1).call(); expect(value).toBe(RUST_U8_MAX + 1); }); it('should test u32 variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions.echo_u32(RUST_U16_MAX + 1).call(); expect(value).toBe(RUST_U16_MAX + 1); }); it('should test u64 variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT = bn(RUST_U32_MAX).add(1).toHex(); const { value } = await contractInstance.functions.echo_u64(INPUT).call(); @@ -174,7 +174,7 @@ describe('Coverage Contract', () => { }); it('should test u256 variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT = U256_MAX; const { value } = await contractInstance.functions.echo_u256(INPUT).call(); @@ -182,49 +182,49 @@ describe('Coverage Contract', () => { }); it('should test bool variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions.echo_bool(false).call(); expect(value).toBe(false); }); it('should test b256 variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions.echo_b256(B256).call(); expect(value).toBe(B256); }); it('should test b512 variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions.echo_b512(B512).call(); expect(value).toBe(B512); }); it('should test str[1] variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions.echo_str_1('f').call(); expect(value).toBe('f'); }); it('should test str[2] variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions.echo_str_2('fu').call(); expect(value).toBe('fu'); }); it('should test str[3] variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions.echo_str_3('fue').call(); expect(value).toBe('fue'); }); it('should test str[8] variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions.echo_str_8('fuel-sdk').call(); @@ -232,21 +232,21 @@ describe('Coverage Contract', () => { }); it('should test str[9] variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions.echo_str_9('fuel-sdks').call(); expect(value).toBe('fuel-sdks'); }); it('should test tuple < 8 bytes variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions.echo_tuple_u8([21, 22]).call(); expect(value).toStrictEqual([21, 22]); }); it('should test tuple > 8 bytes variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT = [bn(RUST_U32_MAX).add(1), bn(RUST_U32_MAX).add(2)]; const { value } = await contractInstance.functions.echo_tuple_u64(INPUT).call(); @@ -254,7 +254,7 @@ describe('Coverage Contract', () => { }); it('should test tuple mixed variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT = [true, bn(RUST_U32_MAX).add(1)]; const { value } = await contractInstance.functions.echo_tuple_mixed(INPUT).call(); @@ -262,14 +262,14 @@ describe('Coverage Contract', () => { }); it('should test array < 8 bytes variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions.echo_array_u8([4, 3]).call(); expect(value).toStrictEqual([4, 3]); }); it('should test array > 8 bytes variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT: [number, string, BN, string, string] = [ 11, @@ -285,14 +285,14 @@ describe('Coverage Contract', () => { }); it('should test array bool variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions.echo_array_bool([true, true]).call(); expect(value).toStrictEqual([true, true]); }); it('should test struct < 8 bytes variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT = { i: 4 }; const { value } = await contractInstance.functions.echo_struct_u8(INPUT).call(); @@ -300,7 +300,7 @@ describe('Coverage Contract', () => { }); it('should test struct > 8 bytes variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT = { i: B256 }; const { value } = await contractInstance.functions.echo_struct_b256(INPUT).call(); @@ -308,7 +308,7 @@ describe('Coverage Contract', () => { }); it('should test enum < 8 byte variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT = SmallEnum.Empty; const { value } = await contractInstance.functions.echo_enum_small(INPUT).call(); @@ -316,7 +316,7 @@ describe('Coverage Contract', () => { }); it('should test enum > 8 bytes variable type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT = { AddressB: B256 }; @@ -325,7 +325,7 @@ describe('Coverage Contract', () => { }); it('should test Option type', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT = 187; const { value } = await contractInstance.functions.echo_option_u8(INPUT).call(); @@ -333,7 +333,7 @@ describe('Coverage Contract', () => { }); it('should test Option extraction [Some]', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT_SOME = 123; const { value: Some } = await contractInstance.functions @@ -343,7 +343,7 @@ describe('Coverage Contract', () => { }); it('should test Option extraction [None]', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT_NONE = undefined; const { value: None } = await contractInstance.functions @@ -356,7 +356,7 @@ describe('Coverage Contract', () => { }); it('should test multiple Option params [Some]', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT_A = 1; const INPUT_B = 4; @@ -372,7 +372,7 @@ describe('Coverage Contract', () => { }); it('should test multiple Option params [None]', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT = 1; @@ -384,14 +384,14 @@ describe('Coverage Contract', () => { }); it('should test u8 empty vector input', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions.check_u8_vector([]).call(); expect(value).toBeFalsy(); }); it('should test u8 vector input', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value, logs } = await contractInstance.functions .check_u8_vector([1, 2, 3, 4, 5]) @@ -404,7 +404,7 @@ describe('Coverage Contract', () => { }); it('should echo u8 vector input', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions .echo_u8_vector_first([23, 6, 1, 51, 2]) @@ -414,7 +414,7 @@ describe('Coverage Contract', () => { }); it('should echo a vector of optional u8 input', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions.echo_u8_option_vector_first([28]).call(); @@ -422,7 +422,7 @@ describe('Coverage Contract', () => { }); it('should echo u64 vector input', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT = bn(54).toHex(); const { value } = await contractInstance.functions @@ -432,7 +432,7 @@ describe('Coverage Contract', () => { }); it('should echo u32 vector addition of mixed params', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions .echo_u32_vector_addition_other_type([100, 2], 47) @@ -441,7 +441,7 @@ describe('Coverage Contract', () => { }); it('should echo u32 vector addition', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions .echo_u32_vector_addition([100, 2], [24, 54]) @@ -450,7 +450,7 @@ describe('Coverage Contract', () => { }); it('should echo u32 vector addition [variable lengths]', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions .echo_u32_vector_addition([100, 2, 1, 2, 3], [24, 54]) @@ -459,7 +459,7 @@ describe('Coverage Contract', () => { }); it('should echo struct vector input', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const first = { foo: 1, @@ -608,7 +608,7 @@ describe('Coverage Contract', () => { }); it('should test native enum [Red->Green]', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT: ColorEnumInput = ColorEnumInput.Red; const OUTPUT: ColorEnumOutput = ColorEnumOutput.Green; @@ -618,7 +618,7 @@ describe('Coverage Contract', () => { }); it('should test native enum [Green->Blue]', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT: ColorEnumInput = ColorEnumInput.Green; const OUTPUT: ColorEnumOutput = ColorEnumOutput.Blue; @@ -628,7 +628,7 @@ describe('Coverage Contract', () => { }); it('should test native enum [Blue->Red]', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT: ColorEnumInput = ColorEnumInput.Blue; const OUTPUT: ColorEnumOutput = ColorEnumOutput.Red; @@ -638,7 +638,7 @@ describe('Coverage Contract', () => { }); it('should test mixed native enum [Native->NotNative]', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const input = MixedNativeEnum.Native; const expected = { NotNative: MixedNativeEnum.NotNative }; @@ -648,7 +648,7 @@ describe('Coverage Contract', () => { }); it('should test mixed native enum [NotNative->Native]', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const input = { NotNative: MixedNativeEnum.NotNative }; const expected = 'Native'; @@ -658,7 +658,7 @@ describe('Coverage Contract', () => { }); it('should try vec_as_only_param', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions .vec_as_only_param([100, 450, 202, 340]) @@ -673,7 +673,7 @@ describe('Coverage Contract', () => { }); it('should try u32_and_vec_params', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const { value } = await contractInstance.functions .u32_and_vec_params(33, [450, 202, 340]) @@ -688,7 +688,7 @@ describe('Coverage Contract', () => { }); it('should support vec in vec', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT = [ [0, 1, 2], @@ -701,7 +701,7 @@ describe('Coverage Contract', () => { }); it('should support array in vec', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT = [ [0, 1, 2], @@ -714,7 +714,7 @@ describe('Coverage Contract', () => { }); it('should test b256 multiple params vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT_A = [hexlify(randomBytes(32)), hexlify(randomBytes(32)), hexlify(randomBytes(32))]; const INPUT_B = [hexlify(randomBytes(32)), hexlify(randomBytes(32)), hexlify(randomBytes(32))]; @@ -729,7 +729,7 @@ describe('Coverage Contract', () => { }); it('should handle multiple calls [with vectors]', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT_A = [hexlify(randomBytes(32)), hexlify(randomBytes(32)), hexlify(randomBytes(32))]; const INPUT_B = [hexlify(randomBytes(32))]; @@ -749,7 +749,7 @@ describe('Coverage Contract', () => { }); it('should handle multiple calls [with vectors + stack data first]', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); const INPUT_A = [hexlify(randomBytes(32)), hexlify(randomBytes(32)), hexlify(randomBytes(32))]; const INPUT_B = [hexlify(randomBytes(32))]; diff --git a/packages/fuel-gauge/src/edge-cases.test.ts b/packages/fuel-gauge/src/edge-cases.test.ts index f38a7e863a8..4e436d015de 100644 --- a/packages/fuel-gauge/src/edge-cases.test.ts +++ b/packages/fuel-gauge/src/edge-cases.test.ts @@ -3,7 +3,7 @@ import { FUEL_NETWORK_URL, Provider, TransactionResponse, Wallet } from 'fuels'; import { FuelGaugeProjectsEnum } from '../test/fixtures'; -import { setupContract } from './utils'; +import { launchTestContract } from './utils'; /** * @group node @@ -11,7 +11,7 @@ import { setupContract } from './utils'; */ describe('Edge Cases', () => { it('can run collision_in_fn_names', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.COLLISION_IN_FN_NAMES); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COLLISION_IN_FN_NAMES); expect((await contractInstance.functions.new().call()).value.toNumber()).toEqual(12345); }); diff --git a/packages/fuel-gauge/src/generic-types-contract.test.ts b/packages/fuel-gauge/src/generic-types-contract.test.ts index 036f204b5ec..06b766174f9 100644 --- a/packages/fuel-gauge/src/generic-types-contract.test.ts +++ b/packages/fuel-gauge/src/generic-types-contract.test.ts @@ -2,14 +2,14 @@ import { toHex } from 'fuels'; import { FuelGaugeProjectsEnum } from '../test/fixtures'; -import { setupContract } from './utils'; +import { launchTestContract } from './utils'; /** * @group node * @group browser */ describe('GenericTypesContract', () => { it('should call complex contract function with generic type', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.GENERIC_TYPES_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.GENERIC_TYPES_CONTRACT); const b256 = '0xd5579c46dfcc7f18207013e65b44e4cb4e2c2298f4ac457ba8f82743f31e930b'; const bimArg1 = 'Yes'; diff --git a/packages/fuel-gauge/src/is-function-readonly.test.ts b/packages/fuel-gauge/src/is-function-readonly.test.ts index 6daff109543..c924d58eac9 100644 --- a/packages/fuel-gauge/src/is-function-readonly.test.ts +++ b/packages/fuel-gauge/src/is-function-readonly.test.ts @@ -1,13 +1,13 @@ import { FuelGaugeProjectsEnum } from '../test/fixtures'; -import { setupContract } from './utils'; +import { launchTestContract } from './utils'; /** * @group node */ describe('isReadOnly', () => { test('isReadOnly returns true for a read-only function', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); const isReadOnly = contractInstance.functions.counter.isReadOnly(); @@ -15,7 +15,7 @@ describe('isReadOnly', () => { }); test('isReadOnly returns false for a function containing write operations', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); const isReadOnly = contractInstance.functions.increment_counter.isReadOnly(); @@ -23,7 +23,7 @@ describe('isReadOnly', () => { }); test('isReadOnly does not throw a runtime error for a function that does not use storage', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); const isReadOnly = contractInstance.functions.return_true.isReadOnly(); diff --git a/packages/fuel-gauge/src/options.test.ts b/packages/fuel-gauge/src/options.test.ts index 00e63ba9199..4b1c5680064 100644 --- a/packages/fuel-gauge/src/options.test.ts +++ b/packages/fuel-gauge/src/options.test.ts @@ -3,7 +3,7 @@ import type { WalletUnlocked } from 'fuels'; import { FuelGaugeProjectsEnum } from '../test/fixtures'; -import { setupContract } from './utils'; +import { launchTestContract } from './utils'; const U8_MAX = 255; const U16_MAX = 65535; @@ -12,7 +12,7 @@ const U32_MAX = 4294967295; let wallet: WalletUnlocked; beforeAll(async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); wallet = await generateTestWallet(contractInstance.provider, [ [200_000, contractInstance.provider.getBaseAssetId()], ]); @@ -24,7 +24,7 @@ beforeAll(async () => { */ describe('Options Tests', () => { it('calls', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); const { value } = await contractInstance.functions.print_enum_option_array().call(); expect(value).toStrictEqual({ @@ -47,7 +47,7 @@ describe('Options Tests', () => { const someInput = U8_MAX; const noneInput = undefined; - using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); const { value: someValue } = await contractInstance.functions.echo_option(someInput).call(); @@ -66,7 +66,7 @@ describe('Options Tests', () => { two: U32_MAX, }; - using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); const { value: someValue } = await contractInstance.functions .echo_struct_enum_option(someInput) @@ -91,7 +91,7 @@ describe('Options Tests', () => { it('echos vec option', async () => { const someInput = [U8_MAX, U16_MAX, U32_MAX]; - using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); const { value: someValue } = await contractInstance.functions.echo_vec_option(someInput).call(); @@ -115,7 +115,7 @@ describe('Options Tests', () => { it('echos tuple option', async () => { const someInput = [U8_MAX, U16_MAX]; - using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); const { value: someValue } = await contractInstance.functions .echo_tuple_option(someInput) @@ -143,7 +143,7 @@ describe('Options Tests', () => { it('echoes enum option', async () => { const someInput = { a: U8_MAX }; - using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); const { value: someValue } = await contractInstance.functions .echo_enum_option(someInput) @@ -163,7 +163,7 @@ describe('Options Tests', () => { it('echos array option', async () => { const someInput = [U8_MAX, U16_MAX, 123]; - using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); const { value: someValue } = await contractInstance.functions .echo_array_option(someInput) @@ -195,7 +195,7 @@ describe('Options Tests', () => { }, }; - using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); const { value } = await contractInstance.functions.echo_deeply_nested_option(input).call(); @@ -203,7 +203,7 @@ describe('Options Tests', () => { }); it('prints struct option', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); const { value } = await contractInstance.functions .get_some_struct({ Address: { bits: wallet.address.toB256() } }) @@ -213,7 +213,7 @@ describe('Options Tests', () => { }); it('echoes option enum diff sizes', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); const { value } = await contractInstance.functions.echo_enum_diff_sizes(undefined).call(); diff --git a/packages/fuel-gauge/src/payable-annotation.test.ts b/packages/fuel-gauge/src/payable-annotation.test.ts index 730cd8402a3..c7f4d3dd9a5 100644 --- a/packages/fuel-gauge/src/payable-annotation.test.ts +++ b/packages/fuel-gauge/src/payable-annotation.test.ts @@ -2,7 +2,7 @@ import { bn } from 'fuels'; import { FuelGaugeProjectsEnum } from '../test/fixtures'; -import { setupContract } from './utils'; +import { launchTestContract } from './utils'; beforeAll(() => {}); @@ -11,7 +11,7 @@ beforeAll(() => {}); * @group browser */ test('allow sending coins to payable functions', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); + using contract = await launchTestContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); const baseAssetId = contract.provider.getBaseAssetId(); // This should not fail because the function is payable @@ -29,7 +29,7 @@ test('allow sending coins to payable functions', async () => { }); test("don't allow sending coins to non-payable functions", async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); + using contract = await launchTestContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); const baseAssetId = contract.provider.getBaseAssetId(); // This should fail because the function is not payable diff --git a/packages/fuel-gauge/src/policies.test.ts b/packages/fuel-gauge/src/policies.test.ts index 3ae9f0dad2f..75544776989 100644 --- a/packages/fuel-gauge/src/policies.test.ts +++ b/packages/fuel-gauge/src/policies.test.ts @@ -13,8 +13,10 @@ import { } from 'fuels'; import { getFuelGaugeForcProject, FuelGaugeProjectsEnum } from '../test/fixtures'; +import { PayableAnnotationAbi__factory } from '../test/typegen/contracts'; +import PayableAnnotationAbiHex from '../test/typegen/contracts/PayableAnnotationAbi.hex'; -import { setupContract } from './utils'; +import { launchTestContract } from './utils'; /** * @group node * @group browser @@ -193,7 +195,10 @@ describe('Policies', () => { }); it('should ensure TX policies are properly set (BaseInvocationScope)', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); + using contract = await launchTestContract({ + deployer: PayableAnnotationAbi__factory, + bytecode: PayableAnnotationAbiHex, + }); const callScope = contract.functions.payable().txParams({ tip: 5, @@ -265,7 +270,7 @@ describe('Policies', () => { }); it('should ensure TX policies are properly set (Account Contract Transfer)', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); + using contract = await launchTestContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); const txParams: CustomTxParams = { tip: 1, @@ -318,7 +323,7 @@ describe('Policies', () => { }); it('on account transferring to contract', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); + using contract = await launchTestContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); const maxFee = 1; @@ -371,7 +376,7 @@ describe('Policies', () => { }); it('on a contract call', async () => { - using contract = await setupContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); + using contract = await launchTestContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); const maxFee = 1; diff --git a/packages/fuel-gauge/src/predicate/utils/predicate/index.ts b/packages/fuel-gauge/src/predicate/utils/predicate/index.ts index f0e0ebd8a70..fe2454c2c87 100644 --- a/packages/fuel-gauge/src/predicate/utils/predicate/index.ts +++ b/packages/fuel-gauge/src/predicate/utils/predicate/index.ts @@ -1,5 +1,5 @@ export * from './assertBalance'; export * from './assertBalances'; export * from './fundPredicate'; -export * from './setupContract'; +export * from './launchTestContract'; export * from './setupWallets'; diff --git a/packages/fuel-gauge/src/predicate/utils/predicate/setupContract.ts b/packages/fuel-gauge/src/predicate/utils/predicate/setupContract.ts index bf768aa4911..b07db0d8e7d 100644 --- a/packages/fuel-gauge/src/predicate/utils/predicate/setupContract.ts +++ b/packages/fuel-gauge/src/predicate/utils/predicate/setupContract.ts @@ -45,7 +45,7 @@ export const setup = async ({ contractBytecode, abi, cache }: SetupConfig) => { return contract; }; -export const setupContractWithConfig = +export const launchTestContractWithConfig = (defaultConfig: SetupConfig) => async (config?: Partial) => setup({ contractBytecode: defaultConfig.contractBytecode, diff --git a/packages/fuel-gauge/src/raw-slice.test.ts b/packages/fuel-gauge/src/raw-slice.test.ts index b16f0824335..d1db6fe0c90 100644 --- a/packages/fuel-gauge/src/raw-slice.test.ts +++ b/packages/fuel-gauge/src/raw-slice.test.ts @@ -4,7 +4,7 @@ import type { BN } from 'fuels'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; -import { getScript, setupContract } from './utils'; +import { getScript, launchTestContract } from './utils'; type SomeEnum = { First?: boolean; @@ -28,7 +28,7 @@ const setup = async (balance = 500_000) => { let baseAssetId: string; beforeAll(async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.RAW_SLICE); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.RAW_SLICE); baseAssetId = contractInstance.provider.getBaseAssetId(); }); @@ -38,7 +38,7 @@ beforeAll(async () => { */ describe('Raw Slice Tests', () => { it('should test raw slice output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.RAW_SLICE); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.RAW_SLICE); const INPUT = 10; @@ -48,7 +48,7 @@ describe('Raw Slice Tests', () => { }); it('should test raw slice input', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.RAW_SLICE); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.RAW_SLICE); const INPUT = [40, 41, 42]; @@ -58,7 +58,7 @@ describe('Raw Slice Tests', () => { }); it('should test raw slice input [nested]', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.RAW_SLICE); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.RAW_SLICE); const slice = [40, 41, 42]; const INPUT = { diff --git a/packages/fuel-gauge/src/std-lib-string.test.ts b/packages/fuel-gauge/src/std-lib-string.test.ts index 4efb8ec55d1..9a6219c2288 100644 --- a/packages/fuel-gauge/src/std-lib-string.test.ts +++ b/packages/fuel-gauge/src/std-lib-string.test.ts @@ -4,11 +4,11 @@ import type { Contract } from 'fuels'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; -import { getScript, setupContract } from './utils'; +import { getScript, launchTestContract } from './utils'; let baseAssetId: string; beforeAll(async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.STD_LIB_STRING); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.STD_LIB_STRING); baseAssetId = contractInstance.provider.getBaseAssetId(); }); @@ -30,13 +30,13 @@ describe('std-lib-string Tests', () => { getFuelGaugeForcProject(FuelGaugeProjectsEnum.PREDICATE_STD_LIB_STRING); it('should test std-lib-string return', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.STD_LIB_STRING); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.STD_LIB_STRING); const { value } = await contractInstance.functions.return_dynamic_string().call(); expect(value).toBe('Hello World'); }); it('should test std-lib-string input', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.STD_LIB_STRING); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.STD_LIB_STRING); const INPUT = 'Hello World'; const { value } = await contractInstance.functions.accepts_dynamic_string(INPUT).call(); diff --git a/packages/fuel-gauge/src/transaction-summary.test.ts b/packages/fuel-gauge/src/transaction-summary.test.ts index 7b85d97e729..db02384ba1c 100644 --- a/packages/fuel-gauge/src/transaction-summary.test.ts +++ b/packages/fuel-gauge/src/transaction-summary.test.ts @@ -24,7 +24,7 @@ import { import { FuelGaugeProjectsEnum } from '../test/fixtures'; -import { setupContract } from './utils'; +import { launchTestContract } from './utils'; /** * @group node @@ -230,7 +230,7 @@ describe('TransactionSummary', () => { [10_000, ASSET_A], ]); - using contract1 = await setupContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); + using contract1 = await launchTestContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); const amount = 234; @@ -252,7 +252,7 @@ describe('TransactionSummary', () => { it('should ensure transfer operation is assembled (CONTRACT TRANSFER TO ACCOUNT)', async () => { const wallet = await generateTestWallet(provider, [[300_000, baseAssetId]]); - using contract = await setupContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); + using contract = await launchTestContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); contract.account = wallet; const recipient = Wallet.generate({ provider }); @@ -286,7 +286,7 @@ describe('TransactionSummary', () => { [50_000, ASSET_B], ]); - using senderContract = await setupContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); + using senderContract = await launchTestContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); senderContract.account = wallet; const fundAmount = 5_000; @@ -343,10 +343,10 @@ describe('TransactionSummary', () => { it('should ensure transfer operation is assembled (CONTRACT TRANSFER TO CONTRACT)', async () => { const wallet = await generateTestWallet(provider, [[300_000, baseAssetId]]); - using contractSender = await setupContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); + using contractSender = await launchTestContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); contractSender.account = wallet; - using contractRecipient = await setupContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); + using contractRecipient = await launchTestContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); const { transactionResult: { mintedAssets }, } = await contractSender.functions.mint_coins(100000).call(); @@ -379,7 +379,7 @@ describe('TransactionSummary', () => { [60_000, ASSET_B], ]); - using senderContract = await setupContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); + using senderContract = await launchTestContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); senderContract.account = wallet; const fundAmount = 5_000; @@ -389,8 +389,8 @@ describe('TransactionSummary', () => { await tx.waitForResult(); } - using contractRecipient1 = await setupContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); - using contractRecipient2 = await setupContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); + using contractRecipient1 = await launchTestContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); + using contractRecipient2 = await launchTestContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); const transferData1 = { address: contractRecipient1.id, diff --git a/packages/fuel-gauge/src/utils.ts b/packages/fuel-gauge/src/utils.ts index 0b90417930a..28a986db81f 100644 --- a/packages/fuel-gauge/src/utils.ts +++ b/packages/fuel-gauge/src/utils.ts @@ -2,48 +2,11 @@ import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { ASSET_A } from '@fuel-ts/utils/test-utils'; import { readFileSync } from 'fs'; import { Script, Provider, FUEL_NETWORK_URL } from 'fuels'; -import type { Interface, WalletUnlocked, JsonAbi, BytesLike, Contract } from 'fuels'; +import type { Interface, WalletUnlocked, JsonAbi, BytesLike } from 'fuels'; +import type { DeployContractConfig } from 'fuels/test-utils'; import { launchTestNode } from 'fuels/test-utils'; import { join } from 'path'; -import { FuelGaugeProjectsEnum } from '../test/fixtures'; -import { - AuthTestingContractAbi__factory, - AdvancedLoggingAbi__factory, - AdvancedLoggingOtherContractAbi__factory, - BytecodeSwayLibAbi__factory, - CallTestContractAbi__factory, - ConfigurableContractAbi__factory, - CoverageContractAbi__factory, - PayableAnnotationAbi__factory, - BytesAbi__factory, - CollisionInFnNamesAbi__factory, - OptionsAbi__factory, - StdLibStringAbi__factory, - StorageTestContractAbi__factory, - RawSliceAbi__factory, - MultiTokenContractAbi__factory, - VectorTypesContractAbi__factory, - VectorsAbi__factory, -} from '../test/typegen/contracts'; -import advancedLoggingBytecode from '../test/typegen/contracts/AdvancedLoggingAbi.hex'; -import advancedLoggingOtherContractBytecode from '../test/typegen/contracts/AdvancedLoggingOtherContractAbi.hex'; -import authTestingBytecode from '../test/typegen/contracts/AuthTestingContractAbi.hex'; -import bytecodeSwayLibBytecode from '../test/typegen/contracts/BytecodeSwayLibAbi.hex'; -import bytesBytecode from '../test/typegen/contracts/BytesAbi.hex'; -import callTestBytecode from '../test/typegen/contracts/CallTestContractAbi.hex'; -import collisionInFnNamesBytecode from '../test/typegen/contracts/CollisionInFnNamesAbi.hex'; -import configurableContractBytecode from '../test/typegen/contracts/ConfigurableContractAbi.hex'; -import coverageContractBytecode from '../test/typegen/contracts/CoverageContractAbi.hex'; -import multiTokenContractBytecode from '../test/typegen/contracts/MultiTokenContractAbi.hex'; -import optionsBytecode from '../test/typegen/contracts/OptionsAbi.hex'; -import payableAnnotationBytecode from '../test/typegen/contracts/PayableAnnotationAbi.hex'; -import rawSliceBytecode from '../test/typegen/contracts/RawSliceAbi.hex'; -import stdLibStringBytecode from '../test/typegen/contracts/StdLibStringAbi.hex'; -import storageTestContractBytecode from '../test/typegen/contracts/StorageTestContractAbi.hex'; -import vectorTypesContractBytecode from '../test/typegen/contracts/VectorTypesContractAbi.hex'; -import vectorsBytecode from '../test/typegen/contracts/VectorsAbi.hex'; - let walletInstance: WalletUnlocked; export const createWallet = async () => { if (walletInstance) { @@ -86,114 +49,12 @@ export const getScript = ( export const getProgramDir = (name: string) => join(__dirname, `../test/fixtures/forc-projects/${name}`); -export interface DisposableContract extends Contract { - [Symbol.dispose]: () => Promise; -} - -export async function setupContract(type: FuelGaugeProjectsEnum): Promise { - let deployer; - let bytecode: string; - - switch (type) { - case FuelGaugeProjectsEnum.ADVANCED_LOGGING: - deployer = AdvancedLoggingAbi__factory; - bytecode = advancedLoggingBytecode; - break; - - case FuelGaugeProjectsEnum.AUTH_TESTING_CONTRACT: - deployer = AuthTestingContractAbi__factory; - bytecode = authTestingBytecode; - break; - - case FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT: - deployer = AdvancedLoggingOtherContractAbi__factory; - bytecode = advancedLoggingOtherContractBytecode; - break; - - case FuelGaugeProjectsEnum.BYTES: - deployer = BytesAbi__factory; - bytecode = bytesBytecode; - break; - - case FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB: - deployer = BytecodeSwayLibAbi__factory; - bytecode = bytecodeSwayLibBytecode; - break; - - case FuelGaugeProjectsEnum.CALL_TEST_CONTRACT: - deployer = CallTestContractAbi__factory; - bytecode = callTestBytecode; - break; - - case FuelGaugeProjectsEnum.COLLISION_IN_FN_NAMES: - deployer = CollisionInFnNamesAbi__factory; - bytecode = collisionInFnNamesBytecode; - break; - - case FuelGaugeProjectsEnum.CONFIGURABLE_CONTRACT: - deployer = ConfigurableContractAbi__factory; - bytecode = configurableContractBytecode; - break; - - case FuelGaugeProjectsEnum.COVERAGE_CONTRACT: - deployer = CoverageContractAbi__factory; - bytecode = coverageContractBytecode; - break; - - case FuelGaugeProjectsEnum.MULTI_TOKEN_CONTRACT: - deployer = MultiTokenContractAbi__factory; - bytecode = multiTokenContractBytecode; - break; - - case FuelGaugeProjectsEnum.OPTIONS: - deployer = OptionsAbi__factory; - bytecode = optionsBytecode; - break; - - case FuelGaugeProjectsEnum.PAYABLE_ANNOTATION: - deployer = PayableAnnotationAbi__factory; - bytecode = payableAnnotationBytecode; - break; - - case FuelGaugeProjectsEnum.RAW_SLICE: - deployer = RawSliceAbi__factory; - bytecode = rawSliceBytecode; - break; - - case FuelGaugeProjectsEnum.STD_LIB_STRING: - deployer = StdLibStringAbi__factory; - bytecode = stdLibStringBytecode; - break; - - case FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT: - deployer = StorageTestContractAbi__factory; - bytecode = storageTestContractBytecode; - break; - - case FuelGaugeProjectsEnum.VECTORS: - deployer = VectorsAbi__factory; - bytecode = vectorsBytecode; - break; - - case FuelGaugeProjectsEnum.VECTOR_TYPES_CONTRACT: - deployer = VectorTypesContractAbi__factory; - bytecode = vectorTypesContractBytecode; - break; - - default: - throw new Error('Invalid contract type'); - } - +export async function launchTestContract(config: T) { const { contracts: [contract], cleanup, } = await launchTestNode({ - contractsConfigs: [ - { - deployer, - bytecode, - }, - ], + contractsConfigs: [config], }); return Object.assign(contract, { [Symbol.dispose]: () => Promise.resolve(cleanup()) }); } diff --git a/packages/fuel-gauge/src/vector-types.test.ts b/packages/fuel-gauge/src/vector-types.test.ts index 1864350180e..65380f0a7a2 100644 --- a/packages/fuel-gauge/src/vector-types.test.ts +++ b/packages/fuel-gauge/src/vector-types.test.ts @@ -4,7 +4,7 @@ import { bn, Predicate, Wallet, Address, Provider, FUEL_NETWORK_URL } from 'fuel import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; -import { getScript, setupContract } from './utils'; +import { getScript, launchTestContract } from './utils'; const U32_VEC = [0, 1, 2]; const VEC_IN_VEC = [ @@ -100,7 +100,7 @@ describe('Vector Types Validation', () => { }); it('can use supported vector types [vector-types-contract]', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTOR_TYPES_CONTRACT); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTOR_TYPES_CONTRACT); const { value } = await contractInstance.functions .test_all( diff --git a/packages/fuel-gauge/src/vectors.test.ts b/packages/fuel-gauge/src/vectors.test.ts index 63326d7b8aa..913876d745a 100644 --- a/packages/fuel-gauge/src/vectors.test.ts +++ b/packages/fuel-gauge/src/vectors.test.ts @@ -3,7 +3,7 @@ import type { BN } from 'fuels'; import { FuelGaugeProjectsEnum } from '../test/fixtures'; -import { setupContract } from './utils'; +import { launchTestContract } from './utils'; const toNumbers = (nums: BN[]) => nums.map((num: BN) => bn(num).toNumber()); @@ -17,7 +17,7 @@ enum SmallEnum { */ describe('Vector Tests', () => { it('should test u8 vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [8, 6, 7, 5, 3, 0, 9]; const { value } = await contractInstance.functions.echo_u8(INPUT).call(); @@ -26,7 +26,7 @@ describe('Vector Tests', () => { }); it('should test u16 vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [8, 6, 7, 5, 3, 0, 9]; const { value } = await contractInstance.functions.echo_u16(INPUT).call(); @@ -35,7 +35,7 @@ describe('Vector Tests', () => { }); it('should test u32 vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [8, 6, 7, 5, 3, 0, 9]; @@ -45,7 +45,7 @@ describe('Vector Tests', () => { }); it('should test u64 vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [8, 6, 7, 5, 3, 0, 9]; @@ -55,7 +55,7 @@ describe('Vector Tests', () => { }); it('should test bool vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [true, false, true, true]; @@ -65,7 +65,7 @@ describe('Vector Tests', () => { }); it('should test b256 vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [hexlify(randomBytes(32)), hexlify(randomBytes(32)), hexlify(randomBytes(32))]; @@ -75,7 +75,7 @@ describe('Vector Tests', () => { }); it('should test b512 vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [hexlify(randomBytes(64)), hexlify(randomBytes(64)), hexlify(randomBytes(64))]; @@ -85,7 +85,7 @@ describe('Vector Tests', () => { }); it('should test str[1] vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = ['a', 'b', 'c', 'd']; @@ -95,7 +95,7 @@ describe('Vector Tests', () => { }); it('should test str[9] vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = ['123456789', 'abcdefghi', 'catdogcat', 'onetwoone']; @@ -105,7 +105,7 @@ describe('Vector Tests', () => { }); it('should test (u8, u8) vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [ [1, 2], @@ -119,7 +119,7 @@ describe('Vector Tests', () => { }); it('should test (u64, u64) vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [ [111, 2222], @@ -133,7 +133,7 @@ describe('Vector Tests', () => { }); it('should test [u8; 2] vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [ [1, 2], @@ -146,7 +146,7 @@ describe('Vector Tests', () => { }); it('should test [u64; 5] vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [ [1, 2, 3, 4, 5], @@ -160,7 +160,7 @@ describe('Vector Tests', () => { }); it('should test [bool; 2] vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [ [true, true], @@ -176,7 +176,7 @@ describe('Vector Tests', () => { }); it('should test U8Struct vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [ { @@ -196,7 +196,7 @@ describe('Vector Tests', () => { }); it('should test B256Struct vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [ { @@ -216,7 +216,7 @@ describe('Vector Tests', () => { }); it('should test ComplexStruct vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); type ComplexStruct = { foo: number; bar: BN; baz: string }; const INPUT = [ @@ -250,7 +250,7 @@ describe('Vector Tests', () => { }); it('should test SmallEnum vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [ SmallEnum.Empty, @@ -266,7 +266,7 @@ describe('Vector Tests', () => { }); it('should test BigEnum vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [ { @@ -286,7 +286,7 @@ describe('Vector Tests', () => { }); it('should test Option vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [undefined, 1, undefined, 2, undefined, 3]; @@ -296,7 +296,7 @@ describe('Vector Tests', () => { }); it('should test Vec inside struct input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = { num: 2, @@ -309,7 +309,7 @@ describe('Vector Tests', () => { }); it('should test Vec inside enum input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = { vec: [1, 5, 98], @@ -321,7 +321,7 @@ describe('Vector Tests', () => { }); it('should test Vec inside vector input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [[1, 5, 98], [2, 44], [34]]; @@ -331,7 +331,7 @@ describe('Vector Tests', () => { }); it('should test struct and Vec input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); type Struct = { foo: number; bar: BN; baz: string }; const INPUT: [Struct, number[]] = [ @@ -354,7 +354,7 @@ describe('Vector Tests', () => { }); it('should test Vec and b256 tuple input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [[1, 8, 3, 2, 55, 215], hexlify(randomBytes(32))]; @@ -364,7 +364,7 @@ describe('Vector Tests', () => { }); it('should test two vectors tuple input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [ [219, 229], @@ -377,7 +377,7 @@ describe('Vector Tests', () => { }); it('should test u32 and three different vectors tuple input/output', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const INPUT = [91000, [true, true, false], [95000, 153333], [20000, 65500]]; @@ -387,7 +387,7 @@ describe('Vector Tests', () => { }); it('should test multiCall vectors', async () => { - using contractInstance = await setupContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); const { value: results } = await contractInstance .multiCall([ From 7da953cb71418eb0a7d3f53f6b8850f23d347ac3 Mon Sep 17 00:00:00 2001 From: chad Date: Mon, 24 Jun 2024 21:25:51 -0500 Subject: [PATCH 17/53] fix: adjust advanced logging to use new pattern --- .../fuel-gauge/src/advanced-logging.test.ts | 199 ++++++++++++------ 1 file changed, 133 insertions(+), 66 deletions(-) diff --git a/packages/fuel-gauge/src/advanced-logging.test.ts b/packages/fuel-gauge/src/advanced-logging.test.ts index 93a03d5888e..dda6a2de523 100644 --- a/packages/fuel-gauge/src/advanced-logging.test.ts +++ b/packages/fuel-gauge/src/advanced-logging.test.ts @@ -1,36 +1,42 @@ import { generateTestWallet } from '@fuel-ts/account/test-utils'; import type { FuelError } from '@fuel-ts/errors'; -import type { Provider, WalletUnlocked } from 'fuels'; +import type { WalletUnlocked } from 'fuels'; import { Script, bn } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import type { + AdvancedLoggingAbi, + AdvancedLoggingOtherContractAbi, + CallTestContractAbi, + ConfigurableContractAbi, + CoverageContractAbi, +} from '../test/typegen/contracts'; +import { + AdvancedLoggingAbi__factory, + AdvancedLoggingOtherContractAbi__factory, + CallTestContractAbi__factory, + ConfigurableContractAbi__factory, + CoverageContractAbi__factory, +} from '../test/typegen/contracts'; +import AdvancedLoggingAbiHex from '../test/typegen/contracts/AdvancedLoggingAbi.hex'; +import AdvancedLoggingOtherContractAbiHex from '../test/typegen/contracts/AdvancedLoggingOtherContractAbi.hex'; +import CallTestContractAbiHex from '../test/typegen/contracts/CallTestContractAbi.hex'; +import ConfigurableContractAbiHex from '../test/typegen/contracts/ConfigurableContractAbi.hex'; +import CoverageContractAbiHex from '../test/typegen/contracts/CoverageContractAbi.hex'; import { launchTestContract } from './utils'; -let provider: Provider; -let advancedLogId: string; -let otherLogId: string; -let baseAssetId: string; - -beforeAll(async () => { - using advancedLogContract = await launchTestContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); - using otherAdvancedLogContract = await launchTestContract( - FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT - ); - - provider = advancedLogContract.provider; - advancedLogId = advancedLogContract.id.toB256(); - otherLogId = otherAdvancedLogContract.id.toB256(); - baseAssetId = provider.getBaseAssetId(); -}); - /** * @group node * @group browser */ describe('Advanced Logging', () => { it('can get log data', async () => { - using advancedLogContract = await launchTestContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + using advancedLogContract = await launchTestContract({ + deployer: AdvancedLoggingAbi__factory, + bytecode: AdvancedLoggingAbiHex, + }); const { value, logs } = await advancedLogContract.functions.test_function().call(); @@ -76,7 +82,10 @@ describe('Advanced Logging', () => { }); it('can get log data from require [condition=true]', async () => { - using advancedLogContract = await launchTestContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + using advancedLogContract = await launchTestContract({ + deployer: AdvancedLoggingAbi__factory, + bytecode: AdvancedLoggingAbiHex, + }); const { value, logs } = await advancedLogContract.functions .test_function_with_require(1, 1) @@ -87,7 +96,10 @@ describe('Advanced Logging', () => { }); it('can get log data from require [condition=false]', async () => { - using advancedLogContract = await launchTestContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); + using advancedLogContract = await launchTestContract({ + deployer: AdvancedLoggingAbi__factory, + bytecode: AdvancedLoggingAbiHex, + }); const invocation = advancedLogContract.functions.test_function_with_require(1, 3); try { @@ -118,11 +130,19 @@ describe('Advanced Logging', () => { }); it('can get log data from a downstream Contract', async () => { - // TODO: this test should use the same node - using advancedLogContract = await launchTestContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); - using otherAdvancedLogContract = await launchTestContract( - FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT - ); + using launched = await launchTestNode({ + contractsConfigs: [ + { deployer: AdvancedLoggingAbi__factory, bytecode: AdvancedLoggingAbiHex }, + { + deployer: AdvancedLoggingOtherContractAbi__factory, + bytecode: AdvancedLoggingOtherContractAbiHex, + }, + ], + }); + + // #TODO: Find a cleaner way to infer these types + const advancedLogContract = launched.contracts[0] as AdvancedLoggingAbi; + const otherAdvancedLogContract = launched.contracts[1] as AdvancedLoggingOtherContractAbi; const INPUT = 3; const { value, logs } = await advancedLogContract.functions @@ -140,11 +160,6 @@ describe('Advanced Logging', () => { }); describe('should properly decode all logs in a multicall with inter-contract calls', async () => { - using callTest = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); - using configurable = await launchTestContract(FuelGaugeProjectsEnum.CONFIGURABLE_CONTRACT); - using coverage = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); - - let wallet: WalletUnlocked; const testStruct = { a: true, b: 100000, @@ -160,20 +175,31 @@ describe('Advanced Logging', () => { 'fuelfuel', ]; - beforeAll(async () => { - wallet = await generateTestWallet(provider, [[500_000, baseAssetId]]); - }); - it('when using InvacationScope', async () => { - using advancedLogContract = await launchTestContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); - using otherAdvancedLogContract = await launchTestContract( - FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT - ); + using launched = await launchTestNode({ + contractsConfigs: [ + { deployer: AdvancedLoggingAbi__factory, bytecode: AdvancedLoggingAbiHex }, + { + deployer: AdvancedLoggingOtherContractAbi__factory, + bytecode: AdvancedLoggingOtherContractAbiHex, + }, + { deployer: CallTestContractAbi__factory, bytecode: CallTestContractAbiHex }, + { deployer: ConfigurableContractAbi__factory, bytecode: ConfigurableContractAbiHex }, + { deployer: CoverageContractAbi__factory, bytecode: CoverageContractAbiHex }, + ], + }); + + // #TODO: Find a cleaner way to infer these types + const advancedLogContract = launched.contracts[0] as AdvancedLoggingAbi; + const otherAdvancedLogContract = launched.contracts[1] as AdvancedLoggingAbi; + const callTest = launched.contracts[2] as CallTestContractAbi; + const configurable = launched.contracts[3] as ConfigurableContractAbi; + const coverage = launched.contracts[4] as CoverageContractAbi; const { logs } = await callTest .multiCall([ advancedLogContract.functions - .test_log_from_other_contract(10, otherLogId) + .test_log_from_other_contract(10, otherAdvancedLogContract.id.toB256()) .addContracts([otherAdvancedLogContract]), callTest.functions.boo(testStruct), configurable.functions.echo_struct(), @@ -187,15 +213,34 @@ describe('Advanced Logging', () => { }); it('when using ScriptTransactionRequest', async () => { - using advancedLogContract = await launchTestContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); - using otherAdvancedLogContract = await launchTestContract( - FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT - ); + using launched = await launchTestNode({ + contractsConfigs: [ + { deployer: AdvancedLoggingAbi__factory, bytecode: AdvancedLoggingAbiHex }, + { + deployer: AdvancedLoggingOtherContractAbi__factory, + bytecode: AdvancedLoggingOtherContractAbiHex, + }, + { deployer: CallTestContractAbi__factory, bytecode: CallTestContractAbiHex }, + { deployer: ConfigurableContractAbi__factory, bytecode: ConfigurableContractAbiHex }, + { deployer: CoverageContractAbi__factory, bytecode: CoverageContractAbiHex }, + ], + }); + + // #TODO: Find a cleaner way to infer these types + const advancedLogContract = launched.contracts[0] as AdvancedLoggingAbi; + const otherAdvancedLogContract = launched.contracts[1] as AdvancedLoggingAbi; + const callTest = launched.contracts[2] as CallTestContractAbi; + const configurable = launched.contracts[3] as ConfigurableContractAbi; + const coverage = launched.contracts[4] as CoverageContractAbi; + + const wallet = await generateTestWallet(launched.provider, [ + [500_000, launched.provider.getBaseAssetId()], + ]); const request = await callTest .multiCall([ advancedLogContract.functions - .test_log_from_other_contract(10, otherLogId) + .test_log_from_other_contract(10, otherAdvancedLogContract.id.toB256()) .addContracts([otherAdvancedLogContract]), callTest.functions.boo(testStruct), configurable.functions.echo_struct(), @@ -203,7 +248,7 @@ describe('Advanced Logging', () => { ]) .getTransactionRequest(); - const txCost = await provider.getTransactionCost(request, { + const txCost = await launched.provider.getTransactionCost(request, { resourcesOwner: wallet, }); @@ -228,15 +273,9 @@ describe('Advanced Logging', () => { }); }); - describe('decode logs from a script set to manually call other contracts', () => { - const { abiContents, binHexlified } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.SCRIPT_CALL_CONTRACT - ); - + describe('decode logs from a script set to manually call other contracts', async () => { const amount = Math.floor(Math.random() * 10) + 1; - let wallet: WalletUnlocked; - const expectedLogs = [ 'Hello from script', 'Hello from main Contract', @@ -245,19 +284,32 @@ describe('Advanced Logging', () => { amount, ]; - beforeAll(async () => { - wallet = await generateTestWallet(provider, [[300_000, baseAssetId]]); - }); + beforeAll(async () => {}); it('when using InvocationScope', async () => { - using advancedLogContract = await launchTestContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); - using otherAdvancedLogContract = await launchTestContract( - FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT - ); + using launched = await launchTestNode({ + contractsConfigs: [ + { deployer: AdvancedLoggingAbi__factory, bytecode: AdvancedLoggingAbiHex }, + { + deployer: AdvancedLoggingOtherContractAbi__factory, + bytecode: AdvancedLoggingOtherContractAbiHex, + }, + ], + }); + + const advancedLogContract = launched.contracts[0] as AdvancedLoggingAbi; + const otherAdvancedLogContract = launched.contracts[1] as AdvancedLoggingAbi; + const wallet = await generateTestWallet(launched.provider, [ + [300_000, launched.provider.getBaseAssetId()], + ]); + + const { abiContents, binHexlified } = getFuelGaugeForcProject( + FuelGaugeProjectsEnum.SCRIPT_CALL_CONTRACT + ); const script = new Script(binHexlified, abiContents, wallet); const { logs } = await script.functions - .main(advancedLogId, otherLogId, amount) + .main(advancedLogContract.id.toB256(), otherAdvancedLogContract.id.toB256(), amount) .addContracts([advancedLogContract, otherAdvancedLogContract]) .call(); @@ -265,19 +317,34 @@ describe('Advanced Logging', () => { }); it('when using ScriptTransactionRequest', async () => { - using advancedLogContract = await launchTestContract(FuelGaugeProjectsEnum.ADVANCED_LOGGING); - using otherAdvancedLogContract = await launchTestContract( - FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT + using launched = await launchTestNode({ + contractsConfigs: [ + { deployer: AdvancedLoggingAbi__factory, bytecode: AdvancedLoggingAbiHex }, + { + deployer: AdvancedLoggingOtherContractAbi__factory, + bytecode: AdvancedLoggingOtherContractAbiHex, + }, + ], + }); + + const advancedLogContract = launched.contracts[0] as AdvancedLoggingAbi; + const otherAdvancedLogContract = launched.contracts[1] as AdvancedLoggingAbi; + + const wallet = await generateTestWallet(launched.provider, [ + [300_000, launched.provider.getBaseAssetId()], + ]); + const { abiContents, binHexlified } = getFuelGaugeForcProject( + FuelGaugeProjectsEnum.SCRIPT_CALL_CONTRACT ); const script = new Script(binHexlified, abiContents, wallet); const request = await script.functions - .main(advancedLogId, otherLogId, amount) + .main(advancedLogContract.id.toB256(), otherAdvancedLogContract.id.toB256(), amount) .addContracts([advancedLogContract, otherAdvancedLogContract]) .getTransactionRequest(); - const txCost = await provider.getTransactionCost(request, { + const txCost = await launched.provider.getTransactionCost(request, { resourcesOwner: wallet, }); From 7b783e3e406b824516a84c07a2c9720600cca9de Mon Sep 17 00:00:00 2001 From: chad Date: Wed, 26 Jun 2024 13:10:50 -0500 Subject: [PATCH 18/53] test: integrate launchTestNode with other tests --- .../fuel-gauge/src/advanced-logging.test.ts | 1 - packages/fuel-gauge/src/auth-testing.test.ts | 38 ++++--- .../fuel-gauge/src/bytecode-sway-lib.test.ts | 32 +++--- packages/fuel-gauge/src/bytes.test.ts | 54 +++++++--- .../fuel-gauge/src/call-test-contract.test.ts | 42 ++++---- .../src/configurable-contract.test.ts | 102 +++++++++++------- 6 files changed, 164 insertions(+), 105 deletions(-) diff --git a/packages/fuel-gauge/src/advanced-logging.test.ts b/packages/fuel-gauge/src/advanced-logging.test.ts index dda6a2de523..21e4e3c98cb 100644 --- a/packages/fuel-gauge/src/advanced-logging.test.ts +++ b/packages/fuel-gauge/src/advanced-logging.test.ts @@ -1,6 +1,5 @@ import { generateTestWallet } from '@fuel-ts/account/test-utils'; import type { FuelError } from '@fuel-ts/errors'; -import type { WalletUnlocked } from 'fuels'; import { Script, bn } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; diff --git a/packages/fuel-gauge/src/auth-testing.test.ts b/packages/fuel-gauge/src/auth-testing.test.ts index 27306b21e7e..25a7702b1a0 100644 --- a/packages/fuel-gauge/src/auth-testing.test.ts +++ b/packages/fuel-gauge/src/auth-testing.test.ts @@ -1,27 +1,21 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; -import type { WalletUnlocked } from 'fuels'; -import { Provider, getRandomB256, FUEL_NETWORK_URL } from 'fuels'; +import { getRandomB256 } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum } from '../test/fixtures'; +import { AuthTestingContractAbi__factory } from '../test/typegen/contracts'; +import AuthTestingAbiHex from '../test/typegen/contracts/AuthTestingContractAbi.hex'; import { launchTestContract } from './utils'; -let wallet: WalletUnlocked; -let baseAssetId: string; - /** * @group node * @group browser */ describe('Auth Testing', () => { - beforeAll(async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - wallet = await generateTestWallet(provider, [[1_000_000, baseAssetId]]); - }); - it('can get is_caller_external', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.AUTH_TESTING_CONTRACT); + using contractInstance = await launchTestContract({ + deployer: AuthTestingContractAbi__factory, + bytecode: AuthTestingAbiHex, + }); const { value } = await contractInstance.functions.is_caller_external().call(); @@ -29,7 +23,16 @@ describe('Auth Testing', () => { }); it('can check_msg_sender [with correct id]', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.AUTH_TESTING_CONTRACT); + using launched = await launchTestNode({ + contractsConfigs: [ + { deployer: AuthTestingContractAbi__factory, bytecode: AuthTestingAbiHex }, + ], + }); + + const { + contracts: [contractInstance], + wallets: [wallet], + } = launched; const { value } = await contractInstance.functions .check_msg_sender({ bits: wallet.address.toB256() }) @@ -39,7 +42,10 @@ describe('Auth Testing', () => { }); it('can check_msg_sender [with incorrect id]', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.AUTH_TESTING_CONTRACT); + using contractInstance = await launchTestContract({ + deployer: AuthTestingContractAbi__factory, + bytecode: AuthTestingAbiHex, + }); await expect( contractInstance.functions.check_msg_sender({ bits: getRandomB256() }).call() diff --git a/packages/fuel-gauge/src/bytecode-sway-lib.test.ts b/packages/fuel-gauge/src/bytecode-sway-lib.test.ts index b097b30c8fc..926c7fa8224 100644 --- a/packages/fuel-gauge/src/bytecode-sway-lib.test.ts +++ b/packages/fuel-gauge/src/bytecode-sway-lib.test.ts @@ -1,24 +1,26 @@ import { FUEL_NETWORK_URL, Predicate, Provider, arrayify } from 'fuels'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; import { defaultPredicateAbi } from '../test/fixtures/abi/predicate'; import { defaultPredicateBytecode } from '../test/fixtures/bytecode/predicate'; +import { BytecodeSwayLibAbi__factory } from '../test/typegen/contracts'; +import BytecodeSwayLibAbiHex from '../test/typegen/contracts/BytecodeSwayLibAbi.hex'; +import CallTestContractAbiHex from '../test/typegen/contracts/CallTestContractAbi.hex'; import { launchTestContract } from './utils'; + /** * @group node * @group browser */ describe('bytecode computations', () => { test('compute_bytecode_root', async () => { - const { binHexlified: bytecodeFromFile } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.CALL_TEST_CONTRACT - ); - - using contract = await launchTestContract(FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB); + using contract = await launchTestContract({ + deployer: BytecodeSwayLibAbi__factory, + bytecode: BytecodeSwayLibAbiHex, + }); const { logs } = await contract.functions - .compute_bytecode_root(arrayify(bytecodeFromFile)) + .compute_bytecode_root(Array.from(arrayify(CallTestContractAbiHex))) .call(); const bytecodeRoot: string = logs[0]; @@ -28,18 +30,17 @@ describe('bytecode computations', () => { }); test('verify_contract_bytecode', async () => { - const { binHexlified: bytecodeFromFile } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB - ); - - using contract = await launchTestContract(FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB); + using contract = await launchTestContract({ + deployer: BytecodeSwayLibAbi__factory, + bytecode: BytecodeSwayLibAbiHex, + }); const { value } = await contract.functions .verify_contract_bytecode( { bits: contract.id.toB256(), }, - Array.from(arrayify(bytecodeFromFile)) + Array.from(arrayify(BytecodeSwayLibAbiHex)) ) .call(); @@ -57,7 +58,10 @@ describe('bytecode computations', () => { const address = predicate.address; - const contract = await launchTestContract(FuelGaugeProjectsEnum.BYTECODE_SWAY_LIB); + const contract = await launchTestContract({ + deployer: BytecodeSwayLibAbi__factory, + bytecode: BytecodeSwayLibAbiHex, + }); const { value } = await contract.functions .compute_predicate_address(Array.from(arrayify(defaultPredicateBytecode))) diff --git a/packages/fuel-gauge/src/bytes.test.ts b/packages/fuel-gauge/src/bytes.test.ts index acd8b3b1cd1..70bbd86c573 100644 --- a/packages/fuel-gauge/src/bytes.test.ts +++ b/packages/fuel-gauge/src/bytes.test.ts @@ -3,6 +3,8 @@ import { bn, Predicate, Wallet, Address, Provider, FUEL_NETWORK_URL } from 'fuel import type { BN } from 'fuels'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { BytesAbi__factory } from '../test/typegen/contracts'; +import BytesAbiHex from '../test/typegen/contracts/BytesAbi.hex'; import { getScript, launchTestContract } from './utils'; @@ -30,14 +32,11 @@ const setup = async (balance = 500_000) => { * @group browser */ describe('Bytes Tests', () => { - let baseAssetId: string; - beforeAll(async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - }); - it('should test bytes output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.BYTES); + using contractInstance = await launchTestContract({ + deployer: BytesAbi__factory, + bytecode: BytesAbiHex, + }); const INPUT = 10; const { value } = await contractInstance.functions.return_bytes(INPUT).call(); @@ -46,7 +45,10 @@ describe('Bytes Tests', () => { }); it('should test bytes output [100 items]', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.BYTES); + using contractInstance = await launchTestContract({ + deployer: BytesAbi__factory, + bytecode: BytesAbiHex, + }); const INPUT = 100; @@ -56,7 +58,10 @@ describe('Bytes Tests', () => { }); it('should test bytes input', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.BYTES); + using contractInstance = await launchTestContract({ + deployer: BytesAbi__factory, + bytecode: BytesAbiHex, + }); const INPUT = [40, 41, 42]; @@ -65,6 +70,10 @@ describe('Bytes Tests', () => { }); it('should test bytes input [nested]', async () => { + using contractInstance = await launchTestContract({ + deployer: BytesAbi__factory, + bytecode: BytesAbiHex, + }); const bytes = [40, 41, 42]; const INPUT: Wrapper = { @@ -77,6 +86,11 @@ describe('Bytes Tests', () => { }); it('should test bytes input [predicate-bytes]', async () => { + using launched = await launchTestContract({ + deployer: BytesAbi__factory, + bytecode: BytesAbiHex, + }); + const wallet = await setup(1_000_000); const receiver = Wallet.fromAddress(Address.fromRandom(), wallet.provider); const amountToPredicate = 500_000; @@ -101,16 +115,26 @@ describe('Bytes Tests', () => { }); // setup predicate - const setupTx = await wallet.transfer(predicate.address, amountToPredicate, baseAssetId, { - gasLimit: 10_000, - }); + const setupTx = await wallet.transfer( + predicate.address, + amountToPredicate, + launched.provider.getBaseAssetId(), + { + gasLimit: 10_000, + } + ); await setupTx.waitForResult(); const initialReceiverBalance = await receiver.getBalance(); - const tx = await predicate.transfer(receiver.address, amountToReceiver, baseAssetId, { - gasLimit: 10_000, - }); + const tx = await predicate.transfer( + receiver.address, + amountToReceiver, + launched.provider.getBaseAssetId(), + { + gasLimit: 10_000, + } + ); const { isStatusSuccess } = await tx.waitForResult(); diff --git a/packages/fuel-gauge/src/call-test-contract.test.ts b/packages/fuel-gauge/src/call-test-contract.test.ts index e47cdfe0540..c807c7d69bb 100644 --- a/packages/fuel-gauge/src/call-test-contract.test.ts +++ b/packages/fuel-gauge/src/call-test-contract.test.ts @@ -1,20 +1,11 @@ import { ASSET_A } from '@fuel-ts/utils/test-utils'; import type { Contract } from 'fuels'; import { BN, bn, toHex } from 'fuels'; -import { launchTestNode } from 'fuels/test-utils'; import { CallTestContractAbi__factory } from '../test/typegen/contracts'; import bytecode from '../test/typegen/contracts/CallTestContractAbi.hex'; -const setupContract = async () => { - const { - contracts: [contract], - cleanup, - } = await launchTestNode({ - contractsConfigs: [{ deployer: CallTestContractAbi__factory, bytecode }], - }); - return Object.assign(contract, { [Symbol.dispose]: cleanup }); -}; +import { launchTestContract } from './utils'; const U64_MAX = bn(2).pow(64).sub(1); @@ -24,7 +15,7 @@ const U64_MAX = bn(2).pow(64).sub(1); */ describe('CallTestContract', () => { it.each([0, 1337, U64_MAX.sub(1)])('can call a contract with u64 (%p)', async (num) => { - using contract = await setupContract(); + using contract = await launchTestContract({ deployer: CallTestContractAbi__factory, bytecode }); const { value } = await contract.functions.foo(num).call(); expect(value.toHex()).toEqual(bn(num).add(1).toHex()); }); @@ -37,14 +28,14 @@ describe('CallTestContract', () => { [{ a: false, b: U64_MAX.sub(1) }], [{ a: true, b: U64_MAX.sub(1) }], ])('can call a contract with structs (%p)', async (struct) => { - using contract = await setupContract(); + using contract = await launchTestContract({ deployer: CallTestContractAbi__factory, bytecode }); const { value } = await contract.functions.boo(struct).call(); expect(value.a).toEqual(!struct.a); expect(value.b.toHex()).toEqual(bn(struct.b).add(1).toHex()); }); it('can call a function with empty arguments', async () => { - using contract = await setupContract(); + using contract = await launchTestContract({ deployer: CallTestContractAbi__factory, bytecode }); const { value: empty } = await contract.functions.empty().call(); expect(empty.toHex()).toEqual(toHex(63)); @@ -62,7 +53,7 @@ describe('CallTestContract', () => { }); it('function with empty return should resolve undefined', async () => { - using contract = await setupContract(); + using contract = await launchTestContract({ deployer: CallTestContractAbi__factory, bytecode }); // Call method with no params but with no result and no value on config const { value } = await contract.functions.return_void().call(); @@ -139,7 +130,10 @@ describe('CallTestContract', () => { async (method, { values, expected }) => { // Type cast to Contract because of the dynamic nature of the test // But the function names are type-constrained to correct Contract's type - using contract = await setupContract(); + using contract = await launchTestContract({ + deployer: CallTestContractAbi__factory, + bytecode, + }); const { value } = await (contract as Contract).functions[method](...values).call(); @@ -152,7 +146,7 @@ describe('CallTestContract', () => { ); it('Forward amount value on contract call', async () => { - using contract = await setupContract(); + using contract = await launchTestContract({ deployer: CallTestContractAbi__factory, bytecode }); const baseAssetId = contract.provider.getBaseAssetId(); const { value } = await contract.functions .return_context_amount() @@ -164,7 +158,7 @@ describe('CallTestContract', () => { }); it('Forward asset_id on contract call', async () => { - using contract = await setupContract(); + using contract = await launchTestContract({ deployer: CallTestContractAbi__factory, bytecode }); const assetId = ASSET_A; const { value } = await contract.functions @@ -177,7 +171,7 @@ describe('CallTestContract', () => { }); it('Forward asset_id on contract simulate call', async () => { - using contract = await setupContract(); + using contract = await launchTestContract({ deployer: CallTestContractAbi__factory, bytecode }); const assetId = ASSET_A; const { value } = await contract.functions @@ -190,7 +184,7 @@ describe('CallTestContract', () => { }); it('can make multiple calls', async () => { - using contract = await setupContract(); + using contract = await launchTestContract({ deployer: CallTestContractAbi__factory, bytecode }); const num = 1337; const numC = 10; @@ -225,14 +219,20 @@ describe('CallTestContract', () => { }); it('Calling a simple contract function does only one dry run', async () => { - using contract = await setupContract(); + using contract = await launchTestContract({ + deployer: CallTestContractAbi__factory, + bytecode, + }); const dryRunSpy = vi.spyOn(contract.provider.operations, 'dryRun'); await contract.functions.no_params().call(); expect(dryRunSpy).toHaveBeenCalledOnce(); }); it('Simulating a simple contract function does two dry runs', async () => { - using contract = await setupContract(); + using contract = await launchTestContract({ + deployer: CallTestContractAbi__factory, + bytecode, + }); const dryRunSpy = vi.spyOn(contract.provider.operations, 'dryRun'); await contract.functions.no_params().simulate(); diff --git a/packages/fuel-gauge/src/configurable-contract.test.ts b/packages/fuel-gauge/src/configurable-contract.test.ts index 793cd764721..0588147664a 100644 --- a/packages/fuel-gauge/src/configurable-contract.test.ts +++ b/packages/fuel-gauge/src/configurable-contract.test.ts @@ -1,8 +1,9 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; -import type { CoinQuantityLike, WalletUnlocked } from 'fuels'; -import { BN, ContractFactory, Provider, getRandomB256, FUEL_NETWORK_URL } from 'fuels'; +import { BN, getRandomB256 } from 'fuels'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { ConfigurableContractAbi__factory } from '../test/typegen/contracts'; +import ConfigurableContractAbiHex from '../test/typegen/contracts/ConfigurableContractAbi.hex'; + +import { launchTestContract } from './utils'; const defaultValues = { U8: 10, @@ -29,30 +30,11 @@ const defaultValues = { * @group node */ describe('Configurable Contract', () => { - let wallet: WalletUnlocked; - let factory: ContractFactory; - let baseAssetId: string; - beforeAll(async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - const quantities: CoinQuantityLike[] = [ - { - amount: 1_000_000, - assetId: baseAssetId, - }, - ]; - - wallet = await generateTestWallet(provider, quantities); - - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.CONFIGURABLE_CONTRACT - ); - - factory = new ContractFactory(binHexlified, abiContents, wallet); - }); - it('should assert default values', async () => { - const contract = await factory.deployContract(); + using contract = await launchTestContract({ + deployer: ConfigurableContractAbi__factory, + bytecode: ConfigurableContractAbiHex, + }); const { value } = await contract.functions.echo_configurables().simulate(); @@ -76,7 +58,11 @@ describe('Configurable Contract', () => { expect(defaultValues.U8).not.toBe(configurableConstants.U8); - const contract = await factory.deployContract({ configurableConstants }); + const contract = await launchTestContract({ + deployer: ConfigurableContractAbi__factory, + bytecode: ConfigurableContractAbiHex, + configurableConstants, + }); const { value } = await contract.functions.echo_u8().simulate(); @@ -90,7 +76,11 @@ describe('Configurable Contract', () => { expect(defaultValues.U16).not.toBe(configurableConstants.U16); - const contract = await factory.deployContract({ configurableConstants }); + const contract = await launchTestContract({ + deployer: ConfigurableContractAbi__factory, + bytecode: ConfigurableContractAbiHex, + configurableConstants, + }); const { value } = await contract.functions.echo_u16().simulate(); @@ -104,7 +94,11 @@ describe('Configurable Contract', () => { expect(defaultValues.U32).not.toBe(configurableConstants.U32); - const contract = await factory.deployContract({ configurableConstants }); + const contract = await launchTestContract({ + deployer: ConfigurableContractAbi__factory, + bytecode: ConfigurableContractAbiHex, + configurableConstants, + }); const { value } = await contract.functions.echo_u32().simulate(); @@ -118,7 +112,11 @@ describe('Configurable Contract', () => { expect(defaultValues.U64).not.toBe(configurableConstants.U64); - const contract = await factory.deployContract({ configurableConstants }); + const contract = await launchTestContract({ + deployer: ConfigurableContractAbi__factory, + bytecode: ConfigurableContractAbiHex, + configurableConstants, + }); const { value } = await contract.functions.echo_u64().simulate(); @@ -132,7 +130,11 @@ describe('Configurable Contract', () => { expect(defaultValues.BOOL).not.toBe(configurableConstants.BOOL); - const contract = await factory.deployContract({ configurableConstants }); + const contract = await launchTestContract({ + deployer: ConfigurableContractAbi__factory, + bytecode: ConfigurableContractAbiHex, + configurableConstants, + }); const { value } = await contract.functions.echo_bool().simulate(); @@ -146,7 +148,11 @@ describe('Configurable Contract', () => { expect(defaultValues.B256).not.toBe(configurableConstants.B256); - const contract = await factory.deployContract({ configurableConstants }); + const contract = await launchTestContract({ + deployer: ConfigurableContractAbi__factory, + bytecode: ConfigurableContractAbiHex, + configurableConstants, + }); const { value } = await contract.functions.echo_b256().simulate(); @@ -160,7 +166,11 @@ describe('Configurable Contract', () => { expect(defaultValues.ENUM).not.toBe(configurableConstants.ENUM); - const contract = await factory.deployContract({ configurableConstants }); + const contract = await launchTestContract({ + deployer: ConfigurableContractAbi__factory, + bytecode: ConfigurableContractAbiHex, + configurableConstants, + }); const { value } = await contract.functions.echo_enum().simulate(); @@ -177,7 +187,11 @@ describe('Configurable Contract', () => { expect(defaultValues.ARRAY).not.toStrictEqual(configurableConstants.ARRAY); - const contract = await factory.deployContract({ configurableConstants }); + const contract = await launchTestContract({ + deployer: ConfigurableContractAbi__factory, + bytecode: ConfigurableContractAbiHex, + configurableConstants, + }); const { value } = await contract.functions.echo_array().simulate(); @@ -191,7 +205,11 @@ describe('Configurable Contract', () => { expect(defaultValues.STR_4).not.toBe(configurableConstants.STR_4); - const contract = await factory.deployContract({ configurableConstants }); + const contract = await launchTestContract({ + deployer: ConfigurableContractAbi__factory, + bytecode: ConfigurableContractAbiHex, + configurableConstants, + }); const { value } = await contract.functions.echo_str4().simulate(); @@ -205,7 +223,11 @@ describe('Configurable Contract', () => { expect(defaultValues.TUPLE).not.toStrictEqual(configurableConstants.TUPLE); - const contract = await factory.deployContract({ configurableConstants }); + const contract = await launchTestContract({ + deployer: ConfigurableContractAbi__factory, + bytecode: ConfigurableContractAbiHex, + configurableConstants, + }); const { value } = await contract.functions.echo_tuple().simulate(); @@ -223,7 +245,11 @@ describe('Configurable Contract', () => { expect(defaultValues.STRUCT_1).not.toStrictEqual(configurableConstants.STRUCT_1); - const contract = await factory.deployContract({ configurableConstants }); + const contract = await launchTestContract({ + deployer: ConfigurableContractAbi__factory, + bytecode: ConfigurableContractAbiHex, + configurableConstants, + }); const { value } = await contract.functions.echo_struct().simulate(); From 7d9b6504335e593bf111fb0872a6e18d414f5f8e Mon Sep 17 00:00:00 2001 From: chad Date: Sat, 29 Jun 2024 18:37:01 -0500 Subject: [PATCH 19/53] refactor: refactor more tests to use launchTestNode --- .../src/configurable-contract.test.ts | 93 ++--- .../fuel-gauge/src/contract-factory.test.ts | 60 ++- packages/fuel-gauge/src/contract.test.ts | 28 +- .../fuel-gauge/src/coverage-contract.test.ts | 143 +++---- packages/fuel-gauge/src/doc-examples.test.ts | 44 +-- packages/fuel-gauge/src/edge-cases.test.ts | 13 +- packages/fuel-gauge/src/fee.test.ts | 162 +++++--- .../src/funding-transaction.test.ts | 128 +++++-- .../src/generic-types-contract.test.ts | 8 +- .../src/is-function-readonly.test.ts | 19 +- packages/fuel-gauge/src/min-gas.test.ts | 355 ++++++++++-------- packages/fuel-gauge/src/options.test.ts | 56 +-- .../fuel-gauge/src/payable-annotation.test.ts | 14 +- packages/fuel-gauge/src/policies.test.ts | 53 ++- .../src/predicate-conditional-inputs.test.ts | 41 +- packages/fuel-gauge/src/raw-slice.test.ts | 75 ++-- .../src/reentrant-contract-calls.test.ts | 77 ++-- packages/fuel-gauge/src/revert-error.test.ts | 61 +-- .../fuel-gauge/src/script-main-args.test.ts | 50 ++- 19 files changed, 837 insertions(+), 643 deletions(-) diff --git a/packages/fuel-gauge/src/configurable-contract.test.ts b/packages/fuel-gauge/src/configurable-contract.test.ts index 0588147664a..6b665359a21 100644 --- a/packages/fuel-gauge/src/configurable-contract.test.ts +++ b/packages/fuel-gauge/src/configurable-contract.test.ts @@ -1,10 +1,9 @@ import { BN, getRandomB256 } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; import { ConfigurableContractAbi__factory } from '../test/typegen/contracts'; import ConfigurableContractAbiHex from '../test/typegen/contracts/ConfigurableContractAbi.hex'; -import { launchTestContract } from './utils'; - const defaultValues = { U8: 10, U16: 301, @@ -26,15 +25,31 @@ const defaultValues = { }, }; +async function setupContract(configurableConstants?: { [name: string]: unknown }) { + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: ConfigurableContractAbi__factory, + bytecode: ConfigurableContractAbiHex, + options: { configurableConstants }, + }, + ], + }); + + const { + contracts: [contract], + } = launched; + + return contract; +} + /** * @group node + * @group browser */ describe('Configurable Contract', () => { it('should assert default values', async () => { - using contract = await launchTestContract({ - deployer: ConfigurableContractAbi__factory, - bytecode: ConfigurableContractAbiHex, - }); + const contract = await setupContract(); const { value } = await contract.functions.echo_configurables().simulate(); @@ -58,11 +73,7 @@ describe('Configurable Contract', () => { expect(defaultValues.U8).not.toBe(configurableConstants.U8); - const contract = await launchTestContract({ - deployer: ConfigurableContractAbi__factory, - bytecode: ConfigurableContractAbiHex, - configurableConstants, - }); + const contract = await setupContract(configurableConstants); const { value } = await contract.functions.echo_u8().simulate(); @@ -76,11 +87,7 @@ describe('Configurable Contract', () => { expect(defaultValues.U16).not.toBe(configurableConstants.U16); - const contract = await launchTestContract({ - deployer: ConfigurableContractAbi__factory, - bytecode: ConfigurableContractAbiHex, - configurableConstants, - }); + const contract = await setupContract(configurableConstants); const { value } = await contract.functions.echo_u16().simulate(); @@ -94,11 +101,7 @@ describe('Configurable Contract', () => { expect(defaultValues.U32).not.toBe(configurableConstants.U32); - const contract = await launchTestContract({ - deployer: ConfigurableContractAbi__factory, - bytecode: ConfigurableContractAbiHex, - configurableConstants, - }); + const contract = await setupContract(configurableConstants); const { value } = await contract.functions.echo_u32().simulate(); @@ -112,11 +115,7 @@ describe('Configurable Contract', () => { expect(defaultValues.U64).not.toBe(configurableConstants.U64); - const contract = await launchTestContract({ - deployer: ConfigurableContractAbi__factory, - bytecode: ConfigurableContractAbiHex, - configurableConstants, - }); + const contract = await setupContract(configurableConstants); const { value } = await contract.functions.echo_u64().simulate(); @@ -130,11 +129,7 @@ describe('Configurable Contract', () => { expect(defaultValues.BOOL).not.toBe(configurableConstants.BOOL); - const contract = await launchTestContract({ - deployer: ConfigurableContractAbi__factory, - bytecode: ConfigurableContractAbiHex, - configurableConstants, - }); + const contract = await setupContract(configurableConstants); const { value } = await contract.functions.echo_bool().simulate(); @@ -148,11 +143,7 @@ describe('Configurable Contract', () => { expect(defaultValues.B256).not.toBe(configurableConstants.B256); - const contract = await launchTestContract({ - deployer: ConfigurableContractAbi__factory, - bytecode: ConfigurableContractAbiHex, - configurableConstants, - }); + const contract = await setupContract(configurableConstants); const { value } = await contract.functions.echo_b256().simulate(); @@ -166,11 +157,7 @@ describe('Configurable Contract', () => { expect(defaultValues.ENUM).not.toBe(configurableConstants.ENUM); - const contract = await launchTestContract({ - deployer: ConfigurableContractAbi__factory, - bytecode: ConfigurableContractAbiHex, - configurableConstants, - }); + const contract = await setupContract(configurableConstants); const { value } = await contract.functions.echo_enum().simulate(); @@ -187,11 +174,7 @@ describe('Configurable Contract', () => { expect(defaultValues.ARRAY).not.toStrictEqual(configurableConstants.ARRAY); - const contract = await launchTestContract({ - deployer: ConfigurableContractAbi__factory, - bytecode: ConfigurableContractAbiHex, - configurableConstants, - }); + const contract = await setupContract(configurableConstants); const { value } = await contract.functions.echo_array().simulate(); @@ -205,11 +188,7 @@ describe('Configurable Contract', () => { expect(defaultValues.STR_4).not.toBe(configurableConstants.STR_4); - const contract = await launchTestContract({ - deployer: ConfigurableContractAbi__factory, - bytecode: ConfigurableContractAbiHex, - configurableConstants, - }); + const contract = await setupContract(configurableConstants); const { value } = await contract.functions.echo_str4().simulate(); @@ -223,11 +202,7 @@ describe('Configurable Contract', () => { expect(defaultValues.TUPLE).not.toStrictEqual(configurableConstants.TUPLE); - const contract = await launchTestContract({ - deployer: ConfigurableContractAbi__factory, - bytecode: ConfigurableContractAbiHex, - configurableConstants, - }); + const contract = await setupContract(configurableConstants); const { value } = await contract.functions.echo_tuple().simulate(); @@ -245,11 +220,7 @@ describe('Configurable Contract', () => { expect(defaultValues.STRUCT_1).not.toStrictEqual(configurableConstants.STRUCT_1); - const contract = await launchTestContract({ - deployer: ConfigurableContractAbi__factory, - bytecode: ConfigurableContractAbiHex, - configurableConstants, - }); + const contract = await setupContract(configurableConstants); const { value } = await contract.functions.echo_struct().simulate(); diff --git a/packages/fuel-gauge/src/contract-factory.test.ts b/packages/fuel-gauge/src/contract-factory.test.ts index 187217a67dd..f5e5fd18904 100644 --- a/packages/fuel-gauge/src/contract-factory.test.ts +++ b/packages/fuel-gauge/src/contract-factory.test.ts @@ -1,10 +1,10 @@ import type { Account, TransactionResult } from '@fuel-ts/account'; -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { FuelError, ErrorCode } from '@fuel-ts/errors'; import { expectToThrowFuelError } from '@fuel-ts/errors/test-utils'; -import { BN, bn, toHex, Interface, Provider, ContractFactory, FUEL_NETWORK_URL } from 'fuels'; +import { BN, bn, toHex, Interface, ContractFactory } from 'fuels'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { StorageTestContractAbi__factory } from '../test/typegen/contracts'; +import StorageTestContractAbiHex from '../test/typegen/contracts/StorageTestContractAbi.hex'; import { launchTestContract } from './utils'; @@ -13,26 +13,11 @@ import { launchTestContract } from './utils'; * @group browser */ describe('Contract Factory', () => { - let baseAssetId: string; - - const { - binHexlified: byteCode, - abiContents: abi, - storageSlots, - } = getFuelGaugeForcProject(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); - - const createContractFactory = async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - const wallet = await generateTestWallet(provider, [[5_000_000, baseAssetId]]); - - // send byteCode and ABI to ContractFactory to load - const factory = new ContractFactory(byteCode, abi, wallet); - return factory; - }; - it('Creates a factory from inputs that can return call results', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); + using contract = await launchTestContract({ + deployer: StorageTestContractAbi__factory, + bytecode: StorageTestContractAbiHex, + }); expect(contract.interface).toBeInstanceOf(Interface); const { value: valueInitial } = await contract.functions.initialize_counter(41).call(); @@ -46,7 +31,10 @@ describe('Contract Factory', () => { }); it('Creates a factory from inputs that can return transaction results', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); + using contract = await launchTestContract({ + deployer: StorageTestContractAbi__factory, + bytecode: StorageTestContractAbiHex, + }); expect(contract.interface).toBeInstanceOf(Interface); @@ -90,9 +78,10 @@ describe('Contract Factory', () => { }); it('Creates a factory from inputs that can prepare call data', async () => { - const factory = await createContractFactory(); - - const contract = await factory.deployContract(); + using contract = await launchTestContract({ + deployer: StorageTestContractAbi__factory, + bytecode: StorageTestContractAbiHex, + }); const prepared = contract.functions.increment_counter(1).getCallConfig(); expect(prepared).toEqual({ @@ -107,9 +96,8 @@ describe('Contract Factory', () => { }); it('should not override user input maxFee when calling deployContract', async () => { - const factory = await createContractFactory(); const setFee = bn(120_000); - + const factory = await createContractFactory(); const spy = vi.spyOn(factory.account as Account, 'sendTransaction'); await factory.deployContract({ @@ -124,9 +112,9 @@ describe('Contract Factory', () => { }); it('Creates a contract with initial storage fixed var names', async () => { - const factory = await createContractFactory(); - const contract = await factory.deployContract({ - storageSlots, + using contract = await launchTestContract({ + deployer: StorageTestContractAbi__factory, + bytecode: StorageTestContractAbiHex, }); const { value: var1 } = await contract.functions.return_var1().call(); @@ -165,7 +153,10 @@ describe('Contract Factory', () => { }); it('Creates a contract with initial storage. Both dynamic key and fixed vars', async () => { - const factory = await createContractFactory(); + const factory = new ContractFactory( + StorageTestContractAbiHex, + StorageTestContractAbi__factory.abi + ); const b256 = '0x626f0c36909faecc316056fca8be684ab0cd06afc63247dc008bdf9e433f927a'; const contract = await factory.deployContract({ @@ -200,7 +191,10 @@ describe('Contract Factory', () => { }); it('should throws if calls createTransactionRequest is called when provider is not set', async () => { - const factory = new ContractFactory(byteCode, abi); + const factory = new ContractFactory( + StorageTestContractAbiHex, + StorageTestContractAbi__factory.abi + ); await expectToThrowFuelError( () => factory.createTransactionRequest(), diff --git a/packages/fuel-gauge/src/contract.test.ts b/packages/fuel-gauge/src/contract.test.ts index 411769f1197..ff8f0c181a5 100644 --- a/packages/fuel-gauge/src/contract.test.ts +++ b/packages/fuel-gauge/src/contract.test.ts @@ -23,7 +23,6 @@ import { FunctionInvocationResult, Wallet, ContractFactory, - ZeroBytes32, FUEL_NETWORK_URL, Predicate, PolicyType, @@ -33,14 +32,6 @@ import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures import { launchTestContract } from './utils'; -const { binHexlified: contractBytecode, abiContents: abi } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.CALL_TEST_CONTRACT -); - -const { binHexlified: predicateBytecode } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PREDICATE_TRUE -); - const jsonFragment: JsonAbi = { configurables: [], loggedTypes: [], @@ -166,17 +157,13 @@ const AltToken = '0x010101010101010101010101010101010101010101010101010101010101 * @group browser */ describe('Contract', () => { - let provider: Provider; - let baseAssetId: string; - beforeAll(async () => { - provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - }); - it('generates function methods on a simple contract', async () => { - const spy = vi.spyOn(provider, 'sendTransaction'); - const wallet = await generateTestWallet(provider, [[1_000, baseAssetId]]); - const contract = new Contract(ZeroBytes32, jsonFragment, wallet); + using contract = await launchTestContract({ + deployer: jsonFragment, + bytecode: jsonFragmentHex, + }); + const spy = vi.spyOn(contract.account as Account, 'sendTransaction'); + const fragment = contract.interface.getFunction('entry_one'); const interfaceSpy = vi.spyOn(fragment, 'encodeArguments'); @@ -192,8 +179,7 @@ describe('Contract', () => { it('generates function methods on a complex contract', async () => { const spy = vi.spyOn(provider, 'sendTransaction'); - const wallet = await generateTestWallet(provider, [[1_000, baseAssetId]]); - const contract = new Contract(ZeroBytes32, complexFragment, wallet); + const fragment = contract.interface.getFunction('tuple_function'); const interfaceSpy = vi.spyOn(fragment, 'encodeArguments'); diff --git a/packages/fuel-gauge/src/coverage-contract.test.ts b/packages/fuel-gauge/src/coverage-contract.test.ts index 2eaba9b5e51..710764c35af 100644 --- a/packages/fuel-gauge/src/coverage-contract.test.ts +++ b/packages/fuel-gauge/src/coverage-contract.test.ts @@ -1,17 +1,8 @@ import type { BN, Message } from 'fuels'; -import { - arrayify, - bn, - toHex, - Provider, - Wallet, - ScriptTransactionRequest, - randomBytes, - hexlify, - FUEL_NETWORK_URL, -} from 'fuels'; - -import { FuelGaugeProjectsEnum } from '../test/fixtures'; +import { arrayify, bn, toHex, Wallet, ScriptTransactionRequest, randomBytes, hexlify } from 'fuels'; + +import { CoverageContractAbi__factory } from '../test/typegen/contracts'; +import CoverageContractAbiHex from '../test/typegen/contracts/CoverageContractAbi.hex'; import { launchTestContract } from './utils'; @@ -44,13 +35,21 @@ enum MixedNativeEnum { NotNative = 12, } +async function setupContract() { + return launchTestContract({ + deployer: CoverageContractAbi__factory, + bytecode: CoverageContractAbiHex, + }); +} + /** * @group node * @group browser */ describe('Coverage Contract', () => { it('can return outputs', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); + // Call contract methods expect((await contractInstance.functions.get_id().call()).value).toEqual( '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff' @@ -137,7 +136,7 @@ describe('Coverage Contract', () => { }); it('should test u8 variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); // #region U8 const { value } = await contractInstance.functions.echo_u8(3).call(); expect(value).toBe(3); @@ -145,28 +144,28 @@ describe('Coverage Contract', () => { }); it('should test u8 variable type multiple params', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions.echo_u8_addition(3, 4, 3).call(); expect(value).toBe(10); }); it('should test u16 variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions.echo_u16(RUST_U8_MAX + 1).call(); expect(value).toBe(RUST_U8_MAX + 1); }); it('should test u32 variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions.echo_u32(RUST_U16_MAX + 1).call(); expect(value).toBe(RUST_U16_MAX + 1); }); it('should test u64 variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT = bn(RUST_U32_MAX).add(1).toHex(); const { value } = await contractInstance.functions.echo_u64(INPUT).call(); @@ -174,7 +173,7 @@ describe('Coverage Contract', () => { }); it('should test u256 variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT = U256_MAX; const { value } = await contractInstance.functions.echo_u256(INPUT).call(); @@ -182,49 +181,49 @@ describe('Coverage Contract', () => { }); it('should test bool variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions.echo_bool(false).call(); expect(value).toBe(false); }); it('should test b256 variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions.echo_b256(B256).call(); expect(value).toBe(B256); }); it('should test b512 variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions.echo_b512(B512).call(); expect(value).toBe(B512); }); it('should test str[1] variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions.echo_str_1('f').call(); expect(value).toBe('f'); }); it('should test str[2] variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions.echo_str_2('fu').call(); expect(value).toBe('fu'); }); it('should test str[3] variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions.echo_str_3('fue').call(); expect(value).toBe('fue'); }); it('should test str[8] variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions.echo_str_8('fuel-sdk').call(); @@ -232,21 +231,21 @@ describe('Coverage Contract', () => { }); it('should test str[9] variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions.echo_str_9('fuel-sdks').call(); expect(value).toBe('fuel-sdks'); }); it('should test tuple < 8 bytes variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions.echo_tuple_u8([21, 22]).call(); expect(value).toStrictEqual([21, 22]); }); it('should test tuple > 8 bytes variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT = [bn(RUST_U32_MAX).add(1), bn(RUST_U32_MAX).add(2)]; const { value } = await contractInstance.functions.echo_tuple_u64(INPUT).call(); @@ -254,7 +253,7 @@ describe('Coverage Contract', () => { }); it('should test tuple mixed variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT = [true, bn(RUST_U32_MAX).add(1)]; const { value } = await contractInstance.functions.echo_tuple_mixed(INPUT).call(); @@ -262,14 +261,14 @@ describe('Coverage Contract', () => { }); it('should test array < 8 bytes variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions.echo_array_u8([4, 3]).call(); expect(value).toStrictEqual([4, 3]); }); it('should test array > 8 bytes variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT: [number, string, BN, string, string] = [ 11, @@ -285,14 +284,14 @@ describe('Coverage Contract', () => { }); it('should test array bool variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions.echo_array_bool([true, true]).call(); expect(value).toStrictEqual([true, true]); }); it('should test struct < 8 bytes variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT = { i: 4 }; const { value } = await contractInstance.functions.echo_struct_u8(INPUT).call(); @@ -300,7 +299,7 @@ describe('Coverage Contract', () => { }); it('should test struct > 8 bytes variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT = { i: B256 }; const { value } = await contractInstance.functions.echo_struct_b256(INPUT).call(); @@ -308,7 +307,7 @@ describe('Coverage Contract', () => { }); it('should test enum < 8 byte variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT = SmallEnum.Empty; const { value } = await contractInstance.functions.echo_enum_small(INPUT).call(); @@ -316,7 +315,7 @@ describe('Coverage Contract', () => { }); it('should test enum > 8 bytes variable type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT = { AddressB: B256 }; @@ -325,7 +324,7 @@ describe('Coverage Contract', () => { }); it('should test Option type', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT = 187; const { value } = await contractInstance.functions.echo_option_u8(INPUT).call(); @@ -333,7 +332,7 @@ describe('Coverage Contract', () => { }); it('should test Option extraction [Some]', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT_SOME = 123; const { value: Some } = await contractInstance.functions @@ -343,7 +342,7 @@ describe('Coverage Contract', () => { }); it('should test Option extraction [None]', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT_NONE = undefined; const { value: None } = await contractInstance.functions @@ -356,7 +355,7 @@ describe('Coverage Contract', () => { }); it('should test multiple Option params [Some]', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT_A = 1; const INPUT_B = 4; @@ -372,7 +371,7 @@ describe('Coverage Contract', () => { }); it('should test multiple Option params [None]', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT = 1; @@ -384,14 +383,14 @@ describe('Coverage Contract', () => { }); it('should test u8 empty vector input', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions.check_u8_vector([]).call(); expect(value).toBeFalsy(); }); it('should test u8 vector input', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value, logs } = await contractInstance.functions .check_u8_vector([1, 2, 3, 4, 5]) @@ -404,7 +403,7 @@ describe('Coverage Contract', () => { }); it('should echo u8 vector input', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions .echo_u8_vector_first([23, 6, 1, 51, 2]) @@ -414,7 +413,7 @@ describe('Coverage Contract', () => { }); it('should echo a vector of optional u8 input', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions.echo_u8_option_vector_first([28]).call(); @@ -422,7 +421,7 @@ describe('Coverage Contract', () => { }); it('should echo u64 vector input', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT = bn(54).toHex(); const { value } = await contractInstance.functions @@ -432,7 +431,7 @@ describe('Coverage Contract', () => { }); it('should echo u32 vector addition of mixed params', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions .echo_u32_vector_addition_other_type([100, 2], 47) @@ -441,7 +440,7 @@ describe('Coverage Contract', () => { }); it('should echo u32 vector addition', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions .echo_u32_vector_addition([100, 2], [24, 54]) @@ -450,7 +449,7 @@ describe('Coverage Contract', () => { }); it('should echo u32 vector addition [variable lengths]', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions .echo_u32_vector_addition([100, 2, 1, 2, 3], [24, 54]) @@ -459,7 +458,7 @@ describe('Coverage Contract', () => { }); it('should echo struct vector input', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const first = { foo: 1, @@ -482,6 +481,8 @@ describe('Coverage Contract', () => { }); it('should echo complex struct vector input', async () => { + using contractInstance = await setupContract(); + const last = { foo: 3, bar: bn(31337).toHex(), @@ -511,7 +512,7 @@ describe('Coverage Contract', () => { }); it('should get initial state messages from node', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); + const { provider } = await setupContract(); // #region Message-getMessages const WALLET_A = Wallet.fromPrivateKey( @@ -536,11 +537,11 @@ describe('Coverage Contract', () => { ]; const EXPECTED_MESSAGES_B: Message[] = [ { - messageId: '0x39578ef8c047ae994d0dadce8015559953b32fffa657c25c4c068fe4d6995a4b', + messageId: '0xba5fece66404c865ea533b1a0f8462e9a67c2066a20b70fcf8446ce4f2b82ed4', sender: WALLET_A.address, recipient: WALLET_B.address, nonce: '0x0e1ef2963832068b0e1ef2963832068b0e1ef2963832068b0e1ef2963832068b', - amount: bn('12704439083013451934'), + amount: bn('0xffffffffffffffff', 'hex'), data: arrayify('0x'), daHeight: bn(0), }, @@ -555,7 +556,7 @@ describe('Coverage Contract', () => { }); it('should test spending input messages', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); + const { provider } = await setupContract(); const request = new ScriptTransactionRequest({ gasLimit: 1000000 }); const recipient = Wallet.generate({ @@ -566,7 +567,7 @@ describe('Coverage Contract', () => { provider ); - request.addCoinOutput(recipient.address, 10, baseAssetId); + request.addCoinOutput(recipient.address, 10, provider.getBaseAssetId()); const txCost = await sender.provider.getTransactionCost(request); @@ -582,6 +583,8 @@ describe('Coverage Contract', () => { }); it('supports result type', async () => { + using contractInstance = await setupContract(); + const { value: { Ok }, } = await contractInstance.functions.types_result({ Ok: 1 }).call(); @@ -599,6 +602,8 @@ describe('Coverage Contract', () => { }); it('can read from produce_logs_variables', async () => { + using contractInstance = await setupContract(); + const { logs } = await contractInstance.functions.produce_logs_variables().call(); expect(logs[0].toHex()).toEqual(bn(64).toHex()); @@ -608,7 +613,7 @@ describe('Coverage Contract', () => { }); it('should test native enum [Red->Green]', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT: ColorEnumInput = ColorEnumInput.Red; const OUTPUT: ColorEnumOutput = ColorEnumOutput.Green; @@ -618,7 +623,7 @@ describe('Coverage Contract', () => { }); it('should test native enum [Green->Blue]', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT: ColorEnumInput = ColorEnumInput.Green; const OUTPUT: ColorEnumOutput = ColorEnumOutput.Blue; @@ -628,7 +633,7 @@ describe('Coverage Contract', () => { }); it('should test native enum [Blue->Red]', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT: ColorEnumInput = ColorEnumInput.Blue; const OUTPUT: ColorEnumOutput = ColorEnumOutput.Red; @@ -638,7 +643,7 @@ describe('Coverage Contract', () => { }); it('should test mixed native enum [Native->NotNative]', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const input = MixedNativeEnum.Native; const expected = { NotNative: MixedNativeEnum.NotNative }; @@ -648,7 +653,7 @@ describe('Coverage Contract', () => { }); it('should test mixed native enum [NotNative->Native]', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const input = { NotNative: MixedNativeEnum.NotNative }; const expected = 'Native'; @@ -658,7 +663,7 @@ describe('Coverage Contract', () => { }); it('should try vec_as_only_param', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions .vec_as_only_param([100, 450, 202, 340]) @@ -673,7 +678,7 @@ describe('Coverage Contract', () => { }); it('should try u32_and_vec_params', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions .u32_and_vec_params(33, [450, 202, 340]) @@ -688,7 +693,7 @@ describe('Coverage Contract', () => { }); it('should support vec in vec', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT = [ [0, 1, 2], @@ -701,7 +706,7 @@ describe('Coverage Contract', () => { }); it('should support array in vec', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT = [ [0, 1, 2], @@ -714,7 +719,7 @@ describe('Coverage Contract', () => { }); it('should test b256 multiple params vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT_A = [hexlify(randomBytes(32)), hexlify(randomBytes(32)), hexlify(randomBytes(32))]; const INPUT_B = [hexlify(randomBytes(32)), hexlify(randomBytes(32)), hexlify(randomBytes(32))]; @@ -729,7 +734,7 @@ describe('Coverage Contract', () => { }); it('should handle multiple calls [with vectors]', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT_A = [hexlify(randomBytes(32)), hexlify(randomBytes(32)), hexlify(randomBytes(32))]; const INPUT_B = [hexlify(randomBytes(32))]; @@ -749,7 +754,7 @@ describe('Coverage Contract', () => { }); it('should handle multiple calls [with vectors + stack data first]', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COVERAGE_CONTRACT); + using contractInstance = await setupContract(); const INPUT_A = [hexlify(randomBytes(32)), hexlify(randomBytes(32)), hexlify(randomBytes(32))]; const INPUT_B = [hexlify(randomBytes(32))]; diff --git a/packages/fuel-gauge/src/doc-examples.test.ts b/packages/fuel-gauge/src/doc-examples.test.ts index 7915c80f779..1a0ef21eb08 100644 --- a/packages/fuel-gauge/src/doc-examples.test.ts +++ b/packages/fuel-gauge/src/doc-examples.test.ts @@ -26,20 +26,9 @@ import { FUEL_NETWORK_URL, TESTNET_NETWORK_URL, } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; - -const { abiContents: callTestAbi } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.CALL_TEST_CONTRACT -); - -const { binHexlified: predicateTriple } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PREDICATE_TRIPLE_SIG -); - -const { binHexlified: testPredicateTrue } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PREDICATE_TRUE -); +import { CallTestContractAbi__factory } from '../test/typegen/contracts'; const PUBLIC_KEY = '0x2f34bc0df4db0ec391792cedb05768832b49b1aa3a2dd8c30054d1af00f67d00b74b7acbbf3087c8e0b1a4c343db50aa471d21f278ff5ce09f07795d541fb47e'; @@ -59,18 +48,6 @@ const ADDRESS_BYTES = new Uint8Array([ * @group browser */ describe('Doc Examples', () => { - let baseAssetId: string; - - beforeAll(async () => { - // Avoids using the actual network. - const mockProvider = await Provider.create(FUEL_NETWORK_URL); - vi.spyOn(Provider, 'create').mockResolvedValue(mockProvider); - }); - - beforeAll(async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - }); test('it has an Address class using bech32Address', () => { const address = new Address(ADDRESS_BECH32); @@ -135,8 +112,16 @@ describe('Doc Examples', () => { }); test('it has conversion tools', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - + using node = await launchTestNode({ + contractsConfigs: [ + { + deployer: CallTestContractAbi__factory, + bytecode: CallTestContractAbiHex, + }, + ], + walletsConfig: [{}], + }); + const { provider } = node; const assetId: string = ZeroBytes32; const randomB256Bytes: Bytes = randomBytes(32); const hexedB256: string = hexlify(randomB256Bytes); @@ -155,8 +140,7 @@ describe('Doc Examples', () => { }); test('it can work with wallets', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - + const { provider } = await launchTestNode(); // use the `generate` helper to make an Unlocked Wallet const myWallet: WalletUnlocked = Wallet.generate({ provider, @@ -175,7 +159,7 @@ describe('Doc Examples', () => { unlockedWallet = Wallet.fromPrivateKey(PRIVATE_KEY, provider); const newlyLockedWallet = unlockedWallet.lock(); - const balance: BigNumberish = await myWallet.getBalance(baseAssetId); + const balance: BigNumberish = await myWallet.getBalance(provider.getBaseAssetId()); const balances: CoinQuantity[] = await myWallet.getBalances(); expect(newlyLockedWallet.address).toEqual(someWallet.address); diff --git a/packages/fuel-gauge/src/edge-cases.test.ts b/packages/fuel-gauge/src/edge-cases.test.ts index 4e436d015de..0f012597260 100644 --- a/packages/fuel-gauge/src/edge-cases.test.ts +++ b/packages/fuel-gauge/src/edge-cases.test.ts @@ -1,7 +1,9 @@ import { generateTestWallet } from '@fuel-ts/account/test-utils'; -import { FUEL_NETWORK_URL, Provider, TransactionResponse, Wallet } from 'fuels'; +import { TransactionResponse, Wallet } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum } from '../test/fixtures'; +import { CollisionInFnNamesAbi__factory } from '../test/typegen/contracts'; +import CollisionInFnNamesAbiHex from '../test/typegen/contracts/CollisionInFnNamesAbi.hex'; import { launchTestContract } from './utils'; @@ -11,12 +13,15 @@ import { launchTestContract } from './utils'; */ describe('Edge Cases', () => { it('can run collision_in_fn_names', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.COLLISION_IN_FN_NAMES); + using contractInstance = await launchTestContract({ + deployer: CollisionInFnNamesAbi__factory, + bytecode: CollisionInFnNamesAbiHex, + }); expect((await contractInstance.functions.new().call()).value.toNumber()).toEqual(12345); }); test("SSE subscriptions that are closed by the node don't hang a for-await-of loop", async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); + const { provider } = await launchTestNode(); const baseAssetId = provider.getBaseAssetId(); const adminWallet = await generateTestWallet(provider, [[500_000, baseAssetId]]); diff --git a/packages/fuel-gauge/src/fee.test.ts b/packages/fuel-gauge/src/fee.test.ts index 77b20ed02ff..7acf6585840 100644 --- a/packages/fuel-gauge/src/fee.test.ts +++ b/packages/fuel-gauge/src/fee.test.ts @@ -1,37 +1,21 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { ASSET_A, ASSET_B, expectToBeInRange } from '@fuel-ts/utils/test-utils'; -import type { BN, BaseWalletUnlocked } from 'fuels'; -import { - ContractFactory, - FUEL_NETWORK_URL, - Predicate, - Provider, - ScriptTransactionRequest, - Wallet, - getRandomB256, -} from 'fuels'; +import type { BN } from 'fuels'; +import { ContractFactory, Predicate, ScriptTransactionRequest, Wallet, getRandomB256 } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { + CallTestContractAbi__factory, + MultiTokenContractAbi__factory, +} from '../test/typegen/contracts'; +import CallTestContractAbiHex from '../test/typegen/contracts/CallTestContractAbi.hex'; +import MultiTokenContractAbiHex from '../test/typegen/contracts/MultiTokenContractAbi.hex'; +import { PredicateU32Abi__factory } from '../test/typegen/predicates/factories/PredicateU32Abi__factory'; /** * @group node * @group browser */ describe('Fee', () => { - let wallet: BaseWalletUnlocked; - let provider: Provider; - let baseAssetId: string; - - beforeAll(async () => { - provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - wallet = await generateTestWallet(provider, [ - [1_000_000_000, baseAssetId], - [1_000_000_000, ASSET_A], - [1_000_000_000, ASSET_B], - ]); - }); - const expectFeeInMarginOfError = (fee: BN, expectedFee: BN) => { const feeNumber = fee.toNumber(); const expectedFeeNumber = expectedFee.toNumber(); @@ -50,12 +34,19 @@ describe('Fee', () => { }; it('should ensure fee is properly calculated when minting and burning coins', async () => { - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.MULTI_TOKEN_CONTRACT - ); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: MultiTokenContractAbi__factory, + bytecode: MultiTokenContractAbiHex, + }, + ], + }); - const factory = new ContractFactory(binHexlified, abiContents, wallet); - const contract = await factory.deployContract(); + const { + contracts: [contract], + wallets: [wallet], + } = launched; // minting coins let balanceBefore = await wallet.getBalance(); @@ -87,14 +78,23 @@ describe('Fee', () => { }); it('should ensure fee is properly calculated on simple transfer transactions', async () => { + const { + provider, + wallets: [wallet], + } = await launchTestNode(); const destination = Wallet.generate({ provider }); const amountToTransfer = 120; const balanceBefore = await wallet.getBalance(); - const tx = await wallet.transfer(destination.address, amountToTransfer, baseAssetId, { - gasLimit: 10_000, - }); + const tx = await wallet.transfer( + destination.address, + amountToTransfer, + provider.getBaseAssetId(), + { + gasLimit: 10_000, + } + ); const { fee } = await tx.wait(); const balanceAfter = await wallet.getBalance(); @@ -108,9 +108,14 @@ describe('Fee', () => { }); it('should ensure fee is properly calculated on multi transfer transactions', async () => { - const destination1 = Wallet.generate({ provider }); - const destination2 = Wallet.generate({ provider }); - const destination3 = Wallet.generate({ provider }); + const { + provider, + wallets: [wallet, destination1, destination2, destination3], + } = await launchTestNode({ + walletsConfig: { + count: 4, + }, + }); const amountToTransfer = 120; const balanceBefore = await wallet.getBalance(); @@ -119,7 +124,7 @@ describe('Fee', () => { gasLimit: 10000, }); - request.addCoinOutput(destination1.address, amountToTransfer, baseAssetId); + request.addCoinOutput(destination1.address, amountToTransfer, provider.getBaseAssetId()); request.addCoinOutput(destination2.address, amountToTransfer, ASSET_A); request.addCoinOutput(destination3.address, amountToTransfer, ASSET_B); @@ -146,13 +151,20 @@ describe('Fee', () => { }); it('should ensure fee is properly calculated on a contract deploy', async () => { - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.MULTI_TOKEN_CONTRACT - ); + using launched = await launchTestNode(); + + const { + provider, + wallets: [wallet], + } = launched; const balanceBefore = await wallet.getBalance(); - const factory = new ContractFactory(binHexlified, abiContents, wallet); + const factory = new ContractFactory( + MultiTokenContractAbiHex, + MultiTokenContractAbi__factory.abi, + wallet + ); const { transactionRequest } = factory.createTransactionRequest(); const txCost = await provider.getTransactionCost(transactionRequest); @@ -174,11 +186,17 @@ describe('Fee', () => { }); it('should ensure fee is properly calculated on a contract call', async () => { - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.CALL_TEST_CONTRACT - ); + using launched = await launchTestNode(); + + const { + wallets: [wallet], + } = launched; - const factory = new ContractFactory(binHexlified, abiContents, wallet); + const factory = new ContractFactory( + CallTestContractAbiHex, + CallTestContractAbi__factory.abi, + wallet + ); const contract = await factory.deployContract(); const balanceBefore = await wallet.getBalance(); @@ -201,11 +219,17 @@ describe('Fee', () => { }); it('should ensure fee is properly calculated a contract multi call', async () => { - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.CALL_TEST_CONTRACT - ); + using launched = await launchTestNode(); - const factory = new ContractFactory(binHexlified, abiContents, wallet); + const { + wallets: [wallet], + } = launched; + + const factory = new ContractFactory( + CallTestContractAbiHex, + CallTestContractAbi__factory.abi, + wallet + ); const contract = await factory.deployContract(); const balanceBefore = await wallet.getBalance(); @@ -232,11 +256,17 @@ describe('Fee', () => { }); it('should ensure fee is properly calculated in a multi call [MINT TO 15 ADDRESSES]', async () => { - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.MULTI_TOKEN_CONTRACT - ); + using launched = await launchTestNode(); + + const { + wallets: [wallet], + } = launched; - const factory = new ContractFactory(binHexlified, abiContents, wallet); + const factory = new ContractFactory( + MultiTokenContractAbiHex, + MultiTokenContractAbi__factory.abi, + wallet + ); const contract = await factory.deployContract(); const subId = '0x4a778acfad1abc155a009dc976d2cf0db6197d3d360194d74b1fb92b96986b00'; @@ -268,23 +298,33 @@ describe('Fee', () => { }); it('should ensure fee is properly calculated on transactions with predicate', async () => { - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PREDICATE_U32 - ); + using launched = await launchTestNode({ + walletsConfig: { + assets: 3, + count: 3, + coinsPerAsset: 2, + amountPerCoin: 1_000_000, + }, + }); + + const { + provider, + wallets: [wallet], + } = launched; const predicate = new Predicate({ - bytecode: binHexlified, - abi: abiContents, + bytecode: PredicateU32Abi__factory.bin, + abi: PredicateU32Abi__factory.abi, provider, inputData: [1078], }); - const tx1 = await wallet.transfer(predicate.address, 2000, baseAssetId); + const tx1 = await wallet.transfer(predicate.address, 2000, provider.getBaseAssetId()); await tx1.wait(); const transferAmount = 100; const balanceBefore = await predicate.getBalance(); - const tx2 = await predicate.transfer(wallet.address, transferAmount, baseAssetId); + const tx2 = await predicate.transfer(wallet.address, transferAmount, provider.getBaseAssetId()); const { fee } = await tx2.wait(); diff --git a/packages/fuel-gauge/src/funding-transaction.test.ts b/packages/fuel-gauge/src/funding-transaction.test.ts index d702b750df3..bb6d07e2c28 100644 --- a/packages/fuel-gauge/src/funding-transaction.test.ts +++ b/packages/fuel-gauge/src/funding-transaction.test.ts @@ -1,35 +1,30 @@ import { seedTestWallet } from '@fuel-ts/account/test-utils'; import { FuelError } from '@fuel-ts/errors'; import { expectToThrowFuelError } from '@fuel-ts/errors/test-utils'; -import type { Account, CoinTransactionRequestInput } from 'fuels'; -import { FUEL_NETWORK_URL, Provider, ScriptTransactionRequest, Wallet, bn } from 'fuels'; +import type { Account, CoinTransactionRequestInput, Provider } from 'fuels'; +import { ScriptTransactionRequest, Wallet, bn } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; /** * @group node + * @group browser */ describe(__filename, () => { - let mainWallet: Account; - let provider: Provider; - let baseAssetId: string; - const assetA = '0x0101010101010101010101010101010101010101010101010101010101010101'; const assetB = '0x0202020202020202020202020202020202020202020202020202020202020202'; - beforeAll(async () => { - provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - mainWallet = Wallet.generate({ provider }); - await seedTestWallet(mainWallet, [[200_000_000, baseAssetId]]); - }); - const fundingTxWithMultipleUTXOs = async ({ account, totalAmount, splitIn, + baseAssetId, + mainWallet, }: { account: Account; totalAmount: number; splitIn: number; + baseAssetId: string; + mainWallet: Account; }) => { const request = new ScriptTransactionRequest(); @@ -52,14 +47,26 @@ describe(__filename, () => { }; it('should successfully fund a transaction request when it is not fully funded', async () => { - const sender = Wallet.generate({ provider }); - const receiver = Wallet.generate({ provider }); + const initialAmount = 500_000; + using launched = await launchTestNode({ + walletsConfig: { + count: 2, + amountPerCoin: initialAmount, + }, + }); + + const { + provider, + wallets: [sender, receiver], + } = launched; - // 1500 splitted in 5 = 5 UTXOs of 300 each + // 1500 splitted in 5 = 5 UTXOs of 30 each await fundingTxWithMultipleUTXOs({ account: sender, totalAmount: 400_000, splitIn: 5, + baseAssetId: provider.getBaseAssetId(), + mainWallet: sender, }); const request = new ScriptTransactionRequest({ @@ -68,7 +75,7 @@ describe(__filename, () => { const amountToTransfer = 300; - request.addCoinOutput(receiver.address, amountToTransfer, baseAssetId); + request.addCoinOutput(receiver.address, amountToTransfer, provider.getBaseAssetId()); const txCost = await provider.getTransactionCost(request); @@ -86,12 +93,24 @@ describe(__filename, () => { // fund method should have been called to fetch the remaining UTXOs expect(getResourcesToSpendSpy).toHaveBeenCalled(); - const receiverBalance = await receiver.getBalance(baseAssetId); + const receiverBalance = await receiver.getBalance(provider.getBaseAssetId()); - expect(receiverBalance.toNumber()).toBe(amountToTransfer); + expect(receiverBalance.toNumber()).toBe(amountToTransfer + initialAmount); }); it('should not fund a transaction request when it is already funded', async () => { + using launched = await launchTestNode({ + walletsConfig: { + count: 1, + amountPerCoin: 200_000_000, + }, + }); + + const { + provider, + wallets: [mainWallet], + } = launched; + const sender = Wallet.generate({ provider }); const receiver = Wallet.generate({ provider }); @@ -100,10 +119,12 @@ describe(__filename, () => { account: sender, totalAmount: 400_000, splitIn: 2, + baseAssetId: provider.getBaseAssetId(), + mainWallet, }); - // sender has 2 UTXOs for 200_000 each, so it has enough resources to spend 1000 of baseAssetId - const enoughtResources = await sender.getResourcesToSpend([[100, baseAssetId]]); + // sender has 2 UTXOs for 500_000 each, so it has enough resources to spend 1000 of baseAssetId + const enoughtResources = await sender.getResourcesToSpend([[100, provider.getBaseAssetId()]]); // confirm we only fetched 1 UTXO from the expected amount expect(enoughtResources.length).toBe(1); @@ -115,7 +136,7 @@ describe(__filename, () => { const amountToTransfer = 100; - request.addCoinOutput(receiver.address, amountToTransfer, baseAssetId); + request.addCoinOutput(receiver.address, amountToTransfer, provider.getBaseAssetId()); request.addResources(enoughtResources); const txCost = await provider.getTransactionCost(request); @@ -139,19 +160,31 @@ describe(__filename, () => { // fund should not have been called since the TX request was already funded expect(getResourcesToSpendSpy).toHaveBeenCalledTimes(0); - const receiverBalance = await receiver.getBalance(baseAssetId); + const receiverBalance = await receiver.getBalance(provider.getBaseAssetId()); expect(receiverBalance.toNumber()).toBe(amountToTransfer); }); it('should fully fund a transaction when it is has no funds yet', async () => { - const sender = Wallet.generate({ provider }); - const receiver = Wallet.generate({ provider }); + const initialAmount = 500_000; + using launched = await launchTestNode({ + walletsConfig: { + count: 2, + amountPerCoin: initialAmount, + }, + }); + + const { + provider, + wallets: [sender, receiver], + } = launched; await fundingTxWithMultipleUTXOs({ account: sender, totalAmount: 200_000, splitIn: 1, + baseAssetId: provider.getBaseAssetId(), + mainWallet: sender, }); const request = new ScriptTransactionRequest({ @@ -159,7 +192,7 @@ describe(__filename, () => { }); const amountToTransfer = 1000; - request.addCoinOutput(receiver.address, amountToTransfer, baseAssetId); + request.addCoinOutput(receiver.address, amountToTransfer, provider.getBaseAssetId()); const txCost = await provider.getTransactionCost(request); @@ -180,14 +213,24 @@ describe(__filename, () => { // fund method should have been called to fetch UTXOs expect(getResourcesToSpendSpy).toHaveBeenCalledTimes(1); - const receiverBalance = await receiver.getBalance(baseAssetId); + const receiverBalance = await receiver.getBalance(provider.getBaseAssetId()); - expect(receiverBalance.toNumber()).toBe(amountToTransfer); + expect(receiverBalance.toNumber()).toBe(amountToTransfer + initialAmount); }); it('should ensure proper error is thrown when user has not enough resources', async () => { - const sender = Wallet.generate({ provider }); - const receiver = Wallet.generate({ provider }); + const initialAmount = 100_000; + using launched = await launchTestNode({ + walletsConfig: { + count: 2, + amountPerCoin: initialAmount, + }, + }); + + const { + provider, + wallets: [sender, receiver], + } = launched; const splitIn = 20; @@ -199,12 +242,14 @@ describe(__filename, () => { account: sender, totalAmount: 2400, splitIn, + baseAssetId: provider.getBaseAssetId(), + mainWallet: sender, }); const request = new ScriptTransactionRequest(); const amountToTransfer = 1000; - request.addCoinOutput(receiver.address, amountToTransfer, baseAssetId); + request.addCoinOutput(receiver.address, amountToTransfer, provider.getBaseAssetId()); const txCost = await provider.getTransactionCost(request); @@ -237,6 +282,10 @@ describe(__filename, () => { }); it('should ensure a partially funded Transaction will require only missing funds', async () => { + using launched = await launchTestNode(); + + const { provider } = launched; + const receiver = Wallet.generate({ provider }); const wallet1 = Wallet.generate({ provider }); const wallet2 = Wallet.generate({ provider }); @@ -251,7 +300,7 @@ describe(__filename, () => { * in the Base Asset to pay the fee */ await seedTestWallet(wallet1, [ - [totalInBaseAsset, baseAssetId], + [totalInBaseAsset, provider.getBaseAssetId()], [partiallyInAssetA, assetA], ]); @@ -275,10 +324,12 @@ describe(__filename, () => { // Manually fetching resources from wallet1 to be added to transactionRequest const partiallyResources = await wallet1.getResourcesToSpend([ [partiallyInAssetA, assetA], - [totalInBaseAsset, baseAssetId], + [totalInBaseAsset, provider.getBaseAssetId()], ]); - const baseAssetResource = partiallyResources.find((r) => r.assetId === baseAssetId); + const baseAssetResource = partiallyResources.find( + (r) => r.assetId === provider.getBaseAssetId() + ); const assetAResource = partiallyResources.find((r) => r.assetId === assetA); // Expect to have the correct amount of resources, not enough to cover the required amount in Asset A @@ -307,13 +358,16 @@ describe(__filename, () => { }); it('should ensure a funded Transaction will not require more funds from another user', async () => { - const receiver = Wallet.generate({ provider }); + using launched = await launchTestNode(); + const { provider } = launched; + const fundedWallet = Wallet.generate({ provider }); const unfundedWallet = Wallet.generate({ provider }); + const receiver = Wallet.generate({ provider }); // Funding the wallet with sufficient amounts for base and additional assets await seedTestWallet(fundedWallet, [ - [300_000, baseAssetId], + [300_000, provider.getBaseAssetId()], [80_000, assetA], [80_000, assetB], ]); @@ -324,7 +378,7 @@ describe(__filename, () => { * Adding CoinOutputs for the receiver address. All required amounts can be * covered by the fundedWallet. */ - transactionRequest.addCoinOutput(receiver.address, 1500, baseAssetId); + transactionRequest.addCoinOutput(receiver.address, 1500, provider.getBaseAssetId()); transactionRequest.addCoinOutput(receiver.address, 3000, assetA); transactionRequest.addCoinOutput(receiver.address, 4500, assetB); diff --git a/packages/fuel-gauge/src/generic-types-contract.test.ts b/packages/fuel-gauge/src/generic-types-contract.test.ts index 06b766174f9..8dd3c0e373c 100644 --- a/packages/fuel-gauge/src/generic-types-contract.test.ts +++ b/packages/fuel-gauge/src/generic-types-contract.test.ts @@ -1,6 +1,7 @@ import { toHex } from 'fuels'; -import { FuelGaugeProjectsEnum } from '../test/fixtures'; +import { GenericTypesContractAbi__factory } from '../test/typegen/contracts'; +import GenericTypesContractAbiHex from '../test/typegen/contracts/GenericTypesContractAbi.hex'; import { launchTestContract } from './utils'; /** @@ -9,7 +10,10 @@ import { launchTestContract } from './utils'; */ describe('GenericTypesContract', () => { it('should call complex contract function with generic type', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.GENERIC_TYPES_CONTRACT); + using contract = await launchTestContract({ + deployer: GenericTypesContractAbi__factory, + bytecode: GenericTypesContractAbiHex, + }); const b256 = '0xd5579c46dfcc7f18207013e65b44e4cb4e2c2298f4ac457ba8f82743f31e930b'; const bimArg1 = 'Yes'; diff --git a/packages/fuel-gauge/src/is-function-readonly.test.ts b/packages/fuel-gauge/src/is-function-readonly.test.ts index c924d58eac9..58c21273d16 100644 --- a/packages/fuel-gauge/src/is-function-readonly.test.ts +++ b/packages/fuel-gauge/src/is-function-readonly.test.ts @@ -1,13 +1,18 @@ -import { FuelGaugeProjectsEnum } from '../test/fixtures'; +import { StorageTestContractAbi__factory } from '../test/typegen/contracts'; +import StorageTestContractAbiHex from '../test/typegen/contracts/StorageTestContractAbi.hex'; import { launchTestContract } from './utils'; /** * @group node + * @group browser */ describe('isReadOnly', () => { test('isReadOnly returns true for a read-only function', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); + using contractInstance = await launchTestContract({ + deployer: StorageTestContractAbi__factory, + bytecode: StorageTestContractAbiHex, + }); const isReadOnly = contractInstance.functions.counter.isReadOnly(); @@ -15,7 +20,10 @@ describe('isReadOnly', () => { }); test('isReadOnly returns false for a function containing write operations', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); + using contractInstance = await launchTestContract({ + deployer: StorageTestContractAbi__factory, + bytecode: StorageTestContractAbiHex, + }); const isReadOnly = contractInstance.functions.increment_counter.isReadOnly(); @@ -23,7 +31,10 @@ describe('isReadOnly', () => { }); test('isReadOnly does not throw a runtime error for a function that does not use storage', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); + using contractInstance = await launchTestContract({ + deployer: StorageTestContractAbi__factory, + bytecode: StorageTestContractAbiHex, + }); const isReadOnly = contractInstance.functions.return_true.isReadOnly(); diff --git a/packages/fuel-gauge/src/min-gas.test.ts b/packages/fuel-gauge/src/min-gas.test.ts index 38961237990..e3c7bbae3a6 100644 --- a/packages/fuel-gauge/src/min-gas.test.ts +++ b/packages/fuel-gauge/src/min-gas.test.ts @@ -2,8 +2,6 @@ import { seedTestWallet } from '@fuel-ts/account/test-utils'; import { ContractFactory, Wallet, - FUEL_NETWORK_URL, - Provider, bn, TransactionStatus, ScriptTransactionRequest, @@ -13,118 +11,147 @@ import { getGasUsedFromReceipts, BigNumberCoder, } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { ComplexPredicateAbi__factory } from '../test/typegen/predicates'; /** * @group node + * @group browser */ describe(__filename, () => { - let provider: Provider; - let baseAssetId: string; + // it('sets gas requirements (contract)', async () => { + // using launched = await launchTestNode({ + // walletsConfig: { + // amountPerCoin: 500_000, + // }, + // }); + + // const { + // provider, + // wallets: [wallet], + // } = launched; + + // /** + // * Create a contract transaction + // */ + + // const { abiContents, binHexlified, storageSlots } = getFuelGaugeForcProject( + // FuelGaugeProjectsEnum.COVERAGE_CONTRACT + // ); + + // const contractFactory = new ContractFactory(binHexlified, abiContents, wallet); + // const { transactionRequest: request } = contractFactory.createTransactionRequest({ + // storageSlots, + // }); + // const resources = await provider.getResourcesToSpend(wallet.address, [ + // { + // amount: bn(100_000), + // assetId: provider.getBaseAssetId(), + // }, + // ]); + // request.addResources(resources); + + // /** + // * Get the transaction cost to set a strict gasLimit and min gasPrice + // */ + // const { maxFee } = await provider.getTransactionCost(request); + + // request.maxFee = maxFee; + + // /** + // * Send transaction + // */ + // const result = await wallet.sendTransaction(request); + // const { status } = await result.waitForResult(); + + // expect(status).toBe(TransactionStatus.success); + // }); + + // it('sets gas requirements (script)', async () => { + // using launched = await launchTestNode({ + // walletsConfig: { + // amountPerCoin: 500_000, + // }, + // }); + + // const { + // provider, + // wallets: [sender], + // } = launched; + + // /** + // * Create a script transaction + // */ + // const { binHexlified } = getFuelGaugeForcProject(FuelGaugeProjectsEnum.COMPLEX_SCRIPT); + + // const request = new ScriptTransactionRequest({ + // script: binHexlified, + // scriptData: hexlify(new BigNumberCoder('u64').encode(bn(2000))), + // }); + // request.addCoinOutput(Address.fromRandom(), bn(100), provider.getBaseAssetId()); + + // /** + // * Get the transaction cost to set a strict gasLimit and min gasPrice + // */ + // const txCost = await provider.getTransactionCost(request); + + // request.gasLimit = txCost.gasUsed; + // request.maxFee = txCost.maxFee; + + // await sender.fund(request, txCost); + + // /** + // * Send transaction + // */ + // const result = await sender.sendTransaction(request); + // const { status, gasUsed: txGasUsed } = await result.wait(); + + // expect(status).toBe(TransactionStatus.success); + // expect(txCost.gasUsed.toString()).toBe(txGasUsed.toString()); + // }); - beforeAll(async () => { - provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - }); - - it('sets gas requirements (contract)', async () => { - const wallet = Wallet.generate({ provider }); - await seedTestWallet(wallet, [[500_000, baseAssetId]]); - - /** - * Create a contract transaction - */ - - const { abiContents, binHexlified, storageSlots } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.COVERAGE_CONTRACT - ); - - const contractFactory = new ContractFactory(binHexlified, abiContents, wallet); - const { transactionRequest: request } = contractFactory.createTransactionRequest({ - storageSlots, - }); - const resources = await provider.getResourcesToSpend(wallet.address, [ - { - amount: bn(100_000), - assetId: baseAssetId, + it('sets gas requirements (predicate)', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 100_000_000, }, - ]); - request.addResources(resources); - - /** - * Get the transaction cost to set a strict gasLimit and min gasPrice - */ - const { maxFee } = await provider.getTransactionCost(request); - - request.maxFee = maxFee; - - /** - * Send transaction - */ - const result = await wallet.sendTransaction(request); - const { status } = await result.waitForResult(); - - expect(status).toBe(TransactionStatus.success); - }); + }); - it('sets gas requirements (script)', async () => { - const sender = Wallet.generate({ provider }); - await seedTestWallet(sender, [[500_000, baseAssetId]]); + const { provider } = launched; /** - * Create a script transaction + * Setup predicate */ - const { binHexlified } = getFuelGaugeForcProject(FuelGaugeProjectsEnum.COMPLEX_SCRIPT); - - const request = new ScriptTransactionRequest({ - script: binHexlified, - scriptData: hexlify(new BigNumberCoder('u64').encode(bn(2000))), + const predicate = new Predicate({ + bytecode: ComplexPredicateAbi__factory.bin, + abi: ComplexPredicateAbi__factory.abi, + provider, + inputData: [bn(1000)], }); - request.addCoinOutput(Address.fromRandom(), bn(100), baseAssetId); - - /** - * Get the transaction cost to set a strict gasLimit and min gasPrice - */ - const txCost = await provider.getTransactionCost(request); - - request.gasLimit = txCost.gasUsed; - request.maxFee = txCost.maxFee; - - await sender.fund(request, txCost); /** - * Send transaction + * Fund the predicate */ - const result = await sender.sendTransaction(request); - const { status, gasUsed: txGasUsed } = await result.wait(); - - expect(status).toBe(TransactionStatus.success); - expect(txCost.gasUsed.toString()).toBe(txGasUsed.toString()); - }); + const fundRequest = new ScriptTransactionRequest(); - it('sets gas requirements (predicate)', async () => { - const { abiContents, binHexlified } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.COMPLEX_PREDICATE - ); + fundRequest.addCoinOutput(Address.fromRandom(), bn(500_000), provider.getBaseAssetId()); - /** - * Setup predicate - */ - const predicate = new Predicate({ - bytecode: binHexlified, - abi: abiContents, - provider, - inputData: [bn(1000)], + const fundTxCost = await provider.getTransactionCost(fundRequest, { + resourcesOwner: predicate, }); - await seedTestWallet(predicate, [[500_000, baseAssetId]]); + fundRequest.gasLimit = fundTxCost.gasUsed; + fundRequest.maxFee = fundTxCost.maxFee; + + await predicate.fund(fundRequest, fundTxCost); /** * Create a script transaction transfer */ const request = new ScriptTransactionRequest(); - request.addCoinOutput(Address.fromRandom(), bn(100), baseAssetId); + request.addCoinOutput(Address.fromRandom(), bn(100), provider.getBaseAssetId()); /** * Get the transaction cost to set a strict gasLimit and min gasPrice @@ -147,73 +174,87 @@ describe(__filename, () => { expect(txCost.gasUsed.toString()).toBe(gasUsedFromReceipts.toString()); }); - it('sets gas requirements (account and predicate with script)', async () => { - const { abiContents, binHexlified } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.COMPLEX_PREDICATE - ); - /** - * Setup account - */ - const wallet = Wallet.generate({ provider }); - await seedTestWallet(wallet, [[500_000, baseAssetId]]); - - /** - * Setup predicate - */ - const predicate = new Predicate({ - bytecode: binHexlified, - abi: abiContents, - provider, - inputData: [bn(1000)], - }); - await seedTestWallet(predicate, [[500_000, baseAssetId]]); - - /** - * Create a script transaction - */ - const { binHexlified: scriptBin } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.COMPLEX_SCRIPT - ); - const request = new ScriptTransactionRequest({ - script: scriptBin, - scriptData: hexlify(new BigNumberCoder('u64').encode(bn(2000))), - }); - // add predicate transfer - const resourcesPredicate = await predicate.getResourcesToSpend([ - { - amount: bn(100_000), - assetId: baseAssetId, - }, - ]); - request.addResources(resourcesPredicate); - - // add account transfer - request.addCoinOutput(Address.fromRandom(), bn(100), baseAssetId); - - const txCost = await provider.getTransactionCost(request, { - resourcesOwner: predicate, - }); - request.gasLimit = txCost.gasUsed; - request.maxFee = txCost.maxFee; - - await wallet.provider.estimatePredicates(request); - - await wallet.fund(request, txCost); - - /** - * Get the transaction cost to set a strict gasLimit and min gasPrice - */ - - /** - * Send transaction predicate - */ - predicate.populateTransactionPredicateData(request); - await wallet.populateTransactionWitnessesSignature(request); - const result = await predicate.sendTransaction(request); - const { status, receipts } = await result.wait(); - const txGasUsed = getGasUsedFromReceipts(receipts); - - expect(status).toBe(TransactionStatus.success); - expect(txCost.gasUsed.toString()).toBe(txGasUsed.toString()); - }); + // it('sets gas requirements (account and predicate with script)', async () => { + // using launched = await launchTestNode({ + // walletsConfig: { + // amountPerCoin: 500_000, + // }, + // }); + + // const { + // provider, + // wallets: [wallet], + // } = launched; + // const baseAssetId = provider.getBaseAssetId(); + + // /** + // * Setup predicate + // */ + // const predicate = new Predicate({ + // bytecode: ComplexPredicateAbi__factory.bin, + // abi: ComplexPredicateAbi__factory.abi, + // provider, + // inputData: [bn(1000)], + // }); + + // /** + // * Fund the predicate + // */ + // const fundRequest = new ScriptTransactionRequest(); + // fundRequest.addCoinOutput(predicate.address, bn(500_000), baseAssetId); + + // const fundTxCost = await provider.getTransactionCost(fundRequest, { + // resourcesOwner: predicate, + // }); + + // await predicate.fund(fundRequest, fundTxCost); + + // /** + // * Create a script transaction + // */ + // const { binHexlified: scriptBin } = getFuelGaugeForcProject( + // FuelGaugeProjectsEnum.COMPLEX_SCRIPT + // ); + // const request = new ScriptTransactionRequest({ + // script: scriptBin, + // scriptData: hexlify(new BigNumberCoder('u64').encode(bn(2000))), + // }); + // // add predicate transfer + // const resourcesPredicate = await predicate.getResourcesToSpend([ + // { + // amount: bn(100_000), + // assetId: baseAssetId, + // }, + // ]); + // request.addResources(resourcesPredicate); + + // // add account transfer + // request.addCoinOutput(Address.fromRandom(), bn(100), baseAssetId); + + // const txCost = await provider.getTransactionCost(request, { + // resourcesOwner: predicate, + // }); + // request.gasLimit = txCost.gasUsed; + // request.maxFee = txCost.maxFee; + + // await wallet.provider.estimatePredicates(request); + + // await wallet.fund(request, txCost); + + // /** + // * Get the transaction cost to set a strict gasLimit and min gasPrice + // */ + + // /** + // * Send transaction predicate + // */ + // predicate.populateTransactionPredicateData(request); + // await wallet.populateTransactionWitnessesSignature(request); + // const result = await predicate.sendTransaction(request); + // const { status, receipts } = await result.wait(); + // const txGasUsed = getGasUsedFromReceipts(receipts); + + // expect(status).toBe(TransactionStatus.success); + // expect(txCost.gasUsed.toString()).toBe(txGasUsed.toString()); + // }); }); diff --git a/packages/fuel-gauge/src/options.test.ts b/packages/fuel-gauge/src/options.test.ts index 4b1c5680064..c243b81976c 100644 --- a/packages/fuel-gauge/src/options.test.ts +++ b/packages/fuel-gauge/src/options.test.ts @@ -1,7 +1,7 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; -import type { WalletUnlocked } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum } from '../test/fixtures'; +import { OptionsAbi__factory } from '../test/typegen/contracts'; +import OptionsAbiHex from '../test/typegen/contracts/OptionsAbi.hex'; import { launchTestContract } from './utils'; @@ -9,14 +9,12 @@ const U8_MAX = 255; const U16_MAX = 65535; const U32_MAX = 4294967295; -let wallet: WalletUnlocked; - -beforeAll(async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); - wallet = await generateTestWallet(contractInstance.provider, [ - [200_000, contractInstance.provider.getBaseAssetId()], - ]); -}); +async function launchOptionsContract() { + return launchTestContract({ + bytecode: OptionsAbiHex, + deployer: OptionsAbi__factory, + }); +} /** * @group node @@ -24,7 +22,8 @@ beforeAll(async () => { */ describe('Options Tests', () => { it('calls', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchOptionsContract(); + const { value } = await contractInstance.functions.print_enum_option_array().call(); expect(value).toStrictEqual({ @@ -47,7 +46,7 @@ describe('Options Tests', () => { const someInput = U8_MAX; const noneInput = undefined; - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchOptionsContract(); const { value: someValue } = await contractInstance.functions.echo_option(someInput).call(); @@ -66,7 +65,7 @@ describe('Options Tests', () => { two: U32_MAX, }; - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchOptionsContract(); const { value: someValue } = await contractInstance.functions .echo_struct_enum_option(someInput) @@ -91,7 +90,7 @@ describe('Options Tests', () => { it('echos vec option', async () => { const someInput = [U8_MAX, U16_MAX, U32_MAX]; - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchOptionsContract(); const { value: someValue } = await contractInstance.functions.echo_vec_option(someInput).call(); @@ -115,7 +114,7 @@ describe('Options Tests', () => { it('echos tuple option', async () => { const someInput = [U8_MAX, U16_MAX]; - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchOptionsContract(); const { value: someValue } = await contractInstance.functions .echo_tuple_option(someInput) @@ -143,7 +142,7 @@ describe('Options Tests', () => { it('echoes enum option', async () => { const someInput = { a: U8_MAX }; - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchOptionsContract(); const { value: someValue } = await contractInstance.functions .echo_enum_option(someInput) @@ -163,7 +162,7 @@ describe('Options Tests', () => { it('echos array option', async () => { const someInput = [U8_MAX, U16_MAX, 123]; - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchOptionsContract(); const { value: someValue } = await contractInstance.functions .echo_array_option(someInput) @@ -195,7 +194,7 @@ describe('Options Tests', () => { }, }; - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchOptionsContract(); const { value } = await contractInstance.functions.echo_deeply_nested_option(input).call(); @@ -203,7 +202,19 @@ describe('Options Tests', () => { }); it('prints struct option', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: OptionsAbi__factory, + bytecode: OptionsAbiHex, + }, + ], + }); + + const { + contracts: [contractInstance], + wallets: [wallet], + } = launched; const { value } = await contractInstance.functions .get_some_struct({ Address: { bits: wallet.address.toB256() } }) @@ -213,7 +224,10 @@ describe('Options Tests', () => { }); it('echoes option enum diff sizes', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.OPTIONS); + using contractInstance = await launchTestContract({ + bytecode: OptionsAbiHex, + deployer: OptionsAbi__factory, + }); const { value } = await contractInstance.functions.echo_enum_diff_sizes(undefined).call(); diff --git a/packages/fuel-gauge/src/payable-annotation.test.ts b/packages/fuel-gauge/src/payable-annotation.test.ts index c7f4d3dd9a5..750a944a14a 100644 --- a/packages/fuel-gauge/src/payable-annotation.test.ts +++ b/packages/fuel-gauge/src/payable-annotation.test.ts @@ -1,17 +1,23 @@ import { bn } from 'fuels'; -import { FuelGaugeProjectsEnum } from '../test/fixtures'; +import { PayableAnnotationAbi__factory } from '../test/typegen/contracts'; +import PayableAnnotationAbiHex from '../test/typegen/contracts/PayableAnnotationAbi.hex'; import { launchTestContract } from './utils'; -beforeAll(() => {}); +async function launchPayableContract() { + return launchTestContract({ + bytecode: PayableAnnotationAbiHex, + deployer: PayableAnnotationAbi__factory, + }); +} /** * @group node * @group browser */ test('allow sending coins to payable functions', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); + using contract = await launchPayableContract(); const baseAssetId = contract.provider.getBaseAssetId(); // This should not fail because the function is payable @@ -29,7 +35,7 @@ test('allow sending coins to payable functions', async () => { }); test("don't allow sending coins to non-payable functions", async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); + using contract = await launchPayableContract(); const baseAssetId = contract.provider.getBaseAssetId(); // This should fail because the function is not payable diff --git a/packages/fuel-gauge/src/policies.test.ts b/packages/fuel-gauge/src/policies.test.ts index 75544776989..1bdf44bec13 100644 --- a/packages/fuel-gauge/src/policies.test.ts +++ b/packages/fuel-gauge/src/policies.test.ts @@ -13,13 +13,11 @@ import { } from 'fuels'; import { getFuelGaugeForcProject, FuelGaugeProjectsEnum } from '../test/fixtures'; -import { PayableAnnotationAbi__factory } from '../test/typegen/contracts'; -import PayableAnnotationAbiHex from '../test/typegen/contracts/PayableAnnotationAbi.hex'; -import { launchTestContract } from './utils'; +import { createSetupConfig } from './utils'; + /** * @group node - * @group browser */ describe('Policies', () => { let provider: Provider; @@ -195,10 +193,15 @@ describe('Policies', () => { }); it('should ensure TX policies are properly set (BaseInvocationScope)', async () => { - using contract = await launchTestContract({ - deployer: PayableAnnotationAbi__factory, - bytecode: PayableAnnotationAbiHex, - }); + const { binHexlified, abiContents } = getFuelGaugeForcProject( + FuelGaugeProjectsEnum.PAYABLE_ANNOTATION + ); + + const contract = await createSetupConfig({ + contractBytecode: binHexlified, + abi: abiContents, + cache: true, + })(); const callScope = contract.functions.payable().txParams({ tip: 5, @@ -270,7 +273,15 @@ describe('Policies', () => { }); it('should ensure TX policies are properly set (Account Contract Transfer)', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); + const { binHexlified, abiContents } = getFuelGaugeForcProject( + FuelGaugeProjectsEnum.PAYABLE_ANNOTATION + ); + + const contract = await createSetupConfig({ + contractBytecode: binHexlified, + abi: abiContents, + cache: true, + })(); const txParams: CustomTxParams = { tip: 1, @@ -323,10 +334,18 @@ describe('Policies', () => { }); it('on account transferring to contract', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); - const maxFee = 1; + const { binHexlified, abiContents } = getFuelGaugeForcProject( + FuelGaugeProjectsEnum.PAYABLE_ANNOTATION + ); + + const contract = await createSetupConfig({ + contractBytecode: binHexlified, + abi: abiContents, + cache: true, + })(); + const txParams: CustomTxParams = { maturity: await randomMaturity(), witnessLimit: 800, @@ -376,10 +395,18 @@ describe('Policies', () => { }); it('on a contract call', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.PAYABLE_ANNOTATION); - const maxFee = 1; + const { binHexlified, abiContents } = getFuelGaugeForcProject( + FuelGaugeProjectsEnum.PAYABLE_ANNOTATION + ); + + const contract = await createSetupConfig({ + contractBytecode: binHexlified, + abi: abiContents, + cache: true, + })(); + const txParams: CustomTxParams = { maturity: await randomMaturity(), witnessLimit: 800, diff --git a/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts b/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts index 0ea0510b705..d24aab4eab5 100644 --- a/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts +++ b/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts @@ -1,26 +1,19 @@ import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { ASSET_A, ASSET_B } from '@fuel-ts/utils/test-utils'; import { Provider, FUEL_NETWORK_URL, Predicate, Wallet, ScriptTransactionRequest, bn } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { PredicateConditionalInputsAbi__factory } from '../test/typegen/predicates'; /** * @group node + * @group browser */ describe('PredicateConditionalInputs', () => { - let baseAssetId: string; - - const { binHexlified: predicateBytecode, abiContents: abiJSON } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PREDICATE_CONDITIONAL_INPUTS - ); - - beforeAll(async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - }); - it('should execute custom transaction where predicate transfers to Alice (ALICE PAYS FEES)', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); + using launched = await launchTestNode(); + + const { provider } = launched; const aliceWallet = Wallet.generate({ provider, @@ -29,13 +22,13 @@ describe('PredicateConditionalInputs', () => { const amountToTransfer = 1000; const adminWallet = await generateTestWallet(provider, [ - [800_000, baseAssetId], + [800_000, provider.getBaseAssetId()], [800_000, ASSET_A], ]); const predicate = new Predicate({ - bytecode: predicateBytecode, - abi: abiJSON, + bytecode: PredicateConditionalInputsAbi__factory.bin, + abi: PredicateConditionalInputsAbi__factory.abi, provider, configurableConstants: { MAKER: aliceWallet.address.toB256() }, }); @@ -46,7 +39,7 @@ describe('PredicateConditionalInputs', () => { await tx1.waitForResult(); // transfer base asset to Alice so she can pay the fees - const tx2 = await adminWallet.transfer(aliceWallet.address, 200_000, baseAssetId); + const tx2 = await adminWallet.transfer(aliceWallet.address, 200_000, provider.getBaseAssetId()); await tx2.waitForResult(); @@ -54,7 +47,7 @@ describe('PredicateConditionalInputs', () => { // fetch predicate resources to spend const predicateResoruces = await predicate.getResourcesToSpend([[amountToTransfer, ASSET_A]]); - const aliceResources = await aliceWallet.getResourcesToSpend([[1, baseAssetId]]); + const aliceResources = await aliceWallet.getResourcesToSpend([[1, provider.getBaseAssetId()]]); request .addResources(aliceResources) @@ -97,7 +90,9 @@ describe('PredicateConditionalInputs', () => { }); it('should execute custom transaction where predicate transfer to Alice (PREDICATE PAYS FEES)', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); + using launched = await launchTestNode(); + + const { provider } = launched; const aliceWallet = Wallet.generate({ provider, @@ -106,14 +101,14 @@ describe('PredicateConditionalInputs', () => { const amountToTransfer = 1000; const adminWallet = await generateTestWallet(provider, [ - [500_000, baseAssetId], + [500_000, provider.getBaseAssetId()], [500_000, ASSET_A], [500_000, ASSET_B], ]); const predicate = new Predicate({ - bytecode: predicateBytecode, - abi: abiJSON, + bytecode: PredicateConditionalInputsAbi__factory.bin, + abi: PredicateConditionalInputsAbi__factory.abi, provider, configurableConstants: { MAKER: aliceWallet.address.toB256() }, }); @@ -124,7 +119,7 @@ describe('PredicateConditionalInputs', () => { await tx1.waitForResult(); // transfer base asset to predicate so it can pay the fees - const tx2 = await adminWallet.transfer(predicate.address, 200_000, baseAssetId); + const tx2 = await adminWallet.transfer(predicate.address, 200_000, provider.getBaseAssetId()); await tx2.waitForResult(); diff --git a/packages/fuel-gauge/src/raw-slice.test.ts b/packages/fuel-gauge/src/raw-slice.test.ts index d1db6fe0c90..a348ca29f78 100644 --- a/packages/fuel-gauge/src/raw-slice.test.ts +++ b/packages/fuel-gauge/src/raw-slice.test.ts @@ -1,8 +1,10 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; -import { bn, Predicate, Wallet, Address, Provider, FUEL_NETWORK_URL } from 'fuels'; +import { bn, Predicate, Wallet, Address } from 'fuels'; import type { BN } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { RawSliceAbi__factory } from '../test/typegen/contracts'; +import RawSliceAbiHex from '../test/typegen/contracts/RawSliceAbi.hex'; +import { PredicateRawSliceAbi__factory } from '../test/typegen/predicates'; import { getScript, launchTestContract } from './utils'; @@ -16,29 +18,19 @@ type Wrapper = { inner_enum: SomeEnum; }; -const setup = async (balance = 500_000) => { - const provider = await Provider.create(FUEL_NETWORK_URL); - const baseAssetId = provider.getBaseAssetId(); - - // Create wallet - const wallet = await generateTestWallet(provider, [[balance, baseAssetId]]); - - return wallet; -}; - -let baseAssetId: string; -beforeAll(async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.RAW_SLICE); - baseAssetId = contractInstance.provider.getBaseAssetId(); -}); - +async function setupRawSliceContract() { + return launchTestContract({ + deployer: RawSliceAbi__factory, + bytecode: RawSliceAbiHex, + }); +} /** * @group node * @group browser */ describe('Raw Slice Tests', () => { it('should test raw slice output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.RAW_SLICE); + using contractInstance = await setupRawSliceContract(); const INPUT = 10; @@ -48,7 +40,7 @@ describe('Raw Slice Tests', () => { }); it('should test raw slice input', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.RAW_SLICE); + using contractInstance = await setupRawSliceContract(); const INPUT = [40, 41, 42]; @@ -58,7 +50,7 @@ describe('Raw Slice Tests', () => { }); it('should test raw slice input [nested]', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.RAW_SLICE); + using contractInstance = await setupRawSliceContract(); const slice = [40, 41, 42]; const INPUT = { @@ -74,15 +66,18 @@ describe('Raw Slice Tests', () => { }); it('should test raw slice input [predicate-raw-slice]', async () => { - const wallet = await setup(); - const receiver = Wallet.fromAddress(Address.fromRandom(), wallet.provider); + using launched = await launchTestNode(); + + const { + provider, + wallets: [wallet], + } = launched; + + const receiver = Wallet.fromAddress(Address.fromRandom(), provider); const amountToPredicate = 300_000; const amountToReceiver = 50; type MainArgs = [Wrapper]; - const { binHexlified: predicateRawSlice, abiContents: predicateRawSliceAbi } = - getFuelGaugeForcProject(FuelGaugeProjectsEnum.PREDICATE_RAW_SLICE); - const bytes = [40, 41, 42]; const INPUT: Wrapper = { inner: [bytes, bytes], @@ -90,23 +85,33 @@ describe('Raw Slice Tests', () => { }; const predicate = new Predicate({ - bytecode: predicateRawSlice, - abi: predicateRawSliceAbi, + bytecode: PredicateRawSliceAbi__factory.bin, + abi: PredicateRawSliceAbi__factory.abi, provider: wallet.provider, inputData: [INPUT], }); // setup predicate - const setupTx = await wallet.transfer(predicate.address, amountToPredicate, baseAssetId, { - gasLimit: 10_000, - }); + const setupTx = await wallet.transfer( + predicate.address, + amountToPredicate, + provider.getBaseAssetId(), + { + gasLimit: 10_000, + } + ); await setupTx.waitForResult(); const initialReceiverBalance = await receiver.getBalance(); - const tx = await predicate.transfer(receiver.address, amountToReceiver, baseAssetId, { - gasLimit: 10_000, - }); + const tx = await predicate.transfer( + receiver.address, + amountToReceiver, + provider.getBaseAssetId(), + { + gasLimit: 10_000, + } + ); const { isStatusSuccess } = await tx.waitForResult(); // Check the balance of the receiver diff --git a/packages/fuel-gauge/src/reentrant-contract-calls.test.ts b/packages/fuel-gauge/src/reentrant-contract-calls.test.ts index 9665fd8df1b..d6ab95ba5f6 100644 --- a/packages/fuel-gauge/src/reentrant-contract-calls.test.ts +++ b/packages/fuel-gauge/src/reentrant-contract-calls.test.ts @@ -1,35 +1,38 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; -import type { Contract, WalletUnlocked } from 'fuels'; -import { ContractFactory, FUEL_NETWORK_URL, Provider, ReceiptType, bn } from 'fuels'; +import { ContractFactory, ReceiptType, bn } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; - -const bar = getFuelGaugeForcProject(FuelGaugeProjectsEnum.REENTRANT_BAR); -const foo = getFuelGaugeForcProject(FuelGaugeProjectsEnum.REENTRANT_FOO); -const storageTest = getFuelGaugeForcProject(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); +import type { ReentrantBarAbi, ReentrantFooAbi } from '../test/typegen/contracts'; +import { + ReentrantBarAbi__factory, + ReentrantFooAbi__factory, + StorageTestContractAbi__factory, +} from '../test/typegen/contracts'; +import ReentrantBarAbiHex from '../test/typegen/contracts/ReentrantBarAbi.hex'; +import ReentrantFooAbiHex from '../test/typegen/contracts/ReentrantFooAbi.hex'; +import StorageTestContractAbiHex from '../test/typegen/contracts/StorageTestContractAbi.hex'; /** * @group node + * @group browser */ describe('Reentrant Contract Calls', () => { - let barContract: Contract; - let fooContract: Contract; - let wallet: WalletUnlocked; - let baseAssetId: string; - - beforeAll(async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - wallet = await generateTestWallet(provider, [[500_000, baseAssetId]]); - - const factoryBar = new ContractFactory(bar.binHexlified, bar.abiContents, wallet); - barContract = await factoryBar.deployContract(); + it('should ensure the SDK returns the proper value for a reentrant call', async () => { + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: ReentrantFooAbi__factory, + bytecode: ReentrantFooAbiHex, + }, + { + deployer: ReentrantBarAbi__factory, + bytecode: ReentrantBarAbiHex, + }, + ], + }); - const factoryFoo = new ContractFactory(foo.binHexlified, foo.abiContents, wallet); - fooContract = await factoryFoo.deployContract(); - }); + const fooContract = launched.contracts[0] as ReentrantFooAbi; + const barContract = launched.contracts[1] as ReentrantBarAbi; - it('should ensure the SDK returns the proper value for a reentrant call', async () => { const { value, transactionResult: { receipts }, @@ -64,11 +67,31 @@ describe('Reentrant Contract Calls', () => { }); it('should ensure the SDK returns the proper value for a reentrant call on multi-call', async () => { + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: ReentrantFooAbi__factory, + bytecode: ReentrantFooAbiHex, + }, + { + deployer: ReentrantBarAbi__factory, + bytecode: ReentrantBarAbiHex, + }, + ], + }); + + const { + wallets: [wallet], + } = launched; + + const fooContract = launched.contracts[0] as ReentrantFooAbi; + const barContract = launched.contracts[1] as ReentrantBarAbi; + const storageContract = await new ContractFactory( - storageTest.binHexlified, - storageTest.abiContents, + StorageTestContractAbiHex, + StorageTestContractAbi__factory.abi, wallet - ).deployContract({ storageSlots: storageTest.storageSlots }); + ).deployContract({ storageSlots: StorageTestContractAbi__factory.storageSlots }); const reentrantCall = fooContract.functions.foo( { bits: fooContract.id.toB256() }, diff --git a/packages/fuel-gauge/src/revert-error.test.ts b/packages/fuel-gauge/src/revert-error.test.ts index 5ccb40615b1..7fa3d6f8458 100644 --- a/packages/fuel-gauge/src/revert-error.test.ts +++ b/packages/fuel-gauge/src/revert-error.test.ts @@ -1,35 +1,30 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { ErrorCode, FuelError } from '@fuel-ts/errors'; import { expectToThrowFuelError } from '@fuel-ts/errors/test-utils'; -import type { Contract, WalletUnlocked, TransactionResultReceipt } from 'fuels'; -import { bn, ContractFactory, Provider, FUEL_NETWORK_URL, getRandomB256 } from 'fuels'; +import type { TransactionResultReceipt } from 'fuels'; +import { bn, getRandomB256, ContractFactory } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { RevertErrorAbi__factory } from '../test/typegen/contracts'; +import RevertErrorAbiHex from '../test/typegen/contracts/RevertErrorAbi.hex'; -let contractInstance: Contract; -let wallet: WalletUnlocked; +import { launchTestContract } from './utils'; + +async function launchContract() { + return launchTestContract({ + deployer: RevertErrorAbi__factory, + bytecode: RevertErrorAbiHex, + }); +} /** * @group node + * @group browser */ describe('Revert Error Testing', () => { - let provider: Provider; - let baseAssetId: string; - - beforeAll(async () => { - provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - wallet = await generateTestWallet(provider, [[1_000_000, baseAssetId]]); - - const { binHexlified: bytecode, abiContents: FactoryAbi } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.REVERT_ERROR - ); - - const factory = new ContractFactory(bytecode, FactoryAbi, wallet); - contractInstance = await factory.deployContract(); - }); - it('can pass require checks [valid]', async () => { + using contractInstance = await launchContract(); + const INPUT_PRICE = bn(10); const INPUT_TOKEN_ID = bn(100); @@ -48,6 +43,8 @@ describe('Revert Error Testing', () => { }); it('should throw for "require" revert TX [PriceCantBeZero]', async () => { + using contractInstance = await launchContract(); + const INPUT_PRICE = bn(0); const INPUT_TOKEN_ID = bn(100); @@ -68,6 +65,8 @@ describe('Revert Error Testing', () => { }); it('should throw for "require" revert TX [InvalidTokenId]', async () => { + using contractInstance = await launchContract(); + const INPUT_PRICE = bn(10); const INPUT_TOKEN_ID = bn(55); @@ -88,6 +87,8 @@ describe('Revert Error Testing', () => { }); it('should throw for revert TX with reason "TransferZeroCoins"', async () => { + using contractInstance = await launchContract(); + await expectToThrowFuelError( () => contractInstance.functions.failed_transfer_revert().call(), new FuelError( @@ -105,6 +106,8 @@ describe('Revert Error Testing', () => { }); it('should throw for "assert" revert TX', async () => { + using contractInstance = await launchContract(); + const INPUT_PRICE = bn(100); const INPUT_TOKEN_ID = bn(100); @@ -125,6 +128,8 @@ describe('Revert Error Testing', () => { }); it('should throw for revert TX with reason "NotEnoughBalance"', async () => { + using contractInstance = await launchContract(); + await expectToThrowFuelError( () => contractInstance.functions.failed_transfer().call(), new FuelError( @@ -142,6 +147,8 @@ describe('Revert Error Testing', () => { }); it('should throw for "assert_eq" revert TX', async () => { + using contractInstance = await launchContract(); + await expectToThrowFuelError( () => contractInstance.functions.assert_value_eq_10(9).call(), new FuelError( @@ -159,6 +166,8 @@ describe('Revert Error Testing', () => { }); it('should throw for "assert_ne" revert TX', async () => { + using contractInstance = await launchContract(); + await expectToThrowFuelError( () => contractInstance.functions.assert_value_ne_5(5).call(), new FuelError( @@ -176,6 +185,12 @@ describe('Revert Error Testing', () => { }); it('should throw for a missing OutputChange', async () => { + using launched = await launchTestNode(); + + const { + wallets: [wallet], + provider, + } = launched; const { binHexlified: tokenBytecode, abiContents: tokenAbi } = getFuelGaugeForcProject( FuelGaugeProjectsEnum.TOKEN_CONTRACT ); @@ -224,6 +239,8 @@ describe('Revert Error Testing', () => { }); it('should throw UNKNOWN Error for revert', async () => { + using contractInstance = await launchContract(); + await expectToThrowFuelError( () => contractInstance.functions.revert_with_0().call(), new FuelError(ErrorCode.UNKNOWN, `The transaction reverted with an unknown reason: 0`, { @@ -237,6 +254,8 @@ describe('Revert Error Testing', () => { }); it('should ensure errors from getTransactionCost dry-run are properly thrown', async () => { + using contractInstance = await launchContract(); + await expectToThrowFuelError( () => contractInstance.functions.assert_value_ne_5(5).getTransactionCost(), new FuelError( diff --git a/packages/fuel-gauge/src/script-main-args.test.ts b/packages/fuel-gauge/src/script-main-args.test.ts index cf464c48b4a..8186941da42 100644 --- a/packages/fuel-gauge/src/script-main-args.test.ts +++ b/packages/fuel-gauge/src/script-main-args.test.ts @@ -1,21 +1,11 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import type { BigNumberish } from 'fuels'; -import { Provider, bn, Script, FUEL_NETWORK_URL } from 'fuels'; +import { bn, Script } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; import { getScript } from './utils'; -const setup = async (balance = 500_000) => { - const provider = await Provider.create(FUEL_NETWORK_URL); - const baseAssetId = provider.getBaseAssetId(); - - // Create wallet - const wallet = await generateTestWallet(provider, [[balance, baseAssetId]]); - - return wallet; -}; - type Baz = { x: number; }; @@ -24,12 +14,16 @@ type Baz = { * @group node */ describe('Script Coverage', () => { - const { binHexlified: scriptBin, abiContents: scriptAbi } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.SCRIPT_MAIN_ARGS - ); - it('can call script and use main arguments', async () => { - const wallet = await setup(); + using launched = await launchTestNode(); + const { + wallets: [wallet], + } = launched; + + const { binHexlified: scriptBin, abiContents: scriptAbi } = getFuelGaugeForcProject( + FuelGaugeProjectsEnum.SCRIPT_MAIN_ARGS + ); + // #region script-call-factory const foo = 33; const scriptInstance = new Script(scriptBin, scriptAbi, wallet); @@ -42,7 +36,11 @@ describe('Script Coverage', () => { }); it('can call script and use main arguments [two args, read logs]', async () => { - const wallet = await setup(); + using launched = await launchTestNode(); + const { + wallets: [wallet], + } = launched; + const scriptInstance = getScript<[BigNumberish, Baz], Baz>('script-main-two-args', wallet); const foo = 33; const bar: Baz = { @@ -56,7 +54,11 @@ describe('Script Coverage', () => { }); it('can call script and use main arguments [two args, struct return]', async () => { - const wallet = await setup(); + using launched = await launchTestNode(); + const { + wallets: [wallet], + } = launched; + const scriptInstance = getScript<[BigNumberish, Baz], Baz>('script-main-return-struct', wallet); const foo = 1; const bar: Baz = { @@ -71,7 +73,15 @@ describe('Script Coverage', () => { }); it('can call script and use main arguments [tx params]', async () => { - const wallet = await setup(); + using launched = await launchTestNode(); + const { + wallets: [wallet], + } = launched; + + const { binHexlified: scriptBin, abiContents: scriptAbi } = getFuelGaugeForcProject( + FuelGaugeProjectsEnum.SCRIPT_MAIN_ARGS + ); + const scriptInstance = new Script(scriptBin, scriptAbi, wallet); const foo = 42; From 89d356abba375b0918fc266fd8e0c58dd11e667b Mon Sep 17 00:00:00 2001 From: chad Date: Tue, 2 Jul 2024 18:19:11 -0500 Subject: [PATCH 20/53] refactor: refactored more tests to use launchTestNode --- .../src/test-utils/launch-test-node.ts | 3 + .../fuel-gauge/src/advanced-logging.test.ts | 24 +- .../fuel-gauge/src/await-execution.test.ts | 36 +- .../fuel-gauge/src/bytecode-sway-lib.test.ts | 7 +- packages/fuel-gauge/src/bytes.test.ts | 42 +- .../fuel-gauge/src/call-test-contract.test.ts | 1 + .../fuel-gauge/src/contract-factory.test.ts | 45 +- packages/fuel-gauge/src/contract.test.ts | 445 ++++++++++++------ packages/fuel-gauge/src/doc-examples.test.ts | 100 ++-- .../src/dry-run-multiple-txs.test.ts | 138 +++--- .../src/funding-transaction.test.ts | 2 +- .../src/multi-token-contract.test.ts | 2 +- .../src/transaction-summary.test.ts | 17 - packages/fuel-gauge/src/transaction.test.ts | 17 +- packages/fuel-gauge/src/vector-types.test.ts | 71 +-- packages/fuel-gauge/src/vectors.test.ts | 66 +-- 16 files changed, 625 insertions(+), 391 deletions(-) diff --git a/packages/contract/src/test-utils/launch-test-node.ts b/packages/contract/src/test-utils/launch-test-node.ts index de2decf9f1f..d131973d286 100644 --- a/packages/contract/src/test-utils/launch-test-node.ts +++ b/packages/contract/src/test-utils/launch-test-node.ts @@ -8,12 +8,15 @@ import { FuelError } from '@fuel-ts/errors'; import type { BytesLike } from '@fuel-ts/interfaces'; import type { Contract } from '@fuel-ts/program'; import type { SnapshotConfigs } from '@fuel-ts/utils'; +import { EventEmitter } from 'events'; import { readFileSync } from 'fs'; import * as path from 'path'; import { mergeDeepRight } from 'ramda'; import type { DeployContractOptions } from '../contract-factory'; +EventEmitter.defaultMaxListeners = 20; + interface ContractDeployer { deployContract( bytecode: BytesLike, diff --git a/packages/fuel-gauge/src/advanced-logging.test.ts b/packages/fuel-gauge/src/advanced-logging.test.ts index 19e81c12d97..ce2f2466552 100644 --- a/packages/fuel-gauge/src/advanced-logging.test.ts +++ b/packages/fuel-gauge/src/advanced-logging.test.ts @@ -222,8 +222,13 @@ describe('Advanced Logging', () => { { deployer: ConfigurableContractAbi__factory, bytecode: ConfigurableContractAbiHex }, { deployer: CoverageContractAbi__factory, bytecode: CoverageContractAbiHex }, ], + walletsConfig: { + amountPerCoin: 500_000, + }, }); + const wallet = launched.wallets[0]; + // #TODO: Find a cleaner way to infer these types const advancedLogContract = launched.contracts[0] as AdvancedLoggingAbi; const otherAdvancedLogContract = launched.contracts[1] as AdvancedLoggingAbi; @@ -231,10 +236,6 @@ describe('Advanced Logging', () => { const configurable = launched.contracts[3] as ConfigurableContractAbi; const coverage = launched.contracts[4] as CoverageContractAbi; - const wallet = await generateTestWallet(launched.provider, [ - [500_000, launched.provider.getBaseAssetId()], - ]); - const request = await callTest .multiCall([ advancedLogContract.functions @@ -293,14 +294,15 @@ describe('Advanced Logging', () => { bytecode: AdvancedLoggingOtherContractAbiHex, }, ], + walletsConfig: { + amountPerCoin: 300_000, + }, }); const advancedLogContract = launched.contracts[0] as AdvancedLoggingAbi; const otherAdvancedLogContract = launched.contracts[1] as AdvancedLoggingAbi; - const wallet = await generateTestWallet(launched.provider, [ - [300_000, launched.provider.getBaseAssetId()], - ]); + const wallet = launched.wallets[0]; const { abiContents, binHexlified } = getFuelGaugeForcProject( FuelGaugeProjectsEnum.SCRIPT_CALL_CONTRACT @@ -323,14 +325,16 @@ describe('Advanced Logging', () => { bytecode: AdvancedLoggingOtherContractAbiHex, }, ], + walletsConfig: { + amountPerCoin: 300_000, + }, }); const advancedLogContract = launched.contracts[0] as AdvancedLoggingAbi; const otherAdvancedLogContract = launched.contracts[1] as AdvancedLoggingAbi; - const wallet = await generateTestWallet(launched.provider, [ - [300_000, launched.provider.getBaseAssetId()], - ]); + const wallet = launched.wallets[0]; + const { abiContents, binHexlified } = getFuelGaugeForcProject( FuelGaugeProjectsEnum.SCRIPT_CALL_CONTRACT ); diff --git a/packages/fuel-gauge/src/await-execution.test.ts b/packages/fuel-gauge/src/await-execution.test.ts index 1166ab9700d..b4905c3988c 100644 --- a/packages/fuel-gauge/src/await-execution.test.ts +++ b/packages/fuel-gauge/src/await-execution.test.ts @@ -1,5 +1,5 @@ import { Provider, WalletUnlocked, randomBytes, Wallet, FUEL_NETWORK_URL } from 'fuels'; -import { launchNode } from 'fuels/test-utils'; +import { launchNode, launchTestNode } from 'fuels/test-utils'; /** * @group node @@ -7,38 +7,40 @@ import { launchNode } from 'fuels/test-utils'; */ describe('await-execution', () => { test('awaiting execution of a transaction on the provider works', async () => { - const { cleanup, ip, port } = await launchNode({ - args: ['--poa-instant', 'false', '--poa-interval-period', '400ms'], - }); - const nodeProvider = await Provider.create(`http://${ip}:${port}/v1/graphql`); - const baseAssetId = nodeProvider.getBaseAssetId(); + using launched = await launchTestNode(); + + const { provider } = launched; const genesisWallet = new WalletUnlocked( process.env.GENESIS_SECRET || randomBytes(32), - nodeProvider + provider ); - const destination = Wallet.generate({ provider: nodeProvider }); + const destination = Wallet.generate({ provider }); - const transfer = await genesisWallet.createTransfer(destination.address, 100, baseAssetId, { - gasLimit: 10_000, - }); + const transfer = await genesisWallet.createTransfer( + destination.address, + 100, + provider.getBaseAssetId(), + { + gasLimit: 10_000, + } + ); transfer.updateWitnessByOwner( genesisWallet.address, await genesisWallet.signTransaction(transfer) ); - const response = await nodeProvider.sendTransaction(transfer, { awaitExecution: true }); + const response = await provider.sendTransaction(transfer, { awaitExecution: true }); expect(response.gqlTransaction?.status?.type).toBe('SuccessStatus'); - - cleanup(); }); test.skip('transferring funds with awaitExecution works', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - const baseAssetId = provider.getBaseAssetId(); + using launched = await launchTestNode(); + + const { provider } = launched; const genesisWallet = new WalletUnlocked( process.env.GENESIS_SECRET || randomBytes(32), @@ -52,7 +54,7 @@ describe('await-execution', () => { await genesisWallet.transfer( destination.address, 100, - baseAssetId, + provider.getBaseAssetId(), { gasLimit: 10_000, } diff --git a/packages/fuel-gauge/src/bytecode-sway-lib.test.ts b/packages/fuel-gauge/src/bytecode-sway-lib.test.ts index 926c7fa8224..7bb0638b661 100644 --- a/packages/fuel-gauge/src/bytecode-sway-lib.test.ts +++ b/packages/fuel-gauge/src/bytecode-sway-lib.test.ts @@ -1,4 +1,5 @@ -import { FUEL_NETWORK_URL, Predicate, Provider, arrayify } from 'fuels'; +import { Predicate, arrayify } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; import { defaultPredicateAbi } from '../test/fixtures/abi/predicate'; import { defaultPredicateBytecode } from '../test/fixtures/bytecode/predicate'; @@ -48,7 +49,9 @@ describe('bytecode computations', () => { }); test('compute_predicate_address', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); + using launched = await launchTestNode(); + + const { provider } = launched; const predicate = new Predicate({ bytecode: defaultPredicateBytecode, diff --git a/packages/fuel-gauge/src/bytes.test.ts b/packages/fuel-gauge/src/bytes.test.ts index 2b1e1095d9f..8cdb3cbf154 100644 --- a/packages/fuel-gauge/src/bytes.test.ts +++ b/packages/fuel-gauge/src/bytes.test.ts @@ -1,5 +1,6 @@ -import { bn, Predicate, Wallet, Address, Provider, FUEL_NETWORK_URL } from 'fuels'; +import { bn, Predicate, Wallet, Address } from 'fuels'; import type { BN } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; import { BytesAbi__factory } from '../test/typegen/contracts'; @@ -16,16 +17,6 @@ type Wrapper = { inner: number[][]; inner_enum: SomeEnum; }; - -const setup = async (balance = 500_000) => { - const provider = await Provider.create(FUEL_NETWORK_URL); - const baseAssetId = provider.getBaseAssetId(); - // Create wallet - const wallet = await generateTestWallet(provider, [[balance, baseAssetId]]); - - return wallet; -}; - /** * @group node * @group browser @@ -85,12 +76,22 @@ describe('Bytes Tests', () => { }); it('should test bytes input [predicate-bytes]', async () => { - using launched = await launchTestContract({ - deployer: BytesAbi__factory, - bytecode: BytesAbiHex, + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: BytesAbi__factory, + bytecode: BytesAbiHex, + }, + ], + walletsConfig: { + amountPerCoin: 1_000_000, + }, }); - const wallet = await setup(1_000_000); + const { + wallets: [wallet], + } = launched; + const receiver = Wallet.fromAddress(Address.fromRandom(), wallet.provider); const amountToPredicate = 500_000; const amountToReceiver = 50; @@ -147,7 +148,16 @@ describe('Bytes Tests', () => { }); it('should test bytes input [script-bytes]', async () => { - const wallet = await setup(); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 500_000, + }, + }); + + const { + wallets: [wallet], + } = launched; + type MainArgs = [number, Wrapper]; const scriptInstance = getScript('script-bytes', wallet); diff --git a/packages/fuel-gauge/src/call-test-contract.test.ts b/packages/fuel-gauge/src/call-test-contract.test.ts index 58845f10bc9..f6bb03e08a0 100644 --- a/packages/fuel-gauge/src/call-test-contract.test.ts +++ b/packages/fuel-gauge/src/call-test-contract.test.ts @@ -1,5 +1,6 @@ import type { Contract } from 'fuels'; import { BN, bn, toHex } from 'fuels'; +import { ASSET_A } from 'fuels/test-utils'; import { CallTestContractAbi__factory } from '../test/typegen/contracts'; import bytecode from '../test/typegen/contracts/CallTestContractAbi.hex'; diff --git a/packages/fuel-gauge/src/contract-factory.test.ts b/packages/fuel-gauge/src/contract-factory.test.ts index f5e5fd18904..228f87d0191 100644 --- a/packages/fuel-gauge/src/contract-factory.test.ts +++ b/packages/fuel-gauge/src/contract-factory.test.ts @@ -2,6 +2,7 @@ import type { Account, TransactionResult } from '@fuel-ts/account'; import { FuelError, ErrorCode } from '@fuel-ts/errors'; import { expectToThrowFuelError } from '@fuel-ts/errors/test-utils'; import { BN, bn, toHex, Interface, ContractFactory } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; import { StorageTestContractAbi__factory } from '../test/typegen/contracts'; import StorageTestContractAbiHex from '../test/typegen/contracts/StorageTestContractAbi.hex'; @@ -96,8 +97,21 @@ describe('Contract Factory', () => { }); it('should not override user input maxFee when calling deployContract', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 5_000_000, + }, + }); + const { + wallets: [wallet], + } = launched; + const setFee = bn(120_000); - const factory = await createContractFactory(); + const factory = new ContractFactory( + StorageTestContractAbiHex, + StorageTestContractAbi__factory.abi, + wallet + ); const spy = vi.spyOn(factory.account as Account, 'sendTransaction'); await factory.deployContract({ @@ -139,7 +153,20 @@ describe('Contract Factory', () => { }); it('Creates a contract with initial storage (dynamic key)', async () => { - const factory = await createContractFactory(); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 5_000_000, + }, + }); + const { + wallets: [wallet], + } = launched; + + const factory = new ContractFactory( + StorageTestContractAbiHex, + StorageTestContractAbi__factory.abi, + wallet + ); const b256 = '0x626f0c36909faecc316056fca8be684ab0cd06afc63247dc008bdf9e433f927a'; const contact = await factory.deployContract({ @@ -153,15 +180,25 @@ describe('Contract Factory', () => { }); it('Creates a contract with initial storage. Both dynamic key and fixed vars', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 5_000_000, + }, + }); + const { + wallets: [wallet], + } = launched; + const factory = new ContractFactory( StorageTestContractAbiHex, - StorageTestContractAbi__factory.abi + StorageTestContractAbi__factory.abi, + wallet ); const b256 = '0x626f0c36909faecc316056fca8be684ab0cd06afc63247dc008bdf9e433f927a'; const contract = await factory.deployContract({ storageSlots: [ - ...storageSlots, // initializing from storage_slots.json + ...StorageTestContractAbi__factory.storageSlots, // initializing from storage_slots.json { key: '0000000000000000000000000000000000000000000000000000000000000001', value: b256 }, // Initializing manual value ], }); diff --git a/packages/fuel-gauge/src/contract.test.ts b/packages/fuel-gauge/src/contract.test.ts index 9c2df544bce..12a49dd3d2b 100644 --- a/packages/fuel-gauge/src/contract.test.ts +++ b/packages/fuel-gauge/src/contract.test.ts @@ -1,12 +1,4 @@ import { ErrorCode, FuelError } from '@fuel-ts/errors'; -import type { - TransactionRequestLike, - TransactionResponse, - TransactionType, - JsonAbi, - ScriptTransactionRequest, - TransferParams, -} from 'fuels'; import { BN, getRandomB256, @@ -23,6 +15,15 @@ import { FUEL_NETWORK_URL, Predicate, PolicyType, + ZeroBytes32, +} from 'fuels'; +import type { + TransactionRequestLike, + TransactionResponse, + TransactionType, + JsonAbi, + ScriptTransactionRequest, + TransferParams, } from 'fuels'; import { generateTestWallet, @@ -30,9 +31,16 @@ import { expectToThrowFuelError, ASSET_A, ASSET_B, + launchTestNode, } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { + CallTestContractAbi__factory, + StorageTestContractAbi__factory, +} from '../test/typegen/contracts'; +import CallTestContractAbiHex from '../test/typegen/contracts/CallTestContractAbi.hex'; +import StorageTestContractAbiHex from '../test/typegen/contracts/StorageTestContractAbi.hex'; +import { PredicateTrueAbi__factory } from '../test/typegen/predicates/factories/PredicateTrueAbi__factory'; import { launchTestContract } from './utils'; @@ -156,17 +164,32 @@ const txPointer = '0x00000000000000000000000000000000'; const AltToken = '0x0101010101010101010101010101010101010101010101010101010101010101'; +async function setupTestContract() { + return launchTestContract({ + deployer: CallTestContractAbi__factory, + bytecode: CallTestContractAbiHex, + }); +} + /** * @group node * @group browser */ describe('Contract', () => { it('generates function methods on a simple contract', async () => { - using contract = await launchTestContract({ - deployer: jsonFragment, - bytecode: jsonFragmentHex, + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000, + }, }); - const spy = vi.spyOn(contract.account as Account, 'sendTransaction'); + const { + provider, + wallets: [wallet], + } = launched; + + const contract = new Contract(ZeroBytes32, jsonFragment, wallet); + + const spy = vi.spyOn(provider, 'sendTransaction'); const fragment = contract.interface.getFunction('entry_one'); const interfaceSpy = vi.spyOn(fragment, 'encodeArguments'); @@ -182,6 +205,18 @@ describe('Contract', () => { }); it('generates function methods on a complex contract', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000, + }, + }); + const { + provider, + wallets: [wallet], + } = launched; + + const contract = new Contract(ZeroBytes32, complexFragment, wallet); + const spy = vi.spyOn(provider, 'sendTransaction'); const fragment = contract.interface.getFunction('tuple_function'); @@ -200,14 +235,21 @@ describe('Contract', () => { expect(interfaceSpy).toHaveBeenCalled(); }); - it('assigns a provider if passed', () => { + it('assigns a provider if passed', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000, + }, + }); + const { provider } = launched; + const contract = new Contract(getRandomB256(), jsonFragment, provider); expect(contract.provider).toEqual(provider); }); it('should fail to execute call if gasLimit is too low', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); let failed; try { @@ -225,8 +267,22 @@ describe('Contract', () => { }); it('adds multiple contracts on invocation', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); - using otherContract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: CallTestContractAbi__factory, + bytecode: CallTestContractAbiHex, + }, + { + deployer: CallTestContractAbi__factory, + bytecode: CallTestContractAbiHex, + }, + ], + }); + + const { + contracts: [contract, otherContract], + } = launched; const scope = contract.functions.call_external_foo(1336, otherContract.id.toB256()); @@ -236,8 +292,22 @@ describe('Contract', () => { }); it('adds multiple contracts on multicalls', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); - using otherContract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: CallTestContractAbi__factory, + bytecode: CallTestContractAbiHex, + }, + { + deployer: CallTestContractAbi__factory, + bytecode: CallTestContractAbiHex, + }, + ], + }); + + const { + contracts: [contract, otherContract], + } = launched; const calls = [ contract.functions.foo(1336), @@ -263,7 +333,7 @@ describe('Contract', () => { }); it('submits multiple calls', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const { value: results } = await contract .multiCall([contract.functions.foo(1336), contract.functions.foo(1336)]) @@ -272,7 +342,7 @@ describe('Contract', () => { }); it('submits multiple calls, six calls', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const { value: results } = await contract .multiCall([ @@ -291,7 +361,7 @@ describe('Contract', () => { }); it('submits multiple calls, eight calls', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const { value: results } = await contract .multiCall([ @@ -320,7 +390,7 @@ describe('Contract', () => { }); it('should fail to execute multiple calls if gasLimit is too low', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); let failed; try { @@ -338,8 +408,22 @@ describe('Contract', () => { }); it('adds multiple contracts on multicalls', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); - using otherContract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: CallTestContractAbi__factory, + bytecode: CallTestContractAbiHex, + }, + { + deployer: CallTestContractAbi__factory, + bytecode: CallTestContractAbiHex, + }, + ], + }); + + const { + contracts: [contract, otherContract], + } = launched; const scope = contract.multiCall([contract.functions.foo(1336)]).addContracts([otherContract]); @@ -360,7 +444,7 @@ describe('Contract', () => { }); it('dryRuns multiple calls', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const { value: results } = await contract .multiCall([contract.functions.foo(1336), contract.functions.foo(1336)]) @@ -369,7 +453,7 @@ describe('Contract', () => { }); it('simulates multiple calls', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const { value, callResult, gasUsed } = await contract .multiCall([contract.functions.foo(1336), contract.functions.foo(1336)]) @@ -380,7 +464,7 @@ describe('Contract', () => { }); it('Returns gasUsed and transactionId', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const { transactionId, gasUsed } = await contract .multiCall([contract.functions.foo(1336), contract.functions.foo(1336)]) @@ -390,7 +474,7 @@ describe('Contract', () => { }); it('Single call with forwarding a alt token', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const { value } = await contract.functions .return_context_amount() .callParams({ @@ -405,12 +489,12 @@ describe('Contract', () => { }); it('MultiCall with multiple forwarding', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const { value } = await contract .multiCall([ contract.functions.return_context_amount().callParams({ - forward: [100, baseAssetId], + forward: [100, contract.provider.getBaseAssetId()], }), contract.functions.return_context_amount().callParams({ forward: [200, AltToken], @@ -427,13 +511,13 @@ describe('Contract', () => { }); it('Check if gas per call is lower than transaction', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); await expect( contract .multiCall([ contract.functions.return_context_amount().callParams({ - forward: [100, baseAssetId], + forward: [100, contract.provider.getBaseAssetId()], gasLimit: 100, }), contract.functions.return_context_amount().callParams({ @@ -451,7 +535,7 @@ describe('Contract', () => { }); it('can forward gas to multicall calls', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const { value } = await contract .multiCall([ @@ -479,11 +563,11 @@ describe('Contract', () => { }); it('Get transaction cost', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const invocationScope = contract.multiCall([ contract.functions.return_context_amount().callParams({ - forward: [100, baseAssetId], + forward: [100, contract.provider.getBaseAssetId()], }), contract.functions.return_context_amount().callParams({ forward: [200, AltToken], @@ -504,10 +588,10 @@ describe('Contract', () => { }); it('Fail before submit if gasLimit is lower than gasUsed', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const invocationScope = contract.functions.return_context_amount().callParams({ - forward: [100, baseAssetId], + forward: [100, contract.provider.getBaseAssetId()], }); const { gasUsed } = await invocationScope.getTransactionCost(); @@ -522,7 +606,7 @@ describe('Contract', () => { }); it('calls array functions', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const { value: arrayBoolean } = await contract.functions .take_array_boolean([true, false, false]) @@ -554,7 +638,7 @@ describe('Contract', () => { }); it('calls enum functions', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const { value: enumB256ReturnValue } = await contract.functions .take_b256_enum({ @@ -610,11 +694,11 @@ describe('Contract', () => { }); it('dryRun and get should not validate the signature', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const { value } = await contract .multiCall([ contract.functions.return_context_amount().callParams({ - forward: [100, baseAssetId], + forward: [100, contract.provider.getBaseAssetId()], }), contract.functions.return_context_amount().callParams({ forward: [200, AltToken], @@ -626,7 +710,7 @@ describe('Contract', () => { }); it('Parse TX to JSON and parse back to TX', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const num = 1337; const struct = { a: true, b: 1337 }; @@ -652,16 +736,22 @@ describe('Contract', () => { }); it('Parse create TX to JSON and parse back to create TX', async () => { + using launched = await launchTestNode(); + const { provider } = launched; const wallet = Wallet.generate({ provider, }); await seedTestWallet(wallet, [ { amount: bn(1_000_000), - assetId: baseAssetId, + assetId: provider.getBaseAssetId(), }, ]); - const contract = new ContractFactory(contractBytecode, abi, wallet); + const contract = new ContractFactory( + StorageTestContractAbiHex, + StorageTestContractAbi__factory.abi, + wallet + ); const { transactionRequest } = contract.createTransactionRequest(); const txRequest = JSON.stringify(transactionRequest); @@ -686,18 +776,20 @@ describe('Contract', () => { }); it('Provide a custom provider and public wallet to the contract instance', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); + + const { provider } = contract; const externalWallet = Wallet.generate({ provider, }); + await seedTestWallet(externalWallet, [ { amount: bn(1_000_000), - assetId: baseAssetId, + assetId: provider.getBaseAssetId(), }, ]); - // Create a custom provider to emulate a external signer // like Wallet Extension or a Hardware wallet let signedTransaction; @@ -766,7 +858,7 @@ describe('Contract', () => { }); it('should ensure multicall allows multiple heap types', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const vector = [5, 4, 3, 2, 1]; @@ -782,7 +874,7 @@ describe('Contract', () => { }); it('Read only call', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const { value } = await contract.functions.echo_b256(contract.id.toB256()).simulate(); expect(value).toEqual(contract.id.toB256()); }); @@ -793,37 +885,74 @@ describe('Contract', () => { * currently placed inside the `fuel-gauge` package. It might make sense * to move them to another test suite when addressing https://github.com/FuelLabs/fuels-ts/issues/1043. */ - it('should tranfer asset to a deployed contract just fine (NATIVE ASSET)', async () => { - const wallet = await generateTestWallet(provider, [[10_000_000, baseAssetId]]); - - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + it('should transfer asset to a deployed contract just fine (NATIVE ASSET)', async () => { + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: CallTestContractAbi__factory, + bytecode: CallTestContractAbiHex, + }, + ], + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); + const { + provider, + wallets: [wallet], + contracts: [contract], + } = launched; - const initialBalance = new BN(await contract.getBalance(baseAssetId)).toNumber(); + const initialBalance = new BN(await contract.getBalance(provider.getBaseAssetId())).toNumber(); const u64Amount = bn(10_000); const amountToContract = u64Amount; - const tx = await wallet.transferToContract(contract.id, amountToContract, baseAssetId); + const tx = await wallet.transferToContract( + contract.id, + amountToContract, + provider.getBaseAssetId() + ); await tx.waitForResult(); - const finalBalance = new BN(await contract.getBalance(baseAssetId)).toNumber(); + const finalBalance = new BN(await contract.getBalance(provider.getBaseAssetId())).toNumber(); expect(finalBalance).toBe(initialBalance + amountToContract.toNumber()); }); it('should set "gasLimit" and "maxFee" when transferring amounts to contract just fine', async () => { - const wallet = await generateTestWallet(provider, [[10_000_000, baseAssetId]]); - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: CallTestContractAbi__factory, + bytecode: CallTestContractAbiHex, + }, + ], + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); + const { + provider, + wallets: [wallet], + contracts: [contract], + } = launched; + const amountToContract = 5_000; const gasLimit = 80_000; const maxFee = 70_000; - const tx = await wallet.transferToContract(contract.id, amountToContract, baseAssetId, { - gasLimit, - maxFee, - }); + const tx = await wallet.transferToContract( + contract.id, + amountToContract, + provider.getBaseAssetId(), + { + gasLimit, + maxFee, + } + ); const { transaction } = await tx.waitForResult(); @@ -835,9 +964,21 @@ describe('Contract', () => { }); it('should ensure gas price and gas limit are validated when transfering to contract', async () => { - const wallet = await generateTestWallet(provider, [[1000, baseAssetId]]); - - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: CallTestContractAbi__factory, + bytecode: CallTestContractAbiHex, + }, + ], + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); + const { + wallets: [wallet], + contracts: [contract], + } = launched; const amountToContract = 100; @@ -845,7 +986,7 @@ describe('Contract', () => { const result = await wallet.transferToContract( contract.id.toB256(), amountToContract, - baseAssetId, + contract.provider.getBaseAssetId(), { gasLimit: 1, } @@ -857,12 +998,21 @@ describe('Contract', () => { it('should tranfer asset to a deployed contract just fine (NOT NATIVE ASSET)', async () => { const asset = '0x0101010101010101010101010101010101010101010101010101010101010101'; - const wallet = await generateTestWallet(provider, [ - [500_000, baseAssetId], - [200, asset], - ]); - - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: CallTestContractAbi__factory, + bytecode: CallTestContractAbiHex, + }, + ], + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); + const { + wallets: [wallet], + contracts: [contract], + } = launched; const initialBalance = new BN(await contract.getBalance(asset)).toNumber(); @@ -878,36 +1028,58 @@ describe('Contract', () => { }); it('should tranfer asset to a deployed contract just fine (FROM PREDICATE)', async () => { - const wallet = await generateTestWallet(provider, [[1_000_000, baseAssetId]]); - - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: CallTestContractAbi__factory, + bytecode: CallTestContractAbiHex, + }, + ], + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); + const { + provider, + wallets: [wallet], + contracts: [contract], + } = launched; - const initialBalance = new BN(await contract.getBalance(baseAssetId)).toNumber(); + const initialBalance = new BN( + await contract.getBalance(contract.provider.getBaseAssetId()) + ).toNumber(); const amountToContract = 200; const amountToPredicate = 500_000; const predicate = new Predicate({ - bytecode: predicateBytecode, + bytecode: PredicateTrueAbi__factory.bin, provider, }); - const tx1 = await wallet.transfer(predicate.address, amountToPredicate, baseAssetId); + const tx1 = await wallet.transfer( + predicate.address, + amountToPredicate, + provider.getBaseAssetId() + ); await tx1.waitForResult(); - const tx2 = await predicate.transferToContract(contract.id, amountToContract, baseAssetId); + const tx2 = await predicate.transferToContract( + contract.id, + amountToContract, + provider.getBaseAssetId() + ); await tx2.waitForResult(); - const finalBalance = new BN(await contract.getBalance(baseAssetId)).toNumber(); + const finalBalance = new BN(await contract.getBalance(provider.getBaseAssetId())).toNumber(); expect(finalBalance).toBe(initialBalance + amountToContract); }); it('should ensure TX revert error can be extracted for dryRun and simulate calls', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); - + using contract = await setupTestContract(); const scope = contract.functions.assert_u8(10, 11); await expect(scope.dryRun()).rejects.toThrowError( @@ -920,15 +1092,8 @@ describe('Contract', () => { }); it('should ensure assets can be transfered to wallets (SINGLE TRANSFER)', async () => { - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.CALL_TEST_CONTRACT - ); - - const wallet = await generateTestWallet(provider, [[300_000, baseAssetId]]); - - const factory = new ContractFactory(binHexlified, abiContents, wallet); - - const contract = await factory.deployContract(); + using contract = await setupTestContract(); + const { provider } = contract; const receiver = Wallet.generate({ provider }); const amountToTransfer = 300; @@ -938,7 +1103,7 @@ describe('Contract', () => { .addTransfer({ destination: receiver.address, amount: amountToTransfer, - assetId: baseAssetId, + assetId: provider.getBaseAssetId(), }) .call(); @@ -948,17 +1113,20 @@ describe('Contract', () => { }); it('should ensure assets can be transfered to wallets (MULTI TRANSFER)', async () => { - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.CALL_TEST_CONTRACT - ); + using launched = await launchTestNode(); + const { provider } = launched; const wallet = await generateTestWallet(provider, [ - [300_000, baseAssetId], + [300_000, provider.getBaseAssetId()], [300_000, ASSET_A], [300_000, ASSET_B], ]); - const factory = new ContractFactory(binHexlified, abiContents, wallet); + const factory = new ContractFactory( + CallTestContractAbiHex, + CallTestContractAbi__factory.abi, + wallet + ); const contract = await factory.deployContract(); @@ -971,14 +1139,18 @@ describe('Contract', () => { const amountToTransfer3 = 122; const transferParams: TransferParams[] = [ - { destination: receiver1.address, amount: amountToTransfer1, assetId: baseAssetId }, + { + destination: receiver1.address, + amount: amountToTransfer1, + assetId: provider.getBaseAssetId(), + }, { destination: receiver2.address, amount: amountToTransfer2, assetId: ASSET_A }, { destination: receiver3.address, amount: amountToTransfer3, assetId: ASSET_B }, ]; await contract.functions.sum(40, 50).addBatchTransfer(transferParams).call(); - const finalBalance1 = await receiver1.getBalance(baseAssetId); + const finalBalance1 = await receiver1.getBalance(provider.getBaseAssetId()); const finalBalance2 = await receiver2.getBalance(ASSET_A); const finalBalance3 = await receiver3.getBalance(ASSET_B); @@ -988,37 +1160,40 @@ describe('Contract', () => { }); it('should throw when trying to transfer a zero or negative amount to a contract', async () => { - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.CALL_TEST_CONTRACT - ); + using launched = await launchTestNode(); + const { provider } = launched; const wallet = await generateTestWallet(provider, [ - [300_000, baseAssetId], + [300_000, provider.getBaseAssetId()], [300_000, ASSET_A], [300_000, ASSET_B], ]); - const factory = new ContractFactory(binHexlified, abiContents, wallet); + const factory = new ContractFactory( + CallTestContractAbiHex, + CallTestContractAbi__factory.abi, + wallet + ); const contract = await factory.deployContract(); await expectToThrowFuelError( async () => { - await wallet.transferToContract(contract.id, 0, baseAssetId); + await wallet.transferToContract(contract.id, 0, provider.getBaseAssetId()); }, new FuelError(ErrorCode.INVALID_TRANSFER_AMOUNT, 'Transfer amount must be a positive number.') ); await expectToThrowFuelError( async () => { - await wallet.transferToContract(contract.id, -1, baseAssetId); + await wallet.transferToContract(contract.id, -1, provider.getBaseAssetId()); }, new FuelError(ErrorCode.INVALID_TRANSFER_AMOUNT, 'Transfer amount must be a positive number.') ); }); it('should throw when using "simulate" with an unfunded wallet', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); contract.account = Wallet.generate({ provider: contract.provider }); @@ -1026,28 +1201,28 @@ describe('Contract', () => { contract.functions .return_context_amount() .callParams({ - forward: [100, baseAssetId], + forward: [100, contract.provider.getBaseAssetId()], }) .simulate() ).rejects.toThrowError('not enough coins to fit the target'); }); it('should throw when using "simulate" without a wallet', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); contract.account = null; await expect( contract.functions .return_context_amount() .callParams({ - forward: [100, baseAssetId], + forward: [100, contract.provider.getBaseAssetId()], }) .simulate() ).rejects.toThrowError('Wallet is required!'); }); it('should throw when using "simulate" with a locked wallet', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); contract.account = Wallet.fromAddress(getRandomB256()); @@ -1055,14 +1230,14 @@ describe('Contract', () => { contract.functions .return_context_amount() .callParams({ - forward: [100, baseAssetId], + forward: [100, contract.provider.getBaseAssetId()], }) .simulate() ).rejects.toThrowError('An unlocked wallet is required to simulate a contract call.'); }); it('should use "dryRun" with an unfunded wallet just fine', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); contract.account = Wallet.generate({ provider: contract.provider }); @@ -1070,14 +1245,14 @@ describe('Contract', () => { contract.functions .return_context_amount() .callParams({ - forward: [100, baseAssetId], + forward: [100, contract.provider.getBaseAssetId()], }) .dryRun() ).resolves.not.toThrow(); }); it('should ensure "get" does not spend any funds', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const balance = await contract.account?.getBalance(); @@ -1092,7 +1267,7 @@ describe('Contract', () => { }); it('should ensure "get" can be used to execute a contract call without a wallet', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); // contract with no account set const contractToCall = new Contract(contract.id, contract.interface, contract.provider); @@ -1104,7 +1279,7 @@ describe('Contract', () => { }); it('should ensure "get" can be used to execute a contract call with an unfunded wallet', async () => { - using contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const unfundedWallet = Wallet.generate({ provider: contract.provider }); @@ -1120,13 +1295,16 @@ describe('Contract', () => { }); it('should ensure "get" does not modify the blockchain state', async () => { - const { abiContents, binHexlified } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT - ); + using contract = await setupTestContract(); + const { provider } = contract; - const wallet = await generateTestWallet(provider, [[200_000, baseAssetId]]); + const wallet = await generateTestWallet(provider, [[200_000, provider.getBaseAssetId()]]); - const factory = new ContractFactory(binHexlified, abiContents, wallet); + const factory = new ContractFactory( + StorageTestContractAbiHex, + StorageTestContractAbi__factory.abi, + wallet + ); const storageContract = await factory.deployContract(); @@ -1150,14 +1328,17 @@ describe('Contract', () => { }); it('should ensure "maxFee" and "gasLimit" can be set for a contract call', async () => { - const { abiContents, binHexlified } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT - ); - - const wallet = await generateTestWallet(provider, [[350_000, baseAssetId]]); - const factory = new ContractFactory(binHexlified, abiContents, wallet); - - const storageContract = await factory.deployContract(); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: StorageTestContractAbi__factory, + bytecode: StorageTestContractAbiHex, + }, + ], + }); + const { + contracts: [storageContract], + } = launched; const gasLimit = 200_000; const maxFee = 100_000; @@ -1180,7 +1361,7 @@ describe('Contract', () => { }); it('should ensure "maxFee" and "gasLimit" can be set on a multicall', async () => { - const contract = await launchTestContract(FuelGaugeProjectsEnum.CALL_TEST_CONTRACT); + using contract = await setupTestContract(); const gasLimit = 500_000; const maxFee = 250_000; diff --git a/packages/fuel-gauge/src/doc-examples.test.ts b/packages/fuel-gauge/src/doc-examples.test.ts index e2b3ddae552..51d2b074497 100644 --- a/packages/fuel-gauge/src/doc-examples.test.ts +++ b/packages/fuel-gauge/src/doc-examples.test.ts @@ -22,12 +22,13 @@ import { WalletUnlocked, Signer, ZeroBytes32, - FUEL_NETWORK_URL, - TESTNET_NETWORK_URL, } from 'fuels'; -import { launchTestNode } from 'fuels/test-utils'; +import { AssetId, launchTestNode } from 'fuels/test-utils'; import { CallTestContractAbi__factory } from '../test/typegen/contracts'; +import CallTestContractAbiHex from '../test/typegen/contracts/CallTestContractAbi.hex'; +import { PredicateTrueAbi__factory } from '../test/typegen/predicates'; +import { PredicateTripleSigAbi__factory } from '../test/typegen/predicates/factories/PredicateTripleSigAbi__factory'; const PUBLIC_KEY = '0x2f34bc0df4db0ec391792cedb05768832b49b1aa3a2dd8c30054d1af00f67d00b74b7acbbf3087c8e0b1a4c343db50aa471d21f278ff5ce09f07795d541fb47e'; @@ -179,7 +180,9 @@ describe('Doc Examples', () => { }); it('it can work sign messages with wallets', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); + using launched = await launchTestNode(); + const { provider } = launched; + const wallet = WalletUnlocked.generate({ provider, }); @@ -195,23 +198,13 @@ describe('Doc Examples', () => { }); it('can create wallets', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - const assetIdA = '0x0101010101010101010101010101010101010101010101010101010101010101'; - const assetIdB = '0x0202020202020202020202020202020202020202020202020202020202020202'; - - // single asset - const walletA = await generateTestWallet(provider, [[42, baseAssetId]]); - - // multiple assets - const walletB = await generateTestWallet(provider, [ - // [Amount, AssetId] - [100, assetIdA], - [200, assetIdB], - [30, baseAssetId], - ]); + using launched = await launchTestNode(); + + const { provider } = launched; - // this wallet has no assets - const walletC = await generateTestWallet(provider); + const walletA = Wallet.generate({ provider }); + const walletB = Wallet.generate({ provider }); + const walletC = Wallet.generate({ provider }); // retrieve balances of wallets const walletABalances = await walletA.getBalances(); @@ -219,17 +212,18 @@ describe('Doc Examples', () => { const walletCBalances = await walletC.getBalances(); // validate balances - expect(walletABalances).toEqual([{ assetId: baseAssetId, amount: bn(42) }]); + expect(walletABalances).toEqual([{ assetId: provider.getBaseAssetId(), amount: bn(100) }]); expect(walletBBalances).toEqual([ - { assetId: assetIdA, amount: bn(100) }, - { assetId: assetIdB, amount: bn(200) }, - { assetId: baseAssetId, amount: bn(30) }, + { assetId: AssetId.A, amount: bn(100) }, + { assetId: AssetId.B, amount: bn(100) }, + { assetId: provider.getBaseAssetId(), amount: bn(100) }, ]); expect(walletCBalances).toEqual([]); }); it('can connect to testnet', async () => { - const provider = await Provider.create(TESTNET_NETWORK_URL); + using launched = await launchTestNode(); + const { provider } = launched; const PRIVATE_KEY = 'a1447cd75accc6b71a976fd3401a1f6ce318d27ba660b0315ee6ac347bf39568'; const wallet = Wallet.fromPrivateKey(PRIVATE_KEY, provider); @@ -239,28 +233,30 @@ describe('Doc Examples', () => { }); it('can connect to a local provider', async () => { - const localProvider = await Provider.create(FUEL_NETWORK_URL); - + using launched = await launchTestNode(); + const { provider } = launched; const PRIVATE_KEY = 'a1447cd75accc6b71a976fd3401a1f6ce318d27ba660b0315ee6ac347bf39568'; - const wallet: WalletUnlocked = Wallet.fromPrivateKey(PRIVATE_KEY, localProvider); + const wallet: WalletUnlocked = Wallet.fromPrivateKey(PRIVATE_KEY, provider); const signer = new Signer(PRIVATE_KEY); expect(wallet.address).toEqual(signer.address); }); it('can create a predicate', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); + using launched = await launchTestNode(); + const { provider } = launched; const predicate = new Predicate({ - bytecode: testPredicateTrue, + bytecode: PredicateTrueAbi__factory.bin, provider, }); expect(predicate.address).toBeTruthy(); - expect(predicate.bytes).toEqual(arrayify(testPredicateTrue)); + expect(predicate.bytes).toEqual(arrayify(PredicateTrueAbi__factory.bin)); }); it('can create a predicate and use', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); + using launched = await launchTestNode(); + const { provider } = launched; // Setup a private key const PRIVATE_KEY_1 = '0x862512a2363db2b3a375c0d4bbbd27172180d89f23f2e259bac850ab02619301'; const PRIVATE_KEY_2 = '0x37fa81c84ccd547c30c176b118d5cb892bdb113e8e80141f266519422ef9eefd'; @@ -272,10 +268,6 @@ describe('Doc Examples', () => { const wallet3: WalletUnlocked = Wallet.fromPrivateKey(PRIVATE_KEY_3, provider); const receiver = Wallet.generate({ provider }); - await seedTestWallet(wallet1, [{ assetId: baseAssetId, amount: bn(1_000_000) }]); - await seedTestWallet(wallet2, [{ assetId: baseAssetId, amount: bn(2_000_000) }]); - await seedTestWallet(wallet3, [{ assetId: baseAssetId, amount: bn(300_000) }]); - const AbiInputs: JsonAbi = { types: [ { @@ -331,7 +323,7 @@ describe('Doc Examples', () => { const signature3 = await wallet3.signMessage(dataToSign); const signatures = [signature1, signature2, signature3]; const predicate = new Predicate({ - bytecode: predicateTriple, + bytecode: PredicateTripleSigAbi__factory.bin, provider, abi: AbiInputs, inputData: [signatures], @@ -339,20 +331,36 @@ describe('Doc Examples', () => { const amountToPredicate = 600_000; const amountToReceiver = 100; - const response = await wallet1.transfer(predicate.address, amountToPredicate, baseAssetId, { - gasLimit: 10_000, - }); + const response = await wallet1.transfer( + predicate.address, + amountToPredicate, + provider.getBaseAssetId(), + { + gasLimit: 10_000, + } + ); + await response.waitForResult(); - const depositOnPredicate = await wallet1.transfer(predicate.address, 1000, baseAssetId, { - gasLimit: 10_000, - }); + const depositOnPredicate = await wallet1.transfer( + predicate.address, + 1000, + provider.getBaseAssetId(), + { + gasLimit: 10_000, + } + ); // Wait for Transaction to succeed await depositOnPredicate.waitForResult(); - const tx = await predicate.transfer(receiver.address, amountToReceiver, baseAssetId, { - gasLimit: 10_000, - }); + const tx = await predicate.transfer( + receiver.address, + amountToReceiver, + provider.getBaseAssetId(), + { + gasLimit: 10_000, + } + ); const { isStatusSuccess } = await tx.waitForResult(); // check balance diff --git a/packages/fuel-gauge/src/dry-run-multiple-txs.test.ts b/packages/fuel-gauge/src/dry-run-multiple-txs.test.ts index 0376c567e46..89f9d6ef874 100644 --- a/packages/fuel-gauge/src/dry-run-multiple-txs.test.ts +++ b/packages/fuel-gauge/src/dry-run-multiple-txs.test.ts @@ -3,82 +3,46 @@ import type { DryRunStatus, EstimateTxDependenciesReturns, TransactionResultReceipt, - WalletUnlocked, } from 'fuels'; -import { ContractFactory, FUEL_NETWORK_URL, Provider, Wallet } from 'fuels'; -import { generateTestWallet } from 'fuels/test-utils'; - -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { ContractFactory, Wallet } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; + +import { + AdvancedLoggingAbi__factory, + AdvancedLoggingOtherContractAbi__factory, + MultiTokenContractAbi__factory, + RevertErrorAbi__factory, +} from '../test/typegen/contracts'; +import AdvancedLoggingAbiHex from '../test/typegen/contracts/AdvancedLoggingAbi.hex'; +import AdvancedLoggingOtherContractAbiHex from '../test/typegen/contracts/AdvancedLoggingOtherContractAbi.hex'; +import MultiTokenAbiHex from '../test/typegen/contracts/MultiTokenContractAbi.hex'; +import RevertErrorAbiHex from '../test/typegen/contracts/RevertErrorAbi.hex'; /** * @group node + * @group browser */ describe('dry-run-multiple-txs', () => { - const { abiContents, binHexlified } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.TOKEN_CONTRACT - ); - const { abiContents: abiRevert, binHexlified: binRevert } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.REVERT_ERROR - ); - const { abiContents: abiMultiToken, binHexlified: binMultiToken } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.MULTI_TOKEN_CONTRACT - ); - const { abiContents: abiLog, binHexlified: binLog } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.ADVANCED_LOGGING - ); - const { abiContents: abiLogOther, binHexlified: binLogOther } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.ADVANCED_LOGGING_OTHER_CONTRACT - ); - - let provider: Provider; - let wallet: WalletUnlocked; - let baseAssetId: string; - - beforeAll(async () => { - provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - wallet = await generateTestWallet(provider, [[1_000_000, baseAssetId]]); - }); - - afterEach(() => { - vi.restoreAllMocks(); - }); - - const deployContracts = async () => { - const revertFactory = new ContractFactory(binRevert, abiRevert, wallet); - - const revertContract = await revertFactory.deployContract({ - maxFee: 70_000, - }); - - const multiTokenFactory = new ContractFactory(binMultiToken, abiMultiToken, wallet); - - const multiTokenContract = await multiTokenFactory.deployContract({ - maxFee: 70_000, - }); - - const logFactory = new ContractFactory(binLog, abiLog, wallet); - - const logContract = await logFactory.deployContract({ - maxFee: 70_000, - }); - const logOtherFactory = new ContractFactory(binLogOther, abiLogOther, wallet); - - const logOtherContract = await logOtherFactory.deployContract({ - maxFee: 70_000, - }); - - return { revertContract, multiTokenContract, logContract, logOtherContract }; - }; - it('should properly dry-run multiple TXs requests', async () => { - const revertFactory = new ContractFactory(binRevert, abiRevert, wallet); - - const revertContract = await revertFactory.deployContract({ - maxFee: 70_000, + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: RevertErrorAbi__factory, + bytecode: RevertErrorAbiHex, + }, + ], + walletsConfig: { + amountPerCoin: 1_000_000, + }, }); - const resources = await wallet.getResourcesToSpend([[500_000, baseAssetId]]); + const { + contracts: [revertContract], + provider, + wallets: [wallet], + } = launched; + + const resources = await wallet.getResourcesToSpend([[500_000, provider.getBaseAssetId()]]); const request1 = await revertContract.functions .validate_inputs(10, 0) @@ -161,13 +125,39 @@ describe('dry-run-multiple-txs', () => { }); it('should properly estimate multiple TXs requests', async () => { - // preparing test data - const { revertContract, multiTokenContract, logContract, logOtherContract } = - await deployContracts(); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: RevertErrorAbi__factory, + bytecode: RevertErrorAbiHex, + }, + { + deployer: MultiTokenContractAbi__factory, + bytecode: MultiTokenAbiHex, + }, + { + deployer: AdvancedLoggingAbi__factory, + bytecode: AdvancedLoggingAbiHex, + }, + { + deployer: AdvancedLoggingOtherContractAbi__factory, + bytecode: AdvancedLoggingOtherContractAbiHex, + }, + ], + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); + + const { + contracts: [revertContract, multiTokenContract, logContract, logOtherContract], + provider, + wallets: [wallet], + } = launched; // subId defined on multi-token contract const subId = '0x4a778acfad1abc155a009dc976d2cf0db6197d3d360194d74b1fb92b96986b00'; - const resources = await wallet.getResourcesToSpend([[500_000, baseAssetId]]); + const resources = await wallet.getResourcesToSpend([[500_000, provider.getBaseAssetId()]]); // creating receives to be used by the request 2 and 3 const addresses = [ @@ -177,7 +167,11 @@ describe('dry-run-multiple-txs', () => { ]; // request 1 - const factory = new ContractFactory(binHexlified, abiContents, wallet); + const factory = new ContractFactory( + MultiTokenAbiHex, + MultiTokenContractAbi__factory.abi, + wallet + ); const { transactionRequest: request1 } = factory.createTransactionRequest({ maxFee: 15000, }); diff --git a/packages/fuel-gauge/src/funding-transaction.test.ts b/packages/fuel-gauge/src/funding-transaction.test.ts index 62c7c74c8ed..49e2b69a86e 100644 --- a/packages/fuel-gauge/src/funding-transaction.test.ts +++ b/packages/fuel-gauge/src/funding-transaction.test.ts @@ -1,6 +1,6 @@ import { FuelError } from '@fuel-ts/errors'; import { expectToThrowFuelError } from '@fuel-ts/errors/test-utils'; -import type { Account, CoinTransactionRequestInput, Provider } from 'fuels'; +import type { Account, CoinTransactionRequestInput } from 'fuels'; import { ScriptTransactionRequest, Wallet, bn } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; diff --git a/packages/fuel-gauge/src/multi-token-contract.test.ts b/packages/fuel-gauge/src/multi-token-contract.test.ts index f3d038fe194..c9a0c678ec9 100644 --- a/packages/fuel-gauge/src/multi-token-contract.test.ts +++ b/packages/fuel-gauge/src/multi-token-contract.test.ts @@ -14,7 +14,7 @@ const subIds = [ /** * @group node - * @group browse + * @group browser */ describe('MultiTokenContract', () => { it( diff --git a/packages/fuel-gauge/src/transaction-summary.test.ts b/packages/fuel-gauge/src/transaction-summary.test.ts index f7603ec7ec9..062f4ffa367 100644 --- a/packages/fuel-gauge/src/transaction-summary.test.ts +++ b/packages/fuel-gauge/src/transaction-summary.test.ts @@ -30,16 +30,6 @@ import { launchTestContract } from './utils'; * @group browser */ describe('TransactionSummary', () => { - let provider: Provider; - let adminWallet: WalletUnlocked; - - let baseAssetId: string; - beforeAll(async () => { - provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - adminWallet = await generateTestWallet(provider, [[100_000_000, baseAssetId]]); - }); - const verifyTransactionSummary = (params: { transaction: TransactionResult | TransactionSummary; isRequest?: boolean; @@ -224,13 +214,6 @@ describe('TransactionSummary', () => { }); it('should ensure transfer operation is assembled (ACCOUNT TRANSFER TO CONTRACT)', async () => { - const wallet = await generateTestWallet(provider, [ - [300_000, baseAssetId], - [10_000, ASSET_A], - ]); - - using contract1 = await launchTestContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); - const amount = 234; const tx1 = await wallet.transferToContract(contract1.id, amount, ASSET_A); diff --git a/packages/fuel-gauge/src/transaction.test.ts b/packages/fuel-gauge/src/transaction.test.ts index e23b872a244..73e0cce1962 100644 --- a/packages/fuel-gauge/src/transaction.test.ts +++ b/packages/fuel-gauge/src/transaction.test.ts @@ -1,24 +1,19 @@ -import { sleep, Provider, TransactionType } from 'fuels'; -import { launchNode } from 'fuels/test-utils'; +import { TransactionType } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; /** * @group node + * @group browser */ describe('Transaction', () => { it('should ensure a mint transaction can be decoded just fine', async () => { - const { cleanup, ip, port } = await launchNode({ - args: ['--poa-instant', 'false', '--poa-interval-period', '100ms'], - loggingEnabled: false, - }); + using launched = await launchTestNode(); + const { provider } = launched; - await sleep(500); - const nodeProvider = await Provider.create(`http://${ip}:${port}/v1/graphql`); const { transactions: [tx], - } = await nodeProvider.getTransactions({ first: 1 }); + } = await provider.getTransactions({ first: 1 }); expect(tx.type).toBe(TransactionType.Mint); - - cleanup(); }); }); diff --git a/packages/fuel-gauge/src/vector-types.test.ts b/packages/fuel-gauge/src/vector-types.test.ts index 1cb9eab2861..17827c530b0 100644 --- a/packages/fuel-gauge/src/vector-types.test.ts +++ b/packages/fuel-gauge/src/vector-types.test.ts @@ -1,8 +1,10 @@ import type { BigNumberish } from 'fuels'; -import { bn, Predicate, Wallet, Address, Provider, FUEL_NETWORK_URL } from 'fuels'; -import { generateTestWallet } from 'fuels/test-utils'; +import { bn, Predicate, Wallet, Address } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { VectorTypesContractAbi__factory } from '../test/typegen/contracts'; +import VectorTypesContractAbiHex from '../test/typegen/contracts/VectorTypesContractAbi.hex'; +import { PredicateVectorTypesAbi__factory } from '../test/typegen/predicates'; import { getScript, launchTestContract } from './utils'; @@ -75,32 +77,16 @@ type MainArgs = [ VecInAStructInAVec, // VEC_IN_A_VEC_IN_A_STRUCT_IN_A_VEC ]; -const setup = async (balance = 500_000) => { - const provider = await Provider.create(FUEL_NETWORK_URL); - const baseAssetId = provider.getBaseAssetId(); - - // Create wallet - const wallet = await generateTestWallet(provider, [[balance, baseAssetId]]); - - return wallet; -}; - /** * @group node * @group browser */ describe('Vector Types Validation', () => { - let baseAssetId: string; - const { binHexlified: predicateVectorTypes, abiContents: predicateVectorTypesAbi } = - getFuelGaugeForcProject(FuelGaugeProjectsEnum.PREDICATE_VECTOR_TYPES); - - beforeAll(async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - }); - it('can use supported vector types [vector-types-contract]', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTOR_TYPES_CONTRACT); + using contractInstance = await launchTestContract({ + deployer: VectorTypesContractAbi__factory, + bytecode: VectorTypesContractAbiHex, + }); const { value } = await contractInstance.functions .test_all( @@ -121,7 +107,10 @@ describe('Vector Types Validation', () => { }); it('can use supported vector types [vector-types-script]', async () => { - const wallet = await setup(); + using launched = await launchTestNode(); + const { + wallets: [wallet], + } = launched; const scriptInstance = getScript('vector-types-script', wallet); const { value } = await scriptInstance.functions @@ -144,14 +133,20 @@ describe('Vector Types Validation', () => { }); it('can use supported vector types [predicate-vector-types]', async () => { - const wallet = await setup(); + using launched = await launchTestNode(); + + const { + provider, + wallets: [wallet], + } = launched; + const receiver = Wallet.fromAddress(Address.fromRandom(), wallet.provider); const amountToPredicate = 300_000; const amountToReceiver = 50; const predicate = new Predicate({ - bytecode: predicateVectorTypes, + bytecode: PredicateVectorTypesAbi__factory.bin, provider: wallet.provider, - abi: predicateVectorTypesAbi, + abi: PredicateVectorTypesAbi__factory.abi, inputData: [ U32_VEC, VEC_IN_VEC, @@ -168,16 +163,26 @@ describe('Vector Types Validation', () => { }); // setup predicate - const setupTx = await wallet.transfer(predicate.address, amountToPredicate, baseAssetId, { - gasLimit: 10_000, - }); + const setupTx = await wallet.transfer( + predicate.address, + amountToPredicate, + provider.getBaseAssetId(), + { + gasLimit: 10_000, + } + ); await setupTx.waitForResult(); const initialReceiverBalance = await receiver.getBalance(); - const tx = await predicate.transfer(receiver.address, amountToReceiver, baseAssetId, { - gasLimit: 10_000, - }); + const tx = await predicate.transfer( + receiver.address, + amountToReceiver, + provider.getBaseAssetId(), + { + gasLimit: 10_000, + } + ); const { isStatusSuccess } = await tx.waitForResult(); // Check the balance of the receiver diff --git a/packages/fuel-gauge/src/vectors.test.ts b/packages/fuel-gauge/src/vectors.test.ts index 913876d745a..be745311131 100644 --- a/packages/fuel-gauge/src/vectors.test.ts +++ b/packages/fuel-gauge/src/vectors.test.ts @@ -1,7 +1,8 @@ import { bn, randomBytes, hexlify } from 'fuels'; import type { BN } from 'fuels'; -import { FuelGaugeProjectsEnum } from '../test/fixtures'; +import { VectorsAbi__factory } from '../test/typegen/contracts'; +import VectorsAbiHex from '../test/typegen/contracts/VectorsAbi.hex'; import { launchTestContract } from './utils'; @@ -11,13 +12,20 @@ enum SmallEnum { Empty = 'Empty', } +async function setupContract() { + return launchTestContract({ + deployer: VectorsAbi__factory, + bytecode: VectorsAbiHex, + }); +} + /** * @group node * @group browser */ describe('Vector Tests', () => { it('should test u8 vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [8, 6, 7, 5, 3, 0, 9]; const { value } = await contractInstance.functions.echo_u8(INPUT).call(); @@ -26,7 +34,7 @@ describe('Vector Tests', () => { }); it('should test u16 vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [8, 6, 7, 5, 3, 0, 9]; const { value } = await contractInstance.functions.echo_u16(INPUT).call(); @@ -35,7 +43,7 @@ describe('Vector Tests', () => { }); it('should test u32 vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [8, 6, 7, 5, 3, 0, 9]; @@ -45,7 +53,7 @@ describe('Vector Tests', () => { }); it('should test u64 vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [8, 6, 7, 5, 3, 0, 9]; @@ -55,7 +63,7 @@ describe('Vector Tests', () => { }); it('should test bool vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [true, false, true, true]; @@ -65,7 +73,7 @@ describe('Vector Tests', () => { }); it('should test b256 vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [hexlify(randomBytes(32)), hexlify(randomBytes(32)), hexlify(randomBytes(32))]; @@ -75,7 +83,7 @@ describe('Vector Tests', () => { }); it('should test b512 vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [hexlify(randomBytes(64)), hexlify(randomBytes(64)), hexlify(randomBytes(64))]; @@ -85,7 +93,7 @@ describe('Vector Tests', () => { }); it('should test str[1] vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = ['a', 'b', 'c', 'd']; @@ -95,7 +103,7 @@ describe('Vector Tests', () => { }); it('should test str[9] vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = ['123456789', 'abcdefghi', 'catdogcat', 'onetwoone']; @@ -105,7 +113,7 @@ describe('Vector Tests', () => { }); it('should test (u8, u8) vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [ [1, 2], @@ -119,7 +127,7 @@ describe('Vector Tests', () => { }); it('should test (u64, u64) vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [ [111, 2222], @@ -133,7 +141,7 @@ describe('Vector Tests', () => { }); it('should test [u8; 2] vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [ [1, 2], @@ -146,7 +154,7 @@ describe('Vector Tests', () => { }); it('should test [u64; 5] vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [ [1, 2, 3, 4, 5], @@ -160,7 +168,7 @@ describe('Vector Tests', () => { }); it('should test [bool; 2] vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [ [true, true], @@ -176,7 +184,7 @@ describe('Vector Tests', () => { }); it('should test U8Struct vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [ { @@ -196,7 +204,7 @@ describe('Vector Tests', () => { }); it('should test B256Struct vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [ { @@ -216,7 +224,7 @@ describe('Vector Tests', () => { }); it('should test ComplexStruct vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); type ComplexStruct = { foo: number; bar: BN; baz: string }; const INPUT = [ @@ -250,7 +258,7 @@ describe('Vector Tests', () => { }); it('should test SmallEnum vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [ SmallEnum.Empty, @@ -266,7 +274,7 @@ describe('Vector Tests', () => { }); it('should test BigEnum vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [ { @@ -286,7 +294,7 @@ describe('Vector Tests', () => { }); it('should test Option vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [undefined, 1, undefined, 2, undefined, 3]; @@ -296,7 +304,7 @@ describe('Vector Tests', () => { }); it('should test Vec inside struct input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = { num: 2, @@ -309,7 +317,7 @@ describe('Vector Tests', () => { }); it('should test Vec inside enum input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = { vec: [1, 5, 98], @@ -321,7 +329,7 @@ describe('Vector Tests', () => { }); it('should test Vec inside vector input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [[1, 5, 98], [2, 44], [34]]; @@ -331,7 +339,7 @@ describe('Vector Tests', () => { }); it('should test struct and Vec input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); type Struct = { foo: number; bar: BN; baz: string }; const INPUT: [Struct, number[]] = [ @@ -354,7 +362,7 @@ describe('Vector Tests', () => { }); it('should test Vec and b256 tuple input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [[1, 8, 3, 2, 55, 215], hexlify(randomBytes(32))]; @@ -364,7 +372,7 @@ describe('Vector Tests', () => { }); it('should test two vectors tuple input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [ [219, 229], @@ -377,7 +385,7 @@ describe('Vector Tests', () => { }); it('should test u32 and three different vectors tuple input/output', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const INPUT = [91000, [true, true, false], [95000, 153333], [20000, 65500]]; @@ -387,7 +395,7 @@ describe('Vector Tests', () => { }); it('should test multiCall vectors', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.VECTORS); + using contractInstance = await setupContract(); const { value: results } = await contractInstance .multiCall([ From de20c8cc5dc852d4112086ca0f1c10a792cc3fbd Mon Sep 17 00:00:00 2001 From: chad Date: Sat, 6 Jul 2024 13:05:43 -0500 Subject: [PATCH 21/53] fix: add typegen for token contract abi + more tests --- .../src/reentrant-contract-calls.test.ts | 7 +- .../src/storage-test-contract.test.ts | 62 ++++---- .../src/token-test-contract.test.ts | 47 +++--- .../src/transaction-response.test.ts | 140 ++++++++---------- .../src/transaction-summary.test.ts | 137 ++++++++++++++--- packages/fuel-gauge/src/utils.ts | 4 +- .../test/fixtures/forc-projects/Forc.toml | 4 +- .../forc-projects/token_abi/Forc.toml | 2 +- .../forc-projects/token_contract/Forc.toml | 4 +- packages/fuel-gauge/test/fixtures/index.ts | 4 +- 10 files changed, 241 insertions(+), 170 deletions(-) diff --git a/packages/fuel-gauge/src/reentrant-contract-calls.test.ts b/packages/fuel-gauge/src/reentrant-contract-calls.test.ts index d6ab95ba5f6..a9528be80ed 100644 --- a/packages/fuel-gauge/src/reentrant-contract-calls.test.ts +++ b/packages/fuel-gauge/src/reentrant-contract-calls.test.ts @@ -1,4 +1,4 @@ -import { ContractFactory, ReceiptType, bn } from 'fuels'; +import { ContractFactory, ReceiptType, bn, sleep } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; import type { ReentrantBarAbi, ReentrantFooAbi } from '../test/typegen/contracts'; @@ -16,6 +16,11 @@ import StorageTestContractAbiHex from '../test/typegen/contracts/StorageTestCont * @group browser */ describe('Reentrant Contract Calls', () => { + it.only('dummy test', async () => { + console.log('before'); + using node = await launchTestNode(); + console.log('after'); + }); it('should ensure the SDK returns the proper value for a reentrant call', async () => { using launched = await launchTestNode({ contractsConfigs: [ diff --git a/packages/fuel-gauge/src/storage-test-contract.test.ts b/packages/fuel-gauge/src/storage-test-contract.test.ts index 09fec504d31..187e87c5713 100644 --- a/packages/fuel-gauge/src/storage-test-contract.test.ts +++ b/packages/fuel-gauge/src/storage-test-contract.test.ts @@ -1,43 +1,27 @@ import { toHex, Provider, ContractFactory, FUEL_NETWORK_URL } from 'fuels'; -import { generateTestWallet } from 'fuels/test-utils'; +import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; - -const { - binHexlified: bytecode, - abiContents: abi, - storageSlots, -} = getFuelGaugeForcProject(FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT); - -const setup = async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - const baseAssetId = provider.getBaseAssetId(); - // Create wallet - const wallet = await generateTestWallet(provider, [[1_000_000, baseAssetId]]); - // Deploy contract - // #region contract-deployment-storage-slots - // #context import storageSlots from '../your-sway-project/out/debug/your-sway-project-storage_slots.json'; - - const factory = new ContractFactory(bytecode, abi, wallet); - const contract = await factory.deployContract({ - storageSlots, - }); - // #endregion contract-deployment-storage-slots - - return contract; -}; +import { StorageTestContractAbi__factory } from '../test/typegen'; +import StorageTestContractAbiHex from '../test/typegen/contracts/StorageTestContractAbi.hex'; /** * @group node + * @group browser */ describe('StorageTestContract', () => { - let baseAssetId: string; - beforeAll(async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - }); it('can increment counter', async () => { - const contract = await setup(); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: StorageTestContractAbi__factory, + bytecode: StorageTestContractAbiHex, + }, + ], + }); + + const { + contracts: [contract], + } = launched; // Call contract const { value: initializeResult } = await contract.functions.initialize_counter(1300).call(); @@ -50,9 +34,17 @@ describe('StorageTestContract', () => { }); it('can increment counter - using custom inline storage slots', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - const wallet = await generateTestWallet(provider, [[500_000, baseAssetId]]); - const factory = new ContractFactory(bytecode, abi, wallet); + using launched = await launchTestNode(); + + const { + wallets: [wallet], + } = launched; + + const factory = new ContractFactory( + StorageTestContractAbiHex, + StorageTestContractAbi__factory.abi, + wallet + ); // #region contract-deployment-storage-slots-inline const contract = await factory.deployContract({ storageSlots: [ diff --git a/packages/fuel-gauge/src/token-test-contract.test.ts b/packages/fuel-gauge/src/token-test-contract.test.ts index 49b204cd936..6f2d459e631 100644 --- a/packages/fuel-gauge/src/token-test-contract.test.ts +++ b/packages/fuel-gauge/src/token-test-contract.test.ts @@ -1,41 +1,34 @@ import { ErrorCode, FuelError } from '@fuel-ts/errors'; import type { AssetId, BN } from 'fuels'; -import { toHex, Provider, Wallet, ContractFactory, bn, FUEL_NETWORK_URL } from 'fuels'; -import { expectToThrowFuelError, generateTestWallet } from 'fuels/test-utils'; +import { toHex, Wallet, bn } from 'fuels'; +import { expectToThrowFuelError, launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; - -const { binHexlified: bytecode, abiContents: abi } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.TOKEN_CONTRACT -); - -let provider: Provider; -let baseAssetId: string; - -const setup = async () => { - // Create wallet - const wallet = await generateTestWallet(provider, [[5_000_000, baseAssetId]]); - - // Deploy contract - const factory = new ContractFactory(bytecode, abi, wallet); - const contract = await factory.deployContract(); - - return contract; -}; - -beforeAll(async () => { - provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); -}); +import { TokenAbi__factory } from '../test/typegen'; +import TokenAbiHex from '../test/typegen/contracts/TokenAbi.hex'; /** * @group node + * @group browser */ + describe('TokenTestContract', () => { it('Can mint and transfer coins', async () => { // New wallet to transfer coins and check balance + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: MultiTokenContractAbi__factory, + bytecode: MultiTokenContractAbiHex, + }, + ], + }); + + const { + provider, + contracts: [token], + } = launched; + const userWallet = Wallet.generate({ provider }); - const token = await setup(); const tokenContractId = { bits: token.id.toB256() }; const addressId = { bits: userWallet.address.toB256() }; diff --git a/packages/fuel-gauge/src/transaction-response.test.ts b/packages/fuel-gauge/src/transaction-response.test.ts index df024144207..a33d3907302 100644 --- a/packages/fuel-gauge/src/transaction-response.test.ts +++ b/packages/fuel-gauge/src/transaction-response.test.ts @@ -1,6 +1,5 @@ import { ErrorCode } from '@fuel-ts/errors'; import { - FUEL_NETWORK_URL, Provider, TransactionResponse, Wallet, @@ -8,7 +7,7 @@ import { WalletUnlocked, ScriptTransactionRequest, } from 'fuels'; -import { generateTestWallet, launchNode, expectToThrowFuelError } from 'fuels/test-utils'; +import { launchNode, expectToThrowFuelError, launchTestNode } from 'fuels/test-utils'; import type { MockInstance } from 'vitest'; async function verifyKeepAliveMessageWasSent(subscriptionStream: ReadableStream) { @@ -83,17 +82,18 @@ function getSubscriptionStreamFromFetch(streamHolder: { stream: ReadableStream { - let provider: Provider; - let adminWallet: WalletUnlocked; - - let baseAssetId: string; - beforeAll(async () => { - provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - adminWallet = await generateTestWallet(provider, [[500_000, baseAssetId]]); - }); - it('should ensure create method waits till a transaction response is given', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 500_000, + }, + }); + + const { + provider, + wallets: [adminWallet], + } = launched; + const destination = Wallet.generate({ provider, }); @@ -101,7 +101,7 @@ describe('TransactionResponse', () => { const { id: transactionId } = await adminWallet.transfer( destination.address, 100, - baseAssetId, + provider.getBaseAssetId(), { gasLimit: 10_000 } ); @@ -113,16 +113,26 @@ describe('TransactionResponse', () => { }); it('should ensure getTransactionSummary fetchs a transaction and assembles transaction summary', async () => { - const { ip, port } = await launchNode({ - args: ['--poa-instant', 'false', '--poa-interval-period', '1s'], + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 500_000, + }, }); - const nodeProvider = await Provider.create(`http://${ip}:${port}/v1/graphql`); + + const { + provider, + wallets: [adminWallet], + } = launched; const destination = Wallet.generate({ - provider: nodeProvider, + provider, }); - const { id: transactionId } = await adminWallet.transfer(destination.address, 100, baseAssetId); + const { id: transactionId } = await adminWallet.transfer( + destination.address, + 100, + provider.getBaseAssetId() + ); const response = await TransactionResponse.create(transactionId, provider); @@ -152,74 +162,53 @@ describe('TransactionResponse', () => { expect(response.gqlTransaction?.id).toBe(transactionId); }); - it.skip('should ensure waitForResult always waits for the transaction to be processed', async () => { - const { cleanup, ip, port } = await launchNode({ - /** - * This is set to so long in order to test keep-alive message handling as well. - * Keep-alive messages are sent every 15s. - * It is very important to test this because the keep-alive messages are not sent in the same format as the other messages - * and it is reasonable to expect subscriptions lasting more than 15 seconds. - * We need a proper integration test for this - * because if the keep-alive message changed in any way between fuel-core versions and we missed it, - * all our subscriptions would break. - * We need at least one long test to ensure that the keep-alive messages are handled correctly. - * */ - args: ['--poa-instant', 'false', '--poa-interval-period', '17sec'], - }); - const nodeProvider = await Provider.create(`http://${ip}:${port}/v1/graphql`); - - const genesisWallet = new WalletUnlocked( - process.env.GENESIS_SECRET || randomBytes(32), - nodeProvider - ); + it('should ensure waitForResult always waits for the transaction to be processed', async () => { + using launched = await launchTestNode(); - const destination = Wallet.generate({ provider: nodeProvider }); + const { + provider, + wallets: [genesisWallet, destination], + } = launched; const { id: transactionId } = await genesisWallet.transfer( destination.address, 100, - baseAssetId, + provider.getBaseAssetId(), { gasLimit: 10_000 } ); - const response = await TransactionResponse.create(transactionId, nodeProvider); + const response = await TransactionResponse.create(transactionId, provider); - expect(response.gqlTransaction?.status?.type).toBe('SubmittedStatus'); + // expect(response.gqlTransaction?.status?.type).toBe('SubmittedStatus'); - const subscriptionStreamHolder = { - stream: new ReadableStream(), - }; + // const subscriptionStreamHolder = { + // stream: new ReadableStream(), + // }; - getSubscriptionStreamFromFetch(subscriptionStreamHolder); + // getSubscriptionStreamFromFetch(subscriptionStreamHolder); - await response.waitForResult(); + // await response.waitForResult(); expect(response.gqlTransaction?.status?.type).toEqual('SuccessStatus'); expect(response.gqlTransaction?.id).toBe(transactionId); - await verifyKeepAliveMessageWasSent(subscriptionStreamHolder.stream); - - cleanup(); + // await verifyKeepAliveMessageWasSent(subscriptionStreamHolder.stream); }, 18500); it('should throw error for a SqueezedOut status update [waitForResult]', async () => { - const { cleanup, ip, port } = await launchNode({ - /** - * a larger --tx-pool-ttl 1s is necessary to ensure that the transaction doesn't get squeezed out - * before the waitForResult (provider.operations.statusChange) call is made - * */ - args: ['--poa-instant', 'false', '--poa-interval-period', '2s', '--tx-pool-ttl', '1s'], - loggingEnabled: false, + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 500_000, + }, }); - const nodeProvider = await Provider.create(`http://${ip}:${port}/v1/graphql`); - const genesisWallet = new WalletUnlocked( - process.env.GENESIS_SECRET || randomBytes(32), - nodeProvider - ); + const { + provider, + wallets: [genesisWallet], + } = launched; const request = new ScriptTransactionRequest(); - request.addCoinOutput(Wallet.generate(), 100, baseAssetId); + request.addCoinOutput(Wallet.generate(), 100, provider.getBaseAssetId()); const txCost = await genesisWallet.provider.getTransactionCost(request); @@ -233,7 +222,7 @@ describe('TransactionResponse', () => { await genesisWallet.signTransaction(request) ); - const response = await nodeProvider.sendTransaction(request); + const response = await provider.sendTransaction(request); await expectToThrowFuelError( async () => { @@ -241,27 +230,25 @@ describe('TransactionResponse', () => { }, { code: ErrorCode.TRANSACTION_SQUEEZED_OUT } ); - - cleanup(); }); it( 'should throw error for a SqueezedOut status update [submitAndAwait]', async () => { - const { cleanup, ip, port } = await launchNode({ - args: ['--poa-instant', 'false', '--poa-interval-period', '4s', '--tx-pool-ttl', '1s'], - loggingEnabled: false, + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 500_000, + }, }); - const nodeProvider = await Provider.create(`http://${ip}:${port}/v1/graphql`); - const genesisWallet = new WalletUnlocked( - process.env.GENESIS_SECRET || randomBytes(32), - nodeProvider - ); + const { + provider, + wallets: [genesisWallet], + } = launched; const request = new ScriptTransactionRequest(); - request.addCoinOutput(Wallet.generate(), 100, baseAssetId); + request.addCoinOutput(Wallet.generate(), 100, provider.getBaseAssetId()); const txCost = await genesisWallet.provider.getTransactionCost(request, { signatureCallback: (tx) => tx.addAccountWitnesses(genesisWallet), @@ -279,11 +266,10 @@ describe('TransactionResponse', () => { await expectToThrowFuelError( async () => { - await nodeProvider.sendTransaction(request, { awaitExecution: true }); + await provider.sendTransaction(request, { awaitExecution: true }); }, { code: ErrorCode.TRANSACTION_SQUEEZED_OUT } ); - cleanup(); }, { retry: 10 } ); diff --git a/packages/fuel-gauge/src/transaction-summary.test.ts b/packages/fuel-gauge/src/transaction-summary.test.ts index 062f4ffa367..5f6c26480ff 100644 --- a/packages/fuel-gauge/src/transaction-summary.test.ts +++ b/packages/fuel-gauge/src/transaction-summary.test.ts @@ -1,5 +1,4 @@ import type { - WalletUnlocked, TransactionResultReceipt, Operation, TransactionSummary, @@ -19,9 +18,11 @@ import { AddressType, OperationName, } from 'fuels'; -import { generateTestWallet, ASSET_A, ASSET_B } from 'fuels/test-utils'; +import { generateTestWallet, ASSET_A, ASSET_B, launchTestNode } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum } from '../test/fixtures'; +import { MultiTokenContractAbi__factory } from '../test/typegen'; +import MultiTokenContractAbiHex from '../test/typegen/contracts/MultiTokenContractAbi.hex'; import { launchTestContract } from './utils'; @@ -57,6 +58,17 @@ describe('TransactionSummary', () => { }; it('should ensure getTransactionSummary executes just fine', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 100_000_000, + }, + }); + + const { + provider, + wallets: [adminWallet], + } = launched; + const destination = Wallet.generate({ provider, }); @@ -67,7 +79,7 @@ describe('TransactionSummary', () => { gasLimit: 10000, }); - request.addCoinOutput(destination.address, amountToTransfer, baseAssetId); + request.addCoinOutput(destination.address, amountToTransfer, provider.getBaseAssetId()); const txCost = await adminWallet.provider.getTransactionCost(request); @@ -94,11 +106,22 @@ describe('TransactionSummary', () => { }); it('should ensure getTransactionsSummaries executes just fine', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 100_000_000, + }, + }); + + const { + provider, + wallets: [adminWallet], + } = launched; + const sender = Wallet.generate({ provider, }); - const tx1 = await adminWallet.transfer(sender.address, 500_000, baseAssetId, { + const tx1 = await adminWallet.transfer(sender.address, 500_000, provider.getBaseAssetId(), { gasLimit: 10_000, }); const transactionResponse1 = await tx1.waitForResult(); @@ -109,9 +132,14 @@ describe('TransactionSummary', () => { provider, }); - const tx2 = await sender.transfer(destination.address, amountToTransfer, baseAssetId, { - gasLimit: 10_000, - }); + const tx2 = await sender.transfer( + destination.address, + amountToTransfer, + provider.getBaseAssetId(), + { + gasLimit: 10_000, + } + ); const transactionResponse2 = await tx2.waitForResult(); const { transactions } = await getTransactionsSummaries({ @@ -135,6 +163,17 @@ describe('TransactionSummary', () => { }); it('should ensure getTransactionSummaryFromRequest executes just fine', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 100_000_000, + }, + }); + + const { + provider, + wallets: [adminWallet], + } = launched; + const request = new ScriptTransactionRequest({ gasLimit: 10000, }); @@ -161,10 +200,6 @@ describe('TransactionSummary', () => { }); describe('Transfer Operations', () => { - beforeAll(async () => { - provider = await Provider.create(FUEL_NETWORK_URL); - }); - const validateTransferOperation = (params: { operations: Operation[]; sender: AbstractAddress; @@ -190,13 +225,22 @@ describe('TransactionSummary', () => { }; it('should ensure transfer operation is assembled (ACCOUNT TRANSFER)', async () => { - const wallet = await generateTestWallet(provider, [[300_000, baseAssetId]]); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 100_000_000, + }, + }); + + const { + provider, + wallets: [wallet], + } = launched; const recipient = Wallet.generate({ provider }); const amount = 1233; - const tx1 = await wallet.transfer(recipient.address, amount, baseAssetId); + const tx1 = await wallet.transfer(recipient.address, amount, provider.getBaseAssetId()); const { operations } = await tx1.waitForResult(); @@ -208,15 +252,35 @@ describe('TransactionSummary', () => { fromType: AddressType.account, toType: AddressType.account, recipients: [ - { address: recipient.address, quantities: [{ amount, assetId: baseAssetId }] }, + { + address: recipient.address, + quantities: [{ amount, assetId: provider.getBaseAssetId() }], + }, ], }); }); it('should ensure transfer operation is assembled (ACCOUNT TRANSFER TO CONTRACT)', async () => { + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: MultiTokenContractAbi__factory, + bytecode: MultiTokenContractAbiHex, + }, + ], + walletsConfig: { + amountPerCoin: 100_000_000, + }, + }); + + const { + contracts: [contract], + wallets: [wallet], + } = launched; + const amount = 234; - const tx1 = await wallet.transferToContract(contract1.id, amount, ASSET_A); + const tx1 = await wallet.transferToContract(contract.id, amount, ASSET_A); const { operations } = await tx1.waitForResult(); @@ -227,15 +291,27 @@ describe('TransactionSummary', () => { sender: wallet.address, fromType: AddressType.account, toType: AddressType.contract, - recipients: [{ address: contract1.id, quantities: [{ amount, assetId: ASSET_A }] }], + recipients: [{ address: contract.id, quantities: [{ amount, assetId: ASSET_A }] }], }); }); it('should ensure transfer operation is assembled (CONTRACT TRANSFER TO ACCOUNT)', async () => { - const wallet = await generateTestWallet(provider, [[300_000, baseAssetId]]); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: MultiTokenContractAbi__factory, + bytecode: MultiTokenContractAbiHex, + }, + ], + walletsConfig: { + amountPerCoin: 100_000_000, + }, + }); - using contract = await launchTestContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); - contract.account = wallet; + const { + provider, + contracts: [contract], + } = launched; const recipient = Wallet.generate({ provider }); const amount = 1055; @@ -323,12 +399,29 @@ describe('TransactionSummary', () => { }); it('should ensure transfer operation is assembled (CONTRACT TRANSFER TO CONTRACT)', async () => { - const wallet = await generateTestWallet(provider, [[300_000, baseAssetId]]); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: MultiTokenContractAbi__factory, + bytecode: MultiTokenContractAbiHex, + }, + { + deployer: MultiTokenContractAbi__factory, + bytecode: MultiTokenContractAbiHex, + }, + ], + walletsConfig: { + amountPerCoin: 100_000_000, + }, + }); + + const { + wallets: [wallet], + contracts: [contractSender, contractRecipient], + } = launched; - using contractSender = await launchTestContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); contractSender.account = wallet; - using contractRecipient = await launchTestContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); const { transactionResult: { mintedAssets }, } = await contractSender.functions.mint_coins(100000).call(); diff --git a/packages/fuel-gauge/src/utils.ts b/packages/fuel-gauge/src/utils.ts index fd8cbc2747b..07bedd63aac 100644 --- a/packages/fuel-gauge/src/utils.ts +++ b/packages/fuel-gauge/src/utils.ts @@ -54,5 +54,7 @@ export async function launchTestContract(config: } = await launchTestNode({ contractsConfigs: [config], }); - return Object.assign(contract, { [Symbol.dispose]: () => Promise.resolve(cleanup()) }); + return Object.assign(contract, { + [Symbol.dispose]: () => Promise.resolve(cleanup()), + }); } diff --git a/packages/fuel-gauge/test/fixtures/forc-projects/Forc.toml b/packages/fuel-gauge/test/fixtures/forc-projects/Forc.toml index e853095e252..b017851d107 100644 --- a/packages/fuel-gauge/test/fixtures/forc-projects/Forc.toml +++ b/packages/fuel-gauge/test/fixtures/forc-projects/Forc.toml @@ -60,8 +60,8 @@ members = [ "small-bytes", "std-lib-string", "storage-test-contract", - "token_abi", - "token_contract", + "token-abi", + "token-contract", "vector-types-contract", "vector-types-script", "vectors", diff --git a/packages/fuel-gauge/test/fixtures/forc-projects/token_abi/Forc.toml b/packages/fuel-gauge/test/fixtures/forc-projects/token_abi/Forc.toml index 616942145bc..ccb9d450b7c 100644 --- a/packages/fuel-gauge/test/fixtures/forc-projects/token_abi/Forc.toml +++ b/packages/fuel-gauge/test/fixtures/forc-projects/token_abi/Forc.toml @@ -1,6 +1,6 @@ [project] authors = ["Fuel Labs "] license = "Apache-2.0" -name = "token_abi" +name = "token-abi" [dependencies] diff --git a/packages/fuel-gauge/test/fixtures/forc-projects/token_contract/Forc.toml b/packages/fuel-gauge/test/fixtures/forc-projects/token_contract/Forc.toml index e1c68c87ef0..49924786669 100644 --- a/packages/fuel-gauge/test/fixtures/forc-projects/token_contract/Forc.toml +++ b/packages/fuel-gauge/test/fixtures/forc-projects/token_contract/Forc.toml @@ -1,7 +1,7 @@ [project] authors = ["Fuel Labs "] license = "Apache-2.0" -name = "token_contract" +name = "token-contract" [dependencies] -token_abi = { path = "../token_abi" } +token-abi = { path = "../token-abi" } diff --git a/packages/fuel-gauge/test/fixtures/index.ts b/packages/fuel-gauge/test/fixtures/index.ts index 0a2a206cf8e..e33c1093a9f 100644 --- a/packages/fuel-gauge/test/fixtures/index.ts +++ b/packages/fuel-gauge/test/fixtures/index.ts @@ -57,8 +57,8 @@ export enum FuelGaugeProjectsEnum { SCRIPT_WITH_VECTOR_MIXED = 'script-with-vector-mixed', STD_LIB_STRING = 'std-lib-string', STORAGE_TEST_CONTRACT = 'storage-test-contract', - TOKEN_ABI = 'token_abi', - TOKEN_CONTRACT = 'token_contract', + TOKEN_ABI = 'token-abi', + TOKEN_CONTRACT = 'token-contract', VECTOR_TYPES_CONTRACT = 'vector-types-contract', VECTOR_TYPES_SCRIPT = 'vector-types-script', VECTORS = 'vectors', From f9c5fbf8bcfcc3a159e2a33189ea1960903cae65 Mon Sep 17 00:00:00 2001 From: chad Date: Sun, 7 Jul 2024 14:31:19 -0500 Subject: [PATCH 22/53] fix: update script configurable tests --- .../forc-projects/return-script/Forc.toml | 1 + package.json | 1 + packages/create-fuels/create-fuels.js | 0 packages/fuel-gauge/src/min-gas.test.ts | 5 +- .../src/predicate-conditional-inputs.test.ts | 2 +- .../src/reentrant-contract-calls.test.ts | 5 - packages/fuel-gauge/src/revert-error.test.ts | 9 +- .../fuel-gauge/src/script-main-args.test.ts | 21 +- .../src/script-with-configurable.test.ts | 87 +++++--- .../src/script-with-vectors.test.ts | 56 +++-- .../fuel-gauge/src/std-lib-string.test.ts | 92 ++++---- .../src/storage-test-contract.test.ts | 28 ++- .../src/token-test-contract.test.ts | 65 ++++-- .../src/transaction-summary.test.ts | 2 - .../{token_abi => token-abi}/Forc.toml | 0 .../{token_abi => token-abi}/src/main.sw | 0 .../Forc.toml | 0 .../src/main.sw | 0 pnpm-lock.yaml | 198 ++++++++++-------- 19 files changed, 349 insertions(+), 223 deletions(-) mode change 100644 => 100755 packages/create-fuels/create-fuels.js rename packages/fuel-gauge/test/fixtures/forc-projects/{token_abi => token-abi}/Forc.toml (100%) rename packages/fuel-gauge/test/fixtures/forc-projects/{token_abi => token-abi}/src/main.sw (100%) rename packages/fuel-gauge/test/fixtures/forc-projects/{token_contract => token-contract}/Forc.toml (100%) rename packages/fuel-gauge/test/fixtures/forc-projects/{token_contract => token-contract}/src/main.sw (100%) diff --git a/apps/docs-snippets/test/fixtures/forc-projects/return-script/Forc.toml b/apps/docs-snippets/test/fixtures/forc-projects/return-script/Forc.toml index e8fdc98ec27..c4bf2224e3c 100644 --- a/apps/docs-snippets/test/fixtures/forc-projects/return-script/Forc.toml +++ b/apps/docs-snippets/test/fixtures/forc-projects/return-script/Forc.toml @@ -1,4 +1,5 @@ [project] +authors = ["Fuel Labs "] entry = "main.sw" license = "Apache-2.0" name = "return-script" diff --git a/package.json b/package.json index 86a8d8460f0..70f537cb6a4 100644 --- a/package.json +++ b/package.json @@ -60,6 +60,7 @@ "devDependencies": { "@actions/core": "^1.10.1", "@actions/github": "^6.0.0", + "@babel/runtime": "^7.22.5", "@changesets/cli": "^2.27.1", "@changesets/get-github-info": "^0.6.0", "@changesets/read": "^0.6.0", diff --git a/packages/create-fuels/create-fuels.js b/packages/create-fuels/create-fuels.js old mode 100644 new mode 100755 diff --git a/packages/fuel-gauge/src/min-gas.test.ts b/packages/fuel-gauge/src/min-gas.test.ts index c46187a0f70..8334acd724a 100644 --- a/packages/fuel-gauge/src/min-gas.test.ts +++ b/packages/fuel-gauge/src/min-gas.test.ts @@ -1,6 +1,4 @@ import { - ContractFactory, - Wallet, bn, TransactionStatus, ScriptTransactionRequest, @@ -12,8 +10,7 @@ import { } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; -import { ComplexPredicateAbi__factory } from '../test/typegen/predicates'; +import { ComplexPredicateAbi__factory } from '../test/typegen'; /** * @group node diff --git a/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts b/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts index 83b2e5badf7..49ad4621adb 100644 --- a/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts +++ b/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts @@ -1,4 +1,4 @@ -import { Provider, FUEL_NETWORK_URL, Predicate, Wallet, ScriptTransactionRequest, bn } from 'fuels'; +import { Predicate, Wallet, ScriptTransactionRequest, bn } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; import { PredicateConditionalInputsAbi__factory } from '../test/typegen/predicates'; diff --git a/packages/fuel-gauge/src/reentrant-contract-calls.test.ts b/packages/fuel-gauge/src/reentrant-contract-calls.test.ts index a9528be80ed..53b2c402034 100644 --- a/packages/fuel-gauge/src/reentrant-contract-calls.test.ts +++ b/packages/fuel-gauge/src/reentrant-contract-calls.test.ts @@ -16,11 +16,6 @@ import StorageTestContractAbiHex from '../test/typegen/contracts/StorageTestCont * @group browser */ describe('Reentrant Contract Calls', () => { - it.only('dummy test', async () => { - console.log('before'); - using node = await launchTestNode(); - console.log('after'); - }); it('should ensure the SDK returns the proper value for a reentrant call', async () => { using launched = await launchTestNode({ contractsConfigs: [ diff --git a/packages/fuel-gauge/src/revert-error.test.ts b/packages/fuel-gauge/src/revert-error.test.ts index 7fa3d6f8458..edeb658ef3f 100644 --- a/packages/fuel-gauge/src/revert-error.test.ts +++ b/packages/fuel-gauge/src/revert-error.test.ts @@ -4,9 +4,9 @@ import type { TransactionResultReceipt } from 'fuels'; import { bn, getRandomB256, ContractFactory } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; -import { RevertErrorAbi__factory } from '../test/typegen/contracts'; +import { RevertErrorAbi__factory, TokenContractAbi__factory } from '../test/typegen/contracts'; import RevertErrorAbiHex from '../test/typegen/contracts/RevertErrorAbi.hex'; +import TokenContractAbiHex from '../test/typegen/contracts/TokenContractAbi.hex'; import { launchTestContract } from './utils'; @@ -191,11 +191,8 @@ describe('Revert Error Testing', () => { wallets: [wallet], provider, } = launched; - const { binHexlified: tokenBytecode, abiContents: tokenAbi } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.TOKEN_CONTRACT - ); - const factory = new ContractFactory(tokenBytecode, tokenAbi, wallet); + const factory = new ContractFactory(TokenContractAbiHex, TokenContractAbi__factory.abi, wallet); const tokenContract = await factory.deployContract(); const addresses = [ diff --git a/packages/fuel-gauge/src/script-main-args.test.ts b/packages/fuel-gauge/src/script-main-args.test.ts index 8186941da42..9bd73a6347a 100644 --- a/packages/fuel-gauge/src/script-main-args.test.ts +++ b/packages/fuel-gauge/src/script-main-args.test.ts @@ -2,7 +2,7 @@ import type { BigNumberish } from 'fuels'; import { bn, Script } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { ScriptMainArgsAbi__factory } from '../test/typegen'; import { getScript } from './utils'; @@ -12,6 +12,7 @@ type Baz = { /** * @group node + * @group browser */ describe('Script Coverage', () => { it('can call script and use main arguments', async () => { @@ -20,13 +21,13 @@ describe('Script Coverage', () => { wallets: [wallet], } = launched; - const { binHexlified: scriptBin, abiContents: scriptAbi } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.SCRIPT_MAIN_ARGS - ); - // #region script-call-factory const foo = 33; - const scriptInstance = new Script(scriptBin, scriptAbi, wallet); + const scriptInstance = new Script( + ScriptMainArgsAbi__factory.bin, + ScriptMainArgsAbi__factory.abi, + wallet + ); const { value, logs } = await scriptInstance.functions.main(foo).call(); // #endregion script-call-factory @@ -78,11 +79,11 @@ describe('Script Coverage', () => { wallets: [wallet], } = launched; - const { binHexlified: scriptBin, abiContents: scriptAbi } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.SCRIPT_MAIN_ARGS + const scriptInstance = new Script( + ScriptMainArgsAbi__factory.bin, + ScriptMainArgsAbi__factory.abi, + wallet ); - - const scriptInstance = new Script(scriptBin, scriptAbi, wallet); const foo = 42; await expect( diff --git a/packages/fuel-gauge/src/script-with-configurable.test.ts b/packages/fuel-gauge/src/script-with-configurable.test.ts index 0984199e354..2fa201e4ef0 100644 --- a/packages/fuel-gauge/src/script-with-configurable.test.ts +++ b/packages/fuel-gauge/src/script-with-configurable.test.ts @@ -1,38 +1,33 @@ -import type { CoinQuantityLike, WalletUnlocked } from 'fuels'; -import { Script, Provider, FUEL_NETWORK_URL } from 'fuels'; -import { generateTestWallet } from 'fuels/test-utils'; +import { Script } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { ScriptWithConfigurableAbi__factory } from '../test/typegen'; const defaultValues = { FEE: 5, }; -let wallet: WalletUnlocked; - /** * @group node + * @group browser */ describe('Script With Configurable', () => { - const { binHexlified: bytecode, abiContents: abi } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.SCRIPT_WITH_CONFIGURABLE - ); - - beforeAll(async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - const baseAssetId = provider.getBaseAssetId(); - const quantities: CoinQuantityLike[] = [ - { - amount: 1_000_000, - assetId: baseAssetId, + it('should returns true when input value matches default configurable constant', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000, }, - ]; + }); - wallet = await generateTestWallet(provider, quantities); - }); + const { + wallets: [wallet], + } = launched; - it('should returns true when input value matches default configurable constant', async () => { - const script = new Script(bytecode, abi, wallet); + const script = new Script( + ScriptWithConfigurableAbi__factory.bin, + ScriptWithConfigurableAbi__factory.abi, + wallet + ); script.setConfigurableConstants(defaultValues); @@ -42,11 +37,25 @@ describe('Script With Configurable', () => { }); it('should returns false when input value differs from default configurable constant', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); + + const { + wallets: [wallet], + } = launched; + const configurableConstants = { FEE: 71 }; expect(configurableConstants.FEE).not.toEqual(defaultValues.FEE); - const script = new Script(bytecode, abi, wallet); + const script = new Script( + ScriptWithConfigurableAbi__factory.bin, + ScriptWithConfigurableAbi__factory.abi, + wallet + ); script.setConfigurableConstants(defaultValues); @@ -56,9 +65,23 @@ describe('Script With Configurable', () => { }); it('should returns true when input value matches manually set configurable constant', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); + + const { + wallets: [wallet], + } = launched; + const configurableConstants = { FEE: 35 }; - const script = new Script(bytecode, abi, wallet); + const script = new Script( + ScriptWithConfigurableAbi__factory.bin, + ScriptWithConfigurableAbi__factory.abi, + wallet + ); script.setConfigurableConstants(configurableConstants); @@ -68,13 +91,27 @@ describe('Script With Configurable', () => { }); it('should returns false when input value differs from manually set configurable constant', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); + + const { + wallets: [wallet], + } = launched; + const configurableConstants = { FEE: 10 }; const input = { FEE: 15 }; expect(configurableConstants.FEE).not.toEqual(input.FEE); - const script = new Script(bytecode, abi, wallet); + const script = new Script( + ScriptWithConfigurableAbi__factory.bin, + ScriptWithConfigurableAbi__factory.abi, + wallet + ); script.setConfigurableConstants(configurableConstants); diff --git a/packages/fuel-gauge/src/script-with-vectors.test.ts b/packages/fuel-gauge/src/script-with-vectors.test.ts index a31dfece176..2ad45810b5c 100644 --- a/packages/fuel-gauge/src/script-with-vectors.test.ts +++ b/packages/fuel-gauge/src/script-with-vectors.test.ts @@ -1,25 +1,24 @@ import type { BigNumberish } from 'fuels'; -import { FUEL_NETWORK_URL, Provider } from 'fuels'; -import { generateTestWallet } from 'fuels/test-utils'; +import { launchTestNode } from 'fuels/test-utils'; import { getScript } from './utils'; -const setup = async (balance = 500_000) => { - const provider = await Provider.create(FUEL_NETWORK_URL); - const baseAssetId = provider.getBaseAssetId(); - - // Create wallet - const wallet = await generateTestWallet(provider, [[balance, baseAssetId]]); - - return wallet; -}; - /** * @group node + * @group browser */ describe('Script With Vectors', () => { it('can call script and use main argument [array]', async () => { - const wallet = await setup(); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); + + const { + wallets: [wallet], + } = launched; + const someArray = [1, 100]; const scriptInstance = getScript<[BigNumberish[]], void>('script-with-array', wallet); @@ -29,7 +28,16 @@ describe('Script With Vectors', () => { }); it('can call script and use main argument [vec]', async () => { - const wallet = await setup(); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); + + const { + wallets: [wallet], + } = launched; + const someVec = [7, 2, 1, 5]; const scriptInstance = getScript<[BigNumberish[]], void>('script-with-vector', wallet); @@ -53,7 +61,15 @@ describe('Script With Vectors', () => { }); it('can call script and use main argument [struct in vec in struct in vec in struct in vec]', async () => { - const wallet = await setup(); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); + + const { + wallets: [wallet], + } = launched; const importantDates = [ { @@ -93,7 +109,15 @@ describe('Script With Vectors', () => { }); it('can call script and use main argument [struct in vec in struct in vec in struct in vec]', async () => { - const wallet = await setup(); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); + + const { + wallets: [wallet], + } = launched; const scores = [24, 56, 43]; diff --git a/packages/fuel-gauge/src/std-lib-string.test.ts b/packages/fuel-gauge/src/std-lib-string.test.ts index 0d320eaf762..c09675ea1ca 100644 --- a/packages/fuel-gauge/src/std-lib-string.test.ts +++ b/packages/fuel-gauge/src/std-lib-string.test.ts @@ -1,42 +1,32 @@ -import { bn, Predicate, Wallet, Address, Provider, FUEL_NETWORK_URL } from 'fuels'; -import type { Contract } from 'fuels'; -import { generateTestWallet } from 'fuels/test-utils'; +import { bn, Predicate, Wallet, Address } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { PredicateStdLibStringAbi__factory, StdLibStringAbi__factory } from '../test/typegen'; +import StdLibStringAbiHex from '../test/typegen/contracts/StdLibStringAbi.hex'; import { getScript, launchTestContract } from './utils'; -let baseAssetId: string; -beforeAll(async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.STD_LIB_STRING); - baseAssetId = contractInstance.provider.getBaseAssetId(); -}); - -const setup = async (balance = 500_000) => { - const provider = await Provider.create(FUEL_NETWORK_URL); - - // Create wallet - const wallet = await generateTestWallet(provider, [[balance, baseAssetId]]); - - return wallet; -}; - /** * @group node * @group browser */ -describe('std-lib-string Tests', () => { - const { binHexlified: predicateStdString, abiContents: predicateStdStringAbi } = - getFuelGaugeForcProject(FuelGaugeProjectsEnum.PREDICATE_STD_LIB_STRING); +async function setupContract() { + return launchTestContract({ + deployer: StdLibStringAbi__factory, + bytecode: StdLibStringAbiHex, + }); +} + +describe('std-lib-string Tests', () => { it('should test std-lib-string return', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.STD_LIB_STRING); + using contractInstance = await setupContract(); const { value } = await contractInstance.functions.return_dynamic_string().call(); expect(value).toBe('Hello World'); }); it('should test std-lib-string input', async () => { - using contractInstance = await launchTestContract(FuelGaugeProjectsEnum.STD_LIB_STRING); + using contractInstance = await setupContract(); const INPUT = 'Hello World'; const { value } = await contractInstance.functions.accepts_dynamic_string(INPUT).call(); @@ -45,28 +35,49 @@ describe('std-lib-string Tests', () => { }); it('should test String input [predicate-std-lib-string]', async () => { - const wallet = await setup(); - const receiver = Wallet.fromAddress(Address.fromRandom(), wallet.provider); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); + + const { + provider, + wallets: [wallet], + } = launched; + + const receiver = Wallet.fromAddress(Address.fromRandom(), provider); + const amountToPredicate = 300_000; const amountToReceiver = 50; type MainArgs = [number, number, string]; const predicate = new Predicate({ - bytecode: predicateStdString, - abi: predicateStdStringAbi, - provider: wallet.provider, + bytecode: PredicateStdLibStringAbi__factory.bin, + abi: PredicateStdLibStringAbi__factory.abi, + provider, inputData: [1, 2, 'Hello World'], }); // setup predicate - const setupTx = await wallet.transfer(predicate.address, amountToPredicate, baseAssetId, { - gasLimit: 10_000, - }); + const setupTx = await wallet.transfer( + predicate.address, + amountToPredicate, + provider.getBaseAssetId(), + { + gasLimit: 10_000, + } + ); await setupTx.waitForResult(); const initialReceiverBalance = await receiver.getBalance(); - const tx = await predicate.transfer(receiver.address, amountToReceiver, baseAssetId, { - gasLimit: 10_000, - }); + const tx = await predicate.transfer( + receiver.address, + amountToReceiver, + provider.getBaseAssetId(), + { + gasLimit: 10_000, + } + ); const { isStatusSuccess } = await tx.waitForResult(); // Check the balance of the receiver @@ -79,7 +90,16 @@ describe('std-lib-string Tests', () => { }); it('should test String input [script-std-lib-string]', async () => { - const wallet = await setup(); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); + + const { + wallets: [wallet], + } = launched; + type MainArgs = [string]; const scriptInstance = getScript('script-std-lib-string', wallet); const INPUT = 'Hello World'; diff --git a/packages/fuel-gauge/src/storage-test-contract.test.ts b/packages/fuel-gauge/src/storage-test-contract.test.ts index 187e87c5713..2d948b4de55 100644 --- a/packages/fuel-gauge/src/storage-test-contract.test.ts +++ b/packages/fuel-gauge/src/storage-test-contract.test.ts @@ -1,4 +1,4 @@ -import { toHex, Provider, ContractFactory, FUEL_NETWORK_URL } from 'fuels'; +import { toHex, ContractFactory } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; import { StorageTestContractAbi__factory } from '../test/typegen'; @@ -10,19 +10,27 @@ import StorageTestContractAbiHex from '../test/typegen/contracts/StorageTestCont */ describe('StorageTestContract', () => { it('can increment counter', async () => { - using launched = await launchTestNode({ - contractsConfigs: [ - { - deployer: StorageTestContractAbi__factory, - bytecode: StorageTestContractAbiHex, - }, - ], - }); + using launched = await launchTestNode(); const { - contracts: [contract], + wallets: [wallet], } = launched; + const { storageSlots } = StorageTestContractAbi__factory; + + // #region contract-deployment-storage-slots + // #context import storageSlots from '../your-sway-project/out/debug/your-sway-project-storage_slots.json'; + + const factory = new ContractFactory( + StorageTestContractAbiHex, + StorageTestContractAbi__factory.abi, + wallet + ); + const contract = await factory.deployContract({ + storageSlots, + }); + // #endregion contract-deployment-storage-slots + // Call contract const { value: initializeResult } = await contract.functions.initialize_counter(1300).call(); expect(initializeResult.toHex()).toEqual(toHex(1300)); diff --git a/packages/fuel-gauge/src/token-test-contract.test.ts b/packages/fuel-gauge/src/token-test-contract.test.ts index 6f2d459e631..e4d6e86fa3c 100644 --- a/packages/fuel-gauge/src/token-test-contract.test.ts +++ b/packages/fuel-gauge/src/token-test-contract.test.ts @@ -3,9 +3,8 @@ import type { AssetId, BN } from 'fuels'; import { toHex, Wallet, bn } from 'fuels'; import { expectToThrowFuelError, launchTestNode } from 'fuels/test-utils'; -import { TokenAbi__factory } from '../test/typegen'; -import TokenAbiHex from '../test/typegen/contracts/TokenAbi.hex'; - +import { TokenContractAbi__factory } from '../test/typegen'; +import TokenContractAbiHex from '../test/typegen/contracts/TokenContractAbi.hex'; /** * @group node * @group browser @@ -17,8 +16,8 @@ describe('TokenTestContract', () => { using launched = await launchTestNode({ contractsConfigs: [ { - deployer: MultiTokenContractAbi__factory, - bytecode: MultiTokenContractAbiHex, + deployer: TokenContractAbi__factory, + bytecode: TokenContractAbiHex, }, ], }); @@ -58,16 +57,27 @@ describe('TokenTestContract', () => { }); it('Automatically add variableOuputs', async () => { - const [wallet1, wallet2, wallet3] = Array.from({ length: 3 }, () => - Wallet.generate({ provider }) - ); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: TokenContractAbi__factory, + bytecode: TokenContractAbiHex, + }, + ], + walletsConfig: { + count: 3, + }, + }); + + const { + wallets: [wallet1, wallet2, wallet3], + contracts: [token], + } = launched; const addresses = [wallet1, wallet2, wallet3].map((wallet) => ({ bits: wallet.address.toB256(), })); - const token = await setup(); - const functionCallOne = token.functions.mint_to_addresses(addresses, 10); await functionCallOne.dryRun(); const { transactionResult } = await functionCallOne.call(); @@ -118,8 +128,20 @@ describe('TokenTestContract', () => { }); it('Contract getBalance', async () => { - const userWallet = Wallet.generate({ provider }); - const token = await setup(); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: TokenContractAbi__factory, + bytecode: TokenContractAbiHex, + }, + ], + }); + + const { + wallets: [userWallet], + contracts: [token], + } = launched; + const addressId = { bits: userWallet.address.toB256(), }; @@ -142,12 +164,25 @@ describe('TokenTestContract', () => { }); it('throws when passing entire Address object as address parameter', async () => { - const userWallet = Wallet.generate({ provider }); - const token = await setup(); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: TokenContractAbi__factory, + bytecode: TokenContractAbiHex, + }, + ], + }); + + const { + provider, + wallets: [userWallet], + contracts: [token], + } = launched; + const addressParameter = { bits: userWallet.address, }; - const assetId: AssetId = { bits: baseAssetId }; + const assetId: AssetId = { bits: provider.getBaseAssetId() }; await expectToThrowFuelError( () => token.functions.transfer_to_address(addressParameter, assetId, 50).call(), diff --git a/packages/fuel-gauge/src/transaction-summary.test.ts b/packages/fuel-gauge/src/transaction-summary.test.ts index 5f6c26480ff..c04cb35e144 100644 --- a/packages/fuel-gauge/src/transaction-summary.test.ts +++ b/packages/fuel-gauge/src/transaction-summary.test.ts @@ -7,11 +7,9 @@ import type { } from 'fuels'; import { BN, - FUEL_NETWORK_URL, getTransactionsSummaries, getTransactionSummary, getTransactionSummaryFromRequest, - Provider, ScriptTransactionRequest, TransactionTypeName, Wallet, diff --git a/packages/fuel-gauge/test/fixtures/forc-projects/token_abi/Forc.toml b/packages/fuel-gauge/test/fixtures/forc-projects/token-abi/Forc.toml similarity index 100% rename from packages/fuel-gauge/test/fixtures/forc-projects/token_abi/Forc.toml rename to packages/fuel-gauge/test/fixtures/forc-projects/token-abi/Forc.toml diff --git a/packages/fuel-gauge/test/fixtures/forc-projects/token_abi/src/main.sw b/packages/fuel-gauge/test/fixtures/forc-projects/token-abi/src/main.sw similarity index 100% rename from packages/fuel-gauge/test/fixtures/forc-projects/token_abi/src/main.sw rename to packages/fuel-gauge/test/fixtures/forc-projects/token-abi/src/main.sw diff --git a/packages/fuel-gauge/test/fixtures/forc-projects/token_contract/Forc.toml b/packages/fuel-gauge/test/fixtures/forc-projects/token-contract/Forc.toml similarity index 100% rename from packages/fuel-gauge/test/fixtures/forc-projects/token_contract/Forc.toml rename to packages/fuel-gauge/test/fixtures/forc-projects/token-contract/Forc.toml diff --git a/packages/fuel-gauge/test/fixtures/forc-projects/token_contract/src/main.sw b/packages/fuel-gauge/test/fixtures/forc-projects/token-contract/src/main.sw similarity index 100% rename from packages/fuel-gauge/test/fixtures/forc-projects/token_contract/src/main.sw rename to packages/fuel-gauge/test/fixtures/forc-projects/token-contract/src/main.sw diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 04522b8c374..b076e5d5a95 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,6 +17,9 @@ importers: '@actions/github': specifier: ^6.0.0 version: 6.0.0 + '@babel/runtime': + specifier: ^7.22.5 + version: 7.24.7 '@changesets/cli': specifier: ^2.27.1 version: 2.27.1 @@ -157,7 +160,7 @@ importers: version: 4.16.0 turbo: specifier: ^2.0.4 - version: 2.0.4 + version: 2.0.6 typescript: specifier: ~5.4.5 version: 5.4.5 @@ -2292,8 +2295,8 @@ packages: resolution: {integrity: sha512-TNPDN6aBFaUox2Lu+H/Y1dKKQgr4ucz/FGyCz67RVYLsBpVpUFf1dDngzg+Od8aqbrqwyztkaZjtWCZEUOT8zA==} engines: {node: '>=6.9.0'} - '@babel/runtime@7.23.4': - resolution: {integrity: sha512-2Yv65nlWnWlSpe3fXEyX5i7fx5kIKo4Qbcj+hMO0odwaneFjfXw5fdum+4yL20O0QiaHpia0cYQ9xpNMqrBwHg==} + '@babel/runtime@7.24.7': + resolution: {integrity: sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==} engines: {node: '>=6.9.0'} '@babel/template@7.24.6': @@ -6416,7 +6419,6 @@ packages: bun@1.1.17: resolution: {integrity: sha512-x2vUqI75XQ11Qxb3FzQCd/AkbA8A3AiJ35xfw49JeNgu0MTi0RCuW+1zOyFf5iJM0xU07LKf2H69n4ASuEqhtQ==} - cpu: [arm64, x64] os: [darwin, linux, win32] hasBin: true @@ -13185,38 +13187,38 @@ packages: resolution: {integrity: sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==} engines: {node: '>=0.6.11 <=0.7.0 || >=0.7.3'} - turbo-darwin-64@2.0.4: - resolution: {integrity: sha512-x9mvmh4wudBstML8Z8IOmokLWglIhSfhQwnh2gBCSqabgVBKYvzl8Y+i+UCNPxheCGTgtsPepTcIaKBIyFIcvw==} + turbo-darwin-64@2.0.6: + resolution: {integrity: sha512-XpgBwWj3Ggmz/gQVqXdMKXHC1iFPMDiuwugLwSzE7Ih0O13JuNtYZKhQnopvbDQnFQCeRq2Vsm5OTWabg/oB/g==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.0.4: - resolution: {integrity: sha512-/B1Ih8zPRGVw5vw4SlclOf3C/woJ/2T6ieH6u54KT4wypoaVyaiyMqBcziIXycdObIYr7jQ+raHO7q3mhay9/A==} + turbo-darwin-arm64@2.0.6: + resolution: {integrity: sha512-RfeZYXIAkiA21E8lsvfptGTqz/256YD+eI1x37fedfvnHFWuIMFZGAOwJxtZc6QasQunDZ9TRRREbJNI68tkIw==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.0.4: - resolution: {integrity: sha512-6aG670e5zOWu6RczEYcB81nEl8EhiGJEvWhUrnAfNEUIMBEH1pR5SsMmG2ol5/m3PgiRM12r13dSqTxCLcHrVg==} + turbo-linux-64@2.0.6: + resolution: {integrity: sha512-92UDa0xNQQbx0HdSp9ag3YSS3xPdavhc7q9q9mxIAcqyjjD6VElA4Y85m4F/DDGE5SolCrvBz2sQhVmkOd6Caw==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.0.4: - resolution: {integrity: sha512-AXfVOjst+mCtPDFT4tCu08Qrfv12Nj7NDd33AjGwV79NYN1Y1rcFY59UQ4nO3ij3rbcvV71Xc+TZJ4csEvRCSg==} + turbo-linux-arm64@2.0.6: + resolution: {integrity: sha512-eQKu6utCVUkIH2kqOzD8OS6E0ba6COjWm6PRDTNCHQRljZW503ycaTUIdMOiJrVg1MkEjDyOReUg8s8D18aJ4Q==} cpu: [arm64] os: [linux] - turbo-windows-64@2.0.4: - resolution: {integrity: sha512-QOnUR9hKl0T5gq5h1fAhVEqBSjpcBi/BbaO71YGQNgsr6pAnCQdbG8/r3MYXet53efM0KTdOhieWeO3KLNKybA==} + turbo-windows-64@2.0.6: + resolution: {integrity: sha512-+9u4EPrpoeHYCQ46dRcou9kbkSoelhOelHNcbs2d86D6ruYD/oIAHK9qgYK8LeARRz0jxhZIA/dWYdYsxJJWkw==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.0.4: - resolution: {integrity: sha512-3v8WpdZy1AxZw0gha0q3caZmm+0gveBQ40OspD6mxDBIS+oBtO5CkxhIXkFJJW+jDKmDlM7wXDIGfMEq+QyNCQ==} + turbo-windows-arm64@2.0.6: + resolution: {integrity: sha512-rdrKL+p+EjtdDVg0wQ/7yTbzkIYrnb0Pw4IKcjsy3M0RqUM9UcEi67b94XOAyTa5a0GqJL1+tUj2ebsFGPgZbg==} cpu: [arm64] os: [win32] - turbo@2.0.4: - resolution: {integrity: sha512-Ilme/2Q5kYw0AeRr+aw3s02+WrEYaY7U8vPnqSZU/jaDG/qd6jHVN6nRWyd/9KXvJGYM69vE6JImoGoyNjLwaw==} + turbo@2.0.6: + resolution: {integrity: sha512-/Ftmxd5Mq//a9yMonvmwENNUN65jOVTwhhBPQjEtNZutYT9YKyzydFGLyVM1nzhpLWahQSMamRc/RDBv5EapzA==} hasBin: true type-check@0.4.0: @@ -14411,7 +14413,7 @@ snapshots: '@babel/core': 7.24.4 '@babel/generator': 7.24.4 '@babel/parser': 7.24.7 - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@babel/traverse': 7.24.1 '@babel/types': 7.24.6 babel-preset-fbjs: 3.4.0(@babel/core@7.24.4) @@ -16311,7 +16313,7 @@ snapshots: core-js-pure: 3.31.0 regenerator-runtime: 0.13.11 - '@babel/runtime@7.23.4': + '@babel/runtime@7.24.7': dependencies: regenerator-runtime: 0.14.0 @@ -16376,7 +16378,7 @@ snapshots: '@changesets/apply-release-plan@7.0.0': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@changesets/config': 3.0.0 '@changesets/get-version-range-type': 0.4.0 '@changesets/git': 3.0.0 @@ -16392,7 +16394,7 @@ snapshots: '@changesets/assemble-release-plan@6.0.0': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.0.0 '@changesets/types': 6.0.0 @@ -16405,7 +16407,7 @@ snapshots: '@changesets/cli@2.27.1': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@changesets/apply-release-plan': 7.0.0 '@changesets/assemble-release-plan': 6.0.0 '@changesets/changelog-git': 0.2.0 @@ -16469,7 +16471,7 @@ snapshots: '@changesets/get-release-plan@4.0.0': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@changesets/assemble-release-plan': 6.0.0 '@changesets/config': 3.0.0 '@changesets/pre': 2.0.0 @@ -16481,7 +16483,7 @@ snapshots: '@changesets/git@3.0.0': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@changesets/errors': 0.2.0 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 @@ -16500,7 +16502,7 @@ snapshots: '@changesets/pre@2.0.0': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@changesets/errors': 0.2.0 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 @@ -16508,7 +16510,7 @@ snapshots: '@changesets/read@0.6.0': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@changesets/git': 3.0.0 '@changesets/logger': 0.1.0 '@changesets/parse': 0.4.0 @@ -16523,7 +16525,7 @@ snapshots: '@changesets/write@0.3.0': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@changesets/types': 6.0.0 fs-extra: 7.0.1 human-id: 1.0.2 @@ -17966,14 +17968,14 @@ snapshots: '@manypkg/find-root@1.1.0': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@types/node': 12.20.55 find-up: 4.1.0 fs-extra: 8.1.0 '@manypkg/get-packages@1.1.3': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@changesets/types': 4.1.0 '@manypkg/find-root': 1.1.0 fs-extra: 8.1.0 @@ -18657,25 +18659,25 @@ snapshots: '@radix-ui/primitive@1.0.1': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@radix-ui/react-compose-refs@1.0.1(@types/react@18.3.3)(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 react: 18.3.1 optionalDependencies: '@types/react': 18.3.3 '@radix-ui/react-context@1.0.1(@types/react@18.3.3)(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 react: 18.3.1 optionalDependencies: '@types/react': 18.3.3 '@radix-ui/react-dialog@1.0.5(@types/react-dom@18.2.4)(@types/react@18.3.3)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@radix-ui/primitive': 1.0.1 '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.3)(react@18.3.1) '@radix-ui/react-context': 1.0.1(@types/react@18.3.3)(react@18.3.1) @@ -18698,7 +18700,7 @@ snapshots: '@radix-ui/react-dialog@1.0.5(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@radix-ui/primitive': 1.0.1 '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.3)(react@18.3.1) '@radix-ui/react-context': 1.0.1(@types/react@18.3.3)(react@18.3.1) @@ -18721,7 +18723,7 @@ snapshots: '@radix-ui/react-dismissable-layer@1.0.5(@types/react-dom@18.2.4)(@types/react@18.3.3)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@radix-ui/primitive': 1.0.1 '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.3)(react@18.3.1) '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.4)(@types/react@18.3.3)(react-dom@18.2.0(react@18.3.1))(react@18.3.1) @@ -18735,7 +18737,7 @@ snapshots: '@radix-ui/react-dismissable-layer@1.0.5(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@radix-ui/primitive': 1.0.1 '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.3)(react@18.3.1) '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -18749,14 +18751,14 @@ snapshots: '@radix-ui/react-focus-guards@1.0.1(@types/react@18.3.3)(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 react: 18.3.1 optionalDependencies: '@types/react': 18.3.3 '@radix-ui/react-focus-scope@1.0.4(@types/react-dom@18.2.4)(@types/react@18.3.3)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.3)(react@18.3.1) '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.4)(@types/react@18.3.3)(react-dom@18.2.0(react@18.3.1))(react@18.3.1) '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.3)(react@18.3.1) @@ -18768,7 +18770,7 @@ snapshots: '@radix-ui/react-focus-scope@1.0.4(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.3)(react@18.3.1) '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.3)(react@18.3.1) @@ -18780,7 +18782,7 @@ snapshots: '@radix-ui/react-id@1.0.1(@types/react@18.3.3)(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.3)(react@18.3.1) react: 18.3.1 optionalDependencies: @@ -18788,7 +18790,7 @@ snapshots: '@radix-ui/react-portal@1.0.4(@types/react-dom@18.2.4)(@types/react@18.3.3)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.4)(@types/react@18.3.3)(react-dom@18.2.0(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.2.0(react@18.3.1) @@ -18798,7 +18800,7 @@ snapshots: '@radix-ui/react-portal@1.0.4(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -18808,7 +18810,7 @@ snapshots: '@radix-ui/react-presence@1.0.1(@types/react-dom@18.2.4)(@types/react@18.3.3)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.3)(react@18.3.1) '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.3)(react@18.3.1) react: 18.3.1 @@ -18819,7 +18821,7 @@ snapshots: '@radix-ui/react-presence@1.0.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.3)(react@18.3.1) '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.3)(react@18.3.1) react: 18.3.1 @@ -18830,7 +18832,7 @@ snapshots: '@radix-ui/react-primitive@1.0.3(@types/react-dom@18.2.4)(@types/react@18.3.3)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@radix-ui/react-slot': 1.0.2(@types/react@18.3.3)(react@18.3.1) react: 18.3.1 react-dom: 18.2.0(react@18.3.1) @@ -18840,7 +18842,7 @@ snapshots: '@radix-ui/react-primitive@1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@radix-ui/react-slot': 1.0.2(@types/react@18.3.3)(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -18850,7 +18852,7 @@ snapshots: '@radix-ui/react-slot@1.0.2(@types/react@18.3.3)(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.3)(react@18.3.1) react: 18.3.1 optionalDependencies: @@ -18858,14 +18860,14 @@ snapshots: '@radix-ui/react-use-callback-ref@1.0.1(@types/react@18.3.3)(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 react: 18.3.1 optionalDependencies: '@types/react': 18.3.3 '@radix-ui/react-use-controllable-state@1.0.1(@types/react@18.3.3)(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.3)(react@18.3.1) react: 18.3.1 optionalDependencies: @@ -18873,7 +18875,7 @@ snapshots: '@radix-ui/react-use-escape-keydown@1.0.3(@types/react@18.3.3)(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.3)(react@18.3.1) react: 18.3.1 optionalDependencies: @@ -18881,7 +18883,7 @@ snapshots: '@radix-ui/react-use-layout-effect@1.0.1(@types/react@18.3.3)(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 react: 18.3.1 optionalDependencies: '@types/react': 18.3.3 @@ -19552,7 +19554,7 @@ snapshots: '@testing-library/dom@8.20.1': dependencies: '@babel/code-frame': 7.24.6 - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@types/aria-query': 5.0.1 aria-query: 5.1.3 chalk: 4.1.2 @@ -19562,7 +19564,7 @@ snapshots: '@testing-library/react@16.0.0(@testing-library/dom@8.20.1)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@testing-library/dom': 8.20.1 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -20296,7 +20298,7 @@ snapshots: '@vitest/utils': 1.6.0 magic-string: 0.30.5 sirv: 2.0.4 - vitest: 1.6.0(@types/node@18.15.3)(@vitest/browser@1.6.0)(jsdom@16.7.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(terser@5.18.2) + vitest: 1.6.0(@types/node@20.11.13)(@vitest/browser@1.6.0)(jsdom@16.7.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(terser@5.18.2) optionalDependencies: playwright: 1.44.0 webdriverio: 8.39.0(bufferutil@4.0.8)(typescript@5.4.5)(utf-8-validate@6.0.4) @@ -21306,7 +21308,7 @@ snapshots: aria-query@4.2.2: dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@babel/runtime-corejs3': 7.22.5 aria-query@5.1.3: @@ -21569,7 +21571,7 @@ snapshots: babel-plugin-macros@3.1.0: dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 cosmiconfig: 7.1.0 resolve: 1.22.8 @@ -21728,7 +21730,7 @@ snapshots: '@babel/preset-env': 7.22.5(@babel/core@7.22.5) '@babel/preset-react': 7.22.5(@babel/core@7.22.5) '@babel/preset-typescript': 7.22.5(@babel/core@7.22.5) - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 babel-plugin-macros: 3.1.0 babel-plugin-transform-react-remove-prop-types: 0.4.24 transitivePeerDependencies: @@ -22719,7 +22721,7 @@ snapshots: date-fns@2.30.0: dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 dayjs@1.11.10: {} @@ -23396,8 +23398,8 @@ snapshots: '@typescript-eslint/parser': 6.9.1(eslint@8.54.0)(typescript@5.2.2) eslint: 8.54.0 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@6.9.1(eslint@8.54.0)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0(@typescript-eslint/parser@6.9.1(eslint@8.57.0)(typescript@5.4.5))(eslint@8.54.0))(eslint@8.54.0) - eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.9.1(eslint@8.54.0)(typescript@5.2.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0) + eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@6.9.1(eslint@8.54.0)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0)(eslint@8.54.0) + eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.9.1(eslint@8.57.0)(typescript@5.4.5))(eslint@8.54.0) eslint-plugin-jsx-a11y: 6.7.1(eslint@8.54.0) eslint-plugin-react: 7.33.2(eslint@8.54.0) eslint-plugin-react-hooks: 4.6.0(eslint@8.54.0) @@ -23446,13 +23448,13 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.9.1(eslint@8.54.0)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0(@typescript-eslint/parser@6.9.1(eslint@8.57.0)(typescript@5.4.5))(eslint@8.54.0))(eslint@8.54.0): + eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.9.1(eslint@8.54.0)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0)(eslint@8.54.0): dependencies: debug: 4.3.5 enhanced-resolve: 5.15.0 eslint: 8.54.0 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.9.1(eslint@8.54.0)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.9.1(eslint@8.54.0)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0(@typescript-eslint/parser@6.9.1(eslint@8.57.0)(typescript@5.4.5))(eslint@8.54.0))(eslint@8.54.0))(eslint@8.54.0) - eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.9.1(eslint@8.54.0)(typescript@5.2.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0) + eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.9.1(eslint@8.54.0)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.9.1(eslint@8.54.0)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0)(eslint@8.54.0))(eslint@8.54.0) + eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.9.1(eslint@8.57.0)(typescript@5.4.5))(eslint@8.54.0) fast-glob: 3.3.2 get-tsconfig: 4.7.2 is-core-module: 2.13.1 @@ -23473,14 +23475,24 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.8.0(@typescript-eslint/parser@6.9.1(eslint@8.54.0)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.9.1(eslint@8.54.0)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0(@typescript-eslint/parser@6.9.1(eslint@8.57.0)(typescript@5.4.5))(eslint@8.54.0))(eslint@8.54.0))(eslint@8.54.0): + eslint-module-utils@2.8.0(@typescript-eslint/parser@6.9.1(eslint@8.54.0)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.9.1(eslint@8.54.0)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0)(eslint@8.54.0))(eslint@8.54.0): dependencies: debug: 3.2.7 optionalDependencies: '@typescript-eslint/parser': 6.9.1(eslint@8.54.0)(typescript@5.2.2) eslint: 8.54.0 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@6.9.1(eslint@8.54.0)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0(@typescript-eslint/parser@6.9.1(eslint@8.57.0)(typescript@5.4.5))(eslint@8.54.0))(eslint@8.54.0) + eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@6.9.1(eslint@8.54.0)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0)(eslint@8.54.0) + transitivePeerDependencies: + - supports-color + + eslint-module-utils@2.8.0(@typescript-eslint/parser@6.9.1(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint@8.54.0): + dependencies: + debug: 3.2.7 + optionalDependencies: + '@typescript-eslint/parser': 6.9.1(eslint@8.57.0)(typescript@5.4.5) + eslint: 8.54.0 + eslint-import-resolver-node: 0.3.9 transitivePeerDependencies: - supports-color @@ -23531,7 +23543,7 @@ snapshots: - eslint-import-resolver-webpack - supports-color - eslint-plugin-import@2.29.0(@typescript-eslint/parser@6.9.1(eslint@8.54.0)(typescript@5.2.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0): + eslint-plugin-import@2.29.0(@typescript-eslint/parser@6.9.1(eslint@8.57.0)(typescript@5.4.5))(eslint@8.54.0): dependencies: array-includes: 3.1.7 array.prototype.findlastindex: 1.2.3 @@ -23541,7 +23553,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.54.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.9.1(eslint@8.54.0)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.9.1(eslint@8.54.0)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0(@typescript-eslint/parser@6.9.1(eslint@8.57.0)(typescript@5.4.5))(eslint@8.54.0))(eslint@8.54.0))(eslint@8.54.0) + eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.9.1(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint@8.54.0) hasown: 2.0.0 is-core-module: 2.13.1 is-glob: 4.0.3 @@ -23552,7 +23564,7 @@ snapshots: semver: 6.3.1 tsconfig-paths: 3.14.2 optionalDependencies: - '@typescript-eslint/parser': 6.9.1(eslint@8.54.0)(typescript@5.2.2) + '@typescript-eslint/parser': 6.9.1(eslint@8.57.0)(typescript@5.4.5) transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack @@ -23613,7 +23625,7 @@ snapshots: eslint-plugin-jsx-a11y@6.6.1(eslint@8.57.0): dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 aria-query: 4.2.2 array-includes: 3.1.6 ast-types-flow: 0.0.7 @@ -23630,7 +23642,7 @@ snapshots: eslint-plugin-jsx-a11y@6.7.1(eslint@8.54.0): dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 aria-query: 5.3.0 array-includes: 3.1.7 array.prototype.flatmap: 1.3.2 @@ -23650,7 +23662,7 @@ snapshots: eslint-plugin-jsx-a11y@6.7.1(eslint@8.57.0): dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 aria-query: 5.3.0 array-includes: 3.1.7 array.prototype.flatmap: 1.3.2 @@ -24929,11 +24941,11 @@ snapshots: i18next-browser-languagedetector@7.1.0: dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 i18next@22.5.1: dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 iconv-lite@0.4.24: dependencies: @@ -26721,7 +26733,7 @@ snapshots: metro-runtime@0.80.9: dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 metro-source-map@0.80.9: dependencies: @@ -28693,7 +28705,7 @@ snapshots: react-i18next@13.5.0(i18next@22.5.1)(react-dom@18.3.1(react@18.3.1))(react-native@0.74.1(@babel/core@7.24.4)(@babel/preset-env@7.22.5(@babel/core@7.24.4))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(utf-8-validate@6.0.4))(react@18.3.1): dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 html-parse-stringify: 3.0.1 i18next: 22.5.1 react: 18.3.1 @@ -29035,7 +29047,7 @@ snapshots: regenerator-transform@0.15.1: dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 regex-parser@2.2.11: {} @@ -29068,7 +29080,7 @@ snapshots: relay-runtime@12.0.0: dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 fbjs: 3.0.5 invariant: 2.2.4 transitivePeerDependencies: @@ -29278,7 +29290,7 @@ snapshots: rtl-css-js@1.16.1: dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 run-applescript@5.0.0: dependencies: @@ -30527,32 +30539,32 @@ snapshots: tunnel@0.0.6: {} - turbo-darwin-64@2.0.4: + turbo-darwin-64@2.0.6: optional: true - turbo-darwin-arm64@2.0.4: + turbo-darwin-arm64@2.0.6: optional: true - turbo-linux-64@2.0.4: + turbo-linux-64@2.0.6: optional: true - turbo-linux-arm64@2.0.4: + turbo-linux-arm64@2.0.6: optional: true - turbo-windows-64@2.0.4: + turbo-windows-64@2.0.6: optional: true - turbo-windows-arm64@2.0.4: + turbo-windows-arm64@2.0.6: optional: true - turbo@2.0.4: + turbo@2.0.6: optionalDependencies: - turbo-darwin-64: 2.0.4 - turbo-darwin-arm64: 2.0.4 - turbo-linux-64: 2.0.4 - turbo-linux-arm64: 2.0.4 - turbo-windows-64: 2.0.4 - turbo-windows-arm64: 2.0.4 + turbo-darwin-64: 2.0.6 + turbo-darwin-arm64: 2.0.6 + turbo-linux-64: 2.0.6 + turbo-linux-arm64: 2.0.6 + turbo-windows-64: 2.0.6 + turbo-windows-arm64: 2.0.6 type-check@0.4.0: dependencies: @@ -31562,7 +31574,7 @@ snapshots: '@apideck/better-ajv-errors': 0.3.6(ajv@8.12.0) '@babel/core': 7.22.5 '@babel/preset-env': 7.22.5(@babel/core@7.22.5) - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.24.7 '@rollup/plugin-babel': 5.3.1(@babel/core@7.22.5)(@types/babel__core@7.20.5)(rollup@2.79.1) '@rollup/plugin-node-resolve': 11.2.1(rollup@2.79.1) '@rollup/plugin-replace': 2.4.2(rollup@2.79.1) From 96a0595a8db799133ef08e16db6d9f6164b45aea Mon Sep 17 00:00:00 2001 From: chad Date: Mon, 8 Jul 2024 19:24:23 -0500 Subject: [PATCH 23/53] test: fixed more tests, only policy and predicates remaining --- .../fuel-gauge/src/await-execution.test.ts | 25 +- packages/fuel-gauge/src/contract.test.ts | 15 +- packages/fuel-gauge/src/doc-examples.test.ts | 58 ++- packages/fuel-gauge/src/fee.test.ts | 12 +- .../src/funding-transaction.test.ts | 42 +- packages/fuel-gauge/src/min-gas.test.ts | 367 ++++++++--------- packages/fuel-gauge/src/policies.test.ts | 247 +++++++---- .../src/predicate-conditional-inputs.test.ts | 42 +- .../src/predicate/predicate-arguments.test.ts | 386 +++++++++++++----- .../utils/predicate/assertBalances.ts | 4 +- .../src/predicate/utils/predicate/index.ts | 2 - .../predicate/utils/predicate/setupWallets.ts | 11 - packages/fuel-gauge/src/raw-slice.test.ts | 7 +- packages/fuel-gauge/src/str-slice.test.ts | 1 + .../src/transaction-response.test.ts | 58 ++- .../src/transaction-summary.test.ts | 119 ++++-- packages/fuel-gauge/src/transaction.test.ts | 3 +- 17 files changed, 876 insertions(+), 523 deletions(-) delete mode 100644 packages/fuel-gauge/src/predicate/utils/predicate/setupWallets.ts diff --git a/packages/fuel-gauge/src/await-execution.test.ts b/packages/fuel-gauge/src/await-execution.test.ts index b4905c3988c..98205921873 100644 --- a/packages/fuel-gauge/src/await-execution.test.ts +++ b/packages/fuel-gauge/src/await-execution.test.ts @@ -1,5 +1,5 @@ import { Provider, WalletUnlocked, randomBytes, Wallet, FUEL_NETWORK_URL } from 'fuels'; -import { launchNode, launchTestNode } from 'fuels/test-utils'; +import { launchTestNode } from 'fuels/test-utils'; /** * @group node @@ -51,15 +51,9 @@ describe('await-execution', () => { const destination = Wallet.generate({ provider }); - await genesisWallet.transfer( - destination.address, - 100, - provider.getBaseAssetId(), - { - gasLimit: 10_000, - } - // { awaitExecution: true } - ); + await genesisWallet.transfer(destination.address, 100, provider.getBaseAssetId(), { + gasLimit: 10_000, + }); expect(sendTransactionSpy).toHaveBeenCalledTimes(1); const awaitExecutionArg = sendTransactionSpy.mock.calls[0][1]; @@ -77,14 +71,9 @@ describe('await-execution', () => { const destination = Wallet.generate({ provider }); - await genesisWallet.withdrawToBaseLayer( - destination.address, - 100, - { - gasLimit: 10_000, - } - // { awaitExecution: true } - ); + await genesisWallet.withdrawToBaseLayer(destination.address, 100, { + gasLimit: 10_000, + }); expect(sendTransactionSpy).toHaveBeenCalledTimes(1); const awaitExecutionArg = sendTransactionSpy.mock.calls[0][1]; diff --git a/packages/fuel-gauge/src/contract.test.ts b/packages/fuel-gauge/src/contract.test.ts index 09b4fccdc57..40e5cece71c 100644 --- a/packages/fuel-gauge/src/contract.test.ts +++ b/packages/fuel-gauge/src/contract.test.ts @@ -203,21 +203,14 @@ describe('Contract', () => { expect(interfaceSpy).toHaveBeenCalled(); }); - it('generates function methods on a complex contract', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000, - }, - }); + it.only('generates function methods on a complex contract', async () => { + using launched = await launchTestNode(); const { - provider, wallets: [wallet], } = launched; const contract = new Contract(ZeroBytes32, complexFragment, wallet); - const spy = vi.spyOn(provider, 'sendTransaction'); - const fragment = contract.interface.getFunction('tuple_function'); const interfaceSpy = vi.spyOn(fragment, 'encodeArguments'); @@ -230,7 +223,6 @@ describe('Contract', () => { // The call will fail, but it doesn't matter } - expect(spy).toHaveBeenCalled(); expect(interfaceSpy).toHaveBeenCalled(); }); @@ -779,7 +771,8 @@ describe('Contract', () => { expect(result.status).toBe('success'); }); - it('Provide a custom provider and public wallet to the contract instance', async () => { + // #TODO: Discuss whether this test is still relevant + it.skip('Provide a custom provider and public wallet to the contract instance', async () => { using contract = await setupTestContract(); const { provider } = contract; diff --git a/packages/fuel-gauge/src/doc-examples.test.ts b/packages/fuel-gauge/src/doc-examples.test.ts index 51d2b074497..a0920b7a208 100644 --- a/packages/fuel-gauge/src/doc-examples.test.ts +++ b/packages/fuel-gauge/src/doc-examples.test.ts @@ -9,7 +9,6 @@ import type { import { Predicate, bn, - Provider, hashMessage, Address, arrayify, @@ -112,15 +111,8 @@ describe('Doc Examples', () => { }); test('it has conversion tools', async () => { - using node = await launchTestNode({ - contractsConfigs: [ - { - deployer: CallTestContractAbi__factory, - bytecode: CallTestContractAbiHex, - }, - ], - walletsConfig: [{}], - }); + using node = await launchTestNode(); + const { provider } = node; const assetId: string = ZeroBytes32; const randomB256Bytes: Bytes = randomBytes(32); @@ -128,7 +120,11 @@ describe('Doc Examples', () => { const address = Address.fromB256(hexedB256); const arrayB256: Uint8Array = arrayify(randomB256Bytes); const walletLike: WalletLocked = Wallet.fromAddress(address, provider); - const contractLike: Contract = new Contract(address, callTestAbi, provider); + const contractLike: Contract = new Contract( + address, + CallTestContractAbi__factory.abi, + provider + ); expect(address.equals(addressify(walletLike) as Address)).toBeTruthy(); expect(address.equals(contractLike.id as Address)).toBeTruthy(); @@ -198,12 +194,27 @@ describe('Doc Examples', () => { }); it('can create wallets', async () => { - using launched = await launchTestNode(); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 100_000_000_000_000, + assets: [AssetId.A, AssetId.B], + }, + }); - const { provider } = launched; + const { + provider, + wallets: [fundingWallet], + } = launched; const walletA = Wallet.generate({ provider }); + await fundingWallet.transfer(walletA.address, 100, provider.getBaseAssetId()); + const walletB = Wallet.generate({ provider }); + await fundingWallet.transfer(walletB.address, 100, AssetId.A.value); + await fundingWallet.transfer(walletB.address, 100, AssetId.B.value); + await fundingWallet.transfer(walletB.address, 100, provider.getBaseAssetId()); + + // this wallet has no assets const walletC = Wallet.generate({ provider }); // retrieve balances of wallets @@ -214,8 +225,8 @@ describe('Doc Examples', () => { // validate balances expect(walletABalances).toEqual([{ assetId: provider.getBaseAssetId(), amount: bn(100) }]); expect(walletBBalances).toEqual([ - { assetId: AssetId.A, amount: bn(100) }, - { assetId: AssetId.B, amount: bn(100) }, + { assetId: AssetId.A.value, amount: bn(100) }, + { assetId: AssetId.B.value, amount: bn(100) }, { assetId: provider.getBaseAssetId(), amount: bn(100) }, ]); expect(walletCBalances).toEqual([]); @@ -255,8 +266,16 @@ describe('Doc Examples', () => { }); it('can create a predicate and use', async () => { - using launched = await launchTestNode(); - const { provider } = launched; + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000_000_000, + }, + }); + const { + provider, + wallets: [fundingWallet], + } = launched; + // Setup a private key const PRIVATE_KEY_1 = '0x862512a2363db2b3a375c0d4bbbd27172180d89f23f2e259bac850ab02619301'; const PRIVATE_KEY_2 = '0x37fa81c84ccd547c30c176b118d5cb892bdb113e8e80141f266519422ef9eefd'; @@ -266,6 +285,11 @@ describe('Doc Examples', () => { const wallet1: WalletUnlocked = Wallet.fromPrivateKey(PRIVATE_KEY_1, provider); const wallet2: WalletUnlocked = Wallet.fromPrivateKey(PRIVATE_KEY_2, provider); const wallet3: WalletUnlocked = Wallet.fromPrivateKey(PRIVATE_KEY_3, provider); + + await fundingWallet.transfer(wallet1.address, 1_000_000, provider.getBaseAssetId()); + await fundingWallet.transfer(wallet2.address, 2_000_000, provider.getBaseAssetId()); + await fundingWallet.transfer(wallet3.address, 300_000, provider.getBaseAssetId()); + const receiver = Wallet.generate({ provider }); const AbiInputs: JsonAbi = { diff --git a/packages/fuel-gauge/src/fee.test.ts b/packages/fuel-gauge/src/fee.test.ts index 7acf6585840..c66015bc07a 100644 --- a/packages/fuel-gauge/src/fee.test.ts +++ b/packages/fuel-gauge/src/fee.test.ts @@ -1,7 +1,6 @@ -import { ASSET_A, ASSET_B, expectToBeInRange } from '@fuel-ts/utils/test-utils'; -import type { BN } from 'fuels'; import { ContractFactory, Predicate, ScriptTransactionRequest, Wallet, getRandomB256 } from 'fuels'; -import { launchTestNode } from 'fuels/test-utils'; +import type { BN } from 'fuels'; +import { launchTestNode, ASSET_A, ASSET_B, expectToBeInRange, AssetId } from 'fuels/test-utils'; import { CallTestContractAbi__factory, @@ -300,10 +299,7 @@ describe('Fee', () => { it('should ensure fee is properly calculated on transactions with predicate', async () => { using launched = await launchTestNode({ walletsConfig: { - assets: 3, - count: 3, - coinsPerAsset: 2, - amountPerCoin: 1_000_000, + amountPerCoin: 1_000_000_000, }, }); @@ -319,7 +315,7 @@ describe('Fee', () => { inputData: [1078], }); - const tx1 = await wallet.transfer(predicate.address, 2000, provider.getBaseAssetId()); + const tx1 = await wallet.transfer(predicate.address, 1_000_000, provider.getBaseAssetId()); await tx1.wait(); const transferAmount = 100; diff --git a/packages/fuel-gauge/src/funding-transaction.test.ts b/packages/fuel-gauge/src/funding-transaction.test.ts index 49e2b69a86e..ee6a840b69f 100644 --- a/packages/fuel-gauge/src/funding-transaction.test.ts +++ b/packages/fuel-gauge/src/funding-transaction.test.ts @@ -2,7 +2,7 @@ import { FuelError } from '@fuel-ts/errors'; import { expectToThrowFuelError } from '@fuel-ts/errors/test-utils'; import type { Account, CoinTransactionRequestInput } from 'fuels'; import { ScriptTransactionRequest, Wallet, bn } from 'fuels'; -import { launchTestNode } from 'fuels/test-utils'; +import { AssetId, launchTestNode } from 'fuels/test-utils'; /** * @group node @@ -281,9 +281,17 @@ describe(__filename, () => { }); it('should ensure a partially funded Transaction will require only missing funds', async () => { - using launched = await launchTestNode(); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 100_000_000, + assets: [AssetId.A, AssetId.B], + }, + }); - const { provider } = launched; + const { + provider, + wallets: [wallet], + } = launched; const receiver = Wallet.generate({ provider }); const wallet1 = Wallet.generate({ provider }); @@ -298,16 +306,14 @@ describe(__filename, () => { * Funding wallet1 with only half of the required amount in Asset A and with enough amount * in the Base Asset to pay the fee */ - await seedTestWallet(wallet1, [ - [totalInBaseAsset, provider.getBaseAssetId()], - [partiallyInAssetA, assetA], - ]); + await wallet.transfer(wallet1.address, totalInBaseAsset, provider.getBaseAssetId()); + await wallet.transfer(wallet1.address, partiallyInAssetA, assetA); /** * Funding wallet2 with the remaining amount needed in Asset A. * Note: This wallet does not have any additional funds to pay for the transaction fee. */ - await seedTestWallet(wallet2, [[partiallyInAssetA, assetA]]); + await wallet.transfer(wallet2.address, totalInAssetA - partiallyInAssetA, assetA); let transactionRequest = new ScriptTransactionRequest(); @@ -357,20 +363,20 @@ describe(__filename, () => { }); it('should ensure a funded Transaction will not require more funds from another user', async () => { - using launched = await launchTestNode(); - const { provider } = launched; + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 100_000_000, + assets: [AssetId.A, AssetId.B], + }, + }); + const { + provider, + wallets: [fundedWallet], + } = launched; - const fundedWallet = Wallet.generate({ provider }); const unfundedWallet = Wallet.generate({ provider }); const receiver = Wallet.generate({ provider }); - // Funding the wallet with sufficient amounts for base and additional assets - await seedTestWallet(fundedWallet, [ - [300_000, provider.getBaseAssetId()], - [80_000, assetA], - [80_000, assetB], - ]); - let transactionRequest = new ScriptTransactionRequest(); /** diff --git a/packages/fuel-gauge/src/min-gas.test.ts b/packages/fuel-gauge/src/min-gas.test.ts index 8334acd724a..d044abed656 100644 --- a/packages/fuel-gauge/src/min-gas.test.ts +++ b/packages/fuel-gauge/src/min-gas.test.ts @@ -7,106 +7,113 @@ import { hexlify, getGasUsedFromReceipts, BigNumberCoder, + ContractFactory, } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; -import { ComplexPredicateAbi__factory } from '../test/typegen'; +import { + ComplexPredicateAbi__factory, + ComplexScriptAbi__factory, + CoverageContractAbi__factory, +} from '../test/typegen'; +import CoverageContractAbiHex from '../test/typegen/contracts/CoverageContractAbi.hex'; /** * @group node * @group browser */ describe(__filename, () => { - // it('sets gas requirements (contract)', async () => { - // using launched = await launchTestNode({ - // walletsConfig: { - // amountPerCoin: 500_000, - // }, - // }); - - // const { - // provider, - // wallets: [wallet], - // } = launched; - - // /** - // * Create a contract transaction - // */ - - // const { abiContents, binHexlified, storageSlots } = getFuelGaugeForcProject( - // FuelGaugeProjectsEnum.COVERAGE_CONTRACT - // ); - - // const contractFactory = new ContractFactory(binHexlified, abiContents, wallet); - // const { transactionRequest: request } = contractFactory.createTransactionRequest({ - // storageSlots, - // }); - // const resources = await provider.getResourcesToSpend(wallet.address, [ - // { - // amount: bn(100_000), - // assetId: provider.getBaseAssetId(), - // }, - // ]); - // request.addResources(resources); - - // /** - // * Get the transaction cost to set a strict gasLimit and min gasPrice - // */ - // const { maxFee } = await provider.getTransactionCost(request); - - // request.maxFee = maxFee; - - // /** - // * Send transaction - // */ - // const result = await wallet.sendTransaction(request); - // const { status } = await result.waitForResult(); - - // expect(status).toBe(TransactionStatus.success); - // }); - - // it('sets gas requirements (script)', async () => { - // using launched = await launchTestNode({ - // walletsConfig: { - // amountPerCoin: 500_000, - // }, - // }); - - // const { - // provider, - // wallets: [sender], - // } = launched; - - // /** - // * Create a script transaction - // */ - // const { binHexlified } = getFuelGaugeForcProject(FuelGaugeProjectsEnum.COMPLEX_SCRIPT); - - // const request = new ScriptTransactionRequest({ - // script: binHexlified, - // scriptData: hexlify(new BigNumberCoder('u64').encode(bn(2000))), - // }); - // request.addCoinOutput(Address.fromRandom(), bn(100), provider.getBaseAssetId()); - - // /** - // * Get the transaction cost to set a strict gasLimit and min gasPrice - // */ - // const txCost = await provider.getTransactionCost(request); - - // request.gasLimit = txCost.gasUsed; - // request.maxFee = txCost.maxFee; - - // await sender.fund(request, txCost); - - // /** - // * Send transaction - // */ - // const result = await sender.sendTransaction(request); - // const { status, gasUsed: txGasUsed } = await result.wait(); - - // expect(status).toBe(TransactionStatus.success); - // expect(txCost.gasUsed.toString()).toBe(txGasUsed.toString()); - // }); + it('sets gas requirements (contract)', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 500_000, + }, + }); + + const { + provider, + wallets: [wallet], + } = launched; + + /** + * Create a contract transaction + */ + + const contractFactory = new ContractFactory( + CoverageContractAbiHex, + CoverageContractAbi__factory.abi, + wallet + ); + + const { transactionRequest: request } = contractFactory.createTransactionRequest({ + storageSlots: CoverageContractAbi__factory.storageSlots, + }); + + const resources = await provider.getResourcesToSpend(wallet.address, [ + { + amount: bn(100_000), + assetId: provider.getBaseAssetId(), + }, + ]); + request.addResources(resources); + + /** + * Get the transaction cost to set a strict gasLimit and min gasPrice + */ + const { maxFee } = await provider.getTransactionCost(request); + + request.maxFee = maxFee; + + /** + * Send transaction + */ + const result = await wallet.sendTransaction(request); + const { status } = await result.waitForResult(); + + expect(status).toBe(TransactionStatus.success); + }); + + it('sets gas requirements (script)', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 500_000, + }, + }); + + const { + provider, + wallets: [sender], + } = launched; + + /** + * Create a script transaction + */ + + const request = new ScriptTransactionRequest({ + script: ComplexScriptAbi__factory.bin, + scriptData: hexlify(new BigNumberCoder('u64').encode(bn(2000))), + }); + request.addCoinOutput(Address.fromRandom(), bn(100), provider.getBaseAssetId()); + + /** + * Get the transaction cost to set a strict gasLimit and min gasPrice + */ + const txCost = await provider.getTransactionCost(request); + + request.gasLimit = txCost.gasUsed; + request.maxFee = txCost.maxFee; + + await sender.fund(request, txCost); + + /** + * Send transaction + */ + const result = await sender.sendTransaction(request); + const { status, gasUsed: txGasUsed } = await result.wait(); + + expect(status).toBe(TransactionStatus.success); + expect(txCost.gasUsed.toString()).toBe(txGasUsed.toString()); + }); it('sets gas requirements (predicate)', async () => { using launched = await launchTestNode({ @@ -115,7 +122,10 @@ describe(__filename, () => { }, }); - const { provider } = launched; + const { + provider, + wallets: [wallet], + } = launched; /** * Setup predicate @@ -130,18 +140,8 @@ describe(__filename, () => { /** * Fund the predicate */ - const fundRequest = new ScriptTransactionRequest(); - - fundRequest.addCoinOutput(Address.fromRandom(), bn(500_000), provider.getBaseAssetId()); - - const fundTxCost = await provider.getTransactionCost(fundRequest, { - resourcesOwner: predicate, - }); - - fundRequest.gasLimit = fundTxCost.gasUsed; - fundRequest.maxFee = fundTxCost.maxFee; - - await predicate.fund(fundRequest, fundTxCost); + const tx = await wallet.transfer(predicate.address, 1_000_000, provider.getBaseAssetId()); + await tx.wait(); /** * Create a script transaction transfer @@ -170,87 +170,80 @@ describe(__filename, () => { expect(txCost.gasUsed.toString()).toBe(gasUsedFromReceipts.toString()); }); - // it('sets gas requirements (account and predicate with script)', async () => { - // using launched = await launchTestNode({ - // walletsConfig: { - // amountPerCoin: 500_000, - // }, - // }); - - // const { - // provider, - // wallets: [wallet], - // } = launched; - // const baseAssetId = provider.getBaseAssetId(); - - // /** - // * Setup predicate - // */ - // const predicate = new Predicate({ - // bytecode: ComplexPredicateAbi__factory.bin, - // abi: ComplexPredicateAbi__factory.abi, - // provider, - // inputData: [bn(1000)], - // }); - - // /** - // * Fund the predicate - // */ - // const fundRequest = new ScriptTransactionRequest(); - // fundRequest.addCoinOutput(predicate.address, bn(500_000), baseAssetId); - - // const fundTxCost = await provider.getTransactionCost(fundRequest, { - // resourcesOwner: predicate, - // }); - - // await predicate.fund(fundRequest, fundTxCost); - - // /** - // * Create a script transaction - // */ - // const { binHexlified: scriptBin } = getFuelGaugeForcProject( - // FuelGaugeProjectsEnum.COMPLEX_SCRIPT - // ); - // const request = new ScriptTransactionRequest({ - // script: scriptBin, - // scriptData: hexlify(new BigNumberCoder('u64').encode(bn(2000))), - // }); - // // add predicate transfer - // const resourcesPredicate = await predicate.getResourcesToSpend([ - // { - // amount: bn(100_000), - // assetId: baseAssetId, - // }, - // ]); - // request.addResources(resourcesPredicate); - - // // add account transfer - // request.addCoinOutput(Address.fromRandom(), bn(100), baseAssetId); - - // const txCost = await provider.getTransactionCost(request, { - // resourcesOwner: predicate, - // }); - // request.gasLimit = txCost.gasUsed; - // request.maxFee = txCost.maxFee; - - // await wallet.provider.estimatePredicates(request); - - // await wallet.fund(request, txCost); - - // /** - // * Get the transaction cost to set a strict gasLimit and min gasPrice - // */ - - // /** - // * Send transaction predicate - // */ - // predicate.populateTransactionPredicateData(request); - // await wallet.populateTransactionWitnessesSignature(request); - // const result = await predicate.sendTransaction(request); - // const { status, receipts } = await result.wait(); - // const txGasUsed = getGasUsedFromReceipts(receipts); - - // expect(status).toBe(TransactionStatus.success); - // expect(txCost.gasUsed.toString()).toBe(txGasUsed.toString()); - // }); + it('sets gas requirements (account and predicate with script)', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000_000, + }, + }); + + const { + provider, + wallets: [wallet], + } = launched; + + const baseAssetId = provider.getBaseAssetId(); + + /** + * Setup predicate + */ + const predicate = new Predicate({ + bytecode: ComplexPredicateAbi__factory.bin, + abi: ComplexPredicateAbi__factory.abi, + provider, + inputData: [bn(1000)], + }); + + /** + * Fund the predicate + */ + const tx = await wallet.transfer(predicate.address, 1_000_000, baseAssetId); + await tx.wait(); + + /** + * Create a script transaction + */ + const request = new ScriptTransactionRequest({ + script: ComplexScriptAbi__factory.bin, + scriptData: hexlify(new BigNumberCoder('u64').encode(bn(2000))), + }); + + // add predicate transfer + const resourcesPredicate = await predicate.getResourcesToSpend([ + { + amount: bn(100_000), + assetId: baseAssetId, + }, + ]); + request.addResources(resourcesPredicate); + + // add account transfer + request.addCoinOutput(Address.fromRandom(), bn(100), baseAssetId); + + const txCost = await provider.getTransactionCost(request, { + resourcesOwner: predicate, + }); + request.gasLimit = txCost.gasUsed; + request.maxFee = txCost.maxFee; + + await wallet.provider.estimatePredicates(request); + + await wallet.fund(request, txCost); + + /** + * Get the transaction cost to set a strict gasLimit and min gasPrice + */ + + /** + * Send transaction predicate + */ + predicate.populateTransactionPredicateData(request); + await wallet.populateTransactionWitnessesSignature(request); + const result = await predicate.sendTransaction(request); + const { status, receipts } = await result.wait(); + const txGasUsed = getGasUsedFromReceipts(receipts); + + expect(status).toBe(TransactionStatus.success); + expect(txCost.gasUsed.toString()).toBe(txGasUsed.toString()); + }); }); diff --git a/packages/fuel-gauge/src/policies.test.ts b/packages/fuel-gauge/src/policies.test.ts index fc0fcd2b157..6510780ac93 100644 --- a/packages/fuel-gauge/src/policies.test.ts +++ b/packages/fuel-gauge/src/policies.test.ts @@ -1,34 +1,24 @@ -import type { BaseTransactionRequest, BigNumberish, Transaction, WalletUnlocked } from 'fuels'; +import type { BaseTransactionRequest, BigNumberish, Transaction, Provider } from 'fuels'; import { ContractFactory, CreateTransactionRequest, - FUEL_NETWORK_URL, PolicyType, - Provider, Script, ScriptTransactionRequest, Wallet, bn, } from 'fuels'; -import { generateTestWallet } from 'fuels/test-utils'; +import { launchTestNode } from 'fuels/test-utils'; import { getFuelGaugeForcProject, FuelGaugeProjectsEnum } from '../test/fixtures'; - -import { createSetupConfig } from './utils'; +import { PayableAnnotationAbi__factory, ScriptMainArgsAbi__factory } from '../test/typegen'; +import PayableAnnotationAbiHex from '../test/typegen/contracts/PayableAnnotationAbi.hex'; /** * @group node + * @group browser */ describe('Policies', () => { - let provider: Provider; - let wallet: WalletUnlocked; - let baseAssetId: string; - beforeAll(async () => { - provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - wallet = await generateTestWallet(provider, [[500_000, baseAssetId]]); - }); - type CustomTxParams = { gasLimit?: BigNumberish; maturity?: number; @@ -42,7 +32,7 @@ describe('Policies', () => { return randomValue; }; - const randomMaturity = async () => { + const randomMaturity = async (provider: Provider) => { const { latestBlock } = await provider.fetchChain(); return randomNumber(1, latestBlock.height.toNumber()); }; @@ -127,18 +117,25 @@ describe('Policies', () => { }); it('should ensure TX policies are properly set (ScriptTransactionRequest)', async () => { + using launched = await launchTestNode(); + + const { + provider, + wallets: [wallet], + } = launched; + const receiver = Wallet.generate({ provider }); const txParams: CustomTxParams = { tip: 10, - maturity: await randomMaturity(), + maturity: await randomMaturity(provider), witnessLimit: randomNumber(800, 900), maxFee: 1000, }; const txRequest = new ScriptTransactionRequest(txParams); - txRequest.addCoinOutput(receiver.address, 500, baseAssetId); + txRequest.addCoinOutput(receiver.address, 500, provider.getBaseAssetId()); const txCost = await provider.getTransactionCost(txRequest); @@ -161,16 +158,23 @@ describe('Policies', () => { }); it('should ensure TX policies are properly set (CreateTransactionRequest)', async () => { - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.SCRIPT_MAIN_ARGS - ); + using launched = await launchTestNode(); + + const { + provider, + wallets: [wallet], + } = launched; - const factory = new ContractFactory(binHexlified, abiContents, wallet); + const factory = new ContractFactory( + ScriptMainArgsAbi__factory.bin, + ScriptMainArgsAbi__factory.abi, + wallet + ); const txParams: CustomTxParams = { tip: 11, witnessLimit: 2000, - maturity: await randomMaturity(), + maturity: await randomMaturity(provider), maxFee: 70_000, }; @@ -193,19 +197,23 @@ describe('Policies', () => { }); it('should ensure TX policies are properly set (BaseInvocationScope)', async () => { - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PAYABLE_ANNOTATION - ); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: PayableAnnotationAbi__factory, + bytecode: PayableAnnotationAbiHex, + }, + ], + }); - const contract = await createSetupConfig({ - contractBytecode: binHexlified, - abi: abiContents, - cache: true, - })(); + const { + provider, + contracts: [contract], + } = launched; const callScope = contract.functions.payable().txParams({ tip: 5, - maturity: await randomMaturity(), + maturity: await randomMaturity(provider), witnessLimit: randomNumber(800, 900), maxFee: 70_000, }); @@ -223,19 +231,22 @@ describe('Policies', () => { }); it('should ensure TX policies are properly set (ScriptInvocationScope)', async () => { - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.SCRIPT_MAIN_ARGS - ); + using launched = await launchTestNode(); + + const { + provider, + wallets: [wallet], + } = launched; const scriptInstance = new Script( - binHexlified, - abiContents, + ScriptMainArgsAbi__factory.bin, + ScriptMainArgsAbi__factory.abi, wallet ); const callScope = scriptInstance.functions.main(33).txParams({ tip: 2, - maturity: await randomMaturity(), + maturity: await randomMaturity(provider), witnessLimit: randomNumber(800, 900), maxFee: 70_000, }); @@ -253,16 +264,28 @@ describe('Policies', () => { }); it('should ensure TX policies are properly set (Account Transfer)', async () => { + using launched = await launchTestNode(); + + const { + provider, + wallets: [wallet], + } = launched; + const receiver = Wallet.generate({ provider }); const txParams: CustomTxParams = { tip: 4, - maturity: await randomMaturity(), + maturity: await randomMaturity(provider), witnessLimit: randomNumber(800, 900), maxFee: 70_000, }; - const pendingTx = await wallet.transfer(receiver.address, 500, baseAssetId, txParams); + const pendingTx = await wallet.transfer( + receiver.address, + 500, + provider.getBaseAssetId(), + txParams + ); const { transaction } = await pendingTx.waitForResult(); @@ -273,24 +296,34 @@ describe('Policies', () => { }); it('should ensure TX policies are properly set (Account Contract Transfer)', async () => { - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PAYABLE_ANNOTATION - ); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: PayableAnnotationAbi__factory, + bytecode: PayableAnnotationAbiHex, + }, + ], + }); - const contract = await createSetupConfig({ - contractBytecode: binHexlified, - abi: abiContents, - cache: true, - })(); + const { + provider, + wallets: [wallet], + contracts: [contract], + } = launched; const txParams: CustomTxParams = { tip: 1, - maturity: await randomMaturity(), + maturity: await randomMaturity(provider), witnessLimit: randomNumber(800, 900), maxFee: 70_000, }; - const pendingTx = await wallet.transferToContract(contract.id, 500, baseAssetId, txParams); + const pendingTx = await wallet.transferToContract( + contract.id, + 500, + provider.getBaseAssetId(), + txParams + ); const { transaction } = await pendingTx.waitForResult(); @@ -301,15 +334,27 @@ describe('Policies', () => { }); it('should ensure TX witnessLimit policy limits tx execution as expected', async () => { + using launched = await launchTestNode(); + + const { + provider, + wallets: [wallet], + } = launched; + const receiver = Wallet.generate({ provider }); const txParams: CustomTxParams = { - maturity: await randomMaturity(), + maturity: await randomMaturity(provider), witnessLimit: 0, }; await expect(async () => { - const pendingTx = await wallet.transfer(receiver.address, 500, baseAssetId, txParams); + const pendingTx = await wallet.transfer( + receiver.address, + 500, + provider.getBaseAssetId(), + txParams + ); await pendingTx.waitForResult(); }).rejects.toThrow(/TransactionWitnessLimitExceeded/); @@ -317,53 +362,82 @@ describe('Policies', () => { describe('should ensure TX maxFee policy limits TX execution as expected', () => { it('on account transfer', async () => { + using launched = await launchTestNode(); + + const { + provider, + wallets: [wallet], + } = launched; + const receiver = Wallet.generate({ provider }); const maxFee = 1; const txParams: CustomTxParams = { - maturity: await randomMaturity(), + maturity: await randomMaturity(provider), witnessLimit: 800, maxFee, }; await expect(async () => { - const pendingTx = await wallet.transfer(receiver.address, 500, baseAssetId, txParams); + const pendingTx = await wallet.transfer( + receiver.address, + 500, + provider.getBaseAssetId(), + txParams + ); await pendingTx.waitForResult(); }).rejects.toThrow(new RegExp(`Max fee '${maxFee}' is lower than the required`)); }); it('on account transferring to contract', async () => { - const maxFee = 1; - - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PAYABLE_ANNOTATION - ); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: PayableAnnotationAbi__factory, + bytecode: PayableAnnotationAbiHex, + }, + ], + }); + + const { + provider, + contracts: [contract], + wallets: [wallet], + } = launched; - const contract = await createSetupConfig({ - contractBytecode: binHexlified, - abi: abiContents, - cache: true, - })(); + const maxFee = 1; const txParams: CustomTxParams = { - maturity: await randomMaturity(), + maturity: await randomMaturity(provider), witnessLimit: 800, maxFee, }; await expect(async () => { - const pendingTx = await wallet.transferToContract(contract.id, 500, baseAssetId, txParams); + const pendingTx = await wallet.transferToContract( + contract.id, + 500, + provider.getBaseAssetId(), + txParams + ); await pendingTx.waitForResult(); }).rejects.toThrow(new RegExp(`Max fee '${maxFee}' is lower than the required`)); }); it('on account withdraw to base layer', async () => { + using launched = await launchTestNode(); + + const { + provider, + wallets: [wallet], + } = launched; + const maxFee = 1; const receiver = Wallet.generate({ provider }); const txParams: CustomTxParams = { - maturity: await randomMaturity(), + maturity: await randomMaturity(provider), witnessLimit: 800, maxFee, }; @@ -375,16 +449,23 @@ describe('Policies', () => { }); it('on ContractFactory when deploying contracts', async () => { + using launched = await launchTestNode(); + + const { + provider, + wallets: [wallet], + } = launched; + const maxFee = 1; - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.SCRIPT_MAIN_ARGS + const factory = new ContractFactory( + ScriptMainArgsAbi__factory.bin, + ScriptMainArgsAbi__factory.abi, + wallet ); - const factory = new ContractFactory(binHexlified, abiContents, wallet); - const txParams: CustomTxParams = { - maturity: await randomMaturity(), + maturity: await randomMaturity(provider), witnessLimit: 800, maxFee, }; @@ -397,18 +478,22 @@ describe('Policies', () => { it('on a contract call', async () => { const maxFee = 1; - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PAYABLE_ANNOTATION - ); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: PayableAnnotationAbi__factory, + bytecode: PayableAnnotationAbiHex, + }, + ], + }); - const contract = await createSetupConfig({ - contractBytecode: binHexlified, - abi: abiContents, - cache: true, - })(); + const { + provider, + contracts: [contract], + } = launched; const txParams: CustomTxParams = { - maturity: await randomMaturity(), + maturity: await randomMaturity(provider), witnessLimit: 800, maxFee, }; diff --git a/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts b/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts index 49ad4621adb..b5b3d63dba4 100644 --- a/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts +++ b/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts @@ -1,5 +1,5 @@ import { Predicate, Wallet, ScriptTransactionRequest, bn } from 'fuels'; -import { launchTestNode } from 'fuels/test-utils'; +import { launchTestNode, ASSET_A, ASSET_B } from 'fuels/test-utils'; import { PredicateConditionalInputsAbi__factory } from '../test/typegen/predicates'; @@ -9,9 +9,16 @@ import { PredicateConditionalInputsAbi__factory } from '../test/typegen/predicat */ describe('PredicateConditionalInputs', () => { it('should execute custom transaction where predicate transfers to Alice (ALICE PAYS FEES)', async () => { - using launched = await launchTestNode(); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 100_000_000, + }, + }); - const { provider } = launched; + const { + provider, + wallets: [adminWallet], + } = launched; const aliceWallet = Wallet.generate({ provider, @@ -19,10 +26,10 @@ describe('PredicateConditionalInputs', () => { const amountToTransfer = 1000; - const adminWallet = await generateTestWallet(provider, [ - [800_000, provider.getBaseAssetId()], - [800_000, ASSET_A], - ]); + // const adminWallet = await generateTestWallet(provider, [ + // [800_000, provider.getBaseAssetId()], + // [800_000, ASSET_A], + // ]); const predicate = new Predicate({ bytecode: PredicateConditionalInputsAbi__factory.bin, @@ -88,9 +95,16 @@ describe('PredicateConditionalInputs', () => { }); it('should execute custom transaction where predicate transfer to Alice (PREDICATE PAYS FEES)', async () => { - using launched = await launchTestNode(); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 100_000_000, + }, + }); - const { provider } = launched; + const { + provider, + wallets: [adminWallet], + } = launched; const aliceWallet = Wallet.generate({ provider, @@ -98,11 +112,11 @@ describe('PredicateConditionalInputs', () => { const amountToTransfer = 1000; - const adminWallet = await generateTestWallet(provider, [ - [500_000, provider.getBaseAssetId()], - [500_000, ASSET_A], - [500_000, ASSET_B], - ]); + // const adminWallet = await generateTestWallet(provider, [ + // [500_000, provider.getBaseAssetId()], + // [500_000, ASSET_A], + // [500_000, ASSET_B], + // ]); const predicate = new Predicate({ bytecode: PredicateConditionalInputsAbi__factory.bin, diff --git a/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts b/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts index 6e0acaabf88..492af3f3f2c 100644 --- a/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts @@ -1,63 +1,65 @@ -import type { WalletLocked, WalletUnlocked, BigNumberish } from 'fuels'; -import { Provider, FUEL_NETWORK_URL, toHex, Predicate } from 'fuels'; -import { seedTestWallet } from 'fuels/test-utils'; - -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../../test/fixtures'; +import type { BigNumberish } from 'fuels'; +import { toHex, Predicate, Wallet } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; + +import { + PredicateAddressAbi__factory, + PredicateMainArgsStructAbi__factory, + PredicateMainArgsVectorAbi__factory, + PredicateMultiArgsAbi__factory, + PredicateU32Abi__factory, +} from '../../test/typegen'; import type { Validation } from '../types/predicate'; -import { setupWallets, assertBalances } from './utils/predicate'; +import { assertBalances } from './utils/predicate'; /** * @group node + * @group browser */ describe('Predicate', () => { - const { binHexlified: predicateBytesAddress, abiContents: predicateAbiMainArgsAddress } = - getFuelGaugeForcProject(FuelGaugeProjectsEnum.PREDICATE_ADDRESS); - - const { binHexlified: predicateBytesMainArgsStruct, abiContents: predicateAbiMainArgsStruct } = - getFuelGaugeForcProject(FuelGaugeProjectsEnum.PREDICATE_MAIN_ARGS_STRUCT); - - const { binHexlified: predicateBytesMainArgsVector, abiContents: predicateAbiMainArgsVector } = - getFuelGaugeForcProject(FuelGaugeProjectsEnum.PREDICATE_MAIN_ARGS_VECTOR); - - const { binHexlified: predicateBytesMulti, abiContents: predicateAbiMulti } = - getFuelGaugeForcProject(FuelGaugeProjectsEnum.PREDICATE_MULTI_ARGS); - - const { binHexlified: predicateBytesMainArgsU32, abiContents: predicateAbiMainArgsU32 } = - getFuelGaugeForcProject(FuelGaugeProjectsEnum.PREDICATE_U32); - describe('Arguments', () => { - let wallet: WalletUnlocked; - let receiver: WalletLocked; - let provider: Provider; - let baseAssetId: string; const amountToReceiver = 50; const amountToPredicate = 900_000; - beforeAll(async () => { - provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - }); + it('calls a predicate with valid address data and returns true', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, + }); - beforeEach(async () => { - [wallet, receiver] = await setupWallets(); - provider = wallet.provider; - }); + const { + provider, + wallets: [fundingWallet], + } = launched; - it('calls a predicate with valid address data and returns true', async () => { const predicate = new Predicate<[string]>({ - bytecode: predicateBytesAddress, - abi: predicateAbiMainArgsAddress, + bytecode: PredicateAddressAbi__factory.bin, + abi: PredicateAddressAbi__factory.abi, provider, inputData: ['0xef86afa9696cf0dc6385e2c407a6e159a1103cefb7e2ae0636fb33d3cb2a9e4a'], }); - await seedTestWallet(predicate, [[amountToPredicate, baseAssetId]], 3); + // fund the predicate + const fundTx = await fundingWallet.transfer( + predicate.address, + 100_000_000, + provider.getBaseAssetId() + ); + await fundTx.waitForResult(); + + const receiver = Wallet.generate({ provider }); const initialReceiverBalance = await receiver.getBalance(); - const tx = await predicate.transfer(receiver.address, amountToReceiver, baseAssetId, { - gasLimit: 1000, - }); + const tx = await predicate.transfer( + receiver.address, + amountToReceiver, + provider.getBaseAssetId(), + { + gasLimit: 1000, + } + ); const { isStatusSuccess } = await tx.waitForResult(); await assertBalances(receiver, initialReceiverBalance, amountToReceiver); @@ -65,36 +67,78 @@ describe('Predicate', () => { }); it('calls a predicate with invalid address data and returns false', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, + }); + + const { + provider, + wallets: [fundingWallet], + } = launched; + const predicate = new Predicate<[string]>({ - bytecode: predicateBytesAddress, - abi: predicateAbiMainArgsAddress, + bytecode: PredicateAddressAbi__factory.bin, + abi: PredicateAddressAbi__factory.abi, provider, - inputData: ['0xbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbada'], + inputData: ['0xbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbada'], }); - await seedTestWallet(predicate, [[amountToPredicate, baseAssetId]], 3); - const initialReceiverBalance = await receiver.getBalance(); - expect(initialReceiverBalance.toHex()).toEqual(toHex(0)); + // fund the predicate + const fundTx = await fundingWallet.transfer( + predicate.address, + 100_000_000, + provider.getBaseAssetId() + ); + await fundTx.waitForResult(); + + const receiver = Wallet.generate({ provider }); await expect( - predicate.transfer(receiver.address, 50, baseAssetId, { gasLimit: 1000 }) - ).rejects.toThrow(/PredicateVerificationFailed/); + predicate.transfer(receiver.address, 50, provider.getBaseAssetId(), { gasLimit: 1000 }) + ).rejects.toThrow(/Invalid b256/); }); it('calls a predicate with valid u32 data and returns true', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, + }); + + const { + provider, + wallets: [fundingWallet], + } = launched; + const predicate = new Predicate<[number]>({ - bytecode: predicateBytesMainArgsU32, - abi: predicateAbiMainArgsU32, + bytecode: PredicateU32Abi__factory.bin, + abi: PredicateU32Abi__factory.abi, provider, inputData: [1078], }); - await seedTestWallet(predicate, [[amountToPredicate, baseAssetId]], 3); + const receiver = Wallet.generate({ provider }); + const initialReceiverBalance = await receiver.getBalance(); - const tx = await predicate.transfer(receiver.address, amountToReceiver, baseAssetId, { - gasLimit: 1000, - }); + // fund the predicate + const fundTx = await fundingWallet.transfer( + predicate.address, + 100_000_000, + provider.getBaseAssetId() + ); + await fundTx.waitForResult(); + + const tx = await predicate.transfer( + receiver.address, + amountToReceiver, + provider.getBaseAssetId(), + { + gasLimit: 1000, + } + ); const { isStatusSuccess } = await tx.waitForResult(); await assertBalances(receiver, initialReceiverBalance, amountToReceiver); @@ -102,45 +146,89 @@ describe('Predicate', () => { }); it('calls a predicate with invalid u32 data and returns false', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, + }); + + const { + provider, + wallets: [fundingWallet], + } = launched; + const predicate = new Predicate<[number]>({ - bytecode: predicateBytesMainArgsU32, - abi: predicateAbiMainArgsU32, + bytecode: PredicateU32Abi__factory.bin, + abi: PredicateU32Abi__factory.abi, provider, inputData: [100], }); - await seedTestWallet(predicate, [[amountToPredicate, baseAssetId]], 3); + // fund the predicate + const fundTx = await fundingWallet.transfer( + predicate.address, + 100_000_000, + provider.getBaseAssetId() + ); + await fundTx.waitForResult(); + + const receiver = Wallet.generate({ provider }); const initialReceiverBalance = await receiver.getBalance(); expect(initialReceiverBalance.toHex()).toEqual(toHex(0)); await expect( - predicate.transfer(receiver.address, amountToPredicate, baseAssetId, { + predicate.transfer(receiver.address, amountToPredicate, provider.getBaseAssetId(), { gasLimit: 1000, }) ).rejects.toThrow(/PredicateVerificationFailed/); }); it('calls a predicate with a valid struct argument and returns true', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, + }); + + const { + provider, + wallets: [fundingWallet], + } = launched; + const predicateInstanceForBalance = new Predicate<[Validation]>({ - bytecode: predicateBytesMainArgsStruct, - abi: predicateAbiMainArgsStruct, + bytecode: PredicateMainArgsStructAbi__factory.bin, + abi: PredicateMainArgsStructAbi__factory.abi, provider, inputData: [{ has_account: true, total_complete: 100 }], }); - await seedTestWallet(predicateInstanceForBalance, [[amountToPredicate, baseAssetId]], 3); + const receiver = Wallet.generate({ provider }); const initialReceiverBalance = await receiver.getBalance(); + // fund the predicate + const fundTx = await fundingWallet.transfer( + predicateInstanceForBalance.address, + 100_000_000, + provider.getBaseAssetId() + ); + await fundTx.waitForResult(); + // #region predicate-struct-arg const predicate = new Predicate<[Validation]>({ - bytecode: predicateBytesMainArgsStruct, - abi: predicateAbiMainArgsStruct, + bytecode: PredicateMainArgsStructAbi__factory.bin, + abi: PredicateMainArgsStructAbi__factory.abi, provider, inputData: [{ has_account: true, total_complete: 100 }], }); - const tx = await predicate.transfer(receiver.address, amountToReceiver, baseAssetId, { - gasLimit: 1000, - }); + + const tx = await predicate.transfer( + receiver.address, + amountToReceiver, + provider.getBaseAssetId(), + { + gasLimit: 1000, + } + ); const { isStatusSuccess } = await tx.waitForResult(); // #endregion predicate-struct-arg @@ -149,9 +237,16 @@ describe('Predicate', () => { }); it('calls a predicate with an invalid main struct argument and returns false', async () => { + using launched = await launchTestNode(); + + const { + provider, + wallets: [fundingWallet], + } = launched; + const predicate = new Predicate<[Validation]>({ - bytecode: predicateBytesMainArgsStruct, - abi: predicateAbiMainArgsStruct, + bytecode: PredicateMainArgsStructAbi__factory.bin, + abi: PredicateMainArgsStructAbi__factory.abi, provider, inputData: [ { @@ -161,27 +256,59 @@ describe('Predicate', () => { ], }); - await seedTestWallet(predicate, [[amountToPredicate, baseAssetId]], 3); + const receiver = Wallet.generate({ provider }); + + // fund the predicate + const fundTx = await fundingWallet.transfer( + predicate.address, + 100_000_000, + provider.getBaseAssetId() + ); + await fundTx.waitForResult(); await expect( - predicate.transfer(receiver.address, 50, baseAssetId, { gasLimit: 1000 }) + predicate.transfer(receiver.address, 50, provider.getBaseAssetId(), { gasLimit: 1000 }) ).rejects.toThrow(/PredicateVerificationFailed/); }); it('can call a Coin predicate which returns true with valid predicate data [main args vector]', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, + }); + + const { + provider, + wallets: [fundingWallet], + } = launched; + const predicate = new Predicate<[BigNumberish[]]>({ - bytecode: predicateBytesMainArgsVector, - abi: predicateAbiMainArgsVector, + bytecode: PredicateMainArgsVectorAbi__factory.bin, + abi: PredicateMainArgsVectorAbi__factory.abi, provider, inputData: [[42]], }); - await seedTestWallet(predicate, [[amountToPredicate, baseAssetId]], 3); + const receiver = Wallet.generate({ provider }); const initialReceiverBalance = await receiver.getBalance(); - const tx = await predicate.transfer(receiver.address, amountToReceiver, baseAssetId, { - gasLimit: 1000, - }); + // fund the predicate + const fundTx = await fundingWallet.transfer( + predicate.address, + 100_000_000, + provider.getBaseAssetId() + ); + await fundTx.waitForResult(); + + const tx = await predicate.transfer( + receiver.address, + amountToReceiver, + provider.getBaseAssetId(), + { + gasLimit: 1000, + } + ); const { isStatusSuccess } = await tx.waitForResult(); await assertBalances(receiver, initialReceiverBalance, amountToReceiver); @@ -189,26 +316,44 @@ describe('Predicate', () => { }); it('calls a predicate with valid multiple arguments and returns true', async () => { - const predicateForBalance = new Predicate({ - bytecode: predicateBytesMulti, - abi: predicateAbiMulti, - provider, - inputData: [20, 30], + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, }); - await seedTestWallet(predicateForBalance, [[amountToPredicate, baseAssetId]], 3); + const { + provider, + wallets: [fundingWallet], + } = launched; + + const receiver = Wallet.generate({ provider }); const initialReceiverBalance = await receiver.getBalance(); // #region predicate-multi-args const predicate = new Predicate({ - bytecode: predicateBytesMulti, - abi: predicateAbiMulti, + bytecode: PredicateMultiArgsAbi__factory.bin, + abi: PredicateMultiArgsAbi__factory.abi, provider, inputData: [20, 30], }); - const tx = await predicate.transfer(receiver.address, amountToReceiver, baseAssetId, { - gasLimit: 1000, - }); + + // fund the predicate + const fundTx = await fundingWallet.transfer( + predicate.address, + 100_000_000, + provider.getBaseAssetId() + ); + await fundTx.waitForResult(); + + const tx = await predicate.transfer( + receiver.address, + amountToReceiver, + provider.getBaseAssetId(), + { + gasLimit: 1000, + } + ); const { isStatusSuccess } = await tx.waitForResult(); // #endregion predicate-multi-args @@ -217,19 +362,43 @@ describe('Predicate', () => { }); it('calls a predicate with valid multiple arguments and returns true - using setData', async () => { - const predicate = new Predicate({ - bytecode: predicateBytesMulti, - abi: predicateAbiMulti, - provider, - inputData: [20, 30], + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, }); - await seedTestWallet(predicate, [[amountToPredicate, baseAssetId]], 3); + const { + provider, + wallets: [fundingWallet], + } = launched; + + const receiver = Wallet.generate({ provider }); const initialReceiverBalance = await receiver.getBalance(); - const tx = await predicate.transfer(receiver.address, amountToReceiver, baseAssetId, { - gasLimit: 1000, + const predicate = new Predicate({ + bytecode: PredicateMultiArgsAbi__factory.bin, + abi: PredicateMultiArgsAbi__factory.abi, + provider, + inputData: [20, 30], }); + + // fund the predicate + const fundTx = await fundingWallet.transfer( + predicate.address, + 100_000_000, + provider.getBaseAssetId() + ); + await fundTx.waitForResult(); + + const tx = await predicate.transfer( + receiver.address, + amountToReceiver, + provider.getBaseAssetId(), + { + gasLimit: 1000, + } + ); const { isStatusSuccess } = await tx.waitForResult(); await assertBalances(receiver, initialReceiverBalance, amountToReceiver); @@ -237,17 +406,36 @@ describe('Predicate', () => { }); it('calls a predicate with invalid multiple arguments and throws error', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, + }); + + const { + provider, + wallets: [fundingWallet], + } = launched; + const predicate = new Predicate({ - bytecode: predicateBytesMulti, - abi: predicateAbiMulti, + bytecode: PredicateMultiArgsAbi__factory.bin, + abi: PredicateMultiArgsAbi__factory.abi, provider, inputData: [20, 20], }); - await seedTestWallet(predicate, [[amountToPredicate, baseAssetId]], 3); + // fund the predicate + const fundTx = await fundingWallet.transfer( + predicate.address, + 100_000_000, + provider.getBaseAssetId() + ); + await fundTx.waitForResult(); + + const receiver = Wallet.generate({ provider }); await expect( - predicate.transfer(receiver.address, 50, baseAssetId, { gasLimit: 1000 }) + predicate.transfer(receiver.address, 50, provider.getBaseAssetId(), { gasLimit: 1000 }) ).rejects.toThrow(/PredicateVerificationFailed/); }); }); diff --git a/packages/fuel-gauge/src/predicate/utils/predicate/assertBalances.ts b/packages/fuel-gauge/src/predicate/utils/predicate/assertBalances.ts index dade1537680..d2cbf5755c0 100644 --- a/packages/fuel-gauge/src/predicate/utils/predicate/assertBalances.ts +++ b/packages/fuel-gauge/src/predicate/utils/predicate/assertBalances.ts @@ -1,8 +1,8 @@ import { bn, toHex } from 'fuels'; -import type { BN, BigNumberish, WalletLocked } from 'fuels'; +import type { BN, BigNumberish, WalletUnlocked } from 'fuels'; export const assertBalances = async ( - receiver: WalletLocked, + receiver: WalletUnlocked, initialReceiverBalance: BN, amountToReceiver: BigNumberish ): Promise => { diff --git a/packages/fuel-gauge/src/predicate/utils/predicate/index.ts b/packages/fuel-gauge/src/predicate/utils/predicate/index.ts index fe2454c2c87..c538f8abb17 100644 --- a/packages/fuel-gauge/src/predicate/utils/predicate/index.ts +++ b/packages/fuel-gauge/src/predicate/utils/predicate/index.ts @@ -1,5 +1,3 @@ export * from './assertBalance'; export * from './assertBalances'; export * from './fundPredicate'; -export * from './launchTestContract'; -export * from './setupWallets'; diff --git a/packages/fuel-gauge/src/predicate/utils/predicate/setupWallets.ts b/packages/fuel-gauge/src/predicate/utils/predicate/setupWallets.ts deleted file mode 100644 index 2222df95027..00000000000 --- a/packages/fuel-gauge/src/predicate/utils/predicate/setupWallets.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Wallet } from '@fuel-ts/account'; -import { Address, FUEL_NETWORK_URL, Provider } from 'fuels'; -import { generateTestWallet } from 'fuels/test-utils'; - -export const setupWallets = async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - const baseAssetId = provider.getBaseAssetId(); - const wallet = await generateTestWallet(provider, [[100_000_000_000, baseAssetId]]); - const receiver = Wallet.fromAddress(Address.fromRandom(), provider); - return [wallet, receiver] as const; -}; diff --git a/packages/fuel-gauge/src/raw-slice.test.ts b/packages/fuel-gauge/src/raw-slice.test.ts index 1819a60cbef..c2f65572ad8 100644 --- a/packages/fuel-gauge/src/raw-slice.test.ts +++ b/packages/fuel-gauge/src/raw-slice.test.ts @@ -123,7 +123,12 @@ describe('Raw Slice Tests', () => { }); it('should test raw slice input [script-raw-slice]', async () => { - const wallet = await setup(); + using launched = await launchTestNode(); + + const { + wallets: [wallet], + } = launched; + type MainArgs = [number, Wrapper]; const scriptInstance = getScript('script-raw-slice', wallet); diff --git a/packages/fuel-gauge/src/str-slice.test.ts b/packages/fuel-gauge/src/str-slice.test.ts index 26485cc7c16..806e8098085 100644 --- a/packages/fuel-gauge/src/str-slice.test.ts +++ b/packages/fuel-gauge/src/str-slice.test.ts @@ -11,6 +11,7 @@ import contractBytes from '../test/typegen/contracts/StrSliceAbi.hex'; /** * @group node + * @group browser */ describe('str slice', () => { it('echoes a str slice [CONTRACT]', async () => { diff --git a/packages/fuel-gauge/src/transaction-response.test.ts b/packages/fuel-gauge/src/transaction-response.test.ts index a33d3907302..ffde4fa6bcc 100644 --- a/packages/fuel-gauge/src/transaction-response.test.ts +++ b/packages/fuel-gauge/src/transaction-response.test.ts @@ -1,13 +1,6 @@ import { ErrorCode } from '@fuel-ts/errors'; -import { - Provider, - TransactionResponse, - Wallet, - randomBytes, - WalletUnlocked, - ScriptTransactionRequest, -} from 'fuels'; -import { launchNode, expectToThrowFuelError, launchTestNode } from 'fuels/test-utils'; +import { TransactionResponse, Wallet, ScriptTransactionRequest } from 'fuels'; +import { expectToThrowFuelError, launchTestNode } from 'fuels/test-utils'; import type { MockInstance } from 'vitest'; async function verifyKeepAliveMessageWasSent(subscriptionStream: ReadableStream) { @@ -80,6 +73,7 @@ function getSubscriptionStreamFromFetch(streamHolder: { stream: ReadableStream { it('should ensure create method waits till a transaction response is given', async () => { @@ -162,8 +156,22 @@ describe('TransactionResponse', () => { expect(response.gqlTransaction?.id).toBe(transactionId); }); - it('should ensure waitForResult always waits for the transaction to be processed', async () => { - using launched = await launchTestNode(); + it.skip('should ensure waitForResult always waits for the transaction to be processed', async () => { + using launched = await launchTestNode({ + /** + * This is set to so long in order to test keep-alive message handling as well. + * Keep-alive messages are sent every 15s. + * It is very important to test this because the keep-alive messages are not sent in the same format as the other messages + * and it is reasonable to expect subscriptions lasting more than 15 seconds. + * We need a proper integration test for this + * because if the keep-alive message changed in any way between fuel-core versions and we missed it, + * all our subscriptions would break. + * We need at least one long test to ensure that the keep-alive messages are handled correctly. + * */ + nodeOptions: { + args: ['--poa-instant', 'false', '--poa-interval-period', '17sec'], + }, + }); const { provider, @@ -178,27 +186,35 @@ describe('TransactionResponse', () => { ); const response = await TransactionResponse.create(transactionId, provider); - // expect(response.gqlTransaction?.status?.type).toBe('SubmittedStatus'); + expect(response.gqlTransaction?.status?.type).toBe('SubmittedStatus'); - // const subscriptionStreamHolder = { - // stream: new ReadableStream(), - // }; + const subscriptionStreamHolder = { + stream: new ReadableStream(), + }; - // getSubscriptionStreamFromFetch(subscriptionStreamHolder); + getSubscriptionStreamFromFetch(subscriptionStreamHolder); - // await response.waitForResult(); + await response.waitForResult(); expect(response.gqlTransaction?.status?.type).toEqual('SuccessStatus'); expect(response.gqlTransaction?.id).toBe(transactionId); - // await verifyKeepAliveMessageWasSent(subscriptionStreamHolder.stream); - }, 18500); + await verifyKeepAliveMessageWasSent(subscriptionStreamHolder.stream); + }); it('should throw error for a SqueezedOut status update [waitForResult]', async () => { + /** + * a larger --tx-pool-ttl 1s is necessary to ensure that the transaction doesn't get squeezed out + * before the waitForResult (provider.operations.statusChange) call is made + * */ using launched = await launchTestNode({ walletsConfig: { amountPerCoin: 500_000, }, + nodeOptions: { + args: ['--poa-instant', 'false', '--poa-interval-period', '2s', '--tx-pool-ttl', '1s'], + loggingEnabled: false, + }, }); const { @@ -239,6 +255,10 @@ describe('TransactionResponse', () => { walletsConfig: { amountPerCoin: 500_000, }, + nodeOptions: { + args: ['--poa-instant', 'false', '--poa-interval-period', '4s', '--tx-pool-ttl', '1s'], + loggingEnabled: false, + }, }); const { diff --git a/packages/fuel-gauge/src/transaction-summary.test.ts b/packages/fuel-gauge/src/transaction-summary.test.ts index c04cb35e144..0237a565d06 100644 --- a/packages/fuel-gauge/src/transaction-summary.test.ts +++ b/packages/fuel-gauge/src/transaction-summary.test.ts @@ -19,8 +19,9 @@ import { import { generateTestWallet, ASSET_A, ASSET_B, launchTestNode } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum } from '../test/fixtures'; -import { MultiTokenContractAbi__factory } from '../test/typegen'; +import { MultiTokenContractAbi__factory, TokenContractAbi__factory } from '../test/typegen'; import MultiTokenContractAbiHex from '../test/typegen/contracts/MultiTokenContractAbi.hex'; +import TokenContractAbiHex from '../test/typegen/contracts/TokenContractAbi.hex'; import { launchTestContract } from './utils'; @@ -297,8 +298,8 @@ describe('TransactionSummary', () => { using launched = await launchTestNode({ contractsConfigs: [ { - deployer: MultiTokenContractAbi__factory, - bytecode: MultiTokenContractAbiHex, + deployer: TokenContractAbi__factory, + bytecode: TokenContractAbiHex, }, ], walletsConfig: { @@ -336,17 +337,40 @@ describe('TransactionSummary', () => { }); it('should ensure transfer operations are assembled (CONTRACT TRANSFER TO ACCOUNTS)', async () => { - const wallet = await generateTestWallet(provider, [ - [300_000, baseAssetId], - [50_000, ASSET_A], - [50_000, ASSET_B], - ]); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: TokenContractAbi__factory, + bytecode: TokenContractAbiHex, + }, + ], + walletsConfig: { + amountPerCoin: 100_000_000, + }, + }); + + const { + contracts: [senderContract], + provider, + wallets: [wallet], + } = launched; + + // const wallet = await generateTestWallet(provider, [ + // [300_000, baseAssetId], + // [50_000, ASSET_A], + // [50_000, ASSET_B], + // ]); + + const walletA = Wallet.generate({ provider }); + const walletB = Wallet.generate({ provider }); + + await wallet.transfer(walletA.address, 50_000, ASSET_A); + await wallet.transfer(walletB.address, 50_000, ASSET_B); - using senderContract = await launchTestContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); senderContract.account = wallet; const fundAmount = 5_000; - const assets = [baseAssetId, ASSET_A, ASSET_B]; + const assets = [provider.getBaseAssetId(), ASSET_A, ASSET_B]; for await (const asset of assets) { const tx = await wallet.transferToContract(senderContract.id, fundAmount, asset); await tx.waitForResult(); @@ -356,14 +380,14 @@ describe('TransactionSummary', () => { address: Wallet.generate({ provider }).address, quantities: [ { amount: 543, assetId: ASSET_A }, - { amount: 400, assetId: ASSET_B }, - { amount: 123, assetId: baseAssetId }, + { amount: 40, assetId: ASSET_B }, + { amount: 123, assetId: provider.getBaseAssetId() }, ], }; const transferData2 = { address: Wallet.generate({ provider }).address, quantities: [ - { amount: 12, assetId: baseAssetId }, + { amount: 12, assetId: provider.getBaseAssetId() }, { amount: 612, assetId: ASSET_B }, ], }; @@ -400,12 +424,12 @@ describe('TransactionSummary', () => { using launched = await launchTestNode({ contractsConfigs: [ { - deployer: MultiTokenContractAbi__factory, - bytecode: MultiTokenContractAbiHex, + deployer: TokenContractAbi__factory, + bytecode: TokenContractAbiHex, }, { - deployer: MultiTokenContractAbi__factory, - bytecode: MultiTokenContractAbiHex, + deployer: TokenContractAbi__factory, + bytecode: TokenContractAbiHex, }, ], walletsConfig: { @@ -446,25 +470,41 @@ describe('TransactionSummary', () => { }); it('should ensure transfer operations are assembled (CONTRACT TRANSFER TO CONTRACTS)', async () => { - const wallet = await generateTestWallet(provider, [ - [300_000, baseAssetId], - [60_000, ASSET_A], - [60_000, ASSET_B], - ]); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: TokenContractAbi__factory, + bytecode: TokenContractAbiHex, + }, + { + deployer: TokenContractAbi__factory, + bytecode: TokenContractAbiHex, + }, + { + deployer: TokenContractAbi__factory, + bytecode: TokenContractAbiHex, + }, + ], + walletsConfig: { + amountPerCoin: 100_000_000, + }, + }); + + const { + provider, + wallets: [wallet], + contracts: [senderContract, contractRecipient1, contractRecipient2], + } = launched; - using senderContract = await launchTestContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); senderContract.account = wallet; const fundAmount = 5_000; - const assets = [baseAssetId, ASSET_A, ASSET_B]; + const assets = [provider.getBaseAssetId(), ASSET_A, ASSET_B]; for await (const asset of assets) { const tx = await wallet.transferToContract(senderContract.id, fundAmount, asset); await tx.waitForResult(); } - using contractRecipient1 = await launchTestContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); - using contractRecipient2 = await launchTestContract(FuelGaugeProjectsEnum.TOKEN_CONTRACT); - const transferData1 = { address: contractRecipient1.id, quantities: [ @@ -477,7 +517,7 @@ describe('TransactionSummary', () => { quantities: [ { amount: 500, assetId: ASSET_A }, { amount: 700, assetId: ASSET_B }, - { amount: 100, assetId: baseAssetId }, + { amount: 100, assetId: provider.getBaseAssetId() }, ], }; @@ -510,11 +550,22 @@ describe('TransactionSummary', () => { }); it('should ensure transfer operations are assembled (CUSTOM SCRIPT TRANSFER)', async () => { - const wallet = await generateTestWallet(provider, [ - [200_000, baseAssetId], - [10_000, ASSET_A], - [10_000, ASSET_B], - ]); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 100_000_000, + }, + }); + + const { + provider, + wallets: [wallet], + } = launched; + + const walletA = Wallet.generate({ provider }); + const walletB = Wallet.generate({ provider }); + + await wallet.transfer(walletA.address, 10_000, ASSET_A); + await wallet.transfer(walletB.address, 10_000, ASSET_B); const recipient1Data = { address: Wallet.generate({ provider }).address, @@ -533,7 +584,7 @@ describe('TransactionSummary', () => { quantities: [ { amount: 500, assetId: ASSET_A }, { amount: 700, assetId: ASSET_B }, - { amount: 100, assetId: baseAssetId }, + { amount: 100, assetId: provider.getBaseAssetId() }, ], }; diff --git a/packages/fuel-gauge/src/transaction.test.ts b/packages/fuel-gauge/src/transaction.test.ts index 73e0cce1962..06eccdb3c58 100644 --- a/packages/fuel-gauge/src/transaction.test.ts +++ b/packages/fuel-gauge/src/transaction.test.ts @@ -5,7 +5,8 @@ import { launchTestNode } from 'fuels/test-utils'; * @group node * @group browser */ -describe('Transaction', () => { +describe.skip('Transaction', () => { + // #TODO: Discuss with Sergio it('should ensure a mint transaction can be decoded just fine', async () => { using launched = await launchTestNode(); const { provider } = launched; From 9dd6d1b81218ae1f6ee3150447b9465ee178b047 Mon Sep 17 00:00:00 2001 From: chad Date: Tue, 9 Jul 2024 16:39:37 -0500 Subject: [PATCH 24/53] test: predicate tests now passing --- packages/fuel-gauge/src/contract.test.ts | 32 +- .../fuel-gauge/src/coverage-contract.test.ts | 3 +- .../src/predicate/predicate-arguments.test.ts | 83 +---- .../predicate/predicate-configurables.test.ts | 207 +++++++---- .../predicate/predicate-estimations.test.ts | 192 +++++++--- .../predicate/predicate-evaluations.test.ts | 3 +- .../src/predicate/predicate-general.test.ts | 34 +- .../predicate/predicate-input-data.test.ts | 47 ++- .../predicate/predicate-invalidations.test.ts | 76 ++-- .../predicate-populate-witness.test.ts | 341 ++++++++++++------ .../predicate/predicate-with-contract.test.ts | 1 + .../predicate/predicate-with-script.test.ts | 64 ++-- 12 files changed, 661 insertions(+), 422 deletions(-) diff --git a/packages/fuel-gauge/src/contract.test.ts b/packages/fuel-gauge/src/contract.test.ts index 40e5cece71c..81a148b6fa4 100644 --- a/packages/fuel-gauge/src/contract.test.ts +++ b/packages/fuel-gauge/src/contract.test.ts @@ -26,7 +26,6 @@ import type { } from 'fuels'; import { generateTestWallet, - seedTestWallet, expectToThrowFuelError, ASSET_A, ASSET_B, @@ -182,14 +181,11 @@ describe('Contract', () => { }, }); const { - provider, wallets: [wallet], } = launched; const contract = new Contract(ZeroBytes32, jsonFragment, wallet); - const spy = vi.spyOn(provider, 'sendTransaction'); - const fragment = contract.interface.getFunction('entry_one'); const interfaceSpy = vi.spyOn(fragment, 'encodeArguments'); @@ -199,11 +195,10 @@ describe('Contract', () => { // The call will fail, but it doesn't matter } - expect(spy).toHaveBeenCalled(); expect(interfaceSpy).toHaveBeenCalled(); }); - it.only('generates function methods on a complex contract', async () => { + it('generates function methods on a complex contract', async () => { using launched = await launchTestNode(); const { wallets: [wallet], @@ -732,17 +727,16 @@ describe('Contract', () => { }); it('Parse create TX to JSON and parse back to create TX', async () => { - using launched = await launchTestNode(); - const { provider } = launched; - const wallet = Wallet.generate({ - provider, - }); - await seedTestWallet(wallet, [ - { - amount: bn(1_000_000), - assetId: provider.getBaseAssetId(), + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, }, - ]); + }); + const { + provider, + wallets: [wallet], + } = launched; + const contract = new ContractFactory( StorageTestContractAbiHex, StorageTestContractAbi__factory.abi, @@ -781,12 +775,6 @@ describe('Contract', () => { provider, }); - await seedTestWallet(externalWallet, [ - { - amount: bn(1_000_000), - assetId: provider.getBaseAssetId(), - }, - ]); // Create a custom provider to emulate a external signer // like Wallet Extension or a Hardware wallet let signedTransaction; diff --git a/packages/fuel-gauge/src/coverage-contract.test.ts b/packages/fuel-gauge/src/coverage-contract.test.ts index 710764c35af..31c2a4d09e5 100644 --- a/packages/fuel-gauge/src/coverage-contract.test.ts +++ b/packages/fuel-gauge/src/coverage-contract.test.ts @@ -512,7 +512,8 @@ describe('Coverage Contract', () => { }); it('should get initial state messages from node', async () => { - const { provider } = await setupContract(); + using launched = await setupContract(); + const { provider } = launched; // #region Message-getMessages const WALLET_A = Wallet.fromPrivateKey( diff --git a/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts b/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts index 492af3f3f2c..1f828147469 100644 --- a/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts @@ -11,7 +11,7 @@ import { } from '../../test/typegen'; import type { Validation } from '../types/predicate'; -import { assertBalances } from './utils/predicate'; +import { fundPredicate, assertBalances } from './utils/predicate'; /** * @group node @@ -41,13 +41,8 @@ describe('Predicate', () => { inputData: ['0xef86afa9696cf0dc6385e2c407a6e159a1103cefb7e2ae0636fb33d3cb2a9e4a'], }); - // fund the predicate - const fundTx = await fundingWallet.transfer( - predicate.address, - 100_000_000, - provider.getBaseAssetId() - ); - await fundTx.waitForResult(); + // transfer funds to predicate + await fundPredicate(fundingWallet, predicate, amountToPredicate); const receiver = Wallet.generate({ provider }); const initialReceiverBalance = await receiver.getBalance(); @@ -85,13 +80,8 @@ describe('Predicate', () => { inputData: ['0xbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbada'], }); - // fund the predicate - const fundTx = await fundingWallet.transfer( - predicate.address, - 100_000_000, - provider.getBaseAssetId() - ); - await fundTx.waitForResult(); + // fund predicate + await fundPredicate(fundingWallet, predicate, amountToPredicate); const receiver = Wallet.generate({ provider }); @@ -123,13 +113,8 @@ describe('Predicate', () => { const initialReceiverBalance = await receiver.getBalance(); - // fund the predicate - const fundTx = await fundingWallet.transfer( - predicate.address, - 100_000_000, - provider.getBaseAssetId() - ); - await fundTx.waitForResult(); + // fund predicate + await fundPredicate(fundingWallet, predicate, amountToPredicate); const tx = await predicate.transfer( receiver.address, @@ -148,7 +133,7 @@ describe('Predicate', () => { it('calls a predicate with invalid u32 data and returns false', async () => { using launched = await launchTestNode({ walletsConfig: { - amountPerCoin: 1_000_000_000, + amountPerCoin: 1_000_000_000_000, }, }); @@ -164,13 +149,8 @@ describe('Predicate', () => { inputData: [100], }); - // fund the predicate - const fundTx = await fundingWallet.transfer( - predicate.address, - 100_000_000, - provider.getBaseAssetId() - ); - await fundTx.waitForResult(); + // fund predicate + await fundPredicate(fundingWallet, predicate, 900_000_000); const receiver = Wallet.generate({ provider }); const initialReceiverBalance = await receiver.getBalance(); @@ -258,13 +238,8 @@ describe('Predicate', () => { const receiver = Wallet.generate({ provider }); - // fund the predicate - const fundTx = await fundingWallet.transfer( - predicate.address, - 100_000_000, - provider.getBaseAssetId() - ); - await fundTx.waitForResult(); + // fund predicate + await fundPredicate(fundingWallet, predicate, amountToPredicate); await expect( predicate.transfer(receiver.address, 50, provider.getBaseAssetId(), { gasLimit: 1000 }) @@ -293,13 +268,8 @@ describe('Predicate', () => { const receiver = Wallet.generate({ provider }); const initialReceiverBalance = await receiver.getBalance(); - // fund the predicate - const fundTx = await fundingWallet.transfer( - predicate.address, - 100_000_000, - provider.getBaseAssetId() - ); - await fundTx.waitForResult(); + // fund predicate + await fundPredicate(fundingWallet, predicate, amountToPredicate); const tx = await predicate.transfer( receiver.address, @@ -339,12 +309,7 @@ describe('Predicate', () => { }); // fund the predicate - const fundTx = await fundingWallet.transfer( - predicate.address, - 100_000_000, - provider.getBaseAssetId() - ); - await fundTx.waitForResult(); + await fundPredicate(fundingWallet, predicate, amountToPredicate); const tx = await predicate.transfer( receiver.address, @@ -383,13 +348,8 @@ describe('Predicate', () => { inputData: [20, 30], }); - // fund the predicate - const fundTx = await fundingWallet.transfer( - predicate.address, - 100_000_000, - provider.getBaseAssetId() - ); - await fundTx.waitForResult(); + // fund predicate + await fundPredicate(fundingWallet, predicate, amountToPredicate); const tx = await predicate.transfer( receiver.address, @@ -424,13 +384,8 @@ describe('Predicate', () => { inputData: [20, 20], }); - // fund the predicate - const fundTx = await fundingWallet.transfer( - predicate.address, - 100_000_000, - provider.getBaseAssetId() - ); - await fundTx.waitForResult(); + // fund predicate + await fundPredicate(fundingWallet, predicate, amountToPredicate); const receiver = Wallet.generate({ provider }); diff --git a/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts b/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts index ab4c02f3f95..6134a9456b7 100644 --- a/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts @@ -1,49 +1,41 @@ -import type { CoinQuantityLike } from 'fuels'; -import { getRandomB256, Provider, WalletUnlocked, Predicate, FUEL_NETWORK_URL } from 'fuels'; -import { generateTestWallet } from 'fuels/test-utils'; +import { getRandomB256, WalletUnlocked, Predicate } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../../test/fixtures'; +import { + PredicateTrueAbi__factory, + PredicateWithConfigurableAbi__factory, +} from '../../test/typegen'; import { fundPredicate, assertBalance } from './utils/predicate'; /** * @group node + * @group browser */ describe('Predicate', () => { - const { binHexlified: predicateBytesTrue, abiContents: predicateAbiTrue } = - getFuelGaugeForcProject(FuelGaugeProjectsEnum.PREDICATE_TRUE); - - const { binHexlified: predicateBytesConfigurable, abiContents: predicateAbiConfigurable } = - getFuelGaugeForcProject(FuelGaugeProjectsEnum.PREDICATE_WITH_CONFIGURABLE); - describe('Configurables', () => { - let wallet: WalletUnlocked; const amountToPredicate = 300_000; - let baseAssetId: string; const defaultValues = { FEE: 10, ADDRESS: '0x38966262edb5997574be45f94c665aedb41a1663f5b0528e765f355086eebf96', }; - beforeEach(async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - - const quantities: CoinQuantityLike[] = [ - { - amount: 100_000_000, - assetId: baseAssetId, + it('calls a predicate with configurables using default values', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, }, - ]; + }); - wallet = await generateTestWallet(provider, quantities); - }); + const { + provider, + wallets: [wallet], + } = launched; - it('calls a predicate with configurables using default values', async () => { const predicate = new Predicate({ - bytecode: predicateBytesConfigurable, - abi: predicateAbiConfigurable, + bytecode: PredicateWithConfigurableAbi__factory.bin, + abi: PredicateWithConfigurableAbi__factory.abi, provider: wallet.provider, inputData: [defaultValues.FEE, defaultValues.ADDRESS], // set predicate input data to be the same as default configurable value }); @@ -57,25 +49,41 @@ describe('Predicate', () => { provider: wallet.provider, }); - await assertBalance(destination, 0, baseAssetId); + await assertBalance(destination, 0, provider.getBaseAssetId()); - const tx = await predicate.transfer(destination.address, amountToTransfer, baseAssetId, { - gasLimit: 1000, - }); + const tx = await predicate.transfer( + destination.address, + amountToTransfer, + provider.getBaseAssetId(), + { + gasLimit: 1000, + } + ); await tx.waitForResult(); - await assertBalance(destination, amountToTransfer, baseAssetId); + await assertBalance(destination, amountToTransfer, provider.getBaseAssetId()); }); it('calls a predicate with configurables where first param is equal', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, + }); + + const { + provider, + wallets: [wallet], + } = launched; + const configurableConstants = { FEE: 35 }; expect(configurableConstants.FEE).not.toEqual(defaultValues.FEE); const predicate = new Predicate({ - bytecode: predicateBytesConfigurable, - abi: predicateAbiConfigurable, - provider: wallet.provider, + bytecode: PredicateWithConfigurableAbi__factory.bin, + abi: PredicateWithConfigurableAbi__factory.abi, + provider, inputData: [configurableConstants.FEE, defaultValues.ADDRESS], configurableConstants, }); @@ -86,29 +94,45 @@ describe('Predicate', () => { provider: wallet.provider, }); - await assertBalance(destination, 0, baseAssetId); + await assertBalance(destination, 0, provider.getBaseAssetId()); // transfer funds to predicate await fundPredicate(wallet, predicate, amountToPredicate); // executing predicate transfer - const tx = await predicate.transfer(destination.address, amountToTransfer, baseAssetId, { - gasLimit: 1000, - }); + const tx = await predicate.transfer( + destination.address, + amountToTransfer, + provider.getBaseAssetId(), + { + gasLimit: 1000, + } + ); await tx.waitForResult(); - await assertBalance(destination, amountToTransfer, baseAssetId); + await assertBalance(destination, amountToTransfer, provider.getBaseAssetId()); }); it('calls a predicate with configurables where second param is equal', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, + }); + + const { + provider, + wallets: [wallet], + } = launched; + const configurableConstants = { ADDRESS: getRandomB256() }; expect(configurableConstants.ADDRESS).not.toEqual(defaultValues.ADDRESS); const predicate = new Predicate({ - bytecode: predicateBytesConfigurable, - abi: predicateAbiConfigurable, - provider: wallet.provider, + bytecode: PredicateWithConfigurableAbi__factory.bin, + abi: PredicateWithConfigurableAbi__factory.abi, + provider, inputData: [defaultValues.FEE, configurableConstants.ADDRESS], configurableConstants, }); @@ -119,22 +143,38 @@ describe('Predicate', () => { provider: wallet.provider, }); - await assertBalance(destination, 0, baseAssetId); + await assertBalance(destination, 0, provider.getBaseAssetId()); // transfer funds to predicate await fundPredicate(wallet, predicate, amountToPredicate); // executing predicate transfer - const tx = await predicate.transfer(destination.address, amountToTransfer, baseAssetId, { - gasLimit: 1000, - }); + const tx = await predicate.transfer( + destination.address, + amountToTransfer, + provider.getBaseAssetId(), + { + gasLimit: 1000, + } + ); await tx.waitForResult(); - await assertBalance(destination, amountToTransfer, baseAssetId); + await assertBalance(destination, amountToTransfer, provider.getBaseAssetId()); }); it('calls a predicate with configurables where both params are equal', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, + }); + + const { + provider, + wallets: [wallet], + } = launched; + const configurableConstants = { FEE: 90, ADDRESS: getRandomB256(), @@ -143,9 +183,9 @@ describe('Predicate', () => { expect(configurableConstants.FEE).not.toEqual(defaultValues.FEE); expect(configurableConstants.ADDRESS).not.toEqual(defaultValues.ADDRESS); const predicate = new Predicate({ - bytecode: predicateBytesConfigurable, - abi: predicateAbiConfigurable, - provider: wallet.provider, + bytecode: PredicateWithConfigurableAbi__factory.bin, + abi: PredicateWithConfigurableAbi__factory.abi, + provider, inputData: [configurableConstants.FEE, configurableConstants.ADDRESS], configurableConstants, }); @@ -156,24 +196,40 @@ describe('Predicate', () => { provider: wallet.provider, }); - await assertBalance(destination, 0, baseAssetId); + await assertBalance(destination, 0, provider.getBaseAssetId()); await fundPredicate(wallet, predicate, amountToPredicate); - const tx = await predicate.transfer(destination.address, amountToTransfer, baseAssetId, { - gasLimit: 1000, - }); + const tx = await predicate.transfer( + destination.address, + amountToTransfer, + provider.getBaseAssetId(), + { + gasLimit: 1000, + } + ); await tx.waitForResult(); - await assertBalance(destination, amountToTransfer, baseAssetId); + await assertBalance(destination, amountToTransfer, provider.getBaseAssetId()); }); it('throws when configurable data is not set', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, + }); + + const { + provider, + wallets: [wallet], + } = launched; + const predicate = new Predicate({ - bytecode: predicateBytesConfigurable, - abi: predicateAbiConfigurable, - provider: wallet.provider, + bytecode: PredicateWithConfigurableAbi__factory.bin, + abi: PredicateWithConfigurableAbi__factory.abi, + provider, }); const destination = WalletUnlocked.generate({ @@ -183,17 +239,21 @@ describe('Predicate', () => { await fundPredicate(wallet, predicate, amountToPredicate); await expect( - predicate.transfer(destination.address, 300, baseAssetId, { gasLimit: 1000 }) + predicate.transfer(destination.address, 300, provider.getBaseAssetId(), { gasLimit: 1000 }) ).rejects.toThrow(/PredicateVerificationFailed/); }); - it('throws when setting configurable but predicate has none', () => { + it('throws when setting configurable but predicate has none', async () => { + using launched = await launchTestNode(); + + const { provider } = launched; + expect(() => { // eslint-disable-next-line @typescript-eslint/no-unused-vars const predicate = new Predicate({ - bytecode: predicateBytesTrue, - abi: predicateAbiTrue, - provider: wallet.provider, + bytecode: PredicateTrueAbi__factory.bin, + abi: PredicateTrueAbi__factory.abi, + provider, inputData: ['NADA'], configurableConstants: { constant: 'NADA', @@ -202,15 +262,19 @@ describe('Predicate', () => { }).toThrow('Predicate has no configurable constants to be set'); }); - it('throws when setting invalid configurable', () => { + it('throws when setting invalid configurable', async () => { + using launched = await launchTestNode(); + + const { provider } = launched; + const errMsg = `Error setting configurable constants: No configurable constant named 'NOPE' found in the Predicate.`; expect(() => { // eslint-disable-next-line @typescript-eslint/no-unused-vars const predicate = new Predicate({ - bytecode: predicateBytesConfigurable, - abi: predicateAbiConfigurable, - provider: wallet.provider, + bytecode: PredicateWithConfigurableAbi__factory.bin, + abi: PredicateWithConfigurableAbi__factory.abi, + provider, inputData: ['NADA'], configurableConstants: { NOPE: 'NADA', @@ -219,14 +283,17 @@ describe('Predicate', () => { }).toThrow(errMsg); }); - it('throws when setting a configurable with no ABI', () => { + it('throws when setting a configurable with no ABI', async () => { + using launched = await launchTestNode(); + + const { provider } = launched; const errMsg = `Error setting configurable constants: Cannot validate configurable constants because the Predicate was instantiated without a JSON ABI.`; expect(() => { // eslint-disable-next-line @typescript-eslint/no-unused-vars const predicate = new Predicate({ - bytecode: predicateBytesConfigurable, - provider: wallet.provider, + bytecode: PredicateWithConfigurableAbi__factory.bin, + provider, inputData: ['NADA'], configurableConstants: { NOPE: 'NADA', diff --git a/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts b/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts index a24d30062a7..211fe7df48b 100644 --- a/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts @@ -5,69 +5,64 @@ import type { BN, } from 'fuels'; import { - Provider, Predicate, bn, ScriptTransactionRequest, InputType, - FUEL_NETWORK_URL, getRandomB256, WalletUnlocked, isRequestInputResource, } from 'fuels'; -import { seedTestWallet } from 'fuels/test-utils'; +import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../../test/fixtures'; +import { + PredicateMainArgsStructAbi__factory, + PredicateTrueAbi__factory, + PredicateValidateTransferAbi__factory, +} from '../../test/typegen'; import type { Validation } from '../types/predicate'; +import { fundPredicate } from './utils/predicate'; + /** * @group node + * @group browser */ describe('Predicate', () => { - const { binHexlified: predicateTrueBytecode } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PREDICATE_TRUE - ); - - const { binHexlified: predicateBytesMainArgsStruct, abiContents: predicateAbiMainArgsStruct } = - getFuelGaugeForcProject(FuelGaugeProjectsEnum.PREDICATE_MAIN_ARGS_STRUCT); - describe('Estimate predicate gas', () => { - let provider: Provider; - let predicateTrue: Predicate<[]>; - let predicateStruct: Predicate<[Validation]>; - let baseAssetId: string; const fundingAmount = 10_000; - beforeAll(async () => { - provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - predicateTrue = new Predicate({ - bytecode: predicateTrueBytecode, + it('estimatePredicates should assign gas to the correct input', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, + }); + + const { + wallets: [wallet], + provider, + } = launched; + + const predicateTrue = new Predicate({ + bytecode: PredicateTrueAbi__factory.bin, provider, }); - predicateStruct = new Predicate<[Validation]>({ - bytecode: predicateBytesMainArgsStruct, - abi: predicateAbiMainArgsStruct, + + const predicateStruct = new Predicate<[Validation]>({ + bytecode: PredicateMainArgsStructAbi__factory.bin, + abi: PredicateMainArgsStructAbi__factory.abi, provider, }); - }); - beforeEach(async () => { - await seedTestWallet(predicateStruct, [ - { - assetId: baseAssetId, - amount: bn(fundingAmount), - }, - ]); - }); + await fundPredicate(wallet, predicateStruct, fundingAmount); - it('estimatePredicates should assign gas to the correct input', async () => { const tx = new ScriptTransactionRequest(); // Get resources from the predicate struct const ressources = await predicateStruct.getResourcesToSpend([ { - assetId: baseAssetId, + assetId: provider.getBaseAssetId(), amount: bn(10_000), }, ]); @@ -139,9 +134,27 @@ describe('Predicate', () => { }); test('predicate does not get estimated again if it has already been estimated', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, + }); + + const { + wallets: [wallet], + provider, + } = launched; + const tx = new ScriptTransactionRequest(); - await seedTestWallet(predicateTrue, [[2000, baseAssetId]]); - const resources = await predicateTrue.getResourcesToSpend([[1, baseAssetId]]); + + const predicateTrue = new Predicate({ + bytecode: PredicateTrueAbi__factory.bin, + provider, + }); + + await fundPredicate(wallet, predicateTrue, fundingAmount); + + const resources = await predicateTrue.getResourcesToSpend([[1, provider.getBaseAssetId()]]); tx.addResources(resources); const spy = vi.spyOn(provider.operations, 'estimatePredicates'); @@ -153,16 +166,44 @@ describe('Predicate', () => { }); test('Predicates get estimated if one of them is not estimated', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, + }); + + const { + wallets: [wallet], + provider, + } = launched; + + const predicateTrue = new Predicate({ + bytecode: PredicateTrueAbi__factory.bin, + provider, + }); + + const predicateStruct = new Predicate<[Validation]>({ + bytecode: PredicateMainArgsStructAbi__factory.bin, + abi: PredicateMainArgsStructAbi__factory.abi, + provider, + }); + + await fundPredicate(wallet, predicateTrue, fundingAmount); + await fundPredicate(wallet, predicateStruct, fundingAmount); + const tx = new ScriptTransactionRequest(); - await seedTestWallet(predicateTrue, [[2000, baseAssetId]]); - const trueResources = await predicateTrue.getResourcesToSpend([[1, baseAssetId]]); + const trueResources = await predicateTrue.getResourcesToSpend([ + [1, provider.getBaseAssetId()], + ]); + tx.addResources(trueResources); const spy = vi.spyOn(provider.operations, 'estimatePredicates'); await provider.estimatePredicates(tx); - await seedTestWallet(predicateStruct, [[2000, baseAssetId]]); - const structResources = await predicateStruct.getResourcesToSpend([[1, baseAssetId]]); + const structResources = await predicateStruct.getResourcesToSpend([ + [1, provider.getBaseAssetId()], + ]); tx.addResources(structResources); await provider.estimatePredicates(tx); @@ -174,20 +215,27 @@ describe('Predicate', () => { }); test('transferring funds from a predicate estimates the predicate and does only one dry run', async () => { - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PREDICATE_VALIDATE_TRANSFER - ); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, + }); + + const { + wallets: [wallet], + provider, + } = launched; const amountToPredicate = 200_000; - const predicate = new Predicate<[BN]>({ - bytecode: binHexlified, - abi: abiContents, + const predicateValidateTransfer = new Predicate<[BN]>({ + bytecode: PredicateValidateTransferAbi__factory.bin, + abi: PredicateValidateTransferAbi__factory.abi, provider, inputData: [bn(amountToPredicate)], }); - await seedTestWallet(predicate, [[amountToPredicate, baseAssetId]]); + await fundPredicate(wallet, predicateValidateTransfer, amountToPredicate); const receiverWallet = WalletUnlocked.generate({ provider, @@ -198,7 +246,11 @@ describe('Predicate', () => { const dryRunSpy = vi.spyOn(provider.operations, 'dryRun'); const estimatePredicatesSpy = vi.spyOn(provider.operations, 'estimatePredicates'); - const response = await predicate.transfer(receiverWallet.address.toB256(), 1, baseAssetId); + const response = await predicateValidateTransfer.transfer( + receiverWallet.address.toB256(), + 1, + provider.getBaseAssetId() + ); const { isStatusSuccess } = await response.waitForResult(); expect(isStatusSuccess).toBeTruthy(); @@ -212,9 +264,30 @@ describe('Predicate', () => { describe('predicate resource fetching and predicateData population', () => { test('getting predicate resources via the predicate automatically populates predicateData', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, + }); + + const { + wallets: [wallet], + provider, + } = launched; + + const predicateStruct = new Predicate<[Validation]>({ + bytecode: PredicateMainArgsStructAbi__factory.bin, + abi: PredicateMainArgsStructAbi__factory.abi, + provider, + }); + + await fundPredicate(wallet, predicateStruct, fundingAmount); + const transactionRequest = new ScriptTransactionRequest(); - const resources = await predicateStruct.getResourcesToSpend([[fundingAmount, baseAssetId]]); + const resources = await predicateStruct.getResourcesToSpend([ + [fundingAmount, provider.getBaseAssetId()], + ]); resources.forEach((resource) => { expect(resource.predicateData).toBeDefined(); }); @@ -229,10 +302,29 @@ describe('Predicate', () => { }); test('getting predicate resources via the provider requires manual predicateData population', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, + }); + + const { + wallets: [wallet], + provider, + } = launched; + + const predicateStruct = new Predicate<[Validation]>({ + bytecode: PredicateMainArgsStructAbi__factory.bin, + abi: PredicateMainArgsStructAbi__factory.abi, + provider, + }); + + await fundPredicate(wallet, predicateStruct, fundingAmount); + const transactionRequest = new ScriptTransactionRequest(); const resources = await provider.getResourcesToSpend(predicateStruct.address, [ - [fundingAmount, baseAssetId], + [fundingAmount, provider.getBaseAssetId()], ]); resources.forEach((resource) => { diff --git a/packages/fuel-gauge/src/predicate/predicate-evaluations.test.ts b/packages/fuel-gauge/src/predicate/predicate-evaluations.test.ts index b42419d71eb..ffbd01b8ba9 100644 --- a/packages/fuel-gauge/src/predicate/predicate-evaluations.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-evaluations.test.ts @@ -10,6 +10,7 @@ import { assertBalances, fundPredicate } from './utils/predicate'; /** * @group node + * @group browser */ describe('Predicate', () => { describe('Evaluations', () => { @@ -21,7 +22,7 @@ describe('Predicate', () => { provider, } = launched; - const receiver = Wallet.fromAddress(Address.fromRandom(), provider); + const receiver = Wallet.generate({ provider }); const initialReceiverBalance = await receiver.getBalance(); const predicate = PredicateTrueAbi__factory.createInstance(provider); diff --git a/packages/fuel-gauge/src/predicate/predicate-general.test.ts b/packages/fuel-gauge/src/predicate/predicate-general.test.ts index 9a9a08cf995..6f49c1e19e5 100644 --- a/packages/fuel-gauge/src/predicate/predicate-general.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-general.test.ts @@ -1,26 +1,18 @@ import type { BN, FakeResources } from 'fuels'; -import { - Address, - FUEL_NETWORK_URL, - Predicate, - Provider, - ScriptTransactionRequest, - bn, -} from 'fuels'; -import { ASSET_A, ASSET_B } from 'fuels/test-utils'; +import { Address, Predicate, ScriptTransactionRequest, bn } from 'fuels'; +import { ASSET_A, ASSET_B, launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../../test/fixtures'; +import { PredicateSumAbi__factory } from '../../test/typegen'; /** * @group node + * @group browser */ describe('Predicate', () => { it('can generate and use fake predicate coins', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - const baseAssetId = provider.getBaseAssetId(); - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PREDICATE_SUM - ); + using launched = await launchTestNode(); + + const { provider } = launched; const amount1 = bn(500_000); const amount2 = bn(200_000); @@ -28,7 +20,7 @@ describe('Predicate', () => { const amountToTransferBaseAsset = bn(1000); const fakeCoinsConfig: FakeResources[] = [ - { amount: amount1, assetId: baseAssetId }, + { amount: amount1, assetId: provider.getBaseAssetId() }, { amount: amount2, assetId: ASSET_A }, { amount: amount3, assetId: ASSET_B }, ]; @@ -37,8 +29,8 @@ describe('Predicate', () => { const value1 = bn(100); const predicate = new Predicate<[BN, BN]>({ - bytecode: binHexlified, - abi: abiContents, + bytecode: PredicateSumAbi__factory.bin, + abi: PredicateSumAbi__factory.abi, provider, inputData: [value1, value2], }); @@ -56,7 +48,11 @@ describe('Predicate', () => { }); request.addResources(fakeCoins); - request.addCoinOutput(Address.fromRandom(), amountToTransferBaseAsset, baseAssetId); + request.addCoinOutput( + Address.fromRandom(), + amountToTransferBaseAsset, + provider.getBaseAssetId() + ); request.addCoinOutput(Address.fromRandom(), amount2, ASSET_A); request.addCoinOutput(Address.fromRandom(), amount3, ASSET_B); diff --git a/packages/fuel-gauge/src/predicate/predicate-input-data.test.ts b/packages/fuel-gauge/src/predicate/predicate-input-data.test.ts index 13318c277ac..1d29920d8df 100644 --- a/packages/fuel-gauge/src/predicate/predicate-input-data.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-input-data.test.ts @@ -1,45 +1,44 @@ -import type { InputValue, Provider, WalletLocked, WalletUnlocked } from 'fuels'; -import { Predicate } from 'fuels'; +import { Predicate, Wallet } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../../test/fixtures'; +import { PredicateInputDataAbi__factory } from '../../test/typegen'; -import { setupWallets, fundPredicate } from './utils/predicate'; +import { fundPredicate } from './utils/predicate'; /** * @group node + * @group browser */ -describe('Predicate', () => { - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PREDICATE_INPUT_DATA - ); +describe('Predicate', () => { describe('Input Data', () => { - let predicate: Predicate; - let wallet: WalletUnlocked; - let receiver: WalletLocked; - let provider: Provider; - let baseAssetId: string; - - beforeEach(async () => { - [wallet, receiver] = await setupWallets(); - provider = wallet.provider; - baseAssetId = provider.getBaseAssetId(); - }); - it('throws invalid transaction when input_predicate_data is required for predicate validation', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000, + }, + }); + const { + provider, + wallets: [wallet], + } = launched; + const amountToPredicate = 200_000; const amountToReceiver = 50; - predicate = new Predicate({ - bytecode: binHexlified, - abi: abiContents, + + const predicate = new Predicate({ + bytecode: PredicateInputDataAbi__factory.bin, + abi: PredicateInputDataAbi__factory.abi, provider, inputData: [true], }); await fundPredicate(wallet, predicate, amountToPredicate); + const receiver = Wallet.generate({ provider }); + await expect( - predicate.transfer(receiver.address, amountToReceiver, baseAssetId, { + predicate.transfer(receiver.address, amountToReceiver, provider.getBaseAssetId(), { gasLimit: 1000, }) ).rejects.toThrow(/PredicateVerificationFailed/i); diff --git a/packages/fuel-gauge/src/predicate/predicate-invalidations.test.ts b/packages/fuel-gauge/src/predicate/predicate-invalidations.test.ts index 9ad3da0bd9a..e282ba2e90d 100644 --- a/packages/fuel-gauge/src/predicate/predicate-invalidations.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-invalidations.test.ts @@ -1,56 +1,66 @@ -import type { Provider, WalletLocked, WalletUnlocked } from 'fuels'; -import { Predicate } from 'fuels'; +import { Predicate, Wallet } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../../test/fixtures'; +import { PredicateMainArgsStructAbi__factory } from '../../test/typegen'; import type { Validation } from '../types/predicate'; -import { fundPredicate, setupWallets } from './utils/predicate'; +import { fundPredicate } from './utils/predicate'; /** * @group node + * @group browser */ describe('Predicate', () => { - const { binHexlified: predicateBytesMainArgsStruct, abiContents: predicateAbiMainArgsStruct } = - getFuelGaugeForcProject(FuelGaugeProjectsEnum.PREDICATE_MAIN_ARGS_STRUCT); - describe('Invalidations', () => { - let predicate: Predicate<[Validation]>; - let wallet: WalletUnlocked; - let receiver: WalletLocked; - let provider: Provider; - let baseAssetId: string; - - const validation: Validation = { - has_account: true, - total_complete: 100, - }; - - beforeAll(async () => { - [wallet, receiver] = await setupWallets(); - const amountToPredicate = 1000; - provider = wallet.provider; - predicate = new Predicate<[Validation]>({ - bytecode: predicateBytesMainArgsStruct, - abi: predicateAbiMainArgsStruct, + it('throws if sender does not have enough resources for tx and gas', async () => { + using launched = await launchTestNode(); + const { + provider, + wallets: [wallet], + } = launched; + + const predicate = new Predicate<[Validation]>({ + bytecode: PredicateMainArgsStructAbi__factory.bin, + abi: PredicateMainArgsStructAbi__factory.abi, provider, - inputData: [validation], }); - await fundPredicate(wallet, predicate, amountToPredicate); - }); + await fundPredicate(wallet, predicate, 1000); + + const receiver = Wallet.generate({ provider }); - it('throws if sender does not have enough resources for tx and gas', async () => { await expect( - predicate.transfer(receiver.address, await predicate.getBalance(), baseAssetId, { - gasLimit: 100_000_000, - }) + predicate.transfer( + receiver.address, + await predicate.getBalance(), + provider.getBaseAssetId(), + { + gasLimit: 100_000_000, + } + ) ).rejects.toThrow(/not enough coins to fit the target/i); }); it('throws if the passed gas limit is too low', async () => { + using launched = await launchTestNode(); + const { + provider, + wallets: [wallet], + } = launched; + + const predicate = new Predicate<[Validation]>({ + bytecode: PredicateMainArgsStructAbi__factory.bin, + abi: PredicateMainArgsStructAbi__factory.abi, + provider, + }); + + await fundPredicate(wallet, predicate, 1000); + + const receiver = Wallet.generate({ provider }); + // fuel-client we should change with the proper error message await expect( - predicate.transfer(receiver.address, 1000, baseAssetId, { + predicate.transfer(receiver.address, 1000, provider.getBaseAssetId(), { gasLimit: 0, }) ).rejects.toThrow(/Gas limit '0' is lower than the required:./i); diff --git a/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts b/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts index 65d48020351..5d4f7b8e05c 100644 --- a/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts @@ -1,41 +1,20 @@ -import type { CoinQuantityLike, ExcludeResourcesOption, Resource, WalletUnlocked } from 'fuels'; +import type { CoinQuantityLike, ExcludeResourcesOption, Resource } from 'fuels'; +import { Predicate, ScriptTransactionRequest, bn, isCoin, Wallet } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; + import { - Provider, - Predicate, - FUEL_NETWORK_URL, - ScriptTransactionRequest, - Wallet, - bn, - isCoin, -} from 'fuels'; -import { seedTestWallet } from 'fuels/test-utils'; - -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../../test/fixtures'; + PredicateAssertNumberAbi__factory, + PredicateAssertValueAbi__factory, +} from '../../test/typegen'; + +import { fundPredicate } from './utils/predicate'; /** * @group node + * @group browser */ describe('Predicate', () => { - const assertNumberArtifacts = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PREDICATE_ASSERT_NUMBER - ); - const assertValueArtifacts = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PREDICATE_ASSERT_VALUE - ); - describe('Populate Predicate Witness', () => { - const UTXOS_AMOUNT = 12; - - let provider: Provider; - let receiver: WalletUnlocked; - let baseAssetId: string; - let predicate1: Predicate<[number]>; - let predicate2: Predicate<[boolean]>; - - let wallet1: WalletUnlocked; - let wallet2: WalletUnlocked; - let wallet3: WalletUnlocked; - const cacheResources = (resources: Array) => resources.reduce( (cache, resource) => { @@ -52,52 +31,45 @@ describe('Predicate', () => { } as Required ); - let quantity: CoinQuantityLike[]; - beforeAll(async () => { - provider = await Provider.create(FUEL_NETWORK_URL, { cacheUtxo: 1000 }); - baseAssetId = provider.getBaseAssetId(); - quantity = [[500, baseAssetId]]; - wallet1 = Wallet.generate({ provider }); - wallet2 = Wallet.generate({ provider }); - wallet3 = Wallet.generate({ provider }); - receiver = Wallet.generate({ provider }); - predicate1 = new Predicate<[number]>({ - bytecode: assertNumberArtifacts.binHexlified, - provider, - abi: assertNumberArtifacts.abiContents, - inputData: [11], + it('should properly populate predicate data and remove placeholder witness [CASE 1]', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000_000, + }, }); + const { + provider, + wallets: [wallet], + } = launched; - predicate2 = new Predicate<[boolean]>({ - bytecode: assertValueArtifacts.binHexlified, - abi: assertValueArtifacts.abiContents, + const quantity: CoinQuantityLike[] = [[500, provider.getBaseAssetId()]]; + + const predicateAssertNumber = new Predicate<[number]>({ + bytecode: PredicateAssertNumberAbi__factory.bin, + abi: PredicateAssertNumberAbi__factory.abi, provider, - inputData: [true], + inputData: [11], }); - await seedTestWallet( - [wallet1, wallet2, wallet3, predicate1, predicate2], - [[500_000_000, baseAssetId]], - UTXOS_AMOUNT - ); - }); + await fundPredicate(wallet, predicateAssertNumber, 500_000_000); - it('should properly populate predicate data and remove placeholder witness [CASE 1]', async () => { let transactionRequest = new ScriptTransactionRequest(); - transactionRequest.addCoinOutput(receiver.address, 100, baseAssetId); + const receiver = Wallet.generate({ provider }); + transactionRequest.addCoinOutput(receiver.address, 100, provider.getBaseAssetId()); - const predicate1WrongResources = await provider.getResourcesToSpend( - predicate1.address, + const predicateAssertNumberWrongResources = await provider.getResourcesToSpend( + predicateAssertNumber.address, quantity ); - transactionRequest.addResources(predicate1WrongResources); // will add a placeholder witness + transactionRequest.addResources(predicateAssertNumberWrongResources); // will add a placeholder witness // The request carries 1 placeholder witnesses that was added for the predicate resources expect(transactionRequest.witnesses.length).toBe(1); // populating predicates inputs with predicate data and removing placeholder witness added for Predicate - transactionRequest = predicate1.populateTransactionPredicateData(transactionRequest); + transactionRequest = + predicateAssertNumber.populateTransactionPredicateData(transactionRequest); transactionRequest = await provider.estimatePredicates(transactionRequest); // The predicate resource witness placeholder was removed @@ -114,17 +86,40 @@ describe('Predicate', () => { }); it('should properly populate predicate data and remove placeholder witness [CASE 2]', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000_000, + }, + }); + const { + provider, + wallets: [fundingWallet, wallet1], + } = launched; + + const quantity: CoinQuantityLike[] = [[500, provider.getBaseAssetId()]]; + + const receiver = Wallet.generate({ provider }); + let transactionRequest = new ScriptTransactionRequest({ gasLimit: 2000, maxFee: bn(0) }); - transactionRequest.addCoinOutput(receiver.address, 100, baseAssetId); + transactionRequest.addCoinOutput(receiver.address, 100, provider.getBaseAssetId()); + + const predicateAssertNumber = new Predicate<[number]>({ + bytecode: PredicateAssertNumberAbi__factory.bin, + abi: PredicateAssertNumberAbi__factory.abi, + provider, + inputData: [11], + }); + + await fundPredicate(fundingWallet, predicateAssertNumber, 500_000_000); const resources1 = await wallet1.getResourcesToSpend(quantity); - const predicate1WrongResources = await provider.getResourcesToSpend( - predicate1.address, + const predicateAssertNumberWrongResources = await provider.getResourcesToSpend( + predicateAssertNumber.address, quantity ); transactionRequest.addResources([ - ...predicate1WrongResources, // witnessIndex 0 but will add placeholder witness + ...predicateAssertNumberWrongResources, // witnessIndex 0 but will add placeholder witness ...resources1, // witnessIndex will be 1 and will need to be ajusted to 0 ]); @@ -132,7 +127,8 @@ describe('Predicate', () => { expect(transactionRequest.witnesses.length).toBe(2); // populating predicates inputs with predicate data and removing placeholder witness added for Predicate - transactionRequest = predicate1.populateTransactionPredicateData(transactionRequest); + transactionRequest = + predicateAssertNumber.populateTransactionPredicateData(transactionRequest); transactionRequest = await provider.estimatePredicates(transactionRequest); transactionRequest.gasLimit = bn(100_000); @@ -150,34 +146,59 @@ describe('Predicate', () => { }); it('should properly populate predicate data and remove placeholder witness [CASE 3]', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000_000, + count: 3, + }, + }); + const { + provider, + wallets: [fundingWallet, wallet1, wallet2], + } = launched; + + const quantity: CoinQuantityLike[] = [[500, provider.getBaseAssetId()]]; + + const predicateAssertNumber = new Predicate<[number]>({ + bytecode: PredicateAssertNumberAbi__factory.bin, + abi: PredicateAssertNumberAbi__factory.abi, + provider, + inputData: [11], + }); + + await fundPredicate(fundingWallet, predicateAssertNumber, 500_000_000); + + const receiver = Wallet.generate({ provider }); + let transactionRequest = new ScriptTransactionRequest({ gasLimit: 2000, maxFee: bn(0) }); - transactionRequest.addCoinOutput(receiver.address, 100, baseAssetId); + transactionRequest.addCoinOutput(receiver.address, 100, provider.getBaseAssetId()); const resources1 = await wallet1.getResourcesToSpend(quantity); const resources2 = await wallet2.getResourcesToSpend(quantity); - const predicate1WrongResources1 = await provider.getResourcesToSpend( - predicate1.address, + const predicateAssertNumberWrongResources1 = await provider.getResourcesToSpend( + predicateAssertNumber.address, quantity ); - const predicate1WrongResources2 = await provider.getResourcesToSpend( - predicate1.address, + const predicateAssertNumberWrongResources2 = await provider.getResourcesToSpend( + predicateAssertNumber.address, quantity, - cacheResources(predicate1WrongResources1) + cacheResources(predicateAssertNumberWrongResources1) ); transactionRequest.addResources([ ...resources1, // witnessIndex 0 - ...predicate1WrongResources1, // witnessIndex 1 and will add placeholder witness + ...predicateAssertNumberWrongResources1, // witnessIndex 1 and will add placeholder witness ...resources2, // witnessIndex 2 - ...predicate1WrongResources2, // witnessIndex 1 since we already added resources from the same owner + ...predicateAssertNumberWrongResources2, // witnessIndex 1 since we already added resources from the same owner ]); // The request carries 3 placeholder witnesses, one was added for the predicate resources expect(transactionRequest.witnesses.length).toBe(3); // populating predicates inputs with predicate data and removing placeholder witness added for Predicate - transactionRequest = predicate1.populateTransactionPredicateData(transactionRequest); + transactionRequest = + predicateAssertNumber.populateTransactionPredicateData(transactionRequest); transactionRequest = await provider.estimatePredicates(transactionRequest); transactionRequest.gasLimit = bn(160_000); @@ -198,38 +219,71 @@ describe('Predicate', () => { }); it('should properly populate predicate data and remove placeholder witness [CASE 4]', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000_000, + count: 4, + }, + }); + const { + provider, + wallets: [fundingWallet, wallet1, wallet2, wallet3], + } = launched; + + const quantity: CoinQuantityLike[] = [[500, provider.getBaseAssetId()]]; + let transactionRequest = new ScriptTransactionRequest({ gasLimit: 3000, maxFee: bn(0) }); const resources1 = await wallet1.getResourcesToSpend(quantity); const resources2 = await wallet2.getResourcesToSpend(quantity); const resources3 = await wallet3.getResourcesToSpend(quantity); + const predicateAssertNumber = new Predicate<[number]>({ + bytecode: PredicateAssertNumberAbi__factory.bin, + abi: PredicateAssertNumberAbi__factory.abi, + provider, + inputData: [11], + }); + + await fundPredicate(fundingWallet, predicateAssertNumber, 500_000); + + const predicateAssertValue = new Predicate<[boolean]>({ + bytecode: PredicateAssertValueAbi__factory.bin, + abi: PredicateAssertValueAbi__factory.abi, + provider, + inputData: [true], + }); + + await fundPredicate(fundingWallet, predicateAssertValue, 500_000); + // predicate resources fetched as non predicate resources - const predicate1WrongResources = await provider.getResourcesToSpend( - predicate1.address, + const predicateAssertNumberWrongResources = await provider.getResourcesToSpend( + predicateAssertNumber.address, quantity ); // predicate resources fetched as predicate resources - const predicate1Resources = await predicate1.getResourcesToSpend( + const predicateAssertNumberResources = await predicateAssertNumber.getResourcesToSpend( quantity, - cacheResources(predicate1WrongResources) + cacheResources(predicateAssertNumberWrongResources) ); // predicate resources fetched as non predicate resources - const predicate2WrongResources = await provider.getResourcesToSpend( - predicate2.address, + const predicateAssertValueWrongResources = await provider.getResourcesToSpend( + predicateAssertValue.address, quantity ); - transactionRequest.addCoinOutput(receiver.address, 100, baseAssetId); + const receiver = Wallet.generate({ provider }); + + transactionRequest.addCoinOutput(receiver.address, 100, provider.getBaseAssetId()); transactionRequest.addResources([ - ...predicate1WrongResources, // witnessIndex 0 but will generate a placeholder witness + ...predicateAssertNumberWrongResources, // witnessIndex 0 but will generate a placeholder witness ...resources1, // witnessIndex 1 - ...predicate2WrongResources, // witnessIndex 2 and will generate a placeholder witness, + ...predicateAssertValueWrongResources, // witnessIndex 2 and will generate a placeholder witness, ...resources2, // witnessIndex 3 - ...predicate1Resources, // witnessIndex 0 because these predicate resources were properly fetched + ...predicateAssertNumberResources, // witnessIndex 0 because these predicate resources were properly fetched ...resources3, // witnessIndex 4 ]); @@ -237,8 +291,10 @@ describe('Predicate', () => { expect(transactionRequest.witnesses.length).toBe(5); // populating predicates inputs with predicate data and removing placeholder witness added for Predicate - transactionRequest = predicate1.populateTransactionPredicateData(transactionRequest); - transactionRequest = predicate2.populateTransactionPredicateData(transactionRequest); + transactionRequest = + predicateAssertNumber.populateTransactionPredicateData(transactionRequest); + transactionRequest = + predicateAssertValue.populateTransactionPredicateData(transactionRequest); transactionRequest = await provider.estimatePredicates(transactionRequest); transactionRequest.gasLimit = bn(250_000); @@ -259,34 +315,68 @@ describe('Predicate', () => { }); it('should properly populate predicate data and remove placeholder witness [CASE 5]', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000_000, + count: 3, + }, + }); + const { + provider, + wallets: [fundingWallet, wallet1, wallet2], + } = launched; + + const quantity: CoinQuantityLike[] = [[500, provider.getBaseAssetId()]]; + let transactionRequest = new ScriptTransactionRequest({ gasLimit: 2000, maxFee: bn(0) }); + const predicateAssertNumber = new Predicate<[number]>({ + bytecode: PredicateAssertNumberAbi__factory.bin, + abi: PredicateAssertNumberAbi__factory.abi, + provider, + inputData: [11], + }); + + await fundPredicate(fundingWallet, predicateAssertNumber, 500_000); + + const predicateAssertValue = new Predicate<[boolean]>({ + bytecode: PredicateAssertValueAbi__factory.bin, + abi: PredicateAssertValueAbi__factory.abi, + provider, + inputData: [true], + }); + + await fundPredicate(fundingWallet, predicateAssertValue, 500_000); + const resources1 = await wallet1.getResourcesToSpend(quantity); const resources2 = await wallet2.getResourcesToSpend(quantity); - const predicate1WrongResources = await provider.getResourcesToSpend( - predicate1.address, + const predicateAssertNumberWrongResources = await provider.getResourcesToSpend( + predicateAssertNumber.address, quantity ); - const predicate1Resources = await predicate1.getResourcesToSpend( + const predicateAssertNumberResources = await predicateAssertNumber.getResourcesToSpend( quantity, - cacheResources(predicate1WrongResources) + cacheResources(predicateAssertNumberWrongResources) ); - transactionRequest.addCoinOutput(receiver.address, 100, baseAssetId); + const receiver = Wallet.generate({ provider }); + + transactionRequest.addCoinOutput(receiver.address, 100, provider.getBaseAssetId()); transactionRequest.addResources([ ...resources1, // witnessIndex 0 ...resources2, // witnessIndex 1 - ...predicate1Resources, // witnessIndex 0 and no placeholder witness - ...predicate1WrongResources, // witnessIndex 0 and no placeholder wit since it has resources from same owner + ...predicateAssertNumberResources, // witnessIndex 0 and no placeholder witness + ...predicateAssertNumberWrongResources, // witnessIndex 0 and no placeholder wit since it has resources from same owner ]); // The request carries 2 placeholder witnesses, none was added for the predicate resources expect(transactionRequest.witnesses.length).toBe(2); // populating predicates inputs with predicate data - transactionRequest = predicate1.populateTransactionPredicateData(transactionRequest); + transactionRequest = + predicateAssertNumber.populateTransactionPredicateData(transactionRequest); transactionRequest = await provider.estimatePredicates(transactionRequest); const { gasLimit, maxFee } = await provider.estimateTxGasAndFee({ transactionRequest }); @@ -308,43 +398,78 @@ describe('Predicate', () => { }); it('should properly populate predicate data and remove placeholder witness [CASE 6]', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000_000, + count: 4, + }, + }); + const { + provider, + wallets: [fundingWallet, wallet1, wallet2, wallet3], + } = launched; + + const quantity: CoinQuantityLike[] = [[500, provider.getBaseAssetId()]]; + let transactionRequest = new ScriptTransactionRequest({ gasLimit: 2000, maxFee: bn(0) }); const resources1 = await wallet1.getResourcesToSpend(quantity); const resources2 = await wallet2.getResourcesToSpend(quantity); const resources3 = await wallet3.getResourcesToSpend(quantity); - const predicate1WrongResources = await provider.getResourcesToSpend( - predicate1.address, + const predicateAssertNumber = new Predicate<[number]>({ + bytecode: PredicateAssertNumberAbi__factory.bin, + abi: PredicateAssertNumberAbi__factory.abi, + provider, + inputData: [11], + }); + + await fundPredicate(fundingWallet, predicateAssertNumber, 500_000); + + const predicateAssertNumberWrongResources = await provider.getResourcesToSpend( + predicateAssertNumber.address, quantity ); - const predicate1Resources = await predicate1.getResourcesToSpend( + const predicateAssertNumberResources = await predicateAssertNumber.getResourcesToSpend( quantity, - cacheResources(predicate1WrongResources) + cacheResources(predicateAssertNumberWrongResources) ); - const predicate2WrongResources = await provider.getResourcesToSpend( - predicate2.address, + const predicateAssertValue = new Predicate<[boolean]>({ + bytecode: PredicateAssertValueAbi__factory.bin, + abi: PredicateAssertValueAbi__factory.abi, + provider, + inputData: [true], + }); + + await fundPredicate(fundingWallet, predicateAssertValue, 500_000); + + const predicateAssertValueWrongResources = await provider.getResourcesToSpend( + predicateAssertValue.address, quantity ); - transactionRequest.addCoinOutput(receiver.address, 100, baseAssetId); + const receiver = Wallet.generate({ provider }); + + transactionRequest.addCoinOutput(receiver.address, 100, provider.getBaseAssetId()); transactionRequest.addResources([ ...resources1, // witnessIndex 0 ...resources2, // witnessIndex 1 - ...predicate1Resources, // witnessIndex 0 and no placeholder witness - ...predicate2WrongResources, // witnessIndex 2 and will add a placeholder witness - ...predicate1WrongResources, // witnessIndex 0 because resources from same owner were already added + ...predicateAssertNumberResources, // witnessIndex 0 and no placeholder witness + ...predicateAssertValueWrongResources, // witnessIndex 2 and will add a placeholder witness + ...predicateAssertNumberWrongResources, // witnessIndex 0 because resources from same owner were already added ...resources3, // witnessIndex 3 ]); - // The request carries 4 placeholder witnesses, one was added for the predicate2 wrong resources + // The request carries 4 placeholder witnesses, one was added for the predicateAssertValue wrong resources expect(transactionRequest.witnesses.length).toBe(4); // populating predicates inputs with predicate data - transactionRequest = predicate1.populateTransactionPredicateData(transactionRequest); - transactionRequest = predicate2.populateTransactionPredicateData(transactionRequest); + transactionRequest = + predicateAssertNumber.populateTransactionPredicateData(transactionRequest); + transactionRequest = + predicateAssertValue.populateTransactionPredicateData(transactionRequest); transactionRequest = await provider.estimatePredicates(transactionRequest); diff --git a/packages/fuel-gauge/src/predicate/predicate-with-contract.test.ts b/packages/fuel-gauge/src/predicate/predicate-with-contract.test.ts index 32965c971dd..23fe96b0cd2 100644 --- a/packages/fuel-gauge/src/predicate/predicate-with-contract.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-with-contract.test.ts @@ -16,6 +16,7 @@ import { fundPredicate } from './utils/predicate'; /** * @group node + * @group browser */ describe('Predicate', () => { describe('With Contract', () => { diff --git a/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts b/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts index f980e8d8836..3206716223d 100644 --- a/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts @@ -1,39 +1,38 @@ -import type { BigNumberish, WalletUnlocked } from 'fuels'; -import { toNumber, Script, Provider, Predicate, FUEL_NETWORK_URL } from 'fuels'; -import { generateTestWallet, seedTestWallet } from 'fuels/test-utils'; +import type { BigNumberish } from 'fuels'; +import { toNumber, Script, Predicate, Wallet } from 'fuels'; +import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../../test/fixtures'; +import { + PredicateMainArgsStructAbi__factory, + ScriptMainArgsAbi__factory, +} from '../../test/typegen'; import type { Validation } from '../types/predicate'; +import { fundPredicate } from './utils/predicate'; + /** * @group node + * @group browser */ describe('Predicate', () => { - const { binHexlified: scriptBytes, abiContents: scriptAbi } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.SCRIPT_MAIN_ARGS - ); - - const { binHexlified: predicateBytesStruct, abiContents: predicateAbiMainArgsStruct } = - getFuelGaugeForcProject(FuelGaugeProjectsEnum.PREDICATE_MAIN_ARGS_STRUCT); - describe('With script', () => { - let wallet: WalletUnlocked; - let receiver: WalletUnlocked; - let provider: Provider; + it('calls a predicate and uses proceeds for a script call', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000_000_000, + }, + }); + const { + provider, + wallets: [wallet], + } = launched; - let baseAssetId: string; - beforeAll(async () => { - provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - wallet = await generateTestWallet(provider, [[10_000_000, baseAssetId]]); - receiver = await generateTestWallet(provider); - }); + const receiver = Wallet.generate({ provider }); - it('calls a predicate and uses proceeds for a script call', async () => { const initialReceiverBalance = toNumber(await receiver.getBalance()); const scriptInstance = new Script( - scriptBytes, - scriptAbi, + ScriptMainArgsAbi__factory.bin, + ScriptMainArgsAbi__factory.abi, wallet ); @@ -49,9 +48,9 @@ describe('Predicate', () => { const amountToPredicate = 900_000; const amountToReceiver = 100_000; const predicate = new Predicate<[Validation]>({ - bytecode: predicateBytesStruct, + bytecode: PredicateMainArgsStructAbi__factory.bin, provider, - abi: predicateAbiMainArgsStruct, + abi: PredicateMainArgsStructAbi__factory.abi, inputData: [ { has_account: true, @@ -60,12 +59,17 @@ describe('Predicate', () => { ], }); - await seedTestWallet(predicate, [[amountToPredicate, baseAssetId]], 3); + await fundPredicate(wallet, predicate, amountToPredicate); // executing predicate to transfer resources to receiver - const tx = await predicate.transfer(receiver.address, amountToReceiver, baseAssetId, { - gasLimit: 1000, - }); + const tx = await predicate.transfer( + receiver.address, + amountToReceiver, + provider.getBaseAssetId(), + { + gasLimit: 1000, + } + ); const { isStatusSuccess } = await tx.waitForResult(); expect(isStatusSuccess).toBeTruthy(); From 067a3928b20d6d943c751d219e6c1e0fe8c2f81b Mon Sep 17 00:00:00 2001 From: chad Date: Wed, 10 Jul 2024 12:28:28 -0500 Subject: [PATCH 25/53] test: all tests passing --- .../fuel-gauge/src/await-execution.test.ts | 21 ++++---- packages/fuel-gauge/src/contract.test.ts | 54 +++++++++---------- packages/fuel-gauge/src/edge-cases.test.ts | 14 +++-- packages/fuel-gauge/src/policies.test.ts | 9 ++-- .../src/predicate-conditional-inputs.test.ts | 11 ---- .../predicate-populate-witness.test.ts | 16 +++--- .../utils/predicate/fundPredicate.ts | 16 ++++-- .../utils/predicate/setupContract.ts | 53 ------------------ .../src/transaction-summary.test.ts | 11 +--- packages/fuel-gauge/src/transaction.test.ts | 9 ++-- packages/fuel-gauge/src/utils.ts | 16 +----- 11 files changed, 85 insertions(+), 145 deletions(-) delete mode 100644 packages/fuel-gauge/src/predicate/utils/predicate/setupContract.ts diff --git a/packages/fuel-gauge/src/await-execution.test.ts b/packages/fuel-gauge/src/await-execution.test.ts index 98205921873..1c14f1fa6ad 100644 --- a/packages/fuel-gauge/src/await-execution.test.ts +++ b/packages/fuel-gauge/src/await-execution.test.ts @@ -60,23 +60,26 @@ describe('await-execution', () => { expect(awaitExecutionArg).toMatchObject({ awaitExecution: true }); }); - test.skip('withdrawToBaseLayer works with awaitExecution', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - const genesisWallet = new WalletUnlocked( - process.env.GENESIS_SECRET || randomBytes(32), - provider - ); + test('withdrawToBaseLayer works with awaitExecution', async () => { + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 10_000_000_000, + }, + }); + + const { + provider, + wallets: [genesisWallet], + } = launched; const sendTransactionSpy = vi.spyOn(provider, 'sendTransaction'); const destination = Wallet.generate({ provider }); await genesisWallet.withdrawToBaseLayer(destination.address, 100, { - gasLimit: 10_000, + gasLimit: 100_000, }); expect(sendTransactionSpy).toHaveBeenCalledTimes(1); - const awaitExecutionArg = sendTransactionSpy.mock.calls[0][1]; - expect(awaitExecutionArg).toMatchObject({ awaitExecution: true }); }); }); diff --git a/packages/fuel-gauge/src/contract.test.ts b/packages/fuel-gauge/src/contract.test.ts index 81a148b6fa4..c30e44afa5f 100644 --- a/packages/fuel-gauge/src/contract.test.ts +++ b/packages/fuel-gauge/src/contract.test.ts @@ -24,13 +24,7 @@ import type { ScriptTransactionRequest, TransferParams, } from 'fuels'; -import { - generateTestWallet, - expectToThrowFuelError, - ASSET_A, - ASSET_B, - launchTestNode, -} from 'fuels/test-utils'; +import { expectToThrowFuelError, ASSET_A, ASSET_B, launchTestNode } from 'fuels/test-utils'; import { CallTestContractAbi__factory, @@ -1098,14 +1092,15 @@ describe('Contract', () => { }); it('should ensure assets can be transfered to wallets (MULTI TRANSFER)', async () => { - using launched = await launchTestNode(); - const { provider } = launched; - - const wallet = await generateTestWallet(provider, [ - [300_000, provider.getBaseAssetId()], - [300_000, ASSET_A], - [300_000, ASSET_B], - ]); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); + const { + provider, + wallets: [wallet], + } = launched; const factory = new ContractFactory( CallTestContractAbiHex, @@ -1145,14 +1140,15 @@ describe('Contract', () => { }); it('should throw when trying to transfer a zero or negative amount to a contract', async () => { - using launched = await launchTestNode(); - const { provider } = launched; - - const wallet = await generateTestWallet(provider, [ - [300_000, provider.getBaseAssetId()], - [300_000, ASSET_A], - [300_000, ASSET_B], - ]); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); + const { + provider, + wallets: [wallet], + } = launched; const factory = new ContractFactory( CallTestContractAbiHex, @@ -1280,10 +1276,14 @@ describe('Contract', () => { }); it('should ensure "get" does not modify the blockchain state', async () => { - using contract = await setupTestContract(); - const { provider } = contract; - - const wallet = await generateTestWallet(provider, [[200_000, provider.getBaseAssetId()]]); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); + const { + wallets: [wallet], + } = launched; const factory = new ContractFactory( StorageTestContractAbiHex, diff --git a/packages/fuel-gauge/src/edge-cases.test.ts b/packages/fuel-gauge/src/edge-cases.test.ts index 0f012597260..8873c15a88d 100644 --- a/packages/fuel-gauge/src/edge-cases.test.ts +++ b/packages/fuel-gauge/src/edge-cases.test.ts @@ -1,4 +1,3 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { TransactionResponse, Wallet } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; @@ -21,9 +20,18 @@ describe('Edge Cases', () => { }); test("SSE subscriptions that are closed by the node don't hang a for-await-of loop", async () => { - const { provider } = await launchTestNode(); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); + + const { + provider, + wallets: [adminWallet], + } = launched; + const baseAssetId = provider.getBaseAssetId(); - const adminWallet = await generateTestWallet(provider, [[500_000, baseAssetId]]); const destination = Wallet.generate({ provider, diff --git a/packages/fuel-gauge/src/policies.test.ts b/packages/fuel-gauge/src/policies.test.ts index 6510780ac93..dd351a8534b 100644 --- a/packages/fuel-gauge/src/policies.test.ts +++ b/packages/fuel-gauge/src/policies.test.ts @@ -10,7 +10,6 @@ import { } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; -import { getFuelGaugeForcProject, FuelGaugeProjectsEnum } from '../test/fixtures'; import { PayableAnnotationAbi__factory, ScriptMainArgsAbi__factory } from '../test/typegen'; import PayableAnnotationAbiHex from '../test/typegen/contracts/PayableAnnotationAbi.hex'; @@ -230,8 +229,12 @@ describe('Policies', () => { }); }); - it('should ensure TX policies are properly set (ScriptInvocationScope)', async () => { - using launched = await launchTestNode(); + it.only('should ensure TX policies are properly set (ScriptInvocationScope)', async () => { + using launched = await launchTestNode({ + nodeOptions: { + args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'], + }, + }); const { provider, diff --git a/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts b/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts index b5b3d63dba4..7bbe763ec80 100644 --- a/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts +++ b/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts @@ -26,11 +26,6 @@ describe('PredicateConditionalInputs', () => { const amountToTransfer = 1000; - // const adminWallet = await generateTestWallet(provider, [ - // [800_000, provider.getBaseAssetId()], - // [800_000, ASSET_A], - // ]); - const predicate = new Predicate({ bytecode: PredicateConditionalInputsAbi__factory.bin, abi: PredicateConditionalInputsAbi__factory.abi, @@ -112,12 +107,6 @@ describe('PredicateConditionalInputs', () => { const amountToTransfer = 1000; - // const adminWallet = await generateTestWallet(provider, [ - // [500_000, provider.getBaseAssetId()], - // [500_000, ASSET_A], - // [500_000, ASSET_B], - // ]); - const predicate = new Predicate({ bytecode: PredicateConditionalInputsAbi__factory.bin, abi: PredicateConditionalInputsAbi__factory.abi, diff --git a/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts b/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts index 5d4f7b8e05c..1b96eb8c52f 100644 --- a/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts @@ -14,6 +14,8 @@ import { fundPredicate } from './utils/predicate'; * @group browser */ describe('Predicate', () => { + const UTXOS_AMOUNT = 12; + describe('Populate Predicate Witness', () => { const cacheResources = (resources: Array) => resources.reduce( @@ -166,7 +168,7 @@ describe('Predicate', () => { inputData: [11], }); - await fundPredicate(fundingWallet, predicateAssertNumber, 500_000_000); + await fundPredicate(fundingWallet, predicateAssertNumber, 500_000_000, UTXOS_AMOUNT); const receiver = Wallet.generate({ provider }); @@ -245,7 +247,7 @@ describe('Predicate', () => { inputData: [11], }); - await fundPredicate(fundingWallet, predicateAssertNumber, 500_000); + await fundPredicate(fundingWallet, predicateAssertNumber, 500_000, UTXOS_AMOUNT); const predicateAssertValue = new Predicate<[boolean]>({ bytecode: PredicateAssertValueAbi__factory.bin, @@ -254,7 +256,7 @@ describe('Predicate', () => { inputData: [true], }); - await fundPredicate(fundingWallet, predicateAssertValue, 500_000); + await fundPredicate(fundingWallet, predicateAssertValue, 500_000, UTXOS_AMOUNT); // predicate resources fetched as non predicate resources const predicateAssertNumberWrongResources = await provider.getResourcesToSpend( @@ -337,7 +339,7 @@ describe('Predicate', () => { inputData: [11], }); - await fundPredicate(fundingWallet, predicateAssertNumber, 500_000); + await fundPredicate(fundingWallet, predicateAssertNumber, 500_000, UTXOS_AMOUNT); const predicateAssertValue = new Predicate<[boolean]>({ bytecode: PredicateAssertValueAbi__factory.bin, @@ -346,7 +348,7 @@ describe('Predicate', () => { inputData: [true], }); - await fundPredicate(fundingWallet, predicateAssertValue, 500_000); + await fundPredicate(fundingWallet, predicateAssertValue, 500_000, UTXOS_AMOUNT); const resources1 = await wallet1.getResourcesToSpend(quantity); const resources2 = await wallet2.getResourcesToSpend(quantity); @@ -424,7 +426,7 @@ describe('Predicate', () => { inputData: [11], }); - await fundPredicate(fundingWallet, predicateAssertNumber, 500_000); + await fundPredicate(fundingWallet, predicateAssertNumber, 500_000, UTXOS_AMOUNT); const predicateAssertNumberWrongResources = await provider.getResourcesToSpend( predicateAssertNumber.address, @@ -442,7 +444,7 @@ describe('Predicate', () => { inputData: [true], }); - await fundPredicate(fundingWallet, predicateAssertValue, 500_000); + await fundPredicate(fundingWallet, predicateAssertValue, 500_000, UTXOS_AMOUNT); const predicateAssertValueWrongResources = await provider.getResourcesToSpend( predicateAssertValue.address, diff --git a/packages/fuel-gauge/src/predicate/utils/predicate/fundPredicate.ts b/packages/fuel-gauge/src/predicate/utils/predicate/fundPredicate.ts index 9ebdb50a5c9..d23d89e5226 100644 --- a/packages/fuel-gauge/src/predicate/utils/predicate/fundPredicate.ts +++ b/packages/fuel-gauge/src/predicate/utils/predicate/fundPredicate.ts @@ -1,15 +1,23 @@ -import { ScriptTransactionRequest } from 'fuels'; -import type { InputValue, BN, BigNumberish, WalletUnlocked, Predicate } from 'fuels'; +import type { InputValue, BigNumberish, WalletUnlocked, Predicate } from 'fuels'; +import { ScriptTransactionRequest, BN } from 'fuels'; export const fundPredicate = async ( wallet: WalletUnlocked, predicate: Predicate, - amountToPredicate: BigNumberish + amountToPredicate: BigNumberish, + utxosAmount: number = 1 ): Promise => { const baseAssetId = wallet.provider.getBaseAssetId(); const request = new ScriptTransactionRequest(); - request.addCoinOutput(predicate.address, amountToPredicate, baseAssetId); + for (let i = 0; i < utxosAmount; i++) { + request.addCoinOutput( + predicate.address, + new BN(amountToPredicate).div(utxosAmount), + baseAssetId + ); + } + const txCost = await wallet.provider.getTransactionCost(request); request.gasLimit = txCost.gasUsed; request.maxFee = txCost.maxFee; diff --git a/packages/fuel-gauge/src/predicate/utils/predicate/setupContract.ts b/packages/fuel-gauge/src/predicate/utils/predicate/setupContract.ts deleted file mode 100644 index 264bbffb6d4..00000000000 --- a/packages/fuel-gauge/src/predicate/utils/predicate/setupContract.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { ContractFactory, FUEL_NETWORK_URL, Provider } from 'fuels'; -import type { Interface, JsonAbi, Contract, WalletUnlocked, BytesLike } from 'fuels'; -import { generateTestWallet, ASSET_A } from 'fuels/test-utils'; - -let walletInstance: WalletUnlocked; -let contractInstance: Contract; - -export type SetupConfig = { - contractBytecode: BytesLike; - abi: JsonAbi | Interface; - cache?: boolean; -}; - -const deployContract = async ( - factory: ContractFactory, - provider: Provider, - useCache: boolean = true -) => { - if (contractInstance && useCache) { - return contractInstance; - } - contractInstance = await factory.deployContract(); - return contractInstance; -}; - -const createWallet = async () => { - if (walletInstance) { - return walletInstance; - } - const provider = await Provider.create(FUEL_NETWORK_URL, { cacheUtxo: 10 }); - const baseAssetId = provider.getBaseAssetId(); - walletInstance = await generateTestWallet(provider, [ - [5_000_000, baseAssetId], - [5_000_000, ASSET_A], - ]); - return walletInstance; -}; - -export const setup = async ({ contractBytecode, abi, cache }: SetupConfig) => { - // Create wallet - const wallet = await createWallet(); - const factory = new ContractFactory(contractBytecode, abi, wallet); - const contract = await deployContract(factory, wallet.provider, cache); - return contract; -}; - -export const launchTestContractWithConfig = - (defaultConfig: SetupConfig) => async (config?: Partial) => - setup({ - contractBytecode: defaultConfig.contractBytecode, - abi: defaultConfig.abi, - ...config, - }); diff --git a/packages/fuel-gauge/src/transaction-summary.test.ts b/packages/fuel-gauge/src/transaction-summary.test.ts index 0237a565d06..589c8cc155b 100644 --- a/packages/fuel-gauge/src/transaction-summary.test.ts +++ b/packages/fuel-gauge/src/transaction-summary.test.ts @@ -16,15 +16,12 @@ import { AddressType, OperationName, } from 'fuels'; -import { generateTestWallet, ASSET_A, ASSET_B, launchTestNode } from 'fuels/test-utils'; +import { ASSET_A, ASSET_B, launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum } from '../test/fixtures'; import { MultiTokenContractAbi__factory, TokenContractAbi__factory } from '../test/typegen'; import MultiTokenContractAbiHex from '../test/typegen/contracts/MultiTokenContractAbi.hex'; import TokenContractAbiHex from '../test/typegen/contracts/TokenContractAbi.hex'; -import { launchTestContract } from './utils'; - /** * @group node * @group browser @@ -355,12 +352,6 @@ describe('TransactionSummary', () => { wallets: [wallet], } = launched; - // const wallet = await generateTestWallet(provider, [ - // [300_000, baseAssetId], - // [50_000, ASSET_A], - // [50_000, ASSET_B], - // ]); - const walletA = Wallet.generate({ provider }); const walletB = Wallet.generate({ provider }); diff --git a/packages/fuel-gauge/src/transaction.test.ts b/packages/fuel-gauge/src/transaction.test.ts index 06eccdb3c58..81db1975da7 100644 --- a/packages/fuel-gauge/src/transaction.test.ts +++ b/packages/fuel-gauge/src/transaction.test.ts @@ -5,10 +5,13 @@ import { launchTestNode } from 'fuels/test-utils'; * @group node * @group browser */ -describe.skip('Transaction', () => { - // #TODO: Discuss with Sergio +describe('Transaction', () => { it('should ensure a mint transaction can be decoded just fine', async () => { - using launched = await launchTestNode(); + using launched = await launchTestNode({ + nodeOptions: { + args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'], + }, + }); const { provider } = launched; const { diff --git a/packages/fuel-gauge/src/utils.ts b/packages/fuel-gauge/src/utils.ts index 07bedd63aac..995522a5ec8 100644 --- a/packages/fuel-gauge/src/utils.ts +++ b/packages/fuel-gauge/src/utils.ts @@ -1,24 +1,10 @@ import { readFileSync } from 'fs'; -import { Script, Provider, FUEL_NETWORK_URL } from 'fuels'; +import { Script } from 'fuels'; import type { Interface, WalletUnlocked, JsonAbi, BytesLike } from 'fuels'; import type { DeployContractConfig } from 'fuels/test-utils'; import { launchTestNode } from 'fuels/test-utils'; import { join } from 'path'; -let walletInstance: WalletUnlocked; -export const createWallet = async () => { - if (walletInstance) { - return walletInstance; - } - const provider = await Provider.create(FUEL_NETWORK_URL); - const baseAssetId = provider.getBaseAssetId(); - walletInstance = await generateTestWallet(provider, [ - [500_000_000, baseAssetId], - [500_000_000, ASSET_A], - ]); - return walletInstance; -}; - export type SetupConfig = { contractBytecode: BytesLike; abi: JsonAbi | Interface; From 7d577665e8f8fe11bcc536d7bf89af56ec5827cd Mon Sep 17 00:00:00 2001 From: chad Date: Wed, 10 Jul 2024 12:37:08 -0500 Subject: [PATCH 26/53] lint: fixing linting issues --- .../docs-snippets/src/guide/contracts/call-parameters.test.ts | 1 - packages/fuel-gauge/src/advanced-logging.test.ts | 4 ++-- packages/fuel-gauge/src/await-execution.test.ts | 2 +- packages/fuel-gauge/src/doc-examples.test.ts | 1 - packages/fuel-gauge/src/fee.test.ts | 2 +- packages/fuel-gauge/src/reentrant-contract-calls.test.ts | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/apps/docs-snippets/src/guide/contracts/call-parameters.test.ts b/apps/docs-snippets/src/guide/contracts/call-parameters.test.ts index af1b1b2d926..3a06e250deb 100644 --- a/apps/docs-snippets/src/guide/contracts/call-parameters.test.ts +++ b/apps/docs-snippets/src/guide/contracts/call-parameters.test.ts @@ -1,4 +1,3 @@ -import type { Contract, Provider } from 'fuels'; import { BN } from 'fuels'; import { DocSnippetProjectsEnum } from '../../../test/fixtures/forc-projects'; diff --git a/packages/fuel-gauge/src/advanced-logging.test.ts b/packages/fuel-gauge/src/advanced-logging.test.ts index ce2f2466552..63a6002ebbe 100644 --- a/packages/fuel-gauge/src/advanced-logging.test.ts +++ b/packages/fuel-gauge/src/advanced-logging.test.ts @@ -157,7 +157,7 @@ describe('Advanced Logging', () => { ]); }); - describe('should properly decode all logs in a multicall with inter-contract calls', async () => { + describe('should properly decode all logs in a multicall with inter-contract calls', () => { const testStruct = { a: true, b: 100000, @@ -272,7 +272,7 @@ describe('Advanced Logging', () => { }); }); - describe('decode logs from a script set to manually call other contracts', async () => { + describe('decode logs from a script set to manually call other contracts', () => { const amount = Math.floor(Math.random() * 10) + 1; const expectedLogs = [ diff --git a/packages/fuel-gauge/src/await-execution.test.ts b/packages/fuel-gauge/src/await-execution.test.ts index 1c14f1fa6ad..5d14f7388df 100644 --- a/packages/fuel-gauge/src/await-execution.test.ts +++ b/packages/fuel-gauge/src/await-execution.test.ts @@ -1,4 +1,4 @@ -import { Provider, WalletUnlocked, randomBytes, Wallet, FUEL_NETWORK_URL } from 'fuels'; +import { WalletUnlocked, randomBytes, Wallet } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; /** diff --git a/packages/fuel-gauge/src/doc-examples.test.ts b/packages/fuel-gauge/src/doc-examples.test.ts index a0920b7a208..b52e954bfde 100644 --- a/packages/fuel-gauge/src/doc-examples.test.ts +++ b/packages/fuel-gauge/src/doc-examples.test.ts @@ -25,7 +25,6 @@ import { import { AssetId, launchTestNode } from 'fuels/test-utils'; import { CallTestContractAbi__factory } from '../test/typegen/contracts'; -import CallTestContractAbiHex from '../test/typegen/contracts/CallTestContractAbi.hex'; import { PredicateTrueAbi__factory } from '../test/typegen/predicates'; import { PredicateTripleSigAbi__factory } from '../test/typegen/predicates/factories/PredicateTripleSigAbi__factory'; diff --git a/packages/fuel-gauge/src/fee.test.ts b/packages/fuel-gauge/src/fee.test.ts index c66015bc07a..86819c386f8 100644 --- a/packages/fuel-gauge/src/fee.test.ts +++ b/packages/fuel-gauge/src/fee.test.ts @@ -1,6 +1,6 @@ import { ContractFactory, Predicate, ScriptTransactionRequest, Wallet, getRandomB256 } from 'fuels'; import type { BN } from 'fuels'; -import { launchTestNode, ASSET_A, ASSET_B, expectToBeInRange, AssetId } from 'fuels/test-utils'; +import { launchTestNode, ASSET_A, ASSET_B, expectToBeInRange } from 'fuels/test-utils'; import { CallTestContractAbi__factory, diff --git a/packages/fuel-gauge/src/reentrant-contract-calls.test.ts b/packages/fuel-gauge/src/reentrant-contract-calls.test.ts index 53b2c402034..d6ab95ba5f6 100644 --- a/packages/fuel-gauge/src/reentrant-contract-calls.test.ts +++ b/packages/fuel-gauge/src/reentrant-contract-calls.test.ts @@ -1,4 +1,4 @@ -import { ContractFactory, ReceiptType, bn, sleep } from 'fuels'; +import { ContractFactory, ReceiptType, bn } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; import type { ReentrantBarAbi, ReentrantFooAbi } from '../test/typegen/contracts'; From 0ba79bfee790311e699130900f4ac0ec8688e8a4 Mon Sep 17 00:00:00 2001 From: chad Date: Wed, 10 Jul 2024 15:17:59 -0500 Subject: [PATCH 27/53] test: updated configurable-contract tests --- .changeset/pretty-hornets-walk.md | 6 ++ .../src/configurable-contract.test.ts | 80 ++++++++++++++----- 2 files changed, 67 insertions(+), 19 deletions(-) create mode 100644 .changeset/pretty-hornets-walk.md diff --git a/.changeset/pretty-hornets-walk.md b/.changeset/pretty-hornets-walk.md new file mode 100644 index 00000000000..e70ecacb41c --- /dev/null +++ b/.changeset/pretty-hornets-walk.md @@ -0,0 +1,6 @@ +--- +"create-fuels": patch +"@fuel-ts/contract": patch +--- + +chore: integrate launchTestNode into current test suites diff --git a/packages/fuel-gauge/src/configurable-contract.test.ts b/packages/fuel-gauge/src/configurable-contract.test.ts index 6b665359a21..7a828fddce5 100644 --- a/packages/fuel-gauge/src/configurable-contract.test.ts +++ b/packages/fuel-gauge/src/configurable-contract.test.ts @@ -26,7 +26,7 @@ const defaultValues = { }; async function setupContract(configurableConstants?: { [name: string]: unknown }) { - using launched = await launchTestNode({ + return launchTestNode({ contractsConfigs: [ { deployer: ConfigurableContractAbi__factory, @@ -35,12 +35,6 @@ async function setupContract(configurableConstants?: { [name: string]: unknown } }, ], }); - - const { - contracts: [contract], - } = launched; - - return contract; } /** @@ -49,7 +43,11 @@ async function setupContract(configurableConstants?: { [name: string]: unknown } */ describe('Configurable Contract', () => { it('should assert default values', async () => { - const contract = await setupContract(); + using contractInstance = await setupContract(); + + const { + contracts: [contract], + } = contractInstance; const { value } = await contract.functions.echo_configurables().simulate(); @@ -73,7 +71,11 @@ describe('Configurable Contract', () => { expect(defaultValues.U8).not.toBe(configurableConstants.U8); - const contract = await setupContract(configurableConstants); + using contractInstance = await setupContract(configurableConstants); + + const { + contracts: [contract], + } = contractInstance; const { value } = await contract.functions.echo_u8().simulate(); @@ -87,7 +89,11 @@ describe('Configurable Contract', () => { expect(defaultValues.U16).not.toBe(configurableConstants.U16); - const contract = await setupContract(configurableConstants); + using contractInstance = await setupContract(configurableConstants); + + const { + contracts: [contract], + } = contractInstance; const { value } = await contract.functions.echo_u16().simulate(); @@ -101,7 +107,11 @@ describe('Configurable Contract', () => { expect(defaultValues.U32).not.toBe(configurableConstants.U32); - const contract = await setupContract(configurableConstants); + using contractInstance = await setupContract(configurableConstants); + + const { + contracts: [contract], + } = contractInstance; const { value } = await contract.functions.echo_u32().simulate(); @@ -115,7 +125,11 @@ describe('Configurable Contract', () => { expect(defaultValues.U64).not.toBe(configurableConstants.U64); - const contract = await setupContract(configurableConstants); + using contractInstance = await setupContract(configurableConstants); + + const { + contracts: [contract], + } = contractInstance; const { value } = await contract.functions.echo_u64().simulate(); @@ -129,7 +143,11 @@ describe('Configurable Contract', () => { expect(defaultValues.BOOL).not.toBe(configurableConstants.BOOL); - const contract = await setupContract(configurableConstants); + using contractInstance = await setupContract(configurableConstants); + + const { + contracts: [contract], + } = contractInstance; const { value } = await contract.functions.echo_bool().simulate(); @@ -143,7 +161,11 @@ describe('Configurable Contract', () => { expect(defaultValues.B256).not.toBe(configurableConstants.B256); - const contract = await setupContract(configurableConstants); + using contractInstance = await setupContract(configurableConstants); + + const { + contracts: [contract], + } = contractInstance; const { value } = await contract.functions.echo_b256().simulate(); @@ -157,7 +179,11 @@ describe('Configurable Contract', () => { expect(defaultValues.ENUM).not.toBe(configurableConstants.ENUM); - const contract = await setupContract(configurableConstants); + using contractInstance = await setupContract(configurableConstants); + + const { + contracts: [contract], + } = contractInstance; const { value } = await contract.functions.echo_enum().simulate(); @@ -174,7 +200,11 @@ describe('Configurable Contract', () => { expect(defaultValues.ARRAY).not.toStrictEqual(configurableConstants.ARRAY); - const contract = await setupContract(configurableConstants); + using contractInstance = await setupContract(configurableConstants); + + const { + contracts: [contract], + } = contractInstance; const { value } = await contract.functions.echo_array().simulate(); @@ -188,7 +218,11 @@ describe('Configurable Contract', () => { expect(defaultValues.STR_4).not.toBe(configurableConstants.STR_4); - const contract = await setupContract(configurableConstants); + using contractInstance = await setupContract(configurableConstants); + + const { + contracts: [contract], + } = contractInstance; const { value } = await contract.functions.echo_str4().simulate(); @@ -202,7 +236,11 @@ describe('Configurable Contract', () => { expect(defaultValues.TUPLE).not.toStrictEqual(configurableConstants.TUPLE); - const contract = await setupContract(configurableConstants); + using contractInstance = await setupContract(configurableConstants); + + const { + contracts: [contract], + } = contractInstance; const { value } = await contract.functions.echo_tuple().simulate(); @@ -220,7 +258,11 @@ describe('Configurable Contract', () => { expect(defaultValues.STRUCT_1).not.toStrictEqual(configurableConstants.STRUCT_1); - const contract = await setupContract(configurableConstants); + using contractInstance = await setupContract(configurableConstants); + + const { + contracts: [contract], + } = contractInstance; const { value } = await contract.functions.echo_struct().simulate(); From 2abdad84d34f3a8633d43b961477a9a853ba53a6 Mon Sep 17 00:00:00 2001 From: chad Date: Wed, 10 Jul 2024 15:19:50 -0500 Subject: [PATCH 28/53] docs: update changeset typo --- .changeset/pretty-hornets-walk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/pretty-hornets-walk.md b/.changeset/pretty-hornets-walk.md index e70ecacb41c..7312e41d5ce 100644 --- a/.changeset/pretty-hornets-walk.md +++ b/.changeset/pretty-hornets-walk.md @@ -3,4 +3,4 @@ "@fuel-ts/contract": patch --- -chore: integrate launchTestNode into current test suites +chore: integrate `launchTestNode` into current test suites From 1a281d40312d084ebe32a5cc66a18288389c830d Mon Sep 17 00:00:00 2001 From: chad Date: Wed, 10 Jul 2024 15:48:31 -0500 Subject: [PATCH 29/53] test: remove only on policies test --- packages/fuel-gauge/src/policies.test.ts | 41 ++++++++++++++++++++---- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/packages/fuel-gauge/src/policies.test.ts b/packages/fuel-gauge/src/policies.test.ts index 8e60635c598..94fcceaa70a 100644 --- a/packages/fuel-gauge/src/policies.test.ts +++ b/packages/fuel-gauge/src/policies.test.ts @@ -116,7 +116,11 @@ describe('Policies', () => { }); it('should ensure TX policies are properly set (ScriptTransactionRequest)', async () => { - using launched = await launchTestNode(); + using launched = await launchTestNode({ + nodeOptions: { + args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'], + }, + }); const { provider, @@ -157,7 +161,11 @@ describe('Policies', () => { }); it('should ensure TX policies are properly set (CreateTransactionRequest)', async () => { - using launched = await launchTestNode(); + using launched = await launchTestNode({ + nodeOptions: { + args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'], + }, + }); const { provider, @@ -231,7 +239,7 @@ describe('Policies', () => { }); }); - it.only('should ensure TX policies are properly set (ScriptInvocationScope)', async () => { + it('should ensure TX policies are properly set (ScriptInvocationScope)', async () => { using launched = await launchTestNode({ nodeOptions: { args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'], @@ -271,7 +279,11 @@ describe('Policies', () => { }); it('should ensure TX policies are properly set (Account Transfer)', async () => { - using launched = await launchTestNode(); + using launched = await launchTestNode({ + nodeOptions: { + args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'], + }, + }); const { provider, @@ -310,6 +322,9 @@ describe('Policies', () => { bytecode: PayableAnnotationAbiHex, }, ], + nodeOptions: { + args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'], + }, }); const { @@ -341,7 +356,11 @@ describe('Policies', () => { }); it('should ensure TX witnessLimit policy limits tx execution as expected', async () => { - using launched = await launchTestNode(); + using launched = await launchTestNode({ + nodeOptions: { + args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'], + }, + }); const { provider, @@ -369,7 +388,11 @@ describe('Policies', () => { describe('should ensure TX maxFee policy limits TX execution as expected', () => { it('on account transfer', async () => { - using launched = await launchTestNode(); + using launched = await launchTestNode({ + nodeOptions: { + args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'], + }, + }); const { provider, @@ -456,7 +479,11 @@ describe('Policies', () => { }); it('on ContractFactory when deploying contracts', async () => { - using launched = await launchTestNode(); + using launched = await launchTestNode({ + nodeOptions: { + args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'], + }, + }); const { provider, From 08cf2b0e455373f1597ff0b3621ad909e52adb55 Mon Sep 17 00:00:00 2001 From: chad Date: Wed, 10 Jul 2024 16:01:57 -0500 Subject: [PATCH 30/53] refactor: clean up type inferences --- .../fuel-gauge/src/advanced-logging.test.ts | 58 ++++++++++--------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/packages/fuel-gauge/src/advanced-logging.test.ts b/packages/fuel-gauge/src/advanced-logging.test.ts index 4ddc91e4883..7d01571f516 100644 --- a/packages/fuel-gauge/src/advanced-logging.test.ts +++ b/packages/fuel-gauge/src/advanced-logging.test.ts @@ -142,12 +142,12 @@ describe('Advanced Logging', () => { ], }); - // #TODO: Find a cleaner way to infer these types - const advancedLogContract = launched.contracts[0] as AdvancedLoggingAbi; - const otherAdvancedLogContract = launched.contracts[1] as AdvancedLoggingOtherContractAbi; + const { + contracts: [advancedLogContract, otherAdvancedLogContract], + } = launched; const INPUT = 3; - const { waitForResult } = await advancedLogContract.functions + const { waitForResult } = await (advancedLogContract as AdvancedLoggingAbi).functions .test_log_from_other_contract(INPUT, otherAdvancedLogContract.id.toB256()) .addContracts([otherAdvancedLogContract]) .call(); @@ -193,21 +193,24 @@ describe('Advanced Logging', () => { ], }); - // #TODO: Find a cleaner way to infer these types - const advancedLogContract = launched.contracts[0] as AdvancedLoggingAbi; - const otherAdvancedLogContract = launched.contracts[1] as AdvancedLoggingAbi; - const callTest = launched.contracts[2] as CallTestContractAbi; - const configurable = launched.contracts[3] as ConfigurableContractAbi; - const coverage = launched.contracts[4] as CoverageContractAbi; + const { + contracts: [ + advancedLogContract, + otherAdvancedLogContract, + callTest, + configurable, + coverage, + ], + } = launched; const { waitForResult } = await callTest .multiCall([ - advancedLogContract.functions + (advancedLogContract as AdvancedLoggingAbi).functions .test_log_from_other_contract(10, otherAdvancedLogContract.id.toB256()) .addContracts([otherAdvancedLogContract]), - callTest.functions.boo(testStruct), - configurable.functions.echo_struct(), - coverage.functions.echo_str_8('fuelfuel'), + (callTest as CallTestContractAbi).functions.boo(testStruct), + (configurable as ConfigurableContractAbi).functions.echo_struct(), + (coverage as CoverageContractAbi).functions.echo_str_8('fuelfuel'), ]) .call(); @@ -235,23 +238,24 @@ describe('Advanced Logging', () => { }, }); - const wallet = launched.wallets[0]; - - // #TODO: Find a cleaner way to infer these types - const advancedLogContract = launched.contracts[0] as AdvancedLoggingAbi; - const otherAdvancedLogContract = launched.contracts[1] as AdvancedLoggingAbi; - const callTest = launched.contracts[2] as CallTestContractAbi; - const configurable = launched.contracts[3] as ConfigurableContractAbi; - const coverage = launched.contracts[4] as CoverageContractAbi; - + const { + contracts: [ + advancedLogContract, + otherAdvancedLogContract, + callTest, + configurable, + coverage, + ], + wallets: [wallet], + } = launched; const request = await callTest .multiCall([ - advancedLogContract.functions + (advancedLogContract as AdvancedLoggingAbi).functions .test_log_from_other_contract(10, otherAdvancedLogContract.id.toB256()) .addContracts([otherAdvancedLogContract]), - callTest.functions.boo(testStruct), - configurable.functions.echo_struct(), - coverage.functions.echo_str_8('fuelfuel'), + (callTest as CallTestContractAbi).functions.boo(testStruct), + (configurable as ConfigurableContractAbi).functions.echo_struct(), + (coverage as CoverageContractAbi).functions.echo_str_8('fuelfuel'), ]) .getTransactionRequest(); From d7b84ba42daa56124c6ea528760e1097fa5f9ad5 Mon Sep 17 00:00:00 2001 From: chad Date: Thu, 11 Jul 2024 12:27:44 -0500 Subject: [PATCH 31/53] test: refactor type inferencing --- .../src/test-utils/launch-test-node.ts | 2 +- .../fuel-gauge/src/advanced-logging.test.ts | 51 ++++++++----------- .../src/reentrant-contract-calls.test.ts | 9 ++-- 3 files changed, 27 insertions(+), 35 deletions(-) diff --git a/packages/contract/src/test-utils/launch-test-node.ts b/packages/contract/src/test-utils/launch-test-node.ts index 63ef07a2341..0b78bbc3656 100644 --- a/packages/contract/src/test-utils/launch-test-node.ts +++ b/packages/contract/src/test-utils/launch-test-node.ts @@ -133,7 +133,7 @@ function getWalletForDeployment(config: DeployContractConfig, wallets: WalletUnl return wallets[config.walletIndex]; } -export async function launchTestNode({ +export async function launchTestNode({ providerOptions = {}, walletsConfig = {}, nodeOptions = {}, diff --git a/packages/fuel-gauge/src/advanced-logging.test.ts b/packages/fuel-gauge/src/advanced-logging.test.ts index 7d01571f516..baf9c13aa7b 100644 --- a/packages/fuel-gauge/src/advanced-logging.test.ts +++ b/packages/fuel-gauge/src/advanced-logging.test.ts @@ -2,15 +2,7 @@ import type { FuelError } from '@fuel-ts/errors'; import { Script, bn } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; import { ScriptCallContractAbi__factory } from '../test/typegen'; -import type { - AdvancedLoggingAbi, - AdvancedLoggingOtherContractAbi, - CallTestContractAbi, - ConfigurableContractAbi, - CoverageContractAbi, -} from '../test/typegen/contracts'; import { AdvancedLoggingAbi__factory, AdvancedLoggingOtherContractAbi__factory, @@ -147,7 +139,7 @@ describe('Advanced Logging', () => { } = launched; const INPUT = 3; - const { waitForResult } = await (advancedLogContract as AdvancedLoggingAbi).functions + const { waitForResult } = await advancedLogContract.functions .test_log_from_other_contract(INPUT, otherAdvancedLogContract.id.toB256()) .addContracts([otherAdvancedLogContract]) .call(); @@ -205,12 +197,12 @@ describe('Advanced Logging', () => { const { waitForResult } = await callTest .multiCall([ - (advancedLogContract as AdvancedLoggingAbi).functions + advancedLogContract.functions .test_log_from_other_contract(10, otherAdvancedLogContract.id.toB256()) .addContracts([otherAdvancedLogContract]), - (callTest as CallTestContractAbi).functions.boo(testStruct), - (configurable as ConfigurableContractAbi).functions.echo_struct(), - (coverage as CoverageContractAbi).functions.echo_str_8('fuelfuel'), + callTest.functions.boo(testStruct), + configurable.functions.echo_struct(), + coverage.functions.echo_str_8('fuelfuel'), ]) .call(); @@ -248,14 +240,15 @@ describe('Advanced Logging', () => { ], wallets: [wallet], } = launched; + const request = await callTest .multiCall([ - (advancedLogContract as AdvancedLoggingAbi).functions + advancedLogContract.functions .test_log_from_other_contract(10, otherAdvancedLogContract.id.toB256()) .addContracts([otherAdvancedLogContract]), - (callTest as CallTestContractAbi).functions.boo(testStruct), - (configurable as ConfigurableContractAbi).functions.echo_struct(), - (coverage as CoverageContractAbi).functions.echo_str_8('fuelfuel'), + callTest.functions.boo(testStruct), + configurable.functions.echo_struct(), + coverage.functions.echo_str_8('fuelfuel'), ]) .getTransactionRequest(); @@ -311,10 +304,10 @@ describe('Advanced Logging', () => { }, }); - const advancedLogContract = launched.contracts[0] as AdvancedLoggingAbi; - const otherAdvancedLogContract = launched.contracts[1] as AdvancedLoggingAbi; - - const wallet = launched.wallets[0]; + const { + contracts: [advancedLogContract, otherAdvancedLogContract], + wallets: [wallet], + } = launched; const script = new Script( ScriptCallContractAbi__factory.bin, @@ -346,17 +339,17 @@ describe('Advanced Logging', () => { }, }); - const advancedLogContract = launched.contracts[0] as AdvancedLoggingAbi; - const otherAdvancedLogContract = launched.contracts[1] as AdvancedLoggingAbi; - - const wallet = launched.wallets[0]; + const { + contracts: [advancedLogContract, otherAdvancedLogContract], + wallets: [wallet], + } = launched; - const { abiContents, binHexlified } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.SCRIPT_CALL_CONTRACT + const script = new Script( + ScriptCallContractAbi__factory.bin, + ScriptCallContractAbi__factory.abi, + wallet ); - const script = new Script(binHexlified, abiContents, wallet); - const request = await script.functions .main(advancedLogContract.id.toB256(), otherAdvancedLogContract.id.toB256(), amount) .addContracts([advancedLogContract, otherAdvancedLogContract]) diff --git a/packages/fuel-gauge/src/reentrant-contract-calls.test.ts b/packages/fuel-gauge/src/reentrant-contract-calls.test.ts index 4ae1ec8d1d7..a0dc09bf74b 100644 --- a/packages/fuel-gauge/src/reentrant-contract-calls.test.ts +++ b/packages/fuel-gauge/src/reentrant-contract-calls.test.ts @@ -30,8 +30,9 @@ describe('Reentrant Contract Calls', () => { ], }); - const fooContract = launched.contracts[0] as ReentrantFooAbi; - const barContract = launched.contracts[1] as ReentrantBarAbi; + const { + contracts: [fooContract, barContract], + } = launched; const { waitForResult } = await fooContract.functions .foo({ bits: fooContract.id.toB256() }, { bits: barContract.id.toB256() }) @@ -84,11 +85,9 @@ describe('Reentrant Contract Calls', () => { const { wallets: [wallet], + contracts: [fooContract, barContract], } = launched; - const fooContract = launched.contracts[0] as ReentrantFooAbi; - const barContract = launched.contracts[1] as ReentrantBarAbi; - const deploy = await new ContractFactory( StorageTestContractAbiHex, StorageTestContractAbi__factory.abi, From b1c0dba5f7345626a0cb31c75d2d43a7944b7b86 Mon Sep 17 00:00:00 2001 From: chad Date: Thu, 11 Jul 2024 16:19:11 -0500 Subject: [PATCH 32/53] test: fix issue with hanging tests due to variables not dropping resources --- .../fuel-gauge/src/bytecode-sway-lib.test.ts | 25 +-- packages/fuel-gauge/src/contract.test.ts | 2 +- .../fuel-gauge/src/coverage-contract.test.ts | 5 +- packages/fuel-gauge/src/doc-examples.test.ts | 4 +- packages/fuel-gauge/src/fee.test.ts | 15 +- .../src/transaction-response.test.ts | 76 +++++---- .../src/transaction-summary.test.ts | 158 +++++++++--------- 7 files changed, 154 insertions(+), 131 deletions(-) diff --git a/packages/fuel-gauge/src/bytecode-sway-lib.test.ts b/packages/fuel-gauge/src/bytecode-sway-lib.test.ts index b142115185a..0f9485d143f 100644 --- a/packages/fuel-gauge/src/bytecode-sway-lib.test.ts +++ b/packages/fuel-gauge/src/bytecode-sway-lib.test.ts @@ -13,7 +13,7 @@ import { launchTestContract } from './utils'; * @group browser */ describe('bytecode computations', () => { - test('compute_bytecode_root', async () => { + it('compute_bytecode_root', async () => { using contract = await launchTestContract({ deployer: BytecodeSwayLibAbi__factory, bytecode: BytecodeSwayLibAbiHex, @@ -31,7 +31,7 @@ describe('bytecode computations', () => { expect(bytecodeRoot.length).toBe(66); }); - test('verify_contract_bytecode', async () => { + it('verify_contract_bytecode', async () => { using contract = await launchTestContract({ deployer: BytecodeSwayLibAbi__factory, bytecode: BytecodeSwayLibAbiHex, @@ -51,10 +51,20 @@ describe('bytecode computations', () => { expect(value).toBeTruthy(); }); - test('compute_predicate_address', async () => { - using launched = await launchTestNode(); + it('compute_predicate_address', async () => { + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: BytecodeSwayLibAbi__factory, + bytecode: BytecodeSwayLibAbiHex, + }, + ], + }); - const { provider } = launched; + const { + contracts: [contract], + provider, + } = launched; const predicate = new Predicate({ bytecode: defaultPredicateBytecode, @@ -64,11 +74,6 @@ describe('bytecode computations', () => { const address = predicate.address; - const contract = await launchTestContract({ - deployer: BytecodeSwayLibAbi__factory, - bytecode: BytecodeSwayLibAbiHex, - }); - const { waitForResult } = await contract.functions .compute_predicate_address(Array.from(arrayify(defaultPredicateBytecode))) .call(); diff --git a/packages/fuel-gauge/src/contract.test.ts b/packages/fuel-gauge/src/contract.test.ts index efa90dfcbdc..5b544534f82 100644 --- a/packages/fuel-gauge/src/contract.test.ts +++ b/packages/fuel-gauge/src/contract.test.ts @@ -229,7 +229,7 @@ describe('Contract', () => { }); it('should executes a contract call just nice', async () => { - const contract = await setupTestContract(); + using contract = await setupTestContract(); const numberToSend = 1336; diff --git a/packages/fuel-gauge/src/coverage-contract.test.ts b/packages/fuel-gauge/src/coverage-contract.test.ts index f13a8fed02b..43c372670de 100644 --- a/packages/fuel-gauge/src/coverage-contract.test.ts +++ b/packages/fuel-gauge/src/coverage-contract.test.ts @@ -401,6 +401,7 @@ describe('Coverage Contract', () => { it('should test u8 empty vector input', async () => { using contractInstance = await setupContract(); + const { waitForResult } = await contractInstance.functions.check_u8_vector([]).call(); const { value } = await waitForResult(); expect(value).toBeFalsy(); @@ -593,7 +594,9 @@ describe('Coverage Contract', () => { }); it('should test spending input messages', async () => { - const { provider } = await setupContract(); + using contractInstance = await setupContract(); + + const { provider } = contractInstance; const request = new ScriptTransactionRequest({ gasLimit: 1000000 }); const recipient = Wallet.generate({ diff --git a/packages/fuel-gauge/src/doc-examples.test.ts b/packages/fuel-gauge/src/doc-examples.test.ts index 000a8952143..dba9d41f086 100644 --- a/packages/fuel-gauge/src/doc-examples.test.ts +++ b/packages/fuel-gauge/src/doc-examples.test.ts @@ -128,7 +128,9 @@ describe('Doc Examples', () => { }); test('it can work with wallets', async () => { - const { provider } = await launchTestNode(); + using node = await launchTestNode(); + + const { provider } = node; // use the `generate` helper to make an Unlocked Wallet const myWallet: WalletUnlocked = Wallet.generate({ provider, diff --git a/packages/fuel-gauge/src/fee.test.ts b/packages/fuel-gauge/src/fee.test.ts index 56adbdea346..3ff893cfa24 100644 --- a/packages/fuel-gauge/src/fee.test.ts +++ b/packages/fuel-gauge/src/fee.test.ts @@ -80,10 +80,13 @@ describe('Fee', () => { }); it('should ensure fee is properly calculated on simple transfer transactions', async () => { + using launched = await launchTestNode(); + const { provider, wallets: [wallet], - } = await launchTestNode(); + } = launched; + const destination = Wallet.generate({ provider }); const amountToTransfer = 120; @@ -110,15 +113,17 @@ describe('Fee', () => { }); it('should ensure fee is properly calculated on multi transfer transactions', async () => { - const { - provider, - wallets: [wallet, destination1, destination2, destination3], - } = await launchTestNode({ + using launched = await launchTestNode({ walletsConfig: { count: 4, }, }); + const { + provider, + wallets: [wallet, destination1, destination2, destination3], + } = launched; + const amountToTransfer = 120; const balanceBefore = await wallet.getBalance(); diff --git a/packages/fuel-gauge/src/transaction-response.test.ts b/packages/fuel-gauge/src/transaction-response.test.ts index ffde4fa6bcc..db0eb834f51 100644 --- a/packages/fuel-gauge/src/transaction-response.test.ts +++ b/packages/fuel-gauge/src/transaction-response.test.ts @@ -202,51 +202,55 @@ describe('TransactionResponse', () => { await verifyKeepAliveMessageWasSent(subscriptionStreamHolder.stream); }); - it('should throw error for a SqueezedOut status update [waitForResult]', async () => { - /** - * a larger --tx-pool-ttl 1s is necessary to ensure that the transaction doesn't get squeezed out - * before the waitForResult (provider.operations.statusChange) call is made - * */ - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 500_000, - }, - nodeOptions: { - args: ['--poa-instant', 'false', '--poa-interval-period', '2s', '--tx-pool-ttl', '1s'], - loggingEnabled: false, - }, - }); + it( + 'should throw error for a SqueezedOut status update [waitForResult]', + async () => { + /** + * a larger --tx-pool-ttl 1s is necessary to ensure that the transaction doesn't get squeezed out + * before the waitForResult (provider.operations.statusChange) call is made + * */ + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 500_000, + }, + nodeOptions: { + args: ['--poa-instant', 'false', '--poa-interval-period', '2s', '--tx-pool-ttl', '1s'], + loggingEnabled: false, + }, + }); - const { - provider, - wallets: [genesisWallet], - } = launched; + const { + provider, + wallets: [genesisWallet], + } = launched; - const request = new ScriptTransactionRequest(); + const request = new ScriptTransactionRequest(); - request.addCoinOutput(Wallet.generate(), 100, provider.getBaseAssetId()); + request.addCoinOutput(Wallet.generate(), 100, provider.getBaseAssetId()); - const txCost = await genesisWallet.provider.getTransactionCost(request); + const txCost = await genesisWallet.provider.getTransactionCost(request); - request.gasLimit = txCost.gasUsed; - request.maxFee = txCost.maxFee; + request.gasLimit = txCost.gasUsed; + request.maxFee = txCost.maxFee; - await genesisWallet.fund(request, txCost); + await genesisWallet.fund(request, txCost); - request.updateWitnessByOwner( - genesisWallet.address, - await genesisWallet.signTransaction(request) - ); + request.updateWitnessByOwner( + genesisWallet.address, + await genesisWallet.signTransaction(request) + ); - const response = await provider.sendTransaction(request); + const response = await provider.sendTransaction(request); - await expectToThrowFuelError( - async () => { - await response.waitForResult(); - }, - { code: ErrorCode.TRANSACTION_SQUEEZED_OUT } - ); - }); + await expectToThrowFuelError( + async () => { + await response.waitForResult(); + }, + { code: ErrorCode.TRANSACTION_SQUEEZED_OUT } + ); + }, + { timeout: 10_000 } + ); it( 'should throw error for a SqueezedOut status update [submitAndAwait]', diff --git a/packages/fuel-gauge/src/transaction-summary.test.ts b/packages/fuel-gauge/src/transaction-summary.test.ts index 0d11c000f3d..d34891a5e5b 100644 --- a/packages/fuel-gauge/src/transaction-summary.test.ts +++ b/packages/fuel-gauge/src/transaction-summary.test.ts @@ -334,85 +334,89 @@ describe('TransactionSummary', () => { }); }); - it('should ensure transfer operations are assembled (CONTRACT TRANSFER TO ACCOUNTS)', async () => { - using launched = await launchTestNode({ - contractsConfigs: [ - { - deployer: TokenContractAbi__factory, - bytecode: TokenContractAbiHex, + it( + 'should ensure transfer operations are assembled (CONTRACT TRANSFER TO ACCOUNTS)', + async () => { + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: TokenContractAbi__factory, + bytecode: TokenContractAbiHex, + }, + ], + walletsConfig: { + amountPerCoin: 100_000_000, }, - ], - walletsConfig: { - amountPerCoin: 100_000_000, - }, - }); - - const { - contracts: [senderContract], - provider, - wallets: [wallet], - } = launched; - - const walletA = Wallet.generate({ provider }); - const walletB = Wallet.generate({ provider }); - - await wallet.transfer(walletA.address, 50_000, ASSET_A); - await wallet.transfer(walletB.address, 50_000, ASSET_B); - - senderContract.account = wallet; - const fundAmount = 5_000; - - const assets = [provider.getBaseAssetId(), ASSET_A, ASSET_B]; - for await (const asset of assets) { - const tx = await wallet.transferToContract(senderContract.id, fundAmount, asset); - await tx.waitForResult(); - } - - const transferData1 = { - address: Wallet.generate({ provider }).address, - quantities: [ - { amount: 543, assetId: ASSET_A }, - { amount: 40, assetId: ASSET_B }, - { amount: 123, assetId: provider.getBaseAssetId() }, - ], - }; - const transferData2 = { - address: Wallet.generate({ provider }).address, - quantities: [ - { amount: 12, assetId: provider.getBaseAssetId() }, - { amount: 612, assetId: ASSET_B }, - ], - }; - - const { waitForResult } = await senderContract.functions - .multi_address_transfer([ - // 3 Transfers for recipient contract 1 - ...transferData1.quantities.map(({ amount, assetId }) => ({ - recipient: { bits: transferData1.address.toB256() }, - asset_id: { bits: assetId }, - amount, - })), - // 2 Transfers for recipient contract 2 - ...transferData2.quantities.map(({ amount, assetId }) => ({ - recipient: { bits: transferData2.address.toB256() }, - asset_id: { bits: assetId }, - amount, - })), - ]) - .call(); - - const { - transactionResult: { operations }, - } = await waitForResult(); + }); - validateTransferOperation({ - operations, - sender: senderContract.id, - fromType: AddressType.contract, - toType: AddressType.account, - recipients: [transferData1, transferData2], - }); - }); + const { + contracts: [senderContract], + provider, + wallets: [wallet], + } = launched; + + const walletA = Wallet.generate({ provider }); + const walletB = Wallet.generate({ provider }); + + await wallet.transfer(walletA.address, 50_000, ASSET_A); + await wallet.transfer(walletB.address, 50_000, ASSET_B); + + senderContract.account = wallet; + const fundAmount = 5_000; + + const assets = [provider.getBaseAssetId(), ASSET_A, ASSET_B]; + for await (const asset of assets) { + const tx = await wallet.transferToContract(senderContract.id, fundAmount, asset); + await tx.waitForResult(); + } + + const transferData1 = { + address: Wallet.generate({ provider }).address, + quantities: [ + { amount: 543, assetId: ASSET_A }, + { amount: 40, assetId: ASSET_B }, + { amount: 123, assetId: provider.getBaseAssetId() }, + ], + }; + const transferData2 = { + address: Wallet.generate({ provider }).address, + quantities: [ + { amount: 12, assetId: provider.getBaseAssetId() }, + { amount: 612, assetId: ASSET_B }, + ], + }; + + const { waitForResult } = await senderContract.functions + .multi_address_transfer([ + // 3 Transfers for recipient contract 1 + ...transferData1.quantities.map(({ amount, assetId }) => ({ + recipient: { bits: transferData1.address.toB256() }, + asset_id: { bits: assetId }, + amount, + })), + // 2 Transfers for recipient contract 2 + ...transferData2.quantities.map(({ amount, assetId }) => ({ + recipient: { bits: transferData2.address.toB256() }, + asset_id: { bits: assetId }, + amount, + })), + ]) + .call(); + + const { + transactionResult: { operations }, + } = await waitForResult(); + + validateTransferOperation({ + operations, + sender: senderContract.id, + fromType: AddressType.contract, + toType: AddressType.account, + recipients: [transferData1, transferData2], + }); + }, + { timeout: 10_000 } + ); it('should ensure transfer operation is assembled (CONTRACT TRANSFER TO CONTRACT)', async () => { using launched = await launchTestNode({ From e952b4804da66df4b4a039d2c215e9c47d940ff6 Mon Sep 17 00:00:00 2001 From: chad Date: Thu, 11 Jul 2024 16:40:38 -0500 Subject: [PATCH 33/53] fix: increase block production times on policy tests --- .../src/launch-test-node-types.test.ts | 29 ------------------- packages/fuel-gauge/src/policies.test.ts | 16 +++++----- 2 files changed, 8 insertions(+), 37 deletions(-) delete mode 100644 packages/fuel-gauge/src/launch-test-node-types.test.ts diff --git a/packages/fuel-gauge/src/launch-test-node-types.test.ts b/packages/fuel-gauge/src/launch-test-node-types.test.ts deleted file mode 100644 index a72aa4e74d7..00000000000 --- a/packages/fuel-gauge/src/launch-test-node-types.test.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { launchTestNode } from 'fuels/test-utils'; - -import type { AdvancedLoggingAbi, CallTestContractAbi } from '../test/typegen'; -import { AdvancedLoggingAbi__factory, CallTestContractAbi__factory } from '../test/typegen'; -import AdvancedLoggingBytecode from '../test/typegen/contracts/AdvancedLoggingAbi.hex'; -import CallTestContractBytecode from '../test/typegen/contracts/CallTestContractAbi.hex'; - -/** - * @group node - * @group browser - */ -describe('type level tests for launchTestNode', () => { - test('infers types correctly', async () => { - using launched = await launchTestNode({ - contractsConfigs: [ - { deployer: AdvancedLoggingAbi__factory, bytecode: AdvancedLoggingBytecode }, - { deployer: CallTestContractAbi__factory, bytecode: CallTestContractBytecode }, - { deployer: AdvancedLoggingAbi__factory, bytecode: AdvancedLoggingBytecode }, - ], - }); - const { - contracts: [c1, c2, c3], - } = launched; - - expectTypeOf(c1).toMatchTypeOf(); - expectTypeOf(c2).toMatchTypeOf(); - expectTypeOf(c3).toMatchTypeOf(); - }); -}); diff --git a/packages/fuel-gauge/src/policies.test.ts b/packages/fuel-gauge/src/policies.test.ts index 94fcceaa70a..0ea7cd10bcd 100644 --- a/packages/fuel-gauge/src/policies.test.ts +++ b/packages/fuel-gauge/src/policies.test.ts @@ -118,7 +118,7 @@ describe('Policies', () => { it('should ensure TX policies are properly set (ScriptTransactionRequest)', async () => { using launched = await launchTestNode({ nodeOptions: { - args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'], + args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'], }, }); @@ -163,7 +163,7 @@ describe('Policies', () => { it('should ensure TX policies are properly set (CreateTransactionRequest)', async () => { using launched = await launchTestNode({ nodeOptions: { - args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'], + args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'], }, }); @@ -242,7 +242,7 @@ describe('Policies', () => { it('should ensure TX policies are properly set (ScriptInvocationScope)', async () => { using launched = await launchTestNode({ nodeOptions: { - args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'], + args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'], }, }); @@ -281,7 +281,7 @@ describe('Policies', () => { it('should ensure TX policies are properly set (Account Transfer)', async () => { using launched = await launchTestNode({ nodeOptions: { - args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'], + args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'], }, }); @@ -323,7 +323,7 @@ describe('Policies', () => { }, ], nodeOptions: { - args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'], + args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'], }, }); @@ -358,7 +358,7 @@ describe('Policies', () => { it('should ensure TX witnessLimit policy limits tx execution as expected', async () => { using launched = await launchTestNode({ nodeOptions: { - args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'], + args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'], }, }); @@ -390,7 +390,7 @@ describe('Policies', () => { it('on account transfer', async () => { using launched = await launchTestNode({ nodeOptions: { - args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'], + args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'], }, }); @@ -481,7 +481,7 @@ describe('Policies', () => { it('on ContractFactory when deploying contracts', async () => { using launched = await launchTestNode({ nodeOptions: { - args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'], + args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'], }, }); From 8bc6b6142bc68eb6c55a9b16d67edd7a9503bb17 Mon Sep 17 00:00:00 2001 From: chad Date: Fri, 12 Jul 2024 09:37:25 -0500 Subject: [PATCH 34/53] fix: undo call parameters test change --- .../docs-snippets/src/guide/contracts/call-parameters.test.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/docs-snippets/src/guide/contracts/call-parameters.test.ts b/apps/docs-snippets/src/guide/contracts/call-parameters.test.ts index d05ea6721a3..f13033ce659 100644 --- a/apps/docs-snippets/src/guide/contracts/call-parameters.test.ts +++ b/apps/docs-snippets/src/guide/contracts/call-parameters.test.ts @@ -1,3 +1,4 @@ +import type { Contract, Provider } from 'fuels'; import { BN } from 'fuels'; import { DocSnippetProjectsEnum } from '../../../test/fixtures/forc-projects'; @@ -7,6 +8,9 @@ import { createAndDeployContractFromProject } from '../../utils'; * @group node */ describe(__filename, () => { + let contract: Contract; + let provider: Provider; + let baseAssetId: string; beforeAll(async () => { contract = await createAndDeployContractFromProject(DocSnippetProjectsEnum.RETURN_CONTEXT); provider = contract.provider; From 7c8a51eefbc886f706e448ad71117ac3b7637e44 Mon Sep 17 00:00:00 2001 From: chad Date: Fri, 12 Jul 2024 09:38:54 -0500 Subject: [PATCH 35/53] fix: resotre create-fuels.js --- packages/create-fuels/create-fuels.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 packages/create-fuels/create-fuels.js diff --git a/packages/create-fuels/create-fuels.js b/packages/create-fuels/create-fuels.js old mode 100755 new mode 100644 From f401c95a20128cff9942986e3e99a9cef638b7c4 Mon Sep 17 00:00:00 2001 From: chad Date: Fri, 12 Jul 2024 10:13:30 -0500 Subject: [PATCH 36/53] test: update typegen demo-test --- apps/demo-typegen/src/demo.test.ts | 95 ++++++++++++++++++++++-------- 1 file changed, 72 insertions(+), 23 deletions(-) diff --git a/apps/demo-typegen/src/demo.test.ts b/apps/demo-typegen/src/demo.test.ts index 2aacfd77a05..cae953f2290 100644 --- a/apps/demo-typegen/src/demo.test.ts +++ b/apps/demo-typegen/src/demo.test.ts @@ -1,6 +1,6 @@ // #region Testing-in-ts-ts import { ContractFactory, Provider, toHex, Wallet, FUEL_NETWORK_URL, Address } from 'fuels'; -import { generateTestWallet, safeExec } from 'fuels/test-utils'; +import { generateTestWallet, launchTestNode, safeExec } from 'fuels/test-utils'; import storageSlots from '../contract/out/release/demo-contract-storage_slots.json'; @@ -10,19 +10,21 @@ import type { PredicateAbiInputs } from './predicate-types'; import { PredicateAbi__factory } from './predicate-types'; import { ScriptAbi__factory } from './script-types'; -let baseAssetId: string; - /** * @group node + * @group browser */ describe('ExampleContract', () => { - beforeAll(async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - baseAssetId = provider.getBaseAssetId(); - }); it('with imported storage slots', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - const wallet = await generateTestWallet(provider, [[500_000, baseAssetId]]); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 500_000, + }, + }); + + const { + wallets: [wallet], + } = launched; // #region typegen-demo-contract-storage-slots // #context import storageSlots from './contract/out/debug/demo-contract-storage_slots.json'; @@ -36,8 +38,15 @@ describe('ExampleContract', () => { expect(contract.id).toBeTruthy(); }); it('should return the input', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - const wallet = await generateTestWallet(provider, [[500_000, baseAssetId]]); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 500_000, + }, + }); + + const { + wallets: [wallet], + } = launched; // Deploy const factory = new ContractFactory(bytecode, DemoContractAbi__factory.abi, wallet); @@ -64,8 +73,15 @@ describe('ExampleContract', () => { }); it('deployContract method', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - const wallet = await generateTestWallet(provider, [[500_000, baseAssetId]]); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 500_000, + }, + }); + + const { + wallets: [wallet], + } = launched; // #region typegen-demo-contract-factory-deploy // #context import { DemoContractAbi__factory } from './types'; @@ -88,8 +104,17 @@ describe('ExampleContract', () => { // #endregion Testing-in-ts-ts it('should throw when simulating via contract factory with wallet with no resources', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - const fundedWallet = await generateTestWallet(provider, [[500_000, baseAssetId]]); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 500_000, + }, + }); + + const { + provider, + wallets: [fundedWallet], + } = launched; + const unfundedWallet = Wallet.generate({ provider }); const factory = new ContractFactory(bytecode, DemoContractAbi__factory.abi, fundedWallet); @@ -103,8 +128,16 @@ it('should throw when simulating via contract factory with wallet with no resour }); it('should not throw when dry running via contract factory with wallet with no resources', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - const fundedWallet = await generateTestWallet(provider, [[500_000, baseAssetId]]); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 500_000, + }, + }); + + const { + provider, + wallets: [fundedWallet], + } = launched; const unfundedWallet = Wallet.generate({ provider }); const factory = new ContractFactory(bytecode, DemoContractAbi__factory.abi, fundedWallet); @@ -116,8 +149,15 @@ it('should not throw when dry running via contract factory with wallet with no r }); test('Example script', async () => { - const provider = await Provider.create(FUEL_NETWORK_URL); - const wallet = await generateTestWallet(provider, [[500_000, baseAssetId]]); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 500_000, + }, + }); + + const { + wallets: [wallet], + } = launched; // #region typegen-demo-script // #context import { ScriptAbi__factory } from './types'; @@ -135,18 +175,27 @@ test('Example predicate', async () => { // #context import { PredicateAbi__factory } from './types'; // In this exchange, we are first transferring some coins to the predicate - const provider = await Provider.create(FUEL_NETWORK_URL); - const wallet = await generateTestWallet(provider, [[500_000, baseAssetId]]); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 10_000_000_000, + }, + }); + + const { + provider, + wallets: [wallet], + } = launched; + const receiver = Wallet.fromAddress(Address.fromRandom(), provider); const predicateData: PredicateAbiInputs = []; const predicate = PredicateAbi__factory.createInstance(provider, predicateData); - const tx = await wallet.transfer(predicate.address, 150_000, baseAssetId); + const tx = await wallet.transfer(predicate.address, 1_000_000, provider.getBaseAssetId()); const { isStatusSuccess } = await tx.wait(); // Then we are transferring some coins from the predicate to a random address (receiver) - const tx2 = await predicate.transfer(receiver.address, 50_000, baseAssetId); + const tx2 = await predicate.transfer(receiver.address, 50_000, provider.getBaseAssetId()); await tx2.wait(); expect((await receiver.getBalance()).toNumber()).toEqual(50_000); From d998db805c2ed05a79e643b7fdf54aebdab846bd Mon Sep 17 00:00:00 2001 From: chad Date: Fri, 12 Jul 2024 10:41:10 -0500 Subject: [PATCH 37/53] lint: linting fixes --- apps/demo-typegen/src/demo.test.ts | 4 ++-- packages/fuel-gauge/src/reentrant-contract-calls.test.ts | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/demo-typegen/src/demo.test.ts b/apps/demo-typegen/src/demo.test.ts index cae953f2290..e0207b010fd 100644 --- a/apps/demo-typegen/src/demo.test.ts +++ b/apps/demo-typegen/src/demo.test.ts @@ -1,6 +1,6 @@ // #region Testing-in-ts-ts -import { ContractFactory, Provider, toHex, Wallet, FUEL_NETWORK_URL, Address } from 'fuels'; -import { generateTestWallet, launchTestNode, safeExec } from 'fuels/test-utils'; +import { ContractFactory, toHex, Address } from 'fuels'; +import { launchTestNode, safeExec } from 'fuels/test-utils'; import storageSlots from '../contract/out/release/demo-contract-storage_slots.json'; diff --git a/packages/fuel-gauge/src/reentrant-contract-calls.test.ts b/packages/fuel-gauge/src/reentrant-contract-calls.test.ts index a0dc09bf74b..912b9d770d0 100644 --- a/packages/fuel-gauge/src/reentrant-contract-calls.test.ts +++ b/packages/fuel-gauge/src/reentrant-contract-calls.test.ts @@ -1,7 +1,6 @@ import { ContractFactory, ReceiptType, bn } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; -import type { ReentrantBarAbi, ReentrantFooAbi } from '../test/typegen/contracts'; import { ReentrantBarAbi__factory, ReentrantFooAbi__factory, From 453e71a98ab6ff6d72df23602a1b1ca7cfdb2932 Mon Sep 17 00:00:00 2001 From: chad Date: Fri, 12 Jul 2024 10:42:01 -0500 Subject: [PATCH 38/53] test: skipping policy tests temporarily --- packages/fuel-gauge/src/policies.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fuel-gauge/src/policies.test.ts b/packages/fuel-gauge/src/policies.test.ts index 0ea7cd10bcd..c08c48388f5 100644 --- a/packages/fuel-gauge/src/policies.test.ts +++ b/packages/fuel-gauge/src/policies.test.ts @@ -17,7 +17,7 @@ import PayableAnnotationAbiHex from '../test/typegen/contracts/PayableAnnotation * @group node * @group browser */ -describe('Policies', () => { +describe.skip('Policies', () => { type CustomTxParams = { gasLimit?: BigNumberish; maturity?: number; From 5cb3ce139de5ee6695c1bf267b6c212a6fb09c48 Mon Sep 17 00:00:00 2001 From: chad Date: Fri, 12 Jul 2024 11:01:35 -0500 Subject: [PATCH 39/53] fix: import wallet in tests --- apps/demo-typegen/src/demo.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/demo-typegen/src/demo.test.ts b/apps/demo-typegen/src/demo.test.ts index e0207b010fd..fb7c920de4d 100644 --- a/apps/demo-typegen/src/demo.test.ts +++ b/apps/demo-typegen/src/demo.test.ts @@ -1,5 +1,5 @@ // #region Testing-in-ts-ts -import { ContractFactory, toHex, Address } from 'fuels'; +import { ContractFactory, toHex, Address, Wallet } from 'fuels'; import { launchTestNode, safeExec } from 'fuels/test-utils'; import storageSlots from '../contract/out/release/demo-contract-storage_slots.json'; From 9d306ed1149be24cd8e6b60431e8abc4f27980d3 Mon Sep 17 00:00:00 2001 From: chad Date: Fri, 12 Jul 2024 11:31:39 -0500 Subject: [PATCH 40/53] fix: remove node specific testing utilities --- packages/fuel-gauge/src/bytes.test.ts | 17 ++++------ packages/fuel-gauge/src/e2e-script.test.ts | 4 +-- .../src/funding-transaction.test.ts | 2 +- packages/fuel-gauge/src/min-gas.test.ts | 2 +- packages/fuel-gauge/src/raw-slice.test.ts | 6 ++-- .../fuel-gauge/src/script-main-args.test.ts | 12 ++++--- .../src/script-with-vectors.test.ts | 18 ++++++----- .../fuel-gauge/src/std-lib-string.test.ts | 11 ++++--- packages/fuel-gauge/src/utils.ts | 32 ------------------- packages/fuel-gauge/src/vector-types.test.ts | 7 ++-- 10 files changed, 41 insertions(+), 70 deletions(-) diff --git a/packages/fuel-gauge/src/bytes.test.ts b/packages/fuel-gauge/src/bytes.test.ts index 4dcbfca4f51..48f70d7d373 100644 --- a/packages/fuel-gauge/src/bytes.test.ts +++ b/packages/fuel-gauge/src/bytes.test.ts @@ -2,11 +2,11 @@ import { bn, Predicate, Wallet, Address } from 'fuels'; import type { BN } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; -import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; +import { PredicateBytesAbi__factory, ScriptBytesAbi__factory } from '../test/typegen'; import { BytesAbi__factory } from '../test/typegen/contracts'; import BytesAbiHex from '../test/typegen/contracts/BytesAbi.hex'; -import { getScript, launchTestContract } from './utils'; +import { launchTestContract } from './utils'; type SomeEnum = { First?: boolean; @@ -106,10 +106,6 @@ describe('Bytes Tests', () => { const amountToReceiver = 50; type MainArgs = [Wrapper]; - const { binHexlified, abiContents } = getFuelGaugeForcProject( - FuelGaugeProjectsEnum.PREDICATE_BYTES - ); - const bytes = [40, 41, 42]; const INPUT: Wrapper = { inner: [bytes, bytes], @@ -117,8 +113,8 @@ describe('Bytes Tests', () => { }; const predicate = new Predicate({ - bytecode: binHexlified, - abi: abiContents, + bytecode: PredicateBytesAbi__factory.bin, + abi: PredicateBytesAbi__factory.abi, provider: wallet.provider, inputData: [INPUT], }); @@ -167,15 +163,14 @@ describe('Bytes Tests', () => { wallets: [wallet], } = launched; - type MainArgs = [number, Wrapper]; - const scriptInstance = getScript('script-bytes', wallet); - const bytes = [40, 41, 42]; const INPUT: Wrapper = { inner: [bytes, bytes], inner_enum: { Second: bytes }, }; + const scriptInstance = ScriptBytesAbi__factory.createInstance(wallet); + const { waitForResult } = await scriptInstance.functions.main(1, INPUT).call(); const { value } = await waitForResult(); diff --git a/packages/fuel-gauge/src/e2e-script.test.ts b/packages/fuel-gauge/src/e2e-script.test.ts index 08d607ae90c..7503a8b9479 100644 --- a/packages/fuel-gauge/src/e2e-script.test.ts +++ b/packages/fuel-gauge/src/e2e-script.test.ts @@ -10,7 +10,7 @@ import { assets, } from 'fuels'; -import { getScript } from './utils'; +import { ScriptMainArgBoolAbi__factory } from '../test/typegen'; enum Networks { DEVNET = 'devnet', @@ -81,7 +81,7 @@ describe.each(selectedNetworks)('Live Script Test', (selectedNetwork) => { return; } - const scriptInstance = getScript<[boolean], boolean>('script-main-arg-bool', wallet); + const scriptInstance = ScriptMainArgBoolAbi__factory.createInstance(wallet); let output: boolean = false; try { diff --git a/packages/fuel-gauge/src/funding-transaction.test.ts b/packages/fuel-gauge/src/funding-transaction.test.ts index 20a07cf61ce..a10054f59ac 100644 --- a/packages/fuel-gauge/src/funding-transaction.test.ts +++ b/packages/fuel-gauge/src/funding-transaction.test.ts @@ -8,7 +8,7 @@ import { AssetId, launchTestNode } from 'fuels/test-utils'; * @group node * @group browser */ -describe(__filename, () => { +describe('Funding Transactions', () => { const assetA = '0x0101010101010101010101010101010101010101010101010101010101010101'; const assetB = '0x0202020202020202020202020202020202020202020202020202020202020202'; diff --git a/packages/fuel-gauge/src/min-gas.test.ts b/packages/fuel-gauge/src/min-gas.test.ts index d044abed656..8889fffeece 100644 --- a/packages/fuel-gauge/src/min-gas.test.ts +++ b/packages/fuel-gauge/src/min-gas.test.ts @@ -22,7 +22,7 @@ import CoverageContractAbiHex from '../test/typegen/contracts/CoverageContractAb * @group node * @group browser */ -describe(__filename, () => { +describe('Minimum gas tests', () => { it('sets gas requirements (contract)', async () => { using launched = await launchTestNode({ walletsConfig: { diff --git a/packages/fuel-gauge/src/raw-slice.test.ts b/packages/fuel-gauge/src/raw-slice.test.ts index 54866c3fc32..c284bfca39b 100644 --- a/packages/fuel-gauge/src/raw-slice.test.ts +++ b/packages/fuel-gauge/src/raw-slice.test.ts @@ -2,11 +2,12 @@ import { bn, Predicate, Wallet, Address } from 'fuels'; import type { BN } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; +import { ScriptRawSliceAbi__factory } from '../test/typegen'; import { RawSliceAbi__factory } from '../test/typegen/contracts'; import RawSliceAbiHex from '../test/typegen/contracts/RawSliceAbi.hex'; import { PredicateRawSliceAbi__factory } from '../test/typegen/predicates'; -import { getScript, launchTestContract } from './utils'; +import { launchTestContract } from './utils'; type SomeEnum = { First?: boolean; @@ -136,8 +137,7 @@ describe('Raw Slice Tests', () => { wallets: [wallet], } = launched; - type MainArgs = [number, Wrapper]; - const scriptInstance = getScript('script-raw-slice', wallet); + const scriptInstance = ScriptRawSliceAbi__factory.createInstance(wallet); const bytes = [40, 41, 42]; const INPUT: Wrapper = { diff --git a/packages/fuel-gauge/src/script-main-args.test.ts b/packages/fuel-gauge/src/script-main-args.test.ts index def26e1bdb8..962b83d235c 100644 --- a/packages/fuel-gauge/src/script-main-args.test.ts +++ b/packages/fuel-gauge/src/script-main-args.test.ts @@ -2,9 +2,11 @@ import type { BigNumberish } from 'fuels'; import { bn, Script } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; -import { ScriptMainArgsAbi__factory } from '../test/typegen'; - -import { getScript } from './utils'; +import { + ScriptMainArgsAbi__factory, + ScriptMainReturnStructAbi__factory, + ScriptMainTwoArgsAbi__factory, +} from '../test/typegen'; type Baz = { x: number; @@ -44,7 +46,7 @@ describe('Script Coverage', () => { wallets: [wallet], } = launched; - const scriptInstance = getScript<[BigNumberish, Baz], Baz>('script-main-two-args', wallet); + const scriptInstance = ScriptMainTwoArgsAbi__factory.createInstance(wallet); const foo = 33; const bar: Baz = { x: 12, @@ -63,7 +65,7 @@ describe('Script Coverage', () => { wallets: [wallet], } = launched; - const scriptInstance = getScript<[BigNumberish, Baz], Baz>('script-main-return-struct', wallet); + const scriptInstance = ScriptMainReturnStructAbi__factory.createInstance(wallet); const foo = 1; const bar: Baz = { x: 2, diff --git a/packages/fuel-gauge/src/script-with-vectors.test.ts b/packages/fuel-gauge/src/script-with-vectors.test.ts index 4468e9cf7e8..d5e1659bffd 100644 --- a/packages/fuel-gauge/src/script-with-vectors.test.ts +++ b/packages/fuel-gauge/src/script-with-vectors.test.ts @@ -1,7 +1,11 @@ -import type { BigNumberish } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; -import { getScript } from './utils'; +import { + ScriptWithArrayAbi__factory, + ScriptWithVectorAbi__factory, + ScriptWithVectorAdvancedAbi__factory, + ScriptWithVectorMixedAbi__factory, +} from '../test/typegen'; /** * @group node @@ -20,7 +24,7 @@ describe('Script With Vectors', () => { } = launched; const someArray = [1, 100]; - const scriptInstance = getScript<[BigNumberish[]], void>('script-with-array', wallet); + const scriptInstance = ScriptWithArrayAbi__factory.createInstance(wallet); const { waitForResult } = await scriptInstance.functions.main(someArray).call(); const { logs } = await waitForResult(); @@ -40,7 +44,7 @@ describe('Script With Vectors', () => { } = launched; const someVec = [7, 2, 1, 5]; - const scriptInstance = getScript<[BigNumberish[]], void>('script-with-vector', wallet); + const scriptInstance = ScriptWithVectorAbi__factory.createInstance(wallet); const scriptInvocationScope = scriptInstance.functions.main(someVec); @@ -103,8 +107,7 @@ describe('Script With Vectors', () => { }, ]; - // eslint-disable-next-line @typescript-eslint/no-explicit-any - const scriptInstance = getScript<[any], void>('script-with-vector-mixed', wallet); + const scriptInstance = ScriptWithVectorMixedAbi__factory.createInstance(wallet); const { waitForResult } = await scriptInstance.functions.main(importantDates).call(); const { value } = await waitForResult(); @@ -179,8 +182,7 @@ describe('Script With Vectors', () => { }, ]; - // eslint-disable-next-line @typescript-eslint/no-explicit-any - const scriptInstance = getScript<[any[]], void>('script-with-vector-advanced', wallet); + const scriptInstance = ScriptWithVectorAdvancedAbi__factory.createInstance(wallet); const { waitForResult } = await scriptInstance.functions.main(vectorOfStructs).call(); const { value } = await waitForResult(); diff --git a/packages/fuel-gauge/src/std-lib-string.test.ts b/packages/fuel-gauge/src/std-lib-string.test.ts index 1e5add238d9..e3e54c27682 100644 --- a/packages/fuel-gauge/src/std-lib-string.test.ts +++ b/packages/fuel-gauge/src/std-lib-string.test.ts @@ -1,10 +1,14 @@ import { bn, Predicate, Wallet, Address } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; -import { PredicateStdLibStringAbi__factory, StdLibStringAbi__factory } from '../test/typegen'; +import { + PredicateStdLibStringAbi__factory, + ScriptStdLibStringAbi__factory, + StdLibStringAbi__factory, +} from '../test/typegen'; import StdLibStringAbiHex from '../test/typegen/contracts/StdLibStringAbi.hex'; -import { getScript, launchTestContract } from './utils'; +import { launchTestContract } from './utils'; /** * @group node @@ -105,9 +109,8 @@ describe('std-lib-string Tests', () => { wallets: [wallet], } = launched; - type MainArgs = [string]; - const scriptInstance = getScript('script-std-lib-string', wallet); const INPUT = 'Hello World'; + const scriptInstance = ScriptStdLibStringAbi__factory.createInstance(wallet); const { waitForResult } = await scriptInstance.functions.main(INPUT).call(); const { value } = await waitForResult(); diff --git a/packages/fuel-gauge/src/utils.ts b/packages/fuel-gauge/src/utils.ts index 995522a5ec8..1a2a6cfc3a3 100644 --- a/packages/fuel-gauge/src/utils.ts +++ b/packages/fuel-gauge/src/utils.ts @@ -1,37 +1,5 @@ -import { readFileSync } from 'fs'; -import { Script } from 'fuels'; -import type { Interface, WalletUnlocked, JsonAbi, BytesLike } from 'fuels'; import type { DeployContractConfig } from 'fuels/test-utils'; import { launchTestNode } from 'fuels/test-utils'; -import { join } from 'path'; - -export type SetupConfig = { - contractBytecode: BytesLike; - abi: JsonAbi | Interface; - cache?: boolean; -}; - -const getFullPath = (contractName: string, next: (fullPath: string) => T) => - next( - join(__dirname, `../test/fixtures/forc-projects/${contractName}/out/release/${contractName}`) - ); - -export const getScript = ( - scriptName: string, - wallet: WalletUnlocked -): Script => - getFullPath( - scriptName, - (fullPath: string) => - new Script( - readFileSync(`${fullPath}.bin`), - JSON.parse(readFileSync(`${fullPath}-abi.json`, 'utf8')), - wallet - ) - ); - -export const getProgramDir = (name: string) => - join(__dirname, `../test/fixtures/forc-projects/${name}`); export async function launchTestContract(config: T) { const { diff --git a/packages/fuel-gauge/src/vector-types.test.ts b/packages/fuel-gauge/src/vector-types.test.ts index 47d9de38a5a..69aea48368b 100644 --- a/packages/fuel-gauge/src/vector-types.test.ts +++ b/packages/fuel-gauge/src/vector-types.test.ts @@ -1,12 +1,12 @@ -import type { BigNumberish } from 'fuels'; import { bn, Predicate, Wallet, Address } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; +import { VectorTypesScriptAbi__factory } from '../test/typegen'; import { VectorTypesContractAbi__factory } from '../test/typegen/contracts'; import VectorTypesContractAbiHex from '../test/typegen/contracts/VectorTypesContractAbi.hex'; import { PredicateVectorTypesAbi__factory } from '../test/typegen/predicates'; -import { getScript, launchTestContract } from './utils'; +import { launchTestContract } from './utils'; const U32_VEC = [0, 1, 2]; const VEC_IN_VEC = [ @@ -114,7 +114,8 @@ describe('Vector Types Validation', () => { const { wallets: [wallet], } = launched; - const scriptInstance = getScript('vector-types-script', wallet); + + const scriptInstance = VectorTypesScriptAbi__factory.createInstance(wallet); const { waitForResult } = await scriptInstance.functions .main( From e7b028710b853b4f63038ddbe5edde62de50db75 Mon Sep 17 00:00:00 2001 From: chad Date: Fri, 12 Jul 2024 12:52:03 -0500 Subject: [PATCH 41/53] test: removed maturity from policy tests due to inconsistency --- packages/fuel-gauge/src/policies.test.ts | 81 +++++------------------- 1 file changed, 16 insertions(+), 65 deletions(-) diff --git a/packages/fuel-gauge/src/policies.test.ts b/packages/fuel-gauge/src/policies.test.ts index c08c48388f5..53eac7daf37 100644 --- a/packages/fuel-gauge/src/policies.test.ts +++ b/packages/fuel-gauge/src/policies.test.ts @@ -17,7 +17,7 @@ import PayableAnnotationAbiHex from '../test/typegen/contracts/PayableAnnotation * @group node * @group browser */ -describe.skip('Policies', () => { +describe('Policies', () => { type CustomTxParams = { gasLimit?: BigNumberish; maturity?: number; @@ -31,11 +31,6 @@ describe.skip('Policies', () => { return randomValue; }; - const randomMaturity = async (provider: Provider) => { - const { latestBlock } = await provider.fetchChain(); - return randomNumber(1, latestBlock.height.toNumber()); - }; - const validatePolicies = ({ transaction, params, @@ -47,10 +42,8 @@ describe.skip('Policies', () => { expect(bn(transaction.policies?.[0].data).eq(bn(params.tip))).toBeTruthy(); expect(transaction.policies?.[1].type).toBe(PolicyType.WitnessLimit); expect(bn(transaction.policies?.[1].data).eq(bn(params.witnessLimit))).toBeTruthy(); - expect(transaction.policies?.[2].type).toBe(PolicyType.Maturity); - expect(transaction.policies?.[2]?.data).toBe(params.maturity); - expect(transaction.policies?.[3].type).toBe(PolicyType.MaxFee); - expect(bn(transaction.policies?.[3]?.data).lte(bn(params.maxFee))).toBeTruthy(); + expect(transaction.policies?.[2].type).toBe(PolicyType.MaxFee); + expect(bn(transaction.policies?.[2]?.data).lte(bn(params.maxFee))).toBeTruthy(); }; it('should ensure optional TX policies are not set when not informed', () => { @@ -116,11 +109,7 @@ describe.skip('Policies', () => { }); it('should ensure TX policies are properly set (ScriptTransactionRequest)', async () => { - using launched = await launchTestNode({ - nodeOptions: { - args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'], - }, - }); + using launched = await launchTestNode(); const { provider, @@ -131,7 +120,6 @@ describe.skip('Policies', () => { const txParams: CustomTxParams = { tip: 10, - maturity: await randomMaturity(provider), witnessLimit: randomNumber(800, 900), maxFee: 1000, }; @@ -151,8 +139,8 @@ describe.skip('Policies', () => { const { transaction } = await tx.waitForResult(); - expect(transaction.policyTypes).toBe(15); - expect(transaction.policies?.length).toBe(4); + expect(transaction.policyTypes).toBe(11); + expect(transaction.policies?.length).toBe(3); validatePolicies({ transaction, @@ -161,11 +149,7 @@ describe.skip('Policies', () => { }); it('should ensure TX policies are properly set (CreateTransactionRequest)', async () => { - using launched = await launchTestNode({ - nodeOptions: { - args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'], - }, - }); + using launched = await launchTestNode(); const { provider, @@ -181,7 +165,6 @@ describe.skip('Policies', () => { const txParams: CustomTxParams = { tip: 11, witnessLimit: 2000, - maturity: await randomMaturity(provider), maxFee: 70_000, }; @@ -214,13 +197,12 @@ describe.skip('Policies', () => { }); const { - provider, contracts: [contract], } = launched; const callScope = contract.functions.payable().txParams({ tip: 5, - maturity: await randomMaturity(provider), + witnessLimit: randomNumber(800, 900), maxFee: 70_000, }); @@ -240,11 +222,7 @@ describe.skip('Policies', () => { }); it('should ensure TX policies are properly set (ScriptInvocationScope)', async () => { - using launched = await launchTestNode({ - nodeOptions: { - args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'], - }, - }); + using launched = await launchTestNode(); const { provider, @@ -259,7 +237,7 @@ describe.skip('Policies', () => { const callScope = scriptInstance.functions.main(33).txParams({ tip: 2, - maturity: await randomMaturity(provider), + witnessLimit: randomNumber(800, 900), maxFee: 70_000, }); @@ -279,11 +257,7 @@ describe.skip('Policies', () => { }); it('should ensure TX policies are properly set (Account Transfer)', async () => { - using launched = await launchTestNode({ - nodeOptions: { - args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'], - }, - }); + using launched = await launchTestNode(); const { provider, @@ -294,7 +268,7 @@ describe.skip('Policies', () => { const txParams: CustomTxParams = { tip: 4, - maturity: await randomMaturity(provider), + witnessLimit: randomNumber(800, 900), maxFee: 70_000, }; @@ -322,9 +296,6 @@ describe.skip('Policies', () => { bytecode: PayableAnnotationAbiHex, }, ], - nodeOptions: { - args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'], - }, }); const { @@ -335,7 +306,7 @@ describe.skip('Policies', () => { const txParams: CustomTxParams = { tip: 1, - maturity: await randomMaturity(provider), + witnessLimit: randomNumber(800, 900), maxFee: 70_000, }; @@ -356,11 +327,7 @@ describe.skip('Policies', () => { }); it('should ensure TX witnessLimit policy limits tx execution as expected', async () => { - using launched = await launchTestNode({ - nodeOptions: { - args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'], - }, - }); + using launched = await launchTestNode(); const { provider, @@ -370,7 +337,6 @@ describe.skip('Policies', () => { const receiver = Wallet.generate({ provider }); const txParams: CustomTxParams = { - maturity: await randomMaturity(provider), witnessLimit: 0, }; @@ -388,11 +354,7 @@ describe.skip('Policies', () => { describe('should ensure TX maxFee policy limits TX execution as expected', () => { it('on account transfer', async () => { - using launched = await launchTestNode({ - nodeOptions: { - args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'], - }, - }); + using launched = await launchTestNode(); const { provider, @@ -404,7 +366,6 @@ describe.skip('Policies', () => { const maxFee = 1; const txParams: CustomTxParams = { - maturity: await randomMaturity(provider), witnessLimit: 800, maxFee, }; @@ -439,7 +400,6 @@ describe.skip('Policies', () => { const maxFee = 1; const txParams: CustomTxParams = { - maturity: await randomMaturity(provider), witnessLimit: 800, maxFee, }; @@ -467,7 +427,6 @@ describe.skip('Policies', () => { const receiver = Wallet.generate({ provider }); const txParams: CustomTxParams = { - maturity: await randomMaturity(provider), witnessLimit: 800, maxFee, }; @@ -479,14 +438,9 @@ describe.skip('Policies', () => { }); it('on ContractFactory when deploying contracts', async () => { - using launched = await launchTestNode({ - nodeOptions: { - args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'], - }, - }); + using launched = await launchTestNode(); const { - provider, wallets: [wallet], } = launched; @@ -499,7 +453,6 @@ describe.skip('Policies', () => { ); const txParams: CustomTxParams = { - maturity: await randomMaturity(provider), witnessLimit: 800, maxFee, }; @@ -522,12 +475,10 @@ describe.skip('Policies', () => { }); const { - provider, contracts: [contract], } = launched; const txParams: CustomTxParams = { - maturity: await randomMaturity(provider), witnessLimit: 800, maxFee, }; From 74a884705b298fc44cb4e80fcd948afc408ebc83 Mon Sep 17 00:00:00 2001 From: chad Date: Fri, 12 Jul 2024 13:03:56 -0500 Subject: [PATCH 42/53] lint: linting fixes --- packages/fuel-gauge/src/policies.test.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/fuel-gauge/src/policies.test.ts b/packages/fuel-gauge/src/policies.test.ts index 53eac7daf37..3ccc1853f82 100644 --- a/packages/fuel-gauge/src/policies.test.ts +++ b/packages/fuel-gauge/src/policies.test.ts @@ -1,4 +1,4 @@ -import type { BaseTransactionRequest, BigNumberish, Transaction, Provider } from 'fuels'; +import type { BaseTransactionRequest, BigNumberish, Transaction } from 'fuels'; import { ContractFactory, CreateTransactionRequest, @@ -225,7 +225,6 @@ describe('Policies', () => { using launched = await launchTestNode(); const { - provider, wallets: [wallet], } = launched; From 5e925dd75473a8dc2f0e979a1e3f0e339f344085 Mon Sep 17 00:00:00 2001 From: chad Date: Fri, 12 Jul 2024 13:37:50 -0500 Subject: [PATCH 43/53] test: update configs for await-execution test --- packages/fuel-gauge/src/await-execution.test.ts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/fuel-gauge/src/await-execution.test.ts b/packages/fuel-gauge/src/await-execution.test.ts index 5d14f7388df..e25a9465c2a 100644 --- a/packages/fuel-gauge/src/await-execution.test.ts +++ b/packages/fuel-gauge/src/await-execution.test.ts @@ -7,14 +7,16 @@ import { launchTestNode } from 'fuels/test-utils'; */ describe('await-execution', () => { test('awaiting execution of a transaction on the provider works', async () => { - using launched = await launchTestNode(); - - const { provider } = launched; + using launched = await launchTestNode({ + nodeOptions: { + args: ['--poa-instant', 'false', '--poa-interval-period', '400ms'], + }, + }); - const genesisWallet = new WalletUnlocked( - process.env.GENESIS_SECRET || randomBytes(32), - provider - ); + const { + provider, + wallets: [genesisWallet], + } = launched; const destination = Wallet.generate({ provider }); From 1f1b7ff84feedee70753ec4e1bc7f3203abb937e Mon Sep 17 00:00:00 2001 From: chad Date: Fri, 12 Jul 2024 14:11:03 -0500 Subject: [PATCH 44/53] docs: update changeset --- .changeset/pretty-hornets-walk.md | 1 - 1 file changed, 1 deletion(-) diff --git a/.changeset/pretty-hornets-walk.md b/.changeset/pretty-hornets-walk.md index 7312e41d5ce..39b96930860 100644 --- a/.changeset/pretty-hornets-walk.md +++ b/.changeset/pretty-hornets-walk.md @@ -1,5 +1,4 @@ --- -"create-fuels": patch "@fuel-ts/contract": patch --- From 4e27d7723b1cb7f07119495aa5eea5481d9a5783 Mon Sep 17 00:00:00 2001 From: chad Date: Mon, 15 Jul 2024 15:12:17 -0500 Subject: [PATCH 45/53] refactor: optimizations based on PR feedback --- apps/demo-typegen/src/demo.test.ts | 4 +- .../fuel-gauge/src/await-execution.test.ts | 19 +- packages/fuel-gauge/src/contract.test.ts | 166 +++--------------- packages/fuel-gauge/src/doc-examples.test.ts | 4 +- packages/fuel-gauge/src/min-gas.test.ts | 2 +- .../src/predicate/predicate-arguments.test.ts | 4 +- .../predicate-populate-witness.test.ts | 18 +- .../predicate/predicate-with-script.test.ts | 2 +- .../src/transaction-response.test.ts | 86 ++++----- 9 files changed, 93 insertions(+), 212 deletions(-) diff --git a/apps/demo-typegen/src/demo.test.ts b/apps/demo-typegen/src/demo.test.ts index fb7c920de4d..b4f96e65d7c 100644 --- a/apps/demo-typegen/src/demo.test.ts +++ b/apps/demo-typegen/src/demo.test.ts @@ -177,7 +177,7 @@ test('Example predicate', async () => { // In this exchange, we are first transferring some coins to the predicate using launched = await launchTestNode({ walletsConfig: { - amountPerCoin: 10_000_000_000, + amountPerCoin: 500_000, }, }); @@ -191,7 +191,7 @@ test('Example predicate', async () => { const predicateData: PredicateAbiInputs = []; const predicate = PredicateAbi__factory.createInstance(provider, predicateData); - const tx = await wallet.transfer(predicate.address, 1_000_000, provider.getBaseAssetId()); + const tx = await wallet.transfer(predicate.address, 200_000, provider.getBaseAssetId()); const { isStatusSuccess } = await tx.wait(); // Then we are transferring some coins from the predicate to a random address (receiver) diff --git a/packages/fuel-gauge/src/await-execution.test.ts b/packages/fuel-gauge/src/await-execution.test.ts index e25a9465c2a..e71576f8d5b 100644 --- a/packages/fuel-gauge/src/await-execution.test.ts +++ b/packages/fuel-gauge/src/await-execution.test.ts @@ -1,4 +1,4 @@ -import { WalletUnlocked, randomBytes, Wallet } from 'fuels'; +import { Wallet } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; /** @@ -40,14 +40,17 @@ describe('await-execution', () => { }); test.skip('transferring funds with awaitExecution works', async () => { - using launched = await launchTestNode(); + using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 1_000_000, + }, + }); const { provider } = launched; - const genesisWallet = new WalletUnlocked( - process.env.GENESIS_SECRET || randomBytes(32), - provider - ); + const { + wallets: [genesisWallet], + } = launched; const sendTransactionSpy = vi.spyOn(provider, 'sendTransaction'); @@ -65,7 +68,7 @@ describe('await-execution', () => { test('withdrawToBaseLayer works with awaitExecution', async () => { using launched = await launchTestNode({ walletsConfig: { - amountPerCoin: 10_000_000_000, + amountPerCoin: 1_000_000, }, }); @@ -79,7 +82,7 @@ describe('await-execution', () => { const destination = Wallet.generate({ provider }); await genesisWallet.withdrawToBaseLayer(destination.address, 100, { - gasLimit: 100_000, + gasLimit: 44442, }); expect(sendTransactionSpy).toHaveBeenCalledTimes(1); diff --git a/packages/fuel-gauge/src/contract.test.ts b/packages/fuel-gauge/src/contract.test.ts index 5b544534f82..1b2a2850737 100644 --- a/packages/fuel-gauge/src/contract.test.ts +++ b/packages/fuel-gauge/src/contract.test.ts @@ -6,24 +6,16 @@ import { multiply, toHex, toNumber, - Provider, Contract, transactionRequestify, Wallet, ContractFactory, - FUEL_NETWORK_URL, Predicate, PolicyType, ZeroBytes32, buildFunctionResult, } from 'fuels'; -import type { - TransactionRequestLike, - TransactionResponse, - JsonAbi, - ScriptTransactionRequest, - TransferParams, -} from 'fuels'; +import type { JsonAbi, ScriptTransactionRequest, TransferParams } from 'fuels'; import { expectToThrowFuelError, ASSET_A, ASSET_B, launchTestNode } from 'fuels/test-utils'; import { @@ -36,6 +28,17 @@ import { PredicateTrueAbi__factory } from '../test/typegen/predicates/factories/ import { launchTestContract } from './utils'; +const contractsConfigs = [ + { + deployer: CallTestContractAbi__factory, + bytecode: CallTestContractAbiHex, + }, + { + deployer: CallTestContractAbi__factory, + bytecode: CallTestContractAbiHex, + }, +]; + const jsonFragment: JsonAbi = { configurables: [], loggedTypes: [], @@ -261,16 +264,7 @@ describe('Contract', () => { it('adds multiple contracts on invocation', async () => { using launched = await launchTestNode({ - contractsConfigs: [ - { - deployer: CallTestContractAbi__factory, - bytecode: CallTestContractAbiHex, - }, - { - deployer: CallTestContractAbi__factory, - bytecode: CallTestContractAbiHex, - }, - ], + contractsConfigs, }); const { @@ -286,16 +280,7 @@ describe('Contract', () => { it('adds multiple contracts on multicalls', async () => { using launched = await launchTestNode({ - contractsConfigs: [ - { - deployer: CallTestContractAbi__factory, - bytecode: CallTestContractAbiHex, - }, - { - deployer: CallTestContractAbi__factory, - bytecode: CallTestContractAbiHex, - }, - ], + contractsConfigs, }); const { @@ -410,16 +395,7 @@ describe('Contract', () => { it('adds multiple contracts on multicalls', async () => { using launched = await launchTestNode({ - contractsConfigs: [ - { - deployer: CallTestContractAbi__factory, - bytecode: CallTestContractAbiHex, - }, - { - deployer: CallTestContractAbi__factory, - bytecode: CallTestContractAbiHex, - }, - ], + contractsConfigs, }); const { @@ -806,83 +782,6 @@ describe('Contract', () => { expect(result.status).toBe('success'); }); - // #TODO: Discuss whether this test is still relevant - it.skip('Provide a custom provider and public wallet to the contract instance', async () => { - using contract = await setupTestContract(); - - const { provider } = contract; - - const externalWallet = Wallet.generate({ - provider, - }); - - // Create a custom provider to emulate a external signer - // like Wallet Extension or a Hardware wallet - let signedTransaction; - class ProviderCustom extends Provider { - // eslint-disable-next-line @typescript-eslint/require-await - static async create(url: string) { - const newProvider = new ProviderCustom(url); - return newProvider; - } - - async sendTransaction( - transactionRequestLike: TransactionRequestLike - ): Promise { - const transactionRequest = transactionRequestify(transactionRequestLike); - // Simulate a external request of signature - signedTransaction = await externalWallet.signTransaction(transactionRequest); - transactionRequest.updateWitnessByOwner(externalWallet.address, signedTransaction); - return super.sendTransaction(transactionRequestLike); - } - } - - // Set custom provider to contract instance - const customProvider = await ProviderCustom.create(FUEL_NETWORK_URL); - contract.account = Wallet.fromAddress(externalWallet.address, customProvider); - contract.provider = customProvider; - - const num = 1337; - const struct = { a: true, b: 1337 }; - const invocationScopes = [contract.functions.foo(num), contract.functions.boo(struct)]; - const multiCallScope = contract.multiCall(invocationScopes).txParams({ gasLimit: 20_000 }); - - const transactionRequest = await multiCallScope.getTransactionRequest(); - - const txRequest = JSON.stringify(transactionRequest); - const txRequestParsed = JSON.parse(txRequest); - - const transactionRequestParsed = transactionRequestify( - txRequestParsed - ) as ScriptTransactionRequest; - - const txCost = await contract.provider.getTransactionCost(transactionRequestParsed); - - transactionRequestParsed.gasLimit = txCost.gasUsed; - transactionRequestParsed.maxFee = txCost.maxFee; - - await contract.account.fund(transactionRequestParsed, txCost); - - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const response = await contract.account!.sendTransaction(transactionRequestParsed); - const { - value: [resultA, resultB], - transactionResult, - // eslint-disable-next-line @typescript-eslint/no-explicit-any - } = await buildFunctionResult({ - funcScope: invocationScopes, - transactionResponse: response, - isMultiCall: true, - program: contract, - }); - - expect(transactionResult.transaction.witnesses.length).toEqual(1); - expect(transactionResult.transaction.witnesses[0].data).toEqual(signedTransaction); - expect(resultA.toHex()).toEqual(bn(num).add(1).toHex()); - expect(resultB.a).toEqual(!struct.a); - expect(resultB.b.toHex()).toEqual(bn(struct.b).add(1).toHex()); - }); - it('should ensure multicall allows multiple heap types', async () => { using contract = await setupTestContract(); @@ -915,12 +814,7 @@ describe('Contract', () => { */ it('should transfer asset to a deployed contract just fine (NATIVE ASSET)', async () => { using launched = await launchTestNode({ - contractsConfigs: [ - { - deployer: CallTestContractAbi__factory, - bytecode: CallTestContractAbiHex, - }, - ], + contractsConfigs, walletsConfig: { amountPerCoin: 1_000_000, }, @@ -951,12 +845,7 @@ describe('Contract', () => { it('should set "gasLimit" and "maxFee" when transferring amounts to contract just fine', async () => { using launched = await launchTestNode({ - contractsConfigs: [ - { - deployer: CallTestContractAbi__factory, - bytecode: CallTestContractAbiHex, - }, - ], + contractsConfigs, walletsConfig: { amountPerCoin: 1_000_000, }, @@ -993,12 +882,7 @@ describe('Contract', () => { it('should ensure gas price and gas limit are validated when transfering to contract', async () => { using launched = await launchTestNode({ - contractsConfigs: [ - { - deployer: CallTestContractAbi__factory, - bytecode: CallTestContractAbiHex, - }, - ], + contractsConfigs, walletsConfig: { amountPerCoin: 1_000_000, }, @@ -1027,12 +911,7 @@ describe('Contract', () => { const asset = '0x0101010101010101010101010101010101010101010101010101010101010101'; using launched = await launchTestNode({ - contractsConfigs: [ - { - deployer: CallTestContractAbi__factory, - bytecode: CallTestContractAbiHex, - }, - ], + contractsConfigs, walletsConfig: { amountPerCoin: 1_000_000, }, @@ -1057,12 +936,7 @@ describe('Contract', () => { it('should tranfer asset to a deployed contract just fine (FROM PREDICATE)', async () => { using launched = await launchTestNode({ - contractsConfigs: [ - { - deployer: CallTestContractAbi__factory, - bytecode: CallTestContractAbiHex, - }, - ], + contractsConfigs, walletsConfig: { amountPerCoin: 1_000_000, }, diff --git a/packages/fuel-gauge/src/doc-examples.test.ts b/packages/fuel-gauge/src/doc-examples.test.ts index dba9d41f086..8472ccd66d8 100644 --- a/packages/fuel-gauge/src/doc-examples.test.ts +++ b/packages/fuel-gauge/src/doc-examples.test.ts @@ -190,7 +190,7 @@ describe('Doc Examples', () => { it('can create wallets', async () => { using launched = await launchTestNode({ walletsConfig: { - amountPerCoin: 100_000_000_000_000, + amountPerCoin: 100_000_000, assets: [AssetId.A, AssetId.B], }, }); @@ -262,7 +262,7 @@ describe('Doc Examples', () => { it('can create a predicate and use', async () => { using launched = await launchTestNode({ walletsConfig: { - amountPerCoin: 1_000_000_000_000_000, + amountPerCoin: 100_000_000, }, }); const { diff --git a/packages/fuel-gauge/src/min-gas.test.ts b/packages/fuel-gauge/src/min-gas.test.ts index 8889fffeece..d648605190f 100644 --- a/packages/fuel-gauge/src/min-gas.test.ts +++ b/packages/fuel-gauge/src/min-gas.test.ts @@ -173,7 +173,7 @@ describe('Minimum gas tests', () => { it('sets gas requirements (account and predicate with script)', async () => { using launched = await launchTestNode({ walletsConfig: { - amountPerCoin: 1_000_000_000_000, + amountPerCoin: 100_000_000, }, }); diff --git a/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts b/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts index 1f828147469..dc3a5a5517a 100644 --- a/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts @@ -133,7 +133,7 @@ describe('Predicate', () => { it('calls a predicate with invalid u32 data and returns false', async () => { using launched = await launchTestNode({ walletsConfig: { - amountPerCoin: 1_000_000_000_000, + amountPerCoin: 100_000_000, }, }); @@ -150,7 +150,7 @@ describe('Predicate', () => { }); // fund predicate - await fundPredicate(fundingWallet, predicate, 900_000_000); + await fundPredicate(fundingWallet, predicate, 90_000_00); const receiver = Wallet.generate({ provider }); const initialReceiverBalance = await receiver.getBalance(); diff --git a/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts b/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts index 1b96eb8c52f..685ebafb73a 100644 --- a/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts @@ -36,7 +36,7 @@ describe('Predicate', () => { it('should properly populate predicate data and remove placeholder witness [CASE 1]', async () => { using launched = await launchTestNode({ walletsConfig: { - amountPerCoin: 1_000_000_000_000, + amountPerCoin: 100_000_000, }, }); const { @@ -53,7 +53,7 @@ describe('Predicate', () => { inputData: [11], }); - await fundPredicate(wallet, predicateAssertNumber, 500_000_000); + await fundPredicate(wallet, predicateAssertNumber, 500_000); let transactionRequest = new ScriptTransactionRequest(); const receiver = Wallet.generate({ provider }); @@ -90,7 +90,7 @@ describe('Predicate', () => { it('should properly populate predicate data and remove placeholder witness [CASE 2]', async () => { using launched = await launchTestNode({ walletsConfig: { - amountPerCoin: 1_000_000_000_000, + amountPerCoin: 100_000_000, }, }); const { @@ -112,7 +112,7 @@ describe('Predicate', () => { inputData: [11], }); - await fundPredicate(fundingWallet, predicateAssertNumber, 500_000_000); + await fundPredicate(fundingWallet, predicateAssertNumber, 500_000); const resources1 = await wallet1.getResourcesToSpend(quantity); const predicateAssertNumberWrongResources = await provider.getResourcesToSpend( @@ -150,7 +150,7 @@ describe('Predicate', () => { it('should properly populate predicate data and remove placeholder witness [CASE 3]', async () => { using launched = await launchTestNode({ walletsConfig: { - amountPerCoin: 1_000_000_000_000, + amountPerCoin: 100_000_000, count: 3, }, }); @@ -168,7 +168,7 @@ describe('Predicate', () => { inputData: [11], }); - await fundPredicate(fundingWallet, predicateAssertNumber, 500_000_000, UTXOS_AMOUNT); + await fundPredicate(fundingWallet, predicateAssertNumber, 500_000, UTXOS_AMOUNT); const receiver = Wallet.generate({ provider }); @@ -223,7 +223,7 @@ describe('Predicate', () => { it('should properly populate predicate data and remove placeholder witness [CASE 4]', async () => { using launched = await launchTestNode({ walletsConfig: { - amountPerCoin: 1_000_000_000_000, + amountPerCoin: 100_000_000, count: 4, }, }); @@ -319,7 +319,7 @@ describe('Predicate', () => { it('should properly populate predicate data and remove placeholder witness [CASE 5]', async () => { using launched = await launchTestNode({ walletsConfig: { - amountPerCoin: 1_000_000_000_000, + amountPerCoin: 100_000_000, count: 3, }, }); @@ -402,7 +402,7 @@ describe('Predicate', () => { it('should properly populate predicate data and remove placeholder witness [CASE 6]', async () => { using launched = await launchTestNode({ walletsConfig: { - amountPerCoin: 1_000_000_000_000, + amountPerCoin: 100_000_000, count: 4, }, }); diff --git a/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts b/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts index 17110a39bda..666359f7250 100644 --- a/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts @@ -19,7 +19,7 @@ describe('Predicate', () => { it('calls a predicate and uses proceeds for a script call', async () => { using launched = await launchTestNode({ walletsConfig: { - amountPerCoin: 1_000_000_000_000, + amountPerCoin: 100_000_000, }, }); const { diff --git a/packages/fuel-gauge/src/transaction-response.test.ts b/packages/fuel-gauge/src/transaction-response.test.ts index db0eb834f51..1aae4c0b307 100644 --- a/packages/fuel-gauge/src/transaction-response.test.ts +++ b/packages/fuel-gauge/src/transaction-response.test.ts @@ -156,54 +156,59 @@ describe('TransactionResponse', () => { expect(response.gqlTransaction?.id).toBe(transactionId); }); - it.skip('should ensure waitForResult always waits for the transaction to be processed', async () => { - using launched = await launchTestNode({ - /** - * This is set to so long in order to test keep-alive message handling as well. - * Keep-alive messages are sent every 15s. - * It is very important to test this because the keep-alive messages are not sent in the same format as the other messages - * and it is reasonable to expect subscriptions lasting more than 15 seconds. - * We need a proper integration test for this - * because if the keep-alive message changed in any way between fuel-core versions and we missed it, - * all our subscriptions would break. - * We need at least one long test to ensure that the keep-alive messages are handled correctly. - * */ - nodeOptions: { - args: ['--poa-instant', 'false', '--poa-interval-period', '17sec'], - }, - }); + it.skip( + 'should ensure waitForResult always waits for the transaction to be processed', + { timeout: 18_500 }, + async () => { + using launched = await launchTestNode({ + /** + * This is set to so long in order to test keep-alive message handling as well. + * Keep-alive messages are sent every 15s. + * It is very important to test this because the keep-alive messages are not sent in the same format as the other messages + * and it is reasonable to expect subscriptions lasting more than 15 seconds. + * We need a proper integration test for this + * because if the keep-alive message changed in any way between fuel-core versions and we missed it, + * all our subscriptions would break. + * We need at least one long test to ensure that the keep-alive messages are handled correctly. + * */ + nodeOptions: { + args: ['--poa-instant', 'false', '--poa-interval-period', '17sec'], + }, + }); - const { - provider, - wallets: [genesisWallet, destination], - } = launched; + const { + provider, + wallets: [genesisWallet, destination], + } = launched; - const { id: transactionId } = await genesisWallet.transfer( - destination.address, - 100, - provider.getBaseAssetId(), - { gasLimit: 10_000 } - ); - const response = await TransactionResponse.create(transactionId, provider); + const { id: transactionId } = await genesisWallet.transfer( + destination.address, + 100, + provider.getBaseAssetId(), + { gasLimit: 10_000 } + ); + const response = await TransactionResponse.create(transactionId, provider); - expect(response.gqlTransaction?.status?.type).toBe('SubmittedStatus'); + expect(response.gqlTransaction?.status?.type).toBe('SubmittedStatus'); - const subscriptionStreamHolder = { - stream: new ReadableStream(), - }; + const subscriptionStreamHolder = { + stream: new ReadableStream(), + }; - getSubscriptionStreamFromFetch(subscriptionStreamHolder); + getSubscriptionStreamFromFetch(subscriptionStreamHolder); - await response.waitForResult(); + await response.waitForResult(); - expect(response.gqlTransaction?.status?.type).toEqual('SuccessStatus'); - expect(response.gqlTransaction?.id).toBe(transactionId); + expect(response.gqlTransaction?.status?.type).toEqual('SuccessStatus'); + expect(response.gqlTransaction?.id).toBe(transactionId); - await verifyKeepAliveMessageWasSent(subscriptionStreamHolder.stream); - }); + await verifyKeepAliveMessageWasSent(subscriptionStreamHolder.stream); + } + ); it( 'should throw error for a SqueezedOut status update [waitForResult]', + { timeout: 10_000 }, async () => { /** * a larger --tx-pool-ttl 1s is necessary to ensure that the transaction doesn't get squeezed out @@ -248,12 +253,12 @@ describe('TransactionResponse', () => { }, { code: ErrorCode.TRANSACTION_SQUEEZED_OUT } ); - }, - { timeout: 10_000 } + } ); it( 'should throw error for a SqueezedOut status update [submitAndAwait]', + { retry: 10 }, async () => { using launched = await launchTestNode({ walletsConfig: { @@ -294,7 +299,6 @@ describe('TransactionResponse', () => { }, { code: ErrorCode.TRANSACTION_SQUEEZED_OUT } ); - }, - { retry: 10 } + } ); }); From 7ae80b8a4af7a2b770bb687edf1d9db671cc4a60 Mon Sep 17 00:00:00 2001 From: chad Date: Mon, 15 Jul 2024 15:16:19 -0500 Subject: [PATCH 46/53] fix: remove max event emitters patch for warning --- packages/contract/src/test-utils/launch-test-node.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/contract/src/test-utils/launch-test-node.ts b/packages/contract/src/test-utils/launch-test-node.ts index 0b78bbc3656..1987632aa24 100644 --- a/packages/contract/src/test-utils/launch-test-node.ts +++ b/packages/contract/src/test-utils/launch-test-node.ts @@ -7,15 +7,12 @@ import type { import { FuelError } from '@fuel-ts/errors'; import type { BytesLike } from '@fuel-ts/interfaces'; import type { SnapshotConfigs } from '@fuel-ts/utils'; -import { EventEmitter } from 'events'; import { readFileSync } from 'fs'; import * as path from 'path'; import { mergeDeepRight } from 'ramda'; import type { DeployContractOptions, DeployContractResult } from '../contract-factory'; -EventEmitter.defaultMaxListeners = 20; - export interface ContractDeployer { deployContract( bytecode: BytesLike, From 755f8e04ba56411e4a02c8acf483376b0d217cf8 Mon Sep 17 00:00:00 2001 From: chad Date: Wed, 17 Jul 2024 11:09:24 -0500 Subject: [PATCH 47/53] refactor: PR feedback --- apps/demo-typegen/src/demo.test.ts | 42 ++--------- .../fuel-gauge/src/advanced-logging.test.ts | 11 --- .../fuel-gauge/src/await-execution.test.ts | 12 +--- packages/fuel-gauge/src/bytes.test.ts | 9 +-- .../src/configurable-contract.test.ts | 2 +- .../fuel-gauge/src/contract-factory.test.ts | 38 ++++------ packages/fuel-gauge/src/contract.test.ts | 54 +++----------- .../fuel-gauge/src/coverage-contract.test.ts | 2 +- packages/fuel-gauge/src/doc-examples.test.ts | 13 +--- .../src/dry-run-multiple-txs.test.ts | 6 -- packages/fuel-gauge/src/edge-cases.test.ts | 6 +- packages/fuel-gauge/src/fee.test.ts | 6 +- .../src/funding-transaction.test.ts | 23 ++---- packages/fuel-gauge/src/min-gas.test.ts | 24 ++----- .../src/predicate-conditional-inputs.test.ts | 12 +--- .../src/predicate/predicate-arguments.test.ts | 60 ++++------------ .../predicate/predicate-configurables.test.ts | 30 ++------ .../predicate/predicate-estimations.test.ts | 36 ++-------- .../predicate/predicate-input-data.test.ts | 6 +- .../predicate-populate-witness.test.ts | 16 +---- .../predicate/predicate-with-script.test.ts | 6 +- .../src/script-with-configurable.test.ts | 24 ++----- .../src/script-with-vectors.test.ts | 24 ++----- .../fuel-gauge/src/std-lib-string.test.ts | 14 +--- .../src/transaction-response.test.ts | 15 +--- .../src/transaction-summary.test.ts | 45 ++---------- packages/fuel-gauge/src/utils.ts | 2 +- packages/fuel-gauge/src/vectors.test.ts | 2 +- packages/fuel-gauge/test/fixtures/index.ts | 72 ------------------- 29 files changed, 94 insertions(+), 518 deletions(-) delete mode 100644 packages/fuel-gauge/test/fixtures/index.ts diff --git a/apps/demo-typegen/src/demo.test.ts b/apps/demo-typegen/src/demo.test.ts index b4f96e65d7c..42a6bb1ebd1 100644 --- a/apps/demo-typegen/src/demo.test.ts +++ b/apps/demo-typegen/src/demo.test.ts @@ -16,11 +16,7 @@ import { ScriptAbi__factory } from './script-types'; */ describe('ExampleContract', () => { it('with imported storage slots', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 500_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], @@ -38,11 +34,7 @@ describe('ExampleContract', () => { expect(contract.id).toBeTruthy(); }); it('should return the input', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 500_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], @@ -73,11 +65,7 @@ describe('ExampleContract', () => { }); it('deployContract method', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 500_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], @@ -104,11 +92,7 @@ describe('ExampleContract', () => { // #endregion Testing-in-ts-ts it('should throw when simulating via contract factory with wallet with no resources', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 500_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -128,11 +112,7 @@ it('should throw when simulating via contract factory with wallet with no resour }); it('should not throw when dry running via contract factory with wallet with no resources', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 500_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -149,11 +129,7 @@ it('should not throw when dry running via contract factory with wallet with no r }); test('Example script', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 500_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], @@ -175,11 +151,7 @@ test('Example predicate', async () => { // #context import { PredicateAbi__factory } from './types'; // In this exchange, we are first transferring some coins to the predicate - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 500_000, - }, - }); + using launched = await launchTestNode({}); const { provider, diff --git a/packages/fuel-gauge/src/advanced-logging.test.ts b/packages/fuel-gauge/src/advanced-logging.test.ts index baf9c13aa7b..ec5512b9da5 100644 --- a/packages/fuel-gauge/src/advanced-logging.test.ts +++ b/packages/fuel-gauge/src/advanced-logging.test.ts @@ -225,9 +225,6 @@ describe('Advanced Logging', () => { { deployer: ConfigurableContractAbi__factory, bytecode: ConfigurableContractAbiHex }, { deployer: CoverageContractAbi__factory, bytecode: CoverageContractAbiHex }, ], - walletsConfig: { - amountPerCoin: 500_000, - }, }); const { @@ -288,8 +285,6 @@ describe('Advanced Logging', () => { amount, ]; - beforeAll(async () => {}); - it('when using InvocationScope', async () => { using launched = await launchTestNode({ contractsConfigs: [ @@ -299,9 +294,6 @@ describe('Advanced Logging', () => { bytecode: AdvancedLoggingOtherContractAbiHex, }, ], - walletsConfig: { - amountPerCoin: 300_000, - }, }); const { @@ -334,9 +326,6 @@ describe('Advanced Logging', () => { bytecode: AdvancedLoggingOtherContractAbiHex, }, ], - walletsConfig: { - amountPerCoin: 300_000, - }, }); const { diff --git a/packages/fuel-gauge/src/await-execution.test.ts b/packages/fuel-gauge/src/await-execution.test.ts index e71576f8d5b..342292a32b5 100644 --- a/packages/fuel-gauge/src/await-execution.test.ts +++ b/packages/fuel-gauge/src/await-execution.test.ts @@ -40,11 +40,7 @@ describe('await-execution', () => { }); test.skip('transferring funds with awaitExecution works', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider } = launched; @@ -66,11 +62,7 @@ describe('await-execution', () => { }); test('withdrawToBaseLayer works with awaitExecution', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, diff --git a/packages/fuel-gauge/src/bytes.test.ts b/packages/fuel-gauge/src/bytes.test.ts index 48f70d7d373..1e493015c3b 100644 --- a/packages/fuel-gauge/src/bytes.test.ts +++ b/packages/fuel-gauge/src/bytes.test.ts @@ -92,9 +92,6 @@ describe('Bytes Tests', () => { bytecode: BytesAbiHex, }, ], - walletsConfig: { - amountPerCoin: 1_000_000, - }, }); const { @@ -153,11 +150,7 @@ describe('Bytes Tests', () => { }); it('should test bytes input [script-bytes]', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 500_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], diff --git a/packages/fuel-gauge/src/configurable-contract.test.ts b/packages/fuel-gauge/src/configurable-contract.test.ts index 7a828fddce5..1b95c486f8a 100644 --- a/packages/fuel-gauge/src/configurable-contract.test.ts +++ b/packages/fuel-gauge/src/configurable-contract.test.ts @@ -25,7 +25,7 @@ const defaultValues = { }, }; -async function setupContract(configurableConstants?: { [name: string]: unknown }) { +function setupContract(configurableConstants?: { [name: string]: unknown }) { return launchTestNode({ contractsConfigs: [ { diff --git a/packages/fuel-gauge/src/contract-factory.test.ts b/packages/fuel-gauge/src/contract-factory.test.ts index b720c77806b..216f7b96b18 100644 --- a/packages/fuel-gauge/src/contract-factory.test.ts +++ b/packages/fuel-gauge/src/contract-factory.test.ts @@ -102,11 +102,7 @@ describe('Contract Factory', () => { }); it('should not override user input maxFee when calling deployContract', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 5_000_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], } = launched; @@ -137,24 +133,24 @@ describe('Contract Factory', () => { storageSlots: StorageTestContractAbi__factory.storageSlots, }); - const { waitForResult } = await contract.functions.return_var1().call(); - const { value: var1 } = await waitForResult(); + const call1 = await contract.functions.return_var1().call(); + const { value: var1 } = await call1.waitForResult(); expect(var1.toHex()).toEqual(toHex(0)); - const { waitForResult: waitForSecondResult } = await contract.functions.return_var2().call(); - const { value: var2 } = await waitForSecondResult(); + const call2 = await contract.functions.return_var2().call(); + const { value: var2 } = await call2.waitForResult(); expect(var2).toEqual(20); - const { waitForResult: waitForThirdResult } = await contract.functions.return_var3().call(); - const { value: var3 } = await waitForThirdResult(); + const call3 = await contract.functions.return_var3().call(); + const { value: var3 } = await call3.waitForResult(); expect(var3).toEqual(30); - const { waitForResult: waitForFourthResult } = await contract.functions.return_var4().call(); - const { value: var4 } = await waitForFourthResult(); + const call4 = await contract.functions.return_var4().call(); + const { value: var4 } = await call4.waitForResult(); expect(var4).toEqual(true); - const { waitForResult: waitForFifthResult } = await contract.functions.return_var5().call(); - const { value: var5 } = await waitForFifthResult(); + const call5 = await contract.functions.return_var5().call(); + const { value: var5 } = await call5.waitForResult(); expect(JSON.stringify(var5)).toEqual( JSON.stringify({ v1: true, @@ -164,11 +160,7 @@ describe('Contract Factory', () => { }); it('Creates a contract with initial storage (dynamic key)', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 5_000_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], } = launched; @@ -192,11 +184,7 @@ describe('Contract Factory', () => { }); it('Creates a contract with initial storage. Both dynamic key and fixed vars', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 5_000_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], } = launched; diff --git a/packages/fuel-gauge/src/contract.test.ts b/packages/fuel-gauge/src/contract.test.ts index 1b2a2850737..eef146e366b 100644 --- a/packages/fuel-gauge/src/contract.test.ts +++ b/packages/fuel-gauge/src/contract.test.ts @@ -17,6 +17,7 @@ import { } from 'fuels'; import type { JsonAbi, ScriptTransactionRequest, TransferParams } from 'fuels'; import { expectToThrowFuelError, ASSET_A, ASSET_B, launchTestNode } from 'fuels/test-utils'; +import type { DeployContractConfig } from 'fuels/test-utils'; import { CallTestContractAbi__factory, @@ -28,7 +29,7 @@ import { PredicateTrueAbi__factory } from '../test/typegen/predicates/factories/ import { launchTestContract } from './utils'; -const contractsConfigs = [ +const contractsConfigs: DeployContractConfig[] = [ { deployer: CallTestContractAbi__factory, bytecode: CallTestContractAbiHex, @@ -172,11 +173,7 @@ function setupTestContract() { */ describe('Contract', () => { it('generates function methods on a simple contract', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], } = launched; @@ -219,11 +216,7 @@ describe('Contract', () => { }); it('assigns a provider if passed', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000, - }, - }); + using launched = await launchTestNode({}); const { provider } = launched; const contract = new Contract(getRandomB256(), jsonFragment, provider); @@ -744,11 +737,7 @@ describe('Contract', () => { }); it('Parse create TX to JSON and parse back to create TX', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, wallets: [wallet], @@ -815,9 +804,6 @@ describe('Contract', () => { it('should transfer asset to a deployed contract just fine (NATIVE ASSET)', async () => { using launched = await launchTestNode({ contractsConfigs, - walletsConfig: { - amountPerCoin: 1_000_000, - }, }); const { provider, @@ -846,9 +832,6 @@ describe('Contract', () => { it('should set "gasLimit" and "maxFee" when transferring amounts to contract just fine', async () => { using launched = await launchTestNode({ contractsConfigs, - walletsConfig: { - amountPerCoin: 1_000_000, - }, }); const { provider, @@ -883,9 +866,6 @@ describe('Contract', () => { it('should ensure gas price and gas limit are validated when transfering to contract', async () => { using launched = await launchTestNode({ contractsConfigs, - walletsConfig: { - amountPerCoin: 1_000_000, - }, }); const { wallets: [wallet], @@ -912,9 +892,6 @@ describe('Contract', () => { using launched = await launchTestNode({ contractsConfigs, - walletsConfig: { - amountPerCoin: 1_000_000, - }, }); const { wallets: [wallet], @@ -937,9 +914,6 @@ describe('Contract', () => { it('should tranfer asset to a deployed contract just fine (FROM PREDICATE)', async () => { using launched = await launchTestNode({ contractsConfigs, - walletsConfig: { - amountPerCoin: 1_000_000, - }, }); const { provider, @@ -1017,11 +991,7 @@ describe('Contract', () => { }); it('should ensure assets can be transfered to wallets (MULTI TRANSFER)', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, wallets: [wallet], @@ -1067,11 +1037,7 @@ describe('Contract', () => { }); it('should throw when trying to transfer a zero or negative amount to a contract', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, wallets: [wallet], @@ -1205,11 +1171,7 @@ describe('Contract', () => { }); it('should ensure "get" does not modify the blockchain state', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], } = launched; diff --git a/packages/fuel-gauge/src/coverage-contract.test.ts b/packages/fuel-gauge/src/coverage-contract.test.ts index 43c372670de..8478298f215 100644 --- a/packages/fuel-gauge/src/coverage-contract.test.ts +++ b/packages/fuel-gauge/src/coverage-contract.test.ts @@ -35,7 +35,7 @@ enum MixedNativeEnum { NotNative = 12, } -async function setupContract() { +function setupContract() { return launchTestContract({ deployer: CoverageContractAbi__factory, bytecode: CoverageContractAbiHex, diff --git a/packages/fuel-gauge/src/doc-examples.test.ts b/packages/fuel-gauge/src/doc-examples.test.ts index 8472ccd66d8..8b82b1d7fcf 100644 --- a/packages/fuel-gauge/src/doc-examples.test.ts +++ b/packages/fuel-gauge/src/doc-examples.test.ts @@ -188,12 +188,7 @@ describe('Doc Examples', () => { }); it('can create wallets', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 100_000_000, - assets: [AssetId.A, AssetId.B], - }, - }); + using launched = await launchTestNode(); const { provider, @@ -260,11 +255,7 @@ describe('Doc Examples', () => { }); it('can create a predicate and use', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 100_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, wallets: [fundingWallet], diff --git a/packages/fuel-gauge/src/dry-run-multiple-txs.test.ts b/packages/fuel-gauge/src/dry-run-multiple-txs.test.ts index 89f9d6ef874..ba0a6aea021 100644 --- a/packages/fuel-gauge/src/dry-run-multiple-txs.test.ts +++ b/packages/fuel-gauge/src/dry-run-multiple-txs.test.ts @@ -31,9 +31,6 @@ describe('dry-run-multiple-txs', () => { bytecode: RevertErrorAbiHex, }, ], - walletsConfig: { - amountPerCoin: 1_000_000, - }, }); const { @@ -144,9 +141,6 @@ describe('dry-run-multiple-txs', () => { bytecode: AdvancedLoggingOtherContractAbiHex, }, ], - walletsConfig: { - amountPerCoin: 1_000_000, - }, }); const { diff --git a/packages/fuel-gauge/src/edge-cases.test.ts b/packages/fuel-gauge/src/edge-cases.test.ts index 77f40457b0a..c9887c10514 100644 --- a/packages/fuel-gauge/src/edge-cases.test.ts +++ b/packages/fuel-gauge/src/edge-cases.test.ts @@ -24,11 +24,7 @@ describe('Edge Cases', () => { }); test("SSE subscriptions that are closed by the node don't hang a for-await-of loop", async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, diff --git a/packages/fuel-gauge/src/fee.test.ts b/packages/fuel-gauge/src/fee.test.ts index 3ff893cfa24..a59ef2226e5 100644 --- a/packages/fuel-gauge/src/fee.test.ts +++ b/packages/fuel-gauge/src/fee.test.ts @@ -312,11 +312,7 @@ describe('Fee', () => { }); it('should ensure fee is properly calculated on transactions with predicate', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode(); const { provider, diff --git a/packages/fuel-gauge/src/funding-transaction.test.ts b/packages/fuel-gauge/src/funding-transaction.test.ts index a10054f59ac..d15500bc9da 100644 --- a/packages/fuel-gauge/src/funding-transaction.test.ts +++ b/packages/fuel-gauge/src/funding-transaction.test.ts @@ -2,7 +2,7 @@ import { FuelError } from '@fuel-ts/errors'; import { expectToThrowFuelError } from '@fuel-ts/errors/test-utils'; import type { Account, CoinTransactionRequestInput } from 'fuels'; import { ScriptTransactionRequest, Wallet, bn } from 'fuels'; -import { AssetId, launchTestNode } from 'fuels/test-utils'; +import { launchTestNode } from 'fuels/test-utils'; /** * @group node @@ -98,12 +98,7 @@ describe('Funding Transactions', () => { }); it('should not fund a transaction request when it is already funded', async () => { - using launched = await launchTestNode({ - walletsConfig: { - count: 1, - amountPerCoin: 200_000_000, - }, - }); + using launched = await launchTestNode(); const { provider, @@ -281,12 +276,7 @@ describe('Funding Transactions', () => { }); it('should ensure a partially funded Transaction will require only missing funds', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 100_000_000, - assets: [AssetId.A, AssetId.B], - }, - }); + using launched = await launchTestNode(); const { provider, @@ -363,12 +353,7 @@ describe('Funding Transactions', () => { }); it('should ensure a funded Transaction will not require more funds from another user', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 100_000_000, - assets: [AssetId.A, AssetId.B], - }, - }); + using launched = await launchTestNode(); const { provider, wallets: [fundedWallet], diff --git a/packages/fuel-gauge/src/min-gas.test.ts b/packages/fuel-gauge/src/min-gas.test.ts index d648605190f..dd9d5169b72 100644 --- a/packages/fuel-gauge/src/min-gas.test.ts +++ b/packages/fuel-gauge/src/min-gas.test.ts @@ -24,11 +24,7 @@ import CoverageContractAbiHex from '../test/typegen/contracts/CoverageContractAb */ describe('Minimum gas tests', () => { it('sets gas requirements (contract)', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 500_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -74,11 +70,7 @@ describe('Minimum gas tests', () => { }); it('sets gas requirements (script)', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 500_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -116,11 +108,7 @@ describe('Minimum gas tests', () => { }); it('sets gas requirements (predicate)', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 100_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -171,11 +159,7 @@ describe('Minimum gas tests', () => { }); it('sets gas requirements (account and predicate with script)', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 100_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, diff --git a/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts b/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts index 7bbe763ec80..b84107d8006 100644 --- a/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts +++ b/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts @@ -9,11 +9,7 @@ import { PredicateConditionalInputsAbi__factory } from '../test/typegen/predicat */ describe('PredicateConditionalInputs', () => { it('should execute custom transaction where predicate transfers to Alice (ALICE PAYS FEES)', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 100_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -90,11 +86,7 @@ describe('PredicateConditionalInputs', () => { }); it('should execute custom transaction where predicate transfer to Alice (PREDICATE PAYS FEES)', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 100_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, diff --git a/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts b/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts index dc3a5a5517a..929d298165d 100644 --- a/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts @@ -23,11 +23,7 @@ describe('Predicate', () => { const amountToPredicate = 900_000; it('calls a predicate with valid address data and returns true', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -42,7 +38,7 @@ describe('Predicate', () => { }); // transfer funds to predicate - await fundPredicate(fundingWallet, predicate, amountToPredicate); + await fundPredicate(fundingWallet, predicate, amountToPredicate, 3); const receiver = Wallet.generate({ provider }); const initialReceiverBalance = await receiver.getBalance(); @@ -61,12 +57,8 @@ describe('Predicate', () => { expect(isStatusSuccess).toBeTruthy(); }); - it('calls a predicate with invalid address data and returns false', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + it('calls a predicate with invalid address data and throws error', async () => { + using launched = await launchTestNode({}); const { provider, @@ -91,11 +83,7 @@ describe('Predicate', () => { }); it('calls a predicate with valid u32 data and returns true', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -131,11 +119,7 @@ describe('Predicate', () => { }); it('calls a predicate with invalid u32 data and returns false', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 100_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -150,7 +134,7 @@ describe('Predicate', () => { }); // fund predicate - await fundPredicate(fundingWallet, predicate, 90_000_00); + await fundPredicate(fundingWallet, predicate, 90_000_00, 3); const receiver = Wallet.generate({ provider }); const initialReceiverBalance = await receiver.getBalance(); @@ -165,11 +149,7 @@ describe('Predicate', () => { }); it('calls a predicate with a valid struct argument and returns true', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -247,11 +227,7 @@ describe('Predicate', () => { }); it('can call a Coin predicate which returns true with valid predicate data [main args vector]', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -286,11 +262,7 @@ describe('Predicate', () => { }); it('calls a predicate with valid multiple arguments and returns true', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -327,11 +299,7 @@ describe('Predicate', () => { }); it('calls a predicate with valid multiple arguments and returns true - using setData', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -366,11 +334,7 @@ describe('Predicate', () => { }); it('calls a predicate with invalid multiple arguments and throws error', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, diff --git a/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts b/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts index 6134a9456b7..de88d17a35d 100644 --- a/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts @@ -22,11 +22,7 @@ describe('Predicate', () => { }; it('calls a predicate with configurables using default values', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -66,11 +62,7 @@ describe('Predicate', () => { }); it('calls a predicate with configurables where first param is equal', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -115,11 +107,7 @@ describe('Predicate', () => { }); it('calls a predicate with configurables where second param is equal', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -164,11 +152,7 @@ describe('Predicate', () => { }); it('calls a predicate with configurables where both params are equal', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -215,11 +199,7 @@ describe('Predicate', () => { }); it('throws when configurable data is not set', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, diff --git a/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts b/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts index 211fe7df48b..34d14d9b4d6 100644 --- a/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts @@ -33,11 +33,7 @@ describe('Predicate', () => { const fundingAmount = 10_000; it('estimatePredicates should assign gas to the correct input', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], @@ -134,11 +130,7 @@ describe('Predicate', () => { }); test('predicate does not get estimated again if it has already been estimated', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], @@ -166,11 +158,7 @@ describe('Predicate', () => { }); test('Predicates get estimated if one of them is not estimated', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], @@ -215,11 +203,7 @@ describe('Predicate', () => { }); test('transferring funds from a predicate estimates the predicate and does only one dry run', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], @@ -264,11 +248,7 @@ describe('Predicate', () => { describe('predicate resource fetching and predicateData population', () => { test('getting predicate resources via the predicate automatically populates predicateData', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], @@ -302,11 +282,7 @@ describe('Predicate', () => { }); test('getting predicate resources via the provider requires manual predicateData population', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], diff --git a/packages/fuel-gauge/src/predicate/predicate-input-data.test.ts b/packages/fuel-gauge/src/predicate/predicate-input-data.test.ts index 1d29920d8df..535b1ab1f26 100644 --- a/packages/fuel-gauge/src/predicate/predicate-input-data.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-input-data.test.ts @@ -13,11 +13,7 @@ import { fundPredicate } from './utils/predicate'; describe('Predicate', () => { describe('Input Data', () => { it('throws invalid transaction when input_predicate_data is required for predicate validation', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, wallets: [wallet], diff --git a/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts b/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts index 685ebafb73a..d1aae2da83e 100644 --- a/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts @@ -34,11 +34,7 @@ describe('Predicate', () => { ); it('should properly populate predicate data and remove placeholder witness [CASE 1]', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 100_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, wallets: [wallet], @@ -88,11 +84,7 @@ describe('Predicate', () => { }); it('should properly populate predicate data and remove placeholder witness [CASE 2]', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 100_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, wallets: [fundingWallet, wallet1], @@ -150,7 +142,6 @@ describe('Predicate', () => { it('should properly populate predicate data and remove placeholder witness [CASE 3]', async () => { using launched = await launchTestNode({ walletsConfig: { - amountPerCoin: 100_000_000, count: 3, }, }); @@ -223,7 +214,6 @@ describe('Predicate', () => { it('should properly populate predicate data and remove placeholder witness [CASE 4]', async () => { using launched = await launchTestNode({ walletsConfig: { - amountPerCoin: 100_000_000, count: 4, }, }); @@ -319,7 +309,6 @@ describe('Predicate', () => { it('should properly populate predicate data and remove placeholder witness [CASE 5]', async () => { using launched = await launchTestNode({ walletsConfig: { - amountPerCoin: 100_000_000, count: 3, }, }); @@ -402,7 +391,6 @@ describe('Predicate', () => { it('should properly populate predicate data and remove placeholder witness [CASE 6]', async () => { using launched = await launchTestNode({ walletsConfig: { - amountPerCoin: 100_000_000, count: 4, }, }); diff --git a/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts b/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts index 666359f7250..20d61dcfdb6 100644 --- a/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts @@ -17,11 +17,7 @@ import { fundPredicate } from './utils/predicate'; describe('Predicate', () => { describe('With script', () => { it('calls a predicate and uses proceeds for a script call', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 100_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, wallets: [wallet], diff --git a/packages/fuel-gauge/src/script-with-configurable.test.ts b/packages/fuel-gauge/src/script-with-configurable.test.ts index 26580181a85..27aba35e6c6 100644 --- a/packages/fuel-gauge/src/script-with-configurable.test.ts +++ b/packages/fuel-gauge/src/script-with-configurable.test.ts @@ -13,11 +13,7 @@ const defaultValues = { */ describe('Script With Configurable', () => { it('should returns true when input value matches default configurable constant', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], @@ -38,11 +34,7 @@ describe('Script With Configurable', () => { }); it('should returns false when input value differs from default configurable constant', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], @@ -67,11 +59,7 @@ describe('Script With Configurable', () => { }); it('should returns true when input value matches manually set configurable constant', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], @@ -94,11 +82,7 @@ describe('Script With Configurable', () => { }); it('should returns false when input value differs from manually set configurable constant', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], diff --git a/packages/fuel-gauge/src/script-with-vectors.test.ts b/packages/fuel-gauge/src/script-with-vectors.test.ts index d5e1659bffd..ec056808846 100644 --- a/packages/fuel-gauge/src/script-with-vectors.test.ts +++ b/packages/fuel-gauge/src/script-with-vectors.test.ts @@ -13,11 +13,7 @@ import { */ describe('Script With Vectors', () => { it('can call script and use main argument [array]', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], @@ -33,11 +29,7 @@ describe('Script With Vectors', () => { }); it('can call script and use main argument [vec]', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], @@ -67,11 +59,7 @@ describe('Script With Vectors', () => { }); it('can call script and use main argument [struct in vec in struct in vec in struct in vec]', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], @@ -115,11 +103,7 @@ describe('Script With Vectors', () => { }); it('can call script and use main argument [struct in vec in struct in vec in struct in vec]', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], diff --git a/packages/fuel-gauge/src/std-lib-string.test.ts b/packages/fuel-gauge/src/std-lib-string.test.ts index e3e54c27682..85711167c26 100644 --- a/packages/fuel-gauge/src/std-lib-string.test.ts +++ b/packages/fuel-gauge/src/std-lib-string.test.ts @@ -15,7 +15,7 @@ import { launchTestContract } from './utils'; * @group browser */ -async function setupContract() { +function setupContract() { return launchTestContract({ deployer: StdLibStringAbi__factory, bytecode: StdLibStringAbiHex, @@ -44,11 +44,7 @@ describe('std-lib-string Tests', () => { }); it('should test String input [predicate-std-lib-string]', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -99,11 +95,7 @@ describe('std-lib-string Tests', () => { }); it('should test String input [script-std-lib-string]', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 1_000_000, - }, - }); + using launched = await launchTestNode({}); const { wallets: [wallet], diff --git a/packages/fuel-gauge/src/transaction-response.test.ts b/packages/fuel-gauge/src/transaction-response.test.ts index 1aae4c0b307..8a145224e54 100644 --- a/packages/fuel-gauge/src/transaction-response.test.ts +++ b/packages/fuel-gauge/src/transaction-response.test.ts @@ -77,11 +77,7 @@ function getSubscriptionStreamFromFetch(streamHolder: { stream: ReadableStream { it('should ensure create method waits till a transaction response is given', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 500_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -107,11 +103,7 @@ describe('TransactionResponse', () => { }); it('should ensure getTransactionSummary fetchs a transaction and assembles transaction summary', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 500_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -261,9 +253,6 @@ describe('TransactionResponse', () => { { retry: 10 }, async () => { using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 500_000, - }, nodeOptions: { args: ['--poa-instant', 'false', '--poa-interval-period', '4s', '--tx-pool-ttl', '1s'], loggingEnabled: false, diff --git a/packages/fuel-gauge/src/transaction-summary.test.ts b/packages/fuel-gauge/src/transaction-summary.test.ts index d34891a5e5b..55cd1aa85d1 100644 --- a/packages/fuel-gauge/src/transaction-summary.test.ts +++ b/packages/fuel-gauge/src/transaction-summary.test.ts @@ -54,11 +54,7 @@ describe('TransactionSummary', () => { }; it('should ensure getTransactionSummary executes just fine', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 100_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -102,11 +98,7 @@ describe('TransactionSummary', () => { }); it('should ensure getTransactionsSummaries executes just fine', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 100_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -159,11 +151,7 @@ describe('TransactionSummary', () => { }); it('should ensure getTransactionSummaryFromRequest executes just fine', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 100_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -221,11 +209,7 @@ describe('TransactionSummary', () => { }; it('should ensure transfer operation is assembled (ACCOUNT TRANSFER)', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 100_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, @@ -264,9 +248,6 @@ describe('TransactionSummary', () => { bytecode: MultiTokenContractAbiHex, }, ], - walletsConfig: { - amountPerCoin: 100_000_000, - }, }); const { @@ -299,9 +280,6 @@ describe('TransactionSummary', () => { bytecode: TokenContractAbiHex, }, ], - walletsConfig: { - amountPerCoin: 100_000_000, - }, }); const { @@ -344,9 +322,6 @@ describe('TransactionSummary', () => { bytecode: TokenContractAbiHex, }, ], - walletsConfig: { - amountPerCoin: 100_000_000, - }, }); const { @@ -430,9 +405,6 @@ describe('TransactionSummary', () => { bytecode: TokenContractAbiHex, }, ], - walletsConfig: { - amountPerCoin: 100_000_000, - }, }); const { @@ -486,9 +458,6 @@ describe('TransactionSummary', () => { bytecode: TokenContractAbiHex, }, ], - walletsConfig: { - amountPerCoin: 100_000_000, - }, }); const { @@ -553,11 +522,7 @@ describe('TransactionSummary', () => { }); it('should ensure transfer operations are assembled (CUSTOM SCRIPT TRANSFER)', async () => { - using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 100_000_000, - }, - }); + using launched = await launchTestNode({}); const { provider, diff --git a/packages/fuel-gauge/src/utils.ts b/packages/fuel-gauge/src/utils.ts index 1a2a6cfc3a3..a34532a5676 100644 --- a/packages/fuel-gauge/src/utils.ts +++ b/packages/fuel-gauge/src/utils.ts @@ -9,6 +9,6 @@ export async function launchTestContract(config: contractsConfigs: [config], }); return Object.assign(contract, { - [Symbol.dispose]: () => Promise.resolve(cleanup()), + [Symbol.dispose]: cleanup, }); } diff --git a/packages/fuel-gauge/src/vectors.test.ts b/packages/fuel-gauge/src/vectors.test.ts index 0e7ab54f781..10bd0f46d70 100644 --- a/packages/fuel-gauge/src/vectors.test.ts +++ b/packages/fuel-gauge/src/vectors.test.ts @@ -12,7 +12,7 @@ enum SmallEnum { Empty = 'Empty', } -async function setupContract() { +function setupContract() { return launchTestContract({ deployer: VectorsAbi__factory, bytecode: VectorsAbiHex, diff --git a/packages/fuel-gauge/test/fixtures/index.ts b/packages/fuel-gauge/test/fixtures/index.ts deleted file mode 100644 index e33c1093a9f..00000000000 --- a/packages/fuel-gauge/test/fixtures/index.ts +++ /dev/null @@ -1,72 +0,0 @@ -import type { JsonAbi } from 'fuels'; -import { getForcProject } from 'fuels/test-utils'; -import { join } from 'path'; - -export enum FuelGaugeProjectsEnum { - ADVANCED_LOGGING = 'advanced-logging', - ADVANCED_LOGGING_OTHER_CONTRACT = 'advanced-logging-other-contract', - ADVANCED_LOGGING_OTHER_CONTRACT_ABI = 'advanced-logging-other-contract-abi', - AUTH_TESTING_ABI = 'auth_testing_abi', - AUTH_TESTING_CONTRACT = 'auth_testing_contract', - BYTES = 'bytes', - BYTECODE_SWAY_LIB = 'bytecode-sway-lib', - CALL_TEST_CONTRACT = 'call-test-contract', - CONFIGURABLE_CONTRACT = 'configurable-contract', - COMPLEX_SCRIPT = 'complex-script', - COMPLEX_PREDICATE = 'complex-predicate', - COLLISION_IN_FN_NAMES = 'collision_in_fn_names', - COVERAGE_CONTRACT = 'coverage-contract', - GENERIC_TYPES_CONTRACT = 'generic-types-contract', - MULTI_TOKEN_CONTRACT = 'multi-token-contract', - OPTIONS = 'options', - PAYABLE_ANNOTATION = 'payable-annotation', - PREDICATE_ADDRESS = 'predicate-address', - PREDICATE_ASSERT_VALUE = 'predicate-assert-value', - PREDICATE_ASSERT_NUMBER = 'predicate-assert-number', - PREDICATE_SUM = 'predicate-sum', - PREDICATE_BYTES = 'predicate-bytes', - PREDICATE_CONDITIONAL_INPUTS = 'predicate-conditional-inputs', - PREDICATE_FALSE = 'predicate-false', - PREDICATE_MAIN_ARGS_STRUCT = 'predicate-main-args-struct', - PREDICATE_MAIN_ARGS_VECTOR = 'predicate-main-args-vector', - PREDICATE_MULTI_ARGS = 'predicate-multi-args', - PREDICATE_RAW_SLICE = 'predicate-raw-slice', - PREDICATE_STD_LIB_STRING = 'predicate-std-lib-string', - PREDICATE_STRUCT = 'predicate-struct', - PREDICATE_TRIPLE_SIG = 'predicate-triple-sig', - PREDICATE_TRUE = 'predicate-true', - PREDICATE_WITH_CONFIGURABLE = 'predicate-with-configurable', - PREDICATE_U32 = 'predicate-u32', - PREDICATE_VECTOR_TYPES = 'predicate-vector-types', - PREDICATE_INPUT_DATA = 'predicate-input-data', - PREDICATE_VALIDATE_TRANSFER = 'predicate-validate-transfer', - RAW_SLICE = 'raw-slice', - REVERT_ERROR = 'revert-error', - SCRIPT_BYTES = 'script-bytes', - SCRIPT_CALL_CONTRACT = 'script-call-contract', - SCRIPT_MAIN_ARGS = 'script-main-args', - SCRIPT_MAIN_RETURN_STRUCT = 'script-main-return-struct', - SCRIPT_MAIN_TWO_ARGS = 'script-main-two-args', - SCRIPT_STD_LIB_STRING = 'script-std-lib-string', - SCRIPT_WITH_CONFIGURABLE = 'script-with-configurable', - REENTRANT_FOO = 'reentrant-foo', - REENTRANT_BAR = 'reentrant-bar', - SCRIPT_WITH_ARRAY = 'script-with-array', - SCRIPT_WITH_VECTOR = 'script-with-vector', - SCRIPT_WITH_VECTOR_ADVANCED = 'script-with-vector-advanced', - SCRIPT_WITH_VECTOR_MIXED = 'script-with-vector-mixed', - STD_LIB_STRING = 'std-lib-string', - STORAGE_TEST_CONTRACT = 'storage-test-contract', - TOKEN_ABI = 'token-abi', - TOKEN_CONTRACT = 'token-contract', - VECTOR_TYPES_CONTRACT = 'vector-types-contract', - VECTOR_TYPES_SCRIPT = 'vector-types-script', - VECTORS = 'vectors', -} - -export const getFuelGaugeForcProject = (project: FuelGaugeProjectsEnum) => - getForcProject({ - projectDir: join(__dirname, 'forc-projects', project), - projectName: project, - build: 'release', - }); From 90ec1387937765748dc3056a890ace51bc2928e4 Mon Sep 17 00:00:00 2001 From: chad Date: Wed, 17 Jul 2024 14:09:01 -0500 Subject: [PATCH 48/53] refactor: further PR feedback --- packages/fuel-gauge/src/funding-transaction.test.ts | 2 +- packages/fuel-gauge/src/options.test.ts | 7 ++----- packages/fuel-gauge/src/payable-annotation.test.ts | 2 +- packages/fuel-gauge/src/raw-slice.test.ts | 2 +- packages/fuel-gauge/src/revert-error.test.ts | 2 +- .../fuel-gauge/src/script-with-configurable.test.ts | 8 ++++---- packages/fuel-gauge/src/transaction-response.test.ts | 11 ++++++----- packages/fuel-gauge/src/transaction.test.ts | 1 + 8 files changed, 17 insertions(+), 18 deletions(-) diff --git a/packages/fuel-gauge/src/funding-transaction.test.ts b/packages/fuel-gauge/src/funding-transaction.test.ts index d15500bc9da..32f66bed68b 100644 --- a/packages/fuel-gauge/src/funding-transaction.test.ts +++ b/packages/fuel-gauge/src/funding-transaction.test.ts @@ -117,7 +117,7 @@ describe('Funding Transactions', () => { mainWallet, }); - // sender has 2 UTXOs for 500_000 each, so it has enough resources to spend 1000 of baseAssetId + // sender has 2 UTXOs for 200_000 each, so it has enough resources to spend 1000 of baseAssetId const enoughtResources = await sender.getResourcesToSpend([[100, provider.getBaseAssetId()]]); // confirm we only fetched 1 UTXO from the expected amount diff --git a/packages/fuel-gauge/src/options.test.ts b/packages/fuel-gauge/src/options.test.ts index ad3cf7d87ad..394c9cdbd05 100644 --- a/packages/fuel-gauge/src/options.test.ts +++ b/packages/fuel-gauge/src/options.test.ts @@ -9,7 +9,7 @@ const U8_MAX = 255; const U16_MAX = 65535; const U32_MAX = 4294967295; -async function launchOptionsContract() { +function launchOptionsContract() { return launchTestContract({ bytecode: OptionsAbiHex, deployer: OptionsAbi__factory, @@ -228,10 +228,7 @@ describe('Options Tests', () => { }); it('echoes option enum diff sizes', async () => { - using contractInstance = await launchTestContract({ - bytecode: OptionsAbiHex, - deployer: OptionsAbi__factory, - }); + using contractInstance = await launchOptionsContract(); const call1 = await contractInstance.functions.echo_enum_diff_sizes(undefined).call(); const { value } = await call1.waitForResult(); diff --git a/packages/fuel-gauge/src/payable-annotation.test.ts b/packages/fuel-gauge/src/payable-annotation.test.ts index 750a944a14a..54a6fe5083f 100644 --- a/packages/fuel-gauge/src/payable-annotation.test.ts +++ b/packages/fuel-gauge/src/payable-annotation.test.ts @@ -5,7 +5,7 @@ import PayableAnnotationAbiHex from '../test/typegen/contracts/PayableAnnotation import { launchTestContract } from './utils'; -async function launchPayableContract() { +function launchPayableContract() { return launchTestContract({ bytecode: PayableAnnotationAbiHex, deployer: PayableAnnotationAbi__factory, diff --git a/packages/fuel-gauge/src/raw-slice.test.ts b/packages/fuel-gauge/src/raw-slice.test.ts index c284bfca39b..86b74970c2a 100644 --- a/packages/fuel-gauge/src/raw-slice.test.ts +++ b/packages/fuel-gauge/src/raw-slice.test.ts @@ -19,7 +19,7 @@ type Wrapper = { inner_enum: SomeEnum; }; -async function setupRawSliceContract() { +function setupRawSliceContract() { return launchTestContract({ deployer: RawSliceAbi__factory, bytecode: RawSliceAbiHex, diff --git a/packages/fuel-gauge/src/revert-error.test.ts b/packages/fuel-gauge/src/revert-error.test.ts index b9abc9352f3..dd53b87a1a8 100644 --- a/packages/fuel-gauge/src/revert-error.test.ts +++ b/packages/fuel-gauge/src/revert-error.test.ts @@ -10,7 +10,7 @@ import TokenContractAbiHex from '../test/typegen/contracts/TokenContractAbi.hex' import { launchTestContract } from './utils'; -async function launchContract() { +function launchContract() { return launchTestContract({ deployer: RevertErrorAbi__factory, bytecode: RevertErrorAbiHex, diff --git a/packages/fuel-gauge/src/script-with-configurable.test.ts b/packages/fuel-gauge/src/script-with-configurable.test.ts index 27aba35e6c6..5a5e5390f3e 100644 --- a/packages/fuel-gauge/src/script-with-configurable.test.ts +++ b/packages/fuel-gauge/src/script-with-configurable.test.ts @@ -13,7 +13,7 @@ const defaultValues = { */ describe('Script With Configurable', () => { it('should returns true when input value matches default configurable constant', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], @@ -34,7 +34,7 @@ describe('Script With Configurable', () => { }); it('should returns false when input value differs from default configurable constant', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], @@ -59,7 +59,7 @@ describe('Script With Configurable', () => { }); it('should returns true when input value matches manually set configurable constant', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], @@ -82,7 +82,7 @@ describe('Script With Configurable', () => { }); it('should returns false when input value differs from manually set configurable constant', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], diff --git a/packages/fuel-gauge/src/transaction-response.test.ts b/packages/fuel-gauge/src/transaction-response.test.ts index 8a145224e54..77fd8269cf5 100644 --- a/packages/fuel-gauge/src/transaction-response.test.ts +++ b/packages/fuel-gauge/src/transaction-response.test.ts @@ -102,8 +102,12 @@ describe('TransactionResponse', () => { expect(response.gqlTransaction?.id).toBe(transactionId); }); - it('should ensure getTransactionSummary fetchs a transaction and assembles transaction summary', async () => { - using launched = await launchTestNode({}); + it('should ensure getTransactionSummary fetches a transaction and assembles transaction summary', async () => { + using launched = await launchTestNode({ + nodeOptions: { + args: ['--poa-instant', 'false', '--poa-interval-period', '1s'], + }, + }); const { provider, @@ -207,9 +211,6 @@ describe('TransactionResponse', () => { * before the waitForResult (provider.operations.statusChange) call is made * */ using launched = await launchTestNode({ - walletsConfig: { - amountPerCoin: 500_000, - }, nodeOptions: { args: ['--poa-instant', 'false', '--poa-interval-period', '2s', '--tx-pool-ttl', '1s'], loggingEnabled: false, diff --git a/packages/fuel-gauge/src/transaction.test.ts b/packages/fuel-gauge/src/transaction.test.ts index 81db1975da7..564510d5611 100644 --- a/packages/fuel-gauge/src/transaction.test.ts +++ b/packages/fuel-gauge/src/transaction.test.ts @@ -10,6 +10,7 @@ describe('Transaction', () => { using launched = await launchTestNode({ nodeOptions: { args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'], + loggingEnabled: false, }, }); const { provider } = launched; From 2ed6e0927a0db79c162df59a9f13129162b9517e Mon Sep 17 00:00:00 2001 From: chad Date: Wed, 17 Jul 2024 14:37:10 -0500 Subject: [PATCH 49/53] refactor: set lower amount on transaction-response test --- packages/fuel-gauge/src/transaction-response.test.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/fuel-gauge/src/transaction-response.test.ts b/packages/fuel-gauge/src/transaction-response.test.ts index 77fd8269cf5..6835578c7f4 100644 --- a/packages/fuel-gauge/src/transaction-response.test.ts +++ b/packages/fuel-gauge/src/transaction-response.test.ts @@ -211,6 +211,9 @@ describe('TransactionResponse', () => { * before the waitForResult (provider.operations.statusChange) call is made * */ using launched = await launchTestNode({ + walletsConfig: { + amountPerCoin: 500_000, + }, nodeOptions: { args: ['--poa-instant', 'false', '--poa-interval-period', '2s', '--tx-pool-ttl', '1s'], loggingEnabled: false, From 2bb3862b638a0db95154481a3d37d2ea0bc286e6 Mon Sep 17 00:00:00 2001 From: nedsalk Date: Thu, 18 Jul 2024 11:13:41 +0200 Subject: [PATCH 50/53] Replace `launchtestNode({})` with `launchTestNode()` globally --- apps/demo-typegen/src/demo.test.ts | 14 +++++++------- .../fuel-gauge/src/await-execution.test.ts | 4 ++-- packages/fuel-gauge/src/bytes.test.ts | 2 +- .../fuel-gauge/src/contract-factory.test.ts | 6 +++--- packages/fuel-gauge/src/contract.test.ts | 12 ++++++------ packages/fuel-gauge/src/doc-examples.test.ts | 2 +- packages/fuel-gauge/src/edge-cases.test.ts | 2 +- packages/fuel-gauge/src/min-gas.test.ts | 8 ++++---- .../src/predicate-conditional-inputs.test.ts | 4 ++-- .../src/predicate/predicate-arguments.test.ts | 18 +++++++++--------- .../predicate/predicate-configurables.test.ts | 10 +++++----- .../predicate/predicate-estimations.test.ts | 12 ++++++------ .../src/predicate/predicate-input-data.test.ts | 2 +- .../predicate-populate-witness.test.ts | 4 ++-- .../predicate/predicate-with-script.test.ts | 2 +- .../fuel-gauge/src/script-with-vectors.test.ts | 8 ++++---- packages/fuel-gauge/src/std-lib-string.test.ts | 4 ++-- .../src/transaction-response.test.ts | 2 +- .../fuel-gauge/src/transaction-summary.test.ts | 10 +++++----- 19 files changed, 63 insertions(+), 63 deletions(-) diff --git a/apps/demo-typegen/src/demo.test.ts b/apps/demo-typegen/src/demo.test.ts index 42a6bb1ebd1..ad9b7b66dcf 100644 --- a/apps/demo-typegen/src/demo.test.ts +++ b/apps/demo-typegen/src/demo.test.ts @@ -16,7 +16,7 @@ import { ScriptAbi__factory } from './script-types'; */ describe('ExampleContract', () => { it('with imported storage slots', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], @@ -34,7 +34,7 @@ describe('ExampleContract', () => { expect(contract.id).toBeTruthy(); }); it('should return the input', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], @@ -65,7 +65,7 @@ describe('ExampleContract', () => { }); it('deployContract method', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], @@ -92,7 +92,7 @@ describe('ExampleContract', () => { // #endregion Testing-in-ts-ts it('should throw when simulating via contract factory with wallet with no resources', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -112,7 +112,7 @@ it('should throw when simulating via contract factory with wallet with no resour }); it('should not throw when dry running via contract factory with wallet with no resources', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -129,7 +129,7 @@ it('should not throw when dry running via contract factory with wallet with no r }); test('Example script', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], @@ -151,7 +151,7 @@ test('Example predicate', async () => { // #context import { PredicateAbi__factory } from './types'; // In this exchange, we are first transferring some coins to the predicate - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, diff --git a/packages/fuel-gauge/src/await-execution.test.ts b/packages/fuel-gauge/src/await-execution.test.ts index 342292a32b5..8ff4f8bb083 100644 --- a/packages/fuel-gauge/src/await-execution.test.ts +++ b/packages/fuel-gauge/src/await-execution.test.ts @@ -40,7 +40,7 @@ describe('await-execution', () => { }); test.skip('transferring funds with awaitExecution works', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider } = launched; @@ -62,7 +62,7 @@ describe('await-execution', () => { }); test('withdrawToBaseLayer works with awaitExecution', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, diff --git a/packages/fuel-gauge/src/bytes.test.ts b/packages/fuel-gauge/src/bytes.test.ts index 1e493015c3b..c13f575e7d3 100644 --- a/packages/fuel-gauge/src/bytes.test.ts +++ b/packages/fuel-gauge/src/bytes.test.ts @@ -150,7 +150,7 @@ describe('Bytes Tests', () => { }); it('should test bytes input [script-bytes]', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], diff --git a/packages/fuel-gauge/src/contract-factory.test.ts b/packages/fuel-gauge/src/contract-factory.test.ts index 216f7b96b18..6d551a8ffb3 100644 --- a/packages/fuel-gauge/src/contract-factory.test.ts +++ b/packages/fuel-gauge/src/contract-factory.test.ts @@ -102,7 +102,7 @@ describe('Contract Factory', () => { }); it('should not override user input maxFee when calling deployContract', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], } = launched; @@ -160,7 +160,7 @@ describe('Contract Factory', () => { }); it('Creates a contract with initial storage (dynamic key)', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], } = launched; @@ -184,7 +184,7 @@ describe('Contract Factory', () => { }); it('Creates a contract with initial storage. Both dynamic key and fixed vars', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], } = launched; diff --git a/packages/fuel-gauge/src/contract.test.ts b/packages/fuel-gauge/src/contract.test.ts index eef146e366b..672d9bd14a6 100644 --- a/packages/fuel-gauge/src/contract.test.ts +++ b/packages/fuel-gauge/src/contract.test.ts @@ -173,7 +173,7 @@ function setupTestContract() { */ describe('Contract', () => { it('generates function methods on a simple contract', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], } = launched; @@ -216,7 +216,7 @@ describe('Contract', () => { }); it('assigns a provider if passed', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider } = launched; const contract = new Contract(getRandomB256(), jsonFragment, provider); @@ -737,7 +737,7 @@ describe('Contract', () => { }); it('Parse create TX to JSON and parse back to create TX', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, wallets: [wallet], @@ -991,7 +991,7 @@ describe('Contract', () => { }); it('should ensure assets can be transfered to wallets (MULTI TRANSFER)', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, wallets: [wallet], @@ -1037,7 +1037,7 @@ describe('Contract', () => { }); it('should throw when trying to transfer a zero or negative amount to a contract', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, wallets: [wallet], @@ -1171,7 +1171,7 @@ describe('Contract', () => { }); it('should ensure "get" does not modify the blockchain state', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], } = launched; diff --git a/packages/fuel-gauge/src/doc-examples.test.ts b/packages/fuel-gauge/src/doc-examples.test.ts index 8b82b1d7fcf..05762f93263 100644 --- a/packages/fuel-gauge/src/doc-examples.test.ts +++ b/packages/fuel-gauge/src/doc-examples.test.ts @@ -255,7 +255,7 @@ describe('Doc Examples', () => { }); it('can create a predicate and use', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, wallets: [fundingWallet], diff --git a/packages/fuel-gauge/src/edge-cases.test.ts b/packages/fuel-gauge/src/edge-cases.test.ts index c9887c10514..848f33c2332 100644 --- a/packages/fuel-gauge/src/edge-cases.test.ts +++ b/packages/fuel-gauge/src/edge-cases.test.ts @@ -24,7 +24,7 @@ describe('Edge Cases', () => { }); test("SSE subscriptions that are closed by the node don't hang a for-await-of loop", async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, diff --git a/packages/fuel-gauge/src/min-gas.test.ts b/packages/fuel-gauge/src/min-gas.test.ts index dd9d5169b72..8a36da46632 100644 --- a/packages/fuel-gauge/src/min-gas.test.ts +++ b/packages/fuel-gauge/src/min-gas.test.ts @@ -24,7 +24,7 @@ import CoverageContractAbiHex from '../test/typegen/contracts/CoverageContractAb */ describe('Minimum gas tests', () => { it('sets gas requirements (contract)', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -70,7 +70,7 @@ describe('Minimum gas tests', () => { }); it('sets gas requirements (script)', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -108,7 +108,7 @@ describe('Minimum gas tests', () => { }); it('sets gas requirements (predicate)', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -159,7 +159,7 @@ describe('Minimum gas tests', () => { }); it('sets gas requirements (account and predicate with script)', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, diff --git a/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts b/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts index b84107d8006..8eae297f731 100644 --- a/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts +++ b/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts @@ -9,7 +9,7 @@ import { PredicateConditionalInputsAbi__factory } from '../test/typegen/predicat */ describe('PredicateConditionalInputs', () => { it('should execute custom transaction where predicate transfers to Alice (ALICE PAYS FEES)', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -86,7 +86,7 @@ describe('PredicateConditionalInputs', () => { }); it('should execute custom transaction where predicate transfer to Alice (PREDICATE PAYS FEES)', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, diff --git a/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts b/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts index 929d298165d..5ccec84657b 100644 --- a/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts @@ -23,7 +23,7 @@ describe('Predicate', () => { const amountToPredicate = 900_000; it('calls a predicate with valid address data and returns true', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -58,7 +58,7 @@ describe('Predicate', () => { }); it('calls a predicate with invalid address data and throws error', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -83,7 +83,7 @@ describe('Predicate', () => { }); it('calls a predicate with valid u32 data and returns true', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -119,7 +119,7 @@ describe('Predicate', () => { }); it('calls a predicate with invalid u32 data and returns false', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -149,7 +149,7 @@ describe('Predicate', () => { }); it('calls a predicate with a valid struct argument and returns true', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -227,7 +227,7 @@ describe('Predicate', () => { }); it('can call a Coin predicate which returns true with valid predicate data [main args vector]', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -262,7 +262,7 @@ describe('Predicate', () => { }); it('calls a predicate with valid multiple arguments and returns true', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -299,7 +299,7 @@ describe('Predicate', () => { }); it('calls a predicate with valid multiple arguments and returns true - using setData', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -334,7 +334,7 @@ describe('Predicate', () => { }); it('calls a predicate with invalid multiple arguments and throws error', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, diff --git a/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts b/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts index de88d17a35d..23f817ee797 100644 --- a/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts @@ -22,7 +22,7 @@ describe('Predicate', () => { }; it('calls a predicate with configurables using default values', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -62,7 +62,7 @@ describe('Predicate', () => { }); it('calls a predicate with configurables where first param is equal', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -107,7 +107,7 @@ describe('Predicate', () => { }); it('calls a predicate with configurables where second param is equal', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -152,7 +152,7 @@ describe('Predicate', () => { }); it('calls a predicate with configurables where both params are equal', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -199,7 +199,7 @@ describe('Predicate', () => { }); it('throws when configurable data is not set', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, diff --git a/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts b/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts index 34d14d9b4d6..ddfbbf1364a 100644 --- a/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts @@ -33,7 +33,7 @@ describe('Predicate', () => { const fundingAmount = 10_000; it('estimatePredicates should assign gas to the correct input', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], @@ -130,7 +130,7 @@ describe('Predicate', () => { }); test('predicate does not get estimated again if it has already been estimated', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], @@ -158,7 +158,7 @@ describe('Predicate', () => { }); test('Predicates get estimated if one of them is not estimated', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], @@ -203,7 +203,7 @@ describe('Predicate', () => { }); test('transferring funds from a predicate estimates the predicate and does only one dry run', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], @@ -248,7 +248,7 @@ describe('Predicate', () => { describe('predicate resource fetching and predicateData population', () => { test('getting predicate resources via the predicate automatically populates predicateData', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], @@ -282,7 +282,7 @@ describe('Predicate', () => { }); test('getting predicate resources via the provider requires manual predicateData population', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], diff --git a/packages/fuel-gauge/src/predicate/predicate-input-data.test.ts b/packages/fuel-gauge/src/predicate/predicate-input-data.test.ts index 535b1ab1f26..3e04ed4fb0e 100644 --- a/packages/fuel-gauge/src/predicate/predicate-input-data.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-input-data.test.ts @@ -13,7 +13,7 @@ import { fundPredicate } from './utils/predicate'; describe('Predicate', () => { describe('Input Data', () => { it('throws invalid transaction when input_predicate_data is required for predicate validation', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, wallets: [wallet], diff --git a/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts b/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts index d1aae2da83e..3abe172a170 100644 --- a/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts @@ -34,7 +34,7 @@ describe('Predicate', () => { ); it('should properly populate predicate data and remove placeholder witness [CASE 1]', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, wallets: [wallet], @@ -84,7 +84,7 @@ describe('Predicate', () => { }); it('should properly populate predicate data and remove placeholder witness [CASE 2]', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, wallets: [fundingWallet, wallet1], diff --git a/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts b/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts index 20d61dcfdb6..084e3694c3f 100644 --- a/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts @@ -17,7 +17,7 @@ import { fundPredicate } from './utils/predicate'; describe('Predicate', () => { describe('With script', () => { it('calls a predicate and uses proceeds for a script call', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, wallets: [wallet], diff --git a/packages/fuel-gauge/src/script-with-vectors.test.ts b/packages/fuel-gauge/src/script-with-vectors.test.ts index ec056808846..294026fd21a 100644 --- a/packages/fuel-gauge/src/script-with-vectors.test.ts +++ b/packages/fuel-gauge/src/script-with-vectors.test.ts @@ -13,7 +13,7 @@ import { */ describe('Script With Vectors', () => { it('can call script and use main argument [array]', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], @@ -29,7 +29,7 @@ describe('Script With Vectors', () => { }); it('can call script and use main argument [vec]', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], @@ -59,7 +59,7 @@ describe('Script With Vectors', () => { }); it('can call script and use main argument [struct in vec in struct in vec in struct in vec]', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], @@ -103,7 +103,7 @@ describe('Script With Vectors', () => { }); it('can call script and use main argument [struct in vec in struct in vec in struct in vec]', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], diff --git a/packages/fuel-gauge/src/std-lib-string.test.ts b/packages/fuel-gauge/src/std-lib-string.test.ts index 85711167c26..170a88c5637 100644 --- a/packages/fuel-gauge/src/std-lib-string.test.ts +++ b/packages/fuel-gauge/src/std-lib-string.test.ts @@ -44,7 +44,7 @@ describe('std-lib-string Tests', () => { }); it('should test String input [predicate-std-lib-string]', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -95,7 +95,7 @@ describe('std-lib-string Tests', () => { }); it('should test String input [script-std-lib-string]', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { wallets: [wallet], diff --git a/packages/fuel-gauge/src/transaction-response.test.ts b/packages/fuel-gauge/src/transaction-response.test.ts index 6835578c7f4..926a465e9eb 100644 --- a/packages/fuel-gauge/src/transaction-response.test.ts +++ b/packages/fuel-gauge/src/transaction-response.test.ts @@ -77,7 +77,7 @@ function getSubscriptionStreamFromFetch(streamHolder: { stream: ReadableStream { it('should ensure create method waits till a transaction response is given', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, diff --git a/packages/fuel-gauge/src/transaction-summary.test.ts b/packages/fuel-gauge/src/transaction-summary.test.ts index 55cd1aa85d1..840eafae653 100644 --- a/packages/fuel-gauge/src/transaction-summary.test.ts +++ b/packages/fuel-gauge/src/transaction-summary.test.ts @@ -54,7 +54,7 @@ describe('TransactionSummary', () => { }; it('should ensure getTransactionSummary executes just fine', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -98,7 +98,7 @@ describe('TransactionSummary', () => { }); it('should ensure getTransactionsSummaries executes just fine', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -151,7 +151,7 @@ describe('TransactionSummary', () => { }); it('should ensure getTransactionSummaryFromRequest executes just fine', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -209,7 +209,7 @@ describe('TransactionSummary', () => { }; it('should ensure transfer operation is assembled (ACCOUNT TRANSFER)', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, @@ -522,7 +522,7 @@ describe('TransactionSummary', () => { }); it('should ensure transfer operations are assembled (CUSTOM SCRIPT TRANSFER)', async () => { - using launched = await launchTestNode({}); + using launched = await launchTestNode(); const { provider, From 8809708e3a5c8e7e220d6a594419beb4a860fb7e Mon Sep 17 00:00:00 2001 From: nedsalk Date: Thu, 18 Jul 2024 11:22:12 +0200 Subject: [PATCH 51/53] `bytes.test.ts` to use typegen outputs --- packages/fuel-gauge/src/bytes.test.ts | 63 ++++++++++----------------- 1 file changed, 22 insertions(+), 41 deletions(-) diff --git a/packages/fuel-gauge/src/bytes.test.ts b/packages/fuel-gauge/src/bytes.test.ts index c13f575e7d3..5b950dbeb7d 100644 --- a/packages/fuel-gauge/src/bytes.test.ts +++ b/packages/fuel-gauge/src/bytes.test.ts @@ -1,5 +1,4 @@ -import { bn, Predicate, Wallet, Address } from 'fuels'; -import type { BN } from 'fuels'; +import { bn, Wallet, Address } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; import { PredicateBytesAbi__factory, ScriptBytesAbi__factory } from '../test/typegen'; @@ -8,15 +7,6 @@ import BytesAbiHex from '../test/typegen/contracts/BytesAbi.hex'; import { launchTestContract } from './utils'; -type SomeEnum = { - First?: boolean; - Second?: number[]; -}; - -type Wrapper = { - inner: number[][]; - inner_enum: SomeEnum; -}; /** * @group node * @group browser @@ -27,9 +17,8 @@ describe('Bytes Tests', () => { deployer: BytesAbi__factory, bytecode: BytesAbiHex, }); - const INPUT = 10; - const { waitForResult } = await contractInstance.functions.return_bytes(INPUT).call(); + const { waitForResult } = await contractInstance.functions.return_bytes(10).call(); const { value } = await waitForResult(); expect(value).toStrictEqual(new Uint8Array([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])); @@ -41,9 +30,7 @@ describe('Bytes Tests', () => { bytecode: BytesAbiHex, }); - const INPUT = 100; - - const { waitForResult } = await contractInstance.functions.return_bytes(INPUT).call(); + const { waitForResult } = await contractInstance.functions.return_bytes(100).call(); const { value } = await waitForResult(); expect(value).toStrictEqual(new Uint8Array(Array.from({ length: 100 }, (e, i) => i))); @@ -57,7 +44,7 @@ describe('Bytes Tests', () => { const INPUT = [40, 41, 42]; - const { waitForResult } = await contractInstance.functions.accept_bytes(INPUT).call(); + const { waitForResult } = await contractInstance.functions.accept_bytes(INPUT).call(); const { value } = await waitForResult(); expect(value).toBeUndefined(); @@ -70,14 +57,12 @@ describe('Bytes Tests', () => { }); const bytes = [40, 41, 42]; - const INPUT: Wrapper = { - inner: [bytes, bytes], - inner_enum: { Second: bytes }, - }; - const { waitForResult } = await contractInstance.functions - .accept_nested_bytes(INPUT) - .call(); + .accept_nested_bytes({ + inner: [bytes, bytes], + inner_enum: { Second: bytes }, + }) + .call(); const { value } = await waitForResult(); @@ -101,20 +86,15 @@ describe('Bytes Tests', () => { const receiver = Wallet.fromAddress(Address.fromRandom(), wallet.provider); const amountToPredicate = 500_000; const amountToReceiver = 50; - type MainArgs = [Wrapper]; const bytes = [40, 41, 42]; - const INPUT: Wrapper = { - inner: [bytes, bytes], - inner_enum: { Second: bytes }, - }; - - const predicate = new Predicate({ - bytecode: PredicateBytesAbi__factory.bin, - abi: PredicateBytesAbi__factory.abi, - provider: wallet.provider, - inputData: [INPUT], - }); + + const predicate = PredicateBytesAbi__factory.createInstance(wallet.provider, [ + { + inner: [bytes, bytes], + inner_enum: { Second: bytes }, + }, + ]); // setup predicate const setupTx = await wallet.transfer( @@ -157,14 +137,15 @@ describe('Bytes Tests', () => { } = launched; const bytes = [40, 41, 42]; - const INPUT: Wrapper = { - inner: [bytes, bytes], - inner_enum: { Second: bytes }, - }; const scriptInstance = ScriptBytesAbi__factory.createInstance(wallet); - const { waitForResult } = await scriptInstance.functions.main(1, INPUT).call(); + const { waitForResult } = await scriptInstance.functions + .main(1, { + inner: [bytes, bytes], + inner_enum: { Second: bytes }, + }) + .call(); const { value } = await waitForResult(); expect(value).toBe(true); From 35d2e65cd5cd24865fa20075b998d002e9b28f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nedim=20Salki=C4=87?= Date: Thu, 18 Jul 2024 17:40:02 +0200 Subject: [PATCH 52/53] chore: improve `fuel-gauge` tests (#2789) Co-authored-by: Chad Nehemiah --- .../fuel-gauge/src/await-execution.test.ts | 41 -------- .../fuel-gauge/src/call-test-contract.test.ts | 36 +++---- packages/fuel-gauge/src/doc-examples.test.ts | 63 +----------- packages/fuel-gauge/src/fee.test.ts | 28 +++--- .../src/funding-transaction.test.ts | 3 - .../src/is-function-readonly.test.ts | 27 +++--- packages/fuel-gauge/src/min-gas.test.ts | 15 +-- packages/fuel-gauge/src/options.test.ts | 64 ++++++------- .../fuel-gauge/src/payable-annotation.test.ts | 10 +- .../src/predicate-conditional-inputs.test.ts | 16 +--- .../src/predicate/predicate-arguments.test.ts | 96 +++++-------------- 11 files changed, 109 insertions(+), 290 deletions(-) diff --git a/packages/fuel-gauge/src/await-execution.test.ts b/packages/fuel-gauge/src/await-execution.test.ts index 8ff4f8bb083..9050a922903 100644 --- a/packages/fuel-gauge/src/await-execution.test.ts +++ b/packages/fuel-gauge/src/await-execution.test.ts @@ -38,45 +38,4 @@ describe('await-execution', () => { expect(response.gqlTransaction?.status?.type).toBe('SuccessStatus'); }); - - test.skip('transferring funds with awaitExecution works', async () => { - using launched = await launchTestNode(); - - const { provider } = launched; - - const { - wallets: [genesisWallet], - } = launched; - - const sendTransactionSpy = vi.spyOn(provider, 'sendTransaction'); - - const destination = Wallet.generate({ provider }); - - await genesisWallet.transfer(destination.address, 100, provider.getBaseAssetId(), { - gasLimit: 10_000, - }); - - expect(sendTransactionSpy).toHaveBeenCalledTimes(1); - const awaitExecutionArg = sendTransactionSpy.mock.calls[0][1]; - expect(awaitExecutionArg).toMatchObject({ awaitExecution: true }); - }); - - test('withdrawToBaseLayer works with awaitExecution', async () => { - using launched = await launchTestNode(); - - const { - provider, - wallets: [genesisWallet], - } = launched; - - const sendTransactionSpy = vi.spyOn(provider, 'sendTransaction'); - - const destination = Wallet.generate({ provider }); - - await genesisWallet.withdrawToBaseLayer(destination.address, 100, { - gasLimit: 44442, - }); - - expect(sendTransactionSpy).toHaveBeenCalledTimes(1); - }); }); diff --git a/packages/fuel-gauge/src/call-test-contract.test.ts b/packages/fuel-gauge/src/call-test-contract.test.ts index 0dc4f880bcc..87fa0f729b0 100644 --- a/packages/fuel-gauge/src/call-test-contract.test.ts +++ b/packages/fuel-gauge/src/call-test-contract.test.ts @@ -7,6 +7,9 @@ import bytecode from '../test/typegen/contracts/CallTestContractAbi.hex'; import { launchTestContract } from './utils'; +function setupContract() { + return launchTestContract({ deployer: CallTestContractAbi__factory, bytecode }); +} const U64_MAX = bn(2).pow(64).sub(1); /** @@ -15,8 +18,7 @@ const U64_MAX = bn(2).pow(64).sub(1); */ describe('CallTestContract', () => { it.each([0, 1337, U64_MAX.sub(1)])('can call a contract with u64 (%p)', async (num) => { - using contract = await launchTestContract({ deployer: CallTestContractAbi__factory, bytecode }); - + using contract = await setupContract(); const { waitForResult } = await contract.functions.foo(num).call(); const { value } = await waitForResult(); expect(value.toHex()).toEqual(bn(num).add(1).toHex()); @@ -30,8 +32,7 @@ describe('CallTestContract', () => { [{ a: false, b: U64_MAX.sub(1) }], [{ a: true, b: U64_MAX.sub(1) }], ])('can call a contract with structs (%p)', async (struct) => { - using contract = await launchTestContract({ deployer: CallTestContractAbi__factory, bytecode }); - + using contract = await setupContract(); const { waitForResult } = await contract.functions.boo(struct).call(); const { value } = await waitForResult(); expect(value.a).toEqual(!struct.a); @@ -39,7 +40,7 @@ describe('CallTestContract', () => { }); it('can call a function with empty arguments', async () => { - using contract = await launchTestContract({ deployer: CallTestContractAbi__factory, bytecode }); + using contract = await setupContract(); const call1 = await contract.functions.empty().call(); const { value: empty } = await call1.waitForResult(); @@ -60,7 +61,7 @@ describe('CallTestContract', () => { }); it('function with empty return should resolve undefined', async () => { - using contract = await launchTestContract({ deployer: CallTestContractAbi__factory, bytecode }); + using contract = await setupContract(); // Call method with no params but with no result and no value on config const { waitForResult } = await contract.functions.return_void().call(); @@ -138,10 +139,7 @@ describe('CallTestContract', () => { async (method, { values, expected }) => { // Type cast to Contract because of the dynamic nature of the test // But the function names are type-constrained to correct Contract's type - using contract = await launchTestContract({ - deployer: CallTestContractAbi__factory, - bytecode, - }); + using contract = await setupContract(); const { waitForResult } = await (contract as Contract).functions[method](...values).call(); const { value } = await waitForResult(); @@ -155,7 +153,7 @@ describe('CallTestContract', () => { ); it('Forward amount value on contract call', async () => { - using contract = await launchTestContract({ deployer: CallTestContractAbi__factory, bytecode }); + using contract = await setupContract(); const baseAssetId = contract.provider.getBaseAssetId(); const { waitForResult } = await contract.functions .return_context_amount() @@ -170,7 +168,7 @@ describe('CallTestContract', () => { }); it('Forward asset_id on contract call', async () => { - using contract = await launchTestContract({ deployer: CallTestContractAbi__factory, bytecode }); + using contract = await setupContract(); const assetId = ASSET_A; const { waitForResult } = await contract.functions @@ -186,7 +184,7 @@ describe('CallTestContract', () => { }); it('Forward asset_id on contract simulate call', async () => { - using contract = await launchTestContract({ deployer: CallTestContractAbi__factory, bytecode }); + using contract = await setupContract(); const assetId = ASSET_A; const { waitForResult } = await contract.functions @@ -202,7 +200,7 @@ describe('CallTestContract', () => { }); it('can make multiple calls', async () => { - using contract = await launchTestContract({ deployer: CallTestContractAbi__factory, bytecode }); + using contract = await setupContract(); const num = 1337; const numC = 10; @@ -240,20 +238,14 @@ describe('CallTestContract', () => { }); it('Calling a simple contract function does only one dry run', async () => { - using contract = await launchTestContract({ - deployer: CallTestContractAbi__factory, - bytecode, - }); + using contract = await setupContract(); const dryRunSpy = vi.spyOn(contract.provider.operations, 'dryRun'); await contract.functions.no_params().call(); expect(dryRunSpy).toHaveBeenCalledOnce(); }); it('Simulating a simple contract function does two dry runs', async () => { - using contract = await launchTestContract({ - deployer: CallTestContractAbi__factory, - bytecode, - }); + using contract = await setupContract(); const dryRunSpy = vi.spyOn(contract.provider.operations, 'dryRun'); await contract.functions.no_params().simulate(); diff --git a/packages/fuel-gauge/src/doc-examples.test.ts b/packages/fuel-gauge/src/doc-examples.test.ts index 05762f93263..9860c1893cd 100644 --- a/packages/fuel-gauge/src/doc-examples.test.ts +++ b/packages/fuel-gauge/src/doc-examples.test.ts @@ -1,4 +1,4 @@ -import type { Bech32Address, BigNumberish, Bytes, JsonAbi, WalletLocked } from 'fuels'; +import type { Bech32Address, BigNumberish, Bytes, WalletLocked } from 'fuels'; import { Predicate, bn, @@ -277,67 +277,14 @@ describe('Doc Examples', () => { const receiver = Wallet.generate({ provider }); - const AbiInputs: JsonAbi = { - types: [ - { - typeId: 0, - type: 'bool', - components: null, - typeParameters: null, - }, - { - typeId: 1, - type: 'struct B512', - components: null, - typeParameters: null, - }, - { - typeId: 2, - type: '[_; 3]', - components: [ - { - name: '__array_element', - type: 1, - typeArguments: null, - }, - ], - - typeParameters: null, - }, - ], - functions: [ - { - inputs: [ - { - name: 'data', - type: 2, - typeArguments: null, - }, - ], - name: 'main', - output: { - name: '', - type: 0, - typeArguments: null, - }, - attributes: null, - }, - ], - loggedTypes: [], - configurables: [], - messagesTypes: [], - }; const dataToSign = '0x0000000000000000000000000000000000000000000000000000000000000000'; const signature1 = await wallet1.signMessage(dataToSign); const signature2 = await wallet2.signMessage(dataToSign); const signature3 = await wallet3.signMessage(dataToSign); - const signatures = [signature1, signature2, signature3]; - const predicate = new Predicate({ - bytecode: PredicateTripleSigAbi__factory.bin, - provider, - abi: AbiInputs, - inputData: [signatures], - }); + const predicate = PredicateTripleSigAbi__factory.createInstance(provider, [ + [signature1, signature2, signature3], + ]); + const amountToPredicate = 600_000; const amountToReceiver = 100; diff --git a/packages/fuel-gauge/src/fee.test.ts b/packages/fuel-gauge/src/fee.test.ts index a59ef2226e5..d597321e6ca 100644 --- a/packages/fuel-gauge/src/fee.test.ts +++ b/packages/fuel-gauge/src/fee.test.ts @@ -1,4 +1,4 @@ -import { ContractFactory, Predicate, ScriptTransactionRequest, Wallet, getRandomB256 } from 'fuels'; +import { ContractFactory, ScriptTransactionRequest, Wallet, getRandomB256 } from 'fuels'; import type { BN } from 'fuels'; import { launchTestNode, ASSET_A, ASSET_B, expectToBeInRange } from 'fuels/test-utils'; @@ -193,21 +193,20 @@ describe('Fee', () => { }); it('should ensure fee is properly calculated on a contract call', async () => { - using launched = await launchTestNode(); + using launched = await launchTestNode({ + contractsConfigs: [ + { + deployer: CallTestContractAbi__factory, + bytecode: CallTestContractAbiHex, + }, + ], + }); const { + contracts: [contract], wallets: [wallet], } = launched; - const factory = new ContractFactory( - CallTestContractAbiHex, - CallTestContractAbi__factory.abi, - wallet - ); - - const deploy = await factory.deployContract(); - const { contract } = await deploy.waitForResult(); - const balanceBefore = await wallet.getBalance(); const { waitForResult } = await contract.functions.sum_multparams(1, 2, 3, 4, 5).call(); @@ -319,12 +318,7 @@ describe('Fee', () => { wallets: [wallet], } = launched; - const predicate = new Predicate({ - bytecode: PredicateU32Abi__factory.bin, - abi: PredicateU32Abi__factory.abi, - provider, - inputData: [1078], - }); + const predicate = PredicateU32Abi__factory.createInstance(provider, [1078]); const tx1 = await wallet.transfer(predicate.address, 1_000_000, provider.getBaseAssetId()); await tx1.wait(); diff --git a/packages/fuel-gauge/src/funding-transaction.test.ts b/packages/fuel-gauge/src/funding-transaction.test.ts index 32f66bed68b..322bf5ea276 100644 --- a/packages/fuel-gauge/src/funding-transaction.test.ts +++ b/packages/fuel-gauge/src/funding-transaction.test.ts @@ -49,7 +49,6 @@ describe('Funding Transactions', () => { const initialAmount = 500_000; using launched = await launchTestNode({ walletsConfig: { - count: 2, amountPerCoin: initialAmount, }, }); @@ -163,7 +162,6 @@ describe('Funding Transactions', () => { const initialAmount = 500_000; using launched = await launchTestNode({ walletsConfig: { - count: 2, amountPerCoin: initialAmount, }, }); @@ -216,7 +214,6 @@ describe('Funding Transactions', () => { const initialAmount = 100_000; using launched = await launchTestNode({ walletsConfig: { - count: 2, amountPerCoin: initialAmount, }, }); diff --git a/packages/fuel-gauge/src/is-function-readonly.test.ts b/packages/fuel-gauge/src/is-function-readonly.test.ts index 58c21273d16..7452826857f 100644 --- a/packages/fuel-gauge/src/is-function-readonly.test.ts +++ b/packages/fuel-gauge/src/is-function-readonly.test.ts @@ -3,40 +3,37 @@ import StorageTestContractAbiHex from '../test/typegen/contracts/StorageTestCont import { launchTestContract } from './utils'; +function setupContract() { + return launchTestContract({ + deployer: StorageTestContractAbi__factory, + bytecode: StorageTestContractAbiHex, + }); +} /** * @group node * @group browser */ describe('isReadOnly', () => { test('isReadOnly returns true for a read-only function', async () => { - using contractInstance = await launchTestContract({ - deployer: StorageTestContractAbi__factory, - bytecode: StorageTestContractAbiHex, - }); + using contract = await setupContract(); - const isReadOnly = contractInstance.functions.counter.isReadOnly(); + const isReadOnly = contract.functions.counter.isReadOnly(); expect(isReadOnly).toBe(true); }); test('isReadOnly returns false for a function containing write operations', async () => { - using contractInstance = await launchTestContract({ - deployer: StorageTestContractAbi__factory, - bytecode: StorageTestContractAbiHex, - }); + using contract = await setupContract(); - const isReadOnly = contractInstance.functions.increment_counter.isReadOnly(); + const isReadOnly = contract.functions.increment_counter.isReadOnly(); expect(isReadOnly).toBe(false); }); test('isReadOnly does not throw a runtime error for a function that does not use storage', async () => { - using contractInstance = await launchTestContract({ - deployer: StorageTestContractAbi__factory, - bytecode: StorageTestContractAbiHex, - }); + using contract = await setupContract(); - const isReadOnly = contractInstance.functions.return_true.isReadOnly(); + const isReadOnly = contract.functions.return_true.isReadOnly(); expect(isReadOnly).toBe(true); }); diff --git a/packages/fuel-gauge/src/min-gas.test.ts b/packages/fuel-gauge/src/min-gas.test.ts index 8a36da46632..39a56b19d48 100644 --- a/packages/fuel-gauge/src/min-gas.test.ts +++ b/packages/fuel-gauge/src/min-gas.test.ts @@ -3,7 +3,6 @@ import { TransactionStatus, ScriptTransactionRequest, Address, - Predicate, hexlify, getGasUsedFromReceipts, BigNumberCoder, @@ -118,12 +117,7 @@ describe('Minimum gas tests', () => { /** * Setup predicate */ - const predicate = new Predicate({ - bytecode: ComplexPredicateAbi__factory.bin, - abi: ComplexPredicateAbi__factory.abi, - provider, - inputData: [bn(1000)], - }); + const predicate = ComplexPredicateAbi__factory.createInstance(provider, [bn(1000)]); /** * Fund the predicate @@ -171,12 +165,7 @@ describe('Minimum gas tests', () => { /** * Setup predicate */ - const predicate = new Predicate({ - bytecode: ComplexPredicateAbi__factory.bin, - abi: ComplexPredicateAbi__factory.abi, - provider, - inputData: [bn(1000)], - }); + const predicate = ComplexPredicateAbi__factory.createInstance(provider, [bn(1000)]); /** * Fund the predicate diff --git a/packages/fuel-gauge/src/options.test.ts b/packages/fuel-gauge/src/options.test.ts index 394c9cdbd05..c1662a28e3b 100644 --- a/packages/fuel-gauge/src/options.test.ts +++ b/packages/fuel-gauge/src/options.test.ts @@ -22,9 +22,9 @@ function launchOptionsContract() { */ describe('Options Tests', () => { it('calls', async () => { - using contractInstance = await launchOptionsContract(); + using contract = await launchOptionsContract(); - const { waitForResult } = await contractInstance.functions.print_enum_option_array().call(); + const { waitForResult } = await contract.functions.print_enum_option_array().call(); const { value } = await waitForResult(); expect(value).toStrictEqual({ @@ -47,14 +47,14 @@ describe('Options Tests', () => { const someInput = U8_MAX; const noneInput = undefined; - using contractInstance = await launchOptionsContract(); + using contract = await launchOptionsContract(); - const call1 = await contractInstance.functions.echo_option(someInput).call(); + const call1 = await contract.functions.echo_option(someInput).call(); const { value: someValue } = await call1.waitForResult(); expect(someValue).toBe(someInput); - const call2 = await contractInstance.functions.echo_option(noneInput).call(); + const call2 = await contract.functions.echo_option(noneInput).call(); const { value: noneValue } = await call2.waitForResult(); expect(noneValue).toBe(noneInput); @@ -68,9 +68,9 @@ describe('Options Tests', () => { two: U32_MAX, }; - using contractInstance = await launchOptionsContract(); + using contract = await launchOptionsContract(); - const call1 = await contractInstance.functions.echo_struct_enum_option(someInput).call(); + const call1 = await contract.functions.echo_struct_enum_option(someInput).call(); const { value: someValue } = await call1.waitForResult(); expect(someValue).toStrictEqual(someInput); @@ -82,7 +82,7 @@ describe('Options Tests', () => { two: undefined, }; - const call2 = await contractInstance.functions.echo_struct_enum_option(noneInput).call(); + const call2 = await contract.functions.echo_struct_enum_option(noneInput).call(); const { value: noneValue } = await call2.waitForResult(); expect(noneValue).toStrictEqual(noneInput); @@ -91,23 +91,23 @@ describe('Options Tests', () => { it('echos vec option', async () => { const someInput = [U8_MAX, U16_MAX, U32_MAX]; - using contractInstance = await launchOptionsContract(); + using contract = await launchOptionsContract(); - const call1 = await contractInstance.functions.echo_vec_option(someInput).call(); + const call1 = await contract.functions.echo_vec_option(someInput).call(); const { value: someValue } = await call1.waitForResult(); expect(someValue).toStrictEqual(someInput); const noneInput = [undefined, undefined, undefined]; - const call2 = await contractInstance.functions.echo_vec_option(noneInput).call(); + const call2 = await contract.functions.echo_vec_option(noneInput).call(); const { value: noneValue } = await call2.waitForResult(); expect(noneValue).toStrictEqual(noneInput); const mixedInput = [U8_MAX, undefined, U32_MAX]; - const call3 = await contractInstance.functions.echo_vec_option(mixedInput).call(); + const call3 = await contract.functions.echo_vec_option(mixedInput).call(); const { value: mixedValue } = await call3.waitForResult(); expect(mixedValue).toStrictEqual(mixedInput); @@ -116,9 +116,9 @@ describe('Options Tests', () => { it('echos tuple option', async () => { const someInput = [U8_MAX, U16_MAX]; - using contractInstance = await launchOptionsContract(); + using contract = await launchOptionsContract(); - const call1 = await contractInstance.functions.echo_tuple_option(someInput).call(); + const call1 = await contract.functions.echo_tuple_option(someInput).call(); const { value: someValue } = await call1.waitForResult(); @@ -126,7 +126,7 @@ describe('Options Tests', () => { const noneInput = [undefined, undefined]; - const call2 = await contractInstance.functions.echo_tuple_option(noneInput).call(); + const call2 = await contract.functions.echo_tuple_option(noneInput).call(); const { value: noneValue } = await call2.waitForResult(); @@ -134,7 +134,7 @@ describe('Options Tests', () => { const mixedInput = [U8_MAX, undefined]; - const call3 = await contractInstance.functions.echo_tuple_option(mixedInput).call(); + const call3 = await contract.functions.echo_tuple_option(mixedInput).call(); const { value: mixedValue } = await call3.waitForResult(); @@ -144,9 +144,9 @@ describe('Options Tests', () => { it('echoes enum option', async () => { const someInput = { a: U8_MAX }; - using contractInstance = await launchOptionsContract(); + using contract = await launchOptionsContract(); - const call1 = await contractInstance.functions.echo_enum_option(someInput).call(); + const call1 = await contract.functions.echo_enum_option(someInput).call(); const { value: someValue } = await call1.waitForResult(); @@ -154,7 +154,7 @@ describe('Options Tests', () => { const noneInput = { b: undefined }; - const call2 = await contractInstance.functions.echo_enum_option(noneInput).call(); + const call2 = await contract.functions.echo_enum_option(noneInput).call(); const { value: noneValue } = await call2.waitForResult(); @@ -164,23 +164,23 @@ describe('Options Tests', () => { it('echos array option', async () => { const someInput = [U8_MAX, U16_MAX, 123]; - using contractInstance = await launchOptionsContract(); + using contract = await launchOptionsContract(); - const call1 = await contractInstance.functions.echo_array_option(someInput).call(); + const call1 = await contract.functions.echo_array_option(someInput).call(); const { value: someValue } = await call1.waitForResult(); expect(someValue).toStrictEqual(someInput); const noneInput = [undefined, undefined, undefined]; - const call2 = await contractInstance.functions.echo_array_option(noneInput).call(); + const call2 = await contract.functions.echo_array_option(noneInput).call(); const { value: noneValue } = await call2.waitForResult(); expect(noneValue).toStrictEqual(noneInput); const mixedInput = [U8_MAX, undefined, 123]; - const call3 = await contractInstance.functions.echo_array_option(mixedInput).call(); + const call3 = await contract.functions.echo_array_option(mixedInput).call(); const { value: mixedValue } = await call3.waitForResult(); expect(mixedValue).toStrictEqual(mixedInput); @@ -193,10 +193,8 @@ describe('Options Tests', () => { }, }; - using contractInstance = await launchOptionsContract(); - const { waitForResult } = await contractInstance.functions - .echo_deeply_nested_option(input) - .call(); + using contract = await launchOptionsContract(); + const { waitForResult } = await contract.functions.echo_deeply_nested_option(input).call(); const { value } = await waitForResult(); @@ -214,11 +212,11 @@ describe('Options Tests', () => { }); const { - contracts: [contractInstance], + contracts: [contract], wallets: [wallet], } = launched; - const { waitForResult } = await contractInstance.functions + const { waitForResult } = await contract.functions .get_some_struct({ Address: { bits: wallet.address.toB256() } }) .call(); @@ -228,19 +226,19 @@ describe('Options Tests', () => { }); it('echoes option enum diff sizes', async () => { - using contractInstance = await launchOptionsContract(); + using contract = await launchOptionsContract(); - const call1 = await contractInstance.functions.echo_enum_diff_sizes(undefined).call(); + const call1 = await contract.functions.echo_enum_diff_sizes(undefined).call(); const { value } = await call1.waitForResult(); expect(value).toStrictEqual(undefined); - const call2 = await contractInstance.functions.echo_enum_diff_sizes({ a: U8_MAX }).call(); + const call2 = await contract.functions.echo_enum_diff_sizes({ a: U8_MAX }).call(); const { value: value2 } = await call2.waitForResult(); expect(value2).toStrictEqual({ a: U8_MAX }); - const call3 = await contractInstance.functions + const call3 = await contract.functions .echo_enum_diff_sizes({ b: '0x9ae5b658754e096e4d681c548daf46354495a437cc61492599e33fc64dcdc30c', }) diff --git a/packages/fuel-gauge/src/payable-annotation.test.ts b/packages/fuel-gauge/src/payable-annotation.test.ts index 54a6fe5083f..12ca9b6e9a3 100644 --- a/packages/fuel-gauge/src/payable-annotation.test.ts +++ b/packages/fuel-gauge/src/payable-annotation.test.ts @@ -39,8 +39,8 @@ test("don't allow sending coins to non-payable functions", async () => { const baseAssetId = contract.provider.getBaseAssetId(); // This should fail because the function is not payable - await expect(async () => - contract.functions + expect(async () => { + const tx = await contract.functions .non_payable() .callParams({ forward: { @@ -48,8 +48,10 @@ test("don't allow sending coins to non-payable functions", async () => { assetId: baseAssetId, }, }) - .call() - ).rejects.toThrowError( + .call(); + + await tx.waitForResult(); + }).rejects.toThrowError( `The target function non_payable cannot accept forwarded funds as it's not marked as 'payable'.` ); }); diff --git a/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts b/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts index 8eae297f731..976a41a59ff 100644 --- a/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts +++ b/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts @@ -1,4 +1,4 @@ -import { Predicate, Wallet, ScriptTransactionRequest, bn } from 'fuels'; +import { Wallet, ScriptTransactionRequest, bn } from 'fuels'; import { launchTestNode, ASSET_A, ASSET_B } from 'fuels/test-utils'; import { PredicateConditionalInputsAbi__factory } from '../test/typegen/predicates'; @@ -22,11 +22,8 @@ describe('PredicateConditionalInputs', () => { const amountToTransfer = 1000; - const predicate = new Predicate({ - bytecode: PredicateConditionalInputsAbi__factory.bin, - abi: PredicateConditionalInputsAbi__factory.abi, - provider, - configurableConstants: { MAKER: aliceWallet.address.toB256() }, + const predicate = PredicateConditionalInputsAbi__factory.createInstance(provider, undefined, { + MAKER: aliceWallet.address.toB256(), }); // transfer asset A to predicate so it can transfer to alice @@ -99,11 +96,8 @@ describe('PredicateConditionalInputs', () => { const amountToTransfer = 1000; - const predicate = new Predicate({ - bytecode: PredicateConditionalInputsAbi__factory.bin, - abi: PredicateConditionalInputsAbi__factory.abi, - provider, - configurableConstants: { MAKER: aliceWallet.address.toB256() }, + const predicate = PredicateConditionalInputsAbi__factory.createInstance(provider, undefined, { + MAKER: aliceWallet.address.toB256(), }); // transfer asset A to predicate so it can transfer to alice diff --git a/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts b/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts index 5ccec84657b..58032b34fd8 100644 --- a/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts @@ -1,5 +1,4 @@ -import type { BigNumberish } from 'fuels'; -import { toHex, Predicate, Wallet } from 'fuels'; +import { toHex, Wallet } from 'fuels'; import { launchTestNode } from 'fuels/test-utils'; import { @@ -9,7 +8,6 @@ import { PredicateMultiArgsAbi__factory, PredicateU32Abi__factory, } from '../../test/typegen'; -import type { Validation } from '../types/predicate'; import { fundPredicate, assertBalances } from './utils/predicate'; @@ -30,12 +28,9 @@ describe('Predicate', () => { wallets: [fundingWallet], } = launched; - const predicate = new Predicate<[string]>({ - bytecode: PredicateAddressAbi__factory.bin, - abi: PredicateAddressAbi__factory.abi, - provider, - inputData: ['0xef86afa9696cf0dc6385e2c407a6e159a1103cefb7e2ae0636fb33d3cb2a9e4a'], - }); + const predicate = PredicateAddressAbi__factory.createInstance(provider, [ + '0xef86afa9696cf0dc6385e2c407a6e159a1103cefb7e2ae0636fb33d3cb2a9e4a', + ]); // transfer funds to predicate await fundPredicate(fundingWallet, predicate, amountToPredicate, 3); @@ -65,12 +60,9 @@ describe('Predicate', () => { wallets: [fundingWallet], } = launched; - const predicate = new Predicate<[string]>({ - bytecode: PredicateAddressAbi__factory.bin, - abi: PredicateAddressAbi__factory.abi, - provider, - inputData: ['0xbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbada'], - }); + const predicate = PredicateAddressAbi__factory.createInstance(provider, [ + '0xbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbada', + ]); // fund predicate await fundPredicate(fundingWallet, predicate, amountToPredicate); @@ -90,12 +82,7 @@ describe('Predicate', () => { wallets: [fundingWallet], } = launched; - const predicate = new Predicate<[number]>({ - bytecode: PredicateU32Abi__factory.bin, - abi: PredicateU32Abi__factory.abi, - provider, - inputData: [1078], - }); + const predicate = PredicateU32Abi__factory.createInstance(provider, [1078]); const receiver = Wallet.generate({ provider }); @@ -126,12 +113,7 @@ describe('Predicate', () => { wallets: [fundingWallet], } = launched; - const predicate = new Predicate<[number]>({ - bytecode: PredicateU32Abi__factory.bin, - abi: PredicateU32Abi__factory.abi, - provider, - inputData: [100], - }); + const predicate = PredicateU32Abi__factory.createInstance(provider, [100]); // fund predicate await fundPredicate(fundingWallet, predicate, 90_000_00, 3); @@ -156,12 +138,11 @@ describe('Predicate', () => { wallets: [fundingWallet], } = launched; - const predicateInstanceForBalance = new Predicate<[Validation]>({ - bytecode: PredicateMainArgsStructAbi__factory.bin, - abi: PredicateMainArgsStructAbi__factory.abi, + const predicateInstanceForBalance = PredicateMainArgsStructAbi__factory.createInstance( provider, - inputData: [{ has_account: true, total_complete: 100 }], - }); + [{ has_account: true, total_complete: 100 }] + ); + const receiver = Wallet.generate({ provider }); const initialReceiverBalance = await receiver.getBalance(); @@ -174,12 +155,9 @@ describe('Predicate', () => { await fundTx.waitForResult(); // #region predicate-struct-arg - const predicate = new Predicate<[Validation]>({ - bytecode: PredicateMainArgsStructAbi__factory.bin, - abi: PredicateMainArgsStructAbi__factory.abi, - provider, - inputData: [{ has_account: true, total_complete: 100 }], - }); + const predicate = PredicateMainArgsStructAbi__factory.createInstance(provider, [ + { has_account: true, total_complete: 100 }, + ]); const tx = await predicate.transfer( receiver.address, @@ -204,17 +182,9 @@ describe('Predicate', () => { wallets: [fundingWallet], } = launched; - const predicate = new Predicate<[Validation]>({ - bytecode: PredicateMainArgsStructAbi__factory.bin, - abi: PredicateMainArgsStructAbi__factory.abi, - provider, - inputData: [ - { - has_account: false, - total_complete: 0, - }, - ], - }); + const predicate = PredicateMainArgsStructAbi__factory.createInstance(provider, [ + { has_account: false, total_complete: 0 }, + ]); const receiver = Wallet.generate({ provider }); @@ -234,12 +204,7 @@ describe('Predicate', () => { wallets: [fundingWallet], } = launched; - const predicate = new Predicate<[BigNumberish[]]>({ - bytecode: PredicateMainArgsVectorAbi__factory.bin, - abi: PredicateMainArgsVectorAbi__factory.abi, - provider, - inputData: [[42]], - }); + const predicate = PredicateMainArgsVectorAbi__factory.createInstance(provider, [[42]]); const receiver = Wallet.generate({ provider }); const initialReceiverBalance = await receiver.getBalance(); @@ -273,12 +238,7 @@ describe('Predicate', () => { const initialReceiverBalance = await receiver.getBalance(); // #region predicate-multi-args - const predicate = new Predicate({ - bytecode: PredicateMultiArgsAbi__factory.bin, - abi: PredicateMultiArgsAbi__factory.abi, - provider, - inputData: [20, 30], - }); + const predicate = PredicateMultiArgsAbi__factory.createInstance(provider, [20, 30]); // fund the predicate await fundPredicate(fundingWallet, predicate, amountToPredicate); @@ -309,12 +269,7 @@ describe('Predicate', () => { const receiver = Wallet.generate({ provider }); const initialReceiverBalance = await receiver.getBalance(); - const predicate = new Predicate({ - bytecode: PredicateMultiArgsAbi__factory.bin, - abi: PredicateMultiArgsAbi__factory.abi, - provider, - inputData: [20, 30], - }); + const predicate = PredicateMultiArgsAbi__factory.createInstance(provider, [20, 30]); // fund predicate await fundPredicate(fundingWallet, predicate, amountToPredicate); @@ -341,12 +296,7 @@ describe('Predicate', () => { wallets: [fundingWallet], } = launched; - const predicate = new Predicate({ - bytecode: PredicateMultiArgsAbi__factory.bin, - abi: PredicateMultiArgsAbi__factory.abi, - provider, - inputData: [20, 20], - }); + const predicate = PredicateMultiArgsAbi__factory.createInstance(provider, [20, 20]); // fund predicate await fundPredicate(fundingWallet, predicate, amountToPredicate); From ceacc865fb4f11eaa5dc859524d930bb97d9c030 Mon Sep 17 00:00:00 2001 From: Chad Nehemiah Date: Thu, 18 Jul 2024 15:15:40 -0500 Subject: [PATCH 53/53] test: update payabale-annotation test Co-authored-by: Anderson Arboleya --- packages/fuel-gauge/src/payable-annotation.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fuel-gauge/src/payable-annotation.test.ts b/packages/fuel-gauge/src/payable-annotation.test.ts index 12ca9b6e9a3..0b51e4ae0f7 100644 --- a/packages/fuel-gauge/src/payable-annotation.test.ts +++ b/packages/fuel-gauge/src/payable-annotation.test.ts @@ -39,7 +39,7 @@ test("don't allow sending coins to non-payable functions", async () => { const baseAssetId = contract.provider.getBaseAssetId(); // This should fail because the function is not payable - expect(async () => { + await expect(async () => { const tx = await contract.functions .non_payable() .callParams({