tornado-packages/tornado-contracts
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed script and deployments

Browse Source
This commit is contained in:
Tornado Contrib 2024-03-30 09:40:05 +00:00
parent d14ef1ab0c
commit 70b1d66227
Signed by: tornadocontrib
GPG Key ID: 60B4DF1A076C64B1
9 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/Classic/ERC20Tornado.sol
View File

@ -1,4 +1,4 @@
// https://tornado.cash // https://tornadocash.website
/* /*
* d888888P dP a88888b. dP * d888888P dP a88888b. dP
* 88 88 d8' `88 88 * 88 88 d8' `88 88
@ -15,6 +15,7 @@ pragma solidity ^0.8.20;
import { IVerifier, IHasher, Tornado } from "./Tornado.sol"; import { IVerifier, IHasher, Tornado } from "./Tornado.sol";
import { IERC20, SafeERC20 } from "./libraries/SafeERC20.sol"; import { IERC20, SafeERC20 } from "./libraries/SafeERC20.sol";
// Modified by https://git.tornadocash.website/tornadocontrib/tornado-contracts
contract ERC20Tornado is Tornado { contract ERC20Tornado is Tornado {
using SafeERC20 for IERC20; using SafeERC20 for IERC20;
IERC20 public immutable token; IERC20 public immutable token;

3
contracts/Classic/ETHTornado.sol
View File

@ -1,4 +1,4 @@
// https://tornado.cash // https://tornadocash.website
/* /*
* d888888P dP a88888b. dP * d888888P dP a88888b. dP
* 88 88 d8' `88 88 * 88 88 d8' `88 88
@ -14,6 +14,7 @@ pragma solidity ^0.8.20;
import { IVerifier, IHasher, Tornado } from "./Tornado.sol"; import { IVerifier, IHasher, Tornado } from "./Tornado.sol";
// Modified by https://git.tornadocash.website/tornadocontrib/tornado-contracts
contract ETHTornado is Tornado { contract ETHTornado is Tornado {
constructor( constructor(
IVerifier _verifier, IVerifier _verifier,

2
contracts/Classic/MerkleTreeWithHistory.sol
View File

@ -1,4 +1,4 @@
// https://tornado.cash // https://tornadocash.website
/* /*
* d888888P dP a88888b. dP * d888888P dP a88888b. dP
* 88 88 d8' `88 88 * 88 88 d8' `88 88

2
contracts/Classic/Tornado.sol
View File

@ -1,4 +1,4 @@
// https://tornado.cash // https://tornadocash.website
/* /*
* d888888P dP a88888b. dP * d888888P dP a88888b. dP
* 88 88 d8' `88 88 * 88 88 d8' `88 88

2
contracts/Classic/TornadoProxyLight.sol
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// https://tornado.cash // https://tornadocash.website
/* /*
* d888888P dP a88888b. dP * d888888P dP a88888b. dP
* 88 88 d8' `88 88 * 88 88 d8' `88 88

2
contracts/Classic/Verifier.sol
View File

@ -1,4 +1,4 @@
// https://tornado.cash Verifier.sol generated by trusted setup ceremony. // https://tornadocash.website Verifier.sol generated by trusted setup ceremony.
/* /*
* d888888P dP a88888b. dP * d888888P dP a88888b. dP
* 88 88 d8' `88 88 * 88 88 d8' `88 88

2
contracts/Classic/cTornado.sol
View File

@ -1,4 +1,4 @@
// https://tornado.cash // https://tornadocash.website
/* /*
* d888888P dP a88888b. dP * d888888P dP a88888b. dP
* 88 88 d8' `88 88 * 88 88 d8' `88 88

10
scripts/deploy.ts
View File

@ -32,23 +32,23 @@ const {
type contracts = { type contracts = {
[key in string]: { [key in string]: {
DAI: string, DAI: string,
ens: string, ENS: string,
} }
} }
const contracts: contracts = { const contracts: contracts = {
hardhat: { hardhat: {
DAI: '', DAI: '',
ens: '', ENS: '',
}, },
develop: { develop: {
DAI: '', DAI: '',
ens: '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e', ENS: '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e',
}, },
sepolia: { sepolia: {
// https://staging.aave.com/faucet/ // https://staging.aave.com/faucet/
DAI: '0xFF34B3d4Aee8ddCd6F9AFFFB6Fe49bD371b8a357', DAI: '0xFF34B3d4Aee8ddCd6F9AFFFB6Fe49bD371b8a357',
ens: '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e', ENS: '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e',
} }
}; };
@ -132,7 +132,7 @@ async function deployInstances() {
instance: ethInstance, instance: ethInstance,
}, },
{ {
addr: DAITornado2.target, addr: ETHTornado2.target,
instance: { instance: {
...ethInstance, ...ethInstance,
protocolFeePercentage: 30, protocolFeePercentage: 30,

6
sepolia.json
View File

@ -7,7 +7,7 @@
"addr": "0x44ddE10DeEacD8B91799ff02E4493749dDD320d8" "addr": "0x44ddE10DeEacD8B91799ff02E4493749dDD320d8"
}, },
{ {
"addr": "0x68DAD9C7BfFe61B44446d894a352E10416c47AfA" "addr": "0x2365a6BfFbaB6f18EFb9228f394a6aaEEf3F24bc"
}, },
{ {
"addr": "0x3a28921a352D4D8e5A500Ed4a3EECfD6e641C783" "addr": "0x3a28921a352D4D8e5A500Ed4a3EECfD6e641C783"
@ -36,11 +36,11 @@
"GasCompensationVault": "0xD5841cAf0Fd3C9F2b168Cb0db3497B7b0B5ba0b2", "GasCompensationVault": "0xD5841cAf0Fd3C9F2b168Cb0db3497B7b0B5ba0b2",
"TornadoVault": "0x89D330452fDE7054fCbf56F45C2a15bBee1408CE", "TornadoVault": "0x89D330452fDE7054fCbf56F45C2a15bBee1408CE",
"InstanceRegistryProxy": "0x61be247c2Da9E008d359bF7ae7CA69d4d8eA058a", "InstanceRegistryProxy": "0x61be247c2Da9E008d359bF7ae7CA69d4d8eA058a",
"InstanceRegistryImpl": "0x3029F36de6D6B2b7356fB8e01BE08eaF7456E99c", "InstanceRegistryImpl": "0xA5079F75FE958D8634ce5093D901F4bFA0bbc56B",
"FeeManagerProxy": "0x16F3B900d28e15BEb1f36351837190f758fEDfa7", "FeeManagerProxy": "0x16F3B900d28e15BEb1f36351837190f758fEDfa7",
"FeeManagerImpl": "0xD42b5491b343c370661E85e49d7F335C410B1BCF", "FeeManagerImpl": "0xD42b5491b343c370661E85e49d7F335C410B1BCF",
"RelayerRegistryProxy": "0x3A7c2D289c758cE6C35eAb6D0F0d1c1635C3eCF7", "RelayerRegistryProxy": "0x3A7c2D289c758cE6C35eAb6D0F0d1c1635C3eCF7",
"RelayerRegistryImpl": "0x6eb8e939A302191aeFcAc5D05CA500eC78e6f1A2", "RelayerRegistryImpl": "0xAA602af0F1755cC12c0C13AA18418c26aB9F4008",
"RelayerRegistryMock": "0x504D5080b6bffCFEC5336dA55132F974230b4BA5", "RelayerRegistryMock": "0x504D5080b6bffCFEC5336dA55132F974230b4BA5",
"TornadoStakingRewardsProxy": "0xCb64E517F916b88Bd8Fb1D8908D8fFD50a59CE31", "TornadoStakingRewardsProxy": "0xCb64E517F916b88Bd8Fb1D8908D8fFD50a59CE31",
"TornadoStakingRewardsImpl": "0x23d4993209746865F0D7A2de5E9579D9823c25D0", "TornadoStakingRewardsImpl": "0x23d4993209746865F0D7A2de5E9579D9823c25D0",