Merge pull request ethereum#14907 from ethereum/makeCancunDefault

Make Cancun the default EVM version

Author: cameel

.circleci/config.yml

@@ -1469,6 +1469,9 @@ jobs:
 
             # NOTE: This is expected to work without running `pnpm build` first.
             cd hardhat/packages/hardhat-core
+            # TODO: temporarily set hardhat stack traces tests to use cancun hardfork
+            # Remove this when hardhat switch to cancun by default: https://github.com/NomicFoundation/hardhat/issues/4851
+            sed -i 's/hardfork: "shanghai",/hardfork: "cancun",/' test/internal/hardhat-network/stack-traces/execution.ts
             pnpm test
       - matrix_notify_failure_unless_pr
 

.circleci/soltest_all.sh

@@ -36,7 +36,7 @@ DEFAULT_EVM_VALUES=(constantinople petersburg istanbul berlin london paris shang
 # set EVM_VALUES to the default values.
 IFS=" " read -ra EVM_VALUES <<< "${1:-${DEFAULT_EVM_VALUES[@]}}"
 
-DEFAULT_EVM=shanghai
+DEFAULT_EVM=cancun
 OPTIMIZE_VALUES=(0 1)
 
 # Run for ABI encoder v1, without SMTChecker tests.

Changelog.md

@@ -6,6 +6,7 @@ Language Features:
 Compiler Features:
  * Code Generator: Use ``MCOPY`` instead of ``MLOAD``/``MSTORE`` loop when copying byte arrays.
  * Yul Analyzer: Emit transient storage warning only for the first occurrence of ``tstore``.
+ * EVM: Set default EVM version to ``cancun``.
 
 
 Bugfixes:

docs/using-the-compiler.rst

@@ -174,9 +174,9 @@ at each version. Backward compatibility is not guaranteed between each version.
    - The block's base fee (`EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ and `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_) can be accessed via the global ``block.basefee`` or ``basefee()`` in inline assembly.
 - ``paris``
    - Introduces ``prevrandao()`` and ``block.prevrandao``, and changes the semantics of the now deprecated ``block.difficulty``, disallowing ``difficulty()`` in inline assembly (see `EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_).
-- ``shanghai`` (**default**)
+- ``shanghai``
    - Smaller code size and gas savings due to the introduction of ``push0`` (see `EIP-3855 <https://eips.ethereum.org/EIPS/eip-3855>`_).
-- ``cancun``
+- ``cancun`` (**default**)
    - The block's blob base fee (`EIP-7516 <https://eips.ethereum.org/EIPS/eip-7516>`_ and `EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_) can be accessed via the global ``block.blobbasefee`` or ``blobbasefee()`` in inline assembly.
    - Introduces ``blobhash()`` in inline assembly and a corresponding global function to retrieve versioned hashes of blobs associated with the transaction (see `EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_).
    - Opcode ``mcopy`` is available in assembly (see `EIP-5656 <https://eips.ethereum.org/EIPS/eip-5656>`_).
@@ -344,8 +344,8 @@ Input Description
         // Version of the EVM to compile for.
         // Affects type checking and code generation. Can be homestead,
         // tangerineWhistle, spuriousDragon, byzantium, constantinople,
-        // petersburg, istanbul, berlin, london, paris or shanghai (default)
-        "evmVersion": "shanghai",
+        // petersburg, istanbul, berlin, london, paris, shanghai or cancun (default)
+        "evmVersion": "cancun",
         // Optional: Change compilation pipeline to go through the Yul intermediate representation.
         // This is false by default.
         "viaIR": true,

liblangutil/EVMVersion.h

@@ -119,7 +119,7 @@ class EVMVersion:
 
 	EVMVersion(Version _version): m_version(_version) {}
 
-	Version m_version = Version::Shanghai;
+	Version m_version = Version::Cancun;
 };
 
 }

libyul/AsmAnalysis.cpp

@@ -752,14 +752,11 @@ bool AsmAnalyzer::validateInstructions(evmasm::Instruction _instr, SourceLocatio
 	else if (_instr == evmasm::Instruction::BLOBBASEFEE && !m_evmVersion.hasBlobBaseFee())
 		errorForVM(6679_error, "only available for Cancun-compatible");
 	else if (_instr == evmasm::Instruction::BLOBHASH && !m_evmVersion.hasBlobHash())
-		// TODO: Change this assertion to an error, similar to the ones above, when Cancun becomes the default EVM version.
-		yulAssert(false);
+		errorForVM(8314_error, "only available for Cancun-compatible");
 	else if (_instr == evmasm::Instruction::MCOPY && !m_evmVersion.hasMcopy())
-		// TODO: Change this assertion to an error, similar to the ones above, when Cancun becomes the default EVM version.
-		yulAssert(false);
+		errorForVM(7755_error, "only available for Cancun-compatible");
 	else if ((_instr == evmasm::Instruction::TSTORE || _instr == evmasm::Instruction::TLOAD) && !m_evmVersion.supportsTransientStorage())
-		// TODO: Change this assertion to an error, similar to the ones above, when Cancun becomes the default EVM version.
-		yulAssert(false);
+		errorForVM(6243_error, "only available for Cancun-compatible");
 	else if (_instr == evmasm::Instruction::PC)
 		m_errorReporter.error(
 			2450_error,

scripts/error_codes.py

@@ -202,7 +202,6 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
         "4591", # "There are more than 256 warnings. Ignoring the rest."
                 # Due to 3805, the warning lists look different for different compiler builds.
         "1834", # Unimplemented feature error, as we do not test it anymore via cmdLineTests
-        "6679", # blobbasefee being used in inline assembly for EVMVersion < cancun
         "1180", # SMTChecker, covered by CL tests
         "2339", # SMTChecker, covered by CL tests
         "2961", # SMTChecker, covered by CL tests

scripts/externalTests/common.sh

@@ -22,7 +22,7 @@ set -e
 
 # Requires $REPO_ROOT to be defined and "${REPO_ROOT}/scripts/common.sh" to be included before.
 
-CURRENT_EVM_VERSION=shanghai
+CURRENT_EVM_VERSION=cancun
 
 AVAILABLE_PRESETS=(
     legacy-no-optimize

scripts/externalTests/runners/base.py

@@ -41,7 +41,7 @@
 from test_helpers import settings_from_preset
 from test_helpers import SettingsPreset
 
-CURRENT_EVM_VERSION: str = "shanghai"
+CURRENT_EVM_VERSION: str = "cancun"
 
 @dataclass
 class TestConfig:

scripts/tests.sh

@@ -115,7 +115,7 @@ do
     for vm in $EVM_VERSIONS
     do
         FORCE_ABIV1_RUNS="no"
-        if [[ "$vm" == "shanghai" ]]
+        if [[ "$vm" == "cancun" ]]
         then
             FORCE_ABIV1_RUNS="no yes" # run both in paris
         fi