Makes expiration support user_types (#19)

* Add user_type to the community contract

* Adjust make file

* Adjust contract name so abigen works

* Change behavior of the expiration feature

Author: lucca65

community/Makefile

@@ -5,8 +5,7 @@ obj = $(src:.cpp=.wasm)
 OPTS = -D'__TOKEN_ACCOUNT__=cambiatus.tk' -D'__BACKEND_ACCOUNT__=bespiral'
 
 community.wasm: $(src)
-	eosio-cpp $(OPTS) -o $@ $^
-	# eosio-cpp $(OPTS) -o $@ -abigen -R ./ricardian $^
+	eosio-cpp $(OPTS) -o $@ -abigen -R ./ricardian $^
 
 clean:
 	rm $(obj)

community/community.abi

@@ -356,6 +356,10 @@
                 {
                     "name": "new_user",
                     "type": "name"
+                },
+                {
+                    "name": "user_type",
+                    "type": "string"
                 }
             ]
         },
@@ -378,6 +382,10 @@
                 {
                     "name": "invited_by",
                     "type": "name"
+                },
+                {
+                    "name": "user_type",
+                    "type": "string"
                 }
             ]
         },

community/community.cpp

@@ -45,7 +45,7 @@ void cambiatus::create(eosio::asset cmm_asset, eosio::name creator, std::string
   eosio::action netlink = eosio::action(eosio::permission_level{get_self(), eosio::name{"active"}}, // Permission
                                         get_self(),                                                 // Account
                                         eosio::name{"netlink"},                                     // Action
-                                        std::make_tuple(cmm_asset, creator, creator));
+                                        std::make_tuple(cmm_asset, creator, creator, "natural"));
   netlink.send();
 
   // Notify creator
@@ -77,7 +77,7 @@ void cambiatus::update(eosio::asset cmm_asset, std::string logo, std::string nam
   });
 }
 
-void cambiatus::netlink(eosio::asset cmm_asset, eosio::name inviter, eosio::name new_user)
+void cambiatus::netlink(eosio::asset cmm_asset, eosio::name inviter, eosio::name new_user, std::string user_type)
 {
   eosio::check(is_account(new_user), "new user account doesn't exists");
 
@@ -98,6 +98,9 @@ void cambiatus::netlink(eosio::asset cmm_asset, eosio::name inviter, eosio::name
     require_auth(backend_account);
   }
 
+  // Validate user type
+  eosio::check(user_type == "natural" || user_type == "juridical", "User type must be 'natural' or 'juridical'");
+
   // Validates community
   eosio::symbol cmm_symbol = cmm_asset.symbol;
   communities community(_self, _self.value);
@@ -123,6 +126,7 @@ void cambiatus::netlink(eosio::asset cmm_asset, eosio::name inviter, eosio::name
     r.community = cmm_symbol;
     r.invited_user = new_user;
     r.invited_by = inviter;
+    r.user_type = user_type;
   });
 
   // Notify user
@@ -991,6 +995,15 @@ void cambiatus::clean(std::string t)
       itr = communities_table.erase(itr);
     }
   }
+
+  if (t == "network")
+  {
+    networks network_table(_self, _self.value);
+    for (auto itr = network_table.begin(); itr != network_table.end();)
+    {
+      itr = network_table.erase(itr);
+    }
+  }
 }
 
 void cambiatus::migrateafter(std::uint64_t claim_id, std::uint64_t increment)

community/community.hpp

@@ -5,7 +5,7 @@
 #define TOSTR_(T) #T
 #define TOSTR(T) TOSTR_(T)
 
-class [[eosio::contract("cambiatus.community")]] cambiatus : public eosio::contract
+class [[eosio::contract("community")]] cambiatus : public eosio::contract
 {
 public:
   using contract::contract;
@@ -38,13 +38,14 @@ class [[eosio::contract("cambiatus.community")]] cambiatus : public eosio::contr
     eosio::symbol community;
     eosio::name invited_user;
     eosio::name invited_by;
+    std::string user_type;
 
     // keys and indexes
     std::uint64_t primary_key() const { return id; }
     std::uint64_t users_by_cmm() const { return community.raw(); }
 
     EOSLIB_SERIALIZE(network,
-                     (id)(community)(invited_user)(invited_by));
+                     (id)(community)(invited_user)(invited_by)(user_type));
   };
 
   TABLE objective
