From 3f2dccb21662c672d3e13844b914ae6024e418dd Mon Sep 17 00:00:00 2001 From: gozzy Date: Mon, 17 Apr 2023 20:23:41 +0000 Subject: [PATCH] add additional violators --- package.json | 2 +- src/Proposal.sol | 10 +++++++--- src/proprietary/Parameters.sol | 22 ++++++++++++---------- test/Proposal.t.sol | 4 ++++ 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 1ab731d..20f7215 100644 --- a/package.json +++ b/package.json @@ -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" diff --git a/src/Proposal.sol b/src/Proposal.sol index dcebe0a..882bf82 100644 --- a/src/Proposal.sol +++ b/src/Proposal.sol @@ -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); } diff --git a/src/proprietary/Parameters.sol b/src/proprietary/Parameters.sol index 00819d3..8fba30f 100644 --- a/src/proprietary/Parameters.sol +++ b/src/proprietary/Parameters.sol @@ -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; diff --git a/test/Proposal.t.sol b/test/Proposal.t.sol index 76631d8..95544e4 100644 --- a/test/Proposal.t.sol +++ b/test/Proposal.t.sol @@ -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); } }