@gearbox-protocol/sdk 0.0.52 → 0.0.55

package/src/core/tradeTypes.ts

@@ -22,9 +22,12 @@ export enum TradeType {
   YearnDeposit,
   YearnWithdraw,
   LidoStake,
-  ConvexDeposit,
+  ConvexDepositLP,
   ConvexStake,
-  ConvexDepositAndStake
+  ConvexDepositLPAndStake,
+  ConvexWithdrawLP,
+  ConvexWithdraw,
+  ConvexWithdrawAndUnwrap
 }
 
 export type TradeAction =
@@ -67,8 +70,8 @@ export type TradeAction =
       tokenOut: NormalToken;
     }
   | {
-      type: TradeType.ConvexDeposit;
-      contract: ConvexPoolContract;
+      type: TradeType.ConvexDepositLP;
+      contract: "CONVEX_BOOSTER";
       tokenOut: ConvexLPToken;
     }
   | {
@@ -77,7 +80,22 @@ export type TradeAction =
       tokenOut: ConvexStakedPhantomToken;
     }
   | {
-      type: TradeType.ConvexDepositAndStake;
-      contract: ConvexPoolContract;
+      type: TradeType.ConvexDepositLPAndStake;
+      contract: "CONVEX_BOOSTER";
       tokenOut: ConvexStakedPhantomToken;
+    }
+  | {
+      type: TradeType.ConvexWithdrawLP;
+      contract: "CONVEX_BOOSTER";
+      tokenOut: CurveLPToken;
+    }
+  | {
+      type: TradeType.ConvexWithdraw;
+      contract: ConvexPoolContract;
+      tokenOut: ConvexLPToken;
+    }
+  | {
+      type: TradeType.ConvexWithdrawAndUnwrap;
+      contract: ConvexPoolContract;
+      tokenOut: CurveLPToken;
     };

package/src/core/transactions.ts

@@ -77,7 +77,7 @@ export class TxAddLiquidity extends EVMTx {
   }
 
   toString(tokenData: Record<string, TokenData>): string {
-    const token = tokenData[this.underlyingToken];
+    const token = tokenData[this.underlyingToken.toLowerCase()];
     return `${getContractName(this.pool)}: Deposit ${formatBN(
       this.amount,
       token?.decimals || 18
@@ -115,7 +115,7 @@ export class TxRemoveLiquidity extends EVMTx {
   }
 
   toString(tokenData: Record<string, TokenData>): string {
-    const dtoken = tokenData[this.dieselToken];
+    const dtoken = tokenData[this.dieselToken.toLowerCase()];
     return `${getContractName(this.pool)}: Withdraw ${formatBN(
       this.amount,
       dtoken?.decimals || 18
@@ -165,11 +165,11 @@ export class TXSwap extends EVMTx {
   }
 
   toString(tokenData: Record<string, TokenData>): string {
-    const tokenFrom = tokenData[this.tokenFrom];
+    const tokenFrom = tokenData[this.tokenFrom.toLowerCase()];
 
     let toPart = "";
     if (this.tokenTo && this.amountTo) {
-      const tokenTo = tokenData[this.tokenTo];
+      const tokenTo = tokenData[this.tokenTo.toLowerCase()];
       toPart = ` ⇒  ${formatBN(this.amountTo, tokenTo?.decimals || 18)} ${
         tokenTo?.symbol || ""
       }`;
@@ -213,7 +213,7 @@ export class TxAddCollateral extends EVMTx {
   }
 
   toString(tokenData: Record<string, TokenData>): string {
-    const addedToken = tokenData[this.addedToken];
+    const addedToken = tokenData[this.addedToken.toLowerCase()];
     return `Credit account ${getContractName(
       this.creditManager
     )}: Added ${formatBN(this.amount, addedToken.decimals)} ${
@@ -252,7 +252,7 @@ export class TxIncreaseBorrowAmount extends EVMTx {
   }
 
   toString(tokenData: Record<string, TokenData>): string {
-    const token = tokenData[this.underlyingToken];
+    const token = tokenData[this.underlyingToken.toLowerCase()];
     return `Credit account ${getContractName(
       this.creditManager
     )}: Borrowed amount was increased for ${formatBN(
@@ -295,7 +295,7 @@ export class TxOpenAccount extends EVMTx {
   }
 
   toString(tokenData: Record<string, TokenData>): string {
-    const token = tokenData[this.underlyingToken];
+    const token = tokenData[this.underlyingToken.toLowerCase()];
     return `Credit account ${getContractName(
       this.creditManager
     )}: opening ${formatBN(this.amount, token?.decimals || 18)} ${
@@ -333,7 +333,7 @@ export class TxRepayAccount extends EVMTx {
     this.creditManager = opts.creditManager;
   }
 
-  toString(_tokenData: Record<string, TokenData>): string {
+  toString(_: Record<string, TokenData>): string {
     return `Credit account ${getContractName(
       this.creditManager
     )}: Repaying account`;
@@ -363,7 +363,7 @@ export class TxCloseAccount extends EVMTx {
     this.creditManager = opts.creditManager;
   }
 
-  toString(_tokenData: Record<string, TokenData>): string {
+  toString(_: Record<string, TokenData>): string {
     return `Credit account ${getContractName(
       this.creditManager
     )}: Closing account`;
@@ -394,7 +394,7 @@ export class TxApprove extends EVMTx {
   }
 
   toString(tokenData: Record<string, TokenData>): string {
-    const token = tokenData[this.token];
+    const token = tokenData[this.token.toLowerCase()];
     return `Approve ${token?.symbol}`;
   }
 

package/src/index.ts

@@ -6,6 +6,7 @@ export * from "./core/contracts";
 export * from "./core/events";
 export * from "./core/errors";
 export * from "./core/pool";
+export * from "./core/protocols";
 export * from "./core/priceFeeds";
 export * from "./core/operations";
 export * from "./core/oracles";
@@ -43,3 +44,4 @@ export { MultiCallContract } from "./utils/multicall";
 export { callRepeater } from "./utils/repeater";
 export { getContractName } from "./core/contractsRegister";
 export { AdapterInterface } from "./core/adapters";
+export { objectEntries, swapKeyValue, keyToLowercase } from "./utils/mappers";

package/src/utils/mappers.ts

@@ -0,0 +1,23 @@
+type SupportedValue = string | number;
+
+const objectEntries = <K extends SupportedValue, T>(
+  o: Record<K, T>
+): Array<[K, T]> => Object.entries(o) as Array<[K, T]>;
+
+const swapKeyValue = <K extends SupportedValue, T extends SupportedValue>(
+  o: Record<K, T>
+): Record<T, K> =>
+  objectEntries(o).reduce((sum, [key, value]) => {
+    return { ...sum, [value]: key };
+  }, {} as Record<T, K>);
+
+const keyToLowercase = <K extends SupportedValue, T extends SupportedValue>(
+  o: Record<K, T>
+): Record<K, T> =>
+  objectEntries(o).reduce((sum, [key, value]) => {
+    const keyTransformed = typeof key === "string" ? key.toLowerCase() : key;
+    return { ...sum, [keyTransformed]: value };
+  }, {} as Record<K, T>);
+
+export type { SupportedValue };
+export { objectEntries, swapKeyValue, keyToLowercase };