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
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ simulate-deploys:
simulate-sonic-deploys:
@forge script script/deploy/DeployManager.sol --fork-url $(SONIC_URL) -vvvv


# Usage : make verify file=src/contracts/Proxy.sol addr=0xCED...
SHELL := /bin/bash
match:
Expand Down
7 changes: 6 additions & 1 deletion build/deployments-1.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,15 @@
"008_DeployPendleAdaptor": 1755770279,
"009_UpgradeLidoARMSetBufferScript": 1755692363,
"011_DeployEtherFiARMScript": 1761812927,
"012_UpgradeEtherFiARMScript": 1763557643
"012_UpgradeEtherFiARMScript": 1763557643,
"014_DeployEthenaARMScript": 1764664655
},
"contracts": {
"ARM_ZAPPER": "0xE11EDbd5AE4Fa434Af7f8D7F03Da1742996e7Ab2",
"ETHENA_ARM": "0xCEDa2d856238aA0D12f6329de20B9115f07C366d",
"ETHENA_ARM_CAP_IMPL": "0x7073F39ae371962C2469D72f01f907375bB11E08",
"ETHENA_ARM_CAP_MAN": "0x687AFB5A52A15122fD5FC54A8B52cfd58346fb0C",
"ETHENA_ARM_IMPL": "0x6c181f2CA4224e42Cee8Fc7199c060261AD55d7d",
"ETHERFI_ARM_IMPL": "0x69b98667134EeE3eBF75799dacBCd604E28709ab",
"ETHER_FI_ARM": "0xfB0A3CF9B019BFd8827443d131b235B3E0FC58d2",
"ETHER_FI_ARM_CAP_IMPL": "0xe27720Fc3f3707D47015e274D81a99e5B0800472",
Expand Down
3 changes: 1 addition & 2 deletions script/deploy/mainnet/014_DeployEthenaARMScript.sol
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {CapManager} from "contracts/CapManager.sol";
import {MorphoMarket} from "contracts/markets/MorphoMarket.sol";
import {EthenaUnstaker} from "contracts/EthenaARM.sol";
import {IWETH, IStakedUSDe} from "contracts/Interfaces.sol";
import {Abstract4626MarketWrapper} from "contracts/markets/Abstract4626MarketWrapper.sol";

// Deployment imports
import {GovProposal, GovSixHelper} from "contracts/utils/GovSixHelper.sol";
Expand All @@ -24,7 +23,7 @@ contract DeployEthenaARMScript is AbstractDeployScript {
GovProposal public govProposal;

string public constant override DEPLOY_NAME = "014_DeployEthenaARMScript";
bool public constant override proposalExecuted = false;
bool public constant override proposalExecuted = true;

Proxy morphoMarketProxy;
EthenaARM armImpl;
Expand Down
1 change: 0 additions & 1 deletion test/invariants/OriginARM/TargetFunction.sol
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,6 @@ abstract contract TargetFunction is Properties {
// - Ensure everything is empty
// No more OS in the ARM
require(os.balanceOf(address(originARM)) == 0, "ARM should be OS empty");
require(ws.balanceOf(address(originARM)) <= 1e14, "ARM should be WS empty");
// No unclaimed requests
uint256 len = originARM.nextWithdrawalIndex();
for (uint256 i; i < len; i++) {
Expand Down
Loading