Skip to content

Commit 2437dd9

Browse files
VolendiVolendi
committed
Merge branch 'v4.5'
2 parents 6002e9a + 18056b5 commit 2437dd9

18 files changed

+96
-57
lines changed

‎configs/adks.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
port = 80
2-
horizon = "http://janus"
2+
horizon = "http://traefik"
33
log_level = "warn"
44

55
[database]

‎configs/api.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,11 @@ wallets:
5959
tx_watcher:
6060
disabled: false
6161

62-
janus:
63-
endpoint: http://janus:8000
62+
cop:
63+
endpoint: http://cop
6464
upstream: http://api
65-
surname: api
65+
service_name: "api-service"
66+
service_port: "80"
6667

6768
# system settings
6869
key_values:

‎configs/charts.yaml

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
listener:
22
addr: :80
33

4-
websocket:
5-
enabled: true
6-
addr: :8080
7-
84
log:
95
level: warn
106
# we are using sentry for error collection,
@@ -19,10 +15,11 @@ sentry:
1915
dsn: https://[email protected]/3
2016

2117
horizon:
22-
endpoint: http://janus
18+
endpoint: http://traefik
2319
signer: SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4
2420

25-
janus:
26-
endpoint: http://janus:8000
21+
cop:
22+
endpoint: http://cop
2723
upstream: http://charts
28-
surname: charts
24+
service_name: "charts-service"
25+
service_port: "80"

‎configs/coinpayments-atomic-swap-checker.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sentry:
88
dsn: https://[email protected]/6
99

1010
horizon:
11-
endpoint: http://janus
11+
endpoint: http://traefik
1212
signer: SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4
1313

1414
coinpayments:

‎configs/coinpayments-atomic-swap-matcher.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sentry:
88
dsn: https://[email protected]/6
99

1010
horizon:
11-
endpoint: http://janus
11+
endpoint: http://traefik
1212
signer: SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4
1313

1414
coinpayments:

‎configs/coinpayments-deposit-verify.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sentry:
88
dsn: https://[email protected]/4
99

1010
horizon:
11-
endpoint: http://janus
11+
endpoint: http://traefik
1212
signer: SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4
1313

1414
coinpayments:

‎configs/coinpayments-deposit.yaml

+6-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sentry:
88
dsn: https://[email protected]/5
99

1010
horizon:
11-
endpoint: http://janus
11+
endpoint: http://traefik
1212
signer: SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4
1313

1414
coinpayments:
@@ -26,7 +26,9 @@ deposit:
2626
listener:
2727
addr: :80
2828

29-
janus:
30-
endpoint: http://janus:8000
29+
cop:
30+
endpoint: http://cop
3131
upstream: http://coinpayments-deposit
32-
surname: coinpayments-deposit
32+
service_name: "coinpayments-deposit-service"
33+
service_port: "80"
34+
service_prefix: "/integrations/coinpayments/deposit"

‎configs/coinpayments-withdraw.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sentry:
88
dsn: https://[email protected]/6
99

1010
horizon:
11-
endpoint: http://janus
11+
endpoint: http://traefik
1212
signer: SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4
1313

1414
coinpayments:

‎configs/cop.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
log:
2+
disable_sentry: true
3+
4+
traefik:
5+
endpoint: http://traefik:8080
6+
7+
listener:
8+
addr: :80

‎configs/errors.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
log:
2+
disable_sentry: true
3+
4+
listener:
5+
addr: :80
6+
7+
cop:
8+
endpoint: "http://cop"
9+
upstream: "http://errors"
10+
service_name: error-handler-svc
11+
service_port: "80"

‎configs/horizon.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ config:
2424
invest_ready: http://black.hole
2525
telegram_airdrop: http://black.hole
2626

27-
janus:
28-
endpoint: http://janus:8000
27+
cop:
28+
endpoint: http://cop
2929
upstream: http://horizon
30-
surname: horizon
30+
service_name: "horizon-service"
31+
service_port: "80"

‎configs/janus.toml

-7
This file was deleted.

‎configs/nginx.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ http {
7272
add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
7373
}
7474

