Merge pull request #21 from eosnetworkfoundation/gh-19-replace-tx-wra…

…pper-with-eos-evm-miner

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

.cicd/defaults.json

@@ -14,5 +14,8 @@
    "eos-evm-contract":{
       "target":"main",
       "prerelease":false
+   },
+   "eos-evm-miner":{
+      "target":"main"
    }
 }

.github/workflows/node.yml

@@ -48,6 +48,9 @@ on:
         - default
         - true
         - false
+      override-eos-evm-miner:
+        description: 'Override eos-evm-miner target'
+        type: string
 
 defaults:
   run:
@@ -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
@@ -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
@@ -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
@@ -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:
@@ -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()

.gitignore

@@ -3,3 +3,6 @@ build
 tests/nodeos_eos_evm_server/artifacts
 tests/nodeos_eos_evm_server/cache
 tests/nodeos_eos_evm_server/node_modules
+
+*.pyc
+*.pyo

CMakeLists.txt

@@ -32,5 +32,4 @@ endif()
 add_subdirectory(external)
 add_subdirectory(version)
 add_subdirectory(src)
-add_subdirectory(peripherals)
 add_subdirectory(tests)

README.md

@@ -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  |             |                          +-------+---------+