sync evm token support to main

.github/workflows/build.yaml

@@ -124,12 +124,12 @@ jobs:
     container: ${{fromJSON(needs.d.outputs.p)[matrix.platform].image}}
 
     steps:
-      - name: Checkout evm-bridge-contracts
+      - name: Checkout exsat-evm-bridge-contracts
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: 'recursive'
-          path: evm-bridge-contracts
+          path: exsat-evm-bridge-contracts
 
       - name: Download CDT
         uses: AntelopeIO/asset-artifact-download-action@v3
@@ -179,7 +179,7 @@ jobs:
 
       - name: Build EVM Bridge Contracts
         run: |
-          pushd evm-bridge-contracts
+          pushd exsat-evm-bridge-contracts
           cmake -B build -Deosevm_DIR=${{ steps.evm-contract.outputs.EVM_CONTRACT }}
           cmake --build build -- -j
           tar -pc build | zstd --long -T0 -9 > build.tar.zst
@@ -188,7 +188,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: builddir
-          path: evm-bridge-contracts/build.tar.zst
+          path: exsat-evm-bridge-contracts/build.tar.zst
           compression-level: 0
 
       - name: EVM Bridge Contracts Tests

README.md

@@ -1,8 +1,12 @@
-# EOS EVM Bridge Contracts
+# Exsat EVM trustless bridge
 
-This repository contains the Solidity and Antelope contracts needed to support advanced functionality of the trustless bridge of EOS EVM.
+**The contracts for staking and claiming rewards have been moved to https://github.com/exsat-network/evmutil-contracts.**
+**This repository now only contains the code for the trustless bridge for ERC20 tokens.** 
+
+This repository contains the Solidity and Antelope contracts needed to support the trustless bridges.
+
+Those contracts (both within `solidity_contracts` and `antelope_contracts`) enable communication and tokens moves between the EVM and Native environments. 
 
-The `erc20` contracts (both within `solidity_contracts` and `antelope_contracts`) enable tokens to be moved between the EOS EVM and EOS Native environments across the trustless bridge of EOS EVM. On the EOS EVM side, the tokens are managed by an ERC-20 compatible token contract that is automatically deployed to EOS EVM and managed by the Antelope `erc20` contract. On the EOS Native side, the Antelope `erc20` contract supports any tokens that follow the common interface established by the [`eosio.token` reference contract](https://github.com/AntelopeIO/reference-contracts/tree/main/contracts/eosio.token); specifically, the token contract deployed on EOS Native must satisfy the interface for the `transfer` action captured in [this header file](antelope_contracts/contracts/erc20/include/erc20/eosio.token.hpp) and its behavior should follow the expectations set in the `eosio.token` reference contract.
 ## Dependencies
 
 - CMake 3.16 or later
@@ -12,9 +16,9 @@ The `erc20` contracts (both within `solidity_contracts` and `antelope_contracts`
   + Used to compile the .sol files. 
   + We chose to use solcjs because it is more actively maintained than the solc available from the package manager.
     * First install node.js and npm.
-    * Then install solcjs: `npm install -g solc@0.8.21`
-  + Make sure to install version 0.8.21.
-    * Confirm with `solcjs --version`. You should get `0.8.21+commit.d9974bed.Emscripten.clang`
+    * Then install solcjs: `npm install -g solc`
+  + Make sure to install at least version 0.8.21.
+    * Confirm with `solcjs --version`.
 - Install `jq` used to compile solidity contracts
   + `apt-get install jq`
 - Install `xxd` used to compile solidity contracts

antelope_contracts/contracts/erc20/include/erc20/erc20.hpp

@@ -178,4 +178,4 @@ void regtokenwithcodebytes(eosio::name token_contract,  const bytes& address_byt
 
 
 
-}  // namespace erc20
+}  // namespace erc20

antelope_contracts/contracts/stubs/CMakeLists.txt

@@ -1,10 +1,6 @@
-set(SOURCES, "")
 
-list(APPEND SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/stub_evm_runtime.cpp
-)
-
-add_contract(  stub_evm_runtime stub_evm_runtime ${SOURCES} )
+add_contract(  stub_evm_runtime stub_evm_runtime stub_evm_runtime.cpp )
 target_include_directories( stub_evm_runtime PUBLIC )
 
 target_compile_options(stub_evm_runtime PUBLIC --no-missing-ricardian-clause)
+

solidity_contracts/compile_tools/compile_solidity_contract.sh

@@ -31,7 +31,51 @@ set -o pipefail
 # 3 solcjs --starndard-json has some bugs (https://github.com/ethereum/solc-js/issues/460) so we can only use "content" as input.
 # 4 To copy the source code into the json file, we have to escape \\ \" \t \n. (Ignore \b \r \f as we shouldn't have them in sol file)
 tmpfile=$(mktemp)
-cat "$SOLIDITY_SOURCE_FILE_PATH" \
+awk 'BEGIN {
+        found=0;
+    }
+
+    {
+        spos=index($0,"/*");
+        epos=index($0,"*/");
+
+        if(spos > 0 && epos ==0)
+        {
+            printf("%s\n",substr($0,1,spos-1));
+            found=1;
+        }
+        else if(spos == 0 && epos >0)
+        {
+            found=0;
+            if(length($0) != epos+1)
+            {
+                printf("%s\n",substr($0,epos+2));
+            }
+        }
+        else if(spos > 0 && epos > 0)
+        {
+            printf("%s %s\n",substr($0,1,spos-1),substr($0,epos+2));
+        }
+        else if(found==0)
+        {
+            cpp_comment=index($0,"//");
+            if(cpp_comment == 0)
+            {
+                print;
+            }
+            else
+            {
+                printf("%s\n",substr($0,1,cpp_comment-1));
+            }
+        }
+    }
+
+    END {
+        if(found==1)
+        {
+            print "there is unmatched comment"
+        }
+    }' "$SOLIDITY_SOURCE_FILE_PATH" \
 | awk -v token="__CONTRACT_CONTENT" '
     BEGIN {
         RS = "\0"   # Set record separator to null to read the whole input

solidity_contracts/compile_tools/solcjs_json_input_template.json.in

@@ -10,7 +10,7 @@
     "settings":
     {
       "optimizer": {
-        "enabled": false,
+        "enabled": true,
         "runs": 200
       },
       "evmVersion": "byzantium",