@defisaver/sdk 0.2.12 → 0.2.13

package/src/actions/aaveV3/AaveV3PaybackAction.js

@@ -19,15 +19,15 @@ class AaveV3PaybackAction extends ActionWithL2 {
    */
   constructor(useOnDefaultMarket, market, amount, from, rateMode, tokenAddr, assetId, useOnBehalf , onBehalf = getAddr('Empty')) {
     super('AaveV3Payback', getAddr('AaveV3Payback'),
-    [['uint256','address','uint8','uint16', 'bool', 'bool','address','address']],
-    [[amount, from, rateMode, assetId, useOnDefaultMarket, useOnBehalf, market, onBehalf]]
+    ['uint256','address','uint8','uint16', 'bool', 'bool','address','address'],
+    [amount, from, rateMode, assetId, useOnDefaultMarket, useOnBehalf, market, onBehalf]
     );
 
     this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
-      this.args[0][6],
-      this.args[0][7],
+      this.args[0],
+      this.args[1],
+      this.args[6],
+      this.args[7],
     ];
     this.tokenForApproval = tokenAddr;
   }
@@ -42,24 +42,24 @@ class AaveV3PaybackAction extends ActionWithL2 {
     // executeActionDirectL2
     let encodedInput = "0x2895f3aa";
     // amount
-    encodedInput = encodedInput.concat(this.numberToBytes32(this.args[0][0]));
+    encodedInput = encodedInput.concat(this.numberToBytes32(this.args[0]));
     // from
-    encodedInput = encodedInput.concat(this.addressToBytes20(this.args[0][1]));
+    encodedInput = encodedInput.concat(this.addressToBytes20(this.args[1]));
     // rateMode
-    encodedInput = encodedInput.concat(this.numberToBytes1(this.args[0][2]));
+    encodedInput = encodedInput.concat(this.numberToBytes1(this.args[2]));
     // assetId
-    encodedInput = encodedInput.concat(this.numberToBytes2(this.args[0][3]));
+    encodedInput = encodedInput.concat(this.numberToBytes2(this.args[3]));
     // useDefaultMarket
-    encodedInput = encodedInput.concat(this.boolToBytes1(this.args[0][4]));
+    encodedInput = encodedInput.concat(this.boolToBytes1(this.args[4]));
     // useOnBehalf
-    encodedInput = encodedInput.concat(this.boolToBytes1(this.args[0][5]));
-    if (!this.args[0][4]) {
+    encodedInput = encodedInput.concat(this.boolToBytes1(this.args[5]));
+    if (!this.args[4]) {
       // market
-      encodedInput = encodedInput.concat(this.addressToBytes20(this.args[0][6]));
+      encodedInput = encodedInput.concat(this.addressToBytes20(this.args[6]));
     }
-    if (this.args[0][5]) {
+    if (this.args[5]) {
       // onBehalf
-      encodedInput = encodedInput.concat(this.addressToBytes20(this.args[0][7]));
+      encodedInput = encodedInput.concat(this.addressToBytes20(this.args[7]));
     }
     return encodedInput;
   }

package/src/actions/aaveV3/AaveV3SetEModeAction.js

@@ -12,24 +12,24 @@ class AaveV3SetEModeAction extends ActionWithL2 {
    */
   constructor(categoryId, useOnDefaultMarket, market) {
     super('AaveV3SetEMode', getAddr('AaveV3SetEMode'),
-    [['uint8', 'bool', 'address']],
-    [[categoryId, useOnDefaultMarket, market]]
+    ['uint8', 'bool', 'address'],
+    [categoryId, useOnDefaultMarket, market]
     );
 
     this.mappableArgs = [
-      this.args[0][2],
+      this.args[2],
     ];
   }
   encodeInputs() {
     // executeActionDirectL2
     let encodedInput = "0x2895f3aa";
     // categoryId
-    encodedInput = encodedInput.concat(this.numberToBytes1(this.args[0][0]));
+    encodedInput = encodedInput.concat(this.numberToBytes1(this.args[0]));
     // useOnDefaultMarket
-    encodedInput = encodedInput.concat(this.boolToBytes1(this.args[0][1]));
-    if (!this.args[0][1]){
+    encodedInput = encodedInput.concat(this.boolToBytes1(this.args[1]));
+    if (!this.args[1]){
       // market
-      encodedInput = encodedInput.concat(this.addressToBytes20(this.args[0][2]));
+      encodedInput = encodedInput.concat(this.addressToBytes20(this.args[2]));
     }
 
     return encodedInput;

package/src/actions/aaveV3/AaveV3SupplyAction.js

@@ -20,22 +20,22 @@ class AaveV3SupplyAction extends ActionWithL2 {
    */
   constructor(amount, from, tokenAddress, assetId, enableAsColl, useDefaultMarket, useOnBehalf ,market, onBehalf = getAddr('Empty')) {
     super('AaveV3Supply', getAddr('AaveV3Supply'),
-    [['uint256','address','uint16','bool','bool','bool','address','address']],
-    [[amount, from, assetId, enableAsColl, useDefaultMarket, useOnBehalf, market, onBehalf]]
+    ['uint256','address','uint16','bool','bool','bool','address','address'],
+    [amount, from, assetId, enableAsColl, useDefaultMarket, useOnBehalf, market, onBehalf]
     );
 
     this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
-      this.args[0][6],
-      this.args[0][7],
+      this.args[0],
+      this.args[1],
+      this.args[6],
+      this.args[7],
     ];
     this.tokenForApproval = tokenAddress;
   }
 
   async getAssetsToApprove() {
     const asset = getAssetInfoByAddress(this.tokenForApproval);
-    if (asset.symbol !== 'ETH') return [{asset: this.tokenForApproval, owner: this.args[0][2]}];
+    if (asset.symbol !== 'ETH') return [{asset: this.tokenForApproval, owner: this.args[2]}];
     return [];
   }
 
@@ -43,24 +43,24 @@ class AaveV3SupplyAction extends ActionWithL2 {
     // executeActionDirectL2
     let encodedInput = "0x2895f3aa";
     // amount
-    encodedInput = encodedInput.concat(this.numberToBytes32(this.args[0][0]));
+    encodedInput = encodedInput.concat(this.numberToBytes32(this.args[0]));
     // from
-    encodedInput = encodedInput.concat(this.addressToBytes20(this.args[0][1]));
+    encodedInput = encodedInput.concat(this.addressToBytes20(this.args[1]));
     // assetId
-    encodedInput = encodedInput.concat(this.numberToBytes2(this.args[0][2]));
+    encodedInput = encodedInput.concat(this.numberToBytes2(this.args[2]));
     // enableAsColl
-    encodedInput = encodedInput.concat(this.boolToBytes1(this.args[0][3]));
+    encodedInput = encodedInput.concat(this.boolToBytes1(this.args[3]));
     // useDefaultMarket
-    encodedInput = encodedInput.concat(this.boolToBytes1(this.args[0][4]));
+    encodedInput = encodedInput.concat(this.boolToBytes1(this.args[4]));
     // useOnBehalf
-    encodedInput = encodedInput.concat(this.boolToBytes1(this.args[0][5]));
-    if (!this.args[0][4]) {
+    encodedInput = encodedInput.concat(this.boolToBytes1(this.args[5]));
+    if (!this.args[4]) {
       // market
-      encodedInput = encodedInput.concat(this.addressToBytes20(this.args[0][6]));
+      encodedInput = encodedInput.concat(this.addressToBytes20(this.args[6]));
     }
-    if (this.args[0][5]) {
+    if (this.args[5]) {
       // onBehalf
-      encodedInput = encodedInput.concat(this.addressToBytes20(this.args[0][7]));
+      encodedInput = encodedInput.concat(this.addressToBytes20(this.args[7]));
     }
     return encodedInput;
   }

package/src/actions/aaveV3/AaveV3SwapBorrowRateModeAction.js

@@ -14,27 +14,27 @@ class AaveV3SwapBorrowRateModeAction extends ActionWithL2 {
    */
   constructor(rateMode, assetId, useDefaultMarket, market) {
     super('AaveV3SwapBorrowRateMode', getAddr('AaveV3SwapBorrowRateMode'),
-    [['uint256','uint16','bool','address']],
-    [[rateMode, assetId, useDefaultMarket, market]]
+    ['uint256','uint16','bool','address'],
+    [rateMode, assetId, useDefaultMarket, market]
     );
 
     this.mappableArgs = [
       this.args[0][0],
-      this.args[0][3],
+      this.args[3],
     ];
   }
   encodeInputs() {
     // executeActionDirectL2
     let encodedInput = "0x2895f3aa";
     // rateMode
-    encodedInput = encodedInput.concat(this.numberToBytes32(this.args[0][0]));
+    encodedInput = encodedInput.concat(this.numberToBytes32(this.args[0]));
     // assetId
-    encodedInput = encodedInput.concat(this.numberToBytes2(this.args[0][1]))
+    encodedInput = encodedInput.concat(this.numberToBytes2(this.args[1]))
     // useOnDefaultMarket
-    encodedInput = encodedInput.concat(this.boolToBytes1(this.args[0][2]))
-    if (!this.args[0][2]){
+    encodedInput = encodedInput.concat(this.boolToBytes1(this.args[2]))
+    if (!this.args[2]){
       // market
-      encodedInput = encodedInput.concat(this.addressToBytes20(this.args[0][3]));
+      encodedInput = encodedInput.concat(this.addressToBytes20(this.args[3]));
     }
     return encodedInput;
   }

package/src/actions/aaveV3/AaveV3WithdrawAction.js

@@ -14,30 +14,30 @@ class AaveV3WithdrawAction extends ActionWithL2 {
    */
   constructor(assetId, useDefaultMarket, amount, to, market) {
     super('AaveV3Withdraw', getAddr('AaveV3Withdraw'),
-    [['uint16','bool','uint256','address','address']],
-    [[assetId, useDefaultMarket, amount, to, market]]
+    ['uint16','bool','uint256','address','address'],
+    [assetId, useDefaultMarket, amount, to, market]
     );
 
     this.mappableArgs = [
-      this.args[0][2],
-      this.args[0][3],
-      this.args[0][4],
+      this.args[2],
+      this.args[3],
+      this.args[4],
     ];
   }
   encodeInputs() {
     // executeActionDirectL2
     let encodedInput = "0x2895f3aa";
     // assetId
-    encodedInput = encodedInput.concat(this.numberToBytes2(this.args[0][0]));
+    encodedInput = encodedInput.concat(this.numberToBytes2(this.args[0]));
     // useOnDefaultMarket
-    encodedInput = encodedInput.concat(this.boolToBytes1(this.args[0][1]))
+    encodedInput = encodedInput.concat(this.boolToBytes1(this.args[1]))
     // amount
-    encodedInput = encodedInput.concat(this.numberToBytes32(this.args[0][2]));
+    encodedInput = encodedInput.concat(this.numberToBytes32(this.args[2]));
     // from
-    encodedInput = encodedInput.concat(this.addressToBytes20(this.args[0][3]));
-    if (!this.args[0][1]){
+    encodedInput = encodedInput.concat(this.addressToBytes20(this.args[3]));
+    if (!this.args[1]){
       // market
-      encodedInput = encodedInput.concat(this.addressToBytes20(this.args[0][4]));
+      encodedInput = encodedInput.concat(this.addressToBytes20(this.args[4]));
     }
     return encodedInput;
   }

package/src/actions/balancer/BalancerV2ClaimAction.js

@@ -17,29 +17,27 @@ class BalancerV2ClaimAction extends Action {
       'BalancerV2Claim',
       getAddr('BalancerV2Claim'),
       [
-        [
-          "address",
-          "address",
-          "uint256[]",
-          "uint256[]",
-          "bytes32[][]",
-        ],
+        "address",
+        "address",
+        "uint256[]",
+        "uint256[]",
+        "bytes32[][]",
       ],
-      [[liquidityProvider, to, weeks, balances, merkleProofs]]
+      [liquidityProvider, to, weeks, balances, merkleProofs]
     );
 
     this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
+      this.args[0],
+      this.args[1],
     ];
   }
 
   async getAssetsToApprove() {
 
     const approveArr = [];
-      if (this.args[0][0] !== this.args[0][1]){
+      if (this.args[0] !== this.args[1]){
         const tokenAddress = getAddr('BalancerToken');
-        approveArr.push({asset: tokenAddress, owner: this.args[0][0]});
+        approveArr.push({asset: tokenAddress, owner: this.args[0]});
       }
     return approveArr;
   }

package/src/actions/balancer/BalancerV2SupplyAction.js

@@ -18,32 +18,30 @@ class BalancerV2SupplyAction extends Action {
       'BalancerV2Supply',
       getAddr('BalancerV2Supply'),
       [
-        [
-          "bytes32",
-          "address",
-          "address",
-          "address[]",
-          "uint256[]",
-          "bytes",
-        ],
+        "bytes32",
+        "address",
+        "address",
+        "address[]",
+        "uint256[]",
+        "bytes",
       ],
-      [[poolId, from, to, tokens, maxAmountsIn, userData]]
+      [poolId, from, to, tokens, maxAmountsIn, userData]
     );
 
     this.mappableArgs = [
-      this.args[0][1],
-      this.args[0][2],
+      this.args[1],
+      this.args[2],
     ];
-    for (let i = 0; i < this.args[0][4].length; i++){
-      this.mappableArgs.push(this.args[0][4][i]);
+    for (let i = 0; i < this.args[4].length; i++){
+      this.mappableArgs.push(this.args[4][i]);
     }
   }
 
   async getAssetsToApprove() {
     const approveArr = [];
-    const tokens = this.args[0][3];
-    tokens.forEach(token => approveArr.push({asset: token, owner: this.args[0][1], specialApproveLabel: 'balancer'}));
-    
+    const tokens = this.args[3];
+    tokens.forEach(token => approveArr.push({asset: token, owner: this.args[1], specialApproveLabel: 'balancer'}));
+
     return approveArr;
   }
 }

package/src/actions/balancer/BalancerV2WithdrawAction.js

@@ -19,36 +19,34 @@ class BalancerV2WithdrawAction extends Action {
       'BalancerV2Withdraw',
       getAddr('BalancerV2Withdraw'),
       [
-        [
-          "bytes32",
-          "address",
-          "address",
-          "uint256",
-          "address[]",
-          "uint256[]",
-          "bytes",
-        ],
+        "bytes32",
+        "address",
+        "address",
+        "uint256",
+        "address[]",
+        "uint256[]",
+        "bytes",
       ],
-      [[poolId, from, to, lpTokenAmount, tokens, minAmountsOut, userData]]
+      [poolId, from, to, lpTokenAmount, tokens, minAmountsOut, userData]
     );
 
     this.from = from;
 
     this.mappableArgs = [
-      this.args[0][1],
-      this.args[0][2],
-      this.args[0][3],
+      this.args[1],
+      this.args[2],
+      this.args[3],
     ];
 
-    for (let i = 0; i < this.args[0][5].length; i++){
-      this.mappableArgs.push(this.args[0][5][i]);
+    for (let i = 0; i < this.args[5].length; i++){
+      this.mappableArgs.push(this.args[5][i]);
     }
   }
 
   async getAssetsToApprove() {
     const approveArr = [];
-    const token = this.args[0][0].slice(0,42);
-    approveArr.push({asset: token, owner: this.args[0][1], specialApproveLabel: 'balancer'});
+    const token = this.args[0].slice(0,42);
+    approveArr.push({asset: token, owner: this.args[1], specialApproveLabel: 'balancer'});
     return approveArr;
   }
 }

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

@@ -20,23 +20,22 @@ class SellAction extends ActionWithL2 {
     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

@@ -16,19 +16,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

@@ -15,17 +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

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;