Merge pull request #20 from Ether1Project/1.4.0_Kepler

Kepler - ethoFS & ETHO Daemon Merge

Author: Dev-JamesR

.github/CODEOWNERS

@@ -3,21 +3,20 @@
 
 accounts/usbwallet              @karalabe
 accounts/scwallet               @gballet
-accounts/abi                    @gballet
+accounts/abi                    @gballet @MariusVanDerWijden
 cmd/clef                        @holiman
 cmd/puppeth                     @karalabe
 consensus                       @karalabe
 core/                           @karalabe @holiman @rjl493456442
-dashboard/                      @kurkomisi
 eth/                            @karalabe @holiman @rjl493456442
 graphql/                        @gballet
 les/                            @zsfelfoldi @rjl493456442
 light/                          @zsfelfoldi @rjl493456442
 mobile/                         @karalabe @ligi
+node/                           @fjl @renaynay
 p2p/                            @fjl @zsfelfoldi
 rpc/                            @fjl @holiman
-p2p/simulations                 @zelig @janos @justelad
-p2p/protocols                   @zelig @janos @justelad
-p2p/testing                     @zelig @janos @justelad
+p2p/simulations                 @fjl
+p2p/protocols                   @fjl
+p2p/testing                     @fjl
 signer/                         @holiman
-whisper/                        @gballet @gluk256

.github/ISSUE_TEMPLATE.md

@@ -2,7 +2,7 @@ Hi there,
 
 Please note that this is an issue tracker reserved for bug reports and feature requests.
 
