Merge pull request #202 from overlay-market/arthurka/bac-70-revert-th…

…e-extraction-of-oishares-from-the-block-in-build revert: moving oiShares declaration out of the block
overlay-market · May 23, 2024 · a8f5b66 · a8f5b66
2 parents cc33d51 + c638932
commit a8f5b66
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
diff --git a/contracts/OverlayV1Market.sol b/contracts/OverlayV1Market.sol
@@ -204,7 +204,6 @@ contract OverlayV1Market is IOverlayV1Market, Pausable {
         require(collateral >= params.get(Risk.Parameters.MinCollateral), "OVV1:collateral<min");
 
         uint256 oi;
-        uint256 oiShares;
         uint256 debt;
         uint256 price;
         uint256 tradingFee;
@@ -245,7 +244,7 @@ contract OverlayV1Market is IOverlayV1Market, Pausable {
 
             // add new position's open interest to the side's aggregate oi value
             // and increase number of oi shares issued
-            oiShares = _addToOiAggregates(oi, capOi, isLong);
+            uint256 oiShares = _addToOiAggregates(oi, capOi, isLong);
 
             // assemble position info data
             // check position is not immediately liquidatable prior to storing

diff --git a/scripts/Create.s.sol b/scripts/Create.s.sol
@@ -17,21 +17,21 @@ contract CreateMarketScript is Script {
     // TODO: update values as needed
     address constant FEED = 0x0000000000000000000000000000000000000000;
     uint256[15] MARKET_PARAMS = [
-        uint256(122000000000),   // k
-        500000000000000000,      // lmbda
-        2500000000000000,        // delta
-        5000000000000000000,     // capPayoff
-        8e23,                    // capNotional
-        5000000000000000000,     // capLeverage
-        2592000,                 // circuitBreakerWindow
+        uint256(122000000000), // k
+        500000000000000000, // lmbda
+        2500000000000000, // delta
+        5000000000000000000, // capPayoff
+        8e23, // capNotional
+        5000000000000000000, // capLeverage
+        2592000, // circuitBreakerWindow
         66670000000000000000000, // circuitBreakerMintTarget
-        100000000000000000,      // maintenanceMargin
-        100000000000000000,      // maintenanceMarginBurnRate
-        50000000000000000,       // liquidationFeeRate
-        750000000000000,         // tradingFeeRate
-        1e14,                    // minCollateral
-        25000000000000,          // priceDriftUpperLimit
-        250                      // averageBlockTime
+        100000000000000000, // maintenanceMargin
+        100000000000000000, // maintenanceMarginBurnRate
+        50000000000000000, // liquidationFeeRate
+        750000000000000, // tradingFeeRate
+        1e14, // minCollateral
+        25000000000000, // priceDriftUpperLimit
+        250 // averageBlockTime
     ];
 
     function run() external {
@@ -43,7 +43,7 @@ contract CreateMarketScript is Script {
         vm.startBroadcast(DEPLOYER_PK);
 
         // <!---- START DEPLOYMENT ---->
-        
+
         address market = factory.deployMarket(ArbSepoliaConfig.FEED_FACTORY, FEED, MARKET_PARAMS);
 
         // <!-- END DEPLOYMENT -->

diff --git a/scripts/Deploy.s.sol b/scripts/Deploy.s.sol
@@ -24,7 +24,7 @@ contract DeployScript is Script {
         vm.startBroadcast(DEPLOYER_PK);
 
         // <!---- START DEPLOYMENT ---->
-        
+
         // 1. Deploy token contract
         OverlayV1Token ovl = new OverlayV1Token();
 

diff --git a/scripts/feeds/chainlink/Create.s.sol b/scripts/feeds/chainlink/Create.s.sol
@@ -2,7 +2,8 @@
 pragma solidity ^0.8.0;
 
 import {Script, console2} from "forge-std/Script.sol";
-import {OverlayV1ChainlinkFeedFactory} from "contracts/feeds/chainlink/OverlayV1ChainlinkFeedFactory.sol";
+import {OverlayV1ChainlinkFeedFactory} from
+    "contracts/feeds/chainlink/OverlayV1ChainlinkFeedFactory.sol";
 import {ArbSepoliaConfig} from "scripts/config/ArbSepolia.config.sol";
 import {ArbMainnetConfig} from "scripts/config/ArbMainnet.config.sol";
 
@@ -22,11 +23,12 @@ contract CreateFeed is Script {
 
         vm.startBroadcast(DEPLOYER_PK);
 
-        OverlayV1ChainlinkFeedFactory feedFactory = OverlayV1ChainlinkFeedFactory(ArbSepoliaConfig.FEED_FACTORY);
+        OverlayV1ChainlinkFeedFactory feedFactory =
+            OverlayV1ChainlinkFeedFactory(ArbSepoliaConfig.FEED_FACTORY);
 
         // <!---- START DEPLOYMENT ---->
 
-        address feed = feedFactory.deployFeed(AGGREGATOR, HEARTBEAT);        
+        address feed = feedFactory.deployFeed(AGGREGATOR, HEARTBEAT);
 
         // <!-- END DEPLOYMENT -->
 

diff --git a/scripts/feeds/chainlink/Deploy.s.sol b/scripts/feeds/chainlink/Deploy.s.sol
@@ -2,7 +2,8 @@
 pragma solidity ^0.8.0;
 
 import {Script, console2} from "forge-std/Script.sol";
-import {OverlayV1ChainlinkFeedFactory} from "contracts/feeds/chainlink/OverlayV1ChainlinkFeedFactory.sol";
+import {OverlayV1ChainlinkFeedFactory} from
+    "contracts/feeds/chainlink/OverlayV1ChainlinkFeedFactory.sol";
 import {ArbSepoliaConfig} from "scripts/config/ArbSepolia.config.sol";
 import {ArbMainnetConfig} from "scripts/config/ArbMainnet.config.sol";
 
@@ -19,11 +20,9 @@ contract DeployFeedFactory is Script {
         vm.startBroadcast(DEPLOYER_PK);
 
         // <!---- START DEPLOYMENT ---->
-        
+
         OverlayV1ChainlinkFeedFactory feedFactory = new OverlayV1ChainlinkFeedFactory(
-            ArbSepoliaConfig.OVL,
-            ArbSepoliaConfig.MICRO_WINDOW,
-            ArbSepoliaConfig.MACRO_WINDOW
+            ArbSepoliaConfig.OVL, ArbSepoliaConfig.MICRO_WINDOW, ArbSepoliaConfig.MACRO_WINDOW
         );
 
         // <!-- END DEPLOYMENT -->