Merge pull request #179 from oceanprotocol/feature/optimize

Optimize some aspects
2024-12-02 05:57:21 +01:00 · 2019-08-29 11:53:55 +02:00 · 2019-08-29 11:53:55 +02:00 · 35b8e21624
commit 35b8e21624
parent f978f86632 b2eaa5f04a
30 changed files with 338 additions and 5168 deletions
--- a/brizo.env
+++ b/brizo.env
@ -1,13 +1,5 @@
 # Use this file to set the env vars required for Brizo.

-# Set a valid parity address and password to have seamless interaction with the `keeper`
-PARITY_ADDRESS=0x00bd138abd70e2f00903268f3db08f2d25677c9e
-PARITY_PASSWORD=node0
-
-SECRET_STORE_URL=http://secret-store:12001
-KEEPER_URL=http://keeper-node:8545
-PARITY_URL=http://keeper-node:8545
-
 AZURE_ACCOUNT_NAME=
 AZURE_ACCOUNT_KEY=
 AZURE_RESOURCE_GROUP=
--- a/compose-files/brizo.yml
+++ b/compose-files/brizo.yml
@ -9,11 +9,15 @@ services:
        ipv4_address: 172.15.0.17
    depends_on:
      - keeper-node
+      - secret-store-signing-node
    env_file:
      - ${BRIZO_ENV_FILE}
    environment:
      KEEPER_URL: ${KEEPER_RPC_URL}
-      PARITY_URL: ${KEEPER_RPC_URL}
+      PARITY_URL: ${SIGNING_NODE_URL}
      LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS}
+      SECRET_STORE_URL: ${SECRET_STORE_URL}
+      PARITY_ADDRESS: ${PUBLISHER_ADDRESS}
+      PARITY_PASSWORD: ${PUBLISHER_PASSWORD}
    volumes:
      - ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro
--- a/compose-files/pleuston.yml
+++ b/compose-files/pleuston.yml
@ -13,5 +13,7 @@ services:
    - brizo
    environment:
      LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS}
+      REACT_APP_AQUARIUS_URI: ${AQUARIUS_URI}
+      REACT_APP_BRIZO_ADDRESS: ${PUBLISHER_ADDRESS}
    volumes:
    - ${KEEPER_ARTIFACTS_FOLDER}:/pleuston/node_modules/@oceanprotocol/keeper-contracts/artifacts/:ro
--- a/compose-files/secret_store.yml
+++ b/compose-files/secret_store.yml
@ -14,7 +14,6 @@ services:
      --jsonrpc-interface all
      --jsonrpc-hosts all
      --jsonrpc-apis all
-      --no-warp
      --node-key 0x32313aee5977ca63184b696e4cf7b7bfc2745f727dbef82d7a1f6314ad58dcf5
      -l secretstore_net,secretstore=trace
    volumes:
@ -41,23 +40,3 @@ services:
      backend:
        ipv4_address: 172.15.0.16
    command: nginx -g 'daemon off;'
-
-  secret-store-signing-node:
-    image: ${PARITY_IMAGE}
-    command:
-      --chain /etc/parity/secretstore/chain_${KEEPER_NETWORK_NAME}.json
-      --light
-      --jsonrpc-interface all
-      --jsonrpc-apis secretstore
-      --jsonrpc-cors all
-      --no-warp
-      --keys-path /home/parity/.local/keys
-      --node-key 0x27881af7f75724e25a9818f6c8e719895c8c9d3512003fc8ad0f47d762a07a79
-    ports:
-      - 9545:8545
-    volumes:
-      - ../networks/secret-store/keys:/home/parity/.local/keys
-      - ../networks/secret-store/config/:/etc/parity/secretstore/
-    networks:
-      backend:
-        ipv4_address: 172.15.0.18
--- a/compose-files/secret_store_signing_node.yml
+++ b/compose-files/secret_store_signing_node.yml
@ -0,0 +1,21 @@
+version: '3'
+services:
+  secret-store-signing-node:
+    image: ${PARITY_IMAGE}
+    command:
+      --chain dev
+      --light
+      --ws-interface all
+      --jsonrpc-cors all
+      --jsonrpc-interface all
+      --jsonrpc-hosts all
+      --jsonrpc-apis all
+      --keys-path /home/parity/.local/keys
+    ports:
+      - 9545:8545
+    volumes:
+      - ../networks/secret-store/keys:/home/parity/.local/keys
+      - ../networks/secret-store/config/:/etc/parity/secretstore/
+    networks:
+      backend:
+        ipv4_address: 172.15.0.18
--- a/networks/secret-store/keys/kovan/address_book.json
+++ b/networks/secret-store/keys/kovan/address_book.json
--- a/networks/duero/keys/duero/account1.json
+++ b/networks/duero/keys/duero/account1.json
--- a/networks/pacific/keys/account1.json
+++ b/networks/pacific/keys/account1.json
--- a/networks/nile/keys/address_book.json
+++ b/networks/nile/keys/address_book.json
@ -0,0 +1 @@
+{}
--- a/networks/secret-store/keys/kovan/account1.json
+++ b/networks/secret-store/keys/kovan/account1.json
--- a/networks/pacific/keys/address_book.json
+++ b/networks/pacific/keys/address_book.json
@ -0,0 +1 @@
+{}
--- a/networks/secret-store/keys/nile/account1.json
+++ b/networks/secret-store/keys/nile/account1.json
--- a/networks/secret-store/config/chain_duero.json
+++ b/networks/secret-store/config/chain_duero.json
@ -0,0 +1,175 @@
+{
+  "name": "duero",
+  "engine": {
+    "authorityRound": {
+      "params": {
+        "stepDuration": "5",
+        "validators": {
+          "multi": {
+            "0": {
+              "list": [
+                "0xdcb7ff1b9fd738a47eaf9b2e0b3d817b1da92781",
+                "0x3e10ae74970da70b706e768eead37b712a698941",
+                "0x0179e19cd246bb7bdec2c998ae0d8307a7eddbc5"
+              ]
+            },
+            "333": {
+              "safeContract": "0xBDFeAc66c022165Bdb320264398977bf8A54e3C0"
+            },
+            "13333": {
+              "safeContract": "0x4Eb388C190Cde6Bf8C60e37CCd2C8056A184eD43"
+            }
+          }
+        }
+      }
+    }
+  },
+  "params": {
+    "maximumExtraDataSize": "0x20",
+    "minGasLimit": "0x1388",
+    "networkID": "0x897",
+    "gasLimitBoundDivisor": "0x400",
+    "eip140Transition": "0x0",
+    "eip211Transition": "0x0",
+    "eip214Transition": "0x0",
+    "eip658Transition": "0x0",
+    "wasmActivationTransition": "0x0",
+    "eip145Transition": "0x0",
+    "eip1014Transition": "0x0",
+    "eip1052Transition": "0x0",
+    "eip1283Transition": "0x0",
+    "kip4Transition": "0x0",
+    "kip6Transition": "0x0",
+    "maxCodeSize": 24576,
+    "maxCodeSizeTransition": "0x0"
+  },
+  "genesis": {
+    "seal": {
+      "authorityRound": {
+        "step": "0x0",
+        "signature": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      }
+    },
+    "difficulty": "0x20000",
+    "gasLimit": "0x165A0BC00"
+  },
+  "accounts": {
+    "0x0000000000000000000000000000000000000001": {
+      "balance": "1",
+      "builtin": {
+        "name": "ecrecover",
+        "pricing": {
+          "linear": {
+            "base": 3000,
+            "word": 0
+          }
+        }
+      }
+    },
+    "0x0000000000000000000000000000000000000002": {
+      "balance": "1",
+      "builtin": {
+        "name": "sha256",
+        "pricing": {
+          "linear": {
+            "base": 60,
+            "word": 12
+          }
+        }
+      }
+    },
+    "0x0000000000000000000000000000000000000003": {
+      "balance": "1",
+      "builtin": {
+        "name": "ripemd160",
+        "pricing": {
+          "linear": {
+            "base": 600,
+            "word": 120
+          }
+        }
+      }
+    },
+    "0x0000000000000000000000000000000000000004": {
+      "balance": "1",
+      "builtin": {
+        "name": "identity",
+        "pricing": {
+          "linear": {
+            "base": 15,
+            "word": 3
+          }
+        }
+      }
+    },
+    "0xf5d60efcad44babc8d85eb8df57d9e3a5101eb93": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x61f9546cd2bd5e46bdb915ab9c69210c6ee043d2": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x8d968b9bc8fe3b1d233ae6238c771544dd7c8fb2": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x63132a33765fe352187c93e45fac1b9162399e5c": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x95a165da81359c11aafb4490fe6afeb6ee4f7c2e": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x9224dff492427471092d13b36866875d7e0f2dd6": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x9aa9bfa819800a44803dcacc514bb443a2baade6": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x85ef014983c1bad421cc00941c18122066da5860": {
+      "balance": "0x2000000000000000000"
+    },
+    "0xc6fffcb664a60c019a335902112584829a91c0a0": {
+      "balance": "0x2000000000000000000"
+    },
+    "0xdbb63fb51453714f5efed3c2846160018fb3f43c": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x23be64786fe4467635e65aea49f9dd7a0b05d7b5": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x3c80c7163c1e6730f2ba80df707178dcdee44475": {
+      "balance": "0x2000000000000000000"
+    },
+    "0xe49c5f9c8a78884c8ba2aa161b8c41bf21b96751": {
+      "balance": "0x2000000000000000000"
+    },
+    "0xf7f2673e854e7b33a62beec796dec5d61ac9c40a": {
+      "balance": "0x2000000000000000000"
+    },
+    "0xe739ed3643970d106c4b1c51de91b7992400e50c": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x85a7273ff4f4ffce0c708f47ab45249867679bcf": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x4156e7abdfe6e08c16ef2b241661276af57f9ead": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x480b0e0a641ae45521377d4984d085a003934561": {
+      "balance": "0x200000000000000000000000"
+    },
+    "0xb08eb95236499f072b2ae3c91a8f911d6c853b4d": {
+      "balance": "0x200000000000000000000000"
+    },
+    "0x4899f06b5e60140f1885599bf3a562cb25775adc": {
+      "balance": "0x200000000000000000000000"
+    }
+  },
+  "nodes": [
+    "enode://1ac6d74bbd80a37c1dc75bddc78462922d8df6b6243c2e1b38ff250ae57d11ad37bbfcc65fcbb7c0ae22da1de5e516c00ddf98253701db18fe7280ca6b8b45d2@3.214.8.88:30303",
+    "enode://d081a7cebb62ba4a93cbdc96a22779168d8583266fe94a859a40ceb85cf8a056aeabf82c43f2ba35e4eeaf61c34fa8a873b1f16906dfcc0d512cb29e316d696a@3.95.88.145:30303",
+    "enode://d7fc9a3c23f9926321b81ff32ac130bdce185edb7be6fa33375ad18162de1faee894d0e671077e139295cbc609b036804a05d8353ea32b9c963bced2aeda951f@34.193.207.38:30303",
+    "enode://16baffd0d7f8ddd77c5ac21902bdb3ae6fa9e17f2449a579e5f2db0b8701e451c7d27225319cb15628791d4d19f3fcb7c2e2c6b8757ab195eb65d7c347c9530c@23.22.141.34:30303",
+    "enode://f05c1d338edbfbba711118a4ac8ecc37dba436289ecf86361664ef9fe4659e31f668ff23982e9afcf60e8059b23fa6b0f0bce4e8dcfef3e7507c168d62d4d98b@3.214.59.4:30303",
+    "enode://7d582bb66161906100679e079676f12109e5e73731c28a0d23d7c36ece46acd0a307add1b0c38931441c7dbffd5f0ae5507427523e9e3ea875b1ee43097d5b8d@3.213.32.155:30303"
+  ]
+}
+
--- a/networks/secret-store/config/chain_kovan.json
+++ b/networks/secret-store/config/chain_kovan.json
--- a/networks/secret-store/config/chain_pacific.json
+++ b/networks/secret-store/config/chain_pacific.json
@ -1,109 +0,0 @@
-{
-  "name": "pacific",
-  "engine": {
-    "authorityRound": {
-      "params": {
-        "stepDuration": "5",
-        "validators": {
-          "multi": {
-            "0": {
-              "list": [
-                "0x58c0131d5a14b508a7d2cea1179cf8d384b7bf1a",
-                "0x5676b8e60728efdc33a65fcdb8c6d0965d5b045a",
-                "0xbe7ef68dcdbe6520a4ba380c59d1dadc012effff"
-              ]
-            }
-          }
-        }
-      }
-    }
-  },
-  "params": {
-    "maximumExtraDataSize": "0x20",
-    "minGasLimit": "0x1388",
-    "networkID": "0xCEA11",
-    "gasLimitBoundDivisor": "0x400",
-    "eip140Transition": "0",
-    "eip145Transition": "0",
-    "eip211Transition": "0",
-    "eip214Transition": "0",
-    "eip658Transition": "0",
-    "eip1014Transition": "0",
-    "eip1052Transition": "0",
-    "eip1283Transition": "0",
-    "kip4Transition": "0",
-    "kip6Transition": "0",
-    "wasmActivationTransition": "0"
-  },
-  "genesis": {
-    "seal": {
-      "authorityRound": {
-        "step": "0x0",
-        "signature": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-      }
-    },
-    "difficulty": "0x20000",
-    "gasLimit": "0x165A0BC00"
-  },
-  "accounts": {
-    "0x0000000000000000000000000000000000000001": {
-      "balance": "1",
-      "builtin": {
-        "name": "ecrecover",
-        "pricing": {
-          "linear": {
-            "base": 3000,
-            "word": 0
-          }
-        }
-      }
-    },
-    "0x0000000000000000000000000000000000000002": {
-      "balance": "1",
-      "builtin": {
-        "name": "sha256",
-        "pricing": {
-          "linear": {
-            "base": 60,
-            "word": 12
-          }
-        }
-      }
-    },
-    "0x0000000000000000000000000000000000000003": {
-      "balance": "1",
-      "builtin": {
-        "name": "ripemd160",
-        "pricing": {
-          "linear": {
-            "base": 600,
-            "word": 120
-          }
-        }
-      }
-    },
-    "0x0000000000000000000000000000000000000004": {
-      "balance": "1",
-      "builtin": {
-        "name": "identity",
-        "pricing": {
-          "linear": {
-            "base": 15,
-            "word": 3
-          }
-        }
-      }
-    },
-    "0x7eed82a01e7b3cc6c3bb472d34d875e6e2ead48b": {
-      "balance": "1606938044258990275541962092341162602522202993782792835301376"
-    }
-  },
-  "nodes": [
-    "enode://e5e44f4a86a706b4d00a51078df37c0240872a4b1a0b1561266573e42c1e76e8b48a80b46526accba41677323288cc395babd39ac7483b98808c2387addcd949@3.217.145.228:30303",
-    "enode://6a4aac724a2dc1076e26837723958549feef5202ce5dce35bfad443782a0a73da31a7dabe285d18d61c26dfb39e2dec55ed6d61e1af27b927741b5ff1ac399d7@3.217.208.52:30303",
-    "enode://7797c7ba758004af448ea0a33a9815b4578a14c98a1feb1717a954d9927d9b59c194dc50c59a9b4053277a92e0e96917e3340a2bcdb5d09e49cf9907f090d94b@3.217.90.136:30303",
-    "enode://c3c6b58cb12afee2b5ab92e418b86c542c3debebdc08f8c16e3e674b302517ac85118ee6519ab89855a45b0f2136d06a63194fa668d18d5757a1a0f0dfca18d9@3.218.32.223:30303",
-    "enode://58fea462352fa09ae22893a849ca6a6600a1a24ffacd25fe7f380ec442163edd0ce5b5884ab63451adf6b1df9b651ad6b5ffcaa74fe1e2346aabda3419686e52@52.206.124.28:30303",
-    "enode://496cdd8b49f17cbe3000ef3d0cad2ff92aa321a04e791af562fb6f66dfe634a5eb28fb80148d58d5bf99e115a21f3d433f8ce54f9ae79a9e619e213bb6585d73@54.158.180.108:30303"
-  ]
-}
--- a/networks/secret-store/keys/DevelopmentChain/address_book.json
+++ b/networks/secret-store/keys/DevelopmentChain/address_book.json
@ -0,0 +1 @@
+{}
--- a/networks/secret-store/keys/DevelopmentChain/dev.json
+++ b/networks/secret-store/keys/DevelopmentChain/dev.json
@ -0,0 +1,22 @@
+{
+  "id": "ebc69e4b-481f-89bb-6ea1-0df5f733f719",
+  "version": 3,
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "b66b7d5f80d8b44486591ab97965b03f"
+    },
+    "ciphertext": "50adeb6abe8539140ee40009faac297ce8c70d12634b1bafd1ee44f8dee6c40c",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 10240,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "0570b4cea545ff4eda778e0a00c66f0357058209e497d8c5dc161a5923f4f225"
+    },
+    "mac": "efa76188215ab904279c8efe1b8cff62a370c0ad4562a8b5fc87587b04db2748"
+  },
+  "address": "00a329c0648769a73afac7f9381e08fb43dbea72",
+  "name": "Development Account",
+  "meta": "{\"description\":\"Never use this account outside of development chain!\",\"passwordHint\":\"Password is empty string\"}"
+}
--- a/networks/secret-store/keys/DevelopmentChain/publisher.json
+++ b/networks/secret-store/keys/DevelopmentChain/publisher.json
--- a/networks/secret-store/keys/DevelopmentChain/test_account.json
+++ b/networks/secret-store/keys/DevelopmentChain/test_account.json
--- a/networks/secret-store/keys/duero/address_book.json
+++ b/networks/secret-store/keys/duero/address_book.json
@ -0,0 +1 @@
+{}
--- a/networks/secret-store/keys/duero/publisher.json
+++ b/networks/secret-store/keys/duero/publisher.json
--- a/networks/secret-store/keys/duero/ss1.json
+++ b/networks/secret-store/keys/duero/ss1.json
--- a/networks/secret-store/keys/duero/test_account.json
+++ b/networks/secret-store/keys/duero/test_account.json
--- a/networks/secret-store/keys/nile/publisher.json
+++ b/networks/secret-store/keys/nile/publisher.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": "{}"
+}
--- a/networks/secret-store/keys/nile/test_account.json
+++ b/networks/secret-store/keys/nile/test_account.json
--- a/networks/secret-store/keys/spree/publisher.json
+++ b/networks/secret-store/keys/spree/publisher.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": "{}"
+}
--- a/networks/secret-store/keys/spree/test_account.json
+++ b/networks/secret-store/keys/spree/test_account.json
--- a/networks/spree/keys/publisher.json
+++ b/networks/spree/keys/publisher.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": "{}"
+}
--- a/networks/spree/keys/test_account.json
+++ b/networks/spree/keys/test_account.json
@ -0,0 +1,22 @@
+{
+  "id": "ce455fdd-11fd-5a71-0a31-9d0bec6a605d",
+  "version": 3,
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "56b27c187d45aab59377869042b948aa"
+    },
+    "ciphertext": "c774b879793e2e54b85071d929cc7fbb11b47f6bab6e590edf3997fe4373eaf8",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 10240,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "33b3b99e4c6f7f6d7d804555d40c08e4a2acba20e1e46aca712c82c3b9bab749"
+    },
+    "mac": "10ee295ce6b1553887413f0e717ccedc1bddb62572bb9208ec3bd091085990db"
+  },
+  "address": "a99d43d86a0758d5632313b8fa3972b6088a21bb",
+  "name": "",
+  "meta": "{}"
+}
--- a/start_ocean.sh
+++ b/start_ocean.sh
@ -16,10 +16,10 @@ COMPOSE_DIR="${DIR}/compose-files"
 export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v0.3.8}
 export BRIZO_VERSION=${BRIZO_VERSION:-v0.3.14}
 export KEEPER_VERSION=${KEEPER_VERSION:-v0.10.3}
