@defisaver/sdk 0.0.26 → 0.1.1

package/.env.example

@@ -0,0 +1 @@
+RPC=

package/ACTIONS.md

@@ -7,6 +7,9 @@
 <dt><a href="#AaveClaimStkAaveAction">AaveClaimStkAaveAction</a></dt>
 <dd><p>AaveClaimStkAaveAction - Claims stkAave from incentives controller</p>
 </dd>
+<dt><a href="#AaveCollateralSwitchAction">AaveCollateralSwitchAction</a></dt>
+<dd><p>AaveCollateralSwitchAction - Aave enable/disable token usage as collateral</p>
+</dd>
 <dt><a href="#AaveMigrateLendAction">AaveMigrateLendAction</a></dt>
 <dd><p>AaveMigrateLendAction - Migrates Lend to Aave</p>
 </dd>
@@ -19,10 +22,13 @@
 <dt><a href="#AaveWithdrawAction">AaveWithdrawAction</a></dt>
 <dd><p>AaveWithdrawAction - Withdraw token from an aave position</p>
 </dd>
+<dt><a href="#BalancerV2ClaimAction">BalancerV2ClaimAction</a></dt>
+<dd></dd>
 <dt><a href="#BalancerV2SupplyAction">BalancerV2SupplyAction</a></dt>
 <dd></dd>
 <dt><a href="#BalancerV2WithdrawAction">BalancerV2WithdrawAction</a></dt>
-<dd></dd>
+<dd><p>BalancerV2WithdrawAction - Withdraw tokens from Balancer pool</p>
+</dd>
 <dt><a href="#BuyAction">BuyAction</a></dt>
 <dd><p>Buys an exact amount of dest token on DeFi Saver exchange aggregator</p>
 </dd>
@@ -56,6 +62,9 @@
 <dt><a href="#CompoundClaimAction">CompoundClaimAction</a></dt>
 <dd><p>CompoundClaimAction - Claims Comp tokens for the specified address</p>
 </dd>
+<dt><a href="#CompoundCollateralSwitchAction">CompoundCollateralSwitchAction</a></dt>
+<dd><p>CompoundCollateralSwitchAction - Compound enable/disable cToken usage as collateral</p>
+</dd>
 <dt><a href="#CompoundPaybackAction">CompoundPaybackAction</a></dt>
 <dd><p>CompoundPaybackAction - Payback borrowed tokens from Compound</p>
 </dd>
@@ -228,6 +237,12 @@ AaveBorrowAction - Borrow tokens from Aave
 ## AaveClaimStkAaveAction
 AaveClaimStkAaveAction - Claims stkAave from incentives controller
 
+**Kind**: global class  
+<a name="AaveCollateralSwitchAction"></a>
+
+## AaveCollateralSwitchAction
+AaveCollateralSwitchAction - Aave enable/disable token usage as collateral
+
 **Kind**: global class  
 <a name="AaveMigrateLendAction"></a>
 
@@ -296,6 +311,21 @@ AaveWithdrawAction - Withdraw token from an aave position
 - amount <code>string</code>
 - to <code>EthAddress</code> - Tokens will be withdrawn to this address
 
+<a name="BalancerV2ClaimAction"></a>
+
+## BalancerV2ClaimAction
+**Kind**: global class  
+<a name="new_BalancerV2ClaimAction_new"></a>
+
+### new BalancerV2ClaimAction(liquidityProvider, to, weeks, balances, merkleProofs)
+**Params**
+
+- liquidityProvider <code>EthAddress</code>
+- to <code>EthAddress</code>
+- weeks <code>Array.&lt;uint256&gt;</code>
+- balances <code>uint256</code>
+- merkleProofs <code>Array.&lt;Array.&lt;bytes32&gt;&gt;</code>
+
 <a name="BalancerV2SupplyAction"></a>
 
 ## BalancerV2SupplyAction
@@ -315,6 +345,8 @@ AaveWithdrawAction - Withdraw token from an aave position
 <a name="BalancerV2WithdrawAction"></a>
 
 ## BalancerV2WithdrawAction
