tornadocash/tornado-cli
3
0
Fork 1
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fix send function

Browse Source
This commit is contained in:
Theo 2023-08-27 09:39:12 -07:00
parent fadd50e801
commit fcfa782cf1
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cli.js
View File

@ -161,18 +161,18 @@ async function submitTransaction(signedTX) {
async function generateTransaction(to, encodedData, value = 0, txType = 'other') { async function generateTransaction(to, encodedData, value = 0, txType = 'other') {
const nonce = await web3.eth.getTransactionCount(senderAccount); const nonce = await web3.eth.getTransactionCount(senderAccount);
const isNumRString = typeof value == 'string' || typeof value == 'number'; value = toBN(value);
const valueCost = isNumRString ? toBN(value) : value;
const incompletedTx = { let incompletedTx = {
to, to,
value: valueCost.toString(), value: value.toString(),
data: encodedData data: encodedData
}; };
if (txType === 'send') incompletedTx['from'] = senderAccount;
const { gasPrice, gasLimit, l1Fee } = await feeOracle.getGasParams(incompletedTx, txType); const { gasPrice, gasLimit, l1Fee } = await feeOracle.getGasParams(incompletedTx, txType);
const gasCosts = toBN(gasPrice).mul(toBN(gasLimit)).add(toBN(l1Fee)); const gasCosts = toBN(gasPrice).mul(toBN(gasLimit)).add(toBN(l1Fee));
const totalCosts = valueCost.add(gasCosts); const totalCosts = value.add(gasCosts);
/** Transaction details */ /** Transaction details */
console.log('Gas price: ', web3.utils.hexToNumber(gasPrice)); console.log('Gas price: ', web3.utils.hexToNumber(gasPrice));
@ -632,11 +632,12 @@ async function send({ address, amount, tokenAddress }) {
process.exit(1); process.exit(1);
} }
const encodeTransfer = erc20.methods.transfer(address, toSend).encodeABI(); const encodeTransfer = erc20.methods.transfer(address, toSend).encodeABI();
await generateTransaction(tokenAddress, encodeTransfer); await generateTransaction(tokenAddress, encodeTransfer, 0, 'send');
console.log('Sent', amount, tokenSymbol, 'to', address); console.log('Sent', amount, tokenSymbol, 'to', address);
} else { } else {
const balance = new BigNumber(await web3.eth.getBalance(senderAccount)); const balance = new BigNumber(await web3.eth.getBalance(senderAccount));
assert(balance.toNumber() !== 0, "You have 0 balance, can't send transaction"); assert(balance.toNumber() !== 0, "You have 0 balance, can't send transaction");
let toSend = new BigNumber(0);
if (amount) { if (amount) {
toSend = new BigNumber(amount).times(BigNumber(10).pow(18)); toSend = new BigNumber(amount).times(BigNumber(10).pow(18));
if (balance.lt(toSend)) { if (balance.lt(toSend)) {
@ -1452,7 +1453,7 @@ async function init({ rpc, noteNetId, currency = 'dai', amount = '100', balanceC
try { try {
if (balanceCheck) { if (balanceCheck) {
currency = netSymbol.toLowerCase(); currency = netSymbol.toLowerCase();
amount = Object.keys(config.deployments[`netId${netId}`][currency].instanceAddress)[0]; amount = Object.keys(config.deployments[`netId${netId}`]['tokens'][currency].instanceAddress)[0];
} }
tornadoProxyAddress = config.deployments[`netId${netId}`].proxy; tornadoProxyAddress = config.deployments[`netId${netId}`].proxy;
multiCall = config.deployments[`netId${netId}`].multicall; multiCall = config.deployments[`netId${netId}`].multicall;