-export PLEUSTON_VERSION=${PLEUSTON_VERSION:-v0.5.0}
+export PLEUSTON_VERSION=${PLEUSTON_VERSION:-v0.5.1}
 export FAUCET_VERSION=${FAUCET_VERSION:-v0.2.6}

-export PARITY_IMAGE="parity/parity:v2.3.3"
+export PARITY_IMAGE="parity/parity:v2.5.1"

 export PROJECT_NAME="ocean"
 export FORCEPULL="false"
@ -63,6 +63,16 @@ export DB_CLIENT_KEY=""
 export DB_CLIENT_CERT=""
 CHECK_ELASTIC_VM_COUNT=true

+# 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=0x068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0
+export PUBLISHER_PASSWORD=secret
+
+export SECRET_STORE_URL=http://secret-store:12001
+export SIGNING_NODE_URL=http://secret-store-signing-node:8545
+
+export AQUARIUS_URI=http://localhost:5000
+
 # Default Faucet options
 export FAUCET_TIMESPAN=${FAUCET_TIMESPAN:-24}

@ -146,6 +156,7 @@ COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pleuston.yml"
 COMPOSE_FILES+=" -f ${COMPOSE_DIR}/aquarius_elasticsearch.yml"
 COMPOSE_FILES+=" -f ${COMPOSE_DIR}/brizo.yml"
 COMPOSE_FILES+=" -f ${COMPOSE_DIR}/secret_store.yml"
