Merge pull request #182 from AntelopeIO/4.0-stable

4.0-rc1 to stable
AntelopeIO · May 23, 2023 · ca03025 · ca03025
2 parents 34ccbaf + 17cfeb8
commit ca03025
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 16 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -71,8 +71,8 @@ jobs:
           run: |
             mkdir build
             cd build
-            cmake -DCMAKE_BUILD_TYPE=Release -GNinja ..
-            ninja
+            cmake -DCMAKE_BUILD_TYPE=Release ..
+            make -j $(nproc)
             cd tests
             ctest -j $(nproc) --output-on-failure
         - name: Package (Ubuntu 18 only)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ project(cdt)
 set(VERSION_MAJOR 4)
 set(VERSION_MINOR 0)
 set(VERSION_PATCH 0)
-set(VERSION_SUFFIX rc1)
+set(VERSION_SUFFIX "") 
 
 if (VERSION_SUFFIX)
    set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")

diff --git a/README.md b/README.md
@@ -15,8 +15,8 @@ CDT currently supports Linux x86_64 Debian packages. Visit the [release page](ht
 Download the appropriate version of the Debian package and then install it. To download and install the latest version, run the following:
 
 ```sh
-wget https://github.com/AntelopeIO/cdt/releases/download/v4.0.0-rc1/cdt_4.0.0-rc1_amd64.deb
-sudo apt install ./cdt_4.0.0-rc1_amd64.deb
+wget https://github.com/AntelopeIO/cdt/releases/download/v4.0.0/cdt_4.0.0_amd64.deb
+sudo apt install ./cdt_4.0.0_amd64.deb
 ```
 ### Debian package uninstall
 

diff --git a/tests/toolchain/abigen-pass/singleton_contract_simple.abi b/tests/toolchain/abigen-pass/singleton_contract_simple.abi
@@ -0,0 +1,31 @@
+{
+    "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
+    "version": "eosio::abi/1.2",
+    "types": [],
+    "structs": [
+        {
+        "name": "whatever",
+        "base": "",
+        "fields": []
+        }
+    ],
+    "actions": [
+        {
+        "name": "whatever",
+        "type": "whatever",
+        "ricardian_contract": ""
+        }
+    ],
+    "tables": [
+        {
+        "name": "smpl.config",
+        "type": "name",
+        "index_type": "i64",
+        "key_names": [],
+        "key_types": []
+        }
+    ],
+    "ricardian_clauses": [],
+    "variants": [],
+    "action_results": []
+}
diff --git a/tests/toolchain/abigen-pass/singleton_contract_simple.cpp b/tests/toolchain/abigen-pass/singleton_contract_simple.cpp
@@ -0,0 +1,16 @@
+#include <eosio/asset.hpp>
+#include <eosio/eosio.hpp>
+#include <eosio/name.hpp>
+#include <eosio/singleton.hpp>
+
+using namespace eosio;
+
+class [[eosio::contract("singleton_contract_simple")]] singleton_contract_simple : public contract {
+    public:
+        using contract::contract;
+
+    [[eosio::action]]
+        void whatever() {};
+
+    typedef eosio::singleton<"smpl.config"_n, name> config;
+};
diff --git a/tests/toolchain/abigen-pass/singleton_contract_simple.json b/tests/toolchain/abigen-pass/singleton_contract_simple.json
@@ -0,0 +1,10 @@
+{
+    "tests" : [
+       {
+          "expected" : {
+             "abi-file" : "singleton_contract_simple.abi"
+          }
+       }
+    ]
+ }
+
diff --git a/tools/external/antler-proj b/tools/external/antler-proj
diff --git a/tools/include/eosio/abigen.hpp b/tools/include/eosio/abigen.hpp
@@ -243,14 +243,13 @@ namespace eosio { namespace cdt {
          ctables.insert(t);
       }
 
-      void add_table( uint64_t name, const clang::CXXRecordDecl* decl ) {
-         if (!(decl->isEosioTable() && abigen::is_eosio_contract(decl, get_contract_name())))
-            return;
-
-         abi_table t;
-         t.type = decl->getNameAsString();
-         t.name = name_to_string(name);
-         _abi.tables.insert(t);
+      void add_table( uint64_t name, const clang::CXXRecordDecl* decl, bool force=false ) {
+         if (force || decl->isEosioTable() && abigen::is_eosio_contract(decl, get_contract_name())) {
+            abi_table t;
+            t.type = decl->getNameAsString();
+            t.name = name_to_string(name);
+            _abi.tables.insert(t);
+         }
       }
 
       void add_clauses( const std::vector<std::pair<std::string, std::string>>& clauses ) {
@@ -802,9 +801,10 @@ namespace eosio { namespace cdt {
          }
          virtual bool VisitDecl(clang::Decl* decl) {
             if (const auto* d = dyn_cast<clang::ClassTemplateSpecializationDecl>(decl)) {
-               if (d->getName() == "multi_index" || d->getName() == "singleton") {
+               bool is_singleton = d->getName() == "singleton";
+               if (d->getName() == "multi_index" || is_singleton) {
                   ag.add_table(d->getTemplateArgs()[0].getAsIntegral().getExtValue(),
-                        (clang::CXXRecordDecl*)((clang::RecordType*)d->getTemplateArgs()[1].getAsType().getTypePtr())->getDecl());
+                               d->getTemplateArgs()[1].getAsType().getTypePtr()->getAsCXXRecordDecl(), is_singleton);
                }
             }
             return true;
+1 −1		include/antler/project/cmake.hpp
+42 −2		include/antler/system/utils.hpp
+8 −1		src/CMakeLists.txt
+28 −2		tests/cmake_tests.cpp
+21 −6		tools/build.hpp
+7 −2		tools/tests/populate_and_build.py