openchain-nodejs-ts-yxl 1.0.6 → 1.0.8

package/index.d.ts

@@ -992,6 +992,51 @@ export interface ContractInvokeResult {
   logs: string;
 }
 
+/**
+ * 合约调用参数
+ * @interface
+ * @property {string} [contractAddress] 合约账户地址
+ * @property {string} [sourceAddress] 调用者账户地址
+ * @property {string} [code] 合约代码
+ * @property {string} [input] 合约调用输入数据
+ * @property {string} [contractBalance] 合约账户余额
+ * @property {number} optType 操作类型(1-查询，2-调用)
+ * @property {string} [feeLimit] 交易费用上限
+ * @property {string} [gasPrice] Gas单价
+ */
+export interface ContractCallParams {
+  contractAddress?: string;
+  sourceAddress?: string;
+  code?: string;
+  input?: string;
+  contractBalance?: string;
+  optType: number;
+  feeLimit?: string;
+  gasPrice?: string;
+}
+
+/**
+ * 合约调用结果
+ * @interface
+ * @property {string[]} queryRets 查询返回结果列表
+ * @property {string} logs 合约执行日志
+ * @property {Object} stat 合约执行统计信息
+ * @property {number} stat.apply_time 执行时间(毫秒)
+ * @property {number} stat.memory_usage 内存使用量(字节)
+ * @property {number} stat.stack_usage 堆栈使用量(字节)
+ * @property {number} stat.step 执行步数
+ */
+export interface ContractCallResult {
+  queryRets: string[];
+  logs: string;
+  stat: {
+    apply_time: number;
+    memory_usage: number;
+    stack_usage: number;
+    step: number;
+  };
+}
+
 export interface OperationResult {
     type: string;
     data: Record<string, any>;

package/lib/common/util.js

@@ -1,10 +1,9 @@
 'use strict';
 
-const request = require('request-promise');
+const axios = require('axios');
 const is = require('is-type-of');
 const long = require('long');
 const JSONbig = require('json-bigint');
-// const bigNumberToString = require('bignumber-to-string')
 const BigNumber = require('bignumber.js');
 const protobuf = require("protobufjs");
 const tou8 = require('buffer-to-uint8array');
@@ -12,10 +11,8 @@ const humps = require('humps');
 const { keypair, signature } = require('yxchain-encryption-nodejs');
 const errors = require('../exception');
 
-
 const proto = exports;
 
-
 /**
  * GET/POST request
  *
@@ -24,7 +21,7 @@ const proto = exports;
  * @param  {Object} data
  * @return {Object}
  */
-proto._request = function* (method, path, data = {}) {
+proto._request = async function (method, path, data = {}) {
   try {
     const protocol = this.options.secure ? 'https://' : 'http://';
     const uri = `${protocol}${this.options.host}/${path}`;
@@ -37,7 +34,7 @@ proto._request = function* (method, path, data = {}) {
       throw new Error('path must be a non-empty string');
     }
 
-    const methods = [ 'get', 'post' ];
+    const methods = ['get', 'post'];
 
     if (!methods.includes(method.toLowerCase())) {
       throw new Error(`${method} http method is not supported`);
@@ -45,21 +42,23 @@ proto._request = function* (method, path, data = {}) {
 
     const options = {
       method,
-      uri,
+      url: uri,
       timeout: this.options.timeout,
     };
 
-    if (method === 'get') {
-      options.qs = data;
+    if (method.toLowerCase() === 'get') {
+      options.params = data;
     }
 
-    if (method === 'post') {
-      options.body = data;
+    if (method.toLowerCase() === 'post') {
+      options.data = data;
     }
-    const result = yield request(options);
-    const obj = JSONbig.parse(result);
+
+    const response = await axios(options);
+    const result = response.data;
+    const obj = typeof result === 'string' ? JSONbig.parse(result) : result;
     const error_code = obj.error_code;
-    const final =  this._bigNumberToString(obj);
+    const final = this._bigNumberToString(obj);
     final.error_code = error_code;
     return final;
   } catch (err) {
@@ -877,4 +876,4 @@ proto._isAvailableBu = function (str) {
     long.fromValue(str).greaterThanOrEqual(0) &&
     long.fromValue(str).lessThanOrEqual(long.MAX_VALUE.divide(Math.pow(10, 8)))
   );
-}
+}

package/lib/util/index.js

@@ -1,86 +1,148 @@
 'use strict';
 
-const wrap = require('co-wrap-all');
-const merge = require('merge-descriptors');
-const BigNumber = require('bignumber.js');
 const is = require('is-type-of');
+const BigNumber = require('bignumber.js');
 const long = require('long');
+const axios = require('axios');
+const JSONbig = require('json-bigint');
+const errors = require('../exception');
+
+const util = exports;
+
+/**
+ * check if the object is BigNumber
+ * @param  {Object}  object
+ * @return {Boolean}
+ */
+util.isBigNumber = function (object) {
+  return object instanceof BigNumber;
+};
 
-module.exports = Util;
-
-function Util(options) {
-  if (!(this instanceof Util)) {
-    return new Util(options);
-  }
-
-  this.options = options;
-}
+/**
+ * create BigNumber object
+ * @param  {String | Number}  value
+ * @return {BigNumber}
+ */
+util.toBigNumber = function (value) {
+  return new BigNumber(value);
+};
 
-const proto = Util.prototype;
+/**
+ * encode string to hex string
+ * @param  {String} str
+ * @return {String} hex string
+ */
+util.utfToHex = function (str) {
+  if (is.string(str) || is.number(str)) {
+    let hex = '';
 
-merge(proto, require('../common/util'));
+    for (let i = 0; i < str.length; i++) {
+      hex += str.charCodeAt(i).toString(16);
+    }
 
-proto.isBigNumber = function (object) {
-  return this._isBigNumber(object);
-};
+    return hex;
+  }
 
-proto.toBigNumber = function(data) {
-  return this._toBigNumber(data);
+  return str;
 };
 
-proto.utfToHex = function(str) {
-  if (!is.string(str)) {
-    return;
-  }
+/**
+ * decode hex string to string
+ * @param  {String} str hex string
+ * @return {String}
+ */
+util.hexToUtf = function (str) {
+  if (is.string(str) || is.number(str)) {
+    let utf = '';
 
-  return Buffer.from(str, 'utf8').toString('hex');
-};
+    for (let i = 0; i < str.length; i += 2) {
+      utf += String.fromCharCode(parseInt(str.substr(i, 2), 16));
+    }
 
-proto.hexToUtf = function(str) {
-  if (!is.string(str) ||
-      str === '' ||
-      !this._isHexString(str)) {
-    return;
+    return utf;
   }
 
-  return Buffer.from(str, 'hex').toString('utf8');
+  return str;
 };
 
-proto.buToMo = function(bu) {
-  if (!this._isAvailableBu(bu)) {
-    return '';
-  }
+/**
+ * convert bu to mo
+ * @param  {String} str
+ * @return {String}
+ */
+util.buToMo = function (str) {
+  return new BigNumber(str).multipliedBy(100000000).toString(10);
+};
 
-  const oneMo = Math.pow(10, 8);
-  const mo = new BigNumber(bu).times(oneMo);
-  return mo.toString();
+/**
+ * convert mo to bu
+ * @param  {String} str
+ * @return {String}
+ */
+util.moToBu = function (str) {
+  return new BigNumber(str).dividedBy(100000000).toString(10);
 };
 
-proto.moToBu = function(mo) {
-  if (!this._isAvailableValue(mo)) {
-    return '';
+/**
+ * calculate amount with decimals
+ * @param  {String} amount
+ * @param  {String} decimals
+ * @return {String | false}
+ */
+util.unitWithDecimals = function (amount, decimals) {
+  if (!is.string(decimals) || !is.string(amount)) {
+    return false;
   }
 
-  const oneMo = Math.pow(10, 8);
-  const bu = new BigNumber(mo).dividedBy(oneMo);
-  return bu.toString();
-};
-
-proto.unitWithDecimals = function(amount, decimals) {
-  const reg = /^[0-9]+$/;
+  const decimalsBN = new BigNumber(decimals);
+  const amountBN = new BigNumber(amount);
 
-  if (!reg.test(amount) || !reg.test(decimals)) {
+  if (decimalsBN.isNaN() || amountBN.isNaN()) {
     return false;
   }
 
-  amount = new BigNumber(amount);
-  decimals = new BigNumber(Math.pow(10, decimals));
-  const amountWithDecimals = amount.times(decimals);
+  return amountBN.multipliedBy(Math.pow(10, decimals)).toString(10);
+};
 
-  if (amountWithDecimals.isGreaterThanOrEqualTo(0) && amountWithDecimals.isLessThanOrEqualTo(long.MAX_VALUE.toString())) {
-    return amountWithDecimals.toString();
+/**
+ * http request
+ * @param  {String} method
+ * @param  {String} url
+ * @param  {Object} data
+ * @return {Object}
+ */
+util.httpRequest = async function (method, url, data = {}) {
+  try {
+    if (!is.string(method) || !is.string(url)) {
+      throw new Error('method and url must be string');
+    }
+
+    const methods = ['get', 'post'];
+
+    if (!methods.includes(method.toLowerCase())) {
+      throw new Error(`${method} http method is not supported`);
+    }
+
+    const options = {
+      method,
+      url,
+      timeout: 3000,
+    };
+
+    if (method.toLowerCase() === 'get') {
+      options.params = data;
+    }
+
+    if (method.toLowerCase() === 'post') {
+      options.data = data;
+    }
+
+    const response = await axios(options);
+    const result = response.data;
+    return typeof result === 'string' ? JSONbig.parse(result) : result;
+  } catch (err) {
+    throw err;
   }
-  return false;
-}
+};
 
-wrap(proto);
+module.exports = util;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openchain-nodejs-ts-yxl",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "openchain sdk",
   "main": "index.js",
   "types": "index.d.ts",
@@ -14,6 +14,7 @@
   "author": "OpenChain",
   "license": "ISC",
   "dependencies": {
+    "axios": "^1.6.2",
     "bignumber.js": "^7.2.1",
     "buffer-to-uint8array": "^1.1.0",
     "co-wrap-all": "^1.0.0",
@@ -23,8 +24,6 @@
     "long": "^4.0.0",
     "merge-descriptors": "^1.0.1",
     "protobufjs": "^6.8.8",
-    "request": "^2.87.0",
-    "request-promise": "^4.2.2",
     "yxchain-encryption-nodejs": "^1.0.2"
   },
   "devDependencies": {