anon/instances
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add instance registry to check and spec gas limits

Browse Source 
Signed-off-by: T-Hax <>
This commit is contained in:
T-Hax 2023-06-13 19:11:23 +00:00
parent d9de0dd112
commit 13dfec1fae
1 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
contracts/instances/ERC20TornadoCloneable.sol
View File

@ -11,12 +11,18 @@ import "../core/ERC20Tornado.sol";
interface ITornadoRouter { interface ITornadoRouter {
function relayerRegistry() external view returns (address); function relayerRegistry() external view returns (address);
function instanceRegistry() external view returns (address);
} }
interface IRelayerRegistry { interface IRelayerRegistry {
function burn(address, address, address) external; function burn(address, address, address) external;
} }
interface IInstanceRegistry {
function instanceData(address) external view returns (address, uint80, bool, bool);
}
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ CONTRACT ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ CONTRACT ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
/** /**
@ -94,19 +100,39 @@ contract ERC20TornadoCloneable is ERC20Tornado {
} }
/** /**
* @notice This function is a permissionless function which, if the registry is dead, immediately downgrades * @notice This function is a permissionless function which, if the infra is dead, immediately downgrades
the address of the registry to address(0), which makes the instance function as any of the older the address of the router to address(0), which makes the instance function as any of the older
instances. instances.
* @dev We will disable the current registry and call this function once we deploy a new registry * @dev We will disable the current infra and call this function once we deploy a new infrastructure
infrastructure system which will require the relayers to have a wallet-like smart contract, because then system which will require the relayers to have a wallet-like smart contract, because then
frontends will be able to build proofs for it, and as such there will be no need for this bullshit. frontends will be able to build proofs for it, and as such there will be no need for this bullshit.
*/ */
function checkRelayerRegistryIsDead() external { function checkInfrastructureIsDead() external {
require(router != address(0), "relayer registry already dead"); require(router != address(0), "infrastructure already dead");
try try
IRelayerRegistry(ITornadoRouter(router).relayerRegistry()).burn(address(this), address(0), address(0)) // Amount of gas forwarded specified so a potential hijacker can't break the system
// by allowing this to not revert, but making it enough gas so router reverts
IRelayerRegistry(ITornadoRouter(router).relayerRegistry()).burn{ gas: 100_000 }(
msg.sender, // Such that it can't be hardcoded for which person
address(0),
address(this) // This will get passed in the withdraw function
)
{ {
require(false, "registry not dead yet"); /* Do nothing since registry is ok */
} catch {
router = address(0);
return;
}
try
// Amount of gas forwarded specified so a potential hijacker can't break the system
// by allowing this to not revert, but making it enough gas so router reverts
IInstanceRegistry(ITornadoRouter(router).instanceRegistry()).instanceData{ gas: 3_000 }(address(this))
returns (address _token, uint80, bool _isERC20, bool _isEnabled) {
if (IERC20(_token) != token || !_isERC20 || !_isEnabled) {
router = address(0);
}
} catch { } catch {
router = address(0); router = address(0);
} }
@ -121,8 +147,8 @@ contract ERC20TornadoCloneable is ERC20Tornado {
entire intention of the system was to make it economically (similarly to entire intention of the system was to make it economically (similarly to
proof of stake) sybil resistant, but the system has the issue that it can proof of stake) sybil resistant, but the system has the issue that it can
be avoided. So, this is a temporary fix for this until we don't make a full be avoided. So, this is a temporary fix for this until we don't make a full
system upgrade after which will we disable this trash by disabling the registry system upgrade after which will we disable this trash by disabling the infra
and calling `checkRelayerRegistryIsDead()`. and calling `checkInfrastructureIsDead()`.
* @param _recipient The recipient address of the withdraw. * @param _recipient The recipient address of the withdraw.
* @param _relayer The relayer address of the withdraw. Must be a registered * @param _relayer The relayer address of the withdraw. Must be a registered
relayer otherwise router reverts. relayer otherwise router reverts.
@ -135,7 +161,10 @@ contract ERC20TornadoCloneable is ERC20Tornado {
uint256 _fee, uint256 _fee,
uint256 _refund uint256 _refund
) internal override { ) internal override {
if (router != address(0)) require(msg.sender == router, "if registry not dead, router must be caller"); if (router != address(0)) {
require(msg.sender == router, "if infrastructure not dead, router must be caller");
}
super._processWithdraw(_recipient, _relayer, _fee, _refund); super._processWithdraw(_recipient, _relayer, _fee, _refund);
} }
} }