Merge pull request #54 from ShyftNetwork/bootnode

Adjustment of Config.Toml & Docker Config To Faciitate Bootnode Discovery

Makefile

@@ -21,6 +21,11 @@ swarm:
 	@echo "Done building."
 	@echo "Run \"$(GOBIN)/swarm\" to launch swarm."
 
+bootnode:
+	build/env.sh go run build/ci.go install ./cmd/bootnode
+	@echo "Done building."
+	@echo "Run \"$(GOBIN)/bootnode\" to launch bootnode."
+
 all:
 	build/env.sh go run build/ci.go install
 

bootnode.key

@@ -0,0 +1 @@
+16c9595e8957cbbc98188b2be10ae290a28e25f45ea40606ba84072fa304acfd

config.toml

@@ -1,5 +1,5 @@
 [Eth]
-NetworkId = 1
+NetworkId = 2147483647
 SyncMode = "fast"
 LightPeers = 100
 DatabaseCache = 768
@@ -52,8 +52,8 @@ WSModules = ["net", "web3", "eth", "shh"]
 [Node.P2P]
 MaxPeers = 25
 NoDiscovery = false
-BootstrapNodes = ["enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303", "enode://3f1d12044546b76342d59d4a05532c14b85aa669704bfe1f864fe079415aa2c02d743e03218e57a33fb94523adb54032871a6c51b2cc5514cb7c7e35b3ed0a99@13.93.211.84:30303", "enode://78de8a0916848093c73790ead81d1928bec737d565119932b98c6b100d944b7a95e94f847f689fc723399d2e31129d182f7ef3863f2b4c820abbf3ab2722344d@191.235.84.50:30303", "enode://158f8aab45f6d19c6cbf4a089c2670541a8da11978a2f90dbf6a502a4a3bab80d288afdbeb7ec0ef6d92de563767f3b1ea9e8e334ca711e9f8e2df5a0385e8e6@13.75.154.138:30303", "enode://1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082@52.74.57.123:30303", "enode://979b7fa28feeb35a4741660a16076f1943202cb72b6af70d327f053e248bab9ba81760f39d0701ef1d8f89cc1fbd2cacba0710a12cd5314d5e0c9021aa3637f9@5.1.83.226:30303"]
+BootstrapNodes = ["enode://f47940a18bcb63740a795f057757560c60dffe07589766aabe665d92b8e5b808b7bd1103c70c44d25b5bd7ec21020f0883de4a06ade4277dff65a7b250e9c110@54.157.70.195:30301"]
-BootstrapNodesV5 = ["enode://06051a5573c81934c9554ef2898eb13b33a34b94cf36b202b69fde139ca17a85051979867720d4bdae4323d4943ddf9aeeb6643633aa656e0be843659795007a@35.177.226.168:30303", "enode://0cc5f5ffb5d9098c8b8c62325f3797f56509bff942704687b6530992ac706e2cb946b90a34f1f19548cd3c7baccbcaea354531e5983c7d1bc0dee16ce4b6440b@40.118.3.223:30304", "enode://1c7a64d76c0334b0418c004af2f67c50e36a3be60b5e4790bdac0439d21603469a85fad36f2473c9a80eb043ae60936df905fa28f1ff614c3e5dc34f15dcd2dc@40.118.3.223:30306", "enode://85c85d7143ae8bb96924f2b54f1b3e70d8c4d367af305325d30a61385a432f247d2c75c45c6b4a60335060d072d7f5b35dd1d4c45f76941f62a4f83b6e75daaf@40.118.3.223:30307"]
+BootstrapNodesV5 = ["enode://f47940a18bcb63740a795f057757560c60dffe07589766aabe665d92b8e5b808b7bd1103c70c44d25b5bd7ec21020f0883de4a06ade4277dff65a7b250e9c110@54.157.70.195:30301"]
 StaticNodes = []
 TrustedNodes = []
 ListenAddr = ":31333"

docker-compose.yml

@@ -1,5 +1,6 @@
 version: '3'
-
+volumes:
+  pg-data:
 services:
   shyftgeth:
     build:
@@ -9,8 +10,12 @@ services:
       - "8545:8545"
       - "8546:8546"
       - "30301:30301"
+      - "30301:30301/udp"
+      - "30303:30303"
       - "30303:30303/udp"
       - "30304:30304"
+      - "31333:31333"
+      - "31333:31333/udp"
     volumes:
       - .:/go/src/ShyftNetwork/go-empyrean
     working_dir: /go/src/ShyftNetwork/go-empyrean
@@ -29,7 +34,7 @@ services:
       context: $PWD
       dockerfile: docker/pg/Dockerfile.pg
     volumes:
-      - ./pg-data:/var/lib/postgresql/data
+      - pg-data:/var/lib/postgresql/data
     ports:
       - "8001:5432"
     networks:

docker/shyftGeth/Dockerfile.geth

@@ -6,8 +6,9 @@ WORKDIR /go/src/github.com/ShyftEthereum/go-empyrean
 
 RUN \
   apk add --update git make gcc musl-dev linux-headers ca-certificates && \
-  (cd /go/src/github.com/ShyftEthereum/go-empyrean && make geth) && \
+  (cd /go/src/github.com/ShyftEthereum/go-empyrean && make geth && make bootnode) && \
-  cp -v /go/src/github.com/ShyftEthereum/go-empyrean/build/bin/geth /bin 
+  cp -v /go/src/github.com/ShyftEthereum/go-empyrean/build/bin/geth /bin && \
+  cp -v /go/src/github.com/ShyftEthereum/go-empyrean/build/bin/bootnode /bin 
 
 COPY config.toml /
 COPY unlockPasswords.txt /

shyft-cli/startShyftGeth.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 if [[ -z "${DBENV}" ]]; then
-  ./build/bin/geth --config config.toml --ws --wsaddr="0.0.0.0" --wsorigins "*" --nat=none --mine --minerthreads 4 --targetgaslimit 80000000 --unlock "0x43EC6d0942f7fAeF069F7F63D0384a27f529B062,0x9e602164C5826ebb5A6B68E4AFD9Cd466043dc4A,0x5Bd738164C61FB50eb12E227846CbaeF2dE965Aa,0xC04eE4131895F1d0C294D508AF65D94060AA42BB,0x07D899C4aC0c1725C35C5f816e60273B33a964F7" --password ./unlockPasswords.txt
+  ./build/bin/geth --config config.toml --ws --wsaddr="0.0.0.0" --wsorigins "*" --nat=any --mine --minerthreads 4 --targetgaslimit 80000000 --unlock "0x43EC6d0942f7fAeF069F7F63D0384a27f529B062,0x9e602164C5826ebb5A6B68E4AFD9Cd466043dc4A,0x5Bd738164C61FB50eb12E227846CbaeF2dE965Aa,0xC04eE4131895F1d0C294D508AF65D94060AA42BB,0x07D899C4aC0c1725C35C5f816e60273B33a964F7" --password ./unlockPasswords.txt
 else
   /bin/geth --config config.toml --ws --wsaddr="0.0.0.0" --wsorigins "*" --nat=none --mine --minerthreads 4 --targetgaslimit 80000000 --unlock "0x43EC6d0942f7fAeF069F7F63D0384a27f529B062,0x9e602164C5826ebb5A6B68E4AFD9Cd466043dc4A,0x5Bd738164C61FB50eb12E227846CbaeF2dE965Aa,0xC04eE4131895F1d0C294D508AF65D94060AA42BB,0x07D899C4aC0c1725C35C5f816e60273B33a964F7" --password ./unlockPasswords.txt
 fi