Merge pull request #14200 from ethereum/updateEvmone

Bump docker images and evmone version.
This commit is contained in:
Daniel 2023-05-09 19:20:22 +02:00 committed by GitHub
commit 4c4eadd893
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
45 changed files with 111 additions and 111 deletions

View File

@ -9,20 +9,20 @@ version: 2.1
parameters: parameters:
ubuntu-2004-docker-image: ubuntu-2004-docker-image:
type: string type: string
# solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-18 # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-19
default: "solbuildpackpusher/solidity-buildpack-deps@sha256:db35d88a16f19adfac6dfd88bda4b32a85a82430f28830aad97bcd10fa4f846c" default: "solbuildpackpusher/solidity-buildpack-deps@sha256:9c7d3be930936a70f0340d5e9fa9a0b8bf69e11192e7e2d37807afe1b7f55534"
ubuntu-2204-docker-image: ubuntu-2204-docker-image:
type: string type: string
# solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-3 # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-4
default: "solbuildpackpusher/solidity-buildpack-deps@sha256:73e4e80128a0596c3ddb36e36e8039514a9f33ca8799bec82060a49b0cdae461" default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7555c26c82fd0dcbc02cbd422b74468f8de1b7f2972b84fadcfa90f7371d6de5"
ubuntu-2204-clang-docker-image: ubuntu-2204-clang-docker-image:
type: string type: string
# solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-2 # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-3
default: "solbuildpackpusher/solidity-buildpack-deps@sha256:0d4fa1da806f9b3daabd2d1dc0842899af794a838e475c14045c3fb289cc8103" default: "solbuildpackpusher/solidity-buildpack-deps@sha256:3d5efffd1e4c381041d1dff6331add86976373bde1c9dfca97ebd3d735e09dab"
ubuntu-clang-ossfuzz-docker-image: ubuntu-clang-ossfuzz-docker-image:
type: string type: string
# solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-23 # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-1
default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7a84f67829ec2fdcfc8a61ebf22f9dc27b04a9edeb1531565ab3e0ebb1cbc4a0" default: "solbuildpackpusher/solidity-buildpack-deps@sha256:d1bba750ab3f9ad9d28d45e332c2ec2126d248c1d619af369a3ef0c29f5936c3"
emscripten-docker-image: emscripten-docker-image:
type: string type: string
# solbuildpackpusher/solidity-buildpack-deps:emscripten-15 # solbuildpackpusher/solidity-buildpack-deps:emscripten-15

View File

@ -73,10 +73,10 @@ then
rm -r "$z3_dir" rm -r "$z3_dir"
# evmone # evmone
evmone_version="0.9.1" evmone_version="0.10.0"
evmone_package="evmone-${evmone_version}-darwin-x86_64.tar.gz" evmone_package="evmone-${evmone_version}-darwin-x86_64.tar.gz"
wget "https://github.com/ethereum/evmone/releases/download/v${evmone_version}/${evmone_package}" wget "https://github.com/ethereum/evmone/releases/download/v${evmone_version}/${evmone_package}"
validate_checksum "$evmone_package" 70420a893a9b1036fcb63526b806d97658db8c373bcab1c3e8382594dc8593e4 validate_checksum "$evmone_package" 1b7773779287d7908baca6b8d556a98800cbd7d6e5c910b55fa507642bc0a15c
tar xzpf "$evmone_package" -C /usr/local tar xzpf "$evmone_package" -C /usr/local
rm "$evmone_package" rm "$evmone_package"

View File

@ -3,7 +3,7 @@ $ErrorActionPreference = "Stop"
# Needed for Invoke-WebRequest to work via CI. # Needed for Invoke-WebRequest to work via CI.
$progressPreference = "silentlyContinue" $progressPreference = "silentlyContinue"
Invoke-WebRequest -URI "https://github.com/ethereum/evmone/releases/download/v0.9.1/evmone-0.9.1-windows-amd64.zip" -OutFile "evmone.zip" Invoke-WebRequest -URI "https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-windows-amd64.zip" -OutFile "evmone.zip"
tar -xf evmone.zip "bin/evmone.dll" tar -xf evmone.zip "bin/evmone.dll"
mkdir deps mkdir deps
mv bin/evmone.dll deps mv bin/evmone.dll deps

View File

