Commit Graph

485 Commits

Author SHA1 Message Date
Troy McConaghy 98a285bc26
Merge branch 'develop' into add-squid-py-v0.4.2-compatible-option 2019-03-28 12:26:49 +01:00
Javier Cortejoso 45ea0d3e20
Merge pull request #134 from oceanprotocol/change-default-network-to-spree
Change the default network from Nile to Spree
2019-03-28 12:04:29 +01:00
Troy McConaghy f3c3378125 Default KEEPER_NETWORK_NAME="nile" --> "spree" 2019-03-28 11:30:22 +01:00
Troy McConaghy 4b7ff1c270 Change default network from nile to spree 2019-03-26 09:27:49 +01:00
Javier Cortejoso 82f8f3bb65
Moved bootnodes from config to chain spec 2019-03-25 09:51:30 +01:00
Javier Cortejoso b36fab7768
Updated kovan and nile acl contract addresses 2019-03-25 09:49:35 +01:00
Aitor 414b2e596f
Merge pull request #132 from oceanprotocol/fix/nile-keeper-full
removing light flag, a local client needs the events to execute the e2e flow
2019-03-21 10:11:40 +01:00
aitor@oceanprotocol.com b9cb03d20a removing light flag, a local client needs the events to execute the e2e flow 2019-03-19 11:53:13 +01:00
Aitor 7f1b8d1df0
Merge pull request #129 from oceanprotocol/feature/no_secret_store_public_networks
Do not start secret store for public networks (Nile and Kovan)
2019-03-15 16:16:11 +01:00
Javier Cortejoso b50b25f6e7
Disable secret-store in Nile and Kovan 2019-03-15 16:12:01 +01:00
Javier Cortejoso b3ac197bd2
Do not use node-key in public networks 2019-03-15 16:11:44 +01:00
Javier Cortejoso c5e2e1591c
Merge pull request #118 from oceanprotocol/feature/compose_3
Elaticsearch and Compose v3
2019-03-14 09:41:16 +01:00
Tom Marble 530f0d56ca Warn user if ~/.ocean is owned by root (#122)
* Warn user if ~/.ocean is owned by root

Reminder that #100 is not yet fixed

* Updates start_ocean.sh

Adds copyright notice (per @ttmc)
Changes function name for file ownership to check_if_owned_by_root (per @aaitor)
- adds a check for the KEEPER_ARTIFACTS_FOLDER (as required by --purge)

Signed-off-by: Tom Marble <tmarble@info9.net>
2019-03-11 15:47:16 +01:00
Javier Cortejoso 4bfd9b0cee
Merge pull request #121 from oceanprotocol/feature/keeper-contracts-owner
Added owner role address environment variable on Keeper contracts compose.
2019-03-06 12:20:14 +01:00
Pedro Gutiérrez ff27bca33e Added owner role address environment variable on Keeper contracts compose 2019-03-06 12:16:13 +01:00
Troy McConaghy 74db9d106b New users shouldn't run Pleuston, for now 2019-02-28 17:15:02 +01:00
Troy McConaghy 366ae58640 Removed new option, changed default vers, added --stable 2019-02-28 16:49:30 +01:00
Troy McConaghy aed7ca68a0 Added the --squid-py-v0.4.2-compatible option
and updated README.md accordingly
2019-02-28 12:18:53 +01:00
Javier Cortejoso 5f7e9054a0
Updated readme with --elasticsearch 2019-02-27 17:11:13 +01:00
Javier Cortejoso fb1afb8620
Merge branch 'feature/compose_3' of github.com:oceanprotocol/barge into feature/compose_3 2019-02-27 17:06:02 +01:00
Javier Cortejoso 7d9438121f
Merge pull request #117 from oceanprotocol/no-more-ocean-version
No more OCEAN_VERSION
2019-02-25 17:25:23 +01:00
Troy McConaghy 77fac0f3e6
No more OCEAN_VERSION
The OCEAN_VERSION environment variable only occurred in the start_ocean.sh script (and in no other Barge files).

It was set to stable by default but that never got used by anything. If the `--latest` option occurs, then it got changed to `latest` but we don't need to use an environment variable for that.
2019-02-25 14:03:50 +01:00
Javier Cortejoso 346a49757d
Merge pull request #115 from oceanprotocol/fix/error_files
Removed error files
2019-02-14 12:16:49 +01:00
Javier Cortejoso 69fa4492d9
Removed error files 2019-02-14 12:10:44 +01:00
Javier Cortejoso 0f3f1b7849
Merge pull request #114 from oceanprotocol/fix/parity_stable
Fix paritytech/parity-ethereum#10334
2019-02-13 09:09:37 +01:00
Javier Cortejoso 7b6729dd0f
Fix paritytech/parity-ethereum#10334 2019-02-13 09:06:37 +01:00
Javier Cortejoso 9bcef9eca9
ES 6.4.1 2019-02-12 19:54:41 +01:00
eruizgar91 1b3805d3fe Add module variable and upgrade version to 6.4.1 2019-02-11 12:13:29 +01:00
Javier Cortejoso 9709e5c36a
Fix elastic 2019-02-08 16:51:59 +01:00
Javier Cortejoso b977d39a2f
Two files for aquarius 2019-02-08 16:15:01 +01:00
Javier Cortejoso 662898a0eb
Updated acl_contract addresses 2019-02-08 16:14:36 +01:00
Javier Cortejoso b7ec4957ef
Removed error files 2019-02-08 16:13:45 +01:00
Javier Cortejoso 231b13103c
Added elasticsearch 2019-02-08 10:57:56 +01:00
Javier Cortejoso d39e7ac6d7
Upgraded compose version to 3 2019-02-08 09:13:23 +01:00
Enrique Ruiz 64885a9356
Merge pull request #112 from oceanprotocol/fix/nodes_same_net
Fix Secret Store acl_contract -> Parity nodes in the same network
2019-02-07 10:28:09 +01:00
Javier Cortejoso b9435f0a6a
light mode does not work for secret store 2019-02-06 17:32:37 +01:00
Javier Cortejoso 09be714b9f
Removed trace/comments 2019-02-06 11:11:13 +01:00
Javier Cortejoso 3d2067b507
Merge branch 'develop' of github.com:oceanprotocol/barge into fix/nodes_same_net 2019-02-06 11:01:59 +01:00
Javier Cortejoso 8faa6c62b3
Merge pull request #111 from oceanprotocol/some-readme-md-edits
Clarified and copy-edited some of README.md
2019-02-06 11:01:49 +01:00
Javier Cortejoso c5016b2151
Fix kovan 2019-02-06 11:00:58 +01:00
Javier Cortejoso 7a3604115f
Fix Nile and Kovan SS 2019-02-06 08:21:29 +01:00
Troy McConaghy 8ab5d7b8a2
Clarified and copy-edited some of README.md
- Made it clear that the default node type is `nile`, i.e. using the Nile Testnet (in three places).
- Made a link to our docs about the Kovan Testnet, to parallel the link to our docs about the Nile Testnet. Removed the subsection about the Nile network because that section was just linking to our docs; just linked to our docs directly.
- Did some minor copy-editing along the way.
2019-02-05 09:44:52 +01:00
Javier Cortejoso 02bc23c370
Fix nodes same network for Spree 2019-02-01 17:48:02 +01:00
Javier Cortejoso 53e99fe35b
Merge pull request #109 from oceanprotocol/feature/acl_contract_by_default
Feature/acl contract by default
2019-01-30 11:17:47 +01:00
Javier Cortejoso 07f2296a4f
Fix acl address 2019-01-28 11:45:47 +01:00
Javier Cortejoso 1629f1449d
Added acl contract addresses for nile and kovan 2019-01-28 11:36:00 +01:00
Javier Cortejoso a44404000b
Ignore .DS_Store file 2019-01-28 11:35:08 +01:00
Sebastian Gerske 280c142b77
Merge pull request #107 from oceanprotocol/fix/keeper_spree_deployment
Fix/keeper spree deployment
2019-01-25 08:50:47 +01:00
Aitor def6075864
Merge pull request #102 from oceanprotocol/fix/aquarius_url
Fix/aquarius url
2019-01-24 15:10:21 +01:00
Sebastian Gerske 237bf81627 avoid empty var message 2019-01-24 12:03:09 +01:00