@defisaver/sdk 0.2.5 → 0.2.8

package/src/actions/convex/ConvexWithdrawAction.js

@@ -0,0 +1,65 @@
+const Action = require('../../Action');
+const { getAddr } = require('../../addresses');
+const { getConvexPool, WithdrawOption } = require('../../utils/convex-utils');
+const { requireAddress } = require('../../utils/general');
+/**
+ * ConvexWithdrawAction - Withdraws (unwraps) Curve LP from convex, unstakes wrapped LP, or does both
+ */
+class ConvexWithdrawAction extends Action {
+    /**
+     * @param {address} from 
+     * @param {address} to 
+     * @param {address} curveLp 
+     * @param {uint256} amount 
+     * @param {uint8} option 
+     */
+    constructor(
+        from,
+        to,
+        curveLp,
+        amount,
+        option,
+    ) {
+        requireAddress(to);
+        const { pid } = getConvexPool(curveLp);
+        super(
+            'ConvexWithdraw',
+            getAddr('ConvexWithdraw'),
+            [
+                'address',
+                'address',
+                'uint256',
+                'uint256',
+                'uint8',
+            ],
+            [
+                from,
+                to,
+                pid,
+                amount,
+                option,
+            ],
+        ).curveLp = curveLp;
+
+        this.mappableArgs = [
+            this.args[0],
+            this.args[1],
+            this.args[2],
+            this.args[3],
+            this.args[4],
+        ];
+    }
+
+    async getAssetsToApprove() {
+        const pool = getConvexPool(this.curveLp);
+        const owner = this.args[0];
+
+        if (this.args[4] === WithdrawOption.UNWRAP) {
+            return [{asset: pool.token, owner}];
+        }
+
+        return [];
+    }
+}
+
+module.exports = ConvexWithdrawAction;

package/src/actions/convex/index.js

@@ -0,0 +1,9 @@
+const ConvexDepositAction = require('./ConvexDepositAction');
+const ConvexWithdrawAction = require('./ConvexWithdrawAction');
+const ConvexClaimAction = require('./ConvexClaimAction');
+
+module.exports = {
+    ConvexDepositAction,
+    ConvexWithdrawAction,
+    ConvexClaimAction,
+}

package/src/actions/curve/CurveClaimFeesAction.js

@@ -18,12 +18,12 @@ class CurveClaimFeesAction extends Action {
         requireAddress(receiver);
         super('CurveClaimFeesAction',
             getAddr('CurveClaimFeesAction'),
-            [['address', 'address']],
-            [[...arguments]]);
+            ['address', 'address'],
+            [...arguments]);
 
         this.mappableArgs = [
-            this.args[0][0],
-            this.args[0][1],
+            this.args[0],
+            this.args[1],
         ];
     }
 }

package/src/actions/curve/CurveDepositAction.js

@@ -31,19 +31,19 @@ class CurveDepositAction extends Action {
         requireAddress(receiver);
         super('CurveDeposit',
             getAddr('CurveDeposit'),
-            [['address', 'address', 'address', 'address', 'bytes4', 'uint256', 'uint256[]', 'address[]', 'bool']],
-            [[...arguments]]);
+            ['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],
+            this.args[0],
+            this.args[1],
+            this.args[5],
+            ...this.args[6],
         ];
     }
 
     async getAssetsToApprove() {
-        return this.args[0][7].map(_asset => Object({ asset: _asset, owner: this.args[0][0] }));
+        return this.args[7].map(_asset => Object({ asset: _asset, owner: this.args[0] }));
     }
 }
 

package/src/actions/curve/CurveGaugeDepositAction.js

@@ -17,19 +17,19 @@ class CurveGaugeDepositAction extends Action {
         requireAddress(onBehalfOf);
         super('CurveGaugeDeposit',
             getAddr('CurveGaugeDeposit'),
-            [['address', 'address', 'address', 'address', 'uint256']],
-            [[...arguments]],
+            ['address', 'address', 'address', 'address', 'uint256'],
+            [...arguments],
         );
 
         this.mappableArgs = [
-            this.args[0][2],
-            this.args[0][3],
-            this.args[0][4],
+            this.args[2],
+            this.args[3],
+            this.args[4],
         ];
     }
 
     async getAssetsToApprove() {
-        return { asset: this.args[0][1], owner: this.args[0][2] };
+        return { asset: this.args[1], owner: this.args[2] };
     }
 }
 

