Merge branch 'v4.5'

Volendi · Volendi · commit 2437dd93a89b · 2020-05-25T16:50:04.000+03:00
diff --git a/configs/adks.toml b/configs/adks.toml
@@ -1,5 +1,5 @@
 port = 80
-horizon = "http://janus"
+horizon = "http://traefik"
 log_level = "warn"
 
 [database]
diff --git a/configs/api.yml b/configs/api.yml
@@ -59,10 +59,11 @@ wallets:
 tx_watcher:
   disabled: false
 
-janus:
-  endpoint: http://janus:8000
+cop:
+  endpoint: http://cop
   upstream: http://api
-  surname:  api
+  service_name: "api-service"
+  service_port: "80"
   
 # system settings
 key_values:
diff --git a/configs/charts.yaml b/configs/charts.yaml
@@ -1,10 +1,6 @@
 listener:
   addr: :80
 
-websocket:
-  enabled: true
-  addr: :8080
-
 log:
   level: warn
   # we are using sentry for error collection,
@@ -19,10 +15,11 @@ sentry:
   dsn: https://989409410d0740a89b1f8571c4195dca@sentry.tokend.services/3
 
 horizon:
-  endpoint: http://janus
+  endpoint: http://traefik
   signer: SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4
 
-janus:
-  endpoint: http://janus:8000
+cop:
+  endpoint: http://cop
   upstream: http://charts
-  surname:  charts
+  service_name: "charts-service"
+  service_port: "80"
diff --git a/configs/coinpayments-atomic-swap-checker.yaml b/configs/coinpayments-atomic-swap-checker.yaml
@@ -8,7 +8,7 @@ sentry:
   dsn: https://1bbe444efb3b4b15a58d9c0aba739f1c@sentry.tokend.services/6
 
 horizon:
-  endpoint: http://janus
+  endpoint: http://traefik
   signer: SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4
 
 coinpayments:
diff --git a/configs/coinpayments-atomic-swap-matcher.yaml b/configs/coinpayments-atomic-swap-matcher.yaml
@@ -8,7 +8,7 @@ sentry:
   dsn: https://1bbe444efb3b4b15a58d9c0aba739f1c@sentry.tokend.services/6
 
 horizon:
-  endpoint: http://janus
+  endpoint: http://traefik
   signer: SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4
 
 coinpayments:
diff --git a/configs/coinpayments-deposit-verify.yaml b/configs/coinpayments-deposit-verify.yaml
@@ -8,7 +8,7 @@ sentry:
   dsn: https://591b6a3c375f4aa890a37532ce4969ec@sentry.tokend.services/4
 
 horizon:
-  endpoint: http://janus
+  endpoint: http://traefik
   signer: SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4
 
 coinpayments:
diff --git a/configs/coinpayments-deposit.yaml b/configs/coinpayments-deposit.yaml
@@ -8,7 +8,7 @@ sentry:
   dsn: https://d6b1d77a917c4a73a5729a3ce836c9a0@sentry.tokend.services/5
 
 horizon:
-  endpoint: http://janus
+  endpoint: http://traefik
   signer: SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4
 
 coinpayments:
@@ -26,7 +26,9 @@ deposit:
 listener:
   addr: :80
 
-janus:
-  endpoint: http://janus:8000
+cop:
+  endpoint: http://cop
   upstream: http://coinpayments-deposit
-  surname: coinpayments-deposit
+  service_name: "coinpayments-deposit-service"
+  service_port: "80"
+  service_prefix: "/integrations/coinpayments/deposit"
diff --git a/configs/coinpayments-withdraw.yaml b/configs/coinpayments-withdraw.yaml
@@ -8,7 +8,7 @@ sentry:
   dsn: https://1bbe444efb3b4b15a58d9c0aba739f1c@sentry.tokend.services/6
 
 horizon:
-  endpoint: http://janus
+  endpoint: http://traefik
   signer: SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4
 
 coinpayments:
diff --git a/configs/cop.yaml b/configs/cop.yaml
@@ -0,0 +1,8 @@
+log:
+  disable_sentry: true
+
+traefik:
+  endpoint: http://traefik:8080
+
+listener:
+  addr: :80
diff --git a/configs/errors.yaml b/configs/errors.yaml
@@ -0,0 +1,11 @@
+log:
+  disable_sentry: true
+
+listener:
+  addr: :80
+
+cop:
+  endpoint: "http://cop"
+  upstream: "http://errors"
+  service_name: error-handler-svc
+  service_port: "80"
diff --git a/configs/horizon.yaml b/configs/horizon.yaml
@@ -24,7 +24,8 @@ config:
   invest_ready:                            http://black.hole
   telegram_airdrop:                        http://black.hole
 
