Merge pull request #5503 from ethereum-optimism/aj/fpp-e2e-tx

op-e2e: Add actual transactions to the FPP system test

op-e2e/system_fpp_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-node/testlog"
 	opp "github.com/ethereum-optimism/optimism/op-program/host"
 	oppconf "github.com/ethereum-optimism/optimism/op-program/host/config"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/rpc"
@@ -38,26 +39,51 @@ func TestVerifyL2OutputRoot(t *testing.T) {
 	require.Nil(t, err)
 	rollupClient := sources.NewRollupClient(client.NewBaseRPCClient(rollupRPCClient))
 
-	// TODO (CLI-3855): Actually perform some tx to set up a more complex chain.
-
-	// Wait for the safe head to reach block 10
-	require.NoError(t, waitForSafeHead(ctx, 10, rollupClient))
-
-	// Use block 5 as the agreed starting block on L2
-	l2AgreedBlock, err := l2Seq.BlockByNumber(ctx, big.NewInt(5))
-	require.NoError(t, err, "could not retrieve l2 genesis")
-	l2Head := l2AgreedBlock.Hash() // Agreed starting L2 block
-
-	// Get the expected output at block 10
-	l2ClaimBlockNumber := uint64(10)
+	t.Log("Sending transactions to setup existing state, prior to challenged period")
+	aliceKey := cfg.Secrets.Alice
+	opts, err := bind.NewKeyedTransactorWithChainID(aliceKey, cfg.L1ChainIDBig())
+	require.Nil(t, err)
+	SendDepositTx(t, cfg, l1Client, l2Seq, opts, func(l2Opts *DepositTxOpts) {
+		l2Opts.Value = big.NewInt(100_000_000)
+	})
+	SendL2Tx(t, cfg, l2Seq, aliceKey, func(opts *TxOpts) {
+		opts.ToAddr = &cfg.Secrets.Addresses().Bob
+		opts.Value = big.NewInt(1_000)
+		opts.Nonce = 1
+	})
+	SendWithdrawal(t, cfg, l2Seq, aliceKey, func(opts *WithdrawalTxOpts) {
+		opts.Value = big.NewInt(500)
+		opts.Nonce = 2
+	})
+
+	t.Log("Capture current L2 head as agreed starting point")
+	l2AgreedBlock, err := l2Seq.BlockByNumber(ctx, nil)
+	require.NoError(t, err, "could not retrieve l2 agreed block")
+	l2Head := l2AgreedBlock.Hash()
+
+	t.Log("Sending transactions to modify existing state, within challenged period")
+	SendDepositTx(t, cfg, l1Client, l2Seq, opts, func(l2Opts *DepositTxOpts) {
+		l2Opts.Value = big.NewInt(5_000)
+	})
+	SendL2Tx(t, cfg, l2Seq, cfg.Secrets.Bob, func(opts *TxOpts) {
+		opts.ToAddr = &cfg.Secrets.Addresses().Alice
+		opts.Value = big.NewInt(100)
+	})
+	SendWithdrawal(t, cfg, l2Seq, aliceKey, func(opts *WithdrawalTxOpts) {
+		opts.Value = big.NewInt(100)
+		opts.Nonce = 4
+	})
+
+	t.Log("Determine L2 claim")
+	l2ClaimBlockNumber, err := l2Seq.BlockNumber(ctx)
+	require.NoError(t, err, "get L2 claim block number")
 	l2Output, err := rollupClient.OutputAtBlock(ctx, l2ClaimBlockNumber)
 	require.NoError(t, err, "could not get expected output")
 	l2Claim := l2Output.OutputRoot
 
-	// Find the current L1 head
-	l1BlockNumber, err := l1Client.BlockNumber(ctx)
-	require.NoError(t, err, "get l1 head block number")
-	l1HeadBlock, err := l1Client.BlockByNumber(ctx, new(big.Int).SetUint64(l1BlockNumber))
+	t.Log("Determine L1 head that includes all batches required for L2 claim block")
+	require.NoError(t, waitForSafeHead(ctx, l2ClaimBlockNumber, rollupClient))
+	l1HeadBlock, err := l1Client.BlockByNumber(ctx, nil)
 	require.NoError(t, err, "get l1 head block")
 	l1Head := l1HeadBlock.Hash()
 
@@ -72,7 +98,11 @@ func TestVerifyL2OutputRoot(t *testing.T) {
 	err = opp.FaultProofProgram(log, fppConfig)
 	require.NoError(t, err)
 
+	t.Log("Shutting down network")
 	// Shutdown the nodes from the actual chain. Should now be able to run using only the pre-fetched data.
+	sys.BatchSubmitter.StopIfRunning(context.Background())
+	sys.L2OutputSubmitter.Stop()
+	sys.L2OutputSubmitter = nil
 	for _, node := range sys.Nodes {
 		require.NoError(t, node.Close())
 	}