Fix order of events processing for FEVM (#518)

* Fix events processing order for FEVM

* Upgrade watcher package version

* Fix getResultEvent for eventsInRange GQL query

* Fix eventFields parsing

packages/codegen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/codegen",
-  "version": "0.2.94",
+  "version": "0.2.95",
   "description": "Code generator",
   "private": true,
   "main": "index.js",
@@ -20,7 +20,7 @@
   },
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
-    "@cerc-io/util": "^0.2.94",
+    "@cerc-io/util": "^0.2.95",
     "@graphql-tools/load-files": "^6.5.2",
     "@npmcli/package-json": "^5.0.0",
     "@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git",

packages/codegen/src/templates/package-template.handlebars

@@ -41,12 +41,12 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.94",
-    "@cerc-io/ipld-eth-client": "^0.2.94",
-    "@cerc-io/solidity-mapper": "^0.2.94",
-    "@cerc-io/util": "^0.2.94",
+    "@cerc-io/cli": "^0.2.95",
+    "@cerc-io/ipld-eth-client": "^0.2.95",
+    "@cerc-io/solidity-mapper": "^0.2.95",
+    "@cerc-io/util": "^0.2.95",
     {{#if (subgraphPath)}}
-    "@cerc-io/graph-node": "^0.2.94",
+    "@cerc-io/graph-node": "^0.2.95",
     {{/if}}
     "@ethersproject/providers": "^5.4.4",
     "debug": "^4.3.1",

packages/codegen/src/templates/resolvers-template.handlebars

@@ -76,6 +76,8 @@ const executeAndRecordMetrics = async (
       apiKey: expressContext.req.header('x-api-key'),
       origin: expressContext.req.headers.origin
     });
+
+    throw error;
   } finally {
     endTimer();
   }
@@ -133,7 +135,7 @@ export const createResolvers = async (
       ): Promise<ValueResult> => {
         log('{{this.name}}', blockHash, contractAddress
         {{~#each this.params}}, {{this.name~}} {{/each}});
-        
+
         // Set cache-control hints
         // setGQLCacheHints(info, {}, gqlCacheConfig);