diff --git a/package-lock.json b/package-lock.json
index 80da322..abe0e35 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,11 +10,11 @@
       "license": "Apache-2.0",
       "dependencies": {
         "@oceanprotocol/contracts": "^1.1.8",
-        "@oceanprotocol/lib": "^2.5.1",
+        "@oceanprotocol/lib": "^2.5.2",
         "cross-fetch": "^3.1.4"
       },
       "devDependencies": {
-        "@graphprotocol/graph-cli": "^0.35.0",
+        "@graphprotocol/graph-cli": "^0.36.1",
         "@graphprotocol/graph-ts": "^0.29.0",
         "@types/chai": "^4.3.4",
         "@types/chai-spies": "^1.0.3",
@@ -39,7 +39,7 @@
         "ts-node": "^10.9.1",
         "ts-node-dev": "^2.0.0",
         "ts-node-register": "^1.0.0",
-        "typescript": "^4.8.4"
+        "typescript": "^4.9.3"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -582,12 +582,55 @@
         "@ethersproject/strings": "^5.7.0"
       }
     },
-    "node_modules/@graphprotocol/graph-cli": {
-      "version": "0.35.0",
-      "resolved": "https://registry.npmjs.org/@graphprotocol/graph-cli/-/graph-cli-0.35.0.tgz",
-      "integrity": "sha512-50tjeLZg3425fwueH8ORTZbPRSn4uICL0NK9XsJVriDPKCNnhyAIgJgOWaYyPAFgxR8LuyXYkoxIxZ5nduKbiw==",
+    "node_modules/@float-capital/float-subgraph-uncrashable": {
+      "version": "0.0.0-alpha.4",
+      "resolved": "https://registry.npmjs.org/@float-capital/float-subgraph-uncrashable/-/float-subgraph-uncrashable-0.0.0-alpha.4.tgz",
+      "integrity": "sha512-3DPy66rMvGAFDDv7craf/Vgz1fLfuU0QSJ16HB1CRZyFQFqICFHbDL7h04zqG8i255z8cfBcgYq+zSxVzeEyLw==",
       "dev": true,
       "dependencies": {
+        "graphql": "^16.6.0",
+        "graphql-import-node": "^0.0.5",
+        "js-yaml": "^4.1.0",
+        "rescript": "^9.1.4"
+      },
+      "bin": {
+        "uncrashable": "bin/uncrashable"
+      }
+    },
+    "node_modules/@float-capital/float-subgraph-uncrashable/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/@float-capital/float-subgraph-uncrashable/node_modules/graphql": {
+      "version": "16.6.0",
+      "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.6.0.tgz",
+      "integrity": "sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
+      }
+    },
+    "node_modules/@float-capital/float-subgraph-uncrashable/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/@graphprotocol/graph-cli": {
+      "version": "0.36.1",
+      "resolved": "https://registry.npmjs.org/@graphprotocol/graph-cli/-/graph-cli-0.36.1.tgz",
+      "integrity": "sha512-JTiIyPBxLKBOliC7Mdci8A+ApzOmfuGRHNQukgZVWn2+ktld/d/hPLghEKIgE+Fy4z8hCWa865oPUHV6r/J4+Q==",
+      "dev": true,
+      "dependencies": {
+        "@float-capital/float-subgraph-uncrashable": "^0.0.0-alpha.4",
         "assemblyscript": "0.19.10",
         "binary-install-raw": "0.0.13",
         "chalk": "3.0.0",
@@ -889,9 +932,9 @@
       "integrity": "sha512-I6xoADZpP/8EyN3VWZ+dLYv24DbJj3xzmSDcYv0FolXeAUF3FluzminL5AgQtAaoyUtlHl1D3ij1B++KupWcQQ=="
     },
     "node_modules/@oceanprotocol/lib": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-2.5.1.tgz",
-      "integrity": "sha512-PA4qUG96IEh9AfGGRw67YdltfadrErM3JcAadOyOL8P6bMlSvlUh9v6rUCrQWT3GwiC5fk2Mv4OqJ3FEwrYbsQ==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-2.5.2.tgz",
+      "integrity": "sha512-hLNTS6go1GhpSJt7un1VPb/6XNNYSwGpYPX/O1E5q2XCRWjaWYodzqwxBcgQKw2ihSQmaH9JsDsFLZiIKqKRLA==",
       "dependencies": {
         "@oceanprotocol/contracts": "^1.1.8",
         "bignumber.js": "^9.1.0",
@@ -6231,6 +6274,15 @@
         "node": ">= 10.x"
       }
     },
+    "node_modules/graphql-import-node": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/graphql-import-node/-/graphql-import-node-0.0.5.tgz",
+      "integrity": "sha512-OXbou9fqh9/Lm7vwXT0XoRN9J5+WCYKnbiTalgFDvkQERITRmcfncZs6aVABedd5B85yQU5EULS4a5pnbpuI0Q==",
+      "dev": true,
+      "peerDependencies": {
+        "graphql": "*"
+      }
+    },
     "node_modules/handlebars": {
       "version": "4.7.7",
       "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
@@ -11478,6 +11530,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/rescript": {
+      "version": "9.1.4",
+      "resolved": "https://registry.npmjs.org/rescript/-/rescript-9.1.4.tgz",
+      "integrity": "sha512-aXANK4IqecJzdnDpJUsU6pxMViCR5ogAxzuqS0mOr8TloMnzAjJFu63fjD6LCkWrKAhlMkFFzQvVQYaAaVkFXw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "bsc": "bsc",
+        "bsrefmt": "bsrefmt",
+        "bstracing": "lib/bstracing",
+        "rescript": "rescript"
+      }
+    },
     "node_modules/resolve": {
       "version": "1.22.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
@@ -13068,9 +13133,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
-      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz",
+      "integrity": "sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -14719,12 +14784,48 @@
         "@ethersproject/strings": "^5.7.0"
       }
     },