package/src/actions/curve/CurveGaugeWithdrawAction.js

@@ -14,13 +14,13 @@ class CurveGaugeWithdrawAction extends Action {
         requireAddress(receiver);
         super('CurveGaugeWithdraw',
             getAddr('CurveGaugeWithdraw'),
-            [['address', 'address', 'address', 'uint256']],
-            [[...arguments]],
+            ['address', 'address', 'address', 'uint256'],
+            [...arguments],
         );
 
         this.mappableArgs = [
-            this.args[0][2],
-            this.args[0][3],
+            this.args[2],
+            this.args[3],
         ];
     }
 }

package/src/actions/curve/CurveMintCrvAction.js

@@ -12,12 +12,12 @@ class CurveMintCrvAction extends Action {
         requireAddress(receiver);
         super('CurveMintCrv',
             getAddr('CurveMintCrv'),
-            [['address[8]', 'address']],
-            [[...arguments]],
+            ['address[8]', 'address'],
+            [...arguments],
         );
 
         this.mappableArgs = [
-            this.args[0][8],
+            this.args[8],
         ];
     }
 }

package/src/actions/curve/CurveStethPoolDepositAction.js

@@ -9,8 +9,8 @@ class CurveStethPoolDepositAction extends Action {
     /**
      * @param from {address}
      * @param to {address}
-     * @param amounts {uint256[2]}
-     * @param minMintAmount {uint256}
+     * @param amounts {string[]}
+     * @param minMintAmount {string}
      */
     constructor(
         from,
@@ -23,16 +23,16 @@ class CurveStethPoolDepositAction extends Action {
         super(
             'CurveStethPoolDeposit',
             getAddr('CurveStethPoolDeposit'),
-            [['address', 'address', 'uint256[2]', 'uint256']],
-            [[...arguments]],
+            ['address', 'address', 'uint256[2]', 'uint256'],
+            [...arguments],
         );
 
         this.mappableArgs = [
-            this.args[0][0],
-            this.args[0][1],
-            this.args[0][2][0],
-            this.args[0][2][1],
-            this.args[0][3],
+            this.args[0],
+            this.args[1],
+            this.args[2][0],
+            this.args[2][1],
+            this.args[3],
         ];
     }
 }

package/src/actions/curve/CurveStethPoolWithdrawAction.js

@@ -9,30 +9,32 @@ class CurveStethPoolWithdrawAction extends Action {
     /**
      * @param from {address}
      * @param to {address}
-     * @param amounts {uint256[2]}
-     * @param maxBurnAmount {uint256}
+     * @param amounts {string[]}
+     * @param maxBurnAmount {string}
+     * @param returnValue {string}
      */
     constructor(
         from,
         to,
         amounts,
         maxBurnAmount,
+        returnValue,
     ) {
         requireAddress(to);
 
         super(
             'CurveStethPoolWithdraw',
             getAddr('CurveStethPoolWithdraw'),
-            [['address', 'address', 'uint256[2]', 'uint256']],
-            [[...arguments]],
+            ['address', 'address', 'uint256[2]', 'uint256', 'uint256'],
+            [...arguments],
         );
 
         this.mappableArgs = [
-            this.args[0][0],
-            this.args[0][1],
-            this.args[0][2][0],
-            this.args[0][2][1],
-            this.args[0][3],
+            this.args[0],
+            this.args[1],
+            this.args[2][0],
+            this.args[2][1],
+            this.args[3],
         ];
     }
 }

package/src/actions/curve/CurveSwapAction.js

@@ -6,33 +6,33 @@ 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 
+     *
+     * @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]]);
+            ['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],
+            this.args[0],
+            this.args[1],
+            this.args[5],
+            this.args[6],
         ];
     }
 
     async getAssetsToApprove() {
-        return [{ asset: this.args[0][3], owner: this.args[0][0] }];
+        return [{ asset: this.args[3], owner: this.args[0] }];
     }
 }
 

