feat: fix IBC

go.mod

@@ -27,8 +27,8 @@ require (
 	github.com/libp2p/go-libp2p-pubsub v0.13.1
 	github.com/multiformats/go-multiaddr v0.15.0
 	github.com/prometheus/client_golang v1.22.0
-	github.com/rollkit/rollkit v0.14.2-0.20250526094218-4a5686055970
-	github.com/rollkit/rollkit/core v0.0.0-20250526094218-4a5686055970
+	github.com/rollkit/rollkit v0.14.2-0.20250529164851-d4b4a1e88558
+	github.com/rollkit/rollkit/core v0.0.0-20250529164851-d4b4a1e88558
 	github.com/rollkit/rollkit/da v0.0.0-20250526094218-4a5686055970
 	github.com/rollkit/rollkit/sequencers/single v0.0.0-20250526094218-4a5686055970
 	github.com/rs/cors v1.11.1

go.sum

@@ -1004,10 +1004,10 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
-github.com/rollkit/rollkit v0.14.2-0.20250526094218-4a5686055970 h1:KL0gIjEEMf9ETxsN4iGj707q8w8v6HJVngMOhex9mnY=
-github.com/rollkit/rollkit v0.14.2-0.20250526094218-4a5686055970/go.mod h1:7IgdPhN0q+TyVnzrNyMY6XIta2Tv+xUeQ82XAnHk9X0=
-github.com/rollkit/rollkit/core v0.0.0-20250526094218-4a5686055970 h1:CM3cIruk4DwrdcTjfvYJpK4YmucSe4AWyLRNulRbDKs=
-github.com/rollkit/rollkit/core v0.0.0-20250526094218-4a5686055970/go.mod h1:0RhbqC8Is970KRhr6zPUQOZkmKt6/WqPRDQWfd2P7P0=
+github.com/rollkit/rollkit v0.14.2-0.20250529164851-d4b4a1e88558 h1:LenIlcgTjZ89MtiYa+2rx1l84hs0jKrxkhjfD3AJcSQ=
+github.com/rollkit/rollkit v0.14.2-0.20250529164851-d4b4a1e88558/go.mod h1:Gw1i+hGmPp9Y7b05SXlqGj+tnXhzaiW/xs4wboXsEL0=
+github.com/rollkit/rollkit/core v0.0.0-20250529164851-d4b4a1e88558 h1:0jWzjfP/DQSdsRYnIMPNAD7itd8Oq7roV3cu9MddTEA=
+github.com/rollkit/rollkit/core v0.0.0-20250529164851-d4b4a1e88558/go.mod h1:0RhbqC8Is970KRhr6zPUQOZkmKt6/WqPRDQWfd2P7P0=
 github.com/rollkit/rollkit/da v0.0.0-20250526094218-4a5686055970 h1:PnnQLIkI119NALSqI91peceGsqnBVyBBeyunk6auTpM=
 github.com/rollkit/rollkit/da v0.0.0-20250526094218-4a5686055970/go.mod h1:MqbHTMhjb1PGbGaZ7bVddCm5OJg1+GMVEPpERdsO058=
 github.com/rollkit/rollkit/sequencers/single v0.0.0-20250526094218-4a5686055970 h1:vQVPtGxKquSxE74CtA/kv2OmtyIDKivKYT8AcRjFNak=

pkg/adapter/adapter.go

@@ -9,8 +9,10 @@ import (
 	"cosmossdk.io/log"
 	abci "github.com/cometbft/cometbft/abci/types"
 	"github.com/cometbft/cometbft/config"
+	"github.com/cometbft/cometbft/libs/bytes"
 	"github.com/cometbft/cometbft/mempool"
 	corep2p "github.com/cometbft/cometbft/p2p"
+	types1 "github.com/cometbft/cometbft/proto/tendermint/types"
 	cmtstate "github.com/cometbft/cometbft/state"
 	cmttypes "github.com/cometbft/cometbft/types"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
@@ -25,6 +27,7 @@ import (
 	rollnode "github.com/rollkit/rollkit/node"
 	rollkitp2p "github.com/rollkit/rollkit/pkg/p2p"
 	rstore "github.com/rollkit/rollkit/pkg/store"
+	"github.com/rollkit/rollkit/types"
 
 	"github.com/rollkit/go-execution-abci/pkg/p2p"
 )
@@ -244,6 +247,7 @@ func (a *Adapter) InitChain(ctx context.Context, genesisTime time.Time, initialH
 	} else {
 		s.ConsensusParams = cmttypes.ConsensusParamsFromProto(consensusParams)
 	}
+	s.ChainID = chainID
 
 	vals, err := cmttypes.PB2TM.ValidatorUpdates(res.Validators)
 	if err != nil {
@@ -279,6 +283,7 @@ func (a *Adapter) ExecuteTxs(
 	blockHeight uint64,
 	timestamp time.Time,
 	prevStateRoot []byte,
+	metadata map[string]interface{},
 ) ([]byte, uint64, error) {
 	execStart := time.Now()
 	defer func() {
@@ -287,19 +292,53 @@ func (a *Adapter) ExecuteTxs(
 	a.Logger.Info("Executing block", "height", blockHeight, "num_txs", len(txs), "timestamp", timestamp)
 	a.Metrics.TxsExecutedPerBlock.Observe(float64(len(txs)))
 
+	var headerHash types.Hash
+	if h, ok := metadata[types.HeaderHashKey]; ok {
+		headerHash = h.(types.Hash)
+	} else {
+		a.Logger.Info("header hash not found in metadata, running genesis block")
+	}
+
 	s, err := a.Store.LoadState(ctx)
 	if err != nil {
 		return nil, 0, fmt.Errorf("failed to load state: %w", err)
 	}
 
+	var proposedLastCommit abci.CommitInfo
+	if blockHeight > 1 {
+		header, data, err := a.RollkitStore.GetBlockData(ctx, blockHeight-1)
+		if err != nil {
+			return nil, 0, fmt.Errorf("failed to get previous block data: %w", err)
+		}
+
+		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())}},
+			Signatures: []cmttypes.CommitSig{
+				{
+					BlockIDFlag:      cmttypes.BlockIDFlagCommit,
+					ValidatorAddress: cmttypes.Address(header.ProposerAddress),
+					Timestamp:        header.Time(),
+					Signature:        header.Signature,
+				},
+			},
+		}
+		proposedLastCommit = cometCommitToABCICommitInfo(commitForPrevBlock)
+	} else {
+		// For the first block, ProposedLastCommit is empty
+		proposedLastCommit = abci.CommitInfo{Round: 0, Votes: []abci.VoteInfo{}}
+	}
+
 	ppResp, err := a.App.ProcessProposal(&abci.RequestProcessProposal{
-		Txs:                txs,
-		ProposedLastCommit: abci.CommitInfo{},
-		Hash:               prevStateRoot,
+		Hash:               headerHash,
 		Height:             int64(blockHeight),
 		Time:               timestamp,
-		NextValidatorsHash: s.NextValidators.Hash(),
+		Txs:                txs,
+		ProposedLastCommit: proposedLastCommit,
+		Misbehavior:        []abci.Misbehavior{},
 		ProposerAddress:    s.Validators.Proposer.Address,
+		NextValidatorsHash: s.NextValidators.Hash(),
 	})
 	if err != nil {
 		return nil, 0, err
@@ -310,17 +349,24 @@ func (a *Adapter) ExecuteTxs(
 	}
 
 	fbResp, err := a.App.FinalizeBlock(&abci.RequestFinalizeBlock{
-		Txs:                txs,
-		Hash:               prevStateRoot,
-		Height:             int64(blockHeight),
-		Time:               timestamp,
+		Hash:               headerHash,
 		NextValidatorsHash: s.NextValidators.Hash(),
 		ProposerAddress:    s.Validators.Proposer.Address,
+		Height:             int64(blockHeight),
+		Time:               timestamp,
+		DecidedLastCommit: abci.CommitInfo{
+			Round: 0,
+			Votes: nil,
+		},
+		Txs: txs,
 	})
 	if err != nil {
 		return nil, 0, err
 	}
 
+	s.AppHash = fbResp.AppHash
+	s.LastBlockHeight = int64(blockHeight)
+
 	nValSet := s.NextValidators.Copy()
 
 	validatorUpdates, err := cmttypes.PB2TM.ValidatorUpdates(fbResp.ValidatorUpdates)
@@ -404,8 +450,46 @@ func (a *Adapter) ExecuteTxs(
 	for i := range txs {
 		cmtTxs[i] = txs[i]
 	}
-	block := s.MakeBlock(int64(blockHeight), cmtTxs, &cmttypes.Commit{Height: int64(blockHeight)}, nil, s.Validators.Proposer.Address)
-	fireEvents(a.Logger, a.EventBus, block, cmttypes.BlockID{}, fbResp, validatorUpdates)
+
+	var commit = &cmttypes.Commit{
+		Height: int64(blockHeight),
+		Round:  0,
+		Signatures: []cmttypes.CommitSig{
+			{
+				BlockIDFlag:      cmttypes.BlockIDFlagCommit,
+				ValidatorAddress: s.Validators.Proposer.Address,
+				Timestamp:        time.Now(),
+				Signature:        []byte{},
+			},
+		},
+	}
+
+	if blockHeight > 1 {
+		header, data, err := a.RollkitStore.GetBlockData(ctx, blockHeight-1)
+		if err != nil {
+			return nil, 0, fmt.Errorf("failed to get previous block data: %w", err)
+		}
+
+		commit = &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())}},
+			Signatures: []cmttypes.CommitSig{
+				{
+					BlockIDFlag:      cmttypes.BlockIDFlagCommit,
+					ValidatorAddress: cmttypes.Address(header.ProposerAddress),
+					Timestamp:        header.Time(),
+					Signature:        header.Signature,
+				},
+			},
+		}
+	}
+
+	block := s.MakeBlock(int64(blockHeight), cmtTxs, commit, nil, s.Validators.Proposer.Address)
+
+	currentBlockID := cmttypes.BlockID{Hash: block.Hash(), PartSetHeader: cmttypes.PartSetHeader{Total: 1, Hash: block.DataHash}}
+
+	fireEvents(a.Logger, a.EventBus, block, currentBlockID, fbResp, validatorUpdates)
 
 	a.Logger.Info("block executed successfully", "height", blockHeight, "appHash", fmt.Sprintf("%X", fbResp.AppHash))
 	return fbResp.AppHash, uint64(s.ConsensusParams.Block.MaxBytes), nil
