e3: return list of e3 files by grpc (#6827)

This commit is contained in:
Alex Sharov 2023-02-10 13:45:33 +07:00 committed by GitHub
parent 983db55dc5
commit 7c9f30d25b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 5 deletions

View File

@ -368,12 +368,14 @@ func RemoteServices(ctx context.Context, cfg httpcfg.HttpCfg, logger log.Logger,
log.Warn("[Snapshots] reopen", "err", err)
return
}
if err := allSnapshots.ReopenList(reply.Files, true); err != nil {
if err := allSnapshots.ReopenList(reply.BlocksFiles, true); err != nil {
log.Error("[Snapshots] reopen", "err", err)
} else {
allSnapshots.LogStat()
}
_ = reply.HistoryFiles
if err = agg.ReopenFolder(); err != nil {
log.Error("[Snapshots] reopen", "err", err)
} else {

View File

@ -11,6 +11,7 @@ import (
"github.com/holiman/uint256"
"github.com/ledgerwatch/log/v3"
"google.golang.org/grpc"
"google.golang.org/protobuf/types/known/emptypb"
"github.com/ledgerwatch/erigon-lib/chain"
@ -41,7 +42,8 @@ import (
// 2.2.0 - add NodesInfo function
// 3.0.0 - adding PoS interfaces
// 3.1.0 - add Subscribe to logs
var EthBackendAPIVersion = &types2.VersionReply{Major: 3, Minor: 1, Patch: 0}
// 3.2.0 - add EngineGetBlobsBundleV1
var EthBackendAPIVersion = &types2.VersionReply{Major: 3, Minor: 2, Patch: 0}
const MaxBuilders = 128
@ -291,6 +293,10 @@ func (s *EthBackendServer) checkWithdrawalsPresence(time uint64, withdrawals []*
return nil
}
func (s *EthBackendServer) EngineGetBlobsBundleV1(ctx context.Context, in *remote.EngineGetBlobsBundleRequest, opts ...grpc.CallOption) (*types2.BlobsBundleV1, error) {
return nil, fmt.Errorf("EngineGetBlobsBundleV1: not implemented yet")
}
// EngineNewPayload validates and possibly executes payload
func (s *EthBackendServer) EngineNewPayload(ctx context.Context, req *types2.ExecutionPayload) (*remote.EnginePayloadStatus, error) {
header := types.Header{

2
go.mod
View File

@ -3,7 +3,7 @@ module github.com/ledgerwatch/erigon
go 1.18
require (
github.com/ledgerwatch/erigon-lib v0.0.0-20230210045145-8b0f441224ea
github.com/ledgerwatch/erigon-lib v0.0.0-20230210064100-682cdfca7799
github.com/ledgerwatch/erigon-snapshot v1.1.1-0.20230209051056-e695bb0d2ace
github.com/ledgerwatch/log/v3 v3.7.0
github.com/ledgerwatch/secp256k1 v1.0.0

4
go.sum
View File

@ -556,8 +556,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
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-20230210045145-8b0f441224ea h1:4dkxyoYwVPlSCdm3vBVoum7mdjXTnoyrT+Kkscq1Zxo=
github.com/ledgerwatch/erigon-lib v0.0.0-20230210045145-8b0f441224ea/go.mod h1:0C8ZJf2FL/BUqCJq5NrbZr0mq88yi8xXl3OTwLLBC9o=
github.com/ledgerwatch/erigon-lib v0.0.0-20230210064100-682cdfca7799 h1:vfTDc788s26oW/U8ui6/Jb5Jj2AnTwPa1FxcwKZmDGg=
github.com/ledgerwatch/erigon-lib v0.0.0-20230210064100-682cdfca7799/go.mod h1:OXgMDuUo2lZ3NpH29ZvMYbk+LxFd5ffDl2Z2mGMuY/I=
github.com/ledgerwatch/erigon-snapshot v1.1.1-0.20230209051056-e695bb0d2ace h1:42TpaEa42wznKkWVIMuhFPurxTvx8JzITQl+Ofzotq8=
github.com/ledgerwatch/erigon-snapshot v1.1.1-0.20230209051056-e695bb0d2ace/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo=
github.com/ledgerwatch/log/v3 v3.7.0 h1:aFPEZdwZx4jzA3+/Pf8wNDN5tCI0cIolq/kfvgcM+og=