don't store whole chain index element

explorer/types.go

@@ -299,13 +299,13 @@ type V2BlockData struct {
 // A Block is a block containing wrapped transactions and siacoin
 // outputs for the miner payouts.
 type Block struct {
-	Height            uint64                  `json:"height"`
-	ParentID          types.BlockID           `json:"parentID"`
-	Nonce             uint64                  `json:"nonce"`
-	Timestamp         time.Time               `json:"timestamp"`
-	ChainIndexElement types.ChainIndexElement `json:"chainIndexElement"`
-	MinerPayouts      []SiacoinOutput         `json:"minerPayouts"`
-	Transactions      []Transaction           `json:"transactions"`
+	Height       uint64          `json:"height"`
+	ParentID     types.BlockID   `json:"parentID"`
+	Nonce        uint64          `json:"nonce"`
+	Timestamp    time.Time       `json:"timestamp"`
+	LeafIndex    uint64          `json:"leafIndex"`
+	MinerPayouts []SiacoinOutput `json:"minerPayouts"`
+	Transactions []Transaction   `json:"transactions"`
 
 	V2 *V2BlockData `json:"v2,omitempty"`
 }

persist/sqlite/blocks.go

@@ -14,7 +14,7 @@ func (s *Store) Block(id types.BlockID) (result explorer.Block, err error) {
 	err = s.transaction(func(tx *txn) error {
 		var v2Height uint64
 		var v2Commitment types.Hash256
-		err := tx.QueryRow(`SELECT parent_id, nonce, timestamp, height, chain_index_element, v2_height, v2_commitment FROM blocks WHERE id = ?`, encode(id)).Scan(decode(&result.ParentID), decode(&result.Nonce), decode(&result.Timestamp), &result.Height, decode(&result.ChainIndexElement), decodeNull(&v2Height), decodeNull(&v2Commitment))
+		err := tx.QueryRow(`SELECT parent_id, nonce, timestamp, height, leaf_index, v2_height, v2_commitment FROM blocks WHERE id = ?`, encode(id)).Scan(decode(&result.ParentID), decode(&result.Nonce), decode(&result.Timestamp), &result.Height, decode(&result.LeafIndex), decodeNull(&v2Height), decodeNull(&v2Commitment))
 		if err != nil {
 			return fmt.Errorf("failed to get block: %w", err)
 		}

persist/sqlite/consensus.go

@@ -24,8 +24,7 @@ func addBlock(tx *txn, b types.Block, cie types.ChainIndexElement, height uint64
 		v2Height = encode(b.V2.Height)
 		v2Commitment = encode(b.V2.Commitment)
 	}
-	cie.StateElement.MerkleProof = nil
-	_, err := tx.Exec("INSERT INTO blocks(id, height, parent_id, nonce, timestamp, chain_index_element, v2_height, v2_commitment) VALUES (?, ?, ?, ?, ?, ?, ?, ?);", encode(b.ID()), height, encode(b.ParentID), encode(b.Nonce), encode(b.Timestamp), encode(cie), v2Height, v2Commitment)
+	_, err := tx.Exec("INSERT INTO blocks(id, height, parent_id, nonce, timestamp, leaf_index, v2_height, v2_commitment) VALUES (?, ?, ?, ?, ?, ?, ?, ?);", encode(b.ID()), height, encode(b.ParentID), encode(b.Nonce), encode(b.Timestamp), encode(cie.StateElement.LeafIndex), v2Height, v2Commitment)
 	return err
 }
 

persist/sqlite/init.sql

@@ -9,7 +9,7 @@ CREATE TABLE blocks (
 	parent_id BLOB NOT NULL,
 	nonce BLOB NOT NULL,
 	timestamp INTEGER NOT NULL,
-	chain_index_element BLOB NOT NULL,
+	leaf_index BLOB NOT NULL,
 
 	v2_height INTEGER,
 	v2_commitment BLOB

persist/sqlite/v2consensus_test.go

@@ -79,11 +79,18 @@ func getCIE(t *testing.T, db explorer.Store, bid types.BlockID) types.ChainIndex
 		t.Fatal(err)
 	}
 
-	b.ChainIndexElement.StateElement.MerkleProof, err = db.MerkleProof(b.ChainIndexElement.StateElement.LeafIndex)
+	merkleProof, err := db.MerkleProof(b.LeafIndex)
 	if err != nil {
 		t.Fatal(err)
 	}
-	return b.ChainIndexElement
+	return types.ChainIndexElement{
+		ID: bid,
+		StateElement: types.StateElement{
+			LeafIndex:   b.LeafIndex,
+			MerkleProof: merkleProof,
+		},
+		ChainIndex: types.ChainIndex{ID: bid, Height: b.Height},
+	}
 }
 
 func TestV2ArbitraryData(t *testing.T) {