Merge pull request #219 from oceanprotocol/v3

v3
oceanprotocol · Oct 27, 2020 · fe587a3 · fe587a3
2 parents f996fb1 + 2c4f72c
commit fe587a3
Show file tree

Hide file tree

Showing 144 changed files with 192 additions and 3,728 deletions.
diff --git a/.banner b/.banner
@@ -21,7 +21,7 @@
                 Get info: oceanprotocol.com
                 Get docs: docs.oceanprotocol.com
                 Get code: github.com/oceanprotocol
-                Get help: gitter.im/oceanprotocol/Lobby
+                Get help: discord.gg/TnXjkR5
 
                                ---
 
diff --git a/.gitignore b/.gitignore
@@ -8,9 +8,6 @@ ganache-db/
 # Emacs
 *~
 
-# mutable secret store config (Issue #126)
-networks/secret-store/config/config.toml
-
 # Mac OS Filesystem artifacts
 .DS_Store
 **/.DS_Store

diff --git a/ACL/duero_addresses.txt b/ACL/duero_addresses.txt
diff --git a/ACL/nile_addresses.txt b/ACL/nile_addresses.txt
diff --git a/ACL/pacific_addresses.txt b/ACL/pacific_addresses.txt
diff --git a/README.md b/README.md
diff --git a/accounts/provider.json b/accounts/provider.json
diff --git a/brizo.env b/brizo.env
diff --git a/compose-files/agent.yml b/compose-files/agent.yml
diff --git a/compose-files/aquarius.yml b/compose-files/aquarius.yml
@@ -1,12 +1,25 @@
 version: '3'
 services:
+  elasticsearch:
+    image: elasticsearch:6.8.3
+    networks:
+      backend:
+        ipv4_address: 172.15.0.6
+    environment:
+      ES_JAVA_OPTS: "-Xms512m -Xmx512m"
+      MAX_MAP_COUNT: "64000"
+      discovery.type: "single-node"
+
   aquarius:
-    image: oceanprotocol/aquarius:$AQUARIUS_VERSION
+    image: oceanprotocol/aquarius:${AQUARIUS_VERSION:-latest}
     ports:
-    - 5000:5000
+      - 5000:5000
     networks:
       backend:
-        ipv4_address: 172.15.0.15
+        ipv4_address: 172.15.0.5
+    depends_on:
+      - elasticsearch
+      - ocean-contracts
     environment:
       DB_MODULE: ${DB_MODULE}
       DB_HOSTNAME: ${DB_HOSTNAME}
@@ -18,3 +31,14 @@ services:
       DB_CA_CERTS: ${DB_CA_CERTS}
       DB_CLIENT_KEY: ${DB_CLIENT_KEY}
       DB_CLIENT_CERT: ${DB_CLIENT_CERT}
+      LOG_LEVEL: DEBUG
+      EVENTS_ECIES_PRIVATE_KEY: "0x5d75837394b078ce97bc289fa8d75e21000573520bfa7784a9d28ccaae602bf8"
+      ARTIFACTS_PATH: "/ocean-contracts/artifacts"
+      ADDRESS_FILE: "/ocean-contracts/artifacts/address.json"
+      DEPLOY_CONTRACTS: ${DEPLOY_CONTRACTS}
+      NETWORK_NAME: ${CONTRACTS_NETWORK_NAME}
+      EVENTS_RPC: "http://172.15.0.3:8545"
+      EVENTS_ALLOW: "0"
+      RUN_EVENTS_MONITOR: "1"
+    volumes:
+    - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
diff --git a/compose-files/aquarius_elasticsearch.yml b/compose-files/aquarius_elasticsearch.yml
diff --git a/compose-files/aquarius_mongodb.yml b/compose-files/aquarius_mongodb.yml
diff --git a/compose-files/brizo.yml b/compose-files/brizo.yml
diff --git a/compose-files/commons.yml b/compose-files/commons.yml
diff --git a/compose-files/events_handler.yml b/compose-files/events_handler.yml
diff --git a/compose-files/faucet.yml b/compose-files/faucet.yml
diff --git a/compose-files/ganache.yml b/compose-files/ganache.yml
@@ -0,0 +1,10 @@
+version: '3'
+services:
+  ganache:
+    image: trufflesuite/ganache-cli:latest
+    ports:
+      - 8545:8545
+    networks:
+      backend:
+        ipv4_address: 172.15.0.3
+    entrypoint: ["node", "/app/ganache-core.docker.cli.js", "--db", "./ganache_cache","--networkId","0x2324","--gasLimit","10000000000","--gasPrice","1","---hardfork","istanbul","--mnemonic","${GANACHE_MNEMONIC}"]
diff --git a/compose-files/keeper_contracts.yml b/compose-files/keeper_contracts.yml
diff --git a/compose-files/network_volumes.yml b/compose-files/network_volumes.yml
@@ -7,9 +7,3 @@ networks:
       driver: default
       config:
         - subnet: 172.15.0.1/24
-
-volumes:
-  keeper-node-duero:
-  keeper-node-nile:
-  keeper-node-pacific:
-  secret-store: