Merge pull request #4020 from OffchainLabs/port-4019PR

joshuacolvin0 · web-flow · commit 5ee376630830 · 2025-11-14T16:16:37.000-07:00
Port - Fix parent chain reader bug in creating smart contract wallet [PR-4019]
diff --git a/arbnode/node.go b/arbnode/node.go
@@ -835,6 +835,9 @@ func getStaker(
 			return nil, nil, common.Address{}, err
 		}
 		if config.Staker.UseSmartContractWallet {
+			if !l1Reader.Started() {
+				l1Reader.Start(ctx)
+			}
 			err = wallet.InitializeAndCreateSCW(ctx)
 		} else {
 			err = wallet.Initialize(ctx)
@@ -1469,7 +1472,7 @@ func (n *Node) Start(ctx context.Context) error {
 	if n.Staker != nil {
 		n.Staker.Start(ctx)
 	}
-	if n.L1Reader != nil {
+	if n.L1Reader != nil && !n.L1Reader.Started() {
 		n.L1Reader.Start(ctx)
 	}
 	if n.BroadcastClients != nil {

Original file line number	Diff line number	Diff line change
`@@ -835,6 +835,9 @@ func getStaker(`
`835`	`835`	`return nil, nil, common.Address{}, err`
`836`	`836`	`}`
`837`	`837`	`if config.Staker.UseSmartContractWallet {`
	`838`	`+ if !l1Reader.Started() {`
	`839`	`+ l1Reader.Start(ctx)`
	`840`	`+ }`
`838`	`841`	`err = wallet.InitializeAndCreateSCW(ctx)`
`839`	`842`	`} else {`
`840`	`843`	`err = wallet.Initialize(ctx)`
`@@ -1469,7 +1472,7 @@ func (n *Node) Start(ctx context.Context) error {`
`1469`	`1472`	`if n.Staker != nil {`
`1470`	`1473`	`n.Staker.Start(ctx)`
`1471`	`1474`	`}`
`1472`		`- if n.L1Reader != nil {`
	`1475`	`+ if n.L1Reader != nil && !n.L1Reader.Started() {`
`1473`	`1476`	`n.L1Reader.Start(ctx)`
`1474`	`1477`	`}`
`1475`	`1478`	`if n.BroadcastClients != nil {`