Merge pull request #16296 from argotorg/set-osaka-default

Set `osaka` as the default EVM version

Author: matheusaaguiar

.circleci/config.yml

@@ -34,7 +34,7 @@ parameters:
     default: "ghcr.io/argotorg/solidity-buildpack-deps@sha256:fc53d68a4680ffa7d5f70164e13a903478964f15bcc07434d74833a05f4fbc19"
   evm-version:
     type: string
-    default: prague
+    default: osaka
 
 orbs:
   win: circleci/[email protected]

.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=prague
+DEFAULT_EVM=osaka
 OPTIMIZE_VALUES=(0 1)
 # TODO: EOF is marked as experimental in evmone. Reenable when proper handling for that is added here.
 EOF_VERSIONS=(0)

Changelog.md

@@ -5,6 +5,7 @@ Language Features:
 
 Compiler Features:
 * ethdebug: Experimental support for instructions and source locations under EOF.
+* EVM: Set default EVM Version to `osaka`.
 
 Bugfixes:
 * Assembler: Fix not using a fixed-width type for IDs being assigned to subassemblies nested more than one level away, resulting in inconsistent `--asm-json` output between target architectures.

docs/using-the-compiler.rst

@@ -181,9 +181,9 @@ at each version. Backward compatibility is not guaranteed between each version.
    - 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`` (**default**)
-- ``osaka`` (**experimental**)
-   - Experimental compilation to EOF is available starting from this version. (`EIP-7692 <https://eips.ethereum.org/EIPS/eip-7692>`_)
+- ``prague``
+- ``osaka`` (**default**)
+   - ``clz`` builtin function is available in inline assembly. (`EIP-7939 <https://eips.ethereum.org/EIPS/eip-7939>`_)
 
 .. index:: ! standard JSON, ! --standard-json
 .. _compiler-api:
@@ -356,10 +356,11 @@ 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, prague (default) or osaka (experimental).
-        "evmVersion": "prague",
+        // petersburg, istanbul, berlin, london, paris, shanghai, cancun, prague or osaka (default).
+        "evmVersion": "osaka",
         // 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.
+        // Requires `evmVersion` >= osaka.
         "eofVersion": null,
         // Optional: Change compilation pipeline to go through the Yul intermediate representation.
         // This is false by default.

liblangutil/EVMVersion.h

@@ -170,7 +170,7 @@ class EVMVersion
 		Prague,
 		Osaka,
 	};
-	static auto constexpr currentVersion = Version::Prague;
+	static auto constexpr currentVersion = Version::Osaka;
 
 	constexpr EVMVersion(Version _version): m_version(_version) {}
 

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=prague
+CURRENT_EVM_VERSION=osaka
 
 AVAILABLE_PRESETS=(
     legacy-no-optimize
@@ -334,6 +334,12 @@ function force_hardhat_compiler_settings
         echo "module.exports.solidity = ${compiler_settings};"
         echo "module.exports.networks.hardhat = module.exports.networks.hardhat || { hardfork: '${evm_version}' }"
         echo "module.exports.networks.hardhat.hardfork = '${evm_version}'"
+        if [[ $evm_version == "osaka" ]]; then
+            # Transaction gas limit introduced by EIP-7825; the default value is 30_000_000
+            # and should be automatically handled by EDR - however, EDR with the relevant change
+            # was not released in time.
+            echo "module.exports.networks.hardhat.blockGasLimit = 16_777_216"
+        fi
     else
         [[ $config_file == *\.ts ]] || assertFail
         [[ $config_var_name != "" ]] || assertFail
@@ -342,6 +348,12 @@ function force_hardhat_compiler_settings
         echo "${config_var_name}.solidity = {compilers: [${compiler_settings}]};"
         echo "${config_var_name}.networks!.hardhat = ${config_var_name}.networks!.hardhat ?? { hardfork: '${evm_version}' };"
         echo "${config_var_name}.networks!.hardhat!.hardfork = '${evm_version}'"
+        if [[ $evm_version == "osaka" ]]; then
+            # Transaction gas limit introduced by EIP-7825; the default value is 30_000_000
+            # and should be automatically handled by EDR - however, EDR with the relevant change
+            # was not released in time.
+            echo "${config_var_name}.networks!.hardhat!.blockGasLimit = 16_777_216"
+        fi
     fi >> "$config_file"
 }
 

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

scripts/tests.sh

@@ -115,9 +115,9 @@ do
     for vm in $EVM_VERSIONS
     do
         FORCE_ABIV1_RUNS="no"
-        if [[ "$vm" == "prague" ]]
+        if [[ "$vm" == "osaka" ]]
         then
-            FORCE_ABIV1_RUNS="no yes" # run both in paris
+            FORCE_ABIV1_RUNS="no yes" # run both when testing the current EVM version
         fi
         for abiv1 in $FORCE_ABIV1_RUNS
         do

test/cmdlineTests/metadata/output

@@ -1,4 +1,4 @@
 
 ======= input.sol:C =======
 Metadata:
-{"compiler":{"version": "<VERSION REMOVED>"},"language":"Solidity","output":{"abi":[],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"input.sol":"C"},"evmVersion":"prague","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"input.sol":{"keccak256":"0x5cf617b1707a484e3c4bd59643013dec76ab7d75900b46855214729ae3e0ceb0","license":"GPL-3.0","urls":["bzz-raw://ac418a02dfadf87234150d3568f33269e3f49460345cb39300e017a6d755eff2","dweb:/ipfs/QmQq3owBu25x2WV46HB1WyKzJpxiAPecU7eMKqtXCF7eeS"]}},"version":1}
+{"compiler":{"version": "<VERSION REMOVED>"},"language":"Solidity","output":{"abi":[],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"input.sol":"C"},"evmVersion":"osaka","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"input.sol":{"keccak256":"0x5cf617b1707a484e3c4bd59643013dec76ab7d75900b46855214729ae3e0ceb0","license":"GPL-3.0","urls":["bzz-raw://ac418a02dfadf87234150d3568f33269e3f49460345cb39300e017a6d755eff2","dweb:/ipfs/QmQq3owBu25x2WV46HB1WyKzJpxiAPecU7eMKqtXCF7eeS"]}},"version":1}

test/cmdlineTests/standard_metadata/output.json

@@ -2,7 +2,7 @@
     "contracts": {
         "C": {
             "C": {
-                "metadata": "{\"compiler\":{\"version\":\"<VERSION REMOVED>\"},\"language\":\"Solidity\",\"output\":{\"abi\":[],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"C\":\"C\"},\"evmVersion\":\"prague\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[]},\"sources\":{\"C\":{\"keccak256\":\"0x5cf617b1707a484e3c4bd59643013dec76ab7d75900b46855214729ae3e0ceb0\",\"license\":\"GPL-3.0\",\"urls\":[\"bzz-raw://ac418a02dfadf87234150d3568f33269e3f49460345cb39300e017a6d755eff2\",\"dweb:/ipfs/QmQq3owBu25x2WV46HB1WyKzJpxiAPecU7eMKqtXCF7eeS\"]}},\"version\":1}"
+                "metadata": "{\"compiler\":{\"version\":\"<VERSION REMOVED>\"},\"language\":\"Solidity\",\"output\":{\"abi\":[],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"C\":\"C\"},\"evmVersion\":\"osaka\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[]},\"sources\":{\"C\":{\"keccak256\":\"0x5cf617b1707a484e3c4bd59643013dec76ab7d75900b46855214729ae3e0ceb0\",\"license\":\"GPL-3.0\",\"urls\":[\"bzz-raw://ac418a02dfadf87234150d3568f33269e3f49460345cb39300e017a6d755eff2\",\"dweb:/ipfs/QmQq3owBu25x2WV46HB1WyKzJpxiAPecU7eMKqtXCF7eeS\"]}},\"version\":1}"
             }
         }
     },