@defisaver/sdk 0.1.23 → 0.1.24

package/ACTIONS.md

@@ -10,6 +10,9 @@
 <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>
 <dt><a href="#AavePaybackAction">AavePaybackAction</a></dt>
 <dd><p>AavePaybackAction - Payback borrowed tokens from Aave</p>
 </dd>
@@ -26,9 +29,6 @@
 <dt><a href="#BalancerV2WithdrawAction">BalancerV2WithdrawAction</a></dt>
 <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>
 <dt><a href="#ChangeProxyOwnerAction">ChangeProxyOwnerAction</a></dt>
 <dd><p>ChangeProxyOwnerAction - Changes EOA which owns the proxy that is being called</p>
 </dd>
@@ -71,29 +71,6 @@
 <dt><a href="#CompoundWithdrawAction">CompoundWithdrawAction</a></dt>
 <dd><p>CompoundWithdrawAction - Withdraw token from an Compound position</p>
 </dd>
-<dt><a href="#CurveClaimFeesAction">CurveClaimFeesAction</a></dt>
-<dd></dd>
-<dt><a href="#CurveDepositAction">CurveDepositAction</a></dt>
-<dd></dd>
-<dt><a href="#CurveGaugeDepositAction">CurveGaugeDepositAction</a></dt>
-<dd></dd>
-<dt><a href="#CurveGaugeWithdrawAction">CurveGaugeWithdrawAction</a></dt>
-<dd></dd>
-<dt><a href="#CurveMintCrvAction">CurveMintCrvAction</a></dt>
-<dd></dd>
-<dt><a href="#CurveStethPoolDepositAction">CurveStethPoolDepositAction</a></dt>
-<dd><p>CurveStethPoolDepositAction - Deposits tokens into curve steth pool</p>
-</dd>
-<dt><a href="#CurveStethPoolWithdrawAction">CurveStethPoolWithdrawAction</a></dt>
-<dd><p>CurveStethPoolWithdrawAction - Withdraws tokens from curve steth pool</p>
-</dd>
-<dt><a href="#CurveSwapAction">CurveSwapAction</a></dt>
-<dd></dd>
-<dt><a href="#CurveWithdrawAction">CurveWithdrawAction</a></dt>
-<dd></dd>
-<dt><a href="#DyDxSupplyAction">DyDxSupplyAction</a></dt>
-<dd><p>DyDxSupplyAction - Supply token to an DyDx position</p>
-</dd>
 <dt><a href="#DyDxWithdrawAction">DyDxWithdrawAction</a></dt>
 <dd><p>DyDxWithdrawAction - Withdraw token from an DyDx position</p>
 </dd>
@@ -115,27 +92,9 @@
 <dt><a href="#DyDxFlashLoanPaybackAction">DyDxFlashLoanPaybackAction</a></dt>
 <dd><p>Pays back a flashloan from DyDx</p>
 </dd>
-<dt><a href="#MakerFlashLoanAction">MakerFlashLoanAction</a></dt>
-<dd><p>Gets a flashloan from Maker</p>
-</dd>
-<dt><a href="#MakerFlashLoanPaybackAction">MakerFlashLoanPaybackAction</a></dt>
-<dd><p>Pays back a flashloan from Maker</p>
-</dd>
-<dt><a href="#GUniDeposit">GUniDeposit</a></dt>
-<dd><p>Action that adds liquidity to G-UNI pool of interest (mints G-UNI LP tokens)</p>
-</dd>
-<dt><a href="#GUniWithdraw">GUniWithdraw</a></dt>
-<dd><p>Action that removes liquidity from a G-UNI pool and burns G-UNI LP tokens</p>
-</dd>
 <dt><a href="#LidoStakeAction">LidoStakeAction</a></dt>
 <dd><p>LidoStakeAction - Receives WETH, transforms it to ETH then sends it to Lido staking contract receiving stETH in return</p>
 </dd>
