Skip to content

Commit a563e41

Browse files
f33r0vovac12zaporozhets-svgWRRicht3r
authored
[duty]: Add assethub (#219)
* Add assethub Signed-off-by: William Richter <richter@soramitsu.co.jp> * fix volumes Signed-off-by: Nikita Zaporozhets <zaporozhets@soramitsu.co.jp> * delete unsuded vars Signed-off-by: Nikita Zaporozhets <zaporozhets@soramitsu.co.jp> * add new validator and para 1000 Signed-off-by: Nikita Zaporozhets <zaporozhets@soramitsu.co.jp> * revert scripts Signed-off-by: Nikita Zaporozhets <zaporozhets@soramitsu.co.jp> * revert Signed-off-by: Nikita Zaporozhets <zaporozhets@soramitsu.co.jp> * fix gitignore Signed-off-by: Nikita Zaporozhets <zaporozhets@soramitsu.co.jp> --------- Signed-off-by: William Richter <richter@soramitsu.co.jp> Signed-off-by: Nikita Zaporozhets <zaporozhets@soramitsu.co.jp> Co-authored-by: Vladimir Stepanenko <vovac12@gmail.com> Co-authored-by: Nikita Zaporozhets <zaporozhets@soramitsu.co.jp> Co-authored-by: William Richter <88400283+WRRicht3r@users.noreply.github.com>
1 parent d74cd54 commit a563e41

10 files changed

Lines changed: 264 additions & 35 deletions

File tree

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@
1515

1616
.DS_Store
1717
.idea
18-
run
18+
run
19+
nodes-data
20+
build-spec-data

bridge-docker/.dockerignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
Dockerfile.*
2-
docker-compose.yml
2+
docker-compose.yml
3+
buld-spec-data
4+
nodes-data

bridge-docker/Dockerfile.parachain

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ COPY Cargo.toml /app
4646
COPY pallets /app/pallets
4747
COPY runtime /app/runtime
4848
COPY node /app/node
49+
COPY utils /app/utils
4950
COPY parachain-common /app/parachain-common
5051
COPY parachain-gen /app/parachain-gen
5152
RUN cargo chef prepare --recipe-path recipe.json
@@ -61,6 +62,7 @@ COPY Cargo.toml /app
6162
COPY pallets /app/pallets
6263
COPY runtime /app/runtime
6364
COPY node /app/node
65+
COPY utils /app/utils
6466
COPY parachain-common /app/parachain-common
6567
COPY parachain-gen /app/parachain-gen
6668
RUN cargo build --release --bin parachain-collator --features rococo

bridge-docker/Dockerfile.polkadot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM parity/polkadot:v0.9.38
1+
FROM parity/polkadot:v0.9.41
22

33
USER root
44

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
polkadot-parachain build-spec --chain asset-hub-rococo-local --disable-default-bootnode > assethub.json
2+
polkadot-parachain export-genesis-state --chain asset-hub-rococo-local > 1000-genesis
3+
polkadot-parachain export-genesis-wasm --chain asset-hub-rococo-local > 1000-genesis-wasm
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

2-
acala build-spec --chain karura-local > karura.json
2+
acala build-spec --chain karura-local --disable-default-bootnode > karura.json
33
acala export-genesis-state --chain karura-local > 2000-genesis
44
acala export-genesis-wasm --chain karura-local > 2000-genesis-wasm

bridge-docker/build-spec-scripts/polkadot.sh

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11

2-
polkadot build-spec --chain rococo-local > rococo.json
2+
# We should open hrmp for parachain 1000 manually
3+
# Read https://github.com/paritytech/polkadot-sdk/issues/4705
34

4-
for para_id in 2000 2011
5+
polkadot build-spec --chain rococo-local --disable-default-bootnode > rococo.json
6+
7+
for para_id in 1000 2000 2011
58
do
69
# Add parachain config to chain spec
710
jq \
@@ -18,10 +21,30 @@ done
1821
# Open HRMP channels
1922
jq \
2023
'.genesis.runtime.runtime_genesis_config.hrmp.preopenHrmpChannels += [
21-
[2011, 2000, 8, 1048576],
22-
[2000, 2011, 8, 1048576]
24+
[2011, 2000, 4, 524287],
25+
[2000, 2011, 4, 524287]
2326
]' rococo.json > rococo.json.tmp && mv rococo.json.tmp rococo.json
2427