package/src/actions/curve/CurveWithdrawAction.js

@@ -34,19 +34,19 @@ class CurveWithdrawAction extends Action {
         requireAddress(receiver);
         super('CurveWithdrawAction',
             getAddr('CurveWithdrawAction'),
-            [['address', 'address', 'address', 'address', 'bytes4', 'uint256', 'uint256[]', 'address[]', 'bool', 'bool']],
-            [[...arguments]]);
+            ['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],
+            this.args[0],
+            this.args[1],
+            this.args[5],
+            ...this.args[6],
         ];
     }
 
     async getAssetsToApprove() {
-        return { asset: this.args[0][3], owner: this.args[0][0] };
+        return { asset: this.args[3], owner: this.args[0] };
     }
 }
 

package/src/actions/dydx/DyDxWithdrawAction.js

@@ -13,13 +13,7 @@ class DyDxWithdrawAction extends Action {
    */
   constructor(tokenAddr, amount, to) {
     requireAddress(to);
-    super('DyDxWithdraw', getAddr('DyDxWithdraw'), [['address','uint256','address']], [[...arguments]]);
-
-    this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
-      this.args[0][2],
-    ];
+    super('DyDxWithdraw', getAddr('DyDxWithdraw'), ['address','uint256','address'], [...arguments]);
   }
 }
 

package/src/actions/flashloan/AaveV2FlashLoanAction.js

@@ -17,8 +17,8 @@ class AaveV2FlashLoanAction extends Action {
     super(
       'FLAaveV2',
       getAddr('FLAaveV2'),
-      [['address[]','uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes']],
-      [[tokens, loanAmounts, modes, loanPayer, flParamGetterAddr, flParamGetterData, []]]
+      ['address[]','uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes'],
+      [tokens, loanAmounts, modes, loanPayer, flParamGetterAddr, flParamGetterData, []]
     );
   }
 }

package/src/actions/flashloan/BalancerFlashLoanAction.js

@@ -15,8 +15,8 @@ class BalancerFlashLoanAction extends Action {
     super(
       'FLBalancer',
       getAddr('FLBalancer'),
-      [['address[]','uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes']],
-      [[tokens, amounts, [], getAddr('Empty'), flParamGetterAddr, flParamGetterData, []]]
+      ['address[]','uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes'],
+      [tokens, amounts, [], getAddr('Empty'), flParamGetterAddr, flParamGetterData, []]
     );
   }
 }

package/src/actions/flashloan/DyDxFlashLoanAction.js

@@ -12,7 +12,11 @@ class DyDxFlashLoanAction extends Action {
    * @param flParamGetterData {bytes}
    */
   constructor(loanAmount, tokenAddr, flParamGetterAddr = getAddr('Empty'), flParamGetterData= []) {
-    super('FLDyDx', getAddr('FLDyDx'),[['address[]','uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes']], [[[tokenAddr], [loanAmount], [], getAddr('Empty'),flParamGetterAddr, flParamGetterData, []]]);
+    super('FLDyDx',
+      getAddr('FLDyDx'),
+      ['address[]','uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes'],
+      [[tokenAddr], [loanAmount], [], getAddr('Empty'),flParamGetterAddr, flParamGetterData, []],
+      );
   }
 }
 

package/src/actions/flashloan/MakerFlashLoanAction.js

@@ -14,8 +14,8 @@ class MakerFlashLoanAction extends Action {
     super(
       'FLMaker',
       getAddr('FLMaker'),
-      [['address[]','uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes']],
-      [[[], [amount], [], getAddr('Empty'), flParamGetterAddr, flParamGetterData, []]]
+      ['address[]','uint256[]', 'uint256[]', 'address', 'address', 'bytes', 'bytes'],
+      [[], [amount], [], getAddr('Empty'), flParamGetterAddr, flParamGetterData, []]
     );
   }
 }

package/src/actions/flashloan/index.js

