From 3cf54ffe5469520f253efb5bee4df6c0dd601bc4 Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Mon, 15 May 2023 11:20:52 +0300
Subject: [PATCH 01/31] customize for predictoor

---
 compose-files/ganache.yml |  2 +-
 start_ocean.sh            | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/compose-files/ganache.yml b/compose-files/ganache.yml
index 3faa970..d601c48 100644
--- a/compose-files/ganache.yml
+++ b/compose-files/ganache.yml
@@ -7,4 +7,4 @@ services:
     networks:
       backend:
         ipv4_address: 172.15.0.3
-    entrypoint: ["node","/app/dist/node/cli.js","--database.dbPath", "./ganache_cache","--chain.chainId","0x2324","--chain.networkId","0x2324","-l","10000000000","-g","1","--chain.hardfork","istanbul","--miner.blockTime","0","--miner.instamine", "eager","--wallet.mnemonic","${GANACHE_MNEMONIC}", "-e","1000000"]
+    entrypoint: ["node","/app/dist/node/cli.js","--database.dbPath", "./ganache_cache","--chain.chainId","0x2324","--chain.networkId","0x2324","-l","10000000000","-g","1","--chain.hardfork","${GANACHE_FORK}","--miner.blockTime","${GANACHE_BLOCKTIME}","--miner.instamine","${GANACHE_INSTAMINE}","--wallet.mnemonic","${GANACHE_MNEMONIC}", "-e","1000000"]
diff --git a/start_ocean.sh b/start_ocean.sh
index 6fd2bd4..1e27566 100755
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -63,8 +63,13 @@ else
 fi
 export NETWORK_RPC_PORT="8545"
 export NETWORK_RPC_URL="http://"${NETWORK_RPC_HOST}:${NETWORK_RPC_PORT}
+
 # Use this seed on ganache to always create the same wallets
 export GANACHE_MNEMONIC=${GANACHE_MNEMONIC:-"taxi music thumb unique chat sand crew more leg another off lamp"}
+export GANACHE_INSTAMINE=${GANACHE_INSTAMINE:-"eager"}
+export GANACHE_BLOCKTIME=${GANACHE_BLOCKTIME:-0}
+export GANACHE_FORK=${GANACHE_FORK:-"istanbul"}
+
 
 # Ocean contracts
 export OCEAN_HOME="${HOME}/.ocean"
@@ -264,6 +269,22 @@ while :; do
             export DEPLOY_SUBGRAPH=false
             printf $COLOR_Y'Ocean subgraph will not be deployed, the last deployment (if any) will be intact ...\n\n'$COLOR_RESET
             ;;
+        --predictoor)
+            # Add what we need
+            COMPOSE_FILES+=" -f ${COMPOSE_DIR}/thegraph.yml"
+            # Remove what is not needed for now
+            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/provider.yml/}"
+            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/redis.yml/}"
+            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/aquarius.yml/}"
+            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/elasticsearch.yml/}"
+            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/dashboard.yml/}"
+            # Enforce images
+            export CONTRACTS_VERSION=predictoor
+            export SUBGRAPH_VERSION=predictoor
+            # replicate true blockchain behiavour
+            export GANACHE_INSTAMINE=strict
+            export GANACHE_BLOCKTIME=12
+            ;;
         #################################################
         # Cleaning switches
         #################################################

From 401efa559ef30bde840f22241ddd6382ef7d97df Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Mon, 15 May 2023 11:40:34 +0300
Subject: [PATCH 02/31] add aqua/provider for ocean.py

---
 start_ocean.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/start_ocean.sh b/start_ocean.sh
index 1e27566..7c8844f 100755
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -273,10 +273,10 @@ while :; do
             # Add what we need
             COMPOSE_FILES+=" -f ${COMPOSE_DIR}/thegraph.yml"
             # Remove what is not needed for now
-            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/provider.yml/}"
-            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/redis.yml/}"
-            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/aquarius.yml/}"
-            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/elasticsearch.yml/}"
+            #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/provider.yml/}"
+            #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/redis.yml/}"
+            #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/aquarius.yml/}"
+            #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/elasticsearch.yml/}"
             COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/dashboard.yml/}"
             # Enforce images
             export CONTRACTS_VERSION=predictoor

From cec4717cc6ba02f05d816322346494d877c81e36 Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Mon, 15 May 2023 12:09:10 +0300
Subject: [PATCH 03/31] make it faster

---
 start_ocean.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/start_ocean.sh b/start_ocean.sh
index 7c8844f..ad02d1e 100755
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -283,7 +283,7 @@ while :; do
             export SUBGRAPH_VERSION=predictoor
             # replicate true blockchain behiavour
             export GANACHE_INSTAMINE=strict
-            export GANACHE_BLOCKTIME=12
+            export GANACHE_BLOCKTIME=1
             ;;
         #################################################
         # Cleaning switches

From 053f2693265c012fbaaadbd76c243a033efd5837 Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Tue, 16 May 2023 14:33:26 +0300
Subject: [PATCH 04/31] update

---
 start_ocean.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/start_ocean.sh b/start_ocean.sh
index ad02d1e..1d2a5fe 100755
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -272,7 +272,7 @@ while :; do
         --predictoor)
             # Add what we need
             COMPOSE_FILES+=" -f ${COMPOSE_DIR}/thegraph.yml"
-            # Remove what is not needed for now
+            # We should remove what is not needed for now, but ocean,py requires both aqua & provider
             #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/provider.yml/}"
             #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/redis.yml/}"
             #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/aquarius.yml/}"

From 4815fd8772b80b2cf4f481335a03e9b349dc5c1b Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Mon, 22 May 2023 10:06:10 +0300
Subject: [PATCH 05/31] add pdr* components

---
 cleanup.sh                       |  6 ++++++
 compose-files/pdr-predictoor.yml | 20 ++++++++++++++++++++
 compose-files/pdr-trader.yml     | 20 ++++++++++++++++++++
 compose-files/pdr-trueval.yml    | 20 ++++++++++++++++++++
 compose-files/thegraph.yml       |  1 +
 start_ocean.sh                   | 23 +++++++++++++++++++++++
 6 files changed, 90 insertions(+)
 create mode 100644 compose-files/pdr-predictoor.yml
 create mode 100644 compose-files/pdr-trader.yml
 create mode 100644 compose-files/pdr-trueval.yml

diff --git a/cleanup.sh b/cleanup.sh
index be8b1f8..4f87596 100755
--- a/cleanup.sh
+++ b/cleanup.sh
@@ -15,6 +15,9 @@ docker container stop ocean_kindcluster_1
 docker container stop ocean_redis_1
 docker container stop ocean_dashboard_1
 docker container stop docker-registry
+docker container stop ocean_pdr-trader_1
+docker container stop ocean_pdr-predictoor_1
+docker container stop ocean_pdr-trueval_1
 docker container rm ocean_aquarius_1
 docker container rm ocean_graph-node_1
 docker container rm ocean_subgraph_1
@@ -31,6 +34,9 @@ docker container rm ocean_kindcluster_1
 docker container rm ocean_redis_1
 docker container rm ocean_dashboard_1
 docker container rm docker-registry
+docker container rm ocean_pdr-trader_1
+docker container rm ocean_pdr-predictoor_1
+docker container rm ocean_pdr-trueval_1
 docker volume rm ocean_graphipfs
 docker volume rm ocean_graphpgsql
 docker volume rm ocean_provider1db
