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

fix calculateFee

This commit is contained in:
Alexey 2020-05-22 12:37:21 +03:00
parent ebbd3aac03
commit d3c0630f72
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cli.js
View File

@ -1,4 +1,4 @@
#!/usr/bin/env NODE_OPTIONS=--no-warnings node #!/usr/bin/env node
// Temporary demo client // Temporary demo client
// Works both in browser and node.js // Works both in browser and node.js
@ -24,7 +24,6 @@ let MERKLE_TREE_HEIGHT, ETH_AMOUNT, TOKEN_AMOUNT, PRIVATE_KEY
/** Whether we are in a browser or node.js */ /** Whether we are in a browser or node.js */
const inBrowser = (typeof window !== 'undefined') const inBrowser = (typeof window !== 'undefined')
let isLocalRPC = false let isLocalRPC = false
const networks = { '1': 'mainnet', '42': 'kovan' }
/** Generate random number of specified byte length */ /** Generate random number of specified byte length */
const rbigint = nbytes => snarkjs.bigInt.leBuff2int(crypto.randomBytes(nbytes)) const rbigint = nbytes => snarkjs.bigInt.leBuff2int(crypto.randomBytes(nbytes))
@ -346,25 +345,28 @@ function getCurrentNetworkName() {
} }
function calculateFee({ gasPrices, currency, amount, refund, ethPrices, relayerServiceFee, decimals }) { function calculateFee({ gasPrices, currency, amount, refund, ethPrices, relayerServiceFee, decimals }) {
const decimalsPoint = Math.floor(relayerServiceFee) === Number(relayerServiceFee) ?
const total = toBN(fromDecimals({ amount, decimals })) 0 :
const fee = relayerServiceFee relayerServiceFee.toString().split('.')[1].length
const decimalsPoint = Math.floor(fee) === fee ? 0 : fee.toString().split('.')[1].length
const roundDecimal = 10 ** decimalsPoint const roundDecimal = 10 ** decimalsPoint
relayerServiceFee = total.mul(toBN(fee * roundDecimal)).div(toBN(roundDecimal * 100)) const total = toBN(fromDecimals({ amount, decimals }))
const ethFee = toBN(toWei(gasPrices.fast.toString(), 'gwei')).mul(toBN('500000')) const feePercent = total.mul(toBN(relayerServiceFee * roundDecimal)).div(toBN(roundDecimal * 100))
const expense = toBN(toWei(gasPrices.fast.toString(), 'gwei')).mul(toBN(5e5))
let desiredFee
switch (currency) { switch (currency) {
case 'eth': { case 'eth': {
return ethFee.add(relayerServiceFee) desiredFee = expense.add(feePercent)
break
} }
default: { default: {
const tokenFee = ethFee desiredFee = expense.add(toBN(refund))
.mul(toBN(10 ** decimals)) .mul(toBN(10 ** decimals))
.div(toBN(ethPrices[currency])) .div(toBN(ethPrices[currency]))
return tokenFee.add(relayerServiceFee) desiredFee = desiredFee.add(feePercent)
break
} }
} }
return desiredFee
} }
/** /**