From 10b5851efddc01841cd91495830808ddc32cb801 Mon Sep 17 00:00:00 2001 From: Ian Shim Date: Fri, 19 Jul 2024 11:51:46 -0700 Subject: [PATCH] generate inclusion proof with blob index instead of hash --- api/clients/mock/node_client.go | 2 +- api/clients/node_client.go | 2 +- api/clients/retrieval_client.go | 4 ++-- api/clients/retrieval_client_test.go | 4 ++-- core/serialization.go | 4 ++-- disperser/batcher/batcher.go | 11 ++--------- disperser/batcher/encoding_streamer.go | 2 +- go.mod | 9 +++++---- go.sum | 18 ++++++++++-------- node/grpc/server_test.go | 4 ++-- node/grpc/utils.go | 4 ++-- 11 files changed, 30 insertions(+), 34 deletions(-) diff --git a/api/clients/mock/node_client.go b/api/clients/mock/node_client.go index 6fe9d8b4b..42228ae95 100644 --- a/api/clients/mock/node_client.go +++ b/api/clients/mock/node_client.go @@ -6,7 +6,7 @@ import ( "github.com/Layr-Labs/eigenda/api/clients" "github.com/Layr-Labs/eigenda/core" "github.com/stretchr/testify/mock" - "github.com/wealdtech/go-merkletree" + "github.com/wealdtech/go-merkletree/v2" ) type MockNodeClient struct { diff --git a/api/clients/node_client.go b/api/clients/node_client.go index e1422dbc6..daca5b6e5 100644 --- a/api/clients/node_client.go +++ b/api/clients/node_client.go @@ -8,7 +8,7 @@ import ( "github.com/Layr-Labs/eigenda/core" "github.com/Layr-Labs/eigenda/encoding" node_utils "github.com/Layr-Labs/eigenda/node/grpc" - "github.com/wealdtech/go-merkletree" + "github.com/wealdtech/go-merkletree/v2" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/api/clients/retrieval_client.go b/api/clients/retrieval_client.go index 70693787b..8a310dd2d 100644 --- a/api/clients/retrieval_client.go +++ b/api/clients/retrieval_client.go @@ -10,8 +10,8 @@ import ( "github.com/Layr-Labs/eigensdk-go/logging" "github.com/gammazero/workerpool" - "github.com/wealdtech/go-merkletree" - "github.com/wealdtech/go-merkletree/keccak256" + "github.com/wealdtech/go-merkletree/v2" + "github.com/wealdtech/go-merkletree/v2/keccak256" ) type RetrievalClient interface { diff --git a/api/clients/retrieval_client_test.go b/api/clients/retrieval_client_test.go index 505cc9aee..bd2e12f75 100644 --- a/api/clients/retrieval_client_test.go +++ b/api/clients/retrieval_client_test.go @@ -21,8 +21,8 @@ import ( "github.com/consensys/gnark-crypto/ecc/bn254" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/wealdtech/go-merkletree" - "github.com/wealdtech/go-merkletree/keccak256" + "github.com/wealdtech/go-merkletree/v2" + "github.com/wealdtech/go-merkletree/v2/keccak256" ) const numOperators = 10 diff --git a/core/serialization.go b/core/serialization.go index 899efc671..fe1b4fd5e 100644 --- a/core/serialization.go +++ b/core/serialization.go @@ -14,8 +14,8 @@ import ( "github.com/consensys/gnark-crypto/ecc/bn254" "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/wealdtech/go-merkletree" - "github.com/wealdtech/go-merkletree/keccak256" + "github.com/wealdtech/go-merkletree/v2" + "github.com/wealdtech/go-merkletree/v2/keccak256" "golang.org/x/crypto/sha3" ) diff --git a/disperser/batcher/batcher.go b/disperser/batcher/batcher.go index f2f9028fe..b54b87a42 100644 --- a/disperser/batcher/batcher.go +++ b/disperser/batcher/batcher.go @@ -18,7 +18,7 @@ import ( "github.com/gammazero/workerpool" "github.com/hashicorp/go-multierror" "github.com/prometheus/client_golang/prometheus" - "github.com/wealdtech/go-merkletree" + "github.com/wealdtech/go-merkletree/v2" ) const ( @@ -262,15 +262,8 @@ func (b *Batcher) updateConfirmationInfo( blobsToRetry = append(blobsToRetry, batchData.blobs[blobIndex]) continue } - blobHeader := batchData.blobHeaders[blobIndex] - blobHeaderHash, err := blobHeader.GetBlobHeaderHash() - if err != nil { - b.logger.Error("HandleSingleBatch: failed to get blob header hash", "err", err) - blobsToRetry = append(blobsToRetry, batchData.blobs[blobIndex]) - continue - } - merkleProof, err := batchData.merkleTree.GenerateProof(blobHeaderHash[:], 0) + merkleProof, err := batchData.merkleTree.GenerateProofWithIndex(uint64(blobIndex), 0) if err != nil { b.logger.Error("HandleSingleBatch: failed to generate blob header inclusion proof", "err", err) blobsToRetry = append(blobsToRetry, batchData.blobs[blobIndex]) diff --git a/disperser/batcher/encoding_streamer.go b/disperser/batcher/encoding_streamer.go index 78c62ff0d..977775f18 100644 --- a/disperser/batcher/encoding_streamer.go +++ b/disperser/batcher/encoding_streamer.go @@ -13,7 +13,7 @@ import ( "github.com/Layr-Labs/eigenda/disperser" "github.com/Layr-Labs/eigenda/encoding" "github.com/Layr-Labs/eigensdk-go/logging" - "github.com/wealdtech/go-merkletree" + "github.com/wealdtech/go-merkletree/v2" ) const encodingInterval = 2 * time.Second diff --git a/go.mod b/go.mod index 2bad729c8..6ecc3834f 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 github.com/urfave/cli v1.22.14 github.com/urfave/cli/v2 v2.27.1 - github.com/wealdtech/go-merkletree v1.0.1-0.20230205101955-ec7a95ea11ca + github.com/wealdtech/go-merkletree/v2 v2.6.0 go.uber.org/automaxprocs v1.5.2 go.uber.org/goleak v1.3.0 go.uber.org/mock v0.4.0 @@ -105,6 +105,7 @@ require ( github.com/hashicorp/go-bexpr v0.1.10 // indirect github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 // indirect github.com/huin/goupnp v1.3.0 // indirect + github.com/iden3/go-iden3-crypto v0.0.16 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect @@ -201,10 +202,10 @@ require ( github.com/swaggo/gin-swagger v1.6.0 github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - golang.org/x/crypto v0.22.0 + golang.org/x/crypto v0.23.0 golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.19.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect golang.org/x/tools v0.20.0 // indirect google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v3 v3.0.1 diff --git a/go.sum b/go.sum index f6f404b40..deb4b2e74 100644 --- a/go.sum +++ b/go.sum @@ -295,6 +295,8 @@ github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXei github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= +github.com/iden3/go-iden3-crypto v0.0.16 h1:zN867xiz6HgErXVIV/6WyteGcOukE9gybYTorBMEdsk= +github.com/iden3/go-iden3-crypto v0.0.16/go.mod h1:dLpM4vEPJ3nDHzhWFXDjzkn1qHoBeOT/3UEhXsEsP3E= github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -507,8 +509,8 @@ github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho= github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= -github.com/wealdtech/go-merkletree v1.0.1-0.20230205101955-ec7a95ea11ca h1:oK35INPN4CiubFw7ZPQkbxm2AsSU6Tjeb9YhciZnvIM= -github.com/wealdtech/go-merkletree v1.0.1-0.20230205101955-ec7a95ea11ca/go.mod h1:bM9mDSjsti+gkjl8FjovMoUH3MPR5bwJ3+ucaYFY0Jk= +github.com/wealdtech/go-merkletree/v2 v2.6.0 h1:/Qz2blWf+yblxWiudjSXPm5h6sBMgoL67+9Rq2IhfTE= +github.com/wealdtech/go-merkletree/v2 v2.6.0/go.mod h1:Ooz0/mhs/XF1iYfbowRawrkAI56YYZ+oUl5Dw2Tlnjk= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= @@ -550,8 +552,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= -golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -619,8 +621,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -630,8 +632,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/node/grpc/server_test.go b/node/grpc/server_test.go index 2285e581d..b3931fad3 100644 --- a/node/grpc/server_test.go +++ b/node/grpc/server_test.go @@ -27,8 +27,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/wealdtech/go-merkletree" - "github.com/wealdtech/go-merkletree/keccak256" + "github.com/wealdtech/go-merkletree/v2" + "github.com/wealdtech/go-merkletree/v2/keccak256" "google.golang.org/grpc/peer" "google.golang.org/protobuf/proto" ) diff --git a/node/grpc/utils.go b/node/grpc/utils.go index 45659c5cc..58351c4d4 100644 --- a/node/grpc/utils.go +++ b/node/grpc/utils.go @@ -14,8 +14,8 @@ import ( "github.com/consensys/gnark-crypto/ecc/bn254" "github.com/consensys/gnark-crypto/ecc/bn254/fp" "github.com/gammazero/workerpool" - "github.com/wealdtech/go-merkletree" - "github.com/wealdtech/go-merkletree/keccak256" + "github.com/wealdtech/go-merkletree/v2" + "github.com/wealdtech/go-merkletree/v2/keccak256" "google.golang.org/protobuf/proto" )