Preprod merge to main

Makefile

@@ -58,7 +58,7 @@ coverpkg=$(subst $(space),$(comma), $(filter-out %/mock %/assets, $(shell go lis
 startproxeus=PROXEUS_DATA_DIR=$(1)/data PROXEUS_SETTINGS_FILE=$(1)/settings/main.json PROXEUS_TEST_MODE=true artifacts/proxeus &
 stopproxeus=pkill proxeus
 startds=curl -s http://localhost:2115 > /dev/null || ( PROXEUS_DATA_DIR=$(1) docker-compose up -d document-service && touch $(1)/ds-started )
-startnodes=curl -s http://localhost:8011 > /dev/null || (PROXEUS_PLATFORM_DOMAIN=http://$(DOCKER_GATEWAY):1323 NODE_CRYPTO_RATES_URL=http://localhost:8011 REGISTER_RETRY_INTERVAL=1 docker-compose up -d node-crypto-forex-rates && touch $(1)/nodes-started )
+startnodes=curl -s http://localhost:8011 > /dev/null || (PROXEUS_PLATFORM_DOMAIN=http://$(DOCKER_GATEWAY):1323 NODE_CRYPTO_RATES_URL=http://localhost:8011 REGISTER_RETRY_INTERVAL=1 docker-compose -f docker-compose.yml -f docker-compose-extra.override.yml up -d node-crypto-forex-rates && touch $(1)/nodes-started )
 startmongo=nc -z localhost 27017 2> /dev/null || (docker run -d -p 27017:27017 -p 27018:27018 -p 27019:27019 proxeus/mongo-dev-cluster && sleep 10 && touch $(1)/mongo-started)
 
 ifeq ($(coverage),true)

docker-compose-cloud.override.yml

@@ -1,12 +1,8 @@
 ---
-# This file is an override and needs to be used in combination with
-# docker-compose.yml using one of the following methods:
+# Using these settings, you can build a production-ready instance of Proxeus.
+# This file is an override and needs to be used like this:
 #
-# 1. using the -f parameter:
 #  docker-compose -f docker-compose.yml -f docker-compose-cloud.override.yml up
-#
-# 2. renaming the file docker-compose.override.yml (default override):
-#  docker-compose up
 
 version: '3.7'
 
@@ -85,17 +81,3 @@ services:
       LETSENCRYPT_HOST: ${DOCUMENT_SERVICE_VIRTUAL_HOST:-proxeus.example.com}
       LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-admin@example.com}
     restart: unless-stopped
-
-  node-crypto-forex-rates:
-    networks:
-      - reverse-proxy
-    labels:
-      com.centurylinklabs.watchtower.enable: "true"
-    environment:
-      # Replace values for reverse-proxy
-      VIRTUAL_HOST: ${NODE_CRYPTO_FOREX_RATES_VIRTUAL_HOST:-proxeus.example.com}
-      VIRTUAL_PORT: 8011
-      # Replace values for letsencrypt
-      LETSENCRYPT_HOST: ${NODE_CRYPTO_FOREX_RATES_VIRTUAL_HOST:-proxeus.example.com}
-      LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-admin@example.com}
-    restart: unless-stopped

docker-compose-cnode.override.yml

@@ -0,0 +1,22 @@
+---
+# With a configuration like this, you can enable nodes in production.
+# This file is an override and needs to be used like this:
+#
+#  docker-compose -f docker-compose.yml -f docker-compose-cloud.override.yml -f docker-compose-cnode.override.yml up
+
+version: '3.7'
+
+services:
+  node-crypto-forex-rates:
+    networks:
+      - reverse-proxy
+    labels:
+      com.centurylinklabs.watchtower.enable: "true"
+    environment:
+      # Replace values for reverse-proxy
+      VIRTUAL_HOST: ${NODE_CRYPTO_FOREX_RATES_VIRTUAL_HOST:-proxeus.example.com}
+      VIRTUAL_PORT: 8011
+      # Replace values for letsencrypt
+      LETSENCRYPT_HOST: ${NODE_CRYPTO_FOREX_RATES_VIRTUAL_HOST:-proxeus.example.com}
+      LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-admin@example.com}
+    restart: unless-stopped

docker-compose-extra.override.yml

