w8 · tx · 96A···3Tw

tx · 96AL2QmC5qpFvHrjqzcpaEVuMgfV6tDWV95jhZWrx3Tw

3MtbzcFZjxhPwaM1HoYr7sSSGDk7bjBsRNN:  -0.03700000 Waves

2023.05.24 21:05 [2592395] smart account 3MtbzcFZjxhPwaM1HoYr7sSSGDk7bjBsRNN > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "96AL2QmC5qpFvHrjqzcpaEVuMgfV6tDWV95jhZWrx3Tw",
    "fee": 3700000,
    "feeAssetId": null,
    "timestamp": 1684951554748,
    "version": 2,
    "chainId": 84,
    "sender": "3MtbzcFZjxhPwaM1HoYr7sSSGDk7bjBsRNN",
    "senderPublicKey": "269hMEydX4R6CjK9TRgFMec4TtjsckD91Vxo2pzLVzv4",
    "proofs": [
        "atV4grKMNdoqqfCUWPCRgZE7kVLriKTKggbQFigyCJkjfNhY4yKrV5sMshvACxL7qxoEMmom78b3EQYMz8x1Nsq"
    ],
    "script": "base64:BgIlCAISBQoDCAgIEgASABIECgIICBIECgIIARIAEgMKAQgSAwoBCBsAB2tfZnVuZHMCB2tfZnVuZHMAF2tfYXNzZXRfbWFuYWdlcl9hZGRyZXNzAhdrX2Fzc2V0X21hbmFnZXJfYWRkcmVzcwAUa19jb29yZGluYXRvckFkZHJlc3MCFGtfY29vcmRpbmF0b3JBZGRyZXNzABBrX29yZGVyc19hZGRyZXNzAhBrX29yZGVyc19hZGRyZXNzAA9rX3ZhdWx0X2FkZHJlc3MCD2tfdmF1bHRfYWRkcmVzcwAFa19hbW0CBWtfYW1tAA9rX2FkbWluX2FkZHJlc3MCD2tfYWRtaW5fYWRkcmVzcwARa19zdGFraW5nX2FkZHJlc3MCEWtfc3Rha2luZ19hZGRyZXNzAA5rX3Nwb3RfYWRkcmVzcwIOa19zcG90X2FkZHJlc3MAB2tfdmF1bHQCB2tfdmF1bHQADWtfaW5pdGlhbGl6ZWQCDWtfaW5pdGlhbGl6ZWQACGtfcGF1c2VkAghrX3BhdXNlZAEOdG9Db21wb3NpdGVLZXkCBF9rZXkIX2FkZHJlc3MJAKwCAgkArAICBQRfa2V5AgFfBQhfYWRkcmVzcwEJYmFsYW5jZU9mAQhfYXNzZXRJZAkBC3ZhbHVlT3JFbHNlAgkAmggCBQR0aGlzCQEOdG9Db21wb3NpdGVLZXkCBQdrX2Z1bmRzBQhfYXNzZXRJZAAAAQtjb29yZGluYXRvcgAJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkApggBCQETdmFsdWVPckVycm9yTWVzc2FnZQIJAJ0IAgUEdGhpcwUUa19jb29yZGluYXRvckFkZHJlc3MCG0Nvb3JkaW5hdG9yIG5vdCBzZXQgTWFuYWdlcgIbQ29vcmRpbmF0b3IgYWRkcmVzcyBpbnZhbGlkAQx2YXVsdEFkZHJlc3MACQETdmFsdWVPckVycm9yTWVzc2FnZQIJAKYIAQkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCdCAIJAQtjb29yZGluYXRvcgAFD2tfdmF1bHRfYWRkcmVzcwIVVmF1bHQgYWRkcmVzcyBub3Qgc2V0AhVWYXVsdCBhZGRyZXNzIGludmFsaWQBDW9yZGVyc0FkZHJlc3MACQETdmFsdWVPckVycm9yTWVzc2FnZQIJAKYIAQkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCdCAIJAQtjb29yZGluYXRvcgAFEGtfb3JkZXJzX2FkZHJlc3MCFk9yZGVycyBhZGRyZXNzIG5vdCBzZXQCFk9yZGVycyBhZGRyZXNzIGludmFsaWQBDGFkbWluQWRkcmVzcwAJAKYIAQkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCdCAIJAQtjb29yZGluYXRvcgAFD2tfYWRtaW5fYWRkcmVzcwIVQWRtaW4gYWRkcmVzcyBub3Qgc2V0AQ5zdGFraW5nQWRkcmVzcwAJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkApggBCQETdmFsdWVPckVycm9yTWVzc2FnZQIJAJ0IAgkBC2Nvb3JkaW5hdG9yAAURa19zdGFraW5nX2FkZHJlc3MCF1N0YWtpbmcgYWRkcmVzcyBub3Qgc2V0AhdTdGFraW5nIGFkZHJlc3MgaW52YWxpZAELc3BvdEFkZHJlc3MACQETdmFsdWVPckVycm9yTWVzc2FnZQIJAKYIAQkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCdCAIJAQtjb29yZGluYXRvcgAFDmtfc3BvdF9hZGRyZXNzAhRTcG90IGFkZHJlc3Mgbm90IHNldAIUU3BvdCBhZGRyZXNzIGludmFsaWQBC2luaXRpYWxpemVkAAkBC3ZhbHVlT3JFbHNlAgkAmwgCBQR0aGlzBQ1rX2luaXRpYWxpemVkBwEGcGF1c2VkAAkBC3ZhbHVlT3JFbHNlAgkAmwgCBQR0aGlzBQhrX3BhdXNlZAcBE2Fzc2V0TWFuYWdlckFkZHJlc3MBCF9hc3NldElkCQETdmFsdWVPckVycm9yTWVzc2FnZQIJAKYIAQkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCdCAIFBHRoaXMJAQ50b0NvbXBvc2l0ZUtleQIFF2tfYXNzZXRfbWFuYWdlcl9hZGRyZXNzBQhfYXNzZXRJZAkArAICAhtObyBhc3NldCBtYW5hZ2VyIGZvciB0b2tlbiAFCF9hc3NldElkCQCsAgICKEludmFsaWQgYXNzZXQgbWFuYWdlciBhZGRyZXNzIGZvciB0b2tlbiAFCF9hc3NldElkAQtpc1Nwb3RWYXVsdAEIX2FkZHJlc3MEBHNwb3QJAQtzcG90QWRkcmVzcwAJAQt2YWx1ZU9yRWxzZQIJAJsIAgUEc3BvdAkBDnRvQ29tcG9zaXRlS2V5AgUHa192YXVsdAUIX2FkZHJlc3MHAQtpc1doaXRlbGlzdAEIX2FkZHJlc3MDAwMJAAACBQhfYWRkcmVzcwkApQgBCQEOc3Rha2luZ0FkZHJlc3MABgkAAAIFCF9hZGRyZXNzCQClCAEJAQx2YXVsdEFkZHJlc3MABgkAAAIFCF9hZGRyZXNzCQClCAEJAQ1vcmRlcnNBZGRyZXNzAAYJAQtpc1Nwb3RWYXVsdAEFCF9hZGRyZXNzAQt1cGRhdGVGdW5kcwIIX2Fzc2V0SWQGX3ZhbHVlCQDMCAIJAQxJbnRlZ2VyRW50cnkCCQEOdG9Db21wb3NpdGVLZXkCBQdrX2Z1bmRzBQhfYXNzZXRJZAUGX3ZhbHVlBQNuaWwBCnN0ckFzc2V0SWQBBl9hc3NldAMJAQlpc0RlZmluZWQBBQZfYXNzZXQJANgEAQkBBXZhbHVlAQUGX2Fzc2V0AgVXQVZFUwgBaQEKaW5pdGlhbGl6ZQMMX2Nvb3JkaW5hdG9yDV9xdW90ZUFzc2V0SWQSX3F1b3RlQXNzZXRNYW5hZ2VyAwMJAQtpbml0aWFsaXplZAAGCQECIT0CCAUBaQZjYWxsZXIFBHRoaXMJAAIBAhRVbmFibGUgdG8gaW5pdGlhbGl6ZQkAzAgCCQELU3RyaW5nRW50cnkCBRRrX2Nvb3JkaW5hdG9yQWRkcmVzcwkApQgBCQERQGV4dHJOYXRpdmUoMTA2MikBBQxfY29vcmRpbmF0b3IJAMwIAgkBC1N0cmluZ0VudHJ5AgkBDnRvQ29tcG9zaXRlS2V5AgUXa19hc3NldF9tYW5hZ2VyX2FkZHJlc3MFDV9xdW90ZUFzc2V0SWQJAKUIAQkBEUBleHRyTmF0aXZlKDEwNjIpAQUSX3F1b3RlQXNzZXRNYW5hZ2VyCQDMCAIJAQxCb29sZWFuRW50cnkCBQ1rX2luaXRpYWxpemVkBgUDbmlsAWkBB3VucGF1c2UAAwkBAiE9AggFAWkGY2FsbGVyCQEMYWRtaW5BZGRyZXNzAAkAAgECFkludmFsaWQgdW5wYXVzZSBwYXJhbXMJAMwIAgkBDEJvb2xlYW5FbnRyeQIFCGtfcGF1c2VkBwUDbmlsAWkBBXBhdXNlAAMJAQIhPQIIBQFpBmNhbGxlcgkBDGFkbWluQWRkcmVzcwAJAAIBAhRJbnZhbGlkIHBhdXNlIHBhcmFtcwkAzAgCCQEMQm9vbGVhbkVudHJ5AgUIa19wYXVzZWQGBQNuaWwBaQEPYWRkQXNzZXRNYW5hZ2VyAghfYXNzZXRJZA1fdmF1bHRBZGRyZXNzAwMDCQEBIQEJAQtpbml0aWFsaXplZAAGCQECIT0CCAUBaQZjYWxsZXIJAQxhZG1pbkFkZHJlc3MABgMJAQlpc0RlZmluZWQBCQCiCAEJAQ50b0NvbXBvc2l0ZUtleQIFF2tfYXNzZXRfbWFuYWdlcl9hZGRyZXNzBQhfYXNzZXRJZAkAZgIJAQliYWxhbmNlT2YBBQhfYXNzZXRJZAAABwkAAgECHEludmFsaWQgYWRkVG9rZW5WYXVsdCBwYXJhbXMJAMwIAgkBC1N0cmluZ0VudHJ5AgkBDnRvQ29tcG9zaXRlS2V5AgUXa19hc3NldF9tYW5hZ2VyX2FkZHJlc3MFCF9hc3NldElkCQClCAEJARFAZXh0ck5hdGl2ZSgxMDYyKQEFDV92YXVsdEFkZHJlc3MFA25pbAFpAQh3aXRoZHJhdwIIX2Fzc2V0SWQHX2Ftb3VudAMDAwMJAQEhAQkBC2lzV2hpdGVsaXN0AQkApQgBCAUBaQZjYWxsZXIGCQEBIQEJAQtpbml0aWFsaXplZAAGCQEGcGF1c2VkAAYJAGYCBQdfYW1vdW50CQEJYmFsYW5jZU9mAQUIX2Fzc2V0SWQJAAIBCQCsAgIJAKwCAgkArAICAiJJbnZhbGlkIHdpdGhkcmF3IHBhcmFtcyAobWFuYWdlcikgCQCkAwEFB19hbW91bnQCAyA+IAkApAMBCQEJYmFsYW5jZU9mAQUIX2Fzc2V0SWQEB3Vuc3Rha2UJAPwHBAkBE2Fzc2V0TWFuYWdlckFkZHJlc3MBBQhfYXNzZXRJZAIId2l0aGRyYXcJAMwIAgUIX2Fzc2V0SWQJAMwIAgUHX2Ftb3VudAUDbmlsBQNuaWwDCQAAAgUHdW5zdGFrZQUHdW5zdGFrZQQTY3VycmVudEFzc2V0QmFsYW5jZQkAZQIJAQliYWxhbmNlT2YBBQhfYXNzZXRJZAUHX2Ftb3VudAkAzggCCQELdXBkYXRlRnVuZHMCBQhfYXNzZXRJZAUTY3VycmVudEFzc2V0QmFsYW5jZQkAzAgCCQEOU2NyaXB0VHJhbnNmZXIDCAUBaQZjYWxsZXIFB19hbW91bnQDCQAAAgUIX2Fzc2V0SWQCBVdBVkVTBQR1bml0CQDZBAEFCF9hc3NldElkBQNuaWwJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BaQEHZGVwb3NpdAAEB19hbW91bnQICQCRAwIIBQFpCHBheW1lbnRzAAAGYW1vdW50BAhfYXNzZXRJZAkBCnN0ckFzc2V0SWQBCAkAkQMCCAUBaQhwYXltZW50cwAAB2Fzc2V0SWQDAwMDCQEBIQEJAQtpbml0aWFsaXplZAAGAwkBASEBCQELaXNXaGl0ZWxpc3QBCQClCAEIBQFpBmNhbGxlcgkBAiE9AggFAWkGY2FsbGVyCQEMYWRtaW5BZGRyZXNzAAcGCQEGcGF1c2VkAAYJAQIhPQIJAJADAQgFAWkIcGF5bWVudHMAAQkAAgECIEludmFsaWQgZGVwb3NpdCBwYXJhbXMgKG1hbmFnZXIpBAVzdGFrZQkA/AcECQETYXNzZXRNYW5hZ2VyQWRkcmVzcwEFCF9hc3NldElkAgdkZXBvc2l0BQNuaWwJAMwIAgkBD0F0dGFjaGVkUGF5bWVudAIICQCRAwIIBQFpCHBheW1lbnRzAAAHYXNzZXRJZAUHX2Ftb3VudAUDbmlsAwkAAAIFBXN0YWtlBQVzdGFrZQQTY3VycmVudEFzc2V0QmFsYW5jZQkAZAIJAQliYWxhbmNlT2YBBQhfYXNzZXRJZAUHX2Ftb3VudAkBC3VwZGF0ZUZ1bmRzAgUIX2Fzc2V0SWQFE2N1cnJlbnRBc3NldEJhbGFuY2UJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BaQELY2xhaW1Qcm9maXQBCF9hc3NldElkAwMJAQEhAQkBC2luaXRpYWxpemVkAAYJAQEhAQMJAAACCAUBaQZjYWxsZXIJAQx2YXVsdEFkZHJlc3MABgkBC2lzU3BvdFZhdWx0AQkApQgBCAUBaQZjYWxsZXIJAAIBAiRJbnZhbGlkIGNsYWltUHJvZml0IHBhcmFtcyAobWFuYWdlcikEE2RvQ2xhaW1Qcm9maXRSZXN1bHQJAPwHBAkBE2Fzc2V0TWFuYWdlckFkZHJlc3MBBQhfYXNzZXRJZAILY2xhaW1Qcm9maXQJAMwIAgUIX2Fzc2V0SWQFA25pbAUDbmlsAwkAAAIFE2RvQ2xhaW1Qcm9maXRSZXN1bHQFE2RvQ2xhaW1Qcm9maXRSZXN1bHQEBnByb2ZpdAQHJG1hdGNoMAUTZG9DbGFpbVByb2ZpdFJlc3VsdAMJAAECBQckbWF0Y2gwAgNJbnQEAXQFByRtYXRjaDAFAXQJAAIBAh9JbnZhbGlkIGNsYWltUHJvZml0IHJlc3VsdCB0eXBlCQCUCgIJAMwIAgkBDlNjcmlwdFRyYW5zZmVyAwgFAWkGY2FsbGVyBQZwcm9maXQDCQAAAgUIX2Fzc2V0SWQCBVdBVkVTBQR1bml0CQDZBAEFCF9hc3NldElkBQNuaWwFBnByb2ZpdAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgFpARB2aWV3X2NsYWltUHJvZml0AQhfYXNzZXRJZAMJAQEhAQkBC2luaXRpYWxpemVkAAkAAgECKUludmFsaWQgdmlld19jbGFpbVByb2ZpdCBwYXJhbXMgKG1hbmFnZXIpBBNkb0NsYWltUHJvZml0UmVzdWx0CQD8BwQJARNhc3NldE1hbmFnZXJBZGRyZXNzAQUIX2Fzc2V0SWQCC2NsYWltUHJvZml0CQDMCAIFCF9hc3NldElkBQNuaWwFA25pbAMJAAACBRNkb0NsYWltUHJvZml0UmVzdWx0BRNkb0NsYWltUHJvZml0UmVzdWx0BAZwcm9maXQEByRtYXRjaDAFE2RvQ2xhaW1Qcm9maXRSZXN1bHQDCQABAgUHJG1hdGNoMAIDSW50BAF0BQckbWF0Y2gwBQF0CQACAQIfSW52YWxpZCBjbGFpbVByb2ZpdCByZXN1bHQgdHlwZQkAAgEJAKwCAgkArAICCQCsAgIJAKwCAgkApAMBCQEJYmFsYW5jZU9mAQUIX2Fzc2V0SWQCASwJAKQDAQkAZAIJAQliYWxhbmNlT2YBBQhfYXNzZXRJZAUGcHJvZml0AgEsCQCkAwEFBnByb2ZpdAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgECdHgBBnZlcmlmeQAEDmNvb3JkaW5hdG9yU3RyCQCdCAIFBHRoaXMFFGtfY29vcmRpbmF0b3JBZGRyZXNzAwkBCWlzRGVmaW5lZAEFDmNvb3JkaW5hdG9yU3RyBAVhZG1pbgkAnQgCCQERQGV4dHJOYXRpdmUoMTA2MikBCQEFdmFsdWUBBQ5jb29yZGluYXRvclN0cgUPa19hZG1pbl9hZGRyZXNzAwkBCWlzRGVmaW5lZAEFBWFkbWluCQELdmFsdWVPckVsc2UCCQCbCAIJARFAZXh0ck5hdGl2ZSgxMDYyKQEJAQV2YWx1ZQEFBWFkbWluCQCsAgIJAKwCAgkArAICAgdzdGF0dXNfCQClCAEFBHRoaXMCAV8JANgEAQgFAnR4AmlkBwkAAgECLnVuYWJsZSB0byB2ZXJpZnk6IGFkbWluIG5vdCBzZXQgaW4gY29vcmRpbmF0b3IJAPQDAwgFAnR4CWJvZHlCeXRlcwkAkQMCCAUCdHgGcHJvb2ZzAAAIBQJ0eA9zZW5kZXJQdWJsaWNLZXk2S8TQ",
    "height": 2592395,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: An4pt343oh4z2dwrLkH8FtgWRGYUqbyxeAp845jnGHDM
Next: CvSu5MEu2Ubiytf8BouHwABQ6DiJDUj9HjeiUSw73qEy

Diff: 
Old New Differences
170 170  @Callable(i)
171 171  func claimProfit (_assetId) = if (if (!(initialized()))
172 172      then true
173 -     else (i.caller != vaultAddress()))
173 +     else !(if ((i.caller == vaultAddress()))
174 +         then true
175 +         else isSpotVault(toString(i.caller))))
174 176      then throw("Invalid claimProfit params (manager)")
175 177      else {
176 178          let doClaimProfitResult = invoke(assetManagerAddress(_assetId), "claimProfit", [_assetId], nil)
Full: 
Old New Differences
1 1  {-# STDLIB_VERSION 6 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 4  let k_funds = "k_funds"
5 5  
6 6  let k_asset_manager_address = "k_asset_manager_address"
7 7  
8 8  let k_coordinatorAddress = "k_coordinatorAddress"
9 9  
10 10  let k_orders_address = "k_orders_address"
11 11  
12 12  let k_vault_address = "k_vault_address"
13 13  
14 14  let k_amm = "k_amm"
15 15  
16 16  let k_admin_address = "k_admin_address"
17 17  
18 18  let k_staking_address = "k_staking_address"
19 19  
20 20  let k_spot_address = "k_spot_address"
21 21  
22 22  let k_vault = "k_vault"
23 23  
24 24  let k_initialized = "k_initialized"
25 25  
26 26  let k_paused = "k_paused"
27 27  
28 28  func toCompositeKey (_key,_address) = ((_key + "_") + _address)
29 29  
30 30  
31 31  func balanceOf (_assetId) = valueOrElse(getInteger(this, toCompositeKey(k_funds, _assetId)), 0)
32 32  
33 33  
34 34  func coordinator () = valueOrErrorMessage(addressFromString(valueOrErrorMessage(getString(this, k_coordinatorAddress), "Coordinator not set Manager")), "Coordinator address invalid")
35 35  
36 36  
37 37  func vaultAddress () = valueOrErrorMessage(addressFromString(valueOrErrorMessage(getString(coordinator(), k_vault_address), "Vault address not set")), "Vault address invalid")
38 38  
39 39  
40 40  func ordersAddress () = valueOrErrorMessage(addressFromString(valueOrErrorMessage(getString(coordinator(), k_orders_address), "Orders address not set")), "Orders address invalid")
41 41  
42 42  
43 43  func adminAddress () = addressFromString(valueOrErrorMessage(getString(coordinator(), k_admin_address), "Admin address not set"))
44 44  
45 45  
46 46  func stakingAddress () = valueOrErrorMessage(addressFromString(valueOrErrorMessage(getString(coordinator(), k_staking_address), "Staking address not set")), "Staking address invalid")
47 47  
48 48  
49 49  func spotAddress () = valueOrErrorMessage(addressFromString(valueOrErrorMessage(getString(coordinator(), k_spot_address), "Spot address not set")), "Spot address invalid")
50 50  
51 51  
52 52  func initialized () = valueOrElse(getBoolean(this, k_initialized), false)
53 53  
54 54  
55 55  func paused () = valueOrElse(getBoolean(this, k_paused), false)
56 56  
57 57  
58 58  func assetManagerAddress (_assetId) = valueOrErrorMessage(addressFromString(valueOrErrorMessage(getString(this, toCompositeKey(k_asset_manager_address, _assetId)), ("No asset manager for token " + _assetId))), ("Invalid asset manager address for token " + _assetId))
59 59  
60 60  
61 61  func isSpotVault (_address) = {
62 62      let spot = spotAddress()
63 63      valueOrElse(getBoolean(spot, toCompositeKey(k_vault, _address)), false)
64 64      }
65 65  
66 66  
67 67  func isWhitelist (_address) = if (if (if ((_address == toString(stakingAddress())))
68 68      then true
69 69      else (_address == toString(vaultAddress())))
70 70      then true
71 71      else (_address == toString(ordersAddress())))
72 72      then true
73 73      else isSpotVault(_address)
74 74  
75 75  
76 76  func updateFunds (_assetId,_value) = [IntegerEntry(toCompositeKey(k_funds, _assetId), _value)]
77 77  
78 78  
79 79  func strAssetId (_asset) = if (isDefined(_asset))
80 80      then toBase58String(value(_asset))
81 81      else "WAVES"
82 82  
83 83  
84 84  @Callable(i)
85 85  func initialize (_coordinator,_quoteAssetId,_quoteAssetManager) = if (if (initialized())
86 86      then true
87 87      else (i.caller != this))
88 88      then throw("Unable to initialize")
89 89      else [StringEntry(k_coordinatorAddress, toString(addressFromStringValue(_coordinator))), StringEntry(toCompositeKey(k_asset_manager_address, _quoteAssetId), toString(addressFromStringValue(_quoteAssetManager))), BooleanEntry(k_initialized, true)]
90 90  
91 91  
92 92  
93 93  @Callable(i)
94 94  func unpause () = if ((i.caller != adminAddress()))
95 95      then throw("Invalid unpause params")
96 96      else [BooleanEntry(k_paused, false)]
97 97  
98 98  
99 99  
100 100  @Callable(i)
101 101  func pause () = if ((i.caller != adminAddress()))
102 102      then throw("Invalid pause params")
103 103      else [BooleanEntry(k_paused, true)]
104 104  
105 105  
106 106  
107 107  @Callable(i)
108 108  func addAssetManager (_assetId,_vaultAddress) = if (if (if (!(initialized()))
109 109      then true
110 110      else (i.caller != adminAddress()))
111 111      then true
112 112      else if (isDefined(getString(toCompositeKey(k_asset_manager_address, _assetId))))
113 113          then (balanceOf(_assetId) > 0)
114 114          else false)
115 115      then throw("Invalid addTokenVault params")
116 116      else [StringEntry(toCompositeKey(k_asset_manager_address, _assetId), toString(addressFromStringValue(_vaultAddress)))]
117 117  
118 118  
119 119  
120 120  @Callable(i)
121 121  func withdraw (_assetId,_amount) = if (if (if (if (!(isWhitelist(toString(i.caller))))
122 122      then true
123 123      else !(initialized()))
124 124      then true
125 125      else paused())
126 126      then true
127 127      else (_amount > balanceOf(_assetId)))
128 128      then throw(((("Invalid withdraw params (manager) " + toString(_amount)) + " > ") + toString(balanceOf(_assetId))))
129 129      else {
130 130          let unstake = invoke(assetManagerAddress(_assetId), "withdraw", [_assetId, _amount], nil)
131 131          if ((unstake == unstake))
132 132              then {
133 133                  let currentAssetBalance = (balanceOf(_assetId) - _amount)
134 134                  (updateFunds(_assetId, currentAssetBalance) ++ [ScriptTransfer(i.caller, _amount, if ((_assetId == "WAVES"))
135 135                      then unit
136 136                      else fromBase58String(_assetId))])
137 137                  }
138 138              else throw("Strict value is not equal to itself.")
139 139          }
140 140  
141 141  
142 142  
143 143  @Callable(i)
144 144  func deposit () = {
145 145      let _amount = i.payments[0].amount
146 146      let _assetId = strAssetId(i.payments[0].assetId)
147 147      if (if (if (if (!(initialized()))
148 148          then true
149 149          else if (!(isWhitelist(toString(i.caller))))
150 150              then (i.caller != adminAddress())
151 151              else false)
152 152          then true
153 153          else paused())
154 154          then true
155 155          else (size(i.payments) != 1))
156 156          then throw("Invalid deposit params (manager)")
157 157          else {
158 158              let stake = invoke(assetManagerAddress(_assetId), "deposit", nil, [AttachedPayment(i.payments[0].assetId, _amount)])
159 159              if ((stake == stake))
160 160                  then {
161 161                      let currentAssetBalance = (balanceOf(_assetId) + _amount)
162 162                      updateFunds(_assetId, currentAssetBalance)
163 163                      }
164 164                  else throw("Strict value is not equal to itself.")
165 165              }
166 166      }
167 167  
168 168  
169 169  
170 170  @Callable(i)
171 171  func claimProfit (_assetId) = if (if (!(initialized()))
172 172      then true
173 -     else (i.caller != vaultAddress()))
173 +     else !(if ((i.caller == vaultAddress()))
174 +         then true
175 +         else isSpotVault(toString(i.caller))))
174 176      then throw("Invalid claimProfit params (manager)")
175 177      else {
176 178          let doClaimProfitResult = invoke(assetManagerAddress(_assetId), "claimProfit", [_assetId], nil)
177 179          if ((doClaimProfitResult == doClaimProfitResult))
178 180              then {
179 181                  let profit =                 match doClaimProfitResult {
180 182                      case t: Int => 
181 183                          t
182 184                      case _ => 
183 185                          throw("Invalid claimProfit result type")
184 186                  }
185 187                  $Tuple2([ScriptTransfer(i.caller, profit, if ((_assetId == "WAVES"))
186 188                      then unit
187 189                      else fromBase58String(_assetId))], profit)
188 190                  }
189 191              else throw("Strict value is not equal to itself.")
190 192          }
191 193  
192 194  
193 195  
194 196  @Callable(i)
195 197  func view_claimProfit (_assetId) = if (!(initialized()))
196 198      then throw("Invalid view_claimProfit params (manager)")
197 199      else {
198 200          let doClaimProfitResult = invoke(assetManagerAddress(_assetId), "claimProfit", [_assetId], nil)
199 201          if ((doClaimProfitResult == doClaimProfitResult))
200 202              then {
201 203                  let profit =                 match doClaimProfitResult {
202 204                      case t: Int => 
203 205                          t
204 206                      case _ => 
205 207                          throw("Invalid claimProfit result type")
206 208                  }
207 209                  throw(((((toString(balanceOf(_assetId)) + ",") + toString((balanceOf(_assetId) + profit))) + ",") + toString(profit)))
208 210                  }
209 211              else throw("Strict value is not equal to itself.")
210 212          }
211 213  
212 214  
213 215  @Verifier(tx)
214 216  func verify () = {
215 217      let coordinatorStr = getString(this, k_coordinatorAddress)
216 218      if (isDefined(coordinatorStr))
217 219          then {
218 220              let admin = getString(addressFromStringValue(value(coordinatorStr)), k_admin_address)
219 221              if (isDefined(admin))
220 222                  then valueOrElse(getBoolean(addressFromStringValue(value(admin)), ((("status_" + toString(this)) + "_") + toBase58String(tx.id))), false)
221 223                  else throw("unable to verify: admin not set in coordinator")
222 224              }
223 225          else sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)
224 226      }
225 227

Old	New		Differences
170	170		@Callable(i)
171	171		func claimProfit (_assetId) = if (if (!(initialized()))
172	172		then true
173		-	else (i.caller != vaultAddress()))
	173	+	else !(if ((i.caller == vaultAddress()))
	174	+	then true
	175	+	else isSpotVault(toString(i.caller))))
174	176		then throw("Invalid claimProfit params (manager)")
175	177		else {
176	178		let doClaimProfitResult = invoke(assetManagerAddress(_assetId), "claimProfit", [_assetId], nil)

Old	New		Differences
1	1		{-# STDLIB_VERSION 6 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4	4		let k_funds = "k_funds"
5	5
6	6		let k_asset_manager_address = "k_asset_manager_address"
7	7
8	8		let k_coordinatorAddress = "k_coordinatorAddress"
9	9
10	10		let k_orders_address = "k_orders_address"
11	11
12	12		let k_vault_address = "k_vault_address"
13	13
14	14		let k_amm = "k_amm"
15	15
16	16		let k_admin_address = "k_admin_address"
17	17
18	18		let k_staking_address = "k_staking_address"
19	19
20	20		let k_spot_address = "k_spot_address"
21	21
22	22		let k_vault = "k_vault"
23	23
24	24		let k_initialized = "k_initialized"
25	25
26	26		let k_paused = "k_paused"
27	27
28	28		func toCompositeKey (_key,_address) = ((_key + "_") + _address)
29	29
30	30
31	31		func balanceOf (_assetId) = valueOrElse(getInteger(this, toCompositeKey(k_funds, _assetId)), 0)
32	32
33	33
34	34		func coordinator () = valueOrErrorMessage(addressFromString(valueOrErrorMessage(getString(this, k_coordinatorAddress), "Coordinator not set Manager")), "Coordinator address invalid")
35	35
36	36
37	37		func vaultAddress () = valueOrErrorMessage(addressFromString(valueOrErrorMessage(getString(coordinator(), k_vault_address), "Vault address not set")), "Vault address invalid")
38	38
39	39
40	40		func ordersAddress () = valueOrErrorMessage(addressFromString(valueOrErrorMessage(getString(coordinator(), k_orders_address), "Orders address not set")), "Orders address invalid")
41	41
42	42
43	43		func adminAddress () = addressFromString(valueOrErrorMessage(getString(coordinator(), k_admin_address), "Admin address not set"))
44	44
45	45
46	46		func stakingAddress () = valueOrErrorMessage(addressFromString(valueOrErrorMessage(getString(coordinator(), k_staking_address), "Staking address not set")), "Staking address invalid")
47	47
48	48
49	49		func spotAddress () = valueOrErrorMessage(addressFromString(valueOrErrorMessage(getString(coordinator(), k_spot_address), "Spot address not set")), "Spot address invalid")
50	50
51	51
52	52		func initialized () = valueOrElse(getBoolean(this, k_initialized), false)
53	53
54	54
55	55		func paused () = valueOrElse(getBoolean(this, k_paused), false)
56	56
57	57
58	58		func assetManagerAddress (_assetId) = valueOrErrorMessage(addressFromString(valueOrErrorMessage(getString(this, toCompositeKey(k_asset_manager_address, _assetId)), ("No asset manager for token " + _assetId))), ("Invalid asset manager address for token " + _assetId))
59	59
60	60
61	61		func isSpotVault (_address) = {
62	62		let spot = spotAddress()
63	63		valueOrElse(getBoolean(spot, toCompositeKey(k_vault, _address)), false)
64	64		}
65	65
66	66
67	67		func isWhitelist (_address) = if (if (if ((_address == toString(stakingAddress())))
68	68		then true
69	69		else (_address == toString(vaultAddress())))
70	70		then true
71	71		else (_address == toString(ordersAddress())))
72	72		then true
73	73		else isSpotVault(_address)
74	74
75	75
76	76		func updateFunds (_assetId,_value) = [IntegerEntry(toCompositeKey(k_funds, _assetId), _value)]
77	77
78	78
79	79		func strAssetId (_asset) = if (isDefined(_asset))
80	80		then toBase58String(value(_asset))
81	81		else "WAVES"
82	82
83	83
84	84		@Callable(i)
85	85		func initialize (_coordinator,_quoteAssetId,_quoteAssetManager) = if (if (initialized())
86	86		then true
87	87		else (i.caller != this))
88	88		then throw("Unable to initialize")
89	89		else [StringEntry(k_coordinatorAddress, toString(addressFromStringValue(_coordinator))), StringEntry(toCompositeKey(k_asset_manager_address, _quoteAssetId), toString(addressFromStringValue(_quoteAssetManager))), BooleanEntry(k_initialized, true)]
90	90
91	91
92	92
93	93		@Callable(i)
94	94		func unpause () = if ((i.caller != adminAddress()))
95	95		then throw("Invalid unpause params")
96	96		else [BooleanEntry(k_paused, false)]
97	97
98	98
99	99
100	100		@Callable(i)
101	101		func pause () = if ((i.caller != adminAddress()))
102	102		then throw("Invalid pause params")
103	103		else [BooleanEntry(k_paused, true)]
104	104
105	105
106	106
107	107		@Callable(i)
108	108		func addAssetManager (_assetId,_vaultAddress) = if (if (if (!(initialized()))
109	109		then true
110	110		else (i.caller != adminAddress()))
111	111		then true
112	112		else if (isDefined(getString(toCompositeKey(k_asset_manager_address, _assetId))))
113	113		then (balanceOf(_assetId) > 0)
114	114		else false)
115	115		then throw("Invalid addTokenVault params")
116	116		else [StringEntry(toCompositeKey(k_asset_manager_address, _assetId), toString(addressFromStringValue(_vaultAddress)))]
117	117
118	118
119	119
120	120		@Callable(i)
121	121		func withdraw (_assetId,_amount) = if (if (if (if (!(isWhitelist(toString(i.caller))))
122	122		then true
123	123		else !(initialized()))
124	124		then true
125	125		else paused())
126	126		then true
127	127		else (_amount > balanceOf(_assetId)))
128	128		then throw(((("Invalid withdraw params (manager) " + toString(_amount)) + " > ") + toString(balanceOf(_assetId))))
129	129		else {
130	130		let unstake = invoke(assetManagerAddress(_assetId), "withdraw", [_assetId, _amount], nil)
131	131		if ((unstake == unstake))
132	132		then {
133	133		let currentAssetBalance = (balanceOf(_assetId) - _amount)
134	134		(updateFunds(_assetId, currentAssetBalance) ++ [ScriptTransfer(i.caller, _amount, if ((_assetId == "WAVES"))
135	135		then unit
136	136		else fromBase58String(_assetId))])
137	137		}
138	138		else throw("Strict value is not equal to itself.")
139	139		}
140	140
141	141
142	142
143	143		@Callable(i)
144	144		func deposit () = {
145	145		let _amount = i.payments[0].amount
146	146		let _assetId = strAssetId(i.payments[0].assetId)
147	147		if (if (if (if (!(initialized()))
148	148		then true
149	149		else if (!(isWhitelist(toString(i.caller))))
150	150		then (i.caller != adminAddress())
151	151		else false)
152	152		then true
153	153		else paused())
154	154		then true
155	155		else (size(i.payments) != 1))
156	156		then throw("Invalid deposit params (manager)")
157	157		else {
158	158		let stake = invoke(assetManagerAddress(_assetId), "deposit", nil, [AttachedPayment(i.payments[0].assetId, _amount)])
159	159		if ((stake == stake))
160	160		then {
161	161		let currentAssetBalance = (balanceOf(_assetId) + _amount)
162	162		updateFunds(_assetId, currentAssetBalance)
163	163		}
164	164		else throw("Strict value is not equal to itself.")
165	165		}
166	166		}
167	167
168	168
169	169
170	170		@Callable(i)
171	171		func claimProfit (_assetId) = if (if (!(initialized()))
172	172		then true
173		-	else (i.caller != vaultAddress()))
	173	+	else !(if ((i.caller == vaultAddress()))
	174	+	then true
	175	+	else isSpotVault(toString(i.caller))))
174	176		then throw("Invalid claimProfit params (manager)")
175	177		else {
176	178		let doClaimProfitResult = invoke(assetManagerAddress(_assetId), "claimProfit", [_assetId], nil)
177	179		if ((doClaimProfitResult == doClaimProfitResult))
178	180		then {
179	181		let profit = match doClaimProfitResult {
180	182		case t: Int =>
181	183		t
182	184		case _ =>
183	185		throw("Invalid claimProfit result type")
184	186		}
185	187		$Tuple2([ScriptTransfer(i.caller, profit, if ((_assetId == "WAVES"))
186	188		then unit
187	189		else fromBase58String(_assetId))], profit)
188	190		}
189	191		else throw("Strict value is not equal to itself.")
190	192		}
191	193
192	194
193	195
194	196		@Callable(i)
195	197		func view_claimProfit (_assetId) = if (!(initialized()))
196	198		then throw("Invalid view_claimProfit params (manager)")
197	199		else {
198	200		let doClaimProfitResult = invoke(assetManagerAddress(_assetId), "claimProfit", [_assetId], nil)
199	201		if ((doClaimProfitResult == doClaimProfitResult))
200	202		then {
201	203		let profit = match doClaimProfitResult {
202	204		case t: Int =>
203	205		t
204	206		case _ =>
205	207		throw("Invalid claimProfit result type")
206	208		}
207	209		throw(((((toString(balanceOf(_assetId)) + ",") + toString((balanceOf(_assetId) + profit))) + ",") + toString(profit)))
208	210		}
209	211		else throw("Strict value is not equal to itself.")
210	212		}
211	213
212	214
213	215		@Verifier(tx)
214	216		func verify () = {
215	217		let coordinatorStr = getString(this, k_coordinatorAddress)
216	218		if (isDefined(coordinatorStr))
217	219		then {
218	220		let admin = getString(addressFromStringValue(value(coordinatorStr)), k_admin_address)
219	221		if (isDefined(admin))
220	222		then valueOrElse(getBoolean(addressFromStringValue(value(admin)), ((("status_" + toString(this)) + "_") + toBase58String(tx.id))), false)
221	223		else throw("unable to verify: admin not set in coordinator")
222	224		}
223	225		else sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)
224	226		}
225	227

github/deemru/w8io/026f985 
30.90 ms ◑