Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Improve compatibility with standard ethereum tooling #2649

Merged
Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ba49957
Adds format validation for conformity tests
konstantinabl Jul 2, 2024
3d66bb7
Creates separate workflow for conformity tests
konstantinabl Jul 2, 2024
ac670b3
Edits conformity workflow
konstantinabl Jul 2, 2024
e5c8531
Removes conformity tests from acceptance workflow
konstantinabl Jul 2, 2024
7ae82e4
Fixes conformity workflow error
konstantinabl Jul 2, 2024
6a044fe
Adds needed packages for openrpc validation
konstantinabl Jul 3, 2024
17f66ae
Tests CI
konstantinabl Jul 3, 2024
1dd17b4
Adds step to rename files in conformity workflow
konstantinabl Jul 3, 2024
5cc52b9
Adds main changes to package-lock
konstantinabl Jul 3, 2024
1579de9
Fixes error in other acceptance test related to openrpc from excution…
konstantinabl Jul 5, 2024
5895791
Update to latest commit
konstantinabl Jul 19, 2024
a5c8bb5
Removes test code
konstantinabl Jul 22, 2024
2e48be9
Addresses package lock conflict
konstantinabl Jul 22, 2024
25f2724
Move file load from findSchema
konstantinabl Jul 22, 2024
4c7d7a0
Improves conformity workflo yml file
konstantinabl Jul 22, 2024
4b2d43e
Adds better validation for storage slot
konstantinabl Jul 25, 2024
013548f
improves workflow file
konstantinabl Jul 25, 2024
c7bf0e4
Ignores comments in test files from execution-api repo
konstantinabl Jul 25, 2024
3af940a
Removes uneccessary fields check, which is validate by ajv and openrp…
konstantinabl Jul 25, 2024
ba494cd
Adds support to check response for valid error
konstantinabl Jul 25, 2024
8523aa8
Fixes storage slot fromat to be from 1 to 64 chars
konstantinabl Jul 25, 2024
ad1f209
Fixes failing unit tests
konstantinabl Jul 25, 2024
1250c06
Revert "Updates local node version"
konstantinabl Jul 28, 2024
8163c08
Fixes websocket3 test
konstantinabl Jul 30, 2024
781e035
Fixes package-lock
konstantinabl Jul 31, 2024
d9e65be
Removes unneeded boolean
konstantinabl Aug 6, 2024
1420d80
Fixes package-lock
konstantinabl Aug 9, 2024
0391ac0
Adds missing license
konstantinabl Aug 19, 2024
3e78166
Removes require imports
konstantinabl Aug 19, 2024
b7f486f
Fixes conflict in package-lock
konstantinabl Aug 19, 2024
99617a6
Fixes wrong import
konstantinabl Aug 26, 2024
b17e573
removes unecessary console.log
konstantinabl Aug 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .github/workflows/acceptance-public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,6 @@ jobs:
operator_id: ${{ inputs.operator_id }}
operator_key: ${{ inputs.operator_key }}

rpc_api_schema_conformity:
konstantinabl marked this conversation as resolved.
Show resolved Hide resolved
name: API Conformity
uses: ./.github/workflows/acceptance-workflow.yml
with:
testfilter: api_conformity
envfile: ${{ inputs.network }}Acceptance.env
operator_id: ${{ inputs.operator_id }}
operator_key: ${{ inputs.operator_key }}

erc20:
name: ERC20
uses: ./.github/workflows/acceptance-workflow.yml
Expand Down Expand Up @@ -147,7 +138,6 @@ jobs:
- api_batch_1
- api_batch_2
- api_batch_3
- rpc_api_schema_conformity
- erc20
- ratelimiter
- tokencreate
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@ jobs:
with:
testfilter: api_batch3

rpc_api_schema_conformity:
name: API Conformity
uses: ./.github/workflows/acceptance-workflow.yml
with:
testfilter: rpc_api_schema_conformity

erc20:
name: ERC20
uses: ./.github/workflows/acceptance-workflow.yml
Expand Down Expand Up @@ -119,7 +113,6 @@ jobs:
- api_batch_1
- api_batch_2
- api_batch_3
- rpc_api_schema_conformity
- erc20
- ratelimiter
- hbarlimiter
Expand Down
96 changes: 96 additions & 0 deletions .github/workflows/conformity-workflow.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
name: Conformity Test Workflow

on:
pull_request:
branches: [main, release/**]
push:
branches: [main, release/**]
tags: [v*]

jobs:
clone-and-build-execution-apis:
runs-on: [self-hosted, Linux, medium, ephemeral]

steps:
- name: Checkout execution-apis repo
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
with:
ref: 7907424db935b93c2fe6a3c0faab943adebe8557
repository: 'ethereum/execution-apis'
path: 'execution-apis'

- name: Use Node.js TLS 18
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 18

- name: Install dependencies
run: npm install
working-directory: ./execution-apis

- name: Build project
run: npm run build
working-directory: ./execution-apis

- name: Upload openrpc.json as an artifact
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
with:
name: openrpc
path: ./execution-apis/openrpc.json

build-and-test:
runs-on: [self-hosted, Linux, medium, ephemeral]
needs: clone-and-build-execution-apis

steps:
- name: Checkout repository
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6

- name: Use Node.js TLS 18
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 18

- name: Install make
run: sudo apt-get update; sudo apt-get install build-essential -y

- name: Checkout repo
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6

- name: Install packages
run: npm ci

- name: Create .env file
run: cp ./packages/server/tests/localAcceptance.env .env

- name: Install pnpm
run: npm install -g pnpm

- name: Build Typescript
run: npx lerna run build

- name: Install hedera local
run: npm install @hashgraph/hedera-local -g

- name: Set operator id and key env variable if CI is manual
if: ${{ inputs.operator_id }}
run: |
echo "OPERATOR_ID_MAIN=${{ inputs.operator_id }}" >> $GITHUB_ENV
echo "OPERATOR_KEY_MAIN=${{ inputs.operator_key }}" >> $GITHUB_ENV

- name: Run hedera local
run: npx hedera restart -d --network-tag=${{inputs.networkTag}} --mirror-tag=${{inputs.mirrorTag}} --verbose=trace

- name: Stop relay
run: docker stop json-rpc-relay json-rpc-relay-ws

- name: Download openrpc.json artifact
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
with:
name: openrpc

- name: Rename file
run: mv openrpc.json openrpc_exec_apis.json

- name: Run conformity tests
run: npm run acceptancetest:rpc_api_schema_conformity
10 changes: 0 additions & 10 deletions .github/workflows/manual-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,6 @@ jobs:
testfilter: api_batch3
networkTag: ${{inputs.networkNodeTag}}
mirrorTag: ${{inputs.mirrorNodeTag}}


rpc_api_schema_conformity:
name: API Conformity
uses: ./.github/workflows/acceptance-workflow.yml
with:
testfilter: rpc_api_schema_conformity
networkTag: ${{inputs.networkNodeTag}}
mirrorTag: ${{inputs.mirrorNodeTag}}

erc20:
name: ERC20
Expand Down Expand Up @@ -131,7 +122,6 @@ jobs:
- api_batch_1
- api_batch_2
- api_batch_3
- rpc_api_schema_conformity
- erc20
- ratelimiter
- hbarlimiter
Expand Down
Loading
Loading