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

Fix RPC link checking: it must starts with protocol (like ws or https), not includes, because because in this case, RPC sites that have these characters in name or in domain don't work correctly

Browse Source
This commit is contained in:
Theo 2023-05-16 11:10:03 +03:00
parent 2e20c1fbb6
commit 5dd1b14c1b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli.js
View File

@ -1374,7 +1374,7 @@ async function init({ rpc, noteNetId, currency = 'dai', amount = '100', balanceC
if (noteNetId && !rpc) rpc = config.deployments[`netId${noteNetId}`].defaultRpc; if (noteNetId && !rpc) rpc = config.deployments[`netId${noteNetId}`].defaultRpc;
if (torPort && rpc.includes('https')) { if (torPort && rpc.startsWith('https')) {
console.log('Using tor network'); console.log('Using tor network');
web3Options = { agent: { https: new SocksProxyAgent('socks5h://127.0.0.1:' + torPort) }, timeout: 60000 }; web3Options = { agent: { https: new SocksProxyAgent('socks5h://127.0.0.1:' + torPort) }, timeout: 60000 };
// Use forked web3-providers-http from local file to modify user-agent header value which improves privacy. // Use forked web3-providers-http from local file to modify user-agent header value which improves privacy.
@ -1383,7 +1383,7 @@ async function init({ rpc, noteNetId, currency = 'dai', amount = '100', balanceC
httpsAgent: new SocksProxyAgent('socks5h://127.0.0.1:' + torPort), httpsAgent: new SocksProxyAgent('socks5h://127.0.0.1:' + torPort),
headers: { 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0' } headers: { 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0' }
}; };
} else if (torPort && rpc.includes('http')) { } else if (torPort && rpc.startsWith('http')) {
console.log('Using tor network'); console.log('Using tor network');
web3Options = { agent: { http: new SocksProxyAgent('socks5h://127.0.0.1:' + torPort) }, timeout: 60000 }; web3Options = { agent: { http: new SocksProxyAgent('socks5h://127.0.0.1:' + torPort) }, timeout: 60000 };
// Use forked web3-providers-http from local file to modify user-agent header value which improves privacy. // Use forked web3-providers-http from local file to modify user-agent header value which improves privacy.
@ -1395,7 +1395,7 @@ async function init({ rpc, noteNetId, currency = 'dai', amount = '100', balanceC
} else if (rpc.includes('ipc')) { } else if (rpc.includes('ipc')) {
console.log('Using ipc connection'); console.log('Using ipc connection');
web3 = new Web3(new Web3.providers.IpcProvider(rpc, net), null, { transactionConfirmationBlocks: 1 }); web3 = new Web3(new Web3.providers.IpcProvider(rpc, net), null, { transactionConfirmationBlocks: 1 });
} else if (rpc.includes('ws') || rpc.includes('wss')) { } else if (rpc.startsWith('ws') || rpc.startsWith('wss')) {
console.log('Using websocket connection (Note: Tor is not supported for Websocket providers)'); console.log('Using websocket connection (Note: Tor is not supported for Websocket providers)');
web3Options = { web3Options = {
clientConfig: { keepalive: true, keepaliveInterval: -1 }, clientConfig: { keepalive: true, keepaliveInterval: -1 },