Comparing version 2.1.26 to 2.1.27
{ | ||
"name": "tronweb", | ||
"version": "2.1.26", | ||
"version": "2.1.27", | ||
"description": "JavaScript SDK that encapsulates the TRON Node HTTP API", | ||
@@ -5,0 +5,0 @@ "main": "dist/TronWeb.node.js", |
@@ -6,14 +6,2 @@ import TronWeb from 'index'; | ||
const transactionResultManager = (transaction, callback) => { | ||
if(transaction.Error) | ||
return callback(transaction.Error); | ||
if(transaction.result && transaction.result.message) { | ||
return callback( | ||
this.tronWeb.toUtf8(transaction.result.message) | ||
); | ||
} | ||
callback(null, transaction); | ||
} | ||
export default class TransactionBuilder { | ||
@@ -28,2 +16,14 @@ constructor(tronWeb = false) { | ||
_resultManager(transaction, callback) { | ||
if(transaction.Error) | ||
return callback(transaction.Error); | ||
if(transaction.result && transaction.result.message) { | ||
return callback( | ||
this.tronWeb.toUtf8(transaction.result.message) | ||
); | ||
} | ||
callback(null, transaction); | ||
} | ||
sendTrx(to = false, amount = 0, from = this.tronWeb.defaultAddress.hex, callback = false) { | ||
@@ -57,3 +57,3 @@ if(utils.isFunction(from)) { | ||
amount: parseInt(amount) | ||
}, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
}, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -94,3 +94,3 @@ | ||
amount: parseInt(amount) | ||
}, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
}, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -124,3 +124,3 @@ | ||
amount: parseInt(amount) | ||
}, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
}, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -178,3 +178,3 @@ | ||
this.tronWeb.fullNode.request('wallet/freezebalance', data, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
this.tronWeb.fullNode.request('wallet/freezebalance', data, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -219,3 +219,3 @@ | ||
this.tronWeb.fullNode.request('wallet/unfreezebalance', data, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
this.tronWeb.fullNode.request('wallet/unfreezebalance', data, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -237,3 +237,3 @@ | ||
owner_address: this.tronWeb.address.toHex(address) | ||
}, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
}, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -260,3 +260,3 @@ | ||
url: this.tronWeb.fromUtf8(url) | ||
}, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
}, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -307,3 +307,3 @@ | ||
votes | ||
}, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
}, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -438,3 +438,3 @@ | ||
this.tronWeb.fullNode.request('wallet/deploycontract', args, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
this.tronWeb.fullNode.request('wallet/deploycontract', args, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -516,3 +516,3 @@ | ||
const abiCoder = new Ethers.utils.AbiCoder(); | ||
const types = []; | ||
let types = []; | ||
const values = []; | ||
@@ -534,2 +534,10 @@ | ||
try { | ||
// workaround for unsupported trcToken type | ||
types = types.map(type => { | ||
if (/trcToken/.test(type)) { | ||
type = type.replace(/trcToken/,'uint256') | ||
} | ||
return type | ||
}) | ||
parameters = abiCoder.encode(types, values).replace(/^(0x)/, ''); | ||
@@ -555,3 +563,3 @@ } catch (ex) { | ||
this.tronWeb.fullNode.request('wallet/triggersmartcontract', args, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
this.tronWeb.fullNode.request('wallet/triggersmartcontract', args, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -661,3 +669,3 @@ | ||
this.tronWeb.fullNode.request('wallet/createassetissue', data, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
this.tronWeb.fullNode.request('wallet/createassetissue', data, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -686,3 +694,3 @@ | ||
owner_address: this.tronWeb.address.toHex(address), | ||
}, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
}, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -727,3 +735,3 @@ | ||
new_public_limit: parseInt(freeBandwidthLimit) | ||
}, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
}, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -779,3 +787,3 @@ | ||
parameters: parameters | ||
}, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
}, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -805,3 +813,3 @@ | ||
proposal_id: parseInt(proposalID) | ||
}, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
}, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -835,3 +843,3 @@ | ||
is_add_approval: isApproval | ||
}, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
}, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -944,3 +952,3 @@ | ||
quant: parseInt(tokenAmount) | ||
}, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
}, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -979,3 +987,3 @@ | ||
quant: parseInt(tokenAmount) | ||
}, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
}, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -1023,3 +1031,3 @@ | ||
expected: parseInt(tokenAmountExpected) | ||
}, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
}, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -1056,3 +1064,3 @@ | ||
consume_user_resource_percent: userFeePercentage | ||
}, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
}, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
@@ -1089,4 +1097,4 @@ | ||
origin_energy_limit: originEnergyLimit | ||
}, 'post').then(transaction => transactionResultManager(transaction, callback)).catch(err => callback(err)); | ||
}, 'post').then(transaction => this._resultManager(transaction, callback)).catch(err => callback(err)); | ||
} | ||
} |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
3335949
7295