-<dt><a href="#LidoUnwrapAction">LidoUnwrapAction</a></dt>
-<dd><p>LidoUnwrapAction - Unwraps WStEth into StEth</p>
-</dd>
-<dt><a href="#LidoWrapAction">LidoWrapAction</a></dt>
-<dd><p>LidoWrapAction - Turns WETH or StEth into WStEth</p>
-</dd>
 <dt><a href="#LiquityBorrowAction">LiquityBorrowAction</a></dt>
 <dd><p>LiquityBorrowAction - Borrows LUSD from the trove</p>
 </dd>
@@ -181,9 +140,6 @@
 <dt><a href="#LiquityWithdrawAction">LiquityWithdrawAction</a></dt>
 <dd><p>LiquityWithdrawAction - Withdraws collateral from the trove</p>
 </dd>
-<dt><a href="#MakerClaimAction">MakerClaimAction</a></dt>
-<dd><p>MakerClaimAction - Claim bonus tokens in CropJoin types</p>
-</dd>
 <dt><a href="#MakerGenerateAction">MakerGenerateAction</a></dt>
 <dd><p>MakerGenerateAction - Generated Dai from a Vault</p>
 </dd>
@@ -302,6 +258,18 @@ AaveClaimStkAaveAction - Claims stkAave from incentives controller
 ## AaveCollateralSwitchAction
 AaveCollateralSwitchAction - Aave enable/disable token usage as collateral
 
+**Kind**: global class  
+<a name="AaveMigrateLendAction"></a>
+
+## 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="AavePaybackAction"></a>
 
@@ -405,22 +373,6 @@ BalancerV2WithdrawAction - Withdraw tokens from Balancer pool
 - minAmountsOut <code>Array.&lt;uint256&gt;</code>
 - userData <code>bytes</code>
 
-<a name="BuyAction"></a>
-
-## BuyAction
-Buys an exact amount of dest token on DeFi Saver exchange aggregator
-
-**Kind**: global class  
-<a name="new_BuyAction_new"></a>
-
-### new BuyAction(exchangeOrder, from, to, protocolFee)
-**Params**
-
-- exchangeOrder <code>Array</code> - Standard DFS Exchange data
-- from <code>string</code> - Order sender
-- to <code>string</code> - Order recipient
-- protocolFee <code>string</code> - 0x fee (amount of ETH in Wei)
-
 <a name="ChangeProxyOwnerAction"></a>
 
 ## ChangeProxyOwnerAction
@@ -570,7 +522,7 @@ CompoundPaybackAction - Payback borrowed tokens from Compound
 - 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>EthAddress</code> - Defaults to DsProxy address if 0x0
+- onBehalf <code>Array.&lt;EthAddress&gt;</code>
 
 <a name="CompoundSupplyAction"></a>
 
@@ -603,163 +555,6 @@ CompoundWithdrawAction - Withdraw token from an Compound position
 - amount <code>string</code> - Wei amount in underlying asset decimals (not cAsset) - ie. 18 dec for cETH, not 8
 - to <code>EthAddress</code>
 