diff --git a/compose-files/pdr-predictoor.yml b/compose-files/pdr-predictoor.yml
new file mode 100644
index 0000000..5241948
--- /dev/null
+++ b/compose-files/pdr-predictoor.yml
@@ -0,0 +1,20 @@
+version: '3'
+services:
+  pdr-predictoor:
+    image: oceanprotocol/pdr-predictoor:${PDR_PREDICTOOR_VERSION:-latest}
+    networks:
+      backend:
+        ipv4_address: 172.15.0.41
+    depends_on:
+    - ocean-contracts
+    environment:
+      RPC_URL: ${NETWORK_RPC_URL}
+      SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph
+      PRIVATE_KEY: "0xef4b441145c1d0f3b4bc6d61d29f5c6e502359481152f869247c7a4244d45209"
+      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
+      WAIT_FOR_SUBGRAPH: "true"
+    depends_on:
+      - ganache
+    volumes:
+    - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
+    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
\ No newline at end of file
diff --git a/compose-files/pdr-trader.yml b/compose-files/pdr-trader.yml
new file mode 100644
index 0000000..81f5475
--- /dev/null
+++ b/compose-files/pdr-trader.yml
@@ -0,0 +1,20 @@
+version: '3'
+services:
+  pdr-trader:
+    image: oceanprotocol/pdr-trader:${PDR_TRADER_VERSION:-latest}
+    networks:
+      backend:
+        ipv4_address: 172.15.0.42
+    depends_on:
+    - ocean-contracts
+    environment:
+      RPC_URL: ${NETWORK_RPC_URL}
+      SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph
+      PRIVATE_KEY: "0x8467415bb2ba7c91084d932276214b11a3dd9bdb2930fefa194b666dd8020b99"
+      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
+      WAIT_FOR_SUBGRAPH: "true"
+    depends_on:
+      - ganache
+    volumes:
+    - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
+    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
\ No newline at end of file
diff --git a/compose-files/pdr-trueval.yml b/compose-files/pdr-trueval.yml
new file mode 100644
index 0000000..48028b7
--- /dev/null
+++ b/compose-files/pdr-trueval.yml
@@ -0,0 +1,20 @@
+version: '3'
+services:
+  pdr-trueval:
+    image: oceanprotocol/pdr-trueval:${PDR_TRUEVAL_VERSION:-latest}
+    networks:
+      backend:
+        ipv4_address: 172.15.0.40
+    depends_on:
+    - ocean-contracts
+    environment:
+      RPC_URL: ${NETWORK_RPC_URL}
+      SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph
+      PRIVATE_KEY: "0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58"
+      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
+      WAIT_FOR_SUBGRAPH: "true"
+    depends_on:
+      - ganache
+    volumes:
+    - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
+    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
\ No newline at end of file
diff --git a/compose-files/thegraph.yml b/compose-files/thegraph.yml
index 5338906..9ed46ee 100644
--- a/compose-files/thegraph.yml
+++ b/compose-files/thegraph.yml
@@ -49,6 +49,7 @@ services:
       - ocean-contracts
     volumes:
     - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
+    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
 volumes:
   graphpgsql:
 
diff --git a/start_ocean.sh b/start_ocean.sh
index 1d2a5fe..5902978 100755
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -41,6 +41,13 @@ export POD_CONFIGURATION_VERSION=${POD_CONFIGURATION_VERSION:-oceanprotocol/pod-
 export POD_PUBLISHING_VERSION=${POD_PUBLISHING_VERSION:-oceanprotocol/pod-publishing:v4main}
 export WAIT_FOR_C2DIMAGES=${WAIT_FOR_C2DIMAGES:-false}
 
+
+
+export PDR_TRUEVAL_VERSION=${PDR_TRUEVAL_VERSION:-latest}
+export PDR_PREDICTOOR_VERSION=${PDR_PREDICTOOR_VERSION:-latest}
+export PDR_TRADER_VERSION=${PDR_TRADER_VERSION:-latest}
+
+
 export PROJECT_NAME="ocean"
 export FORCEPULL="false"
 
@@ -80,6 +87,10 @@ export OCEAN_ARTIFACTS_FOLDER="${OCEAN_HOME}/ocean-contracts/artifacts"
 mkdir -p ${OCEAN_ARTIFACTS_FOLDER}
 export OCEAN_C2D_FOLDER="${OCEAN_HOME}/ocean-c2d/"
 mkdir -p ${OCEAN_C2D_FOLDER}
+export OCEAN_SUBGRAPH_FOLDER="${OCEAN_HOME}/ocean-subgraph/"
+rm -f "${OCEAN_SUBGRAPH_FOLDER}/ready"
+mkdir -p ${OCEAN_SUBGRAPH_FOLDER}
+
 export ADDRESS_FILE="${OCEAN_ARTIFACTS_FOLDER}/address.json"
 echo "export ADDRESS_FILE=${ADDRESS_FILE}"
 
@@ -285,6 +296,18 @@ while :; do
             export GANACHE_INSTAMINE=strict
             export GANACHE_BLOCKTIME=1
             ;;
+        --with-pdr-trueval)
+            COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pdr-trueval.yml"
+            printf $COLOR_Y'Starting with pdr-trueval...\n\n'$COLOR_RESET
+            ;;
+        --with-pdr-trader)
+            COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pdr-trader.yml"
+            printf $COLOR_Y'Starting with pdr-trader...\n\n'$COLOR_RESET
+            ;;
+        --with-pdr-predictoor)
+            COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pdr-predictoor.yml"
+            printf $COLOR_Y'Starting with pdr-predictoor...\n\n'$COLOR_RESET
+            ;;
         #################################################
         # Cleaning switches
         #################################################

From d2341292dc369c14f4a45a5811ca190b88d6d788 Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Wed, 24 May 2023 13:11:15 +0300
Subject: [PATCH 06/31] add pdr-publisher

---
 cleanup.sh                      |  2 ++
 compose-files/pdr-publisher.yml | 17 +++++++++++++++++
 start_ocean.sh                  |  5 +++++
 3 files changed, 24 insertions(+)
 create mode 100644 compose-files/pdr-publisher.yml

diff --git a/cleanup.sh b/cleanup.sh
index 4f87596..fcf5193 100755
--- a/cleanup.sh
+++ b/cleanup.sh
@@ -18,6 +18,7 @@ docker container stop docker-registry
 docker container stop ocean_pdr-trader_1
 docker container stop ocean_pdr-predictoor_1
 docker container stop ocean_pdr-trueval_1
+docker container stop ocean_pdr-publisher_1
 docker container rm ocean_aquarius_1
 docker container rm ocean_graph-node_1
 docker container rm ocean_subgraph_1
@@ -37,6 +38,7 @@ docker container rm docker-registry
 docker container rm ocean_pdr-trader_1
 docker container rm ocean_pdr-predictoor_1
 docker container rm ocean_pdr-trueval_1
+docker container rm ocean_pdr-publisher_1
 docker volume rm ocean_graphipfs
 docker volume rm ocean_graphpgsql
 docker volume rm ocean_provider1db
diff --git a/compose-files/pdr-publisher.yml b/compose-files/pdr-publisher.yml
new file mode 100644
index 0000000..4f66c18
--- /dev/null
+++ b/compose-files/pdr-publisher.yml
@@ -0,0 +1,17 @@
+version: '3'
+services:
+  pdr-publisher:
+    image: oceanprotocol/pdr-publisher:${PDR_PUBLISHER_VERSION:-latest}
+    networks:
+      backend:
+        ipv4_address: 172.15.0.43
+    depends_on:
+    - ocean-contracts
+    environment:
+      RPC_URL: ${NETWORK_RPC_URL}
+      ADDRESS_FILE: /root/.ocean/ocean-contracts/artifacts/address.json
+      WAIT_FOR_CONTRACTS: "true"
+    depends_on:
+      - ganache
+    volumes:
+    - ${OCEAN_ARTIFACTS_FOLDER}:/root/.ocean/ocean-contracts/artifacts
diff --git a/start_ocean.sh b/start_ocean.sh
index 5902978..c0fff23 100755
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -46,6 +46,7 @@ export WAIT_FOR_C2DIMAGES=${WAIT_FOR_C2DIMAGES:-false}
 export PDR_TRUEVAL_VERSION=${PDR_TRUEVAL_VERSION:-latest}
 export PDR_PREDICTOOR_VERSION=${PDR_PREDICTOOR_VERSION:-latest}
 export PDR_TRADER_VERSION=${PDR_TRADER_VERSION:-latest}
+export PDR_PUBLISHER_VERSION=${PDR_PUBLISHER_VERSION:-latest}
 
 
 export PROJECT_NAME="ocean"
