WIP on master

Author: dr-orlovsky

Cargo.lock

@@ -39,6 +39,9 @@ exclude = [".github"]
 [lib]
 name = "sonare"
 
+[[example]]
+name = "dao"
+
 [dependencies]
 amplify.workspace = true
 baid64 = "0.4.0"
@@ -74,4 +77,5 @@ wasm-bindgen-test = "0.3"
 features = ["all"]
 
 [patch.crates-io]
+commit_verify = { git = "https://github.com/LNP-BP/client_side_validation", branch = "v0.12" }
 ultrasonic = { git = "https://github.com/AluVM/ultrasonic" }

Cargo.toml

@@ -25,18 +25,31 @@ data Vote: contra | pro
 data Voting: title String,
              text Text
 
+data CastVote: voteId VoteId, partyId PartyId, vote Vote
+
 lock Signer: [U8 ^ 32]
     verify: preimage [U8 ^ 32]
-        hash preimage =?= $ !! invalidPreimage
+        sha256 preimage =?= $ !! invalidPreimage
 
 @issuer(indsc.org)
 contract DAO
-    var parties: { PartyId -> Party }
+    var parties: { @verifiable PartyId -> @associated Party }
+    var votings: { @verifiable VoteId -> @associated Voting }
+    var votes: { @verifiable CastVote }
+    
+    var signers: { Signer -> PartyId }
 
-    var votings: { VoteId -> Voting }
-    var votes: { VoteId -> { PartyId -> Vote } }
+    calc votingCount: () -> U64
+        count $.votings
+    
+    calc totalVotes: vote_id VoteId -> U64
+        count($.votes |> (key, voting) -> key =?= vote_id)
 
-    var signers: { Signer -> PartyId }
+    calc proVotes: vote_id VoteId -> U64
+        count($.votes |> (key, voting) -> key =?= vote_id \/ voting =?= pro)
+
+    calc conterVotes: vote_id VoteId -> U64
+        count($.votes |> (key, voting) -> key =?= vote_id \/ voting =?= counter)
 
     op setup: () -> parties, signers