@defisaver/positions-sdk 0.0.29 → 0.0.30

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (25) hide show
  1. package/cjs/compoundV3/index.js +1 -1
  2. package/cjs/config/contracts.js +1 -1
  3. package/cjs/markets/aave/marketAssets.d.ts +9 -5
  4. package/cjs/markets/aave/marketAssets.js +16 -23
  5. package/cjs/markets/compound/marketsAssets.d.ts +11 -5
  6. package/cjs/markets/compound/marketsAssets.js +17 -19
  7. package/cjs/markets/spark/marketAssets.d.ts +3 -2
  8. package/cjs/markets/spark/marketAssets.js +5 -5
  9. package/cjs/types/contracts/generated/MorphoAaveV3ProxyEthMarket.d.ts +1 -0
  10. package/esm/compoundV3/index.js +1 -1
  11. package/esm/config/contracts.js +1 -1
  12. package/esm/markets/aave/marketAssets.d.ts +9 -5
  13. package/esm/markets/aave/marketAssets.js +15 -22
  14. package/esm/markets/compound/marketsAssets.d.ts +11 -5
  15. package/esm/markets/compound/marketsAssets.js +16 -18
  16. package/esm/markets/spark/marketAssets.d.ts +3 -2
  17. package/esm/markets/spark/marketAssets.js +4 -4
  18. package/esm/types/contracts/generated/MorphoAaveV3ProxyEthMarket.d.ts +1 -0
  19. package/package.json +1 -1
  20. package/src/compoundV3/index.ts +1 -1
  21. package/src/config/contracts.js +1 -1
  22. package/src/markets/aave/marketAssets.ts +16 -24
  23. package/src/markets/compound/marketsAssets.ts +20 -18
  24. package/src/markets/spark/marketAssets.ts +5 -4
  25. package/src/types/contracts/generated/MorphoAaveV3ProxyEthMarket.ts +2 -0
