Use patched go-ethereum from our fork instead of patching it on-the-f…

…ly (#1184)

* update to 1.8.16

.travis.yml

@@ -8,12 +8,10 @@ dist: trusty
 install: make setup
 jobs:
   include:
-  - stage: Lint & Vendor Check
-    sudo: required
+  - stage: Lint
     before_script: make dep-ensure
     script:
       - make lint
-      - make vendor-check
   - stage: Test unit and integration
     script:
       - make test-unit

Gopkg.toml

@@ -1,6 +1,3 @@
-# These packages are introduced by patching go-ethereum, so there isn't any point in forcing dep to find them.
-ignored = [ "github.com/ethereum/go-ethereum/ethapi" ]
-
 [prune]
   unused-packages = true
   go-tests = true
@@ -27,7 +24,8 @@ ignored = [ "github.com/ethereum/go-ethereum/ethapi" ]
 
 [[constraint]]
   name = "github.com/ethereum/go-ethereum"
-  version = "=v1.8.15"
+  version = "=v1.8.16"
+  source = "github.com/status-im/go-ethereum"
 
 [[override]]
   name = "github.com/golang/protobuf"
@@ -155,7 +153,7 @@ ignored = [ "github.com/ethereum/go-ethereum/ethapi" ]
 [[override]]
   name = "github.com/deckarep/golang-set"
   revision = "504e848d77ea4752b3057b8fb46da0e7f746ccf3"
-  
+
 [[constraint]]
   name = "github.com/status-im/doubleratchet"
   revision = "321788dbb6eac36f7dab04e631db139e13bb280b"

Makefile

@@ -269,31 +269,12 @@ clean: ##@other Cleanup
 deep-clean: clean
 	rm -Rdf .ethereumtest/StatusChain
 
-vendor-check: ##@dependencies Require all new patches and disallow other changes
-	./_assets/patches/patcher -c
-	./_assets/ci/isolate-vendor-check.sh
-
-dep-ensure: ##@dependencies Dep ensure and apply all patches
+dep-ensure: ##@dependencies Ensure all dependencies are in place with dep
 	@dep ensure
-	./_assets/patches/patcher
 
 dep-install: ##@dependencies Install vendoring tool
 	go get -u github.com/golang/dep/cmd/dep
 
-update-geth: ##@dependencies Update geth (use GETH_BRANCH to optionally set the geth branch name)
-	./_assets/ci/update-geth.sh $(GETH_BRANCH)
-	@echo "**************************************************************"
-	@echo "NOTE: Don't forget to:"
-	@echo "- update the goleveldb dependency revision in Gopkg.toml to match the version used in go-ethereum"
-	@echo "- reconcile any changes to interfaces in transactions/fake (such as PublicTransactionPoolAPI), which are copies from internal geth interfaces"
-	@echo "**************************************************************"
-
-patch: ##@patching Revert and apply all patches
-	./_assets/patches/patcher
-
-patch-revert: ##@patching Revert all patches only
-	./_assets/patches/patcher -r
-
 update-fleet-config: ##@other Update fleets configuration from fleets.status.im
 	./_assets/ci/update-fleet-config.sh
 	@echo "Updating static assets..."