@defisaver/sdk 0.1.5 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/sdk",
-  "version": "0.1.5",
+  "version": "0.1.9",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -13,7 +13,7 @@
   "repository": "https://github.com/DecenterApps/defisaver-sdk",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.3.58",
+    "@defisaver/tokens": "^1.3.64",
     "@ethersproject/address": "^5.0.10",
     "@ethersproject/solidity": "^5.0.9",
     "axios": "^0.21.1",

package/src/Recipe.js

@@ -81,7 +81,8 @@ class Recipe {
     const assetOwnerPairs = await Promise.all(this.actions.map(a => a.getAssetsToApprove()));
     for (const pairsPerAction of assetOwnerPairs) {
       for (const pair of pairsPerAction) {
-        if (!uniqueAssetOwnerPairs.find(_pair => _pair.owner === pair.owner && _pair.asset === pair.asset)) {
+        const isNft = !pair.asset;
+        if (!uniqueAssetOwnerPairs.find(_pair => _pair.owner === pair.owner && (isNft ? _pair.tokenId === pair.tokenId : _pair.asset === pair.asset))) {
           uniqueAssetOwnerPairs.push(pair);
         }
       }

package/src/actions/basic/AutomationV2Unsub.js

@@ -0,0 +1,15 @@
+const Action = require("@defisaver/sdk/src/Action");
+const { getAddr } = require('@defisaver/sdk/src/addresses');
+
+class AutomationV2Unsub extends Action {
+  constructor(protocol, cdpId = 0) {
+    super(
+      'AutomationV2Unsub',
+      getAddr('AutomationV2Unsub'),
+      [["uint256", "uint256"]],
+      [[cdpId, protocol]]
+    );
+  }
+}
+
+module.exports = AutomationV2Unsub;

package/src/actions/basic/index.js

@@ -8,6 +8,7 @@ const SumInputsAction = require('./SumInputsAction');
 const SubInputsAction = require('./SubInputsAction');
 const ChangeProxyOwnerAction = require('./ChangeProxyOwnerAction');
 const TokenBalanceAction = require('./TokenBalanceAction');
+const AutomationV2Unsub = require('./AutomationV2Unsub');
 
 module.exports = {
   SellAction,
@@ -20,4 +21,5 @@ module.exports = {
   SubInputsAction,
   ChangeProxyOwnerAction,
   TokenBalanceAction,
+  AutomationV2Unsub,
 };

package/src/actions/flashloan/MakerFlashLoanAction.js

@@ -15,7 +15,7 @@ class MakerFlashLoanAction extends Action {
       'FLMaker',
       getAddr('FLMaker'),
       [['uint256', 'address', 'bytes'], 'uint256'],
-      [[... arguments], 0]
+      [[amount, flParamGetterAddr, flParamGetterData], 0]
     );
   }
 }

package/src/actions/guni/GUniDeposit.js

@@ -0,0 +1,43 @@
+const Action = require("../../Action");
+const { getAssetInfo } = require("@defisaver/tokens");
+const { getAddr } = require('../../addresses.js');
+
+/**
+ * Action that adds liquidity to G-UNI pool of interest (mints G-UNI LP tokens)
+*/
+class GUniDeposit extends Action {
+    /// @param pool address of G-UNI pool to add liquidity to
+    /// @param token0 address of token0
+    /// @param token1 address of token1
+    /// @param amount0Max the maximum amount of token0 msg.sender willing to input
+    /// @param amount1Max the maximum amount of token1 msg.sender willing to input
+    /// @param amount0Min the minimum amount of token0 actually input (slippage protection)
+    /// @param amount1Min the minimum amount of token1 actually input (slippage protection)
+    /// @param to account to receive minted G-UNI tokens
+    /// @param from account from which to pull underlying tokens from
+  constructor(pool, token0, token1, amount0Max, amount1max, amount0Min, amount1Min, to, from) {
+    super(
+        'GUniDeposit',
+        getAddr('GUniDeposit'),
+        [['address', 'address', 'address', 'uint256', 'uint256', 'uint256', 'uint256', 'address', 'address']],
+        [[pool, token0, token1, amount0Max, amount1max, amount0Min, amount1Min, to, from]]
+    );
+    this.mappableArgs = [
+        this.args[0][3],
+        this.args[0][4],
+        this.args[0][5],
+        this.args[0][6],
+    ];
+  }
+
+  async getAssetsToApprove() {
+    const approveArr = [];
+
+    approveArr.push({asset: this.args[0][1], owner: this.args[0][8]});
+    approveArr.push({asset: this.args[0][2], owner: this.args[0][8]});
+
+    return approveArr;
+  }
+}
+
+module.exports = GUniDeposit;

package/src/actions/guni/GUniWithdraw.js

@@ -0,0 +1,32 @@
+const Action = require("../../Action");
+const { getAssetInfo } = require("@defisaver/tokens");
+const { getAddr } = require('../../addresses.js');
+
+/**
+ * Action that removes liquidity from a G-UNI pool and burns G-UNI LP tokens
+*/
+class GUniWithdraw extends Action {
+    /// @param pool address of G-UNI pool to remove liquidity from
+    /// @param burnAmount The number of G-UNI tokens to burn
+    /// @param amount0Min Minimum amount of token0 received after burn (slippage protection)
+    /// @param amount1Min Minimum amount of token1 received after burn (slippage protection)
+    /// @param to The account to receive the underlying amounts of token0 and token1
+    /// @param from Account from which to pull G-Uni LP tokens
+  constructor(pool, burnAmount, amount0Min, amount1Min, to, from) {
+    super(
+        'GUniWithdraw',
+        getAddr('GUniWithdraw'),
+        [['address', 'uint256', 'uint256', 'uint256', 'address', 'address']],
+        [[pool, burnAmount, amount0Min, amount1Min, to, from]]
+    );
+    this.mappableArgs = [
+        this.args[0][1],
+    ];
+  }
+
+  async getAssetsToApprove() {
+    return [{asset: this.args[0][0], owner: this.args[0][5]}];
+  }
+}
+
+module.exports = GUniWithdraw;

package/src/actions/guni/index.js

@@ -0,0 +1,6 @@
+const GUniDeposit = require('./GUniDeposit');
+const GUniWithdraw = require('./GUniWithdraw.js');
+module.exports = {
+    GUniDeposit,
+    GUniWithdraw,
+}

package/src/actions/index.js

@@ -12,6 +12,9 @@ const yearn = require('./yearn');
 const lido = require('./lido');
 const insta = require('./insta');
 const balancer = require('./balancer');
+const guni = require('./guni');
+const mstable = require('./mstable');
+const rari = require('./rari');
 
 module.exports = {
   maker,
@@ -28,4 +31,7 @@ module.exports = {
   lido,
   insta,
   balancer,
+  guni,
+  mstable,
+  rari,
 };

package/src/actions/lido/LidoStakeAction.js

@@ -1,5 +1,5 @@
 const Action = require("../../Action");
-const {getAssetInfoByAddress, getAssetInfo} = require("@defisaver/tokens");
+const { getAssetInfo } = require("@defisaver/tokens");
 const { getAddr } = require('../../addresses.js');
 
 /**

package/src/actions/lido/LidoUnwrapAction.js

@@ -1,5 +1,4 @@
 const Action = require("../../Action");
-const {getAssetInfoByAddress, getAssetInfo} = require("@defisaver/tokens");
 const { getAddr } = require('../../addresses.js');
 
 /**

package/src/actions/lido/LidoWrapAction.js

@@ -1,7 +1,6 @@
 const Action = require("../../Action");
-const {getAssetInfoByAddress, getAssetInfo} = require("@defisaver/tokens");
+const { getAssetInfo } = require("@defisaver/tokens");
 const { getAddr } = require('../../addresses.js');
-const { lidoWrap } = require("../../../../../../test/actions");
 
 /**
  * LidoWrapAction - Turns WETH or StEth into WStEth
@@ -11,7 +10,7 @@ class LidoWrapAction extends Action {
    * @param amount {string} amount to pull and stake
    * @param from {EthAddress} tokens will be taken from this address
    * @param to {EthAddress} WStEth will be sent to this address
-   * @param useEth {bool} true for using WETH, false for using stEth
+   * @param useEth {boolean} true for using WETH, false for using stEth
    */
   constructor(amount, from, to, useEth) {
     super('LidoWrap', getAddr('LidoWrap'), [['uint256','address', 'address', 'bool']], [[amount, from, to, useEth]]);

package/src/actions/mstable/MStableClaimAction.js

@@ -0,0 +1,38 @@
+const Action = require("@defisaver/sdk/src/Action");
+const {requireAddress} = require("@defisaver/sdk/src/utils/general");
+const { getAddr } = require('@defisaver/sdk/src/addresses');
+
+/**
+ * MStableClaimAction
+ */
+class MStableClaimAction extends Action {
+    /**
+     * @param vaultAddress
+     * @param to
+     * @param first
+     * @param last
+     */
+    constructor(
+        vaultAddress,
+        to,
+        first,
+        last,
+    ) {
+        requireAddress(vaultAddress);
+        requireAddress(to);
+
+        super(
+            'MStableClaim',
+            getAddr('MStableClaim'),
+            [['address', 'address', 'uint256', 'uint256']],
+            [[...arguments]],
+        );
+
+        this.mappableArgs = [
+            this.args[0][0],
+            this.args[0][1],
+        ];
+    }
+}
+
+module.exports = MStableClaimAction;

package/src/actions/mstable/MStableDepositAction.js

@@ -0,0 +1,63 @@
+const Action = require("@defisaver/sdk/src/Action");
+const {requireAddress} = require("@defisaver/sdk/src/utils/general");
+const { getAddr } = require('@defisaver/sdk/src/addresses');
+
+/**
+ * MStableDepositAction
+ */
+class MStableDepositAction extends Action {
+    /**
+     * @param bAsset
+     * @param mAsset
+     * @param saveAddress
+     * @param vaultAddress
+     * @param from
+     * @param to
+     * @param amount
+     * @param minOut
+     * @param stake
+     */
+    constructor(
+        bAsset,
+        mAsset,
+        saveAddress,
+        vaultAddress,
+        from,
+        to,
+        amount,
+        minOut,
+        stake,
+    ) {
+        requireAddress(bAsset);
+        requireAddress(mAsset);
+        requireAddress(saveAddress);
+        requireAddress(vaultAddress);
+        requireAddress(from);
+        requireAddress(to);
+
+        super(
+            'MStableDeposit',
+            getAddr('MStableDeposit'),
+            [['address', 'address', 'address', 'address', 'address', 'address', 'uint256', 'uint256', 'bool']],
+            [[...arguments]],
+        );
+
+        this.mappableArgs = [
+            this.args[0][0],
+            this.args[0][1],
+            this.args[0][2],
+            this.args[0][3],
+            this.args[0][4],
+            this.args[0][5],
+            this.args[0][6],
+            this.args[0][7],
+            this.args[0][8],
+        ];
+    }
+
+    async getAssetsToApprove() {
+        return [{ asset: this.args[0][0], owner: this.args[0][4]}];
+    }
+}
+
+module.exports = MStableDepositAction;

package/src/actions/mstable/MStableWithdrawAction.js

@@ -0,0 +1,66 @@
+const Action = require("@defisaver/sdk/src/Action");
+const {requireAddress} = require("@defisaver/sdk/src/utils/general");
+const { getAddr } = require('@defisaver/sdk/src/addresses');
+
+/**
+ * MStableWithdrawAction
+ */
+class MStableWithdrawAction extends Action {
+    /**
+     * @param bAsset
+     * @param mAsset
+     * @param saveAddress
+     * @param vaultAddress
+     * @param from
+     * @param to
+     * @param amount
+     * @param minOut
+     * @param stake
+     */
+    constructor(
+        bAsset,
+        mAsset,
+        saveAddress,
+        vaultAddress,
+        from,
+        to,
+        amount,
+        minOut,
+        unstake,
+    ) {
+        requireAddress(bAsset);
+        requireAddress(mAsset);
+        requireAddress(saveAddress);
+        requireAddress(vaultAddress);
+        requireAddress(from);
+        requireAddress(to);
+
+        super(
+            'MStableWithdraw',
+            getAddr('MStableWithdraw'),
+            [['address', 'address', 'address', 'address', 'address', 'address', 'uint256', 'uint256', 'bool']],
+            [[...arguments]],
+        );
+
+        this.mappableArgs = [
+            this.args[0][0],
+            this.args[0][1],
+            this.args[0][2],
+            this.args[0][3],
+            this.args[0][4],
+            this.args[0][5],
+            this.args[0][6],
+            this.args[0][7],
+            this.args[0][8],
+        ];
+    }
+
+    async getAssetsToApprove() {
+        const asset = this.args[2];
+        const from = this.args[4];
+        const unstake = this.args[8];
+        return unstake ? [] : [{asset: getAssetInfo(asset).address, owner: from}]
+      }
+}
+
+module.exports = MStableWithdrawAction;

package/src/actions/mstable/index.js

@@ -0,0 +1,9 @@
+const MStableDepositAction = require('./MStableDepositAction');
+const MStableWithdrawAction = require('./MStableWithdrawAction');
+const MStableClaimAction = require('./MStableClaimAction');
+
+module.exports = {
+    MStableDepositAction,
+    MStableWithdrawAction,
+    MStableClaimAction,
+}

package/src/actions/rari/RariDepositAction.js

@@ -0,0 +1,31 @@
+const Action = require("../../Action");
+const { getAssetInfo } = require("@defisaver/tokens");
+const { getAddr } = require('../../addresses.js');
+
+/**
+ * RariDepositAction - action that deposits one stablecoin (DAI, USDC, USDT, TUSD, BUSD, and sUSD) and receives RSPT back
+ */
+class RariDepositAction extends Action {
+  /**
+   * @param fundManager {EthAddress} fundManager for the pool which we want to deposit into
+   * @param stablecoinAddress {EthAddress} stablecoin token address
+   * @param poolTokenAddress {EthAddress} poolTokenAddress
+   * @param amount {string} amount of stablecoin to pull and deposit
+   * @param from {EthAddress} stablecoins will be taken from this address
+   * @param to {EthAddress} RSPT will be sent to this address
+   */
+  constructor(fundManager, stablecoinAddress, poolTokenAddress, amount, from, to) {
+    super('RariDeposit', getAddr('RariDeposit'), [['address', 'address', 'address', 'uint256', 'address', 'address']], [[fundManager, stablecoinAddress, poolTokenAddress, amount, from, to]]);
+    this.mappableArgs = [
+      this.args[0][3],
+      this.args[0][4],
+      this.args[0][5],
+    ];
+  }
+
+  async getAssetsToApprove() {
+    return [{asset: this.args[0][1], owner: this.args[0][4]}];
+  }
+}
+
+module.exports = RariDepositAction;

package/src/actions/rari/RariWithdrawAction.js

@@ -0,0 +1,33 @@
+const Action = require("../../Action");
+const { getAssetInfo } = require("@defisaver/tokens");
+const { getAddr } = require('../../addresses.js');
+
+/**
+ * RariWithdrawAction - Send pool tokens to fund manager which burns them, receive underlying stablecoin back
+ */
+class RariWithdrawAction extends Action {
+  /**
+   * @param fundManager {EthAddress} fundManager for the pool which we want to withdraw from
+   * @param poolTokenAddress {EthAddress} poolToken address
+   * @param poolTokensAmountToPull {string} amount of tokens to pull to proxy
+   * @param from {EthAddress} poolTokens will be taken from this address
+   * @param stablecoinAddress {EthAddress} stablecoin token address
+   * @param stablecoinAmountToWithdraw {string} amount of stablecoin to withdraw from Rari
+   * @param to {EthAddress} stablecoins withdrawn will be sent to this address
+   */
+  constructor(fundManager, poolTokenAddress, poolTokensAmountToPull, from, stablecoinAddress, stablecoinAmountToWithdraw, to) {
+    super('RariWithdraw', getAddr('RariWithdraw'), [['address', 'address', 'uint256', 'address', 'address', 'uint256', 'address']], [[fundManager, poolTokenAddress, poolTokensAmountToPull, from, stablecoinAddress, stablecoinAmountToWithdraw, to]]);
+    this.mappableArgs = [
+      this.args[0][2],
+      this.args[0][3],
+      this.args[0][5],
+      this.args[0][6],
+    ];
+  }
+
+  async getAssetsToApprove() {
+    return [{asset: this.args[0][1], owner: this.args[0][3]}];
+  }
+}
+
+module.exports = RariWithdrawAction;

package/src/actions/rari/index.js

@@ -0,0 +1,6 @@
+const RariDepositAction = require('./RariDepositAction');
+const RariWithdrawAction = require('./RariWithdrawAction');
+module.exports = {
+    RariDepositAction,
+    RariWithdrawAction,
+}

package/src/addresses.js

@@ -12,6 +12,7 @@ const actionAddresses = {
   'SubInputs': '0x3f71c5b806c2aCFA88bd7Ae5F7f8A14121E0FcA6',
   'ChangeProxyOwner': '0x32cEdFfF6e64f6cD1907Ae0b27b78c36320587E7',
   'TokenBalance': '0xFEb82445aEaA675D59A43CD5833f5A6807f97ea2',
+  'AutomationV2Unsub': '0xd3D70313d1E2ab6ae47674C88390Fd9865806201',
 
   // exchange
   'DFSSell': '0x9A765623F9De2D7dB26afb5f7Bb85592DF094CDB',
@@ -105,6 +106,19 @@ const actionAddresses = {
   'BalancerV2Supply': '0xD78E5D95A28a67F7851b0a94505790813A92E405',
   'BalancerV2Withdraw': '0xCcf4b96407BEF25D7df1c95045CCF64950e73E97',
   'BalancerV2Claim': '0x259Ae83567858B7960d2De0D00F3717a764aD73B',
+
+  // GUni
+   'GUniWithdraw': '0xa329263fFac25F86E03481Ec39307bbf5DbeDD83',
+   'GUniDeposit': '0xe943958f01630038c23f8471a2d0ea4378e58b0d',
+
+   // Rari
+   'RariDeposit': '0xC627A3F12c4f7236218a511DC10e3f5ead1a1D7c',
+   'RariWithdraw': '0x8408EeCcC2c2FC25F2cF720398DAAD0A05EfE487',
+  
+   // mStable
+   'MStableDeposit': '0x1887235CFE1927782a3e7eD15fb073586c949858',
+   'MStableWithdraw': '0xb164456190577fbBe8FB8bF5Fa48a106b328A579',
+   'MStableClaim': '0x28279A806aDeDedFD33e39C7375dc0c0ee943847',
 };
 
 const otherAddresses = {