@defisaver/sdk 0.2.2 → 0.2.5

package/src/actions/aaveV3/AaveV3SwapBorrowRateModeAction.js

@@ -0,0 +1,43 @@
+const ActionWithL2 = require("../../ActionWithL2");
+const { getAddr } = require('../../addresses.js');
+
+/**
+ * AaveV3SwapBorrowRateModeAction - Swaps proxy positions borrow rate mode between stable and variable.
+ */
+class AaveV3SwapBorrowRateModeAction extends ActionWithL2 {
+  /**
+   * @param asset {EthAddress} address of the underlying asset
+   * @param rateMode {string} rate mode the user is swapping from.[Stable: 1, Variable: 2]
+   * @param useDefaultMarket {boolean} If this is true it defaults to the hardcoded market in contract
+   * @param market {EthAddress} Address provider for specific market
+   *
+   */
+  constructor(asset, rateMode, useDefaultMarket, market) {
+    super('AaveV3SwapBorrowRateMode', getAddr('AaveV3SwapBorrowRateMode'),
+    [['address','uint256','bool','address']],
+    [[asset, rateMode, useDefaultMarket, market]]
+    );
+
+    this.mappableArgs = [
+      this.args[0][0],
+      this.args[0][3],
+    ];
+  }
+  encodeInputs() {
+    // executeActionDirectL2
+    let encodedInput = "0x2895f3aa";
+    // asset
+    encodedInput = encodedInput.concat(this.addressToBytes20(this.args[0][0]));
+    // rateMode
+    encodedInput = encodedInput.concat(this.numberToBytes32(this.args[0][1]));
+    // useOnDefaultMarket
+    encodedInput = encodedInput.concat(this.boolToBytes1(this.args[0][2]))
+    if (!this.args[0][2]){
+      // market
+      encodedInput = encodedInput.concat(this.addressToBytes20(this.args[0][3]));
+    }
+    return encodedInput;
+  }
+}
+
+module.exports = AaveV3SwapBorrowRateModeAction;

package/src/actions/aaveV3/AaveV3WithdrawAction.js

@@ -0,0 +1,46 @@
+const ActionWithL2 = require("../../ActionWithL2");
+const { getAddr } = require('../../addresses.js');
+
+/**
+ * AaveV3WithdrawAction - Withdraw a previously supplied token from a position in AaveV3
+ */
+class AaveV3WithdrawAction extends ActionWithL2 {
+  /**
+   * @param assetId {number} The id of the token to be deposited
+   * @param useDefaultMarket {boolean} If this is true it defaults to the hardcoded market in contract
+   * @param amount {string} Amount of tokens to be withdrawn -> send type(uint).max for whole amount
+   * @param to {EthAddress} Where the withdrawn tokens will be sent
+   * @param market {EthAddress} Address provider for specific market
+   */
+  constructor(assetId, useDefaultMarket, amount, to, market) {
+    super('AaveV3Withdraw', getAddr('AaveV3Withdraw'),
+    [['uint16','bool','uint256','address','address']],
+    [[assetId, useDefaultMarket, amount, to, market]]
+    );
+
+    this.mappableArgs = [
+      this.args[0][2],
+      this.args[0][3],
+      this.args[0][4],
+    ];
+  }
+  encodeInputs() {
+    // executeActionDirectL2
+    let encodedInput = "0x2895f3aa";
+    // assetId
+    encodedInput = encodedInput.concat(this.numberToBytes2(this.args[0][0]));
+    // useOnDefaultMarket
+    encodedInput = encodedInput.concat(this.boolToBytes1(this.args[0][1]))
+    // amount
+    encodedInput = encodedInput.concat(this.numberToBytes32(this.args[0][2]));
+    // from
+    encodedInput = encodedInput.concat(this.addressToBytes20(this.args[0][3]));
+    if (!this.args[0][1]){
+      // market
+      encodedInput = encodedInput.concat(this.addressToBytes20(this.args[0][4]));
+    }
+    return encodedInput;
+  }
+}
+
+module.exports = AaveV3WithdrawAction;

