@defisaver/sdk 0.2.13 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/sdk",
-  "version": "0.2.13",
+  "version": "0.3.2",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -23,9 +23,9 @@
   },
   "devDependencies": {
     "chai": "^4.2.0",
+    "dotenv": "^10.0.0",
     "jsdoc-to-markdown": "^6.0.1",
     "mocha": "^8.2.1",
-    "web3": "^1.3.4",
-    "dotenv": "^10.0.0"
+    "web3": "^1.3.4"
   }
 }

package/src/actions/curve/CurveDepositAction.js

@@ -2,48 +2,78 @@ const { getAssetInfo } = require('@defisaver/tokens');
 const Action = require('../../Action');
 const { requireAddress } = require('../../utils/general');
 const { getAddr } = require('../../addresses');
+const { poolInfo, makeFlags } = require('../../utils/curve-utils');
 
 class CurveDepositAction extends Action {
 
     /**
      * @param {EthAddress} sender
      * @param {EthAddress} receiver
-     * @param {EthAddress} depositTarget
-     * @param {EthAddress} lpToken
-     * @param {bytes4} sig
+     * @param {EthAddress} poolAddr
      * @param {string} minMintAmount
+     * @param {bool} useUnderlying
      * @param {Array<string>} amounts
-     * @param {Array<EthAddress>} tokens
-     * @param {boolean} useUnderlying
      */
     constructor(
         sender,
         receiver,
-        depositTarget,
-        lpToken,
-        sig,
+        poolAddr,
         minMintAmount,
+        useUnderlying,
         amounts = [],
-        tokens = [],
-        useUnderlying
     ) {
         requireAddress(sender);
         requireAddress(receiver);
+
+        let depositTarget;
+        let depositTargetType = 0;
+        let explicitUnderlying = false;
+        let tokensForApproval;
+
+        const pool = poolInfo.find((e) => e.swapAddr.toLowerCase() === poolAddr.toLowerCase());
+        if (useUnderlying) {
+            if (pool.depositContract) {
+                depositTarget = pool.depositContract;
+                depositTargetType = pool.zapType + 1;
+            } else {
+                depositTarget = pool.swapAddr;
+                explicitUnderlying = pool.underlyingFlag;
+                if (!explicitUnderlying) throw error('pool has no underlying deposit mechanism');
+            }
+            tokensForApproval = pool.underlyingCoins;
+        } else {
+            depositTarget = pool.swapAddr;
+            tokensForApproval = pool.coins;
+        }
+
         super('CurveDeposit',
             getAddr('CurveDeposit'),
-            ['address', 'address', 'address', 'address', 'bytes4', 'uint256', 'uint256[]', 'address[]', 'bool'],
-            [...arguments]);
+            ['address', 'address', 'address', 'uint256', 'uint8', 'uint256[]'],
+            [
+                sender,
+                receiver,
+                depositTarget,
+                minMintAmount,
+                makeFlags(depositTargetType, explicitUnderlying, 0),
+                amounts,
+            ],
+        ).tokensForApproval = tokensForApproval;
 
         this.mappableArgs = [
             this.args[0],
             this.args[1],
-            this.args[5],
-            ...this.args[6],
+            this.args[2],
+            this.args[3],
+            this.args[4],
+            ...this.args[5],
         ];
     }
 
     async getAssetsToApprove() {
-        return this.args[7].map(_asset => Object({ asset: _asset, owner: this.args[0] }));
+        return this.tokensForApproval.map((e) => Object({
+            asset: e.toLowerCase() !== getAssetInfo('ETH').address.toLowerCase() ? e : getAssetInfo('WETH').address,
+            owner: this.args[0],
+        }));
     }
 }
 

package/src/actions/curve/CurveWithdrawAction.js

@@ -2,51 +2,74 @@ const { getAssetInfo } = require('@defisaver/tokens');
 const Action = require('../../Action');
 const { requireAddress } = require('../../utils/general');
 const { getAddr } = require('../../addresses');
