From 1ed367b7f6d10a6c75379d14e1580ba99430b755 Mon Sep 17 00:00:00 2001 From: zhouop0 <11733741+zhouop0@users.noreply.github.com> Date: Tue, 20 Feb 2024 16:25:04 +0800 Subject: [PATCH 1/4] fix validation of submitproof --- x/committer/keeper/msg_server.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/x/committer/keeper/msg_server.go b/x/committer/keeper/msg_server.go index a664cc8dc0..43ef580a57 100644 --- a/x/committer/keeper/msg_server.go +++ b/x/committer/keeper/msg_server.go @@ -3,7 +3,6 @@ package keeper import ( "context" "fmt" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/evmos/ethermint/x/committer/types" ) @@ -44,10 +43,10 @@ func (k msgServer) SubmitProof(goCtx context.Context, msg *types.MsgSubmitProof) Status: types.VotingStatus, } - if lastProposal.EndIndex+1 != proposal.StartIndex { + if lastProposal.EndIndex+1 >= proposal.StartIndex { return &types.MsgSubmitProofResponse{}, fmt.Errorf( - "proposal start index must equal last proposal end index + 1, "+ + "proposal start index must be equal or greater than last proposal end index + 1, "+ "last proposal end index: %s", fmt.Sprint(lastProposal.EndIndex)) } From 0fb092f5d732bf4e14600bf62c96383796704485 Mon Sep 17 00:00:00 2001 From: zhouop0 <11733741+zhouop0@users.noreply.github.com> Date: Wed, 21 Feb 2024 14:36:59 +0800 Subject: [PATCH 2/4] fix validation of submitproof --- x/committer/keeper/msg_server.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/x/committer/keeper/msg_server.go b/x/committer/keeper/msg_server.go index 43ef580a57..816c4b374f 100644 --- a/x/committer/keeper/msg_server.go +++ b/x/committer/keeper/msg_server.go @@ -43,10 +43,11 @@ func (k msgServer) SubmitProof(goCtx context.Context, msg *types.MsgSubmitProof) Status: types.VotingStatus, } - if lastProposal.EndIndex+1 >= proposal.StartIndex { + if !(lastProposal.EndIndex == 0 && proposal.StartIndex == 1) && + !(lastProposal.EndIndex != 0 && lastProposal.EndIndex == proposal.StartIndex) { return &types.MsgSubmitProofResponse{}, fmt.Errorf( - "proposal start index must be equal or greater than last proposal end index + 1, "+ + "proposal start index must equal last proposal end index, "+ "last proposal end index: %s", fmt.Sprint(lastProposal.EndIndex)) } From 1783688a5e7b1a9de1c70f1a3133d0ae008e487a Mon Sep 17 00:00:00 2001 From: zhouop0 <11733741+zhouop0@users.noreply.github.com> Date: Wed, 21 Feb 2024 14:48:13 +0800 Subject: [PATCH 3/4] format --- x/committer/keeper/msg_server.go | 1 + 1 file changed, 1 insertion(+) diff --git a/x/committer/keeper/msg_server.go b/x/committer/keeper/msg_server.go index 816c4b374f..a4647a7c24 100644 --- a/x/committer/keeper/msg_server.go +++ b/x/committer/keeper/msg_server.go @@ -3,6 +3,7 @@ package keeper import ( "context" "fmt" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/evmos/ethermint/x/committer/types" ) From 99ea5da10754dfc7574d5a176adf8f2720a7d19f Mon Sep 17 00:00:00 2001 From: zhouop0 <11733741+zhouop0@users.noreply.github.com> Date: Wed, 21 Feb 2024 16:19:22 +0800 Subject: [PATCH 4/4] format --- x/committer/keeper/msg_server.go | 4 +++- x/committer/keeper/msg_server_test.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/x/committer/keeper/msg_server.go b/x/committer/keeper/msg_server.go index a4647a7c24..cfd9ae76f3 100644 --- a/x/committer/keeper/msg_server.go +++ b/x/committer/keeper/msg_server.go @@ -48,7 +48,9 @@ func (k msgServer) SubmitProof(goCtx context.Context, msg *types.MsgSubmitProof) !(lastProposal.EndIndex != 0 && lastProposal.EndIndex == proposal.StartIndex) { return &types.MsgSubmitProofResponse{}, fmt.Errorf( - "proposal start index must equal last proposal end index, "+ + "if last proposal end index is 0, then proposal start index must be 1, "+ + " else if last proposal end index is not 0, then proposal start"+ + " index must equal last proposal end index, "+ "last proposal end index: %s", fmt.Sprint(lastProposal.EndIndex)) } diff --git a/x/committer/keeper/msg_server_test.go b/x/committer/keeper/msg_server_test.go index fae5292fe4..b6fe0a05ca 100644 --- a/x/committer/keeper/msg_server_test.go +++ b/x/committer/keeper/msg_server_test.go @@ -62,7 +62,7 @@ func TestSubmitProof(t *testing.T) { EndIndex: 11, }, isError: true, - errMsg: "proposal start index must equal last proposal end index + 1", + errMsg: "proposal start index must equal last proposal end index", preRun: func(ctx sdk.Context, k keeper.Keeper) { k.SetLastProposal(ctx, types.Proposal{ Id: 1,