Skip to content

Commit

Permalink
Merge pull request #7 from Ethersocial/gesn-0.4.0-geth-1.9.3-base
Browse files Browse the repository at this point in the history
Gesn 0.4.0 (based on geth v1.9.3 stable branch)
  • Loading branch information
hackmod committed Oct 30, 2019
2 parents cfbb969 + 4e08a82 commit 7c4ce15
Show file tree
Hide file tree
Showing 598 changed files with 2,864 additions and 2,664 deletions.
53 changes: 25 additions & 28 deletions .travis.yml
@@ -1,5 +1,5 @@
language: go
go_import_path: github.com/ethereum/go-ethereum
go_import_path: github.com/ethersocial/go-ethersocial
sudo: false
jobs:
include:
Expand Down Expand Up @@ -56,29 +56,6 @@ jobs:
- 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.12.x
env:
- ubuntu-ppa
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 -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
Expand Down Expand Up @@ -113,6 +90,8 @@ jobs:
- 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
- mkdir -p package
- if [ $(ls *-*.gz 2> /dev/null |wc -l) != 0 ]; then mv *-*.tar.gz package; fi

# This builder does the Linux Azure MIPS xgo uploads
- stage: build
Expand Down Expand Up @@ -143,6 +122,9 @@ jobs:
- 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

- mkdir -p package
- if [ $(ls *-*.gz 2> /dev/null |wc -l) != 0 ]; then mv *-*.tar.gz package; fi

# This builder does the Android Maven and Azure uploads
- stage: build
if: type = push
Expand Down Expand Up @@ -177,9 +159,11 @@ jobs:
- 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
- mkdir -p $GOPATH/src/github.com/ethersocial
- ln -s `pwd` $GOPATH/src/github.com/ethersocial/go-ethersocial
- go run build/ci.go aar -signer ANDROID_SIGNING_KEY -deploy https://oss.sonatype.org -upload gethstore/builds
- mkdir -p package
- if [ $(ls *-*.gz 2> /dev/null |wc -l) != 0 ]; then mv *-*.tar.gz package; fi

# This builder does the OSX Azure, iOS CocoaPods and iOS Azure uploads
- stage: build
Expand Down Expand Up @@ -208,8 +192,11 @@ jobs:
- 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
##- export CGO_CFLAGS_ALLOW='-fmodules|-fblocks|-fobjc-arc'
##- go run build/ci.go xcode -signer IOS_SIGNING_KEY -deploy trunk -upload gethstore/builds

- mkdir -p package
- if [ $(ls *-*.gz 2> /dev/null |wc -l) != 0 ]; then mv *-*.tar.gz package; fi

# This builder does the Azure archive purges to avoid accumulating junk
- stage: build
Expand All @@ -223,3 +210,13 @@ jobs:
submodules: false # avoid cloning ethereum/tests
script:
- go run build/ci.go purge -store gethstore/builds -days 14

