From 74a682c95465ddc26b38030577d244c30d894d05 Mon Sep 17 00:00:00 2001 From: Yulong Date: Tue, 7 May 2024 17:16:11 +0800 Subject: [PATCH] chore(fuel): replace fuels with sub packages (#718) --- packages/sdk/package.json | 8 +- packages/sdk/src/fuel/asset-processor.ts | 3 +- packages/sdk/src/fuel/base-processor.ts | 2 +- packages/sdk/src/fuel/codegen/codegen.ts | 30 +- packages/sdk/src/fuel/context.ts | 9 +- packages/sdk/src/fuel/fuel-processor.ts | 5 +- packages/sdk/src/fuel/network.ts | 2 +- packages/sdk/src/fuel/tests/processor.test.ts | 2 +- packages/sdk/src/fuel/transaction.ts | 19 +- pnpm-lock.yaml | 427 +----------------- 10 files changed, 65 insertions(+), 442 deletions(-) diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 75db2f2a5f..0c574269d1 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -62,7 +62,12 @@ "dependencies": { "@aptos-labs/ts-sdk": "~1.13.0", "@coral-xyz/borsh": "^0.29.0", - "@fuel-ts/abi-typegen": "^0.82.0", + "@fuel-ts/abi-typegen": "0.81.0", + "@fuel-ts/account": "0.81.0", + "@fuel-ts/address": "0.81.0", + "@fuel-ts/contract": "0.81.0", + "@fuel-ts/program": "0.81.0", + "@fuel-ts/transactions": "0.81.0", "@mysten/sui.js": "~0.51.0", "@project-serum/anchor": "^0.26.0", "@sentio/bigdecimal": "9.1.1-patch.3", @@ -78,7 +83,6 @@ "chalk": "^5.3.0", "csv-parse": "^5.5.3", "ethers": "npm:@sentio/ethers@6.7.1-patch.4", - "fuels": "^0.81.0", "js-sha3": "^0.9.3", "lru-cache": "^10.2.0", "mkdirp": "^1.0.4", diff --git a/packages/sdk/src/fuel/asset-processor.ts b/packages/sdk/src/fuel/asset-processor.ts index 701bae84ed..a73a14b04f 100644 --- a/packages/sdk/src/fuel/asset-processor.ts +++ b/packages/sdk/src/fuel/asset-processor.ts @@ -3,7 +3,8 @@ import { Data_FuelCall, FuelAssetHandlerConfig_AssetFilter } from '@sentio/proto import { FuelNetwork, getRpcEndpoint } from './network.js' import { FuelContext } from './context.js' import { decodeFuelTransaction } from './transaction.js' -import { InputType, OutputType, Provider } from 'fuels' +import { Provider } from '@fuel-ts/account' +import { InputType, OutputType } from '@fuel-ts/transactions' export class FuelAssetProcessor implements FuelBaseProcessor { callHandlers: CallHandler[] = [] diff --git a/packages/sdk/src/fuel/base-processor.ts b/packages/sdk/src/fuel/base-processor.ts index 58865a5524..4a116feeb3 100644 --- a/packages/sdk/src/fuel/base-processor.ts +++ b/packages/sdk/src/fuel/base-processor.ts @@ -1,5 +1,5 @@ import { FuelProcessor, FuelProcessorConfig } from './fuel-processor.js' -import { JsonAbi } from 'fuels' +import { JsonAbi } from '@fuel-ts/abi-coder' import { FuelCall, FuelContext } from './context.js' import { FuelFetchConfig } from './transaction.js' import { FuelChainId } from '@sentio/chain' diff --git a/packages/sdk/src/fuel/codegen/codegen.ts b/packages/sdk/src/fuel/codegen/codegen.ts index 41432908e0..0494bcd25f 100644 --- a/packages/sdk/src/fuel/codegen/codegen.ts +++ b/packages/sdk/src/fuel/codegen/codegen.ts @@ -15,7 +15,22 @@ export async function codegen(abisDir: string, outDir: string) { } function patchImport(contents: string) { - return contents.replace(/from\s+['"](\..+)['"]/g, `from '\$1.js'`) + return contents + .replace( + `import { Interface, Contract, ContractFactory } from "fuels";`, + `import { Contract, } from "@fuel-ts/program"; +import { ContractFactory } from "@fuel-ts/contract"; +import { Interface } from "@fuel-ts/abi-coder";` + ) + .replace( + `import type { Provider, Account, AbstractAddress, BytesLike, DeployContractOptions, StorageSlot } from "fuels"; +`, + `import type { Provider, Account } from "@fuel-ts/account"; +import type { AbstractAddress, BytesLike } from "@fuel-ts/interfaces"; +import type { DeployContractOptions } from "@fuel-ts/contract"; +import type { StorageSlot } from "@fuel-ts/transactions";` + ) + .replace(/from\s+['"](\..+)['"]/g, `from '\$1.js'`) } function patchEnumType(contents: string) { @@ -65,12 +80,13 @@ async function codegenInternal(abisDir: string, outDir: string): Promise mkdirp.sync(outDir) mkdirp.sync(path.join(outDir, 'factories')) - + let count = 0 abiTypeGen.files.forEach((file) => { if (!file.path.endsWith('.hex.ts')) { let content = patchImport(file.contents) content = patchEnumType(content) writeFileSync(file.path, content) + count++ } }) @@ -89,11 +105,8 @@ import {${abi.name}__factory } from './factories/${abi.name}__factory.js' import {${abi.commonTypesInUse.join(',')}} from './common.js' import {${importedTypes.join(',')}} from './${abi.name}.js' -import type { - BigNumberish, - BN, - BytesLike, -} from 'fuels'; +import type { BigNumberish, BN } from '@fuel-ts/math'; +import type { BytesLike } from '@fuel-ts/interfaces'; namespace ${name} { @@ -116,9 +129,10 @@ ${abi.functions.map((f) => genOnCallFunction(name, f)).join('\n')} } ` writeFileSync(filePath, content) + count++ } - return allABIFiles.length + return count } function genCallType(f: IFunction) { diff --git a/packages/sdk/src/fuel/context.ts b/packages/sdk/src/fuel/context.ts index cb86e4c1bf..b5c267eb4c 100644 --- a/packages/sdk/src/fuel/context.ts +++ b/packages/sdk/src/fuel/context.ts @@ -1,7 +1,7 @@ import { BaseContext, Labels, normalizeLabels } from '../core/index.js' import { ChainId } from '@sentio/chain' import { RecordMetaData } from '@sentio/protos' -import { BaseAssetId, InputType, InvocationCallResult } from 'fuels' +import { InvocationCallResult } from '@fuel-ts/program' import { FuelTransaction } from './transaction.js' export type FuelCall = InvocationCallResult @@ -21,13 +21,6 @@ export class FuelContext extends BaseContext { } protected getMetaDataInternal(name: string, labels: Labels): RecordMetaData { - let address = '' - for (const input of this.transaction?.transaction?.inputs || []) { - if (input.type == InputType.Coin && input.assetId == BaseAssetId) { - address = input.owner - } - } - return { address: this.contractAddress, contractName: this.contractName, diff --git a/packages/sdk/src/fuel/fuel-processor.ts b/packages/sdk/src/fuel/fuel-processor.ts index 60a8174e15..cb67b91c8e 100644 --- a/packages/sdk/src/fuel/fuel-processor.ts +++ b/packages/sdk/src/fuel/fuel-processor.ts @@ -1,6 +1,9 @@ import { Data_FuelCall, FuelCallFilter } from '@sentio/protos' import { FuelCall, FuelContext } from './context.js' -import { bn, Contract, Interface, InvocationCallResult, JsonAbi, Provider } from 'fuels' +import { Provider } from '@fuel-ts/account' +import { Contract, InvocationCallResult } from '@fuel-ts/program' +import { Interface, JsonAbi } from '@fuel-ts/abi-coder' +import { bn } from '@fuel-ts/math' import { FuelNetwork, getRpcEndpoint } from './network.js' import { decodeFuelTransactionWithAbi, diff --git a/packages/sdk/src/fuel/network.ts b/packages/sdk/src/fuel/network.ts index 326542f765..afae07cdaf 100644 --- a/packages/sdk/src/fuel/network.ts +++ b/packages/sdk/src/fuel/network.ts @@ -1,5 +1,5 @@ import { FuelChainId } from '@sentio/chain' -import { FUEL_BETA_5_NETWORK_URL, FUEL_NETWORK_URL } from 'fuels' +import { FUEL_BETA_5_NETWORK_URL, FUEL_NETWORK_URL } from '@fuel-ts/account/configs' export type FuelNetwork = FuelChainId export const FuelNetwork = { diff --git a/packages/sdk/src/fuel/tests/processor.test.ts b/packages/sdk/src/fuel/tests/processor.test.ts index 0fb072de84..a3b9337e71 100644 --- a/packages/sdk/src/fuel/tests/processor.test.ts +++ b/packages/sdk/src/fuel/tests/processor.test.ts @@ -6,9 +6,9 @@ import abi from './abis/counter-contract-abi.json' import testData from './test-data.json' import testTransferData from './transfer-data.json' import { FuelAssetProcessor } from '../asset-processor.js' -import { BaseAssetId } from 'fuels' import { afterAll } from '@jest/globals' import { State } from '@sentio/runtime' +import { BaseAssetId } from '@fuel-ts/address/configs' describe('fuel network tests', () => { const ADDRESS = '0x730adcb9974977e0f4fd46488b6aac04dade7d846d15ca026bff61279e265813' diff --git a/packages/sdk/src/fuel/transaction.ts b/packages/sdk/src/fuel/transaction.ts index d101b52d06..eefd8e6f95 100644 --- a/packages/sdk/src/fuel/transaction.ts +++ b/packages/sdk/src/fuel/transaction.ts @@ -1,13 +1,7 @@ -import { - AbiMap, - arrayify, - assembleTransactionSummary, - bn, - processGqlReceipt, - Provider, - TransactionCoder, - TransactionSummary -} from 'fuels' +import { AbiMap, assembleTransactionSummary, processGqlReceipt, Provider, TransactionSummary } from '@fuel-ts/account' +import { TransactionCoder } from '@fuel-ts/transactions' +import { bn } from '@fuel-ts/math' +import { arrayify } from '@fuel-ts/utils' export type FuelFetchConfig = { includeFailed?: boolean @@ -25,7 +19,7 @@ export function decodeFuelTransaction(gqlTransaction: any, provider: Provider): const rawPayload = arrayify(gqlTransaction.rawPayload) const [decodedTransaction] = new TransactionCoder().decode(rawPayload, 0) - const { gasPerByte, gasPriceFactor, maxInputs, gasCosts } = provider.getChain().consensusParameters + const { gasCosts, maxInputs, gasPerByte, gasPriceFactor } = provider.getChain().consensusParameters const blockNumber = gqlTransaction.status?.block?.header?.height return { ...assembleTransactionSummary({ @@ -50,7 +44,8 @@ export function decodeFuelTransactionWithAbi(gqlTransaction: any, abiMap: AbiMap const receipts = gqlTransaction.receipts?.map(processGqlReceipt) || [] - const { gasPerByte, gasPriceFactor, maxInputs, gasCosts } = provider.getChain().consensusParameters + const { gasCosts, maxInputs, gasPerByte, gasPriceFactor } = provider.getChain().consensusParameters + const blockNumber = gqlTransaction.status?.block?.header?.height return { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 513ded6652..d3ebc81d97 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -433,8 +433,23 @@ importers: specifier: ^0.29.0 version: 0.29.0(@solana/web3.js@1.89.1) '@fuel-ts/abi-typegen': - specifier: ^0.82.0 - version: 0.82.0 + specifier: 0.81.0 + version: 0.81.0 + '@fuel-ts/account': + specifier: 0.81.0 + version: 0.81.0 + '@fuel-ts/address': + specifier: 0.81.0 + version: 0.81.0 + '@fuel-ts/contract': + specifier: 0.81.0 + version: 0.81.0 + '@fuel-ts/program': + specifier: 0.81.0 + version: 0.81.0 + '@fuel-ts/transactions': + specifier: 0.81.0 + version: 0.81.0 '@mysten/sui.js': specifier: ~0.51.0 version: 0.51.0 @@ -480,9 +495,6 @@ importers: ethers: specifier: npm:@sentio/ethers@6.7.1-patch.4 version: /@sentio/ethers@6.7.1-patch.4 - fuels: - specifier: ^0.81.0 - version: 0.81.0 js-sha3: specifier: ^0.9.3 version: 0.9.3 @@ -1227,15 +1239,6 @@ packages: kuler: 2.0.0 dev: false - /@esbuild/aix-ppc64@0.19.12: - resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [aix] - requiresBuild: true - dev: false - optional: true - /@esbuild/android-arm64@0.17.19: resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==} engines: {node: '>=12'} @@ -1244,15 +1247,6 @@ packages: requiresBuild: true optional: true - /@esbuild/android-arm64@0.19.12: - resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - requiresBuild: true - dev: false - optional: true - /@esbuild/android-arm@0.17.19: resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==} engines: {node: '>=12'} @@ -1261,15 +1255,6 @@ packages: requiresBuild: true optional: true - /@esbuild/android-arm@0.19.12: - resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - requiresBuild: true - dev: false - optional: true - /@esbuild/android-x64@0.17.19: resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==} engines: {node: '>=12'} @@ -1278,15 +1263,6 @@ packages: requiresBuild: true optional: true - /@esbuild/android-x64@0.19.12: - resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - requiresBuild: true - dev: false - optional: true - /@esbuild/darwin-arm64@0.17.19: resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==} engines: {node: '>=12'} @@ -1295,15 +1271,6 @@ packages: requiresBuild: true optional: true - /@esbuild/darwin-arm64@0.19.12: - resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: false - optional: true - /@esbuild/darwin-x64@0.17.19: resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==} engines: {node: '>=12'} @@ -1312,15 +1279,6 @@ packages: requiresBuild: true optional: true - /@esbuild/darwin-x64@0.19.12: - resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: false - optional: true - /@esbuild/freebsd-arm64@0.17.19: resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==} engines: {node: '>=12'} @@ -1329,15 +1287,6 @@ packages: requiresBuild: true optional: true - /@esbuild/freebsd-arm64@0.19.12: - resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - requiresBuild: true - dev: false - optional: true - /@esbuild/freebsd-x64@0.17.19: resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==} engines: {node: '>=12'} @@ -1346,15 +1295,6 @@ packages: requiresBuild: true optional: true - /@esbuild/freebsd-x64@0.19.12: - resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - requiresBuild: true - dev: false - optional: true - /@esbuild/linux-arm64@0.17.19: resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==} engines: {node: '>=12'} @@ -1363,15 +1303,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-arm64@0.19.12: - resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: false - optional: true - /@esbuild/linux-arm@0.17.19: resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==} engines: {node: '>=12'} @@ -1380,15 +1311,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-arm@0.19.12: - resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: false - optional: true - /@esbuild/linux-ia32@0.17.19: resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==} engines: {node: '>=12'} @@ -1397,15 +1319,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-ia32@0.19.12: - resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - requiresBuild: true - dev: false - optional: true - /@esbuild/linux-loong64@0.17.19: resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==} engines: {node: '>=12'} @@ -1414,15 +1327,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-loong64@0.19.12: - resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - requiresBuild: true - dev: false - optional: true - /@esbuild/linux-mips64el@0.17.19: resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==} engines: {node: '>=12'} @@ -1431,15 +1335,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-mips64el@0.19.12: - resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - requiresBuild: true - dev: false - optional: true - /@esbuild/linux-ppc64@0.17.19: resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==} engines: {node: '>=12'} @@ -1448,15 +1343,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-ppc64@0.19.12: - resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - requiresBuild: true - dev: false - optional: true - /@esbuild/linux-riscv64@0.17.19: resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==} engines: {node: '>=12'} @@ -1465,15 +1351,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-riscv64@0.19.12: - resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - requiresBuild: true - dev: false - optional: true - /@esbuild/linux-s390x@0.17.19: resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==} engines: {node: '>=12'} @@ -1482,15 +1359,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-s390x@0.19.12: - resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - requiresBuild: true - dev: false - optional: true - /@esbuild/linux-x64@0.17.19: resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==} engines: {node: '>=12'} @@ -1499,15 +1367,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-x64@0.19.12: - resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: false - optional: true - /@esbuild/netbsd-x64@0.17.19: resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==} engines: {node: '>=12'} @@ -1516,15 +1375,6 @@ packages: requiresBuild: true optional: true - /@esbuild/netbsd-x64@0.19.12: - resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - requiresBuild: true - dev: false - optional: true - /@esbuild/openbsd-x64@0.17.19: resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==} engines: {node: '>=12'} @@ -1533,15 +1383,6 @@ packages: requiresBuild: true optional: true - /@esbuild/openbsd-x64@0.19.12: - resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - requiresBuild: true - dev: false - optional: true - /@esbuild/sunos-x64@0.17.19: resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==} engines: {node: '>=12'} @@ -1550,15 +1391,6 @@ packages: requiresBuild: true optional: true - /@esbuild/sunos-x64@0.19.12: - resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - requiresBuild: true - dev: false - optional: true - /@esbuild/win32-arm64@0.17.19: resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==} engines: {node: '>=12'} @@ -1567,15 +1399,6 @@ packages: requiresBuild: true optional: true - /@esbuild/win32-arm64@0.19.12: - resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: false - optional: true - /@esbuild/win32-ia32@0.17.19: resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==} engines: {node: '>=12'} @@ -1584,15 +1407,6 @@ packages: requiresBuild: true optional: true - /@esbuild/win32-ia32@0.19.12: - resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: false - optional: true - /@esbuild/win32-x64@0.17.19: resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==} engines: {node: '>=12'} @@ -1601,15 +1415,6 @@ packages: requiresBuild: true optional: true - /@esbuild/win32-x64@0.19.12: - resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: false - optional: true - /@eslint-community/eslint-utils@4.4.0(eslint@8.56.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -1733,23 +1538,6 @@ packages: rimraf: 3.0.2 dev: false - /@fuel-ts/abi-typegen@0.82.0: - resolution: {integrity: sha512-K0CLVR0F893GvMe+/mwR2YoGEpB2lxa3KHxgtzWJ8qmjaVrRmRobDoF8TG+leVzaif0sGjInrEciYKFUzwvWow==} - engines: {node: ^18.18.2 || ^20.0.0} - hasBin: true - dependencies: - '@fuel-ts/errors': 0.82.0 - '@fuel-ts/interfaces': 0.82.0 - '@fuel-ts/utils': 0.82.0 - '@fuel-ts/versions': 0.82.0 - commander: 9.5.0 - glob: 10.3.10 - handlebars: 4.7.8 - mkdirp: 1.0.4 - ramda: 0.29.1 - rimraf: 3.0.2 - dev: false - /@fuel-ts/account@0.81.0: resolution: {integrity: sha512-VOqpT2x9Wdx+D+OOhOj2zaUaTvOjmsLh68VYUGNU1DEhmqErapi2CsvlYDigKxR4DU6o44ikOmU0Loft5qHwPg==} engines: {node: ^18.18.2 || ^20.0.0} @@ -1839,33 +1627,6 @@ packages: '@fuel-ts/versions': 0.81.0 dev: false - /@fuel-ts/errors@0.82.0: - resolution: {integrity: sha512-mVk/zbN39Vmi8BAYeiARCpQi0f1pQ7NtMC93BAiqsumoOmT+p4I7whq3CKal8/gD/sFfJNhkqMI3GbOcEZzq2Q==} - engines: {node: ^18.18.2 || ^20.0.0} - dependencies: - '@fuel-ts/versions': 0.82.0 - dev: false - - /@fuel-ts/forc@0.81.0: - resolution: {integrity: sha512-WLJLgFnSnuFx+3/sDrK7On1cOiGnrhBo1qQJ2NWGWj1GGWVqcwrilZCSTeBz0VB/z89DMKVxg3v8mq+cSOnJcA==} - hasBin: true - requiresBuild: true - dependencies: - node-fetch: 2.7.0 - transitivePeerDependencies: - - encoding - dev: false - - /@fuel-ts/fuel-core@0.81.0: - resolution: {integrity: sha512-jfU0ZoVNPqibesRUbIjswhEDp5NQ9U+ead+ceL5C/8hLLeYsT6NjD/MPgK+xu2OYmAqBmUakwN1cfIfOvEVeTQ==} - hasBin: true - requiresBuild: true - dependencies: - node-fetch: 2.7.0 - transitivePeerDependencies: - - encoding - dev: false - /@fuel-ts/hasher@0.81.0: resolution: {integrity: sha512-Ile54vAZZHOd0NDGsO5lHDsRj0psr56Berhy9JkRL7SoRAMUHkpghA49XPvtP02AA71HuFchUzYDsnbrPUxTqA==} engines: {node: ^18.18.2 || ^20.0.0} @@ -1884,11 +1645,6 @@ packages: engines: {node: ^18.18.2 || ^20.0.0} dev: false - /@fuel-ts/interfaces@0.82.0: - resolution: {integrity: sha512-wdbylQ5DjInl/3daF6ro4sD8fOo2dtwEiq8AAAgN8ezDeye2HiAQHOnALk1xbzWrEEanH2V89RsSr7UDJ8LIYg==} - engines: {node: ^18.18.2 || ^20.0.0} - dev: false - /@fuel-ts/math@0.81.0: resolution: {integrity: sha512-lQayJIgEGBiH0rR4BWMoHZzOVX3xTLxfTv0Btm2i9ni0sUR8ZouT6zGEHwBT8ytNahXCpjvX7/nPZu9w0f5w1Q==} engines: {node: ^18.18.2 || ^20.0.0} @@ -1929,26 +1685,6 @@ packages: - utf-8-validate dev: false - /@fuel-ts/script@0.81.0: - resolution: {integrity: sha512-tJnnmx2BSP4YuoSwAvaPMsM2LTNudjzXsxd5iApZDJ1q8OfSTwwY8TYQm//SadZxUTtov4fAw0UorfwF0QK26w==} - engines: {node: ^18.18.2 || ^20.0.0} - dependencies: - '@fuel-ts/abi-coder': 0.81.0 - '@fuel-ts/account': 0.81.0 - '@fuel-ts/address': 0.81.0 - '@fuel-ts/errors': 0.81.0 - '@fuel-ts/interfaces': 0.81.0 - '@fuel-ts/math': 0.81.0 - '@fuel-ts/program': 0.81.0 - '@fuel-ts/transactions': 0.81.0 - '@fuel-ts/utils': 0.81.0 - transitivePeerDependencies: - - bufferutil - - encoding - - supports-color - - utf-8-validate - dev: false - /@fuel-ts/transactions@0.81.0: resolution: {integrity: sha512-ySHBQGV0r4LbA9ZQcp9ds25K9AeykGQPoJQtA6RrnF8xeUrwRxoVqVhdsNwG/rKzACBd2aB+KwMAlsu6EMr7FQ==} engines: {node: ^18.18.2 || ^20.0.0} @@ -1973,14 +1709,6 @@ packages: '@fuel-ts/interfaces': 0.81.0 dev: false - /@fuel-ts/utils@0.82.0: - resolution: {integrity: sha512-xbdSS8Iws8rDsEl3R4jXyqv/jmvpoBFkQNQ6XL37C9h3x1h9iBBMxbhpg5dVRyakpZPx7Why04mEqQkKOrp6WA==} - engines: {node: ^18.18.2 || ^20.0.0} - dependencies: - '@fuel-ts/errors': 0.82.0 - '@fuel-ts/interfaces': 0.82.0 - dev: false - /@fuel-ts/versions@0.81.0: resolution: {integrity: sha512-QVNTYwn1ip7ivER3EYiTlERyglYjPVYwA4wHcjvjqIxPjoguMGrSBjqmsdOj4sMDMa9bYEAIXTGZhN3CvaMJHg==} engines: {node: ^18.18.2 || ^20.0.0} @@ -1990,15 +1718,6 @@ packages: cli-table: 0.3.11 dev: false - /@fuel-ts/versions@0.82.0: - resolution: {integrity: sha512-G550LAw6tofjpVe0JqdPve1335DusBU8S+bUxw03tTeqHqLMYuOmU1VQ1cOO1KL/piXukqA+x3AxjPqa2NSosA==} - engines: {node: ^18.18.2 || ^20.0.0} - hasBin: true - dependencies: - chalk: 4.1.2 - cli-table: 0.3.11 - dev: false - /@fuels/vm-asm@0.42.1: resolution: {integrity: sha512-5e0IDHen26hrKc93ejYNDhQFbqi+EQ7xPpFJcUnSrz0+6zPdPhA2dtwh5UqN0fYDM5AcEFd0wpq+r7Pd2XS5AQ==} dev: false @@ -3531,6 +3250,8 @@ packages: /@types/lodash@4.14.202: resolution: {integrity: sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==} requiresBuild: true + dev: true + optional: true /@types/long@4.0.2: resolution: {integrity: sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==} @@ -4598,16 +4319,6 @@ packages: load-tsconfig: 0.2.5 dev: false - /bundle-require@4.0.2(esbuild@0.19.12): - resolution: {integrity: sha512-jwzPOChofl67PSTW2SGubV9HBQAhhR2i6nskiOThauo9dzwDUgOWQScFVaJkjEfYX+UXiD+LEx8EblQMc2wIag==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - peerDependencies: - esbuild: '>=0.17' - dependencies: - esbuild: 0.19.12 - load-tsconfig: 0.2.5 - dev: false - /bytes@3.1.2: resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} engines: {node: '>= 0.8'} @@ -5598,37 +5309,6 @@ packages: '@esbuild/win32-ia32': 0.17.19 '@esbuild/win32-x64': 0.17.19 - /esbuild@0.19.12: - resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - optionalDependencies: - '@esbuild/aix-ppc64': 0.19.12 - '@esbuild/android-arm': 0.19.12 - '@esbuild/android-arm64': 0.19.12 - '@esbuild/android-x64': 0.19.12 - '@esbuild/darwin-arm64': 0.19.12 - '@esbuild/darwin-x64': 0.19.12 - '@esbuild/freebsd-arm64': 0.19.12 - '@esbuild/freebsd-x64': 0.19.12 - '@esbuild/linux-arm': 0.19.12 - '@esbuild/linux-arm64': 0.19.12 - '@esbuild/linux-ia32': 0.19.12 - '@esbuild/linux-loong64': 0.19.12 - '@esbuild/linux-mips64el': 0.19.12 - '@esbuild/linux-ppc64': 0.19.12 - '@esbuild/linux-riscv64': 0.19.12 - '@esbuild/linux-s390x': 0.19.12 - '@esbuild/linux-x64': 0.19.12 - '@esbuild/netbsd-x64': 0.19.12 - '@esbuild/openbsd-x64': 0.19.12 - '@esbuild/sunos-x64': 0.19.12 - '@esbuild/win32-arm64': 0.19.12 - '@esbuild/win32-ia32': 0.19.12 - '@esbuild/win32-x64': 0.19.12 - dev: false - /escalade@3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} engines: {node: '>=6'} @@ -6357,49 +6037,6 @@ packages: requiresBuild: true optional: true - /fuels@0.81.0: - resolution: {integrity: sha512-m7Ll1y2FK9tC2osIa2S203+feQv5O1iNojEL5cav9jwKGBUsoXyF9PonN7ZEjZk8LWjbs6sNLv0lzZ/ZUx6gPA==} - engines: {node: ^18.18.2 || ^20.0.0} - hasBin: true - dependencies: - '@fuel-ts/abi-coder': 0.81.0 - '@fuel-ts/abi-typegen': 0.81.0 - '@fuel-ts/account': 0.81.0 - '@fuel-ts/address': 0.81.0 - '@fuel-ts/contract': 0.81.0 - '@fuel-ts/crypto': 0.81.0 - '@fuel-ts/errors': 0.81.0 - '@fuel-ts/forc': 0.81.0 - '@fuel-ts/fuel-core': 0.81.0 - '@fuel-ts/hasher': 0.81.0 - '@fuel-ts/interfaces': 0.81.0 - '@fuel-ts/math': 0.81.0 - '@fuel-ts/merkle': 0.81.0 - '@fuel-ts/program': 0.81.0 - '@fuel-ts/script': 0.81.0 - '@fuel-ts/transactions': 0.81.0 - '@fuel-ts/utils': 0.81.0 - '@fuel-ts/versions': 0.81.0 - bundle-require: 4.0.2(esbuild@0.19.12) - chalk: 4.1.2 - chokidar: 3.5.3 - commander: 9.5.0 - esbuild: 0.19.12 - glob: 10.3.10 - handlebars: 4.7.8 - joycon: 3.1.1 - lodash.camelcase: 4.3.0 - portfinder: 1.0.32 - toml: 3.0.0 - tree-kill: 1.2.2 - yup: 0.32.11 - transitivePeerDependencies: - - bufferutil - - encoding - - supports-color - - utf-8-validate - dev: false - /function-bind@1.1.2: resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} @@ -7958,6 +7595,7 @@ packages: /lodash-es@4.17.21: resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==} + dev: true /lodash.assignwith@4.2.0: resolution: {integrity: sha512-ZznplvbvtjK2gMvnQ1BR/zqPFZmS6jbK4p+6Up4xcRYA7yMIwxHCfbTcrYxXKzzqLsQ05eJPVznEW3tuwV7k1g==} @@ -8293,10 +7931,6 @@ packages: resolution: {integrity: sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==} dev: true - /nanoclone@0.2.1: - resolution: {integrity: sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==} - dev: false - /natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} @@ -9070,10 +8704,6 @@ packages: dev: true optional: true - /property-expr@2.0.6: - resolution: {integrity: sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==} - dev: false - /proto-list@1.2.4: resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==} @@ -10321,10 +9951,6 @@ packages: /toml@3.0.0: resolution: {integrity: sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==} - /toposort@2.0.2: - resolution: {integrity: sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==} - dev: false - /tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} @@ -11072,19 +10698,6 @@ packages: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} - /yup@0.32.11: - resolution: {integrity: sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==} - engines: {node: '>=10'} - dependencies: - '@babel/runtime': 7.23.9 - '@types/lodash': 4.14.202 - lodash: 4.17.21 - lodash-es: 4.17.21 - nanoclone: 0.2.1 - property-expr: 2.0.6 - toposort: 2.0.2 - dev: false - /zen-observable-ts@1.2.5: resolution: {integrity: sha512-QZWQekv6iB72Naeake9hS1KxHlotfRpe+WGNbNx5/ta+R3DNjVO2bswf63gXlWDcs+EMd7XY8HfVQyP1X6T4Zg==} requiresBuild: true