w8 · tx · 3xg···NxU

tx · 3xgSAM58g3TY2rgbbxQqec5Bw2757z3FVXVvbK6pMNxU

3PAimVkP7cqar6gMKNh5bQDNH9x4U6sXE7u:  -0.01000000 Waves

2022.01.03 16:06 [2927839] smart account 3PAimVkP7cqar6gMKNh5bQDNH9x4U6sXE7u > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "3xgSAM58g3TY2rgbbxQqec5Bw2757z3FVXVvbK6pMNxU",
    "fee": 1000000,
    "feeAssetId": null,
    "timestamp": 1641215165935,
    "version": 1,
    "sender": "3PAimVkP7cqar6gMKNh5bQDNH9x4U6sXE7u",
    "senderPublicKey": "FZMCzazzRQMocGNfhYr2gvt3qrzyG2Z6FCw1nTDmkDCA",
    "proofs": [
        "2raVTnwMWNVMK4uPanaaZiEf2ZRuRD1VWKviumA9MZcw385Z9gdFuPu3oQvnd3suwrN2TM6THiCgn8XcvHJPwD9W"
    ],
    "script": "base64:AAIFAAAAAAAAAAsIAhIFCgMIAQgSAAAAAAkBAAAACmtleUFzc2V0SWQAAAABAAAAB2FkZHJlc3MJAAEsAAAAAgIAAAAPJXMlc19fYXNzZXRJZF9fBQAAAAdhZGRyZXNzAQAAAAlrZXlBbW91bnQAAAABAAAAB2FkZHJlc3MJAAEsAAAAAgIAAAAOJXMlc19fYW1vdW50X18FAAAAB2FkZHJlc3MBAAAACmtleVBhcnRuZXIAAAABAAAAB2FkZHJlc3MJAAEsAAAAAgIAAAAPJXMlc19fcGFydG5lcl9fBQAAAAdhZGRyZXNzAQAAABBrZXlXYW50ZWRBc3NldElkAAAAAQAAAAdhZGRyZXNzCQABLAAAAAICAAAAFSVzJXNfX3dhbnRlZEFzc2V0SWRfXwUAAAAHYWRkcmVzcwEAAAAPa2V5V2FudGVkQW1vdW50AAAAAQAAAAdhZGRyZXNzCQABLAAAAAICAAAAFCVzJXNfX3dhbnRlZEFtb3VudF9fBQAAAAdhZGRyZXNzAQAAAAV0b1N0cgAAAAEAAAAHYXNzZXRJZAMJAAAAAAAAAgUAAAAHYXNzZXRJZAUAAAAEdW5pdAIAAAAFV0FWRVMJAAJYAAAAAQkBAAAABXZhbHVlAAAAAQUAAAAHYXNzZXRJZAEAAAAHZnJvbVN0cgAAAAEAAAAKYXNzZXRJZFN0cgMJAAAAAAAAAgUAAAAKYXNzZXRJZFN0cgIAAAAFV0FWRVMFAAAABHVuaXQJAAJZAAAAAQUAAAAKYXNzZXRJZFN0cgEAAAASY3Jvc3NDaGVja0Fzc2V0SWRzAAAABQAAAA5wYXJ0bmVyQWRkcmVzcwAAABBteU9mZmVyZWRBc3NldElkAAAAD215V2FudGVkQXNzZXRJZAAAABVwYXJ0bmVyT2ZmZXJlZEFzc2V0SWQAAAAUcGFydG5lcldhbnRlZEFzc2V0SWQDAwkBAAAAAiE9AAAAAgUAAAAVcGFydG5lck9mZmVyZWRBc3NldElkBQAAAA9teVdhbnRlZEFzc2V0SWQGCQEAAAACIT0AAAACBQAAABRwYXJ0bmVyV2FudGVkQXNzZXRJZAUAAAAQbXlPZmZlcmVkQXNzZXRJZAkAAAIAAAABCQABLAAAAAIJAAEsAAAAAgkAASwAAAACCQABLAAAAAIJAAEsAAAAAgkAASwAAAACCQABLAAAAAIJAAEsAAAAAgkAASwAAAACAgAAAB9Bc3NldElkcyBkb24ndCBtYXRjaDogeW91IHdhbnQgBQAAAA9teVdhbnRlZEFzc2V0SWQCAAAACSBhbmQgcGF5IAUAAAAQbXlPZmZlcmVkQXNzZXRJZAIAAAAGLCBidXQgBQAAAA5wYXJ0bmVyQWRkcmVzcwIAAAAHIHdhbnRzIAUAAAAUcGFydG5lcldhbnRlZEFzc2V0SWQCAAAACiBhbmQgcGF5cyAFAAAAFXBhcnRuZXJPZmZlcmVkQXNzZXRJZAYBAAAAEWNyb3NzQ2hlY2tBbW91bnRzAAAABQAAAA5wYXJ0bmVyQWRkcmVzcwAAAA9teU9mZmVyZWRBbW91bnQAAAAObXlXYW50ZWRBbW91bnQAAAAUcGFydG5lck9mZmVyZWRBbW91bnQAAAATcGFydG5lcldhbnRlZEFtb3VudAMDCQEAAAACIT0AAAACBQAAABRwYXJ0bmVyT2ZmZXJlZEFtb3VudAUAAAAObXlXYW50ZWRBbW91bnQGCQEAAAACIT0AAAACBQAAABNwYXJ0bmVyV2FudGVkQW1vdW50BQAAAA9teU9mZmVyZWRBbW91bnQJAAACAAAAAQkAASwAAAACCQABLAAAAAIJAAEsAAAAAgkAASwAAAACCQABLAAAAAIJAAEsAAAAAgkAASwAAAACCQABLAAAAAIJAAEsAAAAAgIAAAAeQW1vdW50cyBkb24ndCBtYXRjaDogeW91IHdhbnQgCQABpAAAAAEFAAAADm15V2FudGVkQW1vdW50AgAAAAkgYW5kIHBheSAJAAGkAAAAAQUAAAAPbXlPZmZlcmVkQW1vdW50AgAAAAYsIGJ1dCAFAAAADnBhcnRuZXJBZGRyZXNzAgAAAAcgd2FudHMgCQABpAAAAAEFAAAAE3BhcnRuZXJXYW50ZWRBbW91bnQCAAAACiBhbmQgcGF5cyAJAAGkAAAAAQUAAAAUcGFydG5lck9mZmVyZWRBbW91bnQGAAAAAgAAAAFpAQAAAAZlc2Nyb3cAAAADAAAADXdhbnRlZEFzc2V0SWQAAAAMd2FudGVkQW1vdW50AAAADnBhcnRuZXJBZGRyZXNzBAAAAAZjYWxsZXIJAAQlAAAAAQgFAAAAAWkAAAAGY2FsbGVyAwkBAAAACWlzRGVmaW5lZAAAAAEJAAQdAAAAAgUAAAAEdGhpcwkBAAAACmtleUFzc2V0SWQAAAABBQAAAAZjYWxsZXIJAAACAAAAAQIAAAA3WW91IGFscmVhZHkgaGF2ZSBhbiBhY3RpdmUgZGVhbCwgcGxlYXNlIGNhbmNlbCBpdCBmaXJzdAMJAQAAAAIhPQAAAAIJAAGQAAAAAQgFAAAAAWkAAAAIcGF5bWVudHMAAAAAAAAAAAEJAAACAAAAAQIAAAAaRXhhY3RseSAxIHBheW1lbnQgZXhwZWN0ZWQEAAAAB3BhcnRuZXIJAQAAABFAZXh0ck5hdGl2ZSgxMDYyKQAAAAEFAAAADnBhcnRuZXJBZGRyZXNzBAAAAA5wYXJ0bmVyQXNzZXRJZAkABB0AAAACBQAAAAR0aGlzCQEAAAAKa2V5QXNzZXRJZAAAAAEFAAAADnBhcnRuZXJBZGRyZXNzBAAAAAlteUFzc2V0SWQICQEAAAAFdmFsdWUAAAABCQABkQAAAAIIBQAAAAFpAAAACHBheW1lbnRzAAAAAAAAAAAAAAAAB2Fzc2V0SWQEAAAACG15QW1vdW50CAkBAAAABXZhbHVlAAAAAQkAAZEAAAACCAUAAAABaQAAAAhwYXltZW50cwAAAAAAAAAAAAAAAAZhbW91bnQDCQEAAAAJaXNEZWZpbmVkAAAAAQUAAAAOcGFydG5lckFzc2V0SWQDCQEAAAACIT0AAAACCQEAAAAFdmFsdWUAAAABCQAEHQAAAAIFAAAABHRoaXMJAQAAAAprZXlQYXJ0bmVyAAAAAQUAAAAOcGFydG5lckFkZHJlc3MFAAAABmNhbGxlcgkAAAIAAAABCQABLAAAAAICAAAAGVlvdSBhcmUgbm90IGEgcGFydG5lciBvZiAFAAAADnBhcnRuZXJBZGRyZXNzBAAAAAVjaGVjawMJAQAAABJjcm9zc0NoZWNrQXNzZXRJZHMAAAAFBQAAAA5wYXJ0bmVyQWRkcmVzcwkBAAAABXRvU3RyAAAAAQUAAAAJbXlBc3NldElkBQAAAA13YW50ZWRBc3NldElkCQEAAAAFdmFsdWUAAAABBQAAAA5wYXJ0bmVyQXNzZXRJZAkBAAAABXZhbHVlAAAAAQkABB0AAAACBQAAAAR0aGlzCQEAAAAQa2V5V2FudGVkQXNzZXRJZAAAAAEFAAAADnBhcnRuZXJBZGRyZXNzCQEAAAARY3Jvc3NDaGVja0Ftb3VudHMAAAAFBQAAAA5wYXJ0bmVyQWRkcmVzcwUAAAAIbXlBbW91bnQFAAAADHdhbnRlZEFtb3VudAkBAAAABXZhbHVlAAAAAQkABBoAAAACBQAAAAR0aGlzCQEAAAAJa2V5QW1vdW50AAAAAQUAAAAOcGFydG5lckFkZHJlc3MJAQAAAAV2YWx1ZQAAAAEJAAQaAAAAAgUAAAAEdGhpcwkBAAAAD2tleVdhbnRlZEFtb3VudAAAAAEFAAAADnBhcnRuZXJBZGRyZXNzBwMJAAAAAAAAAgUAAAAFY2hlY2sFAAAABWNoZWNrCQAETAAAAAIJAQAAAA5TY3JpcHRUcmFuc2ZlcgAAAAMFAAAAB3BhcnRuZXIFAAAACG15QW1vdW50BQAAAAlteUFzc2V0SWQJAARMAAAAAgkBAAAADlNjcmlwdFRyYW5zZmVyAAAAAwgFAAAAAWkAAAAGY2FsbGVyBQAAAAx3YW50ZWRBbW91bnQJAQAAAAdmcm9tU3RyAAAAAQUAAAANd2FudGVkQXNzZXRJZAkABEwAAAACCQEAAAALRGVsZXRlRW50cnkAAAABCQEAAAAKa2V5QXNzZXRJZAAAAAEFAAAADnBhcnRuZXJBZGRyZXNzCQAETAAAAAIJAQAAAAtEZWxldGVFbnRyeQAAAAEJAQAAAAlrZXlBbW91bnQAAAABBQAAAA5wYXJ0bmVyQWRkcmVzcwkABEwAAAACCQEAAAALRGVsZXRlRW50cnkAAAABCQEAAAAKa2V5UGFydG5lcgAAAAEFAAAADnBhcnRuZXJBZGRyZXNzCQAETAAAAAIJAQAAAAtEZWxldGVFbnRyeQAAAAEJAQAAABBrZXlXYW50ZWRBc3NldElkAAAAAQUAAAAOcGFydG5lckFkZHJlc3MJAARMAAAAAgkBAAAAC0RlbGV0ZUVudHJ5AAAAAQkBAAAAD2tleVdhbnRlZEFtb3VudAAAAAEFAAAADnBhcnRuZXJBZGRyZXNzBQAAAANuaWwJAAACAAAAAQIAAAAkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQAETAAAAAIJAQAAAAtTdHJpbmdFbnRyeQAAAAIJAQAAAAprZXlBc3NldElkAAAAAQUAAAAGY2FsbGVyCQEAAAAFdG9TdHIAAAABBQAAAAlteUFzc2V0SWQJAARMAAAAAgkBAAAADEludGVnZXJFbnRyeQAAAAIJAQAAAAlrZXlBbW91bnQAAAABBQAAAAZjYWxsZXIFAAAACG15QW1vdW50CQAETAAAAAIJAQAAAAtTdHJpbmdFbnRyeQAAAAIJAQAAAAprZXlQYXJ0bmVyAAAAAQUAAAAGY2FsbGVyBQAAAA5wYXJ0bmVyQWRkcmVzcwkABEwAAAACCQEAAAALU3RyaW5nRW50cnkAAAACCQEAAAAQa2V5V2FudGVkQXNzZXRJZAAAAAEFAAAABmNhbGxlcgUAAAANd2FudGVkQXNzZXRJZAkABEwAAAACCQEAAAAMSW50ZWdlckVudHJ5AAAAAgkBAAAAD2tleVdhbnRlZEFtb3VudAAAAAEFAAAABmNhbGxlcgUAAAAMd2FudGVkQW1vdW50BQAAAANuaWwAAAABaQEAAAAGY2FuY2VsAAAAAAQAAAAGY2FsbGVyCQAEJQAAAAEIBQAAAAFpAAAABmNhbGxlcgQAAAAKYXNzZXRJZEtleQkBAAAACmtleUFzc2V0SWQAAAABBQAAAAZjYWxsZXIEAAAACmFzc2V0SWRSYXcJAAQdAAAAAgUAAAAEdGhpcwUAAAAKYXNzZXRJZEtleQMJAQAAAAEhAAAAAQkBAAAACWlzRGVmaW5lZAAAAAEFAAAACmFzc2V0SWRSYXcJAAACAAAAAQIAAAAdWW91IGRvbid0IGhhdmUgYW4gYWN0aXZlIGRlYWwEAAAACmFzc2V0SWRTdHIJAQAAAAV2YWx1ZQAAAAEFAAAACmFzc2V0SWRSYXcJAARMAAAAAgkBAAAADlNjcmlwdFRyYW5zZmVyAAAAAwgFAAAAAWkAAAAGY2FsbGVyCQEAAAAFdmFsdWUAAAABCQAEGgAAAAIFAAAABHRoaXMJAQAAAAlrZXlBbW91bnQAAAABBQAAAAZjYWxsZXIJAQAAAAdmcm9tU3RyAAAAAQUAAAAKYXNzZXRJZFN0cgkABEwAAAACCQEAAAALRGVsZXRlRW50cnkAAAABBQAAAAphc3NldElkS2V5CQAETAAAAAIJAQAAAAtEZWxldGVFbnRyeQAAAAEJAQAAAAlrZXlBbW91bnQAAAABBQAAAAZjYWxsZXIJAARMAAAAAgkBAAAAC0RlbGV0ZUVudHJ5AAAAAQkBAAAACmtleVBhcnRuZXIAAAABBQAAAAZjYWxsZXIJAARMAAAAAgkBAAAAC0RlbGV0ZUVudHJ5AAAAAQkBAAAAEGtleVdhbnRlZEFzc2V0SWQAAAABBQAAAAZjYWxsZXIJAARMAAAAAgkBAAAAC0RlbGV0ZUVudHJ5AAAAAQkBAAAAD2tleVdhbnRlZEFtb3VudAAAAAEFAAAABmNhbGxlcgUAAAADbmlsAAAAAGYgge0=",
    "chainId": 87,
    "height": 2927839,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: AushWH7HAhFDRooZCy3H4t5ZccPaR9h8ykeAKkS7eE6m
