oceanprotocol/barge
1
0
Fork 0
mirror of https://github.com/oceanprotocol/barge.git synced 2024-11-22 09:47:04 +01:00
Code Releases Activity

Merge pull request #375 from oceanprotocol/issue374-replace-pdr-components-with-pdr-backend

Browse Source
This commit is contained in:
trizin 2023-09-26 16:45:07 +03:00 committed by GitHub
commit d6bcd0eafe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 40 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compose-files/pdr-dfbuyer.yml
View File

@ -1,7 +1,8 @@
version: '3' version: "3"
services: services:
pdr-dfbuyer: pdr-dfbuyer:
image: oceanprotocol/pdr-dfbuyer:${PDR_DFBUYER_VERSION:-latest} image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
command: dfbuyer
networks: networks:
backend: backend:
ipv4_address: 172.15.0.44 ipv4_address: 172.15.0.44
@ -12,8 +13,9 @@ services:
WAIT_FOR_SUBGRAPH: "true" WAIT_FOR_SUBGRAPH: "true"
WEEKLY_SPEND_LIMIT: 10000 WEEKLY_SPEND_LIMIT: 10000
DELAYED_STARTUP: 120 DELAYED_STARTUP: 120
ADDRESS_FILE: /ocean-contracts/artifacts/address.json
depends_on: depends_on:
- ganache - ganache
volumes: volumes:
- ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
- ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/ - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/

26
compose-files/pdr-predictoor.yml
View File

@ -1,7 +1,8 @@
version: '3' version: "3"
services: services:
pdr-predictoor1: pdr-predictoor1:
image: oceanprotocol/pdr-predictoor:${PDR_PREDICTOOR_VERSION:-latest} image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
command: predictoor
networks: networks:
backend: backend:
ipv4_address: 172.15.0.41 ipv4_address: 172.15.0.41
@ -11,13 +12,15 @@ services:
PRIVATE_KEY: "0xef4b441145c1d0f3b4bc6d61d29f5c6e502359481152f869247c7a4244d45209" PRIVATE_KEY: "0xef4b441145c1d0f3b4bc6d61d29f5c6e502359481152f869247c7a4244d45209"
WAIT_FOR_SUBGRAPH: "true" WAIT_FOR_SUBGRAPH: "true"
DELAYED_STARTUP: 120 DELAYED_STARTUP: 120
ADDRESS_FILE: /ocean-contracts/artifacts/address.json
depends_on: depends_on:
- ganache - ganache
volumes: volumes:
- ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
- ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/ - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
pdr-predictoor2: pdr-predictoor2:
image: oceanprotocol/pdr-predictoor:${PDR_PREDICTOOR_VERSION:-latest} image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
command: predictoor
networks: networks:
backend: backend:
ipv4_address: 172.15.0.45 ipv4_address: 172.15.0.45
@ -27,13 +30,15 @@ services:
PRIVATE_KEY: "0x4ed947ad7e139926e31a6442d55b2e99d141f97f46151a8769d57f514f3db868" PRIVATE_KEY: "0x4ed947ad7e139926e31a6442d55b2e99d141f97f46151a8769d57f514f3db868"
WAIT_FOR_SUBGRAPH: "true" WAIT_FOR_SUBGRAPH: "true"
DELAYED_STARTUP: 120 DELAYED_STARTUP: 120
ADDRESS_FILE: /ocean-contracts/artifacts/address.json
depends_on: depends_on:
- ganache - ganache
volumes: volumes:
- ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
- ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/ - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
pdr-predictoor3: pdr-predictoor3:
image: oceanprotocol/pdr-predictoor:${PDR_PREDICTOOR_VERSION:-latest} image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
command: predictoor
networks: networks:
backend: backend:
ipv4_address: 172.15.0.46 ipv4_address: 172.15.0.46
@ -43,8 +48,9 @@ services:
PRIVATE_KEY: "0xa50c16d96ed01ac8f967b77b01b1fa94f751c4c600b564fd770e239ebd7d869d" PRIVATE_KEY: "0xa50c16d96ed01ac8f967b77b01b1fa94f751c4c600b564fd770e239ebd7d869d"
WAIT_FOR_SUBGRAPH: "true" WAIT_FOR_SUBGRAPH: "true"
DELAYED_STARTUP: 120 DELAYED_STARTUP: 120
ADDRESS_FILE: /ocean-contracts/artifacts/address.json
depends_on: depends_on:
- ganache - ganache
volumes: volumes:
- ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
- ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/ - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/

