@defisaver/sdk 1.3.37 → 1.3.38

package/docs/DEV.md

@@ -44,6 +44,43 @@ For a DSProxy, pass `target` and `data` to its `execute(address,bytes)` method a
 
 A single action also exposes `encodeForDsProxyCall()`, `getAssetsToApprove()`, and `getEthValue()`. `ActionWithL2` supports specialized packed calldata; callers should normally use the public encoding methods rather than pack bytes themselves.
 
+## Flashloans
+
+Choose a provider action to borrow and use `FLPaybackAction` to repay. You can use
+the provider action directly or pass it to `FLAction`.
+
+```js
+const { configure, Recipe, actions } = require('@defisaver/sdk');
+const { FLAction, MorphoBlueFlashLoanAction, FLPaybackAction } = actions.flashloan;
+
+configure({ chainId: 1, testingMode: false });
+const usdc = '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48';
+
+const recipe = new Recipe('Morpho flashloan', [
+  new MorphoBlueFlashLoanAction(usdc, '1000000000'),
+  // Add your actions here.
+  new FLPaybackAction('$1', usdc),
+]);
+```
+
+This borrows 1,000 USDC from Morpho Blue and repays it in the same recipe. The
+flashloan can also be written with an explicit wrapper:
+
+```js
+const flashloan = new FLAction(
+  new MorphoBlueFlashLoanAction(usdc, '1000000000'),
+);
+```
+
+Both forms produce identical calldata for the same provider and arguments. Each
+encodes one loan through the network's `FLAction` contract.
+
+Constructors throw if the chosen provider isn't supported on the selected network.
+Use `isFlashLoanSourceSupported(FLSource.MORPHO_BLUE, chainId)` from
+`actions.flashloan` to check support beforehand.
+
+For Aave V3 loans that open debt instead of repaying, use `AaveV3FlashLoanCarryDebtAction`.
+
 ## Strategies
 
 `Strategy` describes reusable automation: add subscription slots with `addSubSlot`, triggers with `addTrigger`, and actions with `addAction`. Strategy inputs can refer to named subscription slots such as `'&vaultId'`, or the special addresses `'&proxy'` and `'&eoa'`. Action return references still use `'$1'`, `'$2'`, and so on.

package/esm/src/actions/flashloan/AaveV2FlashLoanAction.d.ts

@@ -1,13 +1,11 @@
-import { Action } from '../../Action';
+import { FLAction } from './FLAction';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
 /**
  * Gets a flashloan from Aave v2
  *
  * @category Flashloans
  */
