@defisaver/sdk 1.3.27-midnight-dev → 1.3.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/sdk",
-  "version": "1.3.27-midnight-dev",
+  "version": "1.3.28",
   "description": "",
   "main": "./umd/index.js",
   "module": "./esm/src/index.js",

package/src/Action.ts

@@ -101,30 +101,14 @@ export class Action {
 
   _parseParamType(paramType:string | ParamTypes, arg:Args) {
     if (typeof (paramType) === 'string') {
+      if (paramType.startsWith('(')) {
+        let _paramType = paramType.replace('(', '');
+        _paramType = _paramType.replace(')', '');
+        return _paramType.split(',');
+      }
       if (paramType.endsWith('[]')) {
         return Array.from(Array(arg.length).fill(paramType.replace('[]', '')));
       }
-      if (paramType.startsWith('(') || paramType.startsWith('tuple(')) {
-        const tupleStart = paramType.indexOf('(');
-        const tupleEnd = paramType.lastIndexOf(')');
-        const tupleContents = paramType.slice(tupleStart + 1, tupleEnd);
-        const tupleTypes = [];
-        let currentType = '';
-        let nestingDepth = 0;
-
-        for (const character of tupleContents) {
-          if (character === ',' && nestingDepth === 0) {
-            tupleTypes.push(currentType);
-            currentType = '';
-          } else {
-            currentType += character;
-            if (character === '(') nestingDepth += 1;
-            if (character === ')') nestingDepth -= 1;
-          }
-        }
-        tupleTypes.push(currentType);
-        return tupleTypes;
-      }
     }
     return paramType;
   }

package/src/actions/aaveV3/AaveV3DelegateCredit.ts

@@ -16,7 +16,7 @@ export class AaveV3DelegateCredit extends ActionWithL2 {
    * @param amount Amount of tokens to be payed back
    * @param rateMode Type of borrow debt [Stable: 1, Variable: 2]
    * @param assetId The id of the token to be borrowed
-   * @param delegatee The id of the underlying asset to be repaid
+   * @param delegatee The address of the delegatee to be credited
    */
   constructor(useOnDefaultMarket: boolean, market:EthAddress, amount:uint256, rateMode:uint8, assetId:uint16, delegatee:EthAddress) {
     super('AaveV3DelegateCredit', getAddr('Empty'),

package/src/actions/etherfi/EtherFiStakeFromLidoAction.ts

@@ -0,0 +1,38 @@
+import { getAssetInfo } from '@defisaver/tokens';
+import { Action } from '../../Action';
+import { getAddr } from '../../addresses';
+import { EthAddress, uint256 } from '../../types';
+import { requireAddress } from '../../utils/general';
+
+/**
+ * EtherFiStakeFromLidoAction - Converts wstETH to weETH through Ether.fi's Lido staking route
+ *
+ * @category EtherFi
+ */
+export class EtherFiStakeFromLidoAction extends Action {
+  /**
+   * @param amount - amount of wstETH to pull
+   * @param minAmountOut - minimum amount of weETH to receive
+   * @param from - address from which to pull wstETH
+   * @param to - address where received weETH will be sent
+   */
+  constructor(amount:uint256, minAmountOut:uint256, from:EthAddress, to:EthAddress) {
+    requireAddress(to);
+    super(
+      'EtherFiStakeFromLido',
+      getAddr('EtherFiStakeFromLido'),
+      ['uint256', 'uint256', 'address', 'address'],
+      [amount, minAmountOut, from, to],
+    );
+    this.mappableArgs = [
+      this.args[0],
+      this.args[1],
+      this.args[2],
+      this.args[3],
+    ];
+  }
+
+  async getAssetsToApprove() {
+    return [{ asset: getAssetInfo('WSTETH').address, owner: this.args[2] }];
+  }
+}

package/src/actions/etherfi/index.ts

@@ -1,3 +1,4 @@
 export * from './EtherFiStakeAction';
+export * from './EtherFiStakeFromLidoAction';
 export * from './EtherFiWrapAction';
-export * from './EtherFiUnwrapAction';
+export * from './EtherFiUnwrapAction';

package/src/actions/flashloan/AaveV3FlashLoanAction.ts

@@ -12,8 +12,8 @@ export class AaveV3FlashLoanAction extends ActionWithL2 implements FlashLoanId {
   public flashLoanId = 5;
 
   /**
-   * @param loanAmounts
    * @param tokens
+   * @param loanAmounts
    * @param modes
    * @param loanPayer
    * @param flParamGetterAddr

package/src/actions/flashloan/AaveV3FlashLoanCarryDebtAction.ts

@@ -9,27 +9,21 @@ import { EthAddress, uint256, bytes } from '../../types';
  */
 export class AaveV3FlashLoanCarryDebtAction extends ActionWithL2 {
   /**
-   * @param loanAmounts
    * @param tokens
-   * @param modes
-   * @param loanPayer
+   * @param loanAmounts
    * @param flParamGetterAddr
    * @param flParamGetterData
    */
-  constructor(tokens:Array<EthAddress>, loanAmounts:Array<uint256>, modes:Array<uint256>, loanPayer:EthAddress, flParamGetterAddr:EthAddress = getAddr('Empty'), flParamGetterData:bytes = []) {
+  constructor(tokens:Array<EthAddress>, loanAmounts:Array<uint256>, flParamGetterAddr:EthAddress = getAddr('Empty'), flParamGetterData:bytes = []) {
+    if (tokens.length !== loanAmounts.length) {
+      throw new Error('Tokens and loan amounts must be of the same length');
+    }
+    const modes: Array<uint256> = Array(tokens.length).fill(2); // always use variable borrow rate
     super(
       'FLAaveV3CarryDebt',
       getAddr('FLAaveV3CarryDebt'),
       ['address[]', 'uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes'],
-      [tokens, loanAmounts, modes, loanPayer, flParamGetterAddr, flParamGetterData, []],
+      [tokens, loanAmounts, modes, getAddr('Empty'), flParamGetterAddr, flParamGetterData, []],
     );
-    if (tokens.length !== modes.length || tokens.length !== loanAmounts.length) {
-      throw new Error('Arrays must be of the same length');
-    }
-    modes.forEach((mode) => {
-      if (mode.toString() !== '1' && mode.toString() !== '2') {
-        throw new Error('Invalid borrow mode set');
-      }
-    });
   }
 }

package/src/actions/flashloan/AaveV3FlashLoanNoFeeAction.ts

@@ -9,8 +9,8 @@ import { EthAddress, uint256, bytes } from '../../types';
  */
 export class AaveV3FlashLoanNoFeeAction extends ActionWithL2 {
   /**
-   * @param loanAmounts
    * @param tokens
+   * @param loanAmounts
    * @param modes
    * @param loanPayer
    * @param flParamGetterAddr

package/src/actions/index.ts

@@ -40,7 +40,6 @@ import * as fluid from './fluid';
 import * as pendle from './pendle';
 import * as umbrella from './umbrella';
 import * as aaveV4 from './aavev4';
-import * as midnight from './midnight';
 
 export {
   aave,
@@ -85,5 +84,4 @@ export {
   pendle,
   umbrella,
   aaveV4,
-  midnight,
 };

package/src/actions/uniswap/UniswapClaimAction.ts

@@ -0,0 +1,31 @@
+import { Action } from '../../Action';
+import { getAddr } from '../../addresses';
+import { EthAddress, uint256, bytes32 } from '../../types';
+
+/**
+ * UniswapClaimAction - Claims UNI tokens from the Uniswap merkle distributor
+ *
+ * @category Uniswap
+ */
+export class UniswapClaimAction extends Action {
+  /**
+   * @param index - Index of the claim in the merkle tree
+   * @param to - Address where to send the claimed UNI
+   * @param amount - Amount of UNI allocated to the smart wallet in the merkle tree
+   * @param merkleProof - Merkle proof of the claim
+   */
+  constructor(index: uint256, to: EthAddress, amount: uint256, merkleProof: Array<bytes32>) {
+    super(
+      'UniswapClaim',
+      getAddr('UniswapClaim'),
+      ['uint256', 'address', 'uint256', 'bytes32[]'],
+      [index, to, amount, merkleProof],
+    );
+
+    this.mappableArgs = [
+      this.args[0],
+      this.args[1],
+      this.args[2],
+    ];
+  }
+}

package/src/actions/uniswap/index.ts

@@ -1,2 +1,3 @@
 export * from './UniswapSupplyAction';
-export * from './UniswapWithdrawAction';
+export * from './UniswapWithdrawAction';
+export * from './UniswapClaimAction';

package/src/addresses.ts

@@ -95,6 +95,7 @@ export const actionAddresses = {
     AaveV3ATokenPayback: '0xDe5c012cd1878D86E91309593764895a3adb380E',
     AaveV3View: '0x0CB0170F3413e54405F64d3C23BA3A1D8Bb96D99',
     AaveV3DelegateWithSig: '0x9253E22Ce4f0AeE541301CF8cC29843f9083a1F4',
+    AaveV3DelegateCredit: '0xa7ab39edCb0a1b742DCd908EC6CFe178d8322580',
     GhoClaimAAVE: '0xA53060d822cB31AFd5B26D899130a14E8Efc5917',
     GhoUnstake: '0x3fD02e65B4fb12381946D03815Ff3FF8Ebe2fC63',
     GhoStake: '0x6cfBFd04702f3b7d4fc52D457eDf91D6E4A081bb',
@@ -147,7 +148,7 @@ export const actionAddresses = {
     // flashloan
     FLAaveV2: '0xEA55576383C96A69B3E8beD51Ce0d0294001bc5F',
     FLAaveV3NoFee: '0xd9D8e68717Ce24CCbf162868aaad7E38d81b05d1',
-    FLAaveV3CarryDebt: '0x7BdD8ACE8a48B7032Df68B7f53E0D6D9Ea9411A7',
+    FLAaveV3CarryDebt: '0x8225D3833D88BD1420E7d25e69A00F1A27aB9143',
     FLAaveV3: '0x5021d70aB7D757D61E0230c472ff89b8B2B8705e',
     FLDyDx: '0x08AC78B418fCB0DDF1096533856A757C28d430d7',
     FLMaker: '0x0f8C3368cADF78167F5355D746Ed7b2A826A6e3b',
@@ -161,6 +162,7 @@ export const actionAddresses = {
     // uniswap
     UniSupply: '0x9935e12F0218E61c27D7f23eAC9A9D6881a078eC',
     UniWithdraw: '0xf8bb8F68b0A45DC315F3f7602a60cfb274B00951',
+    UniswapClaim: '0x4Eed50e142BFaE83b2d05ce960C55F4c536d123f',
 
     // uniswap V3
     UniCollectV3: '0x331D7C3F6E710cB6cFE94c4Aa04AC3345AC00e00',
@@ -298,7 +300,7 @@ export const actionAddresses = {
     CurveUsdSwapper: '0xFA8c594b903651F97b27aCADEa83b720cfD7F80b',
     CurveUsdSwapperTransient:
              '0xcF0298592b8FCB3823d31Bb257b65afFCAcCb8b6',
-    CurveUsdSelfLiquidate: '0xd90d8a4955DfE9D4f45F7f60595313B0925ee1da',
+    CurveUsdSelfLiquidate: '0x0B21996Fc90993f975D8279bE8ff2D34518da79C',
     CurveUsdSelfLiquidateWithColl:
              '0x7cE305FC2A18c6820a533AD418dC0A549aFeDcAF',
     CurveUsdGetDebt: '0x3Bb41d3f300dA758780fe7696bb4fB93cD7172fB',
@@ -333,7 +335,7 @@ export const actionAddresses = {
     LlamaLendBorrow: '0xCF693585C47049F3eACc2285E7Fe4e80123b2520',
     LlamaLendWithdraw: '0x5aEb07Ce4A49b7EaE2A1e5281768cFc0C3e1d8F3',
     LlamaLendPayback: '0x07e31d56E47EE6926892dCd928dF26899F58Ac8E',
-    LlamaLendSelfLiquidate: '0x46173C379Fbf998E6db0B47F45b73f77C64d3897',
+    LlamaLendSelfLiquidate: '0xF0D7b730B40b02Ad555E27CFe5FAF43D6a75dfba',
     LlamaLendGetDebt: '0x5625ea9fcd930d5f131b0261ec4dcaf279fea4ed',
     LlamaLendBoost: '0xa21c1ce7318c6d38a10de44c2cd5d80514437d85',
     LlamaLendRepay: '0x57693f72E628A3F7323D31De35Bd158493Aa9CC0',
@@ -356,6 +358,7 @@ export const actionAddresses = {
 
     // etherFi
     EtherFiStake: '0xcadB650B6a60C89f7847Cba555A7eeCC220EA2e8',
+    EtherFiStakeFromLido: '0xd4815aa46fc39e667fd7ab3194458639b59bcd82',
     EtherFiWrap: '0x086464be5c73f66cfbe6b64ec23aa5a86749ef58',
     EtherFiUnwrap: '0x6Eb09948DDf9332d628d156950b9B1C0c091e8D8',
 
@@ -363,9 +366,9 @@ export const actionAddresses = {
 
     // fluid
     FluidVaultT1Open: '0x372404335C05C2493Ff156Ef60cC0B286f6f2971',
-    FluidVaultT1Adjust: '0x8f1443c9F24843D14fa6b302A55C59468ED7D28B',
+    FluidVaultT1Adjust: '0x0Dfe1e40F3DA8687a68824022176bE547Ecc0906',
     FluidVaultT1Borrow: '0x36AF0cE762a016e8b4a80c70Af406DFcBc1FCbD4',
-    FluidVaultT1Payback: '0xa7A4B84D38CD33F9901922687db24B8aE14f2455',
+    FluidVaultT1Payback: '0x8D56b267C6a3e5295EFAebC67Ac413483c885C05',
     FluidVaultT1Withdraw: '0x5673b9ab4A035C5C7474C344664Be91DaFafa17E',
     FluidVaultT1Supply: '0x0c6100209D8A0bb14CC7d18e45dA1bd1E7a3a187',
     FluidView: '0xc8df052bD7A8d76a34c09e758Dff3c6298C0115c',
@@ -374,7 +377,7 @@ export const actionAddresses = {
     FluidDexOpen: '0x071e1369E1c9030Aa1a089bDE2F72797a14FE3b3',
     FluidDexSupply: '0xB3BE39850d8939Cceb4Fc49c415c428548FA9f9C',
     FluidDexBorrow: '0x3fa8EF6DA8f5b2BaAee77493a3A3dA68a7Aa75f3',
-    FluidDexPayback: '0xD733BD32F4AAEe92a983E2021B85ca5d31236FA0',
+    FluidDexPayback: '0x12D0D7c4c2c5304E5ba96A019E0F092FdF555123',
     FluidDexWithdraw: '0x14d5bb8E96fbf7C1f9A8E3EFD0eF5fe6832ff3cd',
 
     // pendle
@@ -438,13 +441,14 @@ export const actionAddresses = {
     AaveV3Withdraw: '0xf19d045f6cFc04A5Ee5E0e8837b565b9f276e3F7',
     AaveV3ClaimRewards: '0xBE8e8cea67085F869C1C0040fD52F9F3115E962e',
     AaveV3DelegateWithSig: '0x8dd05d32fB05E8c3e8F37294e6f2d13e5823a712',
-    AaveV3DelegateCredit: '0x0000000000000000000000000000000000000000',
+    AaveV3DelegateCredit: '0x11E7B19195a76D2E5A4863cf6cbE8030443c729A',
 
     // flashloan
     FLAaveV3NoFee: '0xfbcF23D2BeF8A2C491cfa4dD409D8dF12d431c85',
     FLAaveV3: '0x8A07E93d2B74A80D726eE4E4A0aC1F906aB5Cc63',
     FLBalancer: '0x79d6bf536b8DD65909a3174C87eA6395310d5c41',
     FLAction: '0xB57b666dAB46229e2b80113b5187F6DCD91AB159',
+    FLAaveV3CarryDebt: '0x4ab7a392aF23215A9049A64F3B2d44726aD2D6fe',
 
     AaveV3RatioTrigger: '0xB76e3f7694589D0f34ba43b17AD0D15350Ab5f85',
     GasFeeTakerL2: '0xB3dB299622A9DB0E944ccda2Ef899d6fF365B082',
@@ -508,6 +512,7 @@ export const actionAddresses = {
     AaveV3Withdraw: '0xbf492F869DdB1A18BB4F41b6c3059D9f882Fe7ff',
     AaveV3ClaimRewards: '0x3a4d72Ed2a47a409a82ba61f0fca1C749Ea8aB66',
     AaveV3DelegateWithSig: '0xFF2CE05250d1880f0f45ea8fB453292CABA42F12',
+    AaveV3DelegateCredit: '0x8C13353e3DA67d3171D6F73751E3caa791a3AACD',
 
     // CompV3
     CompV3Allow: '0x0380E8e13CdE0499c720999930CaA07A5744887c',
@@ -525,6 +530,7 @@ export const actionAddresses = {
     FLUniV3: '0xf041C72e201CD7d04a240fe06c5783E2Ee2D92b3', // @DEV - incorrect, same as FLAction
     FLAction: '0xf041C72e201CD7d04a240fe06c5783E2Ee2D92b3',
     FLMorphoBlue: '0xf041C72e201CD7d04a240fe06c5783E2Ee2D92b3',
+    FLAaveV3CarryDebt: '0xEc6Db90d9EFa7cD75d5b716896A497e9d9103D5b',
 
     GasFeeTakerL2: '0x2F64f73B222B4978CAfd0295c0fa106cE5f34996',
     AaveV3RatioCheck: '0x4a5c2cbCFB921b596Dec049389899CC8Eb4678ED',
@@ -542,7 +548,7 @@ export const actionAddresses = {
     LlamaLendBorrow: '0x4948135f8b3a8f3b51fbd1050f5d0f755accb8e7',
     LlamaLendWithdraw: '0xd7a80e7a2296d75cd1eebc2f0de0cebd14fbe117',
     LlamaLendPayback: '0xB2B93495dA2Fee8F92513fBBfA804564110B63ee',
-    LlamaLendSelfLiquidate: '0xe63e836C3ab61481F60A9a56aA72d1D0c55Fc280',
+    LlamaLendSelfLiquidate: '0xC330F048B15CA5aadF34A9033B3a24c65200230A',
     LlamaLendGetDebt: '0x81c01f08b8fc4487501c88404ed17ebc17764f9c',
     LlamaLendBoost: '0xc52a3af27696f8cf999463f3455e23440a376f8d',
     LlamaLendRepay: '0x320fdfa922ee33c1cc8a042ada855c9dfe9bed06',
@@ -552,16 +558,16 @@ export const actionAddresses = {
 
     // fluid
     FluidVaultT1Open: '0x1947Ce90ACCf0E243CcF85140fCceC2EfAeeA193',
-    FluidVaultT1Adjust: '0xF8374Aa0F6d9D28790f90745f0360b5C945DEA20',
+    FluidVaultT1Adjust: '0x212bB7577B6b302450860E128Eb73Eb2F83514c7',
     FluidVaultT1Borrow: '0x499da89aD564F5D6C828259ce55F53Fa288e7Be7',
-    FluidVaultT1Payback: '0x226c871E0a27B12065c9128b8e7440b054b59155',
+    FluidVaultT1Payback: '0x19FF948437B7f1221173effC029739568F5f844a',
     FluidVaultT1Withdraw: '0xc13d93227d97197e5F1751d0a3e80c1080A5fa2B',
     FluidVaultT1Supply: '0xBCF0Dc5bb2C4434AD07369207904F5900d391b0B',
     FluidView: '0xf9e6d5568887ac8eC6fA33B7eefD2A176A958e71',
     FluidDexOpen: '0xA456f13d358B8B93bE6778be3244111E267C0AaC',
     FluidDexSupply: '0x3E49c4f914E01e5612719a7B4965e4FAfb324762',
     FluidDexBorrow: '0x8626b70CDf64e557fDdcFbcb783833Dc314d95F4',
-    FluidDexPayback: '0xA9B46Da016F22cf9F8841A30881bB88E2Ad5CA94',
+    FluidDexPayback: '0x72b9AAf4864631976D764574f4780B1562CCF0F4',
     FluidDexWithdraw: '0x076D5434793798b153298bF70b014f5E6145aB2E',
 
     // summer.fi
@@ -616,6 +622,7 @@ export const actionAddresses = {
     FLUniV3: '0x1bA6082D2ef1aB92a55B96264c72Eb8049C964Ce',
     FLAction: '0x87Af4769e4134379125A262408e1f3EC60d2Ab52', // fix temp
     FLMorphoBlue: '0x87Af4769e4134379125A262408e1f3EC60d2Ab52',
+    FLAaveV3CarryDebt: '0x760e97862DD8652e5BB8b4D8ad9C99a74BBe7E7A',
 
     // AaveV3
     AaveV3Withdraw: '0x1d2Fa7dAcC660A9124c3685EE8a6E699d10409Eb',
@@ -630,6 +637,7 @@ export const actionAddresses = {
     AaveV3ATokenPayback: '0x3D57875885e3cEe9E56Cb65D21789893B6e67815',
     AaveV3View: '0xf140B2904beb743C2f17e0b5f766074212a7e243',
     AaveV3DelegateWithSig: '0x9e295AFaC75E7843b88a563D119FD953EDf441c2',
+    AaveV3DelegateCredit: '0xF85aD63c513A76a1dc05B2AddC4777F17336c7e9',
 
     // CompV3
     CompV3Allow: '0x3Fe56B85BBcD759459408Bd8434c37bac93e26bF',
@@ -659,16 +667,16 @@ export const actionAddresses = {
 
     // fluid
     FluidVaultT1Open: '0xCd4d5896AEAf97e738d3E7215ac01c2CF97474bc',
-    FluidVaultT1Adjust: '0x4405A81c25Be495325f76Aa4d82176f9ae3275bc',
+    FluidVaultT1Adjust: '0x2f7839a733B93641aa6a6AF0b593202335c351D3',
     FluidVaultT1Borrow: '0x8dCBF436cC0971FE29886E58CE0CAeb36d43E91E',
-    FluidVaultT1Payback: '0xA65daAa4FB4Fe9feaDF25bf2C062c3Faa2b02e5D',
+    FluidVaultT1Payback: '0xD4cEe5755e4f713B69f5Fc73068505ec6B9ee2a2',
     FluidVaultT1Withdraw: '0x26bE6a2EdE97aE826ed9DA8Fb79428037fe55cEB',
     FluidVaultT1Supply: '0x028ACA45244d4897ff80ef65ed0b735Bb0D4B0A5',
     FluidView: '0x6cd4D6af4F292817eA2A2311F099dF26cd015028',
     FluidDexOpen: '0x5eA8Da9679145D51F5eAEC8Bf2f42f47003A8799',
     FluidDexSupply: '0x2fCb7db80d3Be5C1B0049dF074b1AcFbcA93A867',
     FluidDexBorrow: '0x9D40776a876fA67C6757DA386434844cB6616C5F',
-    FluidDexPayback: '0xc177c885872592EDA598276bD3FAe5B6d27F80Bf',
+    FluidDexPayback: '0xcaa8877aD3847B428135653AcA5fAd13a2811483',
     FluidDexWithdraw: '0xEaBA867c49FE8e53F5716fFF8857F239bd7202e1',
 
     TokenizedVaultAdapter: '0x88cf6cfa51b6f771570f6df450edf1c886212d3e',
@@ -677,13 +685,6 @@ export const actionAddresses = {
     SFApproveTokens: '0x03EDC9A683f37BFB7516FF234223fFb6E38D5eb9',
     SummerfiUnsub: '0x0000000000000000000000000000000000000000', // Only exists for Maker on Mainnet
     SummerfiUnsubV2: '0x60587B8Fe62Fc149d285a611822263206b4138da',
-
-    MidnightPaybackDirect: '0xC1B049A038f9E9811dc1Ad1D335369844d4268D9',
-    MidnightBorrowFromOrders: '0x82F9dd7eA821463178A2c7bC4047057Bd338E5e5',
-    MidnightPaybackFromOrders: '0x4B0c242195B1C941A2e7a871Bfa242c40dbf032F',
-    MidnightSupplyCollateral: '0xC83C7Ca37203FC30636EDcd3Ef127194542504c5',
-    MidnightWithdrawCollateral: '0x4fA4DA5fDD813279409B4Bf0Bde5Fe9ca8006A9C',
-    MidnightView: '0x3aa272f329E8B562A3bA56Bb6979a44D23A28839',
   },
   [NETWORKS.linea.chainId]: {
     // Basic
@@ -707,6 +708,7 @@ export const actionAddresses = {
     // Flashloan
     FLAction: '0x04ce4b2a9F524d976a8eD8a49B9313C5a2C3ccAD', // fix temp
     FLAaveV3: '0x04ce4b2a9F524d976a8eD8a49B9313C5a2C3ccAD',
+    FLAaveV3CarryDebt: '0x862E533198C9656B75bB6A5dDF0953F7ED5E8507',
 
     // AaveV3
     AaveV3Withdraw: '0xae56474aBe3C271579b513b6668864e39f65Ae15',
@@ -719,7 +721,7 @@ export const actionAddresses = {
     AaveV3ATokenPayback: '0xedfc68e2874b0afc0963e18ae4d68522aec7f97d',
     AaveV3View: '0xc9d6efa6e08b66a5cdc516bcd5807c2fa69e0f2a',
     AaveV3DelegateWithSig: '0x169D6E128238ebabF86032Ae9da65938eaD7F69e',
-    AaveV3DelegateCredit: '0x2A588cBCBd5e6c6ba7ED0E260B8107F599017DDE',
+    AaveV3DelegateCredit: '0x1bA6082D2ef1aB92a55B96264c72Eb8049C964Ce',
   },
   [NETWORKS.plasma.chainId]: {
     // Basic
@@ -743,6 +745,7 @@ export const actionAddresses = {
     // Flashloan
     FLAction: '0x40C9ce603923AACD0b7407Ff0EE844c9C067cEB7', // fix temp
     FLAaveV3: '0x40C9ce603923AACD0b7407Ff0EE844c9C067cEB7',
+    FLAaveV3CarryDebt: '0x6Dc6C0e38fBd066b89Ba7E6f711B4288246891b3',
 
     // AaveV3
     AaveV3Withdraw: '0x4839d021A24820e57C31D386d430e2e82694F73B',
@@ -755,20 +758,20 @@ export const actionAddresses = {
     AaveV3ATokenPayback: '0x425fA97285965E01Cc5F951B62A51F6CDEA5cc0d',
     AaveV3View: '0xD8E67968d8a0df4beCf2D50daE1e34d4d80C701C',
     AaveV3DelegateWithSig: '0x49658E0CF3883c338397C7257619B280dF581057',
-    AaveV3DelegateCredit: '0x0a9b2080C14DaF008AE87C977dFDf5f5D6D0937F',
+    AaveV3DelegateCredit: '0x6F53fa9e7d1323d24515a51AB72Da3cf1E9883Bc',
 
     // Fluid
     FluidVaultT1Open: '0x491cc4AFbE0081C3464DeF1114ba27BE114b2401',
-    FluidVaultT1Adjust: '0xD37d4DB98E67305ef92f34886B25500500E04Aed',
+    FluidVaultT1Adjust: '0xC196dC97Eb0B58E3755a71143b41D3F24595643f',
     FluidVaultT1Borrow: '0x95a8665Ba58aa13A58c60B0803572772cda153dB',
-    FluidVaultT1Payback: '0x1420f4977E7B71AFddccBFc6F6e1505CefdF99F0',
+    FluidVaultT1Payback: '0xdeF8B05Ce194D50C376233C9C5530027f6180442',
     FluidVaultT1Withdraw: '0xcF91546046F16B3c38b890CC508E280BEffa66b9',
     FluidVaultT1Supply: '0x54D1b51d2d68CD0Dc877296527780CA6aff68a39',
     FluidView: '0x27C0BAe2338cE28097122393faF90375B9395dd1',
     FluidDexOpen: '0xF32d5d8D81f2662A02955CE537537088DF29daf5',
     FluidDexSupply: '0x903F7C93FFC4AAbaBB096a7A722F1f057816B399',
     FluidDexBorrow: '0xa2A878a09639D1ab3AF544566c0CA4D0FeAEE65E',
-    FluidDexPayback: '0x04ce4b2a9F524d976a8eD8a49B9313C5a2C3ccAD',
+    FluidDexPayback: '0x3094D0D64fa5318162150720c19669d1A163937B',
     FluidDexWithdraw: '0x17B4ecd173b3Df2F5cB02c53Df8AA34e23Bcb92E',
     // Pendle
     PendleTokenRedeem: '0xB4c5f33bb5791D0174Df1879b809Bf57eE540B62',

package/test/actions/etherFi/EtherFiStakeFromLidoAction.js

@@ -0,0 +1,40 @@
+const dfs = require('../../../src');
+const { getAssetInfo } = require('@defisaver/tokens');
+const { encodeForDsProxyCall, encodeForRecipe } = require('../../_actionUtils');
+const { assert } = require('chai');
+
+describe('Action: EtherFiStakeFromLidoAction', () => {
+    let action;
+    const amount = 100;
+    const minAmountOut = 90;
+    const from = '0x80788de454ad3681d357dc7FcB13c72333f684a7';
+    const to = '0x968Cc941aD9074EE687E0423a33E6f2D33d7c327';
+
+    it('constructor', () => {
+        action = new dfs.actions.etherfi.EtherFiStakeFromLidoAction(
+            amount,
+            minAmountOut,
+            from,
+            to,
+        );
+
+        assert.equal(action.args[0], amount);
+        assert.equal(action.args[1], minAmountOut);
+        assert.equal(action.args[2], from);
+        assert.equal(action.args[3], to);
+    });
+
+    it('encodeForDsProxyCall', () => encodeForDsProxyCall(action));
+    it('encodeForRecipe', () => encodeForRecipe(action));
+
+    it('getEthValue', async () => {
+        assert.equal(await action.getEthValue(), '0');
+    });
+
+    it('getAssetsToApprove', async () => {
+        const assetOwnerPairs = await action.getAssetsToApprove();
+        assert.lengthOf(assetOwnerPairs, 1);
+        assert.equal(assetOwnerPairs[0].asset, getAssetInfo('WSTETH').address);
+        assert.equal(assetOwnerPairs[0].owner, from);
+    });
+});

package/test/actions/uniswap/UniswapClaimAction.js

@@ -0,0 +1,31 @@
+const dfs = require('../../../src');
+const {encodeForDsProxyCall, encodeForRecipe} = require('../../_actionUtils');
+const {assert} = require('chai');
+
+describe('Action: UniswapClaimAction', () => {
+    let action;
+    context('Claim encoding', () => {
+        it('constructor', () => {
+            const index = '137';
+            const to = '0xC093dFcC2cBc4e9488589B7c2245a7F1DA043389';
+            const amount = '4809093062235489680';
+            const merkleProof = [
+                '0xd496d2a15cf30a2af545b0fd4ced50fb4224bb54e7c9add4885c7b7408c907a1',
+                '0x6a8fc6432934b1f2c9f9aed040f4389c0450dd94aff92b16864060e95fba4290',
+                '0xb7491e5e898e774e11c50044140df4c1c74bf9cd7855bac78f0709699ed0e6b7',
+            ];
+            action = new dfs.actions.uniswap.UniswapClaimAction(
+                index,
+                to,
+                amount,
+                merkleProof,
+            );
+        })
+        it('encodeForDsProxyCall', () => encodeForDsProxyCall(action));
+        it('encodeForRecipe', () => encodeForRecipe(action));
+        it('getEthValue', async () => {
+            const ethValue = await action.getEthValue();
+            assert.equal(ethValue, '0');
+        })
+    })
+})