master #2

Closed
tornadosto wants to merge 13 commits from (deleted):master into master
7 changed files with 9004 additions and 2369 deletions
Showing only changes of commit 7cd375d180 - Show all commits

View File

@ -0,0 +1,104 @@
[
{
"blockNumber": 22385840,
"transactionHash": "0x63fa83cf4127ef4147d507b23501179cfc6c037731e8dfb4fd2cc49c09b9eae8",
"commitment": "0x03f8ca1f7d166d11531313ef8b15acb22b19ae5dd98ceea6886b16a320a517cd",
"leafIndex": 0
},
{
"blockNumber": 22385872,
"transactionHash": "0xf55784219dc9d71c142b42f4099e6b791ef5fb2035ee9d14c8e82879a37eae2c",
"commitment": "0x1be521b0899780c2dbc5ce84dfcf90b5635692b23f6ea1042c9312d742e990d8",
"leafIndex": 1
},
{
"blockNumber": 22392807,
"transactionHash": "0x9c7c0202da743a351aafc60c5e62f46c920b7ef8ab0fbd9a437ee5df2f273a52",
"commitment": "0x2c6e62f51b8251c9ebdeccbcdd58efe15b35326cb3f1e0ddd4b99eed3c9fccb0",
"leafIndex": 2
},
{
"blockNumber": 22392987,
"transactionHash": "0x81505022469948ef6d700738463cbfa30aab567897a7bcd7c5b9ac34c25f9b14",
"commitment": "0x1fc417281a28562a41f921786f147ac95e77323304c5cdb9a9359d2dd971056f",
"leafIndex": 3
},
{
"blockNumber": 22393172,
"transactionHash": "0x764550f81da7ba82bb609bd45bba1f0e61deb14fa1a30a320ac8fa7042f6f383",
"commitment": "0x29b11c7da6fcaeb3c6248472677a65fb55daec2a110b90ff0d5c7ad95d4bd05e",
"leafIndex": 4
},
{
"blockNumber": 22393172,
"transactionHash": "0x207a4a95a0bd67e8d7bfb35f81a02d80465b467467fd3097bcf9877a5d1dd712",
"commitment": "0x0a29115a2af3acbb0820056604fd123ed365a3b8e856901430b0c5609ed03897",
"leafIndex": 5
},
{
"blockNumber": 22393172,
"transactionHash": "0x6afd92cf8f9f0afec38179f6c223e49b69fd414354f382c87a0f3e23b596dab3",
"commitment": "0x167ece4de25842f445e5005a525f20f86f7edc8b2a65a923184b052f43a894d5",
"leafIndex": 6
},
{
"blockNumber": 22393172,
"transactionHash": "0xd4c4bae2a66fb7aa192d81144459f1e9030a5211f68a644919fbad722a644b0c",
"commitment": "0x15902671ae98cbd40887e395eeef6e9d66972c671fdd688cdecbc6b7c89b3bc0",
"leafIndex": 7
},
{
"blockNumber": 22393172,
"transactionHash": "0x84fb0853a93fb412f3570a115e56f97677df99762f741c6c281df411703ea14b",
"commitment": "0x146518004a7639391f39833de66bce38ccb23f7d24ae072f2ea7e3ad349fbcb0",
"leafIndex": 8
},
{
"blockNumber": 22393287,
"transactionHash": "0x9c9d005fb758fdc3810d26923573e27c6149cec3d3f0e219ea7182010f8279a0",
"commitment": "0x1c7e098f281b291f47ffdbe734bd7762638692765aa10ae79d00296c683b4f64",
"leafIndex": 9
},
{
"blockNumber": 22393298,
"transactionHash": "0xa145a95807fb52c42dcaa478f5784755feedbc06948871066f2c4b63a674e583",
"commitment": "0x0e874573d767d81c8e04427b38ef7ee88732c9c92c9534f3b42965091d244d95",
"leafIndex": 10
},
{
"blockNumber": 22393384,
"transactionHash": "0xaefad2d9200f27c1ff2dc6731563753fd87ffd5abb16f2610f9d8408e5173643",
"commitment": "0x109040cd8b4f5073949d62c7923cc8030fcc92e3675cc35932a4cbbacb8ce6be",
"leafIndex": 11
},
{
"blockNumber": 22396258,
"transactionHash": "0x6135e90e4c74bf5b3271a44850a10f5556bb3ca57d8f2850c0eddfb1375a1280",
"commitment": "0x034e30e5e1c21deaa71cfedea0fa153c25d3ff380bed56f83a78ed5a307a0c36",
"leafIndex": 12
},
{
"blockNumber": 22396797,
"transactionHash": "0x82dd8478501366f3d7bc82694af2bdbeb5fd3878baf4ddb9d02f1eaf7d31ce63",
"commitment": "0x1469fb2b9bed134e8cff2ada483a8f416b2a44629c7a388dd713b9dc05b87d02",
"leafIndex": 13
},
{
"blockNumber": 22396930,
"transactionHash": "0x56d1744e17e907f0a33ac774eed8dcf1ddb003e14d1e52bf37fdbcf41b0a8cb2",
"commitment": "0x10199e8b32f29fdc6410cac40d9db40302e0902afd71e7a86f94a33af9a6c6d0",
"leafIndex": 14
},
{
"blockNumber": 22396986,
"transactionHash": "0xd3f697cbe6384d33e3751e222e75ed868adc2175bacd1f3bf91cdd9fa2332a5e",
"commitment": "0x0e13899823c0e21680f21de2e1ffd74d899ebfebbd767c8dd3a9b665fb9a2ed4",
"leafIndex": 15
},
{
"blockNumber": 22399955,
"transactionHash": "0xbe98adfe86b0492cd85da8c684e53a4adc2b0b62eae2495c7a5962da635c80e9",
"commitment": "0x227deb325a01d3d83b36b03f2c31b761cf8c20e6f722c2f7c2ea8be02284fce1",
"leafIndex": 16
}
]

