@suilend/sdk 2.0.3 → 3.0.1

package/utils/obligation.js

@@ -7,45 +7,37 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { fromBase64 } 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";
-import * as parsed from "./events";
-export function fetchAllObligationsForMarketWithHandler(client, lendingMarketId, lendingMarketType, chunkHandler) {
+export function fetchAllObligationsForMarketWithHandler(suiGrpcClient, lendingMarketId, lendingMarketType, chunkHandler) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const limit = pLimit(30);
-        const rawLendingMarket = yield client.getObject({
-            id: lendingMarketId,
-            options: {
-                showType: true,
-                showContent: true,
-                showOwner: true,
-                showBcs: true,
-            },
+        const { object: rawLendingMarket } = yield suiGrpcClient.getObject({
+            objectId: lendingMarketId,
+            include: { json: true },
         });
-        const obligationField = ((_a = rawLendingMarket.data) === null || _a === void 0 ? void 0 : _a.content).fields
-            .obligations;
+        const obligationField = rawLendingMarket.json.fields.obligations;
         const obligationOwnerID = obligationField.fields.id.id;
         let hasNextPage = true;
         let cursor = null;
         const promises = [];
         while (hasNextPage) {
-            const response = yield client.getDynamicFields({
+            const response = yield suiGrpcClient.listDynamicFields({
                 parentId: obligationOwnerID,
                 cursor: cursor,
             });
             hasNextPage = response.hasNextPage;
-            cursor = response.nextCursor;
+            cursor = response.cursor;
             promises.push(limit(() => __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                const obligationObjects = yield chunkedMultiGet(client, response.data.map((x) => x.objectId));
+                const obligationObjects = yield chunkedMultiGet(suiGrpcClient, response.dynamicFields.map((x) => x.fieldId));
                 const obligations = [];
                 for (const rawObligation of obligationObjects) {
-                    obligations.push(Obligation.fromBcs(phantom(lendingMarketType), fromBase64(((_a = rawObligation.data) === null || _a === void 0 ? void 0 : _a.bcs).bcsBytes)));
+                    if (rawObligation instanceof Error)
+                        continue;
+                    obligations.push(Obligation.fromBcs(phantom(lendingMarketType), rawObligation.content));
                 }
                 yield chunkHandler(obligations);
             })));
@@ -53,60 +45,50 @@ export function fetchAllObligationsForMarketWithHandler(client, lendingMarketId,
         yield Promise.all(promises);
     });
 }
-export function fetchAllObligationsForMarket(client, lendingMarketId, lendingMarketType) {
+export function fetchAllObligationsForMarket(suiGrpcClient, lendingMarketId, lendingMarketType) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const rawLendingMarket = yield client.getObject({
-            id: lendingMarketId,
-            options: {
-                showType: true,
-                showContent: true,
-                showOwner: true,
-                showBcs: true,
-            },
+        const { object: rawLendingMarket } = yield suiGrpcClient.getObject({
+            objectId: lendingMarketId,
+            include: { json: true },
         });
-        const obligationField = ((_a = rawLendingMarket.data) === null || _a === void 0 ? void 0 : _a.content).fields
-            .obligations;
+        const obligationField = rawLendingMarket.json.fields.obligations;
         const obligationOwnerID = obligationField.fields.id.id;
         let hasNextPage = true;
         let cursor = null;
         let fields = [];
         while (hasNextPage) {
-            const response = yield client.getDynamicFields({
+            const response = yield suiGrpcClient.listDynamicFields({
                 parentId: obligationOwnerID,
                 cursor: cursor,
             });
-            fields = fields.concat(response.data);
+            fields = fields.concat(response.dynamicFields);
             hasNextPage = response.hasNextPage;
-            cursor = response.nextCursor;
+            cursor = response.cursor;
         }
-        const obligationObjects = yield chunkedMultiGet(client, fields.map((x) => x.objectId));
+        const obligationObjects = yield chunkedMultiGet(suiGrpcClient, fields.map((x) => x.fieldId));
         const obligations = [];
         for (const rawObligation of obligationObjects) {
-            obligations.push(Obligation.fromBcs(phantom(lendingMarketType), fromBase64(((_b = rawObligation.data) === null || _b === void 0 ? void 0 : _b.bcs).bcsBytes)));
+            if (rawObligation instanceof Error)
+                continue;
+            obligations.push(Obligation.fromBcs(phantom(lendingMarketType), rawObligation.content));
         }
         return obligations;
     });
 }
-function chunkedMultiGet(client, objectIds) {
+function chunkedMultiGet(suiGrpcClient, objectIds) {
     return __awaiter(this, void 0, void 0, function* () {
         const limit = pLimit(30);
         const results = [];
         const chunks = splitIntoChunks(objectIds, 50);
         const promises = [];
         for (const chunk of chunks) {
-            promises.push(limit(() => client.multiGetObjects({
-                ids: chunk,
-                options: {
-                    showType: true,
-                    showContent: true,
-                    showOwner: true,
-                    showBcs: true,
-                },
+            promises.push(limit(() => suiGrpcClient.getObjects({
+                objectIds: chunk,
+                include: { content: true },
             })));
         }
         for (const chunk of yield Promise.all(promises)) {
-            for (const result of chunk) {
+            for (const result of chunk.objects) {
                 results.push(result);
             }
         }
@@ -121,145 +103,164 @@ function splitIntoChunks(arr, chunkSize) {
     }
     return result;
 }
-export function getObligationHistoryPage(client, obligationId, maxQuantity, cursor) {
+export function getObligationHistoryPage(suiGraphQLClient, obligationId, maxQuantity, cursor) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
         if (maxQuantity > 50 || maxQuantity < 1) {
             throw Error("maxQuantity must be between 1 and 50");
         }
-        const payload = yield client.queryTransactionBlocks({
-            cursor: cursor,
-            limit: maxQuantity,
-            order: "descending",
-            filter: {
-                ChangedObject: obligationId,
-            },
-            options: {
-                showEffects: true,
-                showEvents: true,
+        const result = yield suiGraphQLClient.query({
+            query: `
+      query QueryObligationTransactions($objectId: SuiAddress!, $first: Int, $after: String) {
+        transactionBlocks(
+          first: $first
+          after: $after
+          filter: { changedObject: $objectId }
+        ) {
+          pageInfo {
+            hasNextPage
+            endCursor
+          }
+          nodes {
+            digest
+            effects {
+              timestamp
+              events(first: 50) {
+                nodes {
+                  sendingModule {
+                    package { address }
+                    name
+                  }
+                  type { repr }
+                  json
+                }
+              }
+            }
+          }
+        }
+      }
+    `,
+            variables: {
+                objectId: obligationId,
+                first: maxQuantity,
+                after: cursor,
             },
         });
-        let formattedEvents = [];
-        for (const data of payload.data) {
-            const events = ((_a = data.events) === null || _a === void 0 ? void 0 : _a.filter((e) => e.packageId === PACKAGE_ID)) || [];
-            formattedEvents = formattedEvents.concat(formatEventsToHistory(obligationId, data, events));
+        const payload = (_a = result.data) === null || _a === void 0 ? void 0 : _a.transactionBlocks;
+        if (!payload) {
+            return { cursor: null, history: [] };
         }
-        if (payload.hasNextPage) {
-            return {
-                cursor: payload.nextCursor,
-                history: formattedEvents,
-            };
+        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; });
+            formattedEvents = formattedEvents.concat(formatEventsToHistory(obligationId, txNode, events));
         }
         return {
-            cursor: null,
+            cursor: payload.pageInfo.hasNextPage ? payload.pageInfo.endCursor : null,
             history: formattedEvents,
         };
     });
 }
-function formatEventsToHistory(obligationId, data, events) {
+function formatEventsToHistory(obligationId, txNode, events) {
+    var _a;
     const formattedEvents = [];
-    for (const [, event] of events.entries()) {
-        const eventComponents = event.type.split("::");
-        const eventType = eventComponents[eventComponents.length - 1];
+    const timestampMs = txNode.effects.timestamp
+        ? 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 (eventType === "DepositEvent") {
-            const deposit = new parsed.DepositEvent(event);
-            if (deposit.params().obligation_id !== obligationId) {
+            if ((params === null || params === void 0 ? void 0 : params.obligation_id) !== obligationId) {
                 continue;
             }
             // Find the corresponding mint event
             const matchingEvent = events.find((e) => {
-                return (e.type.includes("MintEvent") &&
-                    new parsed.MintEvent(e).params().ctoken_amount ===
-                        deposit.params().ctoken_amount);
+                var _a;
+                return (e.type.repr.includes("MintEvent") &&
+                    ((_a = e.json) === null || _a === void 0 ? void 0 : _a.ctoken_amount) === params.ctoken_amount);
             });
             if (!matchingEvent) {
                 // TODO: Handle case with solo Mint or solo Deposit
                 continue;
             }
-            const mint = new parsed.MintEvent(matchingEvent);
             formattedEvents.push({
-                reserveId: deposit.params().reserve_id,
-                quantity: parseInt(mint.params().liquidity_amount),
+                reserveId: params.reserve_id,
+                quantity: parseInt(matchingEvent.json.liquidity_amount),
                 action: "Deposit",
-                timestampMs: parseInt(data.timestampMs, 10),
-                digest: data.digest,
+                timestampMs,
+                digest: txNode.digest,
             });
         }
         else if (eventType === "WithdrawEvent") {
-            const withdraw = new parsed.WithdrawEvent(event);
-            if (withdraw.params().obligation_id !== obligationId) {
+            if ((params === null || params === void 0 ? void 0 : params.obligation_id) !== obligationId) {
                 continue;
             }
             // Find the corresponding mint event
             const matchingEvent = events.find((e) => {
-                return (e.type.includes("RedeemEvent") &&
-                    new parsed.RedeemEvent(e).params().ctoken_amount ===
-                        withdraw.params().ctoken_amount);
+                var _a;
+                return (e.type.repr.includes("RedeemEvent") &&
+                    ((_a = e.json) === null || _a === void 0 ? void 0 : _a.ctoken_amount) === params.ctoken_amount);
             });
             if (!matchingEvent) {
                 continue;
             }
-            const redeem = new parsed.RedeemEvent(matchingEvent);
             formattedEvents.push({
-                reserveId: redeem.params().reserve_id,
-                quantity: parseInt(redeem.params().liquidity_amount),
+                reserveId: matchingEvent.json.reserve_id,
+                quantity: parseInt(matchingEvent.json.liquidity_amount),
                 action: "Withdraw",
-                timestampMs: parseInt(data.timestampMs, 10),
-                digest: data.digest,
+                timestampMs,
+                digest: txNode.digest,
             });
         }
         else if (eventType === "BorrowEvent") {
-            const borrow = new parsed.BorrowEvent(event);
-            if (borrow.params().obligation_id !== obligationId) {
+            if ((params === null || params === void 0 ? void 0 : params.obligation_id) !== obligationId) {
                 continue;
             }
             formattedEvents.push({
-                reserveId: borrow.params().reserve_id,
-                quantity: parseInt(borrow.params().liquidity_amount),
+                reserveId: params.reserve_id,
+                quantity: parseInt(params.liquidity_amount),
                 action: "Borrow",
-                timestampMs: parseInt(data.timestampMs, 10),
-                digest: data.digest,
+                timestampMs,
+                digest: txNode.digest,
             });
         }
         else if (eventType === "RepayEvent") {
-            const repay = new parsed.RepayEvent(event);
-            if (repay.params().obligation_id !== obligationId) {
+            if ((params === null || params === void 0 ? void 0 : params.obligation_id) !== obligationId) {
                 continue;
             }
             formattedEvents.push({
-                reserveId: repay.params().reserve_id,
-                quantity: parseInt(repay.params().liquidity_amount),
+                reserveId: params.reserve_id,
+                quantity: parseInt(params.liquidity_amount),
                 action: "Repay",
-                timestampMs: parseInt(data.timestampMs, 10),
-                digest: data.digest,
+                timestampMs,
+                digest: txNode.digest,
             });
         }
         else if (eventType === "LiquidateEvent") {
-            const liquidate = new parsed.LiquidateEvent(event);
-            if (liquidate.params().obligation_id !== obligationId) {
+            if ((params === null || params === void 0 ? void 0 : params.obligation_id) !== obligationId) {
                 continue;
             }
             formattedEvents.push({
-                repayReserveId: liquidate.params().repay_reserve_id,
-                repayQuantity: parseInt(liquidate.params().repay_amount),
-                withdrawReserveId: liquidate.params().withdraw_reserve_id,
-                withdrawQuantity: parseInt(liquidate.params().withdraw_amount),
+                repayReserveId: params.repay_reserve_id,
+                repayQuantity: parseInt(params.repay_amount),
+                withdrawReserveId: params.withdraw_reserve_id,
+                withdrawQuantity: parseInt(params.withdraw_amount),
                 action: "Liquidation",
-                timestampMs: parseInt(data.timestampMs, 10),
-                digest: data.digest,
+                timestampMs,
+                digest: txNode.digest,
             });
         }
         else if (eventType === "ClaimRewardEvent") {
-            const claimReward = new parsed.ClaimRewardEvent(event);
-            if (claimReward.params().obligation_id !== obligationId) {
+            if ((params === null || params === void 0 ? void 0 : params.obligation_id) !== obligationId) {
                 continue;
             }
             formattedEvents.push({
-                reserveId: claimReward.params().reserve_id,
-                quantity: parseInt(claimReward.params().liquidity_amount),
+                reserveId: params.reserve_id,
+                quantity: parseInt(params.liquidity_amount),
                 action: "Claim Reward",
-                timestampMs: parseInt(data.timestampMs, 10),
-                digest: data.digest,
+                timestampMs,
+                digest: txNode.digest,
             });
         }
     }