Problem raised by retrieving order event index in provider fee event handler.

src/mappings/erc20Templates.ts

@@ -248,11 +248,13 @@ export function handleProviderFee(event: ProviderFee): void {
     event.params.validUntil
   }"}`
 
+  const orderEventIndex = event.logIndex.toI32() - 1
+
   const orderId = getOrderId(
     event.transaction.hash.toHex(),
     event.address.toHex(),
     event.transaction.from.toHex(),
-    event.logIndex.toI32().toString()
+    orderEventIndex.toString()
   )
   const order = Order.load(orderId)
 

test/integration/SimplePublishConsume.test.ts

@@ -322,7 +322,25 @@ describe('Simple Publish & consume test', async () => {
     const queryResult = await response.json()
     console.log('queryResult: ', queryResult)
 
-    const providerFeeJSON = JSON.parse(queryResult.data.order.providerFee)
+    const orderIdForProviderFees = `${orderTx.transactionHash.toLowerCase()}-${datatokenAddress.toLowerCase()}-${user1.toLowerCase()}-${orderTx.events.ProviderFee.logIndex.toString()}`
+    console.log('orderIdForProviderFees: ', orderIdForProviderFees)
+    const queryForProviderFees = {
+      query: `query {order(id:"${orderIdForProviderFees}"){id, providerFee, lastPriceToken{id}, eventIndex}}`
+    }
+
+    await sleep(3000)
+    const responseProviderFees = await fetch(subgraphUrl, {
+      method: 'POST',
+      body: JSON.stringify(queryForProviderFees)
+    })
+    await sleep(3000)
+    const queryResultProviderFees = await responseProviderFees.json()
+
+    console.log('queryResultProviderFees: ', queryResultProviderFees)
+
+    const providerFeeJSON = JSON.parse(
+      queryResultProviderFees.data.order.providerFee
+    )
     console.log('provider fee: ', providerFeeJSON)
     const lastPriceToken = queryResult.data.order.lastPriceToken.id