@gearbox-protocol/sdk 2.1.4 → 2.1.6

package/contracts/NetworkDetector.sol

@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: UNLICENSED
+// Gearbox. Generalized leverage protocol that allows to take leverage and then use it across other DeFi protocols and platforms in a composable way.
+// (c) Gearbox Foundation, 2023
+pragma solidity ^0.8.17;
+
+import {Test} from "forge-std/Test.sol";
+
+interface IERC20Check {
+    function totalSupply() external view returns (uint256);
+}
+
+contract NetworkDetector is Test {
+    mapping(uint256 => address) usdcByNetwork;
+
+    uint16[] public connectedNetworks;
+
+    constructor() {
+        // ---------------- Networks ---------------------
+        connectedNetworks.push(1);
+        connectedNetworks.push(42161);
+        usdcByNetwork[1] = 0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48;
+        usdcByNetwork[42161] = 0xaf88d065e77c8cC2239327C5EDb3A432268e5831;
+
+        vm.chainId(getNetworkId());
+    }
+
+    function getNetworkId() internal view returns (uint256) {
+        if (block.chainid == 1337 || block.chainid == 31337) {
+            uint256 len = connectedNetworks.length;
+            for (uint256 i = 0; i < len; i++) {
+                if (checkNetworkId(connectedNetworks[i])) {
+                    return connectedNetworks[i];
+                }
+            }
+        }
+        return block.chainid;
+    }
+
+    function checkNetworkId(uint16 _networkId) internal view returns (bool) {
+        address tokenToCheck = usdcByNetwork[_networkId];
+
+        if (!isContract(tokenToCheck)) {
+            return false;
+        }
+
+        try IERC20Check(tokenToCheck).totalSupply() returns (uint256) {
+            return true;
+        } catch {
+            return false;
+        }
+    }
+
+    // This method relies on extcodesize/address.code.length, which returns 0
+    // for contracts in construction, since the code is only stored at the end
+    // of the constructor execution.
+    function isContract(address account) internal view returns (bool) {
+        return account.code.length > 0;
+    }
+}

package/contracts/PriceFeedDataLive.sol

@@ -54,8 +54,6 @@ struct RedStonePriceFeedData {
 }
 
 contract PriceFeedDataLive {
-    uint256 networkId;
-
     mapping(uint256 => ChainlinkPriceFeedData[]) chainlinkPriceFeedsByNetwork;
     mapping(uint256 => SingeTokenPriceFeedData[]) zeroPriceFeedsByNetwork;
     mapping(uint256 => CurvePriceFeedData[]) curvePriceFeedsByNetwork;
@@ -70,8 +68,7 @@ contract PriceFeedDataLive {
     mapping(uint256 => GenericLPPriceFeedData[]) erc4626PriceFeedsByNetwork;
     mapping(uint256 => RedStonePriceFeedData[]) redStonePriceFeedsByNetwork;
 
-    constructor(uint256 _networkId) {
-        networkId = _networkId;
+    constructor() {
         // ------------------------ 1INCH ------------------------
         chainlinkPriceFeedsByNetwork[1].push(
             ChainlinkPriceFeedData({token: Tokens._1INCH, priceFeed: 0xc929ad75B72593967DE83E7F7Cda0493458261D9})
@@ -908,6 +905,6 @@ contract PriceFeedDataLive {
     }
 
     function chainlinkPriceFeeds(uint256 index) external view returns (ChainlinkPriceFeedData memory) {
-        return chainlinkPriceFeedsByNetwork[networkId][index];
+        return chainlinkPriceFeedsByNetwork[block.chainid][index];
     }
 }

package/contracts/SupportedContracts.sol

@@ -26,14 +26,11 @@ contract SupportedContracts is Test, ISupportedContracts {
     mapping(Contracts => address) public override addressOf;
     mapping(Contracts => string) public override nameOf;
     mapping(address => Contracts) public override contractIndex;
-    mapping(uint16 => ContractData[]) public contractDataByNetwork;
+    mapping(uint256 => ContractData[]) public contractDataByNetwork;
 
     uint256 public override contractCount;
 
-    uint16 immutable networkId;
-
-    constructor(uint16 _networkId) {
-        networkId = _networkId;
+    constructor() {
         contractDataByNetwork[1].push(
             ContractData({
                 id: Contracts.UNISWAP_V2_ROUTER,
@@ -352,7 +349,7 @@ contract SupportedContracts is Test, ISupportedContracts {
             })
         );
 
-        ContractData[] storage cd = contractDataByNetwork[networkId];
+        ContractData[] storage cd = contractDataByNetwork[block.chainid];
 
         uint256 len = cd.length;
         contractCount = len;

package/contracts/TokensData.sol

@@ -18,16 +18,8 @@ struct TokenData {
 
 contract TokensDataLive {
     mapping(uint256 => TokenData[]) tokenDataByNetwork;
-    mapping(uint256 => address) usdcByNetwork;
-
-    uint16[] public connectedNetworks;
 
     constructor() {
-        // ---------------- Networks ---------------------
-        connectedNetworks.push(1);
-        connectedNetworks.push(42161);
-
-        // ---------------- TokensData ---------------------
         tokenDataByNetwork[1].push(
             TokenData({
                 id: Tokens._1INCH,
@@ -108,7 +100,6 @@ contract TokensDataLive {
                 tokenType: TokenType.NORMAL_TOKEN
             })
         );
-        usdcByNetwork[1] = 0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48;
         tokenDataByNetwork[1].push(
             TokenData({
                 id: Tokens.USDC,
@@ -809,7 +800,6 @@ contract TokensDataLive {
                 tokenType: TokenType.NORMAL_TOKEN
             })
         );
-        usdcByNetwork[42161] = 0xaf88d065e77c8cC2239327C5EDb3A432268e5831;
         tokenDataByNetwork[42161].push(
             TokenData({
                 id: Tokens.USDC,
@@ -1019,37 +1009,4 @@ contract TokensDataLive {
     function getTokenData() external view returns (TokenData[] memory) {
         return tokenDataByNetwork[block.chainid];
     }
-
-    function getNetworkId() internal view returns (uint256) {
-        if (block.chainid == 1337 || block.chainid == 31337) {
-            uint256 len = connectedNetworks.length;
-            for (uint256 i = 0; i < len; i++) {
-                if (checkNetworkId(connectedNetworks[i])) {
-                    return connectedNetworks[i];
-                }
-            }
-        }
-        return block.chainid;
-    }
-
-    function checkNetworkId(uint16 _networkId) internal view returns (bool) {
-        address tokenToCheck = usdcByNetwork[_networkId];
-
-        if (!isContract(tokenToCheck)) {
-            return false;
-        }
-
-        try IERC20Check(tokenToCheck).totalSupply() returns (uint256) {
-            return true;
-        } catch {
-            return false;
-        }
-    }
-
-    // This method relies on extcodesize/address.code.length, which returns 0
-    // for contracts in construction, since the code is only stored at the end
-    // of the constructor execution.
-    function isContract(address account) internal view returns (bool) {
-        return account.code.length > 0;
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",