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

fix erc20 tornadoWithdraw

Browse Source
This commit is contained in:
Alexey 2020-11-17 18:39:39 +03:00
parent a1f7b92b50
commit a889e29bae
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/worker.js
View File

@ -7,6 +7,7 @@ const { GasPriceOracle } = require('gas-price-oracle')
const { Utils } = require('tornado-cash-anonymity-mining') const { Utils } = require('tornado-cash-anonymity-mining')
const tornadoProxyABI = require('../abis/tornadoProxyABI.json') const tornadoProxyABI = require('../abis/tornadoProxyABI.json')
const tornadoABI = require('../abis/tornadoABI.json')
const miningABI = require('../abis/mining.abi.json') const miningABI = require('../abis/mining.abi.json')
const swapABI = require('../abis/swap.abi.json') const swapABI = require('../abis/swap.abi.json')
const { queue } = require('./queue') const { queue } = require('./queue')
@ -172,12 +173,18 @@ async function checkMiningFee({ args }) {
async function getTxObject({ data }) { async function getTxObject({ data }) {
if (data.type === jobType.TORNADO_WITHDRAW) { if (data.type === jobType.TORNADO_WITHDRAW) {
const tornadoProxyAddress = await resolver.resolve(torn.tornadoProxy.address) let contract, calldata
const contract = new web3.eth.Contract(tornadoProxyABI, tornadoProxyAddress) if (getInstance(data.contract).currency === 'eth') {
const calldata = contract.methods.withdraw(data.contract, data.proof, ...data.args).encodeABI() const tornadoProxyAddress = await resolver.resolve(torn.tornadoProxy.address)
contract = new web3.eth.Contract(tornadoProxyABI, tornadoProxyAddress)
calldata = contract.methods.withdraw(data.contract, data.proof, ...data.args).encodeABI()
} else {
contract = new web3.eth.Contract(tornadoABI, data.contract)
calldata = contract.methods.withdraw(data.proof, ...data.args).encodeABI()
}
return { return {
value: data.args[5], value: data.args[5],
to: tornadoProxyAddress, to: contract._address,
data: calldata, data: calldata,
} }
} else { } else {