w8 · tx · 365···tq7

tx · 36569vB25gWNF8iX8UV3DSLYTLCoET3kLshoGv8c1tq7

3MuADE2ryaHKiVHXg5uFLyB4NYnvQJLZBUv:  -0.01400000 Waves

2019.12.25 12:45 [824365] smart account 3MuADE2ryaHKiVHXg5uFLyB4NYnvQJLZBUv > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "36569vB25gWNF8iX8UV3DSLYTLCoET3kLshoGv8c1tq7",
    "fee": 1400000,
    "feeAssetId": null,
    "timestamp": 1577267204585,
    "version": 1,
    "sender": "3MuADE2ryaHKiVHXg5uFLyB4NYnvQJLZBUv",
    "senderPublicKey": "A4bJfnBhBTVh7GRNr1hHz6iqJta6eBbaExPDG7UapoaD",
    "proofs": [
        "CWhJQBs4vgBfiLrVFXx4ynXHCaMWBLEacPM5goMwM2anhnck4cVo6A5hN4BPiZcyDM8F3aGt5xGGLUbT9hDCBYf"
    ],
    "script": "base64:AAIDAAAAAAAAABMIARIICgYIAQEBAQESABIDCgEIAAAAGQAAAAAHd2F2ZWxldAAAAAAABfXhAAAAAAAPd2F2ZXNEZXBvc2l0QW10CQAAaAAAAAIAAAAAAAAACigFAAAAB3dhdmVsZXQAAAAADWJ0Y0RlcG9zaXRBbXQJAABpAAAAAgkAAGgAAAACAAAAAAAAAAooBQAAAAd3YXZlbGV0AAAAAAAAACcQAAAAAA1ldGhEZXBvc2l0QW10CQAAaAAAAAIAAAAAAAAAAA0FAAAAB3dhdmVsZXQAAAAADWx0Y0RlcG9zaXRBbXQJAABoAAAAAgAAAAAAAAAAJwUAAAAHd2F2ZWxldAAAAAAOd2VzdERlcG9zaXRBbXQJAABoAAAAAgAAAAAAAABlkAUAAAAHd2F2ZWxldAAAAAANd2N0RGVwb3NpdEFtdAkAAGgAAAACAAAAAAAAAGWQBQAAAAd3YXZlbGV0AAAAABJEcmFnb25GcnVpdEFkZHJlc3MCAAAAIzNNekRHOXJ0MTNFdTV1dzRtWnFrRzVheERpaWp2VlNEYmpjAAAAAA1kaXZQcm9ncmFtUHViCQACWQAAAAECAAAALEE0YkpmbkJoQlRWaDdHUk5yMWhIejZpcUp0YTZlQmJhRXhQREc3VWFwb2FEAAAAAAhhZG1pblB1YgkAAlkAAAABAgAAACw1eWpjZnZINml1d3JrRmdoWHVXYUplTXBwYVE4OTNGU3M4SENBZ1ZRenVOWQAAAAAMd2F2ZXNBc3NldElkBQAAAAR1bml0AAAAAApidGNBc3NldElkAQAAACBsNrL21BwS3Md23RJMHhLQAO4hSBtyiG7Fc7ytDznbKgAAAAAKZXRoQXNzZXRJZAEAAAAgOG7ORVbewMfbA62a/olDqujnHoVWkAI6aALb9rnp/hUAAAAACmx0Y0Fzc2V0SWQBAAAAIOgiL+x0m1Ys90GEbhAt/GhwYa/SfUs9i6TkxeTk+aA0AAAAAAt3ZXN0QXNzZXRJZAEAAAAgo8wfsr1SQl9J9PZOiK8WWOnKBJ7hoJ361Vu8XpF9QVAAAAAACndjdEFzc2V0SWQBAAAAIIrzprwH1IzTbjJC2mPa4ApAiM36hA1xKUedFL6llmWwAQAAAA1jYWxsZXJJc0FkbWluAAAAAQAAAA9jYWxsZXJQdWJsaWNLZXkDCQAAAAAAAAIFAAAAD2NhbGxlclB1YmxpY0tleQUAAAAIYWRtaW5QdWIFAAAAD2NhbGxlclB1YmxpY0tleQkAAAIAAAABAgAAABpZb3UgY2Fubm90IGNyZWF0ZSBkZXBvc2l0cwEAAAAUY2FsbGVySXNEZXBvc2l0T3duZXIAAAACAAAACWFzc2V0TmFtZQAAAA9jYWxsZXJQdWJsaWNLZXkEAAAADGRlcG9zaXRPd25lcgkABB0AAAACBQAAAAR0aGlzCQABLAAAAAIFAAAACWFzc2V0TmFtZQIAAAANX0RlcG9zaXRPd25lcgMJAAAAAAAAAgUAAAAPY2FsbGVyUHVibGljS2V5BQAAAAxkZXBvc2l0T3duZXIFAAAAD2NhbGxlclB1YmxpY0tleQkAAAIAAAABAgAAACtPbmx5IGRlcG9zaXQgb3duZXIgY2FuIHdpdGhkcmF3YWwgZGl2aWRlbmRzAQAAABNkZXBvc2l0Q3JlYXRlZENoZWNrAAAAAQAAAAlhc3NldE5hbWUEAAAAA2tleQkAASwAAAACBQAAAAlhc3NldE5hbWUCAAAADV9EZXBvc2l0T3duZXIEAAAAA3ZhbAkABB0AAAACBQAAAAR0aGlzBQAAAANrZXkEAAAAByRtYXRjaDAFAAAAA3ZhbAMJAAABAAAAAgUAAAAHJG1hdGNoMAIAAAAGU3RyaW5nBAAAAAFhBQAAAAckbWF0Y2gwBgcBAAAAC2Ftb3VudENoZWNrAAAAAgAAAAlhc3NldE5hbWUAAAAJcG10QW1vdW50BAAAAANrZXkJAAEsAAAAAgUAAAAJYXNzZXROYW1lAgAAAA5fRGVwb3NpdEFtb3VudAQAAAADdmFsCQAEGgAAAAIFAAAABHRoaXMFAAAAA2tleQQAAAANZGVwb3NpdEFtb3VudAQAAAAHJG1hdGNoMAUAAAADdmFsAwkAAAEAAAACBQAAAAckbWF0Y2gwAgAAAANJbnQEAAAAAWEFAAAAByRtYXRjaDAFAAAAAWEJAAACAAAAAQIAAAAcQ291bGRuJ3QgZmluZCBkZXBvc2l0IGFtb3VudAMJAAAAAAAAAgUAAAAJcG10QW1vdW50BQAAAA1kZXBvc2l0QW1vdW50BQAAAAlwbXRBbW91bnQJAAACAAAAAQIAAAATQW1vdW50IGlzIGluY29ycmVjdAEAAAARYXNzZXRCYXNlNThUb05hbWUAAAABAAAAB2Fzc2V0SWQDCQEAAAABIQAAAAEJAQAAAAlpc0RlZmluZWQAAAABBQAAAAdhc3NldElkAgAAAAVXQVZFUwMJAAAAAAAAAgUAAAAHYXNzZXRJZAUAAAAKYnRjQXNzZXRJZAIAAAADQlRDAwkAAAAAAAACBQAAAAdhc3NldElkBQAAAApldGhBc3NldElkAgAAAANFVEgDCQAAAAAAAAIFAAAAB2Fzc2V0SWQFAAAACmx0Y0Fzc2V0SWQCAAAAA0xUQwMJAAAAAAAAAgUAAAAHYXNzZXRJZAUAAAALd2VzdEFzc2V0SWQCAAAAA1ZTVAMJAAAAAAAAAgUAAAAHYXNzZXRJZAUAAAAKd2N0QXNzZXRJZAIAAAADV0NUCQAAAgAAAAECAAAAFEFzc2V0SWQgaXMgaW5jb3JyZWN0AQAAABFhc3NldE5hbWVUb0Jhc2U1OAAAAAEAAAAJYXNzZXROYW1lAwkAAAAAAAACBQAAAAlhc3NldE5hbWUCAAAABVdBVkVTBQAAAAx3YXZlc0Fzc2V0SWQDCQAAAAAAAAIFAAAACWFzc2V0TmFtZQIAAAADQlRDBQAAAApidGNBc3NldElkAwkAAAAAAAACBQAAAAlhc3NldE5hbWUCAAAAA0VUSAUAAAAKZXRoQXNzZXRJZAMJAAAAAAAAAgUAAAAJYXNzZXROYW1lAgAAAANMVEMFAAAACmx0Y0Fzc2V0SWQDCQAAAAAAAAIFAAAACWFzc2V0TmFtZQIAAAADVlNUBQAAAAt3ZXN0QXNzZXRJZAMJAAAAAAAAAgUAAAAJYXNzZXROYW1lAgAAAANXQ1QFAAAACndjdEFzc2V0SWQJAAACAAAAAQIAAAAXQXNzZXQgbmFtZSBpcyBpbmNvcnJlY3QBAAAAE2dldERpdmlkZW5kc1BlcmNlbnQAAAABAAAACWFzc2V0TmFtZQQAAAADa2V5CQABLAAAAAIFAAAACWFzc2V0TmFtZQIAAAAQX0RpdmlkZW5kUGVyY2VudAQAAAADdmFsCQAEGgAAAAIFAAAABHRoaXMFAAAAA2tleQQAAAAHJG1hdGNoMAUAAAADdmFsAwkAAAEAAAACBQAAAAckbWF0Y2gwAgAAAANJbnQEAAAAAWEFAAAAByRtYXRjaDAFAAAAAWEJAAACAAAAAQIAAAAeQ291bGRuJ3QgRmluZCBkaXZpZGVuZCBwZXJjZW50AQAAABtnZXREaXZpZGVuZHNXaXRoZHJhd25BbW91bnQAAAABAAAACWFzc2V0TmFtZQQAAAADdmFsCQAEGgAAAAIFAAAABHRoaXMJAAEsAAAAAgUAAAAJYXNzZXROYW1lAgAAABJfRGl2aWRlbmRXaXRoZHJhd24EAAAAByRtYXRjaDAFAAAAA3ZhbAMJAAABAAAAAgUAAAAHJG1hdGNoMAIAAAADSW50BAAAAAFhBQAAAAckbWF0Y2gwBQAAAAFhAAAAAAAAAAAAAQAAABJnZXREaXZpZGVuZEJhbGFuY2UAAAADAAAAB2Fzc2V0SWQAAAASZGl2aWRlbmRzV2l0aGRyYXduAAAAEGRpdmlkZW5kc1BlcmNlbnQEAAAAFWRpdmlkZW5kc1RvdGFsQmFsYW5jZQkAAGQAAAACCQAD6wAAAAIFAAAABHRoaXMFAAAAB2Fzc2V0SWQFAAAAEmRpdmlkZW5kc1dpdGhkcmF3bgQAAAAJdXNlclN0YWtlCQAAaQAAAAIJAABoAAAAAgUAAAAVZGl2aWRlbmRzVG90YWxCYWxhbmNlBQAAABBkaXZpZGVuZHNQZXJjZW50AAAAAAAAAABkCQAAZQAAAAIFAAAACXVzZXJTdGFrZQUAAAASZGl2aWRlbmRzV2l0aGRyYXduAAAAAwAAAAFpAQAAAA1jcmVhdGVEZXBvc2l0AAAABgAAAAlhc3NldE5hbWUAAAAGYW1vdW50AAAAEGRlaXZpZGVuZFBlcmNlbnQAAAALc3RhcnRIZWlnaHQAAAAOZHVyYXRpb25CbG9ja3MAAAAOc3RhcnRUaW1lc3RhbXAEAAAACWNhbGxlclB1YgkBAAAADWNhbGxlcklzQWRtaW4AAAABCAUAAAABaQAAAA9jYWxsZXJQdWJsaWNLZXkEAAAAFWRlcG9zaXRBbHJlYWR5Q3JlYXRlZAkBAAAAE2RlcG9zaXRDcmVhdGVkQ2hlY2sAAAABBQAAAAlhc3NldE5hbWUDBQAAABVkZXBvc2l0QWxyZWFkeUNyZWF0ZWQJAAACAAAAAQIAAAAaRGVwb3NpdCBpcyBhbHJlYWR5IGNyZWF0ZWQJAQAAAAhXcml0ZVNldAAAAAEJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAAEsAAAAAgUAAAAJYXNzZXROYW1lAgAAAA1fRGVwb3NpdFN0YXRlAgAAAAdDcmVhdGVkCQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACCQABLAAAAAIFAAAACWFzc2V0TmFtZQIAAAAOX0RlcG9zaXRBbW91bnQFAAAABmFtb3VudAkABEwAAAACCQEAAAAJRGF0YUVudHJ5AAAAAgkAASwAAAACBQAAAAlhc3NldE5hbWUCAAAAEF9EaXZpZGVuZFBlcmNlbnQFAAAAEGRlaXZpZGVuZFBlcmNlbnQJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAAEsAAAAAgUAAAAJYXNzZXROYW1lAgAAABJfRGVwb3NpdFN0YXJ0QmxvY2sFAAAAC3N0YXJ0SGVpZ2h0CQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACCQABLAAAAAIFAAAACWFzc2V0TmFtZQIAAAAWX0RlcG9zaXRTdGFydFRpbWVzdGFtcAUAAAAOc3RhcnRUaW1lc3RhbXAJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAAEsAAAAAgUAAAAJYXNzZXROYW1lAgAAABVfRGVwb3NpdER1cmF0aW9uQmxvY2sFAAAADmR1cmF0aW9uQmxvY2tzBQAAAANuaWwAAAABaQEAAAAHZGVwb3NpdAAAAAAEAAAACWNhbGxlclB1YgkAAlgAAAABCAUAAAABaQAAAA9jYWxsZXJQdWJsaWNLZXkEAAAAA3BtdAkBAAAAB2V4dHJhY3QAAAABCAUAAAABaQAAAAdwYXltZW50BAAAAAlhc3NldE5hbWUJAQAAABFhc3NldEJhc2U1OFRvTmFtZQAAAAEIBQAAAANwbXQAAAAHYXNzZXRJZAQAAAAGYW1vdW50CQEAAAALYW1vdW50Q2hlY2sAAAACBQAAAAlhc3NldE5hbWUIBQAAAANwbXQAAAAGYW1vdW50BAAAAAxkZXBvc2l0U3RhdGUJAAQdAAAAAgUAAAAEdGhpcwkAASwAAAACBQAAAAlhc3NldE5hbWUCAAAADV9EZXBvc2l0U3RhdGUDCQAAAAAAAAIFAAAADGRlcG9zaXRTdGF0ZQIAAAAHQ3JlYXRlZAkBAAAADFNjcmlwdFJlc3VsdAAAAAIJAQAAAAhXcml0ZVNldAAAAAEJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAAEsAAAAAgUAAAAJYXNzZXROYW1lAgAAAA1fRGVwb3NpdE93bmVyBQAAAAljYWxsZXJQdWIJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAAEsAAAAAgUAAAAJYXNzZXROYW1lAgAAAA1fRGVwb3NpdFN0YXRlAgAAAAZBY3RpdmUJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAAEsAAAAAgUAAAAJYXNzZXROYW1lAgAAABJfRGl2aWRlbmRXaXRoZHJhd24AAAAAAAAAAAAFAAAAA25pbAkBAAAAC1RyYW5zZmVyU2V0AAAAAQkABEwAAAACCQEAAAAOU2NyaXB0VHJhbnNmZXIAAAADCQEAAAAcQGV4dHJVc2VyKGFkZHJlc3NGcm9tU3RyaW5nKQAAAAEFAAAAEkRyYWdvbkZydWl0QWRkcmVzcwUAAAAGYW1vdW50CAUAAAADcG10AAAAB2Fzc2V0SWQFAAAAA25pbAkAAAIAAAABAgAAABZEZXBvc2l0IGlzIHVuYXZhaWxhYmxlAAAAAWkBAAAAEXdpdGhkcmF3RGl2aWRlbmRzAAAAAQAAAAlhc3NldE5hbWUEAAAAB2Fzc2V0SWQJAQAAABFhc3NldE5hbWVUb0Jhc2U1OAAAAAEFAAAACWFzc2V0TmFtZQQAAAAMZGVwb3NpdE93bmVyCQEAAAAUY2FsbGVySXNEZXBvc2l0T3duZXIAAAACBQAAAAlhc3NldE5hbWUJAAJYAAAAAQgFAAAAAWkAAAAPY2FsbGVyUHVibGljS2V5BAAAABBkaXZpZGVuZHNQZXJjZW50CQEAAAATZ2V0RGl2aWRlbmRzUGVyY2VudAAAAAEFAAAACWFzc2V0TmFtZQQAAAASZGl2aWRlbmRzV2l0aGRyYXduCQEAAAAbZ2V0RGl2aWRlbmRzV2l0aGRyYXduQW1vdW50AAAAAQUAAAAJYXNzZXROYW1lBAAAABJkaXZpZGVuZHNBdmFsaWFibGUJAQAAABJnZXREaXZpZGVuZEJhbGFuY2UAAAADBQAAAAdhc3NldElkBQAAABJkaXZpZGVuZHNXaXRoZHJhd24FAAAAEGRpdmlkZW5kc1BlcmNlbnQJAQAAAAxTY3JpcHRSZXN1bHQAAAACCQEAAAAIV3JpdGVTZXQAAAABCQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACCQABLAAAAAIFAAAACWFzc2V0TmFtZQIAAAASX0RpdmlkZW5kV2l0aGRyYXduCQAAZAAAAAIFAAAAEmRpdmlkZW5kc1dpdGhkcmF3bgUAAAASZGl2aWRlbmRzQXZhbGlhYmxlBQAAAANuaWwJAQAAAAtUcmFuc2ZlclNldAAAAAEJAARMAAAAAgkBAAAADlNjcmlwdFRyYW5zZmVyAAAAAwkBAAAAFGFkZHJlc3NGcm9tUHVibGljS2V5AAAAAQkAAlkAAAABBQAAAAxkZXBvc2l0T3duZXIFAAAAEmRpdmlkZW5kc0F2YWxpYWJsZQUAAAAHYXNzZXRJZAUAAAADbmlsAAAAAQAAAAJ0eAEAAAAGdmVyaWZ5AAAAAAMJAAH0AAAAAwgFAAAAAnR4AAAACWJvZHlCeXRlcwkAAZEAAAACCAUAAAACdHgAAAAGcHJvb2ZzAAAAAAAAAAAABQAAAA1kaXZQcm9ncmFtUHViBAAAAAckbWF0Y2gwBQAAAAJ0eAMJAAABAAAAAgUAAAAHJG1hdGNoMAIAAAAUU2V0U2NyaXB0VHJhbnNhY3Rpb24EAAAABHNzdHgFAAAAByRtYXRjaDAGAwkAAAEAAAACBQAAAAckbWF0Y2gwAgAAABNUcmFuc2ZlclRyYW5zYWN0aW9uBAAAAAN0dHgFAAAAByRtYXRjaDAEAAAACWFzc2V0TmFtZQkBAAAAEWFzc2V0QmFzZTU4VG9OYW1lAAAAAQgFAAAAA3R0eAAAAAdhc3NldElkBAAAABBkaXZpZGVuZHNQZXJjZW50CQEAAAATZ2V0RGl2aWRlbmRzUGVyY2VudAAAAAEFAAAACWFzc2V0TmFtZQQAAAASZGl2aWRlbmRzV2l0aGRyYXduCQEAAAAbZ2V0RGl2aWRlbmRzV2l0aGRyYXduQW1vdW50AAAAAQUAAAAJYXNzZXROYW1lBAAAAAlkaXZpZGVuZHMJAQAAABJnZXREaXZpZGVuZEJhbGFuY2UAAAADCAUAAAADdHR4AAAAB2Fzc2V0SWQFAAAAEmRpdmlkZW5kc1dpdGhkcmF3bgUAAAAQZGl2aWRlbmRzUGVyY2VudAQAAAAOYWNjb3VudEJhbGFuY2UJAAPrAAAAAgUAAAAEdGhpcwgFAAAAA3R0eAAAAAdhc3NldElkCQAAZwAAAAIJAABlAAAAAgUAAAAOYWNjb3VudEJhbGFuY2UIBQAAAAN0dHgAAAAGYW1vdW50BQAAAAlkaXZpZGVuZHMDCQAAAQAAAAIFAAAAByRtYXRjaDACAAAAF0ludm9rZVNjcmlwdFRyYW5zYWN0aW9uBAAAAANpdHgFAAAAByRtYXRjaDAGBwcF2dR9",
    "chainId": 84,
    "height": 824365,
    "spentComplexity": 0
}

View: original | compacted
Prev: DwaGfQqDhed3uj4fRCekMjgqypBLwjWCevY9RPG6uQGV
Next: 6NwR2aJdVYwbQk78DbZgfvAbr8DUXakA8pJZkX5dLPBm

Diff: 
Old New Differences
116 116  
117 117  
118 118  func getDividendsWithdrawnAmount (assetName) = {
119 -     let val = getInteger(this, (assetName + "_DividendsWithdrawn"))
119 +     let val = getInteger(this, (assetName + "_DividendWithdrawn"))
120 120      match val {
121 121          case a: Int => 
122 122              a
152 152      let amount = amountCheck(assetName, pmt.amount)
153 153      let depositState = getString(this, (assetName + "_DepositState"))
154 154      if ((depositState == "Created"))
155 -         then ScriptResult(WriteSet([DataEntry((assetName + "_DepositOwner"), callerPub), DataEntry((assetName + "_DepositState"), "Active"), DataEntry((assetName + "_DividendsWithdrawn"), 0)]), TransferSet([ScriptTransfer(addressFromStringValue(DragonFruitAddress), amount, pmt.assetId)]))
155 +         then ScriptResult(WriteSet([DataEntry((assetName + "_DepositOwner"), callerPub), DataEntry((assetName + "_DepositState"), "Active"), DataEntry((assetName + "_DividendWithdrawn"), 0)]), TransferSet([ScriptTransfer(addressFromStringValue(DragonFruitAddress), amount, pmt.assetId)]))
156 156          else throw("Deposit is unavailable")
157 157      }
158 158  
165 165      let dividendsPercent = getDividendsPercent(assetName)
166 166      let dividendsWithdrawn = getDividendsWithdrawnAmount(assetName)
167 167      let dividendsAvaliable = getDividendBalance(assetId, dividendsWithdrawn, dividendsPercent)
168 -     ScriptResult(WriteSet([DataEntry((assetName + "_DividendsWithdrawn"), (dividendsWithdrawn + dividendsAvaliable))]), TransferSet([ScriptTransfer(addressFromPublicKey(fromBase58String(depositOwner)), dividendsAvaliable, assetId)]))
168 +     ScriptResult(WriteSet([DataEntry((assetName + "_DividendWithdrawn"), (dividendsWithdrawn + dividendsAvaliable))]), TransferSet([ScriptTransfer(addressFromPublicKey(fromBase58String(depositOwner)), dividendsAvaliable, assetId)]))
169 169      }
170 170  
171 171  
Full: 
Old New Differences
1 1  {-# STDLIB_VERSION 3 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 4  let wavelet = 100000000
5 5  
6 6  let wavesDepositAmt = (2600 * wavelet)
7 7  
8 8  let btcDepositAmt = ((2600 * wavelet) / 10000)
9 9  
10 10  let ethDepositAmt = (13 * wavelet)
11 11  
12 12  let ltcDepositAmt = (39 * wavelet)
13 13  
14 14  let westDepositAmt = (26000 * wavelet)
15 15  
16 16  let wctDepositAmt = (26000 * wavelet)
17 17  
18 18  let DragonFruitAddress = "3MzDG9rt13Eu5uw4mZqkG5axDiijvVSDbjc"
19 19  
20 20  let divProgramPub = fromBase58String("A4bJfnBhBTVh7GRNr1hHz6iqJta6eBbaExPDG7UapoaD")
21 21  
22 22  let adminPub = fromBase58String("5yjcfvH6iuwrkFghXuWaJeMppaQ893FSs8HCAgVQzuNY")
23 23  
24 24  let wavesAssetId = unit
25 25  
26 26  let btcAssetId = base58'8HRQdqJBBeqZvgMtg6we6sw11i5GzpFNs7onNeVRBmaq'
27 27  
28 28  let ethAssetId = base58'4oHq3C7ar7kmcRHEZBrgPyGtU6fkqJ1pHoRYboKeYSWQ'
29 29  
30 30  let ltcAssetId = base58'Gd9pdZw9muDBZwwsQLqyigRJCDABbiJaksmemzFCorsV'
31 31  
32 32  let westAssetId = base58'C2Pz1Q9QYaF9MkK9J9mX9vAMVc25R3w6Lr5g5B5Yje87'
33 33  
34 34  let wctAssetId = base58'AMQkRmWSWHEd1nMDvDZFkadoCFCxRkDzBsEbscJ9ZZ2P'
35 35  
36 36  func callerIsAdmin (callerPublicKey) = if ((callerPublicKey == adminPub))
37 37      then callerPublicKey
38 38      else throw("You cannot create deposits")
39 39  
40 40  
41 41  func callerIsDepositOwner (assetName,callerPublicKey) = {
42 42      let depositOwner = getString(this, (assetName + "_DepositOwner"))
43 43      if ((callerPublicKey == depositOwner))
44 44          then callerPublicKey
45 45          else throw("Only deposit owner can withdrawal dividends")
46 46      }
47 47  
48 48  
49 49  func depositCreatedCheck (assetName) = {
50 50      let key = (assetName + "_DepositOwner")
51 51      let val = getString(this, key)
52 52      match val {
53 53          case a: String => 
54 54              true
55 55          case _ => 
56 56              false
57 57      }
58 58      }
59 59  
60 60  
61 61  func amountCheck (assetName,pmtAmount) = {
62 62      let key = (assetName + "_DepositAmount")
63 63      let val = getInteger(this, key)
64 64      let depositAmount =     match val {
65 65          case a: Int => 
66 66              a
67 67          case _ => 
68 68              throw("Couldn't find deposit amount")
69 69      }
70 70      if ((pmtAmount == depositAmount))
71 71          then pmtAmount
72 72          else throw("Amount is incorrect")
73 73      }
74 74  
75 75  
76 76  func assetBase58ToName (assetId) = if (!(isDefined(assetId)))
77 77      then "WAVES"
78 78      else if ((assetId == btcAssetId))
79 79          then "BTC"
80 80          else if ((assetId == ethAssetId))
81 81              then "ETH"
82 82              else if ((assetId == ltcAssetId))
83 83                  then "LTC"
84 84                  else if ((assetId == westAssetId))
85 85                      then "VST"
86 86                      else if ((assetId == wctAssetId))
87 87                          then "WCT"
88 88                          else throw("AssetId is incorrect")
89 89  
90 90  
91 91  func assetNameToBase58 (assetName) = if ((assetName == "WAVES"))
92 92      then wavesAssetId
93 93      else if ((assetName == "BTC"))
94 94          then btcAssetId
95 95          else if ((assetName == "ETH"))
96 96              then ethAssetId
97 97              else if ((assetName == "LTC"))
98 98                  then ltcAssetId
99 99                  else if ((assetName == "VST"))
100 100                      then westAssetId
101 101                      else if ((assetName == "WCT"))
102 102                          then wctAssetId
103 103                          else throw("Asset name is incorrect")
104 104  
105 105  
106 106  func getDividendsPercent (assetName) = {
107 107      let key = (assetName + "_DividendPercent")
108 108      let val = getInteger(this, key)
109 109      match val {
110 110          case a: Int => 
111 111              a
112 112          case _ => 
113 113              throw("Couldn't Find dividend percent")
114 114      }
115 115      }
116 116  
117 117  
118 118  func getDividendsWithdrawnAmount (assetName) = {
119 -     let val = getInteger(this, (assetName + "_DividendsWithdrawn"))
119 +     let val = getInteger(this, (assetName + "_DividendWithdrawn"))
120 120      match val {
121 121          case a: Int => 
122 122              a
123 123          case _ => 
124 124              0
125 125      }
126 126      }
127 127  
128 128  
129 129  func getDividendBalance (assetId,dividendsWithdrawn,dividendsPercent) = {
130 130      let dividendsTotalBalance = (assetBalance(this, assetId) + dividendsWithdrawn)
131 131      let userStake = ((dividendsTotalBalance * dividendsPercent) / 100)
132 132      (userStake - dividendsWithdrawn)
133 133      }
134 134  
135 135  
136 136  @Callable(i)
137 137  func createDeposit (assetName,amount,deividendPercent,startHeight,durationBlocks,startTimestamp) = {
138 138      let callerPub = callerIsAdmin(i.callerPublicKey)
139 139      let depositAlreadyCreated = depositCreatedCheck(assetName)
140 140      if (depositAlreadyCreated)
141 141          then throw("Deposit is already created")
142 142          else WriteSet([DataEntry((assetName + "_DepositState"), "Created"), DataEntry((assetName + "_DepositAmount"), amount), DataEntry((assetName + "_DividendPercent"), deividendPercent), DataEntry((assetName + "_DepositStartBlock"), startHeight), DataEntry((assetName + "_DepositStartTimestamp"), startTimestamp), DataEntry((assetName + "_DepositDurationBlock"), durationBlocks)])
143 143      }
144 144  
145 145  
146 146  
147 147  @Callable(i)
148 148  func deposit () = {
149 149      let callerPub = toBase58String(i.callerPublicKey)
150 150      let pmt = extract(i.payment)
151 151      let assetName = assetBase58ToName(pmt.assetId)
152 152      let amount = amountCheck(assetName, pmt.amount)
153 153      let depositState = getString(this, (assetName + "_DepositState"))
154 154      if ((depositState == "Created"))
155 -         then ScriptResult(WriteSet([DataEntry((assetName + "_DepositOwner"), callerPub), DataEntry((assetName + "_DepositState"), "Active"), DataEntry((assetName + "_DividendsWithdrawn"), 0)]), TransferSet([ScriptTransfer(addressFromStringValue(DragonFruitAddress), amount, pmt.assetId)]))
155 +         then ScriptResult(WriteSet([DataEntry((assetName + "_DepositOwner"), callerPub), DataEntry((assetName + "_DepositState"), "Active"), DataEntry((assetName + "_DividendWithdrawn"), 0)]), TransferSet([ScriptTransfer(addressFromStringValue(DragonFruitAddress), amount, pmt.assetId)]))
156 156          else throw("Deposit is unavailable")
157 157      }
158 158  
159 159  
160 160  
161 161  @Callable(i)
162 162  func withdrawDividends (assetName) = {
163 163      let assetId = assetNameToBase58(assetName)
164 164      let depositOwner = callerIsDepositOwner(assetName, toBase58String(i.callerPublicKey))
165 165      let dividendsPercent = getDividendsPercent(assetName)
166 166      let dividendsWithdrawn = getDividendsWithdrawnAmount(assetName)
167 167      let dividendsAvaliable = getDividendBalance(assetId, dividendsWithdrawn, dividendsPercent)
168 -     ScriptResult(WriteSet([DataEntry((assetName + "_DividendsWithdrawn"), (dividendsWithdrawn + dividendsAvaliable))]), TransferSet([ScriptTransfer(addressFromPublicKey(fromBase58String(depositOwner)), dividendsAvaliable, assetId)]))
168 +     ScriptResult(WriteSet([DataEntry((assetName + "_DividendWithdrawn"), (dividendsWithdrawn + dividendsAvaliable))]), TransferSet([ScriptTransfer(addressFromPublicKey(fromBase58String(depositOwner)), dividendsAvaliable, assetId)]))
169 169      }
170 170  
171 171  
172 172  @Verifier(tx)
173 173  func verify () = if (sigVerify(tx.bodyBytes, tx.proofs[0], divProgramPub))
174 174      then     match tx {
175 175          case sstx: SetScriptTransaction => 
176 176              true
177 177          case ttx: TransferTransaction => 
178 178              let assetName = assetBase58ToName(ttx.assetId)
179 179              let dividendsPercent = getDividendsPercent(assetName)
180 180              let dividendsWithdrawn = getDividendsWithdrawnAmount(assetName)
181 181              let dividends = getDividendBalance(ttx.assetId, dividendsWithdrawn, dividendsPercent)
182 182              let accountBalance = assetBalance(this, ttx.assetId)
183 183              ((accountBalance - ttx.amount) >= dividends)
184 184          case itx: InvokeScriptTransaction => 
185 185              true
186 186          case _ => 
187 187              false
188 188      }
189 189      else false
190 190

Old	New		Differences
116	116
117	117
118	118		func getDividendsWithdrawnAmount (assetName) = {
119		-	let val = getInteger(this, (assetName + "_~~DividendsWithdrawn~~"))
	119	+	let val = getInteger(this, (assetName + "_DividendWithdrawn"))
120	120		match val {
121	121		case a: Int =>
122	122		a

152	152		let amount = amountCheck(assetName, pmt.amount)
153	153		let depositState = getString(this, (assetName + "_DepositState"))
154	154		if ((depositState == "Created"))
155		-	then ScriptResult(WriteSet([DataEntry((assetName + "_DepositOwner"), callerPub), DataEntry((assetName + "_DepositState"), "Active"), DataEntry((assetName + "_~~DividendsWithdrawn~~"), 0)]), TransferSet([ScriptTransfer(addressFromStringValue(DragonFruitAddress), amount, pmt.assetId)]))
	155	+	then ScriptResult(WriteSet([DataEntry((assetName + "_DepositOwner"), callerPub), DataEntry((assetName + "_DepositState"), "Active"), DataEntry((assetName + "_DividendWithdrawn"), 0)]), TransferSet([ScriptTransfer(addressFromStringValue(DragonFruitAddress), amount, pmt.assetId)]))
156	156		else throw("Deposit is unavailable")
157	157		}
158	158

165	165		let dividendsPercent = getDividendsPercent(assetName)
166	166		let dividendsWithdrawn = getDividendsWithdrawnAmount(assetName)
167	167		let dividendsAvaliable = getDividendBalance(assetId, dividendsWithdrawn, dividendsPercent)
168		-	ScriptResult(WriteSet([DataEntry((assetName + "_~~DividendsWithdrawn~~"), (dividendsWithdrawn + dividendsAvaliable))]), TransferSet([ScriptTransfer(addressFromPublicKey(fromBase58String(depositOwner)), dividendsAvaliable, assetId)]))
	168	+	ScriptResult(WriteSet([DataEntry((assetName + "_DividendWithdrawn"), (dividendsWithdrawn + dividendsAvaliable))]), TransferSet([ScriptTransfer(addressFromPublicKey(fromBase58String(depositOwner)), dividendsAvaliable, assetId)]))
169	169		}
170	170
171	171

Old	New		Differences
1	1		{-# STDLIB_VERSION 3 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4	4		let wavelet = 100000000
5	5
6	6		let wavesDepositAmt = (2600 * wavelet)
7	7
8	8		let btcDepositAmt = ((2600 * wavelet) / 10000)
9	9
10	10		let ethDepositAmt = (13 * wavelet)
11	11
12	12		let ltcDepositAmt = (39 * wavelet)
13	13
14	14		let westDepositAmt = (26000 * wavelet)
15	15
16	16		let wctDepositAmt = (26000 * wavelet)
17	17
18	18		let DragonFruitAddress = "3MzDG9rt13Eu5uw4mZqkG5axDiijvVSDbjc"
19	19
20	20		let divProgramPub = fromBase58String("A4bJfnBhBTVh7GRNr1hHz6iqJta6eBbaExPDG7UapoaD")
21	21
22	22		let adminPub = fromBase58String("5yjcfvH6iuwrkFghXuWaJeMppaQ893FSs8HCAgVQzuNY")
23	23
24	24		let wavesAssetId = unit
25	25
26	26		let btcAssetId = base58'8HRQdqJBBeqZvgMtg6we6sw11i5GzpFNs7onNeVRBmaq'
27	27
28	28		let ethAssetId = base58'4oHq3C7ar7kmcRHEZBrgPyGtU6fkqJ1pHoRYboKeYSWQ'
29	29
30	30		let ltcAssetId = base58'Gd9pdZw9muDBZwwsQLqyigRJCDABbiJaksmemzFCorsV'
31	31
32	32		let westAssetId = base58'C2Pz1Q9QYaF9MkK9J9mX9vAMVc25R3w6Lr5g5B5Yje87'
33	33
34	34		let wctAssetId = base58'AMQkRmWSWHEd1nMDvDZFkadoCFCxRkDzBsEbscJ9ZZ2P'
35	35
36	36		func callerIsAdmin (callerPublicKey) = if ((callerPublicKey == adminPub))
37	37		then callerPublicKey
38	38		else throw("You cannot create deposits")
39	39
40	40
41	41		func callerIsDepositOwner (assetName,callerPublicKey) = {
42	42		let depositOwner = getString(this, (assetName + "_DepositOwner"))
43	43		if ((callerPublicKey == depositOwner))
44	44		then callerPublicKey
45	45		else throw("Only deposit owner can withdrawal dividends")
46	46		}
47	47
48	48
49	49		func depositCreatedCheck (assetName) = {
50	50		let key = (assetName + "_DepositOwner")
51	51		let val = getString(this, key)
52	52		match val {
53	53		case a: String =>
54	54		true
55	55		case _ =>
56	56		false
57	57		}
58	58		}
59	59
60	60
61	61		func amountCheck (assetName,pmtAmount) = {
62	62		let key = (assetName + "_DepositAmount")
63	63		let val = getInteger(this, key)
64	64		let depositAmount = match val {
65	65		case a: Int =>
66	66		a
67	67		case _ =>
68	68		throw("Couldn't find deposit amount")
69	69		}
70	70		if ((pmtAmount == depositAmount))
71	71		then pmtAmount
72	72		else throw("Amount is incorrect")
73	73		}
74	74
75	75
76	76		func assetBase58ToName (assetId) = if (!(isDefined(assetId)))
77	77		then "WAVES"
78	78		else if ((assetId == btcAssetId))
79	79		then "BTC"
80	80		else if ((assetId == ethAssetId))
81	81		then "ETH"
82	82		else if ((assetId == ltcAssetId))
83	83		then "LTC"
84	84		else if ((assetId == westAssetId))
85	85		then "VST"
86	86		else if ((assetId == wctAssetId))
87	87		then "WCT"
88	88		else throw("AssetId is incorrect")
89	89
90	90
91	91		func assetNameToBase58 (assetName) = if ((assetName == "WAVES"))
92	92		then wavesAssetId
93	93		else if ((assetName == "BTC"))
94	94		then btcAssetId
95	95		else if ((assetName == "ETH"))
96	96		then ethAssetId
97	97		else if ((assetName == "LTC"))
98	98		then ltcAssetId
99	99		else if ((assetName == "VST"))
100	100		then westAssetId
101	101		else if ((assetName == "WCT"))
102	102		then wctAssetId
103	103		else throw("Asset name is incorrect")
104	104
105	105
106	106		func getDividendsPercent (assetName) = {
107	107		let key = (assetName + "_DividendPercent")
108	108		let val = getInteger(this, key)
109	109		match val {
110	110		case a: Int =>
111	111		a
112	112		case _ =>
113	113		throw("Couldn't Find dividend percent")
114	114		}
115	115		}
116	116
117	117
118	118		func getDividendsWithdrawnAmount (assetName) = {
119		-	let val = getInteger(this, (assetName + "_~~DividendsWithdrawn~~"))
	119	+	let val = getInteger(this, (assetName + "_DividendWithdrawn"))
120	120		match val {
121	121		case a: Int =>
122	122		a
123	123		case _ =>
124	124		0
125	125		}
126	126		}
127	127
128	128
129	129		func getDividendBalance (assetId,dividendsWithdrawn,dividendsPercent) = {
130	130		let dividendsTotalBalance = (assetBalance(this, assetId) + dividendsWithdrawn)
131	131		let userStake = ((dividendsTotalBalance * dividendsPercent) / 100)
132	132		(userStake - dividendsWithdrawn)
133	133		}
134	134
135	135
136	136		@Callable(i)
137	137		func createDeposit (assetName,amount,deividendPercent,startHeight,durationBlocks,startTimestamp) = {
138	138		let callerPub = callerIsAdmin(i.callerPublicKey)
139	139		let depositAlreadyCreated = depositCreatedCheck(assetName)
140	140		if (depositAlreadyCreated)
141	141		then throw("Deposit is already created")
142	142		else WriteSet([DataEntry((assetName + "_DepositState"), "Created"), DataEntry((assetName + "_DepositAmount"), amount), DataEntry((assetName + "_DividendPercent"), deividendPercent), DataEntry((assetName + "_DepositStartBlock"), startHeight), DataEntry((assetName + "_DepositStartTimestamp"), startTimestamp), DataEntry((assetName + "_DepositDurationBlock"), durationBlocks)])
143	143		}
144	144
145	145
146	146
147	147		@Callable(i)
148	148		func deposit () = {
149	149		let callerPub = toBase58String(i.callerPublicKey)
150	150		let pmt = extract(i.payment)
151	151		let assetName = assetBase58ToName(pmt.assetId)
152	152		let amount = amountCheck(assetName, pmt.amount)
153	153		let depositState = getString(this, (assetName + "_DepositState"))
154	154		if ((depositState == "Created"))
155		-	then ScriptResult(WriteSet([DataEntry((assetName + "_DepositOwner"), callerPub), DataEntry((assetName + "_DepositState"), "Active"), DataEntry((assetName + "_~~DividendsWithdrawn~~"), 0)]), TransferSet([ScriptTransfer(addressFromStringValue(DragonFruitAddress), amount, pmt.assetId)]))
	155	+	then ScriptResult(WriteSet([DataEntry((assetName + "_DepositOwner"), callerPub), DataEntry((assetName + "_DepositState"), "Active"), DataEntry((assetName + "_DividendWithdrawn"), 0)]), TransferSet([ScriptTransfer(addressFromStringValue(DragonFruitAddress), amount, pmt.assetId)]))
156	156		else throw("Deposit is unavailable")
157	157		}
158	158
159	159
160	160
161	161		@Callable(i)
162	162		func withdrawDividends (assetName) = {
163	163		let assetId = assetNameToBase58(assetName)
164	164		let depositOwner = callerIsDepositOwner(assetName, toBase58String(i.callerPublicKey))
165	165		let dividendsPercent = getDividendsPercent(assetName)
166	166		let dividendsWithdrawn = getDividendsWithdrawnAmount(assetName)
167	167		let dividendsAvaliable = getDividendBalance(assetId, dividendsWithdrawn, dividendsPercent)
168		-	ScriptResult(WriteSet([DataEntry((assetName + "_~~DividendsWithdrawn~~"), (dividendsWithdrawn + dividendsAvaliable))]), TransferSet([ScriptTransfer(addressFromPublicKey(fromBase58String(depositOwner)), dividendsAvaliable, assetId)]))
	168	+	ScriptResult(WriteSet([DataEntry((assetName + "_DividendWithdrawn"), (dividendsWithdrawn + dividendsAvaliable))]), TransferSet([ScriptTransfer(addressFromPublicKey(fromBase58String(depositOwner)), dividendsAvaliable, assetId)]))
169	169		}
170	170
171	171
172	172		@Verifier(tx)
173	173		func verify () = if (sigVerify(tx.bodyBytes, tx.proofs[0], divProgramPub))
174	174		then match tx {
175	175		case sstx: SetScriptTransaction =>
176	176		true
177	177		case ttx: TransferTransaction =>
178	178		let assetName = assetBase58ToName(ttx.assetId)
179	179		let dividendsPercent = getDividendsPercent(assetName)
180	180		let dividendsWithdrawn = getDividendsWithdrawnAmount(assetName)
181	181		let dividends = getDividendBalance(ttx.assetId, dividendsWithdrawn, dividendsPercent)
182	182		let accountBalance = assetBalance(this, ttx.assetId)
183	183		((accountBalance - ttx.amount) >= dividends)
184	184		case itx: InvokeScriptTransaction =>
185	185		true
186	186		case _ =>
187	187		false
188	188		}
189	189		else false
190	190

github/deemru/w8io/fabc49c 
32.68 ms ◑