@defisaver/sdk 0.2.0 → 0.2.4

package/src/actions/uniswapV3/UniswapV3SupplyAction.js

@@ -22,36 +22,34 @@ class UniswapV3SupplyAction extends Action {
       'UniSupplyV3',
       getAddr('UniSupplyV3'),
       [
-        [
-          "uint256",
-          "uint256",
-          "uint256",
-          "uint256",
-          "uint256",
-          "uint256",
-          "address",
-          "address",
-          "address",
-        ],
+        "uint256",
+        "uint256",
+        "uint256",
+        "uint256",
+        "uint256",
+        "uint256",
+        "address",
+        "address",
+        "address",
       ],
-      [[...arguments]]
+      [...arguments]
     );
 
     this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
-      this.args[0][2],
+      this.args[0],
+      this.args[1],
+      this.args[2],
     ];
   }
 
   async getAssetsToApprove() {
-    const assetA = getAssetInfoByAddress(this.args[0][7]);
-    const assetB = getAssetInfoByAddress(this.args[0][8]);
+    const assetA = getAssetInfoByAddress(this.args[7]);
+    const assetB = getAssetInfoByAddress(this.args[8]);
 
     const approveArr = [];
 
-    if (assetA.symbol !== 'ETH') approveArr.push({asset: this.args[0][7], owner: this.args[0][6], specialApproveLabel: 'uniswap v3'});
-    if (assetB.symbol !== 'ETH') approveArr.push({asset: this.args[0][8], owner: this.args[0][6], specialApproveLabel: 'uniswap v3'});
+    if (assetA.symbol !== 'ETH') approveArr.push({asset: this.args[7], owner: this.args[6], specialApproveLabel: 'uniswap v3'});
+    if (assetB.symbol !== 'ETH') approveArr.push({asset: this.args[8], owner: this.args[6], specialApproveLabel: 'uniswap v3'});
 
     return approveArr;
   }

package/src/actions/uniswapV3/UniswapV3WithdrawAction.js

@@ -21,32 +21,30 @@ class UniswapV3WithdrawAction extends Action {
       'UniWithdrawV3',
       getAddr('UniWithdrawV3'),
       [
-        [
-          "uint256",
-          "uint128",
-          "uint256",
-          "uint256",
-          "uint256",
-          "address",
-          "uint128",
-          "uint128",
-        ],
+        "uint256",
+        "uint128",
+        "uint256",
+        "uint256",
+        "uint256",
+        "address",
+        "uint128",
+        "uint128",
       ],
-      [[tokenId, liquidity, amount0Min, amount1Min, deadline, recipient, amount0Max, amount1Max]]
+      [tokenId, liquidity, amount0Min, amount1Min, deadline, recipient, amount0Max, amount1Max]
     );
 
     this.from = from;
 
     this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
