w8 · tx · 57G···8UJ

tx · 57G39WGVQUXRLFwSWHYycuiG1APrePxwX6t5cB1en8UJ

3MxN6Cszfki941gTcEwXc8ngmbWPTsHoJFq:  -0.01400000 Waves

2019.06.22 22:28 [553673] smart account 3MxN6Cszfki941gTcEwXc8ngmbWPTsHoJFq > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "57G39WGVQUXRLFwSWHYycuiG1APrePxwX6t5cB1en8UJ",
    "fee": 1400000,
    "feeAssetId": null,
    "timestamp": 1561231770850,
    "version": 1,
    "sender": "3MxN6Cszfki941gTcEwXc8ngmbWPTsHoJFq",
    "senderPublicKey": "4fygXNNAjU52sT9N6uq4o9Ck8G75e94ukktN3pd4VxVo",
    "proofs": [
        "581WaxgYmNpLbxxFWP4pDQu6TP7SQV2mQ1PP84NSXD89yZ7mgcdQUjMFFHD3JsT8kej8ReUyfXDsBVUbfQgqrVpk"
    ],
    "script": "base64:AAIDAAAAAAAAAAAAAAAdAAAAAAROT05FAgAAAARub25lAQAAAA9nZXRLZXlJdGVtUHJpY2UAAAABAAAABGl0ZW0JAAEsAAAAAgUAAAAEaXRlbQIAAAAGX3ByaWNlAQAAAA5nZXROdW1iZXJCeUtleQAAAAEAAAADa2V5BAAAAANudW0EAAAAByRtYXRjaDAJAAQaAAAAAgUAAAAEdGhpcwUAAAADa2V5AwkAAAEAAAACBQAAAAckbWF0Y2gwAgAAAANJbnQEAAAAAWEFAAAAByRtYXRjaDAFAAAAAWEAAAAAAAAAAAAFAAAAA251bQEAAAALZ2V0U3RyQnlLZXkAAAABAAAAA2tleQQAAAADc3RyBAAAAAckbWF0Y2gwCQAEHQAAAAIFAAAABHRoaXMFAAAAA2tleQMJAAABAAAAAgUAAAAHJG1hdGNoMAIAAAAGU3RyaW5nBAAAAAFhBQAAAAckbWF0Y2gwBQAAAAFhBQAAAAROT05FBQAAAANzdHIBAAAAFWdldEtleVVzZXJJdGVtQ291bnRlcgAAAAIAAAAEdXNlcgAAAARpdGVtCQABLAAAAAIJAAEsAAAAAgkAASwAAAACBQAAAARpdGVtAgAAAAFfBQAAAAR1c2VyAgAAAARfY250AQAAABFnZXRWYWx1ZUl0ZW1QcmljZQAAAAEAAAAEaXRlbQkBAAAADmdldE51bWJlckJ5S2V5AAAAAQkBAAAAD2dldEtleUl0ZW1QcmljZQAAAAEFAAAABGl0ZW0BAAAAF2dldFZhbHVlVXNlckl0ZW1Db3VudGVyAAAAAgAAAAR1c2VyAAAABGl0ZW0JAQAAAA5nZXROdW1iZXJCeUtleQAAAAEJAQAAABVnZXRLZXlVc2VySXRlbUNvdW50ZXIAAAACBQAAAAR1c2VyBQAAAARpdGVtAQAAAApnZXRLZXlJdGVtAAAAAgAAAAhzdXBwbGllcgAAAAV0aXRsZQkAASwAAAACAgAAAAVpdGVtXwkAAlgAAAABCQAB9wAAAAEJAAGbAAAAAQkAASwAAAACBQAAAAhzdXBwbGllcgUAAAAFdGl0bGUBAAAADmdldEtleUl0ZW1EYXRhAAAAAQAAAARpdGVtCQABLAAAAAIFAAAABGl0ZW0CAAAABV9kYXRhAQAAABJnZXRLZXlJdGVtU3VwcGxpZXIAAAABAAAABGl0ZW0JAAEsAAAAAgUAAAAEaXRlbQIAAAAGX293bmVyAQAAABRnZXRWYWx1ZUl0ZW1TdXBwbGllcgAAAAEAAAAEaXRlbQkBAAAAC2dldFN0ckJ5S2V5AAAAAQkBAAAAEmdldEtleUl0ZW1TdXBwbGllcgAAAAEFAAAABGl0ZW0BAAAAFWdldEtleUJhbGFuY2VTdXBwbGllcgAAAAEAAAAHYWNjb3VudAkAASwAAAACBQAAAAdhY2NvdW50AgAAAAhfYmFsYW5jZQEAAAAXZ2V0VmFsdWVCYWxhbmNlU3VwcGxpZXIAAAABAAAAB2FjY291bnQJAQAAAA5nZXROdW1iZXJCeUtleQAAAAEJAQAAABVnZXRLZXlCYWxhbmNlU3VwcGxpZXIAAAABBQAAAAdhY2NvdW50AAAAAAZWb3RlcnMAAAAAAAAAAAMAAAAABlF1b3J1bQAAAAAAAAAAAgAAAAAGVm90aW5nAgAAAAZ2b3RpbmcAAAAABlJldmVhbAIAAAAGcmV2ZWFsAAAAAAhGZWF0dXJlZAIAAAAIZmVhdHVyZWQAAAAACERlbGlzdGVkAgAAAAhkZWxpc3RlZAEAAAAMZ2V0S2V5Q29tbWl0AAAAAgAAAARpdGVtAAAABHVzZXIJAAEsAAAAAgkAASwAAAACCQABLAAAAAIFAAAABGl0ZW0CAAAAAV8FAAAABHVzZXICAAAAB19jb21taXQBAAAADmdldFZhbHVlQ29tbWl0AAAAAgAAAARpdGVtAAAABHVzZXIJAQAAAAtnZXRTdHJCeUtleQAAAAEJAQAAAAxnZXRLZXlDb21taXQAAAACBQAAAARpdGVtBQAAAAR1c2VyAQAAABJnZXRLZXlDb21taXRzQ291bnQAAAABAAAABGl0ZW0JAAEsAAAAAgUAAAAEaXRlbQIAAAAHK2NvbWNudAEAAAAUZ2V0VmFsdWVDb21taXRzQ291bnQAAAABAAAABGl0ZW0JAQAAAA5nZXROdW1iZXJCeUtleQAAAAEJAQAAABJnZXRLZXlDb21taXRzQ291bnQAAAABBQAAAARpdGVtAQAAAAxnZXRLZXlSZXZlYWwAAAACAAAABGl0ZW0AAAAEdXNlcgkAASwAAAACCQABLAAAAAIJAAEsAAAAAgUAAAAEaXRlbQIAAAABXwUAAAAEdXNlcgIAAAAHX3JldmVhbAEAAAAOZ2V0VmFsdWVSZXZlYWwAAAACAAAABGl0ZW0AAAAEdXNlcgkBAAAAC2dldFN0ckJ5S2V5AAAAAQkBAAAADGdldEtleVJldmVhbAAAAAIFAAAABGl0ZW0FAAAABHVzZXIBAAAAEGdldEtleUl0ZW1TdGF0dXMAAAABAAAABGl0ZW0JAAEsAAAAAgUAAAAEaXRlbQIAAAAHX3N0YXR1cwEAAAASZ2V0VmFsdWVJdGVtU3RhdHVzAAAAAQAAAARpdGVtCQEAAAALZ2V0U3RyQnlLZXkAAAABCQEAAAAQZ2V0S2V5SXRlbVN0YXR1cwAAAAEFAAAABGl0ZW0BAAAAD2dldEtleVZvdGVDb3VudAAAAAIAAAAEaXRlbQAAAAR2b3RlCQABLAAAAAIJAAEsAAAAAgUAAAAEaXRlbQIAAAAFX3JlczoFAAAABHZvdGUBAAAAEWdldFZhbHVlVm90ZUNvdW50AAAAAgAAAARpdGVtAAAABHZvdGUJAQAAAA5nZXROdW1iZXJCeUtleQAAAAEJAQAAAA9nZXRLZXlWb3RlQ291bnQAAAACBQAAAARpdGVtBQAAAAR2b3RlAAAABQAAAAFpAQAAAAdhZGRpdGVtAAAAAwAAAAV0aXRsZQAAAAVwcmljZQAAAARkYXRhBAAAAAZzdXBwYWQJAAJYAAAAAQgIBQAAAAFpAAAABmNhbGxlcgAAAAVieXRlcwQAAAAEaXRlbQkBAAAACmdldEtleUl0ZW0AAAACBQAAAAZzdXBwYWQFAAAABXRpdGxlAwkAAGcAAAACAAAAAAAAAAAABQAAAAVwcmljZQkAAAIAAAABAgAAACpwdXJjaGFzZSBhbW91bnQgY2Fubm90IGJlIGxlc3MgdGhhbiAwIG9yIDADCQEAAAACIT0AAAACCQEAAAAUZ2V0VmFsdWVJdGVtU3VwcGxpZXIAAAABBQAAAARpdGVtBQAAAAROT05FCQAAAgAAAAECAAAAFmFuIGl0ZW0gYWxyZWFkeSBleGlzdHMJAQAAAAhXcml0ZVNldAAAAAEJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAQAAABJnZXRLZXlJdGVtU3VwcGxpZXIAAAABBQAAAARpdGVtBQAAAAZzdXBwYWQJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAQAAAA9nZXRLZXlJdGVtUHJpY2UAAAABBQAAAARpdGVtBQAAAAVwcmljZQkABEwAAAACCQEAAAAJRGF0YUVudHJ5AAAAAgkBAAAADmdldEtleUl0ZW1EYXRhAAAAAQUAAAAEaXRlbQUAAAAEZGF0YQUAAAADbmlsAAAAAWkBAAAACHB1cmNoYXNlAAAAAQAAAARpdGVtBAAAAANwbXQJAQAAAAdleHRyYWN0AAAAAQgFAAAAAWkAAAAHcGF5bWVudAMJAQAAAAlpc0RlZmluZWQAAAABCAUAAAADcG10AAAAB2Fzc2V0SWQJAAACAAAAAQIAAAAgQ2FuIHVzZSBXYXZlcyBvbmx5IGF0IHRoZSBtb21lbnQEAAAAD2N1c3RvbWVyQWRkcmVzcwkAAlgAAAABCAgFAAAAAWkAAAAGY2FsbGVyAAAABWJ5dGVzBAAAAAVwcmljZQkBAAAAEWdldFZhbHVlSXRlbVByaWNlAAAAAQUAAAAEaXRlbQQAAAAGc3VwYWRkCQEAAAAUZ2V0VmFsdWVJdGVtU3VwcGxpZXIAAAABBQAAAARpdGVtAwkAAGYAAAACBQAAAAVwcmljZQgFAAAAA3BtdAAAAAZhbW91bnQJAAACAAAAAQIAAAAvcHVyY2hhc2UgYW1vdW50IGNhbm5vdCBiZSBsZXNzIHRoYW4gaXRlbSBwcmljZSADCQAAZgAAAAIIBQAAAANwbXQAAAAGYW1vdW50BQAAAAVwcmljZQkAAAIAAAABAgAAADBwdXJjaGFzZSBhbW91bnQgY2Fubm90IGJlIGhpZ2hlciB0aGFuIGl0ZW0gcHJpY2UJAQAAAAhXcml0ZVNldAAAAAEJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAQAAABVnZXRLZXlVc2VySXRlbUNvdW50ZXIAAAACBQAAAA9jdXN0b21lckFkZHJlc3MFAAAABGl0ZW0JAABkAAAAAgkBAAAAF2dldFZhbHVlVXNlckl0ZW1Db3VudGVyAAAAAgUAAAAPY3VzdG9tZXJBZGRyZXNzBQAAAARpdGVtAAAAAAAAAAABCQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACCQEAAAAVZ2V0S2V5QmFsYW5jZVN1cHBsaWVyAAAAAQUAAAAGc3VwYWRkCQAAZAAAAAIJAQAAABdnZXRWYWx1ZUJhbGFuY2VTdXBwbGllcgAAAAEFAAAABnN1cGFkZAgFAAAAA3BtdAAAAAZhbW91bnQFAAAAA25pbAAAAAFpAQAAAAh3aXRoZHJhdwAAAAAEAAAAB3N1cHBhZGQJAAJYAAAAAQgIBQAAAAFpAAAABmNhbGxlcgAAAAVieXRlcwQAAAADYmFsCQEAAAAOZ2V0TnVtYmVyQnlLZXkAAAABAgAAACszTXFqek5wbVpBRjNLN1c2UlJjZXpiU2RXb3JNQVhYd2Rxb19iYWxhbmNlAwkAAGcAAAACAAAAAAAAAAAABQAAAANiYWwJAAACAAAAAQIAAAAXSW5zdWZmaWNpZW50IEJhbGFuY2UgeEQJAQAAAAxTY3JpcHRSZXN1bHQAAAACCQEAAAAIV3JpdGVTZXQAAAABCQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACCQEAAAAVZ2V0S2V5QmFsYW5jZVN1cHBsaWVyAAAAAQUAAAAHc3VwcGFkZAAAAAAAAAAAAAUAAAADbmlsCQEAAAALVHJhbnNmZXJTZXQAAAABCQAETAAAAAIJAQAAAA5TY3JpcHRUcmFuc2ZlcgAAAAMJAQAAABxAZXh0clVzZXIoYWRkcmVzc0Zyb21TdHJpbmcpAAAAAQUAAAAHc3VwcGFkZAUAAAADYmFsBQAAAAR1bml0BQAAAANuaWwAAAABaQEAAAAKdm90ZUNvbW1pdAAAAAIAAAAEaXRlbQAAAARoYXNoBAAAAAR1c2VyCQACWAAAAAEICAUAAAABaQAAAAZjYWxsZXIAAAAFYnl0ZXMEAAAAB2NvbW1pdHMJAQAAABRnZXRWYWx1ZUNvbW1pdHNDb3VudAAAAAEFAAAABGl0ZW0EAAAABnN0YXR1cwkBAAAAEmdldFZhbHVlSXRlbVN0YXR1cwAAAAEFAAAABGl0ZW0DCQAAZwAAAAIFAAAAB2NvbW1pdHMFAAAABlZvdGVycwkAAAIAAAABAgAAAAlNYXggdm90ZXMDCQEAAAACIT0AAAACCQEAAAAOZ2V0VmFsdWVDb21taXQAAAACBQAAAARpdGVtBQAAAAR1c2VyBQAAAAROT05FCQAAAgAAAAECAAAADGFscmVhZHkgZG9uZQMJAAAAAAAAAgkBAAAAEmdldEtleUl0ZW1TdXBwbGllcgAAAAEFAAAABGl0ZW0FAAAABE5PTkUJAAACAAAAAQIAAAASaXRlbSBkb2Vzbm90IGV4aXN0AwMJAQAAAAIhPQAAAAIFAAAABnN0YXR1cwUAAAAETk9ORQkBAAAAAiE9AAAAAgUAAAAGc3RhdHVzBQAAAAZWb3RpbmcHCQAAAgAAAAECAAAADW5vdCBwb3NzaWxibGUJAQAAAAhXcml0ZVNldAAAAAEJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAQAAAAxnZXRLZXlDb21taXQAAAACBQAAAARpdGVtBQAAAAR1c2VyBQAAAARoYXNoCQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACCQEAAAASZ2V0S2V5Q29tbWl0c0NvdW50AAAAAQUAAAAEaXRlbQkAAGQAAAACBQAAAAdjb21taXRzAAAAAAAAAAABCQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACCQEAAAAQZ2V0S2V5SXRlbVN0YXR1cwAAAAEFAAAABGl0ZW0DCQAAAAAAAAIFAAAAB2NvbW1pdHMFAAAABlZvdGVycwUAAAAGUmV2ZWFsBQAAAAZWb3RpbmcFAAAAA25pbAAAAAFpAQAAAAp2b3RlUmV2ZWFsAAAAAwAAAARpdGVtAAAABHZvdGUAAAAEc2FsdAQAAAAEdXNlcgkAAlgAAAABCAgFAAAAAWkAAAAGY2FsbGVyAAAABWJ5dGVzBAAAAAZzdGF0dXMJAQAAABJnZXRWYWx1ZUl0ZW1TdGF0dXMAAAABBQAAAARpdGVtBAAAAAxuZXdWb3RlQ291bnQJAABkAAAAAgkBAAAAEWdldFZhbHVlVm90ZUNvdW50AAAAAgUAAAAEaXRlbQUAAAAEdm90ZQAAAAAAAAAAAQMJAQAAAAIhPQAAAAIJAAJYAAAAAQkAAfcAAAABCQABmwAAAAEJAAEsAAAAAgUAAAAEdm90ZQUAAAAEc2FsdAkBAAAADmdldFZhbHVlQ29tbWl0AAAAAgUAAAAEaXRlbQUAAAAEdXNlcgkAAAIAAAABAgAAABNyZXZlYWwgaXMgbm90IHZhbGlkAwkAAGYAAAACBQAAAAZWb3RlcnMJAQAAABRnZXRWYWx1ZUNvbW1pdHNDb3VudAAAAAEFAAAABGl0ZW0JAAACAAAAAQIAAAAQbm90IGVub3VnaCB2b3RlcwMJAQAAAAIhPQAAAAIJAQAAAA5nZXRWYWx1ZVJldmVhbAAAAAIFAAAABGl0ZW0FAAAABHVzZXIFAAAABE5PTkUJAAACAAAAAQIAAAAYdXNyIGFscmVhZHkgcGFydGljaXBhdGVkAwMJAQAAAAIhPQAAAAIFAAAABnN0YXR1cwUAAAAGVm90aW5nCQEAAAACIT0AAAACBQAAAAZzdGF0dXMFAAAABlJldmVhbAcJAAACAAAAAQIAAAAMd3Jvbmcgc3RhdHVzAwMJAQAAAAIhPQAAAAIFAAAABHZvdGUFAAAACEZlYXR1cmVkBgkBAAAAAiE9AAAAAgUAAAAGc3RhdHVzBQAAAAhEZWxpc3RlZAkAAAIAAAABAgAAAAp3cm9uZyB2b3RlAwMJAAAAAAAAAgUAAAAGc3RhdHVzBQAAAAhGZWF0dXJlZAYJAAAAAAAAAgUAAAAGc3RhdHVzBQAAAAhEZWxpc3RlZAkAAAIAAAABAgAAABd2b3RpbmcgZmluaXNoZWQgYWxyZWFkeQkBAAAACFdyaXRlU2V0AAAAAQkABEwAAAACCQEAAAAJRGF0YUVudHJ5AAAAAgkBAAAADGdldEtleVJldmVhbAAAAAIFAAAABGl0ZW0FAAAABHVzZXIFAAAABHZvdGUJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAQAAAA9nZXRLZXlWb3RlQ291bnQAAAACBQAAAARpdGVtBQAAAAR2b3RlBQAAAAxuZXdWb3RlQ291bnQJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAQAAABBnZXRLZXlJdGVtU3RhdHVzAAAAAQUAAAAEaXRlbQMJAABnAAAAAgUAAAAMbmV3Vm90ZUNvdW50BQAAAAZRdW9ydW0FAAAABHZvdGUFAAAABlJldmVhbAUAAAADbmlsAAAAAGzKpwg=",
    "chainId": 84,
    "height": 553673,
    "spentComplexity": 0
}

View: original | compacted
Prev: 42ujvvpHFCiMcy7LXZpHraEq7P2agG58WrsiMxkN77FJ
Next: 5cp6kSLnPCDNRt4Xo9LTgKpdGmQqGZs318NkncRMq7vS

Diff: 
Old New Differences
161 161      }
162 162  
163 163  
164 + 
165 + @Callable(i)
166 + func voteReveal (item,vote,salt) = {
167 +     let user = toBase58String(i.caller.bytes)
168 +     let status = getValueItemStatus(item)
169 +     let newVoteCount = (getValueVoteCount(item, vote) + 1)
170 +     if ((toBase58String(sha256(toBytes((vote + salt)))) != getValueCommit(item, user)))
171 +         then throw("reveal is not valid")
172 +         else if ((Voters > getValueCommitsCount(item)))
173 +             then throw("not enough votes")
174 +             else if ((getValueReveal(item, user) != NONE))
175 +                 then throw("usr already participated")
176 +                 else if (if ((status != Voting))
177 +                     then (status != Reveal)
178 +                     else false)
179 +                     then throw("wrong status")
180 +                     else if (if ((vote != Featured))
181 +                         then true
182 +                         else (status != Delisted))
183 +                         then throw("wrong vote")
184 +                         else if (if ((status == Featured))
185 +                             then true
186 +                             else (status == Delisted))
187 +                             then throw("voting finished already")
188 +                             else WriteSet([DataEntry(getKeyReveal(item, user), vote), DataEntry(getKeyVoteCount(item, vote), newVoteCount), DataEntry(getKeyItemStatus(item), if ((newVoteCount >= Quorum))
189 +                                 then vote
190 +                                 else Reveal)])
191 +     }
192 + 
193 + 
Full: 
Old New Differences
1 1  {-# STDLIB_VERSION 3 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 4  let NONE = "none"
5 5  
6 6  func getKeyItemPrice (item) = (item + "_price")
7 7  
8 8  
9 9  func getNumberByKey (key) = {
10 10      let num =     match getInteger(this, key) {
11 11          case a: Int => 
12 12              a
13 13          case _ => 
14 14              0
15 15      }
16 16      num
17 17      }
18 18  
19 19  
20 20  func getStrByKey (key) = {
21 21      let str =     match getString(this, key) {
22 22          case a: String => 
23 23              a
24 24          case _ => 
25 25              NONE
26 26      }
27 27      str
28 28      }
29 29  
30 30  
31 31  func getKeyUserItemCounter (user,item) = (((item + "_") + user) + "_cnt")
32 32  
33 33  
34 34  func getValueItemPrice (item) = getNumberByKey(getKeyItemPrice(item))
35 35  
36 36  
37 37  func getValueUserItemCounter (user,item) = getNumberByKey(getKeyUserItemCounter(user, item))
38 38  
39 39  
40 40  func getKeyItem (supplier,title) = ("item_" + toBase58String(sha256(toBytes((supplier + title)))))
41 41  
42 42  
43 43  func getKeyItemData (item) = (item + "_data")
44 44  
45 45  
46 46  func getKeyItemSupplier (item) = (item + "_owner")
47 47  
48 48  
49 49  func getValueItemSupplier (item) = getStrByKey(getKeyItemSupplier(item))
50 50  
51 51  
52 52  func getKeyBalanceSupplier (account) = (account + "_balance")
53 53  
54 54  
55 55  func getValueBalanceSupplier (account) = getNumberByKey(getKeyBalanceSupplier(account))
56 56  
57 57  
58 58  let Voters = 3
59 59  
60 60  let Quorum = 2
61 61  
62 62  let Voting = "voting"
63 63  
64 64  let Reveal = "reveal"
65 65  
66 66  let Featured = "featured"
67 67  
68 68  let Delisted = "delisted"
69 69  
70 70  func getKeyCommit (item,user) = (((item + "_") + user) + "_commit")
71 71  
72 72  
73 73  func getValueCommit (item,user) = getStrByKey(getKeyCommit(item, user))
74 74  
75 75  
76 76  func getKeyCommitsCount (item) = (item + "+comcnt")
77 77  
78 78  
79 79  func getValueCommitsCount (item) = getNumberByKey(getKeyCommitsCount(item))
80 80  
81 81  
82 82  func getKeyReveal (item,user) = (((item + "_") + user) + "_reveal")
83 83  
84 84  
85 85  func getValueReveal (item,user) = getStrByKey(getKeyReveal(item, user))
86 86  
87 87  
88 88  func getKeyItemStatus (item) = (item + "_status")
89 89  
90 90  
91 91  func getValueItemStatus (item) = getStrByKey(getKeyItemStatus(item))
92 92  
93 93  
94 94  func getKeyVoteCount (item,vote) = ((item + "_res:") + vote)
95 95  
96 96  
97 97  func getValueVoteCount (item,vote) = getNumberByKey(getKeyVoteCount(item, vote))
98 98  
99 99  
100 100  @Callable(i)
101 101  func additem (title,price,data) = {
102 102      let suppad = toBase58String(i.caller.bytes)
103 103      let item = getKeyItem(suppad, title)
104 104      if ((0 >= price))
105 105          then throw("purchase amount cannot be less than 0 or 0")
106 106          else if ((getValueItemSupplier(item) != NONE))
107 107              then throw("an item already exists")
108 108              else WriteSet([DataEntry(getKeyItemSupplier(item), suppad), DataEntry(getKeyItemPrice(item), price), DataEntry(getKeyItemData(item), data)])
109 109      }
110 110  
111 111  
112 112  
113 113  @Callable(i)
114 114  func purchase (item) = {
115 115      let pmt = extract(i.payment)
116 116      if (isDefined(pmt.assetId))
117 117          then throw("Can use Waves only at the moment")
118 118          else {
119 119              let customerAddress = toBase58String(i.caller.bytes)
120 120              let price = getValueItemPrice(item)
121 121              let supadd = getValueItemSupplier(item)
122 122              if ((price > pmt.amount))
123 123                  then throw("purchase amount cannot be less than item price ")
124 124                  else if ((pmt.amount > price))
125 125                      then throw("purchase amount cannot be higher than item price")
126 126                      else WriteSet([DataEntry(getKeyUserItemCounter(customerAddress, item), (getValueUserItemCounter(customerAddress, item) + 1)), DataEntry(getKeyBalanceSupplier(supadd), (getValueBalanceSupplier(supadd) + pmt.amount))])
127 127              }
128 128      }
129 129  
130 130  
131 131  
132 132  @Callable(i)
133 133  func withdraw () = {
134 134      let suppadd = toBase58String(i.caller.bytes)
135 135      let bal = getNumberByKey("3MqjzNpmZAF3K7W6RRcezbSdWorMAXXwdqo_balance")
136 136      if ((0 >= bal))
137 137          then throw("Insufficient Balance xD")
138 138          else ScriptResult(WriteSet([DataEntry(getKeyBalanceSupplier(suppadd), 0)]), TransferSet([ScriptTransfer(addressFromStringValue(suppadd), bal, unit)]))
139 139      }
140 140  
141 141  
142 142  
143 143  @Callable(i)
144 144  func voteCommit (item,hash) = {
145 145      let user = toBase58String(i.caller.bytes)
146 146      let commits = getValueCommitsCount(item)
147 147      let status = getValueItemStatus(item)
148 148      if ((commits >= Voters))
149 149          then throw("Max votes")
150 150          else if ((getValueCommit(item, user) != NONE))
151 151              then throw("already done")
152 152              else if ((getKeyItemSupplier(item) == NONE))
153 153                  then throw("item doesnot exist")
154 154                  else if (if ((status != NONE))
155 155                      then (status != Voting)
156 156                      else false)
157 157                      then throw("not possilble")
158 158                      else WriteSet([DataEntry(getKeyCommit(item, user), hash), DataEntry(getKeyCommitsCount(item), (commits + 1)), DataEntry(getKeyItemStatus(item), if ((commits == Voters))
159 159                          then Reveal
160 160                          else Voting)])
161 161      }
162 162  
163 163  
164 + 
165 + @Callable(i)
166 + func voteReveal (item,vote,salt) = {
167 +     let user = toBase58String(i.caller.bytes)
168 +     let status = getValueItemStatus(item)
169 +     let newVoteCount = (getValueVoteCount(item, vote) + 1)
170 +     if ((toBase58String(sha256(toBytes((vote + salt)))) != getValueCommit(item, user)))
171 +         then throw("reveal is not valid")
172 +         else if ((Voters > getValueCommitsCount(item)))
173 +             then throw("not enough votes")
174 +             else if ((getValueReveal(item, user) != NONE))
175 +                 then throw("usr already participated")
176 +                 else if (if ((status != Voting))
177 +                     then (status != Reveal)
178 +                     else false)
179 +                     then throw("wrong status")
180 +                     else if (if ((vote != Featured))
181 +                         then true
182 +                         else (status != Delisted))
183 +                         then throw("wrong vote")
184 +                         else if (if ((status == Featured))
185 +                             then true
186 +                             else (status == Delisted))
187 +                             then throw("voting finished already")
188 +                             else WriteSet([DataEntry(getKeyReveal(item, user), vote), DataEntry(getKeyVoteCount(item, vote), newVoteCount), DataEntry(getKeyItemStatus(item), if ((newVoteCount >= Quorum))
189 +                                 then vote
190 +                                 else Reveal)])
191 +     }
192 + 
193 +

Old	New		Differences
161	161		}
162	162
163	163
	164	+
	165	+	@Callable(i)
	166	+	func voteReveal (item,vote,salt) = {
	167	+	let user = toBase58String(i.caller.bytes)
	168	+	let status = getValueItemStatus(item)
	169	+	let newVoteCount = (getValueVoteCount(item, vote) + 1)
	170	+	if ((toBase58String(sha256(toBytes((vote + salt)))) != getValueCommit(item, user)))
	171	+	then throw("reveal is not valid")
	172	+	else if ((Voters > getValueCommitsCount(item)))
	173	+	then throw("not enough votes")
	174	+	else if ((getValueReveal(item, user) != NONE))
	175	+	then throw("usr already participated")
	176	+	else if (if ((status != Voting))
	177	+	then (status != Reveal)
	178	+	else false)
	179	+	then throw("wrong status")
	180	+	else if (if ((vote != Featured))
	181	+	then true
	182	+	else (status != Delisted))
	183	+	then throw("wrong vote")
	184	+	else if (if ((status == Featured))
	185	+	then true
	186	+	else (status == Delisted))
	187	+	then throw("voting finished already")
	188	+	else WriteSet([DataEntry(getKeyReveal(item, user), vote), DataEntry(getKeyVoteCount(item, vote), newVoteCount), DataEntry(getKeyItemStatus(item), if ((newVoteCount >= Quorum))
	189	+	then vote
	190	+	else Reveal)])
	191	+	}
	192	+
	193	+

Old	New		Differences
1	1		{-# STDLIB_VERSION 3 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4	4		let NONE = "none"
5	5
6	6		func getKeyItemPrice (item) = (item + "_price")
7	7
8	8
9	9		func getNumberByKey (key) = {
10	10		let num = match getInteger(this, key) {
11	11		case a: Int =>
12	12		a
13	13		case _ =>
14	14		0
15	15		}
16	16		num
17	17		}
18	18
19	19
20	20		func getStrByKey (key) = {
21	21		let str = match getString(this, key) {
22	22		case a: String =>
23	23		a
24	24		case _ =>
25	25		NONE
26	26		}
27	27		str
28	28		}
29	29
30	30
31	31		func getKeyUserItemCounter (user,item) = (((item + "_") + user) + "_cnt")
32	32
33	33
34	34		func getValueItemPrice (item) = getNumberByKey(getKeyItemPrice(item))
35	35
36	36
37	37		func getValueUserItemCounter (user,item) = getNumberByKey(getKeyUserItemCounter(user, item))
38	38
39	39
40	40		func getKeyItem (supplier,title) = ("item_" + toBase58String(sha256(toBytes((supplier + title)))))
41	41
42	42
43	43		func getKeyItemData (item) = (item + "_data")
44	44
45	45
46	46		func getKeyItemSupplier (item) = (item + "_owner")
47	47
48	48
49	49		func getValueItemSupplier (item) = getStrByKey(getKeyItemSupplier(item))
50	50
51	51
52	52		func getKeyBalanceSupplier (account) = (account + "_balance")
53	53
54	54
55	55		func getValueBalanceSupplier (account) = getNumberByKey(getKeyBalanceSupplier(account))
56	56
57	57
58	58		let Voters = 3
59	59
60	60		let Quorum = 2
61	61
62	62		let Voting = "voting"
63	63
64	64		let Reveal = "reveal"
65	65
66	66		let Featured = "featured"
67	67
68	68		let Delisted = "delisted"
69	69
70	70		func getKeyCommit (item,user) = (((item + "_") + user) + "_commit")
71	71
72	72
73	73		func getValueCommit (item,user) = getStrByKey(getKeyCommit(item, user))
74	74
75	75
76	76		func getKeyCommitsCount (item) = (item + "+comcnt")
77	77
78	78
79	79		func getValueCommitsCount (item) = getNumberByKey(getKeyCommitsCount(item))
80	80
81	81
82	82		func getKeyReveal (item,user) = (((item + "_") + user) + "_reveal")
83	83
84	84
85	85		func getValueReveal (item,user) = getStrByKey(getKeyReveal(item, user))
86	86
87	87
88	88		func getKeyItemStatus (item) = (item + "_status")
89	89
90	90
91	91		func getValueItemStatus (item) = getStrByKey(getKeyItemStatus(item))
92	92
93	93
94	94		func getKeyVoteCount (item,vote) = ((item + "_res:") + vote)
95	95
96	96
97	97		func getValueVoteCount (item,vote) = getNumberByKey(getKeyVoteCount(item, vote))
98	98
99	99
100	100		@Callable(i)
101	101		func additem (title,price,data) = {
102	102		let suppad = toBase58String(i.caller.bytes)
103	103		let item = getKeyItem(suppad, title)
104	104		if ((0 >= price))
105	105		then throw("purchase amount cannot be less than 0 or 0")
106	106		else if ((getValueItemSupplier(item) != NONE))
107	107		then throw("an item already exists")
108	108		else WriteSet([DataEntry(getKeyItemSupplier(item), suppad), DataEntry(getKeyItemPrice(item), price), DataEntry(getKeyItemData(item), data)])
109	109		}
110	110
111	111
112	112
113	113		@Callable(i)
114	114		func purchase (item) = {
115	115		let pmt = extract(i.payment)
116	116		if (isDefined(pmt.assetId))
117	117		then throw("Can use Waves only at the moment")
118	118		else {
119	119		let customerAddress = toBase58String(i.caller.bytes)
120	120		let price = getValueItemPrice(item)
121	121		let supadd = getValueItemSupplier(item)
122	122		if ((price > pmt.amount))
123	123		then throw("purchase amount cannot be less than item price ")
124	124		else if ((pmt.amount > price))
125	125		then throw("purchase amount cannot be higher than item price")
126	126		else WriteSet([DataEntry(getKeyUserItemCounter(customerAddress, item), (getValueUserItemCounter(customerAddress, item) + 1)), DataEntry(getKeyBalanceSupplier(supadd), (getValueBalanceSupplier(supadd) + pmt.amount))])
127	127		}
128	128		}
129	129
130	130
131	131
132	132		@Callable(i)
133	133		func withdraw () = {
134	134		let suppadd = toBase58String(i.caller.bytes)
135	135		let bal = getNumberByKey("3MqjzNpmZAF3K7W6RRcezbSdWorMAXXwdqo_balance")
136	136		if ((0 >= bal))
137	137		then throw("Insufficient Balance xD")
138	138		else ScriptResult(WriteSet([DataEntry(getKeyBalanceSupplier(suppadd), 0)]), TransferSet([ScriptTransfer(addressFromStringValue(suppadd), bal, unit)]))
139	139		}
140	140
141	141
142	142
143	143		@Callable(i)
144	144		func voteCommit (item,hash) = {
145	145		let user = toBase58String(i.caller.bytes)
146	146		let commits = getValueCommitsCount(item)
147	147		let status = getValueItemStatus(item)
148	148		if ((commits >= Voters))
149	149		then throw("Max votes")
150	150		else if ((getValueCommit(item, user) != NONE))
151	151		then throw("already done")
152	152		else if ((getKeyItemSupplier(item) == NONE))
153	153		then throw("item doesnot exist")
154	154		else if (if ((status != NONE))
155	155		then (status != Voting)
156	156		else false)
157	157		then throw("not possilble")
158	158		else WriteSet([DataEntry(getKeyCommit(item, user), hash), DataEntry(getKeyCommitsCount(item), (commits + 1)), DataEntry(getKeyItemStatus(item), if ((commits == Voters))
159	159		then Reveal
160	160		else Voting)])
161	161		}
162	162
163	163
	164	+
	165	+	@Callable(i)
	166	+	func voteReveal (item,vote,salt) = {
	167	+	let user = toBase58String(i.caller.bytes)
	168	+	let status = getValueItemStatus(item)
	169	+	let newVoteCount = (getValueVoteCount(item, vote) + 1)
	170	+	if ((toBase58String(sha256(toBytes((vote + salt)))) != getValueCommit(item, user)))
	171	+	then throw("reveal is not valid")
	172	+	else if ((Voters > getValueCommitsCount(item)))
	173	+	then throw("not enough votes")
	174	+	else if ((getValueReveal(item, user) != NONE))
	175	+	then throw("usr already participated")
	176	+	else if (if ((status != Voting))
	177	+	then (status != Reveal)
	178	+	else false)
	179	+	then throw("wrong status")
	180	+	else if (if ((vote != Featured))
	181	+	then true
	182	+	else (status != Delisted))
	183	+	then throw("wrong vote")
	184	+	else if (if ((status == Featured))
	185	+	then true
	186	+	else (status == Delisted))
	187	+	then throw("voting finished already")
	188	+	else WriteSet([DataEntry(getKeyReveal(item, user), vote), DataEntry(getKeyVoteCount(item, vote), newVoteCount), DataEntry(getKeyItemStatus(item), if ((newVoteCount >= Quorum))
	189	+	then vote
	190	+	else Reveal)])
	191	+	}
	192	+
	193	+

github/deemru/w8io/026f985 
26.85 ms ◑