-<a name="CurveClaimFeesAction"></a>
-
-## CurveClaimFeesAction
-**Kind**: global class  
-<a name="new_CurveClaimFeesAction_new"></a>
-
-### new CurveClaimFeesAction(claimFor, receiver)
-**Params**
-
-- claimFor <code>EthAddress</code>
-- receiver <code>EthAddress</code>
-
-<a name="CurveDepositAction"></a>
-
-## CurveDepositAction
-**Kind**: global class  
-<a name="new_CurveDepositAction_new"></a>
-
-### new CurveDepositAction(sender, receiver, depositTarget, lpToken, sig, minMintAmount, amounts, tokens, useUnderlying)
-**Params**
-
-- sender <code>EthAddress</code>
-- receiver <code>EthAddress</code>
-- depositTarget <code>EthAddress</code>
-- lpToken <code>EthAddress</code>
-- sig <code>bytes4</code>
-- minMintAmount <code>string</code>
-- amounts <code>Array.&lt;string&gt;</code>
-- tokens <code>Array.&lt;EthAddress&gt;</code>
-- useUnderlying <code>boolean</code>
-
-<a name="CurveGaugeDepositAction"></a>
-
-## CurveGaugeDepositAction
-**Kind**: global class  
-<a name="new_CurveGaugeDepositAction_new"></a>
-
-### new CurveGaugeDepositAction(gaugeAddr, lpToken, sender, onBehalfOf, amount)
-**Params**
-
-- gaugeAddr <code>EthAddress</code>
-- lpToken <code>EthAddress</code>
-- sender <code>EthAddress</code>
-- onBehalfOf <code>EthAddress</code>
-- amount <code>string</code>
-
-<a name="CurveGaugeWithdrawAction"></a>
-
-## CurveGaugeWithdrawAction
-**Kind**: global class  
-<a name="new_CurveGaugeWithdrawAction_new"></a>
-
-### new CurveGaugeWithdrawAction(gaugeAddr, lpToken, receiver, amount)
-**Params**
-
-- gaugeAddr <code>EthAddress</code>
-- lpToken <code>EthAddress</code>
-- receiver <code>EthAddress</code>
-- amount <code>string</code>
-
-<a name="CurveMintCrvAction"></a>
-
-## CurveMintCrvAction
-**Kind**: global class  
-<a name="new_CurveMintCrvAction_new"></a>
-
-### new CurveMintCrvAction(gaugeAddrs, receiver)
-**Params**
-
-- gaugeAddrs <code>Array.&lt;EthAddress&gt;</code>
-- receiver <code>EthAddress</code>
-
-<a name="CurveStethPoolDepositAction"></a>
-
-## CurveStethPoolDepositAction
-CurveStethPoolDepositAction - Deposits tokens into curve steth pool
-
-**Kind**: global class  
-<a name="new_CurveStethPoolDepositAction_new"></a>
-
-### new CurveStethPoolDepositAction(from, to, amounts, minMintAmount)
-**Params**
-
-- from <code>address</code>
-- to <code>address</code>
-- amounts <code>Array.&lt;string&gt;</code>
-- minMintAmount <code>string</code>
-
-<a name="CurveStethPoolWithdrawAction"></a>
-
-## CurveStethPoolWithdrawAction
-CurveStethPoolWithdrawAction - Withdraws tokens from curve steth pool
-
-**Kind**: global class  
-<a name="new_CurveStethPoolWithdrawAction_new"></a>
-
-### new CurveStethPoolWithdrawAction(from, to, amounts, maxBurnAmount, returnValue)
-**Params**
-
-- from <code>address</code>
-- to <code>address</code>
-- amounts <code>Array.&lt;string&gt;</code>
-- maxBurnAmount <code>string</code>
-- returnValue <code>string</code>
-
-<a name="CurveSwapAction"></a>
-
-## CurveSwapAction
-**Kind**: global class  
-<a name="new_CurveSwapAction_new"></a>
-
-### new CurveSwapAction(sender, receiver, pool, tokenA, tokenB, amount, expected)
-**Params**
-
-- sender <code>EthAddress</code>
-- receiver <code>EthAddress</code>
-- pool <code>EthAddress</code>
-- tokenA <code>EthAddress</code>
-- tokenB <code>EthAddress</code>
-- amount <code>string</code>
-- expected <code>string</code>
-
-<a name="CurveWithdrawAction"></a>
-
-## CurveWithdrawAction
-**Kind**: global class  
-<a name="new_CurveWithdrawAction_new"></a>
-
-### new CurveWithdrawAction(sender, receiver, depositTarget, lpToken, sig, burnAmount, minAmounts, tokens, withdrawExact, useUnderlying)
-**Params**
-
-- sender <code>EthAddress</code>
-- receiver <code>EthAddress</code>
-- depositTarget <code>EthAddress</code>
-- lpToken <code>EthAddress</code>
-- sig <code>bytes4</code>
-- burnAmount <code>string</code>
-- minAmounts <code>Array.&lt;string&gt;</code>
-- tokens <code>Array.&lt;EthAddress&gt;</code>
-- withdrawExact <code>boolean</code>
-- useUnderlying <code>boolean</code>
-
-<a name="DyDxSupplyAction"></a>
-
-## DyDxSupplyAction
-DyDxSupplyAction - Supply token to an DyDx position
-
-**Kind**: global class  
-<a name="new_DyDxSupplyAction_new"></a>
-
-### new DyDxSupplyAction(tokenAddr, amount, from)
-**Params**
-
-- tokenAddr <code>EthAddress</code>
-- amount <code>string</code>
-- from <code>EthAddress</code> - Tokens will be supplied from this address
-
 <a name="DyDxWithdrawAction"></a>
 
 ## DyDxWithdrawAction
