From 3d987c09e5ade12783f6adad2fc4396d3035be05 Mon Sep 17 00:00:00 2001 From: lk Date: Wed, 10 Jul 2019 10:35:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=86=E5=8F=B7=20;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Account.js | 8 +++---- btc.js | 68 ++++++++++++++++++++++++++-------------------------- netConfig.js | 12 +++++----- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/Account.js b/Account.js index 34d02e2..0502396 100644 --- a/Account.js +++ b/Account.js @@ -1,9 +1,9 @@ 'use strict' const Coins = {} -Coins.TIC = require('./tic.js').TIC; -Coins.ETH = require('./eth.js').ETH; -Coins.ERC20 = require('./eth.js').ERC20; -Coins.BTC = require('./btc.js').BTC; +Coins.TIC = require('./tic.js').TIC +Coins.ETH = require('./eth.js').ETH +Coins.ERC20 = require('./eth.js').ERC20 +Coins.BTC = require('./btc.js').BTC class Account { constructor(coinType,privateKey,contractAddress){ diff --git a/btc.js b/btc.js index d42f4f8..fe8a806 100644 --- a/btc.js +++ b/btc.js @@ -1,12 +1,12 @@ 'use strict' -const axios = require('axios'); -const HDNode = require('./utils/hdnode'); -const bitcoinjs = require('bitcoinjs-lib'); -const Ticrypto = require('tic.crypto'); -const BTC_NODE = require('./netConfig').BTC_NODE; -const BTC_NODE2 = require('./netConfig').BTC_NODE2; -const BTC_TXFEE = 30; +const axios = require('axios') +const HDNode = require('./utils/hdnode') +const bitcoinjs = require('bitcoinjs-lib') +const Ticrypto = require('tic.crypto') +const BTC_NODE = require('./netConfig').BTC_NODE +const BTC_NODE2 = require('./netConfig').BTC_NODE2 +const BTC_TXFEE = 30 class BTC { constructor(privateKey){ @@ -30,23 +30,23 @@ class BTC { }, "url" : { enumerable : true, - get: function() { return this._url; }, + get: function() { return this._url }, set: function(url) { - if (typeof(url) !== 'string') { throw new Error('invalid url'); } - this._url = url; + if (typeof(url) !== 'string') { throw new Error('invalid url') } + this._url = url } }, "defaultGas":{ enumerable: true, - get: function() { return this._defaultGasFee; }, + get: function() { return this._defaultGasFee }, set: function(value) { - if (typeof(value) !== 'number') { throw new Error('invalid defaultGasFee'); } - this._defaultGasFee = value; + if (typeof(value) !== 'number') { throw new Error('invalid defaultGasFee') } + this._defaultGasFee = value } } }) - this._url = BTC_NODE; - this._defaultGasFee = BTC_TXFEE; + this._url = BTC_NODE + this._defaultGasFee = BTC_TXFEE } static generateNewAccount(){ @@ -82,22 +82,22 @@ class BTC { return address.length == 34 && address[0] == '1' } async sendTransaction(toAddress, amount, option = {gasFee : BTC_TXFEE}){ - let set = bitcoinjs.ECPair.fromPrivateKey(Buffer.from(this.privateKey,'hex'));//导入私钥用于签名 - let txb = new bitcoinjs.TransactionBuilder();//初始化交易对象 + let set = bitcoinjs.ECPair.fromPrivateKey(Buffer.from(this.privateKey,'hex'))//导入私钥用于签名 + let txb = new bitcoinjs.TransactionBuilder()//初始化交易对象 let tx = await BTC.getUTXO('1DEP8i3QJCsomS4BSMY2RpU1upv62aGvhD') if(!tx) return null - var tot = 0;//用于记录UTXO总量 - amount+=1e4;//消费金额是转出金额加上10000的矿工费 - txb.setVersion(1);//设置交易版本号 + var tot = 0//用于记录UTXO总量 + amount+=1e4//消费金额是转出金额加上10000的矿工费 + txb.setVersion(1)//设置交易版本号 for(var i=0;i