@gearbox-protocol/sdk 2.1.31 → 2.1.33

package/lib/tokens/balancer.d.ts

@@ -2,7 +2,7 @@ import { TradeType } from "../pathfinder/tradeTypes";
 import { NormalToken } from "./normal";
 import type { TokenBase } from "./token";
 import { TokenType } from "./tokenType";
-export type BalancerLPToken = "50OHM_50DAI" | "50OHM_50WETH" | "OHM_wstETH" | "USDC-DAI-USDT";
+export type BalancerLPToken = "50OHM_50DAI" | "50OHM_50WETH" | "OHM_wstETH" | "USDC_DAI_USDT";
 export type BalancerLpTokenData = {
     symbol: BalancerLPToken;
     type: TokenType.BALANCER_LP_TOKEN;

package/lib/tokens/balancer.js

@@ -46,9 +46,9 @@ exports.balancerLpTokens = {
             },
         ],
     },
-    "USDC-DAI-USDT": {
-        name: "Balancer USDC-DAI-USDT",
-        symbol: "USDC-DAI-USDT",
+    USDC_DAI_USDT: {
+        name: "Balancer USDC_DAI_USDT",
+        symbol: "USDC_DAI_USDT",
         type: tokenType_1.TokenType.BALANCER_LP_TOKEN,
         underlying: ["USDC", "DAI", "USDT"],
         poolId: "0x79c58f70905f734641735bc61e45c19dd9ad60bc0000000000000000000004e7",

package/lib/tokens/decimals.js

@@ -97,7 +97,7 @@ exports.decimals = {
     "50OHM_50DAI": 18,
     "50OHM_50WETH": 18,
     OHM_wstETH: 18,
-    "USDC-DAI-USDT": 18,
+    USDC_DAI_USDT: 18,
     aDAI: 18,
     aUSDC: 6,
     aUSDT: 6,

package/lib/tokens/token.js

@@ -125,7 +125,7 @@ exports.tokenDataByNetwork = {
         "50OHM_50DAI": "0x76FCf0e8C7Ff37A47a799FA2cd4c13cDe0D981C9",
         "50OHM_50WETH": "0xD1eC5e215E8148D76F4460e4097FD3d5ae0A3558",
         OHM_wstETH: "0xd4f79CA0Ac83192693bce4699d0c10C66Aa6Cf0F",
-        "USDC-DAI-USDT": "0x79c58f70905f734641735bc61e45c19dd9ad60bc",
+        USDC_DAI_USDT: "0x79c58f70905F734641735BC61e45c19dD9Ad60bC",
         // GEARBOX
         dDAI: "0x6CFaF95457d7688022FC53e7AbE052ef8DFBbdBA",
         dUSDC: "0xc411dB5f5Eb3f7d552F9B8454B2D74097ccdE6E3",
@@ -251,7 +251,7 @@ exports.tokenDataByNetwork = {
         "50OHM_50DAI": constants_1.NOT_DEPLOYED,
         "50OHM_50WETH": "0x89dc7e71e362faF88D92288fE2311D25c6a1B5E0",
         OHM_wstETH: constants_1.NOT_DEPLOYED,
-        "USDC-DAI-USDT": constants_1.NOT_DEPLOYED,
+        USDC_DAI_USDT: constants_1.NOT_DEPLOYED,
         // GEARBOX
         dDAI: constants_1.NOT_DEPLOYED,
         dUSDC: constants_1.NOT_DEPLOYED,

package/lib/tokens/tokens.spec.js

@@ -7,6 +7,21 @@ const types_1 = require("../types");
 const multicall_1 = require("../utils/multicall");
 const token_1 = require("./token");
 const erc20 = types_1.IERC20Metadata__factory.createInterface();
+// Some contracts return something other than string for symbol
+const NON_ERC20_SYMBOLS = {
+    [token_1.tokenDataByNetwork.Mainnet.MKR]: {
+        interface: new ethers_1.ethers.utils.Interface([
+            "function symbol() view returns (bytes32)",
+        ]),
+        // convert bytes32 to string
+        stringifySymbol: (result) => ethers_1.ethers.utils
+            .toUtf8String(ethers_1.ethers.utils.arrayify(result))
+            .replaceAll(String.fromCharCode(0), ""), // trim tail of zeroes
+    },
+};
+function identity(value) {
+    return value;
+}
 const EXCEPTIONS_IN_SYMBOLS = {
     Mainnet: {
         // Our Symbol <-> On-chain Symbol
@@ -38,7 +53,7 @@ class TokenSuite {
         const entries = Object.entries(token_1.tokenDataByNetwork[network]).filter(([_, addr]) => addr?.startsWith("0x"));
         this.calls = entries.map(([symbol, address]) => ({
             address,
-            interface: erc20,
+            interface: NON_ERC20_SYMBOLS[address]?.interface ?? erc20,
             method: "symbol()",
             key: symbol,
         }));
@@ -46,6 +61,7 @@ class TokenSuite {
     async fetchSymbols() {
         // even safe multicall fails when one of addresses is an EOA and not contract address
         if (this.network === "Arbitrum") {
+            // if (true) {
             for (const call of this.calls) {
                 const c = types_1.IERC20Metadata__factory.connect(call.address, this.provider);
                 try {
@@ -68,10 +84,15 @@ class TokenSuite {
             for (let i = 0; i < resps.length; i++) {
                 const call = this.calls[i];
                 const resp = resps[i];
+                // most symbols are ok, but some return non-string value for symbol.
+                // stringifySymbol makes sure that we get symbol as string
+                const stringifySymbol = NON_ERC20_SYMBOLS[call.address]?.stringifySymbol ?? identity;
                 this.responses[call.key] = {
                     address: call.address,
-                    symbol: resp.error ? undefined : this.sanitize(resp.value ?? ""),
-                    error: resp.error ? new Error("multicall error") : undefined,
+                    symbol: resp.error
+                        ? undefined
+                        : this.sanitize(stringifySymbol(resp.value ?? "")),
+                    error: resp.error,
                 };
             }
         }
@@ -84,7 +105,7 @@ class TokenSuite {
     assertSymbol(sdkSymbol) {
         const r = this.responses[sdkSymbol];
         if (r.error) {
-            throw new Error(`failed to verify ${sdkSymbol} on address ${r.address}: ${console.error}`);
+            throw new Error(`failed to verify ${sdkSymbol} on address ${r.address}: ${r.error}`);
         }
         const expectedSymbol = EXCEPTIONS_IN_SYMBOLS[this.network][r.address] ?? sdkSymbol;
         if (r.symbol !== expectedSymbol) {

package/lib/utils/multicall.d.ts

@@ -22,7 +22,7 @@ export declare function multicall<R extends Array<any>>(calls: Array<MCall<any>>
  * @returns
  */
 export declare function safeMulticall<V = any, T extends MCall<any> = MCall<any>>(calls: T[], p: Signer | ethers.providers.Provider, overrides?: CallOverrides): Promise<Array<{
-    error: boolean;
+    error?: Error;
     value?: V;
 }>>;
 export declare class MultiCallContract<T extends ethers.utils.Interface> {

package/lib/utils/multicall.js

@@ -30,12 +30,27 @@ async function safeMulticall(calls, p, overrides) {
         target: c.address,
         callData: c.interface.encodeFunctionData(c.method, c.params),
     })), overrides ?? {});
-    return resp.map((d, num) => ({
-        error: !d.success,
-        value: d.success
-            ? unwrapArray(calls[num].interface.decodeFunctionResult(calls[num].method, d.returnData))
-            : undefined,
-    }));
+    return resp.map((d, num) => {
+        let value;
+        let error;
+        if (d.success) {
+            try {
+                value = unwrapArray(calls[num].interface.decodeFunctionResult(calls[num].method, d.returnData));
+            }
+            catch (e) {
+                if (e instanceof Error) {
+                    error = e;
+                }
+                else {
+                    error = new Error(`${e}`);
+                }
+            }
+        }
+        else {
+            error = new Error("multicall call failed");
+        }
+        return { error, value };
+    });
 }
 exports.safeMulticall = safeMulticall;
 function unwrapArray(data) {

package/package.json

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