Skip to content

Commit 732902e

Browse files
mh739025250mh739025250
committed
update version to 0.8.0
1 parent 0f3f60a commit 732902e

File tree

11 files changed

+171
-47
lines changed

11 files changed

+171
-47
lines changed

‎no-blockchain/chain-connector/config/config.json

+13-5
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
"log": {
33
"level": "info"
44
},
5-
"impl": "monkey",
5+
"impl": "coordinator",
66
"host": "0.0.0.0",
77
"port": 4500,
8-
"monkey": {
8+
"coordinator": {
99
"db": {
1010
"type": "sqlite",
1111
"url": "db/chain.db"
1212
}
1313
},
14-
"chain": {
14+
"ethereum": {
1515
"nodeAddress": "",
1616
"privateKey": "",
1717
"provider": "wss://apus.chain.deltampc.com",
@@ -21,12 +21,20 @@
2121
"chainId": 42,
2222
"name": "delta"
2323
},
24-
2524
"identity": {
2625
"contractAddress": "0x43A6feb218F0a1Bc3Ad9d9045ee6528349572E42"
2726
},
2827
"hfl": {
2928
"contractAddress": "0x3830C82700B050dA87F1D1A60104Fb667227B686"
29+
},
30+
"datahub": {
31+
"contractAddress": ""
32+
},
33+
"hlr": {
34+
"contractAddress": "",
35+
"verifiers": {
36+
"3": ""
37+
}
3038
}
3139
}
32-
}
40+
}

‎no-blockchain/delta-node1/config/config.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# configuration of log
33
log:
44
# log level
5-
level: "INFO"
5+
level: "DEBUG"
66
# directory for log file
77
dir: "logs"
88

@@ -27,6 +27,13 @@ node:
2727
# node public URL
2828
url: "http://node1:6700"
2929

30+
# configuration of delta zk
31+
zk:
32+
# zk host
33+
host: "zk1"
34+
# zk port
35+
port: 3400
36+
3037
# port of node api server
3138
api_port: 6700
3239

‎no-blockchain/delta-node2/config/config.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# configuration of log
33
log:
44
# log level
5-
level: "INFO"
5+
level: "DEBUG"
66
# directory for log file
77
dir: "logs"
88

@@ -27,6 +27,13 @@ node:
2727
# node public URL
2828
url: "http://node2:6700"
2929

30+
# configuration of delta zk
31+
zk:
32+
# zk host
33+
host: "zk2"
34+
# zk port
35+
port: 3400
36+
3037
# port of node api server
3138
api_port: 6700
3239

‎no-blockchain/docker-compose.yml

+34-12
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ version: "3.2"
22

33
services:
44
connector-init:
5-
image: deltampc/delta-chain-connector:0.3.5
5+
image: deltampc/delta-chain-connector:0.8.0
66
container_name: connector-init
77
volumes:
88
- "./chain-connector:/app/"
99
command: "init"
1010
connector:
11-
image: deltampc/delta-chain-connector:0.3.5
11+
image: deltampc/delta-chain-connector:0.8.0
1212
container_name: connector
1313
volumes:
1414
- "./chain-connector:/app/"
@@ -19,19 +19,37 @@ services:
1919
healthcheck:
2020
test: "(echo >/dev/tcp/localhost/4500) &>/dev/null"
2121
interval: 10s
22-
timeout: 10s
22+
timeout: 20s
2323
retries: 3
24-
start_period: 10s
24+
start_period: 20s
2525

26+
zk1:
27+
image: deltampc/delta-zk:0.8.0
28+
container_name: zk1
29+
healthcheck:
30+
test: "(echo >/dev/tcp/localhost/3400) &>/dev/null"
31+
interval: 5s
32+
timeout: 10s
33+
retries: 3
34+
start_period: 2s
35+
zk2:
36+
image: deltampc/delta-zk:0.8.0
37+
container_name: zk2
38+
healthcheck:
39+
test: "(echo >/dev/tcp/localhost/3400) &>/dev/null"
40+
interval: 5s
41+
timeout: 10s
42+
retries: 3
43+
start_period: 2s
2644

