dequanto 0.2.27 → 0.2.29

package/lib/esm/indexer/EventsIndexer.mjs

@@ -14,6 +14,7 @@ import { FsEventsIndexerStore } from './storage/FsEventsIndexerStore.mjs';
 import { FsEventsMetaStore } from './storage/FsEventsMetaStore.mjs';
 import { class_Dfr } from 'atma-utils';
 import { l } from '../utils/$logger.mjs';
+import { PackedRanges } from '../class/PackedRanges.mjs';
 export class EventsIndexer {
     constructor(contract, options) {
         this.contract = contract;
@@ -50,29 +51,36 @@ export class EventsIndexer {
     async getPastLogs(event, filter) {
         let contract = this.contract;
         let client = contract.client;
+        let fromBlock = filter?.fromBlock;
         let toBlock = filter?.toBlock ?? await client.getBlockNumber();
         let events = Array.isArray(event) ? event : [event];
         let filterKey = this.getFilterKey(filter?.params);
-        let ranges = await this.getRanges(events, this.options.initialBlockNumber, toBlock, { filterKey });
-        let logs = await this.getPastLogsRanges(ranges, events, toBlock, filter?.fromBlock, {
+        let ranges = await this.getRanges(events, this.options.initialBlockNumber, toBlock, {
+            fromBlock,
+            filterKey
+        });
+        let { logs, infos } = await this.getPastLogsRanges(ranges, events, toBlock, fromBlock, {
             params: filter?.params
         });
         return {
-            logs: logs
+            logs: logs,
+            infos,
         };
     }
     async *getPastLogsStream(event, options) {
         let contract = this.contract;
         let client = contract.client;
+        let fromBlock = options?.fromBlock;
         let toBlock = options?.toBlock ?? await client.getBlockNumber();
         let events = Array.isArray(event) ? event : [event];
         let filterKey = this.getFilterKey(options?.params);
-        let ranges = await this.getRanges(events, options?.fromBlock ?? this.options.initialBlockNumber, toBlock, {
+        let ranges = await this.getRanges(events, this.options.initialBlockNumber, toBlock, {
+            fromBlock,
             filterKey
         });
         let dfrInner = new class_Dfr();
         let dfrOuter = new class_Dfr();
-        this.getPastLogsRanges(ranges, events, toBlock, options?.fromBlock, {
+        this.getPastLogsRanges(ranges, events, toBlock, fromBlock, {
             params: options?.params,
             blockRangeLimits: options?.blockRangeLimits,
             streamed: true,
@@ -103,113 +111,95 @@ export class EventsIndexer {
         l `Removing ${events.length} from Block #${params.fromBlock}...`;
         await this.store.removeMany(events);
         let metas = await this.storeMeta.fetch();
-        let lastBlock = params.fromBlock - 1;
+        let lastBlock = (params?.fromBlock ?? 0) - 1;
         if (lastBlock < 0) {
+            // remove all metas
             await this.storeMeta.removeMany(metas);
         }
         else {
+            // adjust the lastBlock and the ranges
             metas.forEach(x => {
                 x.lastBlock = Math.min(x.lastBlock, lastBlock);
+                x.ranges = PackedRanges.pickTo(x.ranges, x.lastBlock);
             });
             await this.storeMeta.upsertMany(metas);
         }
     }
     async getRanges(events, initialBlockNumber, toBlock, opts) {
-        let fromBlock = opts?.fromBlock ?? initialBlockNumber;
+        let fromBlock = opts?.fromBlock ?? initialBlockNumber ?? await this.getInitialBlockNumber();
         if (fromBlock != null) {
             $require.lte(fromBlock, toBlock, `Invalid block range order`);
         }
         let logsMetaArr = await this.storeMeta.fetch();
         let eventsBlock = alot(logsMetaArr)
             .filter(x => x.filterKey == opts?.filterKey)
-            .toDictionary(x => x.event, x => x.lastBlock);
-        let logsMeta = events.map(event => {
-            let blockNr = eventsBlock[event] ?? initialBlockNumber;
+            .toDictionary(x => x.event, x => x);
+        let logsMeta = await alot(events).mapAsync(async (event) => {
+            let lastBlock = eventsBlock[event]?.lastBlock ?? initialBlockNumber ?? await this.getInitialBlockNumber();
+            let ranges = eventsBlock[event]?.ranges ?? [];
             return {
                 event: event,
-                lastBlock: blockNr
+                lastBlock: lastBlock,
+                ranges: ranges,
+                filterKey: opts?.filterKey
             };
-        });
-        let hasInitialBlock = logsMeta.every(x => x.lastBlock != null);
-        if (hasInitialBlock === false) {
-            let blockNr = opts?.fromBlock ?? await this.getInitialBlockNumber();
-            logsMeta.filter(x => x.lastBlock == null).forEach(x => x.lastBlock = blockNr);
-        }
-        let ranges = [];
-        let blockNumbers = [...logsMeta.map(x => x.lastBlock), toBlock].filter(x => x <= toBlock);
-        let blockNumberSteps = alot(blockNumbers).distinct().sortBy(x => x).toArray();
-        if (blockNumberSteps.length === 1) {
-            let [block] = blockNumberSteps;
-            ranges.push({
-                fromBlock: block,
-                toBlock: block,
-                events: events
-            });
-        }
-        for (let i = 0; i < blockNumberSteps.length - 1; i++) {
-            let from = blockNumberSteps[i];
-            if (i > 0) {
-                // The range includes both blocks: [x, y], but we want (x, y], so we make [x + 1, y]
-                from += 1;
-            }
-            let to = blockNumberSteps[i + 1];
-            let events = logsMeta.filter(x => x.lastBlock < to).map(x => x.event);
-            ranges.push({
+        }).toArrayAsync();
+        let intersactionRange = PackedRanges.intersection(logsMeta.map(x => x.ranges));
+        let rangesToLoad = PackedRanges.subtract([[fromBlock, toBlock]], intersactionRange);
+        let ranges = rangesToLoad.map(([from, to]) => {
+            return {
                 fromBlock: from,
                 toBlock: to,
-                events: events
-            });
-        }
-        return ranges;
+                events: events,
+                filterKey: opts?.filterKey
+            };
+        });
+        return {
+            fromBlock,
+            load: ranges,
+            current: logsMeta,
+        };
     }
+    // Save indexed logs every 2 minutes
     async getPastLogsRanges(ranges, events, toBlock, fromBlock, options) {
-        // Save indexed logs every 2 minutes
         const PERSIST_INTERVAL = $date.parseTimespan('2min');
         // Save indexed logs every 10k logs
         const PERSIST_COUNT = 10000;
+        fromBlock ??= ranges.fromBlock ?? 0;
         let time = Date.now();
         let contract = this.contract;
         let buffer = [];
         let isStreamed = options?.streamed ?? false;
+        let infos = {
+            cached: 0,
+            fetched: 0,
+        };
+        let cachedStreamedBuffer = [];
         if (isStreamed && typeof options?.onProgress === 'function') {
-            let arr = await this.getItemsFromStore({
+            cachedStreamedBuffer = await this.getItemsFromStore({
                 fromBlock: fromBlock,
-                toBlock: toBlock,
+                toBlock: toBlock + 1,
                 events,
                 params: options?.params,
             });
-            if (arr?.length > 0) {
-                let lastBlock = arr[arr.length - 1].blockNumber;
-                await options.onProgress({
-                    logs: arr,
-                    paged: arr,
-                    completed: false,
-                    blocksPerSecond: 0,
-                    blocks: { total: 0, loaded: 0 },
-                    timeLeftSeconds: 0,
-                    latestBlock: lastBlock
-                });
-                // if (fromBlock != null) {
-                //     let latestFromStorage = alot(arr).max(x => x.blockNumber);
-                //     fromBlock = latestFromStorage + 1;
-                //     if (toBlock != null && fromBlock >= toBlock) {
-                //         // we got all from storage
-                //         return;
-                //     }
-                // }
-                // Adjust ranges to skip blocks already in storage
-                for (let i = 0; i < ranges.length; i++) {
-                    let range = ranges[i];
-                    if (range.toBlock <= lastBlock) {
-                        ranges.splice(i, 1);
-                        i--;
-                        continue;
-                    }
-                    if (range.fromBlock < lastBlock) {
-                        range.fromBlock = lastBlock + 1;
-                    }
-                }
-            }
+            infos.cached = cachedStreamedBuffer.length;
+            // Note: we don't emit progress right away to keep the order in progress callback
+            // Consider: we have blocks [100-150] in cache
+            // Requesting range: [50-200]
+            // Later we fetch [50-100) and (150-200]
+            // The cached response will be inserted after block.100 to keep consistent order
+            // if (arr?.length > 0) {
+            //     let lastBlock = arr[arr.length - 1].blockNumber;
+            //     await options.onProgress({
+            //         logs: arr,
+            //         paged: arr,
+            //         completed: false,
+            //         blocksPerSecond: 0,
+            //         blocks: { total: 0, loaded: 0 },
+            //         timeLeftSeconds: 0,
+            //         latestBlock: lastBlock
+            //     });
+            // }
         }
         let bufferCount = 0;
         let savedCount = 0;
@@ -217,8 +207,8 @@ export class EventsIndexer {
         let nodeStats = Date.now();
         let uniqueCount = 0;
         let unique = {};
-        for (let i = 0; i < ranges.length; i++) {
-            let range = ranges[i];
+        for (let i = 0; i < ranges.load.length; i++) {
+            let range = ranges.load[i];
             let { fromBlock, toBlock, events: rangeEvents } = range;
             let fetched = await contract.getPastLogs(rangeEvents?.length > 0 ? rangeEvents : events, {
                 streamed: options?.streamed,
@@ -227,11 +217,12 @@ export class EventsIndexer {
                 toBlock: toBlock,
                 blockRangeLimits: options?.blockRangeLimits,
                 params: options?.params,
-                onProgress: async (info) => {
+                onProgress: async (chunk) => {
                     onProgressCount++;
-                    buffer.push(...info.logs);
-                    bufferCount += info.logs.length;
-                    for (let log of info.logs) {
+                    buffer.push(...chunk.logs);
+                    bufferCount += chunk.logs.length;
+                    infos.fetched += chunk.logs.length;
+                    for (let log of chunk.logs) {
                         let key = log.id + '';
                         if (key in unique) {
                             uniqueCount += 1;
@@ -243,9 +234,9 @@ export class EventsIndexer {
                         nodeStats = Date.now();
                         l `OnProgressCalled cyan<${onProgressCount}> BufferCount cyan<${bufferCount}> SavedCount cyan<${savedCount}> Unique `;
                     }
-                    let isCompleted = i < ranges.length - 1
+                    let isCompleted = i < ranges.load.length - 1
                         ? false
-                        : info.completed;
+                        : chunk.completed;
                     let now = Date.now();
                     let shouldPersist = isCompleted === true;
                     let shouldTimePersist = now - time >= PERSIST_INTERVAL;
@@ -255,21 +246,60 @@ export class EventsIndexer {
                         buffer = [];
                         time = now;
                         savedCount += arr.length;
-                        await this.upsert(arr, events, info.latestBlock, options);
+                        await this.upsert(arr, events, ranges, fromBlock, chunk.latestBlock, options);
                     }
                     if (options?.onProgress) {
                         // completed must be set to true only when the last Range completes
-                        info.completed = isCompleted;
-                        await options.onProgress(info);
+                        chunk.completed = isCompleted;
+                        if (cachedStreamedBuffer.length > 0) {
+                            if (chunk.logs.length > 0) {
+                                // Preserve the order of logs in progress callback:
+                                // insert cached.blockNumber < fetched.blockNumber first
+                                let [first] = chunk.logs;
+                                let i = 0;
+                                for (; i < cachedStreamedBuffer.length; i++) {
+                                    let x = cachedStreamedBuffer[i];
+                                    if (x.blockNumber > first.blockNumber) {
+                                        break;
+                                    }
+                                }
+                                if (i > 0) {
+                                    let before = cachedStreamedBuffer.splice(0, i);
+                                    chunk.logs = before.concat(chunk.logs);
+                                }
+                            }
+                            if (isCompleted) {
+                                // insert everything left from cache
+                                chunk.logs = chunk.logs.concat(cachedStreamedBuffer);
+                                cachedStreamedBuffer = [];
+                            }
+                        }
+                        await options.onProgress({
+                            ...chunk,
+                            infos,
+                        });
                     }
                 }
             });
             if (buffer.length > 0) {
-                await this.upsert(buffer, events, toBlock, options);
+                await this.upsert(buffer, events, ranges, fromBlock, toBlock, options);
             }
         }
-        // Upsert final, if buffer is empty, we still persist the "toBlock" value
-        await this.upsert(buffer, events, toBlock, options);
+        // Upsert final, if buffer is empty, we still persist the "toBlock" value and the ranges
+        await this.upsert(buffer, events, ranges, fromBlock, toBlock, options);
+        if (isStreamed && typeof options?.onProgress === 'function' && cachedStreamedBuffer.length > 0) {
+            let lastBlock = cachedStreamedBuffer[cachedStreamedBuffer.length - 1].blockNumber;
+            await options.onProgress({
+                logs: cachedStreamedBuffer,
+                paged: cachedStreamedBuffer,
+                completed: true,
+                blocksPerSecond: 0,
+                blocks: { total: 0, loaded: 0 },
+                timeLeftSeconds: 0,
+                latestBlock: lastBlock,
+                infos,
+            });
+        }
         if (isStreamed === true) {
             return;
         }
@@ -279,7 +309,12 @@ export class EventsIndexer {
             events: events,
             params: options?.params
         });
-        return logs;
+        infos.fetched = bufferCount;
+        infos.cached = logs.length - infos.fetched;
+        return {
+            logs,
+            infos,
+        };
     }
     async getItemsFromStore(filter) {
         let arr = await this.store.fetch(filter);
@@ -290,7 +325,7 @@ export class EventsIndexer {
         }
         let filterKey = this.getFilterKey(filter.params);
         arr = arr.filter(x => x.filterKey == filterKey);
-        return arr;
+        return alot(arr).sortBy(x => x.id).toArray();
     }
     getFilterKey(params) {
         if (params == null) {
@@ -311,7 +346,7 @@ export class EventsIndexer {
         }
         return 0;
     }
-    async upsert(logs, events, latestBlock, options) {
+    async upsert(logs, events, ranges, fromBlock, latestBlock, options) {
         let filterKey = this.getFilterKey(options?.params);
         if (logs?.length > 0) {
             for (let log of logs) {
@@ -319,11 +354,21 @@ export class EventsIndexer {
             }
             await this.store.upsertMany(logs);
         }
-        const logsMeta = events.map(event => ({
-            event,
-            lastBlock: latestBlock,
-            filterKey: filterKey,
-        }));
+        const logsMeta = events.map(event => {
+            let currentMeta = ranges
+                .current
+                .find(x => x.event === event);
+            let arr = PackedRanges.union([
+                currentMeta?.ranges ?? [],
+                [[fromBlock, latestBlock]]
+            ]);
+            return {
+                event,
+                lastBlock: latestBlock,
+                filterKey: filterKey,
+                ranges: arr,
+            };
+        });
         await this.storeMeta.upsertMany(logsMeta);
     }
 }

package/lib/esm/rpc/RpcContract.js.map

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

package/lib/esm/rpc/RpcContract.mjs

@@ -58,33 +58,41 @@ export class RpcContract {
         return alot(requests).mapAsync(req => this.getCallRequestRaw(req)).toArrayAsync();
     }
     async getCallRequestRaw(request) {
-        let address = request.address ?? this.defaults?.address;
+        let { tx, abiItem, blockNumber } = await RpcContract.createCalldata(request, this.defaults);
+        let rpc = new Rpc();
+        return {
+            methodRequest: rpc.req.eth_call(tx, blockNumber ?? 'latest'),
+            methodAbi: abiItem
+        };
+    }
+    static async createCalldata(request, options) {
+        let address = request.address ?? options?.address;
         $require.Address(address);
         let data = request.data;
         let { abi, method, params, blockNumber } = request;
-        let abiArr = $web3Abi.ensureAbis(abi ?? this.defaults?.abi);
+        let abiArr = $web3Abi.ensureAbis(abi ?? options?.abi);
         let abiItem = abiArr?.find(x => x.name === method);
         if (abiItem == null) {
-            abiItem = this.defaults?.abi?.find(x => x.name === method);
+            abiItem = options?.abi?.find(x => x.name === method);
         }
         if (data == null) {
             $require.notNull(abiItem, `Method ${method} not found. Available methods: ${abiArr?.map(x => x.name)}`);
             data = $abiUtils.serializeMethodCallData(abiItem, params ?? []);
         }
         if (blockNumber instanceof Date) {
-            let resolver = di.resolve(BlockDateResolver, this.client);
+            let client = $require.notNull(options?.client, `Blocknumber is Date: ${blockNumber}, Client is required.`);
+            let resolver = di.resolve(BlockDateResolver, client);
             blockNumber = await resolver.getBlockNumberFor(blockNumber);
         }
-        let tx = {
-            from: request.from ?? void 0,
-            to: address,
-            value: $hex.ensure(request.value ?? 0n),
-            data: data,
-        };
-        let rpc = new Rpc();
         return {
-            methodRequest: rpc.req.eth_call(tx, blockNumber ?? 'latest'),
-            methodAbi: abiItem
+            tx: {
+                from: request.from ?? void 0,
+                to: address,
+                value: $hex.ensure(request.value ?? 0n),
+                data: data,
+            },
+            abiItem,
+            blockNumber
         };
     }
 }

package/lib/esm/safe/GnosisSafeHandler.js.map

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

package/lib/esm/safe/GnosisSafeHandler.mjs

@@ -112,7 +112,7 @@ export class GnosisSafeHandler {
             baseGas: 0,
             gasToken: $address.ZERO,
             refundReceiver: $address.ZERO,
-            nonce: safeInfo.nonce,
+            nonce: $require.Number(Number(safeInfo.nonce) + Number(safeInfo.pending ?? 0)),
             gasPrice: 0,
         };
         let safeTxHash = await this.getTransactionHash({

package/lib/esm/safe/transport/SafeServiceTransport.js.map

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

package/lib/esm/safe/transport/SafeServiceTransport.mjs

@@ -82,9 +82,19 @@ class SafeServiceClientInner {
         return data;
     }
     async getSafeInfo(safeAddress) {
-        let url = `${this.params.txServiceUrl}/api/v1/safes/${safeAddress}`;
-        let { data } = await $http.get(url);
-        return data;
+        let safeUrl = `${this.params.txServiceUrl}/api/v1/safes/${safeAddress}`;
+        let { data: safeInfo } = await $http.get(safeUrl);
+        let pendingUrl = `${this.params.txServiceUrl}/api/v1/safes/${safeAddress}/multisig-transactions/?executed=false&ordering=-nonce&limit=1`;
+        let { data: pendingTxs } = await $http.get(pendingUrl);
+        let nonce = Number(safeInfo.nonce);
+        let pending = 0;
+        if (pendingTxs.results?.length > 0) {
+            pending = $require.Number(Number(pendingTxs.results[0].nonce) + 1 - nonce);
+        }
+        return {
+            ...safeInfo,
+            pending
+        };
     }
     async estimateSafeTransaction(safeAddress, safeTransaction) {
         let url = `${this.params.txServiceUrl}/api/v1/safes/${safeAddress}/multisig-transactions/estimations/`;