tornadocash/tornado-cli
1
0
Fork 0
mirror of https://github.com/tornadocash/tornado-cli.git synced 2024-11-21 17:27:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicated definition

Browse Source
This commit is contained in:
Ayanami 2022-01-27 14:50:49 +09:00
parent e9ff6d1488
commit 4bea523346
No known key found for this signature in database
GPG Key ID: 0CABDF03077D92E4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cli.js
View File

@ -41,8 +41,8 @@ function toHex(number, length = 32) {
} }
/** Display ETH account balance */ /** Display ETH account balance */
async function printETHBalance({ address, name, symbol }) { async function printETHBalance({ address, name }) {
console.log(`${name} balance is`, web3.utils.fromWei(await web3.eth.getBalance(address)),`${symbol}`) console.log(`${name} balance is`, web3.utils.fromWei(await web3.eth.getBalance(address)),`${netSymbol}`)
} }
/** Display ERC20 account balance */ /** Display ERC20 account balance */
@ -159,13 +159,13 @@ async function deposit({ currency, amount }) {
console.log(`Your note: ${noteString}`) console.log(`Your note: ${noteString}`)
await backupNote({ currency, amount, netId, note, noteString }) await backupNote({ currency, amount, netId, note, noteString })
if (currency === netSymbol.toLowerCase()) { if (currency === netSymbol.toLowerCase()) {
await printETHBalance({ address: tornadoContract._address, name: 'Tornado contract', symbol: currency.toUpperCase() }) await printETHBalance({ address: tornadoContract._address, name: 'Tornado contract' })
await printETHBalance({ address: senderAccount, name: 'Sender account', symbol: currency.toUpperCase() }) await printETHBalance({ address: senderAccount, name: 'Sender account' })
const value = isLocalRPC ? ETH_AMOUNT : fromDecimals({ amount, decimals: 18 }) const value = isLocalRPC ? ETH_AMOUNT : fromDecimals({ amount, decimals: 18 })
console.log('Submitting deposit transaction') console.log('Submitting deposit transaction')
await generateTransaction(contractAddress, await tornado.methods.deposit(tornadoInstance, toHex(deposit.commitment), []).encodeABI(), value) await generateTransaction(contractAddress, await tornado.methods.deposit(tornadoInstance, toHex(deposit.commitment), []).encodeABI(), value)
await printETHBalance({ address: tornadoContract._address, name: 'Tornado contract', symbol: currency.toUpperCase() }) await printETHBalance({ address: tornadoContract._address, name: 'Tornado contract' })
await printETHBalance({ address: senderAccount, name: 'Sender account', symbol: currency.toUpperCase() }) await printETHBalance({ address: senderAccount, name: 'Sender account' })
} else { } else {
// a token // a token
await printERC20Balance({ address: tornadoContract._address, name: 'Tornado contract' }) await printERC20Balance({ address: tornadoContract._address, name: 'Tornado contract' })
@ -351,7 +351,7 @@ async function withdraw({ deposit, currency, amount, recipient, relayerURL, torP
await generateTransaction(contractAddress, await tornado.methods.withdraw(tornadoInstance, proof, ...args).encodeABI()) await generateTransaction(contractAddress, await tornado.methods.withdraw(tornadoInstance, proof, ...args).encodeABI())
} }
if (currency === netSymbol.toLowerCase()) { if (currency === netSymbol.toLowerCase()) {
await printETHBalance({ address: recipient, name: 'Recipient', symbol: currency.toUpperCase() }) await printETHBalance({ address: recipient, name: 'Recipient' })
} else { } else {
await printERC20Balance({ address: recipient, name: 'Recipient' }) await printERC20Balance({ address: recipient, name: 'Recipient' })
} }
@ -1045,7 +1045,7 @@ async function main() {
console.log("Using address",senderAccount,"from private key") console.log("Using address",senderAccount,"from private key")
address = senderAccount; address = senderAccount;
} }
await printETHBalance({ address, name: 'Account', symbol: netSymbol }) await printETHBalance({ address, name: 'Account' })
if (tokenAddress) { if (tokenAddress) {
await printERC20Balance({ address, name: 'Account', tokenAddress }) await printERC20Balance({ address, name: 'Account', tokenAddress })
} }