@defisaver/positions-sdk 2.1.158 → 2.1.159-shifter-v2-dev

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 (118) hide show
  1. package/cjs/aaveV2/index.js +2 -0
  2. package/cjs/config/contracts.d.ts +516 -4
  3. package/cjs/config/contracts.js +17 -5
  4. package/cjs/contracts.d.ts +120 -0
  5. package/cjs/fluid/index.d.ts +5 -0
  6. package/cjs/fluid/index.js +36 -1
  7. package/cjs/helpers/aaveHelpers/index.js +3 -0
  8. package/cjs/helpers/aaveV4Helpers/index.js +1 -0
  9. package/cjs/helpers/compoundHelpers/index.js +2 -0
  10. package/cjs/helpers/curveUsdHelpers/index.js +2 -0
  11. package/cjs/helpers/fluidHelpers/index.js +1 -0
  12. package/cjs/helpers/liquityV2Helpers/index.js +1 -0
  13. package/cjs/helpers/llamaLendHelpers/index.js +2 -0
  14. package/cjs/helpers/makerHelpers/index.d.ts +1 -1
  15. package/cjs/helpers/makerHelpers/index.js +2 -2
  16. package/cjs/helpers/morphoBlueHelpers/index.js +2 -0
  17. package/cjs/helpers/morphoMidnightHelpers/index.js +2 -0
  18. package/cjs/helpers/sparkHelpers/index.js +1 -0
  19. package/cjs/liquity/index.js +8 -1
  20. package/cjs/maker/index.d.ts +7 -2
  21. package/cjs/maker/index.js +32 -12
  22. package/cjs/markets/index.d.ts +1 -0
  23. package/cjs/markets/index.js +3 -1
  24. package/cjs/markets/maker/index.d.ts +1 -0
  25. package/cjs/markets/maker/index.js +13 -0
  26. package/cjs/morphoMidnight/index.js +3 -0
  27. package/cjs/portfolio/index.d.ts +5 -1
  28. package/cjs/portfolio/index.js +276 -0
  29. package/cjs/savings/index.js +6 -6
  30. package/cjs/savings/morphoVaults/index.d.ts +15 -3
  31. package/cjs/savings/morphoVaults/index.js +97 -26
  32. package/cjs/types/aave.d.ts +2 -0
  33. package/cjs/types/aaveV4.d.ts +1 -0
  34. package/cjs/types/compound.d.ts +2 -0
  35. package/cjs/types/fluid.d.ts +1 -0
  36. package/cjs/types/liquity.d.ts +1 -0
  37. package/cjs/types/liquityV2.d.ts +2 -0
  38. package/cjs/types/maker.d.ts +1 -0
  39. package/cjs/types/morphoBlue.d.ts +2 -0
  40. package/cjs/types/morphoMidnight.d.ts +2 -0
  41. package/cjs/types/portfolio.d.ts +26 -10
  42. package/cjs/types/spark.d.ts +2 -0
  43. package/esm/aaveV2/index.js +2 -0
  44. package/esm/config/contracts.d.ts +516 -4
  45. package/esm/config/contracts.js +17 -5
  46. package/esm/contracts.d.ts +120 -0
  47. package/esm/fluid/index.d.ts +5 -0
  48. package/esm/fluid/index.js +33 -0
  49. package/esm/helpers/aaveHelpers/index.js +3 -0
  50. package/esm/helpers/aaveV4Helpers/index.js +1 -0
  51. package/esm/helpers/compoundHelpers/index.js +2 -0
  52. package/esm/helpers/curveUsdHelpers/index.js +2 -0
  53. package/esm/helpers/fluidHelpers/index.js +1 -0
  54. package/esm/helpers/liquityV2Helpers/index.js +1 -0
  55. package/esm/helpers/llamaLendHelpers/index.js +2 -0
  56. package/esm/helpers/makerHelpers/index.d.ts +1 -1
  57. package/esm/helpers/makerHelpers/index.js +2 -2
  58. package/esm/helpers/morphoBlueHelpers/index.js +2 -0
  59. package/esm/helpers/morphoMidnightHelpers/index.js +2 -0
  60. package/esm/helpers/sparkHelpers/index.js +1 -0
  61. package/esm/liquity/index.js +8 -1
  62. package/esm/maker/index.d.ts +7 -2
  63. package/esm/maker/index.js +31 -13
  64. package/esm/markets/index.d.ts +1 -0
  65. package/esm/markets/index.js +1 -0
  66. package/esm/markets/maker/index.d.ts +1 -0
  67. package/esm/markets/maker/index.js +10 -0
  68. package/esm/morphoMidnight/index.js +4 -1
  69. package/esm/portfolio/index.d.ts +5 -1
  70. package/esm/portfolio/index.js +278 -3
  71. package/esm/savings/index.js +6 -6
  72. package/esm/savings/morphoVaults/index.d.ts +15 -3
  73. package/esm/savings/morphoVaults/index.js +93 -24
  74. package/esm/types/aave.d.ts +2 -0
  75. package/esm/types/aaveV4.d.ts +1 -0
  76. package/esm/types/compound.d.ts +2 -0
  77. package/esm/types/fluid.d.ts +1 -0
  78. package/esm/types/liquity.d.ts +1 -0
  79. package/esm/types/liquityV2.d.ts +2 -0
  80. package/esm/types/maker.d.ts +1 -0
  81. package/esm/types/morphoBlue.d.ts +2 -0
  82. package/esm/types/morphoMidnight.d.ts +2 -0
  83. package/esm/types/portfolio.d.ts +26 -10
  84. package/esm/types/spark.d.ts +2 -0
  85. package/package.json +1 -1
  86. package/src/aaveV2/index.ts +2 -0
  87. package/src/config/contracts.ts +17 -5
  88. package/src/fluid/index.ts +40 -0
  89. package/src/helpers/aaveHelpers/index.ts +3 -0
  90. package/src/helpers/aaveV4Helpers/index.ts +1 -0
  91. package/src/helpers/compoundHelpers/index.ts +2 -0
  92. package/src/helpers/curveUsdHelpers/index.ts +2 -0
  93. package/src/helpers/fluidHelpers/index.ts +1 -0
  94. package/src/helpers/liquityV2Helpers/index.ts +1 -0
  95. package/src/helpers/llamaLendHelpers/index.ts +2 -0
  96. package/src/helpers/makerHelpers/index.ts +2 -1
  97. package/src/helpers/morphoBlueHelpers/index.ts +2 -0
  98. package/src/helpers/morphoMidnightHelpers/index.ts +2 -0
  99. package/src/helpers/sparkHelpers/index.ts +1 -0
  100. package/src/liquity/index.ts +8 -1
  101. package/src/maker/index.ts +62 -29
  102. package/src/markets/index.ts +2 -1
  103. package/src/markets/maker/index.ts +10 -0
  104. package/src/morphoMidnight/index.ts +4 -1
  105. package/src/portfolio/index.ts +259 -2
  106. package/src/savings/index.ts +6 -6
  107. package/src/savings/morphoVaults/index.ts +108 -27
  108. package/src/types/aave.ts +3 -0
  109. package/src/types/aaveV4.ts +1 -0
  110. package/src/types/compound.ts +2 -0
  111. package/src/types/fluid.ts +1 -0
  112. package/src/types/liquity.ts +2 -0
  113. package/src/types/liquityV2.ts +2 -0
  114. package/src/types/maker.ts +2 -0
  115. package/src/types/morphoBlue.ts +2 -0
  116. package/src/types/morphoMidnight.ts +2 -0
  117. package/src/types/portfolio.ts +31 -12
  118. package/src/types/spark.ts +2 -0
