Remove pre-Durango block building logic and verification (#2823)

Author: StephenButtolph

vms/platformvm/block/builder/builder.go

@@ -263,6 +263,19 @@ func buildBlock(
 	forceAdvanceTime bool,
 	parentState state.Chain,
 ) (block.Block, error) {
+	blockTxs, err := packBlockTxs(
+		parentID,
+		parentState,
+		builder.Mempool,
+		builder.txExecutorBackend,
+		builder.blkManager,
+		timestamp,
+		targetBlockSize,
+	)
+	if err != nil {
+		return nil, fmt.Errorf("failed to pack block txs: %w", err)
+	}
+
 	// Try rewarding stakers whose staking period ends at the new chain time.
 	// This is done first to prioritize advancing the timestamp as quickly as
 	// possible.
@@ -276,23 +289,6 @@ func buildBlock(
 			return nil, fmt.Errorf("could not build tx to reward staker: %w", err)
 		}
 
-		var blockTxs []*txs.Tx
-		// TODO: Cleanup post-Durango
-		if builder.txExecutorBackend.Config.IsDurangoActivated(timestamp) {
-			blockTxs, err = packBlockTxs(
-				parentID,
-				parentState,
-				builder.Mempool,
-				builder.txExecutorBackend,
-				builder.blkManager,
-				timestamp,
-				targetBlockSize,
-			)
-			if err != nil {
-				return nil, fmt.Errorf("failed to pack block txs: %w", err)
-			}
-		}
-
 		return block.NewBanffProposalBlock(
 			timestamp,
 			parentID,
@@ -302,19 +298,6 @@ func buildBlock(
 		)
 	}
 
-	blockTxs, err := packBlockTxs(
-		parentID,
-		parentState,
-		builder.Mempool,
-		builder.txExecutorBackend,
-		builder.blkManager,
-		timestamp,
-		targetBlockSize,
-	)
-	if err != nil {
-		return nil, fmt.Errorf("failed to pack block txs: %w", err)
-	}
-
 	// If there is no reason to build a block, don't.
 	if len(blockTxs) == 0 && !forceAdvanceTime {
 		builder.txExecutorBackend.Ctx.Log.Debug("no pending txs to issue into a block")

vms/platformvm/block/executor/proposal_block_test.go

@@ -334,23 +334,6 @@ func TestBanffProposalBlockTimeVerification(t *testing.T) {
 		require.ErrorIs(err, executor.ErrAdvanceTimeTxIssuedAfterBanff)
 	}
 
-	{
-		// include too many transactions
-		statelessProposalBlock, err := block.NewBanffProposalBlock(
-			nextStakerTime,
-			parentID,
-			banffParentBlk.Height()+1,
-			blkTx,
-			[]*txs.Tx{},
-		)
-		require.NoError(err)
-
-		statelessProposalBlock.Transactions = []*txs.Tx{blkTx}
-		block := env.blkManager.NewBlock(statelessProposalBlock)
-		err = block.Verify(context.Background())
-		require.ErrorIs(err, errBanffProposalBlockWithMultipleTransactions)
-	}
-
 	{
 		// valid
 		statelessProposalBlock, err := block.NewBanffProposalBlock(

vms/platformvm/block/executor/verifier.go

@@ -22,12 +22,11 @@ var (
 
 	ErrConflictingBlockTxs = errors.New("block contains conflicting transactions")
 
-	errApricotBlockIssuedAfterFork                = errors.New("apricot block issued after fork")
-	errBanffProposalBlockWithMultipleTransactions = errors.New("BanffProposalBlock contains multiple transactions")
-	errBanffStandardBlockWithoutChanges           = errors.New("BanffStandardBlock performs no state changes")
-	errIncorrectBlockHeight                       = errors.New("incorrect block height")
-	errChildBlockEarlierThanParent                = errors.New("proposed timestamp before current chain time")
-	errOptionBlockTimestampNotMatchingParent      = errors.New("option block proposed timestamp not matching parent block one")
+	errApricotBlockIssuedAfterFork           = errors.New("apricot block issued after fork")
+	errBanffStandardBlockWithoutChanges      = errors.New("BanffStandardBlock performs no state changes")
+	errIncorrectBlockHeight                  = errors.New("incorrect block height")
+	errChildBlockEarlierThanParent           = errors.New("proposed timestamp before current chain time")
+	errOptionBlockTimestampNotMatchingParent = errors.New("option block proposed timestamp not matching parent block one")
 )
 
 // verifier handles the logic for verifying a block.
@@ -51,11 +50,6 @@ func (v *verifier) BanffCommitBlock(b *block.BanffCommitBlock) error {
 }
 
 func (v *verifier) BanffProposalBlock(b *block.BanffProposalBlock) error {
-	nextChainTime := b.Timestamp()
-	if !v.txExecutorBackend.Config.IsDurangoActivated(nextChainTime) && len(b.Transactions) != 0 {
-		return errBanffProposalBlockWithMultipleTransactions
-	}
-
 	if err := v.banffNonOptionBlock(b); err != nil {
 		return err
 	}
@@ -67,6 +61,7 @@ func (v *verifier) BanffProposalBlock(b *block.BanffProposalBlock) error {
 	}
 
 	// Advance the time to [nextChainTime].
+	nextChainTime := b.Timestamp()
 	if _, err := executor.AdvanceTimeTo(v.txExecutorBackend, onDecisionState, nextChainTime); err != nil {
 		return err
 	}