@suilend/sdk 3.0.3 → 3.0.4

package/utils/obligation.js

@@ -7,11 +7,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { normalizeSuiAddress } from "@mysten/sui/utils";
 import { BigNumber } from "bignumber.js";
 import pLimit from "p-limit";
 import { phantom } from "../_generated/_framework/reified";
 import { PACKAGE_ID } from "../_generated/suilend";
 import { Obligation } from "../_generated/suilend/obligation/structs";
+const NORMALIZED_PACKAGE_ID = normalizeSuiAddress(PACKAGE_ID);
 export function fetchAllObligationsForMarketWithHandler(suiGrpcClient, lendingMarketId, lendingMarketType, chunkHandler) {
     return __awaiter(this, void 0, void 0, function* () {
         const limit = pLimit(30);
@@ -20,7 +22,7 @@ export function fetchAllObligationsForMarketWithHandler(suiGrpcClient, lendingMa
             include: { json: true },
         });
         const obligationField = rawLendingMarket.json.obligations;
-        const obligationOwnerID = obligationField.id.id;
+        const obligationOwnerID = obligationField.id;
         let hasNextPage = true;
         let cursor = null;
         const promises = [];
@@ -32,7 +34,9 @@ export function fetchAllObligationsForMarketWithHandler(suiGrpcClient, lendingMa
             hasNextPage = response.hasNextPage;
             cursor = response.cursor;
             promises.push(limit(() => __awaiter(this, void 0, void 0, function* () {
-                const obligationObjects = yield chunkedMultiGet(suiGrpcClient, response.dynamicFields.map((x) => x.fieldId));
+                const obligationObjects = yield chunkedMultiGet(suiGrpcClient, response.dynamicFields
+                    .filter((x) => x.$kind === "DynamicObject")
+                    .map((x) => x.childId));
                 const obligations = [];
                 for (const rawObligation of obligationObjects) {
                     if (rawObligation instanceof Error)
@@ -52,7 +56,7 @@ export function fetchAllObligationsForMarket(suiGrpcClient, lendingMarketId, len
             include: { json: true },
         });
         const obligationField = rawLendingMarket.json.obligations;
-        const obligationOwnerID = obligationField.id.id;
+        const obligationOwnerID = obligationField.id;
         let hasNextPage = true;
         let cursor = null;
         let fields = [];
@@ -65,7 +69,7 @@ export function fetchAllObligationsForMarket(suiGrpcClient, lendingMarketId, len
             hasNextPage = response.hasNextPage;
             cursor = response.cursor;
         }
-        const obligationObjects = yield chunkedMultiGet(suiGrpcClient, fields.map((x) => x.fieldId));
+        const obligationObjects = yield chunkedMultiGet(suiGrpcClient, fields.filter((x) => x.$kind === "DynamicObject").map((x) => x.childId));
         const obligations = [];
         for (const rawObligation of obligationObjects) {
             if (rawObligation instanceof Error)
@@ -112,10 +116,10 @@ export function getObligationHistoryPage(suiGraphQLClient, obligationId, maxQuan
         const result = yield suiGraphQLClient.query({
             query: `
       query QueryObligationTransactions($objectId: SuiAddress!, $first: Int, $after: String) {
-        transactionBlocks(
+        transactions(
           first: $first
           after: $after
-          filter: { changedObject: $objectId }
+          filter: { affectedObject: $objectId }
         ) {
           pageInfo {
             hasNextPage
@@ -127,12 +131,14 @@ export function getObligationHistoryPage(suiGraphQLClient, obligationId, maxQuan
               timestamp
               events(first: 50) {
                 nodes {
-                  sendingModule {
+                  transactionModule {
                     package { address }
                     name
                   }
-                  type { repr }
-                  json
+                  contents {
+                    type { repr }
+                    json
+                  }
                 }
               }
             }
@@ -146,13 +152,17 @@ export function getObligationHistoryPage(suiGraphQLClient, obligationId, maxQuan
                 after: cursor,
             },
         });
-        const payload = (_a = result.data) === null || _a === void 0 ? void 0 : _a.transactionBlocks;
+        const payload = (_a = result.data) === null || _a === void 0 ? void 0 : _a.transactions;
         if (!payload) {
             return { cursor: null, history: [] };
         }
         let formattedEvents = [];
         for (const txNode of payload.nodes) {
-            const events = txNode.effects.events.nodes.filter((e) => { var _a, _b; return ((_b = (_a = e.sendingModule) === null || _a === void 0 ? void 0 : _a.package) === null || _b === void 0 ? void 0 : _b.address) === PACKAGE_ID; });
+            const events = txNode.effects.events.nodes.filter((e) => {
+                var _a, _b;
+                return ((_a = e.contents) === null || _a === void 0 ? void 0 : _a.type.repr.startsWith(`${PACKAGE_ID}::`)) ||
+                    ((_b = e.contents) === null || _b === void 0 ? void 0 : _b.type.repr.startsWith(`${NORMALIZED_PACKAGE_ID}::`));
+            });
             formattedEvents = formattedEvents.concat(formatEventsToHistory(obligationId, txNode, events));
         }
         return {
@@ -168,25 +178,25 @@ function formatEventsToHistory(obligationId, txNode, events) {
         ? new Date(txNode.effects.timestamp).getTime()
         : 0;
     for (const event of events) {
-        const eventType = (_a = event.type.repr.split("::").pop()) !== null && _a !== void 0 ? _a : "";
-        const params = event.json;
+        if (!event.contents)
+            continue;
+        const eventType = (_a = event.contents.type.repr.split("::").pop()) !== null && _a !== void 0 ? _a : "";
+        const params = event.contents.json;
         if (eventType === "DepositEvent") {
             if ((params === null || params === void 0 ? void 0 : params.obligation_id) !== obligationId) {
                 continue;
             }
-            // Find the corresponding mint event
             const matchingEvent = events.find((e) => {
-                var _a;
-                return (e.type.repr.includes("MintEvent") &&
-                    ((_a = e.json) === null || _a === void 0 ? void 0 : _a.ctoken_amount) === params.ctoken_amount);
+                var _a, _b, _c;
+                return (((_a = e.contents) === null || _a === void 0 ? void 0 : _a.type.repr.includes("MintEvent")) &&
+                    ((_c = (_b = e.contents) === null || _b === void 0 ? void 0 : _b.json) === null || _c === void 0 ? void 0 : _c.ctoken_amount) === params.ctoken_amount);
             });
-            if (!matchingEvent) {
-                // TODO: Handle case with solo Mint or solo Deposit
+            if (!(matchingEvent === null || matchingEvent === void 0 ? void 0 : matchingEvent.contents)) {
                 continue;
             }
             formattedEvents.push({
                 reserveId: params.reserve_id,
-                quantity: parseInt(matchingEvent.json.liquidity_amount),
+                quantity: parseInt(matchingEvent.contents.json.liquidity_amount),
                 action: "Deposit",
                 timestampMs,
                 digest: txNode.digest,
@@ -196,18 +206,17 @@ function formatEventsToHistory(obligationId, txNode, events) {
             if ((params === null || params === void 0 ? void 0 : params.obligation_id) !== obligationId) {
                 continue;
             }
-            // Find the corresponding mint event
             const matchingEvent = events.find((e) => {
-                var _a;
-                return (e.type.repr.includes("RedeemEvent") &&
-                    ((_a = e.json) === null || _a === void 0 ? void 0 : _a.ctoken_amount) === params.ctoken_amount);
+                var _a, _b, _c;
+                return (((_a = e.contents) === null || _a === void 0 ? void 0 : _a.type.repr.includes("RedeemEvent")) &&
+                    ((_c = (_b = e.contents) === null || _b === void 0 ? void 0 : _b.json) === null || _c === void 0 ? void 0 : _c.ctoken_amount) === params.ctoken_amount);
             });
-            if (!matchingEvent) {
+            if (!(matchingEvent === null || matchingEvent === void 0 ? void 0 : matchingEvent.contents)) {
                 continue;
             }
             formattedEvents.push({
-                reserveId: matchingEvent.json.reserve_id,
-                quantity: parseInt(matchingEvent.json.liquidity_amount),
+                reserveId: matchingEvent.contents.json.reserve_id,
+                quantity: parseInt(matchingEvent.contents.json.liquidity_amount),
                 action: "Withdraw",
                 timestampMs,
                 digest: txNode.digest,