75-
set $upstream janus;
75+
set $upstream traefik;
7676
rewrite /_/api(.+) $1 break;
7777
rewrite /_/api / break;
7878
proxy_pass http://$upstream;

‎configs/poll-closer.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ closer:
1313
concurrency: 100
1414

1515
horizon:
16-
endpoint: http://janus/
16+
endpoint: http://traefik/
1717
signer: "SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4"
1818

1919
listener:

‎configs/salecloser.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ listener:
99
addr: :2323
1010

1111
horizon:
12-
endpoint: http://janus/
12+
endpoint: http://traefik/
1313
signer: "SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4"
1414

1515
log:

‎configs/traefik.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
providers:
2+
rest:
3+
insecure: true
4+
5+
entryPoints:
6+
web:
7+
address: ":80"
8+
api:
9+
insecure: true
10+
11+
log:
12+
level: WARN
13+
14+
accessLog:
15+
filePath: /access.log
16+
bufferingSize: 1000

‎docker-compose.yml

+32-22
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
version: '3.3'
22

33
services:
4-
janus:
5-
image: tokend/janus:latest
4+
traefik:
5+
image: traefik:v2.0
6+
ports:
7+
- "80:80"
8+
- "8081:8080"
9+
volumes:
10+
- ./configs/traefik.yaml:/traefik.yaml
11+
cop:
12+
image: tokend/traefik-cop:1.0.0
613
restart: unless-stopped
14+
environment:
15+
- KV_VIPER_FILE=/config.yaml
716
volumes:
8-
- ./configs/janus.toml:/etc/janus/janus.toml
17+
- ./configs/cop.yaml:/config.yaml
18+
entrypoint: sh -c "traefik-cop run"
919
upstream:
1020
image: nginx
1121
restart: unless-stopped
@@ -14,7 +24,7 @@ services:
1424
ports:
1525
- "8000:80"
1626
adks:
17-
image: tokend/adks:1.0.0
27+
image: tokend/adks:1.0.2
1828
restart: unless-stopped
1929
depends_on:
2030
- horizon
@@ -43,9 +53,9 @@ services:
4353
- --appendonly
4454
- "yes"
4555
core:
46-
image: tokend/core:3.6.3.1
56+
image: tokend/core:3.6.5
4757
depends_on:
48-
- janus
58+
- traefik
4959
restart: unless-stopped
5060
environment:
5161
- POSTGRES_USER=core
@@ -60,7 +70,7 @@ services:
6070
labels:
6171
- "autoheal=true"
6272
horizon:
63-
image: tokend/horizon:3.7.1.1
73+
image: tokend/horizon:3.9.0
6474
depends_on:
6575
- core
6676
restart: unless-stopped
@@ -73,7 +83,7 @@ services:
7383
- ./configs/horizon.yaml:/config.yaml
7484
- horizon-data:/data
7585
api:
76-
image: tokend/identity:4.5.4
86+
image: tokend/identity:4.6.0
7787
restart: unless-stopped
7888
depends_on:
7989
- horizon
@@ -94,7 +104,7 @@ services:
94104
volumes:
95105
- api-data:/pgdata
96106
initscripts:
97-
image: tokend/terraform-provider-tokend:1.3.0
107+
image: tokend/terraform-provider-tokend:1.3.4
98108
depends_on:
99109
- horizon
100110
- storage
@@ -104,14 +114,14 @@ services:
104114
entrypoint: ""
105115
command: /opt/config/apply.sh
106116
web_client:
107-
image: tokend/web-client:1.10.3
117+
image: tokend/web-client:1.12.0-rc.1
108118
restart: unless-stopped
109-
volumes:
119+
volumes:
110120
- ./configs/client.js:/usr/share/nginx/html/static/env.js
111121
ports:
112122
- 8060:80
113123
admin_client:
114-
image: tokend/admin-client:1.10.1
124+
image: tokend/admin-client:1.13.0-rc.0
115125
restart: unless-stopped
116126
volumes:
117127
- ./configs/client.js:/usr/share/nginx/html/static/env.js
@@ -134,7 +144,7 @@ services:
134144
##
135145

136146
charts:
137-
image: tokend/charts:0.4.1
147+
image: tokend/charts:0.5.0
138148
restart: unless-stopped
139149
environment:
140150
- KV_VIPER_FILE=/config.yaml
@@ -180,39 +190,39 @@ services:
180190
## Coinpayments
181191