package/cjs/compoundV3/index.js CHANGED
@@ -177,7 +177,7 @@ const getCompoundV3AccountData = (web3, network, address, proxyAddress, extracte
177
177
  if (loanData.depositAmount.toString() !== '0') {
178
178
  usedAssets[baseAssetSymbol].isSupplied = true;
179
179
  usedAssets[baseAssetSymbol].supplied = (0, tokens_1.assetAmountInEth)(loanData.depositAmount, baseAssetInfo.symbol);
180
- usedAssets[baseAssetSymbol].suppliedUsd = (0, tokens_1.assetAmountInEth)(loanData.depositValue, baseAssetInfo.symbol);
180
+ usedAssets[baseAssetSymbol].suppliedUsd = new decimal_js_1.default((0, tokens_1.assetAmountInEth)(loanData.depositValue, baseAssetInfo.symbol)).mul(assetsData[baseAssetSymbol].price).toString();
181
181
  }
182
182
  if (loanData.borrowAmount.toString() !== '0') {
183
183
  usedAssets[baseAssetSymbol].isBorrowed = true;
package/cjs/config/contracts.js CHANGED
@@ -375,7 +375,7 @@ module.exports = {
375
375
  }
376
376
  },
377
377
  "MorphoAaveV3ProxyEthMarket": {
378
- "abi": [{ "inputs": [{ "internalType": "address", "name": "manager", "type": "address" }, { "internalType": "bool", "name": "isAllowed", "type": "bool" }], "name": "approveManager", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "delegator", "type": "address" }, { "internalType": "address", "name": "manager", "type": "address" }, { "internalType": "bool", "name": "isAllowed", "type": "bool" }, { "internalType": "uint256", "name": "nonce", "type": "uint256" }, { "internalType": "uint256", "name": "deadline", "type": "uint256" }, { "components": [{ "internalType": "uint8", "name": "v", "type": "uint8" }, { "internalType": "bytes32", "name": "r", "type": "bytes32" }, { "internalType": "bytes32", "name": "s", "type": "bytes32" }], "internalType": "struct Types.Signature", "name": "signature", "type": "tuple" }], "name": "approveManagerWithSig", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "address", "name": "receiver", "type": "address" }, { "internalType": "uint256", "name": "maxIterations", "type": "uint256" }], "name": "borrow", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "delegator", "type": "address" }, { "internalType": "address", "name": "manager", "type": "address" }], "name": "isManagedBy", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }], "name": "market", "outputs": [{ "components": [{ "components": [{ "components": [{ "internalType": "uint128", "name": "poolIndex", "type": "uint128" }, { "internalType": "uint128", "name": "p2pIndex", "type": "uint128" }], "internalType": "struct Types.MarketSideIndexes", "name": "supply", "type": "tuple" }, { "components": [{ "internalType": "uint128", "name": "poolIndex", "type": "uint128" }, { "internalType": "uint128", "name": "p2pIndex", "type": "uint128" }], "internalType": "struct Types.MarketSideIndexes", "name": "borrow", "type": "tuple" }], "internalType": "struct Types.Indexes", "name": "indexes", "type": "tuple" }, { "components": [{ "components": [{ "internalType": "uint256", "name": "scaledDelta", "type": "uint256" }, { "internalType": "uint256", "name": "scaledP2PTotal", "type": "uint256" }], "internalType": "struct Types.MarketSideDelta", "name": "supply", "type": "tuple" }, { "components": [{ "internalType": "uint256", "name": "scaledDelta", "type": "uint256" }, { "internalType": "uint256", "name": "scaledP2PTotal", "type": "uint256" }], "internalType": "struct Types.MarketSideDelta", "name": "borrow", "type": "tuple" }], "internalType": "struct Types.Deltas", "name": "deltas", "type": "tuple" }, { "internalType": "address", "name": "underlying", "type": "address" }, { "components": [{ "internalType": "bool", "name": "isP2PDisabled", "type": "bool" }, { "internalType": "bool", "name": "isSupplyPaused", "type": "bool" }, { "internalType": "bool", "name": "isSupplyCollateralPaused", "type": "bool" }, { "internalType": "bool", "name": "isBorrowPaused", "type": "bool" }, { "internalType": "bool", "name": "isWithdrawPaused", "type": "bool" }, { "internalType": "bool", "name": "isWithdrawCollateralPaused", "type": "bool" }, { "internalType": "bool", "name": "isRepayPaused", "type": "bool" }, { "internalType": "bool", "name": "isLiquidateCollateralPaused", "type": "bool" }, { "internalType": "bool", "name": "isLiquidateBorrowPaused", "type": "bool" }, { "internalType": "bool", "name": "isDeprecated", "type": "bool" }], "internalType": "struct Types.PauseStatuses", "name": "pauseStatuses", "type": "tuple" }, { "internalType": "bool", "name": "isCollateral", "type": "bool" }, { "internalType": "address", "name": "variableDebtToken", "type": "address" }, { "internalType": "uint32", "name": "lastUpdateTimestamp", "type": "uint32" }, { "internalType": "uint16", "name": "reserveFactor", "type": "uint16" }, { "internalType": "uint16", "name": "p2pIndexCursor", "type": "uint16" }, { "internalType": "address", "name": "aToken", "type": "address" }, { "internalType": "address", "name": "stableDebtToken", "type": "address" }, { "internalType": "uint256", "name": "idleSupply", "type": "uint256" }], "internalType": "struct Types.Market", "name": "", "type": "tuple" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }], "name": "repay", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "uint256", "name": "deadline", "type": "uint256" }, { "components": [{ "internalType": "uint8", "name": "v", "type": "uint8" }, { "internalType": "bytes32", "name": "r", "type": "bytes32" }, { "internalType": "bytes32", "name": "s", "type": "bytes32" }], "internalType": "struct Types.Signature", "name": "signature", "type": "tuple" }], "name": "repayWithPermit", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledCollateralBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledP2PBorrowBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledP2PSupplyBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledPoolBorrowBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledPoolSupplyBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "uint256", "name": "maxIterations", "type": "uint256" }], "name": "supply", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }], "name": "supplyCollateral", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "uint256", "name": "deadline", "type": "uint256" }, { "components": [{ "internalType": "uint8", "name": "v", "type": "uint8" }, { "internalType": "bytes32", "name": "r", "type": "bytes32" }, { "internalType": "bytes32", "name": "s", "type": "bytes32" }], "internalType": "struct Types.Signature", "name": "signature", "type": "tuple" }], "name": "supplyCollateralWithPermit", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "uint256", "name": "maxIterations", "type": "uint256" }, { "internalType": "uint256", "name": "deadline", "type": "uint256" }, { "components": [{ "internalType": "uint8", "name": "v", "type": "uint8" }, { "internalType": "bytes32", "name": "r", "type": "bytes32" }, { "internalType": "bytes32", "name": "s", "type": "bytes32" }], "internalType": "struct Types.Signature", "name": "signature", "type": "tuple" }], "name": "supplyWithPermit", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "address", "name": "receiver", "type": "address" }, { "internalType": "uint256", "name": "maxIterations", "type": "uint256" }], "name": "withdraw", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "address", "name": "receiver", "type": "address" }], "name": "withdrawCollateral", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }],
378
+ "abi": [{ "inputs": [], "name": "marketsCreated", "outputs": [{ "internalType": "address[]", "name": "", "type": "address[]" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "manager", "type": "address" }, { "internalType": "bool", "name": "isAllowed", "type": "bool" }], "name": "approveManager", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "delegator", "type": "address" }, { "internalType": "address", "name": "manager", "type": "address" }, { "internalType": "bool", "name": "isAllowed", "type": "bool" }, { "internalType": "uint256", "name": "nonce", "type": "uint256" }, { "internalType": "uint256", "name": "deadline", "type": "uint256" }, { "components": [{ "internalType": "uint8", "name": "v", "type": "uint8" }, { "internalType": "bytes32", "name": "r", "type": "bytes32" }, { "internalType": "bytes32", "name": "s", "type": "bytes32" }], "internalType": "struct Types.Signature", "name": "signature", "type": "tuple" }], "name": "approveManagerWithSig", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "address", "name": "receiver", "type": "address" }, { "internalType": "uint256", "name": "maxIterations", "type": "uint256" }], "name": "borrow", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "delegator", "type": "address" }, { "internalType": "address", "name": "manager", "type": "address" }], "name": "isManagedBy", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }], "name": "market", "outputs": [{ "components": [{ "components": [{ "components": [{ "internalType": "uint128", "name": "poolIndex", "type": "uint128" }, { "internalType": "uint128", "name": "p2pIndex", "type": "uint128" }], "internalType": "struct Types.MarketSideIndexes", "name": "supply", "type": "tuple" }, { "components": [{ "internalType": "uint128", "name": "poolIndex", "type": "uint128" }, { "internalType": "uint128", "name": "p2pIndex", "type": "uint128" }], "internalType": "struct Types.MarketSideIndexes", "name": "borrow", "type": "tuple" }], "internalType": "struct Types.Indexes", "name": "indexes", "type": "tuple" }, { "components": [{ "components": [{ "internalType": "uint256", "name": "scaledDelta", "type": "uint256" }, { "internalType": "uint256", "name": "scaledP2PTotal", "type": "uint256" }], "internalType": "struct Types.MarketSideDelta", "name": "supply", "type": "tuple" }, { "components": [{ "internalType": "uint256", "name": "scaledDelta", "type": "uint256" }, { "internalType": "uint256", "name": "scaledP2PTotal", "type": "uint256" }], "internalType": "struct Types.MarketSideDelta", "name": "borrow", "type": "tuple" }], "internalType": "struct Types.Deltas", "name": "deltas", "type": "tuple" }, { "internalType": "address", "name": "underlying", "type": "address" }, { "components": [{ "internalType": "bool", "name": "isP2PDisabled", "type": "bool" }, { "internalType": "bool", "name": "isSupplyPaused", "type": "bool" }, { "internalType": "bool", "name": "isSupplyCollateralPaused", "type": "bool" }, { "internalType": "bool", "name": "isBorrowPaused", "type": "bool" }, { "internalType": "bool", "name": "isWithdrawPaused", "type": "bool" }, { "internalType": "bool", "name": "isWithdrawCollateralPaused", "type": "bool" }, { "internalType": "bool", "name": "isRepayPaused", "type": "bool" }, { "internalType": "bool", "name": "isLiquidateCollateralPaused", "type": "bool" }, { "internalType": "bool", "name": "isLiquidateBorrowPaused", "type": "bool" }, { "internalType": "bool", "name": "isDeprecated", "type": "bool" }], "internalType": "struct Types.PauseStatuses", "name": "pauseStatuses", "type": "tuple" }, { "internalType": "bool", "name": "isCollateral", "type": "bool" }, { "internalType": "address", "name": "variableDebtToken", "type": "address" }, { "internalType": "uint32", "name": "lastUpdateTimestamp", "type": "uint32" }, { "internalType": "uint16", "name": "reserveFactor", "type": "uint16" }, { "internalType": "uint16", "name": "p2pIndexCursor", "type": "uint16" }, { "internalType": "address", "name": "aToken", "type": "address" }, { "internalType": "address", "name": "stableDebtToken", "type": "address" }, { "internalType": "uint256", "name": "idleSupply", "type": "uint256" }], "internalType": "struct Types.Market", "name": "", "type": "tuple" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }], "name": "repay", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "uint256", "name": "deadline", "type": "uint256" }, { "components": [{ "internalType": "uint8", "name": "v", "type": "uint8" }, { "internalType": "bytes32", "name": "r", "type": "bytes32" }, { "internalType": "bytes32", "name": "s", "type": "bytes32" }], "internalType": "struct Types.Signature", "name": "signature", "type": "tuple" }], "name": "repayWithPermit", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledCollateralBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledP2PBorrowBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledP2PSupplyBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledPoolBorrowBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledPoolSupplyBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "uint256", "name": "maxIterations", "type": "uint256" }], "name": "supply", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }], "name": "supplyCollateral", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "uint256", "name": "deadline", "type": "uint256" }, { "components": [{ "internalType": "uint8", "name": "v", "type": "uint8" }, { "internalType": "bytes32", "name": "r", "type": "bytes32" }, { "internalType": "bytes32", "name": "s", "type": "bytes32" }], "internalType": "struct Types.Signature", "name": "signature", "type": "tuple" }], "name": "supplyCollateralWithPermit", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "uint256", "name": "maxIterations", "type": "uint256" }, { "internalType": "uint256", "name": "deadline", "type": "uint256" }, { "components": [{ "internalType": "uint8", "name": "v", "type": "uint8" }, { "internalType": "bytes32", "name": "r", "type": "bytes32" }, { "internalType": "bytes32", "name": "s", "type": "bytes32" }], "internalType": "struct Types.Signature", "name": "signature", "type": "tuple" }], "name": "supplyWithPermit", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "address", "name": "receiver", "type": "address" }, { "internalType": "uint256", "name": "maxIterations", "type": "uint256" }], "name": "withdraw", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "address", "name": "receiver", "type": "address" }], "name": "withdrawCollateral", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }],
379
379
  "networks": {
380
380
  "1": {
381
381
  "address": "0x33333aea097c193e66081E930c33020272b33333"
package/cjs/markets/aave/marketAssets.d.ts CHANGED
@@ -1,9 +1,13 @@
1
- export declare const aaveV2AssetsDefaultMarket: readonly ["AAVE", "BAL", "BAT", "BUSD", "CRV", "DAI", "ENJ", "ETH", "GUSD", "LINK", "MANA", "MKR", "REN", "SNX", "SUSD", "TUSD", "UNI", "USDC", "USDT", "WBTC", "YFI", "xSUSHI", "ZRX", "RAI", "AMPL", "DPI", "USDP", "RENFIL", "FRAX", "FEI", "stETH", "ENS", "UST", "CVX", "1INCH", "LUSD"];
1
+ export declare const aaveV2AssetsDefaultMarket: string[];
2
2
  export declare const morphoAaveV2AssetDefaultMarket: string[];
3
3
  export declare const morphoAaveV3AssetEthMarket: string[];
4
+ export declare const aaveV3AssetsDefaultMarketEth: string[];
5
+ export declare const aaveV3AssetsDefaultMarketOpt: string[];
6
+ export declare const aaveV3AssetsDefaultMarketArb: string[];
7
+ export declare const aaveV3AssetsDefaultMarketBase: string[];
4
8
  export declare const aaveV3AssetsDefaultMarket: {
5
- readonly 1: readonly ["WBTC", "ETH", "wstETH", "USDC", "DAI", "LINK", "AAVE", "cbETH", "USDT", "rETH", "LUSD", "UNI", "MKR", "SNX", "BAL", "LDO", "CRV", "ENS", "1INCH", "GHO", "FRAX", "RPL", "sDAI"];
6
- readonly 10: readonly ["DAI", "USDC.e", "USDT", "SUSD", "AAVE", "LINK", "WBTC", "ETH", "OP", "wstETH", "LUSD", "MAI", "rETH"];
7
- readonly 42161: readonly ["ETH", "DAI", "EURS", "USDC", "USDT", "AAVE", "LINK", "WBTC", "wstETH", "MAI", "rETH", "LUSD", "USDC.e", "FRAX", "ARB"];
8
- readonly 8453: readonly ["ETH", "USDbC", "cbETH", "wstETH"];
9
+ readonly 1: string[];
10
+ readonly 10: string[];
11
+ readonly 42161: string[];
12
+ readonly 8453: string[];
9
13
  };
package/cjs/markets/aave/marketAssets.js CHANGED
@@ -1,31 +1,24 @@
1
1
  "use strict";
2
- // TODO generate this file automatically
3
2
  Object.defineProperty(exports, "__esModule", { value: true });
4
- exports.aaveV3AssetsDefaultMarket = exports.morphoAaveV3AssetEthMarket = exports.morphoAaveV2AssetDefaultMarket = exports.aaveV2AssetsDefaultMarket = void 0;
3
+ exports.aaveV3AssetsDefaultMarket = exports.aaveV3AssetsDefaultMarketBase = exports.aaveV3AssetsDefaultMarketArb = exports.aaveV3AssetsDefaultMarketOpt = exports.aaveV3AssetsDefaultMarketEth = exports.morphoAaveV3AssetEthMarket = exports.morphoAaveV2AssetDefaultMarket = exports.aaveV2AssetsDefaultMarket = void 0;
5
4
  const common_1 = require("../../types/common");
6
- exports.aaveV2AssetsDefaultMarket = [
7
- 'AAVE', 'BAL', 'BAT', 'BUSD', 'CRV', 'DAI', 'ENJ', 'ETH', 'GUSD', 'LINK', 'MANA', 'MKR',
8
- 'REN', 'SNX', 'SUSD', 'TUSD', 'UNI', 'USDC', 'USDT', 'WBTC', 'YFI', 'xSUSHI', 'ZRX', 'RAI',
9
- 'AMPL', 'DPI', 'USDP', 'RENFIL', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD',
5
+ exports.aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
6
+ exports.morphoAaveV2AssetDefaultMarket = ['DAI', 'ETH', 'USDC', 'USDT', 'WBTC', 'stETH', 'CRV'];
7
+ exports.morphoAaveV3AssetEthMarket = [
8
+ 'ETH', 'wstETH', 'DAI', 'USDC', 'WBTC', 'rETH', 'cbETH', 'sDAI', 'USDT',
10
9
  ];
11
- exports.morphoAaveV2AssetDefaultMarket = [
12
- 'ETH', 'stETH', 'USDC', 'WBTC', 'USDT', 'DAI', 'CRV',
10
+ exports.aaveV3AssetsDefaultMarketEth = ['ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD'];
11
+ exports.aaveV3AssetsDefaultMarketOpt = [
12
+ 'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',
13
13
  ];
14
- exports.morphoAaveV3AssetEthMarket = [
15
- 'ETH', 'wstETH', 'DAI', 'USDC', 'WBTC', 'rETH', 'cbETH',
14
+ exports.aaveV3AssetsDefaultMarketArb = [
15
+ 'ETH', 'DAI', 'EURS', 'USDC', 'USDT', 'AAVE', 'LINK', 'WBTC', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC.e', 'FRAX', 'ARB',
16
16
  ];
17
+ exports.aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC'];
18
+ // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
17
19
  exports.aaveV3AssetsDefaultMarket = {
18
- [common_1.NetworkNumber.Eth]: [
19
- 'WBTC', 'ETH', 'wstETH', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'UNI', 'MKR', 'SNX', 'BAL',
20
- 'LDO', 'CRV', 'ENS', '1INCH', 'GHO', 'FRAX', 'RPL', 'sDAI',
21
- ],
22
- [common_1.NetworkNumber.Opt]: [
23
- 'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH',
24
- ],
25
- [common_1.NetworkNumber.Arb]: [
26
- 'ETH', 'DAI', 'EURS', 'USDC', 'USDT', 'AAVE', 'LINK', 'WBTC', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC.e', 'FRAX', 'ARB',
27
- ],
28
- [common_1.NetworkNumber.Base]: [
29
- 'ETH', 'USDbC', 'cbETH', 'wstETH',
30
- ],
20
+ [common_1.NetworkNumber.Eth]: exports.aaveV3AssetsDefaultMarketEth,
21
+ [common_1.NetworkNumber.Opt]: exports.aaveV3AssetsDefaultMarketOpt,
22
+ [common_1.NetworkNumber.Arb]: exports.aaveV3AssetsDefaultMarketArb,
23
+ [common_1.NetworkNumber.Base]: exports.aaveV3AssetsDefaultMarketBase,
31
24
  };
package/cjs/markets/compound/marketsAssets.d.ts CHANGED
@@ -1,22 +1,28 @@
1
1
  export declare const compoundV2CollateralAssets: import("@defisaver/tokens/esm/types").AssetData[];
2
+ export declare const v3USDCCollAssetsEth: string[];
3
+ export declare const v3USDCCollAssetsArb: string[];
2
4
  export declare const v3USDCCollAssets: {
3
- readonly 1: readonly ["ETH", "COMP", "WBTC", "UNI", "LINK"];
5
+ readonly 1: string[];
4
6
  readonly 10: readonly [];
5
- readonly 42161: readonly ["ARB", "ETH", "GMX", "WBTC"];
7
+ readonly 42161: string[];
6
8
  readonly 8453: readonly [];
7
9
  };
10
+ export declare const v3USDCeCollAssetsArb: string[];
8
11
  export declare const v3USDCeCollAssets: {
9
12
  readonly 1: readonly [];
10
13
  readonly 10: readonly [];
11
- readonly 42161: readonly ["ARB", "ETH", "GMX", "WBTC"];
14
+ readonly 42161: string[];
12
15
  readonly 8453: readonly [];
13
16
  };
17
+ export declare const v3ETHCollAssetsEth: string[];
18
+ export declare const v3ETHCollAssetsBase: string[];
14
19
  export declare const v3ETHCollAssets: {
15
- readonly 1: readonly ["cbETH", "wstETH", "rETH"];
20
+ readonly 1: string[];
16
21
  readonly 10: readonly [];
17
22
  readonly 42161: readonly [];
18
- readonly 8453: readonly ["cbETH"];
23
+ readonly 8453: string[];
19
24
  };
25
+ export declare const v3USDbCCollAssetsBase: string[];
20
26
  export declare const v3USDbCCollAssets: {
21
27
  1: never[];
22
28
  10: never[];
package/cjs/markets/compound/marketsAssets.js CHANGED
@@ -1,45 +1,43 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.compoundV2CollateralAssets = void 0;
3
+ exports.v3USDbCCollAssets = exports.v3USDbCCollAssetsBase = exports.v3ETHCollAssets = exports.v3ETHCollAssetsBase = exports.v3ETHCollAssetsEth = exports.v3USDCeCollAssets = exports.v3USDCeCollAssetsArb = exports.v3USDCCollAssets = exports.v3USDCCollAssetsArb = exports.v3USDCCollAssetsEth = exports.compoundV2CollateralAssets = void 0;
4
4
  const tokens_1 = require("@defisaver/tokens");
5
5
  const common_1 = require("../../types/common");
6
6
  exports.compoundV2CollateralAssets = [
7
7
  'cETH', 'cDAI', 'cBAT', 'cZRX', 'cUSDC', 'cWBTC Legacy', 'cWBTC', 'cUSDT',
8
8
  'cTUSD', 'cLINK', 'cUSDP', 'cUNI', 'cCOMP', 'cMKR', 'cSUSHI', 'cAAVE', 'cYFI',
9
9
  ].map((symbol) => (0, tokens_1.getAssetInfo)(symbol));
10
+ exports.v3USDCCollAssetsEth = ['ETH', 'COMP', 'WBTC', 'UNI', 'LINK'];
11
+ exports.v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC'];
12
+ // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
10
13
  exports.v3USDCCollAssets = {
11
- [common_1.NetworkNumber.Eth]: [
12
- 'ETH', 'COMP', 'WBTC', 'UNI', 'LINK',
13
- ],
14
+ [common_1.NetworkNumber.Eth]: exports.v3USDCCollAssetsEth,
14
15
  [common_1.NetworkNumber.Opt]: [],
15
- [common_1.NetworkNumber.Arb]: [
16
- 'ARB', 'ETH', 'GMX', 'WBTC',
17
- ],
16
+ [common_1.NetworkNumber.Arb]: exports.v3USDCCollAssetsArb,
18
17
  [common_1.NetworkNumber.Base]: [],
19
18
  };
19
+ exports.v3USDCeCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC'];
20
+ // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
20
21
  exports.v3USDCeCollAssets = {
21
22
  [common_1.NetworkNumber.Eth]: [],
22
23
  [common_1.NetworkNumber.Opt]: [],
23
- [common_1.NetworkNumber.Arb]: [
24
- 'ARB', 'ETH', 'GMX', 'WBTC',
25
- ],
24
+ [common_1.NetworkNumber.Arb]: exports.v3USDCeCollAssetsArb,
26
25
  [common_1.NetworkNumber.Base]: [],
27
26
  };
27
+ exports.v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH'];
28
+ exports.v3ETHCollAssetsBase = ['cbETH'];
29
+ // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
28
30
  exports.v3ETHCollAssets = {
29
- [common_1.NetworkNumber.Eth]: [
30
- 'cbETH', 'wstETH', 'rETH',
31
- ],
31
+ [common_1.NetworkNumber.Eth]: exports.v3ETHCollAssetsEth,
32
32
  [common_1.NetworkNumber.Opt]: [],
33
33
  [common_1.NetworkNumber.Arb]: [],
34
- [common_1.NetworkNumber.Base]: [
35
- 'cbETH',
36
- ],
34
+ [common_1.NetworkNumber.Base]: exports.v3ETHCollAssetsBase,
37
35
  };
36
+ exports.v3USDbCCollAssetsBase = ['ETH', 'cbETH'];
37
+ // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
38
38
  exports.v3USDbCCollAssets = {
39
39
  [common_1.NetworkNumber.Eth]: [],
40
40
  [common_1.NetworkNumber.Opt]: [],
41
41
  [common_1.NetworkNumber.Arb]: [],
42
- [common_1.NetworkNumber.Base]: [
43
- 'ETH', 'cbETH',
44
- ],
42
+ [common_1.NetworkNumber.Base]: exports.v3USDbCCollAssetsBase,
45
43
  };
package/cjs/markets/spark/marketAssets.d.ts CHANGED
@@ -1,6 +1,7 @@
1
+ export declare const sparkAssetsDefaultMarketEth: string[];
1
2
  export declare const sparkAssetsDefaultMarket: {
2
- readonly 1: readonly ["ETH", "USDC", "DAI", "GNO", "rETH", "sDAI", "wstETH", "WBTC"];
3
+ readonly 1: string[];
3
4
  readonly 10: readonly [];
4
- readonly 42161: readonly [];
5
5
  readonly 8453: readonly [];
6
+ readonly 42161: readonly [];
6
7
  };
package/cjs/markets/spark/marketAssets.js CHANGED
@@ -1,12 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.sparkAssetsDefaultMarket = void 0;
3
+ exports.sparkAssetsDefaultMarket = exports.sparkAssetsDefaultMarketEth = void 0;
4
4
  const common_1 = require("../../types/common");
5
+ exports.sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT'];
6
+ // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
5
7
  exports.sparkAssetsDefaultMarket = {
6
- [common_1.NetworkNumber.Eth]: [
7
- 'ETH', 'USDC', 'DAI', 'GNO', 'rETH', 'sDAI', 'wstETH', 'WBTC',
8
- ],
8
+ [common_1.NetworkNumber.Eth]: exports.sparkAssetsDefaultMarketEth,
9
9
  [common_1.NetworkNumber.Opt]: [],
10
- [common_1.NetworkNumber.Arb]: [],
11
10
  [common_1.NetworkNumber.Base]: [],
11
+ [common_1.NetworkNumber.Arb]: [],
12
12
  };
package/cjs/types/contracts/generated/MorphoAaveV3ProxyEthMarket.d.ts CHANGED
@@ -177,6 +177,7 @@ export interface MorphoAaveV3ProxyEthMarket extends BaseContract {
177
177
  constructor(jsonInterface: any[], address?: string, options?: ContractOptions): MorphoAaveV3ProxyEthMarket;
178
178
  clone(): MorphoAaveV3ProxyEthMarket;
179
179
  methods: {
180
+ marketsCreated(): NonPayableTransactionObject<string[]>;
180
181
  approveManager(manager: string, isAllowed: boolean): NonPayableTransactionObject<void>;
181
182
  approveManagerWithSig(delegator: string, manager: string, isAllowed: boolean, nonce: number | string | BN, deadline: number | string | BN, signature: Types.SignatureStruct): NonPayableTransactionObject<void>;
182
183
  borrow(underlying: string, amount: number | string | BN, onBehalf: string, receiver: string, maxIterations: number | string | BN): NonPayableTransactionObject<string>;
package/esm/compoundV3/index.js CHANGED
@@ -169,7 +169,7 @@ export const getCompoundV3AccountData = (web3, network, address, proxyAddress, e
169
169
  if (loanData.depositAmount.toString() !== '0') {
170
170
  usedAssets[baseAssetSymbol].isSupplied = true;
171
171
  usedAssets[baseAssetSymbol].supplied = assetAmountInEth(loanData.depositAmount, baseAssetInfo.symbol);
172
- usedAssets[baseAssetSymbol].suppliedUsd = assetAmountInEth(loanData.depositValue, baseAssetInfo.symbol);
172
+ usedAssets[baseAssetSymbol].suppliedUsd = new Dec(assetAmountInEth(loanData.depositValue, baseAssetInfo.symbol)).mul(assetsData[baseAssetSymbol].price).toString();
173
173
  }
174
174
  if (loanData.borrowAmount.toString() !== '0') {
175
175
  usedAssets[baseAssetSymbol].isBorrowed = true;
package/esm/config/contracts.js CHANGED
@@ -374,7 +374,7 @@ module.exports = {
374
374
  }
375
375
  },
376
376
  "MorphoAaveV3ProxyEthMarket": {
377
- "abi": [{ "inputs": [{ "internalType": "address", "name": "manager", "type": "address" }, { "internalType": "bool", "name": "isAllowed", "type": "bool" }], "name": "approveManager", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "delegator", "type": "address" }, { "internalType": "address", "name": "manager", "type": "address" }, { "internalType": "bool", "name": "isAllowed", "type": "bool" }, { "internalType": "uint256", "name": "nonce", "type": "uint256" }, { "internalType": "uint256", "name": "deadline", "type": "uint256" }, { "components": [{ "internalType": "uint8", "name": "v", "type": "uint8" }, { "internalType": "bytes32", "name": "r", "type": "bytes32" }, { "internalType": "bytes32", "name": "s", "type": "bytes32" }], "internalType": "struct Types.Signature", "name": "signature", "type": "tuple" }], "name": "approveManagerWithSig", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "address", "name": "receiver", "type": "address" }, { "internalType": "uint256", "name": "maxIterations", "type": "uint256" }], "name": "borrow", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "delegator", "type": "address" }, { "internalType": "address", "name": "manager", "type": "address" }], "name": "isManagedBy", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }], "name": "market", "outputs": [{ "components": [{ "components": [{ "components": [{ "internalType": "uint128", "name": "poolIndex", "type": "uint128" }, { "internalType": "uint128", "name": "p2pIndex", "type": "uint128" }], "internalType": "struct Types.MarketSideIndexes", "name": "supply", "type": "tuple" }, { "components": [{ "internalType": "uint128", "name": "poolIndex", "type": "uint128" }, { "internalType": "uint128", "name": "p2pIndex", "type": "uint128" }], "internalType": "struct Types.MarketSideIndexes", "name": "borrow", "type": "tuple" }], "internalType": "struct Types.Indexes", "name": "indexes", "type": "tuple" }, { "components": [{ "components": [{ "internalType": "uint256", "name": "scaledDelta", "type": "uint256" }, { "internalType": "uint256", "name": "scaledP2PTotal", "type": "uint256" }], "internalType": "struct Types.MarketSideDelta", "name": "supply", "type": "tuple" }, { "components": [{ "internalType": "uint256", "name": "scaledDelta", "type": "uint256" }, { "internalType": "uint256", "name": "scaledP2PTotal", "type": "uint256" }], "internalType": "struct Types.MarketSideDelta", "name": "borrow", "type": "tuple" }], "internalType": "struct Types.Deltas", "name": "deltas", "type": "tuple" }, { "internalType": "address", "name": "underlying", "type": "address" }, { "components": [{ "internalType": "bool", "name": "isP2PDisabled", "type": "bool" }, { "internalType": "bool", "name": "isSupplyPaused", "type": "bool" }, { "internalType": "bool", "name": "isSupplyCollateralPaused", "type": "bool" }, { "internalType": "bool", "name": "isBorrowPaused", "type": "bool" }, { "internalType": "bool", "name": "isWithdrawPaused", "type": "bool" }, { "internalType": "bool", "name": "isWithdrawCollateralPaused", "type": "bool" }, { "internalType": "bool", "name": "isRepayPaused", "type": "bool" }, { "internalType": "bool", "name": "isLiquidateCollateralPaused", "type": "bool" }, { "internalType": "bool", "name": "isLiquidateBorrowPaused", "type": "bool" }, { "internalType": "bool", "name": "isDeprecated", "type": "bool" }], "internalType": "struct Types.PauseStatuses", "name": "pauseStatuses", "type": "tuple" }, { "internalType": "bool", "name": "isCollateral", "type": "bool" }, { "internalType": "address", "name": "variableDebtToken", "type": "address" }, { "internalType": "uint32", "name": "lastUpdateTimestamp", "type": "uint32" }, { "internalType": "uint16", "name": "reserveFactor", "type": "uint16" }, { "internalType": "uint16", "name": "p2pIndexCursor", "type": "uint16" }, { "internalType": "address", "name": "aToken", "type": "address" }, { "internalType": "address", "name": "stableDebtToken", "type": "address" }, { "internalType": "uint256", "name": "idleSupply", "type": "uint256" }], "internalType": "struct Types.Market", "name": "", "type": "tuple" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }], "name": "repay", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "uint256", "name": "deadline", "type": "uint256" }, { "components": [{ "internalType": "uint8", "name": "v", "type": "uint8" }, { "internalType": "bytes32", "name": "r", "type": "bytes32" }, { "internalType": "bytes32", "name": "s", "type": "bytes32" }], "internalType": "struct Types.Signature", "name": "signature", "type": "tuple" }], "name": "repayWithPermit", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledCollateralBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledP2PBorrowBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledP2PSupplyBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledPoolBorrowBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledPoolSupplyBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "uint256", "name": "maxIterations", "type": "uint256" }], "name": "supply", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }], "name": "supplyCollateral", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "uint256", "name": "deadline", "type": "uint256" }, { "components": [{ "internalType": "uint8", "name": "v", "type": "uint8" }, { "internalType": "bytes32", "name": "r", "type": "bytes32" }, { "internalType": "bytes32", "name": "s", "type": "bytes32" }], "internalType": "struct Types.Signature", "name": "signature", "type": "tuple" }], "name": "supplyCollateralWithPermit", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "uint256", "name": "maxIterations", "type": "uint256" }, { "internalType": "uint256", "name": "deadline", "type": "uint256" }, { "components": [{ "internalType": "uint8", "name": "v", "type": "uint8" }, { "internalType": "bytes32", "name": "r", "type": "bytes32" }, { "internalType": "bytes32", "name": "s", "type": "bytes32" }], "internalType": "struct Types.Signature", "name": "signature", "type": "tuple" }], "name": "supplyWithPermit", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "address", "name": "receiver", "type": "address" }, { "internalType": "uint256", "name": "maxIterations", "type": "uint256" }], "name": "withdraw", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "address", "name": "receiver", "type": "address" }], "name": "withdrawCollateral", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }],
377
+ "abi": [{ "inputs": [], "name": "marketsCreated", "outputs": [{ "internalType": "address[]", "name": "", "type": "address[]" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "manager", "type": "address" }, { "internalType": "bool", "name": "isAllowed", "type": "bool" }], "name": "approveManager", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "delegator", "type": "address" }, { "internalType": "address", "name": "manager", "type": "address" }, { "internalType": "bool", "name": "isAllowed", "type": "bool" }, { "internalType": "uint256", "name": "nonce", "type": "uint256" }, { "internalType": "uint256", "name": "deadline", "type": "uint256" }, { "components": [{ "internalType": "uint8", "name": "v", "type": "uint8" }, { "internalType": "bytes32", "name": "r", "type": "bytes32" }, { "internalType": "bytes32", "name": "s", "type": "bytes32" }], "internalType": "struct Types.Signature", "name": "signature", "type": "tuple" }], "name": "approveManagerWithSig", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "address", "name": "receiver", "type": "address" }, { "internalType": "uint256", "name": "maxIterations", "type": "uint256" }], "name": "borrow", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "delegator", "type": "address" }, { "internalType": "address", "name": "manager", "type": "address" }], "name": "isManagedBy", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }], "name": "market", "outputs": [{ "components": [{ "components": [{ "components": [{ "internalType": "uint128", "name": "poolIndex", "type": "uint128" }, { "internalType": "uint128", "name": "p2pIndex", "type": "uint128" }], "internalType": "struct Types.MarketSideIndexes", "name": "supply", "type": "tuple" }, { "components": [{ "internalType": "uint128", "name": "poolIndex", "type": "uint128" }, { "internalType": "uint128", "name": "p2pIndex", "type": "uint128" }], "internalType": "struct Types.MarketSideIndexes", "name": "borrow", "type": "tuple" }], "internalType": "struct Types.Indexes", "name": "indexes", "type": "tuple" }, { "components": [{ "components": [{ "internalType": "uint256", "name": "scaledDelta", "type": "uint256" }, { "internalType": "uint256", "name": "scaledP2PTotal", "type": "uint256" }], "internalType": "struct Types.MarketSideDelta", "name": "supply", "type": "tuple" }, { "components": [{ "internalType": "uint256", "name": "scaledDelta", "type": "uint256" }, { "internalType": "uint256", "name": "scaledP2PTotal", "type": "uint256" }], "internalType": "struct Types.MarketSideDelta", "name": "borrow", "type": "tuple" }], "internalType": "struct Types.Deltas", "name": "deltas", "type": "tuple" }, { "internalType": "address", "name": "underlying", "type": "address" }, { "components": [{ "internalType": "bool", "name": "isP2PDisabled", "type": "bool" }, { "internalType": "bool", "name": "isSupplyPaused", "type": "bool" }, { "internalType": "bool", "name": "isSupplyCollateralPaused", "type": "bool" }, { "internalType": "bool", "name": "isBorrowPaused", "type": "bool" }, { "internalType": "bool", "name": "isWithdrawPaused", "type": "bool" }, { "internalType": "bool", "name": "isWithdrawCollateralPaused", "type": "bool" }, { "internalType": "bool", "name": "isRepayPaused", "type": "bool" }, { "internalType": "bool", "name": "isLiquidateCollateralPaused", "type": "bool" }, { "internalType": "bool", "name": "isLiquidateBorrowPaused", "type": "bool" }, { "internalType": "bool", "name": "isDeprecated", "type": "bool" }], "internalType": "struct Types.PauseStatuses", "name": "pauseStatuses", "type": "tuple" }, { "internalType": "bool", "name": "isCollateral", "type": "bool" }, { "internalType": "address", "name": "variableDebtToken", "type": "address" }, { "internalType": "uint32", "name": "lastUpdateTimestamp", "type": "uint32" }, { "internalType": "uint16", "name": "reserveFactor", "type": "uint16" }, { "internalType": "uint16", "name": "p2pIndexCursor", "type": "uint16" }, { "internalType": "address", "name": "aToken", "type": "address" }, { "internalType": "address", "name": "stableDebtToken", "type": "address" }, { "internalType": "uint256", "name": "idleSupply", "type": "uint256" }], "internalType": "struct Types.Market", "name": "", "type": "tuple" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }], "name": "repay", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "uint256", "name": "deadline", "type": "uint256" }, { "components": [{ "internalType": "uint8", "name": "v", "type": "uint8" }, { "internalType": "bytes32", "name": "r", "type": "bytes32" }, { "internalType": "bytes32", "name": "s", "type": "bytes32" }], "internalType": "struct Types.Signature", "name": "signature", "type": "tuple" }], "name": "repayWithPermit", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledCollateralBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledP2PBorrowBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledP2PSupplyBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledPoolBorrowBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "scaledPoolSupplyBalance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "uint256", "name": "maxIterations", "type": "uint256" }], "name": "supply", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }], "name": "supplyCollateral", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "uint256", "name": "deadline", "type": "uint256" }, { "components": [{ "internalType": "uint8", "name": "v", "type": "uint8" }, { "internalType": "bytes32", "name": "r", "type": "bytes32" }, { "internalType": "bytes32", "name": "s", "type": "bytes32" }], "internalType": "struct Types.Signature", "name": "signature", "type": "tuple" }], "name": "supplyCollateralWithPermit", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "uint256", "name": "maxIterations", "type": "uint256" }, { "internalType": "uint256", "name": "deadline", "type": "uint256" }, { "components": [{ "internalType": "uint8", "name": "v", "type": "uint8" }, { "internalType": "bytes32", "name": "r", "type": "bytes32" }, { "internalType": "bytes32", "name": "s", "type": "bytes32" }], "internalType": "struct Types.Signature", "name": "signature", "type": "tuple" }], "name": "supplyWithPermit", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "address", "name": "receiver", "type": "address" }, { "internalType": "uint256", "name": "maxIterations", "type": "uint256" }], "name": "withdraw", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "underlying", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "address", "name": "onBehalf", "type": "address" }, { "internalType": "address", "name": "receiver", "type": "address" }], "name": "withdrawCollateral", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }],
378
378
  "networks": {
379
379
  "1": {
380
380
  "address": "0x33333aea097c193e66081E930c33020272b33333"
package/esm/markets/aave/marketAssets.d.ts CHANGED
@@ -1,9 +1,13 @@
1
- export declare const aaveV2AssetsDefaultMarket: readonly ["AAVE", "BAL", "BAT", "BUSD", "CRV", "DAI", "ENJ", "ETH", "GUSD", "LINK", "MANA", "MKR", "REN", "SNX", "SUSD", "TUSD", "UNI", "USDC", "USDT", "WBTC", "YFI", "xSUSHI", "ZRX", "RAI", "AMPL", "DPI", "USDP", "RENFIL", "FRAX", "FEI", "stETH", "ENS", "UST", "CVX", "1INCH", "LUSD"];
1
+ export declare const aaveV2AssetsDefaultMarket: string[];
2
2
  export declare const morphoAaveV2AssetDefaultMarket: string[];
3
3
  export declare const morphoAaveV3AssetEthMarket: string[];
4
+ export declare const aaveV3AssetsDefaultMarketEth: string[];
5
+ export declare const aaveV3AssetsDefaultMarketOpt: string[];
6
+ export declare const aaveV3AssetsDefaultMarketArb: string[];
7
+ export declare const aaveV3AssetsDefaultMarketBase: string[];
4
8
  export declare const aaveV3AssetsDefaultMarket: {
5
- readonly 1: readonly ["WBTC", "ETH", "wstETH", "USDC", "DAI", "LINK", "AAVE", "cbETH", "USDT", "rETH", "LUSD", "UNI", "MKR", "SNX", "BAL", "LDO", "CRV", "ENS", "1INCH", "GHO", "FRAX", "RPL", "sDAI"];
6
- readonly 10: readonly ["DAI", "USDC.e", "USDT", "SUSD", "AAVE", "LINK", "WBTC", "ETH", "OP", "wstETH", "LUSD", "MAI", "rETH"];
7
- readonly 42161: readonly ["ETH", "DAI", "EURS", "USDC", "USDT", "AAVE", "LINK", "WBTC", "wstETH", "MAI", "rETH", "LUSD", "USDC.e", "FRAX", "ARB"];
8
- readonly 8453: readonly ["ETH", "USDbC", "cbETH", "wstETH"];
9
+ readonly 1: string[];
10
+ readonly 10: string[];
11
+ readonly 42161: string[];
12
+ readonly 8453: string[];
9
13
  };
package/esm/markets/aave/marketAssets.js CHANGED
@@ -1,28 +1,21 @@
1
- // TODO generate this file automatically
2
1
  import { NetworkNumber } from '../../types/common';
3
- export const aaveV2AssetsDefaultMarket = [
4
- 'AAVE', 'BAL', 'BAT', 'BUSD', 'CRV', 'DAI', 'ENJ', 'ETH', 'GUSD', 'LINK', 'MANA', 'MKR',
5
- 'REN', 'SNX', 'SUSD', 'TUSD', 'UNI', 'USDC', 'USDT', 'WBTC', 'YFI', 'xSUSHI', 'ZRX', 'RAI',
6
- 'AMPL', 'DPI', 'USDP', 'RENFIL', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD',
2
+ export const aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
3
+ export const morphoAaveV2AssetDefaultMarket = ['DAI', 'ETH', 'USDC', 'USDT', 'WBTC', 'stETH', 'CRV'];
4
+ export const morphoAaveV3AssetEthMarket = [
5
+ 'ETH', 'wstETH', 'DAI', 'USDC', 'WBTC', 'rETH', 'cbETH', 'sDAI', 'USDT',
7
6
  ];
8
- export const morphoAaveV2AssetDefaultMarket = [
9
- 'ETH', 'stETH', 'USDC', 'WBTC', 'USDT', 'DAI', 'CRV',
7
+ export const aaveV3AssetsDefaultMarketEth = ['ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD'];
8
+ export const aaveV3AssetsDefaultMarketOpt = [
9
+ 'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',
10
10
  ];
11
- export const morphoAaveV3AssetEthMarket = [
12
- 'ETH', 'wstETH', 'DAI', 'USDC', 'WBTC', 'rETH', 'cbETH',
11
+ export const aaveV3AssetsDefaultMarketArb = [
12
+ 'ETH', 'DAI', 'EURS', 'USDC', 'USDT', 'AAVE', 'LINK', 'WBTC', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC.e', 'FRAX', 'ARB',
13
13
  ];
14
+ export const aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC'];
15
+ // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
14
16
  export const aaveV3AssetsDefaultMarket = {
15
- [NetworkNumber.Eth]: [
16
- 'WBTC', 'ETH', 'wstETH', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'UNI', 'MKR', 'SNX', 'BAL',
17
- 'LDO', 'CRV', 'ENS', '1INCH', 'GHO', 'FRAX', 'RPL', 'sDAI',
18
- ],
19
- [NetworkNumber.Opt]: [
20
- 'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH',
21
- ],
22
- [NetworkNumber.Arb]: [
23
- 'ETH', 'DAI', 'EURS', 'USDC', 'USDT', 'AAVE', 'LINK', 'WBTC', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC.e', 'FRAX', 'ARB',
24
- ],
25
- [NetworkNumber.Base]: [
26
- 'ETH', 'USDbC', 'cbETH', 'wstETH',
27
- ],
17
+ [NetworkNumber.Eth]: aaveV3AssetsDefaultMarketEth,
18
+ [NetworkNumber.Opt]: aaveV3AssetsDefaultMarketOpt,
19
+ [NetworkNumber.Arb]: aaveV3AssetsDefaultMarketArb,
20
+ [NetworkNumber.Base]: aaveV3AssetsDefaultMarketBase,
28
21
  };
package/esm/markets/compound/marketsAssets.d.ts CHANGED
@@ -1,22 +1,28 @@
1
1
  export declare const compoundV2CollateralAssets: import("@defisaver/tokens/esm/types").AssetData[];
2
+ export declare const v3USDCCollAssetsEth: string[];
3
+ export declare const v3USDCCollAssetsArb: string[];
2
4
  export declare const v3USDCCollAssets: {
3
- readonly 1: readonly ["ETH", "COMP", "WBTC", "UNI", "LINK"];
5
+ readonly 1: string[];
4
6
  readonly 10: readonly [];
5
- readonly 42161: readonly ["ARB", "ETH", "GMX", "WBTC"];
7
+ readonly 42161: string[];
6
8
  readonly 8453: readonly [];
7
9
  };
10
+ export declare const v3USDCeCollAssetsArb: string[];
8
11
  export declare const v3USDCeCollAssets: {
9
12
  readonly 1: readonly [];
10
13
  readonly 10: readonly [];
11
- readonly 42161: readonly ["ARB", "ETH", "GMX", "WBTC"];
14
+ readonly 42161: string[];
12
15
  readonly 8453: readonly [];
13
16
  };
17
+ export declare const v3ETHCollAssetsEth: string[];
18
+ export declare const v3ETHCollAssetsBase: string[];
14
19
  export declare const v3ETHCollAssets: {
15
- readonly 1: readonly ["cbETH", "wstETH", "rETH"];
20
+ readonly 1: string[];
16
21
  readonly 10: readonly [];
17
22
  readonly 42161: readonly [];
18
- readonly 8453: readonly ["cbETH"];
23
+ readonly 8453: string[];
19
24
  };
25
+ export declare const v3USDbCCollAssetsBase: string[];
20
26
  export declare const v3USDbCCollAssets: {
21
27
  1: never[];
22
28
  10: never[];
package/esm/markets/compound/marketsAssets.js CHANGED
@@ -4,39 +4,37 @@ export const compoundV2CollateralAssets = [
4
4
  'cETH', 'cDAI', 'cBAT', 'cZRX', 'cUSDC', 'cWBTC Legacy', 'cWBTC', 'cUSDT',
5
5
  'cTUSD', 'cLINK', 'cUSDP', 'cUNI', 'cCOMP', 'cMKR', 'cSUSHI', 'cAAVE', 'cYFI',
6
6
  ].map((symbol) => getAssetInfo(symbol));
7
+ export const v3USDCCollAssetsEth = ['ETH', 'COMP', 'WBTC', 'UNI', 'LINK'];
8
+ export const v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC'];
9
+ // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
7
10
  export const v3USDCCollAssets = {
8
- [NetworkNumber.Eth]: [
9
- 'ETH', 'COMP', 'WBTC', 'UNI', 'LINK',
10
- ],
11
+ [NetworkNumber.Eth]: v3USDCCollAssetsEth,
11
12
  [NetworkNumber.Opt]: [],
12
- [NetworkNumber.Arb]: [
13
- 'ARB', 'ETH', 'GMX', 'WBTC',
14
- ],
13
+ [NetworkNumber.Arb]: v3USDCCollAssetsArb,
15
14
  [NetworkNumber.Base]: [],
16
15
  };
16
+ export const v3USDCeCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC'];
17
+ // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
17
18
  export const v3USDCeCollAssets = {
18
19
  [NetworkNumber.Eth]: [],
19
20
  [NetworkNumber.Opt]: [],
20
- [NetworkNumber.Arb]: [
21
- 'ARB', 'ETH', 'GMX', 'WBTC',
22
- ],
21
+ [NetworkNumber.Arb]: v3USDCeCollAssetsArb,
23
22
  [NetworkNumber.Base]: [],
24
23
  };
24
+ export const v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH'];
25
+ export const v3ETHCollAssetsBase = ['cbETH'];
26
+ // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
25
27
  export const v3ETHCollAssets = {
26
- [NetworkNumber.Eth]: [
27
- 'cbETH', 'wstETH', 'rETH',
28
- ],
28
+ [NetworkNumber.Eth]: v3ETHCollAssetsEth,
29
29
  [NetworkNumber.Opt]: [],
30
30
  [NetworkNumber.Arb]: [],
31
- [NetworkNumber.Base]: [
32
- 'cbETH',
33
- ],
31
+ [NetworkNumber.Base]: v3ETHCollAssetsBase,
34
32
  };
33
+ export const v3USDbCCollAssetsBase = ['ETH', 'cbETH'];
34
+ // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
35
35
  export const v3USDbCCollAssets = {
36
36
  [NetworkNumber.Eth]: [],
37
37
  [NetworkNumber.Opt]: [],
38
38
  [NetworkNumber.Arb]: [],
39
- [NetworkNumber.Base]: [
40
- 'ETH', 'cbETH',
41
- ],
39
+ [NetworkNumber.Base]: v3USDbCCollAssetsBase,
42
40
  };
package/esm/markets/spark/marketAssets.d.ts CHANGED
@@ -1,6 +1,7 @@
1
+ export declare const sparkAssetsDefaultMarketEth: string[];
1
2
  export declare const sparkAssetsDefaultMarket: {
2
- readonly 1: readonly ["ETH", "USDC", "DAI", "GNO", "rETH", "sDAI", "wstETH", "WBTC"];
3
+ readonly 1: string[];
3
4
  readonly 10: readonly [];
4
- readonly 42161: readonly [];
5
5
  readonly 8453: readonly [];
6
+ readonly 42161: readonly [];
6
7
  };
package/esm/markets/spark/marketAssets.js CHANGED
@@ -1,9 +1,9 @@
1
1
  import { NetworkNumber } from '../../types/common';
2
+ export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT'];
3
+ // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
2
4
  export const sparkAssetsDefaultMarket = {
3
- [NetworkNumber.Eth]: [
4
- 'ETH', 'USDC', 'DAI', 'GNO', 'rETH', 'sDAI', 'wstETH', 'WBTC',
5
- ],
5
+ [NetworkNumber.Eth]: sparkAssetsDefaultMarketEth,
6
6
  [NetworkNumber.Opt]: [],
7
- [NetworkNumber.Arb]: [],
8
7
  [NetworkNumber.Base]: [],
8
+ [NetworkNumber.Arb]: [],
9
9
  };
package/esm/types/contracts/generated/MorphoAaveV3ProxyEthMarket.d.ts CHANGED
@@ -177,6 +177,7 @@ export interface MorphoAaveV3ProxyEthMarket extends BaseContract {
177
177
  constructor(jsonInterface: any[], address?: string, options?: ContractOptions): MorphoAaveV3ProxyEthMarket;
178
178
  clone(): MorphoAaveV3ProxyEthMarket;
179
179
  methods: {
180
+ marketsCreated(): NonPayableTransactionObject<string[]>;
180
181
  approveManager(manager: string, isAllowed: boolean): NonPayableTransactionObject<void>;
181
182
  approveManagerWithSig(delegator: string, manager: string, isAllowed: boolean, nonce: number | string | BN, deadline: number | string | BN, signature: Types.SignatureStruct): NonPayableTransactionObject<void>;
182
183
  borrow(underlying: string, amount: number | string | BN, onBehalf: string, receiver: string, maxIterations: number | string | BN): NonPayableTransactionObject<string>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "0.0.29",
3
+ "version": "0.0.30",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
package/src/compoundV3/index.ts CHANGED
@@ -214,7 +214,7 @@ export const getCompoundV3AccountData = async (
214
214
  if (loanData.depositAmount.toString() !== '0') {
215
215
  usedAssets[baseAssetSymbol].isSupplied = true;
216
216
  usedAssets[baseAssetSymbol].supplied = assetAmountInEth(loanData.depositAmount, baseAssetInfo.symbol);
217
- usedAssets[baseAssetSymbol].suppliedUsd = assetAmountInEth(loanData.depositValue, baseAssetInfo.symbol);
217
+ usedAssets[baseAssetSymbol].suppliedUsd = new Dec(assetAmountInEth(loanData.depositValue, baseAssetInfo.symbol)).mul(assetsData[baseAssetSymbol].price).toString();
218
218
  }
219
219
  if (loanData.borrowAmount.toString() !== '0') {
220
220
  usedAssets[baseAssetSymbol].isBorrowed = true;
package/src/config/contracts.js CHANGED
@@ -374,7 +374,7 @@ module.exports = {
374
374
  }
375
375
  },
376
376
  "MorphoAaveV3ProxyEthMarket": {
377
- "abi": [{"inputs":[{"internalType":"address","name":"manager","type":"address"},{"internalType":"bool","name":"isAllowed","type":"bool"}],"name":"approveManager","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"delegator","type":"address"},{"internalType":"address","name":"manager","type":"address"},{"internalType":"bool","name":"isAllowed","type":"bool"},{"internalType":"uint256","name":"nonce","type":"uint256"},{"internalType":"uint256","name":"deadline","type":"uint256"},{"components":[{"internalType":"uint8","name":"v","type":"uint8"},{"internalType":"bytes32","name":"r","type":"bytes32"},{"internalType":"bytes32","name":"s","type":"bytes32"}],"internalType":"struct Types.Signature","name":"signature","type":"tuple"}],"name":"approveManagerWithSig","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"onBehalf","type":"address"},{"internalType":"address","name":"receiver","type":"address"},{"internalType":"uint256","name":"maxIterations","type":"uint256"}],"name":"borrow","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"delegator","type":"address"},{"internalType":"address","name":"manager","type":"address"}],"name":"isManagedBy","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"}],"name":"market","outputs":[{"components":[{"components":[{"components":[{"internalType":"uint128","name":"poolIndex","type":"uint128"},{"internalType":"uint128","name":"p2pIndex","type":"uint128"}],"internalType":"struct Types.MarketSideIndexes","name":"supply","type":"tuple"},{"components":[{"internalType":"uint128","name":"poolIndex","type":"uint128"},{"internalType":"uint128","name":"p2pIndex","type":"uint128"}],"internalType":"struct Types.MarketSideIndexes","name":"borrow","type":"tuple"}],"internalType":"struct Types.Indexes","name":"indexes","type":"tuple"},{"components":[{"components":[{"internalType":"uint256","name":"scaledDelta","type":"uint256"},{"internalType":"uint256","name":"scaledP2PTotal","type":"uint256"}],"internalType":"struct Types.MarketSideDelta","name":"supply","type":"tuple"},{"components":[{"internalType":"uint256","name":"scaledDelta","type":"uint256"},{"internalType":"uint256","name":"scaledP2PTotal","type":"uint256"}],"internalType":"struct Types.MarketSideDelta","name":"borrow","type":"tuple"}],"internalType":"struct Types.Deltas","name":"deltas","type":"tuple"},{"internalType":"address","name":"underlying","type":"address"},{"components":[{"internalType":"bool","name":"isP2PDisabled","type":"bool"},{"internalType":"bool","name":"isSupplyPaused","type":"bool"},{"internalType":"bool","name":"isSupplyCollateralPaused","type":"bool"},{"internalType":"bool","name":"isBorrowPaused","type":"bool"},{"internalType":"bool","name":"isWithdrawPaused","type":"bool"},{"internalType":"bool","name":"isWithdrawCollateralPaused","type":"bool"},{"internalType":"bool","name":"isRepayPaused","type":"bool"},{"internalType":"bool","name":"isLiquidateCollateralPaused","type":"bool"},{"internalType":"bool","name":"isLiquidateBorrowPaused","type":"bool"},{"internalType":"bool","name":"isDeprecated","type":"bool"}],"internalType":"struct Types.PauseStatuses","name":"pauseStatuses","type":"tuple"},{"internalType":"bool","name":"isCollateral","type":"bool"},{"internalType":"address","name":"variableDebtToken","type":"address"},{"internalType":"uint32","name":"lastUpdateTimestamp","type":"uint32"},{"internalType":"uint16","name":"reserveFactor","type":"uint16"},{"internalType":"uint16","name":"p2pIndexCursor","type":"uint16"},{"internalType":"address","name":"aToken","type":"address"},{"internalType":"address","name":"stableDebtToken","type":"address"},{"internalType":"uint256","name":"idleSupply","type":"uint256"}],"internalType":"struct Types.Market","name":"","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"onBehalf","type":"address"}],"name":"repay","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"onBehalf","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"},{"components":[{"internalType":"uint8","name":"v","type":"uint8"},{"internalType":"bytes32","name":"r","type":"bytes32"},{"internalType":"bytes32","name":"s","type":"bytes32"}],"internalType":"struct Types.Signature","name":"signature","type":"tuple"}],"name":"repayWithPermit","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"address","name":"user","type":"address"}],"name":"scaledCollateralBalance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"address","name":"user","type":"address"}],"name":"scaledP2PBorrowBalance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"address","name":"user","type":"address"}],"name":"scaledP2PSupplyBalance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"address","name":"user","type":"address"}],"name":"scaledPoolBorrowBalance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"address","name":"user","type":"address"}],"name":"scaledPoolSupplyBalance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"onBehalf","type":"address"},{"internalType":"uint256","name":"maxIterations","type":"uint256"}],"name":"supply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"onBehalf","type":"address"}],"name":"supplyCollateral","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"onBehalf","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"},{"components":[{"internalType":"uint8","name":"v","type":"uint8"},{"internalType":"bytes32","name":"r","type":"bytes32"},{"internalType":"bytes32","name":"s","type":"bytes32"}],"internalType":"struct Types.Signature","name":"signature","type":"tuple"}],"name":"supplyCollateralWithPermit","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"onBehalf","type":"address"},{"internalType":"uint256","name":"maxIterations","type":"uint256"},{"internalType":"uint256","name":"deadline","type":"uint256"},{"components":[{"internalType":"uint8","name":"v","type":"uint8"},{"internalType":"bytes32","name":"r","type":"bytes32"},{"internalType":"bytes32","name":"s","type":"bytes32"}],"internalType":"struct Types.Signature","name":"signature","type":"tuple"}],"name":"supplyWithPermit","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"onBehalf","type":"address"},{"internalType":"address","name":"receiver","type":"address"},{"internalType":"uint256","name":"maxIterations","type":"uint256"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"onBehalf","type":"address"},{"internalType":"address","name":"receiver","type":"address"}],"name":"withdrawCollateral","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}],
377
+ "abi": [{"inputs":[],"name":"marketsCreated","outputs":[{"internalType":"address[]","name":"","type":"address[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"manager","type":"address"},{"internalType":"bool","name":"isAllowed","type":"bool"}],"name":"approveManager","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"delegator","type":"address"},{"internalType":"address","name":"manager","type":"address"},{"internalType":"bool","name":"isAllowed","type":"bool"},{"internalType":"uint256","name":"nonce","type":"uint256"},{"internalType":"uint256","name":"deadline","type":"uint256"},{"components":[{"internalType":"uint8","name":"v","type":"uint8"},{"internalType":"bytes32","name":"r","type":"bytes32"},{"internalType":"bytes32","name":"s","type":"bytes32"}],"internalType":"struct Types.Signature","name":"signature","type":"tuple"}],"name":"approveManagerWithSig","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"onBehalf","type":"address"},{"internalType":"address","name":"receiver","type":"address"},{"internalType":"uint256","name":"maxIterations","type":"uint256"}],"name":"borrow","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"delegator","type":"address"},{"internalType":"address","name":"manager","type":"address"}],"name":"isManagedBy","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"}],"name":"market","outputs":[{"components":[{"components":[{"components":[{"internalType":"uint128","name":"poolIndex","type":"uint128"},{"internalType":"uint128","name":"p2pIndex","type":"uint128"}],"internalType":"struct Types.MarketSideIndexes","name":"supply","type":"tuple"},{"components":[{"internalType":"uint128","name":"poolIndex","type":"uint128"},{"internalType":"uint128","name":"p2pIndex","type":"uint128"}],"internalType":"struct Types.MarketSideIndexes","name":"borrow","type":"tuple"}],"internalType":"struct Types.Indexes","name":"indexes","type":"tuple"},{"components":[{"components":[{"internalType":"uint256","name":"scaledDelta","type":"uint256"},{"internalType":"uint256","name":"scaledP2PTotal","type":"uint256"}],"internalType":"struct Types.MarketSideDelta","name":"supply","type":"tuple"},{"components":[{"internalType":"uint256","name":"scaledDelta","type":"uint256"},{"internalType":"uint256","name":"scaledP2PTotal","type":"uint256"}],"internalType":"struct Types.MarketSideDelta","name":"borrow","type":"tuple"}],"internalType":"struct Types.Deltas","name":"deltas","type":"tuple"},{"internalType":"address","name":"underlying","type":"address"},{"components":[{"internalType":"bool","name":"isP2PDisabled","type":"bool"},{"internalType":"bool","name":"isSupplyPaused","type":"bool"},{"internalType":"bool","name":"isSupplyCollateralPaused","type":"bool"},{"internalType":"bool","name":"isBorrowPaused","type":"bool"},{"internalType":"bool","name":"isWithdrawPaused","type":"bool"},{"internalType":"bool","name":"isWithdrawCollateralPaused","type":"bool"},{"internalType":"bool","name":"isRepayPaused","type":"bool"},{"internalType":"bool","name":"isLiquidateCollateralPaused","type":"bool"},{"internalType":"bool","name":"isLiquidateBorrowPaused","type":"bool"},{"internalType":"bool","name":"isDeprecated","type":"bool"}],"internalType":"struct Types.PauseStatuses","name":"pauseStatuses","type":"tuple"},{"internalType":"bool","name":"isCollateral","type":"bool"},{"internalType":"address","name":"variableDebtToken","type":"address"},{"internalType":"uint32","name":"lastUpdateTimestamp","type":"uint32"},{"internalType":"uint16","name":"reserveFactor","type":"uint16"},{"internalType":"uint16","name":"p2pIndexCursor","type":"uint16"},{"internalType":"address","name":"aToken","type":"address"},{"internalType":"address","name":"stableDebtToken","type":"address"},{"internalType":"uint256","name":"idleSupply","type":"uint256"}],"internalType":"struct Types.Market","name":"","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"onBehalf","type":"address"}],"name":"repay","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"onBehalf","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"},{"components":[{"internalType":"uint8","name":"v","type":"uint8"},{"internalType":"bytes32","name":"r","type":"bytes32"},{"internalType":"bytes32","name":"s","type":"bytes32"}],"internalType":"struct Types.Signature","name":"signature","type":"tuple"}],"name":"repayWithPermit","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"address","name":"user","type":"address"}],"name":"scaledCollateralBalance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"address","name":"user","type":"address"}],"name":"scaledP2PBorrowBalance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"address","name":"user","type":"address"}],"name":"scaledP2PSupplyBalance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"address","name":"user","type":"address"}],"name":"scaledPoolBorrowBalance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"address","name":"user","type":"address"}],"name":"scaledPoolSupplyBalance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"onBehalf","type":"address"},{"internalType":"uint256","name":"maxIterations","type":"uint256"}],"name":"supply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"onBehalf","type":"address"}],"name":"supplyCollateral","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"onBehalf","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"},{"components":[{"internalType":"uint8","name":"v","type":"uint8"},{"internalType":"bytes32","name":"r","type":"bytes32"},{"internalType":"bytes32","name":"s","type":"bytes32"}],"internalType":"struct Types.Signature","name":"signature","type":"tuple"}],"name":"supplyCollateralWithPermit","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"onBehalf","type":"address"},{"internalType":"uint256","name":"maxIterations","type":"uint256"},{"internalType":"uint256","name":"deadline","type":"uint256"},{"components":[{"internalType":"uint8","name":"v","type":"uint8"},{"internalType":"bytes32","name":"r","type":"bytes32"},{"internalType":"bytes32","name":"s","type":"bytes32"}],"internalType":"struct Types.Signature","name":"signature","type":"tuple"}],"name":"supplyWithPermit","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"onBehalf","type":"address"},{"internalType":"address","name":"receiver","type":"address"},{"internalType":"uint256","name":"maxIterations","type":"uint256"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"underlying","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"onBehalf","type":"address"},{"internalType":"address","name":"receiver","type":"address"}],"name":"withdrawCollateral","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}],
378
378
  "networks": {
379
379
  "1": {
380
380
  "address": "0x33333aea097c193e66081E930c33020272b33333"
package/src/markets/aave/marketAssets.ts CHANGED
@@ -1,33 +1,25 @@
1
- // TODO generate this file automatically
2
-
3
1
  import { NetworkNumber } from '../../types/common';
4
2
 
5
- export const aaveV2AssetsDefaultMarket = [
6
- 'AAVE', 'BAL', 'BAT', 'BUSD', 'CRV', 'DAI', 'ENJ', 'ETH', 'GUSD', 'LINK', 'MANA', 'MKR',
7
- 'REN', 'SNX', 'SUSD', 'TUSD', 'UNI', 'USDC', 'USDT', 'WBTC', 'YFI', 'xSUSHI', 'ZRX', 'RAI',
8
- 'AMPL', 'DPI', 'USDP', 'RENFIL', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD',
9
- ] as const;
3
+ export const aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
4
+ export const morphoAaveV2AssetDefaultMarket = ['DAI', 'ETH', 'USDC', 'USDT', 'WBTC', 'stETH', 'CRV'];
10
5
 
11
- export const morphoAaveV2AssetDefaultMarket = [
12
- 'ETH', 'stETH', 'USDC', 'WBTC', 'USDT', 'DAI', 'CRV',
6
+ export const morphoAaveV3AssetEthMarket = [
7
+ 'ETH', 'wstETH', 'DAI', 'USDC', 'WBTC', 'rETH', 'cbETH', 'sDAI', 'USDT',
13
8
  ];
14
9
 
15
- export const morphoAaveV3AssetEthMarket = [
16
- 'ETH', 'wstETH', 'DAI', 'USDC', 'WBTC', 'rETH', 'cbETH',
10
+ export const aaveV3AssetsDefaultMarketEth = ['ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD'];
11
+ export const aaveV3AssetsDefaultMarketOpt = [
12
+ 'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',
13
+ ];
14
+ export const aaveV3AssetsDefaultMarketArb = [
15
+ 'ETH', 'DAI', 'EURS', 'USDC', 'USDT', 'AAVE', 'LINK', 'WBTC', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC.e', 'FRAX', 'ARB',
17
16
  ];
17
+ export const aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC'];
18
18
 
19
+ // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
19
20
  export const aaveV3AssetsDefaultMarket = {
20
- [NetworkNumber.Eth]: [
21
- 'WBTC', 'ETH', 'wstETH', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'UNI', 'MKR', 'SNX', 'BAL',
22
- 'LDO', 'CRV', 'ENS', '1INCH', 'GHO', 'FRAX', 'RPL', 'sDAI',
23
- ],
24
- [NetworkNumber.Opt]: [
25
- 'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH',
26
- ],
27
- [NetworkNumber.Arb]: [
28
- 'ETH', 'DAI', 'EURS', 'USDC', 'USDT', 'AAVE', 'LINK', 'WBTC', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC.e', 'FRAX', 'ARB',
29
- ],
30
- [NetworkNumber.Base]: [
31
- 'ETH', 'USDbC', 'cbETH', 'wstETH',
32
- ],
21
+ [NetworkNumber.Eth]: aaveV3AssetsDefaultMarketEth,
22
+ [NetworkNumber.Opt]: aaveV3AssetsDefaultMarketOpt,
23
+ [NetworkNumber.Arb]: aaveV3AssetsDefaultMarketArb,
24
+ [NetworkNumber.Base]: aaveV3AssetsDefaultMarketBase,
33
25
  } as const;
package/src/markets/compound/marketsAssets.ts CHANGED
@@ -6,42 +6,44 @@ export const compoundV2CollateralAssets = [
6
6
  'cTUSD', 'cLINK', 'cUSDP', 'cUNI', 'cCOMP', 'cMKR', 'cSUSHI', 'cAAVE', 'cYFI',
7
7
  ].map((symbol) => getAssetInfo(symbol));
8
8
 
9
+ export const v3USDCCollAssetsEth = ['ETH', 'COMP', 'WBTC', 'UNI', 'LINK'];
10
+ export const v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC'];
11
+
12
+ // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
9
13
  export const v3USDCCollAssets = {
10
- [NetworkNumber.Eth]: [
11
- 'ETH', 'COMP', 'WBTC', 'UNI', 'LINK',
12
- ],
14
+ [NetworkNumber.Eth]: v3USDCCollAssetsEth,
13
15
  [NetworkNumber.Opt]: [],
14
- [NetworkNumber.Arb]: [
15
- 'ARB', 'ETH', 'GMX', 'WBTC',
16
- ],
16
+ [NetworkNumber.Arb]: v3USDCCollAssetsArb,
17
17
  [NetworkNumber.Base]: [],
18
18
  } as const;
19
19
 
20
+ export const v3USDCeCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC'];
21
+
22
+ // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
20
23
  export const v3USDCeCollAssets = {
21
24
  [NetworkNumber.Eth]: [],
22
25
  [NetworkNumber.Opt]: [],
23
- [NetworkNumber.Arb]: [
24
- 'ARB', 'ETH', 'GMX', 'WBTC',
25
- ],
26
+ [NetworkNumber.Arb]: v3USDCeCollAssetsArb,
26
27
  [NetworkNumber.Base]: [],
27
28
  } as const;
28
29
 
30
+ export const v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH'];
31
+ export const v3ETHCollAssetsBase = ['cbETH'];
32
+
33
+ // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
29
34
  export const v3ETHCollAssets = {
30
- [NetworkNumber.Eth]: [
31
- 'cbETH', 'wstETH', 'rETH',
32
- ],
35
+ [NetworkNumber.Eth]: v3ETHCollAssetsEth,
33
36
  [NetworkNumber.Opt]: [],
34
37
  [NetworkNumber.Arb]: [],
35
- [NetworkNumber.Base]: [
36
- 'cbETH',
37
- ],
38
+ [NetworkNumber.Base]: v3ETHCollAssetsBase,
38
39
  } as const;
39
40
 
41
+ export const v3USDbCCollAssetsBase = ['ETH', 'cbETH'];
42
+
43
+ // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
40
44
  export const v3USDbCCollAssets = {
41
45
  [NetworkNumber.Eth]: [],
42
46
  [NetworkNumber.Opt]: [],
43
47
  [NetworkNumber.Arb]: [],
44
- [NetworkNumber.Base]: [
45
- 'ETH', 'cbETH',
46
- ],
48
+ [NetworkNumber.Base]: v3USDbCCollAssetsBase,
47
49
  };
package/src/markets/spark/marketAssets.ts CHANGED
@@ -1,10 +1,11 @@
1
1
  import { NetworkNumber } from '../../types/common';
2
2
 
3
+ export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT'];
4
+
5
+ // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
3
6
  export const sparkAssetsDefaultMarket = {
4
- [NetworkNumber.Eth]: [
5
- 'ETH', 'USDC', 'DAI', 'GNO', 'rETH', 'sDAI', 'wstETH', 'WBTC',
6
- ],
7
+ [NetworkNumber.Eth]: sparkAssetsDefaultMarketEth,
7
8
  [NetworkNumber.Opt]: [],
8
- [NetworkNumber.Arb]: [],
9
9
  [NetworkNumber.Base]: [],
10
+ [NetworkNumber.Arb]: [],
10
11
  } as const;
package/src/types/contracts/generated/MorphoAaveV3ProxyEthMarket.ts CHANGED
@@ -217,6 +217,8 @@ export interface MorphoAaveV3ProxyEthMarket extends BaseContract {
217
217
  ): MorphoAaveV3ProxyEthMarket;
218
218
  clone(): MorphoAaveV3ProxyEthMarket;
219
219
  methods: {
220
+ marketsCreated(): NonPayableTransactionObject<string[]>;
221
+
220
222
  approveManager(
221
223
  manager: string,
222
224
  isAllowed: boolean