@defisaver/sdk 1.2.15-dev-allocator-2 → 1.2.16-dev-liquity-v2-1

package/src/actions/liquityV2/LiquityV2SupplyAction.ts

@@ -0,0 +1,57 @@
+import { Action } from '../../Action';
+import { getAddr } from '../../addresses';
+import { EthAddress, uint256 } from '../../types';
+
+/**
+ * LiquityV2SupplyAction - Supplies collateral to a trove
+ *
+ * @category LiquityV2
+ */
+export class LiquityV2SupplyAction extends Action {
+  tokenForApproval: EthAddress;
+
+  /**
+   * @param market liquity address registry for the market
+   * @param from address from which to take the collateral
+   * @param collToken address of the collateral token
+   * @param troveId id of the trove to supply collateral to
+   * @param amount collateral amount to supply
+   */
+  constructor(
+    market: EthAddress,
+    from: EthAddress,
+    collToken: EthAddress,
+    troveId: uint256,
+    amount: uint256,
+  ) {
+    super(
+      'LiquityV2Supply',
+      getAddr('LiquityV2Supply'),
+      [
+        'address',
+        'address',
+        'uint256',
+        'uint256',
+      ],
+      [
+        market,
+        from,
+        troveId,
+        amount,
+      ],
+    );
+
+    this.mappableArgs = [
+      this.args[0],
+      this.args[1],
+      this.args[2],
+      this.args[3],
+    ];
+
+    this.tokenForApproval = collToken;
+  }
+
+  async getAssetsToApprove() {
+    return [{ asset: this.tokenForApproval, owner: this.args[1] }];
+  }
+}

package/src/actions/liquityV2/LiquityV2WithdrawAction.ts

@@ -0,0 +1,47 @@
+import { Action } from '../../Action';
+import { getAddr } from '../../addresses';
+import { EthAddress, uint256 } from '../../types';
+
+/**
+ * LiquityV2WithdrawAction - Withdraws collateral from a trove
+ *
+ * @category LiquityV2
+ */
+export class LiquityV2WithdrawAction extends Action {
+  /**
+   * @param market liquity address registry for the market
+   * @param to address to which to send the withdrawn collateral
+   * @param troveId id of the trove to withdraw from
+   * @param amount collateral amount to withdraw
+   */
+  constructor(
+    market: EthAddress,
+    to: EthAddress,
+    troveId: uint256,
+    amount: uint256,
+  ) {
+    super(
+      'LiquityV2Withdraw',
+      getAddr('LiquityV2Withdraw'),
+      [
+        'address',
+        'address',
+        'uint256',
+        'uint256',
+      ],
+      [
+        market,
+        to,
+        troveId,
+        amount,
+      ],
+    );
+
+    this.mappableArgs = [
+      this.args[0],
+      this.args[1],
+      this.args[2],
+      this.args[3],
+    ];
+  }
+}

package/src/actions/liquityV2/index.ts

@@ -0,0 +1,13 @@
+export * from './LiquityV2OpenAction';
+export * from './LiquityV2CloseAction';
+export * from './LiquityV2BorrowAction';
+export * from './LiquityV2PaybackAction';
+export * from './LiquityV2SupplyAction';
+export * from './LiquityV2WithdrawAction';
+export * from './LiquityV2SPDepositAction';
+export * from './LiquityV2SPWithdrawAction';
+export * from './LiquityV2SPClaimCollAction';
+export * from './LiquityV2AdjustAction';
+export * from './LiquityV2ClaimAction';
+export * from './LiquityV2AdjustInterestRateAction';
+export * from './LiquityV2AdjustZombieTroveAction';

package/src/actions/morpho-blue/MorphoBlueReallocateLiquidityAction.ts