@@ -0,0 +1,93 @@
+---
+# Here we show how to configure all the extra nodes with default settings.
+# This file is an override and needs to be used like this:
+#
+#  docker-compose -f docker-compose.yml -f docker-compose-extra.override.yml up
+
+version: '3.7'
+
+services:
+  node-mail-sender:
+    image: proxeus/node-mail-sender:latest
+    container_name: xes_node-mail-sender
+    networks:
+      - xes-platform-network
+    restart: unless-stopped
+    environment:
+      PROXEUS_INSTANCE_URL: "${PROXEUS_PLATFORM_DOMAIN:-http://xes-platform:1323}"
+      SERVICE_SECRET: secret
+      SERVICE_PORT: 8013
+      SERVICE_URL: "${NODE_CRYPTO_RATES_URL:-http://node-mail-sender:8013}"
+      TZ: Europe/Zurich
+      PROXEUS_SPARKPOST_API_KEY: "${PROXEUS_SPARKPOST_API_KEY}"
+    ports:
+      - "8013:8013"
+
+  node-crypto-forex-rates:
+    image: proxeus/node-crypto-forex-rates:latest
+    container_name: xes_node-crypto-forex-rates
+    networks:
+      - xes-platform-network
+    restart: unless-stopped
+    environment:
+      PROXEUS_INSTANCE_URL: "${PROXEUS_PLATFORM_DOMAIN:-http://xes-platform:1323}"
+      SERVICE_SECRET: secret
+      SERVICE_PORT: 8011
+      SERVICE_URL: "${NODE_CRYPTO_RATES_URL:-http://node-crypto-forex-rates:8011}"
+      TZ: Europe/Zurich
+    ports:
+      - "8011:8011"
+
+  node-balance-retriever:
+    image: proxeus/node-balance-retriever:latest
+    container_name: xes_node-node-balance-retriever
+    networks:
+      - xes-platform-network
+    restart: unless-stopped
+    environment:
+      PROXEUS_INSTANCE_URL: "${PROXEUS_PLATFORM_DOMAIN:-http://xes-platform:1323}"
+      PROXEUS_ETH_CLIENT_URL: "${PROXEUS_ETH_CLIENT_URL:-https://sepolia.infura.io/v3/}"
+      PROXEUS_INFURA_API_KEY: ${PROXEUS_INFURA_API_KEY}
+      SERVICE_SECRET: secret
+      SERVICE_PORT: 8012
+      SERVICE_URL: "${NODE_BALANCE_RETRIEVER_URL:-http://node-balance-retriever:8012}"
+      TZ: Europe/Zurich
+    ports:
+      - "8012:8012"
+
+  node-proof-of-existence:
+    image: proxeus/node-proof-of-existence:latest
+    container_name: xes_node-proof-of-existence
+    networks:
+      - xes-platform-network
+    restart: unless-stopped
+    environment:
+      PROXEUS_INSTANCE_URL: "${PROXEUS_PLATFORM_DOMAIN:-http://xes-platform:1323}"
+      SERVICE_SECRET: secret
+      SERVICE_PORT: 8014
+      SERVICE_URL: "${SERVICE_DOMAIN:-http://node-proof-of-existence:8014}"
+      TWITTER_CONSUMER_KEY: ${TWITTER_CONSUMER_KEY}
+      TWITTER_CONSUMER_SECRET: ${TWITTER_CONSUMER_SECRET}
+      TZ: Europe/Zurich
+    ports:
+      - "8014:8014"
+
+  node-json-sender:
+    image: proxeus/node-json-sender:latest
+    container_name: xes_node-json-sender
+    networks:
+      - xes-platform-network
+    restart: unless-stopped
+    environment:
+      PROXEUS_INSTANCE_URL: "${PROXEUS_PLATFORM_DOMAIN:-http://xes-platform:1323}"
+      SERVICE_SECRET: secret
+      SERVICE_PORT: 8015
+      SERVICE_URL: "${SERVICE_DOMAIN:-http://node-json-sender:8015}"
+      JSON_SENDER_URL: http://url:123/endpoint
+      JSON_SENDER_HEADER_clientid: client_id
+      JSON_SENDER_HEADER_tenantid: tenant_id
+      JSON_SENDER_HEADER_secret: secret
+      JSON_SENDER_HEADER_oauthserverurl: oauth_url
+      TZ: Europe/Zurich
+    ports:
+      - "8015:8015"

docker-compose-local.override.yml

@@ -0,0 +1,13 @@
+---
+# Use this configuration to load Proxeus from a local build, rather than DockerHub.
+# This file is an override and needs to be used like this:
+#
+#  docker-compose -f docker-compose.yml -f docker-compose-local.override.yml up
+
+version: '3.7'
+
+services:
+  platform:
+    image: !reset null
+    build:
+      context: .