update test config for most tests to not deploy the bridge

Author: joshuahannan

engine/execution/state/bootstrap/bootstrap_test.go

@@ -53,7 +53,7 @@ func TestBootstrapLedger(t *testing.T) {
 }
 
 func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) {
-	expectedStateCommitmentBytes, _ := hex.DecodeString("27e23bc91b53d9b3b20af6e23ef506009715798ea32cae78157d84840e8747f5")
+	expectedStateCommitmentBytes, _ := hex.DecodeString("ac2eaefb594337486722fd11a64fc465038790822b646ddd8264c4a8595c9a61")
 	expectedStateCommitment, err := flow.ToStateCommitment(expectedStateCommitmentBytes)
 	require.NoError(t, err)
 

fvm/bootstrap.go

@@ -87,6 +87,7 @@ type BootstrapParams struct {
 	storagePerFlow                   cadence.UFix64
 	restrictedAccountCreationEnabled cadence.Bool
 	setupEVMEnabled                  cadence.Bool
+	setupVMBridgeEnabled             cadence.Bool
 
 	// versionFreezePeriod is the number of blocks in the future where the version
 	// changes are frozen. The Node version beacon manages the freeze period,
@@ -229,6 +230,13 @@ func WithSetupEVMEnabled(enabled cadence.Bool) BootstrapProcedureOption {
 	}
 }
 
+func WithSetupVMBridgeEnabled(enabled cadence.Bool) BootstrapProcedureOption {
+	return func(bp *BootstrapProcedure) *BootstrapProcedure {
+		bp.setupVMBridgeEnabled = enabled
+		return bp
+	}
+}
+
 func WithRestrictedContractDeployment(restricted *bool) BootstrapProcedureOption {
 	return func(bp *BootstrapProcedure) *BootstrapProcedure {
 		bp.restrictedContractDeployment = restricted
@@ -583,7 +591,7 @@ func (b *bootstrapExecutor) deployMetadataViews(fungibleToken, nonFungibleToken
 }
 
 func (b *bootstrapExecutor) deployCrossVMMetadataViews(nonFungibleToken flow.Address, env *templates.Environment) {
-	if bool(b.setupEVMEnabled) && b.ctx.Chain.ChainID().Transient() {
+	if bool(b.setupEVMEnabled) && bool(b.setupVMBridgeEnabled) && b.ctx.Chain.ChainID().Transient() {
 		crossVMMVContract := contracts.CrossVMMetadataViews(*env)
 
 		txError, err := b.invokeMetaTransaction(
@@ -1009,7 +1017,7 @@ func (stubEntropyProvider) RandomSource() ([]byte, error) {
 func (b *bootstrapExecutor) setupVMBridge(serviceAddress flow.Address, env *templates.Environment) {
 	// only setup VM bridge for transient networks
 	// this is because the evm storage account for testnet and mainnet do not exist yet after boostrapping
-	if bool(b.setupEVMEnabled) && b.ctx.Chain.ChainID().Transient() {
+	if bool(b.setupEVMEnabled) && bool(b.setupVMBridgeEnabled) && b.ctx.Chain.ChainID().Transient() {
 
 		bridgeEnv := bridge.Environment{
 			CrossVMNFTAddress:                     env.ServiceAccountAddress,

fvm/fvm_test.go

@@ -3131,7 +3131,7 @@ func TestVMBridge(t *testing.T) {
 	}
 
 	t.Run("successful FT Type Onboarding and Bridging", newVMTest().
-		withBootstrapProcedureOptions(fvm.WithSetupEVMEnabled(true)).
+		withBootstrapProcedureOptions(fvm.WithSetupEVMEnabled(true), fvm.WithSetupVMBridgeEnabled(true)).
 		withContextOptions(ctxOpts...).
 		run(func(
 			t *testing.T,
@@ -3356,7 +3356,7 @@ func TestVMBridge(t *testing.T) {
 	)
 
 	t.Run("successful NFT Type Onboarding and Bridging", newVMTest().
-		withBootstrapProcedureOptions(fvm.WithSetupEVMEnabled(true)).
+		withBootstrapProcedureOptions(fvm.WithSetupEVMEnabled(true), fvm.WithSetupVMBridgeEnabled(true)).
 		withContextOptions(ctxOpts...).
 		run(func(
 			t *testing.T,

utils/unittest/execution_state.go

@@ -23,7 +23,7 @@ const ServiceAccountPrivateKeySignAlgo = crypto.ECDSAP256
 const ServiceAccountPrivateKeyHashAlgo = hash.SHA2_256
 
 // Pre-calculated state commitment with root account with the above private key
-const GenesisStateCommitmentHex = "605fb9f25b76ba9e194feeb967b5d4a9cfbadba5249a57b2e4cecf536cf2a7cd"
+const GenesisStateCommitmentHex = "a0eb770539abfbdf2d6d4af1c45b3ccd469334f40db427040ab04b7c26346c46"
 
 var GenesisStateCommitment flow.StateCommitment
 
@@ -87,10 +87,10 @@ func genesisCommitHexByChainID(chainID flow.ChainID) string {
 		return GenesisStateCommitmentHex
 	}
 	if chainID == flow.Testnet {
-		return "daa9705ebb9778ede626afc4863cd09549e575d0faf8661efaedf91473b1553f"
+		return "1140a7b30156dd7db2d877276dfe9c5cd4bff19a0cae3fc41b0a764fda41693e"
 	}
 	if chainID == flow.Sandboxnet {
 		return "e1c08b17f9e5896f03fe28dd37ca396c19b26628161506924fbf785834646ea1"
 	}
-	return "3bb8b7c2866ae153302dae44342a835ea8a5b4919f4a1bc7d0be47f8416235c2"
+	return "9b6b11cf152a9db180b9ea26e6ea5ea6de0e404edfa8e886546e28feea6f9dac"
 }