Merge pull request #28 from ora-io/dev

Dev

Author: murongg

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ora-stack",
-  "version": "0.2.5",
+  "version": "0.3.1",
   "private": true,
   "packageManager": "[email protected]",
   "description": "",

packages/orap/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ora-io/orap",
   "type": "module",
-  "version": "0.2.5",
+  "version": "0.3.1",
   "packageManager": "[email protected]",
   "description": "",
   "author": "Norman (nom4dv3), MuRong",

packages/reku/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ora-io/reku",
   "type": "module",
-  "version": "0.2.4",
+  "version": "0.3.1",
   "packageManager": "[email protected]",
   "description": "",
   "author": "Norman (nom4dv3), MuRong",

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

@@ -88,6 +88,11 @@ export class AutoCrossChecker extends BaseCrossChecker {
 
     const waitNextCrosscheck = async (): Promise<boolean> => {
       latestBlockNum = await timeoutWithRetry(() => this.provider.provider?.getBlockNumber(), 15 * 1000, 3)
+      if (options.autoFollowLatestBlock) {
+        ccrOptions.toBlock = latestBlockNum
+        return true
+      }
+
       if (ccrOptions.toBlock + delayBlockFromLatest > latestBlockNum) {
         // sleep until the toBlock
         // await sleep((ccrOptions.toBlock + delayBlockFromLatest - latestBlockNum) * blockInterval)

packages/reku/src/event/crosschecker/cache/manager.ts

@@ -89,7 +89,7 @@ export class CrossCheckerCacheManager extends SimpleStoreManager {
     await this.set(`${this.storeKeyPrefix}checkpoint`, checkpoint, this.ttl)
   }
 
-  async getCheckpoint(): Promise<number | undefined> {
+  async getCheckpoint(): Promise<number | undefined | null> {
     return await this.get(`${this.storeKeyPrefix}checkpoint`)
   }
 }

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

@@ -35,6 +35,7 @@ export interface AutoCrossCheckParam extends BaseCrossCheckParam {
   storeKeyPrefix?: string // set the prefix to all keys when set key-value to store (cache), e.g. key = prefix+txHashList
   storeTtl?: Milliseconds // the ttl for <txhash, log index> record in store
   batchBlocksCount?: number // how many blocks at most to get per check
+  autoFollowLatestBlock?: boolean // whether to auto follow the latest block
   delayBlockFromLatest?: number // mostly for realtime mode; each time cc wait until latest height > toBlock + delayBlockFromLatest
   blockInterval?: Milliseconds // the block interval of the given chain, default: eth
   pollingInterval?: Milliseconds // mostly for limiting getLogs calling rate in catchup mode; how long does it take at least between 2 checks

packages/utils/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ora-io/utils",
   "type": "module",
-  "version": "0.2.5",
+  "version": "0.3.1",
   "packageManager": "[email protected]",
   "description": "",
   "author": "Norman (nom4dv3), MuRong",
@@ -44,8 +44,8 @@
   },
   "dependencies": {
     "@murongg/utils": "^0.1.28",
-    "cache-manager": "^5.7.6",
-    "cache-manager-ioredis-yet": "^2.1.1",
+    "cache-manager": "5.7.6",
+    "cache-manager-ioredis-yet": "2.1.1",
     "debug": "^4.3.7",
     "ioredis": "^5.4.1",
     "lodash.clonedeep": "^4.5.0",

packages/utils/src/store/redisHash.ts

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