-janus:
-  endpoint: http://janus:8000
+cop:
+  endpoint: http://cop
   upstream: http://horizon
-  surname: horizon
+  service_name: "horizon-service"
+  service_port: "80"
diff --git a/configs/janus.toml b/configs/janus.toml
diff --git a/configs/nginx.conf b/configs/nginx.conf
@@ -72,7 +72,7 @@ http {
                 add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
             }
 
-            set $upstream janus;
+            set $upstream traefik;
             rewrite    /_/api(.+) $1 break;
             rewrite    /_/api / break;
             proxy_pass http://$upstream;
diff --git a/configs/poll-closer.yaml b/configs/poll-closer.yaml
@@ -13,7 +13,7 @@ closer:
   concurrency: 100
 
 horizon:
-  endpoint: http://janus/
+  endpoint: http://traefik/
   signer: "SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4"
 
 listener:
diff --git a/configs/salecloser.yaml b/configs/salecloser.yaml
@@ -9,7 +9,7 @@ listener:
   addr: :2323
 
 horizon:
-  endpoint: http://janus/
+  endpoint: http://traefik/
   signer: "SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4"
 
 log:
diff --git a/configs/traefik.yaml b/configs/traefik.yaml
@@ -0,0 +1,16 @@
+providers:
+  rest:
+    insecure: true
+
+entryPoints:
+  web:
+    address: ":80"
+api:
+  insecure: true
+
+log:
+  level: WARN
+
+accessLog:
+  filePath: /access.log
+  bufferingSize: 1000
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,11 +1,21 @@
 version: '3.3'
 
 services:
-  janus:
-    image: tokend/janus:latest
+  traefik:
+    image: traefik:v2.0
+    ports:
+      - "80:80"
+      - "8081:8080"
+    volumes:
+      - ./configs/traefik.yaml:/traefik.yaml
+  cop:
+    image: tokend/traefik-cop:1.0.0
     restart: unless-stopped
+    environment:
+      - KV_VIPER_FILE=/config.yaml
     volumes:
-      - ./configs/janus.toml:/etc/janus/janus.toml
+      - ./configs/cop.yaml:/config.yaml
+    entrypoint: sh -c "traefik-cop run"
   upstream:
     image: nginx
     restart: unless-stopped
@@ -14,7 +24,7 @@ services:
     ports:
     - "8000:80"
   adks:
-    image: tokend/adks:1.0.0
+    image: tokend/adks:1.0.2
     restart: unless-stopped
     depends_on:
       - horizon
@@ -43,9 +53,9 @@ services:
       - --appendonly
       - "yes"
   core:
-    image: tokend/core:3.6.3.1
+    image: tokend/core:3.6.5
     depends_on:
-      - janus
+      - traefik
     restart: unless-stopped
     environment:
       - POSTGRES_USER=core
@@ -60,7 +70,7 @@ services:
     labels:
       - "autoheal=true"
   horizon:
-    image: tokend/horizon:3.7.1.1
+    image: tokend/horizon:3.9.0
     depends_on:
       - core
     restart: unless-stopped
@@ -73,7 +83,7 @@ services:
       - ./configs/horizon.yaml:/config.yaml
       - horizon-data:/data
   api:
-    image: tokend/identity:4.5.4
+    image: tokend/identity:4.6.0
     restart: unless-stopped
     depends_on:
       - horizon
@@ -94,7 +104,7 @@ services:
     volumes:
       - api-data:/pgdata
   initscripts:
-    image: tokend/terraform-provider-tokend:1.3.0
+    image: tokend/terraform-provider-tokend:1.3.4
     depends_on:
       - horizon
       - storage
@@ -104,14 +114,14 @@ services:
     entrypoint: ""
     command: /opt/config/apply.sh
   web_client:
-    image: tokend/web-client:1.10.3
+    image: tokend/web-client:1.12.0-rc.1
     restart: unless-stopped
-    volumes:
+    volumes:  
       - ./configs/client.js:/usr/share/nginx/html/static/env.js
     ports:
       - 8060:80
   admin_client:
