Merge pull request #11 from ora-io/dev

Dev

Author: murongg

package.json

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

packages/orap/package.json

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

packages/orap/src/flow/orap.ts

@@ -19,7 +19,7 @@ export class OrapFlow implements Flow {
     event: EventFlow[]
   } = { event: [] }
 
-  onListenFn: any = () => { }
+  onListenFn: Fn = () => { }
 
   get eventFlows() {
     return this.subflows.event
@@ -43,14 +43,15 @@ export class OrapFlow implements Flow {
    * @param options
    * @param onListenFn
    */
-  listen(options: ListenOptions, onListenFn: Fn) {
+  listen(options: ListenOptions, onListenFn?: Fn) {
     for (const eventFlow of this.subflows.event) {
       eventFlow.setSubscribeProvider(options.wsProvider)
       if (options.httpProvider)
         eventFlow.setCrosscheckProvider(options.httpProvider)
     }
 
-    this.onListenFn = onListenFn
+    if (onListenFn)
+      this.onListenFn = onListenFn
 
     const orapVerse = this.assemble()
     orapVerse.play()

packages/orap/src/signal/event.ts

@@ -1,5 +1,5 @@
 import type { EventFragment, Interface, InterfaceAbi, Log } from 'ethers'
-import { ethers } from 'ethers'
+import { ContractEventPayload, ethers } from 'ethers'
 import { AutoCrossChecker, ONE_MINUTE_MS, RekuProviderManager } from '@ora-io/reku'
 import type { AutoCrossCheckParam, Providers } from '@ora-io/reku'
 import type { Signal } from './interface'
@@ -53,7 +53,8 @@ export class EventSignal implements Signal {
     // 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)
-      await this.callback(...parsedLog, log)
+      const payload = new ContractEventPayload(this.contract, this.subscribeCallback, this.params.eventName, this.eventFragment, log)
+      await this.callback(...parsedLog, payload)
     }
 
     // set crosscheckOptions only when speicified

packages/orap/src/verse/orap.ts

@@ -17,7 +17,7 @@ export class OrapVerse implements Verse {
     for (const verse of this._eventVerses)
       verse.play()
 
-    this.flow.onListenFn()
+    this.flow?.onListenFn()
     // return this
   }
 

packages/reku/package.json

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

packages/utils/package.json

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