Merge EngineGetPayloadWithBlobs into EngineGetPayload (ledgerwatch#1010)

Pick up erigontech/interfaces#173
calmbeing · Jul 10, 2023 · 657e95b · 657e95b
1 parent 6a92c07
commit 657e95b
Show file tree

Hide file tree

Showing 6 changed files with 552 additions and 654 deletions.
diff --git a/direct/eth_backend_client.go b/direct/eth_backend_client.go
@@ -34,10 +34,6 @@ func NewEthBackendClientDirect(server remote.ETHBACKENDServer) *EthBackendClient
 	return &EthBackendClientDirect{server: server}
 }
 
-func (s *EthBackendClientDirect) EngineGetBlobsBundleV1(ctx context.Context, in *remote.EngineGetBlobsBundleRequest, opts ...grpc.CallOption) (*types.BlobsBundleV1, error) {
-	return s.server.EngineGetBlobsBundleV1(ctx, in)
-}
-
 func (s *EthBackendClientDirect) Etherbase(ctx context.Context, in *remote.EtherbaseRequest, opts ...grpc.CallOption) (*remote.EtherbaseReply, error) {
 	return s.server.Etherbase(ctx, in)
 }

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/ledgerwatch/erigon-lib
 go 1.19
 
 require (
-	github.com/ledgerwatch/interfaces v0.0.0-20230506191109-292e4ca4d85f
+	github.com/ledgerwatch/interfaces v0.0.0-20230602100217-2411e25360a5
 	github.com/ledgerwatch/log/v3 v3.8.0
 	github.com/ledgerwatch/secp256k1 v1.0.0
 	github.com/ledgerwatch/trackerslist v1.1.0

diff --git a/go.sum b/go.sum
@@ -233,8 +233,8 @@ 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/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
-github.com/ledgerwatch/interfaces v0.0.0-20230506191109-292e4ca4d85f h1:DYvoCnEExrvyYC+3/35xfCvOWmQUsMMVHGXFiiOIbVY=
-github.com/ledgerwatch/interfaces v0.0.0-20230506191109-292e4ca4d85f/go.mod h1:ugQv1QllJzBny3cKZKxUrSnykkjkBgm27eQM6dnGAcc=
+github.com/ledgerwatch/interfaces v0.0.0-20230602100217-2411e25360a5 h1:DaBl9g4gbbUMROIBm8WESihEi3Z/FW9lrY0B33TF5UI=
+github.com/ledgerwatch/interfaces v0.0.0-20230602100217-2411e25360a5/go.mod h1:ugQv1QllJzBny3cKZKxUrSnykkjkBgm27eQM6dnGAcc=
 github.com/ledgerwatch/log/v3 v3.8.0 h1:gCpp7uGtIerEz1jKVPeDnbIopFPud9ZnCpBLlLBGqPU=
 github.com/ledgerwatch/log/v3 v3.8.0/go.mod h1:J2Jl6zV/58LeA6LTaVVnCGyf1/cYYSEOOLHY4ZN8S2A=
 github.com/ledgerwatch/secp256k1 v1.0.0 h1:Usvz87YoTG0uePIV8woOof5cQnLXGYa162rFf3YnwaQ=