Merge pull request #35 from Gearbox-protocol/composite-price-feed-deploy

Composite price feed deploy

Author: Van0k

contracts/test/suites/PriceFeedDeployer.sol

@@ -130,7 +130,6 @@ contract PriceFeedDeployer is Test, PriceFeedDataLive {
                 string memory description = string(abi.encodePacked("PRICEFEED_", tokenTestSuite.symbols(t)));
                 vm.label(pf, description);
             }
-            updateRedstoneOraclePriceFeeds();
         }
 
         // BOUNDED PRICE FEEDS
@@ -172,18 +171,61 @@ contract PriceFeedDeployer is Test, PriceFeedDataLive {
                     address token = tokenTestSuite.addressOf(t);
 
                     if (
-                        token != address(0) && compositePriceFeeds[i].targetToBaseFeed != address(0)
-                            && compositePriceFeeds[i].baseToUSDFeed != address(0)
+                        token != address(0)
+                            && (
+                                compositePriceFeeds[i].targetToBaseFeed != address(0)
+                                    || compositePriceFeeds[i].isTargetRedstone
+                            )
+                            && (
+                                compositePriceFeeds[i].baseToUSDFeed != address(0) || compositePriceFeeds[i].isBaseComposite
+                            )
                     ) {
+                        address targetToBaseFeed;
+                        if (compositePriceFeeds[i].isTargetRedstone) {
+                            targetToBaseFeed = address(
+                                new RedstonePriceFeed(
+                                    token,
+                                    compositePriceFeeds[i].redstoneTargetToBaseData.dataFeedId,
+                                    compositePriceFeeds[i].redstoneTargetToBaseData.signers,
+                                    compositePriceFeeds[i].redstoneTargetToBaseData.signersThreshold
+                                )
+                            );
+                            redstoneServiceIdByPriceFeed[targetToBaseFeed] =
+                                compositePriceFeeds[i].redstoneTargetToBaseData.dataServiceId;
+                            redStoneOracles.push(targetToBaseFeed);
+                        } else {
+                            targetToBaseFeed = compositePriceFeeds[i].targetToBaseFeed;
+                        }
+
+                        address baseToUSDFeed;
+                        if (compositePriceFeeds[i].isBaseComposite) {
+                            baseToUSDFeed = address(
+                                new CompositePriceFeed(
+                                    [
+                                        PriceFeedParams({
+                                            priceFeed: compositePriceFeeds[i].compositeBaseToUSDData.targetToBaseFeed,
+                                            stalenessPeriod: compositePriceFeeds[i].compositeBaseToUSDData.targetStalenessPeriod
+                                        }),
+                                        PriceFeedParams({
+                                            priceFeed: compositePriceFeeds[i].compositeBaseToUSDData.baseToUSDFeed,
+                                            stalenessPeriod: compositePriceFeeds[i].compositeBaseToUSDData.baseStalenessPeriod
+                                        })
+                                    ]
+                                )
+                            );
+                        } else {
+                            baseToUSDFeed = compositePriceFeeds[i].baseToUSDFeed;
+                        }
+
                         address pf = address(
                             new CompositePriceFeed(
                                 [
                                     PriceFeedParams({
-                                        priceFeed: compositePriceFeeds[i].targetToBaseFeed,
+                                        priceFeed: targetToBaseFeed,
                                         stalenessPeriod: compositePriceFeeds[i].targetStalenessPeriod
                                     }),
                                     PriceFeedParams({
-                                        priceFeed: compositePriceFeeds[i].baseToUSDFeed,
+                                        priceFeed: baseToUSDFeed,
                                         stalenessPeriod: compositePriceFeeds[i].baseStalenessPeriod
                                     })
                                 ]
@@ -197,6 +239,7 @@ contract PriceFeedDeployer is Test, PriceFeedDataLive {
                     }
                 }
             }
+            updateRedstoneOraclePriceFeeds();
         }
 
         // ZERO PRICE FEEDS

package.json

@@ -34,7 +34,7 @@
     "@gearbox-protocol/core-v3": "^1.47.1",
     "@gearbox-protocol/eslint-config": "^1.6.1",
     "@gearbox-protocol/prettier-config": "^1.5.0",
-    "@gearbox-protocol/sdk-gov": "^1.31.0",
+    "@gearbox-protocol/sdk-gov": "^1.38.0",
     "@openzeppelin/contracts": "4.9.3",
     "@redstone-finance/evm-connector": "0.2.5",
     "@typechain/ethers-v5": "^10.1.0",

yarn.lock

@@ -1329,10 +1329,10 @@
   resolved "https://registry.yarnpkg.com/@gearbox-protocol/prettier-config/-/prettier-config-1.5.0.tgz#4df8e9fd2305fee6ab8c1417a02e31343836932a"
   integrity sha512-FUoprSsBdZyBjgxXCKL6mTkbeUJytaLzPJqIOoQpDmBRTX0seCc2o5I9PI9tySoRIlNnd/XXnKCXq1xHDEGbxw==
 
-"@gearbox-protocol/sdk-gov@^1.31.0":
-  version "1.31.0"
-  resolved "https://registry.yarnpkg.com/@gearbox-protocol/sdk-gov/-/sdk-gov-1.31.0.tgz#1cc83ee35f9ed2da832ca1c95aa8307ed44aa7c8"
-  integrity sha512-tDEwSx+bW8Bi1tj93Ujw0ZUuTi6Cw/dHF1dFlbLTtFwsdG2hDuCPGOYdLLJUsirHbY69p3ztUXmjm22492W2VA==
+"@gearbox-protocol/sdk-gov@^1.38.0":
+  version "1.38.0"
+  resolved "https://registry.yarnpkg.com/@gearbox-protocol/sdk-gov/-/sdk-gov-1.38.0.tgz#3532bc37be2e42825c4d9aaace487695df21e38f"
+  integrity sha512-5WuUpRELGddQr+dchvMxQxTKojH9xaOufO39qKMd3c/bsvSTIm4QkMijdyAkCM7v2XiZNxSWTwIDGXeGHaYOqA==
   dependencies:
     "@types/yaml" "^1.9.7"
     add "^2.0.6"