Spec4 fixup

config/consensus.go

@@ -1516,32 +1516,44 @@ func initConsensusProtocols() {
 	// but our current max is 150000 so using that :
 	v38.ApprovedUpgrades[protocol.ConsensusV39] = 150000
 
-	// ConsensusFuture is used to test features that are implemented
-	// but not yet released in a production protocol version.
-	vFuture := v39
-	vFuture.ApprovedUpgrades = map[protocol.ConsensusVersion]uint64{}
+	v40 := v39
+	v40.ApprovedUpgrades = map[protocol.ConsensusVersion]uint64{}
 
-	vFuture.LogicSigVersion = 11 // When moving this to a release, put a new higher LogicSigVersion here
+	v40.LogicSigVersion = 11
 
-	vFuture.EnableLogicSigSizePooling = true
+	v40.EnableLogicSigSizePooling = true
 
-	vFuture.Payouts.Enabled = true
-	vFuture.Payouts.Percent = 50
-	vFuture.Payouts.GoOnlineFee = 2_000_000         // 2 algos
-	vFuture.Payouts.MinBalance = 30_000_000_000     // 30,000 algos
-	vFuture.Payouts.MaxBalance = 70_000_000_000_000 // 70M algos
-	vFuture.Payouts.MaxMarkAbsent = 32
-	vFuture.Payouts.ChallengeInterval = 1000
-	vFuture.Payouts.ChallengeGracePeriod = 200
-	vFuture.Payouts.ChallengeBits = 5
+	v40.Payouts.Enabled = true
+	v40.Payouts.Percent = 50
+	v40.Payouts.GoOnlineFee = 2_000_000         // 2 algos
+	v40.Payouts.MinBalance = 30_000_000_000     // 30,000 algos
+	v40.Payouts.MaxBalance = 70_000_000_000_000 // 70M algos
+	v40.Payouts.MaxMarkAbsent = 32
+	v40.Payouts.ChallengeInterval = 1000
+	v40.Payouts.ChallengeGracePeriod = 200
+	v40.Payouts.ChallengeBits = 5
 
-	vFuture.Bonus.BaseAmount = 10_000_000 // 10 Algos
+	v40.Bonus.BaseAmount = 10_000_000 // 10 Algos
 	// 2.9 sec rounds gives about 10.8M rounds per year.
-	vFuture.Bonus.DecayInterval = 1_000_000 // .99^(10.8M/1M) ~ .897. So ~10% decay per year
+	v40.Bonus.DecayInterval = 1_000_000 // .99^(10.8M/1M) ~ .897. So ~10% decay per year
+
+	v40.Heartbeat = true
+
+	v40.EnableCatchpointsWithOnlineAccounts = true
 
-	vFuture.Heartbeat = true
+	Consensus[protocol.ConsensusV40] = v40
+
+	// v39 can be upgraded to v40, with an update delay of 7d:
+	// 208000 = (7 * 24 * 60 * 60 / 2.9 ballpark round times)
+	// our current max is 250000
+	v39.ApprovedUpgrades[protocol.ConsensusV40] = 208000
+
+	// ConsensusFuture is used to test features that are implemented
+	// but not yet released in a production protocol version.
+	vFuture := v40
+	vFuture.ApprovedUpgrades = map[protocol.ConsensusVersion]uint64{}
 
-	vFuture.EnableCatchpointsWithOnlineAccounts = true
+	vFuture.LogicSigVersion = 12 // When moving this to a release, put a new higher LogicSigVersion here
 
 	Consensus[protocol.ConsensusFuture] = vFuture
 

config/version.go

@@ -29,11 +29,11 @@ import (
 
 // VersionMajor is the Major semantic version number (#.y.z) - changed when first public release (0.y.z -> 1.y.z)
 // and when backwards compatibility is broken.
-const VersionMajor = 3
+const VersionMajor = 4
 
 // VersionMinor is the Minor semantic version number (x.#.z) - changed when backwards-compatible features are introduced.
 // Not enforced until after initial public release (x > 0).
-const VersionMinor = 28
+const VersionMinor = 0
 
 // Version is the type holding our full version information.
 type Version struct {

data/bookkeeping/block_test.go

@@ -39,12 +39,22 @@ import (
 var delegatesMoney = basics.MicroAlgos{Raw: 1000 * 1000 * 1000}
 
 var proto1 = protocol.ConsensusVersion("Test1")
+var proto1NoBonus = protocol.ConsensusVersion("Test1NoBonus")
 var proto2 = protocol.ConsensusVersion("Test2")
 var proto3 = protocol.ConsensusVersion("Test3")
 var protoUnsupported = protocol.ConsensusVersion("TestUnsupported")
 var protoDelay = protocol.ConsensusVersion("TestDelay")
 
 func init() {
+	verBeforeBonus := protocol.ConsensusV39
+	params1NB := config.Consensus[verBeforeBonus]
+	params1NB.ApprovedUpgrades = map[protocol.ConsensusVersion]uint64{
+		proto2: 0,
+	}
+	params1NB.MinUpgradeWaitRounds = 0
+	params1NB.MaxUpgradeWaitRounds = 0
+	config.Consensus[proto1NoBonus] = params1NB
+
 	params1 := config.Consensus[protocol.ConsensusCurrentVersion]
 	params1.ApprovedUpgrades = map[protocol.ConsensusVersion]uint64{
 		proto2: 0,
@@ -263,7 +273,7 @@ func TestBonus(t *testing.T) {
 	t.Parallel()
 
 	var prev Block
-	prev.CurrentProtocol = proto1
+	prev.CurrentProtocol = proto1NoBonus
 	prev.BlockHeader.GenesisID = t.Name()
 	crypto.RandBytes(prev.BlockHeader.GenesisHash[:])
 

data/pools/transactionPool_test.go

@@ -1453,6 +1453,7 @@ func TestStateProofLogging(t *testing.T) {
 	b.BlockHeader.GenesisHash = mockLedger.GenesisHash()
 	b.CurrentProtocol = protocol.ConsensusCurrentVersion
 	b.BlockHeader.Round = 1
+	b.BlockHeader.Bonus = basics.MicroAlgos{Raw: 10000000}
 
 	phdr, err := mockLedger.BlockHdr(0)
 	require.NoError(t, err)

data/transactions/logic/README.md

@@ -639,8 +639,8 @@ Global fields are fields that are common to all the transactions in the group. I
 | 18 | PayoutsEnabled | bool | v11  | Whether block proposal payouts are enabled. |
 | 19 | PayoutsGoOnlineFee | uint64 | v11  | The fee required in a keyreg transaction to make an account incentive eligible. |
 | 20 | PayoutsPercent | uint64 | v11  | The percentage of transaction fees in a block that can be paid to the block proposer. |
-| 21 | PayoutsMinBalance | uint64 | v11  | The minimum algo balance an account must have in the agreement round to receive block payouts in the proposal round. |
-| 22 | PayoutsMaxBalance | uint64 | v11  | The maximum algo balance an account can have in the agreement round to receive block payouts in the proposal round. |
+| 21 | PayoutsMinBalance | uint64 | v11  | The minimum balance an account must have in the agreement round to receive block payouts in the proposal round. |
+| 22 | PayoutsMaxBalance | uint64 | v11  | The maximum balance an account can have in the agreement round to receive block payouts in the proposal round. |
 
 
 **Asset Fields**

data/transactions/logic/TEAL_opcodes_v11.md

@@ -465,8 +465,8 @@ Fields
 | 18 | PayoutsEnabled | bool | v11  | Whether block proposal payouts are enabled. |
 | 19 | PayoutsGoOnlineFee | uint64 | v11  | The fee required in a keyreg transaction to make an account incentive eligible. |
 | 20 | PayoutsPercent | uint64 | v11  | The percentage of transaction fees in a block that can be paid to the block proposer. |
-| 21 | PayoutsMinBalance | uint64 | v11  | The minimum algo balance an account must have in the agreement round to receive block payouts in the proposal round. |
-| 22 | PayoutsMaxBalance | uint64 | v11  | The maximum algo balance an account can have in the agreement round to receive block payouts in the proposal round. |
+| 21 | PayoutsMinBalance | uint64 | v11  | The minimum balance an account must have in the agreement round to receive block payouts in the proposal round. |
+| 22 | PayoutsMaxBalance | uint64 | v11  | The maximum balance an account can have in the agreement round to receive block payouts in the proposal round. |
 
 
 ## gtxn

data/transactions/logic/fields.go

@@ -626,9 +626,9 @@ var globalFieldSpecs = [...]globalFieldSpec{
 	{PayoutsPercent, StackUint64, modeAny, incentiveVersion,
 		"The percentage of transaction fees in a block that can be paid to the block proposer."},
 	{PayoutsMinBalance, StackUint64, modeAny, incentiveVersion,
-		"The minimum algo balance an account must have in the agreement round to receive block payouts in the proposal round."},
+		"The minimum balance an account must have in the agreement round to receive block payouts in the proposal round."},
 	{PayoutsMaxBalance, StackUint64, modeAny, incentiveVersion,
-		"The maximum algo balance an account can have in the agreement round to receive block payouts in the proposal round."},
+		"The maximum balance an account can have in the agreement round to receive block payouts in the proposal round."},
 }
 
 func globalFieldSpecByField(f GlobalField) (globalFieldSpec, bool) {

data/transactions/logic/langspec_v1.json

@@ -1,6 +1,6 @@
 {
   "Version": 1,
-  "LogicSigVersion": 10,
+  "LogicSigVersion": 11,
   "NamedTypes": [
     {
       "Name": "[]byte",

data/transactions/logic/langspec_v10.json

@@ -1,6 +1,6 @@
 {
   "Version": 10,
-  "LogicSigVersion": 10,
+  "LogicSigVersion": 11,
   "NamedTypes": [
     {
       "Name": "[]byte",

data/transactions/logic/langspec_v11.json

@@ -1,6 +1,6 @@
 {
   "Version": 11,
-  "LogicSigVersion": 10,
+  "LogicSigVersion": 11,
   "NamedTypes": [
     {
       "Name": "[]byte",

data/transactions/logic/langspec_v2.json

@@ -1,6 +1,6 @@
 {
   "Version": 2,
-  "LogicSigVersion": 10,
+  "LogicSigVersion": 11,
   "NamedTypes": [
     {
       "Name": "[]byte",

data/transactions/logic/langspec_v3.json

@@ -1,6 +1,6 @@
 {
   "Version": 3,
-  "LogicSigVersion": 10,
+  "LogicSigVersion": 11,
   "NamedTypes": [
     {
       "Name": "[]byte",

data/transactions/logic/langspec_v4.json

@@ -1,6 +1,6 @@
 {
   "Version": 4,
-  "LogicSigVersion": 10,
+  "LogicSigVersion": 11,
   "NamedTypes": [
     {
       "Name": "[]byte",

data/transactions/logic/langspec_v5.json

@@ -1,6 +1,6 @@
 {
   "Version": 5,
-  "LogicSigVersion": 10,
+  "LogicSigVersion": 11,
   "NamedTypes": [
     {
       "Name": "[]byte",

data/transactions/logic/langspec_v6.json

@@ -1,6 +1,6 @@
 {
   "Version": 6,
-  "LogicSigVersion": 10,
+  "LogicSigVersion": 11,
   "NamedTypes": [
     {
       "Name": "[]byte",

data/transactions/logic/langspec_v7.json

@@ -1,6 +1,6 @@
 {
   "Version": 7,
-  "LogicSigVersion": 10,
+  "LogicSigVersion": 11,
   "NamedTypes": [
     {
       "Name": "[]byte",

data/transactions/logic/langspec_v8.json

@@ -1,6 +1,6 @@
 {
   "Version": 8,
-  "LogicSigVersion": 10,
+  "LogicSigVersion": 11,
   "NamedTypes": [
     {
       "Name": "[]byte",

data/transactions/logic/langspec_v9.json

@@ -1,6 +1,6 @@
 {
   "Version": 9,
-  "LogicSigVersion": 10,
+  "LogicSigVersion": 11,
   "NamedTypes": [
     {
       "Name": "[]byte",

ledger/applications_test.go

@@ -587,6 +587,7 @@ return`
 	blk.TxnCounter = blk.TxnCounter + 2
 	blk.Payset = append(blk.Payset, txib1, txib2)
 	blk.TxnCommitments, err = blk.PaysetCommit()
+	blk.FeesCollected = basics.MicroAlgos{Raw: txib1.Txn.Fee.Raw + txib2.Txn.Fee.Raw}
 	a.NoError(err)
 	err = l.appendUnvalidated(blk)
 	a.NoError(err)
@@ -731,6 +732,7 @@ return`
 	blk.TxnCounter = blk.TxnCounter + 2
 	blk.Payset = append(blk.Payset, txib1, txib2)
 	blk.TxnCommitments, err = blk.PaysetCommit()
+	blk.FeesCollected = basics.MicroAlgos{Raw: txib1.Txn.Fee.Raw + txib2.Txn.Fee.Raw}
 	a.NoError(err)
 	err = l.appendUnvalidated(blk)
 	a.NoError(err)
@@ -867,6 +869,7 @@ return`
 	blk.TxnCounter = blk.TxnCounter + 2
 	blk.Payset = append(blk.Payset, txib1, txib2)
 	blk.TxnCommitments, err = blk.PaysetCommit()
+	blk.FeesCollected = basics.MicroAlgos{Raw: txib1.Txn.Fee.Raw + txib2.Txn.Fee.Raw}
 	a.NoError(err)
 	err = l.appendUnvalidated(blk)
 	a.NoError(err)

ledger/catchpointfilewriter.go

@@ -373,7 +373,7 @@ func (cw *catchpointFileWriter) readDatabaseStep(ctx context.Context) error {
 	if !cw.onlineAccountsDone {
 		// Create the OnlineAccounts iterator JIT
 		if cw.onlineAccountRows == nil {
-			rows, err := cw.tx.MakeOnlineAccountsIter(ctx)
+			rows, err := cw.tx.MakeOnlineAccountsIter(ctx, false)
 			if err != nil {
 				return err
 			}
@@ -402,7 +402,7 @@ func (cw *catchpointFileWriter) readDatabaseStep(ctx context.Context) error {
 	if !cw.onlineRoundParamsDone {
 		// Create the OnlineRoundParams iterator JIT
 		if cw.onlineRoundParamsRows == nil {
-			rows, err := cw.tx.MakeOnlineRoundParamsIter(ctx)
+			rows, err := cw.tx.MakeOnlineRoundParamsIter(ctx, false)
 			if err != nil {
 				return err
 			}

ledger/catchpointfilewriter_test.go

@@ -1095,18 +1095,18 @@ assert
 	t.Log("DB round generator", genDBRound, "validator", valDBRound)
 	t.Log("Latest round generator", genLatestRound, "validator", valLatestRound)
 
-	genOAHash, genOARows, err := calculateVerificationHash(context.Background(), dl.generator.trackerDB().MakeOnlineAccountsIter)
+	genOAHash, genOARows, err := calculateVerificationHash(context.Background(), dl.generator.trackerDB().MakeOnlineAccountsIter, false)
 	require.NoError(t, err)
-	valOAHash, valOARows, err := calculateVerificationHash(context.Background(), dl.validator.trackerDB().MakeOnlineAccountsIter)
+	valOAHash, valOARows, err := calculateVerificationHash(context.Background(), dl.validator.trackerDB().MakeOnlineAccountsIter, false)
 	require.NoError(t, err)
 	require.Equal(t, genOAHash, valOAHash)
 	require.NotZero(t, genOAHash)
 	require.Equal(t, genOARows, valOARows)
 	require.NotZero(t, genOARows)
 
-	genORPHash, genORPRows, err := calculateVerificationHash(context.Background(), dl.generator.trackerDB().MakeOnlineRoundParamsIter)
+	genORPHash, genORPRows, err := calculateVerificationHash(context.Background(), dl.generator.trackerDB().MakeOnlineRoundParamsIter, false)
 	require.NoError(t, err)
-	valORPHash, valORPRows, err := calculateVerificationHash(context.Background(), dl.validator.trackerDB().MakeOnlineRoundParamsIter)
+	valORPHash, valORPRows, err := calculateVerificationHash(context.Background(), dl.validator.trackerDB().MakeOnlineRoundParamsIter, false)
 	require.NoError(t, err)
 	require.Equal(t, genORPHash, valORPHash)
 	require.NotZero(t, genORPHash)
@@ -1123,13 +1123,13 @@ assert
 	l := testNewLedgerFromCatchpoint(t, dl.generator.trackerDB(), catchpointFilePath)
 	defer l.Close()
 
-	catchpointOAHash, catchpointOARows, err := calculateVerificationHash(context.Background(), l.trackerDBs.MakeOnlineAccountsIter)
+	catchpointOAHash, catchpointOARows, err := calculateVerificationHash(context.Background(), l.trackerDBs.MakeOnlineAccountsIter, false)
 	require.NoError(t, err)
 	require.Equal(t, genOAHash, catchpointOAHash)
 	t.Log("catchpoint onlineaccounts hash", catchpointOAHash, "matches")
 	require.Equal(t, genOARows, catchpointOARows)
 
-	catchpointORPHash, catchpointORPRows, err := calculateVerificationHash(context.Background(), l.trackerDBs.MakeOnlineRoundParamsIter)
+	catchpointORPHash, catchpointORPRows, err := calculateVerificationHash(context.Background(), l.trackerDBs.MakeOnlineRoundParamsIter, false)
 	require.NoError(t, err)
 	require.Equal(t, genORPHash, catchpointORPHash)
 	t.Log("catchpoint onlineroundparams hash", catchpointORPHash, "matches")

ledger/catchpointtracker.go

@@ -238,13 +238,13 @@ func (ct *catchpointTracker) finishFirstStage(ctx context.Context, dbRound basic
 		// Generate hashes of the onlineaccounts and onlineroundparams tables.
 		err := ct.dbs.Snapshot(func(ctx context.Context, tx trackerdb.SnapshotScope) error {
 			var dbErr error
-			onlineAccountsHash, _, dbErr = calculateVerificationHash(ctx, tx.MakeOnlineAccountsIter)
+			onlineAccountsHash, _, dbErr = calculateVerificationHash(ctx, tx.MakeOnlineAccountsIter, false)
 			if dbErr != nil {
 				return dbErr
 
 			}
 
-			onlineRoundParamsHash, _, dbErr = calculateVerificationHash(ctx, tx.MakeOnlineRoundParamsIter)
+			onlineRoundParamsHash, _, dbErr = calculateVerificationHash(ctx, tx.MakeOnlineRoundParamsIter, false)
 			if dbErr != nil {
 				return dbErr
 			}

ledger/catchupaccessor.go

@@ -1031,12 +1031,12 @@ func (c *catchpointCatchupAccessorImpl) GetVerifyData(ctx context.Context) (bala
 			return fmt.Errorf("unable to get state proof verification data: %v", err)
 		}
 
-		onlineAccountsHash, _, err = calculateVerificationHash(ctx, tx.MakeOnlineAccountsIter)
+		onlineAccountsHash, _, err = calculateVerificationHash(ctx, tx.MakeOnlineAccountsIter, true)
 		if err != nil {
 			return fmt.Errorf("unable to get online accounts verification data: %v", err)
 		}
 
-		onlineRoundParamsHash, _, err = calculateVerificationHash(ctx, tx.MakeOnlineRoundParamsIter)
+		onlineRoundParamsHash, _, err = calculateVerificationHash(ctx, tx.MakeOnlineRoundParamsIter, true)
 		if err != nil {
 			return fmt.Errorf("unable to get online round params verification data: %v", err)
 		}
@@ -1058,10 +1058,11 @@ func (c *catchpointCatchupAccessorImpl) GetVerifyData(ctx context.Context) (bala
 // both at restore time (in catchpointCatchupAccessorImpl) and snapshot time (in catchpointTracker).
 func calculateVerificationHash[T crypto.Hashable](
 	ctx context.Context,
-	iterFactory func(context.Context) (trackerdb.TableIterator[T], error),
+	iterFactory func(context.Context, bool) (trackerdb.TableIterator[T], error),
+	useStaging bool,
 ) (crypto.Digest, uint64, error) {
 
-	rows, err := iterFactory(ctx)
+	rows, err := iterFactory(ctx, useStaging)
 	if err != nil {
 		return crypto.Digest{}, 0, err
 	}

ledger/eval_simple_test.go

@@ -33,6 +33,7 @@ import (
 	"github.com/algorand/go-algorand/crypto/merklesignature"
 	"github.com/algorand/go-algorand/data/basics"
 	"github.com/algorand/go-algorand/data/bookkeeping"
+	"github.com/algorand/go-algorand/data/committee"
 	"github.com/algorand/go-algorand/data/transactions"
 	"github.com/algorand/go-algorand/data/txntest"
 	"github.com/algorand/go-algorand/ledger/ledgercore"
@@ -1238,11 +1239,11 @@ func TestRekeying(t *testing.T) {
 		if err != nil {
 			return err
 		}
-		validatedBlock := ledgercore.MakeValidatedBlock(unfinishedBlock.UnfinishedBlock(), unfinishedBlock.UnfinishedDeltas())
+		fb := unfinishedBlock.FinishBlock(committee.Seed{0x01}, basics.Address{0x01}, false)
 
 		backlogPool := execpool.MakeBacklog(nil, 0, execpool.LowPriority, nil)
 		defer backlogPool.Shutdown()
-		_, err = l.Validate(context.Background(), validatedBlock.Block(), backlogPool)
+		_, err = l.Validate(context.Background(), fb, backlogPool)
 		return err
 	}