@@ -27,6 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
29
  exports.getPortfolioData = getPortfolioData;
30
+ exports.getShifterPortfolioData = getShifterPortfolioData;
30
31
  const decimal_js_1 = __importDefault(require("decimal.js"));
31
32
  const common_1 = require("../types/common");
32
33
  const markets_1 = require("../markets");
@@ -485,7 +486,11 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
485
486
  }
486
487
  }))).flat(),
487
488
  ...morphoMidnightMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
489
+ var _a;
488
490
  try {
491
+ // Markets are created lazily on the first position, so an uncreated one can hold no position.
492
+ if (!((_a = morphoMidnightMarketsData[market.value]) === null || _a === void 0 ? void 0 : _a.isCreated))
493
+ return;
489
494
  const accData = yield (0, morphoMidnight_1._getMorphoMidnightAccountData)(client, network, address, market, morphoMidnightMarketsData[market.value]);
490
495
  if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
491
496
  positions[address.toLowerCase()].morphoMidnight[market.value] = { error: '', data: accData };
@@ -615,4 +620,275 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
615
620
  };
616
621
  });
617
622
  }
623
+ function getShifterPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1) {
624
+ return __awaiter(this, arguments, void 0, function* (provider, network, defaultProvider, addresses, isSim = false) {
625
+ const isMainnet = network === common_1.NetworkNumber.Eth;
626
+ const isFluidSupported = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Base, common_1.NetworkNumber.Plasma].includes(network);
627
+ const morphoMarkets = Object.values((0, markets_1.MorphoBlueMarkets)(network)).filter((market) => market.chainIds.includes(network));
628
+ const compoundV3Markets = Object.values((0, markets_1.CompoundMarkets)(network)).filter((market) => market.chainIds.includes(network) && market.value !== types_1.CompoundVersions.CompoundV2);
629
+ const sparkMarkets = Object.values((0, markets_1.SparkMarkets)(network)).filter((market) => market.chainIds.includes(network));
630
+ const aaveV3Markets = [types_1.AaveVersions.AaveV3, types_1.AaveVersions.AaveV3Lido, types_1.AaveVersions.AaveV3Etherfi].map((version) => (0, markets_1.AaveMarkets)(network)[version]).filter((market) => market.chainIds.includes(network));
631
+ const aaveV2Markets = [types_1.AaveVersions.AaveV2].map((version) => (0, markets_1.AaveMarkets)(network)[version]).filter((market) => market.chainIds.includes(network));
632
+ const compoundV2Markets = [types_1.CompoundVersions.CompoundV2].map((version) => (0, markets_1.CompoundMarkets)(network)[version]).filter((market) => market.chainIds.includes(network));
633
+ const crvUsdMarkets = Object.values((0, markets_1.CrvUsdMarkets)(network)).filter((market) => market.chainIds.includes(network));
634
+ const llamaLendMarkets = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb].includes(network) ? Object.values((0, markets_1.LlamaLendMarkets)(network)).filter((market) => market.chainIds.includes(network)) : [];
635
+ const liquityV2Markets = [common_1.NetworkNumber.Eth].includes(network) ? Object.values((0, markets_1.LiquityV2Markets)(network)) : [];
636
+ const aaveV4Spokes = Object.values((0, markets_1.AaveV4Spokes)(network)).filter((market) => market.chainIds.includes(network));
637
+ const args = [network, { batch: { multicall: { batchSize: isSim ? 2000 : 2500000 } } }];
638
+ const client = (0, viem_1.getViemProvider)(provider, ...args);
639
+ const defaultClient = (0, viem_1.getViemProvider)(defaultProvider, ...args);
640
+ const markets = {
641
+ morphoMarketsData: {},
642
+ morphoMidnightMarketsData: {}, // Morpho Midnight is not fetched for the shifter; key kept so the payload shape is stable
643
+ compoundV3MarketsData: {},
644
+ sparkMarketsData: {},
645
+ aaveV3MarketsData: {},
646
+ aaveV2MarketsData: {},
647
+ compoundV2MarketsData: {},
648
+ crvUsdMarketsData: {},
649
+ llamaLendMarketsData: {},
650
+ liquityV2MarketsData: {},
651
+ aaveV4SpokesData: {},
652
+ fluidMarketsData: {},
653
+ makerMarketsData: {},
654
+ };
655
+ const makerCdps = {};
656
+ const positions = {};
657
+ for (const address of addresses) {
658
+ positions[address.toLowerCase()] = {
659
+ aaveV3: {},
660
+ aaveV4: {},
661
+ morphoBlue: {},
662
+ morphoMidnight: {}, // not fetched for the shifter (see markets above)
663
+ compoundV3: {},
664
+ spark: {},
665
+ maker: {},
666
+ aaveV2: {},
667
+ compoundV2: {},
668
+ liquity: {},
669
+ crvUsd: {},
670
+ llamaLend: {},
671
+ fluid: {
672
+ error: '',
673
+ data: {},
674
+ },
675
+ };
676
+ }
677
+ yield Promise.allSettled([
678
+ // === MARKET DATA (needs to be fetched first) ===
679
+ ...morphoMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
680
+ markets.morphoMarketsData[market.value] = yield (0, morphoBlue_1._getMorphoBluePortfolioMarketData)(client, network, market);
681
+ })),
682
+ ...compoundV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
683
+ markets.compoundV3MarketsData[market.value] = yield (0, compoundV3_1._getCompoundV3MarketsData)(client, network, market, defaultClient);
684
+ })),
685
+ ...sparkMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
686
+ markets.sparkMarketsData[market.value] = yield (0, spark_1._getSparkMarketsData)(client, network, market);
687
+ })),
688
+ ...aaveV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
689
+ markets.aaveV3MarketsData[market.value] = yield (0, aaveV3_1._getAaveV3MarketData)(client, network, market);
690
+ })),
691
+ ...aaveV4Spokes.map((spoke) => __awaiter(this, void 0, void 0, function* () {
692
+ markets.aaveV4SpokesData[spoke.value] = yield (0, aaveV4_1._getAaveV4SpokeData)(client, network, spoke);
693
+ })),
694
+ ...aaveV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
695
+ markets.aaveV2MarketsData[market.value] = yield (0, aaveV2_1._getAaveV2MarketsData)(client, network, market);
696
+ })),
697
+ ...compoundV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
698
+ markets.compoundV2MarketsData[market.value] = yield (0, compoundV2_1._getCompoundV2MarketsData)(client, network);
699
+ })),
700
+ ...crvUsdMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
701
+ markets.crvUsdMarketsData[market.value] = yield (0, curveUsd_1._getCurveUsdGlobalData)(client, network, market);
702
+ })),
703
+ ...llamaLendMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
704
+ markets.llamaLendMarketsData[market.value] = yield (0, llamaLend_1._getLlamaLendGlobalData)(client, network, market);
705
+ })),
706
+ ...liquityV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
707
+ markets.liquityV2MarketsData[market.value] = yield (0, liquityV2_1._getLiquityV2MarketData)(client, network, market);
708
+ })),
709
+ (() => __awaiter(this, void 0, void 0, function* () {
710
+ if (!isFluidSupported)
711
+ return;
712
+ try {
713
+ markets.fluidMarketsData = yield (0, fluid_1._getAllFluidMarketDataPortfolio)(client, network);
714
+ }
715
+ catch (error) {
716
+ console.error('Error fetching Fluid markets data:', error);
717
+ }
718
+ }))(),
719
+ (() => __awaiter(this, void 0, void 0, function* () {
720
+ if (!isMainnet)
721
+ return; // Maker CDPs are only available on mainnet
722
+ try {
723
+ markets.makerMarketsData = yield (0, maker_1._getMakerIlksData)(client, network, markets_1.MakerActiveIlks);
724
+ }
725
+ catch (error) {
726
+ console.error('Error fetching Maker ilks data:', error);
727
+ }
728
+ }))(),
729
+ // === INDEPENDENT USER DATA (doesn't depend on market data) ===
730
+ ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
731
+ if (!isMainnet)
732
+ return; // Maker CDPs are only available on mainnet
733
+ const makerCdp = yield (0, maker_1._getUserCdps)(client, network, address);
734
+ makerCdps[address.toLowerCase()] = makerCdp;
735
+ })),
736
+ ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
737
+ try {
738
+ if (!isFluidSupported)
739
+ return; // Fluid is not available on Optimism
740
+ const userPositions = (yield (0, fluid_1._getUserPositionsPortfolio)(client, network, address));
741
+ for (const position of userPositions) {
742
+ if (position.userData && new decimal_js_1.default(position.userData.suppliedUsd).gt(0)) {
743
+ positions[address.toLowerCase()].fluid.data[position.userData.nftId] = position.userData;
744
+ }
745
+ }
746
+ }
747
+ catch (error) {
748
+ console.error(`Error fetching Fluid positions for address ${address}:`, error);
749
+ positions[address.toLowerCase()].fluid = {
750
+ error: `Error fetching Fluid positions for address ${address}`,
751
+ data: {},
752
+ };
753
+ }
754
+ })),
755
+ ]);
756
+ yield Promise.all([
757
+ ...aaveV3Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
758
+ try {
759
+ const accData = yield (0, aaveV3_1._getAaveV3AccountData)(client, network, address, Object.assign({ selectedMarket: market }, markets.aaveV3MarketsData[market.value]));
760
+ if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
761
+ positions[address.toLowerCase()].aaveV3[market.value] = { error: '', data: accData };
762
+ }
763
+ catch (error) {
764
+ console.error(`Error fetching AaveV3 account data for address ${address} on market ${market.value}:`, error);
765
+ positions[address.toLowerCase()].aaveV3[market.value] = { error: `Error fetching AaveV3 account data for address ${address} on market ${market.value}`, data: null };
766
+ }
767
+ }))).flat(),
768
+ ...aaveV4Spokes.map((spoke) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
769
+ try {
770
+ const accData = yield (0, aaveV4_1._getAaveV4AccountData)(client, network, markets.aaveV4SpokesData[spoke.value], address);
771
+ if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
772
+ positions[address.toLowerCase()].aaveV4[spoke.value] = { error: '', data: accData };
773
+ }
774
+ catch (error) {
775
+ console.error(`Error fetching AaveV4 account data for address ${address} on spoke ${spoke.value}:`, error);
776
+ positions[address.toLowerCase()].aaveV4[spoke.value] = { error: `Error fetching AaveV4 account data for address ${address} on spoke ${spoke.value}`, data: null };
777
+ }
778
+ }))).flat(),
779
+ ...morphoMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
780
+ try {
781
+ const accData = yield (0, morphoBlue_1._getMorphoBlueAccountData)(client, network, address, market, markets.morphoMarketsData[market.value]);
782
+ if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
783
+ positions[address.toLowerCase()].morphoBlue[market.value] = { error: '', data: accData };
784
+ }
785
+ catch (error) {
786
+ console.error(`Error fetching MorphoBlue account data for address ${address} on market ${market.value}:`, error);
787
+ positions[address.toLowerCase()].morphoBlue[market.value] = { error: `Error fetching MorphoBlue account data for address ${address} on market ${market.value}`, data: null };
788
+ }
789
+ }))).flat(),
790
+ ...compoundV3Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
791
+ try {
792
+ const accData = yield (0, compoundV3_1._getCompoundV3AccountData)(client, network, address, constants_1.ZERO_ADDRESS, { selectedMarket: market, assetsData: markets.compoundV3MarketsData[market.value].assetsData });
793
+ if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
794
+ positions[address.toLowerCase()].compoundV3[market.value] = { error: '', data: accData };
795
+ }
796
+ catch (error) {
797
+ console.error(`Error fetching CompoundV3 account data for address ${address} on market ${market.value}:`, error);
798
+ positions[address.toLowerCase()].compoundV3[market.value] = { error: `Error fetching CompoundV3 account data for address ${address} on market ${market.value}`, data: null };
799
+ }
800
+ }))).flat(),
801
+ ...sparkMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
802
+ try {
803
+ const accData = yield (0, spark_1._getSparkAccountData)(client, network, address, { selectedMarket: market, assetsData: markets.sparkMarketsData[market.value].assetsData, eModeCategoriesData: markets.sparkMarketsData[market.value].eModeCategoriesData });
804
+ if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
805
+ positions[address.toLowerCase()].spark[market.value] = { error: '', data: accData };
806
+ }
807
+ catch (error) {
808
+ console.error(`Error fetching Spark account data for address ${address} on market ${market.value}:`, error);
809
+ positions[address.toLowerCase()].spark[market.value] = { error: `Error fetching Spark account data for address ${address} on market ${market.value}`, data: null };
810
+ }
811
+ }))).flat(),
812
+ ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
813
+ var _a;
814
+ return (_a = makerCdps[address.toLowerCase()]) === null || _a === void 0 ? void 0 : _a.map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {
815
+ try {
816
+ // reuse ilk data fetched for the markets payload; ilks outside the active set are fetched on demand
817
+ const cdpData = yield (0, maker_1._getMakerCdpData)(client, network, cdpInfo, markets.makerMarketsData[cdpInfo.ilkLabel]);
818
+ if (cdpData) {
819
+ positions[address.toLowerCase()].maker[cdpInfo.id] = { error: '', data: cdpData };
820
+ }
821
+ }
822
+ catch (error) {
823
+ console.error(`Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}:`, error);
824
+ positions[address.toLowerCase()].maker[cdpInfo.id] = { error: `Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}`, data: null };
825
+ }
826
+ }));
827
+ })).flat(),
828
+ ...aaveV2Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
829
+ try {
830
+ const accData = yield (0, aaveV2_1._getAaveV2AccountData)(client, network, address, markets.aaveV2MarketsData[market.value].assetsData, market);
831
+ if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
832
+ positions[address.toLowerCase()].aaveV2[market.value] = { error: '', data: accData };
833
+ }
834
+ catch (error) {
835
+ console.error(`Error fetching AaveV2 account data for address ${address}:`, error);
836
+ positions[address.toLowerCase()].aaveV2[market.value] = { error: `Error fetching AaveV2 account data for address ${address}`, data: null };
837
+ }
838
+ }))).flat(),
839
+ ...compoundV2Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
840
+ try {
841
+ const accData = yield (0, compoundV2_1._getCompoundV2AccountData)(client, network, address, markets.compoundV2MarketsData[market.value].assetsData);
842
+ if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
843
+ positions[address.toLowerCase()].compoundV2[market.value] = { error: '', data: accData };
844
+ }
845
+ catch (error) {
846
+ console.error(`Error fetching CompoundV2 account data for address ${address}:`, error);
847
+ positions[address.toLowerCase()].compoundV2[market.value] = { error: `Error fetching CompoundV2 account data for address ${address}`, data: null };
848
+ }
849
+ }))).flat(),
850
+ ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
851
+ try {
852
+ if (!isMainnet)
853
+ return; // Liquity trove info is only available on mainnet
854
+ const troveInfo = yield (0, liquity_1._getLiquityTroveInfo)(client, network, address);
855
+ if (new decimal_js_1.default(troveInfo.collateral).gt(0))
856
+ positions[address.toLowerCase()].liquity = { error: '', data: troveInfo };
857
+ }
858
+ catch (error) {
859
+ console.error(`Error fetching Liquity trove info for address ${address}:`, error);
860
+ positions[address.toLowerCase()].liquity = { error: `Error fetching Liquity trove info for address ${address}`, data: null };
861
+ }
862
+ })),
863
+ ...crvUsdMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
864
+ try {
865
+ const accData = yield (0, curveUsd_1._getCurveUsdUserData)(client, network, address, market, markets.crvUsdMarketsData[market.value].activeBand);
866
+ if (new decimal_js_1.default(accData.suppliedUsd).gt(0) || new decimal_js_1.default(accData.borrowedUsd).gt(0)) {
867
+ positions[address.toLowerCase()].crvUsd[market.value] = { error: '', data: Object.assign(Object.assign({}, accData), { borrowRate: markets.crvUsdMarketsData[market.value].borrowRate }) };
868
+ }
869
+ }
870
+ catch (error) {
871
+ console.error(`Error fetching Curve USD account data for address ${address} on market ${market.value}:`, error);
872
+ positions[address.toLowerCase()].crvUsd[market.value] = { error: `Error fetching Curve USD account data for address ${address} on market ${market.value}`, data: null };
873
+ }
874
+ }))).flat(),
875
+ ...llamaLendMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
876
+ try {
877
+ const accData = yield (0, llamaLend_1._getLlamaLendUserData)(client, network, address, market, markets.llamaLendMarketsData[market.value]);
878
+ if (new decimal_js_1.default(accData.suppliedUsd).gt(0) || new decimal_js_1.default(accData.borrowedUsd).gt(0)) {
879
+ positions[address.toLowerCase()].llamaLend[market.value] = { error: '', data: Object.assign(Object.assign({}, accData), { borrowRate: markets.llamaLendMarketsData[market.value].borrowRate }) };
880
+ }
881
+ }
882
+ catch (error) {
883
+ console.error(`Error fetching LlamaLend account data for address ${address} on market ${market.value}:`, error);
884
+ positions[address.toLowerCase()].llamaLend[market.value] = { error: `Error fetching LlamaLend account data for address ${address} on market ${market.value}`, data: null };
885
+ }
886
+ }))).flat(),
887
+ ]);
888
+ return {
889
+ positions,
890
+ markets,
891
+ };
892
+ });
893
+ }
618
894
  __exportStar(require("./discovery"), exports);
