@defisaver/sdk 0.3.4 → 0.3.5

package/package.json

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

package/src/Action.js

@@ -114,7 +114,11 @@ class Action {
   }
 
   encodeForL2DsProxyCall() {
-    throw new Error('Not L2'); // TODO improve this
+    return this._encodeForCall()[0];
+  }
+
+  encodeForL2Recipe() {
+    return this._encodeForCall()[0];
   }
 
   /**
@@ -138,12 +142,12 @@ class Action {
    * @returns {Array<string>}
    */
   encodeForRecipe() {
-    return [
-      this._encodeForCall()[0],   // actionCallData
-      "0x0000000000000000000000000000000000000000000000000000000000000000",                        // subData
-      this.getId(),              // actionIds
-      this._getArgumentMapping(), // paramMappings
-    ]
+      return [
+        this._encodeForCall()[0],  // actionCallData
+        "0x0000000000000000000000000000000000000000000000000000000000000000", // subData
+        this.getId(),              // actionIds
+        this._getArgumentMapping(), // paramMappings
+      ]
   }
 
   encodeForStrategy(subSlots) {

package/src/ActionWithL2.js

@@ -8,6 +8,8 @@ class ActionWithL2 extends Action {
    */
   encodeForL2DsProxyCall() { return this.encodeInputs(); }
 
+  encodeForL2Recipe() { return `0x${this.encodeInputs().slice(10)}`; } // cut the method id
+
   encodeInputs() { throw new Error('Use implementation from specific ActionWithL2'); }
 
   addressToBytes20(address) { return address.slice(2); }

package/src/Strategy.js

@@ -1,7 +1,4 @@
 const Action = require('./Action');
-
-// TODO: Code is a prototype should be cleaned up before use in prod.
-
 class Strategy {
 
   constructor(name) {
@@ -35,7 +32,6 @@ class Strategy {
     return this.subSlots;
   }
 
-  // TODO: Probably should be tied into Recipe obj. not directly with actions
   encodeForDsProxyCall() {
     const triggerIds = this.triggers.map((trigger) => trigger.getId());
 

package/src/actions/aaveV3/AaveV3BorrowAction.js

@@ -24,6 +24,10 @@ class AaveV3BorrowAction extends ActionWithL2 {
     this.mappableArgs = [
       this.args[0],
       this.args[1],
+      this.args[2],
+      this.args[3],
+      this.args[4],
+      this.args[5],
       this.args[6],
       this.args[7],
     ];

package/src/actions/aaveV3/AaveV3PaybackAction.js

@@ -26,6 +26,10 @@ class AaveV3PaybackAction extends ActionWithL2 {
     this.mappableArgs = [
       this.args[0],
       this.args[1],
+      this.args[2],
+      this.args[3],
+      this.args[4],
+      this.args[5],
       this.args[6],
       this.args[7],
     ];

package/src/actions/aaveV3/AaveV3SupplyAction.js

@@ -27,6 +27,10 @@ class AaveV3SupplyAction extends ActionWithL2 {
     this.mappableArgs = [
       this.args[0],
       this.args[1],
+      this.args[2],
+      this.args[3],
+      this.args[4],
+      this.args[5],
       this.args[6],
       this.args[7],
     ];

package/src/actions/aaveV3/AaveV3WithdrawAction.js

@@ -19,6 +19,8 @@ class AaveV3WithdrawAction extends ActionWithL2 {
     );
 
     this.mappableArgs = [
+      this.args[0],
+      this.args[1],
       this.args[2],
       this.args[3],
       this.args[4],

package/src/actions/basic/GasFeeActionL2.js

@@ -0,0 +1,28 @@
+const Action = require("../../Action");
+const {getAddr} = require("../../addresses.js");
+
+class GasFeeActionL2 extends Action {
+  /**
+   * @param gasStart {string} Always 0 will be inject value
+   * @param feeToken {string} Address of the token we are taken the fee in
+   * @param availableAmount Amount we have available to pay the gas fee
+   * @param dfsFeeDivider Additional fee for DFS, default is 5bps
+   * @param l1GasCostInEth Additional tx cost for L1 in eth
+   */
+  constructor(gasStart, feeToken, availableAmount, dfsFeeDivider = 2000, l1GasCostInEth = 0) {
+    super("GasFeeTakerL2",
+      getAddr("GasFeeTakerL2"),
+      ["uint256", "address", "uint256", "uint256", "uint256"],
+      [gasStart, feeToken, availableAmount, dfsFeeDivider, l1GasCostInEth],
+    );
+
+    this.mappableArgs = [
+      this.args[1],
+      this.args[2],
+      this.args[3],
+    ];
+  }
+
+}
+
+module.exports = GasFeeActionL2;

package/src/actions/basic/SellAction.js

@@ -1,6 +1,6 @@
 const ActionAbi = require('../../abis/Action.json');
 const AbiCoder = require('web3-eth-abi');
-const ActionWithL2 = require("../../ActionWithL2");
+const Action = require("../../Action");
 const { requireAddress } = require("../../utils/general");
 const { getAssetInfoByAddress } = require("@defisaver/tokens");
 const { getAddr } = require('../../addresses.js');
@@ -8,7 +8,7 @@ const { getAddr } = require('../../addresses.js');
 /**
  * Sells token on DeFi Saver exchange aggregator
  */
-class SellAction extends ActionWithL2 {
+class SellAction extends Action {
   /**
    * @param exchangeOrder {Array} Standard DFS Exchange data
    * @param from {string} Order sender

package/src/actions/basic/index.js

@@ -12,6 +12,7 @@ const AutomationV2Unsub = require('./AutomationV2Unsub');
 const GasFeeAction = require('./GasFeeAction');
 const UpdateSubAction = require('./UpdateSubAction');
 const ToggleSubAction = require('./ToggleSubAction');
+const GasFeeActionL2 = require('./GasFeeActionL2');
 
 module.exports = {
   SellAction,
@@ -28,4 +29,5 @@ module.exports = {
   UpdateSubAction,
   SendTokenAndUnwrapAction,
   ToggleSubAction,
+  GasFeeActionL2,
 };

package/src/actions/checkers/AaveV3RatioCheckAction.js

@@ -0,0 +1,24 @@
+const Action = require("../../Action");
+const {getAddr} = require("../../addresses.js");
+
+/**
+ * AaveV3RatioCheckAction - Checks aave V3 ratio for users proxy position and reverts if faulty
+ */
+class AaveV3RatioCheckAction extends Action {
+  /**
+   * @param ratioState {uint8} If it should lower/higher
+   * @param targetRatio {string} The ratio user want to be at
+   */
+  constructor(ratioState, targetRatio) {
+    super("AaveV3RatioCheck", getAddr("AaveV3RatioCheck"), ["uint8","uint256"], [ratioState, targetRatio]);
+
+    this.mappableArgs = [
+      this.args[0],
+      this.args[1],
+    ];
+  }
+
+}
+
+module.exports = AaveV3RatioCheckAction;
+

package/src/actions/checkers/index.js

@@ -1,5 +1,7 @@
 const MakerRatioCheckAction = require('./MakerRatioCheckAction');
+const AaveV3RatioCheckAction = require('./AaveV3RatioCheckAction');
 
 module.exports = {
   MakerRatioCheckAction,
+  AaveV3RatioCheckAction,
 };

package/src/addresses.js

@@ -149,15 +149,19 @@ const actionAddresses = {
 
     // aave v3
     AaveV3ATokenPayback: '0x71B27114D1777298bD46c3770C42F9f807C49847',
-    AaveV3Borrow: '0x4d3F58460aE2bC71fFaeb33838BFA3b5610083Db',
+    AaveV3Borrow: '0x8CaDc8A911D19B9e4D36c9bAdE47d970f362BcEa',
     AaveV3CollateralSwitch: '0x20D1388Ffa0A2D6ff6328AD014C67051542ca3a8',
-    AaveV3Payback: '0x09DC201A6380882752bCdC7bC721D384f716A5a4',
+    AaveV3Payback: '0x88eb4050e89FecE4DF940109B0e58daF9B59e551',
     AaveV3SetEMode: '0x7F264737066b9b7D9729Fe9715abB97423D8b35B',
-    AaveV3Supply: '0xe431c1C673Be123045c8635b0196d51a5bFE55c1',
+    AaveV3Supply: '0x4Ad0cf94e82b58C414266b84ACB061b41bf1bdF7',
     AaveV3SwapBorrowRateMode: '0xB8f0243b492f0e80feF5315Ba8692e7635481845',
-    AaveV3Withdraw: '0xD0130ecB810C6F8d58e60DC417357F6048Ea32e7',
+    AaveV3Withdraw: '0xf19d045f6cFc04A5Ee5E0e8837b565b9f276e3F7',
 
     FLAaveV3: '0x352D4a1622f2DC34c738F542934372855f219F05',
+
+    AaveV3RatioTrigger: '0xB76e3f7694589D0f34ba43b17AD0D15350Ab5f85',
+    GasFeeTakerL2: '0xB3dB299622A9DB0E944ccda2Ef899d6fF365B082',
+    AaveV3RatioCheck: '0x7A36779a7b5F1128B28932604057d5b63361297c',
   },
   [NETWORKS.arbitrum.chainId]: {
     DFSSell: '0x77c02Bb7CbBb2F896c5Ea14e1b60D65f81e552db',
@@ -180,6 +184,8 @@ const actionAddresses = {
     AaveV3Withdraw: '0x204ae0d3f7cB0db44A297DC4aD433298ed2042F3',
 
     FLAaveV3: '0x3Cc0d5DAE1B94e294152C3150aA732b97af603E1',
+    GasFeeTakerL2: '0x0000000000000000000000000000000000000000',
+    AaveV3RatioCheck: '0x0000000000000000000000000000000000000000',
   }
 };
 
@@ -202,7 +208,7 @@ const otherAddresses = {
     Empty: '0x0000000000000000000000000000000000000000',
   },
   [NETWORKS.optimism.chainId]: {
-    RecipeExecutor: '0xe91ff198bA6DFA97A7B4Fa43e5a606c915B0471f',
+    RecipeExecutor: '0x44FDe16DDCd7c02bE28de52CEc08997336051735',
     DFSRegistry: '0xAf707Ee480204Ed6e2640B53cE86F680D28Afcbd',
     ProxyRegistry: '0x283Cc5C26e53D66ed2Ea252D986F094B37E6e895',
 

package/src/triggers/AaveV3RatioTrigger.js

@@ -0,0 +1,11 @@
+const Action = require("../Action");
+const { getAddr } = require("../addresses.js");
+
+class AaveV3RatioTrigger extends Action {
+
+  constructor(user, market, ratio, state) {
+    super("AaveV3RatioTrigger", getAddr("AaveV3RatioTrigger"), [["address", "address", "uint256", "uint8"]], [[...arguments]]);
+  }
+}
+
+module.exports = AaveV3RatioTrigger;

package/src/triggers/index.js

@@ -6,6 +6,7 @@ const GasPriceTrigger = require('./GasPriceTrigger');
 const CompoundRatioTrigger = require('./CompoundRatioTrigger');
 const ReflexerRatioTrigger = require('./ReflexerRatioTrigger');
 const LiquityRatioTrigger = require('./LiquityRatioTrigger');
+const AaveV3RatioTrigger = require('./AaveV3RatioTrigger');
 
 module.exports = {
     MakerRatioTrigger,
@@ -16,4 +17,5 @@ module.exports = {
     CompoundRatioTrigger,
     ReflexerRatioTrigger,
     LiquityRatioTrigger,
+    AaveV3RatioTrigger,
 }