Skip to content

Commit

Permalink
chore(deps): bump cometbft
Browse files Browse the repository at this point in the history
  • Loading branch information
@itsdevbear
itsdevbear committed Jun 27, 2024
1 parent 9e4bc31 commit 80d984f
Show file tree
Hide file tree
Showing 29 changed files with 637 additions and 55 deletions.
2 changes: 1 addition & 1 deletion beacond/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ require (
github.com/cockroachdb/pebble v1.1.1 // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240625053718-5a9f3b4a787f // indirect
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240627055712-4f91afce3247 // indirect
github.com/cometbft/cometbft-db v0.12.0 // indirect
github.com/cometbft/cometbft/api v1.0.0-rc.1 // indirect
github.com/consensys/bavard v0.1.13 // indirect
Expand Down
4 changes: 2 additions & 2 deletions beacond/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwP
github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo=
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240625053718-5a9f3b4a787f h1:2OwGk7p0iTC+toiY0UilNtbApAzS6pY4BYwBoMT0QT0=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240625053718-5a9f3b4a787f/go.mod h1:bORJpwfl1GNRYjzS9oKVWwcMiY9OSt7lU8gf8Xil4Xw=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240627055712-4f91afce3247 h1:O21PwIxGHo9PwOXWU1NQjCmdSZnj0dU+PLjupDQxHA8=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240627055712-4f91afce3247/go.mod h1:bORJpwfl1GNRYjzS9oKVWwcMiY9OSt7lU8gf8Xil4Xw=
github.com/cometbft/cometbft-db v0.12.0 h1:v77/z0VyfSU7k682IzZeZPFZrQAKiQwkqGN0QzAjMi0=
github.com/cometbft/cometbft-db v0.12.0/go.mod h1:aX2NbCrjNVd2ZajYxt1BsiFf/Z+TQ2MN0VxdicheYuw=
github.com/cometbft/cometbft/api v1.0.0-rc.1 h1:GtdXwDGlqwHYs16A4egjwylfYOMYyEacLBrs3Zvpt7g=
Expand Down
589 changes: 589 additions & 0 deletions go.work.sum
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mod/beacon/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/berachain/beacon-kit/mod/engine-primitives v0.0.0-20240610210054-bfdc14c4013c
github.com/berachain/beacon-kit/mod/errors v0.0.0-20240618214413-d5ec0e66b3dd
github.com/berachain/beacon-kit/mod/log v0.0.0-20240610210054-bfdc14c4013c
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240624204855-d8809d5c8588
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627172211-423f3645a000
golang.org/x/sync v0.7.0
)

