@defisaver/sdk 0.2.5 → 0.2.8

package/src/actions/basic/AutomationV2Unsub.js

@@ -6,10 +6,10 @@ class AutomationV2Unsub extends Action {
     super(
       'AutomationV2Unsub',
       getAddr('AutomationV2Unsub'),
-      [["uint256", "uint256"]],
-      [[cdpId, protocol]]
+      ["uint256", "uint256"],
+      [cdpId, protocol]
     );
   }
 }
 
-module.exports = AutomationV2Unsub;
+module.exports = AutomationV2Unsub;

package/src/actions/basic/ChangeProxyOwnerAction.js

@@ -9,10 +9,8 @@ class ChangeProxyOwnerAction extends Action {
    * @param newOwner {Address} Address of new owner
    */
   constructor(newOwner) {
-    super("ChangeProxyOwner", getAddr("ChangeProxyOwner"), [["address"]], [[...arguments]]);
-
-    this.mappableArgs = [this.args[0][0]];
-    }
+    super("ChangeProxyOwner", getAddr("ChangeProxyOwner"), ["address"], [...arguments]);
+  }
 }
 
 module.exports = ChangeProxyOwnerAction;

package/src/actions/basic/GasFeeAction.js

@@ -11,17 +11,17 @@ class GasFeeAction extends Action {
   constructor(gasStart, feeToken, availableAmount, dfsFeeDivider = 2000) {
     super("GasFeeTaker",
       getAddr("GasFeeTaker"),
-      [["uint256", "address", "uint256", "uint256"]],
-      [[gasStart, feeToken, availableAmount, dfsFeeDivider]],
+      ["uint256", "address", "uint256", "uint256"],
+      [gasStart, feeToken, availableAmount, dfsFeeDivider],
     );
 
     this.mappableArgs = [
-      this.args[0][1],
-      this.args[0][2],
-      this.args[0][3],
+      this.args[1],
+      this.args[2],
+      this.args[3],
     ];
   }
 
 }
 
-module.exports = GasFeeAction;
+module.exports = GasFeeAction;

package/src/actions/basic/PullTokenAction.js

@@ -17,19 +17,13 @@ class PullTokenAction extends Action {
     super(
       'PullToken',
       getAddr('PullToken'),
-      [[
+      [
         "address",
         "address",
         "uint",
-      ]],
-      [[...arguments]]
+      ],
+      [...arguments]
     );
-
-    this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
-      this.args[0][2],
-    ];
   }
 
   async getAssetsToApprove() {

package/src/actions/basic/SellAction.js

@@ -19,23 +19,22 @@ class SellAction extends Action {
     super(
       'DFSSell',
       getAddr('DFSSell'),
-      [[
+      [
         ["address","address","uint256","uint256","uint256","uint256","address","address","bytes",["address","address","address","uint256","uint256","bytes"]],
         "address",
         "address",
-      ]
       ],
-      [[exchangeOrder, from, to]]
+      [exchangeOrder, from, to]
     );
 
     this.protocolFee = protocolFee;
 
     this.mappableArgs = [
-      this.args[0][0][0],
-      this.args[0][0][1],
-      this.args[0][0][2],
+      this.args[0][0],
       this.args[0][1],
       this.args[0][2],
+      this.args[1],
+      this.args[2],
     ];
   }
 

package/src/actions/basic/SendTokenAction.js

@@ -1,5 +1,6 @@
 const Action = require("../../Action");
 const {requireAddress} = require("../../utils/general");
+const {getAssetInfoByAddress} = require("@defisaver/tokens");
 const { getAddr } = require('../../addresses.js');
 
 /**
@@ -16,19 +17,13 @@ class SendTokenAction extends Action {
     super(
       'SendToken',
       getAddr('SendToken'),
-      [[
+      [
         "address",
         "address",
         "uint",
-      ]],
-      [[...arguments]]
+      ],
+      [...arguments]
     );
-
-    this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
-      this.args[0][2],
-    ];
   }
 }
 

package/src/actions/basic/SendTokenAndUnwrapAction.js

@@ -0,0 +1,30 @@
+const Action = require("../../Action");
+const {requireAddress} = require("../../utils/general");
+const {getAssetInfoByAddress} = require("@defisaver/tokens");
+const { getAddr } = require('../../addresses.js');
+
+/**
+ * Transfers specified token from recipe (DsProxy) to specified address unwraps if Weth address
+ */
+class SendTokenAndUnwrapAction extends Action {
+  /**
+   * @param token {string} Token address
+   * @param to {string} Transfer recipient
+   * @param amount {string} Transfer amount (-1 for whole Recipe (DsProxy) balance)
+   */
+  constructor(token, to, amount) {
+    requireAddress(to);
+    super(
+      'SendTokenAndUnwrap',
+      getAddr('SendTokenAndUnwrap'),
+      [
+        "address",
+        "address",
+        "uint",
+      ],
+      [...arguments]
+    );
+  }
+}
+
+module.exports = SendTokenAndUnwrapAction;

package/src/actions/basic/SubInputsAction.js

@@ -9,17 +9,12 @@ class SubInputsAction extends Action {
     super(
       'SubInputs',
       getAddr('SubInputs'),
-      [[
+      [
         "uint",
         "uint",
-      ]],
-      [[...arguments]]
+      ],
+      [...arguments]
     );
-
-    this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
-    ];
   }
 }
 

