feat: allow borsh-serialized contract fn arguments

Let's say you have a `contract` object instantiated in your code, and the contract it wraps has an `add_person` function which receives a borsh-serialized struct. The following code now works: import { serialize } from 'near-api-js/lib/utils/serialize' class Person { constructor (proof) { Object.assign(this, proof) } } const personSchema = new Map([ [Person, { kind: 'struct', fields: [ ['age', 'u64'], ['name', 'String'], ] }] ]) const person = new Person({ age: 33, name: 'Jesus' }) contract.add_person(serialize(personSchema, person))
near · Oct 7, 2020 · b929507 · b929507
1 parent d4d4cf1
commit b929507
Show file tree

Hide file tree

Showing 9 changed files with 104 additions and 84 deletions.
diff --git a/lib/browser-index.js b/lib/browser-index.js
diff --git a/lib/common-index.js b/lib/common-index.js
diff --git a/lib/contract.js b/lib/contract.js
diff --git a/lib/index.js b/lib/index.js
diff --git a/lib/near.d.ts b/lib/near.d.ts
diff --git a/lib/utils/index.js b/lib/utils/index.js
diff --git a/lib/utils/rpc_errors.js b/lib/utils/rpc_errors.js
diff --git a/lib/utils/serialize.js b/lib/utils/serialize.js
diff --git a/src/contract.ts b/src/contract.ts
@@ -12,14 +12,19 @@ function nameFunction(name, body) {
     }[name];
 }
 
+function isUint8Array (x) {
+    return x.byteLength !== undefined && x.byteLength === x.length;
+}
+
+
 /**
  * Defines a smart contract on NEAR including the mutable and non-mutable methods
  */
 export class Contract {
     readonly account: Account;
     readonly contractId: string;
 
-    constructor(account: Account, contractId: string, options: { viewMethods: string[], changeMethods: string[] }) {
+    constructor(account: Account, contractId: string, options: { viewMethods: string[]; changeMethods: string[] }) {
         this.account = account;
         this.contractId = contractId;
         const { viewMethods = [], changeMethods = [] } = options;
@@ -28,7 +33,10 @@ export class Contract {
                 writable: false,
                 enumerable: true,
                 value: nameFunction(methodName, async (args: object = {}, ...ignored) => {
-                    if (ignored.length || Object.prototype.toString.call(args) !== '[object Object]') {
+                    if (
+                        ignored.length ||
+                        (Object.prototype.toString.call(args) !== '[object Object]' && !isUint8Array(args))
+                    ) {
                         throw new PositionalArgsError();
                     }
                     return this.account.viewFunction(this.contractId, methodName, args);
@@ -40,7 +48,10 @@ export class Contract {
                 writable: false,
                 enumerable: true,
                 value: nameFunction(methodName, async (args: object = {}, gas?: BN, amount?: BN, ...ignored) => {
-                    if (ignored.length || Object.prototype.toString.call(args) !== '[object Object]') {
+                    if (
+                        ignored.length ||
+                        (Object.prototype.toString.call(args) !== '[object Object]' && !isUint8Array(args))
+                    ) {
                         throw new PositionalArgsError();
                     }
                     validateBNLike({ gas, amount });