@defisaver/sdk 0.2.0 → 0.2.2

package/package.json

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

package/src/Action.js

@@ -107,13 +107,9 @@ class Action {
    * @private
    */
   _encodeForCall() {
-    const bytesEncodedArgs = this.args.map((arg, i) => {
-      let paramType = this.paramTypes[i];
-      let _arg = this._replaceWithPlaceholders(arg, paramType);
-      let _paramType = this._formatType(paramType);
-      return AbiCoder.encodeParameter(_paramType, _arg);
-    });
-    return bytesEncodedArgs;
+    let _arg = this._replaceWithPlaceholders(this.args, this.paramTypes);
+    let _paramType = this._formatType(this.paramTypes);
+    return [AbiCoder.encodeParameter(_paramType, _arg)];
   }
 
   /**
@@ -144,7 +140,7 @@ class Action {
   encodeForStrategy(subSlots) {
     return [
       this.getId(),
-      this._getArgumentMappingWithSlots(subSlots), // paramMappings
+      [this._getArgumentMappingWithSlots(subSlots)], // paramMappings
     ]
   }
 

package/src/actions/aave/AaveBorrowAction.js

@@ -19,18 +19,9 @@ class AaveBorrowAction extends Action {
     super(
       'AaveBorrow',
       getAddr('AaveBorrow'),
-      [['address', 'address', 'uint256', 'uint256', 'address', 'address']],
-      [[market, tokenAddr, amount, rateMode, to, onBehalf]],
+      ['address', 'address', 'uint256', 'uint256', 'address', 'address'],
+      [market, tokenAddr, amount, rateMode, to, onBehalf],
     );
-
-    this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
-      this.args[0][2],
-      this.args[0][3],
-      this.args[0][4],
-      this.args[0][5],
-    ];
   }
 }
 

package/src/actions/aave/AaveClaimStkAaveAction.js

@@ -11,13 +11,13 @@ class AaveClaimStkAaveAction extends Action {
     super(
       'AaveClaimStkAave',
       getAddr('AaveClaimStkAave'),
-      [['address[]', 'uint256', 'address']],
-      [[...arguments]],
+      ['address[]', 'uint256', 'address'],
+      [...arguments],
     );
     this.mappableArgs = [
-      this.args[0][1],
-      this.args[0][2],
-  ];
+      this.args[1],
+      this.args[2],
+    ];
   }
 }
 

package/src/actions/aave/AaveCollateralSwitchAction.js

@@ -1,6 +1,6 @@
 const Action = require("../../Action");
 const {requireAddress} = require("../../utils/general.js");
-const { getAddr } = require('../../addresses.js');
+const {getAddr} = require('../../addresses.js');
 
 /**
  *  AaveCollateralSwitchAction - Aave enable/disable token usage as collateral
@@ -10,11 +10,10 @@ class AaveCollateralSwitchAction extends Action {
     super(
       'AaveCollateralSwitch',
       getAddr('AaveCollateralSwitch'),
-      [['address', 'address[]', 'bool[]']],
-      [[...arguments]],
+      ['address', 'address[]', 'bool[]'],
+      [...arguments],
     );
-    this.mappableArgs = [
-  ];
+    this.mappableArgs = [];
   }
 }
 

package/src/actions/aave/AavePaybackAction.js

@@ -17,18 +17,9 @@ class AavePaybackAction extends Action {
   constructor(market, tokenAddr, amount, rateMode, from, onBehalf = getAddr('Empty')) {
     super('AavePayback',
       getAddr('AavePayback'),
-      [['address', 'address', 'uint256', 'uint256', 'address', 'address']],
-      [[market, tokenAddr, amount, rateMode, from, onBehalf]],
+      ['address', 'address', 'uint256', 'uint256', 'address', 'address'],
+      [market, tokenAddr, amount, rateMode, from, onBehalf],
     );
-
-    this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
-      this.args[0][2],
-      this.args[0][3],
-      this.args[0][4],
-      this.args[0][5],
-    ];
   }
 
   async getAssetsToApprove() {

package/src/actions/aave/AaveSupplyAction.js

@@ -15,14 +15,14 @@ class AaveSupplyAction extends Action {
    * @param enableAsColl {boolean} If we need to enable asset as collateral
    */
   constructor(market, tokenAddr, amount, from, onBehalf = getAddr('Empty'), enableAsColl) {
-    super('AaveSupply', getAddr('AaveSupply'), [['address','address','uint256','address','address','bool']], [[market, tokenAddr, amount, from, onBehalf, enableAsColl]]);
+    super('AaveSupply', getAddr('AaveSupply'), ['address','address','uint256','address','address','bool'], [market, tokenAddr, amount, from, onBehalf, enableAsColl]);
 
     this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
-      this.args[0][2],
-      this.args[0][3],
-      this.args[0][4],
+      this.args[0],
+      this.args[1],
+      this.args[2],
+      this.args[3],
+      this.args[4],
     ];
   }
 

package/src/actions/aave/AaveWithdrawAction.js

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

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

@@ -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

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

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

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/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 Action {
     super(
       'UnwrapEth',
       getAddr('UnwrapEth'),
-      [[
+      [
         "uint256",
         "address"
-      ]],
-      [[...arguments]]
+      ],
+      [...arguments]
     );
-
-    this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
-    ];
   }
 }
 

package/src/actions/basic/UpdateSubAction.js

@@ -10,7 +10,7 @@ class UpdateSubAction extends Action {
    * @param sub object that contains new sub information
    */
   constructor(subId, sub) {
-    super("UpdateSub", getAddr("UpdateSub"), [["uint256", "(uint64,bool,bytes[],bytes32[])"]], [[...arguments]]);
+    super("UpdateSub", getAddr("UpdateSub"), [["uint256", "(uint64,bool,bytes[],bytes32[])"]], [...arguments]);
 
   }
 

package/src/actions/basic/WrapEthAction.js

@@ -9,11 +9,7 @@ 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() {

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() {