Skip to content

Commit 3902d2c

Browse files
authored
Merge branch 'master' into david/eip-7702
2 parents 51ef955 + ed9375f commit 3902d2c

File tree

3 files changed

+24
-33
lines changed

3 files changed

+24
-33
lines changed
Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1 @@
1-
{
2-
"fixtures/solidity/complex/create/create2_many/test.json::1::Y M3": "Failed",
3-
"fixtures/solidity/complex/create/create_in_library/test.json::0::Y M0": "Failed",
4-
"fixtures/solidity/complex/create/create_in_library/test.json::0::Y M3": "Failed",
5-
"fixtures/solidity/complex/create/create_many/test.json::1::Y M3": "Failed",
6-
"fixtures/solidity/complex/library_call_tuple/test.json::0::Y M0": "Failed",
7-
"fixtures/solidity/complex/library_call_tuple/test.json::0::Y M3": "Failed",
8-
"fixtures/solidity/complex/solidity_by_example/applications/iterable_mapping/test.json::0::Y M0 >=0.8.1": "Failed",
9-
"fixtures/solidity/complex/solidity_by_example/applications/iterable_mapping/test.json::0::Y M3 >=0.8.1": "Failed",
10-
"fixtures/solidity/simple/internal_function_pointers/sum_oddness.sol::0::Y M3": "Failed",
11-
"fixtures/solidity/simple/internal_function_pointers/sum_oddness.sol::1::Y M3": "Failed",
12-
"fixtures/solidity/simple/pointer/large_offset.sol::0::Y M0": "Failed",
13-
"fixtures/solidity/simple/pointer/large_offset.sol::0::Y M3": "Failed",
14-
"fixtures/solidity/simple/try_catch/unbalanced_gas_limit.sol::0::Y M0": "Failed",
15-
"fixtures/solidity/simple/try_catch/unbalanced_gas_limit.sol::0::Y M3": "Failed",
16-
"fixtures/solidity/simple/yul_instructions/revert.sol::59::Y M0": "Failed",
17-
"fixtures/solidity/simple/yul_instructions/revert.sol::59::Y M3": "Failed",
18-
"fixtures/solidity/simple/yul_instructions/revert.sol::60::Y M0": "Failed",
19-
"fixtures/solidity/simple/yul_instructions/revert.sol::60::Y M3": "Failed",
20-
"fixtures/solidity/simple/yul_instructions/revert.sol::61::Y M0": "Failed",
21-
"fixtures/solidity/simple/yul_instructions/revert.sol::61::Y M3": "Failed",
22-
"fixtures/solidity/simple/yul_instructions/revert.sol::75::Y M0": "Failed",
23-
"fixtures/solidity/simple/yul_instructions/revert.sol::75::Y M3": "Failed",
24-
"fixtures/solidity/simple/yul_instructions/revert.sol::197::Y M0": "Failed",
25-
"fixtures/solidity/simple/yul_instructions/revert.sol::197::Y M3": "Failed",
26-
"fixtures/solidity/simple/yul_instructions/revert.sol::202::Y M0": "Failed",
27-
"fixtures/solidity/simple/yul_instructions/revert.sol::202::Y M3": "Failed",
28-
"fixtures/solidity/simple/yul_instructions/revert.sol::207::Y M0": "Failed",
29-
"fixtures/solidity/simple/yul_instructions/revert.sol::207::Y M3": "Failed"
30-
}
1+
{}

.github/workflows/tests-evm.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,25 @@ jobs:
3838
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3939
- name: Update the Installed Python
4040
run: apt-get update && apt-get install -y python3-pip python3
41+
- name: Download artifact by ID
42+
id: download
43+
run: |
44+
curl -L --fail --show-error \
45+
-H "Authorization: Bearer ${{ github.token }}" \
46+
-H "Accept: application/vnd.github+json" \
47+
-H "X-GitHub-Api-Version: 2022-11-28" \
48+
"https://api.github.com/repos/paritytech/revive/actions/artifacts/5198357315/zip" \
49+
-o resolc.zip
50+
unzip -q resolc.zip -d resolc
51+
chmod +x ./resolc/resolc-x86_64-unknown-linux-musl
52+
echo "resolc-path=$(pwd)/resolc/resolc-x86_64-unknown-linux-musl" >> "$GITHUB_OUTPUT"
4153
- name: Run revive differential tests
42-
uses: paritytech/revive-differential-tests/.github/actions/run-differential-tests@be448d78bd83a755fdcab96849971ecdf4eebce0
54+
uses: paritytech/revive-differential-tests/.github/actions/run-differential-tests@0e41f054405c054c37d524e5172ef8c514852e6b
4355
with:
4456
platform: ${{ matrix.platform }}
4557
cargo-command: "forklift cargo"
46-
revive-differential-tests-ref: "be448d78bd83a755fdcab96849971ecdf4eebce0"
47-
resolc-version: "0.5.0"
58+
revive-differential-tests-ref: "0e41f054405c054c37d524e5172ef8c514852e6b"
59+
resolc-path: ${{ steps.download.outputs.resolc-path }}
4860
expectations-file-path: ./.github/assets/${{ matrix.platform }}.json
4961

5062
evm-test-suite:

prdoc/pr_10907.prdoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
title: Update the resolc and retester versions
2+
doc:
3+
- audience: Runtime Dev
4+
description: |-
5+
## Summary
6+
7+
This PR allows us to use nightly versions of the resolc compiler in the differential tests CI which include fixes not yet available in the published version of the compiler. It also bumps the commit hash of differential tests used to a version that allows for gas limits to be specified manually to circumvent the issue observed in https://github.com/paritytech/contract-issues/issues/259
8+
crates: []

0 commit comments

Comments
 (0)