diff --git a/core/types/data_blob.go b/core/types/data_blob.go index bd972ea3a81..291652166a8 100644 --- a/core/types/data_blob.go +++ b/core/types/data_blob.go @@ -6,10 +6,10 @@ import ( "fmt" "io" - "github.com/ethereum/go-ethereum/crypto/kzg" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/params" + "github.com/protolambda/go-kzg/eth" "github.com/protolambda/ztyp/codec" "github.com/protolambda/ztyp/tree" ) @@ -57,7 +57,7 @@ func (p *KZGCommitment) UnmarshalText(text []byte) error { } func (c KZGCommitment) ComputeVersionedHash() common.Hash { - return common.Hash(kzg.KZGToVersionedHash(kzg.KZGCommitment(c))) + return common.Hash(eth.KZGToVersionedHash(eth.KZGCommitment(c))) } // Compressed BLS12-381 G1 element @@ -120,12 +120,12 @@ func (p *BLSFieldElement) UnmarshalText(text []byte) error { // Blob data type Blob [params.FieldElementsPerBlob]BLSFieldElement -// kzg.Blob interface +// eth.Blob interface func (blob Blob) Len() int { return len(blob) } -// kzg.Blob interface +// eth.Blob interface func (blob Blob) At(i int) [32]byte { return [32]byte(blob[i]) } @@ -208,13 +208,13 @@ func (blob *Blob) UnmarshalText(text []byte) error { type BlobKzgs []KZGCommitment -// kzg.KZGCommitmentSequence interface +// eth.KZGCommitmentSequence interface func (bk BlobKzgs) Len() int { return len(bk) } -func (bk BlobKzgs) At(i int) kzg.KZGCommitment { - return kzg.KZGCommitment(bk[i]) +func (bk BlobKzgs) At(i int) eth.KZGCommitment { + return eth.KZGCommitment(bk[i]) } func (li *BlobKzgs) Deserialize(dr *codec.DecodingReader) error { @@ -253,13 +253,13 @@ func (li BlobKzgs) copy() BlobKzgs { type Blobs []Blob -// kzg.BlobSequence interface +// eth.BlobSequence interface func (blobs Blobs) Len() int { return len(blobs) } -// kzg.BlobSequence interface -func (blobs Blobs) At(i int) kzg.Blob { +// eth.BlobSequence interface +func (blobs Blobs) At(i int) eth.Blob { return blobs[i] } @@ -306,17 +306,17 @@ func (blobs Blobs) ComputeCommitmentsAndAggregatedProof() (commitments []KZGComm commitments = make([]KZGCommitment, len(blobs)) versionedHashes = make([]common.Hash, len(blobs)) for i, blob := range blobs { - c, ok := kzg.BlobToKZGCommitment(blob) + c, ok := eth.BlobToKZGCommitment(blob) if !ok { return nil, nil, KZGProof{}, errors.New("could not convert blob to commitment") } commitments[i] = KZGCommitment(c) - versionedHashes[i] = common.Hash(kzg.KZGToVersionedHash(c)) + versionedHashes[i] = common.Hash(eth.KZGToVersionedHash(c)) } var kzgProof KZGProof if len(blobs) != 0 { - proof, err := kzg.ComputeAggregateKZGProof(blobs) + proof, err := eth.ComputeAggregateKZGProof(blobs) if err != nil { return nil, nil, KZGProof{}, err } @@ -402,7 +402,7 @@ func (b *BlobTxWrapData) validateBlobTransactionWrapper(inner Transaction) error if l1 > params.MaxBlobsPerBlock { return fmt.Errorf("number of blobs exceeds max: %v", l1) } - ok, err := kzg.VerifyAggregateKZGProof(b.Blobs, b.BlobKzgs, kzg.KZGProof(b.KzgAggregatedProof)) + ok, err := eth.VerifyAggregateKZGProof(b.Blobs, b.BlobKzgs, eth.KZGProof(b.KzgAggregatedProof)) if err != nil { return fmt.Errorf("error during proof verification: %v", err) } diff --git a/go.mod b/go.mod index 659c12f0fed..5f42382e2f8 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,6 @@ require ( github.com/edsrzf/mmap-go v1.1.0 github.com/emicklei/dot v1.0.0 github.com/emirpasic/gods v1.18.1 - github.com/ethereum/go-ethereum v1.10.25 github.com/ferranbt/fastssz v0.1.2 github.com/fjl/gencodec v0.0.0-20220412091415-8bb9e558978c github.com/gballet/go-verkle v0.0.0-20220902153445-097bd83b7732 @@ -155,7 +154,7 @@ require ( github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect - github.com/protolambda/go-kzg v0.0.0-20221108193918-c6d0faa55038 // indirect + github.com/protolambda/go-kzg v0.0.0-20221122014024-bb3fa3695412 github.com/raulk/go-watchdog v1.3.0 // indirect github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect github.com/supranational/blst v0.3.10 // indirect @@ -261,5 +260,3 @@ require ( ) replace github.com/tendermint/tendermint => github.com/bnb-chain/tendermint v0.31.12 - -replace github.com/ethereum/go-ethereum v1.10.25 => github.com/mdehoog/go-ethereum v1.10.19-0.20221117142754-381b51eccf71 diff --git a/go.sum b/go.sum index cafb3450614..c55b78f7204 100644 --- a/go.sum +++ b/go.sum @@ -471,7 +471,6 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J github.com/herumi/bls-eth-go-binary v1.28.1 h1:fcIZ48y5EE9973k05XjE8+P3YiQgjZz4JI/YabAm8KA= github.com/herumi/bls-eth-go-binary v1.28.1/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= -github.com/holiman/uint256 v1.1.1/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= github.com/holiman/uint256 v1.2.1 h1:XRtyuda/zw2l+Bq/38n5XUoEF72aSOu/77Thd9pPp2o= github.com/holiman/uint256 v1.2.1/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= @@ -561,7 +560,7 @@ github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v0.0.0-20170224010052-a616ab194758 h1:0D5M2HQSGD3PYPwICLl+/9oulQauOuETfgFvhBDffs0= github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c= github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/ledgerwatch/erigon-lib v0.0.0-20221116074006-679b8dfa1d53 h1:SHrhpP4M2i8cYxsm7wtOQTMt+ejcEY+n42/KlEghQu4= @@ -638,8 +637,6 @@ github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI= 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.20221117142754-381b51eccf71 h1:9aI5KT5lZJUsYCpvBbDOxrfzPn5zGj3g9xct1Ax1bLQ= -github.com/mdehoog/go-ethereum v1.10.19-0.20221117142754-381b51eccf71/go.mod h1:g+vX1+faxlr/KM1C0wybtfdcH5aPghqJAfpLGAn+Kbk= github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= @@ -845,8 +842,10 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= -github.com/protolambda/go-kzg v0.0.0-20221108193918-c6d0faa55038 h1:oTNfeC6fvE/m3iT62hR+umMXjdjtnhCQ6ez9Kl4Gwu0= -github.com/protolambda/go-kzg v0.0.0-20221108193918-c6d0faa55038/go.mod h1:9Lk5SNX/61jq4lbyYcxCvOeldv4xEUAO6QMp/Fd5ALw= +github.com/protolambda/go-kzg v0.0.0-20221121235515-3f3e1ef6beb7 h1:yzqsT6UIT17bmesiG9iB6+3cQkmMAtFjUffx5KrXgkk= +github.com/protolambda/go-kzg v0.0.0-20221121235515-3f3e1ef6beb7/go.mod h1:7EhkBJFo/qJ9sToiW5baPqbyPo/TadVHn4iNdpwEW/w= +github.com/protolambda/go-kzg v0.0.0-20221122014024-bb3fa3695412 h1:MQBDul/k5XDDYF5fVn18lNwkWKxpK93FbYeaum1b1UE= +github.com/protolambda/go-kzg v0.0.0-20221122014024-bb3fa3695412/go.mod h1:7EhkBJFo/qJ9sToiW5baPqbyPo/TadVHn4iNdpwEW/w= github.com/protolambda/ztyp v0.2.2 h1:rVcL3vBu9W/aV646zF6caLS/dyn9BN8NYiuJzicLNyY= github.com/protolambda/ztyp v0.2.2/go.mod h1:9bYgKGqg3wJqT9ac1gI2hnVb0STQq7p/1lapqrqY1dU= github.com/prysmaticlabs/go-bitfield v0.0.0-20210809151128-385d8c5e3fb7 h1:0tVE4tdWQK9ZpYygoV7+vS6QkDvQVySboMVEIxBJmXw= @@ -1246,7 +1245,6 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220818161305-2296e01440c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=