@@ -308,6 +309,10 @@ while :; do
             COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pdr-predictoor.yml"
             printf $COLOR_Y'Starting with pdr-predictoor...\n\n'$COLOR_RESET
             ;;
+        --with-pdr-publisher)
+            COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pdr-publisher.yml"
+            printf $COLOR_Y'Starting with pdr-publisher...\n\n'$COLOR_RESET
+            ;;
         #################################################
         # Cleaning switches
         #################################################

From c09237992755e72434f870da7055ee0f1fa76ca7 Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Wed, 24 May 2023 15:09:07 +0300
Subject: [PATCH 07/31] fix

---
 compose-files/pdr-predictoor.yml | 2 --
 compose-files/pdr-publisher.yml  | 2 --
 compose-files/pdr-trader.yml     | 2 --
 compose-files/pdr-trueval.yml    | 2 --
 4 files changed, 8 deletions(-)

diff --git a/compose-files/pdr-predictoor.yml b/compose-files/pdr-predictoor.yml
index 5241948..edc4aa8 100644
--- a/compose-files/pdr-predictoor.yml
+++ b/compose-files/pdr-predictoor.yml
@@ -5,8 +5,6 @@ services:
     networks:
       backend:
         ipv4_address: 172.15.0.41
-    depends_on:
-    - ocean-contracts
     environment:
       RPC_URL: ${NETWORK_RPC_URL}
       SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph
diff --git a/compose-files/pdr-publisher.yml b/compose-files/pdr-publisher.yml
index 4f66c18..423ce04 100644
--- a/compose-files/pdr-publisher.yml
+++ b/compose-files/pdr-publisher.yml
@@ -5,8 +5,6 @@ services:
     networks:
       backend:
         ipv4_address: 172.15.0.43
-    depends_on:
-    - ocean-contracts
     environment:
       RPC_URL: ${NETWORK_RPC_URL}
       ADDRESS_FILE: /root/.ocean/ocean-contracts/artifacts/address.json
diff --git a/compose-files/pdr-trader.yml b/compose-files/pdr-trader.yml
index 81f5475..e9415b8 100644
--- a/compose-files/pdr-trader.yml
+++ b/compose-files/pdr-trader.yml
@@ -5,8 +5,6 @@ services:
     networks:
       backend:
         ipv4_address: 172.15.0.42
-    depends_on:
-    - ocean-contracts
     environment:
       RPC_URL: ${NETWORK_RPC_URL}
       SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph
diff --git a/compose-files/pdr-trueval.yml b/compose-files/pdr-trueval.yml
index 48028b7..321b7da 100644
--- a/compose-files/pdr-trueval.yml
+++ b/compose-files/pdr-trueval.yml
@@ -5,8 +5,6 @@ services:
     networks:
       backend:
         ipv4_address: 172.15.0.40
-    depends_on:
-    - ocean-contracts
     environment:
       RPC_URL: ${NETWORK_RPC_URL}
       SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph

From bba9ef5ddd87f81cb6c4eeaeb96c94ed1be126a3 Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Wed, 24 May 2023 20:35:42 +0300
Subject: [PATCH 08/31] increase ganache block size

---
 compose-files/ganache.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose-files/ganache.yml b/compose-files/ganache.yml
index d601c48..9995528 100644
--- a/compose-files/ganache.yml
+++ b/compose-files/ganache.yml
@@ -7,4 +7,4 @@ services:
     networks:
       backend:
         ipv4_address: 172.15.0.3
-    entrypoint: ["node","/app/dist/node/cli.js","--database.dbPath", "./ganache_cache","--chain.chainId","0x2324","--chain.networkId","0x2324","-l","10000000000","-g","1","--chain.hardfork","${GANACHE_FORK}","--miner.blockTime","${GANACHE_BLOCKTIME}","--miner.instamine","${GANACHE_INSTAMINE}","--wallet.mnemonic","${GANACHE_MNEMONIC}", "-e","1000000"]
+    entrypoint: ["node","/app/dist/node/cli.js","--database.dbPath", "./ganache_cache","--chain.chainId","0x2324","--chain.networkId","0x2324","-l","20000000000","-g","1","--chain.hardfork","${GANACHE_FORK}","--miner.blockTime","${GANACHE_BLOCKTIME}","--miner.instamine","${GANACHE_INSTAMINE}","--wallet.mnemonic","${GANACHE_MNEMONIC}", "-e","1000000"]

From 43a9fd262e3669cba551433597170bd1c84bf7ae Mon Sep 17 00:00:00 2001
From: Alex Coseru <alex.coseru@gmail.com>
Date: Thu, 6 Jul 2023 17:32:34 +0300
Subject: [PATCH 09/31] Update start_ocean.sh

---
 start_ocean.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/start_ocean.sh b/start_ocean.sh
index c0fff23..69013a0 100755
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -291,7 +291,7 @@ while :; do
             #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/elasticsearch.yml/}"
             COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/dashboard.yml/}"
             # Enforce images
-            export CONTRACTS_VERSION=predictoor
+            export CONTRACTS_VERSION=predictoor2
             export SUBGRAPH_VERSION=predictoor
             # replicate true blockchain behiavour
             export GANACHE_INSTAMINE=strict

From c47f1e56f342f6df8acd5a31ee3e5f089b2a4c0c Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Tue, 18 Jul 2023 14:43:24 +0300
Subject: [PATCH 10/31] add pdr-dfbuyer

---
 compose-files/pdr-dfbuyer.yml | 19 +++++++++++++++++++
 start_ocean.sh                |  9 +++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 compose-files/pdr-dfbuyer.yml

diff --git a/compose-files/pdr-dfbuyer.yml b/compose-files/pdr-dfbuyer.yml
new file mode 100644
index 0000000..0946c97
--- /dev/null
+++ b/compose-files/pdr-dfbuyer.yml
@@ -0,0 +1,19 @@
+version: '3'
+services:
+  pdr-predictoor:
+    image: oceanprotocol/pdr-dfbuyer:${PDR_DFBUYER_VERSION:-latest}
+    networks:
+      backend:
+        ipv4_address: 172.15.0.41
+    environment:
+      RPC_URL: ${NETWORK_RPC_URL}
+      SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph
+      PRIVATE_KEY: "0x1f990f8b013fc5c7955e0f8746f11ded231721b9cf3f99ff06cdc03492b28090"
+      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
+      WAIT_FOR_SUBGRAPH: "true"
+      WEEKLY_SPEND_LIMIT: 10000
+    depends_on:
+      - ganache
+    volumes:
+    - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
+    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
\ No newline at end of file
diff --git a/start_ocean.sh b/start_ocean.sh
index c0fff23..c1415b5 100755
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -47,6 +47,7 @@ export PDR_TRUEVAL_VERSION=${PDR_TRUEVAL_VERSION:-latest}
 export PDR_PREDICTOOR_VERSION=${PDR_PREDICTOOR_VERSION:-latest}
 export PDR_TRADER_VERSION=${PDR_TRADER_VERSION:-latest}
 export PDR_PUBLISHER_VERSION=${PDR_PUBLISHER_VERSION:-latest}
+export PDR_DFBUYER_VERSION=${PDR_DFBUYER_VERSION:-latest}
 
 
 export PROJECT_NAME="ocean"
@@ -289,9 +290,9 @@ while :; do
             #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/redis.yml/}"
             #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/aquarius.yml/}"
             #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/elasticsearch.yml/}"
-            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/dashboard.yml/}"
+            #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/dashboard.yml/}"
             # Enforce images
-            export CONTRACTS_VERSION=predictoor
+            export CONTRACTS_VERSION=predictoor2
             export SUBGRAPH_VERSION=predictoor
             # replicate true blockchain behiavour
             export GANACHE_INSTAMINE=strict
@@ -313,6 +314,10 @@ while :; do
             COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pdr-publisher.yml"
             printf $COLOR_Y'Starting with pdr-publisher...\n\n'$COLOR_RESET
             ;;
