w8 · tx · ANt···Zxw

tx · ANtuEzksYvQhhnYot6hyvSYN9opTA22fF5JHRY8ECZxw

3PAimVkP7cqar6gMKNh5bQDNH9x4U6sXE7u:  -0.01000000 Waves

2022.01.03 16:38 [2927873] smart account 3PAimVkP7cqar6gMKNh5bQDNH9x4U6sXE7u > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "ANtuEzksYvQhhnYot6hyvSYN9opTA22fF5JHRY8ECZxw",
    "fee": 1000000,
    "feeAssetId": null,
    "timestamp": 1641217012056,
    "version": 1,
    "sender": "3PAimVkP7cqar6gMKNh5bQDNH9x4U6sXE7u",
    "senderPublicKey": "FZMCzazzRQMocGNfhYr2gvt3qrzyG2Z6FCw1nTDmkDCA",
    "proofs": [
        "5um1QP3hZ7qjDBV2qwty9JqzqjGGefvDkqh38B7mh6kahqRmMyRALvDrZ2jnVttVp1kmLSSQwP6XfapA1gkbtK2A"
    ],
    "script": "base64:AAIFAAAAAAAAAAsIAhIFCgMIAQgSAAAAAAkBAAAACmtleUFzc2V0SWQAAAABAAAAB2FkZHJlc3MJAAEsAAAAAgIAAAAPJXMlc19fYXNzZXRJZF9fBQAAAAdhZGRyZXNzAQAAAAlrZXlBbW91bnQAAAABAAAAB2FkZHJlc3MJAAEsAAAAAgIAAAAOJXMlc19fYW1vdW50X18FAAAAB2FkZHJlc3MBAAAACmtleVBhcnRuZXIAAAABAAAAB2FkZHJlc3MJAAEsAAAAAgIAAAAPJXMlc19fcGFydG5lcl9fBQAAAAdhZGRyZXNzAQAAABBrZXlXYW50ZWRBc3NldElkAAAAAQAAAAdhZGRyZXNzCQABLAAAAAICAAAAFSVzJXNfX3dhbnRlZEFzc2V0SWRfXwUAAAAHYWRkcmVzcwEAAAAPa2V5V2FudGVkQW1vdW50AAAAAQAAAAdhZGRyZXNzCQABLAAAAAICAAAAFCVzJXNfX3dhbnRlZEFtb3VudF9fBQAAAAdhZGRyZXNzAQAAAAV0b1N0cgAAAAEAAAAHYXNzZXRJZAMJAAAAAAAAAgUAAAAHYXNzZXRJZAUAAAAEdW5pdAIAAAAFV0FWRVMJAAJYAAAAAQkBAAAABXZhbHVlAAAAAQUAAAAHYXNzZXRJZAEAAAAHZnJvbVN0cgAAAAEAAAAKYXNzZXRJZFN0cgMJAAAAAAAAAgUAAAAKYXNzZXRJZFN0cgIAAAAFV0FWRVMFAAAABHVuaXQJAAJZAAAAAQUAAAAKYXNzZXRJZFN0cgEAAAASY3Jvc3NDaGVja0Fzc2V0SWRzAAAABQAAAA5wYXJ0bmVyQWRkcmVzcwAAABBteU9mZmVyZWRBc3NldElkAAAAD215V2FudGVkQXNzZXRJZAAAABVwYXJ0bmVyT2ZmZXJlZEFzc2V0SWQAAAAUcGFydG5lcldhbnRlZEFzc2V0SWQDAwkBAAAAAiE9AAAAAgUAAAAVcGFydG5lck9mZmVyZWRBc3NldElkBQAAAA9teVdhbnRlZEFzc2V0SWQGCQEAAAACIT0AAAACBQAAABRwYXJ0bmVyV2FudGVkQXNzZXRJZAUAAAAQbXlPZmZlcmVkQXNzZXRJZAkAAAIAAAABCQABLAAAAAIJAAEsAAAAAgkAASwAAAACCQABLAAAAAIJAAEsAAAAAgkAASwAAAAC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c3MEAAAABWNoZWNrAwkBAAAAEmNyb3NzQ2hlY2tBc3NldElkcwAAAAUFAAAADnBhcnRuZXJBZGRyZXNzCQEAAAAFdG9TdHIAAAABBQAAAAlteUFzc2V0SWQFAAAADXdhbnRlZEFzc2V0SWQJAQAAAAV2YWx1ZQAAAAEFAAAADnBhcnRuZXJBc3NldElkCQEAAAAFdmFsdWUAAAABCQAEHQAAAAIFAAAABHRoaXMJAQAAABBrZXlXYW50ZWRBc3NldElkAAAAAQUAAAAOcGFydG5lckFkZHJlc3MJAQAAABFjcm9zc0NoZWNrQW1vdW50cwAAAAUFAAAADnBhcnRuZXJBZGRyZXNzBQAAAAhteUFtb3VudAUAAAAKd2FudEFtb3VudAkBAAAABXZhbHVlAAAAAQkABBoAAAACBQAAAAR0aGlzCQEAAAAJa2V5QW1vdW50AAAAAQUAAAAOcGFydG5lckFkZHJlc3MJAQAAAAV2YWx1ZQAAAAEJAAQaAAAAAgUAAAAEdGhpcwkBAAAAD2tleVdhbnRlZEFtb3VudAAAAAEFAAAADnBhcnRuZXJBZGRyZXNzBwMJAAAAAAAAAgUAAAAFY2hlY2sFAAAABWNoZWNrCQAETAAAAAIJAQAAAA5TY3JpcHRUcmFuc2ZlcgAAAAMFAAAAB3BhcnRuZXIFAAAACG15QW1vdW50BQAAAAlteUFzc2V0SWQJAARMAAAAAgkBAAAADlNjcmlwdFRyYW5zZmVyAAAAAwgFAAAAAWkAAAAGY2FsbGVyBQAAAAp3YW50QW1vdW50CQEAAAAHZnJvbVN0cgAAAAEFAAAADXdhbnRlZEFzc2V0SWQJAARMAAAAAgkBAAAAC0RlbGV0ZUVudHJ5AAAAAQkBAAAACmtleUFzc2V0SWQAAAABBQAAAA5wYXJ0bmVyQWRkcmVzcwkABEwAAAACCQEAAAALRGVsZXRlRW50cnkAAAABCQEAAAAJa2V5QW1vdW50AAAAAQUAAAAOcGFydG5lckFkZHJlc3MJAARMAAAAAgkBAAAAC0RlbGV0ZUVudHJ5AAAAAQkBAAAACmtleVBhcnRuZXIAAAABBQAAAA5wYXJ0bmVyQWRkcmVzcwkABEwAAAACCQEAAAALRGVsZXRlRW50cnkAAAABCQEAAAAQa2V5V2FudGVkQXNzZXRJZAAAAAEFAAAADnBhcnRuZXJBZGRyZXNzCQAETAAAAAIJAQAAAAtEZWxldGVFbnRyeQAAAAEJAQAAAA9rZXlXYW50ZWRBbW91bnQAAAABBQAAAA5wYXJ0bmVyQWRkcmVzcwUAAAADbmlsCQAAAgAAAAECAAAAJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkABEwAAAACCQEAAAALU3RyaW5nRW50cnkAAAACCQEAAAAKa2V5QXNzZXRJZAAAAAEFAAAABmNhbGxlcgkBAAAABXRvU3RyAAAAAQUAAAAJbXlBc3NldElkCQAETAAAAAIJAQAAAAxJbnRlZ2VyRW50cnkAAAACCQEAAAAJa2V5QW1vdW50AAAAAQUAAAAGY2FsbGVyBQAAAAhteUFtb3VudAkABEwAAAACCQEAAAALU3RyaW5nRW50cnkAAAACCQEAAAAKa2V5UGFydG5lcgAAAAEFAAAABmNhbGxlcgUAAAAOcGFydG5lckFkZHJlc3MJAARMAAAAAgkBAAAAC1N0cmluZ0VudHJ5AAAAAgkBAAAAEGtleVdhbnRlZEFzc2V0SWQAAAABBQAAAAZjYWxsZXIFAAAADXdhbnRlZEFzc2V0SWQJAARMAAAAAgkBAAAADEludGVnZXJFbnRyeQAAAAIJAQAAAA9rZXlXYW50ZWRBbW91bnQAAAABBQAAAAZjYWxsZXIFAAAACndhbnRBbW91bnQFAAAAA25pbAkAAAIAAAABAgAAACRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAACAAAAAQIAAAAkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAAAAAWkBAAAABmNhbmNlbAAAAAAEAAAABmNhbGxlcgkABCUAAAABCAUAAAABaQAAAAZjYWxsZXIEAAAACmFzc2V0SWRLZXkJAQAAAAprZXlBc3NldElkAAAAAQUAAAAGY2FsbGVyBAAAAAphc3NldElkUmF3CQAEHQAAAAIFAAAABHRoaXMFAAAACmFzc2V0SWRLZXkDCQEAAAABIQAAAAEJAQAAAAlpc0RlZmluZWQAAAABBQAAAAphc3NldElkUmF3CQAAAgAAAAECAAAAHVlvdSBkb24ndCBoYXZlIGFuIGFjdGl2ZSBkZWFsBAAAAAphc3NldElkU3RyCQEAAAAFdmFsdWUAAAABBQAAAAphc3NldElkUmF3CQAETAAAAAIJAQAAAA5TY3JpcHRUcmFuc2ZlcgAAAAMIBQAAAAFpAAAABmNhbGxlcgkBAAAABXZhbHVlAAAAAQkABBoAAAACBQAAAAR0aGlzCQEAAAAJa2V5QW1vdW50AAAAAQUAAAAGY2FsbGVyCQEAAAAHZnJvbVN0cgAAAAEFAAAACmFzc2V0SWRTdHIJAARMAAAAAgkBAAAAC0RlbGV0ZUVudHJ5AAAAAQUAAAAKYXNzZXRJZEtleQkABEwAAAACCQEAAAALRGVsZXRlRW50cnkAAAABCQEAAAAJa2V5QW1vdW50AAAAAQUAAAAGY2FsbGVyCQAETAAAAAIJAQAAAAtEZWxldGVFbnRyeQAAAAEJAQAAAAprZXlQYXJ0bmVyAAAAAQUAAAAGY2FsbGVyCQAETAAAAAIJAQAAAAtEZWxldGVFbnRyeQAAAAEJAQAAABBrZXlXYW50ZWRBc3NldElkAAAAAQUAAAAGY2FsbGVyCQAETAAAAAIJAQAAAAtEZWxldGVFbnRyeQAAAAEJAQAAAA9rZXlXYW50ZWRBbW91bnQAAAABBQAAAAZjYWxsZXIFAAAAA25pbAAAAAB4TdZy",
    "chainId": 87,
    "height": 2927873,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: 3xgSAM58g3TY2rgbbxQqec5Bw2757z3FVXVvbK6pMNxU
