@defisaver/sdk 0.2.4 → 0.2.5

package/src/triggers/ReflexerRatioTrigger.js

@@ -4,7 +4,7 @@ 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/src/types.js

@@ -3,6 +3,11 @@
  * @typedef {string} EthAddress
  */
 
+/**
+ * Chain ID number of the Network
+ * @typedef {number} chainId
+ */
+
 /**
  * Maker vault ID
  * @typedef {(string|number)} VaultId
@@ -18,3 +23,31 @@
 /**
  * @typedef {Array<AccessListItem>} AccessList
  */
+
+/**
+ * Global configuration object
+ * @typedef {Object.<string, any>} Config
+ * @property {chainId}
+ */
+
+/**
+ * @typedef {object} NativeCurrency
+ * @property {string} name
+ * @property {string} symbol
+ * @property {number} decimals
+ */
+
+/**
+ * @typedef {object} Network
+ * @property {chainId} chainId
+ * @property {string} chainName
+ * @property {array<string>} blockExplorerUrls
+ * @property {array<string>} iconUrls
+ * @property {array<string>} rpcUrls
+ * @property {NativeCurrency} nativeCurrency
+ */
+
+/**
+ * @typedef Networks
+ * @type {Object.<string, Network>}
+ */

package/test/Action.js

@@ -39,7 +39,6 @@ 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));
@@ -55,7 +54,7 @@ describe('Action', () => {
       assert.throws(() => encodeForRecipe(action));
     });
     it('encodeForRecipe with custom mappableArgs', () => {
-      action.mappableArgs = [action.args[0][0][0], action.args[0][1]];
+      action.mappableArgs = [action.args[0][0], action.args[1]];
       encodeForRecipe(action)
     });
   })

package/test/accessLists/access-lists.js

@@ -85,7 +85,8 @@ describe('Access-Lists', () => {
     sampleRecipes.forEach((recipe) => {
         it(`... should make an access list for recipe ${recipe.name}`, () => {
             const recipeAccessList = recipe.getAccessList();
-            testDuplicates(recipeAccessList);
+          console.log(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[3], getAddr('McdCdpManager'));
+      assert.equal(action.args[0][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[3], getAddr('BCdpManager'));
+      assert.equal(action.args[0][3], getAddr('BCdpManager'));
     })
     it('encodeForDsProxyCall', () => encodeForDsProxyCall(action));
     it('encodeForRecipe', () => encodeForRecipe(action));

package/test/index.js

@@ -3,6 +3,9 @@ const {assert} = require('chai');
 
 describe('DFS', () => {
   it('Exports constructors', () => {
-    assert.containsAllKeys(dfs, ['Action', 'Recipe', 'actions', 'actionAddresses', 'utils', 'DfsWeb3']);
+    assert.containsAllKeys(dfs, [
+      'Action', 'Recipe', 'actions', 'actionAddresses', 'utils', 'DfsWeb3', 'configure', 'getNetworkData', 'networks',
+      'actionAddressesAllChains',
+    ]);
   })
 })

package/src/actions/basic/SendTokenAndUnwrapAction.js

@@ -1,30 +0,0 @@
-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/ToggleSubAction.js

@@ -1,19 +0,0 @@
-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/UpdateSubAction.js

@@ -1,19 +0,0 @@
-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;

package/test/Strategy.js

@@ -1,44 +0,0 @@
-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());
-  })
-})