|
|
@ -9,7 +9,6 @@ import ( |
|
|
|
"github.com/ethereum/go-ethereum/common" |
|
|
|
"github.com/ethereum/go-ethereum/common" |
|
|
|
"github.com/ethereum/go-ethereum/event" |
|
|
|
"github.com/ethereum/go-ethereum/event" |
|
|
|
"github.com/harmony-one/harmony/core" |
|
|
|
"github.com/harmony-one/harmony/core" |
|
|
|
"github.com/harmony-one/harmony/core/types" |
|
|
|
|
|
|
|
"github.com/harmony-one/harmony/internal/utils" |
|
|
|
"github.com/harmony-one/harmony/internal/utils" |
|
|
|
syncproto "github.com/harmony-one/harmony/p2p/stream/protocols/sync" |
|
|
|
syncproto "github.com/harmony-one/harmony/p2p/stream/protocols/sync" |
|
|
|
sttypes "github.com/harmony-one/harmony/p2p/stream/types" |
|
|
|
sttypes "github.com/harmony-one/harmony/p2p/stream/types" |
|
|
@ -87,13 +86,6 @@ type StagedStreamSync struct { |
|
|
|
evtDownloadStartedSubscribed bool |
|
|
|
evtDownloadStartedSubscribed bool |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// BlockWithSig the serialization structure for request DownloaderRequest_BLOCKWITHSIG
|
|
|
|
|
|
|
|
// The block is encoded as block + commit signature
|
|
|
|
|
|
|
|
type BlockWithSig struct { |
|
|
|
|
|
|
|
Block *types.Block |
|
|
|
|
|
|
|
CommitSigAndBitmap []byte |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
type Timing struct { |
|
|
|
type Timing struct { |
|
|
|
isRevert bool |
|
|
|
isRevert bool |
|
|
|
isCleanUp bool |
|
|
|
isCleanUp bool |
|
|
@ -185,7 +177,7 @@ func (s *StagedStreamSync) IsAfter(stage1, stage2 SyncStageID) bool { |
|
|
|
|
|
|
|
|
|
|
|
func (s *StagedStreamSync) RevertTo(revertPoint uint64, invalidBlockNumber uint64, invalidBlockHash common.Hash, invalidBlockStreamID sttypes.StreamID) { |
|
|
|
func (s *StagedStreamSync) RevertTo(revertPoint uint64, invalidBlockNumber uint64, invalidBlockHash common.Hash, invalidBlockStreamID sttypes.StreamID) { |
|
|
|
utils.Logger().Info(). |
|
|
|
utils.Logger().Info(). |
|
|
|
Interface("invalidBlockNumber", invalidBlockNumber). |
|
|
|
Uint64("invalidBlockNumber", invalidBlockNumber). |
|
|
|
Interface("invalidBlockHash", invalidBlockHash). |
|
|
|
Interface("invalidBlockHash", invalidBlockHash). |
|
|
|
Interface("invalidBlockStreamID", invalidBlockStreamID). |
|
|
|
Interface("invalidBlockStreamID", invalidBlockStreamID). |
|
|
|
Uint64("revertPoint", revertPoint). |
|
|
|
Uint64("revertPoint", revertPoint). |
|
|
|