Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,7 @@ abstract contract ValidatorRegistrator is Governable, Pausable {
* @param sourcePubKeys The full public keys of the source validators to be consolidated.
* @param targetPubKey The full public key of the target validator to consolidate into.
*/
// slither-disable-start reentrancy-no-eth
function requestConsolidation(
bytes[] calldata sourcePubKeys,
bytes calldata targetPubKey
Expand All @@ -373,7 +374,7 @@ abstract contract ValidatorRegistrator is Governable, Pausable {
// This is different to the Beacon chain's method.
bytes32 targetPubKeyHash = keccak256(targetPubKey);
bytes32 sourcePubKeyHash;
uint256 totalConsolidationFees;
uint256 totalConsolidationFees = 0;

// For each source validator
for (uint256 i = 0; i < sourcePubKeys.length; ++i) {
Expand Down Expand Up @@ -408,6 +409,8 @@ abstract contract ValidatorRegistrator is Governable, Pausable {
);
}

// slither-disable-end reentrancy-no-eth

/**
* @notice A consolidation request can fail to be processed on the beacon chain
* for various reasons. For example, the pending consolidation queue is full with 262,144 requests.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ module.exports = deploymentWithGovernanceProposal(
forceDeploy: false,
reduceQueueTime: true,
deployerIsProposer: false,
proposalId: "38234265178409078333598297388552567945868201345097914935151040432111128029390",
proposalId:
"38234265178409078333598297388552567945868201345097914935151040432111128029390",
},
async ({ deployWithConfirmation }) => {
const cVaultProxy = await ethers.getContract("VaultProxy");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ const {

module.exports = deploymentWithGovernanceProposal(
{
deployName: "179_vault_upgrade_supernova_AMO",
deployName: "180_vault_upgrade_supernova_AMO",
forceDeploy: false,
reduceQueueTime: true,
deployerIsProposer: false,
proposalId:
"16177445778432224472212272508299557275111595204509579362893638738519171283271",
},
async ({ ethers }) => {
// 1. Deploy new OETH Vault Core and Admin implementations
Expand Down
3 changes: 2 additions & 1 deletion contracts/deployments/mainnet/.migrations.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,6 @@
"175_deploy_pool_booster_merkl_factory": 1772620839,
"177_change_crosschain_strategy_operator": 1771489463,
"178_ousd_auto_withdrawal_module": 1771922160,
"179_upgrade_ousd_morpho_v2_strategy": 1772658143
"179_upgrade_ousd_morpho_v2_strategy": 1772658143,
"180_vault_upgrade_supernova_AMO": 1772814443
}
297 changes: 297 additions & 0 deletions contracts/deployments/mainnet/OETHSupernovaAMOProxy.json

Large diffs are not rendered by default.

Loading
Loading