refactor (#26)

* refactor

* refactor

* refactor

* refactor

* refactor

* refactor

* refactor

* refactor

Author: hanakannzashi

README.md

@@ -55,7 +55,7 @@ const msAccount = MultiSendAccount.fromAccount(account);
 
 // one transaction that contains two actions
 const mTx = MultiTransaction
-  .batch('wrap.near')
+  .batch({ receiverId: 'wrap.near' })
   .functionCall({
     methodName: 'ft_transfer',
     args: {
@@ -88,7 +88,7 @@ const msAccount = MultiSendAccount.fromAccount(account);
 
 // two transactions, each contains one action
 const mTx = MultiTransaction
-  .batch('wrap.near')
+  .batch({ receiverId: 'wrap.near' })
   .functionCall({
     methodName: 'ft_transfer',
     args: {
@@ -98,7 +98,7 @@ const mTx = MultiTransaction
     attachedDeposit: Amount.ONE_YOCTO,
     gas: Gas.parse('10', 'T')
   })
-  .batch('usdt.tether-token.near')
+  .batch({ receiverId: 'usdt.tether-token.near' })
   .functionCall({
     methodName: 'ft_transfer',
     args: {

package.json

@@ -20,7 +20,7 @@
     "@near-wallet-selector/core": "^8.9.2",
     "bignumber.js": "^9.1.2",
     "bn.js": "^5.2.1",
-    "borsher": "^2.3.0",
+    "borsher": "^2.4.0",
     "buffer": "^6.0.3",
     "near-api-js": "^2.1.4"
   },

src/core/MultiSendAccount.ts

@@ -6,10 +6,11 @@ import {
   throwReceiptErrorsFromOutcomes,
   Stringifier,
   Parser,
-  parseOutcomeValue,
+  parseOutcome,
   BlockQuery,
 } from '../utils';
 import { MultiTransaction, EmptyArgs } from './transaction';
+import { SendError } from '../errors';
 
 export class MultiSendAccount extends Account implements View, Call, Send {
   private constructor(connection: Connection, accountId: string) {
@@ -50,7 +51,7 @@ export class MultiSendAccount extends Account implements View, Call, Send {
    */
   async call<Value, Args = EmptyArgs>(options: MultiSendAccountCallOptions<Value, Args>): Promise<Value> {
     const outcome = await this.callRaw(options);
-    return parseOutcomeValue(outcome, options.parser);
+    return parseOutcome(outcome, options.parser);
   }
 
   /**
@@ -65,7 +66,7 @@ export class MultiSendAccount extends Account implements View, Call, Send {
     stringifier,
     ...options
   }: MultiSendAccountCallRawOptions<Args>): Promise<FinalExecutionOutcome> {
-    const mTx = MultiTransaction.batch(contractId).functionCall({
+    const mTx = MultiTransaction.batch({ receiverId: contractId }).functionCall({
       methodName,
       args,
       attachedDeposit,
@@ -78,23 +79,27 @@ export class MultiSendAccount extends Account implements View, Call, Send {
 
   /**
    * Send multiple transactions and return success value of last transaction
-   * @param mTx Multiple transactions
-   * @param options Options
+   * @param mTx mTx
+   * @param options options
    */
   async send<Value>(mTx: MultiTransaction, options?: MultiSendAccountSendOptions<Value>): Promise<Value> {
     const outcomes = await this.sendRaw(mTx, options);
     const outcome = outcomes[outcomes.length - 1];
-    return parseOutcomeValue(outcome, options?.parser);
+    return parseOutcome(outcome, options?.parser);
   }
 
   /**
    * Send multiple transactions
-   * @param mTx Multiple transactions
-   * @param options Options
+   * @param mTx mTx
+   * @param options options
    */
   async sendRaw(mTx: MultiTransaction, options?: MultiSendAccountSendRawOptions): Promise<FinalExecutionOutcome[]> {
     const transactions = parseNearApiJsTransactions(mTx);
 
+    if (transactions.length === 0) {
+      throw new SendError('Transaction not found.');
+    }
+
     const outcomes: FinalExecutionOutcome[] = [];
 
     for (const transaction of transactions) {

src/core/MultiSendWalletSelector.ts

@@ -18,16 +18,17 @@ import {
   Stringifier,
   throwReceiptErrorsFromOutcomes,
   endless,
-  parseOutcomeValue,
+  parseOutcome,
   BlockQuery,
 } from '../utils';
 import { MultiSendWalletSelectorSendOptions } from '../types';
 import { BigNumber } from 'bignumber.js';
+import { SendError } from '../errors';
 
 let multiSendWalletSelector: MultiSendWalletSelector | null = null;
 
 export async function setupMultiSendWalletSelector(
-  options: MultiSendWalletSelectorOptions
+  options: MultiSendWalletSelectorOptions,
 ): Promise<MultiSendWalletSelector> {
   if (!multiSendWalletSelector) {
     let selector: WalletSelector;
@@ -54,7 +55,7 @@ export async function setupMultiSendWalletSelector(
 
       async isLoginAccessKeyActive(
         accountId?: string,
-        requiredMinAllowance = Amount.parse('0.01', 'NEAR')
+        requiredMinAllowance = Amount.parse('0.01', 'NEAR'),
       ): Promise<boolean> {
         accountId = accountId ?? this.getActiveAccountId();
         if (!accountId) {
@@ -73,7 +74,7 @@ export async function setupMultiSendWalletSelector(
         const accessKeys = await this.near.account(accountId).then((account) => account.getAccessKeys());
         const loginAccessKey = accessKeys.find(
           (accessKey) =>
-            PublicKey.fromString(accessKey.public_key).toString() === PublicKey.fromString(loginPublicKey).toString()
+            PublicKey.fromString(accessKey.public_key).toString() === PublicKey.fromString(loginPublicKey).toString(),
         );
 
         if (!loginAccessKey) {
@@ -115,7 +116,7 @@ export async function setupMultiSendWalletSelector(
 
       async call<Value, Args = EmptyArgs>(options: MultiSendWalletSelectorCallOptions<Value, Args>): Promise<Value> {
         const outcome = await this.callRaw(options);
-        return parseOutcomeValue(outcome, options.parser);
+        return parseOutcome(outcome, options.parser);
       },
 
       async callRaw<Args = EmptyArgs>({
@@ -127,7 +128,7 @@ export async function setupMultiSendWalletSelector(
         stringifier,
         ...options
       }: MultiSendWalletSelectorCallRawOptions<Args>): Promise<FinalExecutionOutcome> {
-        const mTx = MultiTransaction.batch(contractId).functionCall({
+        const mTx = MultiTransaction.batch({ receiverId: contractId }).functionCall({
           methodName,
           args,
           attachedDeposit,
@@ -141,20 +142,24 @@ export async function setupMultiSendWalletSelector(
       async send<Value>(mTx: MultiTransaction, options?: MultiSendWalletSelectorSendOptions<Value>): Promise<Value> {
         const outcomes = await this.sendRaw(mTx, options);
         const outcome = outcomes?.[outcomes.length - 1];
-        return parseOutcomeValue(outcome, options?.parser);
+        return parseOutcome(outcome, options?.parser);
       },
 
       async sendRaw(
         mTx: MultiTransaction,
-        options?: MultiSendWalletSelectorSendRawOptions
+        options?: MultiSendWalletSelectorSendRawOptions,
       ): Promise<FinalExecutionOutcome[]> {
-        const wallet = await this.wallet(options?.walletId);
         const transactions = parseNearWalletSelectorTransactions(mTx);
-        let outcomes: FinalExecutionOutcome[] | undefined;
 
         if (transactions.length === 0) {
-          throw Error(`Transaction not found.`);
-        } else if (transactions.length === 1) {
+          throw new SendError('Transaction not found.');
+        }
+
+        const wallet = await this.wallet(options?.walletId);
+
+        let outcomes: FinalExecutionOutcome[] | undefined;
+
+        if (transactions.length === 1) {
           const outcome = await wallet.signAndSendTransaction({
             ...transactions[0],
             callbackUrl: options?.callbackUrl,