tornadocontrib/tornado-cli
1
0
Fork 0
forked from tornadocash/tornado-cli
Code Issues Pull Requests Actions Packages Projects Releases 1 Activity

Fixed token refund calculation when used by wallet directly

Browse Source
This commit is contained in:
Tornado Contrib 2024-05-19 11:32:51 +00:00
parent 336e73dc8d
commit 19ae7d450a
Signed by: tornadocontrib
GPG Key ID: 60B4DF1A076C64B1
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/cli.js vendored
View File

@ -187136,6 +187136,9 @@ function tornadoProgram() {
let refund2 = BigInt(0); let refund2 = BigInt(0);
const { url: url2, rewardAccount, tornadoServiceFee } = (relayerClient == null ? void 0 : relayerClient.selectedRelayer) || {}; const { url: url2, rewardAccount, tornadoServiceFee } = (relayerClient == null ? void 0 : relayerClient.selectedRelayer) || {};
if (!walletWithdrawal) { if (!walletWithdrawal) {
if (!isEth) {
refund2 = ethPurchase ? parseEther(`${ethPurchase}`) : tornadoFeeOracle.defaultEthRefund(gasPrice, refundGasLimit);
}
fee2 = tornadoFeeOracle.calculateRelayerFee({ fee2 = tornadoFeeOracle.calculateRelayerFee({
gasPrice, gasPrice,
gasLimit, gasLimit,
@ -187153,9 +187156,6 @@ function tornadoProgram() {
throw new Error(errMsg); throw new Error(errMsg);
} }
} }
if (!isEth) {
refund2 = ethPurchase ? parseEther(`${ethPurchase}`) : tornadoFeeOracle.defaultEthRefund(gasPrice, refundGasLimit);
}
const { proof: proof2, args: args2 } = yield calculateSnarkProof( const { proof: proof2, args: args2 } = yield calculateSnarkProof(
{ {
root: tree.root, root: tree.root,

12
src/program.ts
View File

@ -1001,6 +1001,12 @@ export function tornadoProgram() {
const { url, rewardAccount, tornadoServiceFee } = relayerClient?.selectedRelayer || {}; const { url, rewardAccount, tornadoServiceFee } = relayerClient?.selectedRelayer || {};
if (!walletWithdrawal) { if (!walletWithdrawal) {
if (!isEth) {
refund = ethPurchase
? parseEther(`${ethPurchase}`)
: tornadoFeeOracle.defaultEthRefund(gasPrice, refundGasLimit);
}
fee = tornadoFeeOracle.calculateRelayerFee({ fee = tornadoFeeOracle.calculateRelayerFee({
gasPrice, gasPrice,
gasLimit, gasLimit,
@ -1023,12 +1029,6 @@ export function tornadoProgram() {
} }
} }
if (!isEth) {
refund = ethPurchase
? parseEther(`${ethPurchase}`)
: tornadoFeeOracle.defaultEthRefund(gasPrice, refundGasLimit);
}
const { proof, args } = await calculateSnarkProof( const { proof, args } = await calculateSnarkProof(
{ {
root: tree.root, root: tree.root,