+      this.args[0],
+      this.args[1],
     ];
   }
 
   async getAssetsToApprove() {
     return [{
       nft: getAddr('UniswapV3PositionManager'),
-      tokenId: this.args[0][0],
+      tokenId: this.args[0],
       owner: this.from,
       specialApproveLabel: 'uniswap v3'
     }];

package/src/actions/yearn/YearnSupplyAction.js

@@ -13,17 +13,17 @@ class YearnSupplyAction extends Action {
    * @param to {ETHAddress} yTokens will be sent to this address
    */
   constructor(tokenAddr, amount, from, to) {
-    super('YearnSupply', getAddr('YearnSupply'), [['address','uint256','address', 'address']], [[tokenAddr, amount, from, to]]);
+    super('YearnSupply', getAddr('YearnSupply'), ['address','uint256','address', 'address'], [tokenAddr, amount, from, to]);
     this.mappableArgs = [
-      this.args[0][1],
-      this.args[0][2],
-      this.args[0][3],
+      this.args[1],
+      this.args[2],
+      this.args[3],
     ];
   }
 
   async getAssetsToApprove() {
-    const asset = getAssetInfoByAddress(this.args[0][0]);
-    if (asset.symbol !== 'ETH') return [{asset: this.args[0][0], owner: this.args[0][2], specialApproveLabel: 'yearn'}];
+    const asset = getAssetInfoByAddress(this.args[0]);
+    if (asset.symbol !== 'ETH') return [{asset: this.args[0], owner: this.args[2], specialApproveLabel: 'yearn'}];
     return [];
   }
 }

package/src/actions/yearn/YearnWithdrawAction.js

@@ -13,17 +13,17 @@ class YearnWithdrawAction extends Action {
    * @param to {ETHAddress} underlying tokens will be sent to this address
    */
   constructor(tokenAddr, amount, from, to) {
-    super('YearnWithdraw', getAddr('YearnWithdraw'), [['address','uint256','address', 'address']], [[tokenAddr, amount, from, to]]);
+    super('YearnWithdraw', getAddr('YearnWithdraw'), ['address','uint256','address', 'address'], [tokenAddr, amount, from, to]);
     this.mappableArgs = [
-      this.args[0][1],
-      this.args[0][2],
-      this.args[0][3],
+      this.args[1],
+      this.args[2],
+      this.args[3],
     ];
   }
 
   async getAssetsToApprove() {
-    const asset = getAssetInfoByAddress(this.args[0][0]);
-    if (asset.symbol !== 'ETH') return [{asset: this.args[0][0], owner: this.args[0][2], specialApproveLabel: 'yearn'}];
+    const asset = getAssetInfoByAddress(this.args[0]);
+    if (asset.symbol !== 'ETH') return [{asset: this.args[0], owner: this.args[2], specialApproveLabel: 'yearn'}];
     return [];
   }
 }

package/src/addresses.js

@@ -15,6 +15,8 @@ const actionAddresses = {
   'TokenBalance': '0xa92B177950F1460119940436515FD857C24494BC',
   'AutomationV2Unsub': '0xe35Fb12fE9796847751076aCf5ee7d124108612C',
   'SendTokenAndUnwrap': '0xeecd376026335261c89faD40D89625391b1eFF6a',
+  'ToggleSub': '0x9A78E9d6538cfDbA0242Ca5eC46771E6132E8085',
+  'UpdateSub': '0x94D707f411B852082a5ce49C3f47c49c7757761f',
 
   // exchange
   'DFSSell': '0x1abDDCae131ce200e66140d9fBd0C37F7a40e642',
@@ -52,6 +54,7 @@ const actionAddresses = {
   'CompBorrow': '0x8495579BF6Ae848f7E59686536F834f1d2CCd79C',
   'CompClaim': '0x81F488cF7A0128A9DB5e7207042cCAB1CB0ac902',
   'CompPayback': '0x2881590d5FfBd1e88BFc0Dc292f10e5377977f87',
+  'CompPaybackNew': '0xa2Fa682f44BE40a11d69Eb738CBB91148f0D9742',
   'CompSupply': '0xB4CEDe40b249b756Ce0EAa3e14F6af89f25f9a3d',
   'CompWithdraw': '0x3792F83D6A82091cb53052458038CC86e206463F',
   'CompGetDebt': '0xc2B8f8423bc8Fe2e9A44cA9d364d835D1751b725',

package/src/triggers/ChainLinkPriceTrigger.js

@@ -4,9 +4,9 @@ const {getAddr} = require("../addresses.js");
 class ChainLinkPriceTrigger extends Action {
 
   constructor(tokenAddr, price, state) {
-    super("ChainLinkPriceTrigger", getAddr("ChainLinkPriceTrigger"), [["address", "uint256", "uint8"]], [[...arguments]]);
+    super("ChainLinkPriceTrigger", getAddr("ChainLinkPriceTrigger"), ["address", "uint256", "uint8"], [...arguments]);
   }
 
 }
 
-module.exports = ChainLinkPriceTrigger;
+module.exports = ChainLinkPriceTrigger;

package/src/triggers/CompoundRatioTrigger.js

@@ -4,7 +4,7 @@ const {getAddr} = require("../addresses.js");
 class CompoundRatioTrigger extends Action {
 
   constructor(user, ratio, state) {
-    super("CompoundRatioTrigger", getAddr("CompoundRatioTrigger"), [["address", "uint256", "uint8"]], [[...arguments]]);
+    super("CompoundRatioTrigger", getAddr("CompoundRatioTrigger"), ["address", "uint256", "uint8"], [...arguments]);
   }
 }
 

package/src/triggers/GasPriceTrigger.js

@@ -4,7 +4,7 @@ const {getAddr} = require("../addresses.js");
 class GasPriceTrigger extends Action {
 
   constructor(maxGasPrice) {
-    super("GasPriceTrigger", getAddr("GasPriceTrigger"), [["uint256"]], [[...arguments]]);
+    super("GasPriceTrigger", getAddr("GasPriceTrigger"), ["uint256"], [...arguments]);
   }
 }
 

package/src/triggers/LiquityRatioTrigger.js

@@ -1,4 +1,5 @@
 const Action = require("../Action");
+const {getAddr} = require("../addresses");
 
 class LiquityRatioTrigger extends Action {
 
@@ -6,8 +7,8 @@ class LiquityRatioTrigger extends Action {
     super(
       "LiquityRatioTrigger",
       getAddr("LiquityRatioTrigger"),
-      [["addresss", "uint256", "uint8"]],
-      [[...arguments]]
+      ["addresss", "uint256", "uint8"],
+      [...arguments]
     );
   }
 }

package/src/triggers/MakerRatioTrigger.js

@@ -4,11 +4,7 @@ const {getAddr} = require("../addresses.js");
 class MakerRatioTrigger extends Action {
 
   constructor(vaultId, ratio, state) {
-    super("McdRatioTrigger", getAddr("McdRatioTrigger"), [["uint256", "uint256", "uint8"]], [[...arguments]]);
-  }
-
-  async getEthValue() {
-    return this.args[0];
+    super("McdRatioTrigger", getAddr("McdRatioTrigger"), ["uint256", "uint256", "uint8"], [...arguments]);
   }
 }
 

package/src/triggers/ReflexerRatioTrigger.js

@@ -1,9 +1,10 @@
 const Action = require("../Action");
+const {getAddr} = require("../addresses");
 
 class ReflexerRatioTrigger extends Action {
 
   constructor(vaultId, ratio, state) {
-    super("ReflexerRatioTrigger", getAddr("ReflexerRatioTrigger"), [["uint256", "uint256", "uint8"]], [[...arguments]]);
+    super("ReflexerRatioTrigger", getAddr("ReflexerRatioTrigger"), ["uint256", "uint256", "uint8"], [...arguments]);
   }
 }
 

package/src/triggers/TimestampTrigger.js

@@ -4,7 +4,7 @@ const {getAddr} = require("../addresses.js");
 class TimestampTrigger extends Action {
 
   constructor(nextTimestamp) {
-    super("TimestampTrigger", getAddr("TimestampTrigger"), [["uint256"]], [[...arguments]]);
+    super("TimestampTrigger", getAddr("TimestampTrigger"), ["uint256"], [...arguments]);
   }
 }
 

package/src/triggers/UniV3CurrentTickTrigger.js

@@ -4,7 +4,7 @@ const {getAddr} = require("../addresses.js");
 class UniV3CurrentTickTrigger extends Action {
 
   constructor(tokenId, state) {
-    super("UniV3CurrentTickTrigger", getAddr("UniV3CurrentTickTrigger"), [["uint256", "uint8"]], [[...arguments]]);
+    super("UniV3CurrentTickTrigger", getAddr("UniV3CurrentTickTrigger"), ["uint256", "uint8"], [...arguments]);
   }
 
 }

package/test/Action.js

@@ -39,6 +39,7 @@ describe('Action', () => {
     let action;
     it('Constructor', () => {
       action = new dfs.Action('MockSwap', '0x0a80C3C540eEF99811f4579fa7b1A0617294e06f', ['uint256', 'address'], ['$1', '0x6b175474e89094c44da98b954eedeac495271d0f']);
+      action.mappableArgs = [action.args[0][0], action.args[0][1]];
     })
     it('encodeForDsProxyCall', () => encodeForDsProxyCall(action));
     it('encodeForRecipe', () => encodeForRecipe(action));
@@ -54,7 +55,7 @@ describe('Action', () => {
       assert.throws(() => encodeForRecipe(action));
     });
     it('encodeForRecipe with custom mappableArgs', () => {
-      action.mappableArgs = [action.args[0][0], action.args[1]];
+      action.mappableArgs = [action.args[0][0][0], action.args[0][1]];
       encodeForRecipe(action)
     });
   })

package/test/Strategy.js

@@ -0,0 +1,44 @@
+const dfs = require('../index.js');
+
+describe('Strategy', () => {
+
+  context('Yearn Repay', () => {
+    let repayStrategy;
+
+    it('Constructor', () => {
+      repayStrategy = new dfs.Strategy('McdYearnRepayStrategy');
+
+      repayStrategy.addSubSlot('&vaultId', 'uint256');
+      repayStrategy.addSubSlot('&targetRatio', 'uint256');
+      repayStrategy.addSubSlot('&daiAddr', 'address');
+      repayStrategy.addSubSlot('&mcdManager', 'address');
+
+      const mcdRatioTrigger = new dfs.triggers.MakerRatioTrigger('0', '0', '0');
+      repayStrategy.addTrigger(mcdRatioTrigger);
+
+      const yearnWithdrawAction = new dfs.actions.yearn.YearnWithdrawAction(
+        '%yDaiAddr',
+        '%amount',
+        '&proxy',
+        '&proxy',
+      );
+
+      const feeTakingAction = new dfs.actions.basic.GasFeeAction(
+        '0', '&daiAddr', '$1',
+      );
+
+      const mcdPaybackAction = new dfs.actions.maker.MakerPaybackAction(
+        '&vaultId',
+        '$2',
+        '&proxy',
+        '&mcdManager',
+      );
+
+      repayStrategy.addAction(yearnWithdrawAction);
+      repayStrategy.addAction(feeTakingAction);
+      repayStrategy.addAction(mcdPaybackAction);
+    })
+
+    it('encodeForDsProxyCall', () => repayStrategy.encodeForDsProxyCall());
+  })
+})

package/test/accessLists/access-lists.js

@@ -85,8 +85,7 @@ describe('Access-Lists', () => {
     sampleRecipes.forEach((recipe) => {
         it(`... should make an access list for recipe ${recipe.name}`, () => {
             const recipeAccessList = recipe.getAccessList();
-          console.log(recipeAccessList);
-          testDuplicates(recipeAccessList);
+            testDuplicates(recipeAccessList);
             testInclusion(recipe, recipeAccessList);
         });
     });

package/test/actions/maker/MakerPaybackAction.js

@@ -14,7 +14,7 @@ describe('Action: MakerPaybackAction', () => {
         assetAmountInWei(1, 'DAI'),
         '0x0a80C3C540eEF99811f4579fa7b1A0617294e06f'
       );
-      assert.equal(action.args[0][3], getAddr('McdCdpManager'));
+      assert.equal(action.args[3], getAddr('McdCdpManager'));
     })
     it('encodeForDsProxyCall', () => encodeForDsProxyCall(action));
     it('encodeForRecipe', () => encodeForRecipe(action));
@@ -38,7 +38,7 @@ describe('Action: MakerPaybackAction', () => {
         '0x0a80C3C540eEF99811f4579fa7b1A0617294e06f',
         getAddr('BCdpManager'),
       );
-      assert.equal(action.args[0][3], getAddr('BCdpManager'));
+      assert.equal(action.args[3], getAddr('BCdpManager'));
     })
     it('encodeForDsProxyCall', () => encodeForDsProxyCall(action));
     it('encodeForRecipe', () => encodeForRecipe(action));