refactor more

brizo.env

@@ -5,9 +5,8 @@ PARITY_ADDRESS=0x00bd138abd70e2f00903268f3db08f2d25677c9e
 PARITY_PASSWORD=node0
 
 AQUARIUS_URL=http://aquarius:5000
-BRIZO_URL=http://brizo:8030
 SECRET_STORE_URL=http://secret-store:12001
-RPC_URL=http://blockchain-node:8545
+RPC_URL=http://keeper-node:8545
 
 AZURE_ACCOUNT_NAME=
 AZURE_ACCOUNT_KEY=

compose-files/aquarius.yml

@@ -11,3 +11,10 @@ services:
     - mongodb
     environment:
       DB_HOSTNAME: mongodb
+
+  mongodb:
+    image: mongo:3.6
+    command: mongod
+    networks:
+      backend:
+        ipv4_address: 172.15.0.11

compose-files/brizo.yml

@@ -8,7 +8,7 @@ services:
       backend:
         ipv4_address: 172.15.0.17
     depends_on:
-    - blockchain-node
+    - keeper-node
     env_file:
     - ${BRIZO_ENV_FILE}
     environment:

compose-files/keeper_contracts.yml

@@ -14,6 +14,6 @@ services:
       KEEPER_RPC_PORT: ${KEEPER_RPC_PORT}
       KEEPER_RPC_URL: ${KEEPER_RPC_URL}
     depends_on:
-      - blockchain-node
+      - keeper-node
     volumes:
     - ${KEEPER_ARTIFACTS_FOLDER}:/keeper-contracts/artifacts/

compose-files/mongodb.yml

@@ -1,8 +0,0 @@
-version: '2.1'
-services:
-  mongodb:
-    image: mongo:3.6
-    command: mongod
-    networks:
-      backend:
-        ipv4_address: 172.15.0.11

compose-files/network_volumes.yml

@@ -10,5 +10,5 @@ networks:
         gateway: 172.15.0.1
 
 volumes:
-  parity-node:
+  keeper-node:
   secret-store:

compose-files/nodes/ganache_node.yml

@@ -1,6 +1,6 @@
 version: '2.1'
 services:
-  blockchain-node:
+  keeper-node:
     image: trufflesuite/ganache-cli:latest
     ports:
       - 8545:8545

compose-files/nodes/kovan_node.yml

@@ -1,6 +1,6 @@
 version: '2.1'
 services:
-  blockchain-node:
+  keeper-node:
     image: oceanprotocol/parity-ethereum:beta
     entrypoint: /opt/parity/parity
     command:

compose-files/nodes/pond_node.yml

@@ -1,6 +1,6 @@
 version: '2.1'
 services:
-  blockchain-node:
+  keeper-node:
     image: oceanprotocol/parity-ethereum:beta
     entrypoint: /opt/parity/parity
     command:
@@ -18,7 +18,7 @@ services:
       --unlock 0x00bd138abd70e2f00903268f3db08f2d25677c9e
     volumes:
       - ../parity/parity/config:/home/parity/parity/config
-      - parity-node:/home/parity/.local/share/io.parity.ethereum/
+      - keeper-node:/home/parity/.local/share/io.parity.ethereum/
       - ../parity/parity/authorities/validator0.json:/home/parity/.local/share/io.parity.ethereum/keys/ocean-network/validator.json
       - ../parity/parity/keys:/home/parity/.local/share/io.parity.ethereum/keys/ocean-network
       - ../parity/parity/authorities/validator0.pwd:/home/parity/parity/validator.pwd

compose-files/pleuston.yml

@@ -8,6 +8,7 @@ services:
     ports:
     - 3000:3000
     depends_on:
+    - keeper-node
     - aquarius
     - brizo
     environment:

compose-files/secret_store.yml

@@ -39,8 +39,11 @@ services:
       --jsonrpc-interface all
       --jsonrpc-apis secretstore
       --jsonrpc-cors all
+      --keys-path /home/parity/.local/keys
     ports:
       - 9545:8545
