From 969bfebe80e3081d096fb8dc0b3b69e249b62c59 Mon Sep 17 00:00:00 2001 From: Roman Khimov Date: Fri, 29 Nov 2019 13:06:14 +0300 Subject: [PATCH] config/docker: fix privnet setup to match neo-local And make it compatible with our default client privnet setup, so that there won't be a need to fix ports to connect to neo-go privnet. --- .docker/docker-compose.yml | 24 ++++++++++++------------ config/protocol.privnet.docker.four.yml | 14 +++++++------- config/protocol.privnet.docker.one.yml | 14 +++++++------- config/protocol.privnet.docker.three.yml | 14 +++++++------- config/protocol.privnet.docker.two.yml | 14 +++++++------- 5 files changed, 40 insertions(+), 40 deletions(-) diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 3da7a6135..c9dfb75bf 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -24,9 +24,9 @@ services: neo_go_network: ipv4_address: 172.200.0.1 ports: - - 20331:20331 - - 20341:20341 - - 20351:20351 + - 20333:20333 + - 30333:30333 + - 20001:20001 node_two: container_name: neo_go_node_two image: env_neo_go_image @@ -38,9 +38,9 @@ services: neo_go_network: ipv4_address: 172.200.0.2 ports: - - 20332:20332 - - 20342:20342 - - 20352:20352 + - 20334:20334 + - 30334:30334 + - 20002:20002 node_three: container_name: neo_go_node_three image: env_neo_go_image @@ -52,9 +52,9 @@ services: neo_go_network: ipv4_address: 172.200.0.3 ports: - - 20333:20333 - - 20343:20343 - - 20353:20353 + - 20335:20335 + - 30335:30335 + - 20003:20003 node_four: container_name: neo_go_node_four image: env_neo_go_image @@ -66,6 +66,6 @@ services: neo_go_network: ipv4_address: 172.200.0.4 ports: - - 20334:20334 - - 20344:20344 - - 20354:20354 + - 20336:20336 + - 30336:30336 + - 20004:20004 diff --git a/config/protocol.privnet.docker.four.yml b/config/protocol.privnet.docker.four.yml index 578125d50..73a9869ee 100644 --- a/config/protocol.privnet.docker.four.yml +++ b/config/protocol.privnet.docker.four.yml @@ -9,10 +9,10 @@ ProtocolConfiguration: - 03d90c07df63e690ce77912e10ab51acc944b66860237b608c4f8f8309e71ee699 - 02a7bc55fe8684e0119768d104ba30795bdcc86619e864add26156723ed185cd62 SeedList: - - 172.200.0.1:20331 - - 172.200.0.2:20332 - - 172.200.0.3:20333 - - 172.200.0.4:20334 + - 172.200.0.1:20333 + - 172.200.0.2:20334 + - 172.200.0.3:20335 + - 172.200.0.4:20336 SystemFee: EnrollmentTransaction: 1000 IssueTransaction: 500 @@ -37,7 +37,7 @@ ApplicationConfiguration: # FilePath: "./chains/privnet.bolt" # Uncomment in order to set up custom address for node. # Address: 127.0.0.1 - NodePort: 20334 + NodePort: 20336 Relay: true DialTimeout: 3 ProtoTickInterval: 2 @@ -47,10 +47,10 @@ ApplicationConfiguration: RPC: Enabled: true EnableCORSWorkaround: false - Port: 20344 + Port: 30336 Monitoring: Enabled: true - Port: 20354 + Port: 20004 UnlockWallet: Path: "6PYRXVwHSqFSukL3CuXxdQ75VmsKpjeLgQLEjt83FrtHf1gCVphHzdD4nc" Password: "four" diff --git a/config/protocol.privnet.docker.one.yml b/config/protocol.privnet.docker.one.yml index 0a6d50d5b..ff939f0b7 100644 --- a/config/protocol.privnet.docker.one.yml +++ b/config/protocol.privnet.docker.one.yml @@ -9,10 +9,10 @@ ProtocolConfiguration: - 03d90c07df63e690ce77912e10ab51acc944b66860237b608c4f8f8309e71ee699 - 02a7bc55fe8684e0119768d104ba30795bdcc86619e864add26156723ed185cd62 SeedList: - - 172.200.0.1:20331 - - 172.200.0.2:20332 - - 172.200.0.3:20333 - - 172.200.0.4:20334 + - 172.200.0.1:20333 + - 172.200.0.2:20334 + - 172.200.0.3:20335 + - 172.200.0.4:20336 SystemFee: EnrollmentTransaction: 1000 IssueTransaction: 500 @@ -37,7 +37,7 @@ ApplicationConfiguration: # FilePath: "./chains/privnet.bolt" # Uncomment in order to set up custom address for node. # Address: 127.0.0.1 - NodePort: 20331 + NodePort: 20333 Relay: true DialTimeout: 3 ProtoTickInterval: 2 @@ -47,10 +47,10 @@ ApplicationConfiguration: RPC: Enabled: true EnableCORSWorkaround: false - Port: 20341 + Port: 30333 Monitoring: Enabled: true - Port: 20351 + Port: 20001 UnlockWallet: Path: "6PYLmjBYJ4wQTCEfqvnznGJwZeW9pfUcV5m5oreHxqryUgqKpTRAFt9L8Y" Password: "one" diff --git a/config/protocol.privnet.docker.three.yml b/config/protocol.privnet.docker.three.yml index 135f83c4b..95749d4ae 100644 --- a/config/protocol.privnet.docker.three.yml +++ b/config/protocol.privnet.docker.three.yml @@ -9,10 +9,10 @@ ProtocolConfiguration: - 03d90c07df63e690ce77912e10ab51acc944b66860237b608c4f8f8309e71ee699 - 02a7bc55fe8684e0119768d104ba30795bdcc86619e864add26156723ed185cd62 SeedList: - - 172.200.0.1:20331 - - 172.200.0.2:20332 - - 172.200.0.3:20333 - - 172.200.0.4:20334 + - 172.200.0.1:20333 + - 172.200.0.2:20334 + - 172.200.0.3:20335 + - 172.200.0.4:20336 SystemFee: EnrollmentTransaction: 1000 IssueTransaction: 500 @@ -37,7 +37,7 @@ ApplicationConfiguration: # FilePath: "./chains/privnet.bolt" # Uncomment in order to set up custom address for node. # Address: 127.0.0.1 - NodePort: 20333 + NodePort: 20335 Relay: true DialTimeout: 3 ProtoTickInterval: 2 @@ -47,10 +47,10 @@ ApplicationConfiguration: RPC: Enabled: true EnableCORSWorkaround: false - Port: 20343 + Port: 30335 Monitoring: Enabled: true - Port: 20353 + Port: 20003 UnlockWallet: Path: "6PYX86vYiHfUbpD95hfN1xgnvcSxy5skxfWYKu3ztjecxk6ikYs2kcWbeh" Password: "three" diff --git a/config/protocol.privnet.docker.two.yml b/config/protocol.privnet.docker.two.yml index eb4694d33..4f7801166 100644 --- a/config/protocol.privnet.docker.two.yml +++ b/config/protocol.privnet.docker.two.yml @@ -9,10 +9,10 @@ ProtocolConfiguration: - 03d90c07df63e690ce77912e10ab51acc944b66860237b608c4f8f8309e71ee699 - 02a7bc55fe8684e0119768d104ba30795bdcc86619e864add26156723ed185cd62 SeedList: - - 172.200.0.1:20331 - - 172.200.0.2:20332 - - 172.200.0.3:20333 - - 172.200.0.4:20334 + - 172.200.0.1:20333 + - 172.200.0.2:20334 + - 172.200.0.3:20335 + - 172.200.0.4:20336 SystemFee: EnrollmentTransaction: 1000 IssueTransaction: 500 @@ -37,7 +37,7 @@ ApplicationConfiguration: # FilePath: "./chains/privnet.bolt" # Uncomment in order to set up custom address for node. # Address: 127.0.0.1 - NodePort: 20332 + NodePort: 20334 Relay: true DialTimeout: 3 ProtoTickInterval: 2 @@ -47,10 +47,10 @@ ApplicationConfiguration: RPC: Enabled: true EnableCORSWorkaround: false - Port: 20342 + Port: 30334 Monitoring: Enabled: true - Port: 20352 + Port: 20002 UnlockWallet: Path: "6PYXHjPaNvW8YknSXaKsTWjf9FRxo1s4naV2jdmSQEgzaqKGX368rndN3L" Password: "two"