@@ -2,8 +2,6 @@ const DyDxFlashLoanAction = require('./DyDxFlashLoanAction');
 const DyDxFlashLoanPaybackAction = require('./DyDxFlashLoanPaybackAction');
 const AaveV2FlashLoanAction = require('./AaveV2FlashLoanAction');
 const AaveV2FlashLoanPaybackAction = require('./AaveV2FlashLoanPaybackAction');
-const AaveV3FlashLoanAction = require('./AaveV3FlashLoanAction');
-const AaveV3FlashLoanPaybackAction = require('./AaveV3FlashLoanPaybackAction');
 const MakerFlashLoanAction = require('./MakerFlashLoanAction');
 const MakerFlashLoanPaybackAction = require('./MakerFlashLoanPaybackAction');
 const BalancerFlashLoanAction = require('./BalancerFlashLoanAction');
@@ -14,8 +12,6 @@ module.exports = {
   DyDxFlashLoanPaybackAction,
   AaveV2FlashLoanAction,
   AaveV2FlashLoanPaybackAction,
-  AaveV3FlashLoanAction,
-  AaveV3FlashLoanPaybackAction,
   MakerFlashLoanAction,
   MakerFlashLoanPaybackAction,
   BalancerFlashLoanAction,

package/src/actions/guni/GUniDeposit.js

@@ -19,25 +19,25 @@ class GUniDeposit extends Action {
     super(
         'GUniDeposit',
         getAddr('GUniDeposit'),
-        [['address', 'address', 'address', 'uint256', 'uint256', 'uint256', 'uint256', 'address', 'address']],
-        [[pool, token0, token1, amount0Max, amount1max, amount0Min, amount1Min, to, from]]
+        ['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],
+        this.args[3],
+        this.args[4],
+        this.args[5],
+        this.args[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]});
+    approveArr.push({asset: this.args[1], owner: this.args[8]});
+    approveArr.push({asset: this.args[2], owner: this.args[8]});
 
     return approveArr;
   }
 }
 
-module.exports = GUniDeposit;
+module.exports = GUniDeposit;

package/src/actions/guni/GUniWithdraw.js

@@ -16,17 +16,17 @@ class GUniWithdraw extends Action {
     super(
         'GUniWithdraw',
         getAddr('GUniWithdraw'),
-        [['address', 'uint256', 'uint256', 'uint256', 'address', 'address']],
-        [[pool, burnAmount, amount0Min, amount1Min, to, from]]
+        ['address', 'uint256', 'uint256', 'uint256', 'address', 'address'],
+        [pool, burnAmount, amount0Min, amount1Min, to, from]
     );
     this.mappableArgs = [
-        this.args[0][1],
+        this.args[1],
     ];
   }
 
   async getAssetsToApprove() {
-    return [{asset: this.args[0][0], owner: this.args[0][5]}];
+    return [{asset: this.args[0], owner: this.args[5]}];
   }
 }
 
-module.exports = GUniWithdraw;
+module.exports = GUniWithdraw;

package/src/actions/index.js

@@ -17,7 +17,7 @@ const curve = require('./curve');
 const guni = require('./guni');
 const mstable = require('./mstable');
 const rari = require('./rari');
-const aaveV3 = require('./aaveV3');
+const convex = require('./convex');
 
 module.exports = {
   maker,
@@ -39,5 +39,5 @@ module.exports = {
   guni,
   mstable,
   rari,
-  aaveV3,
+  convex,
 };

package/src/actions/insta/InstPullTokensAction.js

@@ -7,16 +7,16 @@ class InstPullTokensAction extends Action {
     super(
       "InstPullTokens",
       getAddr("InstPullTokens"),
-      [["address", "address[]", "uint256[]", "address"]],
-      [[dsaAddress, tokens, amounts, to]]
+      ["address", "address[]", "uint256[]", "address"],
+      [dsaAddress, tokens, amounts, to]
     );
     this.mappableArgs = [];
   }
 
   async getAssetsToApprove() {
     return [{
-      dsaAddress: this.args[0][0],
-      specialApproveLabel: 'Instadapp' 
+      dsaAddress: this.args[0],
+      specialApproveLabel: 'Instadapp'
     }];
   }
 }

