Paisley members list actor and tests / examples

Author: mikera

convex-core/src/main/cvx/app/paisley/members.cvx

@@ -1,5 +1,5 @@
 'app.paisley.members
-;; Deploy with
+;; Deploy with something like:
 ;; (deploy
 ;;   '[(set-controller <governance-controller>
 ;;     (def operator <operator-backend-account>)	
@@ -10,7 +10,7 @@
 
 (import convex.trust :as trust)
 
-;; Governance controller. Use controller if set, otherwise *caller* for testing purposes
+;; Governance controller. Use controller if set, otherwise default to *caller* for testing purposes
 (def governor (or *controller* *caller*))
 
 ;; Members counter
@@ -28,36 +28,64 @@
 
 (defn get-metadata
   ^{:callable true
-    :doc {:description "GEts metadata for a member, or nil if does not exist."
+    :doc {:description "Gets metadata for a member, or nil if does not exist."
           :signature   [{:params []}]}}
 
   ([member-id]
     (get members member-id)))
 
 (defn create-member
   ^{:callable true
-    :doc {:description "Creates a new member account. Must be caller by operator. Returns ID."
-          :signature   [{:params []}]}}
-  ([]
+    :doc {:description "Creates a new member account. Must be caller by operator, providing member Convex account. Returns ID."
+          :signature   [{:params [account]}]}}
+  ([acct]
 	(or (trust/trusted? operator *caller*) (fail :TRUST "Not a membership operator"))
 	(let [id mcount]
 	  (set! mcount (inc id))
-	  (set! members (assoc members id {:created *timestamp*}))
+	  (set! members (assoc members id {:created *timestamp* 
+	                                   :updated *timestamp* 
+	                                   :accounts #{acct}}))
       id)))
+      
+(defn update-member
+  ^{:callable true
+    :doc {:description "Updates a new member account. Must be caller by operator, providing member Convex account. Returns updated metadata."
+          :signature   [{:params [id data]}]}}
+  ([id data]
+	(or (trust/trusted? operator *caller*) (fail :TRUST "Not a membership operator"))
+	(let [md (or (get members id) (fail :STATE "Member ID does not exist"))
+	      new-data (merge md data)
+	      new-data (assoc new-data :updated *timestamp*)]
+	  (set! members (assoc members id new-data)))))
 
 
-;; Create members personal token
+;; Create personal token for a member
 ;; Requires:
 ;;  1. Member ID exists
 ;;  2. Offer of at least 1 CVM
 ;;
 ;; Returns personal token asset ID (new or existing)
 ;; Call with (call @app.paisley.members 1000000000 (create-pt id)
-(defn ^:callable create-pt [member-id]
+(defn create-pt  
+  ^{:callable true
+    :doc {:description "Creates a new personal token for a member. Returns CAD29 Token ID."
+          :signature   [{:params [member-id]}]}}
+  [member-id]
   (accept 1000000000)
   (when-not (get members member-id) (fail :STATE (str "Member does not exist: " member-id)))
   (if-let [ptid (get pts member-id)] (return ptid)) ;; return token if already exists
-  (let [id (call pt-actor (create))
+  (let [id (call pt-actor (create [*address* member id]))
         ptid [pt-actor id]]
     (set! pts (assoc pts member-id ptid))
-    ptid))
+    ptid))
+    
+    
+;; Member trust monitor implementation
+(defn ^:callable check-trusted? [subject action object]
+  (let [md (get-metadata *scope*)
+        accts (get md :accounts)]
+    (cond 
+      (not md) false
+      (contains-key? accts subject))))
+
+

convex-core/src/main/cvx/app/paisley/personal.cvx

@@ -50,13 +50,15 @@
 
 (defn create
   ^{:callable true
-    :doc {:description "Creates a new token and returns its id. Caller will be controller of token. Returns ID."
+    :doc {:description "Creates a new token and returns its id. Caller will be as specified, or caller if not provided. Returns ID."
           :signature   [{:params []}
-                        {:params [actor]}]}}
+                        {:params [controller]}]}}
   ([]
+    (recur *caller*))
+  ([controller]
 	(let [id counter]
 	  (set! counter (inc id))
-	  (set! tokens (assoc tokens id [*caller* 0]))
+	  (set! tokens (assoc tokens id [controller 0]))
       id)))
 
 ;;; Trust / control SPI

convex-core/src/test/java/lab/PaisleyTest.java

@@ -10,10 +10,13 @@
 
 import convex.core.cvm.Address;
 import convex.core.cvm.Context;
+import convex.core.cvm.Keywords;
+import convex.core.data.AMap;
 import convex.core.data.AVector;
 import convex.core.data.Maps;
 import convex.core.data.Vectors;
 import convex.core.data.prim.AInteger;
+import convex.core.data.prim.CVMBool;
 import convex.core.data.prim.CVMLong;
 import convex.core.lang.ACVMTest;
 import convex.core.lang.TestState;
@@ -89,8 +92,12 @@ public class PaisleyTest extends ACVMTest  {
 
 	@Test public void testMembersList() {
 		Context c=context();
+		
+		// Check members database is initially empty
 		c=exec(c,"members/members");
 		assertSame(Maps.empty(),c.getResult());
+		assertCVMEquals(0,eval(c,"members/mcount"));
+
 
 		{
 			// Bad token create (non-member)
@@ -99,7 +106,7 @@ public class PaisleyTest extends ACVMTest  {
 		}
 
 		// Create a new member
-		c=exec(c,"(def mid (call members (create-member)))");
+		c=exec(c,"(def mid (call members (create-member *address*)))");
 		assertNotError(c);
 		AInteger MID=c.getResult();
 		assertNotNull(eval(c,"(call members (get-metadata "+MID+"))"));
@@ -110,5 +117,13 @@ public class PaisleyTest extends ACVMTest  {
 			assertStateError(ce);
 		}
 
+		// Example using [members-actor id] as a trust monitor 
+		assertEquals(CVMBool.TRUE,eval(c,"(trust/trusted? [members mid] *address*)"));
+		
+		
+		// Example setting and reading metadata
+		c=exec(c,"(call members (update-member mid {:foo 34}))");
+		AMap<?,?> rmd=eval(c,"(call members (get-metadata mid))");
+		assertCVMEquals(34,rmd.get(Keywords.FOO));
 	}
 }