Skip to content

x/bor: remove unused MsgBackfillSpans plumbing #598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lucca30 wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

x/bor: remove unused MsgBackfillSpans plumbing #598

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d20424
x/bor: remove unused MsgBackfillSpans plumbing
lucca30 May 28, 2026
5bca995
x/bor: keep MsgBackfillSpans decode-only + drop orphan scaffolding
lucca30 May 28, 2026
747924d
x/bor: restore msg-server handler for replay safety (Amoy audit found…
lucca30 May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 39 additions & 42 deletions api/heimdallv2/bor/tx.pulsar.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 0 additions & 41 deletions api/heimdallv2/bor/tx_grpc.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 1 addition & 8 deletions app/abci_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5089,7 +5089,7 @@ func TestABCI_StressTestWith100Blocks(t *testing.T) {
var msg sdk.Msg

// Alternate between different message types
switch (blockHeight + int64(i)) % 5 {
switch (blockHeight + int64(i)) % 4 {
case 0:
msg = &checkpointTypes.MsgCheckpoint{
Proposer: priv.PubKey().Address().String(),
Expand Down Expand Up @@ -5128,13 +5128,6 @@ func TestABCI_StressTestWith100Blocks(t *testing.T) {
LogIndex: uint64(blockHeight*10 + int64(i)),
BlockNumber: uint64(blockHeight),
}
case 4:
msg = &borTypes.MsgBackfillSpans{
Proposer: priv.PubKey().Address().String(),
ChainId: "1",
LatestSpanId: uint64(blockHeight),
LatestBorSpanId: uint64(blockHeight + 1),
}
}

txBytes, err := buildSignedTx(msg, ctx, priv, app)
Expand Down
2 changes: 0 additions & 2 deletions metrics/api/bor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ const (

ProposeSpanMethod = "ProposeSpan"
BorUpdateParamsMethod = "UpdateParams"
BackfillSpansMethod = "BackfillSpans"
VoteProducersMethod = "VoteProducers"
ProducerDowntimeMethod = "ProducerDowntime"

Expand All @@ -30,6 +29,5 @@ const (
// Post message handler methods.

PostHandleMsgSpanMethod = "PostHandleMsgSpan"
PostHandleMsgBackfillSpansMethod = "PostHandleMsgBackfillSpans"
PostHandleMsgSetProducerDowntimeMethod = "PostHandleMsgSetProducerDowntime"
)
10 changes: 6 additions & 4 deletions proto/heimdallv2/bor/tx.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ service Msg {
// UpdateParams defines a method to update the bor module parameters.
// Only the governance authority can execute this.
rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse);
Comment thread
lucca30 marked this conversation as resolved.
// BackfillSpans defines a method to backfill missing spans.
// This is used during chain recovery or when spans need to be reconstructed.
rpc BackfillSpans(MsgBackfillSpans) returns (MsgBackfillSpansResponse);
// VoteProducers defines a method for validators to submit their producer
// votes.
rpc VoteProducers(MsgVoteProducers) returns (MsgVoteProducersResponse);
Expand Down Expand Up @@ -67,7 +64,12 @@ message MsgUpdateParams {
// MsgUpdateParamsResponse defines the response for MsgUpdateParams.
message MsgUpdateParamsResponse {}

// MsgBackfillSpans defines the message for backfilling missing spans.
// MsgBackfillSpans is retained as a decode-only type so any historical block
// containing a MsgBackfillSpans tx remains decodable by the upgraded binary.
// The rpc method, side handler, post handler, and msg-server handler were all
// removed; this message is registered on the interface registry solely to keep
// TxDecode from failing during replay. Do not reintroduce a handler for this
// type — define a fresh message if backfill is ever needed.
message MsgBackfillSpans {
option (amino.name) = "heimdallv2/bor/MsgBackfillSpans";
option (cosmos.msg.v1.signer) = "proposer";
Expand Down
89 changes: 0 additions & 89 deletions x/bor/keeper/msg_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,95 +170,6 @@ func (srv msgServer) VoteProducers(ctx context.Context, msg *types.MsgVoteProduc
return &types.MsgVoteProducersResponse{}, nil
}

func (srv msgServer) BackfillSpans(ctx context.Context, msg *types.MsgBackfillSpans) (*types.MsgBackfillSpansResponse, error) {
var err error
start := time.Now()
defer recordBorTransactionMetric(api.BackfillSpansMethod, start, &err)

logger := srv.Logger(ctx)

logger.Debug(helper.LogValidatingExternalCall("MsgSpanBackfill"),
"proposer", msg.Proposer,
"latestSpanId", msg.LatestSpanId,
"latestBorSpanId", msg.LatestBorSpanId,
"chainId", msg.ChainId,
)

_, err = sdk.ValAddressFromHex(msg.Proposer)
if err != nil {
logger.Error(heimdallTypes.ErrMsgInvalidProposerAddress, "error", err)
return nil, errors.Wrapf(err, heimdallTypes.ErrMsgInvalidProposerAddress)
}

chainParams, err := srv.ck.GetParams(ctx)
if err != nil {
logger.Error("Failed to get chain params", "error", err)
return nil, errors.Wrapf(err, "failed to get chain params")
}

if !helper.ValidateChainID(msg.ChainId, chainParams.ChainParams.BorChainId, logger, "bor") {
return nil, types.ErrInvalidChainID
}

latestSpan, err := srv.GetLastSpan(ctx)
if err != nil {
logger.Error("Failed to get latest span", "error", err)
return nil, errors.Wrapf(err, "failed to get latest span")
}

if msg.LatestSpanId != latestSpan.Id && msg.LatestSpanId != latestSpan.Id-1 {
logger.Error("Invalid latest span id", "expected",
fmt.Sprintf("%d or %d", latestSpan.Id, latestSpan.Id-1), "got", msg.LatestSpanId)
return nil, types.ErrInvalidSpan
}

if msg.LatestBorSpanId <= msg.LatestSpanId {
logger.Error("Invalid bor span id, expected greater than latest span id",
"latestSpanId", latestSpan.Id,
"latestBorSpanId", msg.LatestBorSpanId,
)
return nil, types.ErrInvalidLastBorSpanID
}

latestMilestone, err := srv.mk.GetLastMilestone(ctx)
if err != nil {
logger.Error("Failed to get latest milestone", "error", err)
return nil, errors.Wrapf(err, "failed to get latest milestone")
}

if latestMilestone == nil {
logger.Error("Latest milestone is nil")
return nil, types.ErrLatestMilestoneNotFound
}

borLastUsedSpan, err := srv.GetSpan(ctx, msg.LatestSpanId)
if err != nil {
logger.Error("Failed to get last used bor span", "error", err)
return nil, errors.Wrapf(err, "failed to get last used bor span")
}

borSpanId, err := types.CalcCurrentBorSpanId(latestMilestone.EndBlock, &borLastUsedSpan)
if err != nil {
logger.Error("Failed to calculate bor span id", "error", err)
return nil, errors.Wrapf(err, "failed to calculate bor span id")
}

if borSpanId != msg.LatestBorSpanId {
logger.Error(
"bor span id mismatch",
"calculatedBorSpanId", borSpanId,
"msgLatestBorSpanId", msg.LatestBorSpanId,
"latestMilestoneEndBlock", latestMilestone.EndBlock,
"latestSpanStartBlock", latestSpan.StartBlock,
"latestSpanEndBlock", latestSpan.EndBlock,
"latestSpanId", latestSpan.Id,
)
return nil, types.ErrInvalidSpan
}

return &types.MsgBackfillSpansResponse{}, nil
}

func (srv msgServer) SetProducerDowntime(ctx context.Context, msg *types.MsgSetProducerDowntime) (*types.MsgSetProducerDowntimeResponse, error) {
var err error
start := time.Now()
Expand Down
Loading
Loading