Merge pull request #350 from eosnetworkfoundation/kayan_1.0_to_main_brownie

[1.0 ->main] Forward 1.0.5 to main

Author: taokayan

.github/workflows/node.yml

@@ -321,6 +321,20 @@ jobs:
           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-miner ${{ steps.eos-evm-miner-build.outputs.EVM_MINER_ROOT }}
           
+      - name: Test Leap Integration - with Brownie Framework
+        run: |
+          mkdir -p test_run_root
+          cd test_run_root
+          pip install --upgrade web3
+          pip install otree
+          pip install websocket-client
+          pip install eth-brownie
+          npm install -g ganache
+          pip install flask
+          pip install flask-cors --upgrade
+          brownie networks add Ethereum localhost5000 host=http://127.0.0.1:5000 chainid=15555
+          ${{ 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/
+          
       - name: Test Leap Integration - different gas token
         run: |
           mkdir -p test_run_root

CMakeLists.txt

@@ -20,7 +20,7 @@ include(cmake/conan.cmake)
 
 set(VERSION_MAJOR 1)
 set(VERSION_MINOR 0)
-set(VERSION_PATCH 4)
+set(VERSION_PATCH 5)
 #set(VERSION_SUFFIX rc4)
 
 if(VERSION_SUFFIX)

external/silkworm

@@ -7,6 +7,8 @@ configure_file(nodeos_eos_evm_server.py . COPYONLY)
 configure_file(nodeos_eos_evm_test.py . COPYONLY)
 configure_file(nodeos_eos_evm_different_token_test.py . COPYONLY)
 configure_file(nodeos_eos_evm_gasparam_fork_test.py . COPYONLY)
+configure_file(nodeos_eos_evm_brownietest.py . COPYONLY)
+configure_file(flask_proxy.py . COPYONLY)
 configure_file(defertest.wasm . COPYONLY)
 configure_file(defertest.abi . COPYONLY)
 configure_file(defertest2.wasm . COPYONLY)

tests/CMakeLists.txt

@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+import os
+from flask import Flask, request, jsonify
+from flask_cors import CORS
+import requests
+import json
+
+app = Flask(__name__)
+CORS(app)
+writemethods = {"eth_sendRawTransaction","eth_gasPrice"}
+readEndpoint = "http://127.0.0.1:8881"
+writeEndpoint = os.getenv("WRITE_RPC_ENDPOINT", "http://127.0.0.1:18888")
+flaskListenPort = os.getenv("FLASK_SERVER_PORT", 5000)
+
+import logging
+log = logging.getLogger('werkzeug')
+log.setLevel(logging.ERROR)
+
+@app.route("/", methods=["POST"])
+def default():
+    def forward_request(req):
+        if type(req) == dict and ("method" in req) and (req["method"] in writemethods):
+            #print("send req to miner:" + str(req))
+            resp = requests.post(writeEndpoint, json.dumps(req), headers={"Accept":"application/json","Content-Type":"application/json"}).json()
+            #print("got resp from miner:" + str(resp))
+            return resp
+        else:
+            #print("send req to eos-evm-rpc:" + str(req))
+            resp = requests.post(readEndpoint, json.dumps(req), headers={"Accept":"application/json","Content-Type":"application/json"}).json()
+            #print("got from eos-evm-rpc:" + str(resp))
+            return resp
+
+    request_data = request.get_json()
+    if type(request_data) == dict:
+        return jsonify(forward_request(request_data))
+
+    res = []
+    for r in request_data:
+        res.append(forward_request(r))
+
+    return jsonify(res)
+
+app.run(host='0.0.0.0', port=flaskListenPort)