Next: ANtuEzksYvQhhnYot6hyvSYN9opTA22fF5JHRY8ECZxw

Diff: 
Old New Differences
8 8  
9 9  
10 10  func keyPartner (address) = ("%s%s__partner__" + address)
11 + 
12 + 
13 + func keyWantedAssetId (address) = ("%s%s__wantedAssetId__" + address)
14 + 
15 + 
16 + func keyWantedAmount (address) = ("%s%s__wantedAmount__" + address)
17 + 
18 + 
19 + func toStr (assetId) = if ((assetId == unit))
20 +     then "WAVES"
21 +     else toBase58String(value(assetId))
22 + 
23 + 
24 + func fromStr (assetIdStr) = if ((assetIdStr == "WAVES"))
25 +     then unit
26 +     else fromBase58String(assetIdStr)
27 + 
28 + 
29 + func crossCheckAssetIds (partnerAddress,myOfferedAssetId,myWantedAssetId,partnerOfferedAssetId,partnerWantedAssetId) = if (if ((partnerOfferedAssetId != myWantedAssetId))
30 +     then true
31 +     else (partnerWantedAssetId != myOfferedAssetId))
32 +     then throw(((((((((("AssetIds don't match: you want " + myWantedAssetId) + " and pay ") + myOfferedAssetId) + ", but ") + partnerAddress) + " wants ") + partnerWantedAssetId) + " and pays ") + partnerOfferedAssetId))
33 +     else true
34 + 
35 + 
36 + func crossCheckAmounts (partnerAddress,myOfferedAmount,myWantedAmount,partnerOfferedAmount,partnerWantedAmount) = if (if ((partnerOfferedAmount != myWantedAmount))
37 +     then true
38 +     else (partnerWantedAmount != myOfferedAmount))
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 +     else true
11 41  
12 42  
13 43  @Callable(i)
23 53                  let myAssetId = value(i.payments[0]).assetId
24 54                  let myAmount = value(i.payments[0]).amount
25 55                  if (isDefined(partnerAssetId))
26 -                     then if ((value(partnerAssetId) != wantedAssetId))
27 -                         then throw("AssetIds don't match")
28 -                         else if ((value(getInteger(this, keyAmount(partnerAddress))) != wantedAmount))
29 -                             then throw("Amounts don't match")
30 -                             else if ((value(getString(this, keyPartner(partnerAddress))) != caller))
31 -                                 then throw(("You are not a partner of " + partnerAddress))
32 -                                 else [ScriptTransfer(partner, myAmount, myAssetId), ScriptTransfer(i.caller, wantedAmount, if ((wantedAssetId == "WAVES"))
33 -                                     then unit
34 -                                     else fromBase58String(wantedAssetId)), DeleteEntry(keyAssetId(partnerAddress)), DeleteEntry(keyAmount(partnerAddress)), DeleteEntry(keyPartner(partnerAddress))]
35 -                     else [StringEntry(keyAssetId(caller), if ((myAssetId == unit))
36 -                         then "WAVES"
37 -                         else toBase58String(value(myAssetId))), IntegerEntry(keyAmount(caller), myAmount), StringEntry(keyPartner(caller), partnerAddress)]
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)]
38 67                  }
39 68      }
40 69  
49 78          then throw("You don't have an active deal")
50 79          else {
51 80              let assetIdStr = value(assetIdRaw)
52 - [ScriptTransfer(i.caller, value(getInteger(this, keyAmount(caller))), if ((assetIdStr == "WAVES"))
53 -                 then unit
54 -                 else fromBase58String(assetIdStr)), DeleteEntry(assetIdKey), DeleteEntry(keyAmount(caller)), DeleteEntry(keyPartner(caller))]
81 + [ScriptTransfer(i.caller, value(getInteger(this, keyAmount(caller))), fromStr(assetIdStr)), DeleteEntry(assetIdKey), DeleteEntry(keyAmount(caller)), DeleteEntry(keyPartner(caller)), DeleteEntry(keyWantedAssetId(caller)), DeleteEntry(keyWantedAmount(caller))]
55 82              }
56 83      }
57 84  
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 + 
12 + 
13 + func keyWantedAssetId (address) = ("%s%s__wantedAssetId__" + address)
14 + 
15 + 
16 + func keyWantedAmount (address) = ("%s%s__wantedAmount__" + address)
17 + 
18 + 
19 + func toStr (assetId) = if ((assetId == unit))
20 +     then "WAVES"
21 +     else toBase58String(value(assetId))
22 + 
23 + 
24 + func fromStr (assetIdStr) = if ((assetIdStr == "WAVES"))
25 +     then unit
26 +     else fromBase58String(assetIdStr)
27 + 
28 + 
29 + func crossCheckAssetIds (partnerAddress,myOfferedAssetId,myWantedAssetId,partnerOfferedAssetId,partnerWantedAssetId) = if (if ((partnerOfferedAssetId != myWantedAssetId))
30 +     then true
31 +     else (partnerWantedAssetId != myOfferedAssetId))
32 +     then throw(((((((((("AssetIds don't match: you want " + myWantedAssetId) + " and pay ") + myOfferedAssetId) + ", but ") + partnerAddress) + " wants ") + partnerWantedAssetId) + " and pays ") + partnerOfferedAssetId))
33 +     else true
34 + 
35 + 
36 + func crossCheckAmounts (partnerAddress,myOfferedAmount,myWantedAmount,partnerOfferedAmount,partnerWantedAmount) = if (if ((partnerOfferedAmount != myWantedAmount))
37 +     then true
38 +     else (partnerWantedAmount != myOfferedAmount))
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 +     else true
11 41  
12 42  
13 43  @Callable(i)
14 44  func escrow (wantedAssetId,wantedAmount,partnerAddress) = {
15 45      let caller = toString(i.caller)
16 46      if (isDefined(getString(this, keyAssetId(caller))))
17 47          then throw("You already have an active deal, please cancel it first")
18 48          else if ((size(i.payments) != 1))
19 49              then throw("Exactly 1 payment expected")
20 50              else {
21 51                  let partner = addressFromStringValue(partnerAddress)
22 52                  let partnerAssetId = getString(this, keyAssetId(partnerAddress))
23 53                  let myAssetId = value(i.payments[0]).assetId
24 54                  let myAmount = value(i.payments[0]).amount
25 55                  if (isDefined(partnerAssetId))
26 -                     then if ((value(partnerAssetId) != wantedAssetId))
27 -                         then throw("AssetIds don't match")
28 -                         else if ((value(getInteger(this, keyAmount(partnerAddress))) != wantedAmount))
29 -                             then throw("Amounts don't match")
30 -                             else if ((value(getString(this, keyPartner(partnerAddress))) != caller))
31 -                                 then throw(("You are not a partner of " + partnerAddress))
32 -                                 else [ScriptTransfer(partner, myAmount, myAssetId), ScriptTransfer(i.caller, wantedAmount, if ((wantedAssetId == "WAVES"))
33 -                                     then unit
34 -                                     else fromBase58String(wantedAssetId)), DeleteEntry(keyAssetId(partnerAddress)), DeleteEntry(keyAmount(partnerAddress)), DeleteEntry(keyPartner(partnerAddress))]
35 -                     else [StringEntry(keyAssetId(caller), if ((myAssetId == unit))
36 -                         then "WAVES"
37 -                         else toBase58String(value(myAssetId))), IntegerEntry(keyAmount(caller), myAmount), StringEntry(keyPartner(caller), partnerAddress)]
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)]
38 67                  }
39 68      }
40 69  
41 70  
42 71  
43 72  @Callable(i)
44 73  func cancel () = {
45 74      let caller = toString(i.caller)
46 75      let assetIdKey = keyAssetId(caller)
47 76      let assetIdRaw = getString(this, assetIdKey)
48 77      if (!(isDefined(assetIdRaw)))
49 78          then throw("You don't have an active deal")
50 79          else {
51 80              let assetIdStr = value(assetIdRaw)
52 - [ScriptTransfer(i.caller, value(getInteger(this, keyAmount(caller))), if ((assetIdStr == "WAVES"))
53 -                 then unit
54 -                 else fromBase58String(assetIdStr)), DeleteEntry(assetIdKey), DeleteEntry(keyAmount(caller)), DeleteEntry(keyPartner(caller))]
81 + [ScriptTransfer(i.caller, value(getInteger(this, keyAmount(caller))), fromStr(assetIdStr)), DeleteEntry(assetIdKey), DeleteEntry(keyAmount(caller)), DeleteEntry(keyPartner(caller)), DeleteEntry(keyWantedAssetId(caller)), DeleteEntry(keyWantedAmount(caller))]
55 82              }
56 83      }
57 84  
58 85

