Merge branch 'master' into aa/feat/fuels-cli

FuelLabs · Nov 3, 2023 · e356e5b · e356e5b
2 parents b98d4c1 + 2ddda9f
commit e356e5b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/.changeset/forty-items-cross.md b/.changeset/forty-items-cross.md
@@ -0,0 +1,5 @@
+---
+"@fuel-ts/wallet": minor
+---
+
+fix transferToContract for amounts higher than u16
diff --git a/packages/fuel-gauge/src/contract.test.ts b/packages/fuel-gauge/src/contract.test.ts
@@ -899,13 +899,14 @@ describe('Contract', () => {
    */
   it('should tranfer asset to a deployed contract just fine (NATIVE ASSET)', async () => {
     const provider = await Provider.create(FUEL_NETWORK_URL);
-    const wallet = await generateTestWallet(provider, [[500_000, BaseAssetId]]);
+    const wallet = await generateTestWallet(provider, [[10_000_000_000, BaseAssetId]]);
 
     const contract = await setupContract();
 
     const initialBalance = new BN(await contract.getBalance(BaseAssetId)).toNumber();
 
-    const amountToContract = 200;
+    const u64Amount = bn(5_000_000_000);
+    const amountToContract = u64Amount;
 
     const tx = await wallet.transferToContract(contract.id, amountToContract, BaseAssetId, {
       gasPrice,
@@ -915,7 +916,7 @@ describe('Contract', () => {
 
     const finalBalance = new BN(await contract.getBalance(BaseAssetId)).toNumber();
 
-    expect(finalBalance).toBe(initialBalance + amountToContract);
+    expect(finalBalance).toBe(initialBalance + amountToContract.toNumber());
   });
 
   it('should tranfer asset to a deployed contract just fine (NOT NATIVE ASSET)', async () => {

diff --git a/packages/wallet/src/utils.test.ts b/packages/wallet/src/utils.test.ts
@@ -1,4 +1,4 @@
-import { NumberCoder } from '@fuel-ts/abi-coder';
+import { U64Coder } from '@fuel-ts/abi-coder';
 import { BaseAssetId } from '@fuel-ts/address/configs';
 import type { BigNumberish } from '@fuel-ts/math';
 import * as getBytesCopyMod from 'ethers';
@@ -24,9 +24,7 @@ describe('util', () => {
   it('should ensure "formatScriptDataForTransferringToContract" returns script data just fine', () => {
     const byte: number[] = [0, 0, 0, 0, 0, 0, 0, 1];
 
-    const encode = jest
-      .spyOn(NumberCoder.prototype, 'encode')
-      .mockReturnValue(Uint8Array.from(byte));
+    const encode = jest.spyOn(U64Coder.prototype, 'encode').mockReturnValue(Uint8Array.from(byte));
 
     const arrayify = jest
       .spyOn(getBytesCopyMod, 'getBytesCopy')

diff --git a/packages/wallet/src/utils.ts b/packages/wallet/src/utils.ts
@@ -1,4 +1,4 @@
-import { NumberCoder } from '@fuel-ts/abi-coder';
+import { U64Coder } from '@fuel-ts/abi-coder';
 import type { B256Address } from '@fuel-ts/interfaces';
 import { BN, type BigNumberish } from '@fuel-ts/math';
 import * as asm from '@fuels/vm-asm';
@@ -43,7 +43,7 @@ export const formatScriptDataForTransferringToContract = (
   amountToTransfer: BigNumberish,
   assetId: BytesLike
 ) => {
-  const numberCoder = new NumberCoder('u16');
+  const numberCoder = new U64Coder();
 
   const encoded = numberCoder.encode(new BN(amountToTransfer).toNumber());