Skip to content

Commit 3e3daaa

Browse files
yarkinwhoyarkinwho
committed
Merge branch 'release/2.0' into yarkin/merge_eos_to_vaulta
2 parents f948824 + c32a4a6 commit 3e3daaa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+358
-349
lines changed

‎.cicd/defaults.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"target":"4",
88
"prerelease":false
99
},
10-
"eos-evm-contract":{
10+
"evm-contract":{
1111
"target":"main",
1212
"prerelease":false
1313
},
14-
"eos-evm-miner":{
14+
"evm-miner":{
1515
"target":"main",
1616
"prerelease":false
1717
}

‎.github/workflows/node.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# EOS EVM Node CI
2-
This GitHub Actions workflow builds eos-evm-node and eos-evm-rpc.
1+
# EVM Node CI
2+
This GitHub Actions workflow builds evm-node and evm-rpc.
33

44
### Index
55
1. [Triggers](#triggers)
@@ -27,21 +27,21 @@ This workflow performs the following steps:
2727
1. Attach Documentation
2828
1. Checkout the repo with no submodules.
2929
1. Attach an annotation to the GitHub Actions build summary page containing CI documentation.
30-
1. EOS EVM Node Build
30+
1. EVM Node Build
3131
1. Authenticate to the `trustevm-ci-submodule-checkout` GitHub app using the [AntelopeIO/github-app-token-action](https://github.com/AntelopeIO/github-app-token-action) action to obtain an ephemeral token.
3232
1. Checkout the repo and submodules using the ephemeral token.
33-
1. Build eos-evm-node and eos-evm-rpc using `cmake` and `make`.
33+
1. Build evm-node and evm-rpc using `cmake` and `make`.
3434
1. Upload the build folder to GitHub Actions if the `upload-artifacts` input is set to `true`.
3535

3636
## Outputs
3737
This workflow produces the following outputs:
38-
1. Build Artifacts - `build.tar.gz` containing the built artifacts of eos-evm-node and eos-evm-rpc, if the `upload-artifacts` input is set to `true`.
38+
1. Build Artifacts - `build.tar.gz` containing the built artifacts of evm-node and evm-rpc, if the `upload-artifacts` input is set to `true`.
3939

40-
> 💾️ Build artifacts are only attached on-demand for this pipeline because they are >117 MB each, but we only get 2 GB of cumulative artifact storage in GitHub Actions while eos-evm is a private repo. Obtain artifacts by performing a manual build with `upload-artifacts` set to `true`.
40+
> 💾️ Build artifacts are only attached on-demand for this pipeline because they are >117 MB each, but we only get 2 GB of cumulative artifact storage in GitHub Actions while evm-node is a private repo. Obtain artifacts by performing a manual build with `upload-artifacts` set to `true`.
4141
4242
## See Also
4343
- [github-app-token-action](https://github.com/AntelopeIO/github-app-token-action) GitHub action
44-
- [EOS EVM Documentation](../../README.md)
44+
- [EVM Documentation](../../README.md)
4545

4646
For assistance with the CI system, please open an issue in this repo or reach out in the `#help-automation` channel via IM.
4747

‎.github/workflows/node.yml‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: EOS EVM Node CI
1+
name: EVM Node CI
22

33
on:
44
push:
@@ -18,18 +18,18 @@ on:
1818
- default
1919
- true
2020
- false
21-
override-eos-evm-contract:
22-
description: 'Override eos-evm-contract target'
21+
override-evm-contract:
22+
description: 'Override evm-contract target'
2323
type: string
24-
override-eos-evm-contract-prerelease:
24+
override-evm-contract-prerelease:
2525
type: choice
26-
description: Override eos-evm-contract prelease
26+
description: Override evm-contract prelease
2727
options:
2828
- default
2929
- true
3030
- false
31-
override-eos-evm-miner:
32-
description: 'Override eos-evm-miner target'
31+
override-evm-miner:
32+
description: 'Override evm-miner target'
3333
type: string
3434

3535
defaults:
@@ -92,7 +92,7 @@ jobs:
9292
file: ${{fromJSON(needs.d.outputs.p)[matrix.platform].dockerfile}}
9393

9494
build:
95-
name: EOS EVM Node Build
95+
name: EVM Node Build
9696
needs: [d, build-platforms]
9797
if: always() && needs.d.result == 'success' && (needs.build-platforms.result == 'success' || needs.build-platforms.result == 'skipped')
9898
strategy:
@@ -117,7 +117,7 @@ jobs:
117117
submodules: 'recursive'
118118
token: ${{ steps.auth.outputs.token }}
119119

120-
- name: Build EOS EVM Node
120+
- name: Build EVM Node
121121
run: .github/workflows/build-node.sh
122122
env:
123123
CC: gcc-11
@@ -137,9 +137,9 @@ jobs:
137137
antelope-spring-dev-prerelease: ${{steps.versions.outputs.antelope-spring-dev-prerelease}}
138138
cdt-target: ${{steps.versions.outputs.cdt-target}}
139139
cdt-prerelease: ${{steps.versions.outputs.cdt-prerelease}}
140-
eos-evm-contract-target: ${{steps.versions.outputs.eos-evm-contract-target}}
141-
eos-evm-contract-prerelease: ${{steps.versions.outputs.eos-evm-contract-prerelease}}
142-
eos-evm-miner-target: ${{steps.versions.outputs.eos-evm-miner-target}}
140+
evm-contract-target: ${{steps.versions.outputs.evm-contract-target}}
141+
evm-contract-prerelease: ${{steps.versions.outputs.evm-contract-prerelease}}
142+
evm-miner-target: ${{steps.versions.outputs.evm-miner-target}}
143143
steps:
144144
- name: Setup versions from input or defaults
145145
id: versions
@@ -151,28 +151,28 @@ jobs:
151151
echo antelope-spring-dev-prerelease=$(echo "$DEFAULTS_JSON" | jq -r '."antelope-spring-dev".prerelease') >> $GITHUB_OUTPUT
152152
echo cdt-target=$(echo "$DEFAULTS_JSON" | jq -r '."cdt".target') >> $GITHUB_OUTPUT
153153
echo cdt-prerelease=$(echo "$DEFAULTS_JSON" | jq -r '."cdt".prerelease') >> $GITHUB_OUTPUT
154-
echo eos-evm-contract-target=$(echo "$DEFAULTS_JSON" | jq -r '."eos-evm-contract".target') >> $GITHUB_OUTPUT
155-
echo eos-evm-contract-prerelease=$(echo "$DEFAULTS_JSON" | jq -r '."eos-evm-contract".prerelease') >> $GITHUB_OUTPUT
156-
echo eos-evm-miner-target=$(echo "$DEFAULTS_JSON" | jq -r '."eos-evm-miner".target') >> $GITHUB_OUTPUT
154+
echo evm-contract-target=$(echo "$DEFAULTS_JSON" | jq -r '."evm-contract".target') >> $GITHUB_OUTPUT
155+
echo evm-contract-prerelease=$(echo "$DEFAULTS_JSON" | jq -r '."evm-contract".prerelease') >> $GITHUB_OUTPUT
156+
echo evm-miner-target=$(echo "$DEFAULTS_JSON" | jq -r '."evm-miner".target') >> $GITHUB_OUTPUT
157157
158158
if [[ "${{inputs.override-cdt}}" != "" ]]; then
159159
echo cdt-target=${{inputs.override-cdt}} >> $GITHUB_OUTPUT
160160
fi
161161
if [[ "${{inputs.override-cdt-prerelease}}" == +(true|false) ]]; then
162162
echo cdt-prerelease=${{inputs.override-cdt-prerelease}} >> $GITHUB_OUTPUT
163163
fi
164-
if [[ "${{inputs.override-eos-evm-contract}}" != "" ]]; then
165-
echo eos-evm-contract-target=${{inputs.override-eos-evm-contract}} >> $GITHUB_OUTPUT
164+
if [[ "${{inputs.override-evm-contract}}" != "" ]]; then
165+
echo evm-contract-target=${{inputs.override-evm-contract}} >> $GITHUB_OUTPUT
166166
fi
167-
if [[ "${{inputs.override-eos-evm-contract-prerelease}}" == +(true|false) ]]; then
168-
echo eos-evm-contract-prerelease=${{inputs.override-eos-evm-contract-prerelease}} >> $GITHUB_OUTPUT
167+
if [[ "${{inputs.override-evm-contract-prerelease}}" == +(true|false) ]]; then
168+
echo evm-contract-prerelease=${{inputs.override-evm-contract-prerelease}} >> $GITHUB_OUTPUT
169169
fi
170-
if [[ "${{inputs.override-eos-evm-miner}}" != "" ]]; then
171-
echo eos-evm-miner-target=${{inputs.override-eos-evm-miner}} >> $GITHUB_OUTPUT
170+
if [[ "${{inputs.override-evm-miner}}" != "" ]]; then
171+
echo evm-miner-target=${{inputs.override-evm-miner}} >> $GITHUB_OUTPUT
172172
fi
173173
174174
integration-test:
175-
name: EOS EVM Integration Tests
175+
name: EVM Integration Tests
176176
needs: [d, build, versions]
177177
if: always() && needs.d.result == 'success' && needs.build.result == 'success' && needs.versions.result == 'success'
178178
strategy:
@@ -244,18 +244,18 @@ jobs:
244244
- name: Link Spring TestHarness Module
245245
run: ln -s /usr/share/spring_testing/tests/TestHarness /usr/lib/python3/dist-packages/TestHarness
246246

247-
- name: Download EOS EVM Contract
247+
- name: Download EVM Contract
248248
uses: AntelopeIO/asset-artifact-download-action@v3
249249
with:
250-
owner: eosnetworkfoundation
251-
repo: eos-evm-contract
252-
target: '${{needs.versions.outputs.eos-evm-contract-target}}'
253-
prereleases: ${{fromJSON(needs.versions.outputs.eos-evm-contract-prerelease)}}
250+
owner: VaultaFoundation
251+
repo: evm-contract
252+
target: '${{needs.versions.outputs.evm-contract-target}}'
253+
prereleases: ${{fromJSON(needs.versions.outputs.evm-contract-prerelease)}}
254254
file: 'contract.tar.gz'
255255
artifact-name: contract.test-actions-off.tar.gz
256256
token: ${{ secrets.GITHUB_TOKEN }}
257257

258-
- name: Extract EOS EVM Contract
258+
- name: Extract EVM Contract
259259
id: evm-contract
260260
run: |
261261
mkdir contract
@@ -272,24 +272,24 @@ jobs:
272272
app_id: ${{ secrets.TRUSTEVM_CI_APP_ID }}
273273
private_key: ${{ secrets.TRUSTEVM_CI_APP_KEY }}
274274

275-
- name: Checkout eos-evm-miner
275+
- name: Checkout evm-miner
276276
uses: actions/checkout@v4
277277
with:
278-
repository: eosnetworkfoundation/eos-evm-miner
279-
path: eos-evm-miner
280-
ref: '${{needs.versions.outputs.eos-evm-miner-target}}'
278+
repository: VaultaFoundation/evm-miner
279+
path: evm-miner
280+
ref: '${{needs.versions.outputs.evm-miner-target}}'
281281

282-
- name: Download EOS EVM Node builddir
282+
- name: Download EVM Node builddir
283283
uses: actions/download-artifact@v4
284284
with:
285285
name: build.tar.gz
286286

287-
- name: Extract EOS EVM Node builddir
287+
- name: Extract EVM Node builddir
288288
id: evm-node-build
289289
run: |
290-
mkdir eos-evm-node
291-
mv build.tar.gz eos-evm-node/
292-
pushd eos-evm-node
290+
mkdir evm-node
291+
mv build.tar.gz evm-node/
292+
pushd evm-node
293293
tar xvf build.tar.gz
294294
pushd build
295295
echo "EVM_NODE_BUILD=$(pwd)" >> "$GITHUB_OUTPUT"
@@ -306,10 +306,10 @@ jobs:
306306
node --version
307307
npm --version
308308
309-
- name: Build eos-evm-miner
310-
id: eos-evm-miner-build
309+
- name: Build evm-miner
310+
id: evm-miner-build
311311
run: |
312-
pushd eos-evm-miner
312+
pushd evm-miner
313313
echo "EVM_MINER_ROOT=$(pwd)" >> "$GITHUB_OUTPUT"
314314
npm install
315315
npm run build
@@ -319,7 +319,7 @@ jobs:
319319
run: |
320320
mkdir test_run_root
321321
cd test_run_root
322-
${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}/tests/nodeos_eos_evm_test.py -v --eos-evm-contract-root ${{ steps.evm-contract.outputs.EVM_CONTRACT }} --eos-evm-build-root ${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }} --use-miner ${{ steps.eos-evm-miner-build.outputs.EVM_MINER_ROOT }}
322+
${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}/tests/nodeos_evm_test.py -v --evm-contract-root ${{ steps.evm-contract.outputs.EVM_CONTRACT }} --evm-build-root ${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }} --use-miner ${{ steps.evm-miner-build.outputs.EVM_MINER_ROOT }}
323323
324324
- name: Test Leap Integration - with Brownie Framework
325325
run: |
@@ -333,21 +333,21 @@ jobs:
333333
pip install flask
334334
pip install flask-cors --upgrade
335335
brownie networks add Ethereum localhost5000 host=http://127.0.0.1:5000 chainid=15555
336-
${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}/tests/nodeos_eos_evm_brownietest.py -v --eos-evm-contract-root ${{ steps.evm-contract.outputs.EVM_CONTRACT }} --eos-evm-build-root ${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }} --use-miner ${{ steps.eos-evm-miner-build.outputs.EVM_MINER_ROOT }} --flask-proxy-root ${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}/tests/
336+
${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}/tests/nodeos_evm_brownietest.py -v --evm-contract-root ${{ steps.evm-contract.outputs.EVM_CONTRACT }} --evm-build-root ${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }} --use-miner ${{ steps.evm-miner-build.outputs.EVM_MINER_ROOT }} --flask-proxy-root ${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}/tests/
337337
338338
- name: Test Leap Integration - different gas token
339339
run: |
340340
mkdir -p test_run_root
341341
cd test_run_root
342-
${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}/tests/nodeos_eos_evm_different_token_test.py -v --eos-evm-contract-root ${{ steps.evm-contract.outputs.EVM_CONTRACT }} --eos-evm-build-root ${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }} --use-miner ${{ steps.eos-evm-miner-build.outputs.EVM_MINER_ROOT }}
342+
${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}/tests/nodeos_evm_different_token_test.py -v --evm-contract-root ${{ steps.evm-contract.outputs.EVM_CONTRACT }} --evm-build-root ${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }} --use-miner ${{ steps.evm-miner-build.outputs.EVM_MINER_ROOT }}
343343
344344
- name: Test Web-Socket Integration
345345
run: |
346346
echo "=== current directory is $(pwd)==="
347347
apt-get install psmisc
348348
killall -9 nodeos || true
349-
killall -9 eos-evm-node || true
350-
killall -9 eos-evm-rpc || true
349+
killall -9 evm-node || true
350+
killall -9 evm-rpc || true
351351
sleep 1.0
352352
mkdir -p ws_test_run_root
353353
cd ws_test_run_root
@@ -365,15 +365,15 @@ jobs:
365365
npm install web3
366366
npm install collections
367367
popd
368-
${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}/tests/nodeos_eos_evm_ws_test_basic.py -v --eos-evm-contract-root ${{ steps.evm-contract.outputs.EVM_CONTRACT }} --eos-evm-build-root ${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}
368+
${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}/tests/nodeos_evm_ws_test_basic.py -v --evm-contract-root ${{ steps.evm-contract.outputs.EVM_CONTRACT }} --evm-build-root ${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}
369369
370370
- name: Test Web-Socket Fork Handling
371371
run: |
372372
echo "=== current directory is $(pwd)==="
373373
apt-get install psmisc
374374
killall -9 nodeos || true
375-
killall -9 eos-evm-node || true
376-
killall -9 eos-evm-rpc || true
375+
killall -9 evm-node || true
376+
killall -9 evm-rpc || true
377377
sleep 1.0
378378
mkdir -p ws_test_run_root
379379
cd ws_test_run_root
@@ -391,15 +391,15 @@ jobs:
391391
npm install web3
392392
npm install collections
393393
popd
394-
${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}/tests/nodeos_eos_evm_ws_test_fork.py -v --eos-evm-contract-root ${{ steps.evm-contract.outputs.EVM_CONTRACT }} --eos-evm-build-root ${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}
394+
${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}/tests/nodeos_evm_ws_test_fork.py -v --evm-contract-root ${{ steps.evm-contract.outputs.EVM_CONTRACT }} --evm-build-root ${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}
395395
396396
- name: Test Gas Parameter Fork Handling
397397
run: |
398398
echo "=== current directory is $(pwd)==="
399399
apt-get install psmisc
400400
killall -9 nodeos || true
401-
killall -9 eos-evm-node || true
402-
killall -9 eos-evm-rpc || true
401+
killall -9 evm-node || true
402+
killall -9 evm-rpc || true
403403
sleep 1.0
404404
mkdir -p ws_test_run_root
405405
cd ws_test_run_root
@@ -417,7 +417,7 @@ jobs:
417417
npm install web3
418418
npm install collections
419419
popd
420-
${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}/tests/nodeos_eos_evm_gasparam_fork_test.py -v --eos-evm-contract-root ${{ steps.evm-contract.outputs.EVM_CONTRACT }} --eos-evm-build-root ${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}
420+
${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}/tests/nodeos_evm_gasparam_fork_test.py -v --evm-contract-root ${{ steps.evm-contract.outputs.EVM_CONTRACT }} --evm-build-root ${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}
421421
422422
- name: Prepare Logs
423423
if: failure()

‎.gitignore‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
build
22
.vscode
3-
tests/nodeos_eos_evm_server/artifacts
4-
tests/nodeos_eos_evm_server/cache
5-
tests/nodeos_eos_evm_server/node_modules
3+
tests/nodeos_evm_server/artifacts
4+
tests/nodeos_evm_server/cache
5+
tests/nodeos_evm_server/node_modules
66
tests/TestLogs
7-
tests/eos-evm-genesis.json
7+
tests/evm-genesis.json
88
tests/etc
99
tests/shape_bridge.json
1010
tests/testnet.dot

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set(CMAKE_TOOLCHAIN_FILE
1414
)
1515
endif()
1616

17-
project(eos-evm-node)
17+
project(evm-node)
1818

1919
include(cmake/conan.cmake)
2020

0 commit comments

Comments
 (0)