From c4fc4d81668e21c409e52ac78d36de5308c77653 Mon Sep 17 00:00:00 2001
From: ssallam <samer@oceanprotocol.com>
Date: Thu, 29 Aug 2019 11:16:13 +0200
Subject: [PATCH] Update some env-var names to improve clarity, add accounts
 folder with a specific provider keyfile. Revert provider/publisher address to
 previous value.

---
 accounts/provider.json           | 22 ++++++++++++++++++++++
 compose-files/brizo.yml          |  8 ++++----
 compose-files/events_handler.yml |  8 ++++----
 compose-files/pleuston.yml       |  2 +-
 start_ocean.sh                   |  7 ++++---
 5 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100755 accounts/provider.json

diff --git a/accounts/provider.json b/accounts/provider.json
new file mode 100755
index 0000000..2226e59
--- /dev/null
+++ b/accounts/provider.json
@@ -0,0 +1,22 @@
+{
+  "id": "50aa801a-8d66-1402-1fa4-d8987868c2ce",
+  "version": 3,
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "a874e6fe50a5bb088826c45560dc1b7e"
+    },
+    "ciphertext": "2383c6aa50c744b6558e77b5dcec6137f647c81f10f71f22a87321fd1306056c",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 10240,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "eca6ccc9fbb0bdc3a516c7576808ba5031669e6878f3bb95624ddb46449e119c"
+    },
+    "mac": "14e9a33a45ae32f88a0bd5aac14521c1fcf14f56fd55c1a1c080b2f81ddb8d44"
+  },
+  "address": "068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0",
+  "name": "",
+  "meta": "{}"
+}
diff --git a/compose-files/brizo.yml b/compose-files/brizo.yml
index 3f927a2..265d442 100644
--- a/compose-files/brizo.yml
+++ b/compose-files/brizo.yml
@@ -17,10 +17,10 @@ services:
       PARITY_URL: ${SIGNING_NODE_URL}
       LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS}
       SECRET_STORE_URL: ${SECRET_STORE_URL}
-      PARITY_ADDRESS: ${PUBLISHER_ADDRESS}
-      PARITY_PASSWORD: ${PUBLISHER_PASSWORD}
-      PARITY_KEYFILE: ${PUBLISHER_KEYFILE}
+      PARITY_ADDRESS: ${PROVIDER_ADDRESS}
+      PARITY_PASSWORD: ${PROVIDER_PASSWORD}
+      PARITY_KEYFILE: ${PROVIDER_KEYFILE}
       LOG_LEVEL: ${BRIZO_LOG_LEVEL}
     volumes:
       - ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro
-      - ../networks/spree/authorities/:/parity-data/keys
+      - ${ACCOUNTS_FOLDER}:/accounts
diff --git a/compose-files/events_handler.yml b/compose-files/events_handler.yml
index aaa937b..cc71414 100644
--- a/compose-files/events_handler.yml
+++ b/compose-files/events_handler.yml
@@ -11,11 +11,11 @@ services:
       KEEPER_URL: ${KEEPER_RPC_URL}
       PARITY_URL: ${SIGNING_NODE_URL}
       SECRET_STORE_URL: ${SECRET_STORE_URL}
-      PARITY_ADDRESS: ${PUBLISHER_ADDRESS}
-      PARITY_PASSWORD: ${PUBLISHER_PASSWORD}
-      PARITY_KEYFILE: ${PUBLISHER_KEYFILE}
+      PARITY_ADDRESS: ${PROVIDER_ADDRESS}
+      PARITY_PASSWORD: ${PROVIDER_PASSWORD}
+      PARITY_KEYFILE: ${PROVIDER_KEYFILE}
       LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS}
       LOG_LEVEL: ${EVENTS_HANDLER_LOG_LEVEL}
     volumes:
       - ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro
-      - ../networks/spree/authorities/:/parity-data/keys
+      - ${ACCOUNTS_FOLDER}:/accounts
diff --git a/compose-files/pleuston.yml b/compose-files/pleuston.yml
index b18fca2..cb37a16 100644
--- a/compose-files/pleuston.yml
+++ b/compose-files/pleuston.yml
@@ -14,6 +14,6 @@ services:
     environment:
       LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS}
       REACT_APP_AQUARIUS_URI: ${AQUARIUS_URI}
-      REACT_APP_BRIZO_ADDRESS: ${PUBLISHER_ADDRESS}
+      REACT_APP_BRIZO_ADDRESS: ${PROVIDER_ADDRESS}
     volumes:
     - ${KEEPER_ARTIFACTS_FOLDER}:/pleuston/node_modules/@oceanprotocol/keeper-contracts/artifacts/:ro
diff --git a/start_ocean.sh b/start_ocean.sh
index 251a77a..d5c3099 100755
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -69,9 +69,10 @@ export EVENTS_HANDLER_LOG_LEVEL="INFO"
 
 # Set a valid parity address and password to have seamless interaction with the `keeper`
 # it has to exist on the secret store signing node and as well on the keeper node
-export PUBLISHER_ADDRESS=0x00bd138abd70e2f00903268f3db08f2d25677c9e
-export PUBLISHER_PASSWORD=node0
-export PUBLISHER_KEYFILE="/parity-data/keys/validator0.json"
+export PROVIDER_ADDRESS=0x068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0
+export PROVIDER_PASSWORD=secret
+export PROVIDER_KEYFILE="/accounts/provider.json"
+export ACCOUNTS_FOLDER="../accounts"
 
 export SECRET_STORE_URL=http://secret-store:12001
 export SIGNING_NODE_URL=http://secret-store-signing-node:8545