@@ -69,16 +69,16 @@ const getSavingsData = (provider, network, accounts) => __awaiter(void 0, void 0
69
69
  const savingsData = {};
70
70
  yield Promise.all([
71
71
  ...(network === common_1.NetworkNumber.Eth ? [
72
- ...morphoVaultsList.map((vaultKey) => __awaiter(void 0, void 0, void 0, function* () {
72
+ (() => __awaiter(void 0, void 0, void 0, function* () {
73
73
  try {
74
- const vault = morphoVaults.morphoVaultsOptions.getMorphoVault(vaultKey);
75
- const data = yield morphoVaults.getMorphoVaultData(provider, network, vault, accounts);
76
- savingsData[vaultKey] = data;
74
+ const vaults = morphoVaultsList.map((vaultKey) => morphoVaults.morphoVaultsOptions.getMorphoVault(vaultKey));
75
+ const data = yield morphoVaults.getMorphoVaultsData(provider, network, vaults, accounts);
76
+ Object.assign(savingsData, data);
77
77
  }
78
78
  catch (err) {
79
- console.error(`[getSavingsData] Error fetching morpho vault ${vaultKey}:`, err);
79
+ console.error('[getSavingsData] Error fetching morpho vaults:', err);
80
80
  }
81
- })),
81
+ }))(),
82
82
  ...yearnVaultsList.map((vaultKey) => __awaiter(void 0, void 0, void 0, function* () {
83
83
  try {
84
84
  const vault = yearnVaults.yearnVaultsOptions.getYearnVault(vaultKey);
@@ -1,7 +1,19 @@
1
1
  import { Client } from 'viem';
2
2
  import * as morphoVaultsOptions from './options';
3
- import { EthAddress, EthereumProvider, NetworkNumber } from '../../types/common';
4
- import { MorphoVault, SavingsVaultData } from '../../types';
3
+ import { EthAddress, EthereumProvider, NetworkNumber, MorphoVault, MorphoVaultType, SavingsVaultData } from '../../types';
5
4
  export { morphoVaultsOptions, };
6
- export declare const _getMorphoVaultData: (provider: Client, network: NetworkNumber, morphoVault: MorphoVault, accounts: EthAddress[]) => Promise<SavingsVaultData>;
5
+ /**
6
+ * Fetches liquidity for all given vaults in a single API request (chunked if over the page cap),
7
+ * returned as a map keyed by lowercased vault address. A vault missing from the API response is
8
+ * absent from the map.
9
+ */
10
+ export declare const fetchMorphoVaultsLiquidity: (network: NetworkNumber, vaults: MorphoVault[]) => Promise<Record<string, string>>;
11
+ /**
12
+ * Fetches data for all given vaults with a single Morpho API request for their liquidity,
13
+ * instead of one request per vault. The on-chain reads run in parallel with the API request.
14
+ * A vault whose on-chain reads fail or that is missing from the API response is left out of
15
+ * the result; a failed API request rejects, leaving all vaults out.
16
+ */
17
+ export declare const _getMorphoVaultsData: (provider: Client, network: NetworkNumber, vaults: MorphoVault[], accounts: EthAddress[]) => Promise<Partial<Record<MorphoVaultType, SavingsVaultData>>>;
18
+ export declare function getMorphoVaultsData(provider: EthereumProvider, network: NetworkNumber, vaults: MorphoVault[], accounts: EthAddress[]): Promise<Partial<Record<MorphoVaultType, SavingsVaultData>>>;
7
19
  export declare function getMorphoVaultData(provider: EthereumProvider, network: NetworkNumber, morphoVault: MorphoVault, accounts: EthAddress[]): Promise<SavingsVaultData>;
@@ -45,7 +45,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
45
45
  return (mod && mod.__esModule) ? mod : { "default": mod };
46
46
  };
47
47
  Object.defineProperty(exports, "__esModule", { value: true });
48
- exports._getMorphoVaultData = exports.morphoVaultsOptions = void 0;
48
+ exports._getMorphoVaultsData = exports.fetchMorphoVaultsLiquidity = exports.morphoVaultsOptions = void 0;
49
+ exports.getMorphoVaultsData = getMorphoVaultsData;
49
50
  exports.getMorphoVaultData = getMorphoVaultData;
50
51
  const decimal_js_1 = __importDefault(require("decimal.js"));
51
52
  const graphql_request_1 = require("graphql-request");
@@ -54,38 +55,74 @@ const morphoVaultsOptions = __importStar(require("./options"));
54
55
  exports.morphoVaultsOptions = morphoVaultsOptions;
55
56
  const viem_1 = require("../../services/viem");
56
57
  const contracts_1 = require("../../contracts");
57
- const vaultDataQuery = `
58
- query VaultByAddress($address: String!, $chainId: Int!) {
59
- vaultByAddress(address: $address, chainId: $chainId) {
60
- address
61
- state {
62
- totalAssets
63
- totalAssetsUsd
64
- totalSupply
65
- }
66
- liquidity {
67
- underlying
68
- usd
58
+ const MORPHO_BLUE_API = 'https://api.morpho.org/graphql';
59
+ // Morpho API caps list page size at 100 items
60
+ const MORPHO_API_PAGE_SIZE = 100;
61
+ const vaultsLiquidityQuery = `
62
+ query VaultsLiquidity($addresses: [String!], $chainIds: [Int!]) {
63
+ vaults(first: ${MORPHO_API_PAGE_SIZE}, where: { address_in: $addresses, chainId_in: $chainIds }) {
64
+ items {
65
+ address
66
+ liquidity {
67
+ underlying
68
+ }
69
69
  }
70
70
  }
71
71
  }`;
72
- const MORPHO_BLUE_API = 'https://api.morpho.org/graphql';
73
- const _getMorphoVaultData = (provider, network, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {
72
+ /**
73
+ * Fetches liquidity for all given vaults in a single API request (chunked if over the page cap),
74
+ * returned as a map keyed by lowercased vault address. A vault missing from the API response is
75
+ * absent from the map.
76
+ */
77
+ const fetchMorphoVaultsLiquidity = (network, vaults) => __awaiter(void 0, void 0, void 0, function* () {
78
+ const chunks = [];
79
+ for (let i = 0; i < vaults.length; i += MORPHO_API_PAGE_SIZE)
80
+ chunks.push(vaults.slice(i, i + MORPHO_API_PAGE_SIZE));
81
+ const liquidityByAddress = {};
82
+ yield Promise.all(chunks.map((chunk) => __awaiter(void 0, void 0, void 0, function* () {
83
+ const data = yield (0, graphql_request_1.request)(MORPHO_BLUE_API, vaultsLiquidityQuery, {
84
+ addresses: chunk.map((vault) => vault.address),
85
+ chainIds: [network],
86
+ // the BigInt scalar serializes as a JSON number when it fits in Number.MAX_SAFE_INTEGER, a string otherwise
87
+ });
88
+ (data.vaults.items || []).forEach((item) => {
89
+ var _a, _b;
90
+ if (((_a = item === null || item === void 0 ? void 0 : item.liquidity) === null || _a === void 0 ? void 0 : _a.underlying) !== undefined && ((_b = item.liquidity) === null || _b === void 0 ? void 0 : _b.underlying) !== null) {
91
+ liquidityByAddress[item.address.toLowerCase()] = String(item.liquidity.underlying);
92
+ }
93
+ });
94
+ })));
95
+ return liquidityByAddress;
96
+ });
97
+ exports.fetchMorphoVaultsLiquidity = fetchMorphoVaultsLiquidity;
98
+ const getBatchedViemProvider = (provider, network) => (0, viem_1.getViemProvider)(provider, network, {
99
+ batch: {
100
+ multicall: {
101
+ batchSize: 250000,
102
+ },
103
+ },
104
+ });
105
+ const getMorphoVaultChainData = (provider, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {
74
106
  const morphoVaultContract = (0, contracts_1.getMorphoVaultContractViem)(provider, morphoVault.address);
75
107
  const shares = {};
76
- const [totalAssets, totalSupply, decimals, decimalsOffset, vaultData] = yield Promise.all([
108
+ const [totalAssets, totalSupply, decimals, decimalsOffset] = yield Promise.all([
77
109
  morphoVaultContract.read.totalAssets(),
78
110
  morphoVaultContract.read.totalSupply(),
79
111
  morphoVaultContract.read.decimals(),
80
112
  morphoVaultContract.read.DECIMALS_OFFSET(),
81
- (0, graphql_request_1.request)(MORPHO_BLUE_API, vaultDataQuery, { address: morphoVault.address, chainId: network }),
82
113
  ...accounts.map((account) => __awaiter(void 0, void 0, void 0, function* () {
83
114
  const share = yield morphoVaultContract.read.balanceOf([account]);
84
115
  shares[account] = share;
85
116
  })),
86
117
  ]);
118
+ return {
119
+ totalAssets, totalSupply, decimals, decimalsOffset, shares,
120
+ };
121
+ });
122
+ const formatMorphoVaultData = (morphoVault, chainData, liquidityUnderlying, accounts) => {
123
+ const { totalAssets, totalSupply, decimals, decimalsOffset, shares, } = chainData;
87
124
  const poolSize = (0, tokens_1.assetAmountInEth)(totalAssets.toString(), morphoVault.asset);
88
- const liquidity = (0, tokens_1.assetAmountInEth)(vaultData.vaultByAddress.liquidity.underlying, morphoVault.asset);
125
+ const liquidity = (0, tokens_1.assetAmountInEth)(liquidityUnderlying, morphoVault.asset);
89
126
  const supplied = {};
90
127
  accounts.forEach((account) => {
91
128
  const share = shares[account] || BigInt(0);
@@ -100,16 +137,50 @@ const _getMorphoVaultData = (provider, network, morphoVault, accounts) => __awai
100
137
  asset: morphoVault.asset,
101
138
  optionType: morphoVault.type,
102
139
  };
140
+ };
141
+ /**
142
+ * Fetches data for all given vaults with a single Morpho API request for their liquidity,
143
+ * instead of one request per vault. The on-chain reads run in parallel with the API request.
144
+ * A vault whose on-chain reads fail or that is missing from the API response is left out of
145
+ * the result; a failed API request rejects, leaving all vaults out.
146
+ */
147
+ const _getMorphoVaultsData = (provider, network, vaults, accounts) => __awaiter(void 0, void 0, void 0, function* () {
148
+ const [liquidityByAddress, chainData] = yield Promise.all([
149
+ (0, exports.fetchMorphoVaultsLiquidity)(network, vaults),
150
+ Promise.all(vaults.map((vault) => getMorphoVaultChainData(provider, vault, accounts).catch((err) => {
151
+ console.error(`[getMorphoVaultsData] Error fetching on-chain data for morpho vault ${vault.type}:`, err);
152
+ return null;
153
+ }))),
154
+ ]);
155
+ const savingsData = {};
156
+ vaults.forEach((vault, i) => {
157
+ const vaultChainData = chainData[i];
158
+ if (!vaultChainData)
159
+ return;
160
+ const liquidityUnderlying = liquidityByAddress[vault.address.toLowerCase()];
161
+ if (liquidityUnderlying === undefined) {
162
+ console.error(`[getMorphoVaultsData] Vault ${vault.type} (${vault.address}) missing from Morpho API response`);
163
+ return;
164
+ }
165
+ savingsData[vault.type] = formatMorphoVaultData(vault, vaultChainData, liquidityUnderlying, accounts);
166
+ });
167
+ return savingsData;
103
168
  });
104
- exports._getMorphoVaultData = _getMorphoVaultData;
169
+ exports._getMorphoVaultsData = _getMorphoVaultsData;
170
+ function getMorphoVaultsData(provider, network, vaults, accounts) {
171
+ return __awaiter(this, void 0, void 0, function* () {
172
+ return (0, exports._getMorphoVaultsData)(getBatchedViemProvider(provider, network), network, vaults, accounts);
173
+ });
174
+ }
105
175
  function getMorphoVaultData(provider, network, morphoVault, accounts) {
106
176
  return __awaiter(this, void 0, void 0, function* () {
107
- return (0, exports._getMorphoVaultData)((0, viem_1.getViemProvider)(provider, network, {
108
- batch: {
109
- multicall: {
110
- batchSize: 2500000,
111
- },
112
- },
113
- }), network, morphoVault, accounts);
177
+ const [liquidityByAddress, chainData] = yield Promise.all([
178
+ (0, exports.fetchMorphoVaultsLiquidity)(network, [morphoVault]),
179
+ getMorphoVaultChainData(getBatchedViemProvider(provider, network), morphoVault, accounts),
180
+ ]);
181
+ const liquidityUnderlying = liquidityByAddress[morphoVault.address.toLowerCase()];
182
+ if (liquidityUnderlying === undefined)
183
+ throw new Error(`Vault ${morphoVault.address} missing from Morpho API response`);
184
+ return formatMorphoVaultData(morphoVault, chainData, liquidityUnderlying, accounts);
114
185
  });
115
186
  }
@@ -126,6 +126,7 @@ export interface AavePositionData extends MMPositionData {
126
126
  minRatio: string;
127
127
  collRatio: string;
128
128
  safetyRatioWithLtvZeroFallback?: string;
129
+ safetyRatio?: string;
129
130
  suppliedUsd: string;
130
131
  borrowedUsd: string;
131
132
  borrowLimitUsd: string;
@@ -159,6 +160,7 @@ export interface AaveV3AggregatedPositionData {
159
160
  collRatio: string;
160
161
  borrowLimitWithLtvZeroFallbackUsd: string;
161
162
  safetyRatioWithLtvZeroFallback: string;
163
+ safetyRatio: string;
162
164
  netApy: string;
163
165
  incentiveUsd: string;
164
166
  totalInterestUsd: string;
@@ -169,6 +169,7 @@ export interface AaveV4AggregatedPositionData {
169
169
  leftToBorrowUsd: string;
170
170
  ratio: string;
171
171
  collRatio: string;
172
+ safetyRatio: string;
172
173
  liqRatio: string;
173
174
  liqPercent: string;
174
175
  leveragedType: LeverageType;
@@ -96,6 +96,7 @@ export interface CompoundAggregatedPositionData {
96
96
  leftToBorrowUsd: string;
97
97
  ratio: string;
98
98
  collRatio: string;
99
+ safetyRatio: string;
99
100
  netApy: string;
100
101
  incentiveUsd: string;
101
102
  totalInterestUsd: string;
@@ -115,6 +116,7 @@ export interface CompoundAggregatedPositionData {
115
116
  export interface CompoundPositionData extends MMPositionData {
116
117
  ratio: string;
117
118
  minRatio: string;
119
+ safetyRatio?: string;
118
120
  suppliedUsd: string;
119
121
  borrowedUsd: string;
120
122
  borrowLimitUsd: string;
@@ -323,6 +323,7 @@ export interface FluidAggregatedVaultData {
323
323
  merklBorrowIncentives: IncentiveData[];
324
324
  ratio: string;
325
325
  collRatio: string;
326
+ safetyRatio: string;
326
327
  minRatio: string;
327
328
  totalInterestUsd: string;
328
329
  leveragedType?: LeverageType;
@@ -24,6 +24,7 @@ export interface LiquityTroveInfo {
24
24
  totalETH: string;
25
25
  totalLUSD: string;
26
26
  minCollateralRatio: number;
27
+ safetyRatio: string;
27
28
  priceForRecovery: string;
28
29
  debtInFront: string;
29
30
  exposure: string;
@@ -94,6 +94,7 @@ export interface LiquityV2AggregatedTroveData {
94
94
  liquidationPrice: string;
95
95
  ratio: string;
96
96
  collRatio: string;
97
+ safetyRatio: string;
97
98
  exposure: string;
98
99
  }
99
100
  export interface LiquityV2TroveData {
@@ -101,6 +102,7 @@ export interface LiquityV2TroveData {
101
102
  troveId: string;
102
103
  ratio: string;
103
104
  collRatio: string;
105
+ safetyRatio?: string;
104
106
  liqRatio: string;
105
107
  borrowLimitRatio: string;
106
108
  interestRate: string;
@@ -43,6 +43,7 @@ export interface CdpData {
43
43
  debtAssetMarketPrice: string;
44
44
  liquidationPrice: string;
45
45
  ratio: string;
46
+ safetyRatio: string;
46
47
  liqRatio: string;
47
48
  liqPercent: number;
48
49
  assetPrice: string;
@@ -185,6 +185,7 @@ export interface MorphoBlueAggregatedPositionData {
185
185
  totalInterestUsd: string;
186
186
  ltv: string;
187
187
  ratio: string;
188
+ safetyRatio: string;
188
189
  leveragedType: LeverageType;
189
190
  leveragedAsset?: string;
190
191
  currentVolatilePairRatio?: string;
@@ -207,6 +208,7 @@ export interface MorphoBluePositionData {
207
208
  totalInterestUsd: string;
208
209
  ltv: string;
209
210
  ratio: string;
211
+ safetyRatio?: string;
210
212
  leveragedType: LeverageType;
211
213
  leveragedAsset?: string;
212
214
  currentVolatilePairRatio?: string;
@@ -133,6 +133,7 @@ export type MorphoMidnightAssetsData = {
133
133
  };
134
134
  export interface MorphoMidnightMarketInfo {
135
135
  id: string;
136
+ isCreated: boolean;
136
137
  loanToken: string;
137
138
  collaterals: string[];
138
139
  maturity: number;
@@ -169,6 +170,7 @@ export interface MorphoMidnightAggregatedPositionData {
169
170
  ltv: string;
170
171
  ratio: string;
171
172
  healthRatio: string;
173
+ safetyRatio: string;
172
174
  leveragedType: LeverageType;
173
175
  leveragedAsset?: string;
174
176
  currentVolatilePairRatio?: string;