@clober/v2-sdk 1.0.0-beta.26 → 1.0.0-beta.28

package/dist/esm/views/market/take.js

@@ -1,8 +1,9 @@
-import { createPublicClient, formatUnits, http, parseAbiItem } from 'viem';
+import { createPublicClient, formatUnits, http } from 'viem';
 import { CHAIN_MAP } from '../../constants/chain-configs/chain';
 import { formatPrice, invertTick, quoteToBase, toPrice } from '../../utils';
 import { getContractAddresses } from '../address';
 import { BOOK_MANAGER_ABI } from '../../constants/abis/core/book-manager-abi';
+import { fetchLatestTakes } from '../../entities/take/apis';
 const handleTakeLog = (log, market, onEvent) => {
     const { args } = log;
     const isTakingBidBook = BigInt(market.bidBook.id) === args.bookId;
@@ -25,22 +26,23 @@ const handleTakeLog = (log, market, onEvent) => {
         side: isTakingBidBook ? 'sell' : 'buy',
     });
 };
-const backfillRebalanceEvents = async ({ publicClient, chainId, market, backfillBlocks, onEvent, }) => {
-    const currentBlock = await publicClient.getBlockNumber();
-    const fromBlock = currentBlock > backfillBlocks ? currentBlock - backfillBlocks : 0n;
-    const logs = await publicClient.getLogs({
-        address: getContractAddresses({ chainId }).BookManager,
-        event: parseAbiItem('event Take(uint192 indexed bookId, address indexed user, int24 tick, uint64 unit)'),
-        args: {
-            bookId: [BigInt(market.bidBook.id), BigInt(market.askBook.id)],
-        },
-        fromBlock,
-        toBlock: currentBlock,
-    });
-    for (const log of logs) {
-        handleTakeLog(log, market, onEvent);
+const backfillTakeEventsFromSubgraph = async ({ chainId, market, onEvent, }) => {
+    const takes = await fetchLatestTakes(chainId, market.base.address, market.quote.address);
+    const logIndexMap = new Map();
+    for (const take of takes.reverse()) {
+        if (logIndexMap.has(take.transactionHash)) {
+            logIndexMap.set(take.transactionHash, (logIndexMap.get(take.transactionHash) ?? 0) + 1);
+        }
+        else {
+            logIndexMap.set(take.transactionHash, 0);
+        }
+        onEvent({
+            ...take,
+            logIndex: logIndexMap.get(take.transactionHash),
+            blockNumber: 0, // Subgraph does not provide block number in this query
+            side: take.side,
+        });
     }
-    return currentBlock;
 };
 export const watchTakeEvents = async ({ chainId, market, onEvent, onError, options, }) => {
     const publicClient = createPublicClient({
@@ -48,11 +50,9 @@ export const watchTakeEvents = async ({ chainId, market, onEvent, onError, optio
         transport: options?.rpcUrl ? http(options.rpcUrl) : http(),
     });
     const seen = new Set();
-    const lastBackfilledBlock = await backfillRebalanceEvents({
-        publicClient,
+    await backfillTakeEventsFromSubgraph({
         chainId,
         market,
-        backfillBlocks: options?.backfillBlocks ?? 100n,
         onEvent,
     });
     return publicClient.watchContractEvent({
@@ -62,7 +62,6 @@ export const watchTakeEvents = async ({ chainId, market, onEvent, onError, optio
         args: {
             bookId: [BigInt(market.bidBook.id), BigInt(market.askBook.id)],
         },
-        fromBlock: lastBackfilledBlock + 1n,
         onLogs: (logs) => {
             for (const log of logs) {
                 const key = `${log.transactionHash}-${log.logIndex}`;

package/dist/esm/views/market/take.js.map

@@ -1 +1 @@
-{"version":3,"file":"take.js","sourceRoot":"","sources":["../../../../src/views/market/take.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"take.js","sourceRoot":"","sources":["../../../../src/views/market/take.ts"],"names":[],"mappings":"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"}