oceanprotocol
/
barge
mirror of https://github.com/oceanprotocol/barge.git
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into feature/new-brizo

This commit is contained in:
Matthias Kretschmann 2019-09-11 13:34:14 +02:00 committed by GitHub
parent 5079544e73 609d604d99
commit 100124e683
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 4 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -65,7 +65,7 @@ The default versions are always a combination of component versions which are co
| Aquarius | Brizo | Events Handler | Keeper | Pleuston | Faucet |
| -------- | --------- | -------------- | --------- | -------- | -------- |
| `v0.3.8` | `v0.4.2` | `v0.1.2` | `v0.11.1` | `v0.5.0` | `v0.2.6` |
| `v0.3.8` | `v0.4.2` | `v0.1.2` | `v0.11.1` | `v0.5.1` | `v0.2.6` |
You can use the `--latest` option to pull the most recent Docker images for all components, which are always tagged as `latest` in Docker. The `latest` Docker image tag derives from the default main branch of the component's Git repo.
@ -106,7 +106,6 @@ will use the default Docker image tags for Aquarius, Keeper Contracts and Pleust
| `--local-spree-node` | Runs a node of the local `spree` network. This is the default. |
| `--local-duero-node` | Runs a local parity node and connects the node to the `duero` network. |
| `--local-nile-node` | Runs a local parity node and connects the node to the `nile` network. |
| `--local-kovan-node` | Runs a light node of the `kovan` network and connects the node to the `kovan` network. |
| `--reuse-ganache-database` | Configures a running `ganache` node to use a persistent database. |
| `--acl-contract` | Configures secret-store `acl_contract` option to enable secret-store authorization. |
| `--force-pull` | Force pulling the latest revision of the used Docker images. |
@ -174,7 +173,6 @@ This node can be one of the following types (with the default being `spree`):
| `spree` | This is the default. Runs a local node of the Spree Network. See [Spree Network](#spree-network) for details. The contracts from the desired `keeper-contracts` version will be deployed upon launch of this node. |
| `duero` | Runs a local node of the Duero Network and connects to the [Duero Testnet](https://docs.oceanprotocol.com/concepts/testnets/#the-duero-testnet). |
| `nile` | Runs a local node of the Nile Network and connects to the [Nile Testnet](https://docs.oceanprotocol.com/concepts/testnets/#nile-testnet). |
| `kovan` | Runs a local node of the Kovan Network and connects to the [Kovan Testnet](https://docs.oceanprotocol.com/concepts/testnets/#kovan-testnet). |
### Secret Store

5
compose-files/network_volumes.yml
View File

@ -1,4 +1,4 @@
version: '3'
version: "3"
networks:
backend:
@ -6,11 +6,10 @@ networks:
ipam:
driver: default
config:
- subnet: 172.15.0.1/24
- subnet: 172.15.0.1/24
volumes:
keeper-node-duero:
keeper-node-nile:
keeper-node-pacific:
keeper-node-kovan:
secret-store:

24
compose-files/nodes/kovan_node.yml
View File

@ -1,24 +0,0 @@
version: '3'
services:
keeper-node:
image: ${PARITY_IMAGE}
user: root
command:
--chain kovan
--base-path /home/parity/base
--keys-path /keys
--light
--ws-interface all
--jsonrpc-cors all
--jsonrpc-interface all
--jsonrpc-hosts all
--jsonrpc-apis all
--unsafe-expose
volumes:
- ../networks/kovan/keys:/keys/kovan
- keeper-node-kovan:/home/parity/base
ports:
- 8545:8545
networks:
backend:
ipv4_address: 172.15.0.12

28
kovan_acl_contract_addresses.txt
View File

@ -1,28 +0,0 @@
Kovan
Version=address
v0.5.1=0x53CF7c49188C3d5c6e22d2d25619bA5e51367344
v0.5.2=0x53CF7c49188C3d5c6e22d2d25619bA5e51367344
v0.5.3=0xD82184412E6bbe2F737A35867ec6242A477ca440
v0.6.0=0xD82184412E6bbe2F737A35867ec6242A477ca440
v0.6.1=0xD82184412E6bbe2F737A35867ec6242A477ca440
v0.6.2=0xD82184412E6bbe2F737A35867ec6242A477ca440
v0.6.3=0xD82184412E6bbe2F737A35867ec6242A477ca440
v0.6.4=0xD82184412E6bbe2F737A35867ec6242A477ca440
v0.6.5=0xD82184412E6bbe2F737A35867ec6242A477ca440
v0.6.6=0x294aabd9559b547069c48b45d14bb1ea8d81e440
v0.6.7=0x294aabd9559b547069c48b45d14bb1ea8d81e440
v0.6.8=0x294aabd9559b547069c48b45d14bb1ea8d81e440
v0.6.9=0x294aabd9559b547069c48b45d14bb1ea8d81e440
v0.6.10=0xa5a8c65a5db8f1d18ccbb4759692e4dbe1434974
v0.6.11=0xa5a8c65a5db8f1d18ccbb4759692e4dbe1434974
v0.6.12=0xa5a8c65a5db8f1d18ccbb4759692e4dbe1434974
v0.7.0=0x6e0e0e474102c2f326bfbd5e367455258ed87d1e
v0.8.0=0x6e0e0e474102c2f326bfbd5e367455258ed87d1e
v0.8.1=0x6e0e0e474102c2f326bfbd5e367455258ed87d1e
v0.8.2=0x6e0e0e474102c2f326bfbd5e367455258ed87d1e
v0.8.3=0xd7140Ca488f5087DF6F172eAFd2a2420fFE84008
v0.8.4=0xd7140Ca488f5087DF6F172eAFd2a2420fFE84008
v0.8.5=0xd7140Ca488f5087DF6F172eAFd2a2420fFE84008
v0.8.6=0x9Ee06Ac392FE11f1933a51B48D1d07dd97f1dec7
v0.8.7=0x9Ee06Ac392FE11f1933a51B48D1d07dd97f1dec7
latest=0x9Ee06Ac392FE11f1933a51B48D1d07dd97f1dec7

22
networks/kovan/keys/publisher.json
View File

@ -1,22 +0,0 @@
{
"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": "{}"
}

23
networks/kovan/keys/validator.json
View File

@ -1,23 +0,0 @@
{
"id": "0902d04b-f26e-5c1f-e3ae-78d2c1cb16e7",
"version": 3,
"crypto": {
"cipher": "aes-128-ctr",
"cipherparams": {
"iv": "6a829fe7bc656d85f6c2e9fd21784952"
},
"ciphertext": "1bfec0b054a648af8fdd0e85662206c65a4af0ed15fede4ad41ca9ab7b504ce2",
"kdf": "pbkdf2",
"kdfparams": {
"c": 10240,
"dklen": 32,
"prf": "hmac-sha256",
"salt": "95f96b5ee22dd537e06076eb8d7078eb7275d29af935782fe476696b11be50e5"
},
"mac": "4af2215c3cd9447a5b0512d7d1c3ea5a4435981e1c8f48bf71d7a49c0e5b4986"
},
"address": "00bd138abd70e2f00903268f3db08f2d25677c9e",
"name": "Validator0",
"meta": "{}"
}

17
start_ocean.sh
View File

@ -32,7 +32,7 @@ export OCEAN_HOME="${HOME}/.ocean"
export KEEPER_OWNER_ROLE_ADDRESS="${KEEPER_OWNER_ROLE_ADDRESS}"
export KEEPER_DEPLOY_CONTRACTS="true"
export KEEPER_ARTIFACTS_FOLDER="${OCEAN_HOME}/keeper-contracts/artifacts"
# Specify which ethereum client to run or connect to: development, kovan, spree or nile
# Specify which ethereum client to run or connect to: development, spree or nile
export KEEPER_NETWORK_NAME="spree"
export NODE_COMPOSE_FILE="${COMPOSE_DIR}/nodes/spree_node.yml"
@ -263,20 +263,6 @@ while :; do
#################################################
# Node type switches
#################################################
# connects you to kovan
--local-kovan-node)
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"
@ -341,7 +327,6 @@ while :; do
docker network rm ${PROJECT_NAME}_secretstore || true
docker volume rm ${PROJECT_NAME}_secret-store || true
docker volume rm ${PROJECT_NAME}_keeper-node-duero || true
docker volume rm ${PROJECT_NAME}_keeper-node-kovan || true
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