fix add on-contract-event

lib/ie-contract.js

@@ -3,7 +3,7 @@ import { IE_CONTRACT_ABI, IE_CONTRACT_ADDRESS, RPC_URL, GLIF_TOKEN } from '../sp
 
 const fetchRequest = new ethers.FetchRequest(RPC_URL)
 fetchRequest.setHeader('Authorization', `Bearer ${GLIF_TOKEN}`)
-const provider = new ethers.JsonRpcProvider(fetchRequest)
+export const provider = new ethers.JsonRpcProvider(fetchRequest)
 
 // Uncomment for troubleshooting
 // provider.on('debug', d => console.log('[ethers:debug] %s\npayload: %o', d.action, d.payload))

lib/round-tracker.js

@@ -1,6 +1,8 @@
 import assert from 'node:assert'
 import * as Sentry from '@sentry/node'
-import { createMeridianContract } from './ie-contract.js'
+import { createMeridianContract, provider } from './ie-contract.js'
+import { onContractEvent } from 'on-contract-event'
+import { RPC_URL, GLIF_TOKEN } from '../spark-publish/ie-contract-config.js'
 
 // The number of tasks per round is proportionate to the SPARK round length - longer rounds require
 // more tasks per round.
@@ -65,12 +67,20 @@ export async function startRoundTracker ({ pgPool, signal }) {
       Sentry.captureException(err)
     })
   }
-  contract.on('RoundStart', onRoundStart)
-  if (signal) {
-    signal.addEventListener('abort', () => {
-      contract.removeListener('RoundStart', onRoundStart)
-    })
-  }
+  const it = onContractEvent({
+    contract,
+    provider,
+    rpcUrl: RPC_URL,
+    rpcHeaders: {
+      Authorization: `Bearer ${GLIF_TOKEN}`
+    },
+    signal
+  })
+  ;(async () => {
+    for await (const event of it) {
+      onRoundStart(event.args[0])
+    }
+  })().catch(console.error)
 
   const currentRound = await updateSparkRound(await contract.currentRoundIndex())
   return currentRound

package.json

@@ -25,6 +25,7 @@
     "http-assert": "^1.5.0",
     "http-responders": "^2.0.2",
     "multiformats": "^13.1.0",
+    "on-contract-event": "^1.1.0",
     "pg": "^8.11.5",
     "postgrator": "^7.2.0",
     "raw-body": "^2.5.2"