Skip to content

Commit 6caada7

Browse files
hrkrshnnhrkrshnn
committed
Updated evmone version to 0.8.0 and evmc version to 9.0.0
1 parent 7041b87 commit 6caada7

File tree

9 files changed

+55
-35
lines changed

9 files changed

+55
-35
lines changed

‎.circleci/config.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ version: 2.1
99
parameters:
1010
ubuntu-2004-docker-image:
1111
type: string
12-
# solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-7
13-
default: "solbuildpackpusher/solidity-buildpack-deps@sha256:af5a0c6ea5e113e477f5387955a862f9aea5cc74d9ceeb2377fc64e64088d200"
12+
# solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-8
13+
default: "solbuildpackpusher/solidity-buildpack-deps@sha256:e9d27b82b56a91b2463cecef9972a302df6ab7ea33538a9fa3175ae9e29ffb84"
1414
ubuntu-2004-clang-docker-image:
1515
type: string
16-
# solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-7
17-
default: "solbuildpackpusher/solidity-buildpack-deps@sha256:cb504c6456d4a2dd80b354acfd7429836da5acce4e394500c02d5740617f9d01"
16+
# solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-8
17+
default: "solbuildpackpusher/solidity-buildpack-deps@sha256:bfc02e3b8ea1842918485b8d4bf127ce8090e35d65646bfc5b5490ff37c70232"
1818
ubuntu-1604-clang-ossfuzz-docker-image:
1919
type: string
20-
# solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-10
21-
default: "solbuildpackpusher/solidity-buildpack-deps@sha256:ea15a35f6188360b425593c83e946660ab4ea4dac9b9c3bb3629e6ed57276b1d"
20+
# solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-11
21+
default: "solbuildpackpusher/solidity-buildpack-deps@sha256:8fa6e8c08823868aa788eee9b38cf9763d73ef2bfed9c503be7e8817d7127fd1"
2222
emscripten-docker-image:
2323
type: string
2424
# solbuildpackpusher/solidity-buildpack-deps:emscripten-6

‎.circleci/osx_install_dependencies.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ then
5959
rm -rf "$z3_version-x64-$osx_version"
6060

6161
# evmone
62-
wget https://github.com/ethereum/evmone/releases/download/v0.7.0/evmone-0.7.0-darwin-x86_64.tar.gz
63-
tar xzpf evmone-0.7.0-darwin-x86_64.tar.gz -C /usr/local
64-
rm -f evmone-0.7.0-darwin-x86_64.tar.gz
62+
wget https://github.com/ethereum/evmone/releases/download/v0.8.0/evmone-0.8.0-darwin-x86_64.tar.gz
63+
tar xzpf evmone-0.8.0-darwin-x86_64.tar.gz -C /usr/local
64+
rm -f evmone-0.8.0-darwin-x86_64.tar.gz
6565

6666
# hera
67-
wget https://github.com/ewasm/hera/releases/download/v0.3.2-evmc8/hera-0.3.2+commit.dc886eb7-darwin-x86_64.tar.gz
68-
tar xzpf hera-0.3.2+commit.dc886eb7-darwin-x86_64.tar.gz -C /usr/local
69-
rm -f hera-0.3.2+commit.dc886eb7-darwin-x86_64.tar.gz
67+
wget https://github.com/ewasm/hera/releases/download/v0.5.0/hera-0.5.0-darwin-x86_64.tar.gz
68+
tar xzpf hera-0.5.0-darwin-x86_64.tar.gz -C /usr/local
69+
rm -f hera-0.5.0-darwin-x86_64.tar.gz
7070
fi

‎scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# (c) 2016-2019 solidity contributors.
2323
#------------------------------------------------------------------------------
2424
FROM gcr.io/oss-fuzz-base/base-clang as base
25-
LABEL version="10"
25+
LABEL version="11"
2626

2727
ARG DEBIAN_FRONTEND=noninteractive
2828