+BalancerV2WithdrawAction - Withdraw tokens from Balancer pool
+
 **Kind**: global class  
 <a name="new_BalancerV2WithdrawAction_new"></a>
 
@@ -474,6 +506,12 @@ CompoundClaimAction - Claims Comp tokens for the specified address
 - from <code>EthAddress</code>
 - to <code>EthAddress</code>
 
+<a name="CompoundCollateralSwitchAction"></a>
+
+## CompoundCollateralSwitchAction
+CompoundCollateralSwitchAction - Compound enable/disable cToken usage as collateral
+
+**Kind**: global class  
 <a name="CompoundPaybackAction"></a>
 
 ## CompoundPaybackAction
@@ -482,12 +520,13 @@ CompoundPaybackAction - Payback borrowed tokens from Compound
 **Kind**: global class  
 <a name="new_CompoundPaybackAction_new"></a>
 
-### new CompoundPaybackAction(cTokenAddr, amount, from)
+### new CompoundPaybackAction(cTokenAddr, amount, from, onBehalf)
 **Params**
 
 - cTokenAddr <code>EthAddress</code>
 - amount <code>string</code> - Wei amount in underlying asset decimals (not cAsset) - ie. 18 dec for cETH, not 8
 - from <code>EthAddress</code>
+- onBehalf <code>Array.&lt;EthAddress&gt;</code>
 
 <a name="CompoundSupplyAction"></a>
 

package/DEV.md

@@ -3,6 +3,8 @@
 <dl>
 <dt><a href="#utils.module_uniswapLP">uniswapLP</a></dt>
 <dd></dd>
+<dt><a href="#utils.module_uniV3">uniV3</a></dt>
+<dd></dd>
 <dt><a href="#utils.module_zeroExExchange">zeroExExchange</a></dt>
 <dd></dd>
 </dl>
@@ -58,6 +60,18 @@ Source: https://uniswap.org/docs/v2/javascript-SDK/getting-pair-addresses/#types
 - symbolA <code>string</code>
 - symbolB <code>string</code>
 
+<a name="utils.module_uniV3"></a>
+
+## uniV3
+<a name="utils.module_uniV3.getAssetAddrByTokenId"></a>
+
+### uniV3.getAssetAddrByTokenId(web3, tokenId) ⇒ <code>Promise.&lt;Array.&lt;string&gt;&gt;</code>
+**Kind**: static method of [<code>uniV3</code>](#utils.module_uniV3)  
+**Params**
+
+- web3 <code>Object</code> - Web3 instance
+- tokenId <code>string</code>
+
 <a name="utils.module_zeroExExchange"></a>
 
 ## zeroExExchange

package/index.js

@@ -1,5 +1,6 @@
 const Action = require('./src/Action');
 const Recipe = require('./src/Recipe');
+const DfsWeb3 = require('./src/DfsWeb3');
 
 const actions = require('./src/actions/');
 const utils = require('./src/utils/');
@@ -11,4 +12,5 @@ module.exports = {
   actions,
   actionAddresses,
   utils,
+  DfsWeb3,
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/sdk",
-  "version": "0.0.26",
+  "version": "0.1.1",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -13,7 +13,7 @@
   "repository": "https://github.com/DecenterApps/defisaver-sdk",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.3.51",
+    "@defisaver/tokens": "^1.3.53",
     "@ethersproject/address": "^5.0.10",
     "@ethersproject/solidity": "^5.0.9",
     "axios": "^0.21.1",
@@ -25,6 +25,7 @@
     "chai": "^4.2.0",
     "jsdoc-to-markdown": "^6.0.1",
     "mocha": "^8.2.1",
-    "web3": "^1.3.4"
+    "web3": "^1.3.4",
+    "dotenv": "^10.0.0"
   }
 }

package/src/DfsWeb3.js

@@ -25,7 +25,9 @@ class DfsWeb3 {
     this.account = accounts[0];
     const dfsRegistry = new this.web3.eth.Contract(DFSPRoxyRegistyAbi, getAddr('DFSProxyRegistry'));
     const proxies = await dfsRegistry.methods.getAllProxies(this.account).call();
-    this.proxy = proxies[0];
+    if (proxies[0] !== '0x0000000000000000000000000000000000000000') {
+      this.proxy = proxies[0];
+    }
     this.accountReady = true;
   }
 