+        --with-pdr-dfbuyer)
+            COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pdr-dfbuyer.yml"
+            printf $COLOR_Y'Starting with pdr-dfbuyer...\n\n'$COLOR_RESET
+            ;;
         #################################################
         # Cleaning switches
         #################################################

From 8a790cbc3c31fac3682be67c351257c2af6f1fda Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Thu, 20 Jul 2023 17:06:33 +0300
Subject: [PATCH 11/31] fix envs

---
 compose-files/pdr-publisher.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/compose-files/pdr-publisher.yml b/compose-files/pdr-publisher.yml
index 423ce04..cba13ad 100644
--- a/compose-files/pdr-publisher.yml
+++ b/compose-files/pdr-publisher.yml
@@ -8,6 +8,12 @@ services:
     environment:
       RPC_URL: ${NETWORK_RPC_URL}
       ADDRESS_FILE: /root/.ocean/ocean-contracts/artifacts/address.json
+      OPF_DEPLOYER_PRIVATE_KEY: "0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58"
+      PREDICTOOR_PRIVATE_KEY: "0xef4b441145c1d0f3b4bc6d61d29f5c6e502359481152f869247c7a4244d45209"
+      TRADER_PRIVATE_KEY: "0x8467415bb2ba7c91084d932276214b11a3dd9bdb2930fefa194b666dd8020b99"
+      DFBUYER_PRIVATE_KEY: "0x1f990f8b013fc5c7955e0f8746f11ded231721b9cf3f99ff06cdc03492b28090"
+      PDR_WEBSOCKET_KEY: "0xfd5c1ccea015b6d663618850824154a3b3fb2882c46cefb05b9a93fea8c3d215"
+      PDR_MM_USER: "0x1263dc73bef43a9da06149c7e598f52025bf4027f1d6c13896b71e81bb9233fb"
       WAIT_FOR_CONTRACTS: "true"
     depends_on:
       - ganache

From 68f305c1f43d928e5d3d50e8c3d70917e5eef547 Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Wed, 26 Jul 2023 15:46:26 +0300
Subject: [PATCH 12/31] more updates

---
 cleanup.sh                       | 2 ++
 compose-files/ganache.yml        | 2 +-
 compose-files/pdr-dfbuyer.yml    | 8 ++++----
 compose-files/pdr-predictoor.yml | 4 ++--
 compose-files/pdr-trader.yml     | 4 ++--
 compose-files/pdr-trueval.yml    | 4 ++--
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/cleanup.sh b/cleanup.sh
index fcf5193..407f598 100755
--- a/cleanup.sh
+++ b/cleanup.sh
@@ -19,6 +19,7 @@ docker container stop ocean_pdr-trader_1
 docker container stop ocean_pdr-predictoor_1
 docker container stop ocean_pdr-trueval_1
 docker container stop ocean_pdr-publisher_1
+docker container stop ocean_pdr-dfbuyer_1
 docker container rm ocean_aquarius_1
 docker container rm ocean_graph-node_1
 docker container rm ocean_subgraph_1
@@ -39,6 +40,7 @@ docker container rm ocean_pdr-trader_1
 docker container rm ocean_pdr-predictoor_1
 docker container rm ocean_pdr-trueval_1
 docker container rm ocean_pdr-publisher_1
+docker container rm ocean_pdr-dfbuyer_1
 docker volume rm ocean_graphipfs
 docker volume rm ocean_graphpgsql
 docker volume rm ocean_provider1db
diff --git a/compose-files/ganache.yml b/compose-files/ganache.yml
index 9995528..382e69e 100644
--- a/compose-files/ganache.yml
+++ b/compose-files/ganache.yml
@@ -7,4 +7,4 @@ services:
     networks:
       backend:
         ipv4_address: 172.15.0.3
-    entrypoint: ["node","/app/dist/node/cli.js","--database.dbPath", "./ganache_cache","--chain.chainId","0x2324","--chain.networkId","0x2324","-l","20000000000","-g","1","--chain.hardfork","${GANACHE_FORK}","--miner.blockTime","${GANACHE_BLOCKTIME}","--miner.instamine","${GANACHE_INSTAMINE}","--wallet.mnemonic","${GANACHE_MNEMONIC}", "-e","1000000"]
+    entrypoint: ["node","/app/dist/node/cli.js","--database.dbPath", "./ganache_cache","--chain.chainId","0x2324","--chain.networkId","0x2324","-l","50000000","-g","1","--chain.hardfork","${GANACHE_FORK}","--miner.blockTime","${GANACHE_BLOCKTIME}","--miner.instamine","${GANACHE_INSTAMINE}","--wallet.mnemonic","${GANACHE_MNEMONIC}", "-e","1000000"]
diff --git a/compose-files/pdr-dfbuyer.yml b/compose-files/pdr-dfbuyer.yml
index 0946c97..fbc5ffb 100644
--- a/compose-files/pdr-dfbuyer.yml
+++ b/compose-files/pdr-dfbuyer.yml
@@ -1,19 +1,19 @@
 version: '3'
 services:
-  pdr-predictoor:
+  pdr-dfbuyer:
     image: oceanprotocol/pdr-dfbuyer:${PDR_DFBUYER_VERSION:-latest}
     networks:
       backend:
-        ipv4_address: 172.15.0.41
+        ipv4_address: 172.15.0.44
     environment:
       RPC_URL: ${NETWORK_RPC_URL}
       SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph
       PRIVATE_KEY: "0x1f990f8b013fc5c7955e0f8746f11ded231721b9cf3f99ff06cdc03492b28090"
-      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
       WAIT_FOR_SUBGRAPH: "true"
       WEEKLY_SPEND_LIMIT: 10000
+      DELAYED_STARTUP: 120
     depends_on:
       - ganache
     volumes:
     - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
-    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
\ No newline at end of file
+    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
diff --git a/compose-files/pdr-predictoor.yml b/compose-files/pdr-predictoor.yml
index edc4aa8..84ef684 100644
--- a/compose-files/pdr-predictoor.yml
+++ b/compose-files/pdr-predictoor.yml
@@ -9,10 +9,10 @@ services:
       RPC_URL: ${NETWORK_RPC_URL}
       SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph
       PRIVATE_KEY: "0xef4b441145c1d0f3b4bc6d61d29f5c6e502359481152f869247c7a4244d45209"
-      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
       WAIT_FOR_SUBGRAPH: "true"
+      DELAYED_STARTUP: 120
     depends_on:
       - ganache
     volumes:
     - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
-    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
\ No newline at end of file
+    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
diff --git a/compose-files/pdr-trader.yml b/compose-files/pdr-trader.yml
index e9415b8..5be6fc1 100644
--- a/compose-files/pdr-trader.yml
+++ b/compose-files/pdr-trader.yml
@@ -9,10 +9,10 @@ services:
       RPC_URL: ${NETWORK_RPC_URL}
       SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph
       PRIVATE_KEY: "0x8467415bb2ba7c91084d932276214b11a3dd9bdb2930fefa194b666dd8020b99"
-      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
       WAIT_FOR_SUBGRAPH: "true"
+      DELAYED_STARTUP: 120
     depends_on:
       - ganache
     volumes:
     - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
-    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
\ No newline at end of file
+    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
diff --git a/compose-files/pdr-trueval.yml b/compose-files/pdr-trueval.yml
index 321b7da..28dabb4 100644
--- a/compose-files/pdr-trueval.yml
+++ b/compose-files/pdr-trueval.yml
@@ -9,10 +9,10 @@ services:
       RPC_URL: ${NETWORK_RPC_URL}
       SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph
       PRIVATE_KEY: "0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58"
-      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
       WAIT_FOR_SUBGRAPH: "true"
+      DELAYED_STARTUP: 120
     depends_on:
       - ganache
     volumes:
     - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
-    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
\ No newline at end of file
+    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/

From 88f7813282b32189690bf029dce8e9c17d99a237 Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Wed, 26 Jul 2023 17:54:58 +0300
Subject: [PATCH 13/31] add three predictoors

