Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: fix and execute mod tidy #2138

Merged
merged 6 commits into from
Nov 13, 2024
Merged

chore: fix and execute mod tidy #2138

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
99ac435
chore: fix and execute mod tidy
dezzeus Nov 8, 2024
a2793a1
Merge branch 'main' of github.com:berachain/beacon-kit into fix-and-r…
calbera Nov 11, 2024
3d2983e
tidy & sync
calbera Nov 11, 2024
d4edf86
tidy & sync
calbera Nov 11, 2024
2997508
tidy & sync
calbera Nov 11, 2024
8f9ffe2
Merge branch 'main' into fix-and-run-make-tidy
abi87 Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions beacond/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ replace (
require (
cosmossdk.io/core v1.0.0
github.com/berachain/beacon-kit/mod/beacon v0.0.0-20240821052951-c15422305b4e
github.com/berachain/beacon-kit/mod/cli v0.0.0-20240822173558-4e2a8018ae21
github.com/berachain/beacon-kit/mod/consensus v0.0.0-20240821053614-036c5d2945f0
github.com/berachain/beacon-kit/mod/cli v0.0.0-20241107170417-7905e3d59a1d
github.com/berachain/beacon-kit/mod/consensus v0.0.0-20241107170417-7905e3d59a1d
calbera marked this conversation as resolved.
Show resolved Hide resolved
github.com/berachain/beacon-kit/mod/consensus-types v0.0.0-20240904192942-99aeabe6bb1f
github.com/berachain/beacon-kit/mod/da v0.0.0-20240820191615-398849c34954
github.com/berachain/beacon-kit/mod/engine-primitives v0.0.0-20240809202957-3e3f169ad720
github.com/berachain/beacon-kit/mod/execution v0.0.0-20240820191615-398849c34954
github.com/berachain/beacon-kit/mod/log v0.0.0-20240821000339-4d4242ba4a50
github.com/berachain/beacon-kit/mod/node-api v0.0.0-20240806160829-cde2d1347e7e
github.com/berachain/beacon-kit/mod/node-api v0.0.0-20241107170417-7905e3d59a1d
github.com/berachain/beacon-kit/mod/node-api/engines v0.0.0-20240806160829-cde2d1347e7e
github.com/berachain/beacon-kit/mod/node-core v0.0.0-20240821225446-81f31b0aac98
github.com/berachain/beacon-kit/mod/payload v0.0.0-20240705193247-d464364483df
Expand All @@ -45,8 +45,6 @@ require (
go.uber.org/automaxprocs v1.5.3
)

require github.com/berachain/beacon-kit/mod/observability v0.0.0-00010101000000-000000000000 // indirect

require (
buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.34.2-20240701160653-fedbb9acfd2f.2 // indirect
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.34.2-20240130113600-88ef6483f90f.2 // indirect
Expand Down Expand Up @@ -75,9 +73,10 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/berachain/beacon-kit/mod/async v0.0.0-20240821213929-f32b8e2dc5c8 // indirect
github.com/berachain/beacon-kit/mod/chain-spec v0.0.0-20240705193247-d464364483df // indirect
github.com/berachain/beacon-kit/mod/config v0.0.0-20240705193247-d464364483df // indirect
github.com/berachain/beacon-kit/mod/config v0.0.0-20241107170417-7905e3d59a1d // indirect
github.com/berachain/beacon-kit/mod/errors v0.0.0-20240806211103-d1105603bfc0 // indirect
github.com/berachain/beacon-kit/mod/geth-primitives v0.0.0-20240806160829-cde2d1347e7e // indirect
github.com/berachain/beacon-kit/mod/observability v0.0.0-unpublished // indirect
calbera marked this conversation as resolved.
Show resolved Hide resolved
github.com/bgentry/speakeasy v0.2.0 // indirect
github.com/bits-and-blooms/bitset v1.13.0 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.3 // indirect
Expand Down
2 changes: 1 addition & 1 deletion examples/berad/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ require (

require (
cosmossdk.io/collections v0.4.0
cosmossdk.io/core v1.0.0
cosmossdk.io/core v1.0.0-alpha.3
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240911165923-82f71ec86570
github.com/berachain/beacon-kit/mod/storage v0.0.0-20240815202409-3ecaa1f3f4c5
github.com/cometbft/cometbft v1.0.0-rc1.0.20240806094948-2c4293ef36c4
Expand Down
8 changes: 4 additions & 4 deletions mod/cli/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ replace (
require (
cosmossdk.io/depinject v1.0.0
cosmossdk.io/log v1.4.1
github.com/berachain/beacon-kit/mod/config v0.0.0-20240705193247-d464364483df
github.com/berachain/beacon-kit/mod/consensus v0.0.0-20240821053614-036c5d2945f0
github.com/berachain/beacon-kit/mod/config v0.0.0-20241107170417-7905e3d59a1d
github.com/berachain/beacon-kit/mod/consensus v0.0.0-20241107170417-7905e3d59a1d
calbera marked this conversation as resolved.
Show resolved Hide resolved
github.com/berachain/beacon-kit/mod/consensus-types v0.0.0-20240904192942-99aeabe6bb1f
github.com/berachain/beacon-kit/mod/engine-primitives v0.0.0-20240809202957-3e3f169ad720
github.com/berachain/beacon-kit/mod/errors v0.0.0-20240806211103-d1105603bfc0
Expand All @@ -47,9 +47,9 @@ require (
cosmossdk.io/schema v0.1.1 // indirect
github.com/berachain/beacon-kit/mod/beacon v0.0.0-20240821052951-c15422305b4e // indirect
github.com/berachain/beacon-kit/mod/chain-spec v0.0.0-20240705193247-d464364483df // indirect
github.com/berachain/beacon-kit/mod/node-api v0.0.0-20240806160829-cde2d1347e7e // indirect
github.com/berachain/beacon-kit/mod/node-api v0.0.0-20241107170417-7905e3d59a1d // indirect
github.com/berachain/beacon-kit/mod/node-api/engines v0.0.0-20240806160829-cde2d1347e7e // indirect
github.com/berachain/beacon-kit/mod/observability v0.0.0-00010101000000-000000000000 // indirect
github.com/berachain/beacon-kit/mod/observability v0.0.0-unpublished // indirect
calbera marked this conversation as resolved.
Show resolved Hide resolved
github.com/cockroachdb/fifo v0.0.0-20240616162244-4768e80dfb9a // indirect
github.com/cometbft/cometbft/api v1.0.0-rc.1.0.20240806094948-2c4293ef36c4 // indirect
github.com/ethereum/go-ethereum v1.14.7 // indirect
Expand Down
2 changes: 1 addition & 1 deletion mod/consensus/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ require (
cosmossdk.io/log v1.4.1
cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc
github.com/berachain/beacon-kit/mod/async v0.0.0-20240821213929-f32b8e2dc5c8
github.com/berachain/beacon-kit/mod/cli v0.0.0-00010101000000-000000000000
github.com/berachain/beacon-kit/mod/cli v0.0.0-20241107170417-7905e3d59a1d
github.com/berachain/beacon-kit/mod/consensus-types v0.0.0-20240904192942-99aeabe6bb1f
github.com/berachain/beacon-kit/mod/errors v0.0.0-20240806211103-d1105603bfc0
github.com/berachain/beacon-kit/mod/log v0.0.0-20240821000339-4d4242ba4a50
Expand Down
2 changes: 1 addition & 1 deletion mod/node-api/engines/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ require (
github.com/berachain/beacon-kit/mod/errors v0.0.0-20240705193247-d464364483df
github.com/berachain/beacon-kit/mod/log v0.0.0-20240705193247-d464364483df
github.com/berachain/beacon-kit/mod/node-api v0.0.0-20240806160829-cde2d1347e7e
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240911165923-82f71ec86570
calbera marked this conversation as resolved.
Show resolved Hide resolved
github.com/go-playground/validator/v10 v10.22.0
github.com/labstack/echo/v4 v4.12.0
)

require (
github.com/berachain/beacon-kit/mod/chain-spec v0.0.0-20240705193247-d464364483df // indirect
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240911165923-82f71ec86570 // indirect
github.com/cockroachdb/errors v1.11.3 // indirect
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
Expand Down
13 changes: 3 additions & 10 deletions mod/node-api/engines/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/gabriel-vasile/mimetype v1.4.4 h1:QjV6pZ7/XZ7ryI2KuyeEDE8wnh7fHP9YnQy+R0LnH8I=
github.com/gabriel-vasile/mimetype v1.4.4/go.mod h1:JwLei5XPtWdGiMFB5Pjle1oEeoSeEuJfJE+TtfvdB/s=
github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc=
github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc=
github.com/getsentry/sentry-go v0.28.1 h1:zzaSm/vHmGllRM6Tpx1492r0YDzauArdBfkJRtY6P5k=
Expand Down Expand Up @@ -87,17 +85,14 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand All @@ -109,13 +104,11 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
Expand Down
11 changes: 6 additions & 5 deletions mod/node-core/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ require (
cosmossdk.io/depinject v1.0.0
cosmossdk.io/store/v2 v2.0.0-20240821144902-e88c138760a3
github.com/berachain/beacon-kit/mod/beacon v0.0.0-20240821052951-c15422305b4e
github.com/berachain/beacon-kit/mod/cli v0.0.0-20240822173558-4e2a8018ae21
github.com/berachain/beacon-kit/mod/config v0.0.0-20240705193247-d464364483df
github.com/berachain/beacon-kit/mod/consensus v0.0.0-20240821053614-036c5d2945f0
github.com/berachain/beacon-kit/mod/cli v0.0.0-20241107170417-7905e3d59a1d
github.com/berachain/beacon-kit/mod/config v0.0.0-20241107170417-7905e3d59a1d
github.com/berachain/beacon-kit/mod/consensus v0.0.0-20241107170417-7905e3d59a1d
github.com/berachain/beacon-kit/mod/consensus-types v0.0.0-20240904192942-99aeabe6bb1f
github.com/berachain/beacon-kit/mod/da v0.0.0-20240820191615-398849c34954
github.com/berachain/beacon-kit/mod/engine-primitives v0.0.0-20240809202957-3e3f169ad720
github.com/berachain/beacon-kit/mod/errors v0.0.0-20240806211103-d1105603bfc0
github.com/berachain/beacon-kit/mod/execution v0.0.0-20240820191615-398849c34954
github.com/berachain/beacon-kit/mod/log v0.0.0-20240821000339-4d4242ba4a50
github.com/berachain/beacon-kit/mod/node-api v0.0.0-20240806160829-cde2d1347e7e
github.com/berachain/beacon-kit/mod/node-api v0.0.0-20241107170417-7905e3d59a1d
github.com/berachain/beacon-kit/mod/node-api/engines v0.0.0-20240806160829-cde2d1347e7e
github.com/berachain/beacon-kit/mod/observability v0.0.0-00010101000000-000000000000
github.com/berachain/beacon-kit/mod/observability v0.0.0-unpublished
calbera marked this conversation as resolved.
Show resolved Hide resolved
github.com/berachain/beacon-kit/mod/payload v0.0.0-20240705193247-d464364483df
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240911165923-82f71ec86570
github.com/berachain/beacon-kit/mod/state-transition v0.0.0-20240717225334-64ec6650da31
Expand All @@ -50,6 +50,7 @@ require (

require (
cosmossdk.io/api v0.7.5 // indirect
cosmossdk.io/core/testing v0.0.0-unpublished // indirect
calbera marked this conversation as resolved.
Show resolved Hide resolved
cosmossdk.io/errors/v2 v2.0.0-20240731132947-df72853b3ca5 // indirect
cosmossdk.io/log v1.4.1 // indirect
cosmossdk.io/x/tx v0.13.4-0.20240623110059-dec2d5583e39 // indirect
Expand Down
14 changes: 11 additions & 3 deletions mod/primitives/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,43 @@ go 1.23.0
require (
github.com/berachain/beacon-kit/mod/chain-spec v0.0.0-20240703145037-b5612ab256db
github.com/berachain/beacon-kit/mod/errors v0.0.0-20240610210054-bfdc14c4013c
github.com/cometbft/cometbft v0.38.15
calbera marked this conversation as resolved.
Show resolved Hide resolved
github.com/ferranbt/fastssz v0.1.4-0.20240629094022-eac385e6ee79
github.com/golang-jwt/jwt/v5 v5.2.1
github.com/holiman/uint256 v1.3.1
github.com/karalabe/ssz v0.2.1-0.20240724074312-3d1ff7a6f7c4
github.com/minio/sha256-simd v1.0.1
github.com/prysmaticlabs/gohashtree v0.0.4-beta.0.20240624100937-73632381301b
github.com/stretchr/testify v1.9.0
golang.org/x/crypto v0.26.0
golang.org/x/crypto v0.28.0
golang.org/x/sync v0.8.0
)

require (
github.com/cockroachdb/errors v1.11.3 // indirect
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cosmos/gogoproto v1.7.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
github.com/getsentry/sentry-go v0.28.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/oasisprotocol/curve25519-voi v0.0.0-20220708102147-0a8a51822cae // indirect
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prysmaticlabs/go-bitfield v0.0.0-20240618144021-706c95b2dd15 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/sasha-s/go-deadlock v0.3.5 // indirect
github.com/stretchr/objx v0.5.2 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.19.0 // indirect
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading
Loading