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

Fix commander arguments parser issue: now all parameters with hyphen processed correctly

Browse Source
This commit is contained in:
Theo 2023-05-11 12:04:42 +03:00
parent f000d0af36
commit 16d9efa60c
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cli.js
View File

@ -1348,7 +1348,7 @@ function statePreferences(program) {
if (program.noconfirmation) { if (program.noconfirmation) {
shouldPromptConfirmation = false; shouldPromptConfirmation = false;
} }
if (program.onlyrpc) { if (program.onlyRpc) {
privateRpc = true; privateRpc = true;
} }
if (program.tor) { if (program.tor) {
@ -1503,7 +1503,7 @@ async function main() {
.option('-R, --relayer <URL>', 'Withdraw via relayer') .option('-R, --relayer <URL>', 'Withdraw via relayer')
.option('-T, --tor <PORT>', 'Optional tor port') .option('-T, --tor <PORT>', 'Optional tor port')
.option('-p, --private-key <KEY>', "Wallet private key - If you didn't add it to .env file and it is needed for operation") .option('-p, --private-key <KEY>', "Wallet private key - If you didn't add it to .env file and it is needed for operation")
.option('-S --gas_speed <SPEED>', 'Gas speed preference [ instant, fast, standard, low ]') .option('-S --gas-speed <SPEED>', 'Gas speed preference [ instant, fast, standard, low ]')
.option('-N --noconfirmation', 'No confirmation mode - Does not query confirmation ') .option('-N --noconfirmation', 'No confirmation mode - Does not query confirmation ')
.option('-L, --local-rpc', 'Local node mode - Does not submit signed transaction to the node') .option('-L, --local-rpc', 'Local node mode - Does not submit signed transaction to the node')
.option('-o, --only-rpc', 'Only rpc mode - Does not enable thegraph api nor remote ip detection'); .option('-o, --only-rpc', 'Only rpc mode - Does not enable thegraph api nor remote ip detection');
@ -1523,7 +1523,14 @@ async function main() {
statePreferences(program); statePreferences(program);
const { currency, amount, netId, commitmentNote } = parseInvoice(invoice); const { currency, amount, netId, commitmentNote } = parseInvoice(invoice);
await init({ rpc: program.rpc, currency, amount, localMode: program.local, privateKey: program.privateKey }); await init({
rpc: program.rpc,
currency,
amount,
localMode: program.localRpc,
privateKey: program.privateKey,
noteNetId: netId
});
console.log('Creating', currency.toUpperCase(), amount, 'deposit for', netName, 'Tornado Cash Instance'); console.log('Creating', currency.toUpperCase(), amount, 'deposit for', netName, 'Tornado Cash Instance');
await deposit({ currency, amount, commitmentNote }); await deposit({ currency, amount, commitmentNote });
}); });
@ -1537,7 +1544,7 @@ async function main() {
statePreferences(program); statePreferences(program);
await init({ rpc: program.rpc, currency, amount, localMode: program.local, privateKey: program.privateKey }); await init({ rpc: program.rpc, currency, amount, localMode: program.localRpc, privateKey: program.privateKey });
await deposit({ currency, amount }); await deposit({ currency, amount });
}); });
program program
@ -1555,7 +1562,7 @@ async function main() {
noteNetId: netId, noteNetId: netId,
currency, currency,
amount, amount,
localMode: program.local, localMode: program.localRpc,
privateKey: program.privateKey privateKey: program.privateKey
}); });
await withdraw({ await withdraw({
@ -1589,7 +1596,7 @@ async function main() {
.action(async (address, amount, tokenAddress) => { .action(async (address, amount, tokenAddress) => {
statePreferences(program); statePreferences(program);
await init({ rpc: program.rpc, balanceCheck: true, localMode: program.local, privateKey: program.privateKey }); await init({ rpc: program.rpc, balanceCheck: true, localMode: program.localRpc, privateKey: program.privateKey });
await send({ address, amount, tokenAddress }); await send({ address, amount, tokenAddress });
}); });
program program