feat: upgrade ethers v5 -> v6

.changeset/rare-foxes-flash.md

@@ -0,0 +1,23 @@
+---
+"@fuel-ts/docs-snippets": patch
+"@fuel-ts/abi-coder": patch
+"@fuel-ts/abi-typegen": patch
+"@fuel-ts/address": patch
+"@fuel-ts/contract": patch
+"@fuel-ts/crypto": patch
+"fuels": patch
+"@fuel-ts/hasher": patch
+"@fuel-ts/hdwallet": patch
+"@fuel-ts/merkle": patch
+"@fuel-ts/mnemonic": patch
+"@fuel-ts/predicate": patch
+"@fuel-ts/program": patch
+"@fuel-ts/providers": patch
+"@fuel-ts/script": patch
+"@fuel-ts/signer": patch
+"@fuel-ts/transactions": patch
+"@fuel-ts/utils": patch
+"@fuel-ts/wallet": patch
+---
+
+refactor: purge usage of `arrayify` from ethers v5 in favor of `getBytes` from ethers v6

apps/docs-snippets/src/guide/types/conversion.test.ts

@@ -77,7 +77,7 @@ describe(__filename, () => {
     expect(address3.toB256()).toEqual(assetId);
 
     // consistent bytes conversion
-    expect(arrayify(assetId)).toEqual(arrayify(address1));
+    expect(arrayify(assetId)).toEqual(arrayify(address1.toB256()));
     // #endregion conversion-4
   });
 });

jest.env.ts

@@ -1,4 +1,4 @@
-import { hexlify } from '@ethersproject/bytes';
+import { hexlify } from 'ethers';
 
 import faucets from './.fuel-core/configs/faucets.json';
 
@@ -28,8 +28,7 @@ const getPrivateKeyForCurrentWorker = () => {
     throw new Error(`At most ${faucets.length} workers are supported.`);
   }
 
-  const privateKey = hexlify([workerId]);
-
+  const privateKey = hexlify(Uint8Array.from([workerId]));
   return privateKey;
 };
 

package.json

@@ -45,7 +45,6 @@
   "devDependencies": {
     "@changesets/cli": "^2.25.0",
     "@changesets/get-github-info": "^0.5.2",
-    "@ethersproject/bytes": "^5.7.0",
     "@fuel-ts/forc": "workspace:*",
     "@fuel-ts/fuel-core": "workspace:*",
     "@internal/tsup": "workspace:*",
@@ -71,6 +70,7 @@
     "eslint-plugin-react": "^7.31.10",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-tsdoc": "^0.2.17",
+    "ethers": "^6.7.1",
     "glob": "^10.2.6",
     "jest": "^29.5.0",
     "jest-text-transformer": "^1.0.4",

packages/abi-coder/package.json

@@ -24,16 +24,12 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@ethersproject/abi": "^5.7.0",
-    "@ethersproject/bignumber": "^5.7.0",
-    "@ethersproject/bytes": "^5.7.0",
-    "@ethersproject/properties": "^5.7.0",
-    "@ethersproject/sha2": "^5.7.0",
-    "@ethersproject/strings": "^5.7.0",
     "@fuel-ts/crypto": "workspace:*",
     "@fuel-ts/math": "workspace:*",
     "@fuel-ts/versions": "workspace:*",
+    "@fuel-ts/utils": "workspace:*",
     "@fuel-ts/errors": "workspace:*",
+    "ethers": "^6.7.1",
     "type-fest": "^3.1.0"
   }
 }

packages/abi-coder/src/coders/abstract-coder.ts

@@ -1,6 +1,6 @@
-import type { BytesLike } from '@ethersproject/bytes';
 import { FuelError, type ErrorCode } from '@fuel-ts/errors';
 import type { BN } from '@fuel-ts/math';
+import type { BytesLike } from 'ethers';
 
 import type { Option } from './option';
 

packages/abi-coder/src/coders/b256.ts

@@ -1,6 +1,6 @@
-import { arrayify } from '@ethersproject/bytes';
 import { ErrorCode } from '@fuel-ts/errors';
 import { bn, toHex } from '@fuel-ts/math';
+import { getBytesCopy } from 'ethers';
 
 import { Coder } from './abstract-coder';
 