Next: FKqe3qf1n3mNtiFHT4LaB3CPHdcrZJKbfkjXw5QGE2Jg

Diff: 
Old New Differences
41 41  
42 42  
43 43  @Callable(i)
44 - func escrow (wantedAssetId,wantedAmount,partnerAddress) = {
44 + func escrow (wantAssetId,wantAmount,partnerAddress) = {
45 45      let caller = toString(i.caller)
46 46      if (isDefined(getString(this, keyAssetId(caller))))
47 47          then throw("You already have an active deal, please cancel it first")
49 49              then throw("Exactly 1 payment expected")
50 50              else {
51 51                  let partner = addressFromStringValue(partnerAddress)
52 -                 let partnerAssetId = getString(this, keyAssetId(partnerAddress))
53 -                 let myAssetId = value(i.payments[0]).assetId
54 -                 let myAmount = value(i.payments[0]).amount
55 -                 if (isDefined(partnerAssetId))
56 -                     then if ((value(getString(this, keyPartner(partnerAddress))) != caller))
57 -                         then throw(("You are not a partner of " + partnerAddress))
58 -                         else {
59 -                             let check = if (crossCheckAssetIds(partnerAddress, toStr(myAssetId), wantedAssetId, value(partnerAssetId), value(getString(this, keyWantedAssetId(partnerAddress)))))
60 -                                 then crossCheckAmounts(partnerAddress, myAmount, wantedAmount, value(getInteger(this, keyAmount(partnerAddress))), value(getInteger(this, keyWantedAmount(partnerAddress))))
61 -                                 else false
62 -                             if ((check == check))
63 -                                 then [ScriptTransfer(partner, myAmount, myAssetId), ScriptTransfer(i.caller, wantedAmount, fromStr(wantedAssetId)), DeleteEntry(keyAssetId(partnerAddress)), DeleteEntry(keyAmount(partnerAddress)), DeleteEntry(keyPartner(partnerAddress)), DeleteEntry(keyWantedAssetId(partnerAddress)), DeleteEntry(keyWantedAmount(partnerAddress))]
64 -                                 else throw("Strict value is not equal to itself.")
65 -                             }
66 -                     else [StringEntry(keyAssetId(caller), toStr(myAssetId)), IntegerEntry(keyAmount(caller), myAmount), StringEntry(keyPartner(caller), partnerAddress), StringEntry(keyWantedAssetId(caller), wantedAssetId), IntegerEntry(keyWantedAmount(caller), wantedAmount)]
52 +                 if ((partner == partner))
53 +                     then {
54 +                         let wantedAssetId = toStr(fromStr(wantAssetId))
55 +                         if ((wantedAssetId == wantedAssetId))
56 +                             then if ((0 >= wantAmount))
57 +                                 then throw("Non-positive wantAmount")
58 +                                 else {
59 +                                     let partnerAssetId = getString(this, keyAssetId(partnerAddress))
60 +                                     let myAssetId = value(i.payments[0]).assetId
61 +                                     let myAmount = value(i.payments[0]).amount
62 +                                     if (isDefined(partnerAssetId))
63 +                                         then if ((value(getString(this, keyPartner(partnerAddress))) != caller))
64 +                                             then throw(("You are not a partner of " + partnerAddress))
65 +                                             else {
66 +                                                 let check = if (crossCheckAssetIds(partnerAddress, toStr(myAssetId), wantedAssetId, value(partnerAssetId), value(getString(this, keyWantedAssetId(partnerAddress)))))
67 +                                                     then crossCheckAmounts(partnerAddress, myAmount, wantAmount, value(getInteger(this, keyAmount(partnerAddress))), value(getInteger(this, keyWantedAmount(partnerAddress))))
68 +                                                     else false
69 +                                                 if ((check == check))
70 +                                                     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))]
71 +                                                     else throw("Strict value is not equal to itself.")
72 +                                                 }
73 +                                         else [StringEntry(keyAssetId(caller), toStr(myAssetId)), IntegerEntry(keyAmount(caller), myAmount), StringEntry(keyPartner(caller), partnerAddress), StringEntry(keyWantedAssetId(caller), wantedAssetId), IntegerEntry(keyWantedAmount(caller), wantAmount)]
74 +                                     }
75 +                             else throw("Strict value is not equal to itself.")
76 +                         }
77 +                     else throw("Strict value is not equal to itself.")
67 78                  }
68 79      }
69 80  
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  @Callable(i)
44 - func escrow (wantedAssetId,wantedAmount,partnerAddress) = {
44 + func escrow (wantAssetId,wantAmount,partnerAddress) = {
45 45      let caller = toString(i.caller)
46 46      if (isDefined(getString(this, keyAssetId(caller))))
47 47          then throw("You already have an active deal, please cancel it first")
48 48          else if ((size(i.payments) != 1))
49 49              then throw("Exactly 1 payment expected")
50 50              else {
51 51                  let partner = addressFromStringValue(partnerAddress)
52 -                 let partnerAssetId = getString(this, keyAssetId(partnerAddress))
53 -                 let myAssetId = value(i.payments[0]).assetId
54 -                 let myAmount = value(i.payments[0]).amount
55 -                 if (isDefined(partnerAssetId))
56 -                     then if ((value(getString(this, keyPartner(partnerAddress))) != caller))
57 -                         then throw(("You are not a partner of " + partnerAddress))
58 -                         else {
59 -                             let check = if (crossCheckAssetIds(partnerAddress, toStr(myAssetId), wantedAssetId, value(partnerAssetId), value(getString(this, keyWantedAssetId(partnerAddress)))))
60 -                                 then crossCheckAmounts(partnerAddress, myAmount, wantedAmount, value(getInteger(this, keyAmount(partnerAddress))), value(getInteger(this, keyWantedAmount(partnerAddress))))
61 -                                 else false
62 -                             if ((check == check))
63 -                                 then [ScriptTransfer(partner, myAmount, myAssetId), ScriptTransfer(i.caller, wantedAmount, fromStr(wantedAssetId)), DeleteEntry(keyAssetId(partnerAddress)), DeleteEntry(keyAmount(partnerAddress)), DeleteEntry(keyPartner(partnerAddress)), DeleteEntry(keyWantedAssetId(partnerAddress)), DeleteEntry(keyWantedAmount(partnerAddress))]
64 -                                 else throw("Strict value is not equal to itself.")
65 -                             }
66 -                     else [StringEntry(keyAssetId(caller), toStr(myAssetId)), IntegerEntry(keyAmount(caller), myAmount), StringEntry(keyPartner(caller), partnerAddress), StringEntry(keyWantedAssetId(caller), wantedAssetId), IntegerEntry(keyWantedAmount(caller), wantedAmount)]
52 +                 if ((partner == partner))
53 +                     then {
54 +                         let wantedAssetId = toStr(fromStr(wantAssetId))
55 +                         if ((wantedAssetId == wantedAssetId))
56 +                             then if ((0 >= wantAmount))
57 +                                 then throw("Non-positive wantAmount")
58 +                                 else {
59 +                                     let partnerAssetId = getString(this, keyAssetId(partnerAddress))
60 +                                     let myAssetId = value(i.payments[0]).assetId
61 +                                     let myAmount = value(i.payments[0]).amount
62 +                                     if (isDefined(partnerAssetId))
63 +                                         then if ((value(getString(this, keyPartner(partnerAddress))) != caller))
64 +                                             then throw(("You are not a partner of " + partnerAddress))
65 +                                             else {
66 +                                                 let check = if (crossCheckAssetIds(partnerAddress, toStr(myAssetId), wantedAssetId, value(partnerAssetId), value(getString(this, keyWantedAssetId(partnerAddress)))))
67 +                                                     then crossCheckAmounts(partnerAddress, myAmount, wantAmount, value(getInteger(this, keyAmount(partnerAddress))), value(getInteger(this, keyWantedAmount(partnerAddress))))
68 +                                                     else false
69 +                                                 if ((check == check))
70 +                                                     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))]
71 +                                                     else throw("Strict value is not equal to itself.")
72 +                                                 }
73 +                                         else [StringEntry(keyAssetId(caller), toStr(myAssetId)), IntegerEntry(keyAmount(caller), myAmount), StringEntry(keyPartner(caller), partnerAddress), StringEntry(keyWantedAssetId(caller), wantedAssetId), IntegerEntry(keyWantedAmount(caller), wantAmount)]
74 +                                     }
75 +                             else throw("Strict value is not equal to itself.")
76 +                         }
77 +                     else throw("Strict value is not equal to itself.")
67 78                  }
68 79      }
69 80  
70 81  
71 82  
72 83  @Callable(i)
73 84  func cancel () = {
74 85      let caller = toString(i.caller)
75 86      let assetIdKey = keyAssetId(caller)
76 87      let assetIdRaw = getString(this, assetIdKey)
77 88      if (!(isDefined(assetIdRaw)))
78 89          then throw("You don't have an active deal")
79 90          else {
80 91              let assetIdStr = value(assetIdRaw)
81 92  [ScriptTransfer(i.caller, value(getInteger(this, keyAmount(caller))), fromStr(assetIdStr)), DeleteEntry(assetIdKey), DeleteEntry(keyAmount(caller)), DeleteEntry(keyPartner(caller)), DeleteEntry(keyWantedAssetId(caller)), DeleteEntry(keyWantedAmount(caller))]
82 93              }
83 94      }
84 95  
85 96