Expand Down
4 changes: 2 additions & 2 deletions mod/cli/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ require (
github.com/berachain/beacon-kit/mod/errors v0.0.0-20240624204855-d8809d5c8588
github.com/berachain/beacon-kit/mod/log v0.0.0-20240619234034-fe96d94eafef
github.com/berachain/beacon-kit/mod/node-core v0.0.0-20240624003607-df94860f8eeb
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240625053718-5a9f3b4a787f
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627172211-423f3645a000
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240627055712-4f91afce3247
github.com/cosmos/cosmos-sdk v0.51.0
github.com/ethereum/go-ethereum v1.14.5
github.com/ferranbt/fastssz v0.1.4-0.20240422063434-a4db75388da1
Expand Down
10 changes: 4 additions & 6 deletions mod/cli/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,8 @@ github.com/berachain/beacon-kit/mod/p2p v0.0.0-20240618214413-d5ec0e66b3dd h1:QH
github.com/berachain/beacon-kit/mod/p2p v0.0.0-20240618214413-d5ec0e66b3dd/go.mod h1:ft214cxJaqrRPOuAjpYwgA9AOElJnHrDZZEQ0jZPWwQ=
github.com/berachain/beacon-kit/mod/payload v0.0.0-20240624003607-df94860f8eeb h1:/aKXt8E60/AMOod4MMhbf+8POaIE1vW43ufnTdAZ3uo=
github.com/berachain/beacon-kit/mod/payload v0.0.0-20240624003607-df94860f8eeb/go.mod h1:IFOWyTyeFcwsTkJc0Ud9uMLxQ8r4SyZNFiXpDQaJAgc=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240624204855-d8809d5c8588 h1:zL2vsFmWlm+vbmX17Uc97sVBxjlPlMqQ7Jna0I99uyY=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240624204855-d8809d5c8588/go.mod h1:xg8BworJAcrzTzbTgP/637Be89xAtrRzGkXKSzuRMkQ=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6 h1:5gY+D3SGJJ78t32qIMfC2KQxz5ieXDcCsh544tzdQ6c=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6/go.mod h1:SR9DyddnG1jRxscSEHHQt9E6RaIi/2morGi0YgO4P6s=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627172211-423f3645a000 h1:2ECQ/g0OvMmZKKXcuVeGM/8iycuGGJJEam2rJ7ivq3E=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627172211-423f3645a000/go.mod h1:SR9DyddnG1jRxscSEHHQt9E6RaIi/2morGi0YgO4P6s=
github.com/berachain/beacon-kit/mod/runtime v0.0.0-20240624003607-df94860f8eeb h1:Z9hmZ7UatAS2xaAq104mSVwuNzshJh6YCH1hfMP7Ucc=
github.com/berachain/beacon-kit/mod/runtime v0.0.0-20240624003607-df94860f8eeb/go.mod h1:SoPgkydkLS+bbNQu6iLJiRrS+wncytSQ2AjWBj57zFQ=
github.com/berachain/beacon-kit/mod/state-transition v0.0.0-20240624003607-df94860f8eeb h1:LmYd/RSR1itlg5BprDcxzvIgDbJ1pn4mELpt+/t/HkM=
Expand Down Expand Up @@ -176,8 +174,8 @@ github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwP
github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo=
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240625053718-5a9f3b4a787f h1:2OwGk7p0iTC+toiY0UilNtbApAzS6pY4BYwBoMT0QT0=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240625053718-5a9f3b4a787f/go.mod h1:bORJpwfl1GNRYjzS9oKVWwcMiY9OSt7lU8gf8Xil4Xw=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240627055712-4f91afce3247 h1:O21PwIxGHo9PwOXWU1NQjCmdSZnj0dU+PLjupDQxHA8=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240627055712-4f91afce3247/go.mod h1:bORJpwfl1GNRYjzS9oKVWwcMiY9OSt7lU8gf8Xil4Xw=
github.com/cometbft/cometbft-db v0.12.0 h1:v77/z0VyfSU7k682IzZeZPFZrQAKiQwkqGN0QzAjMi0=
github.com/cometbft/cometbft-db v0.12.0/go.mod h1:aX2NbCrjNVd2ZajYxt1BsiFf/Z+TQ2MN0VxdicheYuw=
github.com/cometbft/cometbft/api v1.0.0-rc.1 h1:GtdXwDGlqwHYs16A4egjwylfYOMYyEacLBrs3Zvpt7g=
Expand Down
2 changes: 1 addition & 1 deletion mod/config/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/berachain/beacon-kit/mod/log v0.0.0-20240624033454-8f3451361f44
github.com/berachain/beacon-kit/mod/payload v0.0.0-20240624003607-df94860f8eeb
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240625053718-5a9f3b4a787f
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240627055712-4f91afce3247
github.com/mitchellh/mapstructure v1.5.0
github.com/spf13/viper v1.19.0
)
Expand Down
4 changes: 2 additions & 2 deletions mod/config/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwP
github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo=
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240625053718-5a9f3b4a787f h1:2OwGk7p0iTC+toiY0UilNtbApAzS6pY4BYwBoMT0QT0=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240625053718-5a9f3b4a787f/go.mod h1:bORJpwfl1GNRYjzS9oKVWwcMiY9OSt7lU8gf8Xil4Xw=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240627055712-4f91afce3247 h1:O21PwIxGHo9PwOXWU1NQjCmdSZnj0dU+PLjupDQxHA8=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240627055712-4f91afce3247/go.mod h1:bORJpwfl1GNRYjzS9oKVWwcMiY9OSt7lU8gf8Xil4Xw=
github.com/cometbft/cometbft/api v1.0.0-rc.1 h1:GtdXwDGlqwHYs16A4egjwylfYOMYyEacLBrs3Zvpt7g=
github.com/cometbft/cometbft/api v1.0.0-rc.1/go.mod h1:NDFKiBBD8HJC6QQLAoUI99YhsiRZtg2+FJWfk6A6m6o=
github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ=
Expand Down
2 changes: 1 addition & 1 deletion mod/consensus-types/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.4
require (
github.com/berachain/beacon-kit/mod/engine-primitives v0.0.0-20240624204855-d8809d5c8588
github.com/berachain/beacon-kit/mod/errors v0.0.0-20240618214413-d5ec0e66b3dd
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627172211-423f3645a000
github.com/ethereum/go-ethereum v1.14.5
github.com/ferranbt/fastssz v0.1.4-0.20240422063434-a4db75388da1
github.com/stretchr/testify v1.9.0
Expand Down
6 changes: 2 additions & 4 deletions mod/consensus-types/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ github.com/berachain/beacon-kit/mod/engine-primitives v0.0.0-20240624204855-d880
github.com/berachain/beacon-kit/mod/engine-primitives v0.0.0-20240624204855-d8809d5c8588/go.mod h1:vBKE/+MvPSRztNcZMzVCYSMRo08zcqxgMcl4q1XepK4=
github.com/berachain/beacon-kit/mod/errors v0.0.0-20240618214413-d5ec0e66b3dd h1:jD/ggR959ZX+lqxsMzoRJzrGvFK7PI6UmgnRwOTh4S4=
github.com/berachain/beacon-kit/mod/errors v0.0.0-20240618214413-d5ec0e66b3dd/go.mod h1:iXa+Q+i0q+GCpLzkusulO57K5vlkDgM77jtfMr3QdFA=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240624204855-d8809d5c8588 h1:zL2vsFmWlm+vbmX17Uc97sVBxjlPlMqQ7Jna0I99uyY=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240624204855-d8809d5c8588/go.mod h1:xg8BworJAcrzTzbTgP/637Be89xAtrRzGkXKSzuRMkQ=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6 h1:5gY+D3SGJJ78t32qIMfC2KQxz5ieXDcCsh544tzdQ6c=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6/go.mod h1:SR9DyddnG1jRxscSEHHQt9E6RaIi/2morGi0YgO4P6s=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627172211-423f3645a000 h1:2ECQ/g0OvMmZKKXcuVeGM/8iycuGGJJEam2rJ7ivq3E=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627172211-423f3645a000/go.mod h1:SR9DyddnG1jRxscSEHHQt9E6RaIi/2morGi0YgO4P6s=
github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE=
github.com/bits-and-blooms/bitset v1.13.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
github.com/btcsuite/btcd/btcec/v2 v2.3.3 h1:6+iXlDKE8RMtKsvK0gshlXIuPbyWM/h84Ensb7o3sC0=
Expand Down
2 changes: 1 addition & 1 deletion mod/consensus/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ replace (
require (
cosmossdk.io/core v0.12.1-0.20240623110059-dec2d5583e39
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240625053718-5a9f3b4a787f
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240627055712-4f91afce3247
github.com/cosmos/cosmos-sdk v0.51.0
github.com/cosmos/gogoproto v1.5.0
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8
Expand Down
4 changes: 2 additions & 2 deletions mod/consensus/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwP
github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo=
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240625053718-5a9f3b4a787f h1:2OwGk7p0iTC+toiY0UilNtbApAzS6pY4BYwBoMT0QT0=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240625053718-5a9f3b4a787f/go.mod h1:bORJpwfl1GNRYjzS9oKVWwcMiY9OSt7lU8gf8Xil4Xw=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240627055712-4f91afce3247 h1:O21PwIxGHo9PwOXWU1NQjCmdSZnj0dU+PLjupDQxHA8=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240627055712-4f91afce3247/go.mod h1:bORJpwfl1GNRYjzS9oKVWwcMiY9OSt7lU8gf8Xil4Xw=
github.com/cometbft/cometbft-db v0.12.0 h1:v77/z0VyfSU7k682IzZeZPFZrQAKiQwkqGN0QzAjMi0=
github.com/cometbft/cometbft-db v0.12.0/go.mod h1:aX2NbCrjNVd2ZajYxt1BsiFf/Z+TQ2MN0VxdicheYuw=
github.com/cometbft/cometbft/api v1.0.0-rc.1 h1:GtdXwDGlqwHYs16A4egjwylfYOMYyEacLBrs3Zvpt7g=
Expand Down
2 changes: 1 addition & 1 deletion mod/engine-primitives/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.22.4

require (
github.com/berachain/beacon-kit/mod/errors v0.0.0-20240618214413-d5ec0e66b3dd
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627172211-423f3645a000
github.com/ethereum/go-ethereum v1.14.5
github.com/ferranbt/fastssz v0.1.4-0.20240422063434-a4db75388da1
github.com/stretchr/testify v1.9.0
Expand Down
4 changes: 2 additions & 2 deletions mod/engine-primitives/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/berachain/beacon-kit/mod/errors v0.0.0-20240618214413-d5ec0e66b3dd h1:jD/ggR959ZX+lqxsMzoRJzrGvFK7PI6UmgnRwOTh4S4=
github.com/berachain/beacon-kit/mod/errors v0.0.0-20240618214413-d5ec0e66b3dd/go.mod h1:iXa+Q+i0q+GCpLzkusulO57K5vlkDgM77jtfMr3QdFA=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6 h1:5gY+D3SGJJ78t32qIMfC2KQxz5ieXDcCsh544tzdQ6c=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6/go.mod h1:SR9DyddnG1jRxscSEHHQt9E6RaIi/2morGi0YgO4P6s=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627172211-423f3645a000 h1:2ECQ/g0OvMmZKKXcuVeGM/8iycuGGJJEam2rJ7ivq3E=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627172211-423f3645a000/go.mod h1:SR9DyddnG1jRxscSEHHQt9E6RaIi/2morGi0YgO4P6s=
github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE=
github.com/bits-and-blooms/bitset v1.13.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
github.com/btcsuite/btcd/btcec/v2 v2.3.3 h1:6+iXlDKE8RMtKsvK0gshlXIuPbyWM/h84Ensb7o3sC0=
Expand Down
2 changes: 0 additions & 2 deletions mod/execution/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ github.com/berachain/beacon-kit/mod/errors v0.0.0-20240618214413-d5ec0e66b3dd h1
github.com/berachain/beacon-kit/mod/errors v0.0.0-20240618214413-d5ec0e66b3dd/go.mod h1:iXa+Q+i0q+GCpLzkusulO57K5vlkDgM77jtfMr3QdFA=
github.com/berachain/beacon-kit/mod/log v0.0.0-20240610210054-bfdc14c4013c h1:7f9dLYGOCMoV7LxT6YRmVSWLTPbGTTcxDPLPLvHGrOk=
github.com/berachain/beacon-kit/mod/log v0.0.0-20240610210054-bfdc14c4013c/go.mod h1:nFybcw/ZhJ6Gu66dna301W2I7u61skm2HfHxQmdR68Q=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240624204855-d8809d5c8588 h1:zL2vsFmWlm+vbmX17Uc97sVBxjlPlMqQ7Jna0I99uyY=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240624204855-d8809d5c8588/go.mod h1:xg8BworJAcrzTzbTgP/637Be89xAtrRzGkXKSzuRMkQ=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6 h1:5gY+D3SGJJ78t32qIMfC2KQxz5ieXDcCsh544tzdQ6c=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6/go.mod h1:SR9DyddnG1jRxscSEHHQt9E6RaIi/2morGi0YgO4P6s=
github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE=
Expand Down
2 changes: 0 additions & 2 deletions mod/node-api/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ github.com/berachain/beacon-kit/mod/engine-primitives v0.0.0-20240624204855-d880
github.com/berachain/beacon-kit/mod/engine-primitives v0.0.0-20240624204855-d8809d5c8588/go.mod h1:vBKE/+MvPSRztNcZMzVCYSMRo08zcqxgMcl4q1XepK4=
github.com/berachain/beacon-kit/mod/errors v0.0.0-20240618214413-d5ec0e66b3dd h1:jD/ggR959ZX+lqxsMzoRJzrGvFK7PI6UmgnRwOTh4S4=
github.com/berachain/beacon-kit/mod/errors v0.0.0-20240618214413-d5ec0e66b3dd/go.mod h1:iXa+Q+i0q+GCpLzkusulO57K5vlkDgM77jtfMr3QdFA=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240624204855-d8809d5c8588 h1:zL2vsFmWlm+vbmX17Uc97sVBxjlPlMqQ7Jna0I99uyY=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240624204855-d8809d5c8588/go.mod h1:xg8BworJAcrzTzbTgP/637Be89xAtrRzGkXKSzuRMkQ=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6 h1:5gY+D3SGJJ78t32qIMfC2KQxz5ieXDcCsh544tzdQ6c=
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6/go.mod h1:SR9DyddnG1jRxscSEHHQt9E6RaIi/2morGi0YgO4P6s=
github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE=
Expand Down
2 changes: 1 addition & 1 deletion mod/node-core/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ require (
github.com/berachain/beacon-kit/mod/runtime v0.0.0-20240624003607-df94860f8eeb
github.com/berachain/beacon-kit/mod/state-transition v0.0.0-20240624003607-df94860f8eeb
github.com/berachain/beacon-kit/mod/storage v0.0.0-20240624003607-df94860f8eeb
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240625053718-5a9f3b4a787f
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240627055712-4f91afce3247
github.com/cometbft/cometbft/api v1.0.0-rc.1
github.com/cosmos/cosmos-db v1.0.2
github.com/cosmos/cosmos-proto v1.0.0-beta.5
Expand Down
4 changes: 2 additions & 2 deletions mod/node-core/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwP
github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo=
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240625053718-5a9f3b4a787f h1:2OwGk7p0iTC+toiY0UilNtbApAzS6pY4BYwBoMT0QT0=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240625053718-5a9f3b4a787f/go.mod h1:bORJpwfl1GNRYjzS9oKVWwcMiY9OSt7lU8gf8Xil4Xw=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240627055712-4f91afce3247 h1:O21PwIxGHo9PwOXWU1NQjCmdSZnj0dU+PLjupDQxHA8=
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240627055712-4f91afce3247/go.mod h1:bORJpwfl1GNRYjzS9oKVWwcMiY9OSt7lU8gf8Xil4Xw=
github.com/cometbft/cometbft-db v0.12.0 h1:v77/z0VyfSU7k682IzZeZPFZrQAKiQwkqGN0QzAjMi0=
github.com/cometbft/cometbft-db v0.12.0/go.mod h1:aX2NbCrjNVd2ZajYxt1BsiFf/Z+TQ2MN0VxdicheYuw=
github.com/cometbft/cometbft/api v1.0.0-rc.1 h1:GtdXwDGlqwHYs16A4egjwylfYOMYyEacLBrs3Zvpt7g=
Expand Down
15 changes: 8 additions & 7 deletions mod/primitives/pkg/merkle/hasher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ func (m *Hasher[RootT]) NewRootWithDepth(
return zero.Hashes[limitDepth], nil
}

// // Preallocate a single buffer large enough for the maximum layer size
// // TODO: It seems that BuildParentTreeRoots has different behaviour
// // when we pass leaves in directly.
// buf := m.buffer.Get((len(leaves) + 1) / two)
// Preallocate a single buffer large enough for the maximum layer size
// TODO: It seems that BuildParentTreeRoots has different behaviour
// when we pass leaves in directly.
buf := m.buffer.Get((len(leaves) + 1) / two)

var err error
for i := range depth {
Expand All @@ -116,16 +116,17 @@ func (m *Hasher[RootT]) NewRootWithDepth(
leaves = append(leaves, zero.Hashes[i])
}

if err = m.hasher(leaves, leaves); err != nil {
newLayerSize := (layerLen + 1) / two
if err = m.hasher(buf[:newLayerSize], leaves); err != nil {
return zero.Hashes[depth], err
}
leaves = leaves[:((layerLen + 1) / two)]
leaves, buf = buf[:newLayerSize], leaves
}

// Handle the case where the tree is not full
h := leaves[0]
for j := depth; j < limitDepth; j++ {
h = m.hh.Combi(h, zero.Hashes[j])
leaves[0] = m.hh.Combi(leaves[0], zero.Hashes[j])
}

return h, nil
Expand Down
2 changes: 1 addition & 1 deletion mod/primitives/pkg/merkle/hasher_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func TestNewRootWithDepth_EmptyLeaves(t *testing.T) {
buffer := getBuffer("reusable")
hasher := merkle.NewHasher(buffer, gohashtree.Hash)

root, err := hasher.NewRootWithDepth(nil, 0, 5)
root, err := hasher.NewRootWithDepth([][32]byte{}, 0, 0)
if err != nil {
t.Fatalf("Expected no error, got %v", err)
}
Expand Down
2 changes: 2 additions & 0 deletions mod/primitives/pkg/ssz/basic.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ func (UInt8) NewFromSSZ(buf []byte) (UInt8, error) {
len(buf),
)
}

//#nosec:G701 // the check above protects against overflow.
return UInt8(buf[0]), nil
}

Expand Down
2 changes: 1 addition & 1 deletion mod/runtime/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/berachain/beacon-kit/mod/log v0.0.0-20240610210054-bfdc14c4013c
github.com/berachain/beacon-kit/mod/p2p v0.0.0-20240618214413-d5ec0e66b3dd
github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240625053718-5a9f3b4a787f
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240627055712-4f91afce3247
github.com/cometbft/cometbft/api v1.0.0-rc.1
github.com/stretchr/testify v1.9.0
)
Expand Down
Loading

0 comments on commit 80d984f

Please sign in to comment.