package/src/actions/lido/LidoStakeAction.js

@@ -12,16 +12,11 @@ class LidoStakeAction extends Action {
    * @param to {EthAddress} stETH will be sent to this address
    */
   constructor(amount, from, to) {
-    super('LidoStake', getAddr('LidoStake'), [['uint256','address', 'address']], [[amount, from, to]]);
-    this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
-      this.args[0][2],
-    ];
+    super('LidoStake', getAddr('LidoStake'), ['uint256','address', 'address'], [amount, from, to]);
   }
 
   async getAssetsToApprove() {
-    return [{asset: getAssetInfo('WETH').address, owner: this.args[0][1]}];
+    return [{asset: getAssetInfo('WETH').address, owner: this.args[1]}];
   }
 }
 

package/src/actions/lido/LidoUnwrapAction.js

@@ -11,16 +11,11 @@ class LidoUnwrapAction extends Action {
    * @param to {EthAddress} stETH will be sent to this address
    */
   constructor(amount, from, to) {
-    super('LidoUnwrap', getAddr('LidoUnwrap'), [['uint256','address', 'address']], [[amount, from, to]]);
-    this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
-      this.args[0][2],
-    ];
+    super('LidoUnwrap', getAddr('LidoUnwrap'), ['uint256','address', 'address'], [amount, from, to]);
   }
 
   async getAssetsToApprove() {
-    return [{asset: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0', owner: this.args[0][1]}];
+    return [{asset: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0', owner: this.args[1]}];
   }
 }
 

package/src/actions/lido/LidoWrapAction.js

@@ -13,19 +13,19 @@ class LidoWrapAction extends Action {
    * @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]]);
+    super('LidoWrap', getAddr('LidoWrap'), ['uint256','address', 'address', 'bool'], [amount, from, to, useEth]);
     this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
-      this.args[0][2],
+      this.args[0],
+      this.args[1],
+      this.args[2],
     ];
   }
 
   async getAssetsToApprove() {
-    if (this.args[0][3]){
-        return [{asset: getAssetInfo('WETH').address, owner: this.args[0][1]}];
+    if (this.args[3]){
+        return [{asset: getAssetInfo('WETH').address, owner: this.args[1]}];
     }else{
-        return [{asset: '0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84', owner: this.args[0][1]}];
+        return [{asset: '0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84', owner: this.args[1]}];
     }
   }
 }

package/src/actions/liquity/LiquityBorrowAction.js

@@ -15,13 +15,13 @@ class LiquityBorrowAction extends Action {
         requireAddress(to);
         super('LiquityBorrow',
             getAddr('LiquityBorrow'),
-            [['uint256', 'uint256', 'address', 'address', 'address']],
-            [[...arguments]]);
+            ['uint256', 'uint256', 'address', 'address', 'address'],
+            [...arguments]);
 
         this.mappableArgs = [
-            this.args[0][0],
-            this.args[0][1],
-            this.args[0][2],
+            this.args[0],
+            this.args[1],
+            this.args[2],
         ];
     }
 }

package/src/actions/liquity/LiquityClaimAction.js

@@ -13,11 +13,11 @@ class LiquityClaimAction extends Action {
         requireAddress(to);
         super('LiquityClaim',
             getAddr('LiquityClaim'),
-            [['address']],
-            [[...arguments]]);
+            ['address'],
+            [...arguments]);
 
             this.mappableArgs = [
-                this.args[0][0],
+                this.args[0],
               ];
     }
 }

package/src/actions/liquity/LiquityCloseAction.js

@@ -16,12 +16,12 @@ class LiquityCloseAction extends Action {
         requireAddress(to);
         super('LiquityClose',
             getAddr('LiquityClose'),
-            [['address', 'address']],
-            [[from, to]]);
+            ['address', 'address'],
+            [from, to]);
 
             this.mappableArgs = [
-                this.args[0][0],
-                this.args[0][1],
+                this.args[0],
+                this.args[1],
               ];
     }