w8 · tx · 3ze···wYe

tx · 3ze9KYGHVowBhJqDuKhRAqAKrvk3kTjAN7vKd7feEwYe

3PAimVkP7cqar6gMKNh5bQDNH9x4U6sXE7u:  -0.01000000 Waves

2022.01.03 20:02 [2928081] smart account 3PAimVkP7cqar6gMKNh5bQDNH9x4U6sXE7u > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "3ze9KYGHVowBhJqDuKhRAqAKrvk3kTjAN7vKd7feEwYe",
    "fee": 1000000,
    "feeAssetId": null,
    "timestamp": 1641229257567,
    "version": 1,
    "sender": "3PAimVkP7cqar6gMKNh5bQDNH9x4U6sXE7u",
    "senderPublicKey": "FZMCzazzRQMocGNfhYr2gvt3qrzyG2Z6FCw1nTDmkDCA",
    "proofs": [
        "4PEvBMRBLtoagYB49gKvgZprB3dUM6WG3YeiKGAfUeErQyKJfMiDp6ThmfsRLn79HT3kehkNR6xjNUVtybTaeRGo"
    ],
    "script": "base64:AAIFAAAAAAAAAAsIAhIFCgMIAQgSAAAAAAoBAAAACmtleUFzc2V0SWQAAAABAAAAB2FkZHJlc3MJAAEsAAAAAgIAAAAPJXMlc19fYXNzZXRJZF9fBQAAAAdhZGRyZXNzAQAAAAlrZXlBbW91bnQAAAABAAAAB2FkZHJlc3MJAAEsAAAAAgIAAAAOJXMlc19fYW1vdW50X18FAAAAB2FkZHJlc3MBAAAACmtleVBhcnRuZXIAAAABAAAAB2FkZHJlc3MJAAEsAAAAAgIAAAAPJXMlc19fcGFydG5lcl9fBQAAAAdhZGRyZXNzAQAAABBrZXlXYW50ZWRBc3NldElkAAAAAQAAAAdhZGRyZXNzCQABLAAAAAICAAAAFSVzJXNfX3dhbnRlZEFzc2V0SWRfXwUAAAAHYWRkcmVzcwEAAAAPa2V5V2FudGVkQW1vdW50AAAAAQAAAAdhZGRyZXNzCQABLAAAAAICAAAAFCVzJXNfX3dhbnRlZEFtb3VudF9fBQAAAAdhZGRyZXNzAQAAAAV0b1N0cgAAAAEAAAAHYXNzZXRJZAMJAAAAAAAAAgUAAAAHYXNzZXRJZAUAAAAEdW5pdAIAAAAFV0FWRVMJAAJYAAAAAQkBAAAABXZhbHVlAAAAAQUAAAAHYXNzZXRJZAEAAAAHZnJvbVN0cgAAAAEAAAAKYXNzZXRJZFN0cgMJAAAAAAAAAgUAAAAKYXNzZXRJZFN0cgIAAAAFV0FWRVMFAAAABHVuaXQJAAJZAAAAAQUAAAAKYXNzZXRJZFN0cgEAAAASY3Jvc3NDaGVja0Fzc2V0SWRzAAAABQAAAA5wYXJ0bmVyQWRkcmVzcwAAABBteU9mZmVyZWRBc3NldElkAAAAD215V2FudGVkQXNzZXRJZAAAABVwYXJ0bmVyT2ZmZXJlZEFzc2V0SWQAAAAUcGFydG5lcldhbnRlZEFzc2V0SWQDAwkBAAAAAiE9AAAAAgUAAAAVcGFydG5lck9mZmVyZWRBc3NldElkBQAAAA9teVdhbnRlZEFzc2V0SWQGCQEAAAACIT0AAAACBQAAABRwYXJ0bmVyV2FudGVkQXNzZXRJZAUAAAAQbXlPZmZlcmVkQXNzZXRJZAkAAAIAAAABCQABLAAAAAIJAAEsAAAAAgkAASwAAAACCQABLAAAAAIJAAEsAAAAAgkAASwAAAAC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RGVsZXRlRW50cnkAAAABCQEAAAAJa2V5QW1vdW50AAAAAQUAAAAOcGFydG5lckFkZHJlc3MJAARMAAAAAgkBAAAAC0RlbGV0ZUVudHJ5AAAAAQkBAAAACmtleVBhcnRuZXIAAAABBQAAAA5wYXJ0bmVyQWRkcmVzcwkABEwAAAACCQEAAAALRGVsZXRlRW50cnkAAAABCQEAAAAQa2V5V2FudGVkQXNzZXRJZAAAAAEFAAAADnBhcnRuZXJBZGRyZXNzCQAETAAAAAIJAQAAAAtEZWxldGVFbnRyeQAAAAEJAQAAAA9rZXlXYW50ZWRBbW91bnQAAAABBQAAAA5wYXJ0bmVyQWRkcmVzcwUAAAADbmlsCQAAAgAAAAECAAAAJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkABEwAAAACCQEAAAALU3RyaW5nRW50cnkAAAACCQEAAAAKa2V5QXNzZXRJZAAAAAEFAAAABmNhbGxlcgkBAAAABXRvU3RyAAAAAQUAAAAJbXlBc3NldElkCQAETAAAAAIJAQAAAAxJbnRlZ2VyRW50cnkAAAACCQEAAAAJa2V5QW1vdW50AAAAAQUAAAAGY2FsbGVyBQAAAAhteUFtb3VudAkABEwAAAACCQEAAAALU3RyaW5nRW50cnkAAAACCQEAAAAKa2V5UGFydG5lcgAAAAEFAAAABmNhbGxlcgUAAAAOcGFydG5lckFkZHJlc3MJAARMAAAAAgkBAAAAC1N0cmluZ0VudHJ5AAAAAgkBAAAAEGtleVdhbnRlZEFzc2V0SWQAAAABBQAAAAZjYWxsZXIFAAAADXdhbnRlZEFzc2V0SWQJAARMAAAAAgkBAAAADEludGVnZXJFbnRyeQAAAAIJAQAAAA9rZXlXYW50ZWRBbW91bnQAAAABBQAAAAZjYWxsZXIFAAAACndhbnRBbW91bnQFAAAAA25pbAkAAAIAAAABAgAAACRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4AAAABaQEAAAAGY2FuY2VsAAAAAAQAAAAGY2FsbGVyCQAEJQAAAAEIBQAAAAFpAAAABmNhbGxlcgQAAAAKYXNzZXRJZEtleQkBAAAACmtleUFzc2V0SWQAAAABBQAAAAZjYWxsZXIEAAAACmFzc2V0SWRSYXcJAAQdAAAAAgUAAAAEdGhpcwUAAAAKYXNzZXRJZEtleQMJAQAAAAEhAAAAAQkBAAAACWlzRGVmaW5lZAAAAAEFAAAACmFzc2V0SWRSYXcJAAACAAAAAQIAAAAdWW91IGRvbid0IGhhdmUgYW4gYWN0aXZlIGRlYWwEAAAACmFzc2V0SWRTdHIJAQAAAAV2YWx1ZQAAAAEFAAAACmFzc2V0SWRSYXcJAARMAAAAAgkBAAAADlNjcmlwdFRyYW5zZmVyAAAAAwgFAAAAAWkAAAAGY2FsbGVyCQEAAAAFdmFsdWUAAAABCQAEGgAAAAIFAAAABHRoaXMJAQAAAAlrZXlBbW91bnQAAAABBQAAAAZjYWxsZXIJAQAAAAdmcm9tU3RyAAAAAQUAAAAKYXNzZXRJZFN0cgkABEwAAAACCQEAAAALRGVsZXRlRW50cnkAAAABBQAAAAphc3NldElkS2V5CQAETAAAAAIJAQAAAAtEZWxldGVFbnRyeQAAAAEJAQAAAAlrZXlBbW91bnQAAAABBQAAAAZjYWxsZXIJAARMAAAAAgkBAAAAC0RlbGV0ZUVudHJ5AAAAAQkBAAAACmtleVBhcnRuZXIAAAABBQAAAAZjYWxsZXIJAARMAAAAAgkBAAAAC0RlbGV0ZUVudHJ5AAAAAQkBAAAAEGtleVdhbnRlZEFzc2V0SWQAAAABBQAAAAZjYWxsZXIJAARMAAAAAgkBAAAAC0RlbGV0ZUVudHJ5AAAAAQkBAAAAD2tleVdhbnRlZEFtb3VudAAAAAEFAAAABmNhbGxlcgUAAAADbmlsAAAAAMgeQF8=",
    "chainId": 87,
    "height": 2928081,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: FKqe3qf1n3mNtiFHT4LaB3CPHdcrZJKbfkjXw5QGE2Jg