@@ -28,7 +28,7 @@ export class MorphoBlueReallocateLiquidityAction extends Action {
   ) {
     super(
       'MorphoBlueReallocateLiquidity',
-      getAddr('Empty'),
+      getAddr('MorphoBlueReallocateLiquidity'),
       [
         ['address', 'address', 'address', 'address', 'uint256'], // MarketParams
         'address[]', // vaults

package/src/addresses.ts

@@ -176,6 +176,21 @@ export const actionAddresses = {
     LiquityRedeem: '0x20B78854658011394C931EF2BF3cEEA2Fe62E7f0',
     LiquityAdjust: '0x0A398f6B97677192A5d5e7Ea8A937383FFf9304c',
 
+    // liquity v2
+    LiquityV2Open: '0x270A0C7eBd1C0a98FdA613782b51419300AB6322',
+    LiquityV2Close: '0xC6C627c63389D8bB7913b55CD62fa451703AD1E1',
+    LiquityV2Supply: '0x6e31Dd331571209043c8CF997f86b4291F648537',
+    LiquityV2Withdraw: '0x561013c605A17f5dC5b738C8a3fF9c5F33DbC3d8',
+    LiquityV2Borrow: '0x26C39FE05466dBA72A98d095d019dC5e067F6b28',
+    LiquityV2Payback: '0x3B1D0bD618fF8F8c51B11CD676c3384CB2A36C64',
+    LiquityV2Claim: '0xb3d3dFf3d68539F6a1bb51e56B7dC8d515aE8978',
+    LiquityV2Adjust: '0x57d6228b5EfC44174701704629A0F3EEa2c25E7f',
+    LiquityV2AdjustInterestRate: '0x3EFf4EEC06bd75941025fb751407A5de5F456bC6',
+    LiquityV2SPDeposit: '0x1e533364fE613AaD64B8D46F7A096Ae0c722239D',
+    LiquityV2SPWithdraw: '0xb080DC160415Ffe1a4b80d75b0Be92EE38a0b426',
+    LiquityV2SPClaimColl: '0xD50B0295C69e3F77BE7d99e7BdeAc442F37b373b',
+    LiquityV2AdjustZombieTrove: '0x457d4969d73FfCb656AF9002703EB4B33504dEFF',
+
     // b.protocol
     BprotocolLiquitySPDeposit: '0x5A0436c7559e37da8cD24B0f66C155a0a2fd6309',
     BprotocolLiquitySPWithdraw: '0x20Ece7CB4463bB1DbA4C4fA800E321A05dfB028B',
@@ -457,6 +472,8 @@ export const actionAddresses = {
     UpdateSub: '0x1601c6ABCDE6e6d8Ad96628AFe20d47908127Aea',
     MerklClaim: '0xa2c6cd875c52bf5c27516fae3b6ba9241790908a',
 
+    GasFeeTakerL2: '0xAEe02caf404332c40Fd7FF8d5c25F91f7c1641d0',
+
     // Flashloan
     FLAaveV3: '0x79Eb9cEe432Cd3e7b09A9eFdB21A733A6d7b4c3A',
     FLBalancer: '0x862E533198C9656B75bB6A5dDF0953F7ED5E8507',
@@ -496,6 +513,7 @@ export const actionAddresses = {
     MorphoBlueSetAuth: '0xb565630c6ddd1fae169c453667f5aa52ef4e2e39',
     MorphoBlueSetAuthWithSig: '0x80be65342f6172a6cd0b6a2653e8a887e3f46cab',
     MorphoBlueView: '0xdbcacf59c5063da8b15481f88e7d70e13c92f2a1',
+    MorphoBlueReallocateLiquidity: '0x5Ea7F30E40F6A25BE2aD23A6FC1C31A6c95F3dc8',
   },
 };
 

package/src/triggers/ClosePriceTrigger.ts

@@ -0,0 +1,19 @@
+import { Action } from '../Action';
+import { getAddr } from '../addresses';
+import { EthAddress, uint256 } from '../types';
+
+/**
+ *
+ *
+ * @category Triggers
+ */
+export class ClosePriceTrigger extends Action {
+  constructor(token:EthAddress, lowerPrice:uint256, upperPrice:uint256) {
+    super(
+      'ClosePriceTrigger',
+      getAddr('Empty'),
+      ['address', 'uint256', 'uint256'],
+      [token, lowerPrice, upperPrice],
+    );
+  }
+}

package/src/triggers/LiquityRatioTrigger.ts

@@ -12,7 +12,7 @@ export class LiquityRatioTrigger extends Action {
     super(
       'LiquityRatioTrigger',
       getAddr('Empty'),
-      ['addresss', 'uint256', 'uint8'],
+      ['address', 'uint256', 'uint8'],
       [troveOwner, ratio, state],
     );
   }

package/src/triggers/LiquityV2RatioTrigger.ts

@@ -0,0 +1,17 @@
+import { Action } from '../Action';
+import { getAddr } from '../addresses';
+import { EthAddress, uint256, uint8 } from '../types';
+
+/**
+ * @category Triggers
+ */
+export class LiquityV2RatioTrigger extends Action {
+  constructor(market: EthAddress, troveId: uint256, ratio:uint256, state:uint8) {
+    super(
+      'LiquityV2RatioTrigger',
+      getAddr('Empty'),
+      ['address', 'uint256', 'uint256', 'uint8'],
+      [market, troveId, ratio, state],
+    );
+  }
+}

package/src/triggers/index.ts

@@ -20,3 +20,5 @@ export * from './CurveUsdCollRatioTrigger';
 export * from './CurveUsdHealthRatioTrigger';
 export * from './MorphoBlueRatioTrigger';
 export * from './OffchainPriceTrigger';
+export * from './LiquityV2RatioTrigger';
+export * from './ClosePriceTrigger';

package/test/actions/basic/SendTokensAndUnwrapAction.js

@@ -0,0 +1,73 @@
+const dfs = require('../../../src');
+const {assetAmountInWei} = require("@defisaver/tokens");
+const {getAssetInfo} = require("@defisaver/tokens");
+const {encodeForDsProxyCall, encodeForRecipe} = require('../../_actionUtils');
+const {assert} = require('chai');
+
+describe('Action: SendTokensAndUnwrap', () => {
+  let action;
+  context('Transfer DAI/USDC', () => {
+    const tokens = [getAssetInfo('DAI').address, getAssetInfo('USDC').address];
+    const amounts = [assetAmountInWei(1, 'DAI'), assetAmountInWei(1, 'USDC')];
+    const receivers = ['0x0a80C3C540eEF99811f4579fa7b1A0617294e06f', '0xf0e1a5f7445211E47faa6D267Fc5A214884557aa'];
+    it('constructor', () => {
+      action = new dfs.actions.basic.SendTokensAndUnwrapAction(
+        tokens,
+        receivers,
+        amounts
+      );
+      assert.equal(action.mappableArgs[0], getAssetInfo('DAI').address);
+      assert.equal(action.mappableArgs[1], getAssetInfo('USDC').address);
+      assert.equal(action.mappableArgs[2], receivers[0]);
+      assert.equal(action.mappableArgs[3], receivers[1]);
+      assert.equal(action.mappableArgs[4], assetAmountInWei(1, 'DAI'));
+      assert.equal(action.mappableArgs[5], assetAmountInWei(1, 'USDC'));      
+    })
+    it('encodeForDsProxyCall', () => encodeForDsProxyCall(action));
+    it('encodeForRecipe', () => encodeForRecipe(action));
+    it('getEthValue', async () => {
+      const ethValue = await action.getEthValue();
+      assert.equal(ethValue, '0');
+    })
+  })
+
+  context('Transfer DAI/WETH', () => {
+    const tokens = [
+      getAssetInfo('DAI').address,
+      getAssetInfo('WETH').address,
+      getAssetInfo('WETH').address
+    ];
+    const amounts = [
+      assetAmountInWei(1, 'DAI'),
+      assetAmountInWei(1, 'WETH'),
+      assetAmountInWei(100, 'WETH'),
+    ];
+    const receivers = [
+      '0x0a80C3C540eEF99811f4579fa7b1A0617294e06f',
+      '0xf0e1a5f7445211E47faa6D267Fc5A214884557aa',
+      '0x0a80C3C540eEF99811f4579fa7b1A0617294e06f'
+    ];
+    it('constructor', () => {
+      action = new dfs.actions.basic.SendTokensAndUnwrapAction(
+        tokens,
+        receivers,
+        amounts
+      );
+        action.mappableArgs[0] = getAssetInfo('DAI').address;
+        action.mappableArgs[1] = getAssetInfo('WETH').address;
+        action.mappableArgs[2] = getAssetInfo('WETH').address;
+        action.mappableArgs[3] = receivers[0];
+        action.mappableArgs[4] = receivers[1];
+        action.mappableArgs[5] = receivers[2];
+        action.mappableArgs[6] = assetAmountInWei(1, 'DAI');
+        action.mappableArgs[7] = assetAmountInWei(1, 'WETH');
+        action.mappableArgs[8] = assetAmountInWei(100, 'WETH');
+    })
+    it('encodeForDsProxyCall', () => encodeForDsProxyCall(action));
+    it('encodeForRecipe', () => encodeForRecipe(action));
+    it('getEthValue', async () => {
+      const ethValue = await action.getEthValue();
+      assert.equal(ethValue, '0');
+    })
+  })
+})