Change required signer counts for scripts (#355)

derivexyz · Oct 4, 2024 · d69b557 · d69b557
2 parents 926904a + 7433483
commit d69b557
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/scripts/deploy-base-only-market.s.sol b/scripts/deploy-base-only-market.s.sol
@@ -83,7 +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.spotFeed.setRequiredSigners(config.requiredSigners);
     }
 
     market.base = new WrappedERC20Asset(deployment.subAccounts, IERC20Metadata(marketERC20));

diff --git a/scripts/deploy-core.s.sol b/scripts/deploy-core.s.sol
@@ -81,7 +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);
+        stableFeed.setRequiredSigners(config.requiredSigners);
         deployment.stableFeed = stableFeed;
 
         deployment.dataSubmitter = new OracleDataSubmitter();

diff --git a/scripts/deploy-market.s.sol b/scripts/deploy-market.s.sol
@@ -107,12 +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.spotFeed.setRequiredSigners(config.requiredSigners);
+    market.perpFeed.setRequiredSigners(config.requiredSigners);
+    market.iapFeed.setRequiredSigners(config.requiredSigners);
+    market.ibpFeed.setRequiredSigners(config.requiredSigners);
+    market.volFeed.setRequiredSigners(config.requiredSigners);
+    market.forwardFeed.setRequiredSigners(config.requiredSigners);
 
     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
@@ -109,10 +109,10 @@ contract DeployPerpOnlyMarket is Utils {
       market.ibpFeed.addSigner(config.feedSigners[i], true);
     }
 
-    market.spotFeed.setRequiredSigners(uint8(config.feedSigners.length));
-    market.perpFeed.setRequiredSigners(uint8(config.feedSigners.length));
-    market.iapFeed.setRequiredSigners(uint8(config.feedSigners.length));
-    market.ibpFeed.setRequiredSigners(uint8(config.feedSigners.length));
+    market.spotFeed.setRequiredSigners(config.requiredSigners);
+    market.perpFeed.setRequiredSigners(config.requiredSigners);
+    market.iapFeed.setRequiredSigners(config.requiredSigners);
+    market.ibpFeed.setRequiredSigners(config.requiredSigners);
 
     // 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
@@ -78,9 +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.spotFeed.setRequiredSigners(config.requiredSigners);
+    market.volFeed.setRequiredSigners(config.requiredSigners);
+    market.forwardFeed.setRequiredSigners(config.requiredSigners);
 
     market.option = new OptionAsset(deployment.subAccounts, address(market.forwardFeed));