npm - @gearbox-protocol/sdk - Versions diffs - 1.23.2 → 1.24.0 - Mend

@gearbox-protocol/sdk 1.23.2 → 1.24.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1177) hide show

package/lib/{core → src/core}/chains.d.ts RENAMED Viewed

@@ -9,15 +9,15 @@ export declare const HARDHAT_NETWORK = 31337;
 export declare const ARBITRUM_NETWORK = 42161;
 export declare const CHAINS: {
     readonly Mainnet: 1;
-    readonly Goerli: 5;
+    readonly Arbitrum: 42161;
     readonly Local: 1337;
     readonly Hardhat: 31337;
     readonly Tenderly: 123456;
     readonly Optimism: 10;
     readonly Polygon: 137;
-    readonly Arbiturum: 42161;
 };
-export type NetworkType = "Mainnet" | "Goerli";
+export declare const supportedChains: readonly ["Mainnet", "Arbitrum"];
+export type NetworkType = typeof supportedChains[number];
 export declare const getNetworkType: (chainId: number, localAs?: NetworkType) => NetworkType;
 export declare const isSupportedNetwork: (chainId: number | undefined) => chainId is number;
 export declare function detectNetwork(provider: ethers.providers.Provider): Promise<NetworkType>;

package/lib/{core → src/core}/chains.js RENAMED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.detectNetwork = exports.isSupportedNetwork = exports.getNetworkType = exports.CHAINS = exports.ARBITRUM_NETWORK = exports.HARDHAT_NETWORK = exports.TENDERLY_NETWORK = exports.LOCAL_NETWORK = exports.POLYGON_NETWORK = exports.OPTIMISM_NETWORK = exports.GOERLI_NETWORK = exports.MAINNET_NETWORK = void 0;
+exports.detectNetwork = exports.isSupportedNetwork = exports.getNetworkType = exports.supportedChains = exports.CHAINS = exports.ARBITRUM_NETWORK = exports.HARDHAT_NETWORK = exports.TENDERLY_NETWORK = exports.LOCAL_NETWORK = exports.POLYGON_NETWORK = exports.OPTIMISM_NETWORK = exports.GOERLI_NETWORK = exports.MAINNET_NETWORK = void 0;
 const token_1 = require("../tokens/token");
 const types_1 = require("../types");
 const constants_1 = require("./constants");
@@ -14,17 +14,17 @@ exports.HARDHAT_NETWORK = 31337;
 exports.ARBITRUM_NETWORK = 42161;
 exports.CHAINS = {
     Mainnet: exports.MAINNET_NETWORK,
-    Goerli: exports.GOERLI_NETWORK,
+    Arbitrum: exports.ARBITRUM_NETWORK,
     Local: exports.LOCAL_NETWORK,
     Hardhat: exports.HARDHAT_NETWORK,
     Tenderly: exports.TENDERLY_NETWORK,
     Optimism: exports.OPTIMISM_NETWORK,
     Polygon: exports.POLYGON_NETWORK,
-    Arbiturum: exports.ARBITRUM_NETWORK,
 };