@@ -92,7 +92,7 @@ RUN set -ex; \
9292
# EVMONE
9393
RUN set -ex; \
9494
cd /usr/src; \
95-
git clone --branch="v0.7.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
95+
git clone --branch="v0.8.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
9696
cd evmone; \
9797
mkdir build; \
9898
cd build; \
@@ -104,7 +104,7 @@ RUN set -ex; \
104104
# HERA
105105
RUN set -ex; \
106106
cd /usr/src; \
107-
git clone --branch="v0.3.2-evmc8" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
107+
git clone --branch="v0.5.0" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
108108
cd hera; \
109109
mkdir build; \
110110
cd build; \
@@ -146,4 +146,4 @@ RUN set -ex; \
146146
FROM base
147147
COPY --from=libraries /usr/lib /usr/lib
148148
COPY --from=libraries /usr/bin /usr/bin
149-
COPY --from=libraries /usr/include /usr/include
149+
COPY --from=libraries /usr/include /usr/include

‎scripts/docker/buildpack-deps/Dockerfile.ubuntu2004‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# (c) 2016-2019 solidity contributors.
2323
#------------------------------------------------------------------------------
2424
FROM buildpack-deps:focal AS base
25-
LABEL version="7"
25+
LABEL version="8"
2626

2727
ARG DEBIAN_FRONTEND=noninteractive
2828

@@ -48,7 +48,7 @@ FROM base AS libraries
4848
# EVMONE
4949
RUN set -ex; \
5050
cd /usr/src; \
51-
git clone --branch="v0.7.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
51+
git clone --branch="v0.8.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
5252
cd evmone; \
5353
mkdir build; \
5454
cd build; \
@@ -60,7 +60,7 @@ RUN set -ex; \
6060
# HERA
6161
RUN set -ex; \
6262
cd /usr/src; \
63-
git clone --branch="v0.3.2-evmc8" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
63+
git clone --branch="v0.5.0" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
6464
cd hera; \
6565
mkdir build; \
6666
cd build; \
@@ -73,4 +73,3 @@ FROM base
7373
COPY --from=libraries /usr/lib /usr/lib
7474
COPY --from=libraries /usr/bin /usr/bin
7575
COPY --from=libraries /usr/include /usr/include
76-

‎scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# (c) 2016-2019 solidity contributors.
2323
#------------------------------------------------------------------------------
2424
FROM buildpack-deps:focal AS base
25-
LABEL version="7"
25+
LABEL version="8"
2626

2727
ARG DEBIAN_FRONTEND=noninteractive
2828

@@ -50,7 +50,7 @@ ENV CXX clang++
5050
# EVMONE
5151
RUN set -ex; \
5252
cd /usr/src; \
53-
git clone --branch="v0.7.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
53+
git clone --branch="v0.8.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
5454
cd evmone; \
5555
mkdir build; \
5656
cd build; \
@@ -62,7 +62,7 @@ RUN set -ex; \
6262
# HERA
6363
RUN set -ex; \
6464
cd /usr/src; \
65-
git clone --branch="v0.3.2-evmc8" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
65+
git clone --branch="v0.5.0" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
6666
cd hera; \
6767
mkdir build; \
6868
cd build; \
@@ -75,4 +75,3 @@ FROM base
7575
COPY --from=libraries /usr/lib /usr/lib
7676
COPY --from=libraries /usr/bin /usr/bin
7777
COPY --from=libraries /usr/include /usr/include
78-

‎scripts/install_evmone.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ $ErrorActionPreference = "Stop"
33
# Needed for Invoke-WebRequest to work via CI.
44
$progressPreference = "silentlyContinue"
55

6-
Invoke-WebRequest -URI "https://github.com/ethereum/evmone/releases/download/v0.7.0/evmone-0.7.0-windows-amd64.zip" -OutFile "evmone.zip"
6+
Invoke-WebRequest -URI "https://github.com/ethereum/evmone/releases/download/v0.8.0/evmone-0.8.0-windows-amd64.zip" -OutFile "evmone.zip"
77
tar -xf evmone.zip "bin/evmone.dll"
88
mkdir deps
99
mv bin/evmone.dll deps

‎test/Common.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@ namespace solidity::test
3131