+    volumes:
+      - ../parity/parity/keys:/home/parity/.local/keys/DevelopmentChain:ro
     networks:
       backend:
         ipv4_address: 172.15.0.18

start_ocean.sh

@@ -9,7 +9,7 @@ export PROJECT_NAME="ocean"
 export KEEPER_DEPLOY_CONTRACTS="true"
 export KEEPER_ARTIFACTS_FOLDER=$HOME/.ocean/keeper-contracts/artifacts
 # Specify which ethereum client to run or connect to: development, kovan, or ocean_poa_net_local
-export KEEPER_NETWORK_NAME="development"
+export KEEPER_NETWORK_NAME="ocean_poa_net_local"
 
 # Ganache specific option, these two options have no effect when not running ganache-cli
 export GANACHE_DATABASE_PATH="${DIR}"
@@ -18,7 +18,7 @@ export GANACHE_REUSE_DATABASE="false"
 export BRIZO_ENV_FILE=$DIR/brizo.env
 
 # Specify the ethereum default RPC container provider
-export KEEPER_RPC_HOST='blockchain-node'
+export KEEPER_RPC_HOST='keeper-node'
 export KEEPER_RPC_PORT='8545'
 export KEEPER_RPC_URL="http://"${KEEPER_RPC_HOST}:${KEEPER_RPC_PORT}
 
@@ -47,7 +47,6 @@ export NODE_FILE=${COMPOSE_DIR}/nodes/pond_node.yml
 
 COMPOSE_FILES=""
 COMPOSE_FILES+=" -f ${COMPOSE_DIR}/network_volumes.yml"
-COMPOSE_FILES+=" -f ${COMPOSE_DIR}/mongodb.yml"
 COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pleuston.yml"
 COMPOSE_FILES+=" -f ${COMPOSE_DIR}/aquarius.yml"
 COMPOSE_FILES+=" -f ${COMPOSE_DIR}/brizo.yml"
@@ -79,18 +78,12 @@ while :; do
         #################################################
         # Node type switches
         #################################################
-        # connect you to kovan
+        # connects you to kovan
         --local-kovan-node)
             export NODE_FILE=${COMPOSE_DIR}/nodes/kovan_node.yml
             export KEEPER_NETWORK_NAME="kovan"
             printf $COLOR_Y'Starting with local Kovan node...\n\n'$COLOR_RESET
             ;;
-        # connects to ocean testnet
-        --local-lake-node)
-            export NODE_FILE=${COMPOSE_DIR}/nodes/lake_node.yml
-            export KEEPER_NETWORK_NAME="ocean_poa_aws"
-            printf $COLOR_Y'Starting with local Pond node...\n\n'$COLOR_RESET
-            ;;
         # spins up a new ganache blockchain
         --local-ganache-node)
             COMPOSE_FILES+=" -f ${COMPOSE_DIR}/keeper_contracts.yml"
@@ -99,6 +92,12 @@ while :; do
             export KEEPER_DEPLOY_CONTRACTS="true"
             printf $COLOR_Y'Starting with local Ganache node...\n\n'$COLOR_RESET
             ;;
+        # connects you to ocean testnet
+        --local-lake-node)
+            export NODE_FILE=${COMPOSE_DIR}/nodes/lake_node.yml
+            export KEEPER_NETWORK_NAME="ocean_poa_aws"
+            printf $COLOR_Y'Starting with local Lake node...\n\n'$COLOR_RESET
+            ;;
         # spins up pond local testnet
         --local-pond-node)
             COMPOSE_FILES+=" -f ${COMPOSE_DIR}/keeper_contracts.yml"
@@ -113,7 +112,7 @@ while :; do
         --purge)
             docker network rm ${PROJECT_NAME}_backend || true
             docker network rm ${PROJECT_NAME}_default || true
-            docker volume rm ${PROJECT_NAME}_parity-node || true
+            docker volume rm ${PROJECT_NAME}_keeper-node || true
             docker volume rm ${PROJECT_NAME}_secret-store || true
             read -p "Are you sure you want to delete $KEEPER_ARTIFACTS_FOLDER? " -n 1 -r
             echo