tornadocash/relayer-registry
1
0
Fork 0
mirror of https://github.com/tornadocash/relayer-registry.git synced 2025-01-15 23:47:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

updates

Browse Source
This commit is contained in:
Alexey 2021-08-13 20:42:57 +03:00
parent d994c6eead
commit 400a656ea9
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contracts/Proposal.sol
View File

@ -21,13 +21,12 @@ interface TornadoTrees is ITornadoTrees {
function setTornadoProxyContract(address _tornadoProxy) external; function setTornadoProxyContract(address _tornadoProxy) external;
} }
// TODO should we add SWAP and CLAIM operations here as well?
contract Proposal { contract Proposal {
TornadoProxy public constant tornadoProxyV2 = TornadoProxy(0x722122dF12D4e14e13Ac3b6895a86e84145b6967); TornadoProxy public constant tornadoProxyV2 = TornadoProxy(0x722122dF12D4e14e13Ac3b6895a86e84145b6967);
TornadoTrees public constant tornadoTrees = TornadoTrees(0x527653eA119F3E6a1F5BD18fbF4714081D7B31ce); TornadoTrees public constant tornadoTrees = TornadoTrees(0x527653eA119F3E6a1F5BD18fbF4714081D7B31ce);
IProposal4 public constant proposal4 = IProposal4(0x4B6C07B8940a7602fE4332AFa915b366e56eAce5); IProposal4 public constant proposal4 = IProposal4(0x4B6C07B8940a7602fE4332AFa915b366e56eAce5);
address public constant governance = 0x5efda50f22d34F262c29268506C5Fa42cB56A1Ce; address public constant governance = 0x5efda50f22d34F262c29268506C5Fa42cB56A1Ce;
uint256 public constant txFee = 0.01 ether; uint256 public constant txFee = 0.1 ether;
uint256 public constant minStake = 500 ether; uint256 public constant minStake = 500 ether;
event DeploymentOf(string name, address addr); event DeploymentOf(string name, address addr);
@ -47,8 +46,11 @@ contract Proposal {
} }
// deploying Relayer registry upgradable proxy and its implementation // deploying Relayer registry upgradable proxy and its implementation
RelayerRegistry registry = new RelayerRegistry(); RelayerRegistry registryImpl = new RelayerRegistry();
TransparentUpgradeableProxy registryProxy = new TransparentUpgradeableProxy(address(registry), governance, ""); emit DeploymentOf("Relayer Registry implementation", address(registryImpl));
TransparentUpgradeableProxy registryProxy = new TransparentUpgradeableProxy(address(registryImpl), governance, "");
emit DeploymentOf("Relayer Registry proxy", address(registryProxy));
// deploying the new tornadoProxy // deploying the new tornadoProxy
TornadoProxyV3 tornadoProxyV3 = new TornadoProxyV3( TornadoProxyV3 tornadoProxyV3 = new TornadoProxyV3(
@ -57,9 +59,10 @@ contract Proposal {
instances, instances,
address(registryProxy) address(registryProxy)
); );
emit DeploymentOf("Tornado Proxy V3", address(tornadoProxyV3));
// initializing Relayer registry // initializing Relayer registry
registry = RelayerRegistry(address(registryProxy)); RelayerRegistry registry = RelayerRegistry(address(registryProxy));
registry.initialize(address(tornadoProxyV3), txFee, minStake); registry.initialize(address(tornadoProxyV3), txFee, minStake);
// registering the new tornadoProxy contract in tornadoTrees // registering the new tornadoProxy contract in tornadoTrees

6
contracts/RelayerRegistry.sol
View File

@ -27,6 +27,7 @@ contract RelayerRegistry is Ownable, Initializable {
event Kick(address indexed relayer, bool confiscation); event Kick(address indexed relayer, bool confiscation);
event NewMinStake(uint256 stake); event NewMinStake(uint256 stake);
event NewTxFee(uint256 fee); event NewTxFee(uint256 fee);
event NewWithdrawalProxy(address proxy);
event Transaction(address indexed _relayer, uint _fee); event Transaction(address indexed _relayer, uint _fee);
@ -87,6 +88,11 @@ contract RelayerRegistry is Ownable, Initializable {
emit NewMinStake(_stake); emit NewMinStake(_stake);
} }
function setWithdrawalProxy(address _proxy) external onlyOwner {
withdrawalProxy = _proxy;
emit NewWithdrawalProxy(_proxy);
}
function kick(address _relayer, bool confiscateStake) external onlyOwner { function kick(address _relayer, bool confiscateStake) external onlyOwner {
Relayer storage relayer = relayers[_relayer]; Relayer storage relayer = relayers[_relayer];
TORN.transfer(confiscateStake ? msg.sender : _relayer, relayer.balance); TORN.transfer(confiscateStake ? msg.sender : _relayer, relayer.balance);