182192
coinpayments-deposit:
183-
image: tokend/coinpayments:0.4.0
193+
image: tokend/coinpayments:0.5.0
184194
restart: unless-stopped
185195
environment:
186196
- KV_VIPER_FILE=/config.yaml
187197
volumes:
188198
- ./configs/coinpayments-deposit.yaml:/config.yaml
189199
command: deposit
190200
coinpayments-deposit-verify:
191-
image: tokend/coinpayments:0.4.0
201+
image: tokend/coinpayments:0.5.0
192202
restart: unless-stopped
193203
environment:
194204
- KV_VIPER_FILE=/config.yaml
195205
volumes:
196206
- ./configs/coinpayments-deposit-verify.yaml:/config.yaml
197207
command: deposit-verify
198208
coinpayments-withdraw:
199-
image: tokend/coinpayments:0.4.0
209+
image: tokend/coinpayments:0.5.0
200210
restart: unless-stopped
201211
environment:
202212
- KV_VIPER_FILE=/config.yaml
203213
volumes:
204214
- ./configs/coinpayments-withdraw.yaml:/config.yaml
205215
command: withdraw
206216
coinpayments-atomic-swap-checker:
207-
image: tokend/coinpayments:0.4.5
217+
image: tokend/coinpayments:0.5.0
208218
restart: unless-stopped
209219
environment:
210220
- KV_VIPER_FILE=/config.yaml
211221
volumes:
212222
- ./configs/coinpayments-atomic-swap-checker.yaml:/config.yaml
213223
command: atomic-swap-checker
214224
coinpayments-atomic-swap-matcher:
215-
image: tokend/coinpayments:0.4.5
225+
image: tokend/coinpayments:0.5.0
216226
restart: unless-stopped
217227
environment:
218228
- KV_VIPER_FILE=/config.yaml
@@ -242,7 +252,7 @@ services:
242252

243253
## Ethereum
244254
erc20-deposit:
245-
image: tokend/erc20-deposit-svc:1.0.8
255+
image: tokend/erc20-deposit-svc:1.0.10
246256
restart: unless-stopped
247257
depends_on:
248258
- horizon
@@ -253,7 +263,7 @@ services:
253263
entrypoint: "erc20-deposit-svc"
254264
command: ["run", "deposit"]
255265
erc20-deployer:
256-
image: tokend/erc20-deposit-svc:1.0.8
266+
image: tokend/erc20-deposit-svc:1.0.10
257267
restart: on-failure
258268
depends_on:
259269
- horizon
@@ -264,7 +274,7 @@ services:
264274
entrypoint: "erc20-deposit-svc"
265275
command: ["run", "deployer"]
266276
erc20-funnel:
267-
image: tokend/erc20-deposit-svc:1.0.8
277+
image: tokend/erc20-deposit-svc:1.0.10
268278
restart: unless-stopped
269279
depends_on:
270280
- horizon
@@ -275,7 +285,7 @@ services:
275285
entrypoint: "erc20-deposit-svc"
276286
command: ["run", "funnel"]
277287
erc20-withdraw:
278-
image: tokend/erc20-withdraw-svc:1.0.5
288+
image: tokend/erc20-withdraw-svc:1.0.6
279289
restart: unless-stopped
280290
depends_on:
281291
- horizon

‎terraform/main.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ terraform {
1414
provider "tokend" {
1515
account = "GBA4EX43M25UPV4WIE6RRMQOFTWXZZRIPFAI5VPY6Z2ZVVXVWZ6NEOOB"
1616
signer = "SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4"
17-
endpoint = "http://janus"
17+
endpoint = "http://horizon"
1818
}
1919

2020
module "tokend_vanilla" {
21-
source = "git::https://github.com/tokend/terraform-tokend-vanilla.git?ref=a95125baa8bd5a35e26889539be9bb786fb8cbfb"
21+
source = "git::https://github.com/tokend/terraform-tokend-vanilla.git?ref=373eb6d8347cd6975a9417a04baf094377748161"
2222
}

0 commit comments

Comments
 (0)