-
Notifications
You must be signed in to change notification settings - Fork 329
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Mild refactoring + adding in utils file + commenting out code
- Loading branch information
1 parent
d1381bd
commit 26861fc
Showing
8 changed files
with
724 additions
and
521 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,75 +1,75 @@ | ||
| // SPDX-License-Identifier: BUSL-1.1 | ||
| pragma solidity ^0.8.12; | ||
|
|
||
| import "./Release_Template.s.sol"; | ||
|
|
||
| // zeus new "pepe" opsmultisig | ||
|
|
||
| contract PEPE_Upgrade is OpsTimelockBuilder { | ||
|
|
||
| struct TimelockData { | ||
| address target; | ||
| uint value; | ||
| string signature; | ||
| bytes data; | ||
| uint eta; | ||
| } | ||
|
|
||
| function _makeTimelockData( | ||
| Addresses memory addrs, | ||
| Environment memory env, | ||
| Params memory params | ||
| ) internal override returns (TimelockData memory) { | ||
| TimelockData data = _newTimelockData(); | ||
| data.eta = env.isMainnet() ? 12351235 : 0; | ||
|
|
||
| data.appendCall({ | ||
| to: addrs.eigenPod.beacon, | ||
| data: EncBeacon.upgradeTo(addrs.eigenPod.getPending()) | ||
| }); | ||
|
|
||
| data.appendCall({ | ||
| to: addrs.proxyAdmin, | ||
| data: EncProxyAdmin.upgrade(addrs.eigenPodManager.proxy, addrs.eigenPodManager.getPending()) | ||
| }); | ||
|
|
||
| return data.encode(); | ||
| } | ||
| function _queue( | ||
| Addresses memory addrs, | ||
| Environment memory env, | ||
| Params memory params | ||
| ) internal override returns (Calls[] memory) { | ||
| TimelockData memory data = _makeTimelockData(addrs, env, params); | ||
|
|
||
| return opsMultisig.queue(txns); | ||
| } | ||
| function _execute( | ||
| Addresses memory addrs, | ||
| Environment memory env, | ||
| Params memory params | ||
| ) internal override returns (Calls[]) { | ||
| TimelockTxn[] memory txns = _makeTimelockTxns(addrs, env, params); | ||
|
|
||
| Calls[] memory final = opsMultsig.execute(txns) | ||
| .append({ | ||
| to: awfe | ||
| data: awef | ||
| }); | ||
|
|
||
| return final; | ||
| } | ||
| } | ||
|
|
||
| contract PEPE_Deploy is EOABuilder { | ||
|
|
||
| function _deploy( | ||
| Addresses memory addrs, | ||
| Environment memory env, | ||
| Params memory params | ||
| ) internal override returns (Deployment[]) { | ||
| } | ||
| } | ||
| // // SPDX-License-Identifier: BUSL-1.1 | ||
| // pragma solidity ^0.8.12; | ||
|
|
||
| // import "./Release_Template.s.sol"; | ||
|
|
||
| // // zeus new "pepe" opsmultisig | ||
|
|
||
| // contract PEPE_Upgrade is OpsTimelockBuilder { | ||
|
|
||
| // struct TimelockData { | ||
| // address target; | ||
| // uint value; | ||
| // string signature; | ||
| // bytes data; | ||
| // uint eta; | ||
| // } | ||
|
|
||
| // function _makeTimelockData( | ||
| // Addresses memory addrs, | ||
| // Environment memory env, | ||
| // Params memory params | ||
| // ) internal override returns (TimelockData memory) { | ||
| // TimelockData data = _newTimelockData(); | ||
| // data.eta = env.isMainnet() ? 12351235 : 0; | ||
|
|
||
| // data.appendCall({ | ||
| // to: addrs.eigenPod.beacon, | ||
| // data: EncBeacon.upgradeTo(addrs.eigenPod.getPending()) | ||
| // }); | ||
|
|
||
| // data.appendCall({ | ||
| // to: addrs.proxyAdmin, | ||
| // data: EncProxyAdmin.upgrade(addrs.eigenPodManager.proxy, addrs.eigenPodManager.getPending()) | ||
| // }); | ||
|
|
||
| // return data.encode(); | ||
| // } | ||
|
|
||
| // function _queue( | ||
| // Addresses memory addrs, | ||
| // Environment memory env, | ||
| // Params memory params | ||
| // ) internal override returns (Transaction memory) { | ||
| // TimelockData memory data = _makeTimelockData(addrs, env, params); | ||
|
|
||
| // return opsMultisig.queue(txns); | ||
| // } | ||
|
|
||
| // function _execute( | ||
| // Addresses memory addrs, | ||
| // Environment memory env, | ||
| // Params memory params | ||
| // ) internal override returns (Transaction memory) { | ||
| // TimelockTxn[] memory txns = _makeTimelockTxns(addrs, env, params); | ||
|
|
||
| // Calls[] memory result = opsMultsig.execute(txns) | ||
| // .append({ | ||
| // to: awfe, | ||
| // data: awef | ||
| // }); | ||
|
|
||
| // return result; | ||
| // } | ||
| // } | ||
|
|
||
| // contract PEPE_Deploy is EOABuilder { | ||
|
|
||
| // function _deploy( | ||
| // Addresses memory addrs, | ||
| // Environment memory env, | ||
| // Params memory params | ||
| // ) internal override returns (Deployment[]) { | ||
|
|
||
| // } | ||
| // } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,24 @@ | ||
| // SPDX-License-Identifier: BUSL-1.1 | ||
| pragma solidity ^0.8.12; | ||
| // // SPDX-License-Identifier: BUSL-1.1 | ||
| // pragma solidity ^0.8.12; | ||
|
|
||
| import "./utils/Releasoor.s.sol"; | ||
| // import "./../../utils/Releasoor.s.sol"; | ||
|
|
||
| contract v0_4_2_ is Releasoor { | ||
| // contract v0_4_2_ is Releasoor { | ||
|
|
||
| using TxBuilder for *; | ||
| using AddressUtils for *; | ||
| // using TxBuilder for *; | ||
| // using AddressUtils for *; | ||
|
|
||
| function deploy(Addresses memory addrs) internal override { | ||
| // If you're deploying contracts, do that here | ||
| } | ||
| // function deploy(Addresses memory addrs) internal override { | ||
| // // If you're deploying contracts, do that here | ||
| // } | ||
|
|
||
| function queueUpgrade(Addresses memory addrs) internal override returns (Tx[] memory executorTxns, uint eta) { | ||
| // If you're queueing an upgrade via the timelock, you can | ||
| // define and encode those transactions here | ||
| } | ||
| // function queueUpgrade(Addresses memory addrs) internal override returns (Tx[] memory executorTxns, uint eta) { | ||
| // // If you're queueing an upgrade via the timelock, you can | ||
| // // define and encode those transactions here | ||
| // } | ||
|
|
||
| function executeUpgrade(Addresses memory addrs) internal override { | ||
| // Whether you are using the timelock or just making transactions | ||
| // from the ops multisig, you can define/encode those transactions here | ||
| } | ||
| } | ||
| // function executeUpgrade(Addresses memory addrs) internal override { | ||
| // // Whether you are using the timelock or just making transactions | ||
| // // from the ops multisig, you can define/encode those transactions here | ||
| // } | ||
| // } |
Oops, something went wrong.