Merge pull request #225 from kaleido-io/go-1.17

Update to Go 1.17

.github/workflows/go.yaml

@@ -22,7 +22,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.17
 
       - name: Install solc
         run: |

.golangci.yml

@@ -3,10 +3,10 @@ run:
 linters-settings:
   golint: {}
   staticcheck:
-    go: "1.16"
+    go: "1.17"
     checks: ["all"]
   stylecheck:
-    go: "1.16"
+    go: "1.17"
     checks: ["all", "-ST1005"]
   gocritic:
     enabled-checks: []

Dockerfile

@@ -1,8 +1,8 @@
-FROM golang:1.16-buster AS builder
+FROM golang:1.17-buster AS builder
 WORKDIR /ethconnect
 RUN apt-get update -y \
  && apt-get install -y build-essential git \
- && curl -Lo /usr/bin/solc https://github.com/ethereum/solidity/releases/download/v0.7.6/solc-static-linux \
+ && curl -Lo /usr/bin/solc https://github.com/ethereum/solidity/releases/download/v0.8.15/solc-static-linux \
  && chmod 755 /usr/bin/solc
 ADD go.mod go.sum ./
 RUN grep -v ethbinding go.mod > go.mod.new \

ethconnect_config.yaml

@@ -0,0 +1,25 @@
+rest:
+  rest-gateway:
+    rpc:
+      url: http://localhost:5100
+    openapi:
+      eventPollingIntervalSec: 1
+      storagePath: /tmp/ethc
+      eventsDB: /tmp/ethc/events.db
+      catchupModeBlockGap: 50
+      catchupModePageSize: 50
+      confirmations:
+        enabled: true
+        requiredConfirmations: 12
+        includeInPayload: true
+    mongodb:
+      url: "localhost:27017"
+      database: "ethconnect"
+      collection: "ethconnect-replies"
+      maxDocs: 1000
+      queryLimit: 100        
+    http:
+      address: 127.0.0.1
+      port: 8080
+    maxTXWaitTime: 60
+    maxInFlight: 10

go.mod

@@ -1,55 +1,88 @@
 module github.com/hyperledger/firefly-ethconnect
 
 require (
-	github.com/Masterminds/semver v1.5.0
-	github.com/PuerkitoBio/purell v1.1.1 // indirect
-	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
-	github.com/Shopify/sarama v1.33.0
+	github.com/Shopify/sarama v1.37.2
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
-	github.com/bketelsen/crypt v0.0.4 // indirect
-	github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
-	github.com/dsnet/compress v0.0.1 // indirect
-	github.com/ethereum/go-ethereum v1.10.17
-	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8
 	github.com/go-openapi/jsonreference v0.20.0
-	github.com/go-openapi/spec v0.20.6
-	github.com/go-openapi/swag v0.21.1 // indirect
+	github.com/go-openapi/spec v0.20.7
 	github.com/gorilla/websocket v1.5.0
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d
-	github.com/hyperledger/firefly-common v1.1.1
-	github.com/icza/dyno v0.0.0-20210726202311-f1bafe5d9996
+	github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/kaleido-io/ethbinding v0.0.0-20220405144420-999853435d9e
-	github.com/klauspost/compress v1.15.4 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
 	github.com/mholt/archiver v3.1.1+incompatible
-	github.com/microcosm-cc/bluemonday v1.0.18 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
-	github.com/nwaples/rardecode v1.1.3 // indirect
-	github.com/oklog/ulid/v2 v2.0.2
-	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
-	github.com/sirupsen/logrus v1.8.1
-	github.com/spf13/cast v1.5.0 // indirect
-	github.com/spf13/cobra v1.4.0
+	github.com/oklog/ulid/v2 v2.1.0
+	github.com/sirupsen/logrus v1.9.0
+	github.com/spf13/cobra v1.5.0
 	github.com/stretchr/testify v1.8.0
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
-	github.com/tidwall/gjson v1.14.1
+	github.com/tidwall/gjson v1.14.3
+	github.com/x-cray/logrus-prefixed-formatter v0.5.2
+	gopkg.in/yaml.v2 v2.4.0
+)
+
+require (
+	github.com/ethereum/go-ethereum v1.10.25 // indirect
+	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
+	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.1 // indirect
+	golang.org/x/crypto v0.0.0-20221010152910-d6f0a8c073c2 // indirect
+	golang.org/x/net v0.0.0-20221004154528-8021a29435af // indirect
+	golang.org/x/sys v0.0.0-20221006211917-84dc82d7e875 // indirect
+	golang.org/x/term v0.0.0-20220919170432-7a66f970e087 // indirect
+	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
+)
+
+require (
+	github.com/btcsuite/btcd/btcec/v2 v2.2.1 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/deckarep/golang-set v1.8.0 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
+	github.com/dsnet/compress v0.0.1 // indirect
+	github.com/eapache/go-resiliency v1.3.0 // indirect
+	github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
+	github.com/eapache/queue v1.1.0 // indirect
+	github.com/frankban/quicktest v1.14.3 // indirect
+	github.com/fsnotify/fsnotify v1.5.4 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/go-stack/stack v1.8.1 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-uuid v1.0.3 // indirect
+	github.com/inconshreveable/mousetrap v1.0.1 // indirect
+	github.com/jcmturner/aescts/v2 v2.0.0 // indirect
+	github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
+	github.com/jcmturner/gofork v1.7.6 // indirect
+	github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect
+	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/klauspost/compress v1.15.11 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
+	github.com/nwaples/rardecode v1.1.3 // indirect
+	github.com/onsi/ginkgo v1.16.5 // indirect
+	github.com/onsi/gomega v1.19.0 // indirect
+	github.com/pierrec/lz4/v4 v4.1.17 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
+	github.com/stretchr/objx v0.4.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.10 // indirect
 	github.com/tklauser/numcpus v0.5.0 // indirect
 	github.com/ulikunitz/xz v0.5.10 // indirect
-	github.com/x-cray/logrus-prefixed-formatter v0.5.2
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 replace github.com/kaleido-io/ethbinding => ../ethbinding
 
-go 1.16
+go 1.17