Algod: support state proofs recoverability

catchup/catchpointService.go

@@ -22,8 +22,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/algorand/go-algorand/stateproof"
-
 	"github.com/algorand/go-deadlock"
 
 	"github.com/algorand/go-algorand/config"
@@ -33,6 +31,7 @@ import (
 	"github.com/algorand/go-algorand/ledger/ledgercore"
 	"github.com/algorand/go-algorand/logging"
 	"github.com/algorand/go-algorand/network"
+	"github.com/algorand/go-algorand/stateproof"
 )
 
 const (
@@ -259,6 +258,7 @@ func (cs *CatchpointCatchupService) processStageInactive() (err error) {
 	if err != nil {
 		return cs.abort(fmt.Errorf("processStageInactive failed to set a catchpoint label : %v", err))
 	}
+
 	err = cs.updateStage(ledger.CatchpointCatchupStateLedgerDownload)
 	if err != nil {
 		return cs.abort(fmt.Errorf("processStageInactive failed to update stage : %v", err))

cmd/catchpointdump/database.go

@@ -17,6 +17,7 @@
 package main
 
 import (
+	"bufio"
 	"context"
 	"database/sql"
 	"fmt"
@@ -63,6 +64,13 @@ var databaseCmd = &cobra.Command{
 			}
 			defer outFile.Close()
 		}
+
+		var version uint64
+		version, err = getVersion(ledgerTrackerFilename, ledgerTrackerStaging)
+		if err != nil {
+			reportErrorf("Unable to read version : %v", err)
+		}
+		printDbVersion(ledgerTrackerStaging, version, outFile)
 		err = printAccountsDatabase(ledgerTrackerFilename, ledgerTrackerStaging, ledger.CatchpointFileHeader{}, outFile, nil)
 		if err != nil {
 			reportErrorf("Unable to print account database : %v", err)
@@ -71,9 +79,56 @@ var databaseCmd = &cobra.Command{
 		if err != nil {
 			reportErrorf("Unable to print key value store : %v", err)
 		}
+		// state proof verification can be found on tracker db version >= 10 or
+		// catchpoint file version >= 7 (i.e staging tables)
+		if !ledgerTrackerStaging && version < 10 || ledgerTrackerStaging && version < ledger.CatchpointFileVersionV7 {
+			return
+		}
+		err = printStateProofVerificationContext(ledgerTrackerFilename, ledgerTrackerStaging, outFile)
+		if err != nil {
+			reportErrorf("Unable to print state proof verification database : %v", err)
+		}
 	},
 }
 
+func printDbVersion(staging bool, version uint64, outFile *os.File) {
+	fileWriter := bufio.NewWriterSize(outFile, 1024*1024)
+	defer fileWriter.Flush()
+
+	if staging {
+		fmt.Fprintf(outFile, "Catchpoint version: %d \n", version)
+	} else {
+		fmt.Fprintf(outFile, "Ledger db version: %d \n", version)
+	}
+}
+
+func getVersion(filename string, staging bool) (uint64, error) {
+	dbAccessor, err := db.MakeAccessor(filename, true, false)
+	if err != nil || dbAccessor.Handle == nil {
+		return 0, err
+	}
+	defer dbAccessor.Close()
+	var version uint64
+	err = dbAccessor.Atomic(func(ctx context.Context, tx *sql.Tx) (err error) {
+		if staging {
+			// writing the version of the catchpoint file start only on ver >= CatchpointFileVersionV7.
+			// in case the catchpoint version does not exists ReadCatchpointStateUint64 returns 0
+			cw := sqlitedriver.NewCatchpointSQLReaderWriter(tx)
+			version, err = cw.ReadCatchpointStateUint64(ctx, trackerdb.CatchpointStateCatchupVersion)
+			return err
+		}
+
+		versionAsInt32, err := db.GetUserVersion(ctx, tx)
+		version = uint64(versionAsInt32)
+		return err
+	})
+	if err != nil {
+		return 0, err
+	}
+
+	return version, nil
+}
+
 var checkCmd = &cobra.Command{
 	Use:   "check",
 	Short: "Performs a consistency checking on the accounts merkle trie",

cmd/catchpointdump/file.go

@@ -47,7 +47,7 @@ import (
 
 var catchpointFile string
 var outFileName string
-var excludedFields *cmdutil.CobraStringSliceValue = cmdutil.MakeCobraStringSliceValue(nil, []string{"version", "catchpoint"})
+var excludedFields = cmdutil.MakeCobraStringSliceValue(nil, []string{"version", "catchpoint"})
 
 func init() {
 	fileCmd.Flags().StringVarP(&catchpointFile, "tar", "t", "", "Specify the catchpoint file (either .tar or .tar.gz) to process")
@@ -127,7 +127,6 @@ var fileCmd = &cobra.Command{
 				}
 				defer outFile.Close()
 			}
-
 			err = printAccountsDatabase("./ledger.tracker.sqlite", true, fileHeader, outFile, excludedFields.GetSlice())
 			if err != nil {
 				reportErrorf("Unable to print account database : %v", err)
@@ -136,6 +135,10 @@ var fileCmd = &cobra.Command{
 			if err != nil {
 				reportErrorf("Unable to print key value store : %v", err)
 			}
+			err = printStateProofVerificationContext("./ledger.tracker.sqlite", true, outFile)
+			if err != nil {
+				reportErrorf("Unable to print state proof verification database : %v", err)
+			}
 		}
 	},
 }
@@ -223,7 +226,7 @@ func loadCatchpointIntoDatabase(ctx context.Context, catchupAccessor ledger.Catc
 		if err != nil {
 			return fileHeader, err
 		}
-		if header.Name == "content.msgpack" {
+		if header.Name == ledger.CatchpointContentFileName {
 			// we already know it's valid, since we validated that above.
 			protocol.Decode(balancesBlockBytes, &fileHeader)
 		}
@@ -434,6 +437,42 @@ func printAccountsDatabase(databaseName string, stagingTables bool, fileHeader l
 	})
 }
 
+func printStateProofVerificationContext(databaseName string, stagingTables bool, outFile *os.File) error {
+	fileWriter := bufio.NewWriterSize(outFile, 1024*1024)
+	defer fileWriter.Flush()
+
+	dbAccessor, err := db.MakeAccessor(databaseName, true, false)
+	if err != nil || dbAccessor.Handle == nil {
+		return err
+	}
+	defer dbAccessor.Close()
+
+	var stateProofVerificationContext []ledgercore.StateProofVerificationContext
+	err = dbAccessor.Atomic(func(ctx context.Context, tx *sql.Tx) (err error) {
+		if stagingTables {
+			stateProofVerificationContext, err = sqlitedriver.MakeStateProofVerificationReader(tx).GetAllSPContextsFromCatchpointTbl(ctx)
+		} else {
+			stateProofVerificationContext, err = sqlitedriver.MakeStateProofVerificationReader(tx).GetAllSPContexts(ctx)
+		}
+		return err
+	})
+
+	if err != nil {
+		return err
+	}
+
+	fmt.Fprintf(fileWriter, "State Proof Verification Data:\n")
+	for _, ctx := range stateProofVerificationContext {
+		jsonData, err := json.Marshal(ctx)
+		if err != nil {
+			return err
+		}
+		fmt.Fprintf(fileWriter, "%d : %s\n", ctx.LastAttestedRound, string(jsonData))
+	}
+
+	return nil
+}
+
 func printKeyValue(writer *bufio.Writer, key, value []byte) {
 	var pretty string
 	ai, rest, err := apps.SplitBoxKey(string(key))

cmd/catchpointdump/net.go

@@ -361,6 +361,10 @@ func loadAndDump(addr string, tarFile string, genesisInitState ledgercore.InitSt
 		if err != nil {
 			return err
 		}
+		err = printStateProofVerificationContext("./ledger.tracker.sqlite", true, outFile)
+		if err != nil {
+			return err
+		}
 
 	}
 	return nil

cmd/tealdbg/localLedger.go

@@ -285,6 +285,10 @@ func (l *localLedger) BlockHdrCached(basics.Round) (bookkeeping.BlockHeader, err
 	return bookkeeping.BlockHeader{}, nil
 }
 
+func (l *localLedger) GetStateProofVerificationContext(_ basics.Round) (*ledgercore.StateProofVerificationContext, error) {
+	return nil, fmt.Errorf("localLedger: GetStateProofVerificationContext, needed for state proof verification, is not implemented in debugger")
+}
+
 func (l *localLedger) CheckDup(config.ConsensusParams, basics.Round, basics.Round, basics.Round, transactions.Txid, ledgercore.Txlease) error {
 	return nil
 }

config/consensus.go

@@ -487,6 +487,14 @@ type ConsensusParams struct {
 	// EnablePrecheckECDSACurve means that ecdsa_verify opcode will bail early,
 	// returning false, if pubkey is not on the curve.
 	EnablePrecheckECDSACurve bool
+
+	// StateProofUseTrackerVerification specifies whether the node will use data from state proof verification tracker
+	// in order to verify state proofs.
+	StateProofUseTrackerVerification bool
+
+	// EnableCatchpointsWithSPContexts specifies when to re-enable version 7 catchpoints.
+	// Version 7 includes state proof verification contexts
+	EnableCatchpointsWithSPContexts bool
 }
 
 // PaysetCommitType enumerates possible ways for the block header to commit to
@@ -1255,6 +1263,9 @@ func initConsensusProtocols() {
 	vFuture.LogicSigVersion = 9 // When moving this to a release, put a new higher LogicSigVersion here
 	vFuture.EnablePrecheckECDSACurve = true
 
+	vFuture.StateProofUseTrackerVerification = true
+	vFuture.EnableCatchpointsWithSPContexts = true
+
 	Consensus[protocol.ConsensusFuture] = vFuture
 
 	// vAlphaX versions are an separate series of consensus parameters and versions for alphanet