diff --git a/operations/20241212_unpause_liquifier.json b/operations/20241212_unpause_liquifier.json new file mode 100644 index 00000000..f43e5701 --- /dev/null +++ b/operations/20241212_unpause_liquifier.json @@ -0,0 +1,13 @@ +{ "version": "1.0", "chainId": "1", "meta": { "name": "Transactions Batch", "description": "", "txBuilderVersion": "1.16.5", "createdFromSafeAddress": "0xcdd57D11476c22d265722F68390b036f3DA48c21" }, "transactions": [ +{ + "to": "0x9f26d4C958fD811A1F59B01B86Be7dFFc9d20761", + "value": "0", + "data": "0x01d5062a0000000000000000000000009ffdf407cde9a93c47611799da23924af3ef764f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000004feda79674e881e779f8b39b25ceba29bd494ea44b38ab30467ec7b98898516f000000000000000000000000000000000000000000000000000000000003f4800000000000000000000000000000000000000000000000000000000000000004bac1520300000000000000000000000000000000000000000000000000000000" +} +, +{ + "to": "0x9f26d4C958fD811A1F59B01B86Be7dFFc9d20761", + "value": "0", + "data": "0x134008d30000000000000000000000009ffdf407cde9a93c47611799da23924af3ef764f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000004feda79674e881e779f8b39b25ceba29bd494ea44b38ab30467ec7b98898516f0000000000000000000000000000000000000000000000000000000000000004bac1520300000000000000000000000000000000000000000000000000000000" +} +] } diff --git a/test/EtherFiTimelock.sol b/test/EtherFiTimelock.sol index 855d9f5b..09aa0d2c 100644 --- a/test/EtherFiTimelock.sol +++ b/test/EtherFiTimelock.sol @@ -378,6 +378,13 @@ contract TimelockTest is TestSetup { vm.stopPrank(); } + + function test_unpause_liquifier() public { + initializeRealisticFork(MAINNET_FORK); + address target = address(liquifierInstance); + bytes memory data = abi.encodeWithSelector(Liquifier.unPauseContract.selector); + _execute_timelock(target, data, true, true, true, true); + } } // {"version":"1.0","chainId":"1 \ No newline at end of file diff --git a/test/TestSetup.sol b/test/TestSetup.sol index 0f13eb4b..29d38d9a 100644 --- a/test/TestSetup.sol +++ b/test/TestSetup.sol @@ -1440,14 +1440,16 @@ contract TestSetup is Test { function _execute_timelock(address target, bytes memory data, bool _schedule, bool _log_schedule, bool _execute, bool _log_execute) internal { vm.startPrank(0xcdd57D11476c22d265722F68390b036f3DA48c21); + + bytes32 salt = keccak256(abi.encodePacked(target, data, block.number)); - if (_schedule) etherFiTimelockInstance.schedule(target, 0, data, bytes32(0), bytes32(0), etherFiTimelockInstance.getMinDelay()); - if (_log_schedule) _output_schedule_txn(target, data, bytes32(0), bytes32(0), etherFiTimelockInstance.getMinDelay()); + if (_schedule) etherFiTimelockInstance.schedule(target, 0, data, bytes32(0), salt, etherFiTimelockInstance.getMinDelay()); + if (_log_schedule) _output_schedule_txn(target, data, bytes32(0), salt, etherFiTimelockInstance.getMinDelay()); vm.warp(block.timestamp + etherFiTimelockInstance.getMinDelay()); - if (_execute) etherFiTimelockInstance.execute(target, 0, data, bytes32(0), bytes32(0)); - if (_log_execute) _output_execute_timelock_txn(target, data, bytes32(0), bytes32(0)); + if (_execute) etherFiTimelockInstance.execute(target, 0, data, bytes32(0), salt); + if (_log_execute) _output_execute_timelock_txn(target, data, bytes32(0), salt); vm.warp(block.timestamp + 1); vm.stopPrank();