+const { poolInfo, makeFlags } = require('../../utils/curve-utils');
 
 class CurveWithdrawAction extends Action {
 
     /**
-     *
      * @param {EthAddress} sender
      * @param {EthAddress} receiver
-     * @param {EthAddress} depositTarget
-     * @param {EthAddress} lpToken
-     * @param {bytes4} sig
+     * @param {EthAddress} poolAddr
      * @param {string} burnAmount
-     * @param {Array<string>} minAmounts
-     * @param {Array<EthAddress>} tokens
-     * @param {boolean} withdrawExact
      * @param {boolean} useUnderlying
+     * @param {boolean} withdrawExact
+     * @param {Array<string>} minAmounts
      */
     constructor(
         sender,
         receiver,
-        depositTarget,
-        lpToken,
-        sig,
+        poolAddr,
         burnAmount,
-        minAmounts = [],
-        tokens = [],
+        useUnderlying,
         withdrawExact,
-        useUnderlying
+        minAmounts = [],
     ) {
         requireAddress(sender);
         requireAddress(receiver);
-        super('CurveWithdrawAction',
-            getAddr('CurveWithdrawAction'),
-            ['address', 'address', 'address', 'address', 'bytes4', 'uint256', 'uint256[]', 'address[]', 'bool', 'bool'],
-            [...arguments]);
+
+        let depositTarget;
+        let depositTargetType = 0;
+        let explicitUnderlying = false;
+
+        const pool = poolInfo.find((e) => e.swapAddr.toLowerCase() === poolAddr.toLowerCase());
+        if (useUnderlying) {
+            if (pool.depositContract) {
+                depositTarget = pool.depositContract;
+                depositTargetType = pool.zapType + 1;
+            } else {
+                depositTarget = pool.swapAddr;
+                explicitUnderlying = pool.underlyingFlag;
+                if (!explicitUnderlying) throw error('pool has no underlying deposit mechanism');
+            }
+        } else {
+            depositTarget = pool.swapAddr;
+        }
+
+        super('CurveWithdraw',
+            getAddr('CurveWithdraw'),
+            ['address', 'address', 'address', 'uint256', 'uint8', 'uint256[]'],
+            [
+                sender,
+                receiver,
+                depositTarget,
+                burnAmount,
+                makeFlags(depositTargetType, explicitUnderlying, withdrawExact),
+                minAmounts,
+            ],
+        ).lpToken = pool.lpToken;
 
         this.mappableArgs = [
             this.args[0],
             this.args[1],
-            this.args[5],
-            ...this.args[6],
+            this.args[2],
+            this.args[3],
+            this.args[4],
+            ...this.args[5],
         ];
     }
 
     async getAssetsToApprove() {
-        return { asset: this.args[3], owner: this.args[0] };
+        return [{ asset: this.lpToken, owner: this.args[0] }];
     }
 }
 

package/src/addresses.js