---
 cleanup.sh                       |  8 ++++++--
 compose-files/ganache.yml        |  2 +-
 compose-files/pdr-predictoor.yml | 34 +++++++++++++++++++++++++++++++-
 compose-files/pdr-publisher.yml  |  2 ++
 4 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/cleanup.sh b/cleanup.sh
index 407f598..5082b7e 100755
--- a/cleanup.sh
+++ b/cleanup.sh
@@ -16,7 +16,9 @@ docker container stop ocean_redis_1
 docker container stop ocean_dashboard_1
 docker container stop docker-registry
 docker container stop ocean_pdr-trader_1
-docker container stop ocean_pdr-predictoor_1
+docker container stop ocean_pdr-predictoor1_1
+docker container stop ocean_pdr-predictoor2_1
+docker container stop ocean_pdr-predictoor3_1
 docker container stop ocean_pdr-trueval_1
 docker container stop ocean_pdr-publisher_1
 docker container stop ocean_pdr-dfbuyer_1
@@ -37,7 +39,9 @@ docker container rm ocean_redis_1
 docker container rm ocean_dashboard_1
 docker container rm docker-registry
 docker container rm ocean_pdr-trader_1
-docker container rm ocean_pdr-predictoor_1
+docker container rm ocean_pdr-predictoor1_1
+docker container rm ocean_pdr-predictoor2_1
+docker container rm ocean_pdr-predictoor3_1
 docker container rm ocean_pdr-trueval_1
 docker container rm ocean_pdr-publisher_1
 docker container rm ocean_pdr-dfbuyer_1
diff --git a/compose-files/ganache.yml b/compose-files/ganache.yml
index 382e69e..06dbbf9 100644
--- a/compose-files/ganache.yml
+++ b/compose-files/ganache.yml
@@ -7,4 +7,4 @@ services:
     networks:
       backend:
         ipv4_address: 172.15.0.3
-    entrypoint: ["node","/app/dist/node/cli.js","--database.dbPath", "./ganache_cache","--chain.chainId","0x2324","--chain.networkId","0x2324","-l","50000000","-g","1","--chain.hardfork","${GANACHE_FORK}","--miner.blockTime","${GANACHE_BLOCKTIME}","--miner.instamine","${GANACHE_INSTAMINE}","--wallet.mnemonic","${GANACHE_MNEMONIC}", "-e","1000000"]
+    entrypoint: ["node","/app/dist/node/cli.js","--database.dbPath", "./ganache_cache","--chain.chainId","0x2324","--chain.networkId","0x2324","-a","20","-l","50000000","-g","1","--chain.hardfork","${GANACHE_FORK}","--miner.blockTime","${GANACHE_BLOCKTIME}","--miner.instamine","${GANACHE_INSTAMINE}","--wallet.mnemonic","${GANACHE_MNEMONIC}", "-e","1000000"]
diff --git a/compose-files/pdr-predictoor.yml b/compose-files/pdr-predictoor.yml
index 84ef684..d78c465 100644
--- a/compose-files/pdr-predictoor.yml
+++ b/compose-files/pdr-predictoor.yml
@@ -1,6 +1,6 @@
 version: '3'
 services:
-  pdr-predictoor:
+  pdr-predictoor1:
     image: oceanprotocol/pdr-predictoor:${PDR_PREDICTOOR_VERSION:-latest}
     networks:
       backend:
@@ -16,3 +16,35 @@ services:
     volumes:
     - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
     - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
+  pdr-predictoor2:
+    image: oceanprotocol/pdr-predictoor:${PDR_PREDICTOOR_VERSION:-latest}
+    networks:
+      backend:
+        ipv4_address: 172.15.0.45
+    environment:
+      RPC_URL: ${NETWORK_RPC_URL}
+      SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph
+      PRIVATE_KEY: "0x4ed947ad7e139926e31a6442d55b2e99d141f97f46151a8769d57f514f3db868"
+      WAIT_FOR_SUBGRAPH: "true"
+      DELAYED_STARTUP: 120
+    depends_on:
+      - ganache
+    volumes:
+    - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
+    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
+  pdr-predictoor3:
+    image: oceanprotocol/pdr-predictoor:${PDR_PREDICTOOR_VERSION:-latest}
+    networks:
+      backend:
+        ipv4_address: 172.15.0.46
+    environment:
+      RPC_URL: ${NETWORK_RPC_URL}
+      SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph
+      PRIVATE_KEY: "0xa50c16d96ed01ac8f967b77b01b1fa94f751c4c600b564fd770e239ebd7d869d"
+      WAIT_FOR_SUBGRAPH: "true"
+      DELAYED_STARTUP: 120
+    depends_on:
+      - ganache
+    volumes:
+    - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
+    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
diff --git a/compose-files/pdr-publisher.yml b/compose-files/pdr-publisher.yml
index cba13ad..8ae2b7c 100644
--- a/compose-files/pdr-publisher.yml
+++ b/compose-files/pdr-publisher.yml
@@ -10,6 +10,8 @@ services:
       ADDRESS_FILE: /root/.ocean/ocean-contracts/artifacts/address.json
       OPF_DEPLOYER_PRIVATE_KEY: "0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58"
       PREDICTOOR_PRIVATE_KEY: "0xef4b441145c1d0f3b4bc6d61d29f5c6e502359481152f869247c7a4244d45209"
+      PREDICTOOR2_PRIVATE_KEY: "0x4ed947ad7e139926e31a6442d55b2e99d141f97f46151a8769d57f514f3db868"
+      PREDICTOOR3_PRIVATE_KEY: "0xa50c16d96ed01ac8f967b77b01b1fa94f751c4c600b564fd770e239ebd7d869d"
       TRADER_PRIVATE_KEY: "0x8467415bb2ba7c91084d932276214b11a3dd9bdb2930fefa194b666dd8020b99"
       DFBUYER_PRIVATE_KEY: "0x1f990f8b013fc5c7955e0f8746f11ded231721b9cf3f99ff06cdc03492b28090"
       PDR_WEBSOCKET_KEY: "0xfd5c1ccea015b6d663618850824154a3b3fb2882c46cefb05b9a93fea8c3d215"

From 2bf56ed49abc478d3c5555aaacf7443b0e56a7ed Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Mon, 31 Jul 2023 18:08:29 +0300
Subject: [PATCH 14/31] multiple predictoor versions

---
 start_ocean.sh | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/start_ocean.sh b/start_ocean.sh
index c1415b5..1868e26 100755
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -294,10 +294,39 @@ while :; do
             # Enforce images
             export CONTRACTS_VERSION=predictoor2
             export SUBGRAPH_VERSION=predictoor
+            export PDR_TRUEVAL_VERSION=v0.0.1
+            export PDR_PREDICTOOR_VERSION=v0.0.1
+            export PDR_TRADER_VERSION=v0.0.1
+            export PDR_PUBLISHER_VERSION=v0.0.1
+            export PDR_DFBUYER_VERSION=v0.0.1
+
             # replicate true blockchain behiavour
             export GANACHE_INSTAMINE=strict
             export GANACHE_BLOCKTIME=1
             ;;
+        --new-predictoor)
+            # Add what we need
+            COMPOSE_FILES+=" -f ${COMPOSE_DIR}/thegraph.yml"
+            # We should remove what is not needed for now, but ocean,py requires both aqua & provider
+            #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/provider.yml/}"
+            #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/redis.yml/}"
+            #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/aquarius.yml/}"
+            #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/elasticsearch.yml/}"
+            #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/dashboard.yml/}"
+            # Enforce images
+            export CONTRACTS_VERSION=predictoor3
+            export SUBGRAPH_VERSION=predictoor3
+            export PDR_TRUEVAL_VERSION=${PDR_TRUEVAL_VERSION:-latest}
+            export PDR_PREDICTOOR_VERSION=${PDR_PREDICTOOR_VERSION:-latest}
+            export PDR_TRADER_VERSION=${PDR_TRADER_VERSION:-latest}
+            export PDR_PUBLISHER_VERSION=${PDR_PUBLISHER_VERSION:-latest}
+            export PDR_DFBUYER_VERSION=${PDR_DFBUYER_VERSION:-latest}
+
+            # replicate true blockchain behiavour
+            export GANACHE_INSTAMINE=strict
+            export GANACHE_BLOCKTIME=1
+            ;;
+
         --with-pdr-trueval)
             COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pdr-trueval.yml"
             printf $COLOR_Y'Starting with pdr-trueval...\n\n'$COLOR_RESET

