Don't serialize args in account.ts

Convert args in transaction.functionCall
near · Aug 3, 2020 · 4c568fb · 4c568fb
1 parent f859641
commit 4c568fb
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/lib/account.js b/lib/account.js
diff --git a/lib/transaction.d.ts b/lib/transaction.d.ts
diff --git a/lib/transaction.js b/lib/transaction.js
diff --git a/src/account.ts b/src/account.ts
@@ -277,7 +277,7 @@ export class Account {
  async functionCall(contractId: string, methodName: string, args: any, gas?: BN, amount?: BN): Promise<FinalExecutionOutcome> {
  args = args || {};
  this.validateArgs(args);
- return this.signAndSendTransaction(contractId, [functionCall(methodName, Buffer.from(JSON.stringify(args)), gas || DEFAULT_FUNC_CALL_GAS, amount)]);
+ return this.signAndSendTransaction(contractId, [functionCall(methodName, args, gas || DEFAULT_FUNC_CALL_GAS, amount)]);
  }
 
  /**
@@ -316,6 +316,11 @@ export class Account {
  }
 
  private validateArgs(args: any) {
+ const isUint8Array = args.byteLength !== undefined && args.byteLength === args.length;
+ if (isUint8Array) {
+ return;
+ }
+
  if (Array.isArray(args) || typeof args !== 'object') {
  throw new PositionalArgsError();
  }

diff --git a/src/transaction.ts b/src/transaction.ts
@@ -51,8 +51,11 @@ export function deployContract(code: Uint8Array): Action {
  return new Action({ deployContract: new DeployContract({code}) });
 }
 
-export function functionCall(methodName: string, args: Uint8Array, gas: BN, deposit: BN): Action {
- return new Action({functionCall: new FunctionCall({methodName, args, gas, deposit }) });
+export function functionCall(methodName: string, args: Uint8Array | object, gas: BN, deposit: BN): Action {
+ const anyArgs = args as any;
+ const isUint8Array = anyArgs.byteLength !== undefined && anyArgs.byteLength === anyArgs.length;
+ const serializedArgs = isUint8Array ? args : Buffer.from(JSON.stringify(args));
+ return new Action({functionCall: new FunctionCall({methodName, args: serializedArgs, gas, deposit }) });
 }
 
 export function transfer(deposit: BN): Action {