28+
29+
# Add 'Charlie' as validator
30+
jq '
31+
.genesis.runtime.runtime_genesis_config.session.keys +=
32+
[
33+
[
34+
"5DAAnrj7VHTznn2AWBemMuyBwZWs6FNFjdyVXUeYum3PTXFy",
35+
"5DAAnrj7VHTznn2AWBemMuyBwZWs6FNFjdyVXUeYum3PTXFy",
36+
{
37+
"grandpa": "5ECTwv6cZ5nJQPk6tWfaTrEk8YH2L7X1VT4EL5Tx2ikfFwb7",
38+
"babe": "5DAAnrj7VHTznn2AWBemMuyBwZWs6FNFjdyVXUeYum3PTXFy",
39+
"im_online": "5DAAnrj7VHTznn2AWBemMuyBwZWs6FNFjdyVXUeYum3PTXFy",
40+
"para_validator": "5DAAnrj7VHTznn2AWBemMuyBwZWs6FNFjdyVXUeYum3PTXFy",
41+
"para_assignment": "5DAAnrj7VHTznn2AWBemMuyBwZWs6FNFjdyVXUeYum3PTXFy",
42+
"authority_discovery": "5DAAnrj7VHTznn2AWBemMuyBwZWs6FNFjdyVXUeYum3PTXFy",
43+
"beefy": "KWCycezxoy7MWTTqA5JDKxJbqVMiNfqThKFhb5dTfsbNaGbrW"
44+
}
45+
]
46+
]' rococo.json > rococo.json.tmp && mv rococo.json.tmp rococo.json
47+
2548
sed -i 's/1e+18/1000000000000000000/' rococo.json
2649

27-
polkadot build-spec --chain rococo.json --raw > rococo-raw.json
50+
polkadot build-spec --chain rococo.json --raw --disable-default-bootnode > rococo-raw.json
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
2-
parachain-collator build-spec --chain docker-local > sora.json
3-
parachain-collator export-genesis-state --chain docker-local > 2011-genesis
4-
parachain-collator export-genesis-wasm --chain docker-local > 2011-genesis-wasm
1+
# changed from docker-local to local
2+
parachain-collator build-spec --chain local --disable-default-bootnode > sora.json
3+
parachain-collator export-genesis-state --chain local > 2011-genesis
4+
parachain-collator export-genesis-wasm --chain local > 2011-genesis-wasm

bridge-docker/docker-compose.yml

Lines changed: 176 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
version: "3.5"
2-
name: sora2-parachain
1+
version: "2.4"
32