2745
node1-init:
28-
image: deltampc/delta-node:0.6.0
46+
image: deltampc/delta-node:0.8.0
2947
container_name: node1-init
3048
volumes:
3149
- "./delta-node1:/app"
3250
command: "init"
3351
node1-data:
34-
image: deltampc/delta-node:0.6.0
52+
image: deltampc/delta-node:0.8.0
3553
container_name: node1-data
3654
volumes:
3755
- "./delta-node1:/app"
@@ -40,7 +58,7 @@ services:
4058
node1-init:
4159
condition: service_completed_successfully
4260
node1:
43-
image: deltampc/delta-node:0.6.0
61+
image: deltampc/delta-node:0.8.0
4462
container_name: node1
4563
volumes:
4664
- "./delta-node1:/app/"
@@ -49,6 +67,8 @@ services:
4967
condition: service_completed_successfully
5068
connector:
5169
condition: service_healthy
70+
zk1:
71+
condition: service_healthy
5272
stop_grace_period: 30s
5373
healthcheck:
5474
test: "(echo >/dev/tcp/localhost/6700) &>/dev/null"
@@ -58,13 +78,13 @@ services:
5878
start_period: 10s
5979

6080
node2-init:
61-
image: deltampc/delta-node:0.6.0
81+
image: deltampc/delta-node:0.8.0
6282
container_name: node2-init
6383
volumes:
6484
- "./delta-node2:/app/"
6585
command: "init"
6686
node2-data:
67-
image: deltampc/delta-node:0.6.0
87+
image: deltampc/delta-node:0.8.0
6888
container_name: node2-data
6989
volumes:
7090
- "./delta-node2:/app/"
@@ -73,7 +93,7 @@ services:
7393
node2-init:
7494
condition: service_completed_successfully
7595
node2:
76-
image: deltampc/delta-node:0.6.0
96+
image: deltampc/delta-node:0.8.0
7797
container_name: node2
7898
volumes:
7999
- "./delta-node2:/app/"
@@ -82,6 +102,8 @@ services:
82102
condition: service_completed_successfully
83103
connector:
84104
condition: service_healthy
105+
zk2:
106+
condition: service_healthy
85107
stop_grace_period: 30s
86108
healthcheck:
87109
test: "(echo >/dev/tcp/localhost/6700) &>/dev/null"
@@ -91,13 +113,13 @@ services:
91113
start_period: 10s
92114

93115
dashboard-init:
94-
image: deltampc/deltaboard:0.6.0
116+
image: deltampc/deltaboard:0.8.0
95117
container_name: dashboard-init
96118
volumes:
97119
- "./deltaboard:/app/"
98120
command: "init"
99121
dashboard:
100-
image: deltampc/deltaboard:0.6.0
122+
image: deltampc/deltaboard:0.8.0
101123
container_name: dashboard
102124
volumes:
103125
- "./deltaboard:/app/"

‎with-blockchain/connector1/config/config.json

+13-5
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
"log": {
33
"level": "info"
44
},
5-
"impl": "chain",
5+
"impl": "ethereum",
66
"host": "0.0.0.0",
77
"port": 4500,
8-
"monkey": {
8+
"coordinator": {
99
"db": {
1010
"type": "sqlite",
1111
"url": "db/chain.db"
1212
}
1313
},
14-
"chain": {
14+
"ethereum": {
1515
"nodeAddress": "0x6578aDabE867C4F7b2Ce4c59aBEAbDC754fBb990",
1616
"privateKey": "0xf0f239a0cc63b338e4633cec4aaa3b705a4531d45ef0cbcc7ba0a4b993a952f2",
1717
"provider": "ws://ganache:8545",
@@ -21,12 +21,20 @@
2121
"chainId": 1337,
2222
"name": ""
2323
},
24-
2524
"identity": {
2625
"contractAddress": "0xCe69c1DDCcD29a821bB4d3BdEEb3EdE9De9C7903"
2726
},
2827
"hfl": {
2928
"contractAddress": "0x7864Bf464F9ecE0D3A95cA55e171D9060cf7336a"
29+
},
30+
"datahub": {
31+
"contractAddress": "0x02c1d56eB5C04Cb026cd98Cf38F75A9942EED39B"
32+
},
33+
"hlr": {
34+
"contractAddress": "0x19eE33EC0eAC58205f1797303461dEa88BFF93E9",
35+
"verifiers": {
36+
"3": "0x075200EBa6317bE48ED73c04082088fab26f5D02"
37+
}
3038
}
3139
}
32-
}
40+
}

