diff --git a/pkg/adapter/adapter.go b/pkg/adapter/adapter.go index e682aaa2..2ebedd21 100644 --- a/pkg/adapter/adapter.go +++ b/pkg/adapter/adapter.go @@ -564,9 +564,15 @@ func (a *Adapter) getLastCommit(ctx context.Context, blockHeight uint64) (*cmtty } commitForPrevBlock := &cmttypes.Commit{ - Height: int64(header.Height()), - Round: 0, - BlockID: cmttypes.BlockID{Hash: bytes.HexBytes(header.Hash()), PartSetHeader: cmttypes.PartSetHeader{Total: 1, Hash: bytes.HexBytes(data.Hash())}}, + Height: int64(header.Height()), + Round: 0, + BlockID: cmttypes.BlockID{ + Hash: bytes.HexBytes(header.Hash()), + PartSetHeader: cmttypes.PartSetHeader{ + Total: 1, + Hash: bytes.HexBytes(data.Hash()), + }, + }, Signatures: []cmttypes.CommitSig{ { BlockIDFlag: cmttypes.BlockIDFlagCommit, @@ -601,7 +607,7 @@ func cometCommitToABCICommitInfo(commit *cmttypes.Commit) abci.CommitInfo { votes[i] = abci.VoteInfo{ Validator: abci.Validator{ Address: sig.ValidatorAddress, - Power: 0, + Power: 1, }, BlockIdFlag: cmtprototypes.BlockIDFlag(sig.BlockIDFlag), } diff --git a/pkg/cometcompat/convert.go b/pkg/cometcompat/convert.go index 47e22725..10e89f12 100644 --- a/pkg/cometcompat/convert.go +++ b/pkg/cometcompat/convert.go @@ -14,28 +14,35 @@ import ( // ToABCIBlock converts Rolkit block into block format defined by ABCI. func ToABCIBlock(header *rlktypes.SignedHeader, data *rlktypes.Data, lastCommit *cmttypes.Commit) (*cmttypes.Block, error) { - abciHeader, err := ToABCIHeader(&header.Header) - if err != nil { - return nil, err - } - // validate have one validator if len(header.ProposerAddress) == 0 { return nil, errors.New("proposer address is not set") } - // set commit hash - abciHeader.LastCommitHash = lastCommit.Hash() + abciHeader := cmttypes.Header{ + Version: cmprotoversion.Consensus{ + Block: cmtversion.BlockProtocol, + App: header.Version.App, + }, + Height: int64(header.Height()), //nolint:gosec + Time: header.Time(), + LastBlockID: lastCommit.BlockID, + LastCommitHash: lastCommit.Hash(), + DataHash: cmbytes.HexBytes(header.DataHash), + ConsensusHash: cmbytes.HexBytes(header.ConsensusHash), + AppHash: cmbytes.HexBytes(header.AppHash), + LastResultsHash: cmbytes.HexBytes(header.LastResultsHash), + EvidenceHash: new(cmttypes.EvidenceData).Hash(), + ProposerAddress: header.ProposerAddress, + ChainID: header.ChainID(), + } - // set validator hash - if header.Signer.Address != nil { - validatorHash, err := validatorHasher(header.ProposerAddress, header.Signer.PubKey) - if err != nil { - return nil, fmt.Errorf("failed to compute validator hash: %w", err) - } - abciHeader.ValidatorsHash = cmbytes.HexBytes(validatorHash) - abciHeader.NextValidatorsHash = cmbytes.HexBytes(validatorHash) + validatorHash, err := validatorHasher(header.ProposerAddress, header.Signer.PubKey) + if err != nil { + return nil, fmt.Errorf("failed to compute validator hash: %w", err) } + abciHeader.ValidatorsHash = cmbytes.HexBytes(validatorHash) + abciHeader.NextValidatorsHash = cmbytes.HexBytes(validatorHash) abciBlock := cmttypes.Block{ Header: abciHeader, @@ -44,6 +51,7 @@ func ToABCIBlock(header *rlktypes.SignedHeader, data *rlktypes.Data, lastCommit }, LastCommit: lastCommit, } + abciBlock.Txs = make([]cmttypes.Tx, len(data.Txs)) for i := range data.Txs { abciBlock.Txs[i] = cmttypes.Tx(data.Txs[i]) @@ -68,32 +76,3 @@ func ToABCIBlockMeta(header *rlktypes.SignedHeader, data *rlktypes.Data, lastCom NumTxs: len(cmblock.Txs), }, nil } - -// ToABCIHeader converts Rollkit header to Header format defined in ABCI. -func ToABCIHeader(header *rlktypes.Header) (cmttypes.Header, error) { - return cmttypes.Header{ - Version: cmprotoversion.Consensus{ - Block: cmtversion.BlockProtocol, - App: header.Version.App, - }, - Height: int64(header.Height()), //nolint:gosec - Time: header.Time(), - LastBlockID: cmttypes.BlockID{ - Hash: cmbytes.HexBytes(header.LastHeaderHash), - PartSetHeader: cmttypes.PartSetHeader{ - Total: 0, - Hash: nil, - }, - }, - LastCommitHash: cmbytes.HexBytes(header.LastCommitHash), - DataHash: cmbytes.HexBytes(header.DataHash), - ConsensusHash: cmbytes.HexBytes(header.ConsensusHash), - AppHash: cmbytes.HexBytes(header.AppHash), - LastResultsHash: cmbytes.HexBytes(header.LastResultsHash), - EvidenceHash: new(cmttypes.EvidenceData).Hash(), - ProposerAddress: header.ProposerAddress, - ChainID: header.ChainID(), - // validator hash and next validator hash are not set here - // they are set later (in ToABCIBlock) - }, nil -} diff --git a/pkg/cometcompat/signer.go b/pkg/cometcompat/signer.go index 1f03f6a8..20573ce1 100644 --- a/pkg/cometcompat/signer.go +++ b/pkg/cometcompat/signer.go @@ -9,22 +9,16 @@ import ( func PayloadProvider() types.SignaturePayloadProvider { return func(header *types.Header) ([]byte, error) { - abciHeaderForSigning, err := ToABCIHeader(header) - if err != nil { - return nil, err - } vote := cmtproto.Vote{ - Type: cmtproto.PrecommitType, - Height: int64(header.Height()), //nolint:gosec - Round: 0, - BlockID: cmtproto.BlockID{ - Hash: abciHeaderForSigning.Hash(), - PartSetHeader: cmtproto.PartSetHeader{}, - }, + Type: cmtproto.PrecommitType, + Height: int64(header.Height()), //nolint:gosec + Round: 0, + BlockID: cmtproto.BlockID{}, Timestamp: header.Time(), ValidatorAddress: header.ProposerAddress, ValidatorIndex: 0, } + chainID := header.ChainID() consensusVoteBytes := cmttypes.VoteSignBytes(chainID, &vote) diff --git a/pkg/rpc/core/blocks.go b/pkg/rpc/core/blocks.go index c422eac9..35386cfd 100644 --- a/pkg/rpc/core/blocks.go +++ b/pkg/rpc/core/blocks.go @@ -8,7 +8,6 @@ import ( cmbytes "github.com/cometbft/cometbft/libs/bytes" cmquery "github.com/cometbft/cometbft/libs/pubsub/query" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" ctypes "github.com/cometbft/cometbft/rpc/core/types" rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" cmttypes "github.com/cometbft/cometbft/types" @@ -141,35 +140,6 @@ func Block(ctx *rpctypes.Context, heightPtr *int64) (*ctypes.ResultBlock, error) return nil, err } - // Then re-sign the final ABCI header if we have a signer - if env.Signer != nil { - // Create a vote for the final ABCI header - vote := cmtproto.Vote{ - Type: cmtproto.PrecommitType, - Height: int64(header.Height()), //nolint:gosec - Round: 0, - BlockID: cmtproto.BlockID{ - Hash: abciBlock.Header.Hash(), - PartSetHeader: cmtproto.PartSetHeader{}, - }, - Timestamp: abciBlock.Time, - ValidatorAddress: header.ProposerAddress, - ValidatorIndex: 0, - } - chainID := header.ChainID() - finalSignBytes := cmttypes.VoteSignBytes(chainID, &vote) - - newSignature, err := env.Signer.Sign(finalSignBytes) - if err != nil { - return nil, fmt.Errorf("failed to sign final ABCI header: %w", err) - } - - // Update the signature in the block - if len(abciBlock.LastCommit.Signatures) > 0 { - abciBlock.LastCommit.Signatures[0].Signature = newSignature - } - } - return &ctypes.ResultBlock{ BlockID: cmttypes.BlockID{Hash: abciBlock.Hash()}, Block: abciBlock, @@ -230,52 +200,21 @@ func Commit(ctx *rpctypes.Context, heightPtr *int64) (*ctypes.ResultCommit, erro }, Signatures: []cmttypes.CommitSig{{ BlockIDFlag: cmttypes.BlockIDFlagCommit, - Signature: header.Signature, // This will be updated if we have a signer + Signature: header.Signature, ValidatorAddress: header.ProposerAddress, Timestamp: header.Time(), }}, } - // First apply ToABCIBlock to get the final header with all transformations abciBlock, err := cometcompat.ToABCIBlock(header, rollkitData, abciCommit) if err != nil { return nil, err } - // Then re-sign the final ABCI header if we have a signer - if env.Signer != nil { - // Create a vote for the final ABCI header - vote := cmtproto.Vote{ - Type: cmtproto.PrecommitType, - Height: int64(header.Height()), //nolint:gosec - Round: 0, - BlockID: cmtproto.BlockID{ - Hash: abciBlock.Header.Hash(), - PartSetHeader: cmtproto.PartSetHeader{}, - }, - Timestamp: abciBlock.Time, - ValidatorAddress: header.ProposerAddress, - ValidatorIndex: 0, - } - chainID := header.ChainID() - finalSignBytes := cmttypes.VoteSignBytes(chainID, &vote) - - newSignature, err := env.Signer.Sign(finalSignBytes) - if err != nil { - return nil, fmt.Errorf("failed to sign final ABCI header: %w", err) - } - - // Update the commit with the new signature - abciBlock.LastCommit.Signatures[0].Signature = newSignature - } - - // Update the commit's BlockID to match the final ABCI block hash - abciBlock.LastCommit.BlockID.Hash = abciBlock.Header.Hash() - return &ctypes.ResultCommit{ SignedHeader: cmttypes.SignedHeader{ Header: &abciBlock.Header, - Commit: abciBlock.LastCommit, + Commit: abciCommit, }, CanonicalCommit: true, }, nil diff --git a/pkg/rpc/core/blocks_test.go b/pkg/rpc/core/blocks_test.go index ff99d047..b51de345 100644 --- a/pkg/rpc/core/blocks_test.go +++ b/pkg/rpc/core/blocks_test.go @@ -207,7 +207,7 @@ func TestCommit_VerifyCometBFTLightClientCompatibility_MultipleBlocks(t *testing verifyFirstBlock(t, fixedValSet, chainID, trustedHeader) isFirstBlock = false } else { - verifySubsequentBlock(t, fixedValSet, &trustedHeader, &commitResult.SignedHeader, rollkitHeader, realSignature) + verifySubsequentBlock(t, fixedValSet, &trustedHeader, &commitResult.SignedHeader, rollkitHeader) trustedHeader = commitResult.SignedHeader } } @@ -312,7 +312,7 @@ func verifyFirstBlock(t *testing.T, valSet *cmttypes.ValidatorSet, chainID strin } } -func verifySubsequentBlock(t *testing.T, valSet *cmttypes.ValidatorSet, trustedHeader, newHeader *cmttypes.SignedHeader, rollkitHeader types.Header, realSignature []byte) { +func verifySubsequentBlock(t *testing.T, valSet *cmttypes.ValidatorSet, trustedHeader, newHeader *cmttypes.SignedHeader, rollkitHeader types.Header) { require := require.New(t) trustingPeriod := 3 * time.Hour