3232
#ifdef _WIN32
3333
static constexpr auto evmoneFilename = "evmone.dll";
34-
static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.7.0/evmone-0.7.0-windows-amd64.zip";
34+
static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.8.0/evmone-0.8.0-windows-amd64.zip";
3535
static constexpr auto heraFilename = "hera.dll";
3636
static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/archive/v0.3.2-evmc8.tar.gz";
3737
#elif defined(__APPLE__)
3838
static constexpr auto evmoneFilename = "libevmone.dylib";
39-
static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.7.0/evmone-0.7.0-darwin-x86_64.tar.gz";
39+
static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.8.0/evmone-0.8.0-darwin-x86_64.tar.gz";
4040
static constexpr auto heraFilename = "libhera.dylib";
41-
static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.3.2-evmc8/hera-0.3.2+commit.dc886eb7-darwin-x86_64.tar.gz";
41+
static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.5.0/hera-0.5.0-darwin-x86_64.tar.gz";
4242
#else
4343
static constexpr auto evmoneFilename = "libevmone.so";
44-
static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.7.0/evmone-0.7.0-linux-x86_64.tar.gz";
44+
static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.8.0/evmone-0.8.0-linux-x86_64.tar.gz";
4545
static constexpr auto heraFilename = "libhera.so";
46-
static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.3.2-evmc8/hera-0.3.2+commit.dc886eb7-linux-x86_64.tar.gz";
46+
static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.5.0/hera-0.5.0-linux-x86_64.tar.gz";
4747
#endif
4848

4949
struct ConfigException : public util::Exception {};

‎test/evmc/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# EVMC
22

3-
This is an import of [EVMC](https://github.com/ethereum/evmc) version [8.0.0](https://github.com/ethereum/evmc/releases/tag/v8.0.0).
3+
This is an import of [EVMC](https://github.com/ethereum/evmc) version [9.0.0](https://github.com/ethereum/evmc/releases/tag/v9.0.0).
44

55
Important: The `MockedAccount.storage` is changed to a map from unordered_map as ordering is important for fuzzing.

‎test/evmc/evmc.h‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ enum
4444
*
4545
* @see @ref versioning
4646
*/
47-
EVMC_ABI_VERSION = 8
47+
EVMC_ABI_VERSION = 9
4848
};
4949

5050

@@ -154,6 +154,7 @@ struct evmc_tx_context
154154
int64_t block_gas_limit; /**< The block gas limit. */
155155
evmc_uint256be block_difficulty; /**< The block difficulty. */
156156
evmc_uint256be chain_id; /**< The blockchain's ChainID. */
157+
evmc_uint256be block_base_fee; /**< The block base fee per gas (EIP-1559, EIP-3198). */
157158
};
158159

159160
/**
@@ -813,19 +814,40 @@ enum evmc_revision
813814
/**
814815
* The Istanbul revision.
815816
*
816-
* The spec draft: https://eips.ethereum.org/EIPS/eip-1679.
817+
* https://eips.ethereum.org/EIPS/eip-1679
817818
*/
818819
EVMC_ISTANBUL = 7,
819820

820821
/**
821822
* The Berlin revision.
822823
*
823-
* The spec draft: https://eips.ethereum.org/EIPS/eip-2070.
824+
* https://github.com/ethereum/eth1.0-specs/blob/master/network-upgrades/mainnet-upgrades/berlin.md
824825
*/
825826
EVMC_BERLIN = 8,
826827

828+
/**
829+
* The London revision.
830+
*
831+
* https://github.com/ethereum/eth1.0-specs/blob/master/network-upgrades/mainnet-upgrades/london.md
832+
*/
833+
EVMC_LONDON = 9,
834+
835+
/**
836+
* The Shanghai revision.
837+
*
838+
* https://github.com/ethereum/eth1.0-specs/blob/master/network-upgrades/mainnet-upgrades/shanghai.md
839+
*/
840+
EVMC_SHANGHAI = 10,
841+
827842
/** The maximum EVM revision supported. */
828-
EVMC_MAX_REVISION = EVMC_BERLIN
843+
EVMC_MAX_REVISION = EVMC_SHANGHAI,
844+
845+
/**
846+
* The latest known EVM revision with finalized specification.
847+
*
848+
* This is handy for EVM tools to always use the latest revision available.
849+
*/
850+
EVMC_LATEST_STABLE_REVISION = EVMC_LONDON
829851
};
830852

831853

0 commit comments

Comments
 (0)