View File

@ -0,0 +1,72 @@
[
{
"blockNumber": 22385858,
"transactionHash": "0x1a8cb44a9d03d2e1248deed7c65d86b30e2ae0f6ccd1e26dfcdd026e6e7ba7e2",
"nullifierHash": "0x01de4b0b2bee6944f771806e61dcb8f223f77ebcb86140040e4b18532dcfa642",
"to": "0xc2f667db796e82913160c1e01030aabbd5ead47e",
"fee": "0"
},
{
"blockNumber": 22385878,
"transactionHash": "0xef83a1582639c13b2ccf90d10305d2c873eedc04346563988d0175cb2e9cf876",
"nullifierHash": "0x0466c43a2ba160630a9929a1e9ef956610ab9fd8038fadd0d80dd6dab498ee37",
"to": "0xc2f667db796e82913160c1e01030aabbd5ead47e",
"fee": "0"
},
{
"blockNumber": 22393007,
"transactionHash": "0x397d7d92ca3aaa571bb10f8f8cb1dc272ecb7be35bc4e8131ce086d36c2b5f5f",
"nullifierHash": "0x11e974a721874186ce971f36873c013bc93c464ed26a6a82ed96319573f9c673",
"to": "0xb4ef209ccee95de23a8e1f7627ac7e676ff0739d",
"fee": "7182616000000000"
},
{
"blockNumber": 22393369,
"transactionHash": "0x8d5d7de4fcd014b050b9feff398fafd88112c04b0fccd420944ecabfe339dd44",
"nullifierHash": "0x22af5c5cd73087a65567b25a3da887d3dc192806691a3694fa868f9ea63ef7d2",
"to": "0xc0f12799b8d3fa8810dfe1616095170c72117f8f",
"fee": "1986919520000000"
},
{
"blockNumber": 22393391,
"transactionHash": "0xfdcb3c4521394b1871243e1a6ad3ee1c5c0a18e118c571f4206e6a7b48e96a34",
"nullifierHash": "0x0add34f677a5e2faccda12a32698418222f07075983b205bd990e68c0b96255e",
"to": "0xc0f12799b8d3fa8810dfe1616095170c72117f8f",
"fee": "4974722720000000"
},
{
"blockNumber": 22393496,
"transactionHash": "0x840dcdc3982c47ca46b088bd9d63977682a6eb2461df832ee1a85d41d5e8475b",
"nullifierHash": "0x1fca9aec5973b7cefbd632df53224c32a5bdb7e0c5516b1bfbcf7819f3f1c1b3",
"to": "0xc2f667db796e82913160c1e01030aabbd5ead47e",
"fee": "0"
},
{
"blockNumber": 22396800,
"transactionHash": "0x306a40c939450320a433399435e93b99f6de9c835196cb5aef94e97829e7a165",
"nullifierHash": "0x1664ce55a6e2520b562b8d2a9e4a965b4e72478bb423bdcd671e89ca9083b515",
"to": "0xb4ef209ccee95de23a8e1f7627ac7e676ff0739d",
"fee": "1574701600000000"
},
{
"blockNumber": 22396811,
"transactionHash": "0x9728fab8b35a5a4fd0e6a67bb0e90963ade1262f5bb49a80a736253c27c3017e",
"nullifierHash": "0x19aa705bf1b01bf5a304b46f5f4f960766f8191068750373b4585ebb0d5f0dee",
"to": "0x9b5fbedaa0c2474b43e4f96f58e62f702614c8b8",
"fee": "1575916000000000"
},
{
"blockNumber": 22397057,
"transactionHash": "0x45a369f482fc98f39eb55c4bd2e113ebf8436f93a01211609881acdab5a87d06",
"nullifierHash": "0x1f9d9874d23cbd163d31b8f2b936ba18d5b3a42991519970bdea29712e1f0ff0",
"to": "0xc0f12799b8d3fa8810dfe1616095170c72117f8f",
"fee": "4986919520000000"
},
{
"blockNumber": 22397185,
"transactionHash": "0x55ece3a9554848a6042ce8cbd4ff22ddd64d51d4b63347d15c661ba8345a68ff",
"nullifierHash": "0x1934703fb8829f2e2764b8621e208a9c0a51396a338ea1d098591c7b9a30c991",
"to": "0x9b5fbedaa0c2474b43e4f96f58e62f702614c8b8",
"fee": "4975916000000000"
}
]