deploy:
- provider: releases
api_key:
secure: "LV+5+6KZlwZN+l0/kyXJr1ZcJUhqCdCmlr7KGhE3J30gX/y5xraGoTUlORdKKOpJdjrP8Mh4sTGNhq0cpm4FO1We/N/vy4JP9x4/BE0yVupXMtfgrKlQw6pNJXL/EzscBT+rwkvzDCk7+glyrNfgNK8Jcue9SKEG20NI1RofdLfOTMMj6+gHSKrQ3qMydUGVFFhE+YMy7Amffs9WMkg48Od/GWtX8flFFIhclC809JafgPA0W4c7ATSlkoHEzDAiTE7x4uZWQ0Bn5tQxoLh0PqxhEUsW3GBuh3M3GpgiJoOZinocJxZyOJ4eCYYsAqtQMxrbQoklD6RepxaZ9bVMhIGvNXDMbr/uWx+eVxmEvLMpJgmMBPBZytcOgC/MgfYJDlTqOmz+q7O318JgmCOmbXn6v9rhw7ng6R/jPnGOlhmgsVM+/NKH4bI8jCPAvqstTU8jiI16QyZnmo7/H3RK2sKfsP0B8I3Uh77Gbt+d/T951ogqFOj/7lmLgmchescEVeA25KfslepM9zBOF6Q0yxJr5eGXQqbFuoL9QP4UaVw5285sFnWgBTCitgqa48wtO/bjDXCDThAVugTSnmnMmtrlHYi2eZNUx7Tz5v3Ejtsv97cQKQweW1sB1zwT7sa+RUIqpHbG0UZJICDovC+G1naof1GkZhzfd2cVulHSXwQ="
file_glob: true
file: package/*
skip_cleanup: true
on:
tags: true
8 changes: 4 additions & 4 deletions Dockerfile
Expand Up @@ -3,14 +3,14 @@ FROM golang:1.12-alpine as builder

RUN apk add --no-cache make gcc musl-dev linux-headers git

ADD . /go-ethereum
RUN cd /go-ethereum && make geth
ADD . /go-ethersocial
RUN cd /go-ethersocial && make geth

# Pull Geth into a second stage deploy alpine container
FROM alpine:latest

RUN apk add --no-cache ca-certificates
COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/
COPY --from=builder /go-ethersocial/build/bin/geth /usr/local/bin/

EXPOSE 8545 8546 30303 30303/udp
EXPOSE 9545 9546 50505 50505/udp
ENTRYPOINT ["geth"]
8 changes: 4 additions & 4 deletions Dockerfile.alltools
Expand Up @@ -3,13 +3,13 @@ FROM golang:1.12-alpine as builder

RUN apk add --no-cache make gcc musl-dev linux-headers git

ADD . /go-ethereum
RUN cd /go-ethereum && make all
ADD . /go-ethersocial
RUN cd /go-ethersocial && make all

# Pull all binaries into a second stage deploy alpine container
FROM alpine:latest

RUN apk add --no-cache ca-certificates
COPY --from=builder /go-ethereum/build/bin/* /usr/local/bin/
COPY --from=builder /go-ethersocial/build/bin/* /usr/local/bin/

EXPOSE 8545 8546 30303 30303/udp
EXPOSE 9545 9546 50505 50505/udp
2 changes: 1 addition & 1 deletion accounts/abi/abi.go
Expand Up @@ -22,7 +22,7 @@ import (
"fmt"
"io"

"github.com/ethereum/go-ethereum/common"
"github.com/ethersocial/go-ethersocial/common"
)

// The ABI holds information about a contract's context and available
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/abi_test.go
Expand Up @@ -25,8 +25,8 @@ import (
"strings"
"testing"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethersocial/go-ethersocial/common"
"github.com/ethersocial/go-ethersocial/crypto"
)

const jsondata = `
Expand Down
12 changes: 6 additions & 6 deletions accounts/abi/bind/auth.go
Expand Up @@ -22,12 +22,12 @@ import (
"io"
"io/ioutil"

"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/accounts/external"
"github.com/ethereum/go-ethereum/accounts/keystore"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethersocial/go-ethersocial/accounts"
"github.com/ethersocial/go-ethersocial/accounts/external"
"github.com/ethersocial/go-ethersocial/accounts/keystore"
"github.com/ethersocial/go-ethersocial/common"
"github.com/ethersocial/go-ethersocial/core/types"
"github.com/ethersocial/go-ethersocial/crypto"
)

// NewTransactor is a utility method to easily create a transaction signer from
Expand Down
6 changes: 3 additions & 3 deletions accounts/abi/bind/backend.go
Expand Up @@ -21,9 +21,9 @@ import (
"errors"
"math/big"

"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethersocial/go-ethersocial"
"github.com/ethersocial/go-ethersocial/common"
"github.com/ethersocial/go-ethersocial/core/types"
)

var (
Expand Down
32 changes: 16 additions & 16 deletions accounts/abi/bind/backends/simulated.go
Expand Up @@ -24,22 +24,22 @@ import (
"sync"
"time"

"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/consensus/ethash"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/bloombits"
"github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/eth/filters"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/rpc"
"github.com/ethersocial/go-ethersocial"
"github.com/ethersocial/go-ethersocial/accounts/abi/bind"
"github.com/ethersocial/go-ethersocial/common"
"github.com/ethersocial/go-ethersocial/common/math"
"github.com/ethersocial/go-ethersocial/consensus/ethash"
"github.com/ethersocial/go-ethersocial/core"
"github.com/ethersocial/go-ethersocial/core/bloombits"
"github.com/ethersocial/go-ethersocial/core/rawdb"
"github.com/ethersocial/go-ethersocial/core/state"
"github.com/ethersocial/go-ethersocial/core/types"
"github.com/ethersocial/go-ethersocial/core/vm"
"github.com/ethersocial/go-ethersocial/eth/filters"
"github.com/ethersocial/go-ethersocial/ethdb"
"github.com/ethersocial/go-ethersocial/event"
"github.com/ethersocial/go-ethersocial/params"
"github.com/ethersocial/go-ethersocial/rpc"
)

// This nil assignment ensures compile time that SimulatedBackend implements bind.ContractBackend.
Expand Down
14 changes: 7 additions & 7 deletions accounts/abi/bind/backends/simulated_test.go
Expand Up @@ -21,13 +21,13 @@ import (
"math/big"
"testing"

ethereum "github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
ethereum "github.com/ethersocial/go-ethersocial"
"github.com/ethersocial/go-ethersocial/accounts/abi/bind"
"github.com/ethersocial/go-ethersocial/accounts/abi/bind/backends"
"github.com/ethersocial/go-ethersocial/common"
"github.com/ethersocial/go-ethersocial/core"
"github.com/ethersocial/go-ethersocial/core/types"
"github.com/ethersocial/go-ethersocial/crypto"
)

func TestSimulatedBackend(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions accounts/abi/bind/base.go
Expand Up @@ -22,12 +22,12 @@ import (
"fmt"
"math/big"

"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/event"
"github.com/ethersocial/go-ethersocial"
"github.com/ethersocial/go-ethersocial/accounts/abi"
"github.com/ethersocial/go-ethersocial/common"
"github.com/ethersocial/go-ethersocial/core/types"
"github.com/ethersocial/go-ethersocial/crypto"
"github.com/ethersocial/go-ethersocial/event"
)

// SignerFn is a signer function callback when a contract requires a method to
Expand Down
16 changes: 8 additions & 8 deletions accounts/abi/bind/base_test.go
Expand Up @@ -23,14 +23,14 @@ import (
"strings"
"testing"

"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/rlp"
"github.com/ethersocial/go-ethersocial"
"github.com/ethersocial/go-ethersocial/accounts/abi"
"github.com/ethersocial/go-ethersocial/accounts/abi/bind"
"github.com/ethersocial/go-ethersocial/common"
"github.com/ethersocial/go-ethersocial/common/hexutil"
"github.com/ethersocial/go-ethersocial/core/types"
"github.com/ethersocial/go-ethersocial/crypto"
"github.com/ethersocial/go-ethersocial/rlp"
)

type mockCaller struct {
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/bind/bind.go
Expand Up @@ -30,8 +30,8 @@ import (
"text/template"
"unicode"

"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/log"
"github.com/ethersocial/go-ethersocial/accounts/abi"
"github.com/ethersocial/go-ethersocial/log"
)

// Lang is a target programming language selector to generate bindings for.
Expand Down

0 comments on commit 7c4ce15

Please sign in to comment.