From 7d902cb10010ff2b493fce9f493d29f4604aa974 Mon Sep 17 00:00:00 2001 From: Andrew Chiaramonte Date: Tue, 17 Dec 2024 18:49:29 -0500 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=9A=80=20deploy=20multicollateral=20w?= =?UTF-8?q?ith=20updated=20pdao?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deployments/Base.json | 8 ++++---- script/utils/parameters/BaseParameters.sol | 4 ++-- src/utils/MulticallerWithSender.sol | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deployments/Base.json b/deployments/Base.json index 0dd7dd9c..af15290b 100644 --- a/deployments/Base.json +++ b/deployments/Base.json @@ -11,9 +11,9 @@ }, "Multi Collateral": { "Zap": "0x41AE8b823850D96088419992c9538198b72cA230", - "Pay": "0x127Fb7602bF3De092d351f922791cF9a149A4837", - "EngineImplementation": "0x4AeD59A7986E8Ae37FD6Ce964492195828D4aC36", - "EngineProxy": "0xB7743A30cE805BcA100e048324d3398530b4547c", - "MulticallerWithSender": "0x138A347ae9607dbc119620b93aAf2c71fDeF6726" + "Pay": "0x067e8C201Cc9CF33e556f8A0d75b91276c9af3D6", + "EngineImplementation": "0x6b17Cfa48ee616C864e5310e4a04b863051CCCeA", + "EngineProxy": "0xe331a7eeC851Ba702aA8BF43070a178451d6D28E", + "MulticallerWithSender": "0x14fC2CAe096E5964Ffb408bf8aCC292FC78d4f7f" } } \ No newline at end of file diff --git a/script/utils/parameters/BaseParameters.sol b/script/utils/parameters/BaseParameters.sol index 9d118ecb..470637d5 100644 --- a/script/utils/parameters/BaseParameters.sol +++ b/script/utils/parameters/BaseParameters.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.27; contract BaseParameters { // Deployer base - address public constant PDAO = 0x88d40a3f2870e835005A3F1CFd28D94b12aD5483; + address public constant PDAO = 0x2f4004Bc32cc5D18a62fE26E35A0881d5397c549; address public constant PERPS_MARKET_PROXY = address(0); @@ -34,7 +34,7 @@ contract BaseParameters { address public constant ZAP = 0x41AE8b823850D96088419992c9538198b72cA230; address payable public constant PAY = - payable(0x127Fb7602bF3De092d351f922791cF9a149A4837); + payable(0x067e8C201Cc9CF33e556f8A0d75b91276c9af3D6); address public constant CBBTC = 0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf; diff --git a/src/utils/MulticallerWithSender.sol b/src/utils/MulticallerWithSender.sol index 04e09f50..92083d41 100644 --- a/src/utils/MulticallerWithSender.sol +++ b/src/utils/MulticallerWithSender.sol @@ -116,7 +116,7 @@ contract MulticallerWithSender { if iszero( call( gas(), // Remaining gas. - 0xB7743A30cE805BcA100e048324d3398530b4547c, // Engine Proxy address. + 0xe331a7eeC851Ba702aA8BF43070a178451d6D28E, // Engine Proxy address. calldataload(values.offset), // ETH to send. memPtr, // Start of input calldata in memory. calldataload(o), // Size of input calldata. From 334cc8ff948db248cdfa0a02dc6f68273157e1e1 Mon Sep 17 00:00:00 2001 From: Andrew Chiaramonte Date: Thu, 19 Dec 2024 14:07:35 -0500 Subject: [PATCH 2/3] =?UTF-8?q?=E2=9C=85=20update=20debt=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/PayDebt.t.sol | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/PayDebt.t.sol b/test/PayDebt.t.sol index b83b4156..b407c9d5 100644 --- a/test/PayDebt.t.sol +++ b/test/PayDebt.t.sol @@ -6,11 +6,11 @@ import {IEngine} from "src/interfaces/IEngine.sol"; contract PayDebtTest is Bootstrap { address public constant DEBT_ACTOR = - address(0x325cd6b3CD80EDB102ac78848f5B127eB6DB13f3); + address(0x3C704e28C8EfCC7aCa262031818001895595081D); uint128 public constant ACCOUNT_ID = - 170_141_183_460_469_231_731_687_303_715_884_105_747; - uint256 public constant INITIAL_DEBT = 2_983_003_117_413_866_988; - uint256 public constant BASE_BLOCK_NUMBER_WITH_DEBT = 23_805_461; + 170_141_183_460_469_231_731_687_303_715_884_108_662; + uint256 public constant INITIAL_DEBT = 10_718_269_732_520_293_989; + uint256 public constant BASE_BLOCK_NUMBER_WITH_DEBT = 23_922_058; uint256 public constant USDC_WRAPPER_MAX_AMOUNT = 100_000_000_000_000_000_000_000_000; @@ -41,7 +41,7 @@ contract PayDebtTest is Bootstrap { /// (for the input _amount) uint256 decimalsFactor = 10 ** (18 - USDC.decimals()); uint256 INITIAL_DEBT_IN_USDC = INITIAL_DEBT / decimalsFactor; - assertEq(INITIAL_DEBT_IN_USDC, 2_983_003); + assertEq(INITIAL_DEBT_IN_USDC, 10_718_269); /// @dev on this block (BASE_BLOCK_NUMBER_WITH_DEBT) /// ACCOUNT_ID has a debt value of INITIAL_DEBT @@ -81,7 +81,7 @@ contract PayDebtTest is Bootstrap { /// (for the input _amount) uint256 decimalsFactor = 10 ** (18 - USDC.decimals()); uint256 INITIAL_DEBT_IN_USDC = INITIAL_DEBT / decimalsFactor; - assertEq(INITIAL_DEBT_IN_USDC, 2_983_003); + assertEq(INITIAL_DEBT_IN_USDC, 10_718_269); /// @dev on this block (BASE_BLOCK_NUMBER_WITH_DEBT) /// @dev ACCOUNT_ID has a debt value of INITIAL_DEBT @@ -125,7 +125,7 @@ contract PayDebtTest is Bootstrap { /// (for the input _amount) uint256 decimalsFactor = 10 ** (18 - USDC.decimals()); uint256 INITIAL_DEBT_IN_USDC = INITIAL_DEBT / decimalsFactor; - assertEq(INITIAL_DEBT_IN_USDC, 2_983_003); + assertEq(INITIAL_DEBT_IN_USDC, 10_718_269); /// @dev on this block (BASE_BLOCK_NUMBER_WITH_DEBT) /// @dev ACCOUNT_ID has a debt value of INITIAL_DEBT From 9cea2da5dec23390cc08860fe2eeb26ca25f1598 Mon Sep 17 00:00:00 2001 From: Andrew Chiaramonte Date: Thu, 19 Dec 2024 14:27:50 -0500 Subject: [PATCH 3/3] =?UTF-8?q?=E2=9C=85=20update=20block=20number?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/utils/Constants.sol | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/utils/Constants.sol b/test/utils/Constants.sol index c5f2c138..3579e263 100644 --- a/test/utils/Constants.sol +++ b/test/utils/Constants.sol @@ -4,8 +4,8 @@ pragma solidity 0.8.27; /// @title Contract for defining constants used in testing /// @author JaredBorders (jaredborders@pm.me) contract Constants { - /// @dev Dec-13-2024 07:33:47 PM +UTC - uint256 public constant BASE_BLOCK_NUMBER = 23_805_461; + /// @dev Dec-19-2024 07:22:05 PM +UTC + uint256 public constant BASE_BLOCK_NUMBER = 23_923_389; address internal constant OWNER = address(0x01); @@ -62,14 +62,14 @@ contract Constants { uint128 constant WSTETH_SYNTH_MARKET_ID = 7; - /// @dev this is the ETH price in USD at the block number 23_805_461 - uint256 internal constant ETH_PRICE = 4000; + /// @dev this is the ETH price in USD at the block number 23_923_389 + uint256 internal constant ETH_PRICE = 3500; - uint256 internal constant BTC_PRICE = 106_000; + uint256 internal constant BTC_PRICE = 98_240; - uint256 internal constant CBETH_PRICE = 4351; + uint256 internal constant CBETH_PRICE = 3800; - uint256 internal constant WSTETH_PRICE = 4735; + uint256 internal constant WSTETH_PRICE = 4134; uint256 internal constant AMOUNT = 10_000 ether;