Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🚀 deploy multicollateral with updated pdao #59

Merged
merged 3 commits into from
Dec 19, 2024
Merged

🚀 deploy multicollateral with updated pdao #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d902cb
🚀 deploy multicollateral with updated pdao
cmontecoding Dec 17, 2024
334cc8f
✅ update debt test
cmontecoding Dec 19, 2024
9cea2da
✅ update block number
cmontecoding Dec 19, 2024
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
8 changes: 4 additions & 4 deletions deployments/Base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
},
"Multi Collateral": {
"Zap": "0x41AE8b823850D96088419992c9538198b72cA230",
"Pay": "0x127Fb7602bF3De092d351f922791cF9a149A4837",
"EngineImplementation": "0x4AeD59A7986E8Ae37FD6Ce964492195828D4aC36",
"EngineProxy": "0xB7743A30cE805BcA100e048324d3398530b4547c",
"MulticallerWithSender": "0x138A347ae9607dbc119620b93aAf2c71fDeF6726"
"Pay": "0x067e8C201Cc9CF33e556f8A0d75b91276c9af3D6",
"EngineImplementation": "0x6b17Cfa48ee616C864e5310e4a04b863051CCCeA",
"EngineProxy": "0xe331a7eeC851Ba702aA8BF43070a178451d6D28E",
"MulticallerWithSender": "0x14fC2CAe096E5964Ffb408bf8aCC292FC78d4f7f"
}
}
4 changes: 2 additions & 2 deletions script/utils/parameters/BaseParameters.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/utils/MulticallerWithSender.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
14 changes: 7 additions & 7 deletions test/PayDebt.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions test/utils/Constants.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ pragma solidity 0.8.27;
/// @title Contract for defining constants used in testing
/// @author JaredBorders ([email protected])
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);

Expand Down Expand Up @@ -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;

Expand Down
Loading