Skip to content

Commit 474cc37

Browse files
author
diglspacedavid
committed
upgrade codebase with ethereum:v1.8.13
2 parents 80cd2d3 + 225171a commit 474cc37

File tree

999 files changed

+154627
-34002
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

999 files changed

+154627
-34002
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# Auto detect text files and perform LF normalization
22
* text=auto
3+
*.sol linguist-language=Solidity

.github/CODEOWNERS

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,32 @@
11
# Lines starting with '#' are comments.
22
# Each line is a file pattern followed by one or more owners.
33

4-
accounts/usbwallet @karalabe
5-
consensus @karalabe
6-
core/ @karalabe @holiman
7-
eth/ @karalabe
8-
les/ @zsfelfoldi
9-
light/ @zsfelfoldi
10-
mobile/ @karalabe
11-
p2p/ @fjl @zsfelfoldi
12-
whisper/ @gballet @gluk256
4+
accounts/usbwallet @karalabe
5+
consensus @karalabe
6+
core/ @karalabe @holiman
7+
eth/ @karalabe
8+
les/ @zsfelfoldi
9+
light/ @zsfelfoldi
10+
mobile/ @karalabe
11+
p2p/ @fjl @zsfelfoldi
12+
swarm/bmt @zelig
13+
swarm/dev @lmars
14+
swarm/fuse @jmozah @holisticode
15+
swarm/grafana_dashboards @nonsense
16+
swarm/metrics @nonsense @holisticode
17+
swarm/multihash @nolash
18+
swarm/network/bitvector @zelig @janos @gbalint
19+
swarm/network/priorityqueue @zelig @janos @gbalint
20+
swarm/network/simulations @zelig
21+
swarm/network/stream @janos @zelig @gbalint @holisticode @justelad
22+
swarm/network/stream/intervals @janos
23+
swarm/network/stream/testing @zelig
24+
swarm/pot @zelig
25+
swarm/pss @nolash @zelig @nonsense
26+
swarm/services @zelig
27+
swarm/state @justelad
28+
swarm/storage/encryption @gbalint @zelig @nagydani
29+
swarm/storage/mock @janos
30+
swarm/storage/mru @nolash
31+
swarm/testutil @lmars
32+
whisper/ @gballet @gluk256

.travis.yml

