@defisaver/sdk 1.2.16 → 1.2.17

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/addresses.ts

@@ -176,6 +176,21 @@ export const actionAddresses = {
     LiquityRedeem: '0x20B78854658011394C931EF2BF3cEEA2Fe62E7f0',
     LiquityAdjust: '0x0A398f6B97677192A5d5e7Ea8A937383FFf9304c',
 
+    // liquity v2
+    LiquityV2Open: '0x6CEdC0317A9236CdFD800e6a6F41074f01d8229F',
+    LiquityV2Close: '0xBD97F8fCfdb03ca29F0C9baCA7Cb09c5A51E4adE',
+    LiquityV2Supply: '0x89403Bc80FDb1adbcf4Ea7b6acFB26197E47F2AA',
+    LiquityV2Withdraw: '0xDcBd59b7095edC5fd29063873Ec5d62F8BB18E9A',
+    LiquityV2Borrow: '0x092afc8AB25C6d5A2cE8CeAc4801fd8B1eFa5759',
+    LiquityV2Payback: '0x2B51c21a1af1316Af89f0493b2FF5C5D34D4626f',
+    LiquityV2Claim: '0x1b5a0c2573A1692bB183cC5d6f506e108c0599FC',
+    LiquityV2Adjust: '0x6063CaD05DBf1c15f643C0F483bc5ce749501d3C',
+    LiquityV2AdjustInterestRate: '0x685f0237D8b85B2018278E975a481b0650dE0b54',
+    LiquityV2SPDeposit: '0x1556711572a53c89912AE185f3a6Dba9FF365Bf3',
+    LiquityV2SPWithdraw: '0x237eaB8D7f9bBeaF8D27dB9797EB835e4062B8C2',
+    LiquityV2SPClaimColl: '0x3f783de20C3095bcB999AEA999aF4DF184b6630f',
+    LiquityV2AdjustZombieTrove: '0xDaB6aA000B0EBAa653A2715cb3847976bf614272',
+
     // b.protocol
     BprotocolLiquitySPDeposit: '0x5A0436c7559e37da8cD24B0f66C155a0a2fd6309',
     BprotocolLiquitySPWithdraw: '0x20Ece7CB4463bB1DbA4C4fA800E321A05dfB028B',
@@ -457,6 +472,8 @@ export const actionAddresses = {
     UpdateSub: '0x1601c6ABCDE6e6d8Ad96628AFe20d47908127Aea',
     MerklClaim: '0xa2c6cd875c52bf5c27516fae3b6ba9241790908a',
 
+    GasFeeTakerL2: '0xAEe02caf404332c40Fd7FF8d5c25F91f7c1641d0',
+
     // Flashloan
     FLAaveV3: '0x79Eb9cEe432Cd3e7b09A9eFdB21A733A6d7b4c3A',
     FLBalancer: '0x862E533198C9656B75bB6A5dDF0953F7ED5E8507',

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/LiquityV2QuotePriceTrigger.ts

@@ -0,0 +1,17 @@
+import { Action } from '../Action';
+import { getAddr } from '../addresses';
+import { EthAddress, uint256, uint8 } from '../types';
+
+/**
+ * @category Triggers
+ */
+export class LiquityV2QuotePriceTrigger extends Action {
+  constructor(market: EthAddress, price:uint256, state:uint8) {
+    super(
+      'LiquityV2QuotePriceTrigger',
+      getAddr('Empty'),
+      ['address', 'uint256', 'uint8'],
+      [market, price, 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,6 @@ export * from './CurveUsdCollRatioTrigger';
 export * from './CurveUsdHealthRatioTrigger';
 export * from './MorphoBlueRatioTrigger';
 export * from './OffchainPriceTrigger';
+export * from './LiquityV2RatioTrigger';
+export * from './ClosePriceTrigger';
+export * from './LiquityV2QuotePriceTrigger';

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');
+    })
+  })
+})