@gearbox-protocol/sdk 0.0.52 → 0.0.55

package/src/core/creditAccount.ts

@@ -64,25 +64,39 @@ export class CreditAccountData {
     prices: Record<string, number>,
     tokens: Record<string, TokenData>
   ): Array<Balance> {
-    const priceCalc = (addr: string, amount: BigNumber) =>
-      amount
-        .mul(Math.floor(1000 * prices[addr.toLowerCase() || ""] || 0))
-        .div(BigNumber.from(10).pow(tokens[addr]?.decimals || 18));
-
-    const tokensAbcComparator = (t1?: TokenData, t2?: TokenData) =>
-      (t1?.symbol || "") > (t2?.symbol || "") ? 1 : -1;
-
-    return tokens
-      ? Object.entries(this.balances || [])
-          .sort(([addr1, amount1], [addr2, amount2]) => {
-            return priceCalc(addr1, amount1).eq(priceCalc(addr2, amount2))
-              ? tokensAbcComparator(tokens[addr1], tokens[addr2])
-              : priceCalc(addr1, amount1).gt(priceCalc(addr2, amount2))
-              ? -1
-              : 1;
-          })
-          .map(([address, balance]) => ({ address, balance }))
-      : [];
+    const priceCalc = (addr: string, amount: BigNumber) => {
+      const price = prices[addr] || 0;
+      const { decimals = 18 } = tokens[addr] || {};
+
+      return amount
+        .mul(Math.floor(1000 * price))
+        .div(BigNumber.from(10).pow(decimals));
+    };
+
+    const tokensAbcComparator = (t1?: TokenData, t2?: TokenData) => {
+      const { symbol: symbol1 = "" } = t1 || {};
+      const { symbol: symbol2 = "" } = t2 || {};
+
+      return symbol1 > symbol2 ? 1 : -1;
+    };
+
+    const safeBalances = this.balances || [];
+
+    return Object.entries(safeBalances)
+      .sort(([addr1, amount1], [addr2, amount2]) => {
+        const addr1Lc = addr1.toLowerCase();
+        const addr2Lc = addr2.toLowerCase();
+
+        const price1 = priceCalc(addr1Lc, amount1);
+        const price2 = priceCalc(addr2Lc, amount2);
+
+        return price1.eq(price2)
+          ? tokensAbcComparator(tokens[addr1Lc], tokens[addr2Lc])
+          : price1.gt(price2)
+          ? -1
+          : 1;
+      })
+      .map(([address, balance]) => ({ address, balance }));
   }
 }
 

package/src/core/events.ts

