BLOCK-2590 - Make bridge contract works with UOS, sync with main branch

.cicd/defaults.json

@@ -1,6 +1,6 @@
 {
-    "leap-dev":{
-       "target":"5",
+    "antelope-spring-dev":{
+       "target":"1",
        "prerelease":false
     },
     "cdt":{

.github/workflows/build.yaml

@@ -8,16 +8,6 @@ on:
   pull_request:
   workflow_dispatch:
     inputs:
-      override-leap-dev:
-        description: Override leap-dev target
-        type: string
-      override-leap-dev-prerelease:
-        type: choice
-        description: Override leap-dev prelease
-        options:
-        - default
-        - true
-        - false
       override-cdt:
         description: 'Override cdt target'
         type: string
@@ -89,8 +79,8 @@ jobs:
     name: Determine Versions
     runs-on: ubuntu-latest
     outputs:
-      leap-dev-target: ${{steps.versions.outputs.leap-dev-target}}
-      leap-dev-prerelease: ${{steps.versions.outputs.leap-dev-prerelease}}
+      antelope-spring-dev-target: ${{steps.versions.outputs.antelope-spring-dev-target}}
+      antelope-spring-dev-prerelease: ${{steps.versions.outputs.antelope-spring-dev-prerelease}}
       cdt-target: ${{steps.versions.outputs.cdt-target}}
       cdt-prerelease: ${{steps.versions.outputs.cdt-prerelease}}
       eos-evm-contract-target: ${{steps.versions.outputs.eos-evm-contract-target}}
@@ -102,19 +92,13 @@ jobs:
           GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
         run: |
           DEFAULTS_JSON=$(curl -sSfL $(gh api https://api.github.com/repos/${{github.repository}}/contents/.cicd/defaults.json?ref=${{github.sha}} --jq .download_url))
-          echo leap-dev-target=$(echo "$DEFAULTS_JSON" | jq -r '."leap-dev".target') >> $GITHUB_OUTPUT
-          echo leap-dev-prerelease=$(echo "$DEFAULTS_JSON" | jq -r '."leap-dev".prerelease') >> $GITHUB_OUTPUT
+          echo antelope-spring-dev-target=$(echo "$DEFAULTS_JSON" | jq -r '."antelope-spring-dev".target') >> $GITHUB_OUTPUT
+          echo antelope-spring-dev-prerelease=$(echo "$DEFAULTS_JSON" | jq -r '."antelope-spring-dev".prerelease') >> $GITHUB_OUTPUT
           echo cdt-target=$(echo "$DEFAULTS_JSON" | jq -r '."cdt".target') >> $GITHUB_OUTPUT
           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
 
-          if [[ "${{inputs.override-leap-dev}}" != "" ]]; then
-            echo leap-dev-target=${{inputs.override-leap-dev}} >> $GITHUB_OUTPUT
-          fi
-          if [[ "${{inputs.override-leap-dev-prerelease}}" == +(true|false) ]]; then
-            echo leap-dev-prerelease=${{inputs.override-leap-dev-prerelease}} >> $GITHUB_OUTPUT
-          fi
           if [[ "${{inputs.override-cdt}}" != "" ]]; then
             echo cdt-target=${{inputs.override-cdt}} >> $GITHUB_OUTPUT
           fi
@@ -156,16 +140,16 @@ jobs:
           prereleases: ${{fromJSON(needs.versions.outputs.cdt-prerelease)}}
           file: 'cdt_.*amd64.deb'
 
-      - name: Download leap-dev.deb
+      - name: Download antelope-spring-dev
         uses: AntelopeIO/asset-artifact-download-action@v3
         with:
           owner: AntelopeIO
-          repo: leap
-          file: 'leap-dev.*ubuntu22.*amd64.deb'
-          target: ${{needs.versions.outputs.leap-dev-target}}
-          prereleases: ${{fromJSON(needs.versions.outputs.leap-dev-prerelease)}}
-          artifact-name: leap-dev-ubuntu22-amd64
-          container-package: experimental-binaries
+          repo: spring
+          file: 'antelope-spring-dev.*ubuntu22\.04_amd64.deb'
+          target: '${{needs.versions.outputs.antelope-spring-dev-target}}'
+          prereleases: ${{fromJSON(needs.versions.outputs.antelope-spring-dev-prerelease)}}
+          artifact-name: antelope-spring-dev-ubuntu22-amd64
+          container-package: antelope-spring-experimental-binaries
 
       - name: Install .deb packages
         run: |

CMakeLists.txt

@@ -8,6 +8,8 @@ endif()
 set(EXTERNAL_DIR ${CMAKE_SOURCE_DIR}/external)
 set(SOLIDITY_BYTECODES_DIR ${CMAKE_BINARY_DIR}/solidity_contracts/bytecodes)
 
+add_compile_definitions(PROJECT_VERSION="0.2.0")
+
 add_subdirectory (solidity_contracts)
 
 enable_testing()

LICENSE

@@ -1,21 +1,97 @@
-MIT License
-
-Copyright (c) 2023 EOS Network Foundation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+License text copyright (c) 2023 MariaDB plc, All Rights Reserved. "Business
+Source License" is a trademark of MariaDB plc.
+
+Parameters
+
+Licensor:              EOS NETWORK FOUNDATION ("ENF")
+
+Licensed Work:         EOS-EVM Bridge Contracts Copyright ENF, 2024, All Rights
+                       Reserved
+
+Additional Use Grant:  Licensee (You) is granted, free of charge, to deal in
+                       the Licensed Work without restriction, including
+                       without limitation the rights to use, copy, modify,
+                       merge, publish, distribute, sublicense, and/or sell
+                       copies of the Licensed Work, and to permit persons to
+                       whom the Licensed Work is furnished to do so, subject
+                       to the following conditions:
+
+                       Your use of the Licensed Work is Directly in Service
+                       of or Materially Dependent on the EOS Blockchain
+                       Network
+
+                       The copyright notice and this permission notice shall
+                       be included in all copies or substantial portions of
+                       the Software.
+
+                       For the purposes of this license:
+
+                       "EOS Blockchain Network" is defined as any blockchain
+                       network created with the EOSIO, or Antelope,
+                       protocols, or any future protocols derived
+                       substantially from them whose genesis block id as
+                       defined by the Licensed Work is 00000001405147477ab2f5...
+                       f51cda427b638191c66d2c59aa392d5c2c98076cb0 
+
+                       "Directly in Service" is defined as any use which is
+                       necessary for the EOS Blockchain to persist and
+                       continue operations including but not limited to
+                       hosting network nodes, archives, RPC endpoints, and
+                       integration with 3rd party services.
+
+                       "Materially Dependent" is defined as use that would
+                       cease to operate effectively or economically if the
+                       EOS blockchain component was removed temporarily or
+                       permanently.
+
+Change Date:           Four years from the date the Licensed Work is published
+
+Change License:        MIT 2.0
+
+For information about alternative licensing arrangements for the Licensed Work,
+please contact [email protected].
+
+Notice
+
+Business Source License 1.1
+
+Terms
+
+The Licensor hereby grants you the right to copy, modify, create derivative
+works, redistribute, and make non-production use of the Licensed Work. The
+Licensor may make an Additional Use Grant, above, permitting limited production
+use.
+
+Effective on the Change Date, or the fourth anniversary of the first publicly
+available distribution of a specific version of the Licensed Work under this
+License, whichever comes first, the Licensor hereby grants you rights under
+the terms of the Change License, and the rights granted in the paragraph
+above terminate.
+
+If your use of the Licensed Work does not comply with the requirements
+currently in effect as described in this License, you must purchase a
+commercial license from the Licensor, its affiliated entities, or authorized
+resellers, or you must refrain from using the Licensed Work.
+
+All copies of the original and modified Licensed Work, and derivative works
+of the Licensed Work, are subject to this License. This License applies
+separately for each version of the Licensed Work and the Change Date may vary
+for each version of the Licensed Work released by Licensor.
+
+You must conspicuously display this License on each original or modified copy
+of the Licensed Work. If you receive the Licensed Work in original or
+modified form from a third party, the terms and conditions set forth in this
+License apply to your use of that work.
+
+Any use of the Licensed Work in violation of this License will automatically
+terminate your rights under this License for the current and all other
+versions of the Licensed Work.
+
+This License does not grant you any right in any trademark or logo of
+Licensor or its affiliates (provided that you may use a trademark or logo of
+Licensor as expressly required by this License).
+
+TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
+AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
+EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND TITLE.

antelope_contracts/contracts/deposit_proxy/src/deposit_proxy.cpp

@@ -16,7 +16,7 @@ void deposit_proxy::transfer(eosio::name from, eosio::name to, eosio::asset quan
 
    eosio::check(memo_has_evm_address, "memo must be a valid EVM address");
 
-   constexpr extended_symbol EOS  = eosio::extended_symbol{eosio::symbol{"EOS",4}, "eosio.token"_n};
+   constexpr extended_symbol EOS  = eosio::extended_symbol{eosio::symbol{"UOS",4}, "eosio.token"_n};
    const auto s = eosio::extended_symbol{quantity.symbol, get_first_receiver()};
 
    auto destination = s == EOS ? "eosio.evm"_n : "eosio.erc2o"_n;

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

@@ -56,7 +56,11 @@ class [[eosio::contract]] erc20 : public contract {
     [[eosio::action]] void withdrawfee(eosio::name token_contract, eosio::asset quantity, eosio::name to, std::string memo);
 
     [[eosio::action]] void unregtoken(eosio::name eos_contract_name, eosio::symbol_code token_symbol_code);
-    [[eosio::action]] void setconfig(std::optional<eosio::name> evm_account, std::optional<eosio::symbol> gas_token_symbol, std::optional<uint64_t> gaslimit, std::optional<uint64_t> init_gaslimit);
+
+    [[eosio::action]] void init(eosio::name evm_account, eosio::symbol gas_token_symbol, uint64_t gaslimit, uint64_t init_gaslimit);
+
+    [[eosio::action]] void setgaslimit(std::optional<uint64_t> gaslimit, std::optional<uint64_t> init_gaslimit);
+    [[eosio::action]] void callupgrade(eosio::name token_contract, eosio::symbol token_symbol);
 
     struct [[eosio::table("implcontract")]] impl_contract_t {
         uint64_t id = 0;
@@ -115,24 +119,25 @@ class [[eosio::contract]] erc20 : public contract {
         EOSLIB_SERIALIZE(config_t, (evm_gaslimit)(evm_init_gaslimit)(evm_account)(evm_gas_token_symbol));
     };
     typedef eosio::singleton<"config"_n, config_t> config_singleton_t;
+
     config_t get_config() const {
         config_singleton_t config(get_self(), get_self().value);
-        if (!config.exists()) {
-            return config_t{};
-        } else {
-            return config.get();
-        }
+        eosio::check(config.exists(), "erc20 config not exist");
+        return config.get();
     }
-    intx::uint256 get_minimum_natively_representable() const {
-        return intx::exp(10_u256, intx::uint256(evm_precision - get_config().evm_gas_token_symbol.precision()));
+
+    intx::uint256 get_minimum_natively_representable(const config_t& config) const {
+        return intx::exp(10_u256, intx::uint256(evm_precision - config.evm_gas_token_symbol.precision()));
     }
+
     void set_config(const config_t &v) {
         config_singleton_t config(get_self(), get_self().value);
         config.set(v, get_self());
     }
 
     uint64_t get_next_nonce();
     void handle_erc20_transfer(const token_t &token, eosio::asset quantity, const std::string &memo);
+    void handle_call_upgrade(const bytes& proxy_address);
 
 private:
     eosio::name receiver_account()const;

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

@@ -18,6 +18,6 @@ constexpr uint64_t default_evm_init_gaslimit = 10000000;
 constexpr eosio::name default_evm_account(eosio::name("eosio.evm"));
 
 constexpr unsigned evm_precision = 18; // precision of native token(aka.EOS) in EVM side
-constexpr eosio::symbol default_native_token_symbol("EOS", 4u);
+constexpr eosio::symbol default_native_token_symbol("UOS", 4u);
 
 }  // namespace erc20