Merge pull request #304 from Zilliqa/fix/batch-request

feat/getsmartcontractsubstate-batch-request

.travis.yml

@@ -2,10 +2,6 @@ language: node_js
 sudo: true
 jobs:
   include:
-    - os: linux
-      dist: xenial
-      node_js:
-        - 10
     - os: linux
       dist: xenial
       node_js:
@@ -14,10 +10,6 @@ jobs:
       dist: xenial
       node_js:
         - 14
-    - os: linux
-      dist: bionic
-      node_js:
-        - 10
     - os: linux
       dist: bionic
       node_js:
@@ -26,9 +18,6 @@ jobs:
       dist: bionic
       node_js:
         - 14
-    - os: osx
-      node_js:
-        - 10
     - os: osx
       node_js:
         - 12

examples/node/queryState.js

@@ -67,6 +67,21 @@ async function test() {
     ['0x381f4008505e940ad7681ec3468a719060caf796'],
   );
   console.log(state4.result);
+
+  console.log(
+    `\n\nGet substate using batch api.`,
+  );
+  const req1 = ["5938fc8af82250ad6cf1da3bb92f4aa005cb2717","balances",['0x381f4008505e940ad7681ec3468a719060caf796']]
+  const req2 = ["5938fc8af82250ad6cf1da3bb92f4aa005cb2717","balances",['0xa476fcedc061797fa2a6f80bd9e020a056904298']]
+
+  const state5 = await zilliqa.blockchain.getSmartContractSubStateBatch(
+    [
+        req1,req2
+    ]
+  );
+
+  const batchResult = JSON.stringify(state5.batch_result);
+  console.log(batchResult);
 }
 
 test();

packages/zilliqa-js-blockchain/src/chain.ts

@@ -764,6 +764,21 @@ export class Blockchain implements ZilliqaModule {
     );
   }
 
+  /**
+   * getSmartContractSubStateBatch - Quires the contract state using batch rpc.
+   * @param reqs array of address variableName indices
+   *  e.g ["5938fc8af82250ad6cf1da3bb92f4aa005cb2717","balances",['0x381f4008505e940ad7681ec3468a719060caf796']]
+   * @returns 
+   */
+  getSmartContractSubStateBatch(
+    reqs: any[]
+  ): Promise<RPCResponse<any, any>>{
+    return this.provider.sendBatch(
+      RPCMethod.GetSmartContractSubState,
+      reqs,
+    );
+  }
+
   /**
    * getSmartContracts
    *

packages/zilliqa-js-core/src/net.ts

@@ -101,7 +101,7 @@ export enum RPCErrorCode {
 }
 
 export interface RPCRequestPayload<T> {
-  id: 1;
+  id: number;
   jsonrpc: '2.0';
   method: RPCMethod;
   params: T;
@@ -120,7 +120,7 @@ export interface RPCRequest<T> {
 
 interface RPCResponseBase {
   jsonrpc: '2.0';
-  id: '1';
+  id: number;
 }
 
 export interface RPCResponseSuccess<R = any> extends RPCResponseBase {

packages/zilliqa-js-core/src/providers/http.ts

@@ -40,10 +40,21 @@ export class HTTPProvider extends BaseProvider implements Provider {
     paramsList: T[],
   ): RPCRequest<T> {
     let payloads: RPCRequestPayload<T>[] = [];
-    for (let payloadParam of paramsList) {
-      const params: any = [payloadParam];
+    for (let i = 0; i < paramsList.length; i++) {
+      // most of the payloads should be a single param, e.g. GetTransaction
+      // however, there are special cases e.g. GetSmartContractSubState & GetTransactionsForTxBlockEx
+      // where the param field is a list
+      let payloadParams = paramsList[i];
+      let params: any;
+      if (Array.isArray(payloadParams)) {
+        // for those param field that is already a list
+        params = payloadParams;
+      } else {
+        params = [payloadParams];
+      }
+      // id start from index 1
       payloads.push({
-        id: 1,
+        id: i + 1,
         jsonrpc: '2.0',
         method,
         params,