Skip to content

Commit

Permalink
Bump github.com/ethereum/go-ethereum from 1.12.0 to 1.13.5 (#220)
Browse files Browse the repository at this point in the history 
* Bump github.com/ethereum/go-ethereum from 1.12.0 to 1.13.5

Bumps [github.com/ethereum/go-ethereum](https://github.com/ethereum/go-ethereum) from 1.12.0 to 1.13.5.
- [Release notes](https://github.com/ethereum/go-ethereum/releases)
- [Commits](ethereum/go-ethereum@v1.12.0...v1.13.5)

---
updated-dependencies:
- dependency-name: github.com/ethereum/go-ethereum
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* remaining dep bumps

* bump to sdk 50.1 and ibc-go v8

* bump raft

* bump all deps. lower raft timeout in tests

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Gouin <[email protected]>
  • Loading branch information
@dependabot @agouin
dependabot[bot] and agouin authored Nov 17, 2023
1 parent 7a6813e commit 5794a02
Show file tree
Hide file tree
Showing 12 changed files with 751 additions and 654 deletions.
4 changes: 2 additions & 2 deletions cmd/horcrux/cmd/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@ for threshold signer mode, --cosigner flags and --threshold flag are required.
"listen address for debug server and prometheus metrics in format localhost:8543",
)
f.StringP(flagKeyDir, "k", "", "key directory if other than home directory")
f.String(flagRaftTimeout, "1500ms", "cosigner raft timeout value, \n"+
f.String(flagRaftTimeout, "500ms", "cosigner raft timeout value, \n"+
"accepts valid duration strings for Go's time.ParseDuration() e.g. 1s, 1000ms, 1.5m")
f.String(flagGRPCTimeout, "1500ms", "cosigner grpc timeout value, \n"+
f.String(flagGRPCTimeout, "500ms", "cosigner grpc timeout value, \n"+
"accepts valid duration strings for Go's time.ParseDuration() e.g. 1s, 1000ms, 1.5m")
f.BoolP(flagOverwrite, "o", false, "overwrite an existing config.yaml")
f.Bool(
Expand Down
24 changes: 12 additions & 12 deletions cmd/horcrux/cmd/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ func TestConfigInitCmd(t *testing.T) {
"-c", "tcp://10.168.1.2:2222",
"-c", "tcp://10.168.1.3:2222",
"-t", "2",
"--raft-timeout", "1500ms",
"--grpc-timeout", "1500ms",
"--raft-timeout", "500ms",
"--grpc-timeout", "500ms",
},
expectConfig: `signMode: threshold
thresholdMode:
Expand All @@ -41,8 +41,8 @@ thresholdMode:
p2pAddr: tcp://10.168.1.2:2222
- shardID: 3
p2pAddr: tcp://10.168.1.3:2222
grpcTimeout: 1500ms
raftTimeout: 1500ms
grpcTimeout: 500ms
raftTimeout: 500ms
chainNodes:
- privValAddr: tcp://10.168.0.1:1234
- privValAddr: tcp://10.168.0.2:1234
Expand Down Expand Up @@ -76,8 +76,8 @@ grpcAddr: ""
"-c", "tcp://10.168.1.2:2222",
"-c", "tcp://10.168.1.3:2222",
"-t", "2",
"--raft-timeout", "1500ms",
"--grpc-timeout", "1500ms",
"--raft-timeout", "500ms",
"--grpc-timeout", "500ms",
},
expectErr: `parse "://10.168.0.1:1234": missing protocol scheme`,
},
Expand All @@ -91,8 +91,8 @@ grpcAddr: ""
"-c", "tcp://10.168.1.2:2222",
"-c", "tcp://10.168.1.3:2222",
"-t", "2",
"--raft-timeout", "1500ms",
"--grpc-timeout", "1500ms",
"--raft-timeout", "500ms",
"--grpc-timeout", "500ms",
},
expectErr: `failed to parse cosigner (shard ID: 1) p2p address: parse "://10.168.1.1:2222": missing protocol scheme`,
},
Expand All @@ -106,8 +106,8 @@ grpcAddr: ""
"-c", "tcp://10.168.1.2:2222",
"-c", "tcp://10.168.1.3:2222",
"-t", "1",
"--raft-timeout", "1500ms",
"--grpc-timeout", "1500ms",
"--raft-timeout", "500ms",
"--grpc-timeout", "500ms",
},
expectErr: "threshold (1) must be greater than number of shards (3) / 2",
},
Expand All @@ -122,7 +122,7 @@ grpcAddr: ""
"-c", "tcp://10.168.1.3:2222",
"-t", "2",
"--raft-timeout", "1500",
"--grpc-timeout", "1500ms",
"--grpc-timeout", "500ms",
},
expectErr: `invalid raftTimeout: time: missing unit in duration "1500"`,
},
Expand All @@ -136,7 +136,7 @@ grpcAddr: ""
"-c", "tcp://10.168.1.2:2222",
"-c", "tcp://10.168.1.3:2222",
"-t", "2",
"--raft-timeout", "1500ms",
"--raft-timeout", "500ms",
"--grpc-timeout", "1500",
},
expectErr: `invalid grpcTimeout: time: missing unit in duration "1500"`,
Expand Down
4 changes: 2 additions & 2 deletions docs/metrics.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ thresholdMode:
p2pAddr: tcp://localhost:5002
- shardID: 3
p2pAddr: tcp://localhost:5003
grpcTimeout: 1500ms
raftTimeout: 1500ms
grpcTimeout: 500ms
raftTimeout: 500ms
chainNodes:
- privValAddr: tcp://localhost:2300
debugAddr: 0.0.0.0:6001
Expand Down
122 changes: 69 additions & 53 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,112 +5,128 @@ go 1.21
require (
github.com/Jille/raft-grpc-leader-rpc v1.1.0
github.com/Jille/raft-grpc-transport v1.4.0
github.com/Jille/raftadmin v1.2.0
github.com/Jille/raftadmin v1.2.1
github.com/armon/go-metrics v0.4.1
github.com/cometbft/cometbft v0.37.2
github.com/cosmos/cosmos-sdk v0.47.3
github.com/cosmos/gogoproto v1.4.10
github.com/ethereum/go-ethereum v1.12.0
github.com/cometbft/cometbft v0.38.0
github.com/cosmos/cosmos-sdk v0.50.1
github.com/cosmos/gogoproto v1.4.11
github.com/ethereum/go-ethereum v1.13.5
github.com/gogo/protobuf v1.3.2
github.com/google/uuid v1.3.0
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/hashicorp/raft v1.5.0
github.com/google/uuid v1.3.1
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/hashicorp/raft v1.6.0
github.com/hashicorp/raft-boltdb/v2 v2.2.2
github.com/kraken-hpc/go-fork v0.1.1
github.com/mitchellh/go-homedir v1.1.0
github.com/prometheus/client_golang v1.14.0
github.com/spf13/cobra v1.6.1
github.com/spf13/viper v1.14.0
github.com/stretchr/testify v1.8.2
github.com/prometheus/client_golang v1.17.0
github.com/spf13/cobra v1.7.0
github.com/spf13/viper v1.16.0
github.com/stretchr/testify v1.8.4
github.com/tendermint/go-amino v0.16.0
gitlab.com/unit410/edwards25519 v0.0.0-20220725154547-61980033348e
gitlab.com/unit410/threshold-ed25519 v0.0.0-20220725172740-6ee731f539ac
golang.org/x/sync v0.1.0
google.golang.org/grpc v1.56.3
gitlab.com/unit410/threshold-ed25519 v0.0.0-20220812172601-56783212c4cc
golang.org/x/sync v0.3.0
google.golang.org/grpc v1.59.0
gopkg.in/yaml.v2 v2.4.0
)

require (
cosmossdk.io/errors v1.0.0-beta.7 // indirect
cosmossdk.io/math v1.0.1 // indirect
cosmossdk.io/api v0.7.2 // indirect
cosmossdk.io/collections v0.4.0 // indirect
cosmossdk.io/core v0.11.0 // indirect
cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
cosmossdk.io/errors v1.0.0 // indirect
cosmossdk.io/log v1.2.1 // indirect
cosmossdk.io/math v1.2.0 // indirect
cosmossdk.io/store v1.0.0 // indirect
cosmossdk.io/x/tx v0.12.0 // indirect
filippo.io/edwards25519 v1.0.0 // indirect
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect
github.com/DataDog/zstd v1.5.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/boltdb/bolt v1.3.1 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cockroachdb/errors v1.11.1 // indirect
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/pebble v0.0.0-20231116191551-bfb2e6a97fdd // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/cometbft/cometbft-db v0.7.0 // indirect
github.com/confio/ics23/go v0.9.0 // indirect
github.com/cosmos/btcutil v1.0.5 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect
github.com/cosmos/go-bip39 v1.0.0 // indirect
github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect
github.com/cosmos/cosmos-db v1.0.0 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.3 // indirect
github.com/cosmos/ics23/go v0.10.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/getsentry/sentry-go v0.25.0 // indirect
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/golang/glog v1.1.0 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/golang/glog v1.1.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/gtank/merlin v0.1.1 // indirect
github.com/gtank/ristretto255 v0.1.2 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-hclog v1.5.0 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-metrics v0.5.2 // indirect
github.com/hashicorp/go-msgpack v1.1.5 // indirect
github.com/hashicorp/go-msgpack/v2 v2.1.1 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-uuid v1.0.1 // indirect
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
github.com/hashicorp/golang-lru v1.0.2 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hdevalence/ed25519consensus v0.1.0 // indirect
github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/holiman/uint256 v1.2.3 // indirect
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/klauspost/compress v1.16.3 // indirect
github.com/klauspost/compress v1.17.3 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/linxGnu/grocksdb v1.8.5 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.18 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect
github.com/pelletier/go-toml/v2 v2.0.9 // indirect
github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/rs/zerolog v1.31.0 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.4.1 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
go.etcd.io/bbolt v1.3.7 // indirect
go.etcd.io/bbolt v1.3.8 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace github.com/keybase/go-keychain => github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4
Loading

0 comments on commit 5794a02

Please sign in to comment.