Lines changed: 208 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,208 @@
1+
language: go
2+
go_import_path: github.com/ethereum/go-ethereum
3+
sudo: false
4+
matrix:
5+
include:
6+
- os: linux
7+
dist: trusty
8+
sudo: required
9+
go: 1.9.x
10+
script:
11+
- sudo modprobe fuse
12+
- sudo chmod 666 /dev/fuse
13+
- sudo chown root:$USER /etc/fuse.conf
14+
- go run build/ci.go install
15+
- go run build/ci.go test -coverage $TEST_PACKAGES
16+
17+
# These are the latest Go versions.
18+
- os: linux
19+
dist: trusty
20+
sudo: required
21+
go: 1.10.x
22+
script:
23+
- sudo modprobe fuse
24+
- sudo chmod 666 /dev/fuse
25+
- sudo chown root:$USER /etc/fuse.conf
26+
- go run build/ci.go install
27+
- go run build/ci.go test -coverage $TEST_PACKAGES
28+
29+
- os: osx
30+
go: 1.10.x
31+
script:
32+
- unset -f cd # workaround for https://github.com/travis-ci/travis-ci/issues/8703
33+
- brew update
34+
- brew cask install osxfuse
35+
- go run build/ci.go install
36+
- go run build/ci.go test -coverage $TEST_PACKAGES
37+
38+
# This builder only tests code linters on latest version of Go
39+
- os: linux
40+
dist: trusty
41+
go: 1.10.x
42+
env:
43+
- lint
44+
git:
45+
submodules: false # avoid cloning ethereum/tests
46+
script:
47+
- go run build/ci.go lint
48+
49+
# This builder does the Ubuntu PPA upload
50+
- os: linux
51+
dist: trusty
52+
go: 1.10.x
53+
env:
54+
- ubuntu-ppa
55+
git:
56+
submodules: false # avoid cloning ethereum/tests
57+
addons:
58+
apt:
59+
packages:
60+
- devscripts
61+
- debhelper
62+
- dput
63+
- fakeroot
64+
script:
65+
- go run build/ci.go debsrc -signer "Go Ethereum Linux Builder <geth-ci@ethereum.org>" -upload ppa:ethereum/ethereum
66+
67+
# This builder does the Linux Azure uploads
68+
- os: linux
69+
dist: trusty
70+
sudo: required
71+
go: 1.10.x
72+
env:
73+
- azure-linux
74+
git:
75+
submodules: false # avoid cloning ethereum/tests
76+
addons:
77+
apt:
78+
packages:
79+
- gcc-multilib
80+
script:
81+
# Build for the primary platforms that Trusty can manage
82+
- go run build/ci.go install
83+
- go run build/ci.go archive -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
84+
- go run build/ci.go install -arch 386
85+
- go run build/ci.go archive -arch 386 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
86+
87+
# Switch over GCC to cross compilation (breaks 386, hence why do it here only)
88+
- 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
89+
- sudo ln -s /usr/include/asm-generic /usr/include/asm
90+
91+
- GOARM=5 go run build/ci.go install -arch arm -cc arm-linux-gnueabi-gcc
92+
- GOARM=5 go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
93+
- GOARM=6 go run build/ci.go install -arch arm -cc arm-linux-gnueabi-gcc
94+
- GOARM=6 go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
95+
- GOARM=7 go run build/ci.go install -arch arm -cc arm-linux-gnueabihf-gcc
96+
- GOARM=7 go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
97+
- go run build/ci.go install -arch arm64 -cc aarch64-linux-gnu-gcc
98+
- go run build/ci.go archive -arch arm64 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
99+
100+
# This builder does the Linux Azure MIPS xgo uploads
101+
- os: linux
102+
dist: trusty
103+
services:
104+
- docker
105+
go: 1.10.x
106+
env:
107+
- azure-linux-mips
108+
git:
109+
submodules: false # avoid cloning ethereum/tests
110+
script:
111+
- go run build/ci.go xgo --alltools -- --targets=linux/mips --ldflags '-extldflags "-static"' -v
112+
- for bin in build/bin/*-linux-mips; do mv -f "${bin}" "${bin/-linux-mips/}"; done
113+
- go run build/ci.go archive -arch mips -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
114+
115+
- go run build/ci.go xgo --alltools -- --targets=linux/mipsle --ldflags '-extldflags "-static"' -v
116+
- for bin in build/bin/*-linux-mipsle; do mv -f "${bin}" "${bin/-linux-mipsle/}"; done
117+
- go run build/ci.go archive -arch mipsle -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
118+
119+
- go run build/ci.go xgo --alltools -- --targets=linux/mips64 --ldflags '-extldflags "-static"' -v
120+
- for bin in build/bin/*-linux-mips64; do mv -f "${bin}" "${bin/-linux-mips64/}"; done
121+
- go run build/ci.go archive -arch mips64 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
122+
123+
- go run build/ci.go xgo --alltools -- --targets=linux/mips64le --ldflags '-extldflags "-static"' -v
124+
- for bin in build/bin/*-linux-mips64le; do mv -f "${bin}" "${bin/-linux-mips64le/}"; done
125+
- go run build/ci.go archive -arch mips64le -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
126+
127+
# This builder does the Android Maven and Azure uploads
128+
- os: linux
129+
dist: trusty
130+
addons:
131+
apt:
132+
packages:
133+
- oracle-java8-installer
134+
- oracle-java8-set-default
135+
language: android
136+
android:
137+
components:
138+
- platform-tools
139+
- tools
140+
- android-15
141+
- android-19
142+
- android-24
143+
env:
144+
- azure-android
145+
- maven-android
146+
git:
147+
submodules: false # avoid cloning ethereum/tests
148+
before_install:
149+
- curl https://storage.googleapis.com/golang/go1.10.3.linux-amd64.tar.gz | tar -xz
150+
- export PATH=`pwd`/go/bin:$PATH
151+
- export GOROOT=`pwd`/go
152+
- export GOPATH=$HOME/go
153+
script:
154+
# Build the Android archive and upload it to Maven Central and Azure
155+
- curl https://dl.google.com/android/repository/android-ndk-r17b-linux-x86_64.zip -o android-ndk-r17b.zip
156+
- unzip -q android-ndk-r17b.zip && rm android-ndk-r17b.zip
157+
- mv android-ndk-r17b $HOME
158+
- export ANDROID_NDK=$HOME/android-ndk-r17b
159+
160+
- mkdir -p $GOPATH/src/github.com/ethereum
161+
- ln -s `pwd` $GOPATH/src/github.com/ethereum
162+
- go run build/ci.go aar -signer ANDROID_SIGNING_KEY -deploy https://oss.sonatype.org -upload gethstore/builds
163+
164+
# This builder does the OSX Azure, iOS CocoaPods and iOS Azure uploads
165+
- os: osx
166+
go: 1.10.x
167+
env:
168+
- azure-osx
169+
- azure-ios
170+
- cocoapods-ios
171+
git:
172+
submodules: false # avoid cloning ethereum/tests
173+
script:
174+
- go run build/ci.go install
175+
- go run build/ci.go archive -type tar -signer OSX_SIGNING_KEY -upload gethstore/builds
176+
177+
# Build the iOS framework and upload it to CocoaPods and Azure
178+
- gem uninstall cocoapods -a -x
179+
- gem install cocoapods
180+
181+
- mv ~/.cocoapods/repos/master ~/.cocoapods/repos/master.bak
182+
- sed -i '.bak' 's/repo.join/!repo.join/g' $(dirname `gem which cocoapods`)/cocoapods/sources_manager.rb
183+
- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git clone --depth=1 https://github.com/CocoaPods/Specs.git ~/.cocoapods/repos/master && pod setup --verbose; fi
184+
185+
- xctool -version
186+
- xcrun simctl list
187+
188+
# Workaround for https://github.com/golang/go/issues/23749
189+
- export CGO_CFLAGS_ALLOW='-fmodules|-fblocks|-fobjc-arc'
190+
- go run build/ci.go xcode -signer IOS_SIGNING_KEY -deploy trunk -upload gethstore/builds
191+
192+
# This builder does the Azure archive purges to avoid accumulating junk
193+
- os: linux
194+
dist: trusty
195+
go: 1.10.x
196+
env:
197+
- azure-purge
198+
git:
199+
submodules: false # avoid cloning ethereum/tests
200+
script:
201+
- go run build/ci.go purge -store gethstore/builds -days 14
202+
203+
notifications:
204+
webhooks:
205+
urls:
206+
- https://webhooks.gitter.im/e/e09ccdce1048c5e03445
207+
on_success: change
208+
on_failure: always

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,3 +171,4 @@ xiekeyang <xiekeyang@users.noreply.github.com>
171171
yoza <yoza.is12s@gmail.com>
172172
ΞTHΞЯSPHΞЯΞ <{viktor.tron,nagydani,zsfelfoldi}@gmail.com>
173173
Максим Чусовлянов <mchusovlianov@gmail.com>
174+
Ralph Caraveo <deckarep@gmail.com>

Dockerfile

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,5 @@ FROM alpine:latest
99

1010
LABEL maintainer="anil@xinfin.org"
1111

12-
WORKDIR /XDCchain
13-
14-
COPY --from=builder /XDCchain/build/bin/XDC /usr/local/bin/XDC
15-
16-
RUN chmod +x /usr/local/bin/XDC
17-
18-
EXPOSE 8545
19-
EXPOSE 30303
20-
21-
ENTRYPOINT ["/usr/local/bin/XDC"]
22-
23-
CMD ["--help"]
12+
EXPOSE 8545 8546 30303 30303/udp
13+
ENTRYPOINT ["XDC"]

Dockerfile.alltools

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Build Geth in a stock Go builder container
2+
FROM golang:1.10-alpine as builder
3+
4+
RUN apk add --no-cache make gcc musl-dev linux-headers
5+
6+
ADD . /go-ethereum
7+
RUN cd /go-ethereum && make all
8+
9+
# Pull all binaries into a second stage deploy alpine container
10+
FROM alpine:latest
11+
12+
RUN apk add --no-cache ca-certificates
13+
COPY --from=builder /go-ethereum/build/bin/* /usr/local/bin/
14+
15+
EXPOSE 8545 8546 30303 30303/udp

Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ XDC:
1515
@echo "Done building."
1616
@echo "Run \"$(GOBIN)/XDC\" to launch XDC."
1717

18-
gc:
19-
build/env.sh go run build/ci.go install ./cmd/gc
20-
@echo "Done building."
21-
@echo "Run \"$(GOBIN)/gc\" to launch gc."
22-
2318
bootnode:
2419
build/env.sh go run build/ci.go install ./cmd/bootnode
2520
@echo "Done building."
@@ -36,7 +31,11 @@ all:
3631
test: all
3732
build/env.sh go run build/ci.go test
3833

34+
lint: ## Run linters.
35+
build/env.sh go run build/ci.go lint
36+
3937
clean:
38+
./build/clean_go_build_cache.sh
4039
rm -fr build/_workspace/pkg/ $(GOBIN)/*
4140

4241
# Cross Compilation Targets (xgo)

0 commit comments

Comments
 (0)