Sync in the latests changes from the bold repo

This includes wiring the HeaderProvider through to the challenge stack and a
slightly clunky backend wrapper around the ethereum client instances.

staker/bold/bold_staker.go

@@ -14,19 +14,21 @@ import (
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/rpc"
 
 	protocol "github.com/offchainlabs/bold/chain-abstraction"
 	solimpl "github.com/offchainlabs/bold/chain-abstraction/sol-implementation"
 	challengemanager "github.com/offchainlabs/bold/challenge-manager"
 	boldtypes "github.com/offchainlabs/bold/challenge-manager/types"
 	l2stateprovider "github.com/offchainlabs/bold/layer2-state-provider"
 	boldrollup "github.com/offchainlabs/bold/solgen/go/rollupgen"
+	"github.com/offchainlabs/bold/util"
 	"github.com/offchainlabs/nitro/arbnode/dataposter"
 	"github.com/offchainlabs/nitro/arbutil"
 	"github.com/offchainlabs/nitro/staker"
 	legacystaker "github.com/offchainlabs/nitro/staker/legacy"
+	"github.com/offchainlabs/nitro/util/headerreader"
 	"github.com/offchainlabs/nitro/util/stopwaiter"
 	"github.com/offchainlabs/nitro/validator"
 )
@@ -144,8 +146,9 @@ type BOLDStaker struct {
 	blockValidator          *staker.BlockValidator
 	statelessBlockValidator *staker.StatelessBlockValidator
 	rollupAddress           common.Address
-	client                  bind.ContractBackend
+	l1Reader                *headerreader.HeaderReader
 	lastWasmModuleRoot      common.Hash
+	client                  protocol.ChainBackend
 	callOpts                bind.CallOpts
 	wallet                  legacystaker.ValidatorWalletInterface
 	stakedNotifiers         []legacystaker.LatestStakedNotifier
@@ -157,7 +160,7 @@ func NewBOLDStaker(
 	rollupAddress common.Address,
 	callOpts bind.CallOpts,
 	txOpts *bind.TransactOpts,
-	client *ethclient.Client,
+	l1Reader *headerreader.HeaderReader,
 	blockValidator *staker.BlockValidator,
 	statelessBlockValidator *staker.StatelessBlockValidator,
 	config *BoldConfig,
@@ -166,7 +169,8 @@ func NewBOLDStaker(
 	stakedNotifiers []legacystaker.LatestStakedNotifier,
 	confirmedNotifiers []legacystaker.LatestConfirmedNotifier,
 ) (*BOLDStaker, error) {
-	manager, err := newBOLDChallengeManager(ctx, rollupAddress, txOpts, client, blockValidator, statelessBlockValidator, config, dataPoster)
+	wrappedClient := util.NewBackendWrapper(l1Reader.Client(), rpc.LatestBlockNumber)
+	manager, err := newBOLDChallengeManager(ctx, rollupAddress, txOpts, l1Reader, wrappedClient, blockValidator, statelessBlockValidator, config, dataPoster)
 	if err != nil {
 		return nil, err
 	}
@@ -176,7 +180,8 @@ func NewBOLDStaker(
 		blockValidator:          blockValidator,
 		statelessBlockValidator: statelessBlockValidator,
 		rollupAddress:           rollupAddress,
-		client:                  client,
+		l1Reader:                l1Reader,
+		client:                  wrappedClient,
 		callOpts:                callOpts,
 		wallet:                  wallet,
 		stakedNotifiers:         stakedNotifiers,
@@ -340,7 +345,8 @@ func newBOLDChallengeManager(
 	ctx context.Context,
 	rollupAddress common.Address,
 	txOpts *bind.TransactOpts,
-	client *ethclient.Client,
+	l1Reader *headerreader.HeaderReader,
+	client protocol.ChainBackend,
 	blockValidator *staker.BlockValidator,
 	statelessBlockValidator *staker.StatelessBlockValidator,
 	config *BoldConfig,
@@ -403,6 +409,7 @@ func newBOLDChallengeManager(
 		challengemanager.StackWithPostingInterval(postingInterval),
 		challengemanager.StackWithConfirmationInterval(confirmingInterval),
 		challengemanager.StackWithTrackChallengeParentAssertionHashes(config.TrackChallengeParentAssertionHashes),
+		challengemanager.StackWithHeaderProvider(l1Reader),
 	}
 	if config.API {
 		apiAddr := fmt.Sprintf("%s:%d", config.APIHost, config.APIPort)

staker/multi_protocol/multi_protocol_staker.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/log"
 
 	"github.com/offchainlabs/bold/solgen/go/bridgegen"
@@ -29,7 +28,7 @@ type MultiProtocolStaker struct {
 	confirmedNotifiers      []legacystaker.LatestConfirmedNotifier
 	statelessBlockValidator *staker.StatelessBlockValidator
 	wallet                  legacystaker.ValidatorWalletInterface
-	client                  *ethclient.Client
+	l1Reader                *headerreader.HeaderReader
 	blockValidator          *staker.BlockValidator
 	callOpts                bind.CallOpts
 	boldConfig              *boldstaker.BoldConfig
@@ -83,7 +82,7 @@ func NewMultiProtocolStaker(
 		confirmedNotifiers:      confirmedNotifiers,
 		statelessBlockValidator: statelessBlockValidator,
 		wallet:                  wallet,
-		client:                  l1Reader.Client(),
+		l1Reader:                l1Reader,
 		blockValidator:          blockValidator,
 		callOpts:                callOpts,
 		boldConfig:              boldConfig,
@@ -157,7 +156,7 @@ func (m *MultiProtocolStaker) isBoldActive(ctx context.Context) (bool, common.Ad
 	if err != nil {
 		return false, addr, err
 	}
-	userLogic, err := boldrollup.NewRollupUserLogic(rollupAddress, m.client)
+	userLogic, err := boldrollup.NewRollupUserLogic(rollupAddress, m.l1Reader.Client())
 	if err != nil {
 		return false, addr, err
 	}
@@ -213,7 +212,7 @@ func (m *MultiProtocolStaker) setupBoldStaker(
 		rollupAddress,
 		*m.getCallOpts(ctx),
 		auth,
-		m.client,
+		m.l1Reader,
 		m.blockValidator,
 		m.statelessBlockValidator,
 		m.boldConfig,

system_tests/bold_challenge_protocol_test.go

@@ -29,6 +29,7 @@ import (
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/ethereum/go-ethereum/rpc"
 	protocol "github.com/offchainlabs/bold/chain-abstraction"
 	solimpl "github.com/offchainlabs/bold/chain-abstraction/sol-implementation"
 	challengemanager "github.com/offchainlabs/bold/challenge-manager"
@@ -40,6 +41,7 @@ import (
 	"github.com/offchainlabs/bold/solgen/go/rollupgen"
 	challengetesting "github.com/offchainlabs/bold/testing"
 	"github.com/offchainlabs/bold/testing/setup"
+	butil "github.com/offchainlabs/bold/util"
 	"github.com/offchainlabs/nitro/arbcompress"
 	"github.com/offchainlabs/nitro/arbnode"
 	"github.com/offchainlabs/nitro/arbnode/dataposter/storage"
@@ -230,7 +232,7 @@ func testChallengeProtocolBOLD(t *testing.T, spawnerOpts ...server_arb.SpawnerOp
 		assertionChain.RollupAddress(),
 		chalManagerAddr.Address(),
 		&evilOpts,
-		l1client,
+		butil.NewBackendWrapper(l1client, rpc.LatestBlockNumber),
 		solimpl.NewDataPosterTransactor(dp),
 	)
 	Require(t, err)
@@ -616,7 +618,7 @@ func createTestNodeOnL1ForBoldProtocol(
 		addresses.Rollup,
 		chalManagerAddr,
 		&opts,
-		l1client,
+		butil.NewBackendWrapper(l1client, rpc.LatestBlockNumber),
 		solimpl.NewDataPosterTransactor(dp),
 	)
 	Require(t, err)
@@ -671,7 +673,7 @@ func deployContractsOnly(
 	cfg.ChainConfig = string(config)
 	addresses, err := setup.DeployFullRollupStack(
 		ctx,
-		backend,
+		butil.NewBackendWrapper(backend, rpc.LatestBlockNumber),
 		&l1TransactionOpts,
 		l1info.GetAddress("Sequencer"),
 		cfg,
@@ -824,7 +826,7 @@ func create2ndNodeWithConfigForBoldProtocol(
 		addresses.Rollup,
 		chalManagerAddr,
 		&evilOpts,
-		l1client,
+		butil.NewBackendWrapper(l1client, rpc.LatestBlockNumber),
 		solimpl.NewDataPosterTransactor(dp),
 	)
 	Require(t, err)

system_tests/bold_new_challenge_test.go

@@ -17,6 +17,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/params"
+	"github.com/ethereum/go-ethereum/rpc"
 	protocol "github.com/offchainlabs/bold/chain-abstraction"
 	solimpl "github.com/offchainlabs/bold/chain-abstraction/sol-implementation"
 	challengemanager "github.com/offchainlabs/bold/challenge-manager"
@@ -27,6 +28,7 @@ import (
 	"github.com/offchainlabs/bold/solgen/go/mocksgen"
 	"github.com/offchainlabs/bold/solgen/go/rollupgen"
 	"github.com/offchainlabs/bold/state-commitments/history"
+	"github.com/offchainlabs/bold/util"
 	"github.com/offchainlabs/nitro/arbnode"
 	"github.com/offchainlabs/nitro/arbnode/dataposter/storage"
 	"github.com/offchainlabs/nitro/staker/bold"
@@ -329,7 +331,7 @@ func startBoldChallengeManager(t *testing.T, ctx context.Context, builder *NodeB
 		builder.addresses.Rollup,
 		chalManagerAddr,
 		&txOpts,
-		builder.L1.Client,
+		util.NewBackendWrapper(builder.L1.Client, rpc.LatestBlockNumber),
 		solimpl.NewDataPosterTransactor(dp),
 	)
 	Require(t, err)

system_tests/common_test.go

@@ -54,6 +54,7 @@ import (
 	boldMocksgen "github.com/offchainlabs/bold/solgen/go/mocksgen"
 	"github.com/offchainlabs/bold/solgen/go/rollupgen"
 	"github.com/offchainlabs/bold/testing/setup"
+	butil "github.com/offchainlabs/bold/util"
 	"github.com/offchainlabs/nitro/arbnode"
 	"github.com/offchainlabs/nitro/arbos"
 	"github.com/offchainlabs/nitro/arbos/arbostypes"
@@ -1342,9 +1343,10 @@ func deployOnParentChain(
 			NumBigStepLevel:              3,
 			ChallengeGracePeriodBlocks:   3,
 		}
+		wrappedClient := butil.NewBackendWrapper(parentChainReader.Client(), rpc.LatestBlockNumber)
 		boldAddresses, err := setup.DeployFullRollupStack(
 			ctx,
-			parentChainReader.Client(),
+			wrappedClient,
 			&parentChainTransactionOpts,
 			parentChainInfo.GetAddress("Sequencer"),
 			cfg,