-    image: tokend/admin-client:1.10.1
+    image: tokend/admin-client:1.13.0-rc.0
     restart: unless-stopped
     volumes:
       - ./configs/client.js:/usr/share/nginx/html/static/env.js
@@ -134,7 +144,7 @@ services:
   ##
 
   charts:
-    image: tokend/charts:0.4.1
+    image: tokend/charts:0.5.0
     restart: unless-stopped
     environment:
       - KV_VIPER_FILE=/config.yaml
@@ -180,39 +190,39 @@ services:
   ## Coinpayments
 
   coinpayments-deposit:
-    image: tokend/coinpayments:0.4.0
+    image: tokend/coinpayments:0.5.0
     restart: unless-stopped
     environment:
       - KV_VIPER_FILE=/config.yaml
     volumes:
       - ./configs/coinpayments-deposit.yaml:/config.yaml
     command: deposit
   coinpayments-deposit-verify:
-    image: tokend/coinpayments:0.4.0
+    image: tokend/coinpayments:0.5.0
     restart: unless-stopped
     environment:
       - KV_VIPER_FILE=/config.yaml
     volumes:
       - ./configs/coinpayments-deposit-verify.yaml:/config.yaml
     command: deposit-verify
   coinpayments-withdraw:
-    image: tokend/coinpayments:0.4.0
+    image: tokend/coinpayments:0.5.0
     restart: unless-stopped
     environment:
       - KV_VIPER_FILE=/config.yaml
     volumes:
       - ./configs/coinpayments-withdraw.yaml:/config.yaml
     command: withdraw
   coinpayments-atomic-swap-checker:
-    image: tokend/coinpayments:0.4.5
+    image: tokend/coinpayments:0.5.0
     restart: unless-stopped
     environment:
       - KV_VIPER_FILE=/config.yaml
     volumes:
       - ./configs/coinpayments-atomic-swap-checker.yaml:/config.yaml
     command: atomic-swap-checker
   coinpayments-atomic-swap-matcher:
-    image: tokend/coinpayments:0.4.5
+    image: tokend/coinpayments:0.5.0
     restart: unless-stopped
     environment:
       - KV_VIPER_FILE=/config.yaml
@@ -242,7 +252,7 @@ services:
 
   ## Ethereum
   erc20-deposit:
-    image: tokend/erc20-deposit-svc:1.0.8
+    image: tokend/erc20-deposit-svc:1.0.10
     restart: unless-stopped
     depends_on:
       - horizon
@@ -253,7 +263,7 @@ services:
     entrypoint: "erc20-deposit-svc"
     command: ["run", "deposit"]
   erc20-deployer:
-    image: tokend/erc20-deposit-svc:1.0.8
+    image: tokend/erc20-deposit-svc:1.0.10
     restart: on-failure
     depends_on:
       - horizon
@@ -264,7 +274,7 @@ services:
     entrypoint: "erc20-deposit-svc"
     command: ["run", "deployer"]
   erc20-funnel:
-    image: tokend/erc20-deposit-svc:1.0.8
+    image: tokend/erc20-deposit-svc:1.0.10
     restart: unless-stopped
     depends_on:
       - horizon
@@ -275,7 +285,7 @@ services:
     entrypoint: "erc20-deposit-svc"
     command: ["run", "funnel"]
   erc20-withdraw:
-    image: tokend/erc20-withdraw-svc:1.0.5
+    image: tokend/erc20-withdraw-svc:1.0.6
     restart: unless-stopped
     depends_on:
       - horizon
diff --git a/terraform/main.tf b/terraform/main.tf
@@ -14,9 +14,9 @@ terraform {
 provider "tokend" {
   account  = "GBA4EX43M25UPV4WIE6RRMQOFTWXZZRIPFAI5VPY6Z2ZVVXVWZ6NEOOB"
   signer   = "SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4"
-  endpoint = "http://janus"
+  endpoint = "http://horizon"
 }
 
 module "tokend_vanilla" {
-  source = "git::https://github.com/tokend/terraform-tokend-vanilla.git?ref=a95125baa8bd5a35e26889539be9bb786fb8cbfb"
+  source = "git::https://github.com/tokend/terraform-tokend-vanilla.git?ref=373eb6d8347cd6975a9417a04baf094377748161"
 }
