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

Replace tx_wrapper with eos-evm-miner for integration test. #21

Merged
merged 9 commits into from
Aug 10, 2023
Merged
3 changes: 3 additions & 0 deletions .cicd/defaults.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@
"eos-evm-contract":{
"target":"main",
"prerelease":false
},
"eos-evm-miner":{
"target":"main"
}
}
25 changes: 23 additions & 2 deletions .github/workflows/node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ on:
- default
- true
- false
override-eos-evm-miner:
description: 'Override eos-evm-miner target'
type: string

defaults:
run:
Expand Down Expand Up @@ -158,6 +161,7 @@ jobs:
cdt-prerelease: ${{steps.versions.outputs.cdt-prerelease}}
eos-evm-contract-target: ${{steps.versions.outputs.eos-evm-contract-target}}
eos-evm-contract-prerelease: ${{steps.versions.outputs.eos-evm-contract-prerelease}}
eos-evm-miner-target: ${{steps.versions.outputs.eos-evm-miner-target}}
steps:
- name: Setup versions from input or defaults
id: versions
Expand All @@ -173,6 +177,7 @@ jobs:
echo cdt-prerelease=$(echo "$DEFAULTS_JSON" | jq -r '."cdt".prerelease') >> $GITHUB_OUTPUT
echo eos-evm-contract-target=$(echo "$DEFAULTS_JSON" | jq -r '."eos-evm-contract".target') >> $GITHUB_OUTPUT
echo eos-evm-contract-prerelease=$(echo "$DEFAULTS_JSON" | jq -r '."eos-evm-contract".prerelease') >> $GITHUB_OUTPUT
echo eos-evm-miner-target=$(echo "$DEFAULTS_JSON" | jq -r '."eos-evm-miner".target') >> $GITHUB_OUTPUT

if [[ "${{inputs.override-leap-dev}}" != "" ]]; then
echo leap-dev-target=${{inputs.override-leap-dev}} >> $GITHUB_OUTPUT
Expand All @@ -198,6 +203,9 @@ jobs:
if [[ "${{inputs.override-eos-evm-contract-prerelease}}" == +(true|false) ]]; then
echo eos-evm-contract-prerelease=${{inputs.override-eos-evm-contract-prerelease}} >> $GITHUB_OUTPUT
fi
if [[ "${{inputs.override-eos-evm-miner}}" != "" ]]; then
echo eos-evm-miner-target=${{inputs.override-eos-evm-miner}} >> $GITHUB_OUTPUT
fi

integration-test:
name: EOS EVM Integration Tests
Expand Down Expand Up @@ -291,6 +299,13 @@ jobs:
app_id: ${{ secrets.TRUSTEVM_CI_APP_ID }}
private_key: ${{ secrets.TRUSTEVM_CI_APP_KEY }}

- name: Checkout eos-evm-miner
uses: actions/checkout@v3
with:
repository: eosnetworkfoundation/eos-evm-miner
path: eos-evm-miner
ref: '${{needs.versions.outputs.eos-evm-miner-target}}'

- name: Download EOS EVM Node builddir
uses: actions/download-artifact@v3
with:
Expand All @@ -316,15 +331,21 @@ jobs:
cp -r node-v18.17.0-linux-x64/{bin,include,lib,share} /usr/
node --version
npm --version
pushd ${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}/peripherals/tx_wrapper

- name: Build eos-evm-miner
id: eos-evm-miner-build
run: |
pushd eos-evm-miner
echo "EVM_MINER_ROOT=$(pwd)" >> "$GITHUB_OUTPUT"
npm install
npm run build
popd

- name: Test Leap Integration
run: |
mkdir test_run_root
cd test_run_root
${{ 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-tx-wrapper ${{ steps.evm-node-build.outputs.EVM_NODE_BUILD }}/peripherals/tx_wrapper
${{ 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 }}

- name: Prepare Logs
if: failure()
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Clients can also push Ethereum compatible transactions (aka EVM transactions) to
```
|
| WRITE +-----------------+
| +------------------------->| TX-Wrapper |
| +------------------------->| EOS EVM MINER |
| | +-------v---------+
| | | Leap node | ---> connect to the other nodes in the blockchain network
client | | +-------+---------+
Expand Down
1 change: 0 additions & 1 deletion peripherals/CMakeLists.txt

This file was deleted.

104 changes: 0 additions & 104 deletions peripherals/tx_wrapper/.gitignore

This file was deleted.

4 changes: 0 additions & 4 deletions peripherals/tx_wrapper/CMakeLists.txt

This file was deleted.

26 changes: 0 additions & 26 deletions peripherals/tx_wrapper/README.md

This file was deleted.

Loading
Loading