diff --git a/lerna.json b/lerna.json
index 57264919..289d43ce 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.2.36",
+  "version": "0.2.37",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {
diff --git a/packages/address-watcher/package.json b/packages/address-watcher/package.json
index 26c17f90..92ecad03 100644
--- a/packages/address-watcher/package.json
+++ b/packages/address-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/address-watcher",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "description": "Address Watcher",
   "private": true,
   "scripts": {
@@ -26,11 +26,11 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cache": "^0.2.36",
-    "@cerc-io/ipld-eth-client": "^0.2.36",
-    "@cerc-io/solidity-mapper": "^0.2.36",
-    "@cerc-io/tracing-client": "^0.2.36",
-    "@cerc-io/util": "^0.2.36",
+    "@cerc-io/cache": "^0.2.37",
+    "@cerc-io/ipld-eth-client": "^0.2.37",
+    "@cerc-io/solidity-mapper": "^0.2.37",
+    "@cerc-io/tracing-client": "^0.2.37",
+    "@cerc-io/util": "^0.2.37",
     "@types/lodash": "^4.14.168",
     "debug": "^4.3.1",
     "ethers": "^5.4.4",
diff --git a/packages/cache/package.json b/packages/cache/package.json
index 481450a7..b8499de4 100644
--- a/packages/cache/package.json
+++ b/packages/cache/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/cache",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "description": "Generic object cache",
   "main": "dist/index.js",
   "scripts": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 1bd26b06..4a0b2cb2 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/cli",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "scripts": {
@@ -11,8 +11,8 @@
     "chat": "DEBUG='vulcanize:*, laconic:*' node dist/chat.js"
   },
   "dependencies": {
-    "@cerc-io/peer": "^0.2.36",
-    "@cerc-io/util": "^0.2.36",
+    "@cerc-io/peer": "^0.2.37",
+    "@cerc-io/util": "^0.2.37",
     "@ethersproject/providers": "^5.4.4",
     "@graphql-tools/utils": "^9.1.1",
     "@ipld/dag-cbor": "^8.0.0",
diff --git a/packages/codegen/package.json b/packages/codegen/package.json
index bab824ef..e84d5f96 100644
--- a/packages/codegen/package.json
+++ b/packages/codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/codegen",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "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.36",
+    "@cerc-io/util": "^0.2.37",
     "@graphql-tools/load-files": "^6.5.2",
     "@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git",
     "@solidity-parser/parser": "^0.13.2",
diff --git a/packages/codegen/src/templates/package-template.handlebars b/packages/codegen/src/templates/package-template.handlebars
index 5bf796ac..207fdab2 100644
--- a/packages/codegen/src/templates/package-template.handlebars
+++ b/packages/codegen/src/templates/package-template.handlebars
@@ -41,12 +41,12 @@
   "dependencies": {
     "@apollo/client": "^3.3.19",
     "@ethersproject/providers": "^5.4.4",
-    "@cerc-io/cli": "^0.2.36",
-    "@cerc-io/ipld-eth-client": "^0.2.36",
-    "@cerc-io/solidity-mapper": "^0.2.36",
-    "@cerc-io/util": "^0.2.36",
+    "@cerc-io/cli": "^0.2.37",
+    "@cerc-io/ipld-eth-client": "^0.2.37",
+    "@cerc-io/solidity-mapper": "^0.2.37",
+    "@cerc-io/util": "^0.2.37",
     {{#if (subgraphPath)}}
-    "@cerc-io/graph-node": "^0.2.36",
+    "@cerc-io/graph-node": "^0.2.37",
     {{/if}}
     "apollo-type-bigint": "^0.1.3",
     "debug": "^4.3.1",
@@ -62,7 +62,7 @@
     "@ethersproject/abi": "^5.3.0",
     "@types/yargs": "^17.0.0",
     "@types/debug": "^4.1.5",
-    "@types/json-bigint": "^1.0.1",
+    "@types/json-bigint": "^1.0.0",
     "@typescript-eslint/eslint-plugin": "^5.47.1",
     "@typescript-eslint/parser": "^5.47.1",
     "eslint": "^8.35.0",
diff --git a/packages/eden-watcher/package.json b/packages/eden-watcher/package.json
index 2315ccf9..db8a239e 100644
--- a/packages/eden-watcher/package.json
+++ b/packages/eden-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/eden-watcher",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "description": "eden-watcher",
   "private": true,
   "main": "dist/index.js",
@@ -38,11 +38,11 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.36",
-    "@cerc-io/graph-node": "^0.2.36",
-    "@cerc-io/ipld-eth-client": "^0.2.36",
-    "@cerc-io/solidity-mapper": "^0.2.36",
-    "@cerc-io/util": "^0.2.36",
+    "@cerc-io/cli": "^0.2.37",
+    "@cerc-io/graph-node": "^0.2.37",
+    "@cerc-io/ipld-eth-client": "^0.2.37",
+    "@cerc-io/solidity-mapper": "^0.2.37",
+    "@cerc-io/util": "^0.2.37",
     "@ethersproject/providers": "^5.4.4",
     "apollo-type-bigint": "^0.1.3",
     "debug": "^4.3.1",
diff --git a/packages/erc20-watcher/package.json b/packages/erc20-watcher/package.json
index 612e0f89..fd453a05 100644
--- a/packages/erc20-watcher/package.json
+++ b/packages/erc20-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/erc20-watcher",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "description": "ERC20 Watcher",
   "private": true,
   "main": "dist/index.js",
@@ -42,10 +42,10 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.36",
-    "@cerc-io/ipld-eth-client": "^0.2.36",
-    "@cerc-io/solidity-mapper": "^0.2.36",
-    "@cerc-io/util": "^0.2.36",
+    "@cerc-io/cli": "^0.2.37",
+    "@cerc-io/ipld-eth-client": "^0.2.37",
+    "@cerc-io/solidity-mapper": "^0.2.37",
+    "@cerc-io/util": "^0.2.37",
     "@ethersproject/providers": "^5.4.4",
     "apollo-type-bigint": "^0.1.3",
     "debug": "^4.3.1",
diff --git a/packages/erc721-watcher/package.json b/packages/erc721-watcher/package.json
index 90080526..f2c27ad0 100644
--- a/packages/erc721-watcher/package.json
+++ b/packages/erc721-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/erc721-watcher",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "description": "erc721-watcher",
   "private": true,
   "main": "dist/index.js",
@@ -47,10 +47,10 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.36",
-    "@cerc-io/ipld-eth-client": "^0.2.36",
-    "@cerc-io/solidity-mapper": "^0.2.36",
-    "@cerc-io/util": "^0.2.36",
+    "@cerc-io/cli": "^0.2.37",
+    "@cerc-io/ipld-eth-client": "^0.2.37",
+    "@cerc-io/solidity-mapper": "^0.2.37",
+    "@cerc-io/util": "^0.2.37",
     "@ethersproject/providers": "^5.4.4",
     "apollo-type-bigint": "^0.1.3",
     "debug": "^4.3.1",
diff --git a/packages/graph-node/package.json b/packages/graph-node/package.json
index 98b3a323..a1860ce4 100644
--- a/packages/graph-node/package.json
+++ b/packages/graph-node/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@cerc-io/graph-node",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
-    "@cerc-io/solidity-mapper": "^0.2.36",
+    "@cerc-io/solidity-mapper": "^0.2.37",
     "@ethersproject/providers": "^5.4.4",
     "@graphprotocol/graph-ts": "^0.22.0",
     "@nomiclabs/hardhat-ethers": "^2.0.2",
@@ -50,9 +50,9 @@
   "dependencies": {
     "@apollo/client": "^3.3.19",
     "@cerc-io/assemblyscript": "0.19.10-watcher-ts-0.1.2",
-    "@cerc-io/cache": "^0.2.36",
-    "@cerc-io/ipld-eth-client": "^0.2.36",
-    "@cerc-io/util": "^0.2.36",
+    "@cerc-io/cache": "^0.2.37",
+    "@cerc-io/ipld-eth-client": "^0.2.37",
+    "@cerc-io/util": "^0.2.37",
     "@types/json-diff": "^0.5.2",
     "bn.js": "^4.11.9",
     "debug": "^4.3.1",
diff --git a/packages/graph-test-watcher/package.json b/packages/graph-test-watcher/package.json
index a054659f..7a5857e8 100644
--- a/packages/graph-test-watcher/package.json
+++ b/packages/graph-test-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/graph-test-watcher",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "description": "graph-test-watcher",
   "private": true,
   "main": "dist/index.js",
@@ -38,11 +38,11 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.36",
-    "@cerc-io/graph-node": "^0.2.36",
-    "@cerc-io/ipld-eth-client": "^0.2.36",
-    "@cerc-io/solidity-mapper": "^0.2.36",
-    "@cerc-io/util": "^0.2.36",
+    "@cerc-io/cli": "^0.2.37",
+    "@cerc-io/graph-node": "^0.2.37",
+    "@cerc-io/ipld-eth-client": "^0.2.37",
+    "@cerc-io/solidity-mapper": "^0.2.37",
+    "@cerc-io/util": "^0.2.37",
     "@ethersproject/providers": "^5.4.4",
     "apollo-type-bigint": "^0.1.3",
     "debug": "^4.3.1",
diff --git a/packages/ipld-eth-client/package.json b/packages/ipld-eth-client/package.json
index 6ade43c9..d12738ae 100644
--- a/packages/ipld-eth-client/package.json
+++ b/packages/ipld-eth-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/ipld-eth-client",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "description": "IPLD ETH Client",
   "main": "dist/index.js",
   "scripts": {
@@ -20,7 +20,7 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@cerc-io/cache": "^0.2.36",
+    "@cerc-io/cache": "^0.2.37",
     "cross-fetch": "^3.1.4",
     "debug": "^4.3.1",
     "ethers": "^5.4.4",
diff --git a/packages/mobymask-v2-watcher/package.json b/packages/mobymask-v2-watcher/package.json
index 8189be22..3b7c04d6 100644
--- a/packages/mobymask-v2-watcher/package.json
+++ b/packages/mobymask-v2-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/mobymask-v2-watcher",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "description": "mobymask-v2-watcher",
   "private": true,
   "main": "dist/index.js",
@@ -38,11 +38,11 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.36",
-    "@cerc-io/ipld-eth-client": "^0.2.36",
-    "@cerc-io/peer": "^0.2.36",
-    "@cerc-io/solidity-mapper": "^0.2.36",
-    "@cerc-io/util": "^0.2.36",
+    "@cerc-io/cli": "^0.2.37",
+    "@cerc-io/ipld-eth-client": "^0.2.37",
+    "@cerc-io/peer": "^0.2.37",
+    "@cerc-io/solidity-mapper": "^0.2.37",
+    "@cerc-io/util": "^0.2.37",
     "@ethersproject/providers": "^5.4.4",
     "apollo-type-bigint": "^0.1.3",
     "debug": "^4.3.1",
diff --git a/packages/mobymask-watcher/package.json b/packages/mobymask-watcher/package.json
index 4c879fee..eefdabf3 100644
--- a/packages/mobymask-watcher/package.json
+++ b/packages/mobymask-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/mobymask-watcher",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "description": "mobymask-watcher",
   "private": true,
   "main": "dist/index.js",
@@ -37,10 +37,10 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.36",
-    "@cerc-io/ipld-eth-client": "^0.2.36",
-    "@cerc-io/solidity-mapper": "^0.2.36",
-    "@cerc-io/util": "^0.2.36",
+    "@cerc-io/cli": "^0.2.37",
+    "@cerc-io/ipld-eth-client": "^0.2.37",
+    "@cerc-io/solidity-mapper": "^0.2.37",
+    "@cerc-io/util": "^0.2.37",
     "@ethersproject/providers": "^5.4.4",
     "apollo-type-bigint": "^0.1.3",
     "debug": "^4.3.1",
diff --git a/packages/peer/package.json b/packages/peer/package.json
index 94e294e4..2fc5ce16 100644
--- a/packages/peer/package.json
+++ b/packages/peer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/peer",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "description": "libp2p module",
   "main": "dist/index.js",
   "exports": "./dist/index.js",
diff --git a/packages/solidity-mapper/package.json b/packages/solidity-mapper/package.json
index 12b01e28..7f65ebdd 100644
--- a/packages/solidity-mapper/package.json
+++ b/packages/solidity-mapper/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@cerc-io/solidity-mapper",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
-    "@cerc-io/ipld-eth-client": "^0.2.36",
+    "@cerc-io/ipld-eth-client": "^0.2.37",
     "@ethersproject/abi": "^5.3.0",
     "@nomiclabs/hardhat-ethers": "^2.0.2",
     "@nomiclabs/hardhat-waffle": "^2.0.1",
diff --git a/packages/test/package.json b/packages/test/package.json
index 9620c40f..05f4a0c2 100644
--- a/packages/test/package.json
+++ b/packages/test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/test",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "private": true,
diff --git a/packages/tracing-client/package.json b/packages/tracing-client/package.json
index 91a06e02..f04c2458 100644
--- a/packages/tracing-client/package.json
+++ b/packages/tracing-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/tracing-client",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "description": "ETH VM tracing client",
   "private": true,
   "main": "dist/index.js",
diff --git a/packages/util/package.json b/packages/util/package.json
index 85e4bd4a..9214f009 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -1,11 +1,11 @@
 {
   "name": "@cerc-io/util",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "dependencies": {
     "@apollo/utils.keyvaluecache": "^1.0.1",
-    "@cerc-io/solidity-mapper": "^0.2.36",
+    "@cerc-io/solidity-mapper": "^0.2.37",
     "@ethersproject/providers": "^5.4.4",
     "@graphql-tools/schema": "^9.0.10",
     "@graphql-tools/utils": "^9.1.1",
@@ -37,8 +37,8 @@
     "yargs": "^17.0.1"
   },
   "devDependencies": {
-    "@cerc-io/cache": "^0.2.36",
-    "@cerc-io/ipld-eth-client": "^0.2.36",
+    "@cerc-io/cache": "^0.2.37",
+    "@cerc-io/ipld-eth-client": "^0.2.37",
     "@nomiclabs/hardhat-waffle": "^2.0.1",
     "@types/express": "^4.17.14",
     "@types/fs-extra": "^9.0.11",
diff --git a/yarn.lock b/yarn.lock
index 95e790cf..f42cdc13 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3756,7 +3756,7 @@
   resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.5.tgz#738dd390a6ecc5442f35e7f03fa1431353f7e138"
   integrity sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==
 
-"@types/json-bigint@^1.0.0", "@types/json-bigint@^1.0.1":
+"@types/json-bigint@^1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/json-bigint/-/json-bigint-1.0.1.tgz#201062a6990119a8cc18023cfe1fed12fc2fc8a7"
   integrity sha512-zpchZLNsNuzJHi6v64UBoFWAvQlPhch7XAi36FkH6tL1bbbmimIF+cS7vwkzY4u5RaSWMoflQfu+TshMPPw8uw==