+COMPOSE_FILES+=" -f ${COMPOSE_DIR}/secret_store_signing_node.yml"
 COMPOSE_FILES+=" -f ${COMPOSE_DIR}/faucet.yml"

 DOCKER_COMPOSE_EXTRA_OPTS="${DOCKER_COMPOSE_EXTRA_OPTS:-}"
@ -206,6 +217,7 @@ while :; do
            COMPOSE_FILES=""
            COMPOSE_FILES+=" -f ${COMPOSE_DIR}/network_volumes.yml"
            COMPOSE_FILES+=" -f ${COMPOSE_DIR}/secret_store.yml"
+            COMPOSE_FILES+=" -f ${COMPOSE_DIR}/secret_store_signing_node.yml"
            NODE_COMPOSE_FILE=""
            printf $COLOR_Y'Starting only Secret Store...\n\n'$COLOR_RESET
            ;;
@ -243,44 +255,46 @@ while :; do
            export NODE_COMPOSE_FILE="${COMPOSE_DIR}/nodes/kovan_node.yml"
            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/keeper_contracts.yml/}"
            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/secret_store.yml/}"
+            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/faucet.yml/}"
            export KEEPER_MNEMONIC=''
            export KEEPER_NETWORK_NAME="kovan"
            export KEEPER_DEPLOY_CONTRACTS="false"
            export ACL_CONTRACT_ADDRESS="$(get_acl_address ${KEEPER_VERSION})"
            printf $COLOR_Y'Starting with local Kovan node...\n\n'$COLOR_RESET
            printf $COLOR_Y'Starting without Secret Store...\n\n'$COLOR_RESET
