tidy & fix event indexing

Author: jribbink

internal/transactions/profile.go

@@ -312,14 +312,16 @@ func profileTransactionWithFVM(
 	)...)
 
 	// Execute prior transactions to recreate state
+	txIndex := 0
 	if len(priorUserTxs) > 0 {
-		if err := executeTransactions(vm, userCtx, execState, priorUserTxs, logger); err != nil {
+		if err := executeTransactions(vm, userCtx, execState, priorUserTxs, txIndex, logger); err != nil {
 			return nil, 0, fmt.Errorf("failed to execute prior user transactions: %w", err)
 		}
+		txIndex += len(priorUserTxs)
 	}
 
 	if len(priorSystemTxs) > 0 {
-		if err := executeTransactions(vm, systemCtx, execState, priorSystemTxs, logger); err != nil {
+		if err := executeTransactions(vm, systemCtx, execState, priorSystemTxs, txIndex, logger); err != nil {
 			return nil, 0, fmt.Errorf("failed to execute prior system transactions: %w", err)
 		}
 	}
@@ -339,8 +341,8 @@ func profileTransactionWithFVM(
 		return nil, 0, fmt.Errorf("failed to create transaction context: %w", err)
 	}
 
-	txIndex := uint32(len(priorUserTxs) + len(priorSystemTxs))
-	txProc := fvm.Transaction(targetFlowTx, txIndex)
+	targetTxIndex := uint32(len(priorUserTxs) + len(priorSystemTxs))
+	txProc := fvm.Transaction(targetFlowTx, targetTxIndex)
 	_, output, err := vm.Run(targetCtx, txProc, txn)
 	if err != nil {
 		return nil, 0, fmt.Errorf("failed to execute target transaction: %w", err)
@@ -371,7 +373,7 @@ func isSystemTransaction(tx *flowsdk.Transaction) bool {
 // separateTransactionsByType separates transactions into user and system transactions
 func separateTransactionsByType(txs []*flowsdk.Transaction) (user, system []*flowsdk.Transaction) {
 	user = make([]*flowsdk.Transaction, 0, len(txs))
-	system = make([]*flowsdk.Transaction, 0)
+	system = make([]*flowsdk.Transaction, 0, len(txs))
 
 	for _, tx := range txs {
 		if isSystemTransaction(tx) {
@@ -389,6 +391,7 @@ func executeTransactions(
 	ctx fvm.Context,
 	execState *fvmState.ExecutionState,
 	txs []*flowsdk.Transaction,
+	startIndex int,
 	logger output.Logger,
 ) error {
 	for i, tx := range txs {
@@ -397,17 +400,17 @@ func executeTransactions(
 		blockDB := fvmStorage.NewBlockDatabase(execState, 0, nil)
 		txn, err := blockDB.NewTransaction(0, fvmState.DefaultParameters())
 		if err != nil {
-			return fmt.Errorf("failed to create transaction context for tx %d: %w", i, err)
+			return fmt.Errorf("failed to create transaction context for tx %d: %w", startIndex+i, err)
 		}
 
-		txProc := fvm.Transaction(flowTx, uint32(i))
+		txProc := fvm.Transaction(flowTx, uint32(startIndex+i))
 		executionSnapshot, _, err := vm.Run(ctx, txProc, txn)
 		if err != nil {
-			return fmt.Errorf("failed to execute transaction %d (%s): %w", i, tx.ID().String()[:txIDDisplayLength], err)
+			return fmt.Errorf("failed to execute transaction %d (%s): %w", startIndex+i, tx.ID().String()[:txIDDisplayLength], err)
 		}
 
 		if err := execState.Merge(executionSnapshot); err != nil {
-			return fmt.Errorf("failed to merge execution snapshot for tx %d: %w", i, err)
+			return fmt.Errorf("failed to merge execution snapshot for tx %d: %w", startIndex+i, err)
 		}
 	}
 

internal/transactions/profile_test.go

@@ -211,15 +211,12 @@ func Test_Profile_Integration_LocalEmulator(t *testing.T) {
 
 func getFreePort(t *testing.T) int {
 	listener, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		if t != nil {
-			require.NoError(t, err)
-		} else {
-			panic(fmt.Sprintf("failed to get free port: %v", err))
-		}
-	}
+	require.NoError(t, err)
 	defer listener.Close()
-	return listener.Addr().(*net.TCPAddr).Port
+
+	tcpAddr, ok := listener.Addr().(*net.TCPAddr)
+	require.True(t, ok, "expected TCP address")
+	return tcpAddr.Port
 }
 
 func runProfileTest(t *testing.T, emulatorHost string, testTxID flow.Identifier, testBlockHeight uint64) {
@@ -270,12 +267,12 @@ func runProfileTest(t *testing.T, emulatorHost string, testTxID flow.Identifier,
 	assert.Equal(t, testBlockHeight, jsonMap["block_height"])
 }
 
-func createEmulatorServer(port int) *server.EmulatorServer {
+func createEmulatorServer(t *testing.T, port int) *server.EmulatorServer {
 	zlog := zerolog.New(zerolog.ConsoleWriter{Out: io.Discard})
 
-	restPort := getFreePort(nil)
-	adminPort := getFreePort(nil)
-	debuggerPort := getFreePort(nil)
+	restPort := getFreePort(t)
+	adminPort := getFreePort(t)
+	debuggerPort := getFreePort(t)
 
 	serverConf := &server.Config{
 		GRPCPort:                     port,
@@ -346,7 +343,7 @@ func submitAndCommitTransaction(t *testing.T, tx *flow.Transaction, blockchain e
 }
 
 func startEmulatorWithTestTransaction(t *testing.T, host string, port int) (*server.EmulatorServer, flow.Identifier, uint64) {
-	emulatorServer := createEmulatorServer(port)
+	emulatorServer := createEmulatorServer(t, port)
 	blockchain := emulatorServer.Emulator()
 
 	createInitialBlocks(t, blockchain)
@@ -374,7 +371,7 @@ func startEmulatorWithTestTransaction(t *testing.T, host string, port int) (*ser
 }
 
 func startEmulatorWithFailedTransaction(t *testing.T, host string, port int) (*server.EmulatorServer, flow.Identifier, uint64) {
-	emulatorServer := createEmulatorServer(port)
+	emulatorServer := createEmulatorServer(t, port)
 	blockchain := emulatorServer.Emulator()
 
 	createInitialBlocks(t, blockchain)
@@ -399,7 +396,7 @@ func startEmulatorWithFailedTransaction(t *testing.T, host string, port int) (*s
 }
 
 func startEmulatorWithMultipleTransactions(t *testing.T, host string, port int, count int) (*server.EmulatorServer, flow.Identifier, uint64) {
-	emulatorServer := createEmulatorServer(port)
+	emulatorServer := createEmulatorServer(t, port)
 	blockchain := emulatorServer.Emulator()
 
 	createInitialBlocks(t, blockchain)
@@ -437,7 +434,7 @@ func startEmulatorWithMultipleTransactions(t *testing.T, host string, port int,
 }
 
 func startEmulatorWithScheduledTransaction(t *testing.T, host string, port int) (*server.EmulatorServer, flow.Identifier, uint64) {
-	emulatorServer := createEmulatorServer(port)
+	emulatorServer := createEmulatorServer(t, port)
 
 	blockchain := emulatorServer.Emulator()
 	serviceAddress := blockchain.ServiceKey().Address