Old	New		Differences
8	8
9	9
10	10		func keyPartner (address) = ("%s%s__partner__" + address)
	11	+
	12	+
	13	+	func keyWantedAssetId (address) = ("%s%s__wantedAssetId__" + address)
	14	+
	15	+
	16	+	func keyWantedAmount (address) = ("%s%s__wantedAmount__" + address)
	17	+
	18	+
	19	+	func toStr (assetId) = if ((assetId == unit))
	20	+	then "WAVES"
	21	+	else toBase58String(value(assetId))
	22	+
	23	+
	24	+	func fromStr (assetIdStr) = if ((assetIdStr == "WAVES"))
	25	+	then unit
	26	+	else fromBase58String(assetIdStr)
	27	+
	28	+
	29	+	func crossCheckAssetIds (partnerAddress,myOfferedAssetId,myWantedAssetId,partnerOfferedAssetId,partnerWantedAssetId) = if (if ((partnerOfferedAssetId != myWantedAssetId))
	30	+	then true
	31	+	else (partnerWantedAssetId != myOfferedAssetId))
	32	+	then throw(((((((((("AssetIds don't match: you want " + myWantedAssetId) + " and pay ") + myOfferedAssetId) + ", but ") + partnerAddress) + " wants ") + partnerWantedAssetId) + " and pays ") + partnerOfferedAssetId))
	33	+	else true
	34	+
	35	+
	36	+	func crossCheckAmounts (partnerAddress,myOfferedAmount,myWantedAmount,partnerOfferedAmount,partnerWantedAmount) = if (if ((partnerOfferedAmount != myWantedAmount))
	37	+	then true
	38	+	else (partnerWantedAmount != myOfferedAmount))
	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	+	else true