Next: none

Diff: 
Old New Differences
42 42  
43 43  func checkAsset (wantAssetId) = {
44 44      let asset = fromStr(wantAssetId)
45 -     let result = if ((asset != unit))
46 -         then {
47 -             let nfo = assetInfo(value(asset))
48 -             if ((nfo == unit))
49 -                 then throw("Invalid wantAssetId: assetInfo missing")
50 -                 else if ((size(value(nfo).id) != 32))
51 -                     then throw(("Invalid wantAssetId: assetInfo size is " + toString(size(value(nfo).id))))
52 -                     else if ((size(value(nfo).issuer.bytes) != 32))
53 -                         then throw(("Invalid wantAssetId: issuer address is " + toBase58String(value(nfo).issuer.bytes)))
54 -                         else true
55 -             }
56 -         else true
57 -     if ((result == result))
58 -         then toStr(asset)
59 -         else throw("Strict value is not equal to itself.")
45 +     if (if ((asset != unit))
46 +         then (assetInfo(value(asset)) == unit)
47 +         else false)
48 +         then throw("Invalid wantAssetId: assetInfo missing")
49 +         else toStr(asset)
60 50      }
61 51  
62 52  
Full: 
Old New Differences
1 1  {-# STDLIB_VERSION 5 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 4  func keyAssetId (address) = ("%s%s__assetId__" + address)
5 5  
6 6  
7 7  func keyAmount (address) = ("%s%s__amount__" + address)
8 8  
9 9  
10 10  func keyPartner (address) = ("%s%s__partner__" + address)
11 11  
12 12  
13 13  func keyWantedAssetId (address) = ("%s%s__wantedAssetId__" + address)
14 14  
15 15  
16 16  func keyWantedAmount (address) = ("%s%s__wantedAmount__" + address)
17 17  
18 18  
19 19  func toStr (assetId) = if ((assetId == unit))
20 20      then "WAVES"
21 21      else toBase58String(value(assetId))
22 22  
23 23  
24 24  func fromStr (assetIdStr) = if ((assetIdStr == "WAVES"))
25 25      then unit
26 26      else fromBase58String(assetIdStr)
27 27  
28 28  
29 29  func crossCheckAssetIds (partnerAddress,myOfferedAssetId,myWantedAssetId,partnerOfferedAssetId,partnerWantedAssetId) = if (if ((partnerOfferedAssetId != myWantedAssetId))
30 30      then true
31 31      else (partnerWantedAssetId != myOfferedAssetId))
32 32      then throw(((((((((("AssetIds don't match: you want " + myWantedAssetId) + " and pay ") + myOfferedAssetId) + ", but ") + partnerAddress) + " wants ") + partnerWantedAssetId) + " and pays ") + partnerOfferedAssetId))
33 33      else true
34 34  
35 35  
36 36  func crossCheckAmounts (partnerAddress,myOfferedAmount,myWantedAmount,partnerOfferedAmount,partnerWantedAmount) = if (if ((partnerOfferedAmount != myWantedAmount))
37 37      then true
38 38      else (partnerWantedAmount != myOfferedAmount))
39 39      then throw(((((((((("Amounts don't match: you want " + toString(myWantedAmount)) + " and pay ") + toString(myOfferedAmount)) + ", but ") + partnerAddress) + " wants ") + toString(partnerWantedAmount)) + " and pays ") + toString(partnerOfferedAmount)))
40 40      else true
41 41  
42 42  
43 43  func checkAsset (wantAssetId) = {
44 44      let asset = fromStr(wantAssetId)
45 -     let result = if ((asset != unit))
46 -         then {
47 -             let nfo = assetInfo(value(asset))
48 -             if ((nfo == unit))
49 -                 then throw("Invalid wantAssetId: assetInfo missing")
50 -                 else if ((size(value(nfo).id) != 32))
51 -                     then throw(("Invalid wantAssetId: assetInfo size is " + toString(size(value(nfo).id))))
52 -                     else if ((size(value(nfo).issuer.bytes) != 32))
53 -                         then throw(("Invalid wantAssetId: issuer address is " + toBase58String(value(nfo).issuer.bytes)))
54 -                         else true
55 -             }
56 -         else true
57 -     if ((result == result))
58 -         then toStr(asset)
59 -         else throw("Strict value is not equal to itself.")
45 +     if (if ((asset != unit))
46 +         then (assetInfo(value(asset)) == unit)
47 +         else false)
48 +         then throw("Invalid wantAssetId: assetInfo missing")
49 +         else toStr(asset)
60 50      }
61 51  
62 52  
63 53  @Callable(i)
64 54  func escrow (wantAssetId,wantAmount,partnerAddress) = {
65 55      let caller = toString(i.caller)
66 56      if (isDefined(getString(this, keyAssetId(caller))))
67 57          then throw("You already have an active deal, please cancel it first")
68 58          else if ((size(i.payments) != 1))
69 59              then throw("Exactly 1 payment expected")
70 60              else {
71 61                  let partner = addressFromStringValue(partnerAddress)
72 62                  if ((partner == partner))
73 63                      then {
74 64                          let wantedAssetId = checkAsset(wantAssetId)
75 65                          if ((0 >= wantAmount))
76 66                              then throw("Non-positive wantAmount")
77 67                              else {
78 68                                  let partnerAssetId = getString(this, keyAssetId(partnerAddress))
79 69                                  let myAssetId = value(i.payments[0]).assetId
80 70                                  let myAmount = value(i.payments[0]).amount
81 71                                  if (isDefined(partnerAssetId))
82 72                                      then if ((value(getString(this, keyPartner(partnerAddress))) != caller))
83 73                                          then throw(("You are not a partner of " + partnerAddress))
84 74                                          else {
85 75                                              let check = if (crossCheckAssetIds(partnerAddress, toStr(myAssetId), wantedAssetId, value(partnerAssetId), value(getString(this, keyWantedAssetId(partnerAddress)))))
86 76                                                  then crossCheckAmounts(partnerAddress, myAmount, wantAmount, value(getInteger(this, keyAmount(partnerAddress))), value(getInteger(this, keyWantedAmount(partnerAddress))))
87 77                                                  else false
88 78                                              if ((check == check))
89 79                                                  then [ScriptTransfer(partner, myAmount, myAssetId), ScriptTransfer(i.caller, wantAmount, fromStr(wantedAssetId)), DeleteEntry(keyAssetId(partnerAddress)), DeleteEntry(keyAmount(partnerAddress)), DeleteEntry(keyPartner(partnerAddress)), DeleteEntry(keyWantedAssetId(partnerAddress)), DeleteEntry(keyWantedAmount(partnerAddress))]
90 80                                                  else throw("Strict value is not equal to itself.")
91 81                                              }
92 82                                      else [StringEntry(keyAssetId(caller), toStr(myAssetId)), IntegerEntry(keyAmount(caller), myAmount), StringEntry(keyPartner(caller), partnerAddress), StringEntry(keyWantedAssetId(caller), wantedAssetId), IntegerEntry(keyWantedAmount(caller), wantAmount)]
93 83                                  }
94 84                          }
95 85                      else throw("Strict value is not equal to itself.")
96 86                  }
97 87      }
98 88  
99 89  
100 90  
101 91  @Callable(i)
102 92  func cancel () = {
103 93      let caller = toString(i.caller)
104 94      let assetIdKey = keyAssetId(caller)
105 95      let assetIdRaw = getString(this, assetIdKey)
106 96      if (!(isDefined(assetIdRaw)))
107 97          then throw("You don't have an active deal")
108 98          else {
109 99              let assetIdStr = value(assetIdRaw)
110 100  [ScriptTransfer(i.caller, value(getInteger(this, keyAmount(caller))), fromStr(assetIdStr)), DeleteEntry(assetIdKey), DeleteEntry(keyAmount(caller)), DeleteEntry(keyPartner(caller)), DeleteEntry(keyWantedAssetId(caller)), DeleteEntry(keyWantedAmount(caller))]
111 101              }
112 102      }
113 103  
114 104

Old	New		Differences
42	42
43	43		func checkAsset (wantAssetId) = {
44	44		let asset = fromStr(wantAssetId)
45		-	let result = if ((asset != unit))
46		-	then {
47		-	let nfo = assetInfo(value(asset))
48		-	if ((nfo == unit))
49		-	then throw("Invalid wantAssetId: assetInfo missing")
50		-	else if ((size(value(nfo).id) != 32))
51		-	then throw(("Invalid wantAssetId: assetInfo size is " + toString(size(value(nfo).id))))
52		-	else if ((size(value(nfo).issuer.bytes) != 32))
53		-	then throw(("Invalid wantAssetId: issuer address is " + toBase58String(value(nfo).issuer.bytes)))
54		-	else true
55		-	}
56		-	else true
57		-	if ((result == result))
58		-	then toStr(asset)
59		-	else throw("Strict value is not equal to itself.")
	45	+	if (if ((asset != unit))
	46	+	then (assetInfo(value(asset)) == unit)
	47	+	else false)
	48	+	then throw("Invalid wantAssetId: assetInfo missing")
	49	+	else toStr(asset)
60	50		}
61	51
62	52

Old	New		Differences
1	1		{-# STDLIB_VERSION 5 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4	4		func keyAssetId (address) = ("%s%s__assetId__" + address)
5	5
6	6
7	7		func keyAmount (address) = ("%s%s__amount__" + address)
8	8
9	9
10	10		func keyPartner (address) = ("%s%s__partner__" + address)
11	11
12	12
13	13		func keyWantedAssetId (address) = ("%s%s__wantedAssetId__" + address)
14	14
15	15
16	16		func keyWantedAmount (address) = ("%s%s__wantedAmount__" + address)
17	17
18	18
19	19		func toStr (assetId) = if ((assetId == unit))
20	20		then "WAVES"
21	21		else toBase58String(value(assetId))
22	22
23	23
24	24		func fromStr (assetIdStr) = if ((assetIdStr == "WAVES"))
25	25		then unit
26	26		else fromBase58String(assetIdStr)
27	27
28	28
29	29		func crossCheckAssetIds (partnerAddress,myOfferedAssetId,myWantedAssetId,partnerOfferedAssetId,partnerWantedAssetId) = if (if ((partnerOfferedAssetId != myWantedAssetId))
30	30		then true
31	31		else (partnerWantedAssetId != myOfferedAssetId))
32	32		then throw(((((((((("AssetIds don't match: you want " + myWantedAssetId) + " and pay ") + myOfferedAssetId) + ", but ") + partnerAddress) + " wants ") + partnerWantedAssetId) + " and pays ") + partnerOfferedAssetId))
33	33		else true
34	34
35	35
36	36		func crossCheckAmounts (partnerAddress,myOfferedAmount,myWantedAmount,partnerOfferedAmount,partnerWantedAmount) = if (if ((partnerOfferedAmount != myWantedAmount))
37	37		then true
38	38		else (partnerWantedAmount != myOfferedAmount))
39	39		then throw(((((((((("Amounts don't match: you want " + toString(myWantedAmount)) + " and pay ") + toString(myOfferedAmount)) + ", but ") + partnerAddress) + " wants ") + toString(partnerWantedAmount)) + " and pays ") + toString(partnerOfferedAmount)))
40	40		else true
41	41
42	42
43	43		func checkAsset (wantAssetId) = {
44	44		let asset = fromStr(wantAssetId)
45		-	let result = if ((asset != unit))
46		-	then {
47		-	let nfo = assetInfo(value(asset))
48		-	if ((nfo == unit))
49		-	then throw("Invalid wantAssetId: assetInfo missing")
50		-	else if ((size(value(nfo).id) != 32))
51		-	then throw(("Invalid wantAssetId: assetInfo size is " + toString(size(value(nfo).id))))
52		-	else if ((size(value(nfo).issuer.bytes) != 32))
53		-	then throw(("Invalid wantAssetId: issuer address is " + toBase58String(value(nfo).issuer.bytes)))
54		-	else true
55		-	}
56		-	else true
57		-	if ((result == result))
58		-	then toStr(asset)
59		-	else throw("Strict value is not equal to itself.")
	45	+	if (if ((asset != unit))
	46	+	then (assetInfo(value(asset)) == unit)
	47	+	else false)
	48	+	then throw("Invalid wantAssetId: assetInfo missing")
	49	+	else toStr(asset)
60	50		}
61	51
62	52
63	53		@Callable(i)
64	54		func escrow (wantAssetId,wantAmount,partnerAddress) = {
65	55		let caller = toString(i.caller)
66	56		if (isDefined(getString(this, keyAssetId(caller))))
67	57		then throw("You already have an active deal, please cancel it first")
68	58		else if ((size(i.payments) != 1))
69	59		then throw("Exactly 1 payment expected")
70	60		else {
71	61		let partner = addressFromStringValue(partnerAddress)
72	62		if ((partner == partner))
73	63		then {
74	64		let wantedAssetId = checkAsset(wantAssetId)
75	65		if ((0 >= wantAmount))
76	66		then throw("Non-positive wantAmount")
77	67		else {
78	68		let partnerAssetId = getString(this, keyAssetId(partnerAddress))
79	69		let myAssetId = value(i.payments[0]).assetId
80	70		let myAmount = value(i.payments[0]).amount
81	71		if (isDefined(partnerAssetId))
82	72		then if ((value(getString(this, keyPartner(partnerAddress))) != caller))
83	73		then throw(("You are not a partner of " + partnerAddress))
84	74		else {
85	75		let check = if (crossCheckAssetIds(partnerAddress, toStr(myAssetId), wantedAssetId, value(partnerAssetId), value(getString(this, keyWantedAssetId(partnerAddress)))))
86	76		then crossCheckAmounts(partnerAddress, myAmount, wantAmount, value(getInteger(this, keyAmount(partnerAddress))), value(getInteger(this, keyWantedAmount(partnerAddress))))
87	77		else false
88	78		if ((check == check))
89	79		then [ScriptTransfer(partner, myAmount, myAssetId), ScriptTransfer(i.caller, wantAmount, fromStr(wantedAssetId)), DeleteEntry(keyAssetId(partnerAddress)), DeleteEntry(keyAmount(partnerAddress)), DeleteEntry(keyPartner(partnerAddress)), DeleteEntry(keyWantedAssetId(partnerAddress)), DeleteEntry(keyWantedAmount(partnerAddress))]
90	80		else throw("Strict value is not equal to itself.")
91	81		}
92	82		else [StringEntry(keyAssetId(caller), toStr(myAssetId)), IntegerEntry(keyAmount(caller), myAmount), StringEntry(keyPartner(caller), partnerAddress), StringEntry(keyWantedAssetId(caller), wantedAssetId), IntegerEntry(keyWantedAmount(caller), wantAmount)]
93	83		}
94	84		}
95	85		else throw("Strict value is not equal to itself.")
96	86		}
97	87		}
98	88
99	89
100	90
101	91		@Callable(i)
102	92		func cancel () = {
103	93		let caller = toString(i.caller)
104	94		let assetIdKey = keyAssetId(caller)
105	95		let assetIdRaw = getString(this, assetIdKey)
106	96		if (!(isDefined(assetIdRaw)))
107	97		then throw("You don't have an active deal")
108	98		else {
109	99		let assetIdStr = value(assetIdRaw)
110	100		[ScriptTransfer(i.caller, value(getInteger(this, keyAmount(caller))), fromStr(assetIdStr)), DeleteEntry(assetIdKey), DeleteEntry(keyAmount(caller)), DeleteEntry(keyPartner(caller)), DeleteEntry(keyWantedAssetId(caller)), DeleteEntry(keyWantedAmount(caller))]
111	101		}
112	102		}
113	103
114	104

github/deemru/w8io/6500d08 
44.16 ms ◑