+exports.supportedChains = ["Mainnet", "Arbitrum"];
 const SUPPORTED_CHAINS = {
     [exports.CHAINS.Mainnet]: "Mainnet",
-    [exports.CHAINS.Goerli]: "Goerli",
+    [exports.CHAINS.Arbitrum]: "Arbitrum",
     [exports.CHAINS.Local]: "Mainnet",
     [exports.CHAINS.Tenderly]: "Mainnet",
     // [CHAINS.Optimism]: "Optimism",
@@ -51,9 +51,9 @@ async function detectNetwork(provider) {
     }
     catch {
         try {
-            const usdcMainnet = types_1.IERC20__factory.connect(token_1.tokenDataByNetwork.Goerli.USDC, provider);
+            const usdcMainnet = types_1.IERC20__factory.connect(token_1.tokenDataByNetwork.Arbitrum.USDC, provider);
             await usdcMainnet.balanceOf(constants_1.ADDRESS_0X0);
-            return "Goerli";
+            return "Arbitrum";
         }
         catch {
             throw new Error("Unsupported network");

package/lib/{core → src/core}/constants.d.ts RENAMED Viewed

@@ -18,3 +18,4 @@ export declare const DUMB_ADDRESS = "0xC4375B7De8af5a38a93548eb8453a498222C4fF2"
 export declare const DUMB_ADDRESS2 = "0x93548eB8453a498222C4FF2C4375b7De8af5A38a";
 export declare const DUMB_ADDRESS3 = "0x822293548EB8453A49c4fF2c4375B7DE8AF5a38A";
 export declare const DUMB_ADDRESS4 = "0x498222C4Ff2C4393548eb8453a75B7dE8AF5A38a";
+export declare const NOT_DEPLOYED = "NOT DEPLOYED";

package/lib/{core → src/core}/constants.js RENAMED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DUMB_ADDRESS4 = exports.DUMB_ADDRESS3 = exports.DUMB_ADDRESS2 = exports.DUMB_ADDRESS = exports.ADDRESS_0X0 = exports.SLIPPAGE_DECIMALS = exports.LEVERAGE_DECIMALS = exports.timeRanges = exports.PERCENTAGE_FACTOR = exports.PERCENTAGE_DECIMALS = exports.MS_PER_YEAR = exports.SECONDS_PER_YEAR = exports.PRICE_DECIMALS = exports.PRICE_DECIMALS_POW = exports.WAD = exports.WAD_DECIMALS_POW = exports.halfRAY = exports.RAY = exports.RAY_DECIMALS_POW = exports.MAX_INT = void 0;
+exports.NOT_DEPLOYED = exports.DUMB_ADDRESS4 = exports.DUMB_ADDRESS3 = exports.DUMB_ADDRESS2 = exports.DUMB_ADDRESS = exports.ADDRESS_0X0 = exports.SLIPPAGE_DECIMALS = exports.LEVERAGE_DECIMALS = exports.timeRanges = exports.PERCENTAGE_FACTOR = exports.PERCENTAGE_DECIMALS = exports.MS_PER_YEAR = exports.SECONDS_PER_YEAR = exports.PRICE_DECIMALS = exports.PRICE_DECIMALS_POW = exports.WAD = exports.WAD_DECIMALS_POW = exports.halfRAY = exports.RAY = exports.RAY_DECIMALS_POW = exports.MAX_INT = void 0;
 exports.MAX_INT = BigInt("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
 exports.RAY_DECIMALS_POW = 27;
 exports.RAY = 10n ** BigInt(exports.RAY_DECIMALS_POW);
@@ -28,3 +28,4 @@ exports.DUMB_ADDRESS = "0xC4375B7De8af5a38a93548eb8453a498222C4fF2";
 exports.DUMB_ADDRESS2 = "0x93548eB8453a498222C4FF2C4375b7De8af5A38a";
 exports.DUMB_ADDRESS3 = "0x822293548EB8453A49c4fF2c4375B7DE8AF5a38A";
 exports.DUMB_ADDRESS4 = "0x498222C4Ff2C4393548eb8453a75B7dE8AF5A38a";
+exports.NOT_DEPLOYED = "NOT DEPLOYED";

package/lib/{core → src/core}/rewardClaimer.d.ts RENAMED Viewed

@@ -12,6 +12,7 @@ export interface Rewards {
 }
 export interface AdapterWithType {
     contractAddress: string;
+    adapter: string;
     contract: SupportedContract;
 }
 export declare class RewardClaimer {

package/lib/{core → src/core}/rewardConvex.d.ts RENAMED Viewed

@@ -8,6 +8,7 @@ import { CreditAccountData } from "./creditAccount";
 import { CreditManagerData } from "./creditManager";
 import { AdapterWithType, Rewards } from "./rewardClaimer";
 export interface RewardDistribution {
+    adapter: string;
     contractAddress: string;
     contract: SupportedContract;
     token: SupportedToken;
@@ -21,6 +22,6 @@ export declare class RewardConvex {
     static findRewards(ca: CreditAccountData, cm: CreditManagerData, network: NetworkType, provider: providers.Provider): Promise<Array<Rewards>>;
     static findAdapters(cm: CreditManagerData): Array<AdapterWithType>;
     static prepareMultiCalls(creditAccount: string, cm: CreditManagerData, network: NetworkType): MCallPreparation;
-    static parseResults(creditAccount: string, rewards: Array<BigNumber>, distribution: Array<RewardDistribution>): Array<Rewards>;
+    static parseResults(rewards: Array<BigNumber>, distribution: Array<RewardDistribution>): Array<Rewards>;
 }
 export {};

package/lib/{core → src/core}/rewardConvex.js RENAMED Viewed

@@ -20,7 +20,7 @@ class RewardConvex {
         });
         const rewards = await (0, multicall_1.multicall)(mcalls, provider);
         const totalSupply = rewards.pop();
-        const results = RewardConvex.parseResults(ca.addr, rewards, distribution);
+        const results = RewardConvex.parseResults(rewards, distribution);
         results.forEach(r => {
             r.rewards.CVX = (0, apy_1.getCVXMintAmount)(r.rewards.CRV || 0n, (0, formatter_1.toBigInt)(totalSupply));
         });
@@ -31,7 +31,8 @@ class RewardConvex {
             .filter(([_, params]) => params.type === adapters_1.AdapterInterface.CONVEX_V1_BASE_REWARD_POOL)
             .map(([contract]) => contract);
         return Object.entries(cm.adapters)
-            .map(([contract]) => ({
+            .map(([contract, adapter]) => ({
+            adapter,
             contractAddress: contract,
             contract: contracts_1.contractsByAddress[contract.toLowerCase()],
         }))
@@ -50,6 +51,7 @@ class RewardConvex {
             });
             distribution.push({
                 contractAddress: a.contractAddress,
+                adapter: a.adapter,
                 contract: a.contract,
                 token: "CRV",
             });
@@ -63,6 +65,7 @@ class RewardConvex {
                 });
                 distribution.push({
                     contractAddress: a.contractAddress,
+                    adapter: a.adapter,
                     contract: a.contract,
                     token: er.rewardToken,
                 });
@@ -73,11 +76,11 @@ class RewardConvex {
             distribution,
         };
     }
-    static parseResults(creditAccount, rewards, distribution) {
+    static parseResults(rewards, distribution) {
         const result = {};
-        const callData = RewardConvex.poolInterface.encodeFunctionData("getReward(address,bool)", [creditAccount, true]);
+        const callData = RewardConvex.poolInterface.encodeFunctionData("getReward()");
         for (let i = 0; i < rewards.length; i++) {
-            const { contract, contractAddress, token } = distribution[i];
+            const { contract, adapter, token } = distribution[i];
             const reward = rewards[i];
             if (!reward.isZero()) {
                 if (!result[contract]) {
@@ -86,7 +89,7 @@ class RewardConvex {
                         rewards: {},
                         calls: [
                             {
-                                target: contractAddress,
+                                target: adapter,
                                 callData,
                             },
                         ],

package/lib/{core → src/core}/rewardConvex.spec.js RENAMED Viewed

@@ -15,18 +15,20 @@ describe("RewardConvex test", () => {
             adapters: {
                 [contracts_1.contractsByNetwork.Mainnet.CONVEX_3CRV_POOL]: ADAPTER_CONVEX_3CRV_POOL,
                 [contracts_1.contractsByNetwork.Mainnet.CURVE_FRAX_POOL]: ADAPTER_CURVE_FRAX_POOL,
-                [contracts_1.contractsByNetwork.Goerli.CONVEX_FRAX3CRV_POOL]: ADAPTER_CONVEX_FRAX3CRV_POOL,
+                [contracts_1.contractsByNetwork.Arbitrum.CONVEX_FRAX3CRV_POOL]: ADAPTER_CONVEX_FRAX3CRV_POOL,
             },
         };
         const expectedResult = [
             {
                 contract: "CONVEX_3CRV_POOL",
                 contractAddress: contracts_1.contractsByNetwork.Mainnet.CONVEX_3CRV_POOL,
+                adapter: ADAPTER_CONVEX_3CRV_POOL,
             },
-            {
-                contract: "CONVEX_FRAX3CRV_POOL",
-                contractAddress: contracts_1.contractsByNetwork.Goerli.CONVEX_FRAX3CRV_POOL,
-            },
+            // {
+            //   contract: "CONVEX_FRAX3CRV_POOL",
+            //   contractAddress: contractsByNetwork.Goerli.CONVEX_FRAX3CRV_POOL,
+            //   adapter: ADAPTER_CONVEX_FRAX3CRV_POOL,
+            // },
         ];
         const result = rewardConvex_1.RewardConvex.findAdapters(cm);
         (0, chai_1.expect)(result).to.be.eql(expectedResult);
@@ -36,7 +38,7 @@ describe("RewardConvex test", () => {
             adapters: {
                 [contracts_1.contractsByNetwork.Mainnet.CONVEX_3CRV_POOL]: ADAPTER_CONVEX_3CRV_POOL,
                 [contracts_1.contractsByNetwork.Mainnet.CURVE_FRAX_POOL]: ADAPTER_CURVE_FRAX_POOL,
-                [contracts_1.contractsByNetwork.Goerli.CONVEX_FRAX3CRV_POOL]: ADAPTER_CONVEX_FRAX3CRV_POOL,
+                [contracts_1.contractsByNetwork.Arbitrum.CONVEX_FRAX3CRV_POOL]: ADAPTER_CONVEX_FRAX3CRV_POOL,
             },
         };
         const calls = [
@@ -46,12 +48,12 @@ describe("RewardConvex test", () => {
                 method: "earned(address)",
                 params: [CREDIT_ACCOUNT],
             },
-            {
-                address: contracts_1.contractsByNetwork.Goerli.CONVEX_FRAX3CRV_POOL,
-                interface: rewardConvex_1.RewardConvex.poolInterface,
-                method: "earned(address)",
-                params: [CREDIT_ACCOUNT],
-            },
+            // {
+            //   address: contractsByNetwork.Goerli.CONVEX_FRAX3CRV_POOL,
+            //   interface: RewardConvex.poolInterface,
+            //   method: "earned(address)",
+            //   params: [CREDIT_ACCOUNT],
+            // },
             {
                 address: contracts_1.contractParams.CONVEX_FRAX3CRV_POOL
                     .extraRewards[0].poolAddress.Mainnet,
@@ -62,20 +64,23 @@ describe("RewardConvex test", () => {
         ];
         const distribution = [
             {
+                adapter: ADAPTER_CONVEX_3CRV_POOL,
                 contractAddress: contracts_1.contractsByNetwork.Mainnet.CONVEX_3CRV_POOL,
                 contract: "CONVEX_3CRV_POOL",
                 token: "CRV",
             },
-            {
-                contractAddress: contracts_1.contractsByNetwork.Goerli.CONVEX_FRAX3CRV_POOL,
-                contract: "CONVEX_FRAX3CRV_POOL",
-                token: "CRV",
-            },
-            {
-                contractAddress: contracts_1.contractsByNetwork.Goerli.CONVEX_FRAX3CRV_POOL,
-                contract: "CONVEX_FRAX3CRV_POOL",
-                token: "FXS",
-            },
+            // {
+            //   adapter: ADAPTER_CONVEX_FRAX3CRV_POOL,
+            //   contractAddress: contractsByNetwork.Goerli.CONVEX_FRAX3CRV_POOL,
+            //   contract: "CONVEX_FRAX3CRV_POOL",
+            //   token: "CRV",
+            // },
+            // {
+            //   adapter: ADAPTER_CONVEX_FRAX3CRV_POOL,
+            //   contractAddress: contractsByNetwork.Goerli.CONVEX_FRAX3CRV_POOL,
+            //   contract: "CONVEX_FRAX3CRV_POOL",
+            //   token: "FXS",
+            // },
         ];
         const result = rewardConvex_1.RewardConvex.prepareMultiCalls(CREDIT_ACCOUNT, cm, "Mainnet");
         (0, chai_1.expect)(result).to.be.eql({ calls, distribution });
@@ -88,23 +93,26 @@ describe("RewardConvex test", () => {
         ];
         const distribution = [
             {
+                adapter: ADAPTER_CONVEX_3CRV_POOL,
                 contractAddress: contracts_1.contractsByNetwork.Mainnet.CONVEX_3CRV_POOL,
                 contract: "CONVEX_3CRV_POOL",
                 token: "CRV",
             },
-            {
-                contractAddress: contracts_1.contractsByNetwork.Goerli.CONVEX_FRAX3CRV_POOL,
-                contract: "CONVEX_FRAX3CRV_POOL",
-                token: "CRV",
-            },
-            {
-                contractAddress: contracts_1.contractsByNetwork.Goerli.CONVEX_FRAX3CRV_POOL,
-                contract: "CONVEX_FRAX3CRV_POOL",
-                token: "FXS",
-            },
+            // {
+            //   adapter: ADAPTER_CONVEX_FRAX3CRV_POOL,
+            //   contractAddress: contractsByNetwork.Goerli.CONVEX_FRAX3CRV_POOL,
+            //   contract: "CONVEX_FRAX3CRV_POOL",
+            //   token: "CRV",
+            // },
+            // {
+            //   adapter: ADAPTER_CONVEX_FRAX3CRV_POOL,
+            //   contractAddress: contractsByNetwork.Goerli.CONVEX_FRAX3CRV_POOL,
+            //   contract: "CONVEX_FRAX3CRV_POOL",
+            //   token: "FXS",
+            // },
         ];
-        const parsed = rewardConvex_1.RewardConvex.parseResults(CREDIT_ACCOUNT, rewards, distribution);
-        const callData = rewardConvex_1.RewardConvex.poolInterface.encodeFunctionData("getReward(address,bool)", [CREDIT_ACCOUNT, true]);
+        const parsed = rewardConvex_1.RewardConvex.parseResults(rewards, distribution);
+        const callData = rewardConvex_1.RewardConvex.poolInterface.encodeFunctionData("getReward()");
         const expected = [
             {
                 contract: "CONVEX_3CRV_POOL",
@@ -113,7 +121,7 @@ describe("RewardConvex test", () => {
                 },
                 calls: [
                     {
-                        target: contracts_1.contractsByNetwork.Mainnet.CONVEX_3CRV_POOL,
+                        target: ADAPTER_CONVEX_3CRV_POOL,
                         callData,
                     },
                 ],
@@ -126,7 +134,7 @@ describe("RewardConvex test", () => {
                 },
                 calls: [
                     {
-                        target: contracts_1.contractsByNetwork.Goerli.CONVEX_FRAX3CRV_POOL,
+                        target: ADAPTER_CONVEX_FRAX3CRV_POOL,
                         callData,
                     },
                 ],