remove lastresulthash from state

Author: tac0turtle

block/internal/executing/executor.go

@@ -149,7 +149,6 @@ func (e *Executor) Stop() error {
 func (e *Executor) GetLastState() types.State {
 	state := e.getLastState()
 	state.AppHash = bytes.Clone(state.AppHash)
-	state.LastResultsHash = bytes.Clone(state.LastResultsHash)
 
 	return state
 }

block/internal/syncing/syncer.go

@@ -158,7 +158,6 @@ func (s *Syncer) GetLastState() types.State {
 
 	stateCopy := *state
 	stateCopy.AppHash = bytes.Clone(state.AppHash)
-	stateCopy.LastResultsHash = bytes.Clone(state.LastResultsHash)
 
 	return stateCopy
 }

docs/adr/adr-004-core-types.md

@@ -56,15 +56,9 @@ type Header struct {
     LastHeaderHash [32]byte
 
     // hashes of block data
-    LastCommitHash     [32]byte // commit from aggregator(s) from the last block
     DataHash           [32]byte // Block.Data root aka Transactions
-    ConsensusHash      [32]byte // consensus params for current block
     AppHash            [32]byte  // state after applying txs from the current block
 
-    // root hash of all results from the txs from the previous block
-    // This is ABCI specific but smart-contract chains require some way of committing to transaction receipts/results.
-    LastResultsHash [32]byte
-
 
     // Note that the address can be derived from the pubkey which can be derived
     // from the signature when using secp256k.

docs/adr/adr-015-rollkit-minimal-header.md

@@ -106,14 +106,11 @@ This minimal Rollkit header can be transformed to be tailored to a specific exec
 This header can be transformed into an ABCI-specific header for IBC compatibility.
 
 - `Version`: Required by IBC clients to correctly interpret the block's structure and contents.
-- `LastCommitHash`: The hash of the previous block's commit, used by IBC clients to verify the legitimacy of the block's state transitions.
 - `DataHash`: A hash of the block's transaction data, enabling IBC clients to verify that the data has not been tampered with. Can be constructed from unpacking the `DataCommitment` in Rollkit header.
 - `ValidatorHash`: Current validator set's hash, which IBC clients use to verify that the block was validated by the correct set of validators. This can be the IBC attester set of the chain for backward compatibility with the IBC Tendermint client, if needed.
 - `NextValidatorsHash`: The hash of the next validator set, allowing IBC clients to anticipate and verify upcoming validators.
-- `ConsensusHash`: Denotes the hash of the consensus parameters, ensuring that IBC clients are aligned with the consensus rules of the blockchain.
 - `AppHash`: Same as the `StateRoot` in the Rollkit Header.
 - `EvidenceHash`: A hash of evidence of any misbehavior by validators, which IBC clients use to assess the trustworthiness of the validator set.
-- `LastResultsHash`: Root hash of all results from the transactions from the previous block.
 - `ProposerAddress`: The address of the block proposer, allowing IBC clients to track and verify the entities proposing new blocks. Can be constructed from the `extraData` field in the Rollkit Header.
 
 #### Transformation to ABCI Header
@@ -139,18 +136,12 @@ This header can be transformed into an ABCI-specific header for IBC compatibilit
 ├─────────────────────┼───────────────────────┤
 │ Version             │ Added for IBC         │
 ├─────────────────────┼───────────────────────┤
-│ LastCommitHash      │ Added for IBC         │
-├─────────────────────┼───────────────────────┤
 │ ValidatorHash       │ Added for IBC         │
 ├─────────────────────┼───────────────────────┤
 │ NextValidatorsHash  │ Added for IBC         │
 ├─────────────────────┼───────────────────────┤
-│ ConsensusHash       │ Added for IBC         │
-├─────────────────────┼───────────────────────┤
 │ EvidenceHash        │ Added for IBC         │
 ├─────────────────────┼───────────────────────┤
-│ LastResultsHash     │ Added for IBC         │
-├─────────────────────┼───────────────────────┤
 │ ProposerAddress     │ From ExtraData        │
 └─────────────────────┴───────────────────────┘
 ```

docs/learn/specs/block-validity.md

@@ -78,8 +78,6 @@ SignedHeader.Verify(untrustedHeader *SignedHeader)
       return error "headers are not adjacent"
     // Verify the link to previous header
     verify untrustedHeader.LastHeaderHash == h.Header.Hash()
-    // Verify LastCommit hash matches previous signature
-    verify untrustedHeader.LastCommitHash == sh.Signature.GetCommitHash(...)
     // Note: ValidatorHash field exists for compatibility but is not validated
 ```
 
@@ -112,11 +110,8 @@ SignedHeader.Verify(untrustedHeader *SignedHeader)
 | **Header** .        |                                                                                            |                                       |
 | Version             | unused                                                                                     |                                       |
 | LastHeaderHash      | The hash of the previous accepted block                                                    | checked in the `Verify()`` step          |
-| LastCommitHash      | The hash of the previous accepted block's commit                                           | checked in the `Verify()`` step          |
 | DataHash            | Correct hash of the block's Data field                                                     | checked in the `ValidateBasic()`` step   |
-| ConsensusHash       | unused                                                                                     |                                       |
 | AppHash             | The correct state root after executing the block's transactions against the accepted state | checked during block execution        |
-| LastResultsHash     | Correct results from executing transactions                                                | checked during block execution        |
 | ProposerAddress     | Address of the expected proposer                                                           | Must match Signer.Address in SignedHeader |
 | ValidatorHash       | Compatibility field for Tendermint light client                                            | Not validated                             |
 

docs/src/openapi-rpc.json

@@ -949,11 +949,6 @@
             "format": "int64",
             "description": "Data availability height"
           },
-          "last_results_hash": {
-            "type": "string",
-            "format": "byte",
-            "description": "Last results hash (base64-encoded)"
-          },
           "app_hash": {
             "type": "string",
             "format": "byte",

pkg/rpc/server/server.go

@@ -137,7 +137,6 @@ func (s *StoreServer) GetState(
 		LastBlockHeight: state.LastBlockHeight,
 		LastBlockTime:   timestamppb.New(state.LastBlockTime),
 		DaHeight:        state.DAHeight,
-		LastResultsHash: state.LastResultsHash,
 		ChainId:         state.ChainID,
 		Version: &pb.Version{
 			Block: state.Version.Block,

tools/da-debug/main.go

@@ -370,11 +370,7 @@ func displayHeader(header *types.SignedHeader) {
 	fmt.Printf("Chain ID:     %s\n", header.ChainID())
 	fmt.Printf("Version:      Block=%d, App=%d\n", header.Version.Block, header.Version.App)
 	fmt.Printf("Last Header:  %s\n", formatHashField(hex.EncodeToString(header.LastHeaderHash[:])))
-	fmt.Printf("Last Commit:  %s\n", formatHashField(hex.EncodeToString(header.LastCommitHash[:])))
 	fmt.Printf("Data Hash:    %s\n", formatHashField(hex.EncodeToString(header.DataHash[:])))
-	fmt.Printf("Consensus:    %s\n", formatHashField(hex.EncodeToString(header.ConsensusHash[:])))
-	fmt.Printf("App Hash:     %s\n", formatHashField(hex.EncodeToString(header.AppHash[:])))
-	fmt.Printf("Last Results: %s\n", formatHashField(hex.EncodeToString(header.LastResultsHash[:])))
 	fmt.Printf("Validator:    %s\n", formatHashField(hex.EncodeToString(header.ValidatorHash[:])))
 	fmt.Printf("Proposer:     %s\n", formatHashField(hex.EncodeToString(header.ProposerAddress)))
 	fmt.Printf("Signature:    %s\n", formatHashField(hex.EncodeToString(header.Signature)))

types/serialization.go

@@ -271,7 +271,6 @@ func (s *State) ToProto() (*pb.State, error) {
 		LastBlockHeight: s.LastBlockHeight,
 		LastBlockTime:   timestamppb.New(s.LastBlockTime),
 		DaHeight:        s.DAHeight,
-		LastResultsHash: s.LastResultsHash[:],
 		AppHash:         s.AppHash[:],
 	}, nil
 }
@@ -297,11 +296,6 @@ func (s *State) FromProto(other *pb.State) error {
 	} else {
 		s.LastBlockTime = time.Time{}
 	}
-	if other.LastResultsHash != nil {
-		s.LastResultsHash = append([]byte(nil), other.LastResultsHash...)
-	} else {
-		s.LastResultsHash = nil
-	}
 	if other.AppHash != nil {
 		s.AppHash = append([]byte(nil), other.AppHash...)
 	} else {

types/serialization_test.go

@@ -115,7 +115,6 @@ func TestStateRoundTrip(t *testing.T) {
 				LastBlockHeight: 987654321,
 				LastBlockTime:   time.Date(2022, 6, 6, 12, 12, 33, 44, time.UTC),
 				DAHeight:        3344,
-				LastResultsHash: Hash{1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2},
 				AppHash:         Hash{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1},
 			},
 		},
@@ -388,7 +387,7 @@ func TestProtoConversionConsistency_AllTypes(t *testing.T) {
 	assert.Equal(t, d, d2)
 
 	// State
-	s := &State{Version: Version{Block: 1, App: 2}, ChainID: "cid", InitialHeight: 1, LastBlockHeight: 2, LastBlockTime: time.Now().UTC(), DAHeight: 3, LastResultsHash: []byte{1, 2}, AppHash: []byte{3, 4}}
+	s := &State{Version: Version{Block: 1, App: 2}, ChainID: "cid", InitialHeight: 1, LastBlockHeight: 2, LastBlockTime: time.Now().UTC(), DAHeight: 3, AppHash: []byte{3, 4}}
 	protoState, err := s.ToProto()
 	assert.NoError(t, err)
 	s2 := &State{}