w8 · tx · 8bM···Ju5

tx · 8bMnRQmzLS9A2ZX9pv7YRH9ivSWDotTu5SBGQQurnJu5

3P4afSdysXRASK8v5H6MuHy677Qsoo4oTpE:  -0.01000000 Waves

2023.08.07 17:12 [3765893] smart account 3P4afSdysXRASK8v5H6MuHy677Qsoo4oTpE > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "8bMnRQmzLS9A2ZX9pv7YRH9ivSWDotTu5SBGQQurnJu5",
    "fee": 1000000,
    "feeAssetId": null,
    "timestamp": 1691417569591,
    "version": 2,
    "chainId": 87,
    "sender": "3P4afSdysXRASK8v5H6MuHy677Qsoo4oTpE",
    "senderPublicKey": "BP9daYroQNZabEJJSwDJFWWDVmX4Ct58UoE7XX84USBk",
    "proofs": [
        "SkbzReg9y7JjAb5zdC6tPvQf7NsxkKV2supr9VAWFtM8c3ACidtB7D12jwaNAPHB2RMv7JKbqKD5ybKGet1raMH"
    ],
    "script": "base64:BgInCAISBAoCCAgSBAoCCAgSBQoDCAgBEgQKAggIEgMKAQgSAwoBCBIABQAJc2VudGluZWxzCQDMCAIJAQdBZGRyZXNzAQEaAVfX4SNRjnyriFrV1yiXddiIddOPriMFpuEJAMwIAgkBB0FkZHJlc3MBARoBV/j6+gImwFGL7Go7RjNJ0hxxsHWL+aTKmgkAzAgCCQEHQWRkcmVzcwEBGgFXSQEY9kN/P0xs4Wd15bfkly/eUC2yg93xCQDMCAIJAQdBZGRyZXNzAQEaAVdLw2zO+zNYQ1hDURDu7+4hEBdL8njLfDIFA25pbAAHU2NhbGUxNgCAgIT+pt7hEQEMdHJ5R2V0U3RyaW5nAQNrZXkEByRtYXRjaDAJAJ0IAgUEdGhpcwUDa2V5AwkAAQIFByRtYXRjaDACBlN0cmluZwQBYgUHJG1hdGNoMAUBYgIAAQ5nZXRBc3NldFN0cmluZwEHYXNzZXRJZAQHJG1hdGNoMAUHYXNzZXRJZAMJAAECBQckbWF0Y2gwAgpCeXRlVmVjdG9yBAFiBQckbWF0Y2gwCQDYBAEFAWICBVdBVkVTAQ1nZXRBc3NldEJ5dGVzAQphc3NldElkU3RyAwkAAAIFCmFzc2V0SWRTdHICBVdBVkVTBQR1bml0CQDZBAEFCmFzc2V0SWRTdHIHAWkBC2luaXROZXdQb29sAgphZGRyZXNzU3RyCnBvb2xEb21haW4DCQECIT0CCAUBaQZjYWxsZXIFBHRoaXMJAAIBAh5vbmx5IGF2YWlsYWJsZSBmb3Igc2VsZiBpbnZva2UECWFkZHJlc3NPSwQHJG1hdGNoMAkApggBBQphZGRyZXNzU3RyAwkAAQIFByRtYXRjaDACB0FkZHJlc3MEAWEFByRtYXRjaDAGBwMJAQEhAQUJYWRkcmVzc09LCQACAQkArAICAhJpbmNvcnJlY3QgYWRkcmVzcyAFCmFkZHJlc3NTdHIJAMwIAgkBC1N0cmluZ0VudHJ5AgkArAICAgpzZXR1cF9wb29sBQpwb29sRG9tYWluBQphZGRyZXNzU3RyBQNuaWwBaQEJaW5pdE5ld1BMAgphc3NldElkU3RyCnBvb2xEb21haW4DCQECIT0CCAUBaQZjYWxsZXIFBHRoaXMJAAIBAh5vbmx5IGF2YWlsYWJsZSBmb3Igc2VsZiBpbnZva2UDCQAAAgkBDHRyeUdldFN0cmluZwEJAKwCAgIKc2V0dXBfcG9vbAUKcG9vbERvbWFpbgIACQACAQIRcG9vbCBpcyBub3Qga25vd24KAQ1vcmlnaW5hbEFzc2V0AQFhCQEFdmFsdWUBCQDsBwEJAQV2YWx1ZQEJAQ1nZXRBc3NldEJ5dGVzAQUBYQQIZGVjaW1hbHMDCQECIT0CBQphc3NldElkU3RyAgVXQVZFUwgJAQ1vcmlnaW5hbEFzc2V0AQUKYXNzZXRJZFN0cghkZWNpbWFscwAIBARuYW1lCQCsAgIJAKwCAgkArAICAgJQTAMJAAACBQpwb29sRG9tYWluAgExAgAFCnBvb2xEb21haW4CASADCQECIT0CBQphc3NldElkU3RyAgVXQVZFUwgJAQ1vcmlnaW5hbEFzc2V0AQUKYXNzZXRJZFN0cgRuYW1lAgVXQVZFUwQEZGVzYwkArAICAilQdXp6bGUgTGVuZCBMUCB0b2tlbi4gRGVyaXZhdGl2ZSBmb3IgdGhlIAMJAQIhPQIFCmFzc2V0SWRTdHICBVdBVkVTCAkBDW9yaWdpbmFsQXNzZXQBBQphc3NldElkU3RyBG5hbWUJAKwCAgIFV0FWRVMCHyB0b2tlbiBvbiB0aGUgV2F2ZXMgYmxvY2tjaGFpbi4EAnBsCQDDCAcFBG5hbWUFBGRlc2MAAAUIZGVjaW1hbHMGBQR1bml0AAAEB3BsSWRTdHIJAQ5nZXRBc3NldFN0cmluZwEJALgIAQUCcGwJAMwIAgUCcGwJAMwIAgkBC1N0cmluZ0VudHJ5AgkArAICCQCsAgIJAKwCAgIJc2V0dXBfcGxfBQphc3NldElkU3RyAgFfBQpwb29sRG9tYWluBQdwbElkU3RyCQDMCAIJAQtTdHJpbmdFbnRyeQIJAKwCAgkArAICAgZzZXR1cF8FB3BsSWRTdHICCF9hc3NldElkBQphc3NldElkU3RyBQNuaWwBaQEIZXhwb3J0UEwDCnBvb2xEb21haW4KYXNzZXRJZFN0cgZhbW91bnQEC3Bvb2xBZGRyZXNzCQERQGV4dHJOYXRpdmUoMTA2MikBCQEMdHJ5R2V0U3RyaW5nAQkArAICAgpzZXR1cF9wb29sBQpwb29sRG9tYWluBAlwbEFzc2V0SWQJAQ1nZXRBc3NldEJ5dGVzAQkBEUBleHRyTmF0aXZlKDEwNTgpAQkArAICCQCsAgIJAKwCAgIJc2V0dXBfcGxfBQphc3NldElkU3RyAgFfBQpwb29sRG9tYWluBAR1c2VyCQClCAEIBQFpBmNhbGxlcgQQdXNlclN1cHBseUFtb3VudAkBEUBleHRyTmF0aXZlKDEwNTApAgULcG9vbEFkZHJlc3MJAKwCAgkArAICBQR1c2VyAgpfc3VwcGxpZWRfBQphc3NldElkU3RyBAphc3NldFNSYXRlCQERQGV4dHJOYXRpdmUoMTA1MCkCBQtwb29sQWRkcmVzcwkArAICBQphc3NldElkU3RyAgZfc1JhdGUECmFtb3VudFJlYWwJAGsDBQZhbW91bnQFCmFzc2V0U1JhdGUFB1NjYWxlMTYEE3VzZXJDb2xsYXRlcmFsQWZ0ZXIJAPwHBAULcG9vbEFkZHJlc3MCEWdldFVzZXJDb2xsYXRlcmFsCQDMCAIHCQDMCAIFBHVzZXIJAMwIAgYJAMwIAgkArAICCQCsAgIFCmFzc2V0SWRTdHICCyxzdXBwbGllZCwtCQCkAwEFCmFtb3VudFJlYWwFA25pbAUDbmlsAwkAAAIFE3VzZXJDb2xsYXRlcmFsQWZ0ZXIFE3VzZXJDb2xsYXRlcmFsQWZ0ZXIEFnVzZXJDb2xsYXRlcmFsQWZ0ZXJWYWwKAAFABRN1c2VyQ29sbGF0ZXJhbEFmdGVyAwkAAQIFAUACA0ludAUBQAkAAgEJAKwCAgkAAwEFAUACGCBjb3VsZG4ndCBiZSBjYXN0IHRvIEludAMJAGYCBQZhbW91bnQFEHVzZXJTdXBwbHlBbW91bnQJAAIBAhtub3QgZW5vdWdoIHN1cHBsaWVkIGJhbGFuY2UDCQBnAgAABRZ1c2VyQ29sbGF0ZXJhbEFmdGVyVmFsCQACAQImdHJhbnNhY3Rpb24gbGVhZHMgdG8gYSBuZWdhdGl2ZSBoZWFsdGgEDXBsVG90YWxBbW91bnQEByRtYXRjaDAJAJoIAgULcG9vbEFkZHJlc3MJAKwCAgIMUExfc3VwcGxpZWRfBQphc3NldElkU3RyAwkAAQIFByRtYXRjaDACA0ludAQBeAUHJG1hdGNoMAUBeAAABAR1cGQxCQD8BwQFC3Bvb2xBZGRyZXNzAg91cGRhdGVQYXJhbWV0ZXIJAMwIAgkArAICCQCsAgIFBHVzZXICCl9zdXBwbGllZF8FCmFzc2V0SWRTdHIJAMwIAgkApAMBCQBlAgUQdXNlclN1cHBseUFtb3VudAUGYW1vdW50BQNuaWwFA25pbAMJAAACBQR1cGQxBQR1cGQxBAR1cGQyCQD8BwQFC3Bvb2xBZGRyZXNzAg91cGRhdGVQYXJhbWV0ZXIJAMwIAgkArAICAgxQTF9zdXBwbGllZF8FCmFzc2V0SWRTdHIJAMwIAgkApAMBCQBkAgUNcGxUb3RhbEFtb3VudAUGYW1vdW50BQNuaWwFA25pbAMJAAACBQR1cGQyBQR1cGQyCQDMCAIJAQdSZWlzc3VlAwkBBXZhbHVlAQUJcGxBc3NldElkBQZhbW91bnQGCQDMCAIJAQ5TY3JpcHRUcmFuc2ZlcgMIBQFpBmNhbGxlcgUGYW1vdW50BQlwbEFzc2V0SWQFA25pbAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgFpAQhpbXBvcnRQTAIKcG9vbERvbWFpbgR1c2VyBAlwbEFzc2V0SWQICQCRAwIIBQFpCHBheW1lbnRzAAAHYXNzZXRJZAQHcGxJZFN0cgkBDmdldEFzc2V0U3RyaW5nAQUJcGxBc3NldElkBAZhbW91bnQICQCRAwIIBQFpCHBheW1lbnRzAAAGYW1vdW50BAtwb29sQWRkcmVzcwkBEUBleHRyTmF0aXZlKDEwNjIpAQkBDHRyeUdldFN0cmluZwEJAKwCAgIKc2V0dXBfcG9vbAUKcG9vbERvbWFpbgQKYXNzZXRJZFN0cgkBDHRyeUdldFN0cmluZwEJAKwCAgkArAICAgZzZXR1cF8FB3BsSWRTdHICCF9hc3NldElkBAlhZGRyZXNzT0sEByRtYXRjaDAJAKYIAQUEdXNlcgMJAAECBQckbWF0Y2gwAgdBZGRyZXNzBAFhBQckbWF0Y2gwBgcDCQEBIQEFCWFkZHJlc3NPSwkAAgEJAKwCAgISaW5jb3JyZWN0IGFkZHJlc3MgBQR1c2VyBBB1c2VyU3VwcGx5QW1vdW50BAckbWF0Y2gwCQCaCAIFC3Bvb2xBZGRyZXNzCQCsAgIJAKwCAgUEdXNlcgILX3N1cHBsaWVkXysFCmFzc2V0SWRTdHIDCQABAgUHJG1hdGNoMAIDSW50BAF4BQckbWF0Y2gwBQF4AAAEDXBsVG90YWxBbW91bnQEByRtYXRjaDAJAJoIAgULcG9vbEFkZHJlc3MJAKwCAgINUExfc3VwcGxpZWRfKwUKYXNzZXRJZFN0cgMJAAECBQckbWF0Y2gwAgNJbnQEAXgFByRtYXRjaDAFAXgAAAQEdXBkMQkA/AcEBQtwb29sQWRkcmVzcwIPdXBkYXRlUGFyYW1ldGVyCQDMCAIJAKwCAgkArAICBQR1c2VyAgtfc3VwcGxpZWRfKwUKYXNzZXRJZFN0cgkAzAgCCQCkAwEJAGQCBRB1c2VyU3VwcGx5QW1vdW50BQZhbW91bnQFA25pbAUDbmlsAwkAAAIFBHVwZDEFBHVwZDEEBHVwZDIJAPwHBAULcG9vbEFkZHJlc3MCD3VwZGF0ZVBhcmFtZXRlcgkAzAgCCQCsAgICDVBMX3N1cHBsaWVkXysFCmFzc2V0SWRTdHIJAMwIAgkApAMBCQBlAgUNcGxUb3RhbEFtb3VudAUGYW1vdW50BQNuaWwFA25pbAMJAAACBQR1cGQyBQR1cGQyCQDMCAIJAQRCdXJuAgkBBXZhbHVlAQUJcGxBc3NldElkBQZhbW91bnQFA25pbAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgFpAQ1pbml0TmV3TWFzdGVyAQZtYXN0ZXIECWFkZHJlc3NPSwQHJG1hdGNoMAkApggBBQZtYXN0ZXIDCQABAgUHJG1hdGNoMAIHQWRkcmVzcwQBYQUHJG1hdGNoMAYHAwkBASEBBQlhZGRyZXNzT0sJAAIBCQCsAgICEmluY29ycmVjdCBhZGRyZXNzIAUGbWFzdGVyAwkBAiE9AggFAWkGY2FsbGVyBQR0aGlzCQACAQIcYXZhaWxhYmxlIGZvciBzZWxmIGNhbGwgb25seQkAzAgCCQELU3RyaW5nRW50cnkCAg92ZXJpZmllcl9tYXN0ZXIFBm1hc3RlcgUDbmlsAWkBEHJlcXVlc3ROZXdNYXN0ZXIBCW5ld01hc3RlcgQJYWRkcmVzc09LBAckbWF0Y2gwCQCmCAEFCW5ld01hc3RlcgMJAAECBQckbWF0Y2gwAgdBZGRyZXNzBAFhBQckbWF0Y2gwBgcDCQEBIQEFCWFkZHJlc3NPSwkAAgEJAKwCAgISaW5jb3JyZWN0IGFkZHJlc3MgBQluZXdNYXN0ZXIDCQAAAgkAzwgCBQlzZW50aW5lbHMIBQFpBmNhbGxlcgUEdW5pdAkAAgECDndoaXRlbGlzdCBvbmx5CQDMCAIJAQtTdHJpbmdFbnRyeQICEnZlcmlmaWVyX25ld01hc3RlcgUJbmV3TWFzdGVyCQDMCAIJAQxJbnRlZ2VyRW50cnkCAh92ZXJpZmllcl9uZXdNYXN0ZXJFbGlnaWJsZUFmdGVyCQBkAgUGaGVpZ2h0AJBOBQNuaWwBaQERYWN0aXZhdGVOZXdNYXN0ZXIABA5lbGlnaWJsZUhlaWdodAkBEUBleHRyTmF0aXZlKDEwNTApAgUEdGhpcwIfdmVyaWZpZXJfbmV3TWFzdGVyRWxpZ2libGVBZnRlcgQJbmV3TWFzdGVyCQERQGV4dHJOYXRpdmUoMTA1MykCBQR0aGlzAhJ2ZXJpZmllcl9uZXdNYXN0ZXIDCQAAAgkAzwgCBQlzZW50aW5lbHMIBQFpBmNhbGxlcgUEdW5pdAkAAgECDndoaXRlbGlzdCBvbmx5AwkAZgIFDmVsaWdpYmxlSGVpZ2h0BQZoZWlnaHQJAAIBAiJuZXcgbWFzdGVyIGNhbm5vdCBiZSBhY3RpdmF0ZWQgeWV0CQDMCAIJAQtEZWxldGVFbnRyeQECEnZlcmlmaWVyX25ld01hc3RlcgkAzAgCCQELRGVsZXRlRW50cnkBAh92ZXJpZmllcl9uZXdNYXN0ZXJFbGlnaWJsZUFmdGVyCQDMCAIJAQtTdHJpbmdFbnRyeQICD3ZlcmlmaWVyX21hc3RlcgUJbmV3TWFzdGVyBQNuaWwBAnR4AQZ2ZXJpZnkABA1tYXN0ZXJBZGRyZXNzCQCiCAECD3ZlcmlmaWVyX21hc3RlcgQQYXBwcm92ZWRCeU1hc3RlcgQHJG1hdGNoMAUNbWFzdGVyQWRkcmVzcwMJAAECBQckbWF0Y2gwAgZTdHJpbmcEAXgFByRtYXRjaDAEByRtYXRjaDEJAJoIAgkBEUBleHRyTmF0aXZlKDEwNjIpAQUBeAkArAICAgthcHByb3ZlZFR4XwkA2AQBCAUCdHgCaWQDCQABAgUHJG1hdGNoMQIDSW50BAF5BQckbWF0Y2gxBQF5AAAAAQMJAPQDAwgFAnR4CWJvZHlCeXRlcwkAkQMCCAUCdHgGcHJvb2ZzAAAIBQJ0eA9zZW5kZXJQdWJsaWNLZXkJAGYCBRBhcHByb3ZlZEJ5TWFzdGVyAAAHJoKZaA==",
    "height": 3765893,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: AFRLiMmgqFGF5nmbdudkCycJe3MdQMU5aq7mjDebWwKh
Next: 2zdZsjuqSxJXmzYgYBXGFj2KthWs4cCt8HLhMe98Z6GU

Diff: 
Old New Differences
64 64                  else ("WAVES" + " token on the Waves blockchain.")))
65 65              let pl = Issue(name, desc, 0, decimals, true, unit, 0)
66 66              let plIdStr = getAssetString(calculateAssetId(pl))
67 - [pl, StringEntry(((("setup_pl_" + assetIdStr) + "_") + poolDomain), plIdStr)]
67 + [pl, StringEntry(((("setup_pl_" + assetIdStr) + "_") + poolDomain), plIdStr), StringEntry((("setup_" + plIdStr) + "_assetId"), assetIdStr)]
68 68              }
69 69  
70 70  
115 115  
116 116  @Callable(i)
117 117  func importPL (poolDomain,user) = {
118 -     let assetIdStr = getAssetString(i.payments[0].assetId)
118 +     let plAssetId = i.payments[0].assetId
119 +     let plIdStr = getAssetString(plAssetId)
119 120      let amount = i.payments[0].amount
120 121      let poolAddress = addressFromStringValue(tryGetString(("setup_pool" + poolDomain)))
121 -     let plAssetId = getAssetBytes(getStringValue(((("setup_pl_" + assetIdStr) + "_") + poolDomain)))
122 +     let assetIdStr = tryGetString((("setup_" + plIdStr) + "_assetId"))
122 123      let addressOK =     match addressFromString(user) {
123 124          case a: Address => 
124 125              true
Full: 
Old New Differences
1 1  {-# STDLIB_VERSION 6 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 4  let sentinels = [Address(base58'3PMcMiMEs6w56NRGacksXtFG5zS7doE9fpL'), Address(base58'3PQdNxynJy5mche2kxMVc5shXWzK8Gstq3o'), Address(base58'3P8auNWJkxxByyJtwErFXaxiXcGM45qQ1hA'), Address(base58'3P8qVX189qpoTJZQQQdKS9endHK5sxWsvrd')]
5 5  
6 6  let Scale16 = 10000000000000000
7 7  
8 8  func tryGetString (key) = match getString(this, key) {
9 9      case b: String => 
10 10          b
11 11      case _ => 
12 12          ""
13 13  }
14 14  
15 15  
16 16  func getAssetString (assetId) = match assetId {
17 17      case b: ByteVector => 
18 18          toBase58String(b)
19 19      case _ => 
20 20          "WAVES"
21 21  }
22 22  
23 23  
24 24  func getAssetBytes (assetIdStr) = if ((assetIdStr == "WAVES"))
25 25      then unit
26 26      else fromBase58String(assetIdStr)
27 27  
28 28  
29 29  @Callable(i)
30 30  func initNewPool (addressStr,poolDomain) = if ((i.caller != this))
31 31      then throw("only available for self invoke")
32 32      else {
33 33          let addressOK =         match addressFromString(addressStr) {
34 34              case a: Address => 
35 35                  true
36 36              case _ => 
37 37                  false
38 38          }
39 39          if (!(addressOK))
40 40              then throw(("incorrect address " + addressStr))
41 41              else [StringEntry(("setup_pool" + poolDomain), addressStr)]
42 42          }
43 43  
44 44  
45 45  
46 46  @Callable(i)
47 47  func initNewPL (assetIdStr,poolDomain) = if ((i.caller != this))
48 48      then throw("only available for self invoke")
49 49      else if ((tryGetString(("setup_pool" + poolDomain)) == ""))
50 50          then throw("pool is not known")
51 51          else {
52 52              func originalAsset (a) =             value(assetInfo(value(getAssetBytes(a))))
53 53  
54 54              let decimals = if ((assetIdStr != "WAVES"))
55 55                  then originalAsset(assetIdStr).decimals
56 56                  else 8
57 57              let name = ((("PL" + (if ((poolDomain == "1"))
58 58                  then ""
59 59                  else poolDomain)) + " ") + (if ((assetIdStr != "WAVES"))
60 60                  then originalAsset(assetIdStr).name
61 61                  else "WAVES"))
62 62              let desc = ("Puzzle Lend LP token. Derivative for the " + (if ((assetIdStr != "WAVES"))
63 63                  then originalAsset(assetIdStr).name
64 64                  else ("WAVES" + " token on the Waves blockchain.")))
65 65              let pl = Issue(name, desc, 0, decimals, true, unit, 0)
66 66              let plIdStr = getAssetString(calculateAssetId(pl))
67 - [pl, StringEntry(((("setup_pl_" + assetIdStr) + "_") + poolDomain), plIdStr)]
67 + [pl, StringEntry(((("setup_pl_" + assetIdStr) + "_") + poolDomain), plIdStr), StringEntry((("setup_" + plIdStr) + "_assetId"), assetIdStr)]
68 68              }
69 69  
70 70  
71 71  
72 72  @Callable(i)
73 73  func exportPL (poolDomain,assetIdStr,amount) = {
74 74      let poolAddress = addressFromStringValue(tryGetString(("setup_pool" + poolDomain)))
75 75      let plAssetId = getAssetBytes(getStringValue(((("setup_pl_" + assetIdStr) + "_") + poolDomain)))
76 76      let user = toString(i.caller)
77 77      let userSupplyAmount = getIntegerValue(poolAddress, ((user + "_supplied_") + assetIdStr))
78 78      let assetSRate = getIntegerValue(poolAddress, (assetIdStr + "_sRate"))
79 79      let amountReal = fraction(amount, assetSRate, Scale16)
80 80      let userCollateralAfter = invoke(poolAddress, "getUserCollateral", [false, user, true, ((assetIdStr + ",supplied,-") + toString(amountReal))], nil)
81 81      if ((userCollateralAfter == userCollateralAfter))
82 82          then {
83 83              let userCollateralAfterVal = {
84 84                  let @ = userCollateralAfter
85 85                  if ($isInstanceOf(@, "Int"))
86 86                      then @
87 87                      else throw(($getType(@) + " couldn't be cast to Int"))
88 88                  }
89 89              if ((amount > userSupplyAmount))
90 90                  then throw("not enough supplied balance")
91 91                  else if ((0 >= userCollateralAfterVal))
92 92                      then throw("transaction leads to a negative health")
93 93                      else {
94 94                          let plTotalAmount =                         match getInteger(poolAddress, ("PL_supplied_" + assetIdStr)) {
95 95                              case x: Int => 
96 96                                  x
97 97                              case _ => 
98 98                                  0
99 99                          }
100 100                          let upd1 = invoke(poolAddress, "updateParameter", [((user + "_supplied_") + assetIdStr), toString((userSupplyAmount - amount))], nil)
101 101                          if ((upd1 == upd1))
102 102                              then {
103 103                                  let upd2 = invoke(poolAddress, "updateParameter", [("PL_supplied_" + assetIdStr), toString((plTotalAmount + amount))], nil)
104 104                                  if ((upd2 == upd2))
105 105                                      then [Reissue(value(plAssetId), amount, true), ScriptTransfer(i.caller, amount, plAssetId)]
106 106                                      else throw("Strict value is not equal to itself.")
107 107                                  }
108 108                              else throw("Strict value is not equal to itself.")
109 109                          }
110 110              }
111 111          else throw("Strict value is not equal to itself.")
112 112      }
113 113  
114 114  
115 115  
116 116  @Callable(i)
117 117  func importPL (poolDomain,user) = {
118 -     let assetIdStr = getAssetString(i.payments[0].assetId)
118 +     let plAssetId = i.payments[0].assetId
119 +     let plIdStr = getAssetString(plAssetId)
119 120      let amount = i.payments[0].amount
120 121      let poolAddress = addressFromStringValue(tryGetString(("setup_pool" + poolDomain)))
121 -     let plAssetId = getAssetBytes(getStringValue(((("setup_pl_" + assetIdStr) + "_") + poolDomain)))
122 +     let assetIdStr = tryGetString((("setup_" + plIdStr) + "_assetId"))
122 123      let addressOK =     match addressFromString(user) {
123 124          case a: Address => 
124 125              true
125 126          case _ => 
126 127              false
127 128      }
128 129      if (!(addressOK))
129 130          then throw(("incorrect address " + user))
130 131          else {
131 132              let userSupplyAmount =             match getInteger(poolAddress, ((user + "_supplied_+") + assetIdStr)) {
132 133                  case x: Int => 
133 134                      x
134 135                  case _ => 
135 136                      0
136 137              }
137 138              let plTotalAmount =             match getInteger(poolAddress, ("PL_supplied_+" + assetIdStr)) {
138 139                  case x: Int => 
139 140                      x
140 141                  case _ => 
141 142                      0
142 143              }
143 144              let upd1 = invoke(poolAddress, "updateParameter", [((user + "_supplied_+") + assetIdStr), toString((userSupplyAmount + amount))], nil)
144 145              if ((upd1 == upd1))
145 146                  then {
146 147                      let upd2 = invoke(poolAddress, "updateParameter", [("PL_supplied_+" + assetIdStr), toString((plTotalAmount - amount))], nil)
147 148                      if ((upd2 == upd2))
148 149                          then [Burn(value(plAssetId), amount)]
149 150                          else throw("Strict value is not equal to itself.")
150 151                      }
151 152                  else throw("Strict value is not equal to itself.")
152 153              }
153 154      }
154 155  
155 156  
156 157  
157 158  @Callable(i)
158 159  func initNewMaster (master) = {
159 160      let addressOK =     match addressFromString(master) {
160 161          case a: Address => 
161 162              true
162 163          case _ => 
163 164              false
164 165      }
165 166      if (!(addressOK))
166 167          then throw(("incorrect address " + master))
167 168          else if ((i.caller != this))
168 169              then throw("available for self call only")
169 170              else [StringEntry("verifier_master", master)]
170 171      }
171 172  
172 173  
173 174  
174 175  @Callable(i)
175 176  func requestNewMaster (newMaster) = {
176 177      let addressOK =     match addressFromString(newMaster) {
177 178          case a: Address => 
178 179              true
179 180          case _ => 
180 181              false
181 182      }
182 183      if (!(addressOK))
183 184          then throw(("incorrect address " + newMaster))
184 185          else if ((indexOf(sentinels, i.caller) == unit))
185 186              then throw("whitelist only")
186 187              else [StringEntry("verifier_newMaster", newMaster), IntegerEntry("verifier_newMasterEligibleAfter", (height + 10000))]
187 188      }
188 189  
189 190  
190 191  
191 192  @Callable(i)
192 193  func activateNewMaster () = {
193 194      let eligibleHeight = getIntegerValue(this, "verifier_newMasterEligibleAfter")
194 195      let newMaster = getStringValue(this, "verifier_newMaster")
195 196      if ((indexOf(sentinels, i.caller) == unit))
196 197          then throw("whitelist only")
197 198          else if ((eligibleHeight > height))
198 199              then throw("new master cannot be activated yet")
199 200              else [DeleteEntry("verifier_newMaster"), DeleteEntry("verifier_newMasterEligibleAfter"), StringEntry("verifier_master", newMaster)]
200 201      }
201 202  
202 203  
203 204  @Verifier(tx)
204 205  func verify () = {
205 206      let masterAddress = getString("verifier_master")
206 207      let approvedByMaster =     match masterAddress {
207 208          case x: String => 
208 209              match getInteger(addressFromStringValue(x), ("approvedTx_" + toBase58String(tx.id))) {
209 210                  case y: Int => 
210 211                      y
211 212                  case _ => 
212 213                      0
213 214              }
214 215          case _ => 
215 216              1
216 217      }
217 218      if (sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey))
218 219          then (approvedByMaster > 0)
219 220          else false
220 221      }
221 222

Old	New		Differences
64	64		else ("WAVES" + " token on the Waves blockchain.")))
65	65		let pl = Issue(name, desc, 0, decimals, true, unit, 0)
66	66		let plIdStr = getAssetString(calculateAssetId(pl))
67		-	[pl, StringEntry(((("setup_pl_" + assetIdStr) + "_") + poolDomain), plIdStr)]
	67	+	[pl, StringEntry(((("setup_pl_" + assetIdStr) + "_") + poolDomain), plIdStr), StringEntry((("setup_" + plIdStr) + "_assetId"), assetIdStr)]
68	68		}
69	69
70	70

115	115
116	116		@Callable(i)
117	117		func importPL (poolDomain,user) = {
118		-	let assetIdStr = getAssetString(i.payments[0].assetId)
	118	+	let plAssetId = i.payments[0].assetId
	119	+	let plIdStr = getAssetString(plAssetId)
119	120		let amount = i.payments[0].amount
120	121		let poolAddress = addressFromStringValue(tryGetString(("setup_pool" + poolDomain)))
121		-	let ~~plAssetId~~ = ~~getAssetBytes(getStringValue(~~((("setup_~~pl_~~" + ~~assetIdStr~~) + "_") ~~+ poolDomain~~)))
	122	+	let assetIdStr = tryGetString((("setup_" + plIdStr) + "_assetId"))
122	123		let addressOK = match addressFromString(user) {
123	124		case a: Address =>
124	125		true

Old	New		Differences
1	1		{-# STDLIB_VERSION 6 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4	4		let sentinels = [Address(base58'3PMcMiMEs6w56NRGacksXtFG5zS7doE9fpL'), Address(base58'3PQdNxynJy5mche2kxMVc5shXWzK8Gstq3o'), Address(base58'3P8auNWJkxxByyJtwErFXaxiXcGM45qQ1hA'), Address(base58'3P8qVX189qpoTJZQQQdKS9endHK5sxWsvrd')]
5	5
6	6		let Scale16 = 10000000000000000
7	7
8	8		func tryGetString (key) = match getString(this, key) {
9	9		case b: String =>
10	10		b
11	11		case _ =>
12	12		""
13	13		}
14	14
15	15
16	16		func getAssetString (assetId) = match assetId {
17	17		case b: ByteVector =>
18	18		toBase58String(b)
19	19		case _ =>
20	20		"WAVES"
21	21		}
22	22
23	23
24	24		func getAssetBytes (assetIdStr) = if ((assetIdStr == "WAVES"))
25	25		then unit
26	26		else fromBase58String(assetIdStr)
27	27
28	28
29	29		@Callable(i)
30	30		func initNewPool (addressStr,poolDomain) = if ((i.caller != this))
31	31		then throw("only available for self invoke")
32	32		else {
33	33		let addressOK = match addressFromString(addressStr) {
34	34		case a: Address =>
35	35		true
36	36		case _ =>
37	37		false
38	38		}
39	39		if (!(addressOK))
40	40		then throw(("incorrect address " + addressStr))
41	41		else [StringEntry(("setup_pool" + poolDomain), addressStr)]
42	42		}
43	43
44	44
45	45
46	46		@Callable(i)
47	47		func initNewPL (assetIdStr,poolDomain) = if ((i.caller != this))
48	48		then throw("only available for self invoke")
49	49		else if ((tryGetString(("setup_pool" + poolDomain)) == ""))
50	50		then throw("pool is not known")
51	51		else {
52	52		func originalAsset (a) = value(assetInfo(value(getAssetBytes(a))))
53	53
54	54		let decimals = if ((assetIdStr != "WAVES"))
55	55		then originalAsset(assetIdStr).decimals
56	56		else 8
57	57		let name = ((("PL" + (if ((poolDomain == "1"))
58	58		then ""
59	59		else poolDomain)) + " ") + (if ((assetIdStr != "WAVES"))
60	60		then originalAsset(assetIdStr).name
61	61		else "WAVES"))
62	62		let desc = ("Puzzle Lend LP token. Derivative for the " + (if ((assetIdStr != "WAVES"))
63	63		then originalAsset(assetIdStr).name
64	64		else ("WAVES" + " token on the Waves blockchain.")))
65	65		let pl = Issue(name, desc, 0, decimals, true, unit, 0)
66	66		let plIdStr = getAssetString(calculateAssetId(pl))
67		-	[pl, StringEntry(((("setup_pl_" + assetIdStr) + "_") + poolDomain), plIdStr)]
	67	+	[pl, StringEntry(((("setup_pl_" + assetIdStr) + "_") + poolDomain), plIdStr), StringEntry((("setup_" + plIdStr) + "_assetId"), assetIdStr)]
68	68		}
69	69
70	70
71	71
72	72		@Callable(i)
73	73		func exportPL (poolDomain,assetIdStr,amount) = {
74	74		let poolAddress = addressFromStringValue(tryGetString(("setup_pool" + poolDomain)))
75	75		let plAssetId = getAssetBytes(getStringValue(((("setup_pl_" + assetIdStr) + "_") + poolDomain)))
76	76		let user = toString(i.caller)
77	77		let userSupplyAmount = getIntegerValue(poolAddress, ((user + "_supplied_") + assetIdStr))
78	78		let assetSRate = getIntegerValue(poolAddress, (assetIdStr + "_sRate"))
79	79		let amountReal = fraction(amount, assetSRate, Scale16)
80	80		let userCollateralAfter = invoke(poolAddress, "getUserCollateral", [false, user, true, ((assetIdStr + ",supplied,-") + toString(amountReal))], nil)
81	81		if ((userCollateralAfter == userCollateralAfter))
82	82		then {
83	83		let userCollateralAfterVal = {
84	84		let @ = userCollateralAfter
85	85		if ($isInstanceOf(@, "Int"))
86	86		then @
87	87		else throw(($getType(@) + " couldn't be cast to Int"))
88	88		}
89	89		if ((amount > userSupplyAmount))
90	90		then throw("not enough supplied balance")
91	91		else if ((0 >= userCollateralAfterVal))
92	92		then throw("transaction leads to a negative health")
93	93		else {
94	94		let plTotalAmount = match getInteger(poolAddress, ("PL_supplied_" + assetIdStr)) {
95	95		case x: Int =>
96	96		x
97	97		case _ =>
98	98		0
99	99		}
100	100		let upd1 = invoke(poolAddress, "updateParameter", [((user + "_supplied_") + assetIdStr), toString((userSupplyAmount - amount))], nil)
101	101		if ((upd1 == upd1))
102	102		then {
103	103		let upd2 = invoke(poolAddress, "updateParameter", [("PL_supplied_" + assetIdStr), toString((plTotalAmount + amount))], nil)
104	104		if ((upd2 == upd2))
105	105		then [Reissue(value(plAssetId), amount, true), ScriptTransfer(i.caller, amount, plAssetId)]
106	106		else throw("Strict value is not equal to itself.")
107	107		}
108	108		else throw("Strict value is not equal to itself.")
109	109		}
110	110		}
111	111		else throw("Strict value is not equal to itself.")
112	112		}
113	113
114	114
115	115
116	116		@Callable(i)
117	117		func importPL (poolDomain,user) = {
118		-	let assetIdStr = getAssetString(i.payments[0].assetId)
	118	+	let plAssetId = i.payments[0].assetId
	119	+	let plIdStr = getAssetString(plAssetId)
119	120		let amount = i.payments[0].amount
120	121		let poolAddress = addressFromStringValue(tryGetString(("setup_pool" + poolDomain)))
121		-	let ~~plAssetId~~ = ~~getAssetBytes(getStringValue(~~((("setup_~~pl_~~" + ~~assetIdStr~~) + "_") ~~+ poolDomain~~)))
	122	+	let assetIdStr = tryGetString((("setup_" + plIdStr) + "_assetId"))
122	123		let addressOK = match addressFromString(user) {
123	124		case a: Address =>
124	125		true
125	126		case _ =>
126	127		false
127	128		}
128	129		if (!(addressOK))
129	130		then throw(("incorrect address " + user))
130	131		else {
131	132		let userSupplyAmount = match getInteger(poolAddress, ((user + "_supplied_+") + assetIdStr)) {
132	133		case x: Int =>
133	134		x
134	135		case _ =>
135	136		0
136	137		}
137	138		let plTotalAmount = match getInteger(poolAddress, ("PL_supplied_+" + assetIdStr)) {
138	139		case x: Int =>
139	140		x
140	141		case _ =>
141	142		0
142	143		}
143	144		let upd1 = invoke(poolAddress, "updateParameter", [((user + "_supplied_+") + assetIdStr), toString((userSupplyAmount + amount))], nil)
144	145		if ((upd1 == upd1))
145	146		then {
146	147		let upd2 = invoke(poolAddress, "updateParameter", [("PL_supplied_+" + assetIdStr), toString((plTotalAmount - amount))], nil)
147	148		if ((upd2 == upd2))
148	149		then [Burn(value(plAssetId), amount)]
149	150		else throw("Strict value is not equal to itself.")
150	151		}
151	152		else throw("Strict value is not equal to itself.")
152	153		}
153	154		}
154	155
155	156
156	157
157	158		@Callable(i)
158	159		func initNewMaster (master) = {
159	160		let addressOK = match addressFromString(master) {
160	161		case a: Address =>
161	162		true
162	163		case _ =>
163	164		false
164	165		}
165	166		if (!(addressOK))
166	167		then throw(("incorrect address " + master))
167	168		else if ((i.caller != this))
168	169		then throw("available for self call only")
169	170		else [StringEntry("verifier_master", master)]
170	171		}
171	172
172	173
173	174
174	175		@Callable(i)
175	176		func requestNewMaster (newMaster) = {
176	177		let addressOK = match addressFromString(newMaster) {
177	178		case a: Address =>
178	179		true
179	180		case _ =>
180	181		false
181	182		}
182	183		if (!(addressOK))
183	184		then throw(("incorrect address " + newMaster))
184	185		else if ((indexOf(sentinels, i.caller) == unit))
185	186		then throw("whitelist only")
186	187		else [StringEntry("verifier_newMaster", newMaster), IntegerEntry("verifier_newMasterEligibleAfter", (height + 10000))]
187	188		}
188	189
189	190
190	191
191	192		@Callable(i)
192	193		func activateNewMaster () = {
193	194		let eligibleHeight = getIntegerValue(this, "verifier_newMasterEligibleAfter")
194	195		let newMaster = getStringValue(this, "verifier_newMaster")
195	196		if ((indexOf(sentinels, i.caller) == unit))
196	197		then throw("whitelist only")
197	198		else if ((eligibleHeight > height))
198	199		then throw("new master cannot be activated yet")
199	200		else [DeleteEntry("verifier_newMaster"), DeleteEntry("verifier_newMasterEligibleAfter"), StringEntry("verifier_master", newMaster)]
200	201		}
201	202
202	203
203	204		@Verifier(tx)
204	205		func verify () = {
205	206		let masterAddress = getString("verifier_master")
206	207		let approvedByMaster = match masterAddress {
207	208		case x: String =>
208	209		match getInteger(addressFromStringValue(x), ("approvedTx_" + toBase58String(tx.id))) {
209	210		case y: Int =>
210	211		y
211	212		case _ =>
212	213		0
213	214		}
214	215		case _ =>
215	216		1
216	217		}
217	218		if (sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey))
218	219		then (approvedByMaster > 0)
219	220		else false
220	221		}
221	222

github/deemru/w8io/3ef1775 
39.44 ms ◑