delay initialization

miner/miner.go

@@ -82,7 +82,7 @@ type Miner struct {
 
 func New(eth Backend, config *Config, chainConfig *params.ChainConfig, mux *event.TypeMux, engine consensus.Engine, clock *mockable.Clock) *Miner {
 	return &Miner{
-		worker: newWorker(config, chainConfig, engine, eth, mux, true),
+		worker: newWorker(config, chainConfig, engine, eth, mux, false),
 		clock:  clock,
 	}
 }

miner/worker.go

@@ -388,7 +388,7 @@ func (w *worker) pendingBlockAndReceipts() (*types.Block, types.Receipts) {
 
 // start sets the running status as 1 and triggers new work submitting.
 func (w *worker) start() {
-	w.running.Store(true)
+	// w.running.Store(true)
 	w.startCh <- struct{}{}
 }
 

plugin/evm/vm.go

@@ -1108,6 +1108,8 @@ func (vm *VM) initBlockBuilding() error {
 	ctx, cancel := context.WithCancel(context.TODO())
 	vm.cancel = cancel
 
+	vm.miner.Start()
+
 	ethTxGossipMarshaller := GossipEthTxMarshaller{}
 	ethTxGossipClient := vm.Network.NewClient(p2p.TxGossipHandlerID, p2p.WithValidatorSampling(vm.validators))
 	ethTxGossipMetrics, err := gossip.NewMetrics(vm.sdkMetrics, ethTxGossipNamespace)

plugin/evm/vm_warp_test.go

@@ -13,6 +13,7 @@ import (
 	_ "embed"
 
 	"github.com/ava-labs/avalanchego/ids"
+	"github.com/ava-labs/avalanchego/snow"
 	commonEng "github.com/ava-labs/avalanchego/snow/engine/common"
 	"github.com/ava-labs/avalanchego/snow/engine/snowman/block"
 	"github.com/ava-labs/avalanchego/snow/validators"
@@ -402,7 +403,7 @@ func testWarpVMTransaction(t *testing.T, unsignedMessage *avalancheWarp.Unsigned
 
 func TestReceiveWarpMessage(t *testing.T) {
 	require := require.New(t)
-	issuer, vm, _, _, _ := GenesisVM(t, true, genesisJSONDurango, "", "")
+	issuer, vm, _, _, _ := GenesisVM(t, false, genesisJSONDurango, "", "")
 
 	defer func() {
 		require.NoError(vm.Shutdown(context.Background()))
@@ -425,15 +426,16 @@ func TestReceiveWarpMessage(t *testing.T) {
 	)
 
 	// Stop the miner to change the upgrade config to avoid a data race
-	vm.miner.Stop()
 	vm.chainConfig.UpgradeConfig = params.UpgradeConfig{
 		PrecompileUpgrades: []params.PrecompileUpgrade{
 			{Config: enableConfig},
 			{Config: disableConfig},
 			{Config: reEnableConfig},
 		},
 	}
-	vm.miner.Start()
+	// Bootstrapping after changing the upgrade config to avoid a data race in the miner
+	require.NoError(vm.SetState(context.Background(), snow.Bootstrapping))
+	require.NoError(vm.SetState(context.Background(), snow.NormalOp))
 
 	type test struct {
 		name          string