|
|
@@ -124,19 +124,32 @@ bitkeepTron.getTransactionData=function (to,money){
|
|
|
*/
|
|
|
bitkeepTron.sendTransaction=function (data){
|
|
|
return new Promise(async (resolve, reject) => {
|
|
|
- try {
|
|
|
- let broastTx;
|
|
|
+ // try {
|
|
|
+ let broastTx={};
|
|
|
if (data.contract) {
|
|
|
- const parameter = [{ type: 'address', value: data.to * Math.pow(10, 18) }];
|
|
|
- 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);
|
|
|
+ // 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;
|
|
|
+ if (decimalCall) {
|
|
|
+ decimal = await decimalCall().call()
|
|
|
+ }
|
|
|
+ let txid = await Contract.transfer(
|
|
|
+ data.to,
|
|
|
+ tronWeb.toHex(data.value * Math.pow(10, decimal))
|
|
|
+ ).send()
|
|
|
+ if(txid){
|
|
|
+ broastTx.txid=txid
|
|
|
+ }
|
|
|
} else {
|
|
|
console.log('transactionBuilder:')
|
|
|
console.log(data.to, data.value * Math.pow(10, 6), data.from)
|
|
|
@@ -151,9 +164,9 @@ bitkeepTron.sendTransaction=function (data){
|
|
|
}else {
|
|
|
reject(false)
|
|
|
}
|
|
|
- }catch (e) {
|
|
|
- reject(false)
|
|
|
- }
|
|
|
+ // }catch (e) {
|
|
|
+ // reject(false)
|
|
|
+ // }
|
|
|
})
|
|
|
}
|
|
|
|