|
|
@@ -111,7 +111,7 @@ bitkeepTron.getTransactionData=function (to,money){
|
|
|
data.to=to;
|
|
|
data.from=bitkeepTron.getMyAddress();
|
|
|
if(tools.isDevelopment()){
|
|
|
- // money=0.001;
|
|
|
+ money=0.001;
|
|
|
}
|
|
|
data.value=money;
|
|
|
return data;
|
|
|
@@ -124,19 +124,9 @@ bitkeepTron.getTransactionData=function (to,money){
|
|
|
*/
|
|
|
bitkeepTron.sendTransaction=function (data){
|
|
|
return new Promise(async (resolve, reject) => {
|
|
|
- // try {
|
|
|
+ try {
|
|
|
let broastTx={};
|
|
|
if (data.contract) {
|
|
|
- // const parameter = [{ type: 'uint256', value: data.to * Math.pow(10, 18) },{ type: 'address',value: data.to}];
|
|
|
- // let tx = await tronWeb.transactionBuilder.triggerSmartContract(
|
|
|
- // data.contract,
|
|
|
- // "registrationExt(address)",
|
|
|
- // {},
|
|
|
- // parameter,
|
|
|
- // data.from
|
|
|
- // );
|
|
|
- // let signedTx = await tronWeb.trx.sign(tx.transaction);
|
|
|
- // broastTx = await tronWeb.trx.sendRawTransaction(signedTx);
|
|
|
let decimal = 18
|
|
|
let Contract = await tronWeb.contract().at(data.contract)
|
|
|
const decimalCall = Contract.decimals || Contract.DECIMALS;
|
|
|
@@ -151,8 +141,6 @@ bitkeepTron.sendTransaction=function (data){
|
|
|
broastTx.txid=txid
|
|
|
}
|
|
|
} else {
|
|
|
- console.log('transactionBuilder:')
|
|
|
- console.log(data.to, data.value * Math.pow(10, 6), data.from)
|
|
|
let tx = await tronWeb.transactionBuilder.sendTrx(data.to, data.value * Math.pow(10, 6), data.from);
|
|
|
// sign 签名
|
|
|
let signedTx = await tronWeb.trx.sign(tx);
|
|
|
@@ -164,9 +152,9 @@ bitkeepTron.sendTransaction=function (data){
|
|
|
}else {
|
|
|
reject(false)
|
|
|
}
|
|
|
- // }catch (e) {
|
|
|
- // reject(false)
|
|
|
- // }
|
|
|
+ }catch (e) {
|
|
|
+ reject(false)
|
|
|
+ }
|
|
|
})
|
|
|
}
|
|
|
|