From c9ec59808e1a21526a05c5b13d6a81d31fd4a1e6 Mon Sep 17 00:00:00 2001 From: Joshua Gutow Date: Wed, 24 Mar 2021 13:18:05 -0400 Subject: [PATCH 1/8] go.mod: update github.com/golang/snappy See #21934 in upstream geth. --- go.mod | 2 +- go.sum | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fcfa28897c..f9524be5e7 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/go-sourcemap/sourcemap v2.1.2+incompatible // indirect github.com/go-stack/stack v1.8.0 github.com/golang/protobuf v1.3.2-0.20190517061210-b285ee9cfc6c - github.com/golang/snappy v0.0.1 + github.com/golang/snappy v0.0.3 github.com/google/go-cmp v0.3.1 // indirect github.com/gorilla/websocket v1.4.1-0.20190629185528-ae1634f6a989 github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277 diff --git a/go.sum b/go.sum index 28b98693a5..65d9cdbd4e 100644 --- a/go.sum +++ b/go.sum @@ -101,6 +101,8 @@ github.com/golang/protobuf v1.3.2-0.20190517061210-b285ee9cfc6c h1:zqAKixg3cTcIa github.com/golang/protobuf v1.3.2-0.20190517061210-b285ee9cfc6c/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/gorilla/websocket v1.4.1-0.20190629185528-ae1634f6a989 h1:giknQ4mEuDFmmHSrGcbargOuLHQGtywqo4mheITex54= @@ -213,11 +215,11 @@ golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4 h1:QmwruyY+bKbDDL0BaglrbZABEali68eoMFhTZpCjYVA= golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= From 43fdf172728b47c79bfec0fa4d7a1dc27b27e68f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Tue, 23 Feb 2021 18:12:25 +0200 Subject: [PATCH 2/8] accounts/abi/bind: fix up Go mod files for Go 1.16 conflict with module rename that was fixed --- accounts/abi/bind/bind_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go index 71b4c3199e..15d7e76695 100644 --- a/accounts/abi/bind/bind_test.go +++ b/accounts/abi/bind/bind_test.go @@ -1746,11 +1746,16 @@ func TestGolangBindings(t *testing.T) { t.Fatalf("failed to convert binding test to modules: %v\n%s", err, out) } pwd, _ := os.Getwd() - replacer := exec.Command(gocmd, "mod", "edit", "-replace", "github.com/celo-org/celo-blockchain="+filepath.Join(pwd, "..", "..", "..")) // Repo root + replacer := exec.Command(gocmd, "mod", "edit", "-x", "-require", "github.com/celo-org/celo-blockchain@v0.0.0", "-replace", "github.com/celo-org/celo-blockchain="+filepath.Join(pwd, "..", "..", "..")) // Repo root replacer.Dir = pkg if out, err := replacer.CombinedOutput(); err != nil { t.Fatalf("failed to replace binding test dependency to current source tree: %v\n%s", err, out) } + tidier := exec.Command(gocmd, "mod", "tidy") + tidier.Dir = pkg + if out, err := tidier.CombinedOutput(); err != nil { + t.Fatalf("failed to tidy Go module file: %v\n%s", err, out) + } // Test the entire package and report any failures cmd := exec.Command(gocmd, "test", "-v", "-count", "1") cmd.Dir = pkg From 8b74eff6d954ca3844eda5e677ba8934a2c545d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Tue, 23 Feb 2021 18:28:24 +0200 Subject: [PATCH 3/8] Dockerfile: bump to Go 1.16 base images --- Dockerfile | 2 +- Dockerfile.alltools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fc3720bfea..4fdfb32241 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # To use this image for testing, modify GETH_NODE_DOCKER_IMAGE_TAG in celo-monorepo/.env file # Build Geth in a stock Go builder container -FROM golang:1.14-alpine as builder +FROM golang:1.16-alpine as builder RUN apk add --no-cache make gcc musl-dev linux-headers git diff --git a/Dockerfile.alltools b/Dockerfile.alltools index 11f0a3c403..40eb112a3f 100644 --- a/Dockerfile.alltools +++ b/Dockerfile.alltools @@ -1,5 +1,5 @@ # Build Geth in a stock Go builder container -FROM golang:1.14-alpine as builder +FROM golang:1.16-alpine as builder RUN apk add --no-cache make gcc musl-dev linux-headers git From 54e94aa69fef204928377ce919b389d301632a6c Mon Sep 17 00:00:00 2001 From: Joshua Gutow Date: Wed, 24 Mar 2021 14:04:30 -0400 Subject: [PATCH 4/8] travis, appveyor, checksums: bump Go to 1.16 See https://github.com/ethereum/go-ethereum/pull/22351/commits/c5023e1dc56f3ced0e3a24733e533bf962515844 --- .travis.yml | 30 +++++++++++++++--------------- appveyor.yml | 4 ++-- build/checksums.txt | 13 ++++++++++++- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8425cf8fc5..93bf733a74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ jobs: allow_failures: - stage: build os: osx - go: 1.14.x + go: 1.16.x env: - azure-osx - azure-ios @@ -16,7 +16,7 @@ jobs: - stage: lint os: linux dist: xenial - go: 1.14.x + go: 1.16.x env: - lint git: @@ -27,7 +27,7 @@ jobs: - stage: build os: linux dist: xenial - go: 1.13.x + go: 1.15.x env: - GO111MODULE=on script: @@ -37,7 +37,7 @@ jobs: - stage: build os: linux dist: xenial - go: 1.13.x + go: 1.15.x env: - GO111MODULE=on script: @@ -47,7 +47,7 @@ jobs: - stage: build os: linux dist: xenial - go: 1.13.x + go: 1.15.x env: - GO111MODULE=on script: @@ -59,7 +59,7 @@ jobs: os: linux arch: amd64 dist: xenial - go: 1.14.x + go: 1.16.x env: - GO111MODULE=on script: @@ -71,7 +71,7 @@ jobs: os: linux arch: arm64 dist: xenial - go: 1.14.x + go: 1.16.x env: - GO111MODULE=on script: @@ -81,7 +81,7 @@ jobs: - stage: build os: osx osx_image: xcode11.3 - go: 1.14.x + go: 1.16.x env: - GO111MODULE=on script: @@ -102,7 +102,7 @@ jobs: if: type = push os: linux dist: xenial - go: 1.14.x + go: 1.16.x env: - ubuntu-ppa - GO111MODULE=on @@ -119,7 +119,7 @@ jobs: - 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.14.2 -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder " + - go run build/ci.go debsrc -goversion 1.16.2 -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder " # This builder does the Linux Azure uploads - stage: build @@ -127,7 +127,7 @@ jobs: os: linux dist: xenial sudo: required - go: 1.14.x + go: 1.16.x env: - azure-linux - GO111MODULE=on @@ -164,7 +164,7 @@ jobs: dist: xenial services: - docker - go: 1.14.x + go: 1.16.x env: - azure-linux-mips - GO111MODULE=on @@ -212,7 +212,7 @@ jobs: git: submodules: false # avoid cloning ethereum/tests before_install: - - curl https://dl.google.com/go/go1.14.2.linux-amd64.tar.gz | tar -xz + - curl https://dl.google.com/go/go1.16.linux-amd64.tar.gz | tar -xz - export PATH=`pwd`/go/bin:$PATH - export GOROOT=`pwd`/go - export GOPATH=$HOME/go @@ -230,7 +230,7 @@ jobs: - stage: build if: type = push os: osx - go: 1.14.x + go: 1.16.x env: - azure-osx - azure-ios @@ -262,7 +262,7 @@ jobs: if: type = cron os: linux dist: xenial - go: 1.14.x + go: 1.16.x env: - azure-purge - GO111MODULE=on diff --git a/appveyor.yml b/appveyor.yml index fe15cc7f0e..1ea0e90a80 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,8 +24,8 @@ environment: install: - git submodule update --init - rmdir C:\go /s /q - - appveyor DownloadFile https://dl.google.com/go/go1.14.2.windows-%GETH_ARCH%.zip - - 7z x go1.14.2.windows-%GETH_ARCH%.zip -y -oC:\ > NUL + - appveyor DownloadFile https://dl.google.com/go/go1.16.windows-%GETH_ARCH%.zip + - 7z x go1.16.windows-%GETH_ARCH%.zip -y -oC:\ > NUL - go version - gcc --version diff --git a/build/checksums.txt b/build/checksums.txt index 708e619649..08c8fd9296 100644 --- a/build/checksums.txt +++ b/build/checksums.txt @@ -1,6 +1,17 @@ # This file contains sha256 checksums of optional build dependencies. -98de84e69726a66da7b4e58eac41b99cbe274d7e8906eeb8a5b7eb0aadee7f7c go1.14.2.src.tar.gz +7688063d55656105898f323d90a79a39c378d86fe89ae192eb3b7fc46347c95a go1.16.src.tar.gz +6000a9522975d116bf76044967d7e69e04e982e9625330d9a539a8b45395f9a8 go1.16.darwin-amd64.tar.gz +ea435a1ac6d497b03e367fdfb74b33e961d813883468080f6e239b3b03bea6aa go1.16.linux-386.tar.gz +013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2 go1.16.linux-amd64.tar.gz +3770f7eb22d05e25fbee8fb53c2a4e897da043eb83c69b9a14f8d98562cd8098 go1.16.linux-arm64.tar.gz +d1d9404b1dbd77afa2bdc70934e10fbfcf7d785c372efc29462bb7d83d0a32fd go1.16.linux-armv6l.tar.gz +481492a17d42193d471b93b7a06da3555331bd833b76336afc87be820c48933f go1.16.windows-386.zip +5cc88fa506b3d5c453c54c3ea218fc8dd05d7362ae1de15bb67986b72089ce93 go1.16.windows-amd64.zip +d7d6c70b05a7c2f68b48aab5ab8cb5116b8444c9ddad131673b152e7cff7c726 go1.16.freebsd-386.tar.gz +40b03216f6945fb6883a50604fc7f409a83f62171607229a9c598e701e684f8a go1.16.freebsd-amd64.tar.gz +27a1aaa988e930b7932ce459c8a63ad5b3333b3a06b016d87ff289f2a11aacd6 go1.16.linux-ppc64le.tar.gz +be4c9e4e2cf058efc4e3eb013a760cb989ddc4362f111950c990d1c63b27ccbe go1.16.linux-s390x.tar.gz e354010a37438301d6324a7548b77a3af3c0cc950f5f46bbf74f84644b3ce3ae golangci-lint-1.25.0-linux-s390x.tar.gz 930e7c9613cbe83b961de5d9ccf9fcf5ad774711830336976e9548a6db397e8c golangci-lint-1.25.0-linux-386.tar.gz From 352fb098bb53b930d11f2d078218601df3cd2706 Mon Sep 17 00:00:00 2001 From: Joshua Gutow Date: Wed, 24 Mar 2021 14:08:06 -0400 Subject: [PATCH 5/8] Update builders to go1.16 --- .circleci/config.yml | 12 ++++++------ Dockerfile.android | 2 +- Dockerfile.arm64 | 4 ++-- Dockerfile.binaries | 2 +- README.md | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d24a3a4a86..6eeefd1ed9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,14 +2,14 @@ version: 2.1 executors: golang: docker: - - image: circleci/golang:1.14 + - image: circleci/golang:1.16 working_directory: ~/repos/geth e2e: docker: - image: celohq/node10-gcloud:v3 working_directory: ~/repos/celo-monorepo/packages/celotool environment: - GO_VERSION: "1.14.14" + GO_VERSION: "1.16.2" CELO_MONOREPO_BRANCH_TO_TEST: master GITHUB_RSA_FINGERPRINT: SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8 jobs: @@ -116,11 +116,11 @@ jobs: - run: name: Setup Go language command: | - brew install go@1.14 - brew link go@1.14 + brew install go@1.16 + brew link go@1.16 # Check that homebrew installed the expected go version - if [[ "$(go version)" != "go version go1.14"* ]]; then - echo "go1.14 is required" + if [[ "$(go version)" != "go version go1.16"* ]]; then + echo "go1.16 is required" exit 1 fi - run: diff --git a/Dockerfile.android b/Dockerfile.android index 123d2e431a..80e3d3a432 100644 --- a/Dockerfile.android +++ b/Dockerfile.android @@ -29,7 +29,7 @@ RUN rustup target add x86_64-linux-android # go and node installations command expect to run as root USER root -RUN curl https://dl.google.com/go/go1.14.14.linux-amd64.tar.gz | tar -xz +RUN curl https://dl.google.com/go/go1.16.2.linux-amd64.tar.gz | tar -xz ENV PATH=/go/bin:$PATH ENV GOROOT=/go ENV GOPATH=$HOME/go diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 63afd1f7f1..bf957728c5 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -9,8 +9,8 @@ RUN apt update && \ rm -rf /var/lib/apt/lists/* RUN rustup target add aarch64-unknown-linux-gnu -RUN wget https://dl.google.com/go/go1.14.14.linux-amd64.tar.gz && \ - tar xf go1.14.14.linux-amd64.tar.gz -C /usr/local +RUN wget https://dl.google.com/go/go1.16.2.linux-amd64.tar.gz && \ + tar xf go1.16.2.linux-amd64.tar.gz -C /usr/local COPY . /go-ethereum WORKDIR /go-ethereum diff --git a/Dockerfile.binaries b/Dockerfile.binaries index 3f0f44e9b1..8031a21d14 100644 --- a/Dockerfile.binaries +++ b/Dockerfile.binaries @@ -41,7 +41,7 @@ # In the CI flow these are then uploaded to cloud storage as artefacts. # Build Geth binaries in the xgo builder container -FROM techknowlogick/xgo:go-1.14.x +FROM techknowlogick/xgo:go-1.16.x # techknowlogic/xgo is a fork of karalabe/xgo updated to ubunut-18, it is more maintained # by the community and allows us to backport mingw in order to build for windows # See discussion in PR celo-blockchain# about downsides of this image diff --git a/README.md b/README.md index 53dc336aba..39d5fcd21f 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Most functionality of this client is similar to `go-ethereum`, also known as `ge ## Building the source -Building `geth` requires both a Go (version 1.14) and a C compiler. +Building `geth` requires both a Go (version 1.16) and a C compiler. You can install them using your favourite package manager. Once the dependencies are installed, run ```shell From 4f81dcb0402565731260fdded25eeacdb4198718 Mon Sep 17 00:00:00 2001 From: Joshua Gutow Date: Wed, 24 Mar 2021 15:40:06 -0400 Subject: [PATCH 6/8] Fix panic with discv5 This is due to a change in golang 1.16 which panics when using a non-unique hash in a HMAC. This change copies the upstream change which uses a new sha instance rather than the existing hash value. Discv5 is next touched in: https://github.com/ethereum/go-ethereum/pull/21647 where it is reworked. Full history of the encoding test: git log geth/master --full-history -- p2p/discover/v5_encoding_test.go --- p2p/discover/v5_encoding.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p2p/discover/v5_encoding.go b/p2p/discover/v5_encoding.go index 823d9d03a0..aeba32075d 100644 --- a/p2p/discover/v5_encoding.go +++ b/p2p/discover/v5_encoding.go @@ -383,7 +383,7 @@ func (c *wireCodec) deriveKeys(n1, n2 enode.ID, priv *ecdsa.PrivateKey, pub *ecd info := []byte("discovery v5 key agreement") info = append(info, n1[:]...) info = append(info, n2[:]...) - kdf := hkdf.New(c.sha256reset, eph, challenge.IDNonce[:], info) + kdf := hkdf.New(sha256.New, eph, challenge.IDNonce[:], info) sec := handshakeSecrets{ writeKey: make([]byte, aesKeySize), readKey: make([]byte, aesKeySize), From a804e38a7b6f40cb2f3a1631f862b1cc2de63e00 Mon Sep 17 00:00:00 2001 From: Joshua Gutow Date: Thu, 25 Mar 2021 11:54:22 -0400 Subject: [PATCH 7/8] Update go mobile --- go.mod | 4 ++-- go.sum | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index f9524be5e7..4fd5279cf1 100644 --- a/go.mod +++ b/go.mod @@ -63,7 +63,7 @@ require ( github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 - golang.org/x/mobile v0.0.0-20200801112145-973feb4309de // indirect + golang.org/x/mobile v0.0.0-20210220033013-bdb1ca9a1e08 // indirect golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 @@ -77,4 +77,4 @@ require ( ) // Use our fork which disables bitcode -replace golang.org/x/mobile => github.com/celo-org/mobile v0.0.0-20201127114005-6a1221213dcf +replace golang.org/x/mobile => github.com/celo-org/mobile v0.0.0-20210324213558-66ac87d7fb95 diff --git a/go.sum b/go.sum index 65d9cdbd4e..7acac49d52 100644 --- a/go.sum +++ b/go.sum @@ -53,6 +53,8 @@ github.com/celo-org/celo-bls-go v0.2.4 h1:V1y92kM5IRJWQZ6DCwqiKLW7swmUA5y/dPJ9Yb github.com/celo-org/celo-bls-go v0.2.4/go.mod h1:eXUCLXu5F1yfd3M+3VaUk5ZUXaA0sLK2rWdLC1Cfaqo= github.com/celo-org/mobile v0.0.0-20201127114005-6a1221213dcf h1:vjXHjR4gf41rdPgg3XafcYgpxrj28zIAZ89KDTStL6U= github.com/celo-org/mobile v0.0.0-20201127114005-6a1221213dcf/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= +github.com/celo-org/mobile v0.0.0-20210324213558-66ac87d7fb95 h1:X0tWCNjfHVI3NkXhfHPXdQA/Hdi4XexGDER9QPh3V9A= +github.com/celo-org/mobile v0.0.0-20210324213558-66ac87d7fb95/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= @@ -225,6 +227,7 @@ golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMx golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd h1:ePuNC7PZ6O5BzgPn9bZayERXBdfZjUYoXEf5BTfDfh8= golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -253,8 +256,10 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69 h1:yBHHx+XZqXJBm6Exke3N7V9gnlsyXxoCPEb1yVenjfk= golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 606a1831d78d9b54973a8c55b0523c16ec68d5f1 Mon Sep 17 00:00:00 2001 From: Joshua Gutow Date: Thu, 25 Mar 2021 12:01:52 -0400 Subject: [PATCH 8/8] Update libs patch for android build --- patches/mobileLibsForBuild.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/mobileLibsForBuild.patch b/patches/mobileLibsForBuild.patch index d5e49162d1..ba1b81083a 100644 --- a/patches/mobileLibsForBuild.patch +++ b/patches/mobileLibsForBuild.patch @@ -5,6 +5,6 @@ index b6989868d..9947b3aa4 100644 @@ -75,3 +75,5 @@ require ( // Use our fork which disables bitcode - replace golang.org/x/mobile => github.com/celo-org/mobile v0.0.0-20201127114005-6a1221213dcf + replace golang.org/x/mobile => github.com/celo-org/mobile v0.0.0-20210324213558-66ac87d7fb95 + +replace golang.org/x/sys => github.com/celo-org/sys v0.0.0-20200816232032-1d4c3212eaf2