From 0714ba06627acbdf7095546738275cc6bbe182fc Mon Sep 17 00:00:00 2001 From: Korviakov Andrey Date: Tue, 12 Mar 2019 11:41:24 +0300 Subject: [PATCH] Fix wrong NetworkId () on the error 'The method net_version does not exist/is not available' && update docker build --- .dockerignore | 5 +++++ .gitignore | 1 + Dockerfile | 23 ++++++++++++++++------- go.mod | 14 ++++++++++++++ go.sum | 35 +++++++++++++++++++++++++++++++++++ main.go | 5 ++++- 6 files changed, 75 insertions(+), 8 deletions(-) create mode 100644 .dockerignore create mode 100644 go.mod create mode 100644 go.sum diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..806445c --- /dev/null +++ b/.dockerignore @@ -0,0 +1,5 @@ +.git +.gitignore +Dockerfile +*.md +*.json \ No newline at end of file diff --git a/.gitignore b/.gitignore index 485dee6..1f1025f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .idea +.DS_Store \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index b6d26b7..6dbd3a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,23 @@ -FROM golang:1.11-alpine as base -RUN apk add --no-cache libstdc++ gcc g++ make git ca-certificates linux-headers +FROM golang:1.12 as base + MAINTAINER "Hunter Long (https://github.com/hunterlong)" -WORKDIR /go/src/github.com/hunterlong/gethexporter -ADD . . -RUN go get && go install + +WORKDIR /app + +COPY go.* ./ + +RUN go mod download + +COPY *.go ./ + +RUN go build -a -tags netgo -ldflags "-w -extldflags '-static'" -o /app/gethexporter FROM alpine:latest + MAINTAINER "Hunter Long (https://github.com/hunterlong)" -RUN apk add --no-cache jq ca-certificates linux-headers -COPY --from=base /go/bin/gethexporter /usr/local/bin/gethexporter +RUN apk add --no-cache ca-certificates +COPY --from=base /app/gethexporter /usr/local/bin/gethexporter + ENV GETH https://mainnet.infura.io/v3/f5951d9239964e62aa32ca40bad376a6 ENV ADDRESSES "" ENV DELAY 500 diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..3d11016 --- /dev/null +++ b/go.mod @@ -0,0 +1,14 @@ +module gethexporter + +go 1.12 + +require ( + github.com/allegro/bigcache v1.2.0 // indirect + github.com/aristanetworks/goarista v0.0.0-20190308231643-e9fb69a13f45 // indirect + github.com/deckarep/golang-set v1.7.1 // indirect + github.com/ethereum/go-ethereum v1.8.23 + github.com/go-stack/stack v1.8.0 // indirect + github.com/rs/cors v1.6.0 // indirect + github.com/syndtr/goleveldb v1.0.0 // indirect + golang.org/x/net v0.0.0-20190311183353-d8887717615a // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..202ee81 --- /dev/null +++ b/go.sum @@ -0,0 +1,35 @@ +github.com/allegro/bigcache v1.2.0 h1:qDaE0QoF29wKBb3+pXFrJFy1ihe5OT9OiXhg1t85SxM= +github.com/allegro/bigcache v1.2.0/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= +github.com/aristanetworks/goarista v0.0.0-20190308231643-e9fb69a13f45 h1:hJVz9Tpl97QLp4aBwi7X9gMyBEEdA9hkGx2Ia7+DuVs= +github.com/aristanetworks/goarista v0.0.0-20190308231643-e9fb69a13f45/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= +github.com/deckarep/golang-set v1.7.1 h1:SCQV0S6gTtp6itiFrTqI+pfmJ4LN85S1YzhDf9rTHJQ= +github.com/deckarep/golang-set v1.7.1/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= +github.com/ethereum/go-ethereum v1.8.23 h1:xVKYpRpe3cbkaWN8gsRgStsyTvz3s82PcQsbEofjhEQ= +github.com/ethereum/go-ethereum v1.8.23/go.mod h1:PwpWDrCLZrV+tfrhqqF6kPknbISMHaJv9Ln3kPCZLwY= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/rs/cors v1.6.0 h1:G9tHG9lebljV9mfp9SNPDL36nCDxmo3zTlAf1YgvzmI= +github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= +github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/main.go b/main.go index 4ede712..7aa327b 100644 --- a/main.go +++ b/main.go @@ -127,7 +127,10 @@ func Routine() { } geth.SugGasPrice, _ = eth.SuggestGasPrice(ctx) geth.PendingTx, _ = eth.PendingTransactionCount(ctx) - geth.NetworkId, _ = eth.NetworkID(ctx) + geth.NetworkId, err = eth.NetworkID(ctx) + if err != nil { + geth.NetworkId = big.NewInt(0) + } geth.Sync, _ = eth.SyncProgress(ctx) if lastBlock == nil || geth.CurrentBlock.NumberU64() > lastBlock.NumberU64() {