fix errors, remove ganache blockTime option.

compose-files/aquarius.yml

@@ -20,5 +20,15 @@ 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_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/

compose-files/aquarius_elasticsearch.yml

@@ -33,7 +33,10 @@ services:
       DB_CLIENT_CERT: ${DB_CLIENT_CERT}
       LOG_LEVEL: DEBUG
       EVENTS_ECIES_PRIVATE_KEY: "0x5d75837394b078ce97bc289fa8d75e21000573520bfa7784a9d28ccaae602bf8"
-      EVENTS_CONTRACT_ADDRESS: ${DDO_CONTRACT_ADDRESS}
+      ARTIFACTS_PATH: "/ocean-contracts/artifacts"
+      ADDRESS_FILE: ${OCEAN_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"

compose-files/ganache.yml

@@ -7,4 +7,4 @@ services:
     networks:
       backend:
         ipv4_address: 172.15.0.3
-    entrypoint: ["node", "/app/ganache-core.docker.cli.js", "--blockTime", "2", "--db", "./ganache_cache", "--networkId","0x2324","--gasLimit","10000000000","--gasPrice","1","---hardfork","istanbul","--mnemonic","${GANACHE_MNEMONIC}"]
+    entrypoint: ["node", "/app/ganache-core.docker.cli.js", "--db", "./ganache_cache", "--networkId","0x2324","--gasLimit","10000000000","--gasPrice","1","---hardfork","istanbul","--mnemonic","${GANACHE_MNEMONIC}"]

compose-files/ocean_contracts.yml

@@ -8,14 +8,14 @@ services:
     environment:
       MNEMONIC: ${GANACHE_MNEMONIC}
       OWNER_ROLE_ADDRESS: ${CONTRACTS_OWNER_ROLE_ADDRESS}
-      DEPLOY_CONTRACTS: ${CONTRACTS_DEPLOY_CONTRACTS}
+      DEPLOY_CONTRACTS: ${DEPLOY_CONTRACTS}
-      LOCAL_CONTRACTS: ${CONTRACTS_DEPLOY_CONTRACTS}
+      LOCAL_CONTRACTS: ${DEPLOY_CONTRACTS}
       REUSE_DATABASE: ${GANACHE_REUSE_DATABASE}
       DATABASE_PATH: "/ganache-db"
       NETWORK_NAME: ${CONTRACTS_NETWORK_NAME}
-      CONTRACTS_RPC_HOST: ${NETWORK_RPC_HOST}
+      NETWORK_RPC_HOST: ${NETWORK_RPC_HOST}
-      CONTRACTS_RPC_PORT: ${NETWORK_RPC_PORT}
+      NETWORK_RPC_PORT: ${NETWORK_RPC_PORT}
-      CONTRACTS_RPC_URL: ${NETWORK_RPC_URL}
+      NETWORK_RPC_URL: ${NETWORK_RPC_URL}
       LOCAL_USER_ID: ${LOCAL_USER_ID}
       LOCAL_GROUP_ID: ${LOCAL_GROUP_ID}
     depends_on:

compose-files/provider.yml

@@ -10,7 +10,7 @@ services:
     depends_on:
     - ocean-contracts
     environment:
-      ARTIFACTS_PATH: ${OCEAN_ARTIFACTS_FOLDER:-/ocean-provider/artifacts}
+      ARTIFACTS_PATH: "/ocean-contracts/artifacts"
       NETWORK_URL: ${NETWORK_RPC_URL}
       PARITY_URL: ${NETWORK_RPC_URL}
       PROVIDER_PRIVATE_KEY: ${PROVIDER_PRIVATE_KEY}

start_ocean.sh

@@ -52,7 +52,7 @@ export GANACHE_MNEMONIC=${GANACHE_MNEMONIC:-"taxi music thumb unique chat sand c
 # Ocean contracts
 export OCEAN_HOME="${HOME}/.ocean"
 export CONTRACTS_OWNER_ROLE_ADDRESS="${CONTRACTS_OWNER_ROLE_ADDRESS}"
-export CONTRACTS_DEPLOY_CONTRACTS="true"
+export DEPLOY_CONTRACTS="true"
 export OCEAN_ARTIFACTS_FOLDER="${OCEAN_HOME}/ocean-contracts/artifacts"
 # Specify which ethereum client to run or connect to: development
 export CONTRACTS_NETWORK_NAME="ganache"
@@ -80,7 +80,6 @@ export PROVIDER_ENCRYPTED_KEY=''
 export PROVIDER_ADDRESS=''
 export PROVIDER_PASSWORD=''
 export PROVIDER_KEYFILE="/accounts/provider.json"
-export DDO_CONTRACT_ADDRESS=''
 
 if [ ${IP} = "localhost" ]; then
     export AQUARIUS_URI=http://172.15.0.5:5000
@@ -147,6 +146,11 @@ function check_max_map_count {
   fi
 }
 
+function clean_local_contracts {
+    rm -f "${OCEAN_ARTIFACTS_FOLDER}/ready"
+    rm -f "${OCEAN_ARTIFACTS_FOLDER}/*.json"
+}
+
 check_if_owned_by_root
 show_banner
 
@@ -227,6 +231,7 @@ while :; do
         *)
             [ ${CHECK_ELASTIC_VM_COUNT} = "true" ] && check_max_map_count
             printf $COLOR_Y'Starting Ocean V3...\n\n'$COLOR_RESET
+            [ ${DEPLOY_CONTRACTS} = "true" ] && clean_local_contracts
             [ ${FORCEPULL} = "true" ] && eval docker-compose "$DOCKER_COMPOSE_EXTRA_OPTS" --project-name=$PROJECT_NAME "$COMPOSE_FILES" pull
             eval docker-compose "$DOCKER_COMPOSE_EXTRA_OPTS" --project-name=$PROJECT_NAME "$COMPOSE_FILES" up --remove-orphans
             break