package/src/actions/aaveV3/index.js

@@ -0,0 +1,21 @@
+const AaveV3SupplyAction = require('./AaveV3SupplyAction');
+const AaveV3BorrowAction = require('./AaveV3BorrowAction');
+const AaveV3PaybackAction = require('./AaveV3PaybackAction');
+const AaveV3WithdrawAction = require('./AaveV3WithdrawAction');
+const AaveV3SetEModeAction = require('./AaveV3SetEModeAction');
+const AaveV3ATokenPaybackAction = require('./AaveV3ATokenPaybackAction');
+const AaveV3CollateralSwitchAction = require('./AaveV3CollateralSwitchAction');
+const AaveV3ClaimRewardsAction = require('./AaveV3ClaimRewardsAction');
+const AaveV3SwapBorrowRateModeAction = require('./AaveV3SwapBorrowRateModeAction');
+
+module.exports = {
+    AaveV3SupplyAction,
+    AaveV3BorrowAction,
+    AaveV3PaybackAction,
+    AaveV3WithdrawAction,
+    AaveV3SetEModeAction,
+    AaveV3ATokenPaybackAction,
+    AaveV3CollateralSwitchAction,
+    AaveV3ClaimRewardsAction,
+    AaveV3SwapBorrowRateModeAction,
+}

package/src/actions/balancer/BalancerV2ClaimAction.js

@@ -17,27 +17,29 @@ 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],
-      this.args[1],
+      this.args[0][0],
+      this.args[0][1],
     ];
   }
 
   async getAssetsToApprove() {
 
     const approveArr = [];
-      if (this.args[0] !== this.args[1]){
+      if (this.args[0][0] !== this.args[0][1]){
         const tokenAddress = getAddr('BalancerToken');
-        approveArr.push({asset: tokenAddress, owner: this.args[0]});
+        approveArr.push({asset: tokenAddress, owner: this.args[0][0]});
       }
     return approveArr;
   }

package/src/actions/balancer/BalancerV2SupplyAction.js

@@ -18,30 +18,32 @@ 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[1],
-      this.args[2],
+      this.args[0][1],
+      this.args[0][2],
     ];
-    for (let i = 0; i < this.args[4].length; i++){
-      this.mappableArgs.push(this.args[4][i]);
+    for (let i = 0; i < this.args[0][4].length; i++){
+      this.mappableArgs.push(this.args[0][4][i]);
     }
   }
 
   async getAssetsToApprove() {
     const approveArr = [];
-    const tokens = this.args[3];
-    tokens.forEach(token => approveArr.push({asset: token, owner: this.args[1], specialApproveLabel: 'balancer'}));
-
+    const tokens = this.args[0][3];
+    tokens.forEach(token => approveArr.push({asset: token, owner: this.args[0][1], specialApproveLabel: 'balancer'}));
+    
     return approveArr;
   }
 }

package/src/actions/balancer/BalancerV2WithdrawAction.js

@@ -19,34 +19,36 @@ 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[1],
-      this.args[2],
-      this.args[3],
+      this.args[0][1],
+      this.args[0][2],
+      this.args[0][3],
     ];
 
