Merge pull request #870 from near/WAL-338-abstractions-if-using-js-sdk

Wal 338 abstractions if using js sdk
near · Jun 8, 2022 · c158218 · c158218
2 parents 6f83d39 + 0260347
commit c158218
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 14 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/connection.d.ts b/lib/connection.d.ts
diff --git a/lib/near.d.ts b/lib/near.d.ts
diff --git a/lib/near.js b/lib/near.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 from JS SDK to binary.
+     */
+    jsContract?: boolean;
 }
 
 interface ReceiptLogWithFailure {
@@ -428,12 +433,25 @@ 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(contractId: string, method: string, args) {
+                return Buffer.concat([Buffer.from(contractId), Buffer.from([0]), Buffer.from(method), Buffer.from([0]), Buffer.from(args)]);
+            }
+            const encodedArgs = encodeCall( contractId, methodName, JSON.stringify(Object.values(args)) );
+            functionCallArgs =  ['call_js_contract', encodedArgs, gas, attachedDeposit, 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 ? this.connection.jsvmAccountId: contractId,
+            // eslint-disable-next-line prefer-spread
+            actions: [functionCall.apply(void 0, functionCallArgs)],
             walletMeta,
             walletCallbackUrl
         });

diff --git a/src/connection.ts b/src/connection.ts
@@ -36,6 +36,7 @@ export class Connection {
     readonly networkId: string;
     readonly provider: Provider;
     readonly signer: Signer;
+    readonly jsvmAccountId: string;
 
     constructor(networkId: string, provider: Provider, signer: Signer) {
         this.networkId = networkId;

diff --git a/src/near.ts b/src/near.ts
@@ -66,6 +66,11 @@ export interface NearConfig {
      * @see {@link https://docs.near.org/docs/tools/near-wallet}
      */
     walletUrl?: string;
+
+    /**
+     * JVSM account ID for NEAR JS SDK
+     */
+    jsvmAccountId?: string;
 }
 
 /**
@@ -85,8 +90,10 @@ export class Near {
         this.connection = Connection.fromConfig({
             networkId: config.networkId,
             provider: { type: 'JsonRpcProvider', args: { url: config.nodeUrl, headers: config.headers } },
-            signer: config.signer || { type: 'InMemorySigner', keyStore: config.keyStore || (config.deps && config.deps.keyStore) }
+            signer: config.signer || { type: 'InMemorySigner', keyStore: config.keyStore || (config.deps && config.deps.keyStore) },
+            jsvmAccountId: config.jsvmAccountId || `jsvm.${config.networkId}`
         });
+
         if (config.masterAccount) {
             // TODO: figure out better way of specifiying initial balance.
             // Hardcoded number below must be enough to pay the gas cost to dev-deploy with near-shell for multiple times

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({ methodName, args, gas, deposit }) });
+    }
+    return new Action({ functionCall: new FunctionCall({ methodName, args: stringify(args), gas, deposit }) });
 }
 
 export function transfer(deposit: BN): Action {