[KVStore] Integration test for version upgrade

cmd/bootstrap/cmd/finalize.go

@@ -25,6 +25,7 @@ import (
 	"github.com/onflow/flow-go/state/protocol"
 	"github.com/onflow/flow-go/state/protocol/badger"
 	"github.com/onflow/flow-go/state/protocol/inmem"
+	"github.com/onflow/flow-go/state/protocol/protocol_state/kvstore"
 	"github.com/onflow/flow-go/utils/io"
 )
 
@@ -176,7 +177,7 @@ func finalize(cmd *cobra.Command, args []string) {
 
 	// construct serializable root protocol snapshot
 	log.Info().Msg("constructing root protocol snapshot")
-	snapshot, err := inmem.SnapshotFromBootstrapStateWithParams(block, result, seal, rootQC, intermediaryData.ProtocolVersion, intermediaryData.EpochCommitSafetyThreshold)
+	snapshot, err := inmem.SnapshotFromBootstrapStateWithParams(block, result, seal, rootQC, intermediaryData.ProtocolVersion, intermediaryData.EpochCommitSafetyThreshold, kvstore.NewDefaultKVStore)
 	if err != nil {
 		log.Fatal().Err(err).Msg("unable to generate root protocol snapshot")
 	}

engine/execution/state/bootstrap/bootstrap_test.go

@@ -53,7 +53,7 @@ func TestBootstrapLedger(t *testing.T) {
 }
 
 func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) {
-	expectedStateCommitmentBytes, _ := hex.DecodeString("394b02bd8207a8f8b86d3af0fe428bc2b11228311b652037175db7823446bcbe")
+	expectedStateCommitmentBytes, _ := hex.DecodeString("f36a180931261665d9dd9455a0605f156d5b16cede0da642e11c052d58c4fde8")
 	expectedStateCommitment, err := flow.ToStateCommitment(expectedStateCommitmentBytes)
 	require.NoError(t, err)
 

engine/testutil/nodes.go

@@ -572,7 +572,7 @@ func ExecutionNode(t *testing.T, hub *stub.Hub, identity bootstrap.NodeInfo, ide
 	diskWal, err := wal.NewDiskWAL(node.Log.With().Str("subcomponent", "wal").Logger(), nil, metricsCollector, dbDir, capacity, pathfinder.PathByteSize, wal.SegmentSize)
 	require.NoError(t, err)
 
-	ls, err := completeLedger.NewLedger(diskWal, capacity, metricsCollector, node.Log.With().Str("compontent", "ledger").Logger(), completeLedger.DefaultPathFinderVersion)
+	ls, err := completeLedger.NewLedger(diskWal, capacity, metricsCollector, node.Log.With().Str("component", "ledger").Logger(), completeLedger.DefaultPathFinderVersion)
 	require.NoError(t, err)
 
 	compactor, err := completeLedger.NewCompactor(ls, diskWal, zerolog.Nop(), capacity, checkpointDistance, checkpointsToKeep, atomic.NewBool(false), metricsCollector)

go.mod

@@ -54,8 +54,8 @@ require (
 	github.com/onflow/cadence v0.42.9
 	github.com/onflow/crypto v0.25.1
 	github.com/onflow/flow v0.3.4
-	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1
-	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1
+	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240318135301-f59efe400a8b
+	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240318135301-f59efe400a8b
 	github.com/onflow/flow-go-sdk v0.44.0
 	github.com/onflow/flow/protobuf/go/flow v0.3.7-0.20240404170900-c321c1475f1e
 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58

go.sum

@@ -1363,10 +1363,10 @@ github.com/onflow/crypto v0.25.1 h1:0txy2PKPMM873JbpxQNbJmuOJtD56bfs48RQfm0ts5A=
 github.com/onflow/crypto v0.25.1/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
 github.com/onflow/flow v0.3.4 h1:FXUWVdYB90f/rjNcY0Owo30gL790tiYff9Pb/sycXYE=
 github.com/onflow/flow v0.3.4/go.mod h1:lzyAYmbu1HfkZ9cfnL5/sjrrsnJiUU8fRL26CqLP7+c=
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1 h1:xF5wHug6H8vKfz7p1LYy9jck6eD9K1HLjTdi6o4kg1k=
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1/go.mod h1:WHp24VkUQfcfZi0XjI1uRVRt5alM5SHVkwOil1U2Tpc=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1 h1:EjWjbyVEA+bMxXbM44dE6MsYeqOu5a9q/EwSWa4ma2M=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1/go.mod h1:c09d6sNyF/j5/pAynK7sNPb1XKqJqk1rxZPEqEL+dUo=
+github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240318135301-f59efe400a8b h1:c22kqZd6SmpdgIhGRqFcbKI+6udc3axakiSHhN4m4iM=
+github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240318135301-f59efe400a8b/go.mod h1:cnCbHh/sxn0c+mk2aUfxb32Sek2SNSbl4MGvA7ALq7U=
+github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240318135301-f59efe400a8b h1:s4ChWTcQmU9P0ZRD5kVhrIMXe4s48+4Ws1/Aqxe8Lh4=
+github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240318135301-f59efe400a8b/go.mod h1:c09d6sNyF/j5/pAynK7sNPb1XKqJqk1rxZPEqEL+dUo=
 github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 h1:B4ll7e3j+MqTJv2122Enq3RtDNzmIGRu9xjV7fo7un0=
 github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13/go.mod h1:kTMFIySzEJJeupk+7EmXs0EJ6CBWY/MV9fv9iYQk+RU=
 github.com/onflow/flow-go-sdk v0.24.0/go.mod h1:IoptMLPyFXWvyd9yYA6/4EmSeeozl6nJoIv4FaEMg74=

insecure/go.mod

@@ -207,8 +207,8 @@ require (
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/onflow/atree v0.6.0 // indirect
 	github.com/onflow/cadence v0.42.9 // indirect
-	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1 // indirect
-	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1 // indirect
+	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240318135301-f59efe400a8b // indirect
+	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240318135301-f59efe400a8b // indirect
 	github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 // indirect
 	github.com/onflow/flow-go-sdk v0.46.0 // indirect
 	github.com/onflow/flow-nft/lib/go/contracts v1.1.0 // indirect

insecure/go.sum

@@ -1326,10 +1326,10 @@ github.com/onflow/cadence v0.42.9 h1:EX+eak/Jjy9PyKcAEmOViGOHMyP/nCOwJO+deodZlJE
 github.com/onflow/cadence v0.42.9/go.mod h1:1wFd+LiNiN6qoZXof3MBdpM6d8BsxbVIxOA77LbIYmE=
 github.com/onflow/crypto v0.25.1 h1:0txy2PKPMM873JbpxQNbJmuOJtD56bfs48RQfm0ts5A=
 github.com/onflow/crypto v0.25.1/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1 h1:xF5wHug6H8vKfz7p1LYy9jck6eD9K1HLjTdi6o4kg1k=
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1/go.mod h1:WHp24VkUQfcfZi0XjI1uRVRt5alM5SHVkwOil1U2Tpc=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1 h1:EjWjbyVEA+bMxXbM44dE6MsYeqOu5a9q/EwSWa4ma2M=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1/go.mod h1:c09d6sNyF/j5/pAynK7sNPb1XKqJqk1rxZPEqEL+dUo=
+github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240318135301-f59efe400a8b h1:c22kqZd6SmpdgIhGRqFcbKI+6udc3axakiSHhN4m4iM=
+github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240318135301-f59efe400a8b/go.mod h1:cnCbHh/sxn0c+mk2aUfxb32Sek2SNSbl4MGvA7ALq7U=
+github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240318135301-f59efe400a8b h1:s4ChWTcQmU9P0ZRD5kVhrIMXe4s48+4Ws1/Aqxe8Lh4=
+github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240318135301-f59efe400a8b/go.mod h1:c09d6sNyF/j5/pAynK7sNPb1XKqJqk1rxZPEqEL+dUo=
 github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 h1:B4ll7e3j+MqTJv2122Enq3RtDNzmIGRu9xjV7fo7un0=
 github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13/go.mod h1:kTMFIySzEJJeupk+7EmXs0EJ6CBWY/MV9fv9iYQk+RU=
 github.com/onflow/flow-go-sdk v0.24.0/go.mod h1:IoptMLPyFXWvyd9yYA6/4EmSeeozl6nJoIv4FaEMg74=

integration/go.mod

@@ -22,8 +22,8 @@ require (
 	github.com/libp2p/go-libp2p v0.32.2
 	github.com/onflow/cadence v0.42.9
 	github.com/onflow/crypto v0.25.1
-	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1
-	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1
+	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240318135301-f59efe400a8b
+	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240318135301-f59efe400a8b
 	github.com/onflow/flow-emulator v0.61.2-0.20240404201132-f53137a8e4cb
 	github.com/onflow/flow-go v0.33.2-0.20240404171354-0b0592cc5bba
 	github.com/onflow/flow-go-sdk v0.46.0

integration/go.sum

@@ -1416,10 +1416,10 @@ github.com/onflow/cadence v0.42.9 h1:EX+eak/Jjy9PyKcAEmOViGOHMyP/nCOwJO+deodZlJE
 github.com/onflow/cadence v0.42.9/go.mod h1:1wFd+LiNiN6qoZXof3MBdpM6d8BsxbVIxOA77LbIYmE=
 github.com/onflow/crypto v0.25.1 h1:0txy2PKPMM873JbpxQNbJmuOJtD56bfs48RQfm0ts5A=
 github.com/onflow/crypto v0.25.1/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1 h1:xF5wHug6H8vKfz7p1LYy9jck6eD9K1HLjTdi6o4kg1k=
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.1/go.mod h1:WHp24VkUQfcfZi0XjI1uRVRt5alM5SHVkwOil1U2Tpc=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1 h1:EjWjbyVEA+bMxXbM44dE6MsYeqOu5a9q/EwSWa4ma2M=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1/go.mod h1:c09d6sNyF/j5/pAynK7sNPb1XKqJqk1rxZPEqEL+dUo=
+github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240318135301-f59efe400a8b h1:c22kqZd6SmpdgIhGRqFcbKI+6udc3axakiSHhN4m4iM=
+github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240318135301-f59efe400a8b/go.mod h1:cnCbHh/sxn0c+mk2aUfxb32Sek2SNSbl4MGvA7ALq7U=
+github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240318135301-f59efe400a8b h1:s4ChWTcQmU9P0ZRD5kVhrIMXe4s48+4Ws1/Aqxe8Lh4=
+github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240318135301-f59efe400a8b/go.mod h1:c09d6sNyF/j5/pAynK7sNPb1XKqJqk1rxZPEqEL+dUo=
 github.com/onflow/flow-emulator v0.61.2-0.20240404201132-f53137a8e4cb h1:A2R42Vvw+HdAi3DnH2U/AFK4ziOk/wNkVB1lrhEzai8=
 github.com/onflow/flow-emulator v0.61.2-0.20240404201132-f53137a8e4cb/go.mod h1:DicO8yliaj+0AFldfwa5No2FfZRQja1R7/abxSHqqDE=
 github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 h1:B4ll7e3j+MqTJv2122Enq3RtDNzmIGRu9xjV7fo7un0=

integration/testnet/client.go

@@ -98,7 +98,7 @@ func (c *Client) AccountKeyPriv() sdkcrypto.PrivateKey {
 	return c.accountKeyPriv
 }
 
-func (c *Client) GetSeqNumber() uint64 {
+func (c *Client) GetAndIncrementSeqNumber() uint64 {
 	n := c.accountKey.SequenceNumber
 	c.accountKey.SequenceNumber++
 	return n
@@ -122,7 +122,7 @@ func (c *Client) DeployContract(ctx context.Context, refID sdk.Identifier, contr
 	tx := sdk.NewTransaction().
 		SetScript([]byte(code.ToCadence())).
 		SetReferenceBlockID(refID).
-		SetProposalKey(c.SDKServiceAddress(), 0, c.GetSeqNumber()).
+		SetProposalKey(c.SDKServiceAddress(), 0, c.GetAndIncrementSeqNumber()).
 		SetPayer(c.SDKServiceAddress()).
 		AddAuthorizer(c.SDKServiceAddress())
 
@@ -368,7 +368,7 @@ func (c *Client) CreateAccount(
 	}
 	tx.SetComputeLimit(1000).
 		SetReferenceBlockID(latestBlockID).
-		SetProposalKey(payer, 0, c.GetSeqNumber()).
+		SetProposalKey(payer, 0, c.GetAndIncrementSeqNumber()).
 		SetPayer(payer)
 
 	err = c.SignAndSendTransaction(ctx, tx)

integration/testnet/network.go

@@ -15,6 +15,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/onflow/flow-go/state/protocol/protocol_state"
+
 	"github.com/dapperlabs/testingdock"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
@@ -427,6 +429,7 @@ type NetworkConfig struct {
 	ViewsInStakingAuction      uint64
 	ViewsInEpoch               uint64
 	EpochCommitSafetyThreshold uint64
+	KVStoreFactory             func(epochStateID flow.Identifier) protocol_state.KVStoreAPI
 }
 
 type NetworkConfigOpt func(*NetworkConfig)
@@ -440,6 +443,7 @@ func NewNetworkConfig(name string, nodes NodeConfigs, opts ...NetworkConfigOpt)
 		ViewsInDKGPhase:            DefaultViewsInDKGPhase,
 		ViewsInEpoch:               DefaultViewsInEpoch,
 		EpochCommitSafetyThreshold: DefaultEpochCommitSafetyThreshold,
+		KVStoreFactory:             kvstore.NewDefaultKVStore,
 	}
 
 	for _, apply := range opts {
@@ -450,15 +454,11 @@ func NewNetworkConfig(name string, nodes NodeConfigs, opts ...NetworkConfigOpt)
 }
 
 func NewNetworkConfigWithEpochConfig(name string, nodes NodeConfigs, viewsInStakingAuction, viewsInDKGPhase, viewsInEpoch, safetyThreshold uint64, opts ...NetworkConfigOpt) NetworkConfig {
-	c := NetworkConfig{
-		Nodes:                      nodes,
-		Name:                       name,
-		NClusters:                  1, // default to 1 cluster
-		ViewsInStakingAuction:      viewsInStakingAuction,
-		ViewsInDKGPhase:            viewsInDKGPhase,
-		ViewsInEpoch:               viewsInEpoch,
-		EpochCommitSafetyThreshold: safetyThreshold,
-	}
+	c := NewNetworkConfig(name, nodes,
+		WithViewsInStakingAuction(viewsInStakingAuction),
+		WithViewsInDKGPhase(viewsInDKGPhase),
+		WithViewsInEpoch(viewsInEpoch),
+		WithEpochCommitSafetyThreshold(safetyThreshold))
 
 	for _, apply := range opts {
 		apply(&c)
@@ -491,6 +491,12 @@ func WithEpochCommitSafetyThreshold(threshold uint64) func(*NetworkConfig) {
 	}
 }
 
+func WithKVStoreFactory(factory func(flow.Identifier) protocol_state.KVStoreAPI) func(*NetworkConfig) {
+	return func(config *NetworkConfig) {
+		config.KVStoreFactory = factory
+	}
+}
+
 func WithClusters(n uint) func(*NetworkConfig) {
 	return func(conf *NetworkConfig) {
 		conf.NClusters = n
@@ -1158,7 +1164,7 @@ func BootstrapNetwork(networkConf NetworkConfig, bootstrapDir string, chainID fl
 		Header: rootHeader,
 	}
 	root.SetPayload(unittest.PayloadFixture(unittest.WithProtocolStateID(
-		kvstore.NewDefaultKVStore(
+		networkConf.KVStoreFactory(
 			inmem.ProtocolStateFromEpochServiceEvents(epochSetup, epochCommit).ID(),
 		).ID(),
 	)))
@@ -1225,7 +1231,7 @@ func BootstrapNetwork(networkConf NetworkConfig, bootstrapDir string, chainID fl
 		return nil, fmt.Errorf("has invalid votes: %v", invalidVotesErr)
 	}
 
-	snapshot, err := inmem.SnapshotFromBootstrapStateWithParams(root, result, seal, qc, flow.DefaultProtocolVersion, networkConf.EpochCommitSafetyThreshold)
+	snapshot, err := inmem.SnapshotFromBootstrapStateWithParams(root, result, seal, qc, flow.DefaultProtocolVersion, networkConf.EpochCommitSafetyThreshold, networkConf.KVStoreFactory)
 	if err != nil {
 		return nil, fmt.Errorf("could not create bootstrap state snapshot: %w", err)
 	}

integration/tests/access/cohort1/access_api_test.go

@@ -235,7 +235,7 @@ func (s *AccessAPISuite) TestSendAndSubscribeTransactionStatuses() {
 	s.Require().NoError(err)
 	tx.SetComputeLimit(1000).
 		SetReferenceBlockID(sdk.HexToID(latestBlockID.String())).
-		SetProposalKey(payer, 0, serviceClient.GetSeqNumber()).
+		SetProposalKey(payer, 0, serviceClient.GetAndIncrementSeqNumber()).
 		SetPayer(payer)
 
 	tx, err = serviceClient.SignTransaction(tx)
@@ -441,7 +441,7 @@ func (s *AccessAPISuite) deployContract() *sdk.TransactionResult {
 	createCounterTx := sdk.NewTransaction().
 		SetScript([]byte(lib.CreateCounterTx(serviceAddress).ToCadence())).
 		SetReferenceBlockID(sdk.Identifier(header.ID)).
-		SetProposalKey(serviceAddress, 0, s.serviceClient.GetSeqNumber()).
+		SetProposalKey(serviceAddress, 0, s.serviceClient.GetAndIncrementSeqNumber()).
 		SetPayer(serviceAddress).
 		AddAuthorizer(serviceAddress).
 		SetComputeLimit(9999)

integration/tests/access/cohort2/observer_indexer_enabled_test.go

@@ -177,7 +177,7 @@ func (s *ObserverIndexerEnabledSuite) TestObserverIndexedRPCsHappyPath() {
 	require.NoError(t, err)
 	createAccountTx.
 		SetReferenceBlockID(sdk.Identifier(latestBlockID)).
-		SetProposalKey(serviceAddress, 0, serviceAccountClient.GetSeqNumber()).
+		SetProposalKey(serviceAddress, 0, serviceAccountClient.GetAndIncrementSeqNumber()).
 		SetPayer(serviceAddress).
 		SetComputeLimit(9999)
 
@@ -319,7 +319,7 @@ func (s *ObserverIndexerEnabledSuite) TestAllObserverIndexedRPCsHappyPath() {
 
 	createAccountTx.
 		SetReferenceBlockID(sdk.Identifier(latestBlockID)).
-		SetProposalKey(serviceAddress, 0, serviceAccountClient.GetSeqNumber()).
+		SetProposalKey(serviceAddress, 0, serviceAccountClient.GetAndIncrementSeqNumber()).
 		SetPayer(serviceAddress).
 		SetComputeLimit(9999)
 

integration/tests/access/cohort3/access_circuit_breaker_test.go

@@ -148,7 +148,7 @@ func (s *AccessCircuitBreakerSuite) TestCircuitBreaker() {
 
 	createAccountTx.
 		SetReferenceBlockID(sdk.Identifier(latestBlockID)).
-		SetProposalKey(serviceAddress, 0, accessClient.GetSeqNumber()).
+		SetProposalKey(serviceAddress, 0, accessClient.GetAndIncrementSeqNumber()).
 		SetPayer(serviceAddress).
 		SetComputeLimit(9999)
 

integration/tests/access/cohort3/execution_state_sync_test.go

@@ -145,7 +145,7 @@ func (s *ExecutionStateSyncSuite) TestHappyPath() {
 	s.T().Logf("got block height %v ID %v", blockA.Header.Height, blockA.Header.ID())
 
 	// wait for the requested number of sealed blocks, then pause the network so we can inspect the dbs
-	s.BlockState.WaitForSealed(s.T(), blockA.Header.Height+runBlocks)
+	s.BlockState.WaitForSealedHeight(s.T(), blockA.Header.Height+runBlocks)
 	s.net.StopContainers()
 
 	metrics := metrics.NewNoopCollector()

integration/tests/bft/protocol/wintermute/wintermute_test.go

@@ -50,7 +50,7 @@ func (w *WintermuteTestSuite) TestWintermuteAttack() {
 	}
 
 	// waits until we seal a height equal to the victim block height
-	w.BlockState.WaitForSealed(w.T(), victimBlock.Header.Height)
+	w.BlockState.WaitForSealedHeight(w.T(), victimBlock.Header.Height)
 	// then checks querying victim block by height returns the original victim block.
 	blockByHeight, ok := w.BlockState.FinalizedHeight(victimBlock.Header.Height)
 	require.True(w.T(), ok)

integration/tests/common/sealing_and_verification.go

@@ -69,7 +69,7 @@ func SealingAndVerificationHappyPathTest(
 
 	// waits until blockB is sealed by consensus nodes after result approvals for all of its chunks emitted.
 	// waits until we seal a height equal to the victim block height
-	blockState.WaitForSealed(t, blockBHeight)
+	blockState.WaitForSealedHeight(t, blockBHeight)
 	// then checks querying victim block by height returns the victim block itself.
 	blockByHeight, ok := blockState.FinalizedHeight(blockBHeight)
 	require.True(t, ok)