fix(orap): revert signle level context, should keep context at the task level only

Author: nom4dv3

packages/orap/index.ts

@@ -2,4 +2,3 @@ export * from './signal'
 export * from './store'
 export * from './task'
 export * from './orap'
-export * from './context'

packages/orap/orap.ts

@@ -3,7 +3,6 @@ import { RekuProviderManager } from '@ora-io/reku'
 import type { Logger } from '@ora-io/utils'
 import { logger } from '@ora-io/utils'
 import { EventSignal } from './signal/event'
-import type { Context } from './context'
 
 export interface ListenOptions {
   wsProvider: Providers
@@ -23,8 +22,8 @@ export class Orap {
     }
   }
 
-  event(options: any, fn: any, context?: Context) {
-    const es = new EventSignal(options, fn, this.logger, context)
+  event(options: any, fn: any) {
+    const es = new EventSignal(options, fn, this.logger)
     this.routes.event.push(es)
     return es
   }

packages/orap/signal/event.ts

@@ -3,7 +3,6 @@ import { ethers } from 'ethers'
 import { AutoCrossChecker, ONE_MINUTE_MS, RekuProviderManager } from '@ora-io/reku'
 import type { AutoCrossCheckParam, Providers } from '@ora-io/reku'
 import type { Logger } from '@ora-io/utils'
-import type { Context } from '../context'
 import type { Signal } from './type'
 
 export interface EventSignalRegisterParams {
@@ -31,7 +30,6 @@ export class EventSignal implements Signal {
     public params: EventSignalRegisterParams,
     public callback: EventSignalCallback,
     public logger: Logger,
-    public context?: Context,
   ) {
     this.contract = new ethers.Contract(
       params.address,
@@ -50,14 +48,14 @@ export class EventSignal implements Signal {
     // to align with crosschecker onMissing, parse the last arg from ContractEventPayload to EventLog
     this.subscribeCallback = async (...args: Array<any>) => {
       const _contractEventPayload = args.pop()
-      await this.callback(...args, _contractEventPayload.log, context)
+      await this.callback(...args, _contractEventPayload.log)
       await this.crosschecker?.cache!.addLog(_contractEventPayload.log)
     }
     // to align with subscribe listener, parse event params and add EventLog to the last
     this.crosscheckCallback = async (log: Log) => {
       const parsedLog = this.contract.interface.decodeEventLog(this.eventFragment, log.data, log.topics)
       this.logger.info('crosschecker capture a missing event! processing...', log.transactionHash, log.index)
-      await this.callback(...parsedLog, log, context)
+      await this.callback(...parsedLog, log)
     }
   }
 

packages/orap/context.ts renamed to packages/orap/task/context.ts

@@ -1,2 +1,3 @@
 export * from './base'
 export * from './storable'
+export * from './context'

packages/orap/task/index.ts

@@ -1,6 +1,6 @@
 import type { Constructor } from '@ora-io/utils'
 import type { StoreManager } from '../store/storemanager'
-import type { Context } from '../context'
+import type { Context } from './context'
 import { TaskBase } from './base'
 
 export abstract class TaskStorable extends TaskBase {