‎with-blockchain/connector2/config/config.json

+13-5
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
"log": {
33
"level": "info"
44
},
5-
"impl": "chain",
5+
"impl": "ethereum",
66
"host": "0.0.0.0",
77
"port": 4500,
8-
"monkey": {
8+
"coordinator": {
99
"db": {
1010
"type": "sqlite",
1111
"url": "db/chain.db"
1212
}
1313
},
14-
"chain": {
14+
"ethereum": {
1515
"nodeAddress": "0xA3dcddd50d436770EF76388D0e6C5441986De4eE",
1616
"privateKey": "0x76917f7d0859f340d54bd8b64b72a61c7f841474dc6f52e5680e22e9976c6452",
1717
"provider": "ws://ganache:8545",
@@ -21,12 +21,20 @@
2121
"chainId": 1337,
2222
"name": ""
2323
},
24-
2524
"identity": {
2625
"contractAddress": "0xCe69c1DDCcD29a821bB4d3BdEEb3EdE9De9C7903"
2726
},
2827
"hfl": {
2928
"contractAddress": "0x7864Bf464F9ecE0D3A95cA55e171D9060cf7336a"
29+
},
30+
"datahub": {
31+
"contractAddress": "0x02c1d56eB5C04Cb026cd98Cf38F75A9942EED39B"
32+
},
33+
"hlr": {
34+
"contractAddress": "0x19eE33EC0eAC58205f1797303461dEa88BFF93E9",
35+
"verifiers": {
36+
"3": "0x075200EBa6317bE48ED73c04082088fab26f5D02"
37+
}
3038
}
3139
}
32-
}
40+
}

‎with-blockchain/connector3/config/config.json

+12-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
"log": {
33
"level": "info"
44
},
5-
"impl": "chain",
5+
"impl": "ethereum",
66
"host": "0.0.0.0",
77
"port": 4500,
8-
"monkey": {
8+
"coordinator": {
99
"db": {
1010
"type": "sqlite",
1111
"url": "db/chain.db"
1212
}
1313
},
14-
"chain": {
14+
"ethereum": {
1515
"nodeAddress": "0x459d81ac4fb5211248b512561643A1669Cd932c4",
1616
"privateKey": "0x67c262ddec49eb3f689bab2d9a02990de09dbb496cf02b2de61564f5b3e4a760",
1717
"provider": "ws://ganache:8545",
@@ -27,6 +27,15 @@
2727
},
2828
"hfl": {
2929
"contractAddress": "0x7864Bf464F9ecE0D3A95cA55e171D9060cf7336a"
30+
},
31+
"datahub": {
32+
"contractAddress": "0x02c1d56eB5C04Cb026cd98Cf38F75A9942EED39B"
33+
},
34+
"hlr": {
35+
"contractAddress": "0x19eE33EC0eAC58205f1797303461dEa88BFF93E9",
36+
"verifiers": {
37+
"3": "0x075200EBa6317bE48ED73c04082088fab26f5D02"
38+
}
3039
}
3140
}
3241
}

‎with-blockchain/delta-node1/config/config.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ node:
2727
# node public URL
2828
url: "http://node1:6700"
2929

30+
# configuration of delta zk
31+
zk:
32+
# zk host
33+
host: "zk1"
34+
# zk port
35+
port: 3400
36+
3037
# port of node api server
3138
api_port: 6700
3239

‎with-blockchain/delta-node2/config/config.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ node:
2727
# node public URL
2828
url: "http://node2:6700"
2929

30+
# configuration of delta zk
31+
zk:
32+
# zk host
33+
host: "zk2"
34+
# zk port
35+
port: 3400
36+
3037
# port of node api server
3138
api_port: 6700
3239

‎with-blockchain/delta-node3/config/config.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ node:
2727
# node public URL
2828
url: "http://node3:6700"
2929

30+
# configuration of delta zk
31+
zk:
32+
# zk host
33+
host: "zk3"
34+
# zk port
35+
port: 3400
36+
3037
# port of node api server
3138
api_port: 6700
3239

0 commit comments

Comments
 (0)