@@ -12,7 +12,7 @@ export class B256Coder extends Coder<string, string> {
   encode(value: string): Uint8Array {
     let encodedValue;
     try {
-      encodedValue = arrayify(value);
+      encodedValue = getBytesCopy(value);
     } catch (error) {
       this.throwError(ErrorCode.ENCODE_ERROR, `Invalid ${this.type}.`);
     }

packages/abi-coder/src/coders/b512.ts

@@ -1,6 +1,6 @@
-import { arrayify } from '@ethersproject/bytes';
 import { ErrorCode } from '@fuel-ts/errors';
 import { bn, toHex } from '@fuel-ts/math';
+import { getBytesCopy } from 'ethers';
 
 import { Coder } from './abstract-coder';
 
@@ -12,7 +12,7 @@ export class B512Coder extends Coder<string, string> {
   encode(value: string): Uint8Array {
     let encodedValue;
     try {
-      encodedValue = arrayify(value);
+      encodedValue = getBytesCopy(value);
     } catch (error) {
       this.throwError(ErrorCode.ENCODE_ERROR, `Invalid ${this.type}.`);
     }

packages/abi-coder/src/coders/byte.ts

@@ -1,6 +1,6 @@
-import { arrayify, concat } from '@ethersproject/bytes';
 import { ErrorCode } from '@fuel-ts/errors';
 import { bn } from '@fuel-ts/math';
+import { concatBytes } from '@fuel-ts/utils';
 
 import { WORD_SIZE } from '../constants';
 import type { Uint8ArrayWithDynamicData } from '../utilities';
@@ -43,14 +43,14 @@ export class ByteCoder extends Coder<number[], Uint8Array> {
   }
 
   #getPaddedData(value: number[]): Uint8Array {
-    const data: Uint8Array[] = [arrayify(value)];
+    const data: Uint8Array[] = [Uint8Array.from(value)];
 
     const paddingLength = (WORD_SIZE - (value.length % WORD_SIZE)) % WORD_SIZE;
     if (paddingLength) {
       data.push(new Uint8Array(paddingLength));
     }
 
-    return concat(data);
+    return concatBytes(data);
   }
 
   decode(data: Uint8Array, offset: number): [Uint8Array, number] {

packages/abi-coder/src/coders/enum.ts

@@ -1,6 +1,6 @@
-import { concat } from '@ethersproject/bytes';
 import { ErrorCode, FuelError } from '@fuel-ts/errors';
 import { toNumber } from '@fuel-ts/math';
+import { concatBytes } from '@fuel-ts/utils';
 import type { RequireExactlyOne } from 'type-fest';
 
 import { concatWithDynamicData } from '../utilities';
@@ -50,7 +50,7 @@ export class EnumCoder<TCoders extends Record<string, Coder>> extends Coder<
     const caseIndex = Object.keys(this.coders).indexOf(value);
 
     const padding = new Uint8Array(this.#encodedValueSize - valueCoder.encodedLength);
-    return concat([this.#caseIndexCoder.encode(caseIndex), padding, encodedValue]);
+    return concatBytes([this.#caseIndexCoder.encode(caseIndex), padding, encodedValue]);
   }
 
   encode(value: InputValueOf<TCoders>): Uint8Array {

packages/abi-coder/src/coders/stdString.ts

@@ -1,6 +1,6 @@
-import { concat } from '@ethersproject/bytes';
-import { toUtf8Bytes, toUtf8String } from '@ethersproject/strings';
 import { bn } from '@fuel-ts/math';
+import { concatBytes } from '@fuel-ts/utils';
+import { toUtf8Bytes, toUtf8String } from 'ethers';
 
 import { WORD_SIZE } from '../constants';
 import type { Uint8ArrayWithDynamicData } from '../utilities';
@@ -46,7 +46,7 @@ export class StdStringCoder extends Coder<string, string> {
       data.push(new Uint8Array(paddingLength));
     }
 
-    return concat(data);
+    return concatBytes(data);
   }
 
   decode(data: Uint8Array, offset: number): [string, number] {

packages/abi-coder/src/coders/string.ts

@@ -1,6 +1,6 @@
-import { concat } from '@ethersproject/bytes';
-import { toUtf8Bytes, toUtf8String } from '@ethersproject/strings';
 import { ErrorCode } from '@fuel-ts/errors';
+import { concatBytes } from '@fuel-ts/utils';
+import { toUtf8Bytes, toUtf8String } from 'ethers';
 
 import { Coder } from './abstract-coder';
 
@@ -23,7 +23,7 @@ export class StringCoder<TLength extends number = number> extends Coder<string,
 
     const encoded = toUtf8Bytes(value);
     const padding = new Uint8Array(this.#paddingLength);
-    return concat([encoded, padding]);
+    return concatBytes([encoded, padding]);
   }
 
   decode(data: Uint8Array, offset: number): [string, number] {

packages/abi-coder/src/function-fragment.ts

@@ -1,9 +1,8 @@
-import type { BytesLike } from '@ethersproject/bytes';
-import { arrayify } from '@ethersproject/bytes';
-import { sha256 } from '@ethersproject/sha2';
 import { bufferFromString } from '@fuel-ts/crypto';
 import { ErrorCode, FuelError } from '@fuel-ts/errors';
 import { bn } from '@fuel-ts/math';
+import type { BytesLike } from 'ethers';
+import { sha256, getBytesCopy } from 'ethers';
 
 import { AbiCoder } from './abi-coder';
 import type { DecodedValue, InputValue } from './coders/abstract-coder';
@@ -144,7 +143,7 @@ export class FunctionFragment<
   }
 
   decodeArguments(data: BytesLike) {
-    const bytes = arrayify(data);
+    const bytes = getBytesCopy(data);
     const nonEmptyInputs = this.jsonFn.inputs.filter(
       (x) => findOrThrow(this.jsonAbi.types, (t) => t.typeId === x.type).type !== '()'
     );
@@ -193,7 +192,7 @@ export class FunctionFragment<
     );
     if (outputAbiType.type === '()') return [undefined, 0];
 
-    const bytes = arrayify(data);
+    const bytes = getBytesCopy(data);
     const coder = AbiCoder.getCoder(this.jsonAbi, this.jsonFn.output);
 
     if (outputAbiType.type === 'raw untyped slice') {

packages/abi-coder/src/interface.ts

@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import type { BytesLike } from '@ethersproject/bytes';
-import { arrayify } from '@ethersproject/bytes';
 import { ErrorCode, FuelError } from '@fuel-ts/errors';
+import { getBytesCopy, type BytesLike } from 'ethers';
 
 import { AbiCoder } from './abi-coder';
 import type { InputValue } from './coders/abstract-coder';
@@ -98,7 +97,7 @@ export class Interface<TAbi extends JsonAbi = JsonAbi> {
 
     const { loggedType } = findOrThrow(this.jsonAbi.loggedTypes, (type) => type.logId === logId);
 
-    return AbiCoder.decode(this.jsonAbi, loggedType, arrayify(data), 0);
+    return AbiCoder.decode(this.jsonAbi, loggedType, getBytesCopy(data), 0);
   }
 
   updateExternalLoggedTypes(id: string, loggedTypes: Interface) {