Merge branch 'staging'

.env.example

@@ -32,7 +32,8 @@ HASURA_GRAPHQL_ACTION_BASE_URL=http://hapi:9090
 
 # WEBAPP
 REACT_APP_RATING_CONTRACT=rateproducer
-REACT_APP_EDEN_CONTRACT=genesis.eden // si es jungle genesisdeden
+REACT_APP_MAINNET_VERSION=true
+REACT_APP_EDEN_CONTRACT=genesis.eden // if is jungle genesisdeden
 REACT_APP_GRAPHQL_HTTP_URL=http://localhost:8080/v1/graphql
 REACT_APP_API_URL=https://jungle.eosio.cr
 REACT_APP_GRAPHQL_WS_URL=ws://localhost:8080/v1/graphql

.github/workflows/push-master-environment.yaml

@@ -43,8 +43,9 @@ jobs:
           NAMESPACE: mainnet-eosrate
           # webapp
           REACT_APP_RATING_CONTRACT: rateproducer
-          REACT_APP_EDEN_CONTRACT: ${{ secrets.REACT_APP_EDEN_CONTRACT }}
           REACT_APP_PROXY_CONTRACT: regproxyinfo
+          REACT_APP_MAINNET_VERSION: true
+          REACT_APP_EDEN_CONTRACT: genesis.eden
           REACT_APP_GRAPHQL_HTTP_URL: https://graphql.eosrate.io/v1/graphql
           REACT_APP_GRAPHQL_WS_URL: wss://graphql.eosrate.io/v1/graphql
           REACT_APP_EOS_API_URL: https://api.main.alohaeos.com
@@ -68,18 +69,6 @@ jobs:
           NAMESPACE: mainnet-eosrate
           INGRESS_HOST: eosrate.io
           INGRESS_GRAPHQL_HOST: graphql.eosrate.io
-          # webapp
-          REACT_APP_RATING_CONTRACT: rateproducer
-          REACT_APP_EDEN_CONTRACT: ${{ secrets.REACT_APP_EDEN_CONTRACT }}
-          REACT_APP_GRAPHQL_HTTP_URL: https://graphql.eosrate.io/v1/graphql
-          REACT_APP_GRAPHQL_WS_URL: wss://graphql.eosrate.io/v1/graphql
-          REACT_APP_EOS_API_URL: https://api.main.alohaeos.com
-          REACT_APP_EOS_API_HOST: api.main.alohaeos.com
-          REACT_APP_EOS_API_PORT: 443
-          REACT_APP_EOS_API_PROTOCOL: https
-          REACT_APP_EOS_CHAIN_ID: aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906
-          REACT_APP_BLOCK_EXPLORER: https://bloks.io
-          REACT_APP_NETWORK_MONITOR_URL: https://jungle.eosio.online/
           # postgres
           POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
           POSTGRES_USER: ${{ secrets.POSTGRES_USER }}

.github/workflows/push-staging-environment.yaml

@@ -43,7 +43,8 @@ jobs:
           NAMESPACE: jungle-eosrate
           # webapp
           REACT_APP_RATING_CONTRACT: rateproducer
-          REACT_APP_EDEN_CONTRACT: ${{ secrets.REACT_APP_EDEN_CONTRACT }}
+          REACT_APP_MAINNET_VERSION: false
+          REACT_APP_EDEN_CONTRACT: genesisdeden
           REACT_APP_PROXY_CONTRACT: regproxyinfo
           REACT_APP_GRAPHQL_HTTP_URL: https://graphql-jungle.eosrate.io/v1/graphql
           REACT_APP_GRAPHQL_WS_URL: wss://graphql-jungle.eosrate.io/v1/graphql
@@ -68,19 +69,6 @@ jobs:
           NAMESPACE: jungle-eosrate
           INGRESS_HOST: jungle.eosrate.io
           INGRESS_GRAPHQL_HOST: graphql-jungle.eosrate.io
-          # webapp
-          REACT_APP_RATING_CONTRACT: rateproducer
-          REACT_APP_EDEN_CONTRACT: ${{ secrets.REACT_APP_EDEN_CONTRACT }}
-          REACT_APP_PROXY_CONTRACT: regproxyinfo
-          REACT_APP_GRAPHQL_HTTP_URL: https://graphql-jungle.eosrate.io/v1/graphql
-          REACT_APP_GRAPHQL_WS_URL: wss://graphql-jungle.eosrate.io/v1/graphql
-          REACT_APP_EOS_API_URL: https://jungle3.cryptolions.io
-          REACT_APP_EOS_API_HOST: jungle3.cryptolions.io
-          REACT_APP_EOS_API_PORT: 443
-          REACT_APP_EOS_API_PROTOCOL: https
-          REACT_APP_EOS_CHAIN_ID: 2a02a0053e5a8cf73a56ba0fda11e4d92e0238a4a2aa74fccf46d5a910746840
-          REACT_APP_BLOCK_EXPLORER: https://jungle3.bloks.io
-          REACT_APP_NETWORK_MONITOR_URL: https://jungle.eosio.online/
           # postgres
           DATABASE_DIRECTORY: database
           POSTGRES_DB: ${{ secrets.POSTGRES_DB }}

docker-compose.yml

@@ -87,6 +87,7 @@ services:
     restart: always
     environment:
       REACT_APP_RATING_CONTRACT: "${REACT_APP_RATING_CONTRACT}"
+      REACT_APP_MAINNET_VERSION: "${REACT_APP_MAINNET_VERSION}"
       REACT_APP_EDEN_CONTRACT: "${REACT_APP_EDEN_CONTRACT}"
       HASURA_GRAPHQL_DATABASE_URL: "${HASURA_GRAPHQL_DATABASE_URL}"
       HASURA_GRAPHQL_MIGRATIONS_DIR: /migrations

webapp/makefile

@@ -25,6 +25,7 @@ build-docker: ./Dockerfile
 		-t $(DOCKER_REGISTRY)/$(IMAGE_NAME_WEBAPP):$(VERSION) --target server \
 		-t $(DOCKER_REGISTRY)/$(IMAGE_NAME_WEBAPP):$(LATEST_TAG) --target server \
 		--build-arg REACT_APP_RATING_CONTRACT="$(REACT_APP_RATING_CONTRACT)" \
+		--build-arg REACT_APP_MAINNET_VERSION="$(REACT_APP_MAINNET_VERSION)" \
 		--build-arg REACT_APP_EDEN_CONTRACT="$(REACT_APP_EDEN_CONTRACT)" \
 		--build-arg REACT_APP_GRAPHQL_HTTP_URL="$(REACT_APP_GRAPHQL_HTTP_URL)" \
 		--build-arg REACT_APP_GRAPHQL_WS_URL="$(REACT_APP_GRAPHQL_WS_URL)" \