-export declare class AaveV2FlashLoanAction extends Action implements FlashLoanId {
-    flashLoanId: number;
+export declare class AaveV2FlashLoanAction extends FLAction {
     /**
      * @param loanAmounts
      * @param tokens

package/esm/src/actions/flashloan/AaveV2FlashLoanAction.js

@@ -1,11 +1,12 @@
-import { Action } from '../../Action';
+import { FLAction } from './FLAction';
 import { getAddr } from '../../addresses';
+import { FLSource } from './FLSource';
 /**
  * Gets a flashloan from Aave v2
  *
  * @category Flashloans
  */
-export class AaveV2FlashLoanAction extends Action {
+export class AaveV2FlashLoanAction extends FLAction {
     /**
      * @param loanAmounts
      * @param tokens
@@ -15,7 +16,9 @@ export class AaveV2FlashLoanAction extends Action {
      * @param flParamGetterData
      */
     constructor(tokens, loanAmounts, modes, loanPayer, flParamGetterAddr = getAddr('Empty'), flParamGetterData = []) {
-        super('FLAaveV2', getAddr('FLAaveV2'), ['address[]', 'uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes'], [tokens, loanAmounts, modes, loanPayer, flParamGetterAddr, flParamGetterData, []]);
-        this.flashLoanId = 1;
+        super({
+            flashLoanId: FLSource.AAVEV2,
+            args: [tokens, loanAmounts, modes, loanPayer, flParamGetterAddr, flParamGetterData, []],
+        });
     }
 }

package/esm/src/actions/flashloan/AaveV3FlashLoanAction.d.ts

@@ -1,13 +1,11 @@
-import { ActionWithL2 } from '../../ActionWithL2';
+import { FLAction } from './FLAction';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
 /**
  * Gets a flashloan from Aave v3 with fee enabled
  *
  * @category Flashloans
  */
-export declare class AaveV3FlashLoanAction extends ActionWithL2 implements FlashLoanId {
-    flashLoanId: number;
+export declare class AaveV3FlashLoanAction extends FLAction {
     /**
      * @param tokens
      * @param loanAmounts

package/esm/src/actions/flashloan/AaveV3FlashLoanAction.js

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

package/esm/src/actions/flashloan/BalancerFlashLoanAction.d.ts

@@ -1,13 +1,11 @@
-import { Action } from '../../Action';
+import { FLAction } from './FLAction';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
 /**
  * Gets a flashloan from Balancer
  *
  * @category Flashloans
  */
-export declare class BalancerFlashLoanAction extends Action implements FlashLoanId {
-    flashLoanId: number;
+export declare class BalancerFlashLoanAction extends FLAction {
     /**
      * @param tokens
      * @param amounts

package/esm/src/actions/flashloan/BalancerFlashLoanAction.js

@@ -1,11 +1,12 @@
-import { Action } from '../../Action';
+import { FLAction } from './FLAction';
 import { getAddr } from '../../addresses';
+import { FLSource } from './FLSource';
 /**
  * Gets a flashloan from Balancer
  *
  * @category Flashloans
  */
-export class BalancerFlashLoanAction extends Action {
+export class BalancerFlashLoanAction extends FLAction {
     /**
      * @param tokens
      * @param amounts
@@ -13,7 +14,9 @@ export class BalancerFlashLoanAction extends Action {
      * @param flParamGetterData
      */
     constructor(tokens, amounts, flParamGetterAddr = getAddr('Empty'), flParamGetterData = []) {
-        super('FLBalancer', getAddr('FLBalancer'), ['address[]', 'uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes'], [tokens, amounts, [], getAddr('Empty'), flParamGetterAddr, flParamGetterData, []]);
-        this.flashLoanId = 2;
+        super({
+            flashLoanId: FLSource.BALANCER,
+            args: [tokens, amounts, [], getAddr('Empty'), flParamGetterAddr, flParamGetterData, []],
+        });
     }
 }

package/esm/src/actions/flashloan/BalancerV3FlashLoanAction.d.ts

@@ -1,13 +1,11 @@
-import { Action } from '../../Action';
+import { FLAction } from './FLAction';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
 /**
  * Gets a flashloan from BalancerV3
  *
  * @category Flashloans
  */
-export declare class BalancerV3FlashLoanAction extends Action implements FlashLoanId {
-    flashLoanId: number;
+export declare class BalancerV3FlashLoanAction extends FLAction {
     /**
      * @param tokens
      * @param loanAmounts

package/esm/src/actions/flashloan/BalancerV3FlashLoanAction.js

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

package/esm/src/actions/flashloan/CurveUsdFlashLoanAction.d.ts

@@ -1,13 +1,11 @@
-import { Action } from '../../Action';
+import { FLAction } from './FLAction';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
 /**
  * Gets a crvUSD flashloan from CurveUsd Flash Minter
  *
  * @category Flashloans
  */
-export declare class CurveUsdFlashLoanAction extends Action implements FlashLoanId {
-    flashLoanId: number;
+export declare class CurveUsdFlashLoanAction extends FLAction {
     /**
      * @param amount
      * @param flParamGetterAddr

package/esm/src/actions/flashloan/CurveUsdFlashLoanAction.js

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

package/esm/src/actions/flashloan/FLAction.d.ts

@@ -1,14 +1,16 @@
 import { Action } from '../../Action';
 import { FlashLoanId } from './FlashLoanId';
-import { ActionWithL2 } from '../../ActionWithL2';
+import { FLSource } 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
  */
-declare type SpecificFlashLoanAction = (Action & FlashLoanId) | (ActionWithL2 & FlashLoanId);
-export declare class FLAction extends Action {
-    #private;
+declare type SpecificFlashLoanAction = FlashLoanId & Pick<Action, 'args'>;
+export declare class FLAction extends Action implements FlashLoanId {
+    flashLoanId: FLSource;
     constructor(specificFLAction: SpecificFlashLoanAction);
 }
 export {};

package/esm/src/actions/flashloan/FLAction.js

@@ -1,28 +1,20 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _FLAction_instances, _FLAction_handleArgs;
 import { Action } from '../../Action';
 import { getAddr } from '../../addresses';
+import { assertFlashLoanSourceSupported } from './FLSource';
 export class FLAction extends Action {
     constructor(specificFLAction) {
+        assertFlashLoanSourceSupported(specificFLAction === null || specificFLAction === void 0 ? void 0 : specificFLAction.flashLoanId);
         super('FLAction', getAddr('FLAction'), [], []);
-        _FLAction_instances.add(this);
         this.paramTypes = ['address[]', 'uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes'];
-        this.args = __classPrivateFieldGet(this, _FLAction_instances, "m", _FLAction_handleArgs).call(this, 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],
+        ];
     }
 }
-_FLAction_instances = new WeakSet(), _FLAction_handleArgs = function _FLAction_handleArgs(specificFLAction) {
-    const argsToReturn = [
-        specificFLAction.args[0],
-        specificFLAction.args[1],
-        specificFLAction.args[2],
-        specificFLAction.args[3],
-        getAddr('Empty'),
-        [specificFLAction.flashLoanId],
-        specificFLAction.args[6],
-    ];
-    return argsToReturn;
-};

package/esm/src/actions/flashloan/FLSource.d.ts

@@ -0,0 +1,18 @@
+/** Must match the unified FLAction contract's FLSource enum. */
+export declare enum FLSource {
+    EMPTY = 0,
+    AAVEV2 = 1,
+    BALANCER = 2,
+    GHO = 3,
+    MAKER = 4,
+    AAVEV3 = 5,
+    UNIV3 = 6,
+    SPARK = 7,
+    MORPHO_BLUE = 8,
+    CURVEUSD = 9,
+    BALANCER_V3 = 10
+}
+/** Provider support in the current unified deployments. */
+export declare const supportedFlashLoanSources: Readonly<Record<number, readonly FLSource[]>>;
+export declare const isFlashLoanSourceSupported: (source: FLSource, chainId?: number) => boolean;
+export declare const assertFlashLoanSourceSupported: (source: FLSource, chainId?: number) => void;

package/esm/src/actions/flashloan/FLSource.js

@@ -0,0 +1,42 @@
+import { CONFIG, NETWORKS } from '../../config';
+/** Must match the unified FLAction contract's FLSource enum. */
+export var FLSource;
+(function (FLSource) {
+    FLSource[FLSource["EMPTY"] = 0] = "EMPTY";
+    FLSource[FLSource["AAVEV2"] = 1] = "AAVEV2";
+    FLSource[FLSource["BALANCER"] = 2] = "BALANCER";
+    FLSource[FLSource["GHO"] = 3] = "GHO";
+    FLSource[FLSource["MAKER"] = 4] = "MAKER";
+    FLSource[FLSource["AAVEV3"] = 5] = "AAVEV3";
+    FLSource[FLSource["UNIV3"] = 6] = "UNIV3";
+    FLSource[FLSource["SPARK"] = 7] = "SPARK";
+    FLSource[FLSource["MORPHO_BLUE"] = 8] = "MORPHO_BLUE";
+    FLSource[FLSource["CURVEUSD"] = 9] = "CURVEUSD";
+    FLSource[FLSource["BALANCER_V3"] = 10] = "BALANCER_V3";
+})(FLSource || (FLSource = {}));
+/** Provider support in the current unified deployments. */
+export const supportedFlashLoanSources = {
+    [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, chainId = CONFIG.chainId) => { var _a, _b; return (_b = (_a = supportedFlashLoanSources[chainId]) === null || _a === void 0 ? void 0 : _a.includes(source)) !== null && _b !== void 0 ? _b : false; };
+export const assertFlashLoanSourceSupported = (source, chainId = CONFIG.chainId) => {
+    var _a;
+    if (!isFlashLoanSourceSupported(source, chainId)) {
+        throw new Error(`Flashloan source ${(_a = FLSource[source]) !== null && _a !== void 0 ? _a : String(source)} is not supported by FLAction on chainId: ${chainId}.`);
+    }
+};

package/esm/src/actions/flashloan/FlashLoanId.d.ts

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

package/esm/src/actions/flashloan/GhoFlashLoanAction.d.ts

@@ -1,13 +1,11 @@
-import { Action } from '../../Action';
+import { FLAction } from './FLAction';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
 /**
  * Gets a GHO flashloan from GHO Flash Minter
  *
  * @category Flashloans
  */
-export declare class GhoFlashLoanAction extends Action implements FlashLoanId {
-    flashLoanId: number;
+export declare class GhoFlashLoanAction extends FLAction {
     /**
      * @param amount
      * @param flParamGetterAddr

package/esm/src/actions/flashloan/GhoFlashLoanAction.js

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

package/esm/src/actions/flashloan/MakerFlashLoanAction.d.ts

@@ -1,13 +1,11 @@
-import { Action } from '../../Action';
+import { FLAction } from './FLAction';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
 /**
  * Gets a flashloan from Maker
  *
  * @category Flashloans
  */
-export declare class MakerFlashLoanAction extends Action implements FlashLoanId {
-    flashLoanId: number;
+export declare class MakerFlashLoanAction extends FLAction {
     /**
      * @param amount
      * @param flParamGetterAddr

package/esm/src/actions/flashloan/MakerFlashLoanAction.js

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

package/esm/src/actions/flashloan/MorphoBlueFlashLoanAction.d.ts

@@ -1,13 +1,11 @@
-import { Action } from '../../Action';
+import { FLAction } from './FLAction';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
 /**
  * Gets a flashloan from MorphoBlue
  *
  * @category Flashloans
  */
-export declare class MorphoBlueFlashLoanAction extends Action implements FlashLoanId {
-    flashLoanId: number;
+export declare class MorphoBlueFlashLoanAction extends FLAction {
     /**
      * @param token
      * @param amount

package/esm/src/actions/flashloan/MorphoBlueFlashLoanAction.js

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

package/esm/src/actions/flashloan/SparkFlashLoanAction.d.ts

@@ -1,13 +1,11 @@
-import { ActionWithL2 } from '../../ActionWithL2';
+import { FLAction } from './FLAction';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
 /**
  * Gets a flashloan from Spark with fee enabled
  *
  * @category Flashloans
  */
-export declare class SparkFlashLoanAction extends ActionWithL2 implements FlashLoanId {
-    flashLoanId: number;
+export declare class SparkFlashLoanAction extends FLAction {
     /**
      * @param tokens
      * @param loanAmounts

package/esm/src/actions/flashloan/SparkFlashLoanAction.js

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

package/esm/src/actions/flashloan/UniV3FlashLoanAction.d.ts

@@ -1,13 +1,11 @@
-import { Action } from '../../Action';
+import { FLAction } from './FLAction';
 import { EthAddress, uint256, bytes } from '../../types';
-import { FlashLoanId } from './FlashLoanId';
 /**
  * Gets a flashloan from UniV3 pool
  *
  * @category Flashloans
  */
-export declare class UniV3FlashLoanAction extends Action implements FlashLoanId {
-    flashLoanId: number;
+export declare class UniV3FlashLoanAction extends FLAction {
     /**
      * @param token0
      * @param token1

package/esm/src/actions/flashloan/UniV3FlashLoanAction.js

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