43
services:
54
parachain-alice:
@@ -14,14 +13,61 @@ services:
1413
- "9844:9844"
1514
- "9854:9854"
1615
environment:
17-
- RUST_LOG=xcm=trace
16+
- RUST_LOG=parachain::candidate-backing=debug,parachain::collator-protocol=debug,beefy=debug,xcm=trace
1817
command: [
1918
"--pruning", "archive",
2019
"--enable-offchain-indexing", "true",
21-
"-d", "/data",
20+
"-d", "/data",
21+
"--collator",
2222
"--alice",
23+
"--force-authoring",
2324
"--chain", "/build-spec/sora.json",
25+
"--port", "30333",
26+
"--ws-port", "9844",
27+
"--rpc-port", "9854",
28+
"--unsafe-ws-external",
29+
"--unsafe-rpc-external",
30+
"--rpc-cors", "all",
31+
"--execution", "wasm",
32+
"--wasm-execution", "compiled",
33+
"--",
34+
"--execution", "wasm",
35+
"--wasm-execution", "compiled",
36+
"--chain", "/build-spec/rococo-raw.json",
37+
"--port", "30343",
38+
"--ws-port", "10844",
39+
"--rpc-port", "10854",
40+
]
41+
depends_on:
42+
build-spec-polkadot:
43+
condition: service_completed_successfully
44+
volumes:
45+
- ./build-spec-data:/build-spec
46+
- ./nodes-data/parachain-alice-data:/data
47+
networks:
48+
- bridgenet
49+
50+
parachain-bob:
51+
image: sora2/substrate-local-parachain
52+
container_name: bridge-parachain-bob
53+
build:
54+
context: ..
55+
dockerfile: bridge-docker/Dockerfile.parachain
56+
restart: always
57+
user: "root"
58+
ports:
59+
- "9845:9844"
60+
- "9855:9854"
61+
environment:
62+
- RUST_LOG=xcm=trace
63+
command: [
64+
"--pruning", "archive",
65+
"--enable-offchain-indexing", "true",
66+
"-d", "/data",
2467
"--collator",
68+
"--bob",
69+
"--force-authoring",
70+
"--chain", "/build-spec/sora.json",
2571
"--port", "30333",
2672
"--ws-port", "9844",
2773
"--rpc-port", "9854",
@@ -42,10 +88,12 @@ services:
4288
build-spec-polkadot:
4389
condition: service_completed_successfully
4490
volumes:
45-
- build-spec-data:/build-spec
46-
- parachain-alice-data:/data
91+
- ./build-spec-data:/build-spec
92+
- ./nodes-data/parachain-bob-data:/data
4793
networks:
4894
- bridgenet
95+
security_opt:
96+
- apparmor=docker-default
4997

5098
relaychain-alice:
5199
image: sora2/substrate-local-polkadot
@@ -80,10 +128,12 @@ services:
80128
build-spec-polkadot:
81129
condition: service_completed_successfully
82130
volumes:
83-
- build-spec-data:/build-spec
84-
- relaychain-alice-data:/data
131+
- ./build-spec-data:/build-spec
132+
- ./nodes-data/relaychain-alice-data:/data
85133
networks:
86134
- bridgenet
135+
security_opt:
136+
- apparmor=docker-default
87137

88138
relaychain-bob:
89139
image: sora2/substrate-local-polkadot
@@ -118,13 +168,96 @@ services:
118168
build-spec-polkadot:
119169
condition: service_completed_successfully
120170
volumes:
121-
- build-spec-data:/build-spec
122-
- relaychain-bob-data:/data
171+
- ./build-spec-data:/build-spec
172+
- ./nodes-data/relaychain-bob-data:/data
123173
networks:
124174
- bridgenet
175+
security_opt:
176+
- apparmor=docker-default
177+
178+
relaychain-dave:
179+
image: sora2/substrate-local-polkadot
180+
container_name: bridge-relaychain-dave
181+
build:
182+
context: .
183+
dockerfile: Dockerfile.polkadot
184+
restart: always
185+
user: "root"
186+
ports:
187+
- "9746:9746"
188+
- "9756:9756"
189+
environment:
190+
- RUST_LOG=xcm=trace
191+
command: [
192+
"--pruning", "archive",
193+
"--enable-offchain-indexing", "true",
194+
"-d", "/data",
195+
"--dave",
196+
"--chain", "/build-spec/rococo-raw.json",
197+
"--validator",
198+
"--port", "30434",
199+
"--ws-port", "9746",
200+
"--rpc-port", "9756",
201+
"--unsafe-ws-external",
202+
"--unsafe-rpc-external",
203+
"--rpc-cors", "all",
204+
"--execution", "wasm",
205+
"--wasm-execution", "compiled"
206+
]
207+
depends_on:
208+
build-spec-polkadot:
209+
condition: service_completed_successfully
210+
volumes:
211+
- ./build-spec-data:/build-spec
212+
- ./nodes-data/relaychain-dave-data:/data
213+
networks:
214+
- bridgenet
215+
security_opt:
216+
- apparmor=docker-default
217+
218+
assethub-alice:
219+
image: parity/polkadot-parachain:1.3.0
220+
container_name: bridge-assethub-alice
221+
restart: always
222+
user: "root"
223+
ports:
224+
- "9655:9654"
225+
environment:
226+
- RUST_LOG=xcm=trace
227+
command: [
228+
"--pruning", "archive",
229+
"--enable-offchain-indexing", "true",
230+
"-d", "/data",
231+
"--collator",
232+
"--alice",
233+
"--force-authoring",
234+
"--chain", "/build-spec/assethub.json",
235+
"--port", "30533",
236+
"--rpc-port", "9654",
237+
"--unsafe-rpc-external",
238+
"--rpc-cors", "all",
239+
"--execution", "wasm",
240+
"--wasm-execution", "compiled",
241+
"--",
242+
"--execution", "wasm",
243+
"--wasm-execution", "compiled",
244+
"--chain", "/build-spec/rococo-raw.json",
245+
"--port", "30543",
246+
"--rpc-port", "10654",
247+
]
248+
depends_on:
249+
build-spec-polkadot:
250+
condition: service_completed_successfully
251+
volumes:
252+
- ./build-spec-data:/build-spec
253+
- ./nodes-data/assethub-alice-data:/data
254+
networks:
255+
- bridgenet
256+
security_opt:
257+
- apparmor=docker-default
125258

126259
karura-alice:
127-
image: acala/karura-node:2.11.0
260+
image: acala/karura-node:2.19.0
128261
container_name: bridge-karura-alice
129262
restart: always
130263
user: "root"
@@ -160,11 +293,14 @@ services:
160293
build-spec-polkadot:
161294
condition: service_completed_successfully
162295
volumes:
163-
- build-spec-data:/build-spec
164-
- karura-alice-data:/data
296+
- ./build-spec-data:/build-spec
297+
- ./nodes-data/karura-alice-data:/data
165298
networks:
166299
- bridgenet
300+
security_opt:
301+
- apparmor=docker-default
167302

303+
# Uncomment this and 'depends' sections if you need to generate a new chainspecs
168304
build-spec-sora:
169305
image: sora2/substrate-local-parachain
170306
container_name: bridge-parachain-build-spec-sora
@@ -176,20 +312,35 @@ services:
176312
user: "root"
177313
command: /build-spec-scripts/sora.sh
178314
volumes:
179-
- build-spec-data:/build-spec
315+
- ./build-spec-data:/build-spec
180316
- ./build-spec-scripts:/build-spec-scripts
181317
networks:
182318
- bridgenet
183319

184320
build-spec-karura:
185-
image: acala/karura-node:2.11.0
321+
image: acala/karura-node:2.19.0
186322
container_name: bridge-parachain-build-spec-karura
187323
working_dir: /build-spec
188324
entrypoint: sh
189325
user: "root"
190326
command: /build-spec-scripts/karura.sh
191327
volumes:
192-
- build-spec-data:/build-spec
328+
- ./build-spec-data:/build-spec
329+
- ./build-spec-scripts:/build-spec-scripts
330+
networks:
331+
- bridgenet
332+
security_opt:
333+
- apparmor=docker-default
334+
335+
build-spec-assethub:
336+
image: parity/polkadot-parachain:1.3.0
337+
container_name: bridge-parachain-build-spec-assethub
338+
working_dir: /build-spec
339+
entrypoint: sh
340+
user: "root"
341+
command: /build-spec-scripts/assethub.sh
342+
volumes:
343+
- ./build-spec-data:/build-spec
193344
- ./build-spec-scripts:/build-spec-scripts
194345
networks:
195346
- bridgenet
@@ -210,17 +361,20 @@ services:
210361
build-spec-karura:
211362
condition: service_completed_successfully
212363
volumes:
213-
- build-spec-data:/build-spec
364+
- ./build-spec-data:/build-spec
214365
- ./build-spec-scripts:/build-spec-scripts
215366
networks:
216367
- bridgenet
368+
security_opt:
369+
- apparmor=docker-default
217370

218371
volumes:
219-
parachain-alice-data: null
220-
relaychain-alice-data: null
221-
relaychain-bob-data: null
222-
karura-alice-data: null
223-
build-spec-data: null
372+
parachain-alice-data:
373+
relaychain-alice-data:
374+
relaychain-bob-data:
375+
karura-alice-data:
376+
assethub-alice-data:
377+
build-spec-data:
224378

225379
networks:
226380
bridgenet:

0 commit comments

Comments
 (0)