Merge pull request #394 from oceanprotocol/predictoor2

Predictoor YAML CLI Update

compose-files/pdr-dfbuyer.yml

@@ -2,18 +2,15 @@ version: "3"
 services:
   pdr-dfbuyer:
     image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
-    command: dfbuyer
+    command: dfbuyer ppss.yaml development
     networks:
       backend:
         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"
       WAIT_FOR_SUBGRAPH: "true"
       WEEKLY_SPEND_LIMIT: 10000
       DELAYED_STARTUP: 120
-      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
     depends_on:
       - ganache
     volumes:

compose-files/pdr-predictoor.yml

@@ -2,17 +2,14 @@ version: "3"
 services:
   pdr-predictoor1:
     image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
-    command: predictoor
+    command: predictoor 1 ppss.yaml development
     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: "0xef4b441145c1d0f3b4bc6d61d29f5c6e502359481152f869247c7a4244d45209"
       WAIT_FOR_SUBGRAPH: "true"
       DELAYED_STARTUP: 120
-      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
     depends_on:
       - ganache
     volumes:
@@ -20,17 +17,13 @@ services:
       - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
   pdr-predictoor2:
     image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
-    command: predictoor
+    command: predictoor 3 ppss.yaml development
     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
-      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
     depends_on:
       - ganache
     volumes:
@@ -43,12 +36,9 @@ services:
       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
-      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
     depends_on:
       - ganache
     volumes:

compose-files/pdr-publisher.yml

@@ -2,13 +2,11 @@ version: '3'
 services:
   pdr-publisher:
     image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
-    command: publisher
+    command: publisher ppss.yaml development
     networks:
       backend:
         ipv4_address: 172.15.0.43
     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"

compose-files/pdr-trader.yml

@@ -2,17 +2,14 @@ version: "3"
 services:
   pdr-trader:
     image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
-    command: trader
+    command: trader 1 ppss.yaml development
     networks:
       backend:
         ipv4_address: 172.15.0.42
     environment:
-      RPC_URL: ${NETWORK_RPC_URL}
-      SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph
       PRIVATE_KEY: "0x8467415bb2ba7c91084d932276214b11a3dd9bdb2930fefa194b666dd8020b99"
       WAIT_FOR_SUBGRAPH: "true"
       DELAYED_STARTUP: 120
-      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
     depends_on:
       - ganache
     volumes:

compose-files/pdr-trueval.yml

@@ -2,17 +2,14 @@ version: "3"
 services:
   pdr-trueval:
     image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
-    command: trueval
+    command: trueval ppss.yaml development
     networks:
       backend:
         ipv4_address: 172.15.0.40
     environment:
-      RPC_URL: ${NETWORK_RPC_URL}
-      SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph
       PRIVATE_KEY: "0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58"
       WAIT_FOR_SUBGRAPH: "true"
       DELAYED_STARTUP: 120
-      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
     depends_on:
       - ganache
     volumes: