mm_contract 1.0.0 → 1.0.1

package/mm_eth.js

@@ -1,4 +1,3 @@
-require("mm_logs");
 const Web3 = require("web3");
 const BigNumber = require("bignumber.js");
 
@@ -59,6 +58,32 @@ class MM_eth {
 		 * 当前账户余额
 		 */
 		this.balance = 0;
+
+		/**
+		 * 日志记录器（可经 config.logger 注入，缺省使用 console）
+		 * @type {Object}
+		 */
+		this._logger = this.config.logger || console;
+	}
+
+	/**
+	 * 设置日志记录器
+	 * @param {Object} logger 日志记录器（需实现 debug/info/warn/error）
+	 * @returns {MM_eth} 当前实例
+	 */
+	setLogger(logger) {
+		if (logger) {
+			this._logger = logger;
+		}
+		return this;
+	}
+
+	/**
+	 * 获取日志记录器
+	 * @returns {Object} 日志记录器
+	 */
+	getLogger() {
+		return this._logger;
 	}
 }
 
@@ -143,18 +168,18 @@ MM_eth.prototype.init = async function(way) {
  * @return {String}  返回地址
  */
 MM_eth.prototype.send = async function(type, name, method, value, ...param) {
-	$.log.debug("send req", type, name, method, value, ...param);
+	this._logger.debug("send req", type, name, method, value, ...param);
 	try {
 		var res = await this[type][name].contract.methods[method](...param).send({
 			from: this.address,
 			gasLimit: this.config.gas,
 			value: value
 		});
-		$.log.debug("send res", type, name, method, res);
+		this._logger.debug("send res", type, name, method, res);
 	} catch (err) {
-		$.log.error(method, err);
+		this._logger.error(method, err);
 	}
-	$.log.debug("send res", name, method, res);
+	this._logger.debug("send res", name, method, res);
 	return res;
 };
 
@@ -170,15 +195,15 @@ MM_eth.prototype.call = async function(type, name, method, value, ...param) {
 	if (!this.address) {
 		await this.init();
 	}
-	$.log.debug("call req", type, name, method, ...param);
+	this._logger.debug("call req", type, name, method, ...param);
 	try {
 		var res = await this[type][name].contract.methods[method](...param).call({
 			from: this.address
 		});
 	} catch (err) {
-		$.log.error(method, err);
+		this._logger.error(method, err);
 	}
-	// $.log.debug("call res", name, method, res);
+	// this._logger.debug("call res", name, method, res);
 	return res;
 };
 
@@ -190,7 +215,7 @@ MM_eth.prototype.call = async function(type, name, method, value, ...param) {
  * @param {Number} chainId 区块链频道
  */
 MM_eth.prototype.eventAfter = function(name, accounts, chainId) {
-	// $.log.debug(name);
+	// this._logger.debug(name);
 };
 
 /**
@@ -200,7 +225,7 @@ MM_eth.prototype.eventAfter = function(name, accounts, chainId) {
  * @param {Number} chainId 区块链频道
  */
 MM_eth.prototype.event = function(name, accounts, chainId) {
-  $.log.debug("event:", name, accounts, chainId);
+  this._logger.debug("event:", name, accounts, chainId);
   if (accounts && accounts.length) {
     this.address = pdr.selectedAddress || accounts[0];
   }
@@ -240,7 +265,7 @@ MM_eth.prototype.event = function(name, accounts, chainId) {
     try {
       o(name, this.address, this.chainId);
     } catch (e) {
-      $.log.debug(e);
+      this._logger.debug(e);
     }
   }
   this.eventAfter(name, accounts, this.chainId);
@@ -289,9 +314,9 @@ MM_eth.prototype.subscribeEvent = function(provider) {
 			chainId,
 			accounts
 		} = payload;
-		$.log.debug("连接成功");
-		$.log.debug(chainId, accounts);
-		$.log.debug(Object.keys(payload));
+		this._logger.debug("连接成功");
+		this._logger.debug(chainId, accounts);
+		this._logger.debug(Object.keys(payload));
 		this.event('connect', accounts, this.toChage10(chainId, 1));
 	});
 
@@ -421,15 +446,15 @@ MM_eth.prototype.sendS = async function(type, name, method, value, ...param) {
 	let address_my = this.web3.eth.defaultAccount || this.address;
 
 	if (!this[type]) {
-		$.log.error("合约类型不正确");
+		this._logger.error("合约类型不正确");
 		return
 	}
 	if (!this[type][name]) {
-		$.log.error("合约不正确");
+		this._logger.error("合约不正确");
 		return
 	}
 	if (!this[type][name].contract.methods[method]) {
-		$.log.error("函数不存在！");
+		this._logger.error("函数不存在！");
 		return
 	}
 
@@ -455,7 +480,7 @@ MM_eth.prototype.sendS = async function(type, name, method, value, ...param) {
 	// $.log.info("数据", rawTx);
 	var sign_data = await this.web3.eth.accounts.signTransaction(rawTx, this.config.private_key);
 	if (!sign_data) {
-		$.log.error("签名失败", rawTx, err);
+		this._logger.error("签名失败", rawTx, err);
 		return null;
 	}
 	// $.log.info("签名", sign_data);
@@ -464,7 +489,7 @@ MM_eth.prototype.sendS = async function(type, name, method, value, ...param) {
 	try {
 		tx = await this.web3.eth.sendSignedTransaction(sign_data.rawTransaction);
 	} catch (err) {
-		$.log.error("链上交易超时", rawTx, err);
+		this._logger.error("链上交易超时", rawTx, err);
 	}
 	// $.log.info("广播", tx);
 	if (tx) {
@@ -476,7 +501,7 @@ MM_eth.prototype.sendS = async function(type, name, method, value, ...param) {
 		this.nonce -= 1
 	}
 
-	$.log.debug('send res', name, tx);
+	this._logger.debug('send res', name, tx);
 	return tx;
 };
 
@@ -492,20 +517,20 @@ MM_eth.prototype.sendS = async function(type, name, method, value, ...param) {
  * @return {String} return address
  */
 MM_eth.prototype.callObj = async function(type, name, method, keys, ...param) {
-  $.log.debug("call req", type, name, method, ...param);
+  this._logger.debug("call req", type, name, method, ...param);
   try {
     var res = await this[type][name].contract.methods[method](...param).call({
       from: this.address
     });
   } catch (err) {
-    $.log.error(method, err)
+    this._logger.error(method, err)
   }
   var arr = res.split('_');
   var obj = {};
   for(var i = 0; i < keys.length; i++){
     obj[keys[i]] = arr.length > i ? arr[i] : 0;
   }
-  $.log.debug("call res", name, method, obj);
+  this._logger.debug("call res", name, method, obj);
   return obj;
 };
 
@@ -518,13 +543,13 @@ MM_eth.prototype.callObj = async function(type, name, method, keys, ...param) {
  * @return {String} return address
  */
 MM_eth.prototype.callList = async function(type, name, method, keys, ...param) {
-  $.log.debug("call req", type, name, method, ...param);
+  this._logger.debug("call req", type, name, method, ...param);
   try {
     var res = await this[type][name].contract.methods[method](...param).call({
       from: this.address
     });
   } catch (err) {
-    $.log.error(method, err)
+    this._logger.error(method, err)
   }
   var list = res.map((o) => {
       var arr = o.split('_');
@@ -534,7 +559,7 @@ MM_eth.prototype.callList = async function(type, name, method, keys, ...param) {
       }
       return obj
   });
-  $.log.debug("call res", name, method, list);
+  this._logger.debug("call res", name, method, list);
   return list;
 };
 

package/package.json

@@ -1,44 +1,46 @@
-{
-  "name": "mm_contract",
-  "version": "1.0.0",
-  "description": "这是超级美眉智能合约调用辅助模块，用于快速发布合约和调用区块链ABI方法，适用于eth和tron。",
-  "main": "index.js",
-  "scripts": {
-    "test": "node test.js",
-    "dev": "nodemon ./demo/index.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://gitee.com/qiuwenwu91/mm_contract.git"
-  },
-  "keywords": [
-    "mm_mod",
-    "mm_adapter",
-    "mm_ext_service",
-    "MM",
-    "超级美眉",
-    "区块链",
-    "智能合约",
-    "浏览器钱包",
-    "ETH",
-    "TRON",
-    "以太坊",
-    "波场",
-    "发布",
-    "调用ABI",
-    "Contract"
-  ],
-  "layer": "adapter",
-  "group": "ext_service",
-  "author": "邱文武（qiuwenwu）",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://gitee.com/qiuwenwu91/mm_contract/issues"
-  },
-  "homepage": "https://gitee.com/qiuwenwu91/mm_contract#readme",
-  "dependencies": {
-    "bignumber": "^1.1.0",
-    "mm_logs": "^1.0.9",
-    "web3": "^1.3.0"
-  }
-}
+{
+    "name": "mm_contract",
+    "version": "1.0.1",
+    "description": "这是超级美眉智能合约调用辅助模块，用于快速发布合约和调用区块链ABI方法，适用于eth和tron。",
+    "main": "index.js",
+    "scripts": {
+        "test": "node test.js",
+        "dev": "nodemon ./demo/index.js"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://gitee.com/qiuwenwu91/mm_contract.git"
+    },
+    "keywords": [
+        "mm_mod",
+        "mm_adapter",
+        "mm_ext_service",
+        "MM",
+        "超级美眉",
+        "区块链",
+        "智能合约",
+        "浏览器钱包",
+        "ETH",
+        "TRON",
+        "以太坊",
+        "波场",
+        "发布",
+        "调用ABI",
+        "Contract"
+    ],
+    "layer": "adapter",
+    "group": "ext_service",
+    "author": "邱文武（qiuwenwu）",
+    "license": "ISC",
+    "bugs": {
+        "url": "https://gitee.com/qiuwenwu91/mm_contract/issues"
+    },
+    "homepage": "https://gitee.com/qiuwenwu91/mm_contract#readme",
+    "dependencies": {
+        "bignumber": "^1.1.0",
+        "web3": "^1.3.0"
+    },
+    "devDependencies": {
+        "mm_logs": "^1.0.9"
+    }
+}