-For general questions please use the gitter channel or the Ethereum stack exchange at https://ethereum.stackexchange.com.
+For general questions please use [discord](https://discord.gg/nthXNEv) or the Ethereum stack exchange at https://ethereum.stackexchange.com.
 
 #### System information
 

.golangci.yml

@@ -1,7 +1,7 @@
 # This file configures github.com/golangci/golangci-lint.
 
 run:
-  timeout: 2m
+  timeout: 3m
   tests: true
   # default is true. Enables skipping of directories:
   #   vendor$, third_party$, testdata$, examples$, Godeps$, builtin$

.travis.yml

@@ -2,64 +2,262 @@ language:           go
 go_import_path:     github.com/Ether1Project/Ether1
 sudo:               false
 jobs:
+  allow_failures:
+    - stage: build
+      os: osx
+      go: 1.14.x
+      env:
+        - azure-osx
+        - azure-ios
+        - cocoapods-ios
+
   include:
-  - stage:          lint
-    os:             linux
-    dist:           xenial
-    go:             1.13.x
-    env:
-    - lint
-    git:
-      submodules:   false
-
-  - stage:          build
-    os:             linux
-    arch:           amd64
-    dist:           xenial
-    go:             1.13.x
-    script:
-    - go run build/ci.go install ./cmd/geth
-    - tar -czvf ether-1-linux-1.3.1.tar.gz build/bin/geth
-    before_deploy:
-          - git config --local user.name "FallenGravity"
-          - git config --local user.email "ethan@ether1.org"
-          - git tag 1.3.1
-    deploy:
-      provider:     releases
-      skip_cleanup: true
-      api_key:
-        secure:     f2neuksH7DULgk7ieZ7cPtSb98OPVHwvfoP4s5BbcJj/2KDGE1ho+1CA+AK5/vwX4tdfYiHoX5rt2qmDkyU+6NVGHdTCO+GTihPJiiIRp6CR1J73+bdgZ8YVgnctRUWRdu8nCc04k8POjfQcSPagmLeSYT52MA1Hh1wLJGp90siZV4UEOkvy6WyF2ywgNh2b0ZvpbQQTD2fgBR+T6qDZIpJVSLqVOa/OkRPzvx0WgxRVidV9yL+G9nYW9h+8RYTB3DkmQ9+tmuvOi35CHUcWA2zScNSqjCLpQcOGecK4j8zqhw0cFSv8Fim13jDwe2Do5wCkxeCjx3t1MWXRPfWkRorNb6NJQBHmGkOg9Jb5WFuXnlyYvvKLsYBoUz0asoceF4kj7rT9zGYL0tl4LTpHdIiZSrOGMZ/lgU9Cpo4JmbeiNTWdz9GgtG+BW/HdewKy0/sZEucnBOAEgvmeP1JphBCK3rgcEAuZ2cB8E0ZgbDCBwPdGmVg5vF/aHGEvVLbDNt0wY6dq3MNEFhqQPgkjKgVq/lPTvjs8OXb3JbUshd58/uBT0qU1NyE0q//47cGuXE+L8L7VAPUwJwsVnzYP29/ZgJQrG4zzkHcGBnkg8QRNiy6REhcErYlt4H9AZMyzbYXC2/nyDWbtWEQP128LWirsCOKX8af9qPwRYZDAp68=
-      file:
-        - "ether-1-linux-1.3.1.tar.gz"
-      on:
-        repo:       Ether1Project/Ether1
-
-  - stage:          build
-    os:             osx
-    osx_image:      xcode11.3
-    go:             1.13.x
-    script:
-    - echo "Increase the maximum number of open file descriptors on macOS"
-    - NOFILE=20480
-    - sudo sysctl -w kern.maxfiles=$NOFILE
-    - sudo sysctl -w kern.maxfilesperproc=$NOFILE
-    - sudo launchctl limit maxfiles $NOFILE $NOFILE
-    - sudo launchctl limit maxfiles
-    - ulimit -S -n $NOFILE
-    - ulimit -n
-    - unset -f cd
-    - go run build/ci.go install ./cmd/geth
-    - zip -r ether-1-macos-1.3.1.zip build/bin/geth
-    before_deploy:
-          - git config --local user.name "FallenGravity"
-          - git config --local user.email "ethan@ether1.org"
-          - git tag 1.3.1 -a -m "Ether-1 V1.3.1 - Test"
-    deploy:
-      provider:     releases
-      skip_cleanup: true
-      api_key:
-        secure:     f2neuksH7DULgk7ieZ7cPtSb98OPVHwvfoP4s5BbcJj/2KDGE1ho+1CA+AK5/vwX4tdfYiHoX5rt2qmDkyU+6NVGHdTCO+GTihPJiiIRp6CR1J73+bdgZ8YVgnctRUWRdu8nCc04k8POjfQcSPagmLeSYT52MA1Hh1wLJGp90siZV4UEOkvy6WyF2ywgNh2b0ZvpbQQTD2fgBR+T6qDZIpJVSLqVOa/OkRPzvx0WgxRVidV9yL+G9nYW9h+8RYTB3DkmQ9+tmuvOi35CHUcWA2zScNSqjCLpQcOGecK4j8zqhw0cFSv8Fim13jDwe2Do5wCkxeCjx3t1MWXRPfWkRorNb6NJQBHmGkOg9Jb5WFuXnlyYvvKLsYBoUz0asoceF4kj7rT9zGYL0tl4LTpHdIiZSrOGMZ/lgU9Cpo4JmbeiNTWdz9GgtG+BW/HdewKy0/sZEucnBOAEgvmeP1JphBCK3rgcEAuZ2cB8E0ZgbDCBwPdGmVg5vF/aHGEvVLbDNt0wY6dq3MNEFhqQPgkjKgVq/lPTvjs8OXb3JbUshd58/uBT0qU1NyE0q//47cGuXE+L8L7VAPUwJwsVnzYP29/ZgJQrG4zzkHcGBnkg8QRNiy6REhcErYlt4H9AZMyzbYXC2/nyDWbtWEQP128LWirsCOKX8af9qPwRYZDAp68=
-      file:
-        - "ether-1-macos-1.3.1.zip"
-      on:
-        repo:       Ether1Project/Ether1
+    # This builder only tests code linters on latest version of Go
+    - stage: lint
+      os: linux
+      dist: xenial
+      go: 1.15.x
+      env:
+        - lint
+      git:
+        submodules: false # avoid cloning ethereum/tests
+      script:
+        - go run build/ci.go lint
+
+    - stage: build
+      os: linux
+      dist: xenial
+      go: 1.13.x
+      env:
+        - GO111MODULE=on
+      script:
+        - go run build/ci.go install
+        - go run build/ci.go test -coverage $TEST_PACKAGES
+
+    - stage: build
+      os: linux
+      dist: xenial
+      go: 1.14.x
+      env:
+        - GO111MODULE=on
+      script:
+        - go run build/ci.go install
+        - go run build/ci.go test -coverage $TEST_PACKAGES
+
+    # These are the latest Go versions.
+    - stage: build
+      os: linux
+      arch: amd64
+      dist: xenial
+      go: 1.15.x
+      env:
+        - GO111MODULE=on
+      script:
+        - go run build/ci.go install
+        - go run build/ci.go test -coverage $TEST_PACKAGES
+
+    - stage: build
+      if: type = pull_request
+      os: linux
+      arch: arm64
+      dist: xenial
+      go: 1.15.x
+      env:
+        - GO111MODULE=on
+      script:
+        - go run build/ci.go install
+        - go run build/ci.go test -coverage $TEST_PACKAGES
+
+    - stage: build
+      os: osx
+      osx_image: xcode11.3
+      go: 1.15.x
+      env:
+        - GO111MODULE=on
+      script:
+        - echo "Increase the maximum number of open file descriptors on macOS"
+        - NOFILE=20480
+        - sudo sysctl -w kern.maxfiles=$NOFILE
+        - sudo sysctl -w kern.maxfilesperproc=$NOFILE
+        - sudo launchctl limit maxfiles $NOFILE $NOFILE
+        - sudo launchctl limit maxfiles
+        - ulimit -S -n $NOFILE
+        - ulimit -n
+        - unset -f cd # workaround for https://github.com/travis-ci/travis-ci/issues/8703
+        - go run build/ci.go install
+        - go run build/ci.go test -coverage $TEST_PACKAGES
+
+    # This builder does the Ubuntu PPA upload
+    - stage: build
+      if: type = push
+      os: linux
+      dist: xenial
+      go: 1.15.x
+      env:
+        - ubuntu-ppa
+        - GO111MODULE=on
+      git:
+        submodules: false # avoid cloning ethereum/tests
+      addons:
+        apt:
+          packages:
+            - devscripts
+            - debhelper
+            - dput
+            - fakeroot
+            - python-bzrlib
+            - python-paramiko
+      script:
+        - echo '|1|7SiYPr9xl3uctzovOTj4gMwAC1M=|t6ReES75Bo/PxlOPJ6/GsGbTrM0= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0aKz5UTUndYgIGG7dQBV+HaeuEZJ2xPHo2DS2iSKvUL4xNMSAY4UguNW+pX56nAQmZKIZZ8MaEvSj6zMEDiq6HFfn5JcTlM80UwlnyKe8B8p7Nk06PPQLrnmQt5fh0HmEcZx+JU9TZsfCHPnX7MNz4ELfZE6cFsclClrKim3BHUIGq//t93DllB+h4O9LHjEUsQ1Sr63irDLSutkLJD6RXchjROXkNirlcNVHH/jwLWR5RcYilNX7S5bIkK8NlWPjsn/8Ua5O7I9/YoE97PpO6i73DTGLh5H9JN/SITwCKBkgSDWUt61uPK3Y11Gty7o2lWsBjhBUm2Y38CBsoGmBw==' >> ~/.ssh/known_hosts
+        - go run build/ci.go debsrc -goversion 1.15 -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder <geth-ci@ethereum.org>"
+
+    # This builder does the Linux Azure uploads
+    - stage: build
+      if: type = push
+      os: linux
+      dist: xenial
+      sudo: required
+      go: 1.15.x
+      env:
+        - azure-linux
+        - GO111MODULE=on
+      git:
+        submodules: false # avoid cloning ethereum/tests
+      addons:
+        apt:
+          packages:
+            - gcc-multilib
+      script:
+        # Build for the primary platforms that Trusty can manage
+        - go run build/ci.go install
+        - go run build/ci.go archive -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
+        - go run build/ci.go install -arch 386
+        - go run build/ci.go archive -arch 386 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
+
+        # Switch over GCC to cross compilation (breaks 386, hence why do it here only)
+        - sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install gcc-arm-linux-gnueabi libc6-dev-armel-cross gcc-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross
+        - sudo ln -s /usr/include/asm-generic /usr/include/asm
+
+        - GOARM=5 go run build/ci.go install -arch arm -cc arm-linux-gnueabi-gcc
+        - GOARM=5 go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
+        - GOARM=6 go run build/ci.go install -arch arm -cc arm-linux-gnueabi-gcc
+        - GOARM=6 go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
+        - GOARM=7 go run build/ci.go install -arch arm -cc arm-linux-gnueabihf-gcc
+        - GOARM=7 go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
+        - go run build/ci.go install -arch arm64 -cc aarch64-linux-gnu-gcc
+        - go run build/ci.go archive -arch arm64 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
+
+    # This builder does the Linux Azure MIPS xgo uploads
+    - stage: build
+      if: type = push
+      os: linux
+      dist: xenial
+      services:
+        - docker
+      go: 1.15.x
+      env:
+        - azure-linux-mips
+        - GO111MODULE=on
+      git:
+        submodules: false # avoid cloning ethereum/tests
+      script:
+        - go run build/ci.go xgo --alltools -- --targets=linux/mips --ldflags '-extldflags "-static"' -v
+        - for bin in build/bin/*-linux-mips; do mv -f "${bin}" "${bin/-linux-mips/}"; done
+        - go run build/ci.go archive -arch mips -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
+
+        - go run build/ci.go xgo --alltools -- --targets=linux/mipsle --ldflags '-extldflags "-static"' -v
+        - for bin in build/bin/*-linux-mipsle; do mv -f "${bin}" "${bin/-linux-mipsle/}"; done
+        - go run build/ci.go archive -arch mipsle -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
+
+        - go run build/ci.go xgo --alltools -- --targets=linux/mips64 --ldflags '-extldflags "-static"' -v
+        - for bin in build/bin/*-linux-mips64; do mv -f "${bin}" "${bin/-linux-mips64/}"; done
+        - go run build/ci.go archive -arch mips64 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
+
+        - go run build/ci.go xgo --alltools -- --targets=linux/mips64le --ldflags '-extldflags "-static"' -v
+        - for bin in build/bin/*-linux-mips64le; do mv -f "${bin}" "${bin/-linux-mips64le/}"; done
+        - go run build/ci.go archive -arch mips64le -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
+
+    # This builder does the Android Maven and Azure uploads
+    - stage: build
+      if: type = push
+      os: linux
+      dist: xenial
+      addons:
+        apt:
+          packages:
+            - oracle-java8-installer
+            - oracle-java8-set-default
+      language: android
+      android:
+        components:
+          - platform-tools
+          - tools
+          - android-15
+          - android-19
+          - android-24
+      env:
+        - azure-android
+        - maven-android
+        - GO111MODULE=on
+      git:
+        submodules: false # avoid cloning ethereum/tests
+      before_install:
+        - curl https://dl.google.com/go/go1.15.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-r19b-linux-x86_64.zip -o android-ndk-r19b.zip
+        - unzip -q android-ndk-r19b.zip && rm android-ndk-r19b.zip
+        - mv android-ndk-r19b $ANDROID_HOME/ndk-bundle
+
+        - mkdir -p $GOPATH/src/github.com/ethereum
+        - ln -s `pwd` $GOPATH/src/github.com/ethereum/go-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
+    - stage: build
+      if: type = push
+      os: osx
+      go: 1.15.x
+      env:
+        - azure-osx
+        - azure-ios
+        - cocoapods-ios
+        - GO111MODULE=on
+      git:
+        submodules: false # avoid cloning ethereum/tests
+      script:
+        - go run build/ci.go install
+        - 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 -x
+        - gem install cocoapods
+
+        - mv ~/.cocoapods/repos/master ~/.cocoapods/repos/master.bak
+        - sed -i '.bak' 's/repo.join/!repo.join/g' $(dirname `gem which cocoapods`)/cocoapods/sources_manager.rb
+        - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git clone --depth=1 https://github.com/CocoaPods/Specs.git ~/.cocoapods/repos/master && pod setup --verbose; fi
+
+        - xctool -version
+        - xcrun simctl list
+
+        # Workaround for https://github.com/golang/go/issues/23749
+        - export CGO_CFLAGS_ALLOW='-fmodules|-fblocks|-fobjc-arc'
+        - go run build/ci.go xcode -signer IOS_SIGNING_KEY -deploy trunk -upload gethstore/builds
+
+    # This builder does the Azure archive purges to avoid accumulating junk
+    - stage: build
+      if: type = cron
+      os: linux
+      dist: xenial
+      go: 1.15.x
+      env:
+        - azure-purge
+        - GO111MODULE=on
+      git:
+        submodules: false # avoid cloning ethereum/tests
+      script:
+        - go run build/ci.go purge -store gethstore/builds -days 14
+>>>>>>> c71a7e26a8b1e332bbf3262d88ba3ff32071456c