Merge remote-tracking branch 'upstream/master'

Author: martymcfly2015

.travis.yml

@@ -6,7 +6,7 @@ matrix:
     - os: linux
       dist: trusty
       sudo: required
-      go: 1.7.5
+      go: 1.7.6
       script:
         - sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install fuse
         - sudo modprobe fuse
@@ -19,7 +19,7 @@ matrix:
     - os: linux
       dist: trusty
       sudo: required
-      go: 1.8.1
+      go: 1.8.3
       script:
         - sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install fuse
         - sudo modprobe fuse
@@ -29,7 +29,7 @@ matrix:
         - go run build/ci.go test -coverage -misspell
 
     - os: osx
-      go: 1.8.1
+      go: 1.8.3
       sudo: required
       script:
         - brew update
@@ -42,7 +42,7 @@ matrix:
     - os: linux
       dist: trusty
       sudo: required
-      go: 1.8.1
+      go: 1.8.3
       env:
         - ubuntu-ppa
         - azure-linux
@@ -80,7 +80,7 @@ matrix:
       sudo: required
       services:
         - docker
-      go: 1.8.1
+      go: 1.8.3
       env:
         - azure-linux-mips
       script:
@@ -120,24 +120,24 @@ matrix:
         - azure-android
         - maven-android
       before_install:
-        - curl https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz | tar -xz
+        - curl https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz | tar -xz
         - export PATH=`pwd`/go/bin:$PATH
         - export GOROOT=`pwd`/go
         - export GOPATH=$HOME/go
       script:
         # Build the Android archive and upload it to Maven Central and Azure
-        - curl https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip -o android-ndk-r13b.zip
-        - unzip -q android-ndk-r13b.zip && rm android-ndk-r13b.zip
-        - mv android-ndk-r13b $HOME
-        - export ANDROID_NDK=$HOME/android-ndk-r13b
+        - curl https://dl.google.com/android/repository/android-ndk-r14b-linux-x86_64.zip -o android-ndk-r14b.zip
+        - unzip -q android-ndk-r14b.zip && rm android-ndk-r14b.zip
+        - mv android-ndk-r14b $HOME
+        - export ANDROID_NDK=$HOME/android-ndk-r14b
 
         - mkdir -p $GOPATH/src/github.com/ethereum
         - ln -s `pwd` $GOPATH/src/github.com/ethereum
         - go run build/ci.go aar -signer ANDROID_SIGNING_KEY -deploy https://oss.sonatype.org -upload gethstore/builds
 
     # This builder does the OSX Azure, iOS CocoaPods and iOS Azure uploads
     - os: osx
-      go: 1.8.1
+      go: 1.8.3
       env:
         - azure-osx
         - azure-ios
@@ -147,7 +147,7 @@ matrix:
         - go run build/ci.go archive -type tar -signer OSX_SIGNING_KEY -upload gethstore/builds
 
         # Build the iOS framework and upload it to CocoaPods and Azure
-        - gem uninstall cocoapods -a
+        - gem uninstall cocoapods -a -x
         - gem install cocoapods
 
         - mv ~/.cocoapods/repos/master ~/.cocoapods/repos/master.bak
@@ -163,7 +163,7 @@ matrix:
     - os: linux
       dist: trusty
       sudo: required
-      go: 1.8.1
+      go: 1.8.3
       env:
         - azure-purge
       script:

Dockerfile

@@ -10,5 +10,6 @@ RUN \
 
 EXPOSE 39421
 EXPOSE 30403
+EXPOSE 30403/udp
 
 ENTRYPOINT ["/gsoil"]

Dockerfile.orig

@@ -0,0 +1,27 @@
+FROM alpine:3.5
+
+ADD . /go-soil
+RUN \
+  apk add --update git go make gcc musl-dev linux-headers && \
+<<<<<<< HEAD
+  (cd go-soil && make gsoil)                           && \
+  cp go-soil/build/bin/gsoil /gsoil                     && \
+=======
+  (cd go-ethereum && make geth)                           && \
+  cp go-ethereum/build/bin/geth /usr/local/bin/           && \
+>>>>>>> upstream/master
+  apk del git go make gcc musl-dev linux-headers          && \
+  rm -rf /go-soil && rm -rf /var/cache/apk/*
+
+<<<<<<< HEAD
+EXPOSE 39421
+EXPOSE 30403
+
+ENTRYPOINT ["/gsoil"]
+=======
+EXPOSE 8545
+EXPOSE 30303
+EXPOSE 30303/udp
+
+ENTRYPOINT ["geth"]
+>>>>>>> upstream/master

README.md

@@ -157,6 +157,12 @@ and agree upon. This consists of a small JSON file (e.g. call it `genesis.json`)
 
 ```json
 {
+  "config": {
+        "chainId": 0,
+        "homesteadBlock": 0,
+        "eip155Block": 0,
+        "eip158Block": 0
+    },
   "alloc"      : {},
   "coinbase"   : "0x0000000000000000000000000000000000000000",
   "difficulty" : "0x20000",