11	41
12	42
13	43		@Callable(i)

23	53		let myAssetId = value(i.payments[0]).assetId
24	54		let myAmount = value(i.payments[0]).amount
25	55		if (isDefined(partnerAssetId))
26		-	then if ((value(partnerAssetId) != wantedAssetId))
27		-	then throw("AssetIds don't match")
28		-	else if ((value(getInteger(this, keyAmount(partnerAddress))) != wantedAmount))
29		-	then throw("Amounts don't match")
30		-	else if ((value(getString(this, keyPartner(partnerAddress))) != caller))
31		-	then throw(("You are not a partner of " + partnerAddress))
32		-	else [ScriptTransfer(partner, myAmount, myAssetId), ScriptTransfer(i.caller, wantedAmount, if ((wantedAssetId == "WAVES"))
33		-	then unit
34		-	else fromBase58String(wantedAssetId)), DeleteEntry(keyAssetId(partnerAddress)), DeleteEntry(keyAmount(partnerAddress)), DeleteEntry(keyPartner(partnerAddress))]
35		-	else [StringEntry(keyAssetId(caller), if ((myAssetId == unit))
36		-	then "WAVES"
37		-	else toBase58String(value(myAssetId))), IntegerEntry(keyAmount(caller), myAmount), StringEntry(keyPartner(caller), partnerAddress)]
	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)]
