Skip to content

Commit 8ab8654

Browse files
committed
Fix testnet startup
- it looks like there is no DNS boostrap functionality actually implemented
1 parent ff333c7 commit 8ab8654

3 files changed

Lines changed: 13 additions & 2 deletions

File tree

‎Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ USER bitmessage
3232

3333
# Generate default config
3434
RUN pybitmessage -t
35+
# But don't include anything else
36+
RUN rm -f knownnodes.dat messages.dat debuglog singleton.lock
3537

3638
ENTRYPOINT ["launcher.sh"]
3739
CMD ["-d"]

‎buildscripts/bootstrap/start-loadbalancer.sh‎

100644100755
File mode changed.

‎src/network/knownnodes.py‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@
4848
Peer('178.11.46.221', 8444)
4949
)
5050

51+
TESTNET_NODES = (
52+
Peer('46.62.252.34', 8444),
53+
Peer('5.78.198.100', 8444)
54+
)
55+
5156

5257
def json_serialize_knownnodes(output):
5358
"""
@@ -145,7 +150,11 @@ def addKnownNode(stream, peer, lastseen=None, is_self=False):
145150
def createDefaultKnownNodes():
146151
"""Creating default Knownnodes"""
147152
past = time.time() - 2418600 # 28 days - 10 min
148-
for peer in DEFAULT_NODES:
153+
nodes = (
154+
TESTNET_NODES if config.safeGetBoolean('bootstrap', 'testnet')
155+
else DEFAULT_NODES
156+
)
157+
for peer in nodes:
149158
addKnownNode(1, peer, past)
150159
saveKnownNodes()
151160

@@ -222,7 +231,7 @@ def trimKnownNodes(recAddrStream=1):
222231
def dns():
223232
"""Add DNS names to knownnodes"""
224233
for port in [8080, 8444]:
225-
if config.safeGetBoolean('boostrap', 'testnet'):
234+
if config.safeGetBoolean('bootstrap', 'testnet'):
226235
addKnownNode(
227236
1, Peer('bootstrap%s.testnet.bitmessage.org' % port, port))
228237
else:

0 commit comments

Comments
 (0)