2810
cache/sepolia/deposits_eth_0.1.json vendored Normal file

File diff suppressed because it is too large Load Diff

1612
cache/sepolia/withdrawals_eth_0.1.json vendored Normal file

File diff suppressed because it is too large Load Diff

17
cli.js
View File

@ -870,6 +870,10 @@ function toDecimals(value, decimals, fixed) {
// List fetched from https://github.com/ethereum-lists/chains/blob/master/_data/chains
function getExplorerLink() {
switch (globals.netId) {
case 61:
return 'etc.blockscout.com';
case 11155111:
return 'sepolia.etherscan.io';
case 56:
return 'bscscan.com';
case 100:
@ -894,6 +898,10 @@ function getExplorerLink() {
// List fetched from https://github.com/trustwallet/assets/tree/master/blockchains
function getCurrentNetworkName() {
switch (globals.netId) {
case 61:
return 'EthereumClassic';
case 11155111:
return 'Sepolia';
case 56:
return 'BinanceSmartChain';
case 100:
@ -920,6 +928,8 @@ function getCurrentNetworkName() {
*/
function getCurrentNetworkSymbol(chainId) {
switch (Number(chainId)) {
case 61:
return 'ETC';
case 56:
return 'BNB';
case 100:
@ -1564,6 +1574,10 @@ async function initNetwork({rpc, chainId, privateKey, torPort, onlyRpc, eventTyp
globals.web3Instance = await createWeb3Instance(rpc)
globals.netId = await globals.web3Instance.net.getId();
if(chainId == 61)
{
globals.netId = 61;
}
globals.netName = getCurrentNetworkName();
globals.netSymbol = getCurrentNetworkSymbol(globals.netId);
@ -1633,8 +1647,9 @@ async function init({ rpc, chainId, currency = 'dai', amount = '100', privateKey
initPreferences({nonconfirmation, localMode});
await initNetwork({rpc, chainId, privateKey, torPort, onlyRpc, eventType, relayer});
const { netId, web3Instance } = globals;
// console.log(netId, chainId);
if (chainId && Number(chainId) !== netId) {
throw new Error('This note is for a different network. Specify the --rpc option explicitly');
}

View File

@ -277,6 +277,66 @@ module.exports = {
multicall: '0x142E2FEaC30d7fc3b61f9EE85FCCad8e560154cc',
subgraphs: ['https://gateway.thegraph.com/api/6a217817dd87d33db10beed79b044a91/subgraphs/id/GvkbnEVhLD6KArXpEzLFtSKRmspBW29ApKFqR5FjuP2P', 'https://gateway.thegraph.com/api/8b164501e1862078eff5fb9dda136c6c/subgraphs/id/GvkbnEVhLD6KArXpEzLFtSKRmspBW29ApKFqR5FjuP2P', 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/optimism-tornado-subgraph'],
defaultRpcs: ['https://optimism.blockpi.network/v1/rpc/public', 'https://optimism-mainnet.chainnodes.org/3ae3d849-a613-4917-a56e-080f181aa4da', 'https://endpoints.omniatech.io/v1/op/mainnet/public', 'https://optimism-mainnet.public.blastapi.io', 'https://optimism.drpc.org']
},
netId11155111: {
tokens:
{
eth:
{
instanceAddress:
{
0.1: '0x8C4A04d872a6C1BE37964A21ba3a138525dFF50b',
1: '0x8cc930096B4Df705A007c4A039BDFA1320Ed2508',
10: '0x8D10d506D29Fc62ABb8A290B99F66dB27Fc43585',
},
deployedBlockNumber:
{
0.1: 5594400,
1: 5594401,
10: 5594402,
},
miningEnabled: false,
symbol: 'ETH',
decimals: 18
}
},
ensSubdomainKey: 'sepolia-tornado',
proxy: '0x1572AFE6949fdF51Cb3E0856216670ae9Ee160Ee',
multicall: '0x53c43764255c17bd724f74c4ef150724ac50a3ed',
subgraphs: ['https://gateway.thegraph.com/api/6a217817dd87d33db10beed79b044a91/subgraphs/id/8kJGz92AYUm72wfyUoze1as3E11ynDSTZM8emiRWrRPy'],
defaultRpcs: ['https://ethereum-sepolia-rpc.publicnode.com', 'https://mainnet.chainnodes.org/61b7de01-6cc4-40dc-a6c2-b6e4a61bb042']
},
netId61:
{
tokens:
{
etc:
{
instanceAddress:
{
1: '0x2f56d5aFC058B8734350B162EFEe75ee48f034e0',
10: '0x59fCB629A23e8eD0a60A0188771E221042260118',
100: '0x784B3a7a7981B959bd8d9D9e73c2013BE819Fbf2',
},
deployedBlockNumber:
{
1: 22385618,
10: 22385618,
100: 22385618,
},
miningEnabled: false,
symbol: 'ETC',
decimals: 18
}
},
ensSubdomainKey: 'etc-tornado',
firstDeploymentTransaction: '0x4d9232046d3503138525bb3b921e131153d02b436f9f81426f52929e50ab359e',
proxy: '0xac97AB4fBd872ea762974CbBB0Ee72351afe16F3',
multicall: '0xA52EE88C0F24EF8b96C3989cAb42cfC6008041A8',
subgraphs: ['https://graph.torndao.com/subgraphs/name/tornadocash/etc-tornado-subgraph'],
defaultRpcs: ['https://etc.etcdesktop.com','https://etc.rivet.link'],
}
}
};

6698
package-lock.json generated

File diff suppressed because it is too large Load Diff