@gearbox-protocol/sdk 2.1.1 → 2.1.3

package/contracts/PriceFeedDataLive.sol

@@ -54,23 +54,23 @@ struct RedStonePriceFeedData {
 }
 
 contract PriceFeedDataLive {
-    uint16 networkId;
-
-    mapping(uint16 => ChainlinkPriceFeedData[]) chainlinkPriceFeedsByNetwork;
-    mapping(uint16 => SingeTokenPriceFeedData[]) zeroPriceFeedsByNetwork;
-    mapping(uint16 => CurvePriceFeedData[]) curvePriceFeedsByNetwork;
-    mapping(uint16 => CurvePriceFeedData[]) curveCryptoPriceFeedsByNetwork;
-    mapping(uint16 => TheSamePriceFeedData[]) theSamePriceFeedsByNetwork;
-    mapping(uint16 => SingeTokenPriceFeedData[]) yearnPriceFeedsByNetwork;
-    mapping(uint16 => BoundedPriceFeedData[]) boundedPriceFeedsByNetwork;
-    mapping(uint16 => CompositePriceFeedData[]) compositePriceFeedsByNetwork;
-    mapping(uint16 => SingeTokenPriceFeedData) wstethPriceFeedByNetwork;
-    mapping(uint16 => GenericLPPriceFeedData[]) wrappedAaveV2PriceFeedsByNetwork;
-    mapping(uint16 => GenericLPPriceFeedData[]) compoundV2PriceFeedsByNetwork;
-    mapping(uint16 => GenericLPPriceFeedData[]) erc4626PriceFeedsByNetwork;
-    mapping(uint16 => RedStonePriceFeedData[]) redStonePriceFeedsByNetwork;
-
-    constructor(uint16 _networkId) {
+    uint256 networkId;
+
+    mapping(uint256 => ChainlinkPriceFeedData[]) chainlinkPriceFeedsByNetwork;
+    mapping(uint256 => SingeTokenPriceFeedData[]) zeroPriceFeedsByNetwork;
+    mapping(uint256 => CurvePriceFeedData[]) curvePriceFeedsByNetwork;
+    mapping(uint256 => CurvePriceFeedData[]) curveCryptoPriceFeedsByNetwork;
+    mapping(uint256 => TheSamePriceFeedData[]) theSamePriceFeedsByNetwork;
+    mapping(uint256 => SingeTokenPriceFeedData[]) yearnPriceFeedsByNetwork;
+    mapping(uint256 => BoundedPriceFeedData[]) boundedPriceFeedsByNetwork;
+    mapping(uint256 => CompositePriceFeedData[]) compositePriceFeedsByNetwork;
+    mapping(uint256 => SingeTokenPriceFeedData) wstethPriceFeedByNetwork;
+    mapping(uint256 => GenericLPPriceFeedData[]) wrappedAaveV2PriceFeedsByNetwork;
+    mapping(uint256 => GenericLPPriceFeedData[]) compoundV2PriceFeedsByNetwork;
+    mapping(uint256 => GenericLPPriceFeedData[]) erc4626PriceFeedsByNetwork;
+    mapping(uint256 => RedStonePriceFeedData[]) redStonePriceFeedsByNetwork;
+
+    constructor(uint256 _networkId) {
         networkId = _networkId;
         // ------------------------ 1INCH ------------------------
         chainlinkPriceFeedsByNetwork[1].push(

package/contracts/TokensData.sol

@@ -17,9 +17,8 @@ struct TokenData {
 }
 
 contract TokensDataLive {
-    uint16 public immutable networkId;
-    mapping(uint16 => TokenData[]) tokenDataByNetwork;
-    mapping(uint16 => address) usdcByNetwork;
+    mapping(uint256 => TokenData[]) tokenDataByNetwork;
+    mapping(uint256 => address) usdcByNetwork;
 
     uint16[] public connectedNetworks;
 
@@ -1015,30 +1014,42 @@ contract TokensDataLive {
                 tokenType: TokenType.AAVE_V2_A_TOKEN
             })
         );
-
-        networkId = getNetworkId();
     }
 
     function getTokenData() external view returns (TokenData[] memory) {
-        return tokenDataByNetwork[networkId];
+        return tokenDataByNetwork[block.chainid];
     }
 
-    function getNetworkId() internal view returns (uint16) {
-        uint256 len = connectedNetworks.length;
-        for (uint256 i = 0; i < len; i++) {
-            if (checkNetworkId(connectedNetworks[i])) {
-                return connectedNetworks[i];
+    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];
+                }
             }
         }
-
-        revert("No network found");
+        return block.chainid;
     }
 
     function checkNetworkId(uint16 _networkId) internal view returns (bool) {
-        try IERC20Check(usdcByNetwork[_networkId]).totalSupply() returns (uint256) {
+        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.1",
+  "version": "2.1.3",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",