38	67		}
39	68		}
40	69

49	78		then throw("You don't have an active deal")
50	79		else {
51	80		let assetIdStr = value(assetIdRaw)
52		-	[ScriptTransfer(i.caller, value(getInteger(this, keyAmount(caller))), if ((assetIdStr == "WAVES"))
53		-	then unit
54		-	else fromBase58String(assetIdStr)), DeleteEntry(assetIdKey), DeleteEntry(keyAmount(caller)), DeleteEntry(keyPartner(caller))]
	81	+	[ScriptTransfer(i.caller, value(getInteger(this, keyAmount(caller))), fromStr(assetIdStr)), DeleteEntry(assetIdKey), DeleteEntry(keyAmount(caller)), DeleteEntry(keyPartner(caller)), DeleteEntry(keyWantedAssetId(caller)), DeleteEntry(keyWantedAmount(caller))]
55	82		}
56	83		}
57	84

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	+
	12	+
	13	+	func keyWantedAssetId (address) = ("%s%s__wantedAssetId__" + address)
	14	+
	15	+
	16	+	func keyWantedAmount (address) = ("%s%s__wantedAmount__" + address)
	17	+
	18	+
	19	+	func toStr (assetId) = if ((assetId == unit))
	20	+	then "WAVES"
	21	+	else toBase58String(value(assetId))
	22	+
	23	+
	24	+	func fromStr (assetIdStr) = if ((assetIdStr == "WAVES"))
	25	+	then unit
	26	+	else fromBase58String(assetIdStr)
	27	+
	28	+
	29	+	func crossCheckAssetIds (partnerAddress,myOfferedAssetId,myWantedAssetId,partnerOfferedAssetId,partnerWantedAssetId) = if (if ((partnerOfferedAssetId != myWantedAssetId))
	30	+	then true
	31	+	else (partnerWantedAssetId != myOfferedAssetId))
	32	+	then throw(((((((((("AssetIds don't match: you want " + myWantedAssetId) + " and pay ") + myOfferedAssetId) + ", but ") + partnerAddress) + " wants ") + partnerWantedAssetId) + " and pays ") + partnerOfferedAssetId))
	33	+	else true
	34	+
	35	+
	36	+	func crossCheckAmounts (partnerAddress,myOfferedAmount,myWantedAmount,partnerOfferedAmount,partnerWantedAmount) = if (if ((partnerOfferedAmount != myWantedAmount))
	37	+	then true
	38	+	else (partnerWantedAmount != myOfferedAmount))
	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	+	else true
11	41
12	42
13	43		@Callable(i)
14	44		func escrow (wantedAssetId,wantedAmount,partnerAddress) = {
15	45		let caller = toString(i.caller)
16	46		if (isDefined(getString(this, keyAssetId(caller))))
17	47		then throw("You already have an active deal, please cancel it first")
18	48		else if ((size(i.payments) != 1))
19	49		then throw("Exactly 1 payment expected")
20	50		else {
21	51		let partner = addressFromStringValue(partnerAddress)
22	52		let partnerAssetId = getString(this, keyAssetId(partnerAddress))
23	53		let myAssetId = value(i.payments[0]).assetId
24	54		let myAmount = value(i.payments[0]).amount
25	55		if (isDefined(partnerAssetId))
26		-	then if ((value(partnerAssetId) != wantedAssetId))
27		-	then throw("AssetIds don't match")
28		-	else if ((value(getInteger(this, keyAmount(partnerAddress))) != wantedAmount))
29		-	then throw("Amounts don't match")
30		-	else if ((value(getString(this, keyPartner(partnerAddress))) != caller))
31		-	then throw(("You are not a partner of " + partnerAddress))
32		-	else [ScriptTransfer(partner, myAmount, myAssetId), ScriptTransfer(i.caller, wantedAmount, if ((wantedAssetId == "WAVES"))
33		-	then unit
34		-	else fromBase58String(wantedAssetId)), DeleteEntry(keyAssetId(partnerAddress)), DeleteEntry(keyAmount(partnerAddress)), DeleteEntry(keyPartner(partnerAddress))]
35		-	else [StringEntry(keyAssetId(caller), if ((myAssetId == unit))
36		-	then "WAVES"
37		-	else toBase58String(value(myAssetId))), IntegerEntry(keyAmount(caller), myAmount), StringEntry(keyPartner(caller), partnerAddress)]
	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)]
38	67		}
39	68		}
40	69
41	70
42	71
43	72		@Callable(i)
44	73		func cancel () = {
45	74		let caller = toString(i.caller)
46	75		let assetIdKey = keyAssetId(caller)
47	76		let assetIdRaw = getString(this, assetIdKey)
48	77		if (!(isDefined(assetIdRaw)))
49	78		then throw("You don't have an active deal")
50	79		else {
51	80		let assetIdStr = value(assetIdRaw)
52		-	[ScriptTransfer(i.caller, value(getInteger(this, keyAmount(caller))), if ((assetIdStr == "WAVES"))
53		-	then unit
54		-	else fromBase58String(assetIdStr)), DeleteEntry(assetIdKey), DeleteEntry(keyAmount(caller)), DeleteEntry(keyPartner(caller))]
	81	+	[ScriptTransfer(i.caller, value(getInteger(this, keyAmount(caller))), fromStr(assetIdStr)), DeleteEntry(assetIdKey), DeleteEntry(keyAmount(caller)), DeleteEntry(keyPartner(caller)), DeleteEntry(keyWantedAssetId(caller)), DeleteEntry(keyWantedAmount(caller))]
55	82		}
56	83		}
57	84
58	85

github/deemru/w8io/6500d08 
40.31 ms ◑