Merge pull request #29 from ora-io/dev

Dev

Author: murongg

packages/reku/src/event/crosschecker/autochecker.ts

@@ -88,11 +88,19 @@ export class AutoCrossChecker extends BaseCrossChecker {
 
     const waitNextCrosscheck = async (): Promise<boolean> => {
       latestBlockNum = await timeoutWithRetry(() => this.provider.provider?.getBlockNumber(), 15 * 1000, 3)
+
+      // If auto-follow is enabled, update toBlock and check block range
       if (options.autoFollowLatestBlock) {
         ccrOptions.toBlock = latestBlockNum
+
+        // Check if the range exceeds the latest block number
+        if (ccrOptions.fromBlock + batchBlocksCount + delayBlockFromLatest > latestBlockNum)
+          return false
+
         return true
       }
 
+      // If auto-follow is not enabled, check if toBlock is within the delay range
       if (ccrOptions.toBlock + delayBlockFromLatest > latestBlockNum) {
         // sleep until the toBlock
         // await sleep((ccrOptions.toBlock + delayBlockFromLatest - latestBlockNum) * blockInterval)

packages/utils/src/store/index.ts

@@ -1,5 +1,6 @@
 export type { Store, StoreConfig, Stores } from 'cache-manager'
 export { redisStore } from './redis'
+export type { RedisStore, RedisClusterConfig } from './redis'
 export * from './manager'
 export { memoryStore } from './memory'
 export type { MemoryStore, MemoryCache, MemoryConfig } from './memory'

packages/utils/src/store/redis.ts

@@ -1,6 +1,7 @@
 import type { RedisOptions } from 'ioredis'
 import { Redis } from 'ioredis'
 import type { Config } from 'cache-manager'
+import type { RedisStore } from 'cache-manager-ioredis-yet'
 import { RedisClusterConfig, redisInsStore } from 'cache-manager-ioredis-yet'
 
 export function redisStore(
@@ -22,3 +23,7 @@ export {
   RedisClusterConfig,
   redisInsStore,
 }
+
+export type {
+  RedisStore,
+}

packages/utils/src/store/types.ts

@@ -1,3 +0,0 @@
-import type { Keyv } from 'keyv'
-
-export type Store = Keyv