@defisaver/sdk 0.1.11 → 0.1.15

package/ACTIONS.md

@@ -71,6 +71,20 @@
 <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="#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>
@@ -580,6 +594,115 @@ 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="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
@@ -1145,7 +1268,7 @@ MStableDepositAction
 **Kind**: global class  
 <a name="new_MStableDepositAction_new"></a>
 
-### new MStableDepositAction(bAsset, mAsset, saveAddress, vaultAddress, from, to, amount, minOut, stake)
+### new MStableDepositAction(bAsset, mAsset, saveAddress, vaultAddress, from, to, amount, minOut, assetPair)
 **Params**
 
 - bAsset
@@ -1156,7 +1279,7 @@ MStableDepositAction
 - to
 - amount
 - minOut
-- stake
+- assetPair
 
 <a name="MStableWithdrawAction"></a>
 
@@ -1166,7 +1289,7 @@ MStableWithdrawAction
 **Kind**: global class  
 <a name="new_MStableWithdrawAction_new"></a>
 
-### new MStableWithdrawAction(bAsset, mAsset, saveAddress, vaultAddress, from, to, amount, minOut, stake)
+### new MStableWithdrawAction(bAsset, mAsset, saveAddress, vaultAddress, from, to, amount, minOut, assetPair)
 **Params**
 
 - bAsset
@@ -1177,7 +1300,7 @@ MStableWithdrawAction
 - to
 - amount
 - minOut
-- stake
+- assetPair
 
 <a name="RariDepositAction"></a>
 

package/DEV.md

@@ -29,6 +29,11 @@
 <dt><a href="#VaultId">VaultId</a> : <code>string</code> | <code>number</code></dt>
 <dd><p>Maker vault ID</p>
 </dd>
+<dt><a href="#AccessListItem">AccessListItem</a> : <code>Object</code></dt>
+<dd><p>Access list item</p>
+</dd>
+<dt><a href="#AccessList">AccessList</a> : <code><a href="#AccessListItem">Array.&lt;AccessListItem&gt;</a></code></dt>
+<dd></dd>
 </dl>
 
 <a name="utils.module_uniswapLP"></a>
