Merge pull request #113 from vulcanize/security_update

Security update
This commit is contained in:
Ian Norden 2021-10-11 12:19:32 -05:00 committed by GitHub
commit 2a1ec043b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 657 additions and 222 deletions

View File

@ -16,7 +16,7 @@ jobs:
GOPATH: /tmp/go GOPATH: /tmp/go
strategy: strategy:
matrix: matrix:
go-version: [1.14.x, 1.15.x] go-version: [1.16.x, 1.17.x]
os: [ubuntu-latest] os: [ubuntu-latest]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
@ -40,7 +40,7 @@ jobs:
GOPATH: /tmp/go GOPATH: /tmp/go
strategy: strategy:
matrix: matrix:
go-version: [1.15.x] go-version: [1.16.x]
os: [ubuntu-latest] os: [ubuntu-latest]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:

View File

@ -1,4 +1,4 @@
FROM golang:1.14-alpine as builder FROM golang:1.16-alpine as builder
RUN apk --update --no-cache add make git g++ linux-headers RUN apk --update --no-cache add make git g++ linux-headers
# DEBUG # DEBUG

View File

@ -100,7 +100,7 @@ func serve() {
logWithCommand.Info("state validator disabled") logWithCommand.Info("state validator disabled")
} }
shutdown := make(chan os.Signal) shutdown := make(chan os.Signal, 1)
signal.Notify(shutdown, os.Interrupt) signal.Notify(shutdown, os.Interrupt)
<-shutdown <-shutdown
if graphQL != nil { if graphQL != nil {

15
go.mod
View File

@ -4,8 +4,9 @@ go 1.13
require ( require (
github.com/ethereum/go-ethereum v1.10.9 github.com/ethereum/go-ethereum v1.10.9
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29 github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29
github.com/ipfs/go-block-format v0.0.2 github.com/ipfs/go-block-format v0.0.3
github.com/ipfs/go-cid v0.0.7 github.com/ipfs/go-cid v0.0.7
github.com/ipfs/go-ipfs-blockstore v1.0.1 github.com/ipfs/go-ipfs-blockstore v1.0.1
github.com/ipfs/go-ipfs-ds-help v1.0.0 github.com/ipfs/go-ipfs-ds-help v1.0.0
@ -15,18 +16,20 @@ require (
github.com/machinebox/graphql v0.2.2 github.com/machinebox/graphql v0.2.2
github.com/mailgun/groupcache/v2 v2.2.1 github.com/mailgun/groupcache/v2 v2.2.1
github.com/matryer/is v1.4.0 // indirect github.com/matryer/is v1.4.0 // indirect
github.com/multiformats/go-multihash v0.0.14 github.com/multiformats/go-multihash v0.0.15
github.com/onsi/ginkgo v1.16.2 github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.10.1 github.com/onsi/gomega v1.13.0
github.com/prometheus/client_golang v1.7.1 github.com/prometheus/client_golang v1.11.0
github.com/shirou/gopsutil v3.21.5+incompatible // indirect github.com/shirou/gopsutil v3.21.5+incompatible // indirect
github.com/sirupsen/logrus v1.7.0 github.com/sirupsen/logrus v1.7.0
github.com/spf13/cobra v1.1.1 github.com/spf13/cobra v1.1.1
github.com/spf13/viper v1.7.0 github.com/spf13/viper v1.7.0
github.com/tklauser/go-sysconf v0.3.6 // indirect github.com/tklauser/go-sysconf v0.3.6 // indirect
github.com/vulcanize/eth-ipfs-state-validator v0.0.1 github.com/vulcanize/eth-ipfs-state-validator v0.0.2
github.com/vulcanize/gap-filler v0.3.1 github.com/vulcanize/gap-filler v0.3.1
github.com/vulcanize/ipfs-ethdb v0.0.5 github.com/vulcanize/ipfs-ethdb v0.0.5
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac // indirect
golang.org/x/tools v0.1.7 // indirect
) )
replace github.com/ethereum/go-ethereum v1.10.9 => github.com/vulcanize/go-ethereum v1.10.9-statediff-0.0.27 replace github.com/ethereum/go-ethereum v1.10.9 => github.com/vulcanize/go-ethereum v1.10.9-statediff-0.0.27

856
go.sum

File diff suppressed because it is too large Load Diff