-    "@graphprotocol/graph-cli": {
-      "version": "0.35.0",
-      "resolved": "https://registry.npmjs.org/@graphprotocol/graph-cli/-/graph-cli-0.35.0.tgz",
-      "integrity": "sha512-50tjeLZg3425fwueH8ORTZbPRSn4uICL0NK9XsJVriDPKCNnhyAIgJgOWaYyPAFgxR8LuyXYkoxIxZ5nduKbiw==",
+    "@float-capital/float-subgraph-uncrashable": {
+      "version": "0.0.0-alpha.4",
+      "resolved": "https://registry.npmjs.org/@float-capital/float-subgraph-uncrashable/-/float-subgraph-uncrashable-0.0.0-alpha.4.tgz",
+      "integrity": "sha512-3DPy66rMvGAFDDv7craf/Vgz1fLfuU0QSJ16HB1CRZyFQFqICFHbDL7h04zqG8i255z8cfBcgYq+zSxVzeEyLw==",
       "dev": true,
       "requires": {
+        "graphql": "^16.6.0",
+        "graphql-import-node": "^0.0.5",
+        "js-yaml": "^4.1.0",
+        "rescript": "^9.1.4"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+          "dev": true
+        },
+        "graphql": {
+          "version": "16.6.0",
+          "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.6.0.tgz",
+          "integrity": "sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==",
+          "dev": true
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "dev": true,
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        }
+      }
+    },
+    "@graphprotocol/graph-cli": {
+      "version": "0.36.1",
+      "resolved": "https://registry.npmjs.org/@graphprotocol/graph-cli/-/graph-cli-0.36.1.tgz",
+      "integrity": "sha512-JTiIyPBxLKBOliC7Mdci8A+ApzOmfuGRHNQukgZVWn2+ktld/d/hPLghEKIgE+Fy4z8hCWa865oPUHV6r/J4+Q==",
+      "dev": true,
+      "requires": {
+        "@float-capital/float-subgraph-uncrashable": "^0.0.0-alpha.4",
         "assemblyscript": "0.19.10",
         "binary-install-raw": "0.0.13",
         "chalk": "3.0.0",
@@ -14956,9 +15057,9 @@
       "integrity": "sha512-I6xoADZpP/8EyN3VWZ+dLYv24DbJj3xzmSDcYv0FolXeAUF3FluzminL5AgQtAaoyUtlHl1D3ij1B++KupWcQQ=="
     },
     "@oceanprotocol/lib": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-2.5.1.tgz",
-      "integrity": "sha512-PA4qUG96IEh9AfGGRw67YdltfadrErM3JcAadOyOL8P6bMlSvlUh9v6rUCrQWT3GwiC5fk2Mv4OqJ3FEwrYbsQ==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-2.5.2.tgz",
+      "integrity": "sha512-hLNTS6go1GhpSJt7un1VPb/6XNNYSwGpYPX/O1E5q2XCRWjaWYodzqwxBcgQKw2ihSQmaH9JsDsFLZiIKqKRLA==",
       "requires": {
         "@oceanprotocol/contracts": "^1.1.8",
         "bignumber.js": "^9.1.0",
@@ -19112,6 +19213,13 @@
       "integrity": "sha512-OmaM7y0kaK31NKG31q4YbD2beNYa6jBBKtMFT6gLYJljHLJr42IqJ8KX08u3Li/0ifzTU5HjmoOOrwa5BRLeDA==",
       "dev": true
     },
+    "graphql-import-node": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/graphql-import-node/-/graphql-import-node-0.0.5.tgz",
+      "integrity": "sha512-OXbou9fqh9/Lm7vwXT0XoRN9J5+WCYKnbiTalgFDvkQERITRmcfncZs6aVABedd5B85yQU5EULS4a5pnbpuI0Q==",
+      "dev": true,
+      "requires": {}
+    },
     "handlebars": {
       "version": "4.7.7",
       "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
@@ -23034,6 +23142,12 @@
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
       "dev": true
     },
+    "rescript": {
+      "version": "9.1.4",
+      "resolved": "https://registry.npmjs.org/rescript/-/rescript-9.1.4.tgz",
+      "integrity": "sha512-aXANK4IqecJzdnDpJUsU6pxMViCR5ogAxzuqS0mOr8TloMnzAjJFu63fjD6LCkWrKAhlMkFFzQvVQYaAaVkFXw==",
+      "dev": true
+    },
     "resolve": {
       "version": "1.22.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
@@ -24279,9 +24393,9 @@
       }
     },
     "typescript": {
-      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
-      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz",
+      "integrity": "sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==",
       "dev": true
     },
     "uglify-js": {
diff --git a/package.json b/package.json
index e6401d7..b471c54 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "changelog": "auto-changelog -p"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "^0.35.0",
+    "@graphprotocol/graph-cli": "^0.36.1",
     "@graphprotocol/graph-ts": "^0.29.0",
     "@types/chai": "^4.3.4",
     "@types/chai-spies": "^1.0.3",
@@ -65,11 +65,11 @@
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0",
     "ts-node-register": "^1.0.0",
-    "typescript": "^4.8.4"
+    "typescript": "^4.9.3"
   },
   "dependencies": {
     "@oceanprotocol/contracts": "^1.1.8",
-    "@oceanprotocol/lib": "^2.5.1",
+    "@oceanprotocol/lib": "^2.5.2",
     "cross-fetch": "^3.1.4"
   },
   "repository": {