@@ -521,3 +605,34 @@ func (a *Adapter) GetTxs(ctx context.Context) ([][]byte, error) {
 func (a *Adapter) SetFinal(ctx context.Context, blockHeight uint64) error {
 	return nil
 }
+
+func cometCommitToABCICommitInfo(commit *cmttypes.Commit) abci.CommitInfo {
+	if commit == nil {
+		return abci.CommitInfo{
+			Round: 0,
+			Votes: []abci.VoteInfo{},
+		}
+	}
+
+	if len(commit.Signatures) == 0 {
+		return abci.CommitInfo{
+			Round: commit.Round,
+			Votes: []abci.VoteInfo{},
+		}
+	}
+
+	votes := make([]abci.VoteInfo, len(commit.Signatures))
+	for i, sig := range commit.Signatures {
+		votes[i] = abci.VoteInfo{
+			Validator: abci.Validator{
+				Address: sig.ValidatorAddress,
+				Power:   0,
+			},
+			BlockIdFlag: types1.BlockIDFlag(sig.BlockIDFlag),
+		}
+	}
+	return abci.CommitInfo{
+		Round: commit.Round,
+		Votes: votes,
+	}
+}

pkg/adapter/adapter_test.go

@@ -87,7 +87,7 @@ func TestExecuteFiresEvents(t *testing.T) {
 			require.NoError(t, adapter.Store.SaveState(ctx, stateFixture()))
 
 			// when
-			_, _, err := adapter.ExecuteTxs(ctx, spec.txs, 1, timestamp, bytes.Repeat([]byte{1}, 32))
+			_, _, err := adapter.ExecuteTxs(ctx, spec.txs, 1, timestamp, bytes.Repeat([]byte{1}, 32), nil)
 			if spec.expErr {
 				require.Error(t, err)
 				blockMx.RLock()

pkg/common/convert.go

@@ -5,8 +5,9 @@ import (
 	"time"
 
 	cmbytes "github.com/cometbft/cometbft/libs/bytes"
-	cmversion "github.com/cometbft/cometbft/proto/tendermint/version"
+	cmprotoversion "github.com/cometbft/cometbft/proto/tendermint/version"
 	cmttypes "github.com/cometbft/cometbft/types"
+	cmtversion "github.com/cometbft/cometbft/version"
 
 	rlktypes "github.com/rollkit/rollkit/types"
 )
@@ -15,14 +16,14 @@ import (
 // Caller should fill all the fields that are not available in Rollkit header (like ChainID).
 func ToABCIHeader(header *rlktypes.Header) (cmttypes.Header, error) {
 	return cmttypes.Header{
-		Version: cmversion.Consensus{
-			Block: header.Version.Block,
+		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[:]),
+			Hash: cmbytes.HexBytes(header.LastHeaderHash),
 			PartSetHeader: cmttypes.PartSetHeader{
 				Total: 0,
 				Hash:  nil,
@@ -94,7 +95,7 @@ func ToABCIBlockMeta(header *rlktypes.SignedHeader, data *rlktypes.Data) (*cmtty
 
 // ToABCICommit returns a commit format defined by ABCI.
 // Other fields (especially ValidatorAddress and Timestamp of Signature) have to be filled by caller.
-func ToABCICommit(height uint64, hash rlktypes.Hash, val cmttypes.Address, time time.Time, signature rlktypes.Signature) *cmttypes.Commit {
+func ToABCICommit(height uint64, hash []byte, val cmttypes.Address, time time.Time, signature rlktypes.Signature) *cmttypes.Commit {
 	return &cmttypes.Commit{
 		Height: int64(height), //nolint:gosec
 		Round:  0,

pkg/rollkit_adapter/commit_hasher.go

@@ -0,0 +1,16 @@
+package rollkitadapter
+
+import (
+	"github.com/rollkit/rollkit/types"
+
+	"github.com/rollkit/go-execution-abci/pkg/rpc"
+)
+
+func CreateCometBFTCommitHasher() types.CommitHashProvider {
+	return func(signature *types.Signature, header *types.Header, proposerAddress []byte) (types.Hash, error) {
+		abciCommit := rpc.GetABCICommit(header.Height(), header.Hash(), proposerAddress, header.Time(), *signature)
+		abciCommit.Signatures[0].ValidatorAddress = proposerAddress
+		abciCommit.Signatures[0].Timestamp = header.Time()
+		return types.Hash(abciCommit.Hash()), nil
+	}
+}

pkg/rollkit_adapter/header_hasher.go

@@ -0,0 +1,18 @@
+package rollkitadapter
+
+import (
+	"github.com/rollkit/rollkit/types"
+
+	"github.com/rollkit/go-execution-abci/pkg/common"
+)
+
+func CreateCometBFTHeaderHasher() types.HeaderHasher {
+	return func(header *types.Header) (types.Hash, error) {
+		abciHeader, err := common.ToABCIHeader(header)
+		if err != nil {
+			return nil, err
+		}
+
+		return types.Hash(abciHeader.Hash()), nil
+	}
+}

pkg/rollkit_adapter/signer.go

@@ -0,0 +1,35 @@
+package rollkitadapter
+
+import (
+	cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
+	cmtypes "github.com/cometbft/cometbft/types"
+
+	"github.com/rollkit/rollkit/types"
+
+	"github.com/rollkit/go-execution-abci/pkg/rpc"
+)
+
+func CreateCometBFTPayloadProvider() types.SignaturePayloadProvider {
+	return func(header *types.Header, data *types.Data) ([]byte, error) {
+		abciHeaderForSigning, err := rpc.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{},
+			},
+			Timestamp:        header.Time(),
+			ValidatorAddress: header.ProposerAddress,
+			ValidatorIndex:   0,
+		}
+		chainID := header.ChainID()
+		consensusVoteBytes := cmtypes.VoteSignBytes(chainID, &vote)
+
+		return consensusVoteBytes, nil
+	}
+}