w8 · tx · 8TW···Ni7

tx · 8TWVzJcsXrBpcF9HQvAWXWtjLFz4WtDRTcb4otoU1Ni7

3MuVxxVfgdoobfADVjpHZXLJ2dNse6zQA8o:  -0.01400000 Waves

2019.08.03 08:43 [614268] smart account 3MuVxxVfgdoobfADVjpHZXLJ2dNse6zQA8o > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "8TWVzJcsXrBpcF9HQvAWXWtjLFz4WtDRTcb4otoU1Ni7",
    "fee": 1400000,
    "feeAssetId": null,
    "timestamp": 1564811107378,
    "version": 1,
    "sender": "3MuVxxVfgdoobfADVjpHZXLJ2dNse6zQA8o",
    "senderPublicKey": "J3FHH7LcE3Xj4yGipA2YSxCnR1RZM9tSNFGXeETQQoMd",
    "proofs": [
        "46EWE1uWb2HhPKgqKzXZ3CLGjqR3mznjZwvVKKen52qjnWrcdNnMhJXWpU8DYHW6qBxR3pMTHjmLv9sQLdoSg7rr"
    ],
    "script": "base64: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",
    "chainId": 84,
    "height": 614268,
    "spentComplexity": 0
}

View: original | compacted
Prev: iynbUoTqW4SjTnXqNJ3W8V7dVFHJ6EUPZGgA7J5UWqG
Next: DD1guVhY94kzXGWJzptP7ZFxqQpmdsh3Q3KWfuxEM3vp

Diff: 
Old New Differences
34 34  @Callable(i)
35 35  func buy (id,cell) = {
36 36      let cells = valueOrErrorMessage(getInteger(this, (id + "_cells")), "No lottery with specified id")
37 -     let status = getBooleanValue(this, (id + "_status"))
37 +     let status = valueOrErrorMessage(getBoolean(this, (id + "_status")), "Invalid status of lottery with specified id")
38 38      if (!(status))
39 39          then throw("Specified lottery is over")
40 40          else if (if ((0 > cell))
42 42              else (cell > lastCell))
43 43              then throw("Invalid number")
44 44              else {
45 -                 let ticketPrice = getIntegerValue(this, (id + "_ticket_price"))
46 -                 let ticketAsset = getStringValue(this, (id + "_ticket_asset"))
45 +                 let ticketPrice = valueOrErrorMessage(getInteger(this, (id + "_ticket_price")), "Invalid ticket price")
46 +                 let ticketAsset = valueOrErrorMessage(getString(this, (id + "_ticket_asset")), "Invalid ticket asset")
47 47                  let pmt = valueOrErrorMessage(i.payment, "Where is payment?")
48 48                  let assetId = if (isDefined(pmt.assetId))
49 49                      then toBase58String(value(pmt.assetId))
56 56                          then throw("Already bought")
57 57                          else {
58 58                              let last = (cells == lastCell)
59 -                             let balance = (getIntegerValue(this, (id + "_balance")) + pmt.amount)
59 +                             let balance = (valueOrErrorMessage(getInteger(this, (id + "_balance")), "Invalid balance") + pmt.amount)
60 60                              if (last)
61 61                                  then {
62 -                                     let creator = addressFromStringValue(getStringValue(this, (id + "_creator")))
63 -                                     let prizeAmount = getIntegerValue(this, (id + "_prize_amount"))
64 -                                     let prizeAsset = getStringValue(this, (id + "_prize_asset"))
62 +                                     let creator = addressFromStringValue(valueOrErrorMessage(getString(this, (id + "_creator")), "Invalid lottery creator"))
63 +                                     let prizeAmount = valueOrErrorMessage(getInteger(this, (id + "_prize_amount")), "Invalid prize amount")
64 +                                     let prizeAsset = valueOrErrorMessage(getString(this, (id + "_prize_asset")), "Invalid prize asset")
65 65                                      let winCell = (toInt(lastBlock.generationSignature) % (lastCell + 1))
66 -                                     let winData = getStringValue(this, ((id + "_cell:") + toString(winCell)))
66 +                                     let winData = valueOrErrorMessage(getString(this, ((id + "_cell:") + toString(winCell))), "Invalid win cell")
67 67                                      let winAddress = if ((winCell == cell))
68 68                                          then i.caller
69 69                                          else value(addressFromString(winData))
Full: 
Old New Differences
1 1  {-# STDLIB_VERSION 3 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 4  let lastCell = 4
5 5  
6 6  let cellsKey = "cells"
7 7  
8 8  @Callable(i)
9 9  func create (name,desc,ticketPrice,ticketAsset) = {
10 10      let assetId = if ((ticketAsset != "WAVES"))
11 11          then {
12 12              let aInfo = valueOrErrorMessage(assetInfo(fromBase58String(ticketAsset)), "There is no asset with specified id")
13 13              ticketAsset
14 14              }
15 15          else ""
16 16      let pmt = valueOrErrorMessage(i.payment, "Where is prize?")
17 17      let prizeAsset = if (isDefined(pmt.assetId))
18 18          then toBase58String(value(pmt.assetId))
19 19          else ""
20 20      if (if (if ((name == ""))
21 21          then true
22 22          else (desc == ""))
23 23          then true
24 24          else (0 > ticketPrice))
25 25          then throw("Invalid name, description or ticket price")
26 26          else {
27 27              let lotteryId = toBase58String(i.transactionId)
28 28              WriteSet([DataEntry((lotteryId + "_name"), name), DataEntry((lotteryId + "_desc"), desc), DataEntry((lotteryId + "_ticket_price"), ticketPrice), DataEntry((lotteryId + "_ticket_asset"), assetId), DataEntry((lotteryId + "_prize_amount"), pmt.amount), DataEntry((lotteryId + "_prize_asset"), prizeAsset), DataEntry((lotteryId + "_creator"), toBase58String(i.caller.bytes)), DataEntry((lotteryId + "_cells"), 0), DataEntry((lotteryId + "_status"), true), DataEntry((lotteryId + "_balance"), 0)])
29 29              }
30 30      }
31 31  
32 32  
33 33  
34 34  @Callable(i)
35 35  func buy (id,cell) = {
36 36      let cells = valueOrErrorMessage(getInteger(this, (id + "_cells")), "No lottery with specified id")
37 -     let status = getBooleanValue(this, (id + "_status"))
37 +     let status = valueOrErrorMessage(getBoolean(this, (id + "_status")), "Invalid status of lottery with specified id")
38 38      if (!(status))
39 39          then throw("Specified lottery is over")
40 40          else if (if ((0 > cell))
41 41              then true
42 42              else (cell > lastCell))
43 43              then throw("Invalid number")
44 44              else {
45 -                 let ticketPrice = getIntegerValue(this, (id + "_ticket_price"))
46 -                 let ticketAsset = getStringValue(this, (id + "_ticket_asset"))
45 +                 let ticketPrice = valueOrErrorMessage(getInteger(this, (id + "_ticket_price")), "Invalid ticket price")
46 +                 let ticketAsset = valueOrErrorMessage(getString(this, (id + "_ticket_asset")), "Invalid ticket asset")
47 47                  let pmt = valueOrErrorMessage(i.payment, "Where is payment?")
48 48                  let assetId = if (isDefined(pmt.assetId))
49 49                      then toBase58String(value(pmt.assetId))
50 50                      else ""
51 51                  if (if ((assetId != ticketAsset))
52 52                      then true
53 53                      else (pmt.amount != ticketPrice))
54 54                      then throw("Invalid payment")
55 55                      else if (isDefined(getString(this, ((id + "_cell:") + toString(cell)))))
56 56                          then throw("Already bought")
57 57                          else {
58 58                              let last = (cells == lastCell)
59 -                             let balance = (getIntegerValue(this, (id + "_balance")) + pmt.amount)
59 +                             let balance = (valueOrErrorMessage(getInteger(this, (id + "_balance")), "Invalid balance") + pmt.amount)
60 60                              if (last)
61 61                                  then {
62 -                                     let creator = addressFromStringValue(getStringValue(this, (id + "_creator")))
63 -                                     let prizeAmount = getIntegerValue(this, (id + "_prize_amount"))
64 -                                     let prizeAsset = getStringValue(this, (id + "_prize_asset"))
62 +                                     let creator = addressFromStringValue(valueOrErrorMessage(getString(this, (id + "_creator")), "Invalid lottery creator"))
63 +                                     let prizeAmount = valueOrErrorMessage(getInteger(this, (id + "_prize_amount")), "Invalid prize amount")
64 +                                     let prizeAsset = valueOrErrorMessage(getString(this, (id + "_prize_asset")), "Invalid prize asset")
65 65                                      let winCell = (toInt(lastBlock.generationSignature) % (lastCell + 1))
66 -                                     let winData = getStringValue(this, ((id + "_cell:") + toString(winCell)))
66 +                                     let winData = valueOrErrorMessage(getString(this, ((id + "_cell:") + toString(winCell))), "Invalid win cell")
67 67                                      let winAddress = if ((winCell == cell))
68 68                                          then i.caller
69 69                                          else value(addressFromString(winData))
70 70                                      ScriptResult(WriteSet([DataEntry((id + "_status"), "over"), DataEntry((id + "_balance"), 0)]), TransferSet([if ((ticketAsset == ""))
71 71                                          then ScriptTransfer(creator, balance, unit)
72 72                                          else ScriptTransfer(creator, balance, fromBase58String(ticketAsset)), if ((prizeAsset == ""))
73 73                                          then ScriptTransfer(winAddress, prizeAmount, unit)
74 74                                          else ScriptTransfer(winAddress, prizeAmount, fromBase58String(prizeAsset))]))
75 75                                      }
76 76                                  else WriteSet([DataEntry(((id + "_cell:") + toString(cell)), toString(i.caller)), DataEntry((id + "_cells"), (cells + 1)), DataEntry((id + "_balance"), balance)])
77 77                              }
78 78                  }
79 79      }
80 80  
81 81  
82 82  @Verifier(tx)
83 83  func verify () = true
84 84

Old	New		Differences
34	34		@Callable(i)
35	35		func buy (id,cell) = {
36	36		let cells = valueOrErrorMessage(getInteger(this, (id + "_cells")), "No lottery with specified id")
37		-	let status = ~~getBooleanValue~~(this, (id + "_status"))
	37	+	let status = valueOrErrorMessage(getBoolean(this, (id + "_status")), "Invalid status of lottery with specified id")
38	38		if (!(status))
39	39		then throw("Specified lottery is over")
40	40		else if (if ((0 > cell))

42	42		else (cell > lastCell))
43	43		then throw("Invalid number")
44	44		else {
45		-	let ticketPrice = ~~getIntegerValue~~(this, (id + "_ticket_price"))
46		-	let ticketAsset = ~~getStringValue~~(this, (id + "_ticket_asset"))
	45	+	let ticketPrice = valueOrErrorMessage(getInteger(this, (id + "_ticket_price")), "Invalid ticket price")
	46	+	let ticketAsset = valueOrErrorMessage(getString(this, (id + "_ticket_asset")), "Invalid ticket asset")
47	47		let pmt = valueOrErrorMessage(i.payment, "Where is payment?")
48	48		let assetId = if (isDefined(pmt.assetId))
49	49		then toBase58String(value(pmt.assetId))

56	56		then throw("Already bought")
57	57		else {
58	58		let last = (cells == lastCell)
59		-	let balance = (~~getIntegerValue~~(this, (id + "_balance")) + pmt.amount)
	59	+	let balance = (valueOrErrorMessage(getInteger(this, (id + "_balance")), "Invalid balance") + pmt.amount)
60	60		if (last)
61	61		then {
62		-	let creator = addressFromStringValue(~~getStringValue~~(this, (id + "_creator")))
63		-	let prizeAmount = ~~getIntegerValue~~(this, (id + "_prize_amount"))
64		-	let prizeAsset = ~~getStringValue~~(this, (id + "_prize_asset"))
	62	+	let creator = addressFromStringValue(valueOrErrorMessage(getString(this, (id + "_creator")), "Invalid lottery creator"))
	63	+	let prizeAmount = valueOrErrorMessage(getInteger(this, (id + "_prize_amount")), "Invalid prize amount")
	64	+	let prizeAsset = valueOrErrorMessage(getString(this, (id + "_prize_asset")), "Invalid prize asset")
65	65		let winCell = (toInt(lastBlock.generationSignature) % (lastCell + 1))
66		-	let winData = ~~getStringValue~~(this, ((id + "_cell:") + toString(winCell)))
	66	+	let winData = valueOrErrorMessage(getString(this, ((id + "_cell:") + toString(winCell))), "Invalid win cell")
67	67		let winAddress = if ((winCell == cell))
68	68		then i.caller
69	69		else value(addressFromString(winData))

Old	New		Differences
1	1		{-# STDLIB_VERSION 3 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4	4		let lastCell = 4
5	5
6	6		let cellsKey = "cells"
7	7
8	8		@Callable(i)
9	9		func create (name,desc,ticketPrice,ticketAsset) = {
10	10		let assetId = if ((ticketAsset != "WAVES"))
11	11		then {
12	12		let aInfo = valueOrErrorMessage(assetInfo(fromBase58String(ticketAsset)), "There is no asset with specified id")
13	13		ticketAsset
14	14		}
15	15		else ""
16	16		let pmt = valueOrErrorMessage(i.payment, "Where is prize?")
17	17		let prizeAsset = if (isDefined(pmt.assetId))
18	18		then toBase58String(value(pmt.assetId))
19	19		else ""
20	20		if (if (if ((name == ""))
21	21		then true
22	22		else (desc == ""))
23	23		then true
24	24		else (0 > ticketPrice))
25	25		then throw("Invalid name, description or ticket price")
26	26		else {
27	27		let lotteryId = toBase58String(i.transactionId)
28	28		WriteSet([DataEntry((lotteryId + "_name"), name), DataEntry((lotteryId + "_desc"), desc), DataEntry((lotteryId + "_ticket_price"), ticketPrice), DataEntry((lotteryId + "_ticket_asset"), assetId), DataEntry((lotteryId + "_prize_amount"), pmt.amount), DataEntry((lotteryId + "_prize_asset"), prizeAsset), DataEntry((lotteryId + "_creator"), toBase58String(i.caller.bytes)), DataEntry((lotteryId + "_cells"), 0), DataEntry((lotteryId + "_status"), true), DataEntry((lotteryId + "_balance"), 0)])
29	29		}
30	30		}
31	31
32	32
33	33
34	34		@Callable(i)
35	35		func buy (id,cell) = {
36	36		let cells = valueOrErrorMessage(getInteger(this, (id + "_cells")), "No lottery with specified id")
37		-	let status = ~~getBooleanValue~~(this, (id + "_status"))
	37	+	let status = valueOrErrorMessage(getBoolean(this, (id + "_status")), "Invalid status of lottery with specified id")
38	38		if (!(status))
39	39		then throw("Specified lottery is over")
40	40		else if (if ((0 > cell))
41	41		then true
42	42		else (cell > lastCell))
43	43		then throw("Invalid number")
44	44		else {
45		-	let ticketPrice = ~~getIntegerValue~~(this, (id + "_ticket_price"))
46		-	let ticketAsset = ~~getStringValue~~(this, (id + "_ticket_asset"))
	45	+	let ticketPrice = valueOrErrorMessage(getInteger(this, (id + "_ticket_price")), "Invalid ticket price")
	46	+	let ticketAsset = valueOrErrorMessage(getString(this, (id + "_ticket_asset")), "Invalid ticket asset")
47	47		let pmt = valueOrErrorMessage(i.payment, "Where is payment?")
48	48		let assetId = if (isDefined(pmt.assetId))
49	49		then toBase58String(value(pmt.assetId))
50	50		else ""
51	51		if (if ((assetId != ticketAsset))
52	52		then true
53	53		else (pmt.amount != ticketPrice))
54	54		then throw("Invalid payment")
55	55		else if (isDefined(getString(this, ((id + "_cell:") + toString(cell)))))
56	56		then throw("Already bought")
57	57		else {
58	58		let last = (cells == lastCell)
59		-	let balance = (~~getIntegerValue~~(this, (id + "_balance")) + pmt.amount)
	59	+	let balance = (valueOrErrorMessage(getInteger(this, (id + "_balance")), "Invalid balance") + pmt.amount)
60	60		if (last)
61	61		then {
62		-	let creator = addressFromStringValue(~~getStringValue~~(this, (id + "_creator")))
63		-	let prizeAmount = ~~getIntegerValue~~(this, (id + "_prize_amount"))
64		-	let prizeAsset = ~~getStringValue~~(this, (id + "_prize_asset"))
	62	+	let creator = addressFromStringValue(valueOrErrorMessage(getString(this, (id + "_creator")), "Invalid lottery creator"))
	63	+	let prizeAmount = valueOrErrorMessage(getInteger(this, (id + "_prize_amount")), "Invalid prize amount")
	64	+	let prizeAsset = valueOrErrorMessage(getString(this, (id + "_prize_asset")), "Invalid prize asset")
65	65		let winCell = (toInt(lastBlock.generationSignature) % (lastCell + 1))
66		-	let winData = ~~getStringValue~~(this, ((id + "_cell:") + toString(winCell)))
	66	+	let winData = valueOrErrorMessage(getString(this, ((id + "_cell:") + toString(winCell))), "Invalid win cell")
67	67		let winAddress = if ((winCell == cell))
68	68		then i.caller
69	69		else value(addressFromString(winData))
70	70		ScriptResult(WriteSet([DataEntry((id + "_status"), "over"), DataEntry((id + "_balance"), 0)]), TransferSet([if ((ticketAsset == ""))
71	71		then ScriptTransfer(creator, balance, unit)
72	72		else ScriptTransfer(creator, balance, fromBase58String(ticketAsset)), if ((prizeAsset == ""))
73	73		then ScriptTransfer(winAddress, prizeAmount, unit)
74	74		else ScriptTransfer(winAddress, prizeAmount, fromBase58String(prizeAsset))]))
75	75		}
76	76		else WriteSet([DataEntry(((id + "_cell:") + toString(cell)), toString(i.caller)), DataEntry((id + "_cells"), (cells + 1)), DataEntry((id + "_balance"), balance)])
77	77		}
78	78		}
79	79		}
80	80
81	81
82	82		@Verifier(tx)
83	83		func verify () = true
84	84

github/deemru/w8io/169f3d6 
60.79 ms ◑