near-api-js 7.0.1 → 7.0.2

package/lib/tokens/ft/index.d.ts

@@ -1,4 +1,4 @@
-import type { AccountLike } from '../../types/index.js';
+import type { Account } from '../../accounts/account.js';
 interface FTMetadata {
     spec?: string;
     name: string;
@@ -30,7 +30,7 @@ declare abstract class BaseFT {
      * @param account The account to get the balance of
      * @returns
      */
-    abstract getBalance(account: AccountLike): Promise<bigint>;
+    abstract getBalance(account: Account): Promise<bigint>;
     /**
      * Transfer tokens from one account to another
      *
@@ -40,28 +40,28 @@ declare abstract class BaseFT {
      * @param param.amount The amount of tokens to transfer in the smallest unit
      */
     abstract transfer({ from, receiverId, amount, }: {
-        from: AccountLike;
+        from: Account;
         receiverId: string;
         amount: string | number | bigint;
     }): Promise<any>;
 }
 export declare class NativeToken extends BaseFT {
     transfer({ from, receiverId, amount, }: {
-        from: AccountLike;
+        from: Account;
         receiverId: string;
         amount: string | number | bigint;
     }): Promise<any>;
-    getBalance(account: AccountLike): Promise<bigint>;
+    getBalance(account: Account): Promise<bigint>;
 }
 export declare class FungibleToken extends BaseFT {
     readonly accountId: string;
     constructor(accountId: string, metadata: FTMetadata);
     transfer({ from, receiverId, amount, }: {
-        from: AccountLike;
+        from: Account;
         receiverId: string;
         amount: string | number | bigint;
     }): Promise<any>;
-    getBalance(account: AccountLike): Promise<bigint>;
+    getBalance(account: Account): Promise<bigint>;
     /**
      * Transfer tokens and call a function on the receiver contract,
      * only works if the receiver implements the `ft_on_transfer` method
@@ -73,7 +73,7 @@ export declare class FungibleToken extends BaseFT {
      * @param param.msg The message to send to the `ft_on_transfer` method
      */
     transferCall({ from, receiverId, amount, msg, }: {
-        from: AccountLike;
+        from: Account;
         receiverId: string;
         amount: bigint;
         msg: string;
@@ -86,8 +86,8 @@ export declare class FungibleToken extends BaseFT {
      * @param param.fundingAccount The Account that will fund the registration
      */
     registerAccount({ accountIdToRegister, fundingAccount, }: {
-        accountIdToRegister: AccountLike;
-        fundingAccount: AccountLike;
+        accountIdToRegister: string;
+        fundingAccount: Account;
     }): Promise<any>;
     /**
      * Unregister an account from the fungible token contract by paying a storage deposit
@@ -97,7 +97,7 @@ export declare class FungibleToken extends BaseFT {
      * @param param.force Whether to remove the account without claiming the storage deposit
      */
     unregisterAccount({ account, force }: {
-        account: AccountLike;
+        account: Account;
         force: boolean;
     }): Promise<any>;
 }

package/lib/tokens/ft/index.js

@@ -1,3 +1,4 @@
+import { actions } from '../../transactions/action_creators.js';
 import { formatAmount, parseAmount } from './format.js';
 class BaseFT {
     constructor(metadata) {
@@ -28,7 +29,7 @@ export class NativeToken extends BaseFT {
     async transfer({ from, receiverId, amount, }) {
         return from.signAndSendTransaction({
             receiverId,
-            actions: [{ transfer: { deposit: amount.toString() } }],
+            actions: [actions.transfer(BigInt(amount))],
         });
     }
     async getBalance(account) {
@@ -55,8 +56,10 @@ export class FungibleToken extends BaseFT {
         });
     }
     async getBalance(account) {
-        const balance = await account.provider.callFunction(this.accountId, 'ft_balance_of', {
-            account_id: account.accountId,
+        const balance = await account.provider.callFunction({
+            contractId: this.accountId,
+            method: 'ft_balance_of',
+            args: { account_id: account.accountId },
         });
         return BigInt(balance);
     }
@@ -91,8 +94,12 @@ export class FungibleToken extends BaseFT {
      * @param param.fundingAccount The Account that will fund the registration
      */
     async registerAccount({ accountIdToRegister, fundingAccount, }) {
-        const { result } = await fundingAccount.provider.callFunction(this.accountId, 'storage_balance_bounds', {});
-        const requiredDeposit = result.min;
+        const bounds = (await fundingAccount.provider.callFunction({
+            contractId: this.accountId,
+            method: 'storage_balance_bounds',
+            args: {},
+        }));
+        const requiredDeposit = bounds.min;
         return fundingAccount.callFunction({
             contractId: this.accountId,
             methodName: 'storage_deposit',

package/lib/tokens/mt/index.d.ts

@@ -1,4 +1,4 @@
-import type { AccountLike } from '../../types/index.js';
+import type { Account } from '../../accounts/account.js';
 export declare class MultiTokenContract {
     readonly accountId: string;
     constructor(accountId: string);
@@ -9,7 +9,7 @@ export declare class MultiTokenContract {
      * @param tokenId The token to retrieve the balance from
      * @returns The balance in the smallest unit as bigint
      */
-    getBalance(account: AccountLike, tokenId: string): Promise<bigint>;
+    getBalance(account: Account, tokenId: string): Promise<bigint>;
     /**
      * Get the available balances of an account for the given tokens in indivisible units
      *
@@ -17,7 +17,7 @@ export declare class MultiTokenContract {
      * @param tokenIds The tokens to retrieve the balances from
      * @returns The balances in the smallest unit as bigint[] matching the order of tokenIds
      */
-    getBatchedBalance(account: AccountLike, tokenIds: string[]): Promise<bigint[]>;
+    getBatchedBalance(account: Account, tokenIds: string[]): Promise<bigint[]>;
     /**
      * Transfer tokens from one account to another
      *
@@ -30,7 +30,7 @@ export declare class MultiTokenContract {
      * @param param.memo Optional memo for indexing
      */
     transfer({ from, receiverId, tokenId, amount, approval, memo, }: {
-        from: AccountLike;
+        from: Account;
         receiverId: string;
         tokenId: string;
         amount: string | number | bigint;
@@ -51,7 +51,7 @@ export declare class MultiTokenContract {
      * @param param.memo Optional memo for indexing
      */
     transferCall({ from, receiverId, tokenId, amount, msg, approval, memo, }: {
-        from: AccountLike;
+        from: Account;
         receiverId: string;
         tokenId: string;
         amount: bigint;
@@ -71,7 +71,7 @@ export declare class MultiTokenContract {
      * @param param.memo Optional memo for indexing
      */
     batchTransfer({ from, receiverId, tokenIds, amounts, approvals, memo, }: {
-        from: AccountLike;
+        from: Account;
         receiverId: string;
         tokenIds: string[];
         amounts: Array<string | number | bigint>;

package/lib/tokens/mt/index.js

@@ -10,9 +10,13 @@ export class MultiTokenContract {
      * @returns The balance in the smallest unit as bigint
      */
     async getBalance(account, tokenId) {
-        const balance = await account.provider.callFunction(this.accountId, 'mt_balance_of', {
-            account_id: account.accountId,
-            token_id: tokenId,
+        const balance = await account.provider.callFunction({
+            contractId: this.accountId,
+            method: 'mt_balance_of',
+            args: {
+                account_id: account.accountId,
+                token_id: tokenId,
+            },
         });
         return BigInt(balance);
     }
@@ -24,9 +28,13 @@ export class MultiTokenContract {
      * @returns The balances in the smallest unit as bigint[] matching the order of tokenIds
      */
     async getBatchedBalance(account, tokenIds) {
-        const balances = await account.provider.callFunction(this.accountId, 'mt_batch_balance_of', {
-            account_id: account.accountId,
-            token_ids: tokenIds,
+        const balances = await account.provider.callFunction({
+            contractId: this.accountId,
+            method: 'mt_batch_balance_of',
+            args: {
+                account_id: account.accountId,
+                token_ids: tokenIds,
+            },
         });
         return balances.map((b) => BigInt(b));
     }

package/lib/tokens/nft/index.d.ts

@@ -1,4 +1,4 @@
-import type { AccountLike } from '../../types/index.js';
+import type { Account } from '../../accounts/account.js';
 interface ContractMetadata {
     spec?: string;
     name: string;
@@ -27,7 +27,7 @@ export declare class NFTContract {
     readonly accountId: string;
     constructor(accountId: string, metadata: ContractMetadata);
     transfer({ from, receiverId, tokenId }: {
-        from: AccountLike;
+        from: Account;
         receiverId: string;
         tokenId: string;
     }): Promise<any>;

package/lib/types/index.d.ts

@@ -1,4 +1,3 @@
-export * from './accounts.js';
 export * from './assignable.js';
 export * from './enum.js';
 export * from './errors.js';

package/lib/types/index.js

@@ -1,4 +1,3 @@
-export * from './accounts.js';
 export * from './assignable.js';
 export * from './enum.js';
 export * from './errors.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "near-api-js",
   "description": "JavaScript library to interact with NEAR Protocol via RPC API",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/near/near-api-js.git"

package/lib/types/accounts.d.ts

@@ -1,20 +0,0 @@
-interface ProviderLike {
-    callFunction: (contractId: any, methodName: any, args: any, blockQuery?: any) => Promise<any>;
-}
-export interface AccountLike {
-    accountId: string;
-    provider: ProviderLike;
-    getState(): Promise<any>;
-    signAndSendTransaction({ receiverId, actions }: {
-        receiverId: any;
-        actions: any;
-    }): Promise<any>;
-    callFunction({ contractId, methodName, args, gas, deposit }: {
-        contractId: any;
-        methodName: any;
-        args: any;
-        gas: any;
-        deposit: any;
-    }): Promise<any>;
-}
-export {};

package/lib/types/accounts.js

@@ -1 +0,0 @@
-export {};