w8 · tx · 6n6···A35

tx · 6n65p3oWsh2hGNv3JD15TnWpPGCPTHTeKsfXSP5fcA35

3N4UJUg7pEuSuvKS1QL95AEKhnmCajteTMz:  -0.01000000 Waves

2021.07.07 16:38 [1603247] smart account 3N4UJUg7pEuSuvKS1QL95AEKhnmCajteTMz > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "6n65p3oWsh2hGNv3JD15TnWpPGCPTHTeKsfXSP5fcA35",
    "fee": 1000000,
    "feeAssetId": null,
    "timestamp": 1625665138954,
    "version": 2,
    "chainId": 84,
    "sender": "3N4UJUg7pEuSuvKS1QL95AEKhnmCajteTMz",
    "senderPublicKey": "83P1tbCSGDinJAD4ucJJ5cUiuS8RUPh4yfUBDtt129Yw",
    "proofs": [
        "4PAzHn2tZcCbGcwBeBjGF2BdCsJHwNubGGuyXeQPvFytyjDkjCxcqvb2WKTmfQ2JeeU19bykhjK2pYBGfXUeqrTK"
    ],
    "script": "base64:AAIFAAAAAAAAA9QIAhIFCgMIAQgSAwoBCBIAEgQKAggIEgUKAwgICBoMCgJhMRIGVk9URVJTGgwKAmEyEgZRVU9SVU0aDAoCYTMSBlZPVElORxoMCgJhNBIGUkVWRUFMGg4KAmE1EghGRUFUVVJFRBoOCgJhNhIIREVMSVNURUQaCgoCYTcSBE5PTkUaFAoCYTgSDmdldE51bWJlckJ5S2V5GgkKAmE5EgNrZXkaCQoCYjESA251bRoNCgJiMhIHJG1hdGNoMBoHCgJiMxIBYRoRCgJiNBILZ2V0U3RyQnlLZXkaCQoCYjUSA3N0choSCgJiNhIMZ2V0S2V5Q29tbWl0GgoKAmI3EgRpdGVtGgoKAmI4EgR1c2VyGhQKAmI5Eg5nZXRWYWx1ZUNvbW1pdBoYCgJjMRISZ2V0S2V5Q29tbWl0c0NvdW50GhoKAmMyEhRnZXRWYWx1ZUNvbW1pdHNDb3VudBoSCgJjMxIMZ2V0S2V5UmV2ZWFsGhQKAmM0Eg5nZXRWYWx1ZVJldmVhbBoWCgJjNRIQZ2V0S2V5SXRlbVN0YXR1cxoYCgJjNhISZ2V0VmFsdWVJdGVtU3RhdHVzGhUKAmM3Eg9nZXRLZXlWb3RlQ291bnQaCgoCYzgSBHZvdGUaFwoCYzkSEWdldFZhbHVlVm90ZUNvdW50GhUKAmQxEg9nZXRLZXlJdGVtUHJpY2UaFwoCZDISEWdldFZhbHVlSXRlbVByaWNlGhsKAmQzEhVnZXRLZXlVc2VySXRlbUNvdW50ZXIaHQoCZDQSF2dldFZhbHVlVXNlckl0ZW1Db3VudGVyGhAKAmQ1EgpnZXRLZXlJdGVtGg4KAmQ2EghzdXBwbGllchoLCgJkNxIFdGl0bGUaFAoCZDgSDmdldEtleUl0ZW1EYXRhGhgKAmQ5EhJnZXRLZXlJdGVtU3VwcGxpZXIaGgoCZTESFGdldFZhbHVlSXRlbVN1cHBsaWVyGhsKAmUyEhVnZXRLZXlCYWxhbmNlU3VwcGxpZXIaDQoCZTMSB2FjY291bnQaHQoCZTQSF2dldFZhbHVlQmFsYW5jZVN1cHBsaWVyGgcKAmU1EgFpGgsKAmU2EgVwcmljZRoKCgJlNxIEZGF0YRoVCgJlOBIPc3VwcGxpZXJBZGRyZXNzGgkKAmU5EgNwbXQaEQoCZjESC3VzZXJBZGRy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",
    "height": 1603247,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: 8kDphVseWX7PBnkR1vWy6ZGi4j16wjHTdFMd85j35XYa
Next: none

Diff: 
Old New Differences
167 167      let user = toBase58String(i.caller.bytes)
168 168      let status = getValueItemStatus(item)
169 169      let newVoteCount = (getValueVoteCount(item, vote) + 1)
170 -     if ((VOTERS > getValueCommitsCount(item)))
171 -         then throw("max num of voters hasnt reached yet")
172 -         else if ((getValueReveal(item, user) != NONE))
173 -             then throw("user has already participated")
174 -             else if (if ((status != VOTING))
175 -                 then (status != REVEAL)
176 -                 else false)
177 -                 then throw("wrong status")
178 -                 else if (if ((vote != FEATURED))
179 -                     then (vote != DELISTED)
170 +     if ((toBase58String(sha256(toBytes((vote + salt)))) != getValueCommit(item, user)))
171 +         then throw("reveal data is not valid")
172 +         else if ((VOTERS > getValueCommitsCount(item)))
173 +             then throw("max num of voters hasnt reached yet")
174 +             else if ((getValueReveal(item, user) != NONE))
175 +                 then throw("user has already participated")
176 +                 else if (if ((status != VOTING))
177 +                     then (status != REVEAL)
180 178                      else false)
181 -                     then throw("wrong vote")
182 -                     else if (if ((status == FEATURED))
183 -                         then true
184 -                         else (status == DELISTED))
185 -                         then throw("vote has finished")
186 -                         else [StringEntry(getKeyReveal(item, user), vote), IntegerEntry(getKeyVoteCount(item, vote), newVoteCount), StringEntry(getKeyItemStatus(item), if ((newVoteCount >= QUORUM))
187 -                             then vote
188 -                             else REVEAL)]
179 +                     then throw("wrong status")
180 +                     else if (if ((vote != FEATURED))
181 +                         then (vote != DELISTED)
182 +                         else false)
183 +                         then throw("wrong vote")
184 +                         else if (if ((status == FEATURED))
185 +                             then true
186 +                             else (status == DELISTED))
187 +                             then throw("vote has finished")
188 +                             else [StringEntry(getKeyReveal(item, user), vote), IntegerEntry(getKeyVoteCount(item, vote), newVoteCount), StringEntry(getKeyItemStatus(item), if ((newVoteCount >= QUORUM))
189 +                                 then vote
190 +                                 else REVEAL)]
189 191      }
190 192  
191 193  
Full: 
Old New Differences
1 1  {-# STDLIB_VERSION 5 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 4  let VOTERS = 3
5 5  
6 6  let QUORUM = 2
7 7  
8 8  let VOTING = "voting"
9 9  
10 10  let REVEAL = "reveal"
11 11  
12 12  let FEATURED = "featured"
13 13  
14 14  let DELISTED = "delisted"
15 15  
16 16  let NONE = "none"
17 17  
18 18  func getNumberByKey (key) = {
19 19      let num =     match getInteger(this, key) {
20 20          case a: Int => 
21 21              a
22 22          case _ => 
23 23              0
24 24      }
25 25      num
26 26      }
27 27  
28 28  
29 29  func getStrByKey (key) = {
30 30      let str =     match getString(this, key) {
31 31          case a: String => 
32 32              a
33 33          case _ => 
34 34              NONE
35 35      }
36 36      str
37 37      }
38 38  
39 39  
40 40  func getKeyCommit (item,user) = (((item + "_") + user) + "_commit")
41 41  
42 42  
43 43  func getValueCommit (item,user) = getStrByKey(getKeyCommit(item, user))
44 44  
45 45  
46 46  func getKeyCommitsCount (item) = (item + "_comcnt")
47 47  
48 48  
49 49  func getValueCommitsCount (item) = getNumberByKey(getKeyCommitsCount(item))
50 50  
51 51  
52 52  func getKeyReveal (item,user) = (((item + "_") + user) + "_reveal")
53 53  
54 54  
55 55  func getValueReveal (item,user) = getStrByKey(getKeyReveal(item, user))
56 56  
57 57  
58 58  func getKeyItemStatus (item) = (item + "_status")
59 59  
60 60  
61 61  func getValueItemStatus (item) = getStrByKey(getKeyItemStatus(item))
62 62  
63 63  
64 64  func getKeyVoteCount (item,vote) = ((item + "_res") + vote)
65 65  
66 66  
67 67  func getValueVoteCount (item,vote) = getNumberByKey(getKeyVoteCount(item, vote))
68 68  
69 69  
70 70  func getKeyItemPrice (item) = (item + "_price")
71 71  
72 72  
73 73  func getValueItemPrice (item) = getNumberByKey(getKeyItemPrice(item))
74 74  
75 75  
76 76  func getKeyUserItemCounter (user,item) = (((item + "_") + user) + "_cnt")
77 77  
78 78  
79 79  func getValueUserItemCounter (user,item) = getNumberByKey(getKeyUserItemCounter(user, item))
80 80  
81 81  
82 82  func getKeyItem (supplier,title) = ("item_" + toBase58String(sha256(toBytes((supplier + title)))))
83 83  
84 84  
85 85  func getKeyItemData (item) = (item + "_data")
86 86  
87 87  
88 88  func getKeyItemSupplier (item) = (item + "_owner")
89 89  
90 90  
91 91  func getValueItemSupplier (item) = getStrByKey(getKeyItemSupplier(item))
92 92  
93 93  
94 94  func getKeyBalanceSupplier (account) = (account + "_balance")
95 95  
96 96  
97 97  func getValueBalanceSupplier (account) = getNumberByKey(getKeyBalanceSupplier(account))
98 98  
99 99  
100 100  @Callable(i)
101 101  func addItem (title,price,data) = {
102 102      let supplierAddress = toBase58String(i.caller.bytes)
103 103      let item = getKeyItem(supplierAddress, title)
104 104      if ((0 >= price))
105 105          then throw("Purchase amount cannot be less than item price")
106 106          else if ((getValueItemSupplier(item) != NONE))
107 107              then throw("an item already exists")
108 108              else [StringEntry(getKeyItemSupplier(item), supplierAddress), IntegerEntry(getKeyItemPrice(item), price), StringEntry(getKeyItemData(item), data)]
109 109      }
110 110  
111 111  
112 112  
113 113  @Callable(i)
114 114  func purchase (item) = {
115 115      let pmt = i.payments[0]
116 116      if (isDefined(pmt.assetId))
117 117          then throw("WAVES tokens only at moment")
118 118          else {
119 119              let userAddress = toBase58String(i.caller.bytes)
120 120              let price = getValueItemPrice(item)
121 121              let supplierAddress = getValueItemSupplier(item)
122 122              if ((price > pmt.amount))
123 123                  then throw("Purchase amount cannot be less than item price")
124 124                  else if ((supplierAddress == NONE))
125 125                      then throw("Supplier does not exist")
126 126                      else [IntegerEntry(getKeyUserItemCounter(userAddress, item), (getValueUserItemCounter(userAddress, item) + 1)), IntegerEntry(getKeyBalanceSupplier(supplierAddress), (getValueBalanceSupplier(supplierAddress) + pmt.amount))]
127 127              }
128 128      }
129 129  
130 130  
131 131  
132 132  @Callable(i)
133 133  func withdraw () = {
134 134      let supplierAddress = toBase58String(i.caller.bytes)
135 135      let balance = getValueBalanceSupplier(supplierAddress)
136 136      if ((0 >= balance))
137 137          then throw("insuficient balance")
138 138          else [IntegerEntry(getKeyBalanceSupplier(supplierAddress), 0), ScriptTransfer(addressFromStringValue(supplierAddress), balance, 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("reached max num of voters")
150 150          else if ((getValueCommit(item, user) != NONE))
151 151              then throw("user has already participated")
152 152              else if ((getKeyItemSupplier(item) == NONE))
153 153                  then throw("item does not exist")
154 154                  else if (if ((status != NONE))
155 155                      then (status != VOTING)
156 156                      else false)
157 157                      then throw("voting is not possible")
158 158                      else [StringEntry(getKeyCommit(item, user), hash), IntegerEntry(getKeyCommitsCount(item), (commits + 1)), StringEntry(getKeyItemStatus(item), if ((commits == VOTERS))
159 159                          then REVEAL
160 160                          else VOTING)]
161 161      }
162 162  
163 163  
164 164  
165 165  @Callable(i)
166 166  func voteReveal (item,vote,salt) = {
167 167      let user = toBase58String(i.caller.bytes)
168 168      let status = getValueItemStatus(item)
169 169      let newVoteCount = (getValueVoteCount(item, vote) + 1)
170 -     if ((VOTERS > getValueCommitsCount(item)))
171 -         then throw("max num of voters hasnt reached yet")
172 -         else if ((getValueReveal(item, user) != NONE))
173 -             then throw("user has already participated")
174 -             else if (if ((status != VOTING))
175 -                 then (status != REVEAL)
176 -                 else false)
177 -                 then throw("wrong status")
178 -                 else if (if ((vote != FEATURED))
179 -                     then (vote != DELISTED)
170 +     if ((toBase58String(sha256(toBytes((vote + salt)))) != getValueCommit(item, user)))
171 +         then throw("reveal data is not valid")
172 +         else if ((VOTERS > getValueCommitsCount(item)))
173 +             then throw("max num of voters hasnt reached yet")
174 +             else if ((getValueReveal(item, user) != NONE))
175 +                 then throw("user has already participated")
176 +                 else if (if ((status != VOTING))
177 +                     then (status != REVEAL)
180 178                      else false)
181 -                     then throw("wrong vote")
182 -                     else if (if ((status == FEATURED))
183 -                         then true
184 -                         else (status == DELISTED))
185 -                         then throw("vote has finished")
186 -                         else [StringEntry(getKeyReveal(item, user), vote), IntegerEntry(getKeyVoteCount(item, vote), newVoteCount), StringEntry(getKeyItemStatus(item), if ((newVoteCount >= QUORUM))
187 -                             then vote
188 -                             else REVEAL)]
179 +                     then throw("wrong status")
180 +                     else if (if ((vote != FEATURED))
181 +                         then (vote != DELISTED)
182 +                         else false)
183 +                         then throw("wrong vote")
184 +                         else if (if ((status == FEATURED))
185 +                             then true
186 +                             else (status == DELISTED))
187 +                             then throw("vote has finished")
188 +                             else [StringEntry(getKeyReveal(item, user), vote), IntegerEntry(getKeyVoteCount(item, vote), newVoteCount), StringEntry(getKeyItemStatus(item), if ((newVoteCount >= QUORUM))
189 +                                 then vote
190 +                                 else REVEAL)]
189 191      }
190 192  
191 193

Old	New		Differences
167	167		let user = toBase58String(i.caller.bytes)
168	168		let status = getValueItemStatus(item)
169	169		let newVoteCount = (getValueVoteCount(item, vote) + 1)
170		-	if ((VOTERS > getValueCommitsCount(item)))
171		-	then throw("max num of voters hasnt reached yet")
172		-	else if ((getValueReveal(item, user) != NONE))
173		-	then throw("user has already participated")
174		-	else if (if ((status != VOTING))
175		-	then (status != REVEAL)
176		-	else false)
177		-	then throw("wrong status")
178		-	else if (if ((vote != FEATURED))
179		-	then (vote != DELISTED)
	170	+	if ((toBase58String(sha256(toBytes((vote + salt)))) != getValueCommit(item, user)))
	171	+	then throw("reveal data is not valid")
	172	+	else if ((VOTERS > getValueCommitsCount(item)))
	173	+	then throw("max num of voters hasnt reached yet")
	174	+	else if ((getValueReveal(item, user) != NONE))
	175	+	then throw("user has already participated")
	176	+	else if (if ((status != VOTING))
	177	+	then (status != REVEAL)
180	178		else false)
181		-	then throw("wrong vote")
182		-	else if (if ((status == FEATURED))
183		-	then true
184		-	else (status == DELISTED))
185		-	then throw("vote has finished")
186		-	else [StringEntry(getKeyReveal(item, user), vote), IntegerEntry(getKeyVoteCount(item, vote), newVoteCount), StringEntry(getKeyItemStatus(item), if ((newVoteCount >= QUORUM))
187		-	then vote
188		-	else REVEAL)]
	179	+	then throw("wrong status")
	180	+	else if (if ((vote != FEATURED))
	181	+	then (vote != DELISTED)
	182	+	else false)
	183	+	then throw("wrong vote")
	184	+	else if (if ((status == FEATURED))
	185	+	then true
	186	+	else (status == DELISTED))
	187	+	then throw("vote has finished")
	188	+	else [StringEntry(getKeyReveal(item, user), vote), IntegerEntry(getKeyVoteCount(item, vote), newVoteCount), StringEntry(getKeyItemStatus(item), if ((newVoteCount >= QUORUM))
	189	+	then vote
	190	+	else REVEAL)]
189	191		}
190	192
191	193

Old	New		Differences
1	1		{-# STDLIB_VERSION 5 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4	4		let VOTERS = 3
5	5
6	6		let QUORUM = 2
7	7
8	8		let VOTING = "voting"
9	9
10	10		let REVEAL = "reveal"
11	11
12	12		let FEATURED = "featured"
13	13
14	14		let DELISTED = "delisted"
15	15
16	16		let NONE = "none"
17	17
18	18		func getNumberByKey (key) = {
19	19		let num = match getInteger(this, key) {
20	20		case a: Int =>
21	21		a
22	22		case _ =>
23	23		0
24	24		}
25	25		num
26	26		}
27	27
28	28
29	29		func getStrByKey (key) = {
30	30		let str = match getString(this, key) {
31	31		case a: String =>
32	32		a
33	33		case _ =>
34	34		NONE
35	35		}
36	36		str
37	37		}
38	38
39	39
40	40		func getKeyCommit (item,user) = (((item + "_") + user) + "_commit")
41	41
42	42
43	43		func getValueCommit (item,user) = getStrByKey(getKeyCommit(item, user))
44	44
45	45
46	46		func getKeyCommitsCount (item) = (item + "_comcnt")
47	47
48	48
49	49		func getValueCommitsCount (item) = getNumberByKey(getKeyCommitsCount(item))
50	50
51	51
52	52		func getKeyReveal (item,user) = (((item + "_") + user) + "_reveal")
53	53
54	54
55	55		func getValueReveal (item,user) = getStrByKey(getKeyReveal(item, user))
56	56
57	57
58	58		func getKeyItemStatus (item) = (item + "_status")
59	59
60	60
61	61		func getValueItemStatus (item) = getStrByKey(getKeyItemStatus(item))
62	62
63	63
64	64		func getKeyVoteCount (item,vote) = ((item + "_res") + vote)
65	65
66	66
67	67		func getValueVoteCount (item,vote) = getNumberByKey(getKeyVoteCount(item, vote))
68	68
69	69
70	70		func getKeyItemPrice (item) = (item + "_price")
71	71
72	72
73	73		func getValueItemPrice (item) = getNumberByKey(getKeyItemPrice(item))
74	74
75	75
76	76		func getKeyUserItemCounter (user,item) = (((item + "_") + user) + "_cnt")
77	77
78	78
79	79		func getValueUserItemCounter (user,item) = getNumberByKey(getKeyUserItemCounter(user, item))
80	80
81	81
82	82		func getKeyItem (supplier,title) = ("item_" + toBase58String(sha256(toBytes((supplier + title)))))
83	83
84	84
85	85		func getKeyItemData (item) = (item + "_data")
86	86
87	87
88	88		func getKeyItemSupplier (item) = (item + "_owner")
89	89
90	90
91	91		func getValueItemSupplier (item) = getStrByKey(getKeyItemSupplier(item))
92	92
93	93
94	94		func getKeyBalanceSupplier (account) = (account + "_balance")
95	95
96	96
97	97		func getValueBalanceSupplier (account) = getNumberByKey(getKeyBalanceSupplier(account))
98	98
99	99
100	100		@Callable(i)
101	101		func addItem (title,price,data) = {
102	102		let supplierAddress = toBase58String(i.caller.bytes)
103	103		let item = getKeyItem(supplierAddress, title)
104	104		if ((0 >= price))
105	105		then throw("Purchase amount cannot be less than item price")
106	106		else if ((getValueItemSupplier(item) != NONE))
107	107		then throw("an item already exists")
108	108		else [StringEntry(getKeyItemSupplier(item), supplierAddress), IntegerEntry(getKeyItemPrice(item), price), StringEntry(getKeyItemData(item), data)]
109	109		}
110	110
111	111
112	112
113	113		@Callable(i)
114	114		func purchase (item) = {
115	115		let pmt = i.payments[0]
116	116		if (isDefined(pmt.assetId))
117	117		then throw("WAVES tokens only at moment")
118	118		else {
119	119		let userAddress = toBase58String(i.caller.bytes)
120	120		let price = getValueItemPrice(item)
121	121		let supplierAddress = getValueItemSupplier(item)
122	122		if ((price > pmt.amount))
123	123		then throw("Purchase amount cannot be less than item price")
124	124		else if ((supplierAddress == NONE))
125	125		then throw("Supplier does not exist")
126	126		else [IntegerEntry(getKeyUserItemCounter(userAddress, item), (getValueUserItemCounter(userAddress, item) + 1)), IntegerEntry(getKeyBalanceSupplier(supplierAddress), (getValueBalanceSupplier(supplierAddress) + pmt.amount))]
127	127		}
128	128		}
129	129
130	130
131	131
132	132		@Callable(i)
133	133		func withdraw () = {
134	134		let supplierAddress = toBase58String(i.caller.bytes)
135	135		let balance = getValueBalanceSupplier(supplierAddress)
136	136		if ((0 >= balance))
137	137		then throw("insuficient balance")
138	138		else [IntegerEntry(getKeyBalanceSupplier(supplierAddress), 0), ScriptTransfer(addressFromStringValue(supplierAddress), balance, 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("reached max num of voters")
150	150		else if ((getValueCommit(item, user) != NONE))
151	151		then throw("user has already participated")
152	152		else if ((getKeyItemSupplier(item) == NONE))
153	153		then throw("item does not exist")
154	154		else if (if ((status != NONE))
155	155		then (status != VOTING)
156	156		else false)
157	157		then throw("voting is not possible")
158	158		else [StringEntry(getKeyCommit(item, user), hash), IntegerEntry(getKeyCommitsCount(item), (commits + 1)), StringEntry(getKeyItemStatus(item), if ((commits == VOTERS))
159	159		then REVEAL
160	160		else VOTING)]
161	161		}
162	162
163	163
164	164
165	165		@Callable(i)
166	166		func voteReveal (item,vote,salt) = {
167	167		let user = toBase58String(i.caller.bytes)
168	168		let status = getValueItemStatus(item)
169	169		let newVoteCount = (getValueVoteCount(item, vote) + 1)
170		-	if ((VOTERS > getValueCommitsCount(item)))
171		-	then throw("max num of voters hasnt reached yet")
172		-	else if ((getValueReveal(item, user) != NONE))
173		-	then throw("user has already participated")
174		-	else if (if ((status != VOTING))
175		-	then (status != REVEAL)
176		-	else false)
177		-	then throw("wrong status")
178		-	else if (if ((vote != FEATURED))
179		-	then (vote != DELISTED)
	170	+	if ((toBase58String(sha256(toBytes((vote + salt)))) != getValueCommit(item, user)))
	171	+	then throw("reveal data is not valid")
	172	+	else if ((VOTERS > getValueCommitsCount(item)))
	173	+	then throw("max num of voters hasnt reached yet")
	174	+	else if ((getValueReveal(item, user) != NONE))
	175	+	then throw("user has already participated")
	176	+	else if (if ((status != VOTING))
	177	+	then (status != REVEAL)
180	178		else false)
181		-	then throw("wrong vote")
182		-	else if (if ((status == FEATURED))
183		-	then true
184		-	else (status == DELISTED))
185		-	then throw("vote has finished")
186		-	else [StringEntry(getKeyReveal(item, user), vote), IntegerEntry(getKeyVoteCount(item, vote), newVoteCount), StringEntry(getKeyItemStatus(item), if ((newVoteCount >= QUORUM))
187		-	then vote
188		-	else REVEAL)]
	179	+	then throw("wrong status")
	180	+	else if (if ((vote != FEATURED))
	181	+	then (vote != DELISTED)
	182	+	else false)
	183	+	then throw("wrong vote")
	184	+	else if (if ((status == FEATURED))
	185	+	then true
	186	+	else (status == DELISTED))
	187	+	then throw("vote has finished")
	188	+	else [StringEntry(getKeyReveal(item, user), vote), IntegerEntry(getKeyVoteCount(item, vote), newVoteCount), StringEntry(getKeyItemStatus(item), if ((newVoteCount >= QUORUM))
	189	+	then vote
	190	+	else REVEAL)]
189	191		}
190	192
191	193

github/deemru/w8io/026f985 
27.99 ms ◑