@@ -46,7 +48,7 @@ class DfsWeb3 {
     const transactions = [];
     const approvals = await action.getAssetsToApprove();
     await Promise.all(approvals.map(async (a) => {
-      if (a.owner.toLowercase() === this.proxy.toLowercase()) {
+      if (a.owner.toLowerCase() === this.proxy.toLowerCase()) {
         const tokenContract = new this.web3.eth.Contract(Erc20Abi, a.asset);
         const allowance = await tokenContract.methods.allowance(this.account, this.proxy).call();
         if (parseFloat(allowance.toString()) === 0) {
@@ -56,14 +58,25 @@ class DfsWeb3 {
     }));
     return transactions;
   }
-  /**
-   * @param action {(Action|Recipe)}
-   */
-  async executeViaProxy(action) {
+
+  async execute(address, params) {
     if (!this.accountReady) await this.prepareAccount();
     if (!this.proxy) throw new Error('Account does not have a Smart Wallet. Run createSmartWallet first');
     const proxyContract = new this.web3.eth.Contract(DsProxyAbi, this.proxy);
-    return proxyContract.methods['execute(address,bytes)'](...action.encodeForDsProxyCall());
+    return proxyContract.methods['execute(address,bytes)'](address, params);
+  }
+
+  /**
+   * @param action {(Action)}
+   */
+  async executeAction(action) {
+    return this.execute(...action.encodeForDsProxyCall());
+  }
+  /**
+   * @param recipe {(Recipe)}
+   */
+  async executeRecipe(recipe) {
+    return this.execute(...recipe.encodeForDsProxyCall());
   }
 }
 

package/src/actions/aave/AaveCollateralSwitchAction.js

@@ -0,0 +1,21 @@
+const Action = require("../../Action");
+const {requireAddress} = require("../../utils/general.js");
+const { getAddr } = require('../../addresses.js');
+
+/**
+ *  AaveCollateralSwitchAction - Aave enable/disable token usage as collateral
+ */
+class AaveCollateralSwitchAction extends Action {
+  constructor(market, tokens, useAsCollateral) {
+    super(
+      'AaveCollateralSwitch',
+      getAddr('AaveCollateralSwitch'),
+      [['address', 'address[]', 'bool[]']],
+      [[...arguments]],
+    );
+    this.mappableArgs = [
+  ];
+  }
+}
+
+module.exports = AaveCollateralSwitchAction;

package/src/actions/aave/index.js

@@ -4,6 +4,7 @@ const AavePaybackAction = require('./AavePaybackAction');
 const AaveWithdrawAction = require('./AaveWithdrawAction');
 const AaveMigrateLendAction = require('./AaveMigrateLendAction');
 const AaveClaimStkAaveAction = require('./AaveClaimStkAaveAction');
+const AaveCollateralSwitchAction = require('./AaveCollateralSwitchAction');
 
 module.exports = {
   AaveBorrowAction,
@@ -12,4 +13,5 @@ module.exports = {
   AaveWithdrawAction,
   AaveMigrateLendAction,
   AaveClaimStkAaveAction,
+  AaveCollateralSwitchAction
 };

package/src/actions/balancer/BalancerV2ClaimAction.js

@@ -0,0 +1,48 @@
+const Action = require("../../Action");
+const {getAddr} = require('../../addresses.js');
+
+/*
+ * BalancerV2ClaimAction - Claim BAL governance tokens
+ */
+class BalancerV2ClaimAction extends Action {
+  /**
+   * @param {EthAddress} liquidityProvider
+   * @param {EthAddress} to
+   * @param {uint256[]} weeks
+   * @param {uint256} balances
+   * @param {bytes32[][]} merkleProofs
+   */
+  constructor(liquidityProvider, to, weeks, balances, merkleProofs) {
+    super(
+      'BalancerV2Claim',
+      getAddr('BalancerV2Claim'),
+      [
+        [
+          "address",
+          "address",
+          "uint256[]",
+          "uint256[]",
+          "bytes32[][]",
+        ],
+      ],
+      [[liquidityProvider, to, weeks, balances, merkleProofs]]
+    );
+
+    this.mappableArgs = [
+      this.args[0][0],
+      this.args[0][1],
+    ];
+  }
+
+  async getAssetsToApprove() {
+
+    const approveArr = [];
+      if (this.args[0][0] !== this.args[0][1]){
+        const tokenAddress = getAddr('BalancerToken');
+        approveArr.push({asset: tokenAddress, owner: this.args[0][0]});
+      }
+    return approveArr;
+  }
+}
+
+module.exports = BalancerV2ClaimAction;

package/src/actions/balancer/BalancerV2SupplyAction.js

@@ -2,7 +2,7 @@ const Action = require("../../Action");
 const {getAddr} = require('../../addresses.js');
 
 /*
- * 
+ * BalancerV2SupplyAction - Supply tokens to Balancer pool
  */
 class BalancerV2SupplyAction extends Action {
   /**
@@ -30,8 +30,6 @@ class BalancerV2SupplyAction extends Action {
       [[poolId, from, to, tokens, maxAmountsIn, userData]]
     );
 
-    this.from = from;
-
     this.mappableArgs = [
       this.args[0][1],
       this.args[0][2],

package/src/actions/balancer/BalancerV2WithdrawAction.js

@@ -1,6 +1,9 @@
 const Action = require("../../Action");
 const {getAddr} = require('../../addresses.js');
 
+/**
+ * BalancerV2WithdrawAction - Withdraw tokens from Balancer pool
+ */
 class BalancerV2WithdrawAction extends Action {
   /**
    * @param {bytes32} poolId

package/src/actions/balancer/index.js

@@ -1,7 +1,9 @@
 const BalancerV2SupplyAction = require("./BalancerV2SupplyAction");
 const BalancerV2WithdrawAction = require("./BalancerV2WithdrawAction");
+const BalancerV2ClaimAction = require("./BalancerV2ClaimAction");
 
 module.exports = {
     BalancerV2SupplyAction,
     BalancerV2WithdrawAction,
+    BalancerV2ClaimAction,
 }

package/src/actions/basic/TokenBalanceAction.js

@@ -0,0 +1,18 @@
+const Action = require("../../Action");
+const { getAddr } = require('../../addresses.js');
+
+class TokenBalanceAction extends Action {
+  constructor(tokenAddr, holderAddr) {
+    super(
+      'TokenBalance',
+      getAddr('TokenBalance'),
+      [[
+        "address",
+        "address",
+      ]],
+      [[...arguments]]
+    );
+  }
+}
+
+module.exports = TokenBalanceAction;

package/src/actions/basic/index.js

@@ -7,6 +7,7 @@ const UnwrapEthAction = require('./UnwrapEthAction');
 const SumInputsAction = require('./SumInputsAction');
 const SubInputsAction = require('./SubInputsAction');
 const ChangeProxyOwnerAction = require('./ChangeProxyOwnerAction');
+const TokenBalanceAction = require('./TokenBalanceAction');
 
 module.exports = {
   SellAction,
@@ -18,4 +19,5 @@ module.exports = {
   SumInputsAction,
   SubInputsAction,
   ChangeProxyOwnerAction,
+  TokenBalanceAction,
 };

package/src/actions/compound/CompoundCollateralSwitchAction.js

@@ -0,0 +1,21 @@
+const Action = require("../../Action");
+const {requireAddress} = require("../../utils/general.js");
+const { getAddr } = require('../../addresses.js');
+
+/**
+ *  CompoundCollateralSwitchAction - Compound enable/disable cToken usage as collateral
+ */
+class CompoundCollateralSwitchAction extends Action {
+  constructor(cTokens, useAsCollateral) {
+    super(
+      'CompCollateralSwitch',
+      getAddr('CompCollateralSwitch'),
+      [['address[]', 'bool[]']],
+      [[...arguments]],
+    );
+    this.mappableArgs = [
+  ];
+  }
+}
+
+module.exports = CompoundCollateralSwitchAction;

package/src/actions/compound/CompoundGetDebtAction.js

@@ -0,0 +1,18 @@
+const Action = require("../../Action");
+const { getAddr } = require('../../addresses.js');
+
+class CompoundGetDebtAction extends Action {
+  constructor(cTokenAddr, holderAddr) {
+    super(
+      'CompGetDebt',
+      getAddr('CompGetDebt'),
+      [[
+        "address",
+        "address",
+      ]],
+      [[...arguments]]
+    );
+  }
+}
+
+module.exports = CompoundGetDebtAction;

package/src/actions/compound/CompoundPaybackAction.js

@@ -10,9 +10,10 @@ class CompoundPaybackAction extends Action {
    * @param cTokenAddr {EthAddress}
    * @param amount {string} Wei amount in underlying asset decimals (not cAsset) - ie. 18 dec for cETH, not 8
    * @param from {EthAddress}
+   * @param onBehalf {EthAddress} Defaults to DsProxy address if 0x0
    */
-  constructor(cTokenAddr, amount, from) {
-    super('CompPayback', getAddr('CompPayback'), ['address', 'uint256', 'address'], [...arguments]);
+  constructor(cTokenAddr, amount, from, onBehalf = getAddr('Empty')) {
+    super('CompPayback', getAddr('CompPayback'), ['address', 'uint256', 'address', 'address'], [cTokenAddr, amount, from, onBehalf]);
   }
 
   async getAssetsToApprove() {

package/src/actions/compound/index.js

@@ -3,6 +3,8 @@ const CompoundSupplyAction = require('./CompoundSupplyAction');
 const CompoundPaybackAction = require('./CompoundPaybackAction');
 const CompoundWithdrawAction = require('./CompoundWithdrawAction');
 const CompoundClaimAction = require('./CompoundClaimAction');
+const CompoundCollateralSwitchAction = require('./CompoundCollateralSwitchAction');
+const CompoundGetDebtAction = require('./CompoundGetDebtAction');
 
 module.exports = {
   CompoundBorrowAction,
@@ -10,4 +12,6 @@ module.exports = {
   CompoundPaybackAction,
   CompoundWithdrawAction,
   CompoundClaimAction,
+  CompoundCollateralSwitchAction,
+  CompoundGetDebtAction,
 };

package/src/actions/insta/InstPullTokensAction.js

@@ -0,0 +1,24 @@
+const Action = require("../../Action");
+const { getAssetInfoByAddress, getAssetInfo } = require("@defisaver/tokens");
+const { getAddr } = require("../../addresses.js");
+
+class InstPullTokensAction extends Action {
+  constructor(dsaAddress, tokens, amounts, to) {
+    super(
+      "InstPullTokens",
+      getAddr("InstPullTokens"),
+      [["address", "address[]", "uint256[]", "address"]],
+      [[dsaAddress, tokens, amounts, to]]
+    );
+    this.mappableArgs = [];
+  }
+
+  async getAssetsToApprove() {
+    return [{
+      dsaAddress: this.args[0][0],
+      specialApproveLabel: 'Instadapp' 
+    }];
+  }
+}
+
+module.exports = InstPullTokensAction;

package/src/actions/insta/index.js

@@ -1,4 +1,6 @@
 const ClaimInstMakerAction = require('./ClaimInstMakerAction');
+const InstPullTokensAction = require('./InstPullTokensAction.js');
 module.exports = {
     ClaimInstMakerAction,
+    InstPullTokensAction,
 }

package/src/addresses.js

@@ -11,6 +11,7 @@ const actionAddresses = {
   'SumInputs': '0xCdef35425579fc566B6Ee0499A79256ac88d25cf',
   'SubInputs': '0x3f71c5b806c2aCFA88bd7Ae5F7f8A14121E0FcA6',
   'ChangeProxyOwner': '0x32cEdFfF6e64f6cD1907Ae0b27b78c36320587E7',
+  'TokenBalance': '0xFEb82445aEaA675D59A43CD5833f5A6807f97ea2',
 
   // exchange
   'DFSSell': '0x9A765623F9De2D7dB26afb5f7Bb85592DF094CDB',
@@ -37,20 +38,23 @@ const actionAddresses = {
 
   // aave
   'AaveBorrow': '0xEdBbF97C505309e5174E164fbec3cAE774d310Ea',
-  'AavePayback': '0xA04dd7BbdA2DF9307654d3F91a252F911790773e',
+  'AavePayback': '0xb583Bc7603E5E482F475Ec9Ea90129029D53fbc8',
   'AaveSupply': '0xC71113E9122465e8bCd42123f840Df99abaF29F1',
   'AaveWithdraw': '0xE06Fc1CBD78Eb0799d5B0ca62D51B065886e08FC',
+  'AaveCollateralSwitch': '0x27d77c80A88665342C98Ea31B687A5fc8ca9a445',
 
   // compound
   'CompBorrow': '0xde1b05266f2D05Bf9216B76500583c2b7785b7e9',
   'CompClaim': '0xAA165C03fF61301b79f35649157f6738263739A3',
-  'CompPayback': '0xaedCD157d570Edd1513c0dafaA8CD92198335AAC',
+  'CompPayback': '0x67D2CC825730cCb70FD4579E55cDb3cf3152fcb6',
   'CompSupply': '0x1F22890C166B30cE8769b7B55354064C254e063F',
   'CompWithdraw': '0xD326a003bcfDbad0E9A4Ccc37a76Ce264345F38a',
+  'CompGetDebt': '0x009109AB7b8CAFf748cdA2F272F36043528Bef2C',
+  'CompCollateralSwitch': '0x1c0BD1E4da2c3108f6caA64609E89a37531B0f86',
 
   // flashloan
-  'FLAaveV2': '0xa290BDae65638c083e860b05009f290140fc0379',
-  'FLDyDx': '0x505079b4E049B9e641deb7E04D55e9457B8ad8Bc',
+  'FLAaveV2': '0x46aafdbc76a8b412909985d0a2c51073ff33c02e',
+  'FLDyDx': '0x973065599BACa33FC9CAD2823710f1332D2B7805',
 
   // uniswap
   'UniSupply': '0xcAE220B5398AfAad75bfeb946164f6C23CF65A98',
@@ -91,10 +95,12 @@ const actionAddresses = {
 
   // insta
   'ClaimInstMaker': '0x15E22A8160F0bDb619C6846C982F8D208A5670D2',
+  'InstPullTokens': '0x37FC940Be30e11d578243dEBea4f9B950E22aC99',
 
   // balancer
   'BalancerV2Supply': '0xD78E5D95A28a67F7851b0a94505790813A92E405',
   'BalancerV2Withdraw': '0xCcf4b96407BEF25D7df1c95045CCF64950e73E97',
+  'BalancerV2Claim': '0x259Ae83567858B7960d2De0D00F3717a764aD73B',
 };
 
 const otherAddresses = {
@@ -106,6 +112,7 @@ const otherAddresses = {
   DFSProxyRegistry: '0x29474FdaC7142f9aB7773B8e38264FA15E3805ed',
   UniswapV3PositionManager : '0xC36442b4a4522E871399CD717aBDD847Ab11FE88',
   RaiWethUniV2LPToken : '0x8aE720a71622e824F576b4A8C03031066548A3B1',
+  BalancerToken : '0xba100000625a3754423978a60c9317c58a424e3D',
 }
 
 

package/src/utils/zeroExExchange.js

@@ -54,7 +54,6 @@ const get0xPrice = async (_sellToken, _buyToken, _amount, convertAmountToWei = t
   if (res.status !== 200) throw new Error(JSON.stringify(res.data));
 
   const data = res.data;
-  console.log(data);
 
   // convert price to be able to compare with other prices onchain
   if (!shouldSell) {
@@ -180,7 +179,6 @@ const createExchangeAction = async (
     '0x', // wrapperData,
     offchainDataArray,
   ];
-  console.log(orderData);
   return shouldSell
     ? new SellAction(orderData, fromAccount, toAccount, protocolFee)
     : new BuyAction(orderData, fromAccount, toAccount, protocolFee)

package/test/DfsWeb3.js

@@ -1,3 +1,4 @@
+require('dotenv').config();
 const {assert} = require('chai');
 const DfsWeb3 = require('../src/DfsWeb3');
 const Web3 = require('web3');
@@ -8,7 +9,11 @@ describe('DfsWeb3', () => {
   let dfsWeb3;
   before(async () => {
     const web3 = new Web3(process.env.RPC);
+
+    web3.eth.getAccounts = () => ['0x0a80C3C540eEF99811f4579fa7b1A0617294e06f'];
     dfsWeb3 = new DfsWeb3(web3);
+    dfsWeb3.account = '0x0a80C3C540eEF99811f4579fa7b1A0617294e06f';
+
     await dfsWeb3.prepareAccount();
     assert.containsAllKeys(dfsWeb3, ['web3', 'account', 'proxy']);
   })
@@ -24,7 +29,7 @@ describe('DfsWeb3', () => {
         gas: '9000000',
       })
     }
-    const exec = await dfsWeb3.executeViaProxy(a);
+    const exec = await dfsWeb3.executeAction(a);
     // await exec.send({
     //   from: dfsWeb3.account,
     //   value: await a.getEthValue(),
@@ -50,7 +55,7 @@ describe('DfsWeb3', () => {
         gas: '9000000',
       })
     }
-    const exec = await dfsWeb3.executeViaProxy(r);
+    const exec = await dfsWeb3.executeRecipe(r);
     // await exec.send({
     //   from: dfsWeb3.account,
     //   value: await r.getEthValue(),

package/test/Recipe.js

@@ -24,7 +24,7 @@ describe('Recipe', () => {
     it('encodeForDsProxyCall', () => encodeForDsProxyCall(recipe));
     it('getAssetsToApprove', async () => {
       const assetsToApprove = await recipe.getAssetsToApprove();
-      assert.lengthOf(assetsToApprove, 0);
+      assert.lengthOf(assetsToApprove, 1);
     });
     it('getEthValue', async () => {
       const ethValue = await recipe.getEthValue();

package/test/actions/aave/AaveClaimStkAaveAction.js

@@ -0,0 +1,22 @@
+const dfs = require('../../../index.js');
+const {assetAmountInWei, getAssetInfo, assetAmountInEth} = require("@defisaver/tokens");
+const {encodeForDsProxyCall, encodeForRecipe} = require('../../_actionUtils');
+const {assert} = require('chai');
+const { getAddr } = require('../../../src/addresses.js');
+
+describe('Action: AaveClaimStkAaveAction', () => {
+  let action;
+  const to = '0x0a80C3C540eEF99811f4579fa7b1A0617294e06f';
+
+  context('Claims stkAave from incentives controller', () => {
+    it('constructor', () => {
+      action = new dfs.actions.aave.AaveClaimStkAaveAction(
+        [getAddr('Empty')],
+        '1000',
+        to,
+      )
+    })
+    it('encodeForDsProxyCall', () => encodeForDsProxyCall(action));
+    it('encodeForRecipe', () => encodeForRecipe(action));
+  })
+})

package/test/actions/aave/AaveCollateralSwitchAction.js

@@ -0,0 +1,21 @@
+const dfs = require('../../../index.js');
+const {assetAmountInWei, getAssetInfo, assetAmountInEth} = require("@defisaver/tokens");
+const {encodeForDsProxyCall, encodeForRecipe} = require('../../_actionUtils');
+const {assert} = require('chai');
+const { getAddr } = require('../../../src/addresses.js');
+
+describe('Action: AaveCollateralSwitchAction', () => {
+  let action;
+
+  context('Enable one token, disable other token with AaveCollSwitch Action', () => {
+    it('constructor', () => {
+      action = new dfs.actions.aave.AaveCollateralSwitchAction(
+          getAddr('AaveDefaultMarket'),
+          [getAddr('RaiWethUniV2LPToken'), getAddr('BalancerToken')],
+          [true, false],
+      )
+    })
+    it('encodeForDsProxyCall', () => encodeForDsProxyCall(action));
+    it('encodeForRecipe', () => encodeForRecipe(action));
+  })
+})