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

Remove duplicated definition

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

3
cli.js
View File

@ -948,6 +948,7 @@ async function init({ rpc, noteNetId, currency = 'dai', amount = '100', torPort,
groth16 = await buildGroth16() groth16 = await buildGroth16()
netId = await web3.eth.net.getId() netId = await web3.eth.net.getId()
netName = getCurrentNetworkName() netName = getCurrentNetworkName()
netSymbol = getCurrentNetworkSymbol()
if (noteNetId && Number(noteNetId) !== netId) { if (noteNetId && Number(noteNetId) !== netId) {
throw new Error('This note is for a different network. Specify the --rpc option explicitly') throw new Error('This note is for a different network. Specify the --rpc option explicitly')
} }
@ -956,14 +957,12 @@ async function init({ rpc, noteNetId, currency = 'dai', amount = '100', torPort,
} }
if (isLocalRPC) { if (isLocalRPC) {
netSymbol = getCurrentNetworkSymbol()
tornadoAddress = currency === netSymbol.toLowerCase() ? contractJson.networks[netId].address : erc20tornadoJson.networks[netId].address tornadoAddress = currency === netSymbol.toLowerCase() ? contractJson.networks[netId].address : erc20tornadoJson.networks[netId].address
tokenAddress = currency !== netSymbol.toLowerCase() ? erc20ContractJson.networks[netId].address : null tokenAddress = currency !== netSymbol.toLowerCase() ? erc20ContractJson.networks[netId].address : null
deployedBlockNumber = 0 deployedBlockNumber = 0
senderAccount = (await web3.eth.getAccounts())[0] senderAccount = (await web3.eth.getAccounts())[0]
} else { } else {
try { try {
netSymbol = getCurrentNetworkSymbol()
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}`][currency].instanceAddress)[0]