Merge pull request #9 from ora-io/dev

Dev

Author: murongg

package.json

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

packages/orap/README.md

@@ -101,9 +101,6 @@ orap.event(eventSignalParam)
   .ttl({ taskTtl: 120000, doneTtl: 60000 })
   .handle(handle2)
 
-// set logger before listen
-orap.logger(logger)
-
 // start signal listeners
 orap.listen(
   {
@@ -130,8 +127,6 @@ Each `new Orap()` starts a `Orap Flow`
   - optional: httpProvider, for crosscheck only, since crosscheck is based on getLogs
 - `onListenFn`: customized hook when listener started.
 
-**.logger(logger)**
-- set which logger to use across this orap
 
 #### Event Flow
 
@@ -302,4 +297,4 @@ etc.
 ### StorageManager
 - a wrap class designed for caching tasks in Orap
 - `store`: the store entity, currently provides 2 options: use memory or redis, checkout `orap/store`
-- `queryDelay`: when doing retry-able operations, e.g. get all keys with the given prefix, this defines the interval between retries.
+- `queryDelay`: when doing retry-able operations, e.g. get all keys with the given prefix, this defines the interval between retries.

packages/orap/examples/customDemo/app.ts

@@ -1,14 +1,13 @@
 import type { EventLog } from 'ethers'
 import { redisStore } from '@ora-io/utils'
-import type { ListenOptions } from '../../index'
-import { Orap, StoreManager } from '../../index'
+import type { ListenOptions } from '../../src'
+import { Orap, StoreManager } from '../../src'
 import { config, logger } from './config'
 import ABI from './erc20.abi.json'
 import { TransferTask } from './taskTransfer'
 
 // new orap
 const orap = new Orap()
-orap.logger(logger)
 
 let store: any
 let sm: any

packages/orap/examples/customDemo/taskTransfer.ts

@@ -1,5 +1,5 @@
 import type { Constructor } from '@ora-io/utils'
-import { TaskStorable } from '../../index'
+import { TaskStorable } from '../../src'
 import { config, logger } from './config'
 
 export class TransferTask extends TaskStorable {

packages/orap/examples/declarativeDemo/app.ts

@@ -1,7 +1,7 @@
 import type { EventLog } from 'ethers'
 import { Logger, randomStr, redisStore } from '@ora-io/utils'
-import type { ListenOptions, ToKeyFn } from '../../index'
-import { Orap, StoreManager } from '../../index'
+import type { ListenOptions, ToKeyFn } from '../../src'
+import { Orap, StoreManager } from '../../src'
 import ABI from './erc20.abi.json'
 
 const MAINNET_USDT_ADDR = '0xdAC17F958D2ee523a2206206994597C13D831ec7'
@@ -50,9 +50,6 @@ export function startDemo(options: ListenOptions, storeConfig?: any) {
     .ttl({ taskTtl: 20000, doneTtl: 20000 })
     .handle(handleTask_2)
 
-  // set logger before listen
-  orap.logger(logger)
-
   // start signal listener
   orap.listen(
     options,

packages/orap/examples/ooSample/app.ts

@@ -1,14 +1,15 @@
 /* eslint-disable no-console */
 import { ethers } from 'ethers'
-import { Orap } from '../../orap'
+import type { EventSignalRegisterParams } from '../../src'
+import { Orap } from '../../src'
 // import { Orap } from '@orap-io/orap'
 
 // new orap
 const orap = new Orap()
 
-const eventSignalParam = {
+const eventSignalParam: EventSignalRegisterParams = {
   address: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
-  abi: { anonymous: false, inputs: [{ indexed: true, name: 'from', type: 'address' }, { indexed: true, name: 'to', type: 'address' }, { indexed: false, name: 'value', type: 'uint256' }], name: 'Transfer', type: 'event' },
+  abi: [{ anonymous: false, inputs: [{ indexed: true, name: 'from', type: 'address' }, { indexed: true, name: 'to', type: 'address' }, { indexed: false, name: 'value', type: 'uint256' }], name: 'Transfer', type: 'event' }],
   eventName: 'Transfer',
 }
 

packages/orap/examples/raplizeSample/app.ts

@@ -1,7 +1,8 @@
 import { ethers } from 'ethers'
 import { Logger, redisStore } from '@ora-io/utils'
-import { Orap } from '../../orap'
-import { StoreManager } from '../../store'
+import type { EventSignalRegisterParams } from '../../src'
+import { Orap } from '../../src'
+import { StoreManager } from '../../src/store'
 // import { Orap } from '@orap-io/orap'
 
 // new orap
@@ -14,9 +15,9 @@ const sm = new StoreManager(store)
 // use a logger
 const logger = new Logger('info', '[orap-raplize-sample]')
 
-const eventSignalParam = {
+const eventSignalParam: EventSignalRegisterParams = {
   address: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
-  abi: { anonymous: false, inputs: [{ indexed: true, name: 'from', type: 'address' }, { indexed: true, name: 'to', type: 'address' }, { indexed: false, name: 'value', type: 'uint256' }], name: 'Transfer', type: 'event' },
+  abi: [{ anonymous: false, inputs: [{ indexed: true, name: 'from', type: 'address' }, { indexed: true, name: 'to', type: 'address' }, { indexed: false, name: 'value', type: 'uint256' }], name: 'Transfer', type: 'event' }],
   eventName: 'Transfer',
 }
 
@@ -33,9 +34,6 @@ orap.event(eventSignalParam)
   .ttl({ taskTtl: 120000, doneTtl: 60000 })
   .handle(handle)
 
-// set logger before listen
-orap.logger(logger)
-
 // start signal listeners
 orap.listen(
   {

packages/orap/package.json

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

packages/orap/beat/event.ts renamed to packages/orap/src/beat/event.ts

@@ -1,4 +1,3 @@
-import type { Logger } from '@ora-io/utils'
 import type { AutoCrossCheckParam, Providers } from '@ora-io/reku'
 import type { EventSignalCallback, EventSignalRegisterParams } from '../signal'
 import { EventSignal } from '../signal'
@@ -11,12 +10,11 @@ export class EventBeat extends EventSignal {
   constructor(
     params: EventSignalRegisterParams,
     callback: EventSignalCallback,
-    logger: Logger,
     crosscheckOptions: Omit<AutoCrossCheckParam, 'address' | 'topics' | 'onMissingLog'> | undefined,
     private subscribeProvider: Providers,
     private crosscheckProvider: Providers | undefined,
   ) {
-    super(params, callback, logger, crosscheckOptions)
+    super(params, callback, crosscheckOptions)
   }
 
   drop() {