+            printf $COLOR_Y'Starting without faucet...\n\n'$COLOR_RESET
            ;;
        # spins up a new ganache blockchain
        --local-ganache-node)
            export NODE_COMPOSE_FILE="${COMPOSE_DIR}/nodes/ganache_node.yml"
+            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/secret_store.yml/}"
+            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/secret_store_signing_node.yml/}"
            export KEEPER_MNEMONIC=''
            export KEEPER_NETWORK_NAME="development"
            export KEEPER_DEPLOY_CONTRACTS="true"
            printf $COLOR_Y'Starting with local Ganache node...\n\n'$COLOR_RESET
+            printf $COLOR_Y'Starting without Secret Store...\n\n'$COLOR_RESET
+            printf $COLOR_Y'Starting without Secret Store signing node...\n\n'$COLOR_RESET
            ;;
        # connects you to nile ocean testnet
        --local-nile-node)
            export NODE_COMPOSE_FILE="${COMPOSE_DIR}/nodes/nile_node.yml"
            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/keeper_contracts.yml/}"
-            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/secret_store.yml/}"
            export KEEPER_MNEMONIC=''
            export KEEPER_NETWORK_NAME="nile"
            export KEEPER_DEPLOY_CONTRACTS="false"
            export ACL_CONTRACT_ADDRESS="$(get_acl_address ${KEEPER_VERSION})"
            printf $COLOR_Y'Starting with local Nile node...\n\n'$COLOR_RESET
