@defisaver/sdk 0.2.12 → 0.2.13

package/src/actions/basic/WrapEthAction.js

@@ -9,21 +9,18 @@ class WrapEthAction extends ActionWithL2 {
    * @param amount {string} Transfer amount
    */
   constructor(amount) {
-    super("WrapEth", getAddr("WrapEth"), [["uint256"]], [[...arguments]]);
-
-    this.mappableArgs = [
-      this.args[0][0],
-    ];
+    super("WrapEth", getAddr("WrapEth"), ["uint256"], [...arguments]);
   }
 
   async getEthValue() {
-    return this.args[0][0];
+    return this.args[0];
   }
-  encodeInputs(){
+
+  encodeInputs() {
     // executeActionDirectL2
     let encodedInput = "0x2895f3aa";
     // amount
-    encodedInput = encodedInput.concat(this.numberToBytes32(this.args[0][0]));
+    encodedInput = encodedInput.concat(this.numberToBytes32(this.args[0]));
   }
 }
 

package/src/actions/basic/index.js

@@ -1,5 +1,6 @@
 const SellAction = require('./SellAction');
 const SendTokenAction = require('./SendTokenAction');
+const SendTokenAndUnwrapAction = require('./SendTokenAndUnwrapAction');
 const PullTokenAction = require('./PullTokenAction');
 const WrapEthAction = require('./WrapEthAction');
 const UnwrapEthAction = require('./UnwrapEthAction');
@@ -9,6 +10,8 @@ const ChangeProxyOwnerAction = require('./ChangeProxyOwnerAction');
 const TokenBalanceAction = require('./TokenBalanceAction');
 const AutomationV2Unsub = require('./AutomationV2Unsub');
 const GasFeeAction = require('./GasFeeAction');
+const UpdateSubAction = require('./UpdateSubAction');
+const ToggleSubAction = require('./ToggleSubAction');
 
 module.exports = {
   SellAction,
@@ -22,4 +25,7 @@ module.exports = {
   TokenBalanceAction,
   AutomationV2Unsub,
   GasFeeAction,
+  UpdateSubAction,
+  SendTokenAndUnwrapAction,
+  ToggleSubAction,
 };

package/src/actions/checkers/MakerRatioCheckAction.js

@@ -13,13 +13,13 @@ class MakerRatioCheckAction extends Action {
    * @param startRatioIndex {uint256} Index in returnValues where ratio before actions is stored
    */
   constructor(ratioState, checkTarget, targetRatio, vaultId, startRatioIndex) {
-    super("McdRatioCheck", getAddr("McdRatioCheck"), [["uint8","bool","uint256","uint256","uint256"]], [[ratioState, checkTarget, targetRatio, vaultId, startRatioIndex]]);
+    super("McdRatioCheck", getAddr("McdRatioCheck"), ["uint8","bool","uint256","uint256","uint256"], [ratioState, checkTarget, targetRatio, vaultId, startRatioIndex]);
 
     this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][2],
-      this.args[0][3],
-      this.args[0][4],
+      this.args[0],
+      this.args[2],
+      this.args[3],
+      this.args[4],
     ];
   }
 

package/src/actions/compound/CompoundBorrowAction.js

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

package/src/actions/compound/CompoundClaimAction.js

@@ -14,11 +14,11 @@ class CompoundClaimAction extends Action {
    */
   constructor(cSupplyAddresses, cBorrowAddresses, from, to) {
     requireAddress(to);
-    super('CompClaim', getAddr('CompClaim'), [["address[]", "address[]", "address", "address"]], [[...arguments]]);
+    super('CompClaim', getAddr('CompClaim'), ["address[]", "address[]", "address", "address"], [...arguments]);
 
     this.mappableArgs = [
-      this.args[0][2],
-      this.args[0][3],
+      this.args[2],
+      this.args[3],
     ];
   }
 }

package/src/actions/compound/CompoundCollateralSwitchAction.js

@@ -10,11 +10,9 @@ class CompoundCollateralSwitchAction extends Action {
     super(
       'CompCollateralSwitch',
       getAddr('CompCollateralSwitch'),
-      [['address[]', 'bool[]']],
-      [[...arguments]],
+      ['address[]', 'bool[]'],
+      [...arguments],
     );
-    this.mappableArgs = [
-  ];
   }
 }
 

package/src/actions/compound/CompoundGetDebtAction.js

