diff --git a/deployment-config/04_DeployIonPool.json b/deployment-config/04_DeployIonPool.json index 57ebb657..a41ac93a 100644 --- a/deployment-config/04_DeployIonPool.json +++ b/deployment-config/04_DeployIonPool.json @@ -2,9 +2,10 @@ "underlying": "0x4200000000000000000000000000000000000006", "treasury": "0xE5a5F3A6C88B894710992e1C2626be0DEB99566E", "decimals": "18", - "name": "Ion weETH WETH Token", - "symbol": "iweETH-WETH", + "name": "Ion ezETH WETH Token", + "symbol": "iezETH-WETH", "whitelist": "0xf98248f0dA9D51d827A3C42d608acF65c77BD76A", "interestRateModule": "0x7BC91582b10c3ce83be1918daE5136B59FC55e01", - "salt": "0xa53bcb7572e19b03e4aae7000000000000000000000000000000000000000000" + "salt": "0xeba688b6a0169602b0f4c5000000000000000000000000000000000000000000", + "ionImpl": "0xB1F7395E72B0045600c946afAB7e44cB35A6EB9B" } diff --git a/deployment-config/06_SetupCollateral.json b/deployment-config/06_SetupCollateral.json index 2e00c3d2..ac7b6a77 100644 --- a/deployment-config/06_SetupCollateral.json +++ b/deployment-config/06_SetupCollateral.json @@ -1,6 +1,6 @@ { - "ionPool": "0x00000000000fA8e0FD26b4554d067CF1856De7F5", - "spotOracle": "0x5D83953248cbF1FF723978FbD3490D9a2385A52d", + "ionPool": "0x000000000054D04Bd84f465ae7aD3aC39072255D", + "spotOracle": "0x1B39e88465e097FDB5d4E4BEad3d88655786ac07", "debtCeiling": "000000000000000000000000000000000000000000000000", "dust": "4000000000000000000000000000000000000000000000" } diff --git a/deployment-config/07_DeployGemJoin.json b/deployment-config/07_DeployGemJoin.json index 81a8102e..306a6026 100644 --- a/deployment-config/07_DeployGemJoin.json +++ b/deployment-config/07_DeployGemJoin.json @@ -1,3 +1,3 @@ { - "ionPool": "0x00000000000fA8e0FD26b4554d067CF1856De7F5" + "ionPool": "0x000000000054D04Bd84f465ae7aD3aC39072255D" } diff --git a/deployment-config/08_DeployHandlers.json b/deployment-config/08_DeployHandlers.json index e060d270..bf0ec3e1 100644 --- a/deployment-config/08_DeployHandlers.json +++ b/deployment-config/08_DeployHandlers.json @@ -1,5 +1,5 @@ { - "ionPool": "0x00000000000fA8e0FD26b4554d067CF1856De7F5", - "gemJoin": "0xe21ae2d45dEDF8dEE2D854774a904d33b8700E78", + "ionPool": "0x000000000054D04Bd84f465ae7aD3aC39072255D", + "gemJoin": "0x177DAaA9aA0ab22E4B84f32B3A01d9dD57728253", "whitelist": "0xf98248f0dA9D51d827A3C42d608acF65c77BD76A" } diff --git a/deployment-config/09_DeployLiquidation.json b/deployment-config/09_DeployLiquidation.json index 005845d5..f1a0d0b5 100644 --- a/deployment-config/09_DeployLiquidation.json +++ b/deployment-config/09_DeployLiquidation.json @@ -3,7 +3,7 @@ "liquidationThreshold": "960000000000000000000000000", "maxDiscount": "200000000000000000000000000", "reserveFactor": "10000000000000000000000000", - "ionPool": "0x00000000000fA8e0FD26b4554d067CF1856De7F5", - "reserveOracle": "0x39c66dEAA7BA7576ed1498C5A0601454740e386C", - "salt": "0x7dbc99ede0e74803aa149e000000000000000000000000000000000000000000" + "ionPool": "0x000000000054D04Bd84f465ae7aD3aC39072255D", + "reserveOracle": "0xcce76ed19a17380d1a5E90adD25317F70650D92b", + "salt": "0x2aa182b96665000197a6b5000000000000000000000000000000000000000000" } diff --git a/deployment-config/10_AdminTransfer.json b/deployment-config/10_AdminTransfer.json index 6525b770..f17b84c3 100644 --- a/deployment-config/10_AdminTransfer.json +++ b/deployment-config/10_AdminTransfer.json @@ -1,8 +1,8 @@ { - "ionPool": "0x00000000000fA8e0FD26b4554d067CF1856De7F5", + "ionPool": "0x000000000054D04Bd84f465ae7aD3aC39072255D", "yieldOracle": "0x2CAe5eD3b35654499EE605cD66A9b14a0d053773", "whitelist": "0xf98248f0dA9D51d827A3C42d608acF65c77BD76A", - "proxyAdmin": "0xe559662C42FF6460BE7c7f0C67aBA789Fde53861", - "liquidation": "0x00000000009229776762B5e6b865a06afeB4444c", - "gemJoin": "0xe21ae2d45dEDF8dEE2D854774a904d33b8700E78" + "proxyAdmin": "0xb475DcdD1C820b6B9c2f03a31C298d0722a1E27C", + "liquidation": "0x0000000000B0874413358bf8E80855f67CEE5C2a", + "gemJoin": "0x177DAaA9aA0ab22E4B84f32B3A01d9dD57728253" } diff --git a/script/deploy-test/10_AdminTransfer.t.sol b/script/deploy-test/10_AdminTransfer.t.sol index 083ae411..3b53aeaf 100644 --- a/script/deploy-test/10_AdminTransfer.t.sol +++ b/script/deploy-test/10_AdminTransfer.t.sol @@ -16,7 +16,7 @@ contract DeployAdminTransferTest is DeployTestBase, AdminTransferScript { assertLe(addressSchedule, block.timestamp, "address schedule"); // assertEq(yieldOracle.pendingOwner(), protocol, "yield oracle pending owner"); - assertEq(whitelist.pendingOwner(), protocol, "whitelist pending owner"); + // assertEq(whitelist.pendingOwner(), protocol, "whitelist pending owner"); assertEq(proxyAdmin.pendingOwner(), protocol, "proxy admin pending owner"); assertTrue(ionPool.hasRole(ionPool.GEM_JOIN_ROLE(), address(gemJoin)), "gem join role"); assertTrue(ionPool.hasRole(ionPool.LIQUIDATOR_ROLE(), address(liquidation)), "gem join role"); diff --git a/script/deploy/05_DeployInitialReserveAndSpotOracles.s.sol b/script/deploy/05_DeployInitialReserveAndSpotOracles.s.sol index 699727e1..395479b7 100644 --- a/script/deploy/05_DeployInitialReserveAndSpotOracles.s.sol +++ b/script/deploy/05_DeployInitialReserveAndSpotOracles.s.sol @@ -3,8 +3,8 @@ pragma solidity 0.8.21; import { DeployScript } from "../Deploy.s.sol"; import { RAY } from "../../src/libraries/math/WadRayMath.sol"; -import {BaseEzEthWethReserveOracle} from "./../../src/oracles/reserve/lrt/base/BaseEzEthWethReserveOracle.sol"; -import {BaseEzEthWethSpotOracle} from "./../../src/oracles/spot/lrt/base/BaseEzEthWethSpotOracle.sol"; +import { BaseEzEthWethReserveOracle } from "./../../src/oracles/reserve/lrt/base/BaseEzEthWethReserveOracle.sol"; +import { BaseEzEthWethSpotOracle } from "./../../src/oracles/spot/lrt/base/BaseEzEthWethSpotOracle.sol"; import { stdJson as StdJson } from "forge-std/StdJson.sol"; diff --git a/script/deploy/08_DeployHandlers.s.sol b/script/deploy/08_DeployHandlers.s.sol index 2b9fbff8..f3ba9454 100644 --- a/script/deploy/08_DeployHandlers.s.sol +++ b/script/deploy/08_DeployHandlers.s.sol @@ -7,7 +7,7 @@ import { IonPool } from "../../src/IonPool.sol"; import { GemJoin } from "../../src/join/GemJoin.sol"; import { Whitelist } from "../../src/Whitelist.sol"; import { IonHandlerBase } from "../../src/flash/IonHandlerBase.sol"; -import {BaseEzEthWethHandler} from "./../../src/flash/lrt/base/BaseEzEthWethHandler.sol"; +import { BaseEzEthWethHandler } from "./../../src/flash/lrt/base/BaseEzEthWethHandler.sol"; import { stdJson as StdJson } from "forge-std/StdJson.sol"; // NOTE: Different handlers will have different constructor parameters. @@ -29,23 +29,11 @@ contract DeployHandlersScript is DeployScript { if (deployCreate2) { handler = new BaseEzEthWethHandler{ salt: DEFAULT_SALT }( - ILK_INDEX_ZERO, - ionPool, - gemJoin, - whitelist, - BASE_EZETH_WETH_AERODROME, - false, - BASE_WETH + ILK_INDEX_ZERO, ionPool, gemJoin, whitelist, BASE_EZETH_WETH_AERODROME, false, BASE_WETH ); } else { handler = new BaseEzEthWethHandler( - ILK_INDEX_ZERO, - ionPool, - gemJoin, - whitelist, - BASE_EZETH_WETH_AERODROME, - false, - BASE_WETH + ILK_INDEX_ZERO, ionPool, gemJoin, whitelist, BASE_EZETH_WETH_AERODROME, false, BASE_WETH ); } } diff --git a/script/deploy/10_AdminTransfer.s.sol b/script/deploy/10_AdminTransfer.s.sol index 791ce8cc..105a2e20 100644 --- a/script/deploy/10_AdminTransfer.s.sol +++ b/script/deploy/10_AdminTransfer.s.sol @@ -49,7 +49,7 @@ contract AdminTransferScript is DeployScript { ionPool.beginDefaultAdminTransfer(protocol); // yieldOracle.transferOwnership(protocol); - whitelist.transferOwnership(protocol); + // whitelist.transferOwnership(protocol); proxyAdmin.transferOwnership(protocol); } }