@defisaver/sdk 0.1.12 → 0.1.13

package/ACTIONS.md

@@ -1145,7 +1145,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 +1156,7 @@ MStableDepositAction
 - to
 - amount
 - minOut
-- stake
+- assetPair
 
 <a name="MStableWithdrawAction"></a>
 
@@ -1166,7 +1166,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 +1177,7 @@ MStableWithdrawAction
 - to
 - amount
 - minOut
-- stake
+- assetPair
 
 <a name="RariDepositAction"></a>
 

package/package.json

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

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',
@@ -119,6 +119,10 @@ const actionAddresses = {
    // mStable
    'MStableDeposit': '0x1887235CFE1927782a3e7eD15fb073586c949858',
    'MStableWithdraw': '0xb164456190577fbBe8FB8bF5Fa48a106b328A579',
+
+   'MStableDepositNew': '0x2AFfE3899d985212aD8ee99e1269D7Dd17576f1d',
+   'MStableWithdrawNew': '0x6468215Bf4811244Ab78599e1df9206716A35aB7',
+
    'MStableClaim': '0x28279A806aDeDedFD33e39C7375dc0c0ee943847',
 };
 

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,
+};