-    for (let i = 0; i < this.args[5].length; i++){
-      this.mappableArgs.push(this.args[5][i]);
+    for (let i = 0; i < this.args[0][5].length; i++){
+      this.mappableArgs.push(this.args[0][5][i]);
     }
   }
 
   async getAssetsToApprove() {
     const approveArr = [];
-    const token = this.args[0].slice(0,42);
-    approveArr.push({asset: token, owner: this.args[1], specialApproveLabel: 'balancer'});
+    const token = this.args[0][0].slice(0,42);
+    approveArr.push({asset: token, owner: this.args[0][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,8 +9,10 @@ class ChangeProxyOwnerAction extends Action {
    * @param newOwner {Address} Address of new owner
    */
   constructor(newOwner) {
-    super("ChangeProxyOwner", getAddr("ChangeProxyOwner"), ["address"], [...arguments]);
-  }
+    super("ChangeProxyOwner", getAddr("ChangeProxyOwner"), [["address"]], [[...arguments]]);
+
+    this.mappableArgs = [this.args[0][0]];
+    }
 }
 
 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[1],
-      this.args[2],
-      this.args[3],
+      this.args[0][1],
+      this.args[0][2],
+      this.args[0][3],
     ];
   }
 
 }
 
-module.exports = GasFeeAction;
+module.exports = GasFeeAction;

package/src/actions/basic/PullTokenAction.js

@@ -17,13 +17,19 @@ 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,22 +19,23 @@ 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],
+      this.args[0][0][0],
+      this.args[0][0][1],
+      this.args[0][0][2],
       this.args[0][1],
       this.args[0][2],
-      this.args[1],
-      this.args[2],
     ];
   }
 

package/src/actions/basic/SendTokenAction.js

@@ -1,6 +1,5 @@
 const Action = require("../../Action");
 const {requireAddress} = require("../../utils/general");
-const {getAssetInfoByAddress} = require("@defisaver/tokens");
 const { getAddr } = require('../../addresses.js');
 
 /**
@@ -17,13 +16,19 @@ 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/SubInputsAction.js

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

@@ -1,11 +1,11 @@
-const Action = require("../../Action");
+const ActionWithL2 = require("../../ActionWithL2");
 const {requireAddress} = require("../../utils/general");
 const {getAddr} = require('../../addresses.js');
 
 /**
  * Unwraps a specified amount of WETH from the proxy
  */
-class UnwrapEthAction extends Action {
+class UnwrapEthAction extends ActionWithL2 {
   /**
    * @param amount {string} Token address
    * @param to {string} Transfer recipient
@@ -15,12 +15,25 @@ class UnwrapEthAction extends Action {
     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/WrapEthAction.js

@@ -1,19 +1,29 @@
-const Action = require("../../Action");
-const {getAddr} = require("../../addresses.js");
+const ActionWithL2 = require("../../ActionWithL2");
+const { getAddr } = require("../../addresses.js");
 
 /**
  * Wraps a specified amount of ETH from the wallet to WETH on the recipe
  */
-class WrapEthAction extends Action {
+class WrapEthAction extends ActionWithL2 {
   /**
    * @param amount {string} Transfer amount
    */
   constructor(amount) {
-    super("WrapEth", getAddr("WrapEth"), ["uint256"], [...arguments]);
+    super("WrapEth", getAddr("WrapEth"), [["uint256"]], [[...arguments]]);
+
+    this.mappableArgs = [
+      this.args[0][0],
+    ];
   }
 
   async getEthValue() {
-    return this.args[0];
+    return this.args[0][0];
+  }
+  encodeInputs(){
+    // executeActionDirectL2
+    let encodedInput = "0x2895f3aa";
+    // amount
+    encodedInput = encodedInput.concat(this.numberToBytes32(this.args[0][0]));
   }
 }
 

package/src/actions/basic/index.js

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

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],
-      this.args[2],
-      this.args[3],
-      this.args[4],
+      this.args[0][0],
+      this.args[0][2],
+      this.args[0][3],
+      this.args[0][4],
     ];
   }
 

package/src/actions/compound/CompoundBorrowAction.js

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

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[2],
-      this.args[3],
+      this.args[0][2],
+      this.args[0][3],
     ];
   }
 }

package/src/actions/compound/CompoundCollateralSwitchAction.js

@@ -10,9 +10,11 @@ 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,7 +13,13 @@ 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]);
+    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],
+    ];
   }
 
   async getAssetsToApprove() {