feat: initial pass at supporting JS contract

near · Jun 3, 2022 · 58396df · 58396df
1 parent 6f83d39
commit 58396df
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 12 deletions.
diff --git a/lib/account.d.ts b/lib/account.d.ts
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
@@ -100,6 +100,11 @@ export interface FunctionCallOptions {
      * Convert input arguments into bytes array.
      */
     stringify?: (input: any) => Buffer;
+
+    /**
+     * Is contract from JS SDK, automatically encodes args
+     */
+    jsContract?: boolean;
 }
 
 interface ReceiptLogWithFailure {
@@ -428,12 +433,24 @@ export class Account {
         });
     }
 
-    private functionCallV2({ contractId, methodName, args = {}, gas = DEFAULT_FUNCTION_CALL_GAS, attachedDeposit, walletMeta, walletCallbackUrl, stringify }: FunctionCallOptions): Promise<FinalExecutionOutcome> {
+    private functionCallV2({ contractId, methodName, args = {}, gas = DEFAULT_FUNCTION_CALL_GAS, attachedDeposit, walletMeta, walletCallbackUrl, stringify, jsContract }: FunctionCallOptions): Promise<FinalExecutionOutcome> {
         this.validateArgs(args);
-        const stringifyArg = stringify === undefined ? stringifyJsonOrBytes : stringify;
+        let functionCallArgs;
+
+        if(jsContract){
+            function encodeCall(contract:string, method:string, args) {
+                return Buffer.concat([Buffer.from(contract), Buffer.from([0]), Buffer.from(method), Buffer.from([0]), Buffer.from(args)])
+            }
+            let encodedArgs = encodeCall( contractId, methodName, JSON.stringify(Object.values(args)) );
+            functionCallArgs=  ['call_js_contract', encodedArgs, gas, null, null, true  ]
+        } else{
+            const stringifyArg = stringify === undefined ? stringifyJsonOrBytes : stringify;
+            functionCallArgs = [methodName, args, gas, attachedDeposit, stringifyArg, false]
+        }
+
         return this.signAndSendTransaction({
-            receiverId: contractId,
-            actions: [functionCall(methodName, args, gas, attachedDeposit, stringifyArg)],
+            receiverId: jsContract ? 'call_js_contract' : contractId,
+            actions: [functionCall.apply(void 0, functionCallArgs)],
             walletMeta,
             walletCallbackUrl
         });

diff --git a/src/transaction.ts b/src/transaction.ts
@@ -67,8 +67,11 @@ export function stringifyJsonOrBytes(args: any): Buffer {
  * @param deposit amount of NEAR (in yoctoNEAR) to send together with the call
  * @param stringify Convert input arguments into bytes array.
  */
-export function functionCall(methodName: string, args: Uint8Array | object, gas: BN, deposit: BN, stringify = stringifyJsonOrBytes): Action {
-    return new Action({functionCall: new FunctionCall({methodName, args: stringify(args), gas, deposit }) });
+export function functionCall(methodName: string, args: Uint8Array | object, gas: BN, deposit: BN, stringify = stringifyJsonOrBytes, jsContract = false): Action {
+    if(jsContract){
+     return new Action({ functionCall: new FunctionCall({ contractId: "jsvm.testnet", methodName, args, gas }) });
+    }
+    return new Action({ functionCall: new FunctionCall({ methodName, args: stringify(args), gas, deposit }) });
 }
 
 export function transfer(deposit: BN): Action {