@@ -145,7 +145,8 @@ export class EventAddLiquidity extends EVMEvent {
   }
 
   toString(tokenData: Record<string, TokenData>): string {
-    const { decimals = 18, symbol } = tokenData[this.underlyingToken] || {};
+    const { decimals = 18, symbol } =
+      tokenData[this.underlyingToken.toLowerCase()] || {};
 
     return `Pool ${getContractName(this.pool)}: Deposit ${formatBN(
       this.amount,
@@ -179,7 +180,8 @@ export class EventRemoveLiquidity extends EVMEvent {
   }
 
   toString(tokenData: Record<string, TokenData>): string {
-    const { decimals = 18, symbol } = tokenData[this.dieselToken] || {};
+    const { decimals = 18, symbol } =
+      tokenData[this.dieselToken.toLowerCase()] || {};
 
     return `Pool ${getContractName(this.pool)}: withdraw ${formatBN(
       this.amount,
@@ -215,7 +217,8 @@ export class EventOpenCreditAccount extends EVMEvent {
   }
 
   toString(tokenData: Record<string, TokenData>): string {
-    const { decimals = 18, symbol } = tokenData[this.underlyingToken] || {};
+    const { decimals = 18, symbol } =
+      tokenData[this.underlyingToken.toLowerCase()] || {};
 
     return `Credit account ${getContractName(
       this.creditManager
@@ -254,7 +257,8 @@ export class EventCloseCreditAccount extends EVMEvent {
   }
 
   toString(tokenData: Record<string, TokenData>): string {
-    const { decimals = 18, symbol } = tokenData[this.underlyingToken] || {};
+    const { decimals = 18, symbol } =
+      tokenData[this.underlyingToken.toLowerCase()] || {};
 
     return `Credit account ${getContractName(
       this.creditManager
@@ -287,7 +291,8 @@ export class EventLiquidateCreditAccount extends EVMEvent {
   }
 
   toString(tokenData: Record<string, TokenData>): string {
-    const { decimals = 18, symbol } = tokenData[this.underlyingToken] || {};
+    const { decimals = 18, symbol } =
+      tokenData[this.underlyingToken.toLowerCase()] || {};
 
     return `Credit account ${getContractName(
       this.creditManager
@@ -316,7 +321,7 @@ export class EventRepayCreditAccount extends EVMEvent {
     this.creditManager = opts.creditManager;
   }
 
-  toString(_tokenData: Record<string, TokenData>): string {
+  toString(_: Record<string, TokenData>): string {
     return `Credit account ${getContractName(this.creditManager)}: was repaid`;
   }
 }
@@ -344,7 +349,8 @@ export class EventAddCollateral extends EVMEvent {
   }
 
   toString(tokenData: Record<string, TokenData>): string {
-    const { decimals = 18, symbol } = tokenData[this.addedToken] || {};
+    const { decimals = 18, symbol } =
+      tokenData[this.addedToken.toLowerCase()] || {};
 
     return `Credit account ${getContractName(
       this.creditManager
@@ -374,7 +380,8 @@ export class EventIncreaseBorrowAmount extends EVMEvent {
   }
 
   toString(tokenData: Record<string, TokenData>): string {
-    const { decimals = 18, symbol } = tokenData[this.underlyingToken] || {};
+    const { decimals = 18, symbol } =
+      tokenData[this.underlyingToken.toLowerCase()] || {};
 
     return `Credit account ${getContractName(
       this.creditManager
@@ -451,7 +458,7 @@ export class EventCMNewParameters extends EVMEvent {
   }
 
   toString(tokenData: Record<string, TokenData>): string {
-    const token = tokenData[this.underlyingToken];
+    const token = tokenData[this.underlyingToken.toLowerCase()];
     let msg = `Credit manager ${getContractName(this.creditManager)} updated: `;
 
     if (this.minAmount !== this.prevMinAmount) {
@@ -529,7 +536,7 @@ export class EventTokenAllowed extends EVMEvent {
   }
 
   toString(tokenData: Record<string, TokenData>): string {
-    const token = tokenData[this.token];
+    const token = tokenData[this.token.toLowerCase()];
     let msg = `Credit manager ${getContractName(this.creditManager)} updated `;
     switch (this.status) {
       case "NewToken":
@@ -573,7 +580,7 @@ export class EventTokenForbidden extends EVMEvent {
   }
 
   toString(tokenData: Record<string, TokenData>): string {
-    const token = tokenData[this.token];
+    const token = tokenData[this.token.toLowerCase()];
     return `Credit manager ${getContractName(this.creditManager)} updated ${
       token.symbol
     } forbidden`;
@@ -894,7 +901,8 @@ export class EventNewExpectedLiquidityLimit extends EVMEvent {
   }
 
   toString(tokenData: Record<string, TokenData>): string {
-    const { decimals = 18, symbol } = tokenData[this.underlyingToken] || {};
+    const { decimals = 18, symbol } =
+      tokenData[this.underlyingToken.toLowerCase()] || {};
 
     return this.prevLimit.isZero()
       ? `Pool ${getContractName(
@@ -942,7 +950,7 @@ export class EventNewWithdrawFee extends EVMEvent {
     this.prevFee = Number(opts.oldFee);
   }
 
-  toString(_tokenData: Record<string, TokenData>): string {
+  toString(_: Record<string, TokenData>): string {
     return this.prevFee === 0
       ? `Pool ${getContractName(this.pool)} updated: withdraw fee was set to: ${
           this.newFee / 100
@@ -975,7 +983,7 @@ export class EventNewPriceFeed extends EVMEvent {
   }
 
   toString(tokenData: Record<string, TokenData>): string {
-    const { symbol } = tokenData[this.token] || {};
+    const { symbol } = tokenData[this.token.toLowerCase()] || {};
 
     return `PriceOracle: oracle for ${symbol} was updated to ${getContractName(
       this.priceFeed
@@ -1005,7 +1013,7 @@ export class EventTakeForever extends EVMEvent {
     this.to = opts.to;
   }
 
-  toString(_tokenData: Record<string, TokenData>): string {
+  toString(_: Record<string, TokenData>): string {
     return `AccountFactory: account ${this.creditAccount} was taken forever and transferred to ${this.to}`;
   }
 }
@@ -1027,7 +1035,7 @@ export class EventPaused extends EVMEvent {
     this.contract = opts.contract;
   }
 
-  toString(_tokenData: Record<string, TokenData>): string {
+  toString(_: Record<string, TokenData>): string {
     return `${getContractName(this.contract)} was paused`;
   }
 }
@@ -1047,7 +1055,7 @@ export class EventUnPaused extends EVMEvent {
     this.contract = opts.contract;
   }
 
-  toString(_tokenData: Record<string, TokenData>): string {
+  toString(_: Record<string, TokenData>): string {
     return `${getContractName(this.contract)} was unpaused`;
   }
 }
@@ -1070,7 +1078,7 @@ export class EventPausableAdminAdded extends EVMEvent {
     this.admin = opts.admin;
   }
 
-  toString(_tokenData: Record<string, TokenData>): string {
+  toString(_: Record<string, TokenData>): string {
     return `ACL: pausable admin ${this.admin} was added`;
   }
 }
@@ -1093,7 +1101,7 @@ export class EventPausableAdminRemoved extends EVMEvent {
     this.admin = opts.admin;
   }
 
-  toString(_tokenData: Record<string, TokenData>): string {
+  toString(_: Record<string, TokenData>): string {
     return `ACL: pausable admin ${this.admin} was removed`;
   }
 }
@@ -1116,7 +1124,7 @@ export class EventUnPausableAdminAdded extends EVMEvent {
     this.admin = opts.admin;
   }
 
-  toString(_tokenData: Record<string, TokenData>): string {
+  toString(_: Record<string, TokenData>): string {
     return `ACL: unpausable admin ${this.admin} was added`;
   }
 }
@@ -1139,7 +1147,7 @@ export class EventUnPausableAdminRemoved extends EVMEvent {
     this.admin = opts.admin;
   }
 
-  toString(_tokenData: Record<string, TokenData>): string {
+  toString(_: Record<string, TokenData>): string {
     return `ACL: unpausable admin ${this.admin} was removed`;
   }
 }
@@ -1161,7 +1169,7 @@ export class EventTransferOwnership extends EVMEvent {
     this.newOwner = opts.admin;
   }
 
-  toString(_tokenData: Record<string, TokenData>): string {
+  toString(_: Record<string, TokenData>): string {
     return `ACL: configurator was changed to ${this.newOwner}`;
   }
 }

package/src/core/priceFeeds.ts

@@ -458,5 +458,71 @@ export const priceFeedsByNetwork: Record<SupportedToken, TokenPriceFeedData> = {
       type: OracleType.LIKE_CURVE_LP_ORACLE,
       curveSymbol: "gusd3CRV"
     }
+  },
+
+  //GEARBOX
+  dDAI: {
+    priceFeedETH: {
+      type: OracleType.CHAINLINK_ORACLE,
+      address: "",
+      kovan: ""
+    },
+    priceFeedUSD: {
+      type: OracleType.CHAINLINK_ORACLE,
+      address: "",
+      kovan: ""
+    }
+  },
+
+  dUSDC: {
+    priceFeedETH: {
+      type: OracleType.CHAINLINK_ORACLE,
+      address: "",
+      kovan: ""
+    },
+    priceFeedUSD: {
+      type: OracleType.CHAINLINK_ORACLE,
+      address: "",
+      kovan: ""
+    }
+  },
+
+  dWBTC: {
+    priceFeedETH: {
+      type: OracleType.CHAINLINK_ORACLE,
+      address: "",
+      kovan: ""
+    },
+    priceFeedUSD: {
+      type: OracleType.CHAINLINK_ORACLE,
+      address: "",
+      kovan: ""
+    }
+  },
+
+  dWETH: {
+    priceFeedETH: {
+      type: OracleType.CHAINLINK_ORACLE,
+      address: "",
+      kovan: ""
+    },
+    priceFeedUSD: {
+      type: OracleType.CHAINLINK_ORACLE,
+      address: "",
+      kovan: ""
+    }
+  },
+
+  GEAR: {
+    priceFeedETH: {
+      type: OracleType.CHAINLINK_ORACLE,
+      address: "",
+      kovan: ""
+    },
+    priceFeedUSD: {
+      type: OracleType.CHAINLINK_ORACLE,
+      address: "",
+      kovan: ""
+    }
   }
 };