diff --git a/WORKSPACE b/WORKSPACE index 506e6083ba53..1a385c3bd9c8 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -396,13 +396,6 @@ go_repository( version = "v0.14.0", ) -go_repository( - name = "com_github_confluentinc_confluent_kafka_go", - importpath = "github.com/confluentinc/confluent-kafka-go", - sum = "h1:13EK9RTujF7lVkvHQ5Hbu6bM+Yfrq8L0MkJNnjHSd4Q=", - version = "v1.4.2", -) - go_repository( name = "com_github_dnaeon_go_vcr", importpath = "github.com/dnaeon/go-vcr", @@ -410,139 +403,6 @@ go_repository( version = "v1.2.0", ) -go_repository( - name = "com_github_form3tech_oss_jwt_go", - importpath = "github.com/form3tech-oss/jwt-go", - sum = "h1:xdtqez379uWVJ9P3qQMX8W+F/nqsTdUvyMZB36tnacA=", - version = "v3.2.1+incompatible", -) - -go_repository( - name = "com_github_go_check_check", - importpath = "github.com/go-check/check", - sum = "h1:0gkP6mzaMqkmpcJYCFOLkIBwI7xFExG03bbkOkCvUPI=", - version = "v0.0.0-20180628173108-788fd7840127", -) - -go_repository( - name = "com_github_iancoleman_strcase", - importpath = "github.com/iancoleman/strcase", - sum = "h1:dJBk1m2/qjL1twPLf68JND55vvivMupZ4wIzE8CTdBw=", - version = "v0.1.3", -) - -go_repository( - name = "com_github_ipfs_go_ipfs_addr", - importpath = "github.com/ipfs/go-ipfs-addr", - sum = "h1:DpDFybnho9v3/a1dzJ5KnWdThWD1HrFLpQ+tWIyBaFI=", - version = "v0.0.1", -) - -go_repository( - name = "com_github_jackpal_gateway", - importpath = "github.com/jackpal/gateway", - sum = "h1:qzXWUJfuMdlLMtt0a3Dgt+xkWQiA5itDEITVJtuSwMc=", - version = "v1.0.5", -) - -go_repository( - name = "com_github_kubuxu_go_os_helper", - importpath = "github.com/Kubuxu/go-os-helper", - sum = "h1:EJiD2VUQyh5A9hWJLmc6iWg6yIcJ7jpBcwC8GMGXfDk=", - version = "v0.0.1", -) - -go_repository( - name = "com_github_libp2p_go_addr_util", - importpath = "github.com/libp2p/go-addr-util", - sum = "h1:7cWK5cdA5x72jX0g8iLrQWm5TRJZ6CzGdPEhWj7plWU=", - version = "v0.0.2", -) - -go_repository( - name = "com_github_libp2p_go_libp2p_autonat", - importpath = "github.com/libp2p/go-libp2p-autonat", - sum = "h1:3y8XQbpr+ssX8QfZUHekjHCYK64sj6/4hnf/awD4+Ug=", - version = "v0.4.0", -) - -go_repository( - name = "com_github_libp2p_go_libp2p_crypto", - importpath = "github.com/libp2p/go-libp2p-crypto", - sum = "h1:k9MFy+o2zGDNGsaoZl0MA3iZ75qXxr9OOoAZF+sD5OQ=", - version = "v0.1.0", -) - -go_repository( - name = "com_github_libp2p_go_libp2p_discovery", - importpath = "github.com/libp2p/go-libp2p-discovery", - sum = "h1:Qfl+e5+lfDgwdrXdu4YNCWyEo3fWuP+WgN9mN0iWviQ=", - version = "v0.5.0", -) - -go_repository( - name = "com_github_libp2p_go_libp2p_loggables", - importpath = "github.com/libp2p/go-libp2p-loggables", - sum = "h1:h3w8QFfCt2UJl/0/NW4K829HX/0S4KD31PQ7m8UXXO8=", - version = "v0.1.0", -) - -go_repository( - name = "com_github_libp2p_go_libp2p_nat", - importpath = "github.com/libp2p/go-libp2p-nat", - sum = "h1:wMWis3kYynCbHoyKLPBEMu4YRLltbm8Mk08HGSfvTkU=", - version = "v0.0.6", -) - -go_repository( - name = "com_github_libp2p_go_libp2p_netutil", - importpath = "github.com/libp2p/go-libp2p-netutil", - sum = "h1:zscYDNVEcGxyUpMd0JReUZTrpMfia8PmLKcKF72EAMQ=", - version = "v0.1.0", -) - -go_repository( - name = "com_github_libp2p_go_libp2p_noise", - importpath = "github.com/libp2p/go-libp2p-noise", - sum = "h1:IH9GRihQJTx56obm+GnpdPX4KeVIlvpXrP6xnJ0wxWk=", - version = "v0.1.2", -) - -go_repository( - name = "com_github_libp2p_go_libp2p_peer", - importpath = "github.com/libp2p/go-libp2p-peer", - sum = "h1:EQ8kMjaCUwt/Y5uLgjT8iY2qg0mGUT0N1zUjer50DsY=", - version = "v0.2.0", -) - -go_repository( - name = "com_github_libp2p_go_libp2p_secio", - importpath = "github.com/libp2p/go-libp2p-secio", - sum = "h1:rLLPvShPQAcY6eNurKNZq3eZjPWfU9kXF2eI9jIYdrg=", - version = "v0.2.2", -) - -go_repository( - name = "com_github_libp2p_go_stream_muxer", - importpath = "github.com/libp2p/go-stream-muxer", - sum = "h1:Ce6e2Pyu+b5MC1k3eeFtAax0pW4gc6MosYSLV05UeLw=", - version = "v0.0.1", -) - -go_repository( - name = "com_github_libp2p_go_ws_transport", - importpath = "github.com/libp2p/go-ws-transport", - sum = "h1:ZX5rWB8nhRRJVaPO6tmkGI/Xx8XNboYX20PW5hXIscw=", - version = "v0.3.1", -) - -go_repository( - name = "com_github_libp2p_go_yamux", - importpath = "github.com/libp2p/go-yamux", - sum = "h1:P1Fe9vF4th5JOxxgQvfbOHkrGqIZniTLf+ddhZp8YTI=", - version = "v1.4.1", -) - go_repository( name = "com_github_modocache_gover", importpath = "github.com/modocache/gover", @@ -550,62 +410,6 @@ go_repository( version = "v0.0.0-20171022184752-b58185e213c5", ) -go_repository( - name = "com_github_nbutton23_zxcvbn_go", - importpath = "github.com/nbutton23/zxcvbn-go", - sum = "h1:AREM5mwr4u1ORQBMvzfzBgpsctsbQikCVpvC+tX285E=", - version = "v0.0.0-20180912185939-ae427f1e4c1d", -) - -go_repository( - name = "com_github_prestonvanloon_go_recaptcha", - importpath = "github.com/prestonvanloon/go-recaptcha", - sum = "h1:/JK1WfWJGBNDKY70uiB53iKKbFqxBx2CuYgj9hK2O70=", - version = "v0.0.0-20190217191114-0834cef6e8bd", -) - -go_repository( - name = "com_github_prysmaticlabs_eth2_types", - importpath = "github.com/prysmaticlabs/eth2-types", - sum = "h1:1dN7YAqMN3oAJ0LceWcyv/U4jHLh+5urnSnr4br6zg4=", - version = "v0.0.0-20210303084904-c9735a06829d", -) - -go_repository( - name = "com_github_prysmaticlabs_prysm", - importpath = "github.com/prysmaticlabs/prysm", - sum = "h1:vgtnaMaTpKHPRcFNbndLH+qf5NWNMykTmnCHFDvH/4o=", - version = "v1.4.4", -) - -go_repository( - name = "com_github_whyrusleeping_go_keyspace", - importpath = "github.com/whyrusleeping/go-keyspace", - sum = "h1:EKhdznlJHPMoKr0XTrX+IlJs1LH3lyx2nfr1dOlZ79k=", - version = "v0.0.0-20160322163242-5b898ac5add1", -) - -go_repository( - name = "com_github_whyrusleeping_go_logging", - importpath = "github.com/whyrusleeping/go-logging", - sum = "h1:fwpzlmT0kRC/Fmd0MdmGgJG/CXIZ6gFq46FQZjprUcc=", - version = "v0.0.1", -) - -go_repository( - name = "com_github_whyrusleeping_mafmt", - importpath = "github.com/whyrusleeping/mafmt", - sum = "h1:TCghSl5kkwEE0j+sU/gudyhVMRlpBin8fMBBHg59EbA=", - version = "v1.2.8", -) - -go_repository( - name = "in_gopkg_confluentinc_confluent_kafka_go_v1", - importpath = "gopkg.in/confluentinc/confluent-kafka-go.v1", - sum = "h1:JabkIV98VYFqYKHHzXtgGMFuRgFBNTNzBytbGByzrJI=", - version = "v1.4.2", -) - gazelle_dependencies() load("@com_github_bazelbuild_buildtools//buildifier:deps.bzl", "buildifier_dependencies") diff --git a/beacon-chain/core/blob/BUILD.bazel b/beacon-chain/core/blob/BUILD.bazel index eb670592b401..535132c4cf1d 100644 --- a/beacon-chain/core/blob/BUILD.bazel +++ b/beacon-chain/core/blob/BUILD.bazel @@ -16,7 +16,5 @@ go_library( "@com_github_ethereum_go_ethereum//crypto/kzg:go_default_library", "@com_github_ethereum_go_ethereum//params:go_default_library", "@com_github_pkg_errors//:go_default_library", - "@com_github_protolambda_go_kzg//bls:go_default_library", - "@com_github_prysmaticlabs_fastssz//:go_default_library", ], ) diff --git a/beacon-chain/core/blob/sidecar.go b/beacon-chain/core/blob/sidecar.go index 793858f71cfa..7b34e583707b 100644 --- a/beacon-chain/core/blob/sidecar.go +++ b/beacon-chain/core/blob/sidecar.go @@ -1,143 +1,58 @@ package blob import ( - "math/big" - "math/bits" - "github.com/ethereum/go-ethereum/crypto/kzg" - "github.com/ethereum/go-ethereum/params" - "github.com/pkg/errors" - "github.com/protolambda/go-kzg/bls" - ssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" types "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" v1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" ) -var ( - blsModulus big.Int - rootsOfUnity []bls.Fr -) - -func init() { - blsModulus.SetString(bls.ModulusStr, 10) - - // Initialize rootsOfUnity which are used by EvaluatePolyInEvaluationForm - var one big.Int - one.SetInt64(1) - var length big.Int - length.SetInt64(params.FieldElementsPerBlob) +type commitmentSequenceImpl [][]byte - var divisor big.Int - divisor.Sub(&blsModulus, &one) - if new(big.Int).Mod(&divisor, &length).Int64() != 0 { - panic("MODULUS-1 % FieldElementsPerBlob should equal 0") - } - divisor.Div(&divisor, &length) // divisor == MODULUS - 1 / length +func (s commitmentSequenceImpl) At(i int) kzg.KZGCommitment { + var out kzg.KZGCommitment + copy(out[:], s[i]) + return out +} - var rootOfUnity big.Int - rootOfUnity.SetInt64(7) // PRIMITIVE_ROOT_OF_UNITY - rootOfUnity.Exp(&rootOfUnity, &divisor, &blsModulus) +func (s commitmentSequenceImpl) Len() int { + return len(s) +} - current := one - rootsOfUnity = make([]bls.Fr, params.FieldElementsPerBlob) - for i := 0; i < params.FieldElementsPerBlob; i++ { - bigToFr(&rootsOfUnity[i], ¤t) - current.Mul(¤t, &rootOfUnity). - Mod(¤t, &blsModulus) - } +type BlobImpl [][]byte - rootsOfUnity = bitReversalPermutation(rootsOfUnity) +func (b BlobImpl) At(i int) [32]byte { + var out [32]byte + copy(out[:], b[i]) + return out } -// Return a copy with bit-reversed permutation. This operation is idempotent. -// l is the array of roots of unity -func bitReversalPermutation(l []bls.Fr) []bls.Fr { - if !isPowerOfTwo(params.FieldElementsPerBlob) { - panic("params.FieldElementsPerBlob must be a power of two") - } +func (b BlobImpl) Len() int { + return len(b) +} - out := make([]bls.Fr, params.FieldElementsPerBlob) - for i := range l { - j := bits.Reverse64(uint64(i)) >> (65 - bits.Len64(params.FieldElementsPerBlob)) - out[i] = l[j] - } +type BlobsSequenceImpl []*v1.Blob - return out +func (s BlobsSequenceImpl) At(i int) kzg.Blob { + return BlobImpl(s[i].Blob) } -func isPowerOfTwo(value uint64) bool { - return value > 0 && (value&(value-1) == 0) +func (s BlobsSequenceImpl) Len() int { + return len(s) } // ValidateBlobsSidecar verifies the integrity of a sidecar, returning nil if the blob is valid. -// It implements validate_blob_transaction_wrapper in the EIP-4844 spec. func ValidateBlobsSidecar(slot types.Slot, root [32]byte, commitments [][]byte, sidecar *eth.BlobsSidecar) error { - if slot != sidecar.BeaconBlockSlot { - return errors.New("invalid blob slot") - } - if root != bytesutil.ToBytes32(sidecar.BeaconBlockRoot) { - return errors.New("invalid blob beacon block root") - } - if len(commitments) != len(sidecar.Blobs) { - return errors.New("invalid blobs length") - } - - rData := eth.BlobsAndCommitments{ - Blobs: sidecar.Blobs, - Commitments: commitments, - } - var r bls.Fr - err := hashToBLSField(&r, &rData) - if err != nil { - return err - } - - numberOfBlobs := len(sidecar.Blobs) - if numberOfBlobs == 0 { - return errors.New("no blobs found in sidecar") - } - rPowers := computePowers(&r, numberOfBlobs) - - aggregatedPolyCommitment, err := linComb(commitments, rPowers) - if err != nil { - return err - } - - aggregatedPoly, err := polyLinComb(sidecar.Blobs, rPowers) - if err != nil { - return err - } - - xData := eth.PolynomialAndCommitment{ - Polynomial: make([][]byte, params.FieldElementsPerBlob), - Commitment: aggregatedPolyCommitment, - } - for i := 0; i < params.FieldElementsPerBlob; i++ { - v := bls.FrTo32(&aggregatedPoly[i]) - xData.Polynomial[i] = v[:] + kzgSidecar := kzg.BlobsSidecar{ + BeaconBlockRoot: kzg.Root(bytesutil.ToBytes32(sidecar.BeaconBlockRoot)), + BeaconBlockSlot: kzg.Slot(sidecar.BeaconBlockSlot), + Blobs: BlobsSequenceImpl(sidecar.Blobs), + KZGAggregatedProof: kzg.KZGProof(bytesutil.ToBytes48(sidecar.AggregatedProof)), } - var x bls.Fr - err = hashToBLSField(&x, &xData) - if err != nil { - return err - } - - var y bls.Fr - EvaluatePolyInEvaluationForm(&y, aggregatedPoly, &x) - - b, err := kzg.VerifyKZGProof(bytesutil.ToBytes48(aggregatedPolyCommitment), &x, &y, bytesutil.ToBytes48(sidecar.AggregatedProof)) - if err != nil { - return err - } - if !b { - return errors.New("couldn't verify proof") - } - return nil + return kzg.ValidateBlobsSidecar(kzg.Slot(slot), kzg.Root(root), commitmentSequenceImpl(commitments), kzgSidecar) } func BlockContainsKZGs(b interfaces.BeaconBlock) bool { @@ -151,91 +66,3 @@ func BlockContainsKZGs(b interfaces.BeaconBlock) bool { } return len(blobKzgs) != 0 } - -// hashToBLSField implements hash_to_bls_field in the EIP-4844 spec, placing the computed field -// element in r and returning error if there was a failure computing the hash. -func hashToBLSField(r *bls.Fr, container ssz.Marshaler) error { - ssz, err := container.MarshalSSZ() - if err != nil { - return err - } - - hashToFr(r, hash.Hash(ssz)) - return nil -} - -// computePowers implements compute_powers from the EIP-4844 spec -func computePowers(x *bls.Fr, n int) []bls.Fr { - currentPower := bls.ONE - powers := make([]bls.Fr, n) - for i := 0; i < n; i++ { - powers[i] = currentPower - bls.MulModFr(¤tPower, ¤tPower, x) - } - return powers -} - -// linComb implements the function lincomb from the EIP-4844 spec -func linComb(commitments [][]byte, scalars []bls.Fr) ([]byte, error) { - n := len(scalars) - g1s := make([]bls.G1Point, n) - for i := 0; i < n; i++ { - g1, err := bls.FromCompressedG1(commitments[i]) - if err != nil { - return nil, err - } - g1s[i] = *g1 - } - r := bls.LinCombG1(g1s, scalars) - return bls.ToCompressedG1(r), nil -} - -func polyLinComb(blobs []*v1.Blob, scalars []bls.Fr) ([]bls.Fr, error) { - out := make([][]bls.Fr, len(blobs)) - for i := range blobs { - r := make([]bls.Fr, params.FieldElementsPerBlob) - blob := blobs[i].Blob - for j, fe := range blob { - ok := bls.FrFrom32(&r[j], bytesutil.ToBytes32(fe)) - if !ok { - return nil, errors.New("invalid value in blob") - } - } - out[i] = r - } - return bls.PolyLinComb(out, scalars) -} - -// Evaluate a polynomial (in evaluation form) at an arbitrary point `x` -// Uses the barycentric formula. -func EvaluatePolyInEvaluationForm(yFr *bls.Fr, poly []bls.Fr, x *bls.Fr) { - bls.EvaluatePolyInEvaluationForm(yFr, poly, x, rootsOfUnity, 0) -} - -// hashToFr interprets hash value v as a little endian integer, and converts it to a BLS field -// element after modding it with the BLS modulus. -func hashToFr(fr *bls.Fr, v [32]byte) *bls.Fr { - var b big.Int - hashToBig(&b, v). - Mod(&b, &blsModulus) - return bigToFr(fr, &b) -} - -// hashToBig interprets the hash value v as a little-endian integer, puts the result in b, -// and returns it. -func hashToBig(b *big.Int, v [32]byte) *big.Int { - // big.Int takes big-endian bytes but v is little endian so we byte swap - for i := 0; i < 16; i++ { - v[i], v[31-i] = v[31-i], v[i] - } - return b.SetBytes(v[:]) -} - -// bigToFr converts the big.Int represented BLS field element b to the go-kzg library -// representation bls.Fr, putting its value in fr and returning it. -func bigToFr(fr *bls.Fr, b *big.Int) *bls.Fr { - // TODO: Conversion currently relies the string representation as an intermediary. Submit a PR - // to protolambda/go-kzg enabling something more efficient. - bls.SetFr(fr, b.String()) - return fr -} diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel index ec4f46e307d3..682e382ab5de 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel @@ -32,6 +32,7 @@ go_library( "//beacon-chain/cache:go_default_library", "//beacon-chain/cache/depositcache:go_default_library", "//beacon-chain/core/altair:go_default_library", + "//beacon-chain/core/blob:go_default_library", "//beacon-chain/core/blocks:go_default_library", "//beacon-chain/core/feed:go_default_library", "//beacon-chain/core/feed/block:go_default_library", @@ -80,6 +81,7 @@ go_library( "//time/slots:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", + "@com_github_ethereum_go_ethereum//crypto/kzg:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_prometheus_client_golang//prometheus:go_default_library", "@com_github_prometheus_client_golang//prometheus/promauto:go_default_library", diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_eip4844.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_eip4844.go index a78ff1b298a3..615e530e0e64 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_eip4844.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_eip4844.go @@ -5,7 +5,9 @@ import ( "context" "fmt" + "github.com/ethereum/go-ethereum/crypto/kzg" "github.com/pkg/errors" + "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blob" "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition/interop" "github.com/prysmaticlabs/prysm/v3/config/params" consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" @@ -108,11 +110,15 @@ func (vs *Server) assembleEip4844Block(ctx context.Context, altairBlk *ethpb.Bea var sideCar *ethpb.BlobsSidecar if len(blobsBundle.Blobs) != 0 { + aggregatedProof, err := kzg.ComputeAggregateKZGProof(blob.BlobsSequenceImpl(blobsBundle.Blobs)) + if err != nil { + return nil, fmt.Errorf("failed to compute aggregated kzg proof: %v", err) + } sideCar = ðpb.BlobsSidecar{ BeaconBlockRoot: r[:], BeaconBlockSlot: wsb.Block().Slot(), Blobs: blobsBundle.Blobs, - AggregatedProof: blobsBundle.AggregatedProof, + AggregatedProof: aggregatedProof[:], } } diff --git a/beacon-chain/sync/initial-sync/BUILD.bazel b/beacon-chain/sync/initial-sync/BUILD.bazel index 28328b797e01..f76b3b490e37 100644 --- a/beacon-chain/sync/initial-sync/BUILD.bazel +++ b/beacon-chain/sync/initial-sync/BUILD.bazel @@ -18,6 +18,8 @@ go_library( deps = [ "//async/abool:go_default_library", "//beacon-chain/blockchain:go_default_library", + "//beacon-chain/core/blob:go_default_library", + "//beacon-chain/core/blocks:go_default_library", "//beacon-chain/core/feed:go_default_library", "//beacon-chain/core/feed/block:go_default_library", "//beacon-chain/core/feed/state:go_default_library", diff --git a/deps.bzl b/deps.bzl index 2585b4a622e4..2609d0107124 100644 --- a/deps.bzl +++ b/deps.bzl @@ -243,12 +243,7 @@ def prysm_deps(): sum = "h1:D6CSsM3gdxaGaqXnPgOBCeL6Mophqzu7KJOu7zW78sU=", version = "v1.1.0", ) - go_repository( - name = "com_github_azure_azure_pipeline_go", - importpath = "github.com/Azure/azure-pipeline-go", - sum = "h1:6oiIS9yaG6XCCzhgAgKFfIWyo4LLCiDhZot6ltoThhY=", - version = "v0.2.2", - ) + go_repository( name = "com_github_azure_azure_sdk_for_go_sdk_azcore", importpath = "github.com/Azure/azure-sdk-for-go/sdk/azcore", @@ -268,13 +263,6 @@ def prysm_deps(): version = "v0.3.0", ) - go_repository( - name = "com_github_azure_azure_storage_blob_go", - importpath = "github.com/Azure/azure-storage-blob-go", - sum = "h1:MuueVOYkufCxJw5YZzF842DY2MBsp+hLuh2apKY0mck=", - version = "v0.7.0", - ) - go_repository( name = "com_github_azure_go_autorest_autorest", importpath = "github.com/Azure/go-autorest/autorest", @@ -599,18 +587,6 @@ def prysm_deps(): sum = "h1:C43yEtQ6NIf4ftFXD/V55gnGFgPbMQobd//YlnLjUJ8=", version = "v0.4.1-0.20210426202927-39ac3d4b3f1f", ) - go_repository( - name = "com_github_consensys_goff", - importpath = "github.com/consensys/goff", - sum = "h1:eatQPk1I/aVec+F5qs47id17bWZsQFIjxu7C9MsrIHY=", - version = "v0.3.10", - ) - go_repository( - name = "com_github_consensys_gurvy", - importpath = "github.com/consensys/gurvy", - sum = "h1:H2hvjvT2OFMgdMn5ZbhXqHt+F8DJ2clZW7Vmc0kFFxc=", - version = "v0.3.8", - ) go_repository( name = "com_github_containerd_cgroups", @@ -678,6 +654,12 @@ def prysm_deps(): sum = "h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=", version = "v2.0.2", ) + go_repository( + name = "com_github_crate_crypto_go_ipa", + importpath = "github.com/crate-crypto/go-ipa", + sum = "h1:6IrxszG5G+O7zhtkWxq6+unVvnrm1fqV2Pe+T95DUzw=", + version = "v0.0.0-20220523130400-f11357ae11c7", + ) go_repository( name = "com_github_creack_pty", @@ -840,12 +822,6 @@ def prysm_deps(): sum = "h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=", version = "v1.0.0", ) - go_repository( - name = "com_github_dvyukov_go_fuzz", - importpath = "github.com/dvyukov/go-fuzz", - sum = "h1:NgO45/5mBLRVfiXerEFzH6ikcZ7DNRPS639xFg3ENzU=", - version = "v0.0.0-20200318091601-be3528f3a813", - ) go_repository( name = "com_github_eapache_go_resiliency", @@ -927,8 +903,8 @@ def prysm_deps(): "//third_party:com_github_ethereum_go_ethereum_secp256k1.patch", ], replace = "github.com/mdehoog/go-ethereum", - sum = "h1:ERmH7q3eETG8aYoEa62/uRRQheRH0kwywtVnCSWlbfE=", - version = "v1.10.19-0.20221025212535-8925aee77ccf", + sum = "h1:2wXfDkt06PPDhG4Lxkse69fDegYljvz9fSZExd5V41c=", + version = "v1.10.19-0.20221114011613-42a69e6e01ae", ) go_repository( @@ -1041,6 +1017,13 @@ def prysm_deps(): sum = "h1:f6D9Hr8xV8uYKlyuj8XIruxlh9WjVjdh1gIicAS7ays=", version = "v0.0.0-20191108122812-4678299bea08", ) + go_repository( + name = "com_github_gballet_go_verkle", + importpath = "github.com/gballet/go-verkle", + sum = "h1:AB7YjNrzlVHsYz06zCULVV2zYCEft82P86dSmtwxKL0=", + version = "v0.0.0-20220902153445-097bd83b7732", + ) + go_repository( name = "com_github_gdamore_encoding", importpath = "github.com/gdamore/encoding", @@ -1660,6 +1643,12 @@ def prysm_deps(): sum = "h1:fcIZ48y5EE9973k05XjE8+P3YiQgjZz4JI/YabAm8KA=", version = "v1.28.1", ) + go_repository( + name = "com_github_holiman_big", + importpath = "github.com/holiman/big", + sum = "h1:pIYdhNkDh+YENVNi3gto8n9hAmRxKxoar0iE6BLucjw=", + version = "v0.0.0-20221017200358-a027dc42d04e", + ) go_repository( name = "com_github_holiman_bloomfilter_v2", @@ -2550,12 +2539,6 @@ def prysm_deps(): sum = "h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=", version = "v0.1.8", ) - go_repository( - name = "com_github_mattn_go_ieproxy", - importpath = "github.com/mattn/go-ieproxy", - sum = "h1:oNAwILwmgWKFpuU+dXvI6dl9jG2mAWAZLX3r9s0PPiw=", - version = "v0.0.0-20190702010315-6dee0af9227d", - ) go_repository( name = "com_github_mattn_go_isatty", @@ -3173,8 +3156,8 @@ def prysm_deps(): go_repository( name = "com_github_protolambda_go_kzg", importpath = "github.com/protolambda/go-kzg", - sum = "h1:9PBJD0rbR2dsgzUoi7GGbCJ3PZssM2eK//tHaAVS5Ds=", - version = "v0.0.0-20221025081131-f3a74d3b1d0c", + sum = "h1:oTNfeC6fvE/m3iT62hR+umMXjdjtnhCQ6ez9Kl4Gwu0=", + version = "v0.0.0-20221108193918-c6d0faa55038", ) go_repository( name = "com_github_protolambda_ztyp", @@ -3795,8 +3778,8 @@ def prysm_deps(): go_repository( name = "com_github_urfave_cli_v2", importpath = "github.com/urfave/cli/v2", - sum = "h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y=", - version = "v2.10.2", + sum = "h1:5SqCsI/2Qya2bCzK15ozrqo2sZxkh0FHynJZOTVoV6Q=", + version = "v2.17.2-0.20221006022127-8f469abc00aa", ) go_repository( name = "com_github_uudashr_gocognit", @@ -4505,8 +4488,8 @@ def prysm_deps(): go_repository( name = "org_golang_x_sys", importpath = "golang.org/x/sys", - sum = "h1:Sx/u41w+OwrInGdEckYmEuU5gHoGSL4QbDz3S9s6j4U=", - version = "v0.0.0-20220818161305-2296e01440c6", + sum = "h1:OK7RB6t2WQX54srQQYSXMW8dF5C6/8+oA/s5QBmmto4=", + version = "v0.0.0-20221013171732-95e765b1cc43", ) go_repository( name = "org_golang_x_term", @@ -4601,12 +4584,6 @@ def prysm_deps(): sum = "h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=", version = "v1.21.0", ) - go_repository( - name = "tools_gotest", - importpath = "gotest.tools", - sum = "h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=", - version = "v2.2.0+incompatible", - ) # Note: go_repository is already wrapped with maybe! maybe( diff --git a/go.mod b/go.mod index 0a6d8be6a3c4..423e13d435b1 100644 --- a/go.mod +++ b/go.mod @@ -269,4 +269,4 @@ replace github.com/json-iterator/go => github.com/prestonvanloon/go v1.1.7-0.201 replace github.com/grpc-ecosystem/grpc-gateway/v2 => github.com/prysmaticlabs/grpc-gateway/v2 v2.3.1-0.20220721162526-0d1c40b5f064 // For eip-4844 types -replace github.com/ethereum/go-ethereum => github.com/mdehoog/go-ethereum v1.10.19-0.20221109152946-e8e85fe80ef8 +replace github.com/ethereum/go-ethereum => github.com/mdehoog/go-ethereum v1.10.19-0.20221114011613-42a69e6e01ae diff --git a/go.sum b/go.sum index 8b553c69ce94..8700d1dee197 100644 --- a/go.sum +++ b/go.sum @@ -865,8 +865,8 @@ github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsO github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mdehoog/go-ethereum v1.10.19-0.20221109152946-e8e85fe80ef8 h1:6aHTJvy185FYSgFI5H/9wyIBDxN8xFkY/3MklzLD+Ig= -github.com/mdehoog/go-ethereum v1.10.19-0.20221109152946-e8e85fe80ef8/go.mod h1:g+vX1+faxlr/KM1C0wybtfdcH5aPghqJAfpLGAn+Kbk= +github.com/mdehoog/go-ethereum v1.10.19-0.20221114011613-42a69e6e01ae h1:2wXfDkt06PPDhG4Lxkse69fDegYljvz9fSZExd5V41c= +github.com/mdehoog/go-ethereum v1.10.19-0.20221114011613-42a69e6e01ae/go.mod h1:g+vX1+faxlr/KM1C0wybtfdcH5aPghqJAfpLGAn+Kbk= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= diff --git a/proto/engine/v1/execution_engine.pb.go b/proto/engine/v1/execution_engine.pb.go index 665bbda3df4e..2bbcad7b29ff 100755 --- a/proto/engine/v1/execution_engine.pb.go +++ b/proto/engine/v1/execution_engine.pb.go @@ -1274,10 +1274,9 @@ type BlobsBundle struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - BlockHash []byte `protobuf:"bytes,1,opt,name=block_hash,json=blockHash,proto3" json:"block_hash,omitempty" ssz-size:"32"` - Kzgs [][]byte `protobuf:"bytes,2,rep,name=kzgs,proto3" json:"kzgs,omitempty" ssz-max:"16" ssz-size:"?,48"` - Blobs []*Blob `protobuf:"bytes,3,rep,name=blobs,proto3" json:"blobs,omitempty" ssz-max:"16"` - AggregatedProof []byte `protobuf:"bytes,4,opt,name=aggregated_proof,json=aggregatedProof,proto3" json:"aggregated_proof,omitempty" ssz-size:"48"` + BlockHash []byte `protobuf:"bytes,1,opt,name=block_hash,json=blockHash,proto3" json:"block_hash,omitempty" ssz-size:"32"` + Kzgs [][]byte `protobuf:"bytes,2,rep,name=kzgs,proto3" json:"kzgs,omitempty" ssz-max:"16" ssz-size:"?,48"` + Blobs []*Blob `protobuf:"bytes,3,rep,name=blobs,proto3" json:"blobs,omitempty" ssz-max:"16"` } func (x *BlobsBundle) Reset() { @@ -1333,13 +1332,6 @@ func (x *BlobsBundle) GetBlobs() []*Blob { return nil } -func (x *BlobsBundle) GetAggregatedProof() []byte { - if x != nil { - return x.AggregatedProof - } - return nil -} - type Blob struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1742,7 +1734,7 @@ var file_proto_engine_v1_execution_engine_proto_rawDesc = []byte{ 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x33, 0x32, 0x52, 0x12, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, - 0x73, 0x68, 0x22, 0xc3, 0x01, 0x0a, 0x0b, 0x42, 0x6c, 0x6f, 0x62, 0x73, 0x42, 0x75, 0x6e, 0x64, + 0x73, 0x68, 0x22, 0x90, 0x01, 0x0a, 0x0b, 0x42, 0x6c, 0x6f, 0x62, 0x73, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x25, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x33, 0x32, 0x52, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x12, 0x22, 0x0a, 0x04, 0x6b, 0x7a, 0x67, @@ -1751,31 +1743,28 @@ var file_proto_engine_v1_execution_engine_proto_rawDesc = []byte{ 0x05, 0x62, 0x6c, 0x6f, 0x62, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x6f, 0x62, 0x42, 0x06, 0x92, 0xb5, 0x18, 0x02, 0x31, 0x36, 0x52, 0x05, - 0x62, 0x6c, 0x6f, 0x62, 0x73, 0x12, 0x31, 0x0a, 0x10, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, - 0x74, 0x65, 0x64, 0x5f, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x42, - 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x34, 0x38, 0x52, 0x0f, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, - 0x74, 0x65, 0x64, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x22, 0x27, 0x0a, 0x04, 0x42, 0x6c, 0x6f, 0x62, - 0x12, 0x1f, 0x0a, 0x04, 0x62, 0x6c, 0x6f, 0x62, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x42, 0x0b, - 0x8a, 0xb5, 0x18, 0x07, 0x34, 0x30, 0x39, 0x36, 0x2c, 0x33, 0x32, 0x52, 0x04, 0x62, 0x6c, 0x6f, - 0x62, 0x22, 0x84, 0x01, 0x0a, 0x0a, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, - 0x12, 0x29, 0x0a, 0x10, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x5f, 0x69, - 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0f, 0x77, 0x69, 0x74, 0x68, - 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x33, 0x0a, 0x11, 0x65, - 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x32, 0x30, 0x52, 0x10, - 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, - 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, - 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x96, 0x01, 0x0a, 0x16, 0x6f, 0x72, 0x67, - 0x2e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, - 0x2e, 0x76, 0x31, 0x42, 0x14, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, - 0x67, 0x69, 0x6e, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x65, - 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x76, 0x31, 0xaa, 0x02, 0x12, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, - 0x75, 0x6d, 0x2e, 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x12, 0x45, - 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x5c, 0x76, - 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x62, 0x6c, 0x6f, 0x62, 0x73, 0x22, 0x27, 0x0a, 0x04, 0x42, 0x6c, 0x6f, 0x62, 0x12, 0x1f, 0x0a, + 0x04, 0x62, 0x6c, 0x6f, 0x62, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x42, 0x0b, 0x8a, 0xb5, 0x18, + 0x07, 0x34, 0x30, 0x39, 0x36, 0x2c, 0x33, 0x32, 0x52, 0x04, 0x62, 0x6c, 0x6f, 0x62, 0x22, 0x84, + 0x01, 0x0a, 0x0a, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x12, 0x29, 0x0a, + 0x10, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x5f, 0x69, 0x6e, 0x64, 0x65, + 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0f, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, + 0x77, 0x61, 0x6c, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x33, 0x0a, 0x11, 0x65, 0x78, 0x65, 0x63, + 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x32, 0x30, 0x52, 0x10, 0x65, 0x78, 0x65, + 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x16, 0x0a, + 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x61, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x96, 0x01, 0x0a, 0x16, 0x6f, 0x72, 0x67, 0x2e, 0x65, 0x74, + 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2e, 0x76, 0x31, + 0x42, 0x14, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x67, 0x69, 0x6e, + 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, + 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x2f, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x6e, 0x67, 0x69, + 0x6e, 0x65, 0x76, 0x31, 0xaa, 0x02, 0x12, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, + 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x12, 0x45, 0x74, 0x68, 0x65, + 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x5c, 0x76, 0x31, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/engine/v1/execution_engine.proto b/proto/engine/v1/execution_engine.proto index ccb3a8043292..8cce6c8908da 100644 --- a/proto/engine/v1/execution_engine.proto +++ b/proto/engine/v1/execution_engine.proto @@ -167,7 +167,6 @@ message BlobsBundle { bytes block_hash = 1 [(ethereum.eth.ext.ssz_size) = "32"]; repeated bytes kzgs = 2 [(ethereum.eth.ext.ssz_size) = "?,48", (ethereum.eth.ext.ssz_max) = "16"]; repeated Blob blobs = 3 [(ethereum.eth.ext.ssz_max) = "16"]; - bytes aggregated_proof = 4 [(ethereum.eth.ext.ssz_size) = "48"]; } message Blob { diff --git a/proto/engine/v1/generated.ssz.go b/proto/engine/v1/generated.ssz.go index 7c1c030d7a50..b3cd3fa81f9b 100644 --- a/proto/engine/v1/generated.ssz.go +++ b/proto/engine/v1/generated.ssz.go @@ -1,5 +1,5 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 9d770a5b11b36db58e568585825cb8920fda4884594b4e1b2d86daf11919235c +// Hash: db83674b7d60215b93a4964a082b84c350ac331be875724071f501df2e9206cd package enginev1 import ( diff --git a/proto/engine/v1/json_marshal_unmarshal.go b/proto/engine/v1/json_marshal_unmarshal.go index f574e6e786f2..44bc7105e563 100644 --- a/proto/engine/v1/json_marshal_unmarshal.go +++ b/proto/engine/v1/json_marshal_unmarshal.go @@ -570,10 +570,9 @@ func (b *BlobsBundle) MarshalJSON() ([]byte, error) { } return json.Marshal(blobBundleJSON{ - BlockHash: bytesutil.ToBytes32(b.BlockHash), - Kzgs: kzgs, - Blobs: blobs, - AggregatedProof: bytesutil.ToBytes48(b.AggregatedProof), + BlockHash: bytesutil.ToBytes32(b.BlockHash), + Kzgs: kzgs, + Blobs: blobs, }) } @@ -600,6 +599,5 @@ func (e *BlobsBundle) UnmarshalJSON(enc []byte) error { } } e.Blobs = blobs - e.AggregatedProof = bytesutil.PadTo(dec.AggregatedProof[:], fieldparams.BLSPubkeyLength) return nil } diff --git a/proto/eth/ext/options.pb.go b/proto/eth/ext/options.pb.go index eadc5c7f75e2..d4446fb515de 100755 --- a/proto/eth/ext/options.pb.go +++ b/proto/eth/ext/options.pb.go @@ -7,9 +7,9 @@ package ext import ( - descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + descriptorpb "google.golang.org/protobuf/types/descriptorpb" reflect "reflect" ) @@ -22,7 +22,7 @@ const ( var file_proto_eth_ext_options_proto_extTypes = []protoimpl.ExtensionInfo{ { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*string)(nil), Field: 50000, Name: "ethereum.eth.ext.cast_type", @@ -30,7 +30,7 @@ var file_proto_eth_ext_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "proto/eth/ext/options.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*string)(nil), Field: 50001, Name: "ethereum.eth.ext.ssz_size", @@ -38,7 +38,7 @@ var file_proto_eth_ext_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "proto/eth/ext/options.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*string)(nil), Field: 50002, Name: "ethereum.eth.ext.ssz_max", @@ -46,7 +46,7 @@ var file_proto_eth_ext_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "proto/eth/ext/options.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*string)(nil), Field: 50003, Name: "ethereum.eth.ext.spec_name", @@ -55,7 +55,7 @@ var file_proto_eth_ext_options_proto_extTypes = []protoimpl.ExtensionInfo{ }, } -// Extension fields to descriptor.FieldOptions. +// Extension fields to descriptorpb.FieldOptions. var ( // optional string cast_type = 50000; E_CastType = &file_proto_eth_ext_options_proto_extTypes[0] @@ -102,7 +102,7 @@ var file_proto_eth_ext_options_proto_rawDesc = []byte{ } var file_proto_eth_ext_options_proto_goTypes = []interface{}{ - (*descriptor.FieldOptions)(nil), // 0: google.protobuf.FieldOptions + (*descriptorpb.FieldOptions)(nil), // 0: google.protobuf.FieldOptions } var file_proto_eth_ext_options_proto_depIdxs = []int32{ 0, // 0: ethereum.eth.ext.cast_type:extendee -> google.protobuf.FieldOptions diff --git a/proto/eth/v1/generated.ssz.go b/proto/eth/v1/generated.ssz.go index 0a8d28caa7a7..cc7cac3490cd 100644 --- a/proto/eth/v1/generated.ssz.go +++ b/proto/eth/v1/generated.ssz.go @@ -1,5 +1,5 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 59bde931814d95807c0932dc7b27cc235ffed4e7c7b80053b7a88632373c7042 +// Hash: df8a853f5b774fd36815786c1690f18f9036403fc0dd7d9c6e4568094316879b package v1 import ( diff --git a/proto/eth/v2/generated.ssz.go b/proto/eth/v2/generated.ssz.go index 92488fad97bb..53c8f03ccaeb 100644 --- a/proto/eth/v2/generated.ssz.go +++ b/proto/eth/v2/generated.ssz.go @@ -1,5 +1,5 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: c25a31d1f7ed41bb40abc5c9e7adfcefb332319040b6ecd30e3a0f2f2c9f6200 +// Hash: a7263bacf115fcb18d5975da47a990452408272cd8bf47cca1fbc0b72ba569c6 package eth import ( diff --git a/proto/prysm/v1alpha1/generated.ssz.go b/proto/prysm/v1alpha1/generated.ssz.go index c0458874aebc..03da1161c671 100644 --- a/proto/prysm/v1alpha1/generated.ssz.go +++ b/proto/prysm/v1alpha1/generated.ssz.go @@ -1,5 +1,5 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: b9ffe13e361455f66e5fd724185953b23d8503eea88a183efe827d4d5b47152c +// Hash: 37c5da3ffa1234c7bc3ac95e12c484f984c57df3f8668a07043aa6a962766e56 package eth import (