From 7080d1d7dff183e03233f4f653186ccb40457b99 Mon Sep 17 00:00:00 2001 From: Dominic Romanowski Date: Thu, 22 Aug 2024 09:16:39 +1000 Subject: [PATCH] updated pyusd and deploy scripts --- deployments/901/PYUSD.json | 4 ++-- deployments/901/shared.json | 2 +- deployments/957/PYUSD.json | 4 ++-- deployments/957/shared.json | 2 +- scripts/deploy-base-only-market.s.sol | 1 + scripts/deploy-core.s.sol | 1 + scripts/deploy-lrt-market.s.sol | 1 + scripts/deploy-market.s.sol | 6 ++++++ scripts/deploy-perp-only-market.s.sol | 5 +++++ scripts/deploy-srm-option-only-market.s.sol | 3 +++ 10 files changed, 23 insertions(+), 6 deletions(-) diff --git a/deployments/901/PYUSD.json b/deployments/901/PYUSD.json index 8d0f122c..c679a708 100644 --- a/deployments/901/PYUSD.json +++ b/deployments/901/PYUSD.json @@ -1,4 +1,4 @@ { - "base": "0x4b9dD2Fd2e5dCa160a68Eea53307f66e24b09Faa", - "spotFeed": "0xFFbFf5464D6B84d292B2316D65E3168dC5C3796f" + "base": "0x6a9A9240491b30bAB56Bf239129e33caC699E4A9", + "spotFeed": "0x7A34670A9192F983bb20410393C1255C2E1297B3" } \ No newline at end of file diff --git a/deployments/901/shared.json b/deployments/901/shared.json index 1caeadac..cc2e0abd 100644 --- a/deployments/901/shared.json +++ b/deployments/901/shared.json @@ -10,7 +10,7 @@ "rsweth": "0xa7456213A5c081F53fEb3A4F64b88A4637Bf3028", "rseth": "0xc3ad6f6E0940df79e12b30F307109fc4Ec2ED7D0", "susde": "0xd87d41f1e4d8b48F3cA18faFc1069b18F9c15B9d", - "pyusd": "0xF40946255Cb4B15cf8d053d08CC263070deF49a9", + "pyusd": "0x4AD1ccd0F9E852EFbE11462BA56cD9AcD19d8239", "dai": "0x1feFa7F9e42cd543d8b25D8226Dff829a3590cf9", "sdai": "0xEd8b70e957027702095060F2961c7feBf5f5c261", "usde": "0x5A73906EBEE0C4631f66eE84E88925a5577c598C", diff --git a/deployments/957/PYUSD.json b/deployments/957/PYUSD.json index 6e61fac5..1b5c8225 100644 --- a/deployments/957/PYUSD.json +++ b/deployments/957/PYUSD.json @@ -1,4 +1,4 @@ { - "base": "0x628D6b702eA76e5C4A3B933a21c28305BE12cA98", - "spotFeed": "0x11a1d8f8d1C688C874152BaBd980B078e9dE864b" + "base": "0x93BA706B606f0012f7B3a8506639600680D6ccd5", + "spotFeed": "0x4A9a2655fF3BE9eCB7E3d8c208dfC8cFEC2095e0" } \ No newline at end of file diff --git a/deployments/957/shared.json b/deployments/957/shared.json index b50002bd..61520142 100644 --- a/deployments/957/shared.json +++ b/deployments/957/shared.json @@ -12,7 +12,7 @@ "susde": "0xb82d12742c3728a14eaa43ebe1c0d32bb62216eb", "usde": "0x1569e57B9e1dA866f9b862Acd8b134ea16B234F5", "sdai": "0x7215a841215cfCcAC7F0894f5F194e8fAa6E5844", - "pyusd": "0x1984Bb061B9301e7ccD6E1731AFb70dfA2b0418D", + "pyusd": "0x5476E2E7ac53e4298ABaaC248b680dC371DC5481", "dai": "0xB56D58Ce246C31c4D3a3bFB354996FF28D081dB7", "feedSigners": ["0x555eB362b5057e36f88cCb42b44D6dA5Fe7A0656", "0x47ebFBAda4d85Dac6b9018C0CE75774556A8243f"] } \ No newline at end of file diff --git a/scripts/deploy-base-only-market.s.sol b/scripts/deploy-base-only-market.s.sol index 7f673b71..9f8c0f9d 100644 --- a/scripts/deploy-base-only-market.s.sol +++ b/scripts/deploy-base-only-market.s.sol @@ -83,6 +83,7 @@ contract DeployMarket is Utils { for (uint i = 0; i < config.feedSigners.length; ++i) { market.spotFeed.addSigner(config.feedSigners[i], true); } + market.spotFeed.setRequiredSigners(config.feedSigners.length); } market.base = new WrappedERC20Asset(deployment.subAccounts, IERC20Metadata(marketERC20)); diff --git a/scripts/deploy-core.s.sol b/scripts/deploy-core.s.sol index edcd1761..47e6cc22 100644 --- a/scripts/deploy-core.s.sol +++ b/scripts/deploy-core.s.sol @@ -81,6 +81,7 @@ contract DeployCore is Utils { for (uint i = 0; i < config.feedSigners.length; ++i) { stableFeed.addSigner(config.feedSigners[i], true); } + stableFeed.setRequiredSigners(config.feedSigners.length); deployment.stableFeed = stableFeed; deployment.dataSubmitter = new OracleDataSubmitter(); diff --git a/scripts/deploy-lrt-market.s.sol b/scripts/deploy-lrt-market.s.sol index 02fc8f88..153fb4a4 100644 --- a/scripts/deploy-lrt-market.s.sol +++ b/scripts/deploy-lrt-market.s.sol @@ -88,6 +88,7 @@ contract DeployMarket is Utils { for (uint i = 0; i < config.feedSigners.length; ++i) { market.spotFeed.addSigner(config.feedSigners[i], true); } + market.spotFeed.setRequiredSigners(config.feedSigners.length); market.base = new WLWrappedERC20Asset(deployment.subAccounts, IERC20Metadata(marketERC20)); } diff --git a/scripts/deploy-market.s.sol b/scripts/deploy-market.s.sol index dc5ca59c..2bbe05b4 100644 --- a/scripts/deploy-market.s.sol +++ b/scripts/deploy-market.s.sol @@ -107,6 +107,12 @@ contract DeployMarket is Utils { market.volFeed.addSigner(config.feedSigners[i], true); market.forwardFeed.addSigner(config.feedSigners[i], true); } + market.spotFeed.setRequiredSigners(config.feedSigners.length); + market.perpFeed.setRequiredSigners(config.feedSigners.length); + market.iapFeed.setRequiredSigners(config.feedSigners.length); + market.ibpFeed.setRequiredSigners(config.feedSigners.length); + market.volFeed.setRequiredSigners(config.feedSigners.length); + market.forwardFeed.setRequiredSigners(config.feedSigners.length); market.option = new OptionAsset(deployment.subAccounts, address(market.forwardFeed)); diff --git a/scripts/deploy-perp-only-market.s.sol b/scripts/deploy-perp-only-market.s.sol index 32052fb7..40c2c4fa 100644 --- a/scripts/deploy-perp-only-market.s.sol +++ b/scripts/deploy-perp-only-market.s.sol @@ -83,6 +83,11 @@ contract DeployPerpOnlyMarket is Utils { market.ibpFeed.addSigner(config.feedSigners[i], true); } + market.spotFeed.setRequiredSigners(config.feedSigners.length); + market.perpFeed.setRequiredSigners(config.feedSigners.length); + market.iapFeed.setRequiredSigners(config.feedSigners.length); + market.ibpFeed.setRequiredSigners(config.feedSigners.length); + // Deploy and configure perp (int staticInterestRate, int fundingRateCap, uint fundingConvergencePeriod) = Config.getPerpParams(); diff --git a/scripts/deploy-srm-option-only-market.s.sol b/scripts/deploy-srm-option-only-market.s.sol index f1f6c4be..69625ac1 100644 --- a/scripts/deploy-srm-option-only-market.s.sol +++ b/scripts/deploy-srm-option-only-market.s.sol @@ -78,6 +78,9 @@ contract DeploySRMOptionOnlyMarket is Utils { market.volFeed.addSigner(config.feedSigners[i], true); market.forwardFeed.addSigner(config.feedSigners[i], true); } + market.spotFeed.setRequiredSigners(config.feedSigners.length); + market.volFeed.setRequiredSigners(config.feedSigners.length); + market.forwardFeed.setRequiredSigners(config.feedSigners.length); market.option = new OptionAsset(deployment.subAccounts, address(market.forwardFeed));