Pull from master (#20)

canfoundation · Apr 24, 2020 · 2e6949c · 2e6949c
1 parent 638be4d
commit 2e6949c
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -1,15 +1,15 @@
 Crypto-Badge
 ----------
 
-Version 1.0.0
+Version 2.0.0
 
 This contract provides multiple functionalities:
 - Users can register to become a badge issuer,
 - Issuer can create/update badge and assign to badge owner
 - Badge owner can create new certification based on the created badge
-- Badge owner can create new certification and issue to users (issuer pay for RAM) directly or offer it to users (Users must pay RAM if they accept the offer)
-- Badge owner can cancel the offered certification.
-- User can accept the offer to receive certification from Badge owner
+- Badge owner can create new certification and issue to users 
+- Badge owner can create new certification and reserved it for non CAN account
+- Users who just have CAN account can claim badge which belong to them under verification from crypto-badge
 - User can choose to public certification detail
 
 Dependencies:
@@ -38,6 +38,7 @@ hydra login
 ```bash
 yarn install
 ```
+cd cryptobadge
 
 3. Run test:
 
@@ -55,6 +56,9 @@ yarn test cryptobadge.test.ts
 
 ***WARING*** Because test need to send many request to hydra server, test timeout error may sometime happend. Make sure your network connection is stable to run this test.
 
+## Example to run contract with cleos:
+
+* [Example](https://github.com/canfoundation/cryptobadge/tree/master/example)
 
 ## Actions:
 

diff --git a/cryptobadge.abi b/cryptobadge.abi
@@ -21,36 +21,6 @@
                 }
             ]
         },
-        {
-            "name": "communityf",
-            "base": "",
-            "fields": [
-                {
-                    "name": "community_account",
-                    "type": "name"
-                },
-                {
-                    "name": "creator",
-                    "type": "name"
-                },
-                {
-                    "name": "community_name",
-                    "type": "string"
-                },
-                {
-                    "name": "member_badge",
-                    "type": "uint64[]"
-                },
-                {
-                    "name": "community_url",
-                    "type": "string"
-                },
-                {
-                    "name": "description",
-                    "type": "string"
-                }
-            ]
-        },
         {
             "name": "createbadge",
             "base": "",
@@ -323,6 +293,36 @@
                 }
             ]
         },
+        {
+            "name": "v1_community",
+            "base": "",
+            "fields": [
+                {
+                    "name": "community_account",
+                    "type": "name"
+                },
+                {
+                    "name": "creator",
+                    "type": "name"
+                },
+                {
+                    "name": "community_name",
+                    "type": "string"
+                },
+                {
+                    "name": "member_badge",
+                    "type": "uint64[]"
+                },
+                {
+                    "name": "community_url",
+                    "type": "string"
+                },
+                {
+                    "name": "description",
+                    "type": "string"
+                }
+            ]
+        },
         {
             "name": "v1_global",
             "base": "",
@@ -439,13 +439,6 @@
         }
     ],
     "tables": [
-        {
-            "name": "community",
-            "type": "communityf",
-            "index_type": "i64",
-            "key_names": [],
-            "key_types": []
-        },
         {
             "name": "v1.badges",
             "type": "v1_badge",
@@ -467,6 +460,13 @@
             "key_names": [],
             "key_types": []
         },
+        {
+            "name": "v1.community",
+            "type": "v1_community",
+            "index_type": "i64",
+            "key_names": [],
+            "key_types": []
+        },
         {
             "name": "v1.global",
             "type": "v1_global",

diff --git a/cryptobadge.wasm b/cryptobadge.wasm
diff --git a/include/cryptobadge.hpp b/include/cryptobadge.hpp
@@ -268,7 +268,7 @@ class[[eosio::contract]] cryptobadge : public contract
 
 
 	//refer govenance design
-	TABLE communityf
+	TABLE v1_community
 	{
 		name community_account;
 		name creator;
@@ -280,5 +280,5 @@ class[[eosio::contract]] cryptobadge : public contract
 		uint64_t primary_key() const { return community_account.value; }
 	};
 
-	typedef eosio::multi_index<"community"_n, communityf> community_table;
+	typedef eosio::multi_index<"v1.community"_n, v1_community> v1_community_table;
 };
diff --git a/src/cryptobadge.cpp b/src/cryptobadge.cpp
@@ -56,7 +56,7 @@ ACTION cryptobadge::createbadge(name issuer, uint64_t badge_id, string name, str
 	if(has_auth(ram_payer_system)) ram_payer = ram_payer_system;
 
 	v1_issuers _issuer(_self, _self.value);
-	community_table _community(g_state.governance_design, g_state.governance_design.value);
+	v1_community_table _community(g_state.governance_design, g_state.governance_design.value);
 
 	auto issuer_itr = _issuer.find( issuer.value );
 	if(issuer_itr == _issuer.end()){
@@ -110,7 +110,7 @@ ACTION cryptobadge::issuebadge( name issuer, name owner, uint64_t badge_id, uint
 	if(has_auth(ram_payer_system)) ram_payer = ram_payer_system;
 
 	v1_issuers _issuer(_self, _self.value);
-	community_table _community(g_state.governance_design, g_state.governance_design.value);
+	v1_community_table _community(g_state.governance_design, g_state.governance_design.value);
 
 	auto issuer_itr = _issuer.find( issuer.value );
 	if(issuer_itr == _issuer.end()) {