From b3e205b2747ab7f88cb600cc0bcf4b1a8fe3e8aa Mon Sep 17 00:00:00 2001
From: trizin <25263018+trizin@users.noreply.github.com>
Date: Thu, 3 Aug 2023 12:09:08 +0300
Subject: [PATCH 15/31] Remove unnecessary versions

---
 start_ocean.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/start_ocean.sh b/start_ocean.sh
index 1868e26..ce7ee21 100755
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -41,13 +41,8 @@ export POD_CONFIGURATION_VERSION=${POD_CONFIGURATION_VERSION:-oceanprotocol/pod-
 export POD_PUBLISHING_VERSION=${POD_PUBLISHING_VERSION:-oceanprotocol/pod-publishing:v4main}
 export WAIT_FOR_C2DIMAGES=${WAIT_FOR_C2DIMAGES:-false}
 
-
-
-export PDR_TRUEVAL_VERSION=${PDR_TRUEVAL_VERSION:-latest}
-export PDR_PREDICTOOR_VERSION=${PDR_PREDICTOOR_VERSION:-latest}
-export PDR_TRADER_VERSION=${PDR_TRADER_VERSION:-latest}
 export PDR_PUBLISHER_VERSION=${PDR_PUBLISHER_VERSION:-latest}
-export PDR_DFBUYER_VERSION=${PDR_DFBUYER_VERSION:-latest}
+export PDR_BACKEND_VERSION=${PDR_BACKEND_VERSION:-latest}
 
 
 export PROJECT_NAME="ocean"

From 548901870d61ee65812447b276d026b2cc4470c7 Mon Sep 17 00:00:00 2001
From: trizin <25263018+trizin@users.noreply.github.com>
Date: Thu, 3 Aug 2023 12:09:49 +0300
Subject: [PATCH 16/31] Update dfbuyer

---
 compose-files/pdr-dfbuyer.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/compose-files/pdr-dfbuyer.yml b/compose-files/pdr-dfbuyer.yml
index fbc5ffb..eab6b7d 100644
--- a/compose-files/pdr-dfbuyer.yml
+++ b/compose-files/pdr-dfbuyer.yml
@@ -1,7 +1,8 @@
-version: '3'
+version: "3"
 services:
   pdr-dfbuyer:
-    image: oceanprotocol/pdr-dfbuyer:${PDR_DFBUYER_VERSION:-latest}
+    image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
+    command: dfbuyer
     networks:
       backend:
         ipv4_address: 172.15.0.44
@@ -15,5 +16,5 @@ services:
     depends_on:
       - ganache
     volumes:
-    - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
-    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
+      - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
+      - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/

From f94fcf5f8246d33d12a1339a2cbbbba519967935 Mon Sep 17 00:00:00 2001
From: trizin <25263018+trizin@users.noreply.github.com>
Date: Thu, 3 Aug 2023 12:09:55 +0300
Subject: [PATCH 17/31] Update predictoor

---
 compose-files/pdr-predictoor.yml | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/compose-files/pdr-predictoor.yml b/compose-files/pdr-predictoor.yml
index d78c465..275cfc0 100644
--- a/compose-files/pdr-predictoor.yml
+++ b/compose-files/pdr-predictoor.yml
@@ -1,7 +1,8 @@
-version: '3'
+version: "3"
 services:
   pdr-predictoor1:
-    image: oceanprotocol/pdr-predictoor:${PDR_PREDICTOOR_VERSION:-latest}
+    image: oceanprotocol/pdr-predictoor:${PDR_BACKEND_VERSION:-latest}
+    command: predictoor
     networks:
       backend:
         ipv4_address: 172.15.0.41
@@ -14,10 +15,11 @@ services:
     depends_on:
       - ganache
     volumes:
-    - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
-    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
+      - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
+      - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
   pdr-predictoor2:
-    image: oceanprotocol/pdr-predictoor:${PDR_PREDICTOOR_VERSION:-latest}
+    image: oceanprotocol/pdr-predictoor:${PDR_BACKEND_VERSION:-latest}
+    command: predictoor
     networks:
       backend:
         ipv4_address: 172.15.0.45
@@ -30,10 +32,11 @@ services:
     depends_on:
       - ganache
     volumes:
-    - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
-    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
+      - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
+      - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
   pdr-predictoor3:
-    image: oceanprotocol/pdr-predictoor:${PDR_PREDICTOOR_VERSION:-latest}
+    image: oceanprotocol/pdr-predictoor:${PDR_BACKEND_VERSION:-latest}
+    command: predictoor
     networks:
       backend:
         ipv4_address: 172.15.0.46
@@ -46,5 +49,5 @@ services:
     depends_on:
       - ganache
     volumes:
-    - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
-    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
+      - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
+      - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/

From 79698d8915abfc6651d3de89723f08e530506db4 Mon Sep 17 00:00:00 2001
From: trizin <25263018+trizin@users.noreply.github.com>
Date: Thu, 3 Aug 2023 12:10:40 +0300
Subject: [PATCH 18/31] Fix

---
 compose-files/pdr-predictoor.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compose-files/pdr-predictoor.yml b/compose-files/pdr-predictoor.yml
index 275cfc0..815aa07 100644
--- a/compose-files/pdr-predictoor.yml
+++ b/compose-files/pdr-predictoor.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   pdr-predictoor1:
-    image: oceanprotocol/pdr-predictoor:${PDR_BACKEND_VERSION:-latest}
+    image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
     command: predictoor
     networks:
       backend:
@@ -18,7 +18,7 @@ services:
       - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
       - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
   pdr-predictoor2:
-    image: oceanprotocol/pdr-predictoor:${PDR_BACKEND_VERSION:-latest}
+    image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
     command: predictoor
     networks:
       backend:
@@ -35,7 +35,7 @@ services:
       - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
       - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
   pdr-predictoor3:
-    image: oceanprotocol/pdr-predictoor:${PDR_BACKEND_VERSION:-latest}
+    image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
     command: predictoor
     networks:
       backend:

From c66280a5d41d08718eff871e9986e0f2e29e0a4f Mon Sep 17 00:00:00 2001
From: trizin <25263018+trizin@users.noreply.github.com>
Date: Thu, 3 Aug 2023 12:11:09 +0300
Subject: [PATCH 19/31] Update trader

---
 compose-files/pdr-trader.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/compose-files/pdr-trader.yml b/compose-files/pdr-trader.yml
index 5be6fc1..adfb386 100644
--- a/compose-files/pdr-trader.yml
+++ b/compose-files/pdr-trader.yml
@@ -1,7 +1,8 @@
-version: '3'
+version: "3"
 services:
   pdr-trader:
-    image: oceanprotocol/pdr-trader:${PDR_TRADER_VERSION:-latest}
+    image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
+    command: trader
     networks:
       backend:
         ipv4_address: 172.15.0.42
@@ -14,5 +15,5 @@ services:
     depends_on:
       - ganache
     volumes:
-    - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
-    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
+      - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
+      - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/

From 823c342e4ac0ea7e6cb335caf92a0ea0aacfca70 Mon Sep 17 00:00:00 2001
From: trizin <25263018+trizin@users.noreply.github.com>
Date: Thu, 3 Aug 2023 12:11:18 +0300
Subject: [PATCH 20/31] Update trueval

---
 compose-files/pdr-trueval.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/compose-files/pdr-trueval.yml b/compose-files/pdr-trueval.yml
index 28dabb4..26bc678 100644
--- a/compose-files/pdr-trueval.yml
+++ b/compose-files/pdr-trueval.yml
@@ -1,7 +1,8 @@
-version: '3'
+version: "3"
 services:
   pdr-trueval:
-    image: oceanprotocol/pdr-trueval:${PDR_TRUEVAL_VERSION:-latest}
+    image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
+    command: trueval
     networks:
       backend:
         ipv4_address: 172.15.0.40
@@ -14,5 +15,5 @@ services:
     depends_on:
       - ganache
     volumes:
-    - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
-    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
+      - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
+      - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/

From f9ca2c12f70b7c1a2b95aa26ca36d750bf0b0084 Mon Sep 17 00:00:00 2001
From: trizin <25263018+trizin@users.noreply.github.com>
Date: Thu, 3 Aug 2023 16:15:19 +0300
Subject: [PATCH 21/31] Remove new predictoor flag

---
 start_ocean.sh | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/start_ocean.sh b/start_ocean.sh
index ce7ee21..83f7bcd 100755
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -278,28 +278,6 @@ while :; do
             printf $COLOR_Y'Ocean subgraph will not be deployed, the last deployment (if any) will be intact ...\n\n'$COLOR_RESET
             ;;
         --predictoor)