@@ -867,46 +662,6 @@ Pays back a flashloan from DyDx
 - loanAmount <code>string</code>
 - tokenAddr <code>EthAddress</code>
 
-<a name="MakerFlashLoanAction"></a>
-
-## MakerFlashLoanAction
-Gets a flashloan from Maker
-
-**Kind**: global class  
-<a name="new_MakerFlashLoanAction_new"></a>
-
-### new MakerFlashLoanAction(amount, flParamGetterAddr, flParamGetterData)
-**Params**
-
-- amount <code>string</code>
-- flParamGetterAddr <code>EthAddress</code>
-- flParamGetterData <code>bytes</code>
-
-<a name="MakerFlashLoanPaybackAction"></a>
-
-## MakerFlashLoanPaybackAction
-Pays back a flashloan from Maker
-
-**Kind**: global class  
-<a name="new_MakerFlashLoanPaybackAction_new"></a>
-
-### new MakerFlashLoanPaybackAction(loanAmount)
-**Params**
-
-- loanAmount <code>string</code>
-
-<a name="GUniDeposit"></a>
-
-## GUniDeposit
-Action that adds liquidity to G-UNI pool of interest (mints G-UNI LP tokens)
-
-**Kind**: global class  
-<a name="GUniWithdraw"></a>
-
-## GUniWithdraw
-Action that removes liquidity from a G-UNI pool and burns G-UNI LP tokens
-
-**Kind**: global class  
 <a name="LidoStakeAction"></a>
 
 ## LidoStakeAction
@@ -922,37 +677,6 @@ LidoStakeAction - Receives WETH, transforms it to ETH then sends it to Lido stak
 - from <code>EthAddress</code> - WETH will be taken from this address
 - to <code>EthAddress</code> - stETH will be sent to this address
 
-<a name="LidoUnwrapAction"></a>
-
-## LidoUnwrapAction
-LidoUnwrapAction - Unwraps WStEth into StEth
-
-**Kind**: global class  
-<a name="new_LidoUnwrapAction_new"></a>
-
-### new LidoUnwrapAction(amount, from, to)
-**Params**
-
-- amount <code>string</code> - amount of WStEth to pull and Unwrap
-- from <code>EthAddress</code> - WstEth will be taken from this address
-- to <code>EthAddress</code> - stETH will be sent to this address
-
-<a name="LidoWrapAction"></a>
-
-## LidoWrapAction
-LidoWrapAction - Turns WETH or StEth into WStEth
-
-**Kind**: global class  
-<a name="new_LidoWrapAction_new"></a>
-
-### new LidoWrapAction(amount, from, to, useEth)
-**Params**
-
-- amount <code>string</code> - amount to pull and stake
-- from <code>EthAddress</code> - tokens will be taken from this address
-- to <code>EthAddress</code> - WStEth will be sent to this address
-- useEth <code>boolean</code> - true for using WETH, false for using stEth
-
 <a name="LiquityBorrowAction"></a>
 
 ## LiquityBorrowAction
@@ -1175,21 +899,6 @@ LiquityWithdrawAction - Withdraws collateral from the trove
 - collAmount - Amount of WETH tokens to withdraw
 - to - Address that will receive the withdrawn tokens
 