4
compose-files/pdr-publisher.yml
View File

@ -1,13 +1,15 @@
version: '3' version: '3'
services: services:
pdr-publisher: pdr-publisher:
image: oceanprotocol/pdr-publisher:${PDR_PUBLISHER_VERSION:-latest} image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
command: publisher
networks: networks:
backend: backend:
ipv4_address: 172.15.0.43 ipv4_address: 172.15.0.43
environment: environment:
RPC_URL: ${NETWORK_RPC_URL} RPC_URL: ${NETWORK_RPC_URL}
ADDRESS_FILE: /root/.ocean/ocean-contracts/artifacts/address.json ADDRESS_FILE: /root/.ocean/ocean-contracts/artifacts/address.json
PRIVATE_KEY: "0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58"
OPF_DEPLOYER_PRIVATE_KEY: "0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58" OPF_DEPLOYER_PRIVATE_KEY: "0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58"
PREDICTOOR_PRIVATE_KEY: "0xef4b441145c1d0f3b4bc6d61d29f5c6e502359481152f869247c7a4244d45209" PREDICTOOR_PRIVATE_KEY: "0xef4b441145c1d0f3b4bc6d61d29f5c6e502359481152f869247c7a4244d45209"
PREDICTOOR2_PRIVATE_KEY: "0x4ed947ad7e139926e31a6442d55b2e99d141f97f46151a8769d57f514f3db868" PREDICTOOR2_PRIVATE_KEY: "0x4ed947ad7e139926e31a6442d55b2e99d141f97f46151a8769d57f514f3db868"

10
compose-files/pdr-trader.yml
View File

@ -1,7 +1,8 @@
version: '3' version: "3"
services: services:
pdr-trader: pdr-trader:
image: oceanprotocol/pdr-trader:${PDR_TRADER_VERSION:-latest} image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
command: trader
networks: networks:
backend: backend:
ipv4_address: 172.15.0.42 ipv4_address: 172.15.0.42
@ -11,8 +12,9 @@ services:
PRIVATE_KEY: "0x8467415bb2ba7c91084d932276214b11a3dd9bdb2930fefa194b666dd8020b99" PRIVATE_KEY: "0x8467415bb2ba7c91084d932276214b11a3dd9bdb2930fefa194b666dd8020b99"
WAIT_FOR_SUBGRAPH: "true" WAIT_FOR_SUBGRAPH: "true"
DELAYED_STARTUP: 120 DELAYED_STARTUP: 120
ADDRESS_FILE: /ocean-contracts/artifacts/address.json
depends_on: depends_on:
- ganache - ganache
volumes: volumes:
- ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
- ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/ - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/

10
compose-files/pdr-trueval.yml
View File

@ -1,7 +1,8 @@
version: '3' version: "3"
services: services:
pdr-trueval: pdr-trueval:
image: oceanprotocol/pdr-trueval:${PDR_TRUEVAL_VERSION:-latest} image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest}
command: trueval
networks: networks:
backend: backend:
ipv4_address: 172.15.0.40 ipv4_address: 172.15.0.40
@ -11,8 +12,9 @@ services:
PRIVATE_KEY: "0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58" PRIVATE_KEY: "0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58"
WAIT_FOR_SUBGRAPH: "true" WAIT_FOR_SUBGRAPH: "true"
DELAYED_STARTUP: 120 DELAYED_STARTUP: 120
ADDRESS_FILE: /ocean-contracts/artifacts/address.json
depends_on: depends_on:
- ganache - ganache
volumes: volumes:
- ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
- ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/ - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/