-            printf $COLOR_Y'Starting without Secret Store...\n\n'$COLOR_RESET
            ;;
        # connects you to duero ocean testnet
        --local-duero-node)
            export NODE_COMPOSE_FILE="${COMPOSE_DIR}/nodes/duero_node.yml"
            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/keeper_contracts.yml/}"
-            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/secret_store.yml/}"
            export KEEPER_MNEMONIC=''
            export KEEPER_NETWORK_NAME="duero"
            export KEEPER_DEPLOY_CONTRACTS="false"
            export ACL_CONTRACT_ADDRESS="$(get_acl_address ${KEEPER_VERSION})"
            printf $COLOR_Y'Starting with local Duero node...\n\n'$COLOR_RESET
-            printf $COLOR_Y'Starting without Secret Store...\n\n'$COLOR_RESET
            ;;
        # connects you to Pacific ocean network
        --local-pacific-node)
@ -318,7 +332,7 @@ while :; do
            docker volume rm ${PROJECT_NAME}_keeper-node-nile || true
            docker volume rm ${PROJECT_NAME}_keeper-node-pacific || true
            docker volume rm ${PROJECT_NAME}_faucet || true
-            read -p "Are you sure you want to delete $KEEPER_ARTIFACTS_FOLDER? " -n 1 -r
+            read -p "Are you sure you want to delete $KEEPER_ARTIFACTS_FOLDER? (y/N): " -n 1 -r
            echo
            if [[ $REPLY =~ ^[Yy]$ ]]
            then