@@ -167,7 +168,7 @@ class [[eosio::contract("cambiatus.community")]] cambiatus : public eosio::contr
 
   /// @abi action
   /// Adds a user to a community
-  ACTION netlink(eosio::asset cmm_asset, eosio::name inviter, eosio::name new_user);
+  ACTION netlink(eosio::asset cmm_asset, eosio::name inviter, eosio::name new_user, std::string user_type);
 
   /// @abi action
   /// Create a new community objective

community/community.wasm

@@ -5,8 +5,7 @@ obj = $(src:.cpp=.wasm)
 OPTS = -D'__COMMUNITY_ACCOUNT__=cambiatus.cm'
 
 token.wasm: $(src)
-	eosio-cpp $(OPTS) -o $@ $^
-	# eosio-cpp $(OPTS) -o $@ $^ -abigen -R ./ricardian
+	eosio-cpp $(OPTS) -o $@ $^ -abigen -R ./ricardian
 
 clean:
 	rm $(obj)

token/Makefile

@@ -74,7 +74,11 @@
                     "type": "symbol"
                 },
                 {
-                    "name": "expiration_period",
+                    "name": "natural_expiration_period",
+                    "type": "uint32"
+                },
+                {
+                    "name": "juridical_expiration_period",
                     "type": "uint32"
                 },
                 {
@@ -94,6 +98,10 @@
                 {
                     "name": "account",
                     "type": "name"
+                },
+                {
+                    "name": "inviter",
+                    "type": "name"
                 }
             ]
         },
@@ -120,12 +128,12 @@
             "base": "",
             "fields": [
                 {
-                    "name": "from",
-                    "type": "name"
+                    "name": "currency",
+                    "type": "symbol"
                 },
                 {
-                    "name": "quantity",
-                    "type": "asset"
+                    "name": "user_type",
+                    "type": "string"
                 },
                 {
                     "name": "memo",
@@ -142,7 +150,11 @@
                     "type": "symbol"
                 },
                 {
-                    "name": "expiration_period",
+                    "name": "natural_expiration_period",
+                    "type": "uint32"
+                },
+                {
+                    "name": "juridical_expiration_period",
                     "type": "uint32"
                 },
                 {
@@ -192,37 +204,37 @@
         {
             "name": "create",
             "type": "create",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\nspec-version: 0.0.1\ntitle: create placeholder\nsummary: placeholder\nicon:"
         },
         {
             "name": "initacc",
             "type": "initacc",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\nspec-version: 0.0.1\ntitle: initacc placeholder\nsummary: placeholder\nicon:"
         },
         {
             "name": "issue",
             "type": "issue",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\nspec-version: 0.0.1\ntitle: issue placeholder\nsummary: placeholder\nicon:"
         },
         {
             "name": "retire",
             "type": "retire",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\nspec-version: 0.0.1\ntitle: retire placeholder\nsummary: placeholder\nicon:"
         },
         {
             "name": "setexpiry",
             "type": "setexpiry",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\nspec-version: 0.0.1\ntitle: setexpiry placeholder\nsummary: placeholder\nicon:"
         },
         {
             "name": "transfer",
             "type": "transfer",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\nspec-version: 0.0.1\ntitle: transfer placeholder\nsummary: placeholder\nicon:"
         },
         {
             "name": "update",
             "type": "update",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\nspec-version: 0.0.1\ntitle: update placeholder\nsummary: placeholder\nicon:"
         }
     ],
     "tables": [
@@ -248,6 +260,11 @@
             "key_types": []
         }
     ],
-    "ricardian_clauses": [],
+    "ricardian_clauses": [
+        {
+            "id": "Data Storage",
+            "body": "---\nspec-version: 0.0.1\ntitle: General Data Storage\nsummary: This smart contract will store data added by the user. The user consents to the storage of this data by signing the transaction.\nicon:"
+        }
+    ],
     "variants": []
 }