package/src/actions/basic/SumInputsAction.js

@@ -9,17 +9,12 @@ class SumInputsAction extends Action {
     super(
       'SumInputs',
       getAddr('SumInputs'),
-      [[
+      [
         "uint",
         "uint",
-      ]],
-      [[...arguments]]
+      ],
+      [...arguments]
     );
-
-    this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
-    ];
   }
 }
 

package/src/actions/basic/ToggleSubAction.js

@@ -0,0 +1,19 @@
+const Action = require("../../Action");
+const {getAddr} = require("../../addresses.js");
+
+/**
+ *  Sets the state of the sub to active or deactivated
+ */
+class ToggleSubAction extends Action {
+  /**
+   * @param subId Id of the subscription in the SubStorage contract
+   * @param active Set to true to activate action, to false to deactivate
+   */
+  constructor(subId, active) {
+    super("ToggleSub", getAddr("ToggleSub"), ["uint256", "bool"], [...arguments]);
+
+  }
+
+}
+
+module.exports = ToggleSubAction;

package/src/actions/basic/TokenBalanceAction.js

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

package/src/actions/basic/UnwrapEthAction.js

@@ -1,11 +1,11 @@
-const ActionWithL2 = require("../../ActionWithL2");
+const Action = require("../../Action");
 const {requireAddress} = require("../../utils/general");
 const {getAddr} = require('../../addresses.js');
 
 /**
  * Unwraps a specified amount of WETH from the proxy
  */
-class UnwrapEthAction extends ActionWithL2 {
+class UnwrapEthAction extends Action {
   /**
    * @param amount {string} Token address
    * @param to {string} Transfer recipient
@@ -15,25 +15,12 @@ class UnwrapEthAction extends ActionWithL2 {
     super(
       'UnwrapEth',
       getAddr('UnwrapEth'),
-      [[
+      [
         "uint256",
         "address"
-      ]],
-      [[...arguments]]
+      ],
+      [...arguments]
     );
-
-    this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
-    ];
-  }
-  encodeInputs(){
-    // executeActionDirectL2
-    let encodedInput = "0x2895f3aa";
-    // amount
-    encodedInput = encodedInput.concat(this.numberToBytes32(this.args[0][0]));
-    // to
-    encodedInput = encodedInput.concat(this.addressToBytes20(this.args[0][1]));
   }
 }
 

package/src/actions/basic/UpdateSubAction.js

@@ -0,0 +1,19 @@
+const Action = require("../../Action");
+const {getAddr} = require("../../addresses.js");
+
+/**
+ * Action for updating sub data
+ */
+class UpdateSubAction extends Action {
+  /**
+   * @param subId id of the subscription in the SubStorage contract
+   * @param sub object that contains new sub information
+   */
+  constructor(subId, sub) {
+    super("UpdateSub", getAddr("UpdateSub"), ["uint256", "(uint64,bool,bytes[],bytes32[])"], [...arguments]);
+
+  }
+
+}
+
+module.exports = UpdateSubAction;

package/src/actions/basic/WrapEthAction.js

@@ -1,29 +1,19 @@
-const ActionWithL2 = require("../../ActionWithL2");
-const { getAddr } = require("../../addresses.js");
+const Action = require("../../Action");
+const {getAddr} = require("../../addresses.js");
 
 /**
  * Wraps a specified amount of ETH from the wallet to WETH on the recipe
  */
-class WrapEthAction extends ActionWithL2 {
+class WrapEthAction extends Action {
   /**
    * @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];
-  }
-  encodeInputs(){
-    // executeActionDirectL2
-    let encodedInput = "0x2895f3aa";
-    // amount
-    encodedInput = encodedInput.concat(this.numberToBytes32(this.args[0][0]));
+    return 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('CompPaybackNew', getAddr('CompPaybackNew'), ['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;