@@ -159,7 +164,7 @@ Single action that can be executed directly, or combined into a set (ie. supply
     * [.encodeForRecipe()](#Action+encodeForRecipe) ⇒ <code>Array.&lt;string&gt;</code>
     * [.getAssetsToApprove()](#Action+getAssetsToApprove) ⇒ <code>Promise.&lt;Array.&lt;{owner: string, asset: string}&gt;&gt;</code>
     * [.getEthValue()](#Action+getEthValue) ⇒ <code>Promise.&lt;string&gt;</code>
-    * [.getAccessList()](#Action+getAccessList) ⇒ <code>Array.&lt;\*&gt;</code>
+    * [.getAccessList()](#Action+getAccessList) ⇒ [<code>AccessList</code>](#AccessList)
 
 <a name="new_Action_new"></a>
 
@@ -200,7 +205,7 @@ ETH value to be sent with transaction
 **Returns**: <code>Promise.&lt;string&gt;</code> - ETH value in wei  
 <a name="Action+getAccessList"></a>
 
-### action.getAccessList() ⇒ <code>Array.&lt;\*&gt;</code>
+### action.getAccessList() ⇒ [<code>AccessList</code>](#AccessList)
 Access list for single action
 
 **Kind**: instance method of [<code>Action</code>](#Action)  
@@ -218,7 +223,7 @@ Set of Actions to be performed sequentially in a single transaction
     * [._validateParamMappings()](#Recipe+_validateParamMappings)
     * [.getAssetsToApprove()](#Recipe+getAssetsToApprove) ⇒ <code>Promise.&lt;Array.&lt;{owner: string, asset: string}&gt;&gt;</code>
     * [.getEthValue()](#Recipe+getEthValue) ⇒ <code>Promise.&lt;string&gt;</code>
-    * [.getAccessList()](#Recipe+getAccessList) ⇒ <code>Array.&lt;\*&gt;</code>
+    * [.getAccessList()](#Recipe+getAccessList) ⇒ [<code>AccessList</code>](#AccessList)
 
 <a name="new_Recipe_new"></a>
 
@@ -265,7 +270,7 @@ ETH value to be sent with transaction
 **Returns**: <code>Promise.&lt;string&gt;</code> - ETH value in wei  
 <a name="Recipe+getAccessList"></a>
 
-### recipe.getAccessList() ⇒ <code>Array.&lt;\*&gt;</code>
+### recipe.getAccessList() ⇒ [<code>AccessList</code>](#AccessList)
 Generates an access list for the recipe
 
 **Kind**: instance method of [<code>Recipe</code>](#Recipe)  
@@ -281,3 +286,20 @@ Ethereum address
 Maker vault ID
 
 **Kind**: global typedef  
+<a name="AccessListItem"></a>
+
+## AccessListItem : <code>Object</code>
+Access list item
+
+**Kind**: global typedef  
+**Properties**
+
+| Name | Type |
+| --- | --- |
+| address | <code>string</code> | 
+| storageKeys | <code>Array.&lt;string&gt;</code> | 
+
+<a name="AccessList"></a>
+
+## AccessList : [<code>Array.&lt;AccessListItem&gt;</code>](#AccessListItem)
+**Kind**: global typedef  

package/package.json

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

package/src/Action.js

@@ -1,5 +1,5 @@
 const AbiCoder = require('web3-eth-abi');
-const Web3Utils = require('web3-utils');
+const { keccak256, padLeft, toHex } = require('web3-utils');
 
 const ActionAbi = require('./abis/Action.json');
 
@@ -32,7 +32,7 @@ class Action {
    * @private
    */
   _getId() {
-    return Web3Utils.keccak256(this.name);
+    return keccak256(this.name);
   }
 
   /**
@@ -137,13 +137,16 @@ class Action {
 
   /**
    * Access list for single action
-   * @returns {Array<*>}
+   * @returns {AccessList}
    */
   getAccessList() {
     return [
       [this.contractAddress, []],
       ...(AccessLists[this.name] || []),
-    ]
+    ].map(([address, storageKeys]) => ({
+      address: address,
+      storageKeys: storageKeys.map(num => padLeft(toHex(num), 64)),
+    }));
   }
 }
 

package/src/Recipe.js

@@ -103,7 +103,7 @@ class Recipe {
 
   /**
    * Generates an access list for the recipe
-   * @returns {Array<*>}
+   * @returns {AccessList}
    */
   getAccessList() {
     const addressMapping = {
@@ -112,11 +112,14 @@ class Recipe {
     };
     this.actions.forEach((action) => {
       const accessList = action.getAccessList();
-      accessList.forEach(([address, memoryLocations]) => {
-        addressMapping[address] = new Set([...memoryLocations, ...(addressMapping[address] || [])]);
+      accessList.forEach(({ address, storageKeys }) => {
+        addressMapping[address] = new Set([...storageKeys, ...(addressMapping[address] || [])]);
       })
     });
-    return Object.keys(addressMapping).map((addr) => [addr, [...addressMapping[addr]]]);
+    return Object.keys(addressMapping).map((address) => ({
+      address,
+      storageKeys: [...addressMapping[address]],
+    }));
   }
 }
 

package/src/actions/curve/CurveClaimFeesAction.js

@@ -0,0 +1,31 @@
+const { getAssetInfo } = require('@defisaver/tokens');
+const Action = require('../../Action');
+const { requireAddress } = require('../../utils/general');
+const { getAddr } = require('../../addresses');
+
+class CurveClaimFeesAction extends Action {
+
+    /**
+     *
+     * @param {EthAddress} claimFor
+     * @param {EthAddress} receiver
+     */
+    constructor(
+        claimFor,
+        receiver,
+    ) {
+        requireAddress(claimFor);
+        requireAddress(receiver);
+        super('CurveClaimFeesAction',
+            getAddr('CurveClaimFeesAction'),
+            [['address', 'address']],
+            [[...arguments]]);
+
+        this.mappableArgs = [
+            this.args[0][0],
+            this.args[0][1],
+        ];
+    }
+}
+
+module.exports = CurveClaimFeesAction;

package/src/actions/curve/CurveDepositAction.js

@@ -0,0 +1,50 @@
+const { getAssetInfo } = require('@defisaver/tokens');
+const Action = require('../../Action');
+const { requireAddress } = require('../../utils/general');
+const { getAddr } = require('../../addresses');
+
+class CurveDepositAction extends Action {
+
+    /**
+     * @param {EthAddress} sender
+     * @param {EthAddress} receiver
+     * @param {EthAddress} depositTarget
+     * @param {EthAddress} lpToken
+     * @param {bytes4} sig
+     * @param {string} minMintAmount
+     * @param {Array<string>} amounts
+     * @param {Array<EthAddress>} tokens
+     * @param {boolean} useUnderlying
+     */
+    constructor(
+        sender,
+        receiver,
+        depositTarget,
+        lpToken,
+        sig,
+        minMintAmount,
+        amounts = [],
+        tokens = [],
+        useUnderlying
+    ) {
+        requireAddress(sender);
+        requireAddress(receiver);
+        super('CurveDeposit',
+            getAddr('CurveDeposit'),
+            [['address', 'address', 'address', 'address', 'bytes4', 'uint256', 'uint256[]', 'address[]', 'bool']],
+            [[...arguments]]);
+
+        this.mappableArgs = [
+            this.args[0][0],
+            this.args[0][1],
+            this.args[0][5],
+            ...this.args[0][6],
+        ];
+    }
+
+    async getAssetsToApprove() {
+        return this.args[0][7].map(_asset => Object({ asset: _asset, owner: this.args[0][0] }));
+    }
+}
+
+module.exports = CurveDepositAction;

package/src/actions/curve/CurveGaugeDepositAction.js

@@ -0,0 +1,36 @@
+const Action = require('../../Action');
+const { requireAddress } = require('../../utils/general');
+const { getAddr } = require('../../addresses');
+
+class CurveGaugeDepositAction extends Action {
+
+    /**
+     *
+     * @param {EthAddress} gaugeAddr
+     * @param {EthAddress} lpToken
+     * @param {EthAddress} sender
+     * @param {EthAddress} onBehalfOf
+     * @param {string} amount
+     */
+    constructor(gaugeAddr, lpToken, sender, onBehalfOf, amount) {
+        requireAddress(sender);
+        requireAddress(onBehalfOf);
+        super('CurveGaugeDeposit',
+            getAddr('CurveGaugeDeposit'),
+            [['address', 'address', 'address', 'address', 'uint256']],
+            [[...arguments]],
+        );
+
+        this.mappableArgs = [
+            this.args[0][2],
+            this.args[0][3],
+            this.args[0][4],
+        ];
+    }
+
+    async getAssetsToApprove() {
+        return { asset: this.args[0][1], owner: this.args[0][2] };
+    }
+}
+
+module.exports = CurveGaugeDepositAction;

package/src/actions/curve/CurveGaugeWithdrawAction.js

@@ -0,0 +1,28 @@
+const Action = require('../../Action');
+const { requireAddress } = require('../../utils/general');
+const { getAddr } = require('../../addresses');
+
+class CurveGaugeWithdrawAction extends Action {
+
+    /**
+     * @param {EthAddress} gaugeAddr
+     * @param {EthAddress} lpToken
+     * @param {EthAddress} receiver
+     * @param {string} amount
+     */
+    constructor(gaugeAddr, lpToken, receiver, amount) {
+        requireAddress(receiver);
+        super('CurveGaugeWithdraw',
+            getAddr('CurveGaugeWithdraw'),
+            [['address', 'address', 'address', 'uint256']],
+            [[...arguments]],
+        );
+
+        this.mappableArgs = [
+            this.args[0][2],
+            this.args[0][3],
+        ];
+    }
+}
+
+module.exports = CurveGaugeWithdrawAction;

package/src/actions/curve/CurveMintCrvAction.js

@@ -0,0 +1,25 @@
+const Action = require('../../Action');
+const { requireAddress } = require('../../utils/general');
+const { getAddr } = require('../../addresses');
+
+class CurveMintCrvAction extends Action {
+
+    /**
+     * @param {Array<EthAddress>} gaugeAddrs
+     * @param {EthAddress} receiver
+     */
+    constructor(gaugeAddrs, receiver) {
+        requireAddress(receiver);
+        super('CurveMintCrv',
+            getAddr('CurveMintCrv'),
+            [['address[8]', 'address']],
+            [[...arguments]],
+        );
+
+        this.mappableArgs = [
+            this.args[0][8],
+        ];
+    }
+}
+
+module.exports = CurveMintCrvAction;

package/src/actions/curve/CurveSwapAction.js

@@ -0,0 +1,39 @@
+const { getAssetInfo } = require('@defisaver/tokens');
+const Action = require('../../Action');
+const { requireAddress } = require('../../utils/general');
+const { getAddr } = require('../../addresses');
+
+class CurveSwapAction extends Action {
+
+    /**
+     * 
+     * @param {EthAddress} sender 
+     * @param {EthAddress} receiver 
+     * @param {EthAddress} pool 
+     * @param {EthAddress} tokenA 
+     * @param {EthAddress} tokenB 
+     * @param {string} amount 
+     * @param {string} expected 
+     */
+    constructor(sender, receiver, pool, tokenA, tokenB, amount, expected) {
+        requireAddress(sender);
+        requireAddress(receiver);
+        super('CurveSwap',
+            getAddr('CurveSwap'),
+            [['address', 'address', 'address', 'address', 'address', 'uint256', 'uint256']],
+            [[...arguments]]);
+
+        this.mappableArgs = [
+            this.args[0][0],
+            this.args[0][1],
+            this.args[0][5],
+            this.args[0][6],
+        ];
+    }
+
+    async getAssetsToApprove() {
+        return [{ asset: this.args[0][3], owner: this.args[0][0] }];
+    }
+}
+
+module.exports = CurveSwapAction;

package/src/actions/curve/CurveWithdrawAction.js

@@ -0,0 +1,53 @@
+const { getAssetInfo } = require('@defisaver/tokens');
+const Action = require('../../Action');
+const { requireAddress } = require('../../utils/general');
+const { getAddr } = require('../../addresses');
+
+class CurveWithdrawAction extends Action {
+
+    /**
+     *
+     * @param {EthAddress} sender
+     * @param {EthAddress} receiver
+     * @param {EthAddress} depositTarget
+     * @param {EthAddress} lpToken
+     * @param {bytes4} sig
+     * @param {string} burnAmount
+     * @param {Array<string>} minAmounts
+     * @param {Array<EthAddress>} tokens
+     * @param {boolean} withdrawExact
+     * @param {boolean} useUnderlying
+     */
+    constructor(
+        sender,
+        receiver,
+        depositTarget,
+        lpToken,
+        sig,
+        burnAmount,
+        minAmounts = [],
+        tokens = [],
+        withdrawExact,
+        useUnderlying
+    ) {
+        requireAddress(sender);
+        requireAddress(receiver);
+        super('CurveWithdrawAction',
+            getAddr('CurveWithdrawAction'),
+            [['address', 'address', 'address', 'address', 'bytes4', 'uint256', 'uint256[]', 'address[]', 'bool', 'bool']],
+            [[...arguments]]);
+
+        this.mappableArgs = [
+            this.args[0][0],
+            this.args[0][1],
+            this.args[0][5],
+            ...this.args[0][6],
+        ];
+    }
+
+    async getAssetsToApprove() {
+        return { asset: this.args[0][3], owner: this.args[0][0] };
+    }
+}
+
+module.exports = CurveWithdrawAction;

package/src/actions/curve/index.js

@@ -0,0 +1,19 @@
+const CurveSwapAction = require('./CurveSwapAction');
+const CurveDepositAction = require('./CurveDepositAction');
+const CurveWithdrawAction = require('./CurveWithdrawAction');
+
+const CurveGaugeDepositAction = require('./CurveGaugeDepositAction');
+const CurveGaugeWithdrawAction = require('./CurveGaugeWithdrawAction');
+const CurveMintCrvAction = require('./CurveMintCrvAction');
+const CurveClaimFeesAction = require('./CurveClaimFeesAction');
+
+module.exports = {
+    CurveSwapAction,
+    CurveDepositAction,
+    CurveWithdrawAction,
+
+    CurveGaugeDepositAction,
+    CurveGaugeWithdrawAction,
+    CurveMintCrvAction,
+    CurveClaimFeesAction,
+};

package/src/actions/index.js

@@ -12,6 +12,7 @@ const yearn = require('./yearn');
 const lido = require('./lido');
 const insta = require('./insta');
 const balancer = require('./balancer');
+const curve = require('./curve');
 const guni = require('./guni');
 const mstable = require('./mstable');
 const rari = require('./rari');
@@ -31,6 +32,7 @@ module.exports = {
   lido,
   insta,
   balancer,
+  curve,
   guni,
   mstable,
   rari,

package/src/actions/mstable/MStableClaimAction.js

@@ -1,5 +1,5 @@
-const Action = require("../../Action");
-const {requireAddress} = require("../../utils/general");
+const Action = require('../../Action');
+const { requireAddress } = require('../../utils/general');
 const { getAddr } = require('../../addresses.js');
 
 /**

package/src/actions/mstable/MStableDepositAction.js

@@ -1,6 +1,7 @@
-const Action = require("../../Action");
-const {requireAddress} = require("../../utils/general");
-const { getAddr } = require('../../addresses.js');
+const Action = require('../../Action');
+const { requireAddress } = require('../../utils/general');
+const { getAddr } = require('../../addresses');
+const mstableAssetPairs = require('../../utils/mstableAssetPairs');
 
 /**
  * MStableDepositAction
@@ -15,7 +16,7 @@ class MStableDepositAction extends Action {
      * @param to
      * @param amount
      * @param minOut
-     * @param stake
+     * @param assetPair
      */
     constructor(
         bAsset,
@@ -26,7 +27,7 @@ class MStableDepositAction extends Action {
         to,
         amount,
         minOut,
-        stake,
+        assetPair,
     ) {
         requireAddress(bAsset);
         requireAddress(mAsset);
@@ -36,9 +37,9 @@ class MStableDepositAction extends Action {
         requireAddress(to);
 
         super(
-            'MStableDeposit',
-            getAddr('MStableDeposit'),
-            [['address', 'address', 'address', 'address', 'address', 'address', 'uint256', 'uint256', 'bool']],
+            'MStableDepositNew',
+            getAddr('MStableDepositNew'),
+            [['address', 'address', 'address', 'address', 'address', 'address', 'uint256', 'uint256', 'uint256']],
             [[...arguments]],
         );
 
@@ -56,7 +57,26 @@ class MStableDepositAction extends Action {
     }
 
     async getAssetsToApprove() {
-        return [{ asset: this.args[0][0], owner: this.args[0][4]}];
+        const assetPair = this.args[0][8];
+        const owner = this.args[0][4];
+        let asset;
+        switch (assetPair) {
+        case mstableAssetPairs.BASSET_MASSET:
+        case mstableAssetPairs.BASSET_IMASSET:
+        case mstableAssetPairs.BASSET_IMASSETVAULT:
+            asset = this.args[0][0];
+            break;
+        case mstableAssetPairs.MASSET_IMASSET:
+        case mstableAssetPairs.MASSET_IMASSETVAULT:
+            asset = this.args[0][1];
+            break;
+        case mstableAssetPairs.IMASSET_IMASSETVAULT:
+            asset = this.args[0][2];
+            break;
+        default:
+            return [];
+        }
+        return [{ asset, owner }];
     }
 }
 

package/src/actions/mstable/MStableWithdrawAction.js

@@ -1,6 +1,7 @@
-const Action = require("../../Action");
-const {requireAddress} = require("../../utils/general");
-const { getAddr } = require('../../addresses.js');
+const Action = require('../../Action');
+const { requireAddress } = require('../../utils/general');
+const { getAddr } = require('../../addresses');
+const mstableAssetPairs = require('../../utils/mstableAssetPairs');
 
 /**
  * MStableWithdrawAction
@@ -15,7 +16,7 @@ class MStableWithdrawAction extends Action {
      * @param to
      * @param amount
      * @param minOut
-     * @param stake
+     * @param assetPair
      */
     constructor(
         bAsset,
@@ -26,7 +27,7 @@ class MStableWithdrawAction extends Action {
         to,
         amount,
         minOut,
-        unstake,
+        assetPair,
     ) {
         requireAddress(bAsset);
         requireAddress(mAsset);
@@ -36,9 +37,9 @@ class MStableWithdrawAction extends Action {
         requireAddress(to);
 
         super(
-            'MStableWithdraw',
-            getAddr('MStableWithdraw'),
-            [['address', 'address', 'address', 'address', 'address', 'address', 'uint256', 'uint256', 'bool']],
+            'MStableWithdrawNew',
+            getAddr('MStableWithdrawNew'),
+            [['address', 'address', 'address', 'address', 'address', 'address', 'uint256', 'uint256', 'uint256']],
             [[...arguments]],
         );
 
@@ -56,11 +57,26 @@ class MStableWithdrawAction extends Action {
     }
 
     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}]
-      }
+        const assetPair = this.args[0][8];
+        const owner = this.args[0][4];
+        let asset;
+        switch (assetPair) {
+        case mstableAssetPairs.BASSET_IMASSETVAULT:
+        case mstableAssetPairs.MASSET_IMASSETVAULT:
+        case mstableAssetPairs.IMASSET_IMASSETVAULT:
+            return [];
+        case mstableAssetPairs.MASSET_IMASSET:
+        case mstableAssetPairs.BASSET_IMASSET:
+            asset = this.args[0][2];
+            break;
+        case mstableAssetPairs.BASSET_MASSET:
+            asset = this.args[0][1];
+            break;
+        default:
+            return [];
+        }
+        return [{ asset, owner }];
+    }
 }
 
 module.exports = MStableWithdrawAction;

package/src/addresses.js

@@ -6,7 +6,7 @@ const actionAddresses = {
 
   // utils
   'WrapEth': '0x9E702937F42Db2cE58342Ca5F213Ef33D51AEF6b',
-  'UnwrapEth': '0x925b0C0663aaef2C6F603aD8B992a15adA83f1Cc',
+  'UnwrapEth': '0x5cD02A169CfE5B0596B352547879Dd60B7033488',
   'PullToken': '0x795a89f6D4E97A959fe81aa22772441323783479',
   'SendToken': '0xBbe0D7f2AF01aE678f8A873CB2d2EB73871C9b5A',
   'SumInputs': '0xCdef35425579fc566B6Ee0499A79256ac88d25cf',
@@ -77,7 +77,7 @@ const actionAddresses = {
 
   // yearn
   'YearnSupply': '0x3B8538B070a0890ef7E13FF60c9d19F893a93B8a',
-  'YearnWithdraw': '0x5BDf949c3a74E4F78328f6ad1F3697CC8edbe1A2',
+  'YearnWithdraw': '0x03CC90F24C23C9F766902917c32411417c28Db92',
 
   // liquity
   'LiquityClose': '0x9C563dc9F8e3FcCF996DAB4b6B6003fb7Bbca90f',
@@ -119,6 +119,10 @@ const actionAddresses = {
    // mStable
    'MStableDeposit': '0x1887235CFE1927782a3e7eD15fb073586c949858',
    'MStableWithdraw': '0xb164456190577fbBe8FB8bF5Fa48a106b328A579',
+
+   'MStableDepositNew': '0x2AFfE3899d985212aD8ee99e1269D7Dd17576f1d',
+   'MStableWithdrawNew': '0x6468215Bf4811244Ab78599e1df9206716A35aB7',
+
    'MStableClaim': '0x28279A806aDeDedFD33e39C7375dc0c0ee943847',
 };
 
@@ -132,6 +136,7 @@ const otherAddresses = {
   UniswapV3PositionManager : '0xC36442b4a4522E871399CD717aBDD847Ab11FE88',
   RaiWethUniV2LPToken : '0x8aE720a71622e824F576b4A8C03031066548A3B1',
   BalancerToken : '0xba100000625a3754423978a60c9317c58a424e3D',
+  CrvToken: '0xD533a949740bb3306d119CC777fa900bA034cd52',
   DAI: '0x6b175474e89094c44da98b954eedeac495271d0f',
 }
 

package/src/types.js

@@ -7,3 +7,14 @@
  * Maker vault ID
  * @typedef {(string|number)} VaultId
  */
+
+/**
+ * Access list item
+ * @typedef {Object} AccessListItem
+ * @property {string} address
+ * @property {Array<string>} storageKeys
+ */
+
+/**
+ * @typedef {Array<AccessListItem>} AccessList
+ */

package/src/utils/index.js

@@ -1,7 +1,9 @@
 const zeroExExchange = require('./zeroExExchange');
 const uniswapLP = require('./uniswapLP');
+const mstableAssetPairs = require('./mstableAssetPairs');
 
 module.exports = {
   zeroExExchange,
   uniswapLP,
+  mstableAssetPairs,
 }

package/src/utils/mstableAssetPairs.js

@@ -0,0 +1,8 @@
+module.exports = {
+    BASSET_MASSET: 0,
+    BASSET_IMASSET: 1,
+    BASSET_IMASSETVAULT: 2,
+    MASSET_IMASSET: 3,
+    MASSET_IMASSETVAULT: 4,
+    IMASSET_IMASSETVAULT: 5,
+};

package/test/accessLists/Recipe.js

@@ -1,5 +1,5 @@
 const AbiCoder = require('web3-eth-abi');
-const { BN } = require('web3-utils');
+const { BN, padLeft, toHex } = require('web3-utils');
 const {getAssetInfo, utils: {compare}} = require("@defisaver/tokens");
 const Action = require('../../src/Action');
 const {getAddr} = require('../../src/addresses');
@@ -103,7 +103,7 @@ class Recipe {
 
   /**
    * Generates an access list for the recipe
-   * @returns {Array<*>}
+   * @returns {AccessList}
    */
   getAccessList() {
     const addressMapping = {
@@ -111,12 +111,15 @@ class Recipe {
       [getAddr('DFSRegistry')]: [],
     };
     this.actions.forEach((action) => {
-      const accessList = MockAccessLists[action.name];
-      accessList.forEach(([address, memoryLocations]) => {
-        addressMapping[address] = new Set([...memoryLocations, ...(addressMapping[address] || [])]);
+      const accessList = MockAccessLists[action.name].map(([address, storageKeys]) => ({ address, storageKeys: storageKeys.map(num => padLeft(toHex(num), 64)) }));
+      accessList.forEach(({ address, storageKeys }) => {
+        addressMapping[address] = new Set([...storageKeys, ...(addressMapping[address] || [])]);
       })
     });
-    return Object.keys(addressMapping).map((addr) => [addr, [...addressMapping[addr]]]);
+    return Object.keys(addressMapping).map((address) => ({
+      address,
+      storageKeys: [...addressMapping[address]],
+    }));
   }
 }
 

package/test/accessLists/access-lists.js

@@ -2,18 +2,19 @@ const { assert } = require("chai");
 const dfs = require("../../index.js");
 const Recipe = require("./Recipe");
 const MockAccessLists = require('./MockAccessLists');
+const { padLeft, toHex } = require('web3-utils');
 
 const testDuplicates = (accessList) => {
     const contractAddrs = accessList.map((entry) => {
         assert(
-            entry[1].length == [...new Set(entry[1])].length,
+            entry.storageKeys.length === [...new Set(entry.storageKeys)].length,
             'Duplicate storage address found',
         );
-        return entry[0];
+        return entry.address;
     })
 
     assert(
-        accessList.length == [...new Set(contractAddrs)].length,
+        accessList.length === [...new Set(contractAddrs)].length,
         'Duplicate contract address found',
     );
 
@@ -22,15 +23,20 @@ const testDuplicates = (accessList) => {
 
 const testInclusion = (recipe, accessList) => {
     const actions = recipe.actions;
-    const addressMapping = Object.fromEntries(accessList);
+    const addressMapping = accessList.reduce((list, current) => {
+      list[current.address] = current.storageKeys;
+      return list;
+    }, {});
     actions.forEach((action) => {
-        MockAccessLists[action.name].forEach((entry) => {
-            const storageAddrs = new Set(addressMapping[entry[0]]);
+        MockAccessLists[action.name]
+          .map(([address, storageKeys]) => ({ address, storageKeys: storageKeys.map(num => padLeft(toHex(num), 64)) }))
+          .forEach((entry) => {
+            const storageAddrs = new Set(addressMapping[entry.address]);
             assert(
                 storageAddrs,
                 'Access list missing a contract address',
             );
-            entry[1].forEach((addr) => {
+            entry.storageKeys.forEach((addr) => {
                 assert(
                     storageAddrs.has(addr),
                     'Access list missing a storage address',
@@ -79,7 +85,8 @@ describe('Access-Lists', () => {
     sampleRecipes.forEach((recipe) => {
         it(`... should make an access list for recipe ${recipe.name}`, () => {
             const recipeAccessList = recipe.getAccessList();
-            testDuplicates(recipeAccessList);
+          console.log(recipeAccessList);
+          testDuplicates(recipeAccessList);
             testInclusion(recipe, recipeAccessList);
         });
     });