-            # Add what we need
-            COMPOSE_FILES+=" -f ${COMPOSE_DIR}/thegraph.yml"
-            # We should remove what is not needed for now, but ocean,py requires both aqua & provider
-            #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/provider.yml/}"
-            #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/redis.yml/}"
-            #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/aquarius.yml/}"
-            #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/elasticsearch.yml/}"
-            #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/dashboard.yml/}"
-            # Enforce images
-            export CONTRACTS_VERSION=predictoor2
-            export SUBGRAPH_VERSION=predictoor
-            export PDR_TRUEVAL_VERSION=v0.0.1
-            export PDR_PREDICTOOR_VERSION=v0.0.1
-            export PDR_TRADER_VERSION=v0.0.1
-            export PDR_PUBLISHER_VERSION=v0.0.1
-            export PDR_DFBUYER_VERSION=v0.0.1
-
-            # replicate true blockchain behiavour
-            export GANACHE_INSTAMINE=strict
-            export GANACHE_BLOCKTIME=1
-            ;;
-        --new-predictoor)
             # Add what we need
             COMPOSE_FILES+=" -f ${COMPOSE_DIR}/thegraph.yml"
             # We should remove what is not needed for now, but ocean,py requires both aqua & provider
@@ -311,17 +289,12 @@ while :; do
             # Enforce images
             export CONTRACTS_VERSION=predictoor3
             export SUBGRAPH_VERSION=predictoor3
-            export PDR_TRUEVAL_VERSION=${PDR_TRUEVAL_VERSION:-latest}
-            export PDR_PREDICTOOR_VERSION=${PDR_PREDICTOOR_VERSION:-latest}
-            export PDR_TRADER_VERSION=${PDR_TRADER_VERSION:-latest}
-            export PDR_PUBLISHER_VERSION=${PDR_PUBLISHER_VERSION:-latest}
-            export PDR_DFBUYER_VERSION=${PDR_DFBUYER_VERSION:-latest}
+            export PDR_BACKEND_VERSION=${PDR_BACKEND_VERSION:-latest}
 
             # replicate true blockchain behiavour
             export GANACHE_INSTAMINE=strict
             export GANACHE_BLOCKTIME=1
             ;;
-
         --with-pdr-trueval)
             COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pdr-trueval.yml"
             printf $COLOR_Y'Starting with pdr-trueval...\n\n'$COLOR_RESET

From 135e682d9e011d6a8eaa8eb618a93e6186588b4d Mon Sep 17 00:00:00 2001
From: trizin <25263018+trizin@users.noreply.github.com>
Date: Thu, 3 Aug 2023 18:24:25 +0300
Subject: [PATCH 22/31] Add ADDRESS_FILE env

---
 compose-files/pdr-dfbuyer.yml    | 1 +
 compose-files/pdr-predictoor.yml | 1 +
 compose-files/pdr-trader.yml     | 1 +
 compose-files/pdr-trueval.yml    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/compose-files/pdr-dfbuyer.yml b/compose-files/pdr-dfbuyer.yml
index eab6b7d..3e207c7 100644
--- a/compose-files/pdr-dfbuyer.yml
+++ b/compose-files/pdr-dfbuyer.yml
@@ -13,6 +13,7 @@ services:
       WAIT_FOR_SUBGRAPH: "true"
       WEEKLY_SPEND_LIMIT: 10000
       DELAYED_STARTUP: 120
+      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
     depends_on:
       - ganache
     volumes:
diff --git a/compose-files/pdr-predictoor.yml b/compose-files/pdr-predictoor.yml
index 815aa07..a45ac78 100644
--- a/compose-files/pdr-predictoor.yml
+++ b/compose-files/pdr-predictoor.yml
@@ -12,6 +12,7 @@ services:
       PRIVATE_KEY: "0xef4b441145c1d0f3b4bc6d61d29f5c6e502359481152f869247c7a4244d45209"
       WAIT_FOR_SUBGRAPH: "true"
       DELAYED_STARTUP: 120
+      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
     depends_on:
       - ganache
     volumes:
diff --git a/compose-files/pdr-trader.yml b/compose-files/pdr-trader.yml
index adfb386..3782ba4 100644
--- a/compose-files/pdr-trader.yml
+++ b/compose-files/pdr-trader.yml
@@ -12,6 +12,7 @@ services:
       PRIVATE_KEY: "0x8467415bb2ba7c91084d932276214b11a3dd9bdb2930fefa194b666dd8020b99"
       WAIT_FOR_SUBGRAPH: "true"
       DELAYED_STARTUP: 120
+      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
     depends_on:
       - ganache
     volumes:
diff --git a/compose-files/pdr-trueval.yml b/compose-files/pdr-trueval.yml
index 26bc678..ac92f17 100644
--- a/compose-files/pdr-trueval.yml
+++ b/compose-files/pdr-trueval.yml
@@ -12,6 +12,7 @@ services:
       PRIVATE_KEY: "0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58"
       WAIT_FOR_SUBGRAPH: "true"
       DELAYED_STARTUP: 120
+      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
     depends_on:
       - ganache
     volumes:

From 494ece02c05505ebcdf9d4b91de246c7cad8884a Mon Sep 17 00:00:00 2001
From: trizin <25263018+trizin@users.noreply.github.com>
Date: Fri, 4 Aug 2023 12:38:21 +0300
Subject: [PATCH 23/31] Add address files

---
 compose-files/pdr-predictoor.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/compose-files/pdr-predictoor.yml b/compose-files/pdr-predictoor.yml
index a45ac78..ca94787 100644
--- a/compose-files/pdr-predictoor.yml
+++ b/compose-files/pdr-predictoor.yml
@@ -30,6 +30,7 @@ services:
       PRIVATE_KEY: "0x4ed947ad7e139926e31a6442d55b2e99d141f97f46151a8769d57f514f3db868"
       WAIT_FOR_SUBGRAPH: "true"
       DELAYED_STARTUP: 120
+      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
     depends_on:
       - ganache
     volumes:
@@ -47,6 +48,7 @@ services:
       PRIVATE_KEY: "0xa50c16d96ed01ac8f967b77b01b1fa94f751c4c600b564fd770e239ebd7d869d"
       WAIT_FOR_SUBGRAPH: "true"
       DELAYED_STARTUP: 120
+      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
     depends_on:
       - ganache
     volumes:

From c3eb6bacf4a0df33d9c36ce2ebf01369dc1e5289 Mon Sep 17 00:00:00 2001
From: trizin <25263018+trizin@users.noreply.github.com>
Date: Tue, 15 Aug 2023 12:13:50 +0300
Subject: [PATCH 24/31] Use pdr-backend for publisher

---
 compose-files/pdr-publisher.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compose-files/pdr-publisher.yml b/compose-files/pdr-publisher.yml
index 8ae2b7c..f835702 100644
--- a/compose-files/pdr-publisher.yml
+++ b/compose-files/pdr-publisher.yml
@@ -1,7 +1,8 @@
 version: '3'
 services:
   pdr-publisher:
