TornadoCash/registry-penalisation-configuration-proposal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add additional violators

Browse Source
This commit is contained in:
gozzy 2023-04-17 20:23:41 +00:00
parent 4e08783bd1
commit 3f2dccb216
4 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -8,7 +8,7 @@
"test": "test"
},
"scripts": {
"test": "forge test -vvvvv --fork-url https://api.securerpc.com/v1 --block-number 17011300"
"test": "forge test -vvvvv --fork-url https://api.securerpc.com/v1 --block-number 17060055"
},
"author": "",
"license": "ISC"

10
src/Proposal.sol
View File

@ -5,7 +5,7 @@ import "@interfaces/IStakingRewards.sol";
contract Proposal {
function getNullifiedTotal(address[11] memory relayers) public returns (uint256) {
function getNullifiedTotal(address[13] memory relayers) public returns (uint256) {
uint256 nullifiedTotal;
address _registryAddress = 0x58E8dCC13BE9780fC42E8723D8EaD4CF46943dF2;
@ -18,7 +18,7 @@ contract Proposal {
}
function executeProposal() external {
address[11] memory VIOLATING_RELAYERS = [
address[13] memory VIOLATING_RELAYERS = [
0x30F96AEF199B399B722F8819c9b0723016CEAe6C, // moon-relayer.eth
0xEFa22d23de9f293B11e0c4aC865d7b440647587a, // tornado-relayer.eth
0x996ad81FD83eD7A87FD3D03694115dff19db0B3b, // secure-tornado.eth
@ -29,7 +29,9 @@ contract Proposal {
0xaaaaD0b504B4CD22348C4Db1071736646Aa314C6, // tornrelayers.eth
0x0000208a6cC0299dA631C08fE8c2EDe435Ea83B8, // 0xtornadocash.eth
0xf0D9b969925116074eF43e7887Bcf035Ff1e7B19, // lowfee-relayer.eth
0x12D92FeD171F16B3a05ACB1542B40648E7CEd384 // torn-relayers.eth
0x12D92FeD171F16B3a05ACB1542B40648E7CEd384, // torn-relayers.eth
0x87BeDf6AD81A2907633Ab68D02c44f0415bc68C1, // tornrelayer.eth
0x14812AE927e2BA5aA0c0f3C0eA016b3039574242 // pls-im-poor.eth
];
uint256 NEW_MINIMUM_STAKE_AMOUNT = 2000 ether;
@ -51,6 +53,8 @@ contract Proposal {
IRelayerRegistry(_registryAddress).nullifyBalance(VIOLATING_RELAYERS[8]);
IRelayerRegistry(_registryAddress).nullifyBalance(VIOLATING_RELAYERS[9]);
IRelayerRegistry(_registryAddress).nullifyBalance(VIOLATING_RELAYERS[10]);
IRelayerRegistry(_registryAddress).nullifyBalance(VIOLATING_RELAYERS[11]);
IRelayerRegistry(_registryAddress).nullifyBalance(VIOLATING_RELAYERS[12]);
IStakingRewards(_stakingAddress).withdrawTorn(NULLIFIED_TOTAL_AMOUNT);
}

22
src/proprietary/Parameters.sol
View File

@ -2,18 +2,20 @@ pragma solidity ^0.8.1;
contract Parameters {
address[11] VIOLATING_RELAYERS = [
0x30F96AEF199B399B722F8819c9b0723016CEAe6C, // moon-relayer.eth
address[13] VIOLATING_RELAYERS = [
0x30F96AEF199B399B722F8819c9b0723016CEAe6C, // moon-relayer.eth
0xEFa22d23de9f293B11e0c4aC865d7b440647587a, // tornado-relayer.eth
0x996ad81FD83eD7A87FD3D03694115dff19db0B3b, // secure-tornado.eth
0x996ad81FD83eD7A87FD3D03694115dff19db0B3b, // secure-tornado.eth
0x7853E027F37830790685622cdd8685fF0c8255A2, // tornado-secure.eth
0x36DD7b862746fdD3eDd3577c8411f1B76FDC2Af5, // tornado-crypto-bot-exchange.eth
0x18F516dD6D5F46b2875Fd822B994081274be2a8b, // torn69.eth
0x853281B7676DFB66B87e2f26c9cB9D10Ce883F37, // available-reliable-relayer.eth
0xaaaaD0b504B4CD22348C4Db1071736646Aa314C6, // tornrelayers.eth
0x0000208a6cC0299dA631C08fE8c2EDe435Ea83B8, // 0xtornadocash.eth
0xf0D9b969925116074eF43e7887Bcf035Ff1e7B19, // lowfee-relayer.eth
0x12D92FeD171F16B3a05ACB1542B40648E7CEd384 // torn-relayers.eth
0x36DD7b862746fdD3eDd3577c8411f1B76FDC2Af5, // tornado-crypto-bot-exchange.eth
0x18F516dD6D5F46b2875Fd822B994081274be2a8b, // torn69.eth
0x853281B7676DFB66B87e2f26c9cB9D10Ce883F37, // available-reliable-relayer.eth
0xaaaaD0b504B4CD22348C4Db1071736646Aa314C6, // tornrelayers.eth
0x0000208a6cC0299dA631C08fE8c2EDe435Ea83B8, // 0xtornadocash.eth
0xf0D9b969925116074eF43e7887Bcf035Ff1e7B19, // lowfee-relayer.eth
0x12D92FeD171F16B3a05ACB1542B40648E7CEd384, // torn-relayers.eth
0x87BeDf6AD81A2907633Ab68D02c44f0415bc68C1, // tornrelayer.eth
0x14812AE927e2BA5aA0c0f3C0eA016b3039574242 // pls-im-poor.eth
];
address _registryAddress = 0x58E8dCC13BE9780fC42E8723D8EaD4CF46943dF2;

4
test/Proposal.t.sol
View File

@ -90,6 +90,8 @@ contract ProposalTest is Test, Parameters, Mock {
require(IRelayerRegistry(_registryAddress).isRelayer(VIOLATING_RELAYERS[8]));
require(IRelayerRegistry(_registryAddress).isRelayer(VIOLATING_RELAYERS[9]));
require(IRelayerRegistry(_registryAddress).isRelayer(VIOLATING_RELAYERS[10]));
require(IRelayerRegistry(_registryAddress).isRelayer(VIOLATING_RELAYERS[11]));
require(IRelayerRegistry(_registryAddress).isRelayer(VIOLATING_RELAYERS[12]));
}
function checkResults() internal {
@ -104,5 +106,7 @@ contract ProposalTest is Test, Parameters, Mock {
require(IRelayerRegistry(_registryAddress).getRelayerBalance(VIOLATING_RELAYERS[8]) == 0);
require(IRelayerRegistry(_registryAddress).getRelayerBalance(VIOLATING_RELAYERS[9]) == 0);
require(IRelayerRegistry(_registryAddress).getRelayerBalance(VIOLATING_RELAYERS[10]) == 0);
require(IRelayerRegistry(_registryAddress).getRelayerBalance(VIOLATING_RELAYERS[11]) == 0);
require(IRelayerRegistry(_registryAddress).getRelayerBalance(VIOLATING_RELAYERS[12]) == 0);
}
}