Old	New		Differences
41	41
42	42
43	43		@Callable(i)
44		-	func escrow (~~wantedAssetId~~,~~wantedAmount~~,partnerAddress) = {
	44	+	func escrow (wantAssetId,wantAmount,partnerAddress) = {
45	45		let caller = toString(i.caller)
46	46		if (isDefined(getString(this, keyAssetId(caller))))
47	47		then throw("You already have an active deal, please cancel it first")

49	49		then throw("Exactly 1 payment expected")
50	50		else {
51	51		let partner = addressFromStringValue(partnerAddress)
52		-	let partnerAssetId = getString(this, keyAssetId(partnerAddress))
53		-	let myAssetId = value(i.payments[0]).assetId
54		-	let myAmount = value(i.payments[0]).amount
55		-	if (isDefined(partnerAssetId))
56		-	then if ((value(getString(this, keyPartner(partnerAddress))) != caller))
57		-	then throw(("You are not a partner of " + partnerAddress))
58		-	else {
59		-	let check = if (crossCheckAssetIds(partnerAddress, toStr(myAssetId), wantedAssetId, value(partnerAssetId), value(getString(this, keyWantedAssetId(partnerAddress)))))
60		-	then crossCheckAmounts(partnerAddress, myAmount, wantedAmount, value(getInteger(this, keyAmount(partnerAddress))), value(getInteger(this, keyWantedAmount(partnerAddress))))
61		-	else false
62		-	if ((check == check))
63		-	then [ScriptTransfer(partner, myAmount, myAssetId), ScriptTransfer(i.caller, wantedAmount, fromStr(wantedAssetId)), DeleteEntry(keyAssetId(partnerAddress)), DeleteEntry(keyAmount(partnerAddress)), DeleteEntry(keyPartner(partnerAddress)), DeleteEntry(keyWantedAssetId(partnerAddress)), DeleteEntry(keyWantedAmount(partnerAddress))]
64		-	else throw("Strict value is not equal to itself.")
65		-	}
66		-	else [StringEntry(keyAssetId(caller), toStr(myAssetId)), IntegerEntry(keyAmount(caller), myAmount), StringEntry(keyPartner(caller), partnerAddress), StringEntry(keyWantedAssetId(caller), wantedAssetId), IntegerEntry(keyWantedAmount(caller), wantedAmount)]
	52	+	if ((partner == partner))
	53	+	then {
	54	+	let wantedAssetId = toStr(fromStr(wantAssetId))
	55	+	if ((wantedAssetId == wantedAssetId))
	56	+	then if ((0 >= wantAmount))
	57	+	then throw("Non-positive wantAmount")
	58	+	else {
	59	+	let partnerAssetId = getString(this, keyAssetId(partnerAddress))
	60	+	let myAssetId = value(i.payments[0]).assetId
	61	+	let myAmount = value(i.payments[0]).amount
	62	+	if (isDefined(partnerAssetId))
	63	+	then if ((value(getString(this, keyPartner(partnerAddress))) != caller))
	64	+	then throw(("You are not a partner of " + partnerAddress))
	65	+	else {
	66	+	let check = if (crossCheckAssetIds(partnerAddress, toStr(myAssetId), wantedAssetId, value(partnerAssetId), value(getString(this, keyWantedAssetId(partnerAddress)))))
	67	+	then crossCheckAmounts(partnerAddress, myAmount, wantAmount, value(getInteger(this, keyAmount(partnerAddress))), value(getInteger(this, keyWantedAmount(partnerAddress))))
	68	+	else false
	69	+	if ((check == check))
	70	+	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))]
	71	+	else throw("Strict value is not equal to itself.")
	72	+	}
	73	+	else [StringEntry(keyAssetId(caller), toStr(myAssetId)), IntegerEntry(keyAmount(caller), myAmount), StringEntry(keyPartner(caller), partnerAddress), StringEntry(keyWantedAssetId(caller), wantedAssetId), IntegerEntry(keyWantedAmount(caller), wantAmount)]
	74	+	}
	75	+	else throw("Strict value is not equal to itself.")
	76	+	}
	77	+	else throw("Strict value is not equal to itself.")
