Merge pull request #133 from AElfProject/feature/view

feat: getChainStatus
AElfProject · Nov 7, 2023 · fc26b52 · fc26b52
2 parents 79e9d83 + dcc7e74
commit fc26b52
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 43 deletions.
diff --git a/dist/aelf.cjs.js b/dist/aelf.cjs.js
@@ -33063,13 +33063,18 @@ function () {
     }
   }, {
     key: "prepareParametersAsync",
-    value: function prepareParametersAsync(args) {
+    value: function prepareParametersAsync(args, isView) {
       var _this = this;
 
       var filterArgs = args.filter(function (arg) {
         return !isFunction(arg) && !isBoolean(arg.sync);
       });
       var encoded = this.packInput(filterArgs[0]);
+
+      if (isView) {
+        return Promise.resolve(this.handleTransaction('', '', encoded));
+      }
+
       return this._chain.getChainStatus().then(function (status) {
         var BestChainHeight = status.BestChainHeight,
             BestChainHash = status.BestChainHash;
@@ -33078,12 +33083,16 @@ function () {
     }
   }, {
     key: "prepareParameters",
-    value: function prepareParameters(args) {
+    value: function prepareParameters(args, isView) {
       var filterArgs = args.filter(function (arg) {
         return !isFunction(arg) && !isBoolean(arg.sync);
       });
       var encoded = this.packInput(filterArgs[0]);
 
+      if (isView) {
+        return this.handleTransaction('', '', encoded);
+      }
+
       var _this$_chain$getChain = this._chain.getChainStatus({
         sync: true
       }),
@@ -33140,14 +33149,14 @@ function () {
       var argsObject = this.extractArgumentsIntoObject(args);
 
       if (argsObject.isSync) {
-        var parameters = this.prepareParameters(args);
+        var parameters = this.prepareParameters(args, true);
         return this.unpackOutput(this._chain.callReadOnly(parameters, {
           sync: true
         }));
       } // eslint-disable-next-line arrow-body-style
 
 
-      return this.prepareParametersAsync(args).then(function (parameters) {
+      return this.prepareParametersAsync(args, true).then(function (parameters) {
         return _this3._chain.callReadOnly(parameters, function (error, result) {
           argsObject.callback(error, _this3.unpackOutput(result));
         }).then(_this3.unpackOutput);
@@ -33207,9 +33216,16 @@ function () {
     key: "getRawTx",
     value: function getRawTx(blockHeightInput, blockHashInput, packedInput) {
       var rawTx = getTransaction(this._wallet.address, this._contractAddress, this._name, packedInput);
-      rawTx.refBlockNumber = blockHeightInput;
-      var blockHash = blockHashInput.match(/^0x/) ? blockHashInput.substring(2) : blockHashInput;
-      rawTx.refBlockPrefix = Buffer.from(blockHash, 'hex').slice(0, 4);
+
+      if (blockHeightInput) {
+        rawTx.refBlockNumber = blockHeightInput;
+      }
+
+      if (blockHashInput) {
+        var blockHash = blockHashInput.match(/^0x/) ? blockHashInput.substring(2) : blockHashInput;
+        rawTx.refBlockPrefix = Buffer.from(blockHash, 'hex').slice(0, 4);
+      }
+
       return rawTx;
     }
   }, {

diff --git a/dist/aelf.cjs.js.map b/dist/aelf.cjs.js.map
diff --git a/dist/aelf.umd.js b/dist/aelf.umd.js
diff --git a/dist/aelf.umd.js.map b/dist/aelf.umd.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aelf-sdk",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "aelf-sdk js library",
   "main": "dist/aelf.cjs.js",
   "browser": "dist/aelf.umd.js",

diff --git a/src/contract/contractMethod.js b/src/contract/contractMethod.js
@@ -2,23 +2,20 @@
  * @file contract method
  * @author atom-yang
  */
-import {
-  getTransaction,
-  Transaction
-} from '../util/proto';
+import { getTransaction, Transaction } from '../util/proto';
 import {
   transformArrayToMap,
   transformMapToArray,
   transform,
   INPUT_TRANSFORMERS,
-  OUTPUT_TRANSFORMERS
+  OUTPUT_TRANSFORMERS,
 } from '../util/transform';
 import {
   isBoolean,
   isFunction,
   noop,
   uint8ArrayToHex,
-  unpackSpecifiedTypeData
+  unpackSpecifiedTypeData,
 } from '../util/utils';
 import wallet from '../wallet';
 
@@ -61,7 +58,7 @@ export default class ContractMethod {
     }
     const result = unpackSpecifiedTypeData({
       data: inputPacked,
-      dataType: this._inputType
+      dataType: this._inputType,
     });
     let params = transform(this._inputType, result, OUTPUT_TRANSFORMERS);
     params = transformArrayToMap(this._inputType, params);
@@ -74,7 +71,7 @@ export default class ContractMethod {
     }
     let result = unpackSpecifiedTypeData({
       data: output,
-      dataType: this._outputType
+      dataType: this._outputType,
     });
     result = transform(this._outputType, result, OUTPUT_TRANSFORMERS);
     result = transformArrayToMap(this._outputType, result);
@@ -103,29 +100,42 @@ export default class ContractMethod {
     return uint8ArrayToHex(tx);
   }
 
-  prepareParametersAsync(args) {
-    const filterArgs = args.filter(arg => !isFunction(arg) && !isBoolean(arg.sync));
+  prepareParametersAsync(args, isView) {
+    const filterArgs = args.filter(
+      arg => !isFunction(arg) && !isBoolean(arg.sync)
+    );
     const encoded = this.packInput(filterArgs[0]);
 
+    if (isView) {
+      return Promise.resolve(this.handleTransaction('', '', encoded));
+    }
     return this._chain.getChainStatus().then(status => {
       const { BestChainHeight, BestChainHash } = status;
       return this.handleTransaction(BestChainHeight, BestChainHash, encoded);
     });
   }
 
-  prepareParameters(args) {
-    const filterArgs = args.filter(arg => !isFunction(arg) && !isBoolean(arg.sync));
+  prepareParameters(args, isView) {
+    const filterArgs = args.filter(
+      arg => !isFunction(arg) && !isBoolean(arg.sync)
+    );
     const encoded = this.packInput(filterArgs[0]);
 
+    if (isView) {
+      return this.handleTransaction('', '', encoded);
+    }
+
     const { BestChainHeight, BestChainHash } = this._chain.getChainStatus({
-      sync: true
+      sync: true,
     });
 
     return this.handleTransaction(BestChainHeight, BestChainHash, encoded);
   }
 
   prepareParametersWithBlockInfo(args) {
-    const filterArgs = args.filter(arg => !isFunction(arg) && !isBoolean(arg.sync));
+    const filterArgs = args.filter(
+      arg => !isFunction(arg) && !isBoolean(arg.sync)
+    );
     const encoded = this.packInput(filterArgs[0]);
 
     const { height, hash } = filterArgs[1]; // blockInfo
@@ -138,7 +148,7 @@ export default class ContractMethod {
     if (argsObject.isSync) {
       const parameters = this.prepareParameters(args);
       return this._chain.sendTransaction(parameters, {
-        sync: true
+        sync: true,
       });
     }
     // eslint-disable-next-line arrow-body-style
@@ -150,23 +160,27 @@ export default class ContractMethod {
   callReadOnly(...args) {
     const argsObject = this.extractArgumentsIntoObject(args);
     if (argsObject.isSync) {
-      const parameters = this.prepareParameters(args);
-      return this.unpackOutput(this._chain.callReadOnly(parameters, {
-        sync: true
-      }));
+      const parameters = this.prepareParameters(args, true);
+      return this.unpackOutput(
+        this._chain.callReadOnly(parameters, {
+          sync: true,
+        })
+      );
     }
     // eslint-disable-next-line arrow-body-style
-    return this.prepareParametersAsync(args).then(parameters => {
-      return this._chain.callReadOnly(parameters, (error, result) => {
-        argsObject.callback(error, this.unpackOutput(result));
-      }).then(this.unpackOutput);
+    return this.prepareParametersAsync(args, true).then(parameters => {
+      return this._chain
+        .callReadOnly(parameters, (error, result) => {
+          argsObject.callback(error, this.unpackOutput(result));
+        })
+        .then(this.unpackOutput);
     });
   }
 
   extractArgumentsIntoObject(args) {
     const result = {
       callback: noop,
-      isSync: false
+      isSync: false,
     };
     if (args.length === 0) {
       // has no callback, default to be async mode
@@ -176,7 +190,7 @@ export default class ContractMethod {
       result.callback = args[args.length - 1];
     }
     args.forEach(arg => {
-      if (isBoolean((arg.sync))) {
+      if (isBoolean(arg.sync)) {
         result.isSync = arg.sync;
       }
     });
@@ -185,7 +199,9 @@ export default class ContractMethod {
 
   // getData(...args) {
   getSignedTx(...args) {
-    const filterArgs = args.filter(arg => !isFunction(arg) && !isBoolean(arg.sync));
+    const filterArgs = args.filter(
+      arg => !isFunction(arg) && !isBoolean(arg.sync)
+    );
 
     if (filterArgs[1]) {
       const { height, hash } = filterArgs[1]; // blockInfo
@@ -199,11 +215,21 @@ export default class ContractMethod {
   }
 
   getRawTx(blockHeightInput, blockHashInput, packedInput) {
-    const rawTx = getTransaction(this._wallet.address, this._contractAddress, this._name, packedInput);
-
-    rawTx.refBlockNumber = blockHeightInput;
-    const blockHash = blockHashInput.match(/^0x/) ? blockHashInput.substring(2) : blockHashInput;
-    rawTx.refBlockPrefix = (Buffer.from(blockHash, 'hex')).slice(0, 4);
+    const rawTx = getTransaction(
+      this._wallet.address,
+      this._contractAddress,
+      this._name,
+      packedInput
+    );
+    if (blockHeightInput) {
+      rawTx.refBlockNumber = blockHeightInput;
+    }
+    if (blockHashInput) {
+      const blockHash = blockHashInput.match(/^0x/)
+        ? blockHashInput.substring(2)
+        : blockHashInput;
+      rawTx.refBlockPrefix = Buffer.from(blockHash, 'hex').slice(0, 4);
+    }
     return rawTx;
   }
 
@@ -214,7 +240,7 @@ export default class ContractMethod {
       method: 'broadcast_tx',
       callback,
       params,
-      format: this.unpackOutput
+      format: this.unpackOutput,
     };
   }