-<a name="MakerClaimAction"></a>
-
-## MakerClaimAction
-MakerClaimAction - Claim bonus tokens in CropJoin types
-
-**Kind**: global class  
-<a name="new_MakerClaimAction_new"></a>
-
-### new MakerClaimAction(vaultId, joinAddr, to)
-**Params**
-
-- vaultId <code>VaultId</code>
-- joinAddr <code>EthAddress</code>
-- to <code>EthAddress</code> - Tokens will be sent to this address
-
 <a name="MakerGenerateAction"></a>
 
 ## MakerGenerateAction
@@ -1325,7 +1034,7 @@ MStableDepositAction
 **Kind**: global class  
 <a name="new_MStableDepositAction_new"></a>
 
-### new MStableDepositAction(bAsset, mAsset, saveAddress, vaultAddress, from, to, amount, minOut, assetPair)
+### new MStableDepositAction(bAsset, mAsset, saveAddress, vaultAddress, from, to, amount, minOut, stake)
 **Params**
 
 - bAsset
@@ -1336,7 +1045,7 @@ MStableDepositAction
 - to
 - amount
 - minOut
-- assetPair
+- stake
 
 <a name="MStableWithdrawAction"></a>
 
@@ -1346,7 +1055,7 @@ MStableWithdrawAction
 **Kind**: global class  
 <a name="new_MStableWithdrawAction_new"></a>
 
-### new MStableWithdrawAction(bAsset, mAsset, saveAddress, vaultAddress, from, to, amount, minOut, assetPair)
+### new MStableWithdrawAction(bAsset, mAsset, saveAddress, vaultAddress, from, to, amount, minOut, stake)
 **Params**
 
 - bAsset
@@ -1357,7 +1066,7 @@ MStableWithdrawAction
 - to
 - amount
 - minOut
-- assetPair
+- stake
 
 <a name="RariDepositAction"></a>
 

package/AccessLists/DyDxAccessLists.js