67	78		}
68	79		}
69	80

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		@Callable(i)
44		-	func escrow (~~wantedAssetId~~,~~wantedAmount~~,partnerAddress) = {
	44	+	func escrow (wantAssetId,wantAmount,partnerAddress) = {
45	45		let caller = toString(i.caller)
46	46		if (isDefined(getString(this, keyAssetId(caller))))
47	47		then throw("You already have an active deal, please cancel it first")
48	48		else if ((size(i.payments) != 1))
49	49		then throw("Exactly 1 payment expected")
50	50		else {
51	51		let partner = addressFromStringValue(partnerAddress)
52		-	let partnerAssetId = getString(this, keyAssetId(partnerAddress))
53		-	let myAssetId = value(i.payments[0]).assetId
54		-	let myAmount = value(i.payments[0]).amount
55		-	if (isDefined(partnerAssetId))
56		-	then if ((value(getString(this, keyPartner(partnerAddress))) != caller))
57		-	then throw(("You are not a partner of " + partnerAddress))
58		-	else {
59		-	let check = if (crossCheckAssetIds(partnerAddress, toStr(myAssetId), wantedAssetId, value(partnerAssetId), value(getString(this, keyWantedAssetId(partnerAddress)))))
60		-	then crossCheckAmounts(partnerAddress, myAmount, wantedAmount, value(getInteger(this, keyAmount(partnerAddress))), value(getInteger(this, keyWantedAmount(partnerAddress))))
61		-	else false
62		-	if ((check == check))
63		-	then [ScriptTransfer(partner, myAmount, myAssetId), ScriptTransfer(i.caller, wantedAmount, fromStr(wantedAssetId)), DeleteEntry(keyAssetId(partnerAddress)), DeleteEntry(keyAmount(partnerAddress)), DeleteEntry(keyPartner(partnerAddress)), DeleteEntry(keyWantedAssetId(partnerAddress)), DeleteEntry(keyWantedAmount(partnerAddress))]
64		-	else throw("Strict value is not equal to itself.")
65		-	}
66		-	else [StringEntry(keyAssetId(caller), toStr(myAssetId)), IntegerEntry(keyAmount(caller), myAmount), StringEntry(keyPartner(caller), partnerAddress), StringEntry(keyWantedAssetId(caller), wantedAssetId), IntegerEntry(keyWantedAmount(caller), wantedAmount)]
	52	+	if ((partner == partner))
	53	+	then {
	54	+	let wantedAssetId = toStr(fromStr(wantAssetId))
	55	+	if ((wantedAssetId == wantedAssetId))
	56	+	then if ((0 >= wantAmount))
	57	+	then throw("Non-positive wantAmount")
	58	+	else {
	59	+	let partnerAssetId = getString(this, keyAssetId(partnerAddress))
	60	+	let myAssetId = value(i.payments[0]).assetId
	61	+	let myAmount = value(i.payments[0]).amount
	62	+	if (isDefined(partnerAssetId))
	63	+	then if ((value(getString(this, keyPartner(partnerAddress))) != caller))
	64	+	then throw(("You are not a partner of " + partnerAddress))
	65	+	else {
	66	+	let check = if (crossCheckAssetIds(partnerAddress, toStr(myAssetId), wantedAssetId, value(partnerAssetId), value(getString(this, keyWantedAssetId(partnerAddress)))))
	67	+	then crossCheckAmounts(partnerAddress, myAmount, wantAmount, value(getInteger(this, keyAmount(partnerAddress))), value(getInteger(this, keyWantedAmount(partnerAddress))))
	68	+	else false
	69	+	if ((check == check))
	70	+	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))]
	71	+	else throw("Strict value is not equal to itself.")
	72	+	}
	73	+	else [StringEntry(keyAssetId(caller), toStr(myAssetId)), IntegerEntry(keyAmount(caller), myAmount), StringEntry(keyPartner(caller), partnerAddress), StringEntry(keyWantedAssetId(caller), wantedAssetId), IntegerEntry(keyWantedAmount(caller), wantAmount)]
	74	+	}
	75	+	else throw("Strict value is not equal to itself.")
	76	+	}
	77	+	else throw("Strict value is not equal to itself.")
67	78		}
68	79		}
69	80
70	81
71	82
72	83		@Callable(i)
73	84		func cancel () = {
74	85		let caller = toString(i.caller)
75	86		let assetIdKey = keyAssetId(caller)
76	87		let assetIdRaw = getString(this, assetIdKey)
77	88		if (!(isDefined(assetIdRaw)))
78	89		then throw("You don't have an active deal")
79	90		else {
80	91		let assetIdStr = value(assetIdRaw)
81	92		[ScriptTransfer(i.caller, value(getInteger(this, keyAmount(caller))), fromStr(assetIdStr)), DeleteEntry(assetIdKey), DeleteEntry(keyAmount(caller)), DeleteEntry(keyPartner(caller)), DeleteEntry(keyWantedAssetId(caller)), DeleteEntry(keyWantedAmount(caller))]
82	93		}
83	94		}
84	95
85	96

github/deemru/w8io/3ef1775 
33.16 ms ◑