diff --git a/beacond/go.mod b/beacond/go.mod index 6cb2f450ed..d227b57d0a 100644 --- a/beacond/go.mod +++ b/beacond/go.mod @@ -15,7 +15,7 @@ replace ( require ( github.com/berachain/beacon-kit/mod/cli v0.0.0-20240624003607-df94860f8eeb - github.com/berachain/beacon-kit/mod/node-core v0.0.0-20240624003607-df94860f8eeb + github.com/berachain/beacon-kit/mod/node-core v0.0.0-20240705192155-574f2bd748a3 github.com/cosmos/cosmos-sdk v0.51.0 go.uber.org/automaxprocs v1.5.3 ) @@ -50,7 +50,7 @@ require ( github.com/VictoriaMetrics/fastcache v1.12.2 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/berachain/beacon-kit/mod/async v0.0.0-20240624003607-df94860f8eeb // indirect + github.com/berachain/beacon-kit/mod/async v0.0.0-20240624011057-b0afb8163f14 // indirect github.com/berachain/beacon-kit/mod/beacon v0.0.0-20240624204855-d8809d5c8588 // indirect github.com/berachain/beacon-kit/mod/config v0.0.0-20240614154006-a5defa6198f5 // indirect github.com/berachain/beacon-kit/mod/consensus-types v0.0.0-20240624003607-df94860f8eeb // indirect @@ -62,7 +62,7 @@ require ( github.com/berachain/beacon-kit/mod/log v0.0.0-20240619234034-fe96d94eafef // indirect github.com/berachain/beacon-kit/mod/p2p v0.0.0-20240618214413-d5ec0e66b3dd // indirect github.com/berachain/beacon-kit/mod/payload v0.0.0-20240624003607-df94860f8eeb // indirect - github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6 // indirect + github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 // indirect github.com/berachain/beacon-kit/mod/runtime v0.0.0-20240624003607-df94860f8eeb // indirect github.com/berachain/beacon-kit/mod/state-transition v0.0.0-20240624003607-df94860f8eeb // indirect github.com/berachain/beacon-kit/mod/storage v0.0.0-20240624003607-df94860f8eeb // indirect diff --git a/beacond/go.sum b/beacond/go.sum index fec91491c1..4a035459b4 100644 --- a/beacond/go.sum +++ b/beacond/go.sum @@ -86,6 +86,7 @@ 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/async v0.0.0-20240624003607-df94860f8eeb h1:4N/wng6MC9Kz5O7diKcJI/k7gnP0o/5hPu+cYZIJpCc= github.com/berachain/beacon-kit/mod/async v0.0.0-20240624003607-df94860f8eeb/go.mod h1:ycwqumRG49gb8qg87cc6kVgPeiUDaFMajjLko54Ey+I= +github.com/berachain/beacon-kit/mod/async v0.0.0-20240624011057-b0afb8163f14/go.mod h1:tzZ5Oyg7BgCViZBkqDwHmfKPNI66xONwE5kWd1P2v7o= github.com/berachain/beacon-kit/mod/beacon v0.0.0-20240624204855-d8809d5c8588 h1:h2DopM3n3b5ynpYljdtkXfJPneLjhS1tbJb4eU2JJ3I= github.com/berachain/beacon-kit/mod/beacon v0.0.0-20240624204855-d8809d5c8588/go.mod h1:N4WA39IfTij4chfvsTMO3JvWt4pF0V+zDaF8b0bmCUg= github.com/berachain/beacon-kit/mod/cli v0.0.0-20240624003607-df94860f8eeb h1:8cZueftTXMtE/GcDEau0+iVAY66eA4S7NibqG2uIOd0= @@ -108,12 +109,16 @@ github.com/berachain/beacon-kit/mod/log v0.0.0-20240619234034-fe96d94eafef h1:KY github.com/berachain/beacon-kit/mod/log v0.0.0-20240619234034-fe96d94eafef/go.mod h1:xP5KcG56VfbPgz2ZRHerxm90MkjXMSDaGZNOOO5yfH4= github.com/berachain/beacon-kit/mod/node-core v0.0.0-20240624003607-df94860f8eeb h1:uBz/5QPwpc/L760Juwnig7a4zlpNw8FqeT+Lvnz3q5c= github.com/berachain/beacon-kit/mod/node-core v0.0.0-20240624003607-df94860f8eeb/go.mod h1:kSMcP+wQmpQ+tHtDl8RW4GJBfqROpsYwC8uZ6ocI67A= +github.com/berachain/beacon-kit/mod/node-core v0.0.0-20240705192155-574f2bd748a3 h1:4qU5LrNuunwgxGXZIsaAV3gwTAZ5JKV06LVH1K9EDAc= +github.com/berachain/beacon-kit/mod/node-core v0.0.0-20240705192155-574f2bd748a3/go.mod h1:AlgkUE9Z9ld7ph0EX78wFqKkM2pG0jNoROnaA2eX4P0= github.com/berachain/beacon-kit/mod/p2p v0.0.0-20240618214413-d5ec0e66b3dd h1:QHAukFEWl62kscPjRvpqfxCPvd3RSg8cD4mw8qIBhU4= 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-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-20240705192155-574f2bd748a3 h1:qE+UcCtj++1DncnxouC8tBJ9eHHcfnwaPAMsNbdwjmU= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3/go.mod h1:wEO/RmZwrzz0TwQmEE8J5LNsNNuhGBJEKnVN4EZJfzc= 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= diff --git a/mod/chain-spec/go.mod b/mod/chain-spec/go.mod index ae656880ac..96e7374a64 100644 --- a/mod/chain-spec/go.mod +++ b/mod/chain-spec/go.mod @@ -3,7 +3,7 @@ module github.com/berachain/beacon-kit/mod/chain-spec go 1.22.5 require ( - github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240703145037-b5612ab256db + github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 github.com/stretchr/testify v1.9.0 ) diff --git a/mod/chain-spec/go.sum b/mod/chain-spec/go.sum index 4c9dd968a9..866c2bb9ac 100644 --- a/mod/chain-spec/go.sum +++ b/mod/chain-spec/go.sum @@ -1,5 +1,7 @@ github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240703145037-b5612ab256db h1:vQWNRXj8sq6/yON9HD5OVZuvUCxOw7OKpLhchPZN6EU= github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240703145037-b5612ab256db/go.mod h1:2TFb0q4JZ3jMO/xEXK/uQm+eSal8Q++b+iiO0fzo9iQ= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 h1:qE+UcCtj++1DncnxouC8tBJ9eHHcfnwaPAMsNbdwjmU= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3/go.mod h1:wEO/RmZwrzz0TwQmEE8J5LNsNNuhGBJEKnVN4EZJfzc= 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/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= diff --git a/mod/cli/go.mod b/mod/cli/go.mod index 14295e07bc..d3a826e452 100644 --- a/mod/cli/go.mod +++ b/mod/cli/go.mod @@ -21,8 +21,8 @@ require ( github.com/berachain/beacon-kit/mod/errors v0.0.0-20240624204855-d8809d5c8588 github.com/berachain/beacon-kit/mod/geth-primitives v0.0.0-20240630225951-a5075323fa26 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-20240627201655-33a34cec850e + github.com/berachain/beacon-kit/mod/node-core v0.0.0-20240705192155-574f2bd748a3 + github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 github.com/cometbft/cometbft v1.0.0-rc1.0.20240705183350-8b262bdd1d36 github.com/cosmos/cosmos-sdk v0.51.0 github.com/ferranbt/fastssz v0.1.4-0.20240422063434-a4db75388da1 @@ -67,7 +67,7 @@ require ( github.com/VictoriaMetrics/fastcache v1.12.2 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/berachain/beacon-kit/mod/async v0.0.0-20240624003607-df94860f8eeb // indirect + github.com/berachain/beacon-kit/mod/async v0.0.0-20240624011057-b0afb8163f14 // indirect // indirect github.com/berachain/beacon-kit/mod/beacon v0.0.0-20240624204855-d8809d5c8588 // indirect github.com/berachain/beacon-kit/mod/da v0.0.0-20240623073416-b8ac8605c6a0 // indirect diff --git a/mod/cli/go.sum b/mod/cli/go.sum index 79c725114f..10c8d2f822 100644 --- a/mod/cli/go.sum +++ b/mod/cli/go.sum @@ -86,6 +86,7 @@ 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/async v0.0.0-20240624003607-df94860f8eeb h1:4N/wng6MC9Kz5O7diKcJI/k7gnP0o/5hPu+cYZIJpCc= github.com/berachain/beacon-kit/mod/async v0.0.0-20240624003607-df94860f8eeb/go.mod h1:ycwqumRG49gb8qg87cc6kVgPeiUDaFMajjLko54Ey+I= +github.com/berachain/beacon-kit/mod/async v0.0.0-20240624011057-b0afb8163f14/go.mod h1:tzZ5Oyg7BgCViZBkqDwHmfKPNI66xONwE5kWd1P2v7o= github.com/berachain/beacon-kit/mod/beacon v0.0.0-20240624204855-d8809d5c8588 h1:h2DopM3n3b5ynpYljdtkXfJPneLjhS1tbJb4eU2JJ3I= github.com/berachain/beacon-kit/mod/beacon v0.0.0-20240624204855-d8809d5c8588/go.mod h1:N4WA39IfTij4chfvsTMO3JvWt4pF0V+zDaF8b0bmCUg= github.com/berachain/beacon-kit/mod/config v0.0.0-20240614154006-a5defa6198f5 h1:KqQcNurpXlZYZ3r/+WR3j50+KjMWu2iZ1DDk1MdbrWk= @@ -108,12 +109,16 @@ github.com/berachain/beacon-kit/mod/log v0.0.0-20240619234034-fe96d94eafef h1:KY github.com/berachain/beacon-kit/mod/log v0.0.0-20240619234034-fe96d94eafef/go.mod h1:xP5KcG56VfbPgz2ZRHerxm90MkjXMSDaGZNOOO5yfH4= github.com/berachain/beacon-kit/mod/node-core v0.0.0-20240624003607-df94860f8eeb h1:uBz/5QPwpc/L760Juwnig7a4zlpNw8FqeT+Lvnz3q5c= github.com/berachain/beacon-kit/mod/node-core v0.0.0-20240624003607-df94860f8eeb/go.mod h1:kSMcP+wQmpQ+tHtDl8RW4GJBfqROpsYwC8uZ6ocI67A= +github.com/berachain/beacon-kit/mod/node-core v0.0.0-20240705192155-574f2bd748a3 h1:4qU5LrNuunwgxGXZIsaAV3gwTAZ5JKV06LVH1K9EDAc= +github.com/berachain/beacon-kit/mod/node-core v0.0.0-20240705192155-574f2bd748a3/go.mod h1:AlgkUE9Z9ld7ph0EX78wFqKkM2pG0jNoROnaA2eX4P0= github.com/berachain/beacon-kit/mod/p2p v0.0.0-20240618214413-d5ec0e66b3dd h1:QHAukFEWl62kscPjRvpqfxCPvd3RSg8cD4mw8qIBhU4= 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-20240627201655-33a34cec850e h1:/MlOTT6MqJ5MbOUGf4YMo5SgrB0UgUDv0R6Bj+awn4g= github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627201655-33a34cec850e/go.mod h1:SR9DyddnG1jRxscSEHHQt9E6RaIi/2morGi0YgO4P6s= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 h1:qE+UcCtj++1DncnxouC8tBJ9eHHcfnwaPAMsNbdwjmU= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3/go.mod h1:wEO/RmZwrzz0TwQmEE8J5LNsNNuhGBJEKnVN4EZJfzc= 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= @@ -132,6 +137,7 @@ github.com/btcsuite/btcd/btcutil v1.1.5 h1:+wER79R5670vs/ZusMTF1yTcRYE5GUsFbdjdi github.com/btcsuite/btcd/btcutil v1.1.5/go.mod h1:PSZZ4UitpLBWzxGd5VGOrLnmOjtPP/a6HaFo12zMs00= github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 h1:59Kx4K6lzOW5w6nFlA0v5+lk/6sjybR934QNHSJZPTQ= github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= +github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/bufbuild/protocompile v0.14.0 h1:z3DW4IvXE5G/uTOnSQn+qwQQxvhckkTWLS/0No/o7KU= github.com/bufbuild/protocompile v0.14.0/go.mod h1:N6J1NYzkspJo3ZwyL4Xjvli86XOj1xq4qAasUFxGups= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= diff --git a/mod/cli/pkg/commands/genesis/payload.go b/mod/cli/pkg/commands/genesis/payload.go index 364ac178ca..7b09b48072 100644 --- a/mod/cli/pkg/commands/genesis/payload.go +++ b/mod/cli/pkg/commands/genesis/payload.go @@ -33,8 +33,8 @@ import ( gethprimitives "github.com/berachain/beacon-kit/mod/geth-primitives" "github.com/berachain/beacon-kit/mod/primitives/pkg/common" "github.com/berachain/beacon-kit/mod/primitives/pkg/constants" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz" "github.com/berachain/beacon-kit/mod/primitives/pkg/math" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz" "github.com/berachain/beacon-kit/mod/primitives/pkg/version" "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" diff --git a/mod/cli/pkg/commands/genesis/root.go b/mod/cli/pkg/commands/genesis/root.go index 034ae8e282..7e3d06b143 100644 --- a/mod/cli/pkg/commands/genesis/root.go +++ b/mod/cli/pkg/commands/genesis/root.go @@ -27,8 +27,8 @@ import ( "github.com/berachain/beacon-kit/mod/errors" "github.com/berachain/beacon-kit/mod/primitives/pkg/bytes" "github.com/berachain/beacon-kit/mod/primitives/pkg/common" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/merkleizer" "github.com/berachain/beacon-kit/mod/primitives/pkg/math" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/merkleizer" "github.com/spf13/afero" "github.com/spf13/cobra" ) diff --git a/mod/config/go.mod b/mod/config/go.mod index 3b20bac943..053aef535f 100644 --- a/mod/config/go.mod +++ b/mod/config/go.mod @@ -11,7 +11,7 @@ require ( github.com/berachain/beacon-kit/mod/geth-primitives v0.0.0-20240630225951-a5075323fa26 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/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 github.com/cometbft/cometbft v1.0.0-rc1.0.20240705183350-8b262bdd1d36 github.com/mitchellh/mapstructure v1.5.0 github.com/spf13/viper v1.19.0 diff --git a/mod/config/go.sum b/mod/config/go.sum index 27d427dffa..62d96536a8 100644 --- a/mod/config/go.sum +++ b/mod/config/go.sum @@ -32,6 +32,8 @@ github.com/berachain/beacon-kit/mod/payload v0.0.0-20240624003607-df94860f8eeb h 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-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-20240705192155-574f2bd748a3 h1:qE+UcCtj++1DncnxouC8tBJ9eHHcfnwaPAMsNbdwjmU= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3/go.mod h1:wEO/RmZwrzz0TwQmEE8J5LNsNNuhGBJEKnVN4EZJfzc= 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= diff --git a/mod/consensus-types/go.mod b/mod/consensus-types/go.mod index 71a44fe767..3110f4af23 100644 --- a/mod/consensus-types/go.mod +++ b/mod/consensus-types/go.mod @@ -7,7 +7,7 @@ require ( github.com/berachain/beacon-kit/mod/engine-primitives v0.0.0-20240624204855-d8809d5c8588 github.com/berachain/beacon-kit/mod/errors v0.0.0-20240624204855-d8809d5c8588 github.com/berachain/beacon-kit/mod/geth-primitives v0.0.0-20240630225951-a5075323fa26 - github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627201655-33a34cec850e + github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 github.com/ethereum/go-ethereum v1.14.6 github.com/ferranbt/fastssz v0.1.4-0.20240422063434-a4db75388da1 github.com/stretchr/testify v1.9.0 diff --git a/mod/consensus-types/go.sum b/mod/consensus-types/go.sum index 3faec02e7c..c13620ecc2 100644 --- a/mod/consensus-types/go.sum +++ b/mod/consensus-types/go.sum @@ -18,6 +18,8 @@ github.com/berachain/beacon-kit/mod/geth-primitives v0.0.0-20240630225951-a50753 github.com/berachain/beacon-kit/mod/geth-primitives v0.0.0-20240630225951-a5075323fa26/go.mod h1:UhtXsU+9A175Ntrsrc7h9ZplRQ3ih0F87vONgS1P6Uc= github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627201655-33a34cec850e h1:/MlOTT6MqJ5MbOUGf4YMo5SgrB0UgUDv0R6Bj+awn4g= github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627201655-33a34cec850e/go.mod h1:SR9DyddnG1jRxscSEHHQt9E6RaIi/2morGi0YgO4P6s= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 h1:qE+UcCtj++1DncnxouC8tBJ9eHHcfnwaPAMsNbdwjmU= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3/go.mod h1:wEO/RmZwrzz0TwQmEE8J5LNsNNuhGBJEKnVN4EZJfzc= 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= diff --git a/mod/consensus-types/pkg/genesis/genesis.go b/mod/consensus-types/pkg/genesis/genesis.go index 213aa76da7..98197952a4 100644 --- a/mod/consensus-types/pkg/genesis/genesis.go +++ b/mod/consensus-types/pkg/genesis/genesis.go @@ -31,8 +31,8 @@ import ( gethprimitives "github.com/berachain/beacon-kit/mod/geth-primitives" "github.com/berachain/beacon-kit/mod/primitives/pkg/common" "github.com/berachain/beacon-kit/mod/primitives/pkg/constants" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz" "github.com/berachain/beacon-kit/mod/primitives/pkg/math" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz" "github.com/berachain/beacon-kit/mod/primitives/pkg/version" "golang.org/x/sync/errgroup" ) diff --git a/mod/consensus-types/pkg/types/deposit.go b/mod/consensus-types/pkg/types/deposit.go index 79d487d94a..3dd6a55afb 100644 --- a/mod/consensus-types/pkg/types/deposit.go +++ b/mod/consensus-types/pkg/types/deposit.go @@ -24,8 +24,8 @@ import ( "github.com/berachain/beacon-kit/mod/primitives/pkg/common" "github.com/berachain/beacon-kit/mod/primitives/pkg/constants" "github.com/berachain/beacon-kit/mod/primitives/pkg/crypto" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/merkleizer" "github.com/berachain/beacon-kit/mod/primitives/pkg/math" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/merkleizer" ) // Deposit into the consensus layer from the deposit contract in the execution diff --git a/mod/consensus-types/pkg/types/payload.go b/mod/consensus-types/pkg/types/payload.go index d751cb7eb1..737583920c 100644 --- a/mod/consensus-types/pkg/types/payload.go +++ b/mod/consensus-types/pkg/types/payload.go @@ -28,9 +28,9 @@ import ( gethprimitives "github.com/berachain/beacon-kit/mod/geth-primitives" "github.com/berachain/beacon-kit/mod/primitives/pkg/bytes" "github.com/berachain/beacon-kit/mod/primitives/pkg/common" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/merkleizer" "github.com/berachain/beacon-kit/mod/primitives/pkg/math" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/merkleizer" "github.com/berachain/beacon-kit/mod/primitives/pkg/version" "golang.org/x/sync/errgroup" ) diff --git a/mod/consensus-types/pkg/types/payload_test.go b/mod/consensus-types/pkg/types/payload_test.go index c6d0c138b7..e1ac9ee40f 100644 --- a/mod/consensus-types/pkg/types/payload_test.go +++ b/mod/consensus-types/pkg/types/payload_test.go @@ -30,9 +30,9 @@ import ( gethprimitives "github.com/berachain/beacon-kit/mod/geth-primitives" "github.com/berachain/beacon-kit/mod/primitives/pkg/bytes" "github.com/berachain/beacon-kit/mod/primitives/pkg/common" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/merkleizer" "github.com/berachain/beacon-kit/mod/primitives/pkg/math" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/merkleizer" "github.com/berachain/beacon-kit/mod/primitives/pkg/version" "github.com/stretchr/testify/require" ) diff --git a/mod/consensus/go.mod b/mod/consensus/go.mod index e513eb1fde..1f2a58e882 100644 --- a/mod/consensus/go.mod +++ b/mod/consensus/go.mod @@ -15,7 +15,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/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 github.com/cometbft/cometbft v1.0.0-rc1.0.20240705183350-8b262bdd1d36 github.com/cosmos/cosmos-sdk v0.51.0 github.com/cosmos/gogoproto v1.5.0 diff --git a/mod/consensus/go.sum b/mod/consensus/go.sum index 7fe9b96dcf..a16473da3e 100644 --- a/mod/consensus/go.sum +++ b/mod/consensus/go.sum @@ -55,6 +55,8 @@ github.com/berachain/beacon-kit/mod/errors v0.0.0-20240610210054-bfdc14c4013c h1 github.com/berachain/beacon-kit/mod/errors v0.0.0-20240610210054-bfdc14c4013c/go.mod h1:xgngH5/PYbyW+YDEmRhbBy3V333GXsNWF4DAkjYCmfs= 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-20240705192155-574f2bd748a3 h1:qE+UcCtj++1DncnxouC8tBJ9eHHcfnwaPAMsNbdwjmU= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3/go.mod h1:wEO/RmZwrzz0TwQmEE8J5LNsNNuhGBJEKnVN4EZJfzc= github.com/berachain/cosmos-sdk v0.46.0-beta2.0.20240624014538-75ba469b1881 h1:08l5GGkl19zIShnUZKiU7ONTfK7L9KS/b82Mdrc+Fz8= github.com/berachain/cosmos-sdk v0.46.0-beta2.0.20240624014538-75ba469b1881/go.mod h1:hCN0m+X7MmJvJ2ukDDRDyScC+30wXHtXTdx6vleSnBU= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s= diff --git a/mod/da/go.mod b/mod/da/go.mod index 3a0ce53c84..f636eedea8 100644 --- a/mod/da/go.mod +++ b/mod/da/go.mod @@ -10,7 +10,7 @@ require ( github.com/berachain/beacon-kit/mod/errors v0.0.0-20240618214413-d5ec0e66b3dd github.com/berachain/beacon-kit/mod/geth-primitives v0.0.0-20240630225951-a5075323fa26 github.com/berachain/beacon-kit/mod/log v0.0.0-20240610210054-bfdc14c4013c - github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240701055325-d20ec6a8adae + github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 github.com/crate-crypto/go-kzg-4844 v1.0.0 github.com/ethereum/c-kzg-4844 v1.0.2 github.com/ferranbt/fastssz v0.1.4-0.20240422063434-a4db75388da1 diff --git a/mod/da/go.sum b/mod/da/go.sum index 9cfd321080..80bc6c499e 100644 --- a/mod/da/go.sum +++ b/mod/da/go.sum @@ -24,6 +24,8 @@ github.com/berachain/beacon-kit/mod/log v0.0.0-20240610210054-bfdc14c4013c h1:7f 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-20240701055325-d20ec6a8adae h1:R2BQepTxsprm/wGMzt+OMLeeeKOUJRMn3RsevZLyV2I= github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240701055325-d20ec6a8adae/go.mod h1:FTOMvEf99+e16UsRBZi0NK/q4hyWCV3QeApr28nvH54= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 h1:qE+UcCtj++1DncnxouC8tBJ9eHHcfnwaPAMsNbdwjmU= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3/go.mod h1:wEO/RmZwrzz0TwQmEE8J5LNsNNuhGBJEKnVN4EZJfzc= 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= diff --git a/mod/engine-primitives/go.mod b/mod/engine-primitives/go.mod index bb0389a961..55abb585ce 100644 --- a/mod/engine-primitives/go.mod +++ b/mod/engine-primitives/go.mod @@ -5,7 +5,7 @@ go 1.22.5 require ( github.com/berachain/beacon-kit/mod/errors v0.0.0-20240618214413-d5ec0e66b3dd github.com/berachain/beacon-kit/mod/geth-primitives v0.0.0-20240630225951-a5075323fa26 - github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240701012235-96033ea1abc8 + github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 github.com/ethereum/go-ethereum v1.14.6 github.com/ferranbt/fastssz v0.1.4-0.20240422063434-a4db75388da1 github.com/stretchr/testify v1.9.0 diff --git a/mod/engine-primitives/go.sum b/mod/engine-primitives/go.sum index 91f120b285..6b25284967 100644 --- a/mod/engine-primitives/go.sum +++ b/mod/engine-primitives/go.sum @@ -14,6 +14,8 @@ github.com/berachain/beacon-kit/mod/geth-primitives v0.0.0-20240630225951-a50753 github.com/berachain/beacon-kit/mod/geth-primitives v0.0.0-20240630225951-a5075323fa26/go.mod h1:UhtXsU+9A175Ntrsrc7h9ZplRQ3ih0F87vONgS1P6Uc= github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240701012235-96033ea1abc8 h1:AIEht0ro8k/PF8qvEY53Rm69WuQvD228d/+QUot0hhk= github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240701012235-96033ea1abc8/go.mod h1:FTOMvEf99+e16UsRBZi0NK/q4hyWCV3QeApr28nvH54= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 h1:qE+UcCtj++1DncnxouC8tBJ9eHHcfnwaPAMsNbdwjmU= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3/go.mod h1:wEO/RmZwrzz0TwQmEE8J5LNsNNuhGBJEKnVN4EZJfzc= 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= diff --git a/mod/engine-primitives/pkg/engine-primitives/transactions.go b/mod/engine-primitives/pkg/engine-primitives/transactions.go index def7a555b5..ab9836dee3 100644 --- a/mod/engine-primitives/pkg/engine-primitives/transactions.go +++ b/mod/engine-primitives/pkg/engine-primitives/transactions.go @@ -25,8 +25,8 @@ import ( "github.com/berachain/beacon-kit/mod/primitives/pkg/common" "github.com/berachain/beacon-kit/mod/primitives/pkg/constants" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/merkleizer" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/merkleizer" ) // Transactions is a typealias for [][]byte, which is how transactions are diff --git a/mod/engine-primitives/pkg/engine-primitives/withdrawal.go b/mod/engine-primitives/pkg/engine-primitives/withdrawal.go index e8347f1f91..734aa5b6e5 100644 --- a/mod/engine-primitives/pkg/engine-primitives/withdrawal.go +++ b/mod/engine-primitives/pkg/engine-primitives/withdrawal.go @@ -22,8 +22,8 @@ package engineprimitives import ( gethprimitives "github.com/berachain/beacon-kit/mod/geth-primitives" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" "github.com/berachain/beacon-kit/mod/primitives/pkg/math" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" ) // Withdrawal represents a validator withdrawal from the consensus layer. diff --git a/mod/engine-primitives/pkg/engine-primitives/withdrawal_test.go b/mod/engine-primitives/pkg/engine-primitives/withdrawal_test.go index 44526032e2..a9484c391d 100644 --- a/mod/engine-primitives/pkg/engine-primitives/withdrawal_test.go +++ b/mod/engine-primitives/pkg/engine-primitives/withdrawal_test.go @@ -25,8 +25,8 @@ import ( engineprimitives "github.com/berachain/beacon-kit/mod/engine-primitives/pkg/engine-primitives" gethprimitives "github.com/berachain/beacon-kit/mod/geth-primitives" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz" "github.com/berachain/beacon-kit/mod/primitives/pkg/math" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz" "github.com/stretchr/testify/require" ) diff --git a/mod/execution/go.mod b/mod/execution/go.mod index a2451269ff..72059b5438 100644 --- a/mod/execution/go.mod +++ b/mod/execution/go.mod @@ -8,7 +8,7 @@ require ( github.com/berachain/beacon-kit/mod/errors v0.0.0-20240618214413-d5ec0e66b3dd github.com/berachain/beacon-kit/mod/geth-primitives v0.0.0-20240630232851-507966e7b554 github.com/berachain/beacon-kit/mod/log v0.0.0-20240610210054-bfdc14c4013c - github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6 + github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 github.com/golang-jwt/jwt/v5 v5.2.1 github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/stretchr/testify v1.9.0 diff --git a/mod/execution/go.sum b/mod/execution/go.sum index f4b4b4577d..8c0d9fd738 100644 --- a/mod/execution/go.sum +++ b/mod/execution/go.sum @@ -20,6 +20,8 @@ github.com/berachain/beacon-kit/mod/log v0.0.0-20240610210054-bfdc14c4013c h1:7f 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-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-20240705192155-574f2bd748a3 h1:qE+UcCtj++1DncnxouC8tBJ9eHHcfnwaPAMsNbdwjmU= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3/go.mod h1:wEO/RmZwrzz0TwQmEE8J5LNsNNuhGBJEKnVN4EZJfzc= 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= diff --git a/mod/node-api/go.mod b/mod/node-api/go.mod index 01238de953..b0d512d27a 100644 --- a/mod/node-api/go.mod +++ b/mod/node-api/go.mod @@ -4,7 +4,7 @@ go 1.22.5 require ( github.com/berachain/beacon-kit/mod/consensus-types v0.0.0-20240624003607-df94860f8eeb - github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6 + github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 github.com/go-playground/validator/v10 v10.20.0 github.com/labstack/echo/v4 v4.12.0 github.com/stretchr/testify v1.9.0 diff --git a/mod/node-api/go.sum b/mod/node-api/go.sum index bd6026589b..4e239beeaf 100644 --- a/mod/node-api/go.sum +++ b/mod/node-api/go.sum @@ -14,6 +14,8 @@ 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/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-20240705192155-574f2bd748a3 h1:qE+UcCtj++1DncnxouC8tBJ9eHHcfnwaPAMsNbdwjmU= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3/go.mod h1:wEO/RmZwrzz0TwQmEE8J5LNsNNuhGBJEKnVN4EZJfzc= 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= diff --git a/mod/node-core/go.mod b/mod/node-core/go.mod index 9015c3afff..38d9a9dc63 100644 --- a/mod/node-core/go.mod +++ b/mod/node-core/go.mod @@ -29,7 +29,7 @@ require ( github.com/berachain/beacon-kit/mod/geth-primitives v0.0.0-20240630225951-a5075323fa26 github.com/berachain/beacon-kit/mod/log v0.0.0-20240619234034-fe96d94eafef 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/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 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 diff --git a/mod/node-core/go.sum b/mod/node-core/go.sum index b258f0c6a2..2bd6a4774f 100644 --- a/mod/node-core/go.sum +++ b/mod/node-core/go.sum @@ -102,6 +102,8 @@ github.com/berachain/beacon-kit/mod/payload v0.0.0-20240624003607-df94860f8eeb h 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-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-20240705192155-574f2bd748a3 h1:qE+UcCtj++1DncnxouC8tBJ9eHHcfnwaPAMsNbdwjmU= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3/go.mod h1:wEO/RmZwrzz0TwQmEE8J5LNsNNuhGBJEKnVN4EZJfzc= 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= diff --git a/mod/payload/go.mod b/mod/payload/go.mod index 2038c39973..0bce3d7958 100644 --- a/mod/payload/go.mod +++ b/mod/payload/go.mod @@ -7,7 +7,7 @@ require ( github.com/berachain/beacon-kit/mod/errors v0.0.0-20240618214413-d5ec0e66b3dd github.com/berachain/beacon-kit/mod/geth-primitives v0.0.0-20240630225951-a5075323fa26 github.com/berachain/beacon-kit/mod/log v0.0.0-20240610215715-5f91f661ac83 - github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6 + github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 github.com/stretchr/testify v1.9.0 ) diff --git a/mod/payload/go.sum b/mod/payload/go.sum index af691aed0b..195197cb54 100644 --- a/mod/payload/go.sum +++ b/mod/payload/go.sum @@ -18,6 +18,8 @@ github.com/berachain/beacon-kit/mod/log v0.0.0-20240610215715-5f91f661ac83 h1:49 github.com/berachain/beacon-kit/mod/log v0.0.0-20240610215715-5f91f661ac83/go.mod h1:nFybcw/ZhJ6Gu66dna301W2I7u61skm2HfHxQmdR68Q= 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-20240705192155-574f2bd748a3 h1:qE+UcCtj++1DncnxouC8tBJ9eHHcfnwaPAMsNbdwjmU= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3/go.mod h1:wEO/RmZwrzz0TwQmEE8J5LNsNNuhGBJEKnVN4EZJfzc= 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= diff --git a/mod/primitives/pkg/bytes/b20.go b/mod/primitives/pkg/bytes/b20.go index ab679f2499..6abbfed87e 100644 --- a/mod/primitives/pkg/bytes/b20.go +++ b/mod/primitives/pkg/bytes/b20.go @@ -23,7 +23,7 @@ package bytes import ( "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/hex" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" ) const ( diff --git a/mod/primitives/pkg/bytes/b20_test.go b/mod/primitives/pkg/bytes/b20_test.go index e33fc3a2f2..7559e421f0 100644 --- a/mod/primitives/pkg/bytes/b20_test.go +++ b/mod/primitives/pkg/bytes/b20_test.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/berachain/beacon-kit/mod/primitives/pkg/bytes" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" "github.com/stretchr/testify/require" ) diff --git a/mod/primitives/pkg/bytes/b32.go b/mod/primitives/pkg/bytes/b32.go index 1a9fbd033b..3b0c42bff3 100644 --- a/mod/primitives/pkg/bytes/b32.go +++ b/mod/primitives/pkg/bytes/b32.go @@ -23,7 +23,7 @@ package bytes import ( "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/hex" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" ) const ( diff --git a/mod/primitives/pkg/bytes/b32_test.go b/mod/primitives/pkg/bytes/b32_test.go index 43f573c938..bdce546813 100644 --- a/mod/primitives/pkg/bytes/b32_test.go +++ b/mod/primitives/pkg/bytes/b32_test.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/berachain/beacon-kit/mod/primitives/pkg/bytes" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" "github.com/stretchr/testify/require" ) diff --git a/mod/primitives/pkg/bytes/b4.go b/mod/primitives/pkg/bytes/b4.go index d92331f71f..9dfe69e2b2 100644 --- a/mod/primitives/pkg/bytes/b4.go +++ b/mod/primitives/pkg/bytes/b4.go @@ -23,7 +23,7 @@ package bytes import ( "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/hex" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" ) const ( diff --git a/mod/primitives/pkg/bytes/b48.go b/mod/primitives/pkg/bytes/b48.go index 93683f2989..9fa0f98308 100644 --- a/mod/primitives/pkg/bytes/b48.go +++ b/mod/primitives/pkg/bytes/b48.go @@ -23,7 +23,7 @@ package bytes import ( "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/hex" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" "github.com/prysmaticlabs/gohashtree" ) diff --git a/mod/primitives/pkg/bytes/b48_test.go b/mod/primitives/pkg/bytes/b48_test.go index 996c84af3e..dbfc5c57d4 100644 --- a/mod/primitives/pkg/bytes/b48_test.go +++ b/mod/primitives/pkg/bytes/b48_test.go @@ -24,8 +24,8 @@ import ( "testing" "github.com/berachain/beacon-kit/mod/primitives/pkg/bytes" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" "github.com/berachain/beacon-kit/mod/primitives/pkg/merkle/zero" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" "github.com/stretchr/testify/require" ) diff --git a/mod/primitives/pkg/bytes/b4_test.go b/mod/primitives/pkg/bytes/b4_test.go index 8c19e36018..e67031f363 100644 --- a/mod/primitives/pkg/bytes/b4_test.go +++ b/mod/primitives/pkg/bytes/b4_test.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/berachain/beacon-kit/mod/primitives/pkg/bytes" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" "github.com/stretchr/testify/require" ) diff --git a/mod/primitives/pkg/bytes/b8.go b/mod/primitives/pkg/bytes/b8.go index caa6bd4d7a..3681566969 100644 --- a/mod/primitives/pkg/bytes/b8.go +++ b/mod/primitives/pkg/bytes/b8.go @@ -23,7 +23,7 @@ package bytes import ( "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/hex" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" ) const ( diff --git a/mod/primitives/pkg/bytes/b8_test.go b/mod/primitives/pkg/bytes/b8_test.go index eddd47d0a0..d962a7f7e7 100644 --- a/mod/primitives/pkg/bytes/b8_test.go +++ b/mod/primitives/pkg/bytes/b8_test.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/berachain/beacon-kit/mod/primitives/pkg/bytes" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" "github.com/stretchr/testify/require" ) diff --git a/mod/primitives/pkg/bytes/b96.go b/mod/primitives/pkg/bytes/b96.go index 22f835448d..df970934b9 100644 --- a/mod/primitives/pkg/bytes/b96.go +++ b/mod/primitives/pkg/bytes/b96.go @@ -23,7 +23,7 @@ package bytes import ( "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/hex" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" "github.com/prysmaticlabs/gohashtree" ) diff --git a/mod/primitives/pkg/bytes/b96_test.go b/mod/primitives/pkg/bytes/b96_test.go index 46941d8f60..f702e4c3db 100644 --- a/mod/primitives/pkg/bytes/b96_test.go +++ b/mod/primitives/pkg/bytes/b96_test.go @@ -26,9 +26,9 @@ import ( "testing" "github.com/berachain/beacon-kit/mod/primitives/pkg/bytes" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" "github.com/berachain/beacon-kit/mod/primitives/pkg/merkle/zero" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" "github.com/stretchr/testify/require" ) diff --git a/mod/primitives/pkg/encoding/json/.gitkeep b/mod/primitives/pkg/encoding/json/.gitkeep new file mode 100644 index 0000000000..d4fc974012 --- /dev/null +++ b/mod/primitives/pkg/encoding/json/.gitkeep @@ -0,0 +1 @@ +todo: move all json logic in here. \ No newline at end of file diff --git a/mod/primitives/pkg/ssz/byte.go b/mod/primitives/pkg/encoding/ssz/byte.go similarity index 94% rename from mod/primitives/pkg/ssz/byte.go rename to mod/primitives/pkg/encoding/ssz/byte.go index a9901b93c5..e170180252 100644 --- a/mod/primitives/pkg/ssz/byte.go +++ b/mod/primitives/pkg/encoding/ssz/byte.go @@ -23,8 +23,8 @@ package ssz import ( "fmt" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/constants" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/constants" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" ) /* -------------------------------------------------------------------------- */ diff --git a/mod/primitives/pkg/ssz/constants/constants.go b/mod/primitives/pkg/encoding/ssz/constants/constants.go similarity index 100% rename from mod/primitives/pkg/ssz/constants/constants.go rename to mod/primitives/pkg/encoding/ssz/constants/constants.go diff --git a/mod/primitives/pkg/ssz/container.go b/mod/primitives/pkg/encoding/ssz/container.go similarity index 96% rename from mod/primitives/pkg/ssz/container.go rename to mod/primitives/pkg/encoding/ssz/container.go index 2b8bd983f4..e757b8e106 100644 --- a/mod/primitives/pkg/ssz/container.go +++ b/mod/primitives/pkg/encoding/ssz/container.go @@ -22,8 +22,8 @@ package ssz import ( "github.com/berachain/beacon-kit/mod/errors" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/merkleizer" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/merkleizer" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" ) /* -------------------------------------------------------------------------- */ diff --git a/mod/primitives/pkg/ssz/errors.go b/mod/primitives/pkg/encoding/ssz/errors.go similarity index 100% rename from mod/primitives/pkg/ssz/errors.go rename to mod/primitives/pkg/encoding/ssz/errors.go diff --git a/mod/primitives/pkg/ssz/interfaces.go b/mod/primitives/pkg/encoding/ssz/interfaces.go similarity index 96% rename from mod/primitives/pkg/ssz/interfaces.go rename to mod/primitives/pkg/encoding/ssz/interfaces.go index 5828db4eb3..d3de24057d 100644 --- a/mod/primitives/pkg/ssz/interfaces.go +++ b/mod/primitives/pkg/encoding/ssz/interfaces.go @@ -20,7 +20,7 @@ package ssz -import "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" +import "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" // BaseMerkleizer provides basic merkleization operations for SSZ types. type BaseMerkleizer[ diff --git a/mod/primitives/pkg/ssz/list.go b/mod/primitives/pkg/encoding/ssz/list.go similarity index 95% rename from mod/primitives/pkg/ssz/list.go rename to mod/primitives/pkg/encoding/ssz/list.go index 22e8379512..a0c487dcf4 100644 --- a/mod/primitives/pkg/ssz/list.go +++ b/mod/primitives/pkg/encoding/ssz/list.go @@ -24,9 +24,9 @@ import ( "unsafe" "github.com/berachain/beacon-kit/mod/errors" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/constants" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/merkleizer" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/constants" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/merkleizer" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" ) /* -------------------------------------------------------------------------- */ diff --git a/mod/primitives/pkg/ssz/merkleizer/helpers.go b/mod/primitives/pkg/encoding/ssz/merkleizer/helpers.go similarity index 100% rename from mod/primitives/pkg/ssz/merkleizer/helpers.go rename to mod/primitives/pkg/encoding/ssz/merkleizer/helpers.go diff --git a/mod/primitives/pkg/ssz/merkleizer/merkleizer.go b/mod/primitives/pkg/encoding/ssz/merkleizer/merkleizer.go similarity index 100% rename from mod/primitives/pkg/ssz/merkleizer/merkleizer.go rename to mod/primitives/pkg/encoding/ssz/merkleizer/merkleizer.go diff --git a/mod/primitives/pkg/ssz/merkleizer/merkleizer_basic_test.go b/mod/primitives/pkg/encoding/ssz/merkleizer/merkleizer_basic_test.go similarity index 97% rename from mod/primitives/pkg/ssz/merkleizer/merkleizer_basic_test.go rename to mod/primitives/pkg/encoding/ssz/merkleizer/merkleizer_basic_test.go index a654e551a4..f30458833a 100644 --- a/mod/primitives/pkg/ssz/merkleizer/merkleizer_basic_test.go +++ b/mod/primitives/pkg/encoding/ssz/merkleizer/merkleizer_basic_test.go @@ -25,7 +25,7 @@ import ( "encoding/binary" "testing" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/merkleizer" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/merkleizer" "github.com/stretchr/testify/require" ) diff --git a/mod/primitives/pkg/ssz/merkleizer/merkleizer_bytes_test.go b/mod/primitives/pkg/encoding/ssz/merkleizer/merkleizer_bytes_test.go similarity index 95% rename from mod/primitives/pkg/ssz/merkleizer/merkleizer_bytes_test.go rename to mod/primitives/pkg/encoding/ssz/merkleizer/merkleizer_bytes_test.go index d341381ed2..5d59a8bed6 100644 --- a/mod/primitives/pkg/ssz/merkleizer/merkleizer_bytes_test.go +++ b/mod/primitives/pkg/encoding/ssz/merkleizer/merkleizer_bytes_test.go @@ -25,8 +25,8 @@ import ( "testing" "github.com/berachain/beacon-kit/mod/primitives/pkg/constants" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/merkleizer" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/merkleizer" ) // Tests consistency of our HashTreeRoot implementation with Prysm's. diff --git a/mod/primitives/pkg/ssz/merkleizer/types.go b/mod/primitives/pkg/encoding/ssz/merkleizer/types.go similarity index 100% rename from mod/primitives/pkg/ssz/merkleizer/types.go rename to mod/primitives/pkg/encoding/ssz/merkleizer/types.go diff --git a/mod/primitives/pkg/ssz/serializer/doc.go b/mod/primitives/pkg/encoding/ssz/serializer/doc.go similarity index 100% rename from mod/primitives/pkg/ssz/serializer/doc.go rename to mod/primitives/pkg/encoding/ssz/serializer/doc.go diff --git a/mod/primitives/pkg/ssz/tree/index.go b/mod/primitives/pkg/encoding/ssz/tree/index.go similarity index 100% rename from mod/primitives/pkg/ssz/tree/index.go rename to mod/primitives/pkg/encoding/ssz/tree/index.go diff --git a/mod/primitives/pkg/ssz/tree/index_test.go b/mod/primitives/pkg/encoding/ssz/tree/index_test.go similarity index 99% rename from mod/primitives/pkg/ssz/tree/index_test.go rename to mod/primitives/pkg/encoding/ssz/tree/index_test.go index dd1094c9e7..29935a9dc0 100644 --- a/mod/primitives/pkg/ssz/tree/index_test.go +++ b/mod/primitives/pkg/encoding/ssz/tree/index_test.go @@ -23,7 +23,7 @@ package tree_test import ( "testing" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/tree" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/tree" "github.com/stretchr/testify/require" ) diff --git a/mod/primitives/pkg/ssz/tree/tree.go b/mod/primitives/pkg/encoding/ssz/tree/tree.go similarity index 100% rename from mod/primitives/pkg/ssz/tree/tree.go rename to mod/primitives/pkg/encoding/ssz/tree/tree.go diff --git a/mod/primitives/pkg/ssz/types/types.go b/mod/primitives/pkg/encoding/ssz/types/types.go similarity index 100% rename from mod/primitives/pkg/ssz/types/types.go rename to mod/primitives/pkg/encoding/ssz/types/types.go diff --git a/mod/primitives/pkg/ssz/vector.go b/mod/primitives/pkg/encoding/ssz/vector.go similarity index 95% rename from mod/primitives/pkg/ssz/vector.go rename to mod/primitives/pkg/encoding/ssz/vector.go index 473e7fa29e..489831aaa9 100644 --- a/mod/primitives/pkg/ssz/vector.go +++ b/mod/primitives/pkg/encoding/ssz/vector.go @@ -24,9 +24,9 @@ import ( "unsafe" "github.com/berachain/beacon-kit/mod/errors" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/constants" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/merkleizer" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/constants" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/merkleizer" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" ) /* -------------------------------------------------------------------------- */ diff --git a/mod/primitives/pkg/ssz/vector_test.go b/mod/primitives/pkg/encoding/ssz/vector_test.go similarity index 97% rename from mod/primitives/pkg/ssz/vector_test.go rename to mod/primitives/pkg/encoding/ssz/vector_test.go index 0afcff1749..395286abb5 100644 --- a/mod/primitives/pkg/ssz/vector_test.go +++ b/mod/primitives/pkg/encoding/ssz/vector_test.go @@ -23,8 +23,8 @@ package ssz_test import ( "testing" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz" "github.com/berachain/beacon-kit/mod/primitives/pkg/math" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz" "github.com/stretchr/testify/require" ) diff --git a/mod/primitives/pkg/math/bool.go b/mod/primitives/pkg/math/bool.go index 8993796f72..3affd3e70d 100644 --- a/mod/primitives/pkg/math/bool.go +++ b/mod/primitives/pkg/math/bool.go @@ -23,8 +23,8 @@ package math import ( "fmt" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/constants" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/constants" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" ) // Ensure type implements types.SSZType. diff --git a/mod/primitives/pkg/math/u16.go b/mod/primitives/pkg/math/u16.go index c56238dcbd..f7f4a72d4b 100644 --- a/mod/primitives/pkg/math/u16.go +++ b/mod/primitives/pkg/math/u16.go @@ -25,8 +25,8 @@ import ( "encoding/binary" "fmt" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/constants" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/constants" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" ) /* -------------------------------------------------------------------------- */ diff --git a/mod/primitives/pkg/math/u256.go b/mod/primitives/pkg/math/u256.go index e26461b740..996f27c543 100644 --- a/mod/primitives/pkg/math/u256.go +++ b/mod/primitives/pkg/math/u256.go @@ -23,8 +23,8 @@ package math import ( "fmt" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/constants" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/constants" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" "github.com/holiman/uint256" ) diff --git a/mod/primitives/pkg/math/u32.go b/mod/primitives/pkg/math/u32.go index 9db4a26ce0..b0f122b245 100644 --- a/mod/primitives/pkg/math/u32.go +++ b/mod/primitives/pkg/math/u32.go @@ -25,8 +25,8 @@ import ( "encoding/binary" "fmt" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/constants" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/constants" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" ) /* -------------------------------------------------------------------------- */ diff --git a/mod/primitives/pkg/math/u64.go b/mod/primitives/pkg/math/u64.go index 3b9a4ac79f..00f2f07a9d 100644 --- a/mod/primitives/pkg/math/u64.go +++ b/mod/primitives/pkg/math/u64.go @@ -28,8 +28,8 @@ import ( "strconv" "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/hex" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/constants" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/constants" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" ) var _ types.SSZType[U64] = (*U64)(nil) diff --git a/mod/primitives/pkg/math/u8.go b/mod/primitives/pkg/math/u8.go index 34fef33a40..89c1b7c20a 100644 --- a/mod/primitives/pkg/math/u8.go +++ b/mod/primitives/pkg/math/u8.go @@ -24,8 +24,8 @@ package math import ( "fmt" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/constants" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/types" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/constants" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/types" ) /* -------------------------------------------------------------------------- */ diff --git a/mod/runtime/go.mod b/mod/runtime/go.mod index 831bbde0b2..50db4582a8 100644 --- a/mod/runtime/go.mod +++ b/mod/runtime/go.mod @@ -13,7 +13,7 @@ require ( github.com/berachain/beacon-kit/mod/errors v0.0.0-20240617161612-ab1257fcf5a1 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/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 github.com/cometbft/cometbft v1.0.0-rc1.0.20240705183350-8b262bdd1d36 github.com/cometbft/cometbft/api v1.0.0-rc.1.0.20240702102754-c4fa9a6225b0 github.com/stretchr/testify v1.9.0 diff --git a/mod/runtime/go.sum b/mod/runtime/go.sum index 28ba3374dc..c95418661f 100644 --- a/mod/runtime/go.sum +++ b/mod/runtime/go.sum @@ -8,6 +8,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/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-20240705192155-574f2bd748a3 h1:qE+UcCtj++1DncnxouC8tBJ9eHHcfnwaPAMsNbdwjmU= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3/go.mod h1:wEO/RmZwrzz0TwQmEE8J5LNsNNuhGBJEKnVN4EZJfzc= github.com/btcsuite/btcd/btcec/v2 v2.3.3 h1:6+iXlDKE8RMtKsvK0gshlXIuPbyWM/h84Ensb7o3sC0= github.com/btcsuite/btcd/btcec/v2 v2.3.3/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/btcutil v1.1.5 h1:+wER79R5670vs/ZusMTF1yTcRYE5GUsFbdjdisflzM8= diff --git a/mod/state-transition/go.mod b/mod/state-transition/go.mod index 48853c2fca..47c9bd36b3 100644 --- a/mod/state-transition/go.mod +++ b/mod/state-transition/go.mod @@ -6,7 +6,7 @@ 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/geth-primitives v0.0.0-20240630225951-a5075323fa26 - github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627201655-33a34cec850e + github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/go-faster/xor v1.0.0 github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 diff --git a/mod/state-transition/go.sum b/mod/state-transition/go.sum index 78ac55e72c..02b9957b1f 100644 --- a/mod/state-transition/go.sum +++ b/mod/state-transition/go.sum @@ -16,6 +16,8 @@ github.com/berachain/beacon-kit/mod/geth-primitives v0.0.0-20240630225951-a50753 github.com/berachain/beacon-kit/mod/geth-primitives v0.0.0-20240630225951-a5075323fa26/go.mod h1:UhtXsU+9A175Ntrsrc7h9ZplRQ3ih0F87vONgS1P6Uc= github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627201655-33a34cec850e h1:/MlOTT6MqJ5MbOUGf4YMo5SgrB0UgUDv0R6Bj+awn4g= github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627201655-33a34cec850e/go.mod h1:SR9DyddnG1jRxscSEHHQt9E6RaIi/2morGi0YgO4P6s= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 h1:qE+UcCtj++1DncnxouC8tBJ9eHHcfnwaPAMsNbdwjmU= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3/go.mod h1:wEO/RmZwrzz0TwQmEE8J5LNsNNuhGBJEKnVN4EZJfzc= 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= diff --git a/mod/state-transition/pkg/core/state_processor.go b/mod/state-transition/pkg/core/state_processor.go index bca2bbd9c6..bfff228c3d 100644 --- a/mod/state-transition/pkg/core/state_processor.go +++ b/mod/state-transition/pkg/core/state_processor.go @@ -26,8 +26,8 @@ import ( "github.com/berachain/beacon-kit/mod/primitives/pkg/common" "github.com/berachain/beacon-kit/mod/primitives/pkg/constants" "github.com/berachain/beacon-kit/mod/primitives/pkg/crypto" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/merkleizer" "github.com/berachain/beacon-kit/mod/primitives/pkg/math" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/merkleizer" "github.com/berachain/beacon-kit/mod/primitives/pkg/transition" ) diff --git a/mod/state-transition/pkg/core/state_processor_genesis.go b/mod/state-transition/pkg/core/state_processor_genesis.go index f278918010..a811b267db 100644 --- a/mod/state-transition/pkg/core/state_processor_genesis.go +++ b/mod/state-transition/pkg/core/state_processor_genesis.go @@ -24,8 +24,8 @@ import ( gethprimitives "github.com/berachain/beacon-kit/mod/geth-primitives" "github.com/berachain/beacon-kit/mod/primitives/pkg/common" "github.com/berachain/beacon-kit/mod/primitives/pkg/constants" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/merkleizer" "github.com/berachain/beacon-kit/mod/primitives/pkg/math" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/merkleizer" "github.com/berachain/beacon-kit/mod/primitives/pkg/transition" "github.com/berachain/beacon-kit/mod/primitives/pkg/version" ) diff --git a/mod/state-transition/pkg/core/types.go b/mod/state-transition/pkg/core/types.go index c29a657aff..e2e20768d8 100644 --- a/mod/state-transition/pkg/core/types.go +++ b/mod/state-transition/pkg/core/types.go @@ -29,8 +29,8 @@ import ( "github.com/berachain/beacon-kit/mod/primitives/pkg/constraints" "github.com/berachain/beacon-kit/mod/primitives/pkg/crypto" "github.com/berachain/beacon-kit/mod/primitives/pkg/eip4844" + "github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/ssz/merkleizer" "github.com/berachain/beacon-kit/mod/primitives/pkg/math" - "github.com/berachain/beacon-kit/mod/primitives/pkg/ssz/merkleizer" ) // BeaconBlock represents a generic interface for a beacon block. diff --git a/mod/storage/go.mod b/mod/storage/go.mod index 0c970cb57e..611d7494f9 100644 --- a/mod/storage/go.mod +++ b/mod/storage/go.mod @@ -17,7 +17,7 @@ require ( cosmossdk.io/log v1.3.2-0.20240530141513-465410c75bce github.com/berachain/beacon-kit/mod/errors v0.0.0-20240617161612-ab1257fcf5a1 github.com/berachain/beacon-kit/mod/log v0.0.0-20240610210054-bfdc14c4013c - github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627134700-de48919ec4d6 + github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 github.com/cometbft/cometbft v1.0.0-rc1.0.20240705183350-8b262bdd1d36 github.com/cosmos/cosmos-sdk v0.51.0 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc diff --git a/testing/go.mod b/testing/go.mod index 3c8e7945ee..13efefe41b 100644 --- a/testing/go.mod +++ b/testing/go.mod @@ -15,7 +15,7 @@ require ( github.com/berachain/beacon-kit/mod/errors v0.0.0-20240624204855-d8809d5c8588 github.com/berachain/beacon-kit/mod/geth-primitives v0.0.0-20240630232851-507966e7b554 github.com/berachain/beacon-kit/mod/log v0.0.0-20240619234034-fe96d94eafef - github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627201655-33a34cec850e + github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 github.com/cometbft/cometbft v1.0.0-rc1.0.20240705183350-8b262bdd1d36 github.com/cosmos/cosmos-sdk v0.51.0 github.com/ethereum/go-ethereum v1.14.6 diff --git a/testing/go.sum b/testing/go.sum index 803cabae75..810a2fe598 100644 --- a/testing/go.sum +++ b/testing/go.sum @@ -88,6 +88,8 @@ github.com/berachain/beacon-kit/mod/log v0.0.0-20240619234034-fe96d94eafef h1:KY github.com/berachain/beacon-kit/mod/log v0.0.0-20240619234034-fe96d94eafef/go.mod h1:xP5KcG56VfbPgz2ZRHerxm90MkjXMSDaGZNOOO5yfH4= github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627201655-33a34cec850e h1:/MlOTT6MqJ5MbOUGf4YMo5SgrB0UgUDv0R6Bj+awn4g= github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240627201655-33a34cec850e/go.mod h1:SR9DyddnG1jRxscSEHHQt9E6RaIi/2morGi0YgO4P6s= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3 h1:qE+UcCtj++1DncnxouC8tBJ9eHHcfnwaPAMsNbdwjmU= +github.com/berachain/beacon-kit/mod/primitives v0.0.0-20240705192155-574f2bd748a3/go.mod h1:wEO/RmZwrzz0TwQmEE8J5LNsNNuhGBJEKnVN4EZJfzc= github.com/berachain/cosmos-sdk v0.46.0-beta2.0.20240624014538-75ba469b1881 h1:08l5GGkl19zIShnUZKiU7ONTfK7L9KS/b82Mdrc+Fz8= github.com/berachain/cosmos-sdk v0.46.0-beta2.0.20240624014538-75ba469b1881/go.mod h1:hCN0m+X7MmJvJ2ukDDRDyScC+30wXHtXTdx6vleSnBU= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s=