@@ -1,8 +1,4 @@
 const DyDxAccessLists = {
-    DyDxSupply: [
-        ['0x1E0447b19BB6EcFdAe1e4AE1694b0C3659614e4e', []], // SoloMargin
-        ['0x5c55B921f590a89C1Ebe84dF170E655a82b62126', []], // DefisaverLogger
-    ],
     DyDxWithdraw: [
         ['0x1E0447b19BB6EcFdAe1e4AE1694b0C3659614e4e', []], // SoloMargin
         ['0x5c55B921f590a89C1Ebe84dF170E655a82b62126', []], // DefisaverLogger

package/AccessLists/InstaAccessLists.js

@@ -1,12 +1,4 @@
 const InstaAccessLists = {
-    ClaimInstMaker: [
-        ['0x2971AdFa57b20E5a416aE5a708A8655A9c74f723', []], // InstaIndex
-        ['0x5ef30b9986345249bc32d8928B7ee64DE9435E39', []], // DssCdpManager
-        ['0xAC838332afc2937FdED89c16a59b2ED8e8e2743c', []], // InstaMakerDAOMerkleDistributor
-        ['0x6f40d4A6237C257fff2dB00FA0510DeEECd303eb', []], // InstaToken
-        ['0x5c55B921f590a89C1Ebe84dF170E655a82b62126', []], // DefisaverLogger
-    ],
-
     InstPullTokens: [
         ['0x5c55B921f590a89C1Ebe84dF170E655a82b62126', []], // DefisaverLogger
     ],

package/AccessLists/UtilsAccessLists.js

@@ -12,11 +12,6 @@ const UtilsAccessLists = {
         ['0x5c55B921f590a89C1Ebe84dF170E655a82b62126', []], // DefisaverLogger
     ],
 
-    DFSBuy: [
-        ['0x25dd3F51e0C3c3Ff164DDC02A8E4D65Bb9cBB12D', []], // SaverExchangeRegistry
-        ['0x5c55B921f590a89C1Ebe84dF170E655a82b62126', []], // DefisaverLogger
-    ],
-
     SendToken: [],
 
     PullToken: [],

package/DEV.md

@@ -85,7 +85,6 @@ Source: https://uniswap.org/docs/v2/javascript-SDK/getting-pair-addresses/#types
     * [.estimateSellPrice(sellAmount, sellToken, buyToken)](#utils.module_zeroExExchange.estimateSellPrice) ⇒ <code>Promise.&lt;string&gt;</code>
     * [.estimateBuyPrice(buyAmount, buyToken, sellToken)](#utils.module_zeroExExchange.estimateBuyPrice) ⇒ <code>Promise.&lt;string&gt;</code>
     * [.createSellAction(sellAmount, sellToken, buyToken, expectedPrice, acceptedSlippagePercent, fromAccount, toAccount)](#utils.module_zeroExExchange.createSellAction) ⇒ <code>Promise.&lt;SellAction&gt;</code>
-    * [.createBuyAction(buyAmount, buyToken, sellToken, expectedPrice, acceptedSlippagePercent, fromAccount, toAccount)](#utils.module_zeroExExchange.createBuyAction) ⇒ <code>Promise.&lt;BuyAction&gt;</code>
 
 <a name="utils.module_zeroExExchange.estimateSellPrice"></a>
 
@@ -133,12 +132,6 @@ For that purpose, the estimateSellPrice method can be used.
 - fromAccount [<code>EthAddress</code>](#EthAddress) - Withdraw funds from this addr
 - toAccount [<code>EthAddress</code>](#EthAddress) - Send funds to this addr
 
-<a name="utils.module_zeroExExchange.createBuyAction"></a>
-
-### zeroExExchange.createBuyAction(buyAmount, buyToken, sellToken, expectedPrice, acceptedSlippagePercent, fromAccount, toAccount) ⇒ <code>Promise.&lt;BuyAction&gt;</code>
-Fetches prices and creates order ready to be passed to transaction.
-This should only be called when before sending tx, not to be used for just querying the price.
-For that purpose, the estimateBuyPrice method can be used.
 
 **Kind**: static method of [<code>zeroExExchange</code>](#utils.module_zeroExExchange)  
 **Params**

package/index.js

@@ -1,16 +1,29 @@
 const Action = require('./src/Action');
 const Recipe = require('./src/Recipe');
+const Strategy = require('./src/Strategy');
 const DfsWeb3 = require('./src/DfsWeb3');
+const {
+  configure, getNetworkData, CONFIG, NETWORKS,
+} = require('./src/config');
 
 const actions = require('./src/actions/');
+const triggers = require('./src/triggers/');
 const utils = require('./src/utils/');
 const { actionAddresses } = require('./src/addresses');
 
 module.exports = {
   Action,
   Recipe,
+  Strategy,
+  DfsWeb3,
+
   actions,
-  actionAddresses,
+  triggers,
   utils,
-  DfsWeb3,
+
+  configure,
+  getNetworkData,
+  networks: NETWORKS,
+  actionAddressesAllChains: actionAddresses,
+  actionAddresses: actionAddresses[CONFIG.chainId],
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/sdk",
-  "version": "0.1.23",
+  "version": "0.1.24",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/Action.js

@@ -1,5 +1,6 @@
 const AbiCoder = require('web3-eth-abi');
 const { keccak256, padLeft, toHex } = require('web3-utils');
+const { CONFIG } = require('./config');
 
 const ActionAbi = require('./abis/Action.json');
 
@@ -31,24 +32,46 @@ class Action {
    * @returns {string}
    * @private
    */
-  _getId() {
-    return keccak256(this.name);
+  getId() {
+    return keccak256(this.name).substr(0, 10);
   }
 
   /**
    * @returns {Array<number>}
    * @private
    */
-  _getArgumentMapping() {
+  _getArgumentMappingWithSlots(subSlots) {
     return this.mappableArgs.map(arg => {
       if (new RegExp(/\$\d+/).test(arg)) {
         if (Array.isArray(arg)) throw TypeError('Input can\'t be mapped to arrays (tuples/structs). Specify `mappableArgs` array in constructor.');
         return parseInt(arg.substr(1))
       }
+
+      // Handle SubSlots placeholder values in strategies
+      if (new RegExp(/\&\w+/).test(arg)) {
+        if (arg === '&proxy') return 254;
+        if (arg === '&eoa') return 255;
+        return parseInt(subSlots[arg].index);
+      }
+
       return 0;
     });
   }
 
+   /**
+   * @returns {Array<number>}
+   * @private
+   */
+    _getArgumentMapping() {
+      return this.mappableArgs.map(arg => {
+        if (new RegExp(/\$\d+/).test(arg)) {
+          if (Array.isArray(arg)) throw TypeError('Input can\'t be mapped to arrays (tuples/structs). Specify `mappableArgs` array in constructor.');
+          return parseInt(arg.substr(1))
+        }
+        return 0;
+      });
+    }
+
   /**
    * @param type {string}
    * @private
@@ -67,6 +90,7 @@ class Action {
   _replaceWithPlaceholders(arg, paramType) {
     if (Array.isArray(arg)) return arg.map((_arg, i) => this._replaceWithPlaceholders(_arg, paramType[i]));
     if (new RegExp(/\$\d+/).test(arg)) return this._getPlaceholderForType(paramType);
+    if (new RegExp(/\&\w+/).test(arg)) return this._getPlaceholderForType(paramType);
     return arg;
   }
 
@@ -84,13 +108,18 @@ class Action {
    * @private
    */
   _encodeForCall() {
-    const bytesEncodedArgs = this.args.map((arg, i) => {
+    return this.args.map((arg, i) => {
       let paramType = this.paramTypes[i];
       let _arg = this._replaceWithPlaceholders(arg, paramType);
       let _paramType = this._formatType(paramType);
       return AbiCoder.encodeParameter(_paramType, _arg);
     });
-    return [bytesEncodedArgs];
+  }
+
+  encodeForL2DsProxyCall() {
+    // TODO fix this mess
+    const executeActionDirectAbi = ActionAbi.find(({ name }) => name === 'executeActionDirect');
+    return AbiCoder.encodeFunctionCall(executeActionDirectAbi, this._encodeForCall());
   }
 
   /**
@@ -98,11 +127,15 @@ class Action {
    * @returns {Array<string>} `address` & `data` to be passed on to DSProxy's `execute(address _target, bytes memory _data)`
    */
   encodeForDsProxyCall() {
-    const executeActionDirectAbi = ActionAbi.find(({ name }) => name === 'executeActionDirect');
-    return [
-      this.contractAddress,
-      AbiCoder.encodeFunctionCall(executeActionDirectAbi, this._encodeForCall()),
-    ];
+    if (CONFIG.chainId === 1) {
+      const executeActionDirectAbi = ActionAbi.find(({ name }) => name === 'executeActionDirect');
+      return [
+        this.contractAddress,
+        AbiCoder.encodeFunctionCall(executeActionDirectAbi, this._encodeForCall()),
+      ];
+    } else {
+      return [this.contractAddress, this.encodeForL2DsProxyCall()];
+    }
   }
 
   /**
@@ -112,12 +145,19 @@ class Action {
   encodeForRecipe() {
     return [
       this._encodeForCall()[0],   // actionCallData
-      [],                        // subData
-      this._getId(),              // actionIds
+      "0x0000000000000000000000000000000000000000000000000000000000000000",                        // subData
+      this.getId(),              // actionIds
       this._getArgumentMapping(), // paramMappings
     ]
   }
 
+  encodeForStrategy(subSlots) {
+    return [
+      this.getId(),
+      this._getArgumentMappingWithSlots(subSlots), // paramMappings
+    ]
+  }
+
   /**
    * Assets requiring approval to be used by DsProxy
    * Approval is done from owner to DsProxy