@@ -126,11 +126,14 @@ const actionAddresses = {
     McdRatioCheck: '0x3f09773e5e945C6Aa1bc8a8B3492f507620DE1e1',
     GasFeeTaker: '0x431F1E1A9859EF99953801dbdeB31d2846ADcc0d',
 
-    CurveStethPoolDeposit: '0x5Ae5870dC0C780e9eb68bE7a223eCd7F3BDad12B', // REDEPLOY
-    CurveStethPoolWithdraw: '0x4089731d843Ce52699Fe64F68556aBbD95D70D00', // REDEPLOY
+    CurveStethPoolDeposit: '0x5Ae5870dC0C780e9eb68bE7a223eCd7F3BDad12B',
+    CurveStethPoolWithdraw: '0x4089731d843Ce52699Fe64F68556aBbD95D70D00',
+
+    CurveDeposit: '0x160225c24300bD9fAA03Bc007D5e72bDbbcA9257',
+    CurveWithdraw: '0xA2A6D75417807ebAf8364613018D697f88021771',
   },
   [NETWORKS.optimism.chainId]: {
-    DFSSell: '0xfA015aD97E25247c2144F1C89AeD449cc3Fd1FCB',
+    DFSSell: '0xBA0f6039b95CC0A02B5fc983eCf0FC4437BaacC7',
 
     // basic
     WrapEth: '0x6D735db054AC4a1F10f96b99f8550E9eefbC2AC5',
@@ -152,7 +155,7 @@ const actionAddresses = {
     FLAaveV3: '0x352D4a1622f2DC34c738F542934372855f219F05',
   },
   [NETWORKS.arbitrum.chainId]: {
-    DFSSell: '0x49E1574Ba6b8134c29B1EbC010784A01D91b794F',
+    DFSSell: '0x77c02Bb7CbBb2F896c5Ea14e1b60D65f81e552db',
 
     // basic
     WrapEth: '0x35136b25bFA7CCC8f5b94E3181a16B61c06980F0',
@@ -189,6 +192,7 @@ const otherAddresses = {
     RaiWethUniV2LPToken : '0x8aE720a71622e824F576b4A8C03031066548A3B1',
     BalancerToken : '0xba100000625a3754423978a60c9317c58a424e3D',
     CrvToken: '0xD533a949740bb3306d119CC777fa900bA034cd52',
+    CvxToken: '0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B',
     DAI: '0x6b175474e89094c44da98b954eedeac495271d0f',
     Empty: '0x0000000000000000000000000000000000000000',
   },
@@ -226,8 +230,11 @@ const getAddr = (name, chainId) => {
   const actions = actionAddresses[_chainId];
   const other = otherAddresses[_chainId];
 
-  if (!actions && !other) throw new Error(`Cannot find address for chainId: ${_chainId}.`);
-  if (!actions[name] && !other[name]) throw new Error(`Cannot find address for name: ${name} (chainId: ${_chainId}).`);
+  // skip this check if we're in testing mode
+  if (!CONFIG.testingMode) {
+    if (!actions && !other) throw new Error(`Cannot find address for chainId: ${_chainId}.`);
+    if (!actions[name] && !other[name]) throw new Error(`Cannot find address for name: ${name} (chainId: ${_chainId}).`);
+  }
 
   return actions[name] || other[name];
 };

package/src/config.js

@@ -45,6 +45,7 @@ const NETWORKS = {
  */
 const CONFIG = {
   chainId: NETWORKS.ethereum.chainId,
+  testingMode: false
 };
 
 /**

package/src/utils/curve-utils.js

@@ -0,0 +1,14 @@
+const poolInfo = require('./curvePoolInfo.json');
+
+const makeFlags = (
+    depositTargetType,
+    explicitUnderlying,
+    withdrawExact,
+) => {
+    return depositTargetType | explicitUnderlying << 2 | withdrawExact << 3;
+}
+
+module.exports = {
+    poolInfo,
+    makeFlags,
+};

package/src/utils/curvePoolInfo.json

@@ -0,0 +1,203 @@
+[
+    {
+        "name": "susd",
+        "swapAddr": "0xA5407eAE9Ba41422680e2e00537571bcC53efBfD",
+        "depositContract": "0xFCBa3E75865d2d561BE8D220616520c171F12851",
+        "nCoins": 4,
+        "coins": [
+            "0x6B175474E89094C44Da98b954EedeAC495271d0F",
+            "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+            "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+            "0x57Ab1ec28D129707052df4dF418D58a2D46d5f51"
+        ],
+        "decimals": [
+            18,
+            6,
+            6,
+            18
+        ],
+        "underlyingCoins": [
+            "0x6B175474E89094C44Da98b954EedeAC495271d0F",
+            "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+            "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+            "0x57Ab1ec28D129707052df4dF418D58a2D46d5f51"
+        ],
+        "underlyingDecimals": [
+            18,
+            6,
+            6,
+            18
+        ],
+        "isMeta": false,
+        "lpToken": "0xC25a3A3b969415c80451098fa907EC722572917F",
+        "gauges": [
+            "0xA90996896660DEcC6E997655E065b23788857849"
+        ],
+        "gaugeTypes": [
+            0
+        ],
+        "zapType": 1
+    },
+    {
+        "name": "compound",
+        "swapAddr": "0xA2B47E3D5c44877cca798226B7B8118F9BFb7A56",
+        "depositContract": "0xeB21209ae4C2c9FF2a86ACA31E123764A3B6Bc06",
+        "nCoins": 2,
+        "coins": [
+            "0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643",
+            "0x39AA39c021dfbaE8faC545936693aC917d5E7563"
+        ],
+        "decimals": [
+            8,
+            8
+        ],
+        "underlyingCoins": [
+            "0x6B175474E89094C44Da98b954EedeAC495271d0F",
+            "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
+        ],
+        "underlyingDecimals": [
+            18,
+            6
+        ],
+        "isMeta": false,
+        "lpToken": "0x845838DF265Dcd2c412A1Dc9e959c7d08537f8a2",
+        "gauges": [
+            "0x7ca5b0a2910B33e9759DC7dDB0413949071D7575"
+        ],
+        "gaugeTypes": [
+            0
+        ],
+        "zapType": 1
+    },
+    {
+        "underlyingFlag": true,
+        "name": "aave",
+        "swapAddr": "0xDeBF20617708857ebe4F679508E7b7863a8A8EeE",
+        "nCoins": 3,
+        "coins": [
+            "0x028171bCA77440897B824Ca71D1c56caC55b68A3",
+            "0xBcca60bB61934080951369a648Fb03DF4F96263C",
+            "0x3Ed3B47Dd13EC9a98b44e6204A523E766B225811"
+        ],
+        "decimals": [
+            18,
+            6,
+            6
+        ],
+        "underlyingCoins": [
+            "0x6B175474E89094C44Da98b954EedeAC495271d0F",
+            "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+            "0xdAC17F958D2ee523a2206206994597C13D831ec7"
+        ],
+        "underlyingDecimals": [
+            18,
+            6,
+            6
+        ],
+        "isMeta": false,
+        "lpToken": "0xFd2a8fA60Abd58Efe3EeE34dd494cD491dC14900",
+        "gauges": [
+            "0xd662908ADA2Ea1916B3318327A97eB18aD588b5d"
+        ],
+        "gaugeTypes": [
+            0
+        ]
+    },
+    {
+        "name": "steth",
+        "swapAddr": "0xDC24316b9AE028F1497c275EB9192a3Ea0f67022",
+        "nCoins": 2,
+        "coins": [
+            "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+            "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84"
+        ],
+        "decimals": [
+            18,
+            18
+        ],
+        "underlyingCoins": [
+            "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+            "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84"
+        ],
+        "underlyingDecimals": [
+            18,
+            18
+        ],
+        "isMeta": false,
+        "lpToken": "0x06325440D014e39736583c165C2963BA99fAf14E",
+        "gauges": [
+            "0x182B723a58739a9c974cFDB385ceaDb237453c28"
+        ],
+        "gaugeTypes": [
+            0
+        ]
+    },
+    {
+        "name": "3pool",
+        "swapAddr": "0xbEbc44782C7dB0a1A60Cb6fe97d0b483032FF1C7",
+        "nCoins": 3,
+        "coins": [
+            "0x6B175474E89094C44Da98b954EedeAC495271d0F",
+            "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+            "0xdAC17F958D2ee523a2206206994597C13D831ec7"
+        ],
+        "decimals": [
+            18,
+            6,
+            6
+        ],
+        "underlyingCoins": [
+            "0x6B175474E89094C44Da98b954EedeAC495271d0F",
+            "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+            "0xdAC17F958D2ee523a2206206994597C13D831ec7"
+        ],
+        "underlyingDecimals": [
+            18,
+            6,
+            6
+        ],
+        "isMeta": false,
+        "lpToken": "0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490",
+        "gauges": [
+            "0xbFcF63294aD7105dEa65aA58F8AE5BE2D9d0952A"
+        ],
+        "gaugeTypes": [
+            0
+        ]
+    },
+    {
+        "name": "musd",
+        "swapAddr": "0x8474DdbE98F5aA3179B3B3F5942D724aFcdec9f6",
+        "depositContract": "0x803A2B40c5a9BB2B86DD630B274Fa2A9202874C2",
+        "nCoins": 2,
+        "coins": [
+            "0xe2f2a5C287993345a840Db3B0845fbC70f5935a5",
+            "0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490"
+        ],
+        "decimals": [
+            18,
+            18
+        ],
+        "underlyingCoins": [
+            "0xe2f2a5C287993345a840Db3B0845fbC70f5935a5",
+            "0x6B175474E89094C44Da98b954EedeAC495271d0F",
+            "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+            "0xdAC17F958D2ee523a2206206994597C13D831ec7"
+        ],
+        "underlyingDecimals": [
+            18,
+            18,
+            6,
+            6
+        ],
+        "isMeta": true,
+        "lpToken": "0x1AEf73d49Dedc4b1778d0706583995958Dc862e6",
+        "gauges": [
+            "0x5f626c30EC1215f4EdCc9982265E8b1F411D1352"
+        ],
+        "gaugeTypes": [
+            0
+        ],
+        "zapType": 0
+    }
+]