openchain-nodejs-ts-yxl 1.0.7 → 1.1.0

package/index.d.ts

@@ -992,6 +992,83 @@ 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单价
+ */
+/**
+ * 合约调用参数
+ * @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单价
+ * @example
+ * {
+ *   contractAddress: 'adx...',
+ *   sourceAddress: 'adx...',
+ *   input: 'method(param)',
+ *   optType: 1,
+ *   feeLimit: '1000000',
+ *   gasPrice: '100'
+ * }
+ */
+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 执行步数
+ * @example
+ * {
+ *   queryRets: ['return value'],
+ *   logs: 'execution logs',
+ *   stat: {
+ *     apply_time: 100,
+ *     memory_usage: 1024,
+ *     stack_usage: 256,
+ *     step: 1000
+ *   }
+ * }
+ */
+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/util/index.js

@@ -1,148 +1,86 @@
 'use strict';
 
-const is = require('is-type-of');
+const wrap = require('co-wrap-all');
+const merge = require('merge-descriptors');
 const BigNumber = require('bignumber.js');
+const is = require('is-type-of');
 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;
-};
 
-/**
- * create BigNumber object
- * @param  {String | Number}  value
- * @return {BigNumber}
- */
-util.toBigNumber = function (value) {
-  return new BigNumber(value);
-};
+module.exports = Util;
 
-/**
- * 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 = '';
+function Util(options) {
+  if (!(this instanceof Util)) {
+    return new Util(options);
+  }
 
-    for (let i = 0; i < str.length; i++) {
-      hex += str.charCodeAt(i).toString(16);
-    }
+  this.options = options;
+}
 
-    return hex;
-  }
+const proto = Util.prototype;
 
-  return str;
-};
+merge(proto, require('../common/util'));
 
-/**
- * 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 = '';
+proto.isBigNumber = function (object) {
+  return this._isBigNumber(object);
+};
 
-    for (let i = 0; i < str.length; i += 2) {
-      utf += String.fromCharCode(parseInt(str.substr(i, 2), 16));
-    }
+proto.toBigNumber = function(data) {
+  return this._toBigNumber(data);
+};
 
-    return utf;
+proto.utfToHex = function(str) {
+  if (!is.string(str)) {
+    return;
   }
 
-  return str;
+  return Buffer.from(str, 'utf8').toString('hex');
 };
 
-/**
- * convert bu to mo
- * @param  {String} str
- * @return {String}
- */
-util.buToMo = function (str) {
-  return new BigNumber(str).multipliedBy(100000000).toString(10);
+proto.hexToUtf = function(str) {
+  if (!is.string(str) ||
+      str === '' ||
+      !this._isHexString(str)) {
+    return;
+  }
+
+  return Buffer.from(str, 'hex').toString('utf8');
 };
 
-/**
- * convert mo to bu
- * @param  {String} str
- * @return {String}
- */
-util.moToBu = function (str) {
-  return new BigNumber(str).dividedBy(100000000).toString(10);
+proto.buToMo = function(bu) {
+  if (!this._isAvailableBu(bu)) {
+    return '';
+  }
+
+  const oneMo = Math.pow(10, 8);
+  const mo = new BigNumber(bu).times(oneMo);
+  return mo.toString();
 };
 
-/**
- * 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;
+proto.moToBu = function(mo) {
+  if (!this._isAvailableValue(mo)) {
+    return '';
   }
 
-  const decimalsBN = new BigNumber(decimals);
-  const amountBN = new BigNumber(amount);
+  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]+$/;
 
-  if (decimalsBN.isNaN() || amountBN.isNaN()) {
+  if (!reg.test(amount) || !reg.test(decimals)) {
     return false;
   }
 
-  return amountBN.multipliedBy(Math.pow(10, decimals)).toString(10);
-};
+  amount = new BigNumber(amount);
+  decimals = new BigNumber(Math.pow(10, decimals));
+  const amountWithDecimals = amount.times(decimals);
 
-/**
- * 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;
+  if (amountWithDecimals.isGreaterThanOrEqualTo(0) && amountWithDecimals.isLessThanOrEqualTo(long.MAX_VALUE.toString())) {
+    return amountWithDecimals.toString();
   }
-};
+  return false;
+}
 
-module.exports = util;
+wrap(proto);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openchain-nodejs-ts-yxl",
-  "version": "1.0.7",
+  "version": "1.1.0",
   "description": "openchain sdk",
   "main": "index.js",
   "types": "index.d.ts",