@@ -6,11 +6,11 @@ class CompoundGetDebtAction extends Action {
     super(
       'CompGetDebt',
       getAddr('CompGetDebt'),
-      [[
+      [
         "address",
         "address",
-      ]],
-      [[...arguments]]
+      ],
+      [...arguments]
     );
   }
 }

package/src/actions/compound/CompoundPaybackAction.js

@@ -13,13 +13,7 @@ class CompoundPaybackAction extends Action {
    * @param onBehalf {EthAddress} Defaults to DsProxy address if 0x0
    */
   constructor(cTokenAddr, amount, from, onBehalf = getAddr('Empty')) {
-    super('CompPayback', getAddr('CompPayback'), [['address', 'uint256', 'address', 'address']], [[cTokenAddr, amount, from, onBehalf]]);
-    this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
-      this.args[0][2],
-      this.args[0][3],
-    ];
+    super('CompPayback', getAddr('CompPayback'), ['address', 'uint256', 'address', 'address'], [cTokenAddr, amount, from, onBehalf]);
   }
 
   async getAssetsToApprove() {

package/src/actions/compound/CompoundSupplyAction.js

@@ -13,12 +13,12 @@ class CompoundSupplyAction extends Action {
    * @param enableAsColl {boolean} If we need to enable asset as collateral
    */
   constructor(cTokenAddr, amount, from, enableAsColl = true) {
-    super('CompSupply', getAddr('CompSupply'), [['address','uint256','address','bool']], [[cTokenAddr, amount, from, enableAsColl]]);
+    super('CompSupply', getAddr('CompSupply'), ['address','uint256','address','bool'], [cTokenAddr, amount, from, enableAsColl]);
 
     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/compound/CompoundWithdrawAction.js

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

package/src/actions/convex/ConvexClaimAction.js

@@ -0,0 +1,60 @@
+const Action = require('../../Action');
+const { getAddr } = require('../../addresses');
+const { getConvexPool } = require('../../utils/convex-utils');
+const { requireAddress } = require('../../utils/general');
+
+/**
+ * ConvexClaimAction - Claims convex rewards
+ */
+class ConvexClaimAction extends Action {
+    /**
+     * @param {address} from 
+     * @param {address} to 
+     * @param {address} curveLp 
+     */
+    constructor(
+        from,
+        to,
+        curveLp,
+    ) {
+        requireAddress(to);
+        const { crvRewards } = getConvexPool(curveLp);
+        super(
+            'ConvexClaim',
+            getAddr('ConvexClaim'),
+            [
+                'address',
+                'address',
+                'address',
+            ],
+            [
+                from,
+                to,
+                crvRewards,
+            ],
+        ).curveLp = curveLp;
+
+        this.mappableArgs = [
+            this.args[0],
+            this.args[1],
+            this.args[2],
+        ];
+    }
+
+    async getAssetsToApprove() {
+        const pool = getConvexPool(this.curveLp);
+        const owner = this.args[0];
+
+        return [
+            getAddr('CrvToken'),
+            getAddr('CvxToken'),
+        ].concat(
+            pool.extraRewards.map((e) => e.token),
+        ).reduce((acc, e) => {
+            if (!acc.includes(e.toLowerCase())) acc.push(e.toLowerCase());
+            return acc;
+        }, []).map((e) => Object({asset: e, owner}));
+    }
+}
+
+module.exports = ConvexClaimAction;

package/src/actions/convex/ConvexDepositAction.js

@@ -0,0 +1,67 @@
+const Action = require('../../Action');
+const { getAddr } = require('../../addresses');
+const { DepositOption, getConvexPool } = require('../../utils/convex-utils');
+const { requireAddress } = require('../../utils/general');
+/**
+ * ConvexDepositAction - Deposits (wraps) Curve LP into convex, stakes wrapped LP, or does both
+ */
+class ConvexDepositAction 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(
+            'ConvexDeposit',
+            getAddr('ConvexDeposit'),
+            [
+                '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 assetToPull = {
+            [DepositOption.WRAP]: pool.lpToken,
+            [DepositOption.STAKE]: pool.token,
+            [DepositOption.WRAP_AND_STAKE]: pool.lpToken,
+        }
+
+        return [{
+            asset: assetToPull[this.args[4]], owner: this.args[0],
+        }];
+    }
+}
+
+module.exports = ConvexDepositAction;

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]);
   }
 }