@defisaver/sdk 1.3.38-semi-continuous-dev → 1.3.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/sdk",
-  "version": "1.3.38-semi-continuous-dev",
+  "version": "1.3.39",
   "description": "",
   "main": "./umd/index.js",
   "module": "./esm/src/index.js",

package/src/actions/aaveV3/AaveV3SetEModeAction.ts

@@ -2,7 +2,7 @@ import { ActionWithL2 } from '../../ActionWithL2';
 import { getAddr } from '../../addresses';
 import { EthAddress, uint8 } from '../../types';
 /**
- * AaveV3SetEModeAction - Set EMode for the proxy AaveV3 position
+ * AaveV3SetEModeAction - Set EMode for an AaveV3 position
  *
  * @category AaveV3
  */
@@ -11,15 +11,22 @@ export class AaveV3SetEModeAction extends ActionWithL2 {
    * @param useOnDefaultMarket If this is true it defaults to the hardcoded market in contract
    * @param market Address provider for specific market
    * @param categoryId ID of the category emode
+   * @param onBehalf Address of the position owner, defaults to proxy
    */
-  constructor(useOnDefaultMarket: boolean, market: EthAddress, categoryId: uint8) {
+  constructor(
+    useOnDefaultMarket: boolean,
+    market: EthAddress,
+    categoryId: uint8,
+    onBehalf: EthAddress = getAddr('Empty'),
+  ) {
     super('AaveV3SetEMode', getAddr('AaveV3SetEMode'),
-      ['uint8', 'bool', 'address'],
-      [categoryId, useOnDefaultMarket, market],
+      ['uint8', 'bool', 'address', 'address'],
+      [categoryId, useOnDefaultMarket, market, onBehalf],
     );
 
     this.mappableArgs = [
       this.args[2],
+      this.args[3],
     ];
   }
 
@@ -34,6 +41,8 @@ export class AaveV3SetEModeAction extends ActionWithL2 {
       // market
       encodedInput = encodedInput.concat(this.addressToBytes20(this.args[2]));
     }
+    // onBehalf
+    encodedInput = encodedInput.concat(this.addressToBytes20(this.args[3]));
 
     return encodedInput;
   }

package/src/actions/flashloan/AaveV2FlashLoanAction.ts

@@ -1,16 +1,14 @@
-import { Action } from '../../Action';
+import { FLAction } from './FLAction';
 import { getAddr } from '../../addresses';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
+import { FLSource } from './FLSource';
 
 /**
  * Gets a flashloan from Aave v2
  *
  * @category Flashloans
  */
-export class AaveV2FlashLoanAction extends Action implements FlashLoanId {
-  public flashLoanId = 1;
-
+export class AaveV2FlashLoanAction extends FLAction {
   /**
    * @param loanAmounts
    * @param tokens
@@ -20,11 +18,9 @@ export class AaveV2FlashLoanAction extends Action implements FlashLoanId {
    * @param flParamGetterData
    */
   constructor(tokens: Array<EthAddress>, loanAmounts: Array<uint256>, modes: Array<uint256>, loanPayer: EthAddress, flParamGetterAddr: EthAddress = getAddr('Empty'), flParamGetterData: bytes = []) {
-    super(
-      'FLAaveV2',
-      getAddr('FLAaveV2'),
-      ['address[]', 'uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes'],
-      [tokens, loanAmounts, modes, loanPayer, flParamGetterAddr, flParamGetterData, []],
-    );
+    super({
+      flashLoanId: FLSource.AAVEV2,
+      args: [tokens, loanAmounts, modes, loanPayer, flParamGetterAddr, flParamGetterData, []],
+    });
   }
 }

package/src/actions/flashloan/AaveV3FlashLoanAction.ts

@@ -1,16 +1,14 @@
-import { ActionWithL2 } from '../../ActionWithL2';
+import { FLAction } from './FLAction';
 import { getAddr } from '../../addresses';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
+import { FLSource } from './FLSource';
 
 /**
  * Gets a flashloan from Aave v3 with fee enabled
  *
  * @category Flashloans
  */
-export class AaveV3FlashLoanAction extends ActionWithL2 implements FlashLoanId {
-  public flashLoanId = 5;
-
+export class AaveV3FlashLoanAction extends FLAction {
   /**
    * @param tokens
    * @param loanAmounts
@@ -20,11 +18,9 @@ export class AaveV3FlashLoanAction extends ActionWithL2 implements FlashLoanId {
    * @param flParamGetterData
    */
   constructor(tokens: Array<EthAddress>, loanAmounts: Array<uint256>, modes: Array<uint256>, loanPayer: EthAddress, flParamGetterAddr: EthAddress = getAddr('Empty'), flParamGetterData: bytes = []) {
-    super(
-      'FLAaveV3WithFee',
-      getAddr('FLAaveV3'),
-      ['address[]', 'uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes'],
-      [tokens, loanAmounts, modes, loanPayer, flParamGetterAddr, flParamGetterData, []],
-    );
+    super({
+      flashLoanId: FLSource.AAVEV3,
+      args: [tokens, loanAmounts, modes, loanPayer, flParamGetterAddr, flParamGetterData, []],
+    });
   }
 }

package/src/actions/flashloan/BalancerFlashLoanAction.ts

@@ -1,16 +1,14 @@
-import { Action } from '../../Action';
+import { FLAction } from './FLAction';
 import { getAddr } from '../../addresses';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
+import { FLSource } from './FLSource';
 
 /**
  * Gets a flashloan from Balancer
  *
  * @category Flashloans
  */
-export class BalancerFlashLoanAction extends Action implements FlashLoanId {
-  public flashLoanId = 2;
-
+export class BalancerFlashLoanAction extends FLAction {
   /**
    * @param tokens
    * @param amounts
@@ -18,11 +16,9 @@ export class BalancerFlashLoanAction extends Action implements FlashLoanId {
    * @param flParamGetterData
    */
   constructor(tokens: Array<EthAddress>, amounts: Array<uint256>, flParamGetterAddr: EthAddress = getAddr('Empty'), flParamGetterData: bytes = []) {
-    super(
-      'FLBalancer',
-      getAddr('FLBalancer'),
-      ['address[]', 'uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes'],
-      [tokens, amounts, [], getAddr('Empty'), flParamGetterAddr, flParamGetterData, []],
-    );
+    super({
+      flashLoanId: FLSource.BALANCER,
+      args: [tokens, amounts, [], getAddr('Empty'), flParamGetterAddr, flParamGetterData, []],
+    });
   }
 }

package/src/actions/flashloan/BalancerV3FlashLoanAction.ts

@@ -1,16 +1,14 @@
-import { Action } from '../../Action';
+import { FLAction } from './FLAction';
 import { getAddr } from '../../addresses';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
+import { FLSource } from './FLSource';
 
 /**
  * Gets a flashloan from BalancerV3
  *
  * @category Flashloans
  */
-export class BalancerV3FlashLoanAction extends Action implements FlashLoanId {
-  public flashLoanId = 10;
-
+export class BalancerV3FlashLoanAction extends FLAction {
   /**
    * @param tokens
    * @param loanAmounts
@@ -23,27 +21,9 @@ export class BalancerV3FlashLoanAction extends Action implements FlashLoanId {
     flParamGetterAddr: EthAddress = getAddr('Empty'),
     flParamGetterData: bytes = [],
   ) {
-    super(
-      'FLAction',
-      getAddr('FLAction'),
-      [
-        'address[]',
-        'uint256[]',
-        'uint256[]',
-        'address',
-        'address',
-        'bytes',
-        'bytes',
-      ],
-      [
-        tokens,
-        loanAmounts,
-        [],
-        getAddr('Empty'),
-        flParamGetterAddr,
-        flParamGetterData,
-        [],
-      ],
-    );
+    super({
+      flashLoanId: FLSource.BALANCER_V3,
+      args: [tokens, loanAmounts, [], getAddr('Empty'), flParamGetterAddr, flParamGetterData, []],
+    });
   }
 }

package/src/actions/flashloan/CurveUsdFlashLoanAction.ts

@@ -1,27 +1,23 @@
-import { Action } from '../../Action';
+import { FLAction } from './FLAction';
 import { getAddr } from '../../addresses';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
+import { FLSource } from './FLSource';
 
 /**
  * Gets a crvUSD flashloan from CurveUsd Flash Minter
  *
  * @category Flashloans
  */
-export class CurveUsdFlashLoanAction extends Action implements FlashLoanId {
-  public flashLoanId = 9;
-
+export class CurveUsdFlashLoanAction extends FLAction {
   /**
    * @param amount
    * @param flParamGetterAddr
    * @param flParamGetterData
    */
   constructor(amount: uint256, flParamGetterAddr: EthAddress = getAddr('Empty'), flParamGetterData: bytes = []) {
-    super(
-      'FLAction',
-      getAddr('FLAction'),
-      ['address[]', 'uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes'],
-      [[], [amount], [], getAddr('Empty'), flParamGetterAddr, flParamGetterData, []],
-    );
+    super({
+      flashLoanId: FLSource.CURVEUSD,
+      args: [[], [amount], [], getAddr('Empty'), flParamGetterAddr, flParamGetterData, []],
+    });
   }
 }

package/src/actions/flashloan/FLAction.ts

@@ -1,33 +1,21 @@
 import { Action } from '../../Action';
 import { getAddr } from '../../addresses';
 import { FlashLoanId } from './FlashLoanId';
-import { ActionWithL2 } from '../../ActionWithL2';
+import { FLSource, assertFlashLoanSourceSupported } from './FLSource';
 /**
- * Gets a specific FL action
+ * Executes a supported provider through the unified FLAction contract.
+ * The inner action's arguments and flashLoanId are used.
+ * Repay with FLPaybackAction or send tokens to FLAction.
  *
  * @category Flashloans
  */
-type SpecificFlashLoanAction = (Action & FlashLoanId) | (ActionWithL2 & FlashLoanId);
+type SpecificFlashLoanAction = FlashLoanId & Pick<Action, 'args'>;
 
-export class FLAction extends Action {
-  /**
-   * @param specificFLAction - FL Action to be used
-   */
-  #handleArgs(specificFLAction: SpecificFlashLoanAction) {
-    const argsToReturn = [
-      specificFLAction.args[0],
-      specificFLAction.args[1],
-      specificFLAction.args[2],
-      specificFLAction.args[3],
-      getAddr('Empty'),
-      [specificFLAction.flashLoanId],
-      specificFLAction.args[6],
-    ];
-
-    return argsToReturn;
-  }
+export class FLAction extends Action implements FlashLoanId {
+  public flashLoanId: FLSource;
 
   constructor(specificFLAction: SpecificFlashLoanAction) {
+    assertFlashLoanSourceSupported(specificFLAction?.flashLoanId);
     super(
       'FLAction',
       getAddr('FLAction'),
@@ -35,6 +23,15 @@ export class FLAction extends Action {
       [],
     );
     this.paramTypes = ['address[]', 'uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes'];
-    this.args = this.#handleArgs(specificFLAction);
+    this.flashLoanId = specificFLAction.flashLoanId;
+    this.args = [
+      specificFLAction.args[0],
+      specificFLAction.args[1],
+      specificFLAction.args[2],
+      specificFLAction.args[3],
+      getAddr('Empty'),
+      [this.flashLoanId],
+      specificFLAction.args[6],
+    ];
   }
 }

package/src/actions/flashloan/FLSource.ts

@@ -0,0 +1,44 @@
+import { CONFIG, NETWORKS } from '../../config';
+
+/** Must match the unified FLAction contract's FLSource enum. */
+export enum FLSource {
+  EMPTY,
+  AAVEV2,
+  BALANCER,
+  GHO,
+  MAKER,
+  AAVEV3,
+  UNIV3,
+  SPARK,
+  MORPHO_BLUE,
+  CURVEUSD,
+  BALANCER_V3,
+}
+
+/** Provider support in the current unified deployments. */
+export const supportedFlashLoanSources: Readonly<Record<number, readonly FLSource[]>> = {
+  [NETWORKS.ethereum.chainId]: [
+    FLSource.AAVEV2, FLSource.BALANCER, FLSource.GHO, FLSource.MAKER,
+    FLSource.AAVEV3, FLSource.UNIV3, FLSource.SPARK, FLSource.MORPHO_BLUE,
+    FLSource.CURVEUSD, FLSource.BALANCER_V3,
+  ],
+  [NETWORKS.arbitrum.chainId]: [
+    FLSource.BALANCER, FLSource.AAVEV3, FLSource.UNIV3, FLSource.MORPHO_BLUE, FLSource.BALANCER_V3,
+  ],
+  [NETWORKS.base.chainId]: [
+    FLSource.BALANCER, FLSource.AAVEV3, FLSource.UNIV3, FLSource.MORPHO_BLUE, FLSource.BALANCER_V3,
+  ],
+  [NETWORKS.optimism.chainId]: [
+    FLSource.BALANCER, FLSource.AAVEV3, FLSource.UNIV3, FLSource.BALANCER_V3,
+  ],
+  [NETWORKS.linea.chainId]: [FLSource.AAVEV3],
+  [NETWORKS.plasma.chainId]: [FLSource.AAVEV3, FLSource.BALANCER_V3],
+};
+
+export const isFlashLoanSourceSupported = (source: FLSource, chainId: number = CONFIG.chainId): boolean => supportedFlashLoanSources[chainId]?.includes(source) ?? false;
+
+export const assertFlashLoanSourceSupported = (source: FLSource, chainId: number = CONFIG.chainId): void => {
+  if (!isFlashLoanSourceSupported(source, chainId)) {
+    throw new Error(`Flashloan source ${FLSource[source] ?? String(source)} is not supported by FLAction on chainId: ${chainId}.`);
+  }
+};

package/src/actions/flashloan/FlashLoanId.ts

@@ -1,3 +1,5 @@
+import { FLSource } from './FLSource';
+
 export interface FlashLoanId {
-  flashLoanId: number;
+  flashLoanId: FLSource;
 }

package/src/actions/flashloan/GhoFlashLoanAction.ts

@@ -1,27 +1,23 @@
-import { Action } from '../../Action';
+import { FLAction } from './FLAction';
 import { getAddr } from '../../addresses';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
+import { FLSource } from './FLSource';
 
 /**
  * Gets a GHO flashloan from GHO Flash Minter
  *
  * @category Flashloans
  */
-export class GhoFlashLoanAction extends Action implements FlashLoanId {
-  public flashLoanId = 3;
-
+export class GhoFlashLoanAction extends FLAction {
   /**
    * @param amount
    * @param flParamGetterAddr
    * @param flParamGetterData
    */
   constructor(amount: uint256, flParamGetterAddr: EthAddress = getAddr('Empty'), flParamGetterData: bytes = []) {
-    super(
-      'FLGho',
-      getAddr('FLGho'),
-      ['address[]', 'uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes'],
-      [[], [amount], [], getAddr('Empty'), flParamGetterAddr, flParamGetterData, []],
-    );
+    super({
+      flashLoanId: FLSource.GHO,
+      args: [[], [amount], [], getAddr('Empty'), flParamGetterAddr, flParamGetterData, []],
+    });
   }
 }

package/src/actions/flashloan/MakerFlashLoanAction.ts

@@ -1,27 +1,23 @@
-import { Action } from '../../Action';
+import { FLAction } from './FLAction';
 import { getAddr } from '../../addresses';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
+import { FLSource } from './FLSource';
 
 /**
  * Gets a flashloan from Maker
  *
  * @category Flashloans
  */
-export class MakerFlashLoanAction extends Action implements FlashLoanId {
-  public flashLoanId = 4;
-
+export class MakerFlashLoanAction extends FLAction {
   /**
    * @param amount
    * @param flParamGetterAddr
    * @param flParamGetterData
    */
   constructor(amount: uint256, flParamGetterAddr: EthAddress = getAddr('Empty'), flParamGetterData: bytes = []) {
-    super(
-      'FLMaker',
-      getAddr('FLMaker'),
-      ['address[]', 'uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes'],
-      [[], [amount], [], getAddr('Empty'), flParamGetterAddr, flParamGetterData, []],
-    );
+    super({
+      flashLoanId: FLSource.MAKER,
+      args: [[], [amount], [], getAddr('Empty'), flParamGetterAddr, flParamGetterData, []],
+    });
   }
 }

package/src/actions/flashloan/MorphoBlueFlashLoanAction.ts

@@ -1,16 +1,14 @@
-import { Action } from '../../Action';
+import { FLAction } from './FLAction';
 import { getAddr } from '../../addresses';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
+import { FLSource } from './FLSource';
 
 /**
  * Gets a flashloan from MorphoBlue
  *
  * @category Flashloans
  */
-export class MorphoBlueFlashLoanAction extends Action implements FlashLoanId {
-  public flashLoanId = 8;
-
+export class MorphoBlueFlashLoanAction extends FLAction {
   /**
    * @param token
    * @param amount
@@ -18,11 +16,9 @@ export class MorphoBlueFlashLoanAction extends Action implements FlashLoanId {
    * @param flParamGetterData
    */
   constructor(token: EthAddress, amount: uint256, flParamGetterAddr: EthAddress = getAddr('Empty'), flParamGetterData: bytes = []) {
-    super(
-      'FLMorphoBlue',
-      getAddr('FLMorphoBlue'),
-      ['address[]', 'uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes'],
-      [[token], [amount], [], getAddr('Empty'), flParamGetterAddr, flParamGetterData, []],
-    );
+    super({
+      flashLoanId: FLSource.MORPHO_BLUE,
+      args: [[token], [amount], [], getAddr('Empty'), flParamGetterAddr, flParamGetterData, []],
+    });
   }
 }

package/src/actions/flashloan/SparkFlashLoanAction.ts

@@ -1,16 +1,14 @@
-import { ActionWithL2 } from '../../ActionWithL2';
+import { FLAction } from './FLAction';
 import { getAddr } from '../../addresses';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
+import { FLSource } from './FLSource';
 
 /**
  * Gets a flashloan from Spark with fee enabled
  *
  * @category Flashloans
  */
-export class SparkFlashLoanAction extends ActionWithL2 implements FlashLoanId {
-  public flashLoanId = 7;
-
+export class SparkFlashLoanAction extends FLAction {
   /**
    * @param tokens
    * @param loanAmounts
@@ -20,11 +18,9 @@ export class SparkFlashLoanAction extends ActionWithL2 implements FlashLoanId {
    * @param flParamGetterData
    */
   constructor(tokens: Array<EthAddress>, loanAmounts: Array<uint256>, modes: Array<uint256>, loanPayer: EthAddress, flParamGetterAddr: EthAddress = getAddr('Empty'), flParamGetterData: bytes = []) {
-    super(
-      'FLSpark',
-      getAddr('FLSpark'),
-      ['address[]', 'uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes'],
-      [tokens, loanAmounts, modes, loanPayer, flParamGetterAddr, flParamGetterData, []],
-    );
+    super({
+      flashLoanId: FLSource.SPARK,
+      args: [tokens, loanAmounts, modes, loanPayer, flParamGetterAddr, flParamGetterData, []],
+    });
   }
 }

package/src/actions/flashloan/UniV3FlashLoanAction.ts

@@ -1,16 +1,14 @@
-import { Action } from '../../Action';
+import { FLAction } from './FLAction';
 import { getAddr } from '../../addresses';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
+import { FLSource } from './FLSource';
 
 /**
  * Gets a flashloan from UniV3 pool
  *
  * @category Flashloans
  */
-export class UniV3FlashLoanAction extends Action implements FlashLoanId {
-  public flashLoanId = 6;
-
+export class UniV3FlashLoanAction extends FLAction {
   /**
    * @param token0
    * @param token1
@@ -21,11 +19,9 @@ export class UniV3FlashLoanAction extends Action implements FlashLoanId {
    * @param flParamGetterData
    */
   constructor(token0: EthAddress, token1: EthAddress, pool: EthAddress, amount0: uint256, amount1: uint256, flParamGetterAddr: EthAddress = getAddr('Empty'), flParamGetterData: bytes = []) {
-    super(
-      'FLUniV3',
-      getAddr('FLUniV3'),
-      ['address[]', 'uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes'],
-      [[token0, token1, pool], [amount0, amount1], [], getAddr('Empty'), flParamGetterAddr, flParamGetterData, []],
-    );
+    super({
+      flashLoanId: FLSource.UNIV3,
+      args: [[token0, token1, pool], [amount0, amount1], [], getAddr('Empty'), flParamGetterAddr, flParamGetterData, []],
+    });
   }
 }

package/src/actions/flashloan/index.ts

@@ -1,27 +1,14 @@
-export * from './DyDxFlashLoanAction';
-export * from './DyDxFlashLoanPaybackAction';
 export * from './AaveV2FlashLoanAction';
-export * from './AaveV2FlashLoanPaybackAction';
 export * from './AaveV3FlashLoanAction';
-export * from './AaveV3FlashLoanPaybackAction';
-export * from './AaveV3FlashLoanNoFeeAction';
-export * from './AaveV3FlashLoanNoFeePaybackAction';
 export * from './AaveV3FlashLoanCarryDebtAction';
 export * from './SparkFlashLoanAction';
-export * from './SparkFlashLoanPaybackAction';
 export * from './MakerFlashLoanAction';
-export * from './MakerFlashLoanPaybackAction';
 export * from './BalancerFlashLoanAction';
-export * from './BalancerFlashLoanPaybackAction';
-export * from './EulerFlashLoanAction';
-export * from './EulerFlashLoanPaybackAction';
 export * from './FLAction';
+export * from './FLSource';
 export * from './UniV3FlashLoanAction';
-export * from './UniV3FlashLoanPaybackAction';
 export * from './GhoFlashLoanAction';
-export * from './GhoFlashLoanPaybackAction';
 export * from './MorphoBlueFlashLoanAction';
-export * from './MorphoBlueFlashLoanPaybackAction';
 export * from './FLPaybackAction';
 export * from './CurveUsdFlashLoanAction';
 export * from './BalancerV3FlashLoanAction';