38
start_ocean.sh
View File

@ -41,13 +41,8 @@ export POD_CONFIGURATION_VERSION=${POD_CONFIGURATION_VERSION:-oceanprotocol/pod-
export POD_PUBLISHING_VERSION=${POD_PUBLISHING_VERSION:-oceanprotocol/pod-publishing:v4main} export POD_PUBLISHING_VERSION=${POD_PUBLISHING_VERSION:-oceanprotocol/pod-publishing:v4main}
export WAIT_FOR_C2DIMAGES=${WAIT_FOR_C2DIMAGES:-false} export WAIT_FOR_C2DIMAGES=${WAIT_FOR_C2DIMAGES:-false}
export PDR_TRUEVAL_VERSION=${PDR_TRUEVAL_VERSION:-latest}
export PDR_PREDICTOOR_VERSION=${PDR_PREDICTOOR_VERSION:-latest}
export PDR_TRADER_VERSION=${PDR_TRADER_VERSION:-latest}
export PDR_PUBLISHER_VERSION=${PDR_PUBLISHER_VERSION:-latest} export PDR_PUBLISHER_VERSION=${PDR_PUBLISHER_VERSION:-latest}
export PDR_DFBUYER_VERSION=${PDR_DFBUYER_VERSION:-latest} export PDR_BACKEND_VERSION=${PDR_BACKEND_VERSION:-latest}
export PROJECT_NAME="ocean" export PROJECT_NAME="ocean"
@ -292,41 +287,14 @@ while :; do
#COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/elasticsearch.yml/}" #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/elasticsearch.yml/}"
#COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/dashboard.yml/}" #COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/dashboard.yml/}"
# Enforce images # Enforce images
export CONTRACTS_VERSION=predictoor2 export CONTRACTS_VERSION=predictoor
export SUBGRAPH_VERSION=predictoor export SUBGRAPH_VERSION=predictoor
export PDR_TRUEVAL_VERSION=v0.0.1 export PDR_BACKEND_VERSION=${PDR_BACKEND_VERSION:-latest}
export PDR_PREDICTOOR_VERSION=v0.0.1
export PDR_TRADER_VERSION=v0.0.1
export PDR_PUBLISHER_VERSION=v0.0.1
export PDR_DFBUYER_VERSION=v0.0.1
# replicate true blockchain behiavour # replicate true blockchain behiavour
export GANACHE_INSTAMINE=strict export GANACHE_INSTAMINE=strict
export GANACHE_BLOCKTIME=1 export GANACHE_BLOCKTIME=1
;; ;;
--new-predictoor)
# Add what we need
COMPOSE_FILES+=" -f ${COMPOSE_DIR}/thegraph.yml"
# We should remove what is not needed for now, but ocean,py requires both aqua & provider
#COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/provider.yml/}"
#COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/redis.yml/}"
#COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/aquarius.yml/}"
#COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/elasticsearch.yml/}"
#COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/dashboard.yml/}"
# Enforce images
export CONTRACTS_VERSION=predictoor3
export SUBGRAPH_VERSION=predictoor3
export PDR_TRUEVAL_VERSION=${PDR_TRUEVAL_VERSION:-latest}
export PDR_PREDICTOOR_VERSION=${PDR_PREDICTOOR_VERSION:-latest}
export PDR_TRADER_VERSION=${PDR_TRADER_VERSION:-latest}
export PDR_PUBLISHER_VERSION=${PDR_PUBLISHER_VERSION:-latest}
export PDR_DFBUYER_VERSION=${PDR_DFBUYER_VERSION:-latest}
# replicate true blockchain behiavour
export GANACHE_INSTAMINE=strict
export GANACHE_BLOCKTIME=1
;;
--with-pdr-trueval) --with-pdr-trueval)
COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pdr-trueval.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pdr-trueval.yml"
printf $COLOR_Y'Starting with pdr-trueval...\n\n'$COLOR_RESET printf $COLOR_Y'Starting with pdr-trueval...\n\n'$COLOR_RESET