-    image: oceanprotocol/pdr-publisher:${PDR_PUBLISHER_VERSION:-latest}
+    image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
+    command: publisher
     networks:
       backend:
         ipv4_address: 172.15.0.43

From 307e7337c64a781e043197d15149224f85d908e9 Mon Sep 17 00:00:00 2001
From: trizin <25263018+trizin@users.noreply.github.com>
Date: Tue, 15 Aug 2023 15:58:00 +0300
Subject: [PATCH 25/31] Add missing env var

---
 compose-files/pdr-publisher.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compose-files/pdr-publisher.yml b/compose-files/pdr-publisher.yml
index f835702..0f6590c 100644
--- a/compose-files/pdr-publisher.yml
+++ b/compose-files/pdr-publisher.yml
@@ -9,6 +9,7 @@ services:
     environment:
       RPC_URL: ${NETWORK_RPC_URL}
       ADDRESS_FILE: /root/.ocean/ocean-contracts/artifacts/address.json
+      PRIVATE_KEY: "0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58"
       OPF_DEPLOYER_PRIVATE_KEY: "0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58"
       PREDICTOOR_PRIVATE_KEY: "0xef4b441145c1d0f3b4bc6d61d29f5c6e502359481152f869247c7a4244d45209"
       PREDICTOOR2_PRIVATE_KEY: "0x4ed947ad7e139926e31a6442d55b2e99d141f97f46151a8769d57f514f3db868"

From a6ea7a33c9225de721337f12e14042219f78dacb Mon Sep 17 00:00:00 2001
From: trizin <25263018+trizin@users.noreply.github.com>
Date: Tue, 22 Aug 2023 20:47:08 +0300
Subject: [PATCH 26/31] Update versions

---
 start_ocean.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/start_ocean.sh b/start_ocean.sh
index 83f7bcd..28f2d80 100755
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -287,8 +287,8 @@ while :; do
             #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/elasticsearch.yml/}"
             #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/dashboard.yml/}"
             # Enforce images
-            export CONTRACTS_VERSION=predictoor3
-            export SUBGRAPH_VERSION=predictoor3
+            export CONTRACTS_VERSION=predictoor-temp
+            export SUBGRAPH_VERSION=predictoor-temp
             export PDR_BACKEND_VERSION=${PDR_BACKEND_VERSION:-latest}
 
             # replicate true blockchain behiavour

From 29dbe1af5f65577b2fcf4dd4aae615799fef60c5 Mon Sep 17 00:00:00 2001
From: trizin <25263018+trizin@users.noreply.github.com>
Date: Wed, 30 Aug 2023 15:53:57 +0300
Subject: [PATCH 27/31] Revert change

---
 start_ocean.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/start_ocean.sh b/start_ocean.sh
index 28f2d80..83f7bcd 100755
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -287,8 +287,8 @@ while :; do
             #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/elasticsearch.yml/}"
             #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/dashboard.yml/}"
             # Enforce images
-            export CONTRACTS_VERSION=predictoor-temp
-            export SUBGRAPH_VERSION=predictoor-temp
+            export CONTRACTS_VERSION=predictoor3
+            export SUBGRAPH_VERSION=predictoor3
             export PDR_BACKEND_VERSION=${PDR_BACKEND_VERSION:-latest}
 
             # replicate true blockchain behiavour

From 20f70c4a100dfb56b7304fc4fa397499530c6081 Mon Sep 17 00:00:00 2001
From: trizin <25263018+trizin@users.noreply.github.com>
Date: Wed, 30 Aug 2023 16:03:34 +0300
Subject: [PATCH 28/31] Fix

---
 start_ocean.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/start_ocean.sh b/start_ocean.sh
index 83f7bcd..ecc8fbb 100755
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -287,7 +287,7 @@ while :; do
             #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/elasticsearch.yml/}"
             #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/dashboard.yml/}"
             # Enforce images
-            export CONTRACTS_VERSION=predictoor3
+            export CONTRACTS_VERSION=predictoor
             export SUBGRAPH_VERSION=predictoor3
             export PDR_BACKEND_VERSION=${PDR_BACKEND_VERSION:-latest}
 

From bf83280b4fddb56ecf46340731facda7275777d2 Mon Sep 17 00:00:00 2001
From: trizin <25263018+trizin@users.noreply.github.com>
Date: Wed, 30 Aug 2023 16:04:07 +0300
Subject: [PATCH 29/31] Fix

---
 start_ocean.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/start_ocean.sh b/start_ocean.sh
index ecc8fbb..6a73251 100755
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -288,7 +288,7 @@ while :; do
             #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/dashboard.yml/}"
             # Enforce images
             export CONTRACTS_VERSION=predictoor
-            export SUBGRAPH_VERSION=predictoor3
+            export SUBGRAPH_VERSION=predictoor
             export PDR_BACKEND_VERSION=${PDR_BACKEND_VERSION:-latest}
 
             # replicate true blockchain behiavour

From be92229b9466e303706951782b089ff38bdfabea Mon Sep 17 00:00:00 2001
From: Calina Cenan <calina@cenan.net>
Date: Tue, 21 Nov 2023 09:31:53 +0000
Subject: [PATCH 30/31] Adds contracts v2.0.2.

---
 README.md      | 2 +-
 start_ocean.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2dc4bf1..7953349 100644
--- a/README.md
+++ b/README.md
@@ -104,7 +104,7 @@ The default versions are always a combination of component versions which are co
 | Component name      | Required by        | Version                           | IP Address      | Ports exposed |
 | --------------      | ------------------ | --------------------------------- | --------------- | ------------- |
 | ganache             |  ocean-contracts   | latest                            | 172.15.0.3      | 8545 -> 8545  |
-| ocean-contracts     |                    | v1.1.8                            | 172.15.0.14     |               |
+| ocean-contracts     |                    | v2.0.2                            | 172.15.0.14     |               |
 | Aquarius            |                    | v5.1.0                            | 172.15.0.5      | 5000 -> 5000  |
 | Elasticsearch       |  Aquarius          | 8.5.1                             | 172.15.0.6      |               |
 | Provider            |                    | v2.0.0                            | 172.15.0.4      | 8030 -> 8030  |
diff --git a/start_ocean.sh b/start_ocean.sh
index 6a73251..fa265c0 100755
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -32,7 +32,7 @@ export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v5.1.0}
 export ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-8.5.1}
 export PROVIDER_VERSION=${PROVIDER_VERSION:-v2.0.1}
 export SUBGRAPH_VERSION=${SUBGRAPH_VERSION:-v3.0.3}
-export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v1.1.8}
+export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v2.0.2}
 export RBAC_VERSION=${RBAC_VERSION:-next}
 
 export OPERATOR_SERVICE_VERSION=${OPERATOR_SERVICE_VERSION:-oceanprotocol/operator-service:v4main}

From d1f4fbc9229ca176db70c1d1031a3e099e29b7b7 Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Tue, 28 Nov 2023 09:31:48 +0200
Subject: [PATCH 31/31] use proper versions

---
 start_ocean.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/start_ocean.sh b/start_ocean.sh
index fa265c0..160fd2d 100755
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -31,7 +31,7 @@ COMPOSE_DIR="${DIR}/compose-files"
 export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v5.1.0}
 export ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-8.5.1}
 export PROVIDER_VERSION=${PROVIDER_VERSION:-v2.0.1}
-export SUBGRAPH_VERSION=${SUBGRAPH_VERSION:-v3.0.3}
+export SUBGRAPH_VERSION=${SUBGRAPH_VERSION:-v4.0.2}
 export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v2.0.2}
 export RBAC_VERSION=${RBAC_VERSION:-next}
 
@@ -287,8 +287,8 @@ while :; do
             #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/elasticsearch.yml/}"
             #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/dashboard.yml/}"
             # Enforce images
-            export CONTRACTS_VERSION=predictoor
-            export SUBGRAPH_VERSION=predictoor
+            #export CONTRACTS_VERSION=predictoor
+            #export SUBGRAPH_VERSION=predictoor
             export PDR_BACKEND_VERSION=${PDR_BACKEND_VERSION:-latest}
 
             # replicate true blockchain behiavour