Merge branch 'main' into feature/predictoor

CHANGELOG.md

@@ -4,12 +4,23 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v3.0.10](https://github.com/oceanprotocol/ocean-subgraph/compare/v3.0.9...v3.0.10)
+
+- Bump to graphnode 0.28.2 [`#702`](https://github.com/oceanprotocol/ocean-subgraph/pull/702)
+- Template id detection [`#705`](https://github.com/oceanprotocol/ocean-subgraph/pull/705)
+- reduce docker siz [`#709`](https://github.com/oceanprotocol/ocean-subgraph/pull/709)
+- Create README.md [`#698`](https://github.com/oceanprotocol/ocean-subgraph/pull/698)
+- Bump word-wrap from 1.2.3 to 1.2.4 [`#701`](https://github.com/oceanprotocol/ocean-subgraph/pull/701)
+
 #### [v3.0.9](https://github.com/oceanprotocol/ocean-subgraph/compare/v3.0.8...v3.0.9)
 
+> 4 July 2023
+
 - bump to latest contracts [`#695`](https://github.com/oceanprotocol/ocean-subgraph/pull/695)
 - Bump release-it from 15.10.3 to 15.11.0 [`#688`](https://github.com/oceanprotocol/ocean-subgraph/pull/688)
 - Bump mock-local-storage from 1.1.23 to 1.1.24 [`#683`](https://github.com/oceanprotocol/ocean-subgraph/pull/683)
 - Bump vm2 from 3.9.17 to 3.9.18 [`#681`](https://github.com/oceanprotocol/ocean-subgraph/pull/681)
+- Release 3.0.9 [`a62a4c1`](https://github.com/oceanprotocol/ocean-subgraph/commit/a62a4c189ddd5f712acb62a683dec1c9c8e067b9)
 
 #### [v3.0.8](https://github.com/oceanprotocol/ocean-subgraph/compare/v3.0.7...v3.0.8)
 

Dockerfile

@@ -1,9 +1,24 @@
-FROM node:16
 
+FROM ubuntu:20.04 as base
+RUN apt-get update && apt-get -y install bash curl
+RUN curl -sL https://deb.nodesource.com/setup_16.x -o /tmp/nodesource_setup.sh
+RUN bash /tmp/nodesource_setup.sh
+RUN apt install nodejs
+
+
+
+FROM base as builder
+RUN apt-get update && apt-get -y install wget
 COPY package*.json /usr/src/app/
-WORKDIR /usr/src/app
-RUN npm install 
+WORKDIR /usr/src/app/
+ENV NODE_ENV=production
+RUN npm ci
 
+
+FROM base as runner
+ENV NODE_ENV=production
 COPY . /usr/src/app
+WORKDIR /usr/src/app/
+COPY --from=builder /usr/src/app/node_modules/ /usr/src/app/node_modules/
 ENV DEPLOY_SUBGRAPH=true
 ENTRYPOINT ["/usr/src/app/docker-entrypoint.sh"]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocean-subgraph",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "scripts": {
     "start": "",
     "quickstart:development": "node ./scripts/generatenetworkssubgraphs.js development && npm run codegen && npm run create:local && npm run deploy:local",
@@ -52,12 +52,14 @@
     "@graphprotocol/graph-ts": "^0.30.0",
     "@types/chai": "^4.3.5",
     "@types/chai-spies": "^1.0.3",
-    "@types/mocha": "^10.0.1",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
+    "@types/mocha": "^10.0.2",
+    "@types/node": "^20.8.2",
+    "@typescript-eslint/eslint-plugin": "^6.7.4",
+    "@typescript-eslint/parser": "^6.7.4",
     "auto-changelog": "^2.4.0",
     "chai": "^4.3.7",
     "chai-spies": "^1.0.0",
+    "cross-fetch": "^3.1.6",
     "eslint": "^7.32.0",
     "eslint-config-oceanprotocol": "^2.0.4",
     "eslint-config-prettier": "^8.8.0",
@@ -65,6 +67,7 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-standard": "^5.0.0",
+    "ethereumjs-util": "^7.1.5",
     "mocha": "^10.2.0",
     "mock-local-storage": "^1.1.24",
     "prettier": "^2.8.8",
@@ -73,10 +76,10 @@
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0",
     "ts-node-register": "^1.0.0",
-    "typescript": "^5.0.4"
+    "typescript": "^5.2.2"
   },
   "dependencies": {
-    "@oceanprotocol/contracts": "^2.0.0-next.14",
+    "@oceanprotocol/contracts": "^2.0.2",
     "@oceanprotocol/lib": "^2.7.0",
     "cross-fetch": "^3.1.6",
     "ethereumjs-util": "^7.1.5"

src/mappings/utils/globalUtils.ts

@@ -13,7 +13,7 @@ export function getGlobalStats(): GlobalStatistic {
   let globalStats = GlobalStatistic.load(GLOBAL_ID)
   if (!globalStats) {
     globalStats = new GlobalStatistic(GLOBAL_ID)
-    globalStats.version = '3.0.9'
+    globalStats.version = '3.0.10'
     globalStats.orderCount = 0
     globalStats.fixedCount = 0
     globalStats.datatokenCount = 0

test/integration/Datatoken.test.ts

@@ -1,3 +1,4 @@
+import 'mocha'
 import {
   DatatokenCreateParams,
   ProviderInstance,