Merge pull request #16030 from ethereum/makePragueDefaultEVMVersion

Set prague as the default EVM version

Author: matheusaaguiar

.circleci/config.yml

@@ -34,7 +34,7 @@ parameters:
     default: "solbuildpackpusher/solidity-buildpack-deps@sha256:98f963ed799a0d206ef8e7b5475f847e0dea53b7fdea9618bbc6106a62730bd2"
   evm-version:
     type: string
-    default: cancun
+    default: prague
 
 orbs:
   win: circleci/[email protected]
@@ -831,6 +831,7 @@ defaults:
       project: uniswap
       binary_type: native
       image: cimg/node:18.16
+      resource_class: medium # Tests run out of memory on a smaller machine
 
   - job_native_test_ext_prb_math: &job_native_test_ext_prb_math
       <<: *requires_b_ubu_static

.circleci/soltest_all.sh

@@ -38,7 +38,7 @@ EVMS_WITH_EOF=(osaka)
 # set EVM_VALUES to the default values.
 IFS=" " read -ra EVM_VALUES <<< "${1:-${DEFAULT_EVM_VALUES[@]}}"
 
-DEFAULT_EVM=cancun
+DEFAULT_EVM=prague
 OPTIMIZE_VALUES=(0 1)
 EOF_VERSIONS=(0 1)
 

Changelog.md

@@ -4,6 +4,7 @@ Language Features:
 
 
 Compiler Features:
+* EVM: Set default EVM Version to `prague`.
 * NatSpec: Capture Natspec documentation of `enum` values in the AST.
 
 

docs/using-the-compiler.rst

@@ -176,12 +176,12 @@ at each version. Backward compatibility is not guaranteed between each version.
    - 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``
    - Smaller code size and gas savings due to the introduction of ``push0`` (see `EIP-3855 <https://eips.ethereum.org/EIPS/eip-3855>`_).
-- ``cancun`` (**default**)
+- ``cancun``
    - 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>`_).
    - Opcodes ``tstore`` and ``tload`` are available in assembly (see `EIP-1153 <https://eips.ethereum.org/EIPS/eip-1153>`_).
-- ``prague`` (**experimental**)
+- ``prague`` (**default**)
 - ``osaka`` (**experimental**)
    - Experimental compilation to EOF is available starting from this version. (`EIP-7692 <https://eips.ethereum.org/EIPS/eip-7692>`_)
 
@@ -356,8 +356,8 @@ Input Description
         // Version of the EVM to compile for (optional).
         // Affects type checking and code generation. Can be homestead,
         // tangerineWhistle, spuriousDragon, byzantium, constantinople,
-        // petersburg, istanbul, berlin, london, paris, shanghai, cancun (default), prague (experimental) or osaka (experimental).
-        "evmVersion": "cancun",
+        // petersburg, istanbul, berlin, london, paris, shanghai, cancun, prague (default) or osaka (experimental).
+        "evmVersion": "prague",
         // EVM Object Format version to compile for (optional, experimental).
         // Currently the only valid value is 1. If not specified, legacy non-EOF bytecode will be generated.
         "eofVersion": null,

liblangutil/EVMVersion.h

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

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=cancun
+CURRENT_EVM_VERSION=prague
 
 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 = "cancun"
+CURRENT_EVM_VERSION: str = "prague"
 
 @dataclass
 class TestConfig:

scripts/tests.sh

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

test/cmdlineTests/mcopy_bytes_array_abi_decode/args

@@ -1 +1 @@
---evm-version cancun --no-cbor-metadata --via-ir --ir --debug-info none
+--no-cbor-metadata --via-ir --ir --debug-info none

test/cmdlineTests/mcopy_bytes_array_returned_from_function/args

@@ -1 +1 @@
---evm-version cancun --no-cbor-metadata --via-ir --optimize --ir-optimized --debug-info none
+--no-cbor-metadata --via-ir --optimize --ir-optimized --debug-info none