@ -33,17 +33,17 @@ namespace solidity::test
#ifdef _WIN32 #ifdef _WIN32
static constexpr auto evmoneFilename = "evmone.dll"; static constexpr auto evmoneFilename = "evmone.dll";
static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.9.1/evmone-0.9.1-windows-amd64.zip"; static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-windows-amd64.zip";
static constexpr auto heraFilename = "hera.dll"; static constexpr auto heraFilename = "hera.dll";
static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/archive/v0.6.0.tar.gz"; static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/archive/v0.6.0.tar.gz";
#elif defined(__APPLE__) #elif defined(__APPLE__)
static constexpr auto evmoneFilename = "libevmone.dylib"; static constexpr auto evmoneFilename = "libevmone.dylib";
static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.9.1/evmone-0.9.1-darwin-x86_64.tar.gz"; static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-darwin-x86_64.tar.gz";
static constexpr auto heraFilename = "libhera.dylib"; static constexpr auto heraFilename = "libhera.dylib";
static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.6.0/hera-0.6.0-darwin-x86_64.tar.gz"; static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.6.0/hera-0.6.0-darwin-x86_64.tar.gz";
#else #else
static constexpr auto evmoneFilename = "libevmone.so"; static constexpr auto evmoneFilename = "libevmone.so";
static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.9.1/evmone-0.9.1-linux-x86_64.tar.gz"; static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-linux-x86_64.tar.gz";
static constexpr auto heraFilename = "libhera.so"; static constexpr auto heraFilename = "libhera.so";
static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.6.0/hera-0.6.0-linux-x86_64.tar.gz"; static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.6.0/hera-0.6.0-linux-x86_64.tar.gz";
#endif #endif

View File

@ -30,6 +30,6 @@ contract C is B {
} }
// ---- // ----
// test() -> 77 // test() -> 77
// gas irOptimized: 119155 // gas irOptimized: 119177
// gas legacy: 151834 // gas legacy: 151866
// gas legacyOptimized: 110339 // gas legacyOptimized: 110359

View File

@ -39,4 +39,4 @@ contract C is B {
// ---- // ----
// test() -> 5, 10 // test() -> 5, 10
// gas irOptimized: 87337 // gas irOptimized: 87337
// gas legacy: 102637 // gas legacy: 102651

View File

@ -16,4 +16,4 @@ contract D {
// ---- // ----
// f() -> FAILURE, hex"4e487b71", 0x11 // f() -> FAILURE, hex"4e487b71", 0x11
// g(), 100 wei -> 1 // g(), 100 wei -> 1
// gas legacy: 100370 // gas legacy: 100388

View File

@ -19,6 +19,6 @@ contract B {
// ---- // ----
// f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004 // f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
// gas irOptimized: 115808 // gas irOptimized: 115828
// gas legacy: 229947 // gas legacy: 230001
// gas legacyOptimized: 130613 // gas legacyOptimized: 130637

View File

@ -43,6 +43,6 @@ contract C {
// ---- // ----
// test() -> 5, 6, 7 // test() -> 5, 6, 7
// gas irOptimized: 260837 // gas irOptimized: 260895
// gas legacy: 441446 // gas legacy: 441556
// gas legacyOptimized: 279259 // gas legacyOptimized: 279321

View File

@ -24,6 +24,6 @@ contract Main {
} }
// ---- // ----
// f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
// gas irOptimized: 112147 // gas irOptimized: 112161
// gas legacy: 125140 // gas legacy: 125162
// gas legacyOptimized: 113000 // gas legacyOptimized: 113012

View File

@ -24,6 +24,6 @@ contract Creator {
} }
// ---- // ----
// f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
// gas irOptimized: 429076 // gas irOptimized: 429160
// gas legacy: 581281 // gas legacy: 581443
// gas legacyOptimized: 444496 // gas legacyOptimized: 444588

View File

@ -24,6 +24,6 @@ contract Creator {
} }
// ---- // ----
// f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h" // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
// gas irOptimized: 278448 // gas irOptimized: 278528
// gas legacy: 418282 // gas legacy: 418462
// gas legacyOptimized: 291665 // gas legacyOptimized: 291755

View File

@ -17,4 +17,4 @@ contract C {
} }
// ---- // ----
// f() -> 16 // f() -> 16
// gas legacy: 102040 // gas legacy: 102082

View File

@ -17,6 +17,6 @@ contract C {
} }
// ---- // ----
// f(), 2000 ether -> true // f(), 2000 ether -> true
// gas irOptimized: 119451 // gas irOptimized: 119457
// gas legacy: 122615 // gas legacy: 122621
// gas legacyOptimized: 122484 // gas legacyOptimized: 122490

View File

@ -15,8 +15,8 @@ contract C {
} }
// ---- // ----
// constructor() -> // constructor() ->
// gas irOptimized: 165390 // gas irOptimized: 165398
// gas legacy: 244780 // gas legacy: 244800
// gas legacyOptimized: 171605 // gas legacyOptimized: 171615
// deposit(bytes32), 18 wei: 0x1234 -> // deposit(bytes32), 18 wei: 0x1234 ->
// ~ emit Deposit(address,bytes32,uint256) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: #0xc06afe3a8444fc0004668591e8306bfb9968e79e, #0x1234, 0x00 // ~ emit Deposit(address,bytes32,uint256) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: #0xc06afe3a8444fc0004668591e8306bfb9968e79e, #0x1234, 0x00

View File

@ -13,4 +13,4 @@ contract D {
} }
// ---- // ----
// f() -> 2 // f() -> 2
// gas legacy: 100201 // gas legacy: 100211

View File

@ -11,4 +11,4 @@ contract D {
} }
// ---- // ----
// f() -> 2 // f() -> 2
// gas legacy: 100175 // gas legacy: 100185

View File

@ -15,7 +15,7 @@ contract D {
} }
// ---- // ----
// constructor(): 2 -> // constructor(): 2 ->
// gas irOptimized: 193985 // gas irOptimized: 193999
// gas legacy: 241212 // gas legacy: 241234
// gas legacyOptimized: 192949 // gas legacyOptimized: 192961
// f() -> 2 // f() -> 2

View File

@ -17,7 +17,7 @@ contract D {
// EVMVersion: >=constantinople // EVMVersion: >=constantinople
// ---- // ----
// constructor(): 2 -> // constructor(): 2 ->
// gas irOptimized: 194148 // gas irOptimized: 194162
// gas legacy: 241584 // gas legacy: 241606
// gas legacyOptimized: 193181 // gas legacyOptimized: 193193
// f() -> 2 // f() -> 2

View File

@ -39,9 +39,9 @@ contract test {
// ---- // ----
// constructor(), 20 wei -> // constructor(), 20 wei ->
// gas irOptimized: 260040 // gas irOptimized: 260052
// gas legacy: 391566 // gas legacy: 391588
// gas legacyOptimized: 268079 // gas legacyOptimized: 268089
// sendAmount(uint256): 5 -> 5 // sendAmount(uint256): 5 -> 5
// outOfGas() -> FAILURE # call to helper should not succeed but amount should be transferred anyway # // outOfGas() -> FAILURE # call to helper should not succeed but amount should be transferred anyway #
// checkState() -> false, 15 // checkState() -> false, 15

View File

@ -38,9 +38,9 @@ contract test {
// ---- // ----
// constructor(), 20 wei -> // constructor(), 20 wei ->
// gas irOptimized: 260040 // gas irOptimized: 260052
// gas legacy: 391566 // gas legacy: 391588
// gas legacyOptimized: 268079 // gas legacyOptimized: 268089
// sendAmount(uint256): 5 -> 5 // sendAmount(uint256): 5 -> 5
// outOfGas() -> FAILURE # call to helper should not succeed but amount should be transferred anyway # // outOfGas() -> FAILURE # call to helper should not succeed but amount should be transferred anyway #
// checkState() -> false, 15 // checkState() -> false, 15

View File

@ -27,5 +27,5 @@ contract C {
// ---- // ----
// t() -> 9 // t() -> 9
// gas irOptimized: 99064 // gas irOptimized: 99064
// gas legacy: 149071 // gas legacy: 149095
// gas legacyOptimized: 106176 // gas legacyOptimized: 106188

View File

@ -27,8 +27,8 @@ contract C {
} }
// ---- // ----
// f() -> 3, 7, 5 // f() -> 3, 7, 5
// gas irOptimized: 124829 // gas irOptimized: 124849
// gas legacy: 148500 // gas legacy: 148528
// gas legacyOptimized: 123951 // gas legacyOptimized: 123971
// x() -> 7 // x() -> 7
// y() -> 5 // y() -> 5

View File

@ -22,7 +22,7 @@ contract D {
// ---- // ----
// f() -> 1 // f() -> 1
// gas irOptimized: 77051 // gas irOptimized: 77051
// gas legacy: 112260 // gas legacy: 112280
// g() -> 5 // g() -> 5
// gas irOptimized: 77106 // gas irOptimized: 77106
// gas legacy: 112796 // gas legacy: 112816

View File

@ -24,4 +24,4 @@ contract B {
// ---- // ----
// g() -> 42 // g() -> 42
// gas irOptimized: 80813 // gas irOptimized: 80813
// gas legacy: 122447 // gas legacy: 122471

View File

@ -23,6 +23,6 @@ contract B {
// ---- // ----
// g() -> 42 // g() -> 42
// gas irOptimized: 100266 // gas irOptimized: 100282
// gas legacy: 180398 // gas legacy: 180440
// gas legacyOptimized: 112576 // gas legacyOptimized: 112596

View File

@ -20,6 +20,6 @@ contract A {
// ---- // ----
// g(int256): -1 -> -1 // g(int256): -1 -> -1
// gas legacy: 102064 // gas legacy: 102086
// g(int256): 10 -> 10 // g(int256): 10 -> 10
// gas legacy: 101692 // gas legacy: 101714

View File

@ -40,9 +40,9 @@ contract Main {
// ---- // ----
// constructor(), 22 wei -> // constructor(), 22 wei ->
// gas irOptimized: 266864 // gas irOptimized: 266886
// gas legacy: 392744 // gas legacy: 392786
// gas legacyOptimized: 261611 // gas legacyOptimized: 261633
// getFlag() -> true // getFlag() -> true
// getName() -> "abc" // getName() -> "abc"
// getBalances() -> 12, 10 // getBalances() -> 12, 10

View File

@ -16,9 +16,9 @@ contract ClientReceipt {
} }
// ---- // ----
// constructor(), 2000 wei -> // constructor(), 2000 wei ->
// gas irOptimized: 171859 // gas irOptimized: 171865
// gas legacy: 230026 // gas legacy: 230038
// gas legacyOptimized: 173877 // gas legacyOptimized: 173883
// balance -> 1500 // balance -> 1500
// gas irOptimized: 191881 // gas irOptimized: 191881
// gas legacy: 235167 // gas legacy: 235167

View File

@ -52,10 +52,10 @@ contract C {
} }
// ---- // ----
// testMul(int32,int32): 42, 10 -> 420 // testMul(int32,int32): 42, 10 -> 420
// gas irOptimized: 102545 // gas irOptimized: 102563
// gas legacy: 183939 // gas legacy: 183981
// gas legacyOptimized: 123539 // gas legacyOptimized: 123563
// testInc(int32): 42 -> 43 // testInc(int32): 42 -> 43
// gas irOptimized: 102368 // gas irOptimized: 102386
// gas legacy: 183197 // gas legacy: 183239
// gas legacyOptimized: 123227 // gas legacyOptimized: 123251

View File

@ -58,10 +58,10 @@ contract C {
} }
// ---- // ----
// testMul(int32,int32): 42, 10 -> 420 // testMul(int32,int32): 42, 10 -> 420
// gas irOptimized: 102545 // gas irOptimized: 102563
// gas legacy: 183939 // gas legacy: 183981
// gas legacyOptimized: 123539 // gas legacyOptimized: 123563
// testInc(int32): 42 -> 43 // testInc(int32): 42 -> 43
// gas irOptimized: 102368 // gas irOptimized: 102386
// gas legacy: 183197 // gas legacy: 183239
// gas legacyOptimized: 123227 // gas legacyOptimized: 123251

View File

@ -26,4 +26,4 @@ contract C {
// compileViaYul: also // compileViaYul: also
// ---- // ----
// createDSalted(bytes32,uint256): 42, 64 -> // createDSalted(bytes32,uint256): 42, 64 ->
// gas legacy: 102921 // gas legacy: 102943

View File

@ -23,4 +23,4 @@ contract A {
// same_salt() -> true // same_salt() -> true
// gas irOptimized: 98438897 // gas irOptimized: 98438897
// gas legacy: 98439109 // gas legacy: 98439109
// gas legacyOptimized: 98438966 // gas legacyOptimized: 98438967

View File

@ -21,6 +21,6 @@ contract A {
// EVMVersion: >=constantinople // EVMVersion: >=constantinople
// ---- // ----
// f(), 10 ether -> 3007, 3008, 3009 // f(), 10 ether -> 3007, 3008, 3009
// gas irOptimized: 254190 // gas irOptimized: 254238
// gas legacy: 380967 // gas legacy: 381063
// gas legacyOptimized: 279640 // gas legacyOptimized: 279694

View File

@ -25,5 +25,5 @@ contract D {
// stateDecimal() -> right(42) // stateDecimal() -> right(42)
// stateBytes() -> left(0x4200ef) // stateBytes() -> left(0x4200ef)
// internalStateDecimal() -> 0x20 // internalStateDecimal() -> 0x20
// gas legacy: 100255 // gas legacy: 100265
// update(bool,uint256,bytes32): false, -23, left(0x2300ef) -> false, -23, left(0x2300ef) // update(bool,uint256,bytes32): false, -23, left(0x2300ef) -> false, -23, left(0x2300ef)

View File

@ -40,4 +40,4 @@ contract D {
// ---- // ----
// library: "A":L // library: "A":L
// test() -> 3 // test() -> 3
// gas legacy: 120859 // gas legacy: 120881

View File

@ -38,6 +38,6 @@ contract C {
} }
// ---- // ----
// testRuntime() -> true // testRuntime() -> true
// gas legacy: 100165 // gas legacy: 100177
// testCreation() -> true // testCreation() -> true
// gas legacy: 100588 // gas legacy: 100600

View File

@ -24,4 +24,4 @@ contract C {
// ---- // ----
// test() -> 7 // test() -> 7
// gas legacy: 100839 // gas legacy: 100849

View File

@ -24,4 +24,4 @@ contract C {
// EVMVersion: >=constantinople // EVMVersion: >=constantinople
// ---- // ----
// test() -> 42 // test() -> 42
// gas legacy: 100225 // gas legacy: 100235

View File

@ -25,5 +25,5 @@ contract C {
// ---- // ----
// test() -> 9, 7 // test() -> 9, 7
// gas legacy: 127478 // gas legacy: 127514
// t2() -> 9 // t2() -> 9

View File

@ -30,9 +30,9 @@ contract D {
} }
// ---- // ----
// constructor(), 1 ether -> // constructor(), 1 ether ->
// gas irOptimized: 186962 // gas irOptimized: 186970
// gas legacy: 255963 // gas legacy: 255973
// gas legacyOptimized: 178911 // gas legacyOptimized: 178919
// c() -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a // c() -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
// balance: 0x137aa4dfc0911524504fcd4d98501f179bc13b4a -> 1000000000000000000 // balance: 0x137aa4dfc0911524504fcd4d98501f179bc13b4a -> 1000000000000000000
// balance -> 0 // balance -> 0

View File

@ -17,7 +17,7 @@ contract D {
// ---- // ----
// constructor(), 27 wei -> // constructor(), 27 wei ->
// gas irOptimized: 169371 // gas irOptimized: 169377
// gas legacy: 218447 // gas legacy: 218459
// gas legacyOptimized: 167286 // gas legacyOptimized: 167292
// f() -> 27 // f() -> 27

View File

@ -35,7 +35,7 @@ contract D {
// EVMVersion: >=byzantium // EVMVersion: >=byzantium
// ---- // ----
// f() -> 0x1 # This should work, next should throw # // f() -> 0x1 # This should work, next should throw #
// gas legacy: 102085 // gas legacy: 102095
// fview() -> FAILURE // fview() -> FAILURE
// gas irOptimized: 98438596 // gas irOptimized: 98438596
// gas legacy: 98438774 // gas legacy: 98438774

View File

@ -20,7 +20,7 @@ contract test {
// ---- // ----
// constructor(), 20 wei -> // constructor(), 20 wei ->
// gas irOptimized: 174345 // gas irOptimized: 174351
// gas legacy: 252286 // gas legacy: 252296
// gas legacyOptimized: 180346 // gas legacyOptimized: 180352
// sendAmount(uint256): 5 -> 8 // sendAmount(uint256): 5 -> 8

View File

@ -19,7 +19,7 @@ contract test {
// ---- // ----
// constructor(), 20 wei -> // constructor(), 20 wei ->
// gas irOptimized: 175209 // gas irOptimized: 175215
// gas legacy: 253810 // gas legacy: 253820
// gas legacyOptimized: 180778 // gas legacyOptimized: 180784
// sendAmount(uint256): 5 -> 8 // sendAmount(uint256): 5 -> 8