Remove feature flag for ABI-only version of EVM contract

onflow · Mar 27, 2024 · f4e4fc7 · f4e4fc7
1 parent 51a3fb6
commit f4e4fc7
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 283 deletions.
diff --git a/cmd/util/ledger/migrations/change_contract_code_migration.go b/cmd/util/ledger/migrations/change_contract_code_migration.go
@@ -326,10 +326,7 @@ func SystemContractChanges(chainID flow.ChainID) []SystemContractChange {
 		// EVM related contracts
 		NewSystemContractChange(
 			systemContracts.EVMContract,
-			evm.ContractCode(
-				systemContracts.FlowToken.Address,
-				true,
-			),
+			evm.ContractCode(systemContracts.FlowToken.Address),
 		),
 	}
 }

diff --git a/fvm/bootstrap.go b/fvm/bootstrap.go
@@ -76,13 +76,7 @@ type BootstrapParams struct {
 	minimumStorageReservation        cadence.UFix64
 	storagePerFlow                   cadence.UFix64
 	restrictedAccountCreationEnabled cadence.Bool
-
-	// `setupEVMEnabled` == true && `evmAbiOnly` == true will enable the ABI-only EVM
-	// `setupEVMEnabled` == true && `evmAbiOnly` == false will enable the full EVM functionality
-	// `setupEVMEnabled` == false will disable EVM
-	// This will allow to quickly disable the ABI-only EVM, in case there's a bug or something.
-	setupEVMEnabled cadence.Bool
-	evmAbiOnly      cadence.Bool
+	setupEVMEnabled                  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,
@@ -225,13 +219,6 @@ func WithSetupEVMEnabled(enabled cadence.Bool) BootstrapProcedureOption {
 	}
 }
 
-func WithEVMABIOnly(evmAbiOnly cadence.Bool) BootstrapProcedureOption {
-	return func(bp *BootstrapProcedure) *BootstrapProcedure {
-		bp.evmAbiOnly = evmAbiOnly
-		return bp
-	}
-}
-
 func WithRestrictedContractDeployment(restricted *bool) BootstrapProcedureOption {
 	return func(bp *BootstrapProcedure) *BootstrapProcedure {
 		bp.restrictedContractDeployment = restricted
@@ -830,7 +817,7 @@ func (b *bootstrapExecutor) setupEVM(serviceAddress, fungibleTokenAddress, flowT
 		// deploy the EVM contract to the service account
 		tx := blueprints.DeployContractTransaction(
 			serviceAddress,
-			stdlib.ContractCode(flowTokenAddress, bool(b.evmAbiOnly)),
+			stdlib.ContractCode(flowTokenAddress),
 			stdlib.ContractName,
 		)
 		// WithEVMEnabled should only be used after we create an account for storage

diff --git a/fvm/evm/stdlib/abiOnlyContract.cdc b/fvm/evm/stdlib/abiOnlyContract.cdc
diff --git a/fvm/evm/stdlib/contract.go b/fvm/evm/stdlib/contract.go
@@ -27,16 +27,9 @@ import (
 //go:embed contract.cdc
 var contractCode string
 
-//go:embed abiOnlyContract.cdc
-var abiOnlyContractCode string
-
 var flowTokenImportPattern = regexp.MustCompile(`(?m)^import "FlowToken"\n`)
 
-func ContractCode(flowTokenAddress flow.Address, evmAbiOnly bool) []byte {
-	if evmAbiOnly {
-		return []byte(abiOnlyContractCode)
-	}
-
+func ContractCode(flowTokenAddress flow.Address) []byte {
 	return []byte(flowTokenImportPattern.ReplaceAllString(
 		contractCode,
 		fmt.Sprintf("import FlowToken from %s", flowTokenAddress.HexWithPrefix()),