w8 · tx · Cnn···fiG

tx · CnnFS95brwB4C8T4Eo9gTJzUYd99oMkpu1wBs49ipfiG

3N9b7vExDf2qqZt2xG9FUsca7iwLVuih1Ta:  -0.01000000 Waves

2023.12.01 23:11 [2868045] smart account 3N9b7vExDf2qqZt2xG9FUsca7iwLVuih1Ta > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "CnnFS95brwB4C8T4Eo9gTJzUYd99oMkpu1wBs49ipfiG",
    "fee": 1000000,
    "feeAssetId": null,
    "timestamp": 1701461574886,
    "version": 2,
    "chainId": 84,
    "sender": "3N9b7vExDf2qqZt2xG9FUsca7iwLVuih1Ta",
    "senderPublicKey": "4rSYGN3SSXzknh6jLyLqqGdGor584DXdjdP2BAbz7kgt",
    "proofs": [
        "4ayqBN3F4bCMtLjAuBVbKqgBNkjQhpu2o6XYhXfz6MJnuUjx4dV6qKe11XKCiBRXxUM7BsBqf4wZ82nMXtaXHrDf"
    ],
    "script": "base64:AAIFAAAAAAAAABcIAhIGCgQIAQgBEgMKAQgSBgoECAgBAQAAAAwAAAAACWRldmVsb3BlcgkBAAAAEUBleHRyTmF0aXZlKDEwNjIpAAAAAQIAAAAjM01wNlRUaHZiYjh6OW5wcXo0QUszQnlxQWJ2czdkWVM4dVIBAAAACmtleVBhcnRuZXIAAAABAAAAB2FkZHJlc3MJAAEsAAAAAgIAAAAPJXMlc19fcGFydG5lcl9fBQAAAAdhZGRyZXNzAQAAABBrZXlXYW50ZWRBc3NldElkAAAAAQAAAAdhZGRyZXNzCQABLAAAAAICAAAAFSVzJXNfX3dhbnRlZEFzc2V0SWRfXwUAAAAHYWRkcmVzcwEAAAAPa2V5V2FudGVkQW1vdW50AAAAAQAAAAdhZGRyZXNzCQABLAAAAAICAAAAFCVzJXNfX3dhbnRlZEFtb3VudF9fBQAAAAdhZGRyZXNzAQAAAAprZXlBc3NldElkAAAAAQAAAAdvcmRlcklkCQABLAAAAAICAAAADyVzJXNfX2Fzc2V0SWRfXwUAAAAHb3JkZXJJZAEAAAAJa2V5QW1vdW50AAAAAQAAAAdvcmRlcklkCQABLAAAAAICAAAADiVzJXNfX2Ftb3VudF9fBQAAAAdvcmRlcklkAQAAAAprZXlPcmRlcklkAAAAAQAAAAdvcmRlcklkCQABLAAAAAICAAAADyVzJXNfX29yZGVySWRfXwUAAAAHb3JkZXJJZAEAAAANa2V5U2VydmljZUZlZQAAAAEAAAAHb3JkZXJJZAkAASwAAAACAgAAABIlcyVzX19zZXJ2aWNlRmVlX18FAAAAB29yZGVySWQBAAAACWdldEFtb3VudAAAAAEAAAAGYW1vdW50BQAAAAZhbW91bnQBAAAABXRvU3RyAAAAAQAAAAdhc3NldElkAwkAAAAAAAACBQAAAAdhc3NldElkBQAAAAR1bml0AgAAAAVXQVZFUwkAAlgAAAABCQEAAAAFdmFsdWUAAAABBQAAAAdhc3NldElkAQAAAAdmcm9tU3RyAAAAAQAAAAphc3NldElkU3RyAwkAAAAAAAACBQAAAAphc3NldElkU3RyAgAAAAVXQVZFUwUAAAAEdW5pdAkAAlkAAAABBQAAAAphc3NldElkU3RyAQAAAApjaGVja0Fzc2V0AAAAAQAAAAdhc3NldElk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",
    "height": 2868045,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: 8WBzB2Bc7YQqu9F7FEuX4Hrgxzq68tq9WJ1PCdmdrRjL
Next: 9uyGipg739uoFwLUX6oxCfZNj85RqASz53qrKpSit3e5

Diff: 
Old New Differences
24 24  func j (g) = ("%s%s__serviceFee__" + g)
25 25  
26 26  
27 - func k (l) = if ((l == unit))
28 -     then "WAVES"
29 -     else toBase58String(value(l))
27 + func k (l) = l
30 28  
31 29  
32 - func m (n) = if ((n == "WAVES"))
33 -     then unit
34 -     else fromBase58String(n)
30 + func m (n) = if ((n == unit))
31 +     then "WAVES"
32 +     else toBase58String(value(n))
35 33  
36 34  
37 - func o (l) = {
38 -     let p = m(l)
39 -     if (if ((p != unit))
40 -         then (assetInfo(value(p)) == unit)
35 + func o (p) = if ((p == "WAVES"))
36 +     then unit
37 +     else fromBase58String(p)
38 + 
39 + 
40 + func q (n) = {
41 +     let r = o(n)
42 +     if (if ((r != unit))
43 +         then (assetInfo(value(r)) == unit)
41 44          else false)
42 45          then throw("Invalid assetId: assetInfo missing")
43 -         else k(p)
46 +         else m(r)
44 47      }
45 48  
46 49  
47 - @Callable(q)
48 - func escrow (g,r,l,s) = if (isDefined(getString(this, i(g))))
50 + @Callable(s)
51 + func escrow (g,l,n,t) = if (isDefined(getString(this, i(g))))
49 52      then throw(("You already have an order with this id: " + g))
50 -     else if ((0 >= r))
53 +     else if ((0 >= l))
51 54          then throw("Non-positive order amount")
52 55          else {
53 -             let t = (r - s)
54 - [IntegerEntry(j(g), s), IntegerEntry(h(g), t), StringEntry(i(g), g), StringEntry(f(g), l)]
56 +             let u = (l - t)
57 + [IntegerEntry(j(g), t), IntegerEntry(h(g), u), StringEntry(i(g), g), StringEntry(f(g), n)]
55 58              }
56 59  
57 60  
58 61  
59 - @Callable(q)
62 + @Callable(s)
60 63  func cancel (g) = if (!(isDefined(i(g))))
61 64      then throw(("You don't have an order with this id: " + g))
62 65      else {
63 -         let u = toBytes(value(h(g)))
64 -         let v = f(g)
65 -         let w = getString(this, v)
66 -         let n = value(w)
67 - [ScriptTransfer(q.caller, toInt(u), m(n)), ScriptTransfer(a, toInt(toBytes(value(j(g)))), m(n)), DeleteEntry(j(g)), DeleteEntry(h(g)), DeleteEntry(i(g)), DeleteEntry(f(g))]
66 +         let v = getIntegerValue(h(g))
67 +         let w = f(g)
68 +         let x = getString(this, w)
69 +         let p = value(x)
70 + [ScriptTransfer(s.caller, v, o(p)), ScriptTransfer(a, toInt(toBytes(value(j(g)))), o(p)), DeleteEntry(j(g)), DeleteEntry(h(g)), DeleteEntry(i(g)), DeleteEntry(f(g))]
68 71          }
69 72  
70 73  
71 74  
72 - @Callable(q)
73 - func deal (g,c,r,x) = if (!(isDefined(i(g))))
75 + @Callable(s)
76 + func deal (g,c,l,y) = if (!(isDefined(i(g))))
74 77      then throw(("You don't have an order with this id: " + g))
75 -     else if ((r > toInt(toBytes(value(h(g))))))
78 +     else if ((l > toInt(toBytes(value(h(g))))))
76 79          then throw("The transaction cannot be executed because the seller does not have enough funds")
77 80          else {
78 -             let u = (toInt(toBytes(value(h(g)))) - r)
79 -             let v = f(g)
80 -             let w = getString(this, v)
81 -             let n = value(w)
82 -             if ((x > u))
83 -                 then [ScriptTransfer(addressFromStringValue(c), r, m(n)), ScriptTransfer(q.caller, u, m(n)), ScriptTransfer(a, toInt(toBytes(value(j(g)))), m(n)), DeleteEntry(j(g)), DeleteEntry(h(g)), DeleteEntry(i(g)), DeleteEntry(f(g))]
84 -                 else [ScriptTransfer(addressFromStringValue(c), r, m(n)), DeleteEntry(h(g)), IntegerEntry(h(g), u)]
81 +             let v = (toInt(toBytes(value(h(g)))) - l)
82 +             let w = f(g)
83 +             let x = getString(this, w)
84 +             let p = value(x)
85 +             if ((y > v))
86 +                 then [ScriptTransfer(addressFromStringValue(c), l, o(p)), ScriptTransfer(s.caller, v, o(p)), ScriptTransfer(a, toInt(toBytes(value(j(g)))), o(p)), DeleteEntry(j(g)), DeleteEntry(h(g)), DeleteEntry(i(g)), DeleteEntry(f(g))]
87 +                 else [ScriptTransfer(addressFromStringValue(c), l, o(p)), DeleteEntry(h(g)), IntegerEntry(h(g), v)]
85 88              }
86 89  
87 90  
Full: 
Old New Differences
1 1  {-# STDLIB_VERSION 5 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 4  let a = addressFromStringValue("3Mp6TThvbb8z9npqz4AK3ByqAbvs7dYS8uR")
5 5  
6 6  func b (c) = ("%s%s__partner__" + c)
7 7  
8 8  
9 9  func d (c) = ("%s%s__wantedAssetId__" + c)
10 10  
11 11  
12 12  func e (c) = ("%s%s__wantedAmount__" + c)
13 13  
14 14  
15 15  func f (g) = ("%s%s__assetId__" + g)
16 16  
17 17  
18 18  func h (g) = ("%s%s__amount__" + g)
19 19  
20 20  
21 21  func i (g) = ("%s%s__orderId__" + g)
22 22  
23 23  
24 24  func j (g) = ("%s%s__serviceFee__" + g)
25 25  
26 26  
27 - func k (l) = if ((l == unit))
28 -     then "WAVES"
29 -     else toBase58String(value(l))
27 + func k (l) = l
30 28  
31 29  
32 - func m (n) = if ((n == "WAVES"))
33 -     then unit
34 -     else fromBase58String(n)
30 + func m (n) = if ((n == unit))
31 +     then "WAVES"
32 +     else toBase58String(value(n))
35 33  
36 34  
37 - func o (l) = {
38 -     let p = m(l)
39 -     if (if ((p != unit))
40 -         then (assetInfo(value(p)) == unit)
35 + func o (p) = if ((p == "WAVES"))
36 +     then unit
37 +     else fromBase58String(p)
38 + 
39 + 
40 + func q (n) = {
41 +     let r = o(n)
42 +     if (if ((r != unit))
43 +         then (assetInfo(value(r)) == unit)
41 44          else false)
42 45          then throw("Invalid assetId: assetInfo missing")
43 -         else k(p)
46 +         else m(r)
44 47      }
45 48  
46 49  
47 - @Callable(q)
48 - func escrow (g,r,l,s) = if (isDefined(getString(this, i(g))))
50 + @Callable(s)
51 + func escrow (g,l,n,t) = if (isDefined(getString(this, i(g))))
49 52      then throw(("You already have an order with this id: " + g))
50 -     else if ((0 >= r))
53 +     else if ((0 >= l))
51 54          then throw("Non-positive order amount")
52 55          else {
53 -             let t = (r - s)
54 - [IntegerEntry(j(g), s), IntegerEntry(h(g), t), StringEntry(i(g), g), StringEntry(f(g), l)]
56 +             let u = (l - t)
57 + [IntegerEntry(j(g), t), IntegerEntry(h(g), u), StringEntry(i(g), g), StringEntry(f(g), n)]
55 58              }
56 59  
57 60  
58 61  
59 - @Callable(q)
62 + @Callable(s)
60 63  func cancel (g) = if (!(isDefined(i(g))))
61 64      then throw(("You don't have an order with this id: " + g))
62 65      else {
63 -         let u = toBytes(value(h(g)))
64 -         let v = f(g)
65 -         let w = getString(this, v)
66 -         let n = value(w)
67 - [ScriptTransfer(q.caller, toInt(u), m(n)), ScriptTransfer(a, toInt(toBytes(value(j(g)))), m(n)), DeleteEntry(j(g)), DeleteEntry(h(g)), DeleteEntry(i(g)), DeleteEntry(f(g))]
66 +         let v = getIntegerValue(h(g))
67 +         let w = f(g)
68 +         let x = getString(this, w)
69 +         let p = value(x)
70 + [ScriptTransfer(s.caller, v, o(p)), ScriptTransfer(a, toInt(toBytes(value(j(g)))), o(p)), DeleteEntry(j(g)), DeleteEntry(h(g)), DeleteEntry(i(g)), DeleteEntry(f(g))]
68 71          }
69 72  
70 73  
71 74  
72 - @Callable(q)
73 - func deal (g,c,r,x) = if (!(isDefined(i(g))))
75 + @Callable(s)
76 + func deal (g,c,l,y) = if (!(isDefined(i(g))))
74 77      then throw(("You don't have an order with this id: " + g))
75 -     else if ((r > toInt(toBytes(value(h(g))))))
78 +     else if ((l > toInt(toBytes(value(h(g))))))
76 79          then throw("The transaction cannot be executed because the seller does not have enough funds")
77 80          else {
78 -             let u = (toInt(toBytes(value(h(g)))) - r)
79 -             let v = f(g)
80 -             let w = getString(this, v)
81 -             let n = value(w)
82 -             if ((x > u))
83 -                 then [ScriptTransfer(addressFromStringValue(c), r, m(n)), ScriptTransfer(q.caller, u, m(n)), ScriptTransfer(a, toInt(toBytes(value(j(g)))), m(n)), DeleteEntry(j(g)), DeleteEntry(h(g)), DeleteEntry(i(g)), DeleteEntry(f(g))]
84 -                 else [ScriptTransfer(addressFromStringValue(c), r, m(n)), DeleteEntry(h(g)), IntegerEntry(h(g), u)]
81 +             let v = (toInt(toBytes(value(h(g)))) - l)
82 +             let w = f(g)
83 +             let x = getString(this, w)
84 +             let p = value(x)
85 +             if ((y > v))
86 +                 then [ScriptTransfer(addressFromStringValue(c), l, o(p)), ScriptTransfer(s.caller, v, o(p)), ScriptTransfer(a, toInt(toBytes(value(j(g)))), o(p)), DeleteEntry(j(g)), DeleteEntry(h(g)), DeleteEntry(i(g)), DeleteEntry(f(g))]
87 +                 else [ScriptTransfer(addressFromStringValue(c), l, o(p)), DeleteEntry(h(g)), IntegerEntry(h(g), v)]
85 88              }
86 89  
87 90

Old	New		Differences
24	24		func j (g) = ("%s%s__serviceFee__" + g)
25	25
26	26
27		-	func k (l) = if ((l == unit))
28		-	then "WAVES"
29		-	else toBase58String(value(l))
	27	+	func k (l) = l
30	28
31	29
32		-	func m (n) = if ((n == ~~"WAVES"~~))
33		-	then ~~unit~~
34		-	else ~~fromBase58String~~(n)
	30	+	func m (n) = if ((n == unit))
	31	+	then "WAVES"
	32	+	else toBase58String(value(n))
35	33
36	34
37		-	func o (l) = {
38		-	let p = m(l)
39		-	if (if ((p != unit))
40		-	then (assetInfo(value(p)) == unit)
	35	+	func o (p) = if ((p == "WAVES"))
	36	+	then unit
	37	+	else fromBase58String(p)
	38	+
	39	+
	40	+	func q (n) = {
	41	+	let r = o(n)
	42	+	if (if ((r != unit))
	43	+	then (assetInfo(value(r)) == unit)
41	44		else false)
42	45		then throw("Invalid assetId: assetInfo missing")
43		-	else k(p)
	46	+	else m(r)
44	47		}
45	48
46	49
47		-	@Callable(q)
48		-	func escrow (g,r,l,s) = if (isDefined(getString(this, i(g))))
	50	+	@Callable(s)
	51	+	func escrow (g,l,n,t) = if (isDefined(getString(this, i(g))))
49	52		then throw(("You already have an order with this id: " + g))
50		-	else if ((0 >= r))
	53	+	else if ((0 >= l))
51	54		then throw("Non-positive order amount")
52	55		else {
53		-	let t = (~~r - s~~)
54		-	[IntegerEntry(j(g), s), IntegerEntry(h(g), t), StringEntry(i(g), g), StringEntry(f(g), l)]
	56	+	let u = (l - t)
	57	+	[IntegerEntry(j(g), t), IntegerEntry(h(g), u), StringEntry(i(g), g), StringEntry(f(g), n)]
55	58		}
56	59
57	60
58	61
59		-	@Callable(q)
	62	+	@Callable(s)
60	63		func cancel (g) = if (!(isDefined(i(g))))
61	64		then throw(("You don't have an order with this id: " + g))
62	65		else {
63		-	let u = ~~toBytes(value~~(h(g)))
64		-	let v = f(g)
65		-	let w = getString(this, v)
66		-	let n = value(w)
67		-	[ScriptTransfer(q.caller, ~~toInt(u)~~, m(n)), ScriptTransfer(a, toInt(toBytes(value(j(g)))), m(n)), DeleteEntry(j(g)), DeleteEntry(h(g)), DeleteEntry(i(g)), DeleteEntry(f(g))]
	66	+	let v = getIntegerValue(h(g))
	67	+	let w = f(g)
	68	+	let x = getString(this, w)
	69	+	let p = value(x)
	70	+	[ScriptTransfer(s.caller, v, o(p)), ScriptTransfer(a, toInt(toBytes(value(j(g)))), o(p)), DeleteEntry(j(g)), DeleteEntry(h(g)), DeleteEntry(i(g)), DeleteEntry(f(g))]
68	71		}
69	72
70	73
71	74
72		-	@Callable(q)
73		-	func deal (g,c,r,x) = if (!(isDefined(i(g))))
	75	+	@Callable(s)
	76	+	func deal (g,c,l,y) = if (!(isDefined(i(g))))
74	77		then throw(("You don't have an order with this id: " + g))
75		-	else if ((r > toInt(toBytes(value(h(g))))))
	78	+	else if ((l > toInt(toBytes(value(h(g))))))
76	79		then throw("The transaction cannot be executed because the seller does not have enough funds")
77	80		else {
78		-	let u = (toInt(toBytes(value(h(g)))) - r)
79		-	let v = f(g)
80		-	let w = getString(this, v)
81		-	let n = value(w)
82		-	if ((x > u))
83		-	then [ScriptTransfer(addressFromStringValue(c), r, m(n)), ScriptTransfer(q.caller, u, m(n)), ScriptTransfer(a, toInt(toBytes(value(j(g)))), m(n)), DeleteEntry(j(g)), DeleteEntry(h(g)), DeleteEntry(i(g)), DeleteEntry(f(g))]
84		-	else [ScriptTransfer(addressFromStringValue(c), r, m(n)), DeleteEntry(h(g)), IntegerEntry(h(g), u)]
	81	+	let v = (toInt(toBytes(value(h(g)))) - l)
	82	+	let w = f(g)
	83	+	let x = getString(this, w)
	84	+	let p = value(x)
	85	+	if ((y > v))
	86	+	then [ScriptTransfer(addressFromStringValue(c), l, o(p)), ScriptTransfer(s.caller, v, o(p)), ScriptTransfer(a, toInt(toBytes(value(j(g)))), o(p)), DeleteEntry(j(g)), DeleteEntry(h(g)), DeleteEntry(i(g)), DeleteEntry(f(g))]
	87	+	else [ScriptTransfer(addressFromStringValue(c), l, o(p)), DeleteEntry(h(g)), IntegerEntry(h(g), v)]
85	88		}
86	89
87	90

Old	New		Differences
1	1		{-# STDLIB_VERSION 5 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4	4		let a = addressFromStringValue("3Mp6TThvbb8z9npqz4AK3ByqAbvs7dYS8uR")
5	5
6	6		func b (c) = ("%s%s__partner__" + c)
7	7
8	8
9	9		func d (c) = ("%s%s__wantedAssetId__" + c)
10	10
11	11
12	12		func e (c) = ("%s%s__wantedAmount__" + c)
13	13
14	14
15	15		func f (g) = ("%s%s__assetId__" + g)
16	16
17	17
18	18		func h (g) = ("%s%s__amount__" + g)
19	19
20	20
21	21		func i (g) = ("%s%s__orderId__" + g)
22	22
23	23
24	24		func j (g) = ("%s%s__serviceFee__" + g)
25	25
26	26
27		-	func k (l) = if ((l == unit))
28		-	then "WAVES"
29		-	else toBase58String(value(l))
	27	+	func k (l) = l
30	28
31	29
32		-	func m (n) = if ((n == ~~"WAVES"~~))
33		-	then ~~unit~~
34		-	else ~~fromBase58String~~(n)
	30	+	func m (n) = if ((n == unit))
	31	+	then "WAVES"
	32	+	else toBase58String(value(n))
35	33
36	34
37		-	func o (l) = {
38		-	let p = m(l)
39		-	if (if ((p != unit))
40		-	then (assetInfo(value(p)) == unit)
	35	+	func o (p) = if ((p == "WAVES"))
	36	+	then unit
	37	+	else fromBase58String(p)
	38	+
	39	+
	40	+	func q (n) = {
	41	+	let r = o(n)
	42	+	if (if ((r != unit))
	43	+	then (assetInfo(value(r)) == unit)
41	44		else false)
42	45		then throw("Invalid assetId: assetInfo missing")
43		-	else k(p)
	46	+	else m(r)
44	47		}
45	48
46	49
47		-	@Callable(q)
48		-	func escrow (g,r,l,s) = if (isDefined(getString(this, i(g))))
	50	+	@Callable(s)
	51	+	func escrow (g,l,n,t) = if (isDefined(getString(this, i(g))))
49	52		then throw(("You already have an order with this id: " + g))
50		-	else if ((0 >= r))
	53	+	else if ((0 >= l))
51	54		then throw("Non-positive order amount")
52	55		else {
53		-	let t = (~~r - s~~)
54		-	[IntegerEntry(j(g), s), IntegerEntry(h(g), t), StringEntry(i(g), g), StringEntry(f(g), l)]
	56	+	let u = (l - t)
	57	+	[IntegerEntry(j(g), t), IntegerEntry(h(g), u), StringEntry(i(g), g), StringEntry(f(g), n)]
55	58		}
56	59
57	60
58	61
59		-	@Callable(q)
	62	+	@Callable(s)
60	63		func cancel (g) = if (!(isDefined(i(g))))
61	64		then throw(("You don't have an order with this id: " + g))
62	65		else {
63		-	let u = ~~toBytes(value~~(h(g)))
64		-	let v = f(g)
65		-	let w = getString(this, v)
66		-	let n = value(w)
67		-	[ScriptTransfer(q.caller, ~~toInt(u)~~, m(n)), ScriptTransfer(a, toInt(toBytes(value(j(g)))), m(n)), DeleteEntry(j(g)), DeleteEntry(h(g)), DeleteEntry(i(g)), DeleteEntry(f(g))]
	66	+	let v = getIntegerValue(h(g))
	67	+	let w = f(g)
	68	+	let x = getString(this, w)
	69	+	let p = value(x)
	70	+	[ScriptTransfer(s.caller, v, o(p)), ScriptTransfer(a, toInt(toBytes(value(j(g)))), o(p)), DeleteEntry(j(g)), DeleteEntry(h(g)), DeleteEntry(i(g)), DeleteEntry(f(g))]
68	71		}
69	72
70	73
71	74
72		-	@Callable(q)
73		-	func deal (g,c,r,x) = if (!(isDefined(i(g))))
	75	+	@Callable(s)
	76	+	func deal (g,c,l,y) = if (!(isDefined(i(g))))
74	77		then throw(("You don't have an order with this id: " + g))
75		-	else if ((r > toInt(toBytes(value(h(g))))))
	78	+	else if ((l > toInt(toBytes(value(h(g))))))
76	79		then throw("The transaction cannot be executed because the seller does not have enough funds")
77	80		else {
78		-	let u = (toInt(toBytes(value(h(g)))) - r)
79		-	let v = f(g)
80		-	let w = getString(this, v)
81		-	let n = value(w)
82		-	if ((x > u))
83		-	then [ScriptTransfer(addressFromStringValue(c), r, m(n)), ScriptTransfer(q.caller, u, m(n)), ScriptTransfer(a, toInt(toBytes(value(j(g)))), m(n)), DeleteEntry(j(g)), DeleteEntry(h(g)), DeleteEntry(i(g)), DeleteEntry(f(g))]
84		-	else [ScriptTransfer(addressFromStringValue(c), r, m(n)), DeleteEntry(h(g)), IntegerEntry(h(g), u)]
	81	+	let v = (toInt(toBytes(value(h(g)))) - l)
	82	+	let w = f(g)
	83	+	let x = getString(this, w)
	84	+	let p = value(x)
	85	+	if ((y > v))
	86	+	then [ScriptTransfer(addressFromStringValue(c), l, o(p)), ScriptTransfer(s.caller, v, o(p)), ScriptTransfer(a, toInt(toBytes(value(j(g)))), o(p)), DeleteEntry(j(g)), DeleteEntry(h(g)), DeleteEntry(i(g)), DeleteEntry(f(g))]
	87	+	else [ScriptTransfer(addressFromStringValue(c), l, o(p)), DeleteEntry(h(g)), IntegerEntry(h(g), v)]
85	88		}
86	89
87	90

github/deemru/w8io/026f985 
54.97 ms ◑