w8 · tx · 7bf···zHk

tx · 7bfLA2RQBBxJqukoCXqUbJeTQAe7Mf7wxNX7HirF4zHk

3MxbR7b3gHF4XdQKNTT5aQMRiazHvrVWC8N:  -0.02000000 Waves

2020.06.26 15:40 [1060693] smart account 3MxbR7b3gHF4XdQKNTT5aQMRiazHvrVWC8N > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "7bfLA2RQBBxJqukoCXqUbJeTQAe7Mf7wxNX7HirF4zHk",
    "fee": 2000000,
    "feeAssetId": null,
    "timestamp": 1593175221470,
    "version": 1,
    "sender": "3MxbR7b3gHF4XdQKNTT5aQMRiazHvrVWC8N",
    "senderPublicKey": "4bj7YXaphTC4Ldx7DqqMmrTjNshRtw1yNsej2XXZcAzS",
    "proofs": [
        "2dU7GnKMCig8ViLTh7MsvBsGtUoooTnUeiqXyKEwHaQH5QbKqLoptShbTWhmaqxntSYEYRBrZMD8xrPg8ZZi6GTp",
        "bMV2JVbNidRrgCq7gWc9pgFq3UxfrkpZZ1cDQGy7imTMCjaDduLV7zhfY7LoaUdyc7oSyyh13tCEjHNi4eGjKf6",
        "5TrF8YkKe8mfLRGA5iALbW7kKK6kk4A3eoxSAC8zgSVSsv7Jub6GJbY1ygTBkJC8KrJhh6KWNUjihw8VdNLc1kPj"
    ],
    "script": "base64:AAIDAAAAAAAAABYIARIDCgEBEgQKAgEIEgMKAQgSABIAAAAAOQEAAAAOZ2V0TnVtYmVyQnlLZXkAAAABAAAAA2tleQQAAAAHJG1hdGNoMAkABBoAAAACBQAAAAR0aGlzBQAAAANrZXkDCQAAAQAAAAIFAAAAByRtYXRjaDACAAAAA0ludAQAAAABYQUAAAAHJG1hdGNoMAUAAAABYQAAAAAAAAAAAAEAAAAOZ2V0U3RyaW5nQnlLZXkAAAABAAAAA2tleQQAAAAHJG1hdGNoMAkABB0AAAACBQAAAAR0aGlzBQAAAANrZXkDCQAAAQAAAAIFAAAAByRtYXRjaDACAAAABlN0cmluZwQAAAABYQUAAAAHJG1hdGNoMAUAAAABYQIAAAAAAQAAABZnZXRCb29sQnlBZGRyZXNzQW5kS2V5AAAAAgAAAAdhZGRyZXNzAAAAA2tleQQAAAAHJG1hdGNoMAkABBsAAAACBQAAAAdhZGRyZXNzBQAAAANrZXkDCQAAAQAAAAIFAAAAByRtYXRjaDACAAAAB0Jvb2xlYW4EAAAAAWEFAAAAByRtYXRjaDAFAAAAAWEHAQAAABhnZXRTdHJpbmdCeUFkZHJlc3NBbmRLZXkAAAACAAAAB2FkZHJlc3MAAAADa2V5BAAAAAckbWF0Y2gwCQAEHQAAAAIFAAAAB2FkZHJlc3MFAAAAA2tleQMJAAABAAAAAgUAAAAHJG1hdGNoMAIAAAAGU3RyaW5nBAAAAAFhBQAAAAckbWF0Y2gwBQAAAAFhAgAAAAABAAAAGGdldE51bWJlckJ5QWRkcmVzc0FuZEtleQAAAAIAAAAHYWRkcmVzcwAAAANrZXkEAAAAByRtYXRjaDAJAAQaAAAAAgUAAAAHYWRkcmVzcwUAAAADa2V5AwkAAAEAAAACBQAAAAckbWF0Y2gwAgAAAANJbnQEAAAAAWEFAAAAByRtYXRjaDAFAAAAAWEAAAAAAAAAAAAAAAAAB1dBVkVMRVQAAAAAAAX14QAAAAAABVBBVUxJAAAAAAAAD0JAAAAAAA1NSU5PUkRFUlRPVEFMCQAAaAAAAAIAAAAAAAAAAAoFAAAAB1dBVkVMRVQAAAAABk1BWFJPSQAAAAAAAAAAXwAAAAAIQ0FOQ0VMRUQCAAAACGNhbmNlbGVkAAAAAANORVcCAAAAA25ldwAAAAAGRklMTEVEAgAAAAZmaWxsZWQAAAAAE05ldXRyaW5vQ29udHJhY3RLZXkCAAAAEW5ldXRyaW5vX2NvbnRyYWN0AAAAAAhQcmljZUtleQIAAAAFcHJpY2UAAAAADkJvbmRBc3NldElkS2V5AgAAAA1ib25kX2Fzc2V0X2lkAAAAABJOZXV0cmlub0Fzc2V0SWRLZXkCAAAAEW5ldXRyaW5vX2Fzc2V0X2lkAAAAABJDb250cm9sQ29udHJhY3RLZXkCAAAAEGNvbnRyb2xfY29udHJhY3QAAAAAEUJhbGFuY2VMb2NrZWRrS2V5AgAAAA1iYWxhbmNlX2xvY2tfAAAAABVXYXZlc0xvY2tlZEJhbGFuY2VLZXkJAAEsAAAAAgUAAAARQmFsYW5jZUxvY2tlZGtLZXkCAAAABXdhdmVzAAAAABhOZXV0cmlub0xvY2tlZEJhbGFuY2VLZXkJAAEsAAAAAgUAAAARQmFsYW5jZUxvY2tlZGtLZXkCAAAACG5ldXRyaW5vAAAAABZMaXF1aWRhdGlvbkNvbnRyYWN0S2V5AgAAABRsaXF1aWRhdGlvbl9jb250cmFjdAAAAAANRmlyc3RPcmRlcktleQIAAAALb3JkZXJfZmlyc3QBAAAAEmdldFJvaUJ5T3JkZXJJZEtleQAAAAEAAAAHb3JkZXJJZAkAASwAAAACAgAAABBkZWJ1Z19vcmRlcl9yb2lfBQAAAAdvcmRlcklkAQAAABBnZXRPcmRlclByaWNlS2V5AAAAAQAAAAdvcmRlcklkCQABLAAAAAICAAAADG9yZGVyX3ByaWNlXwUAAAAHb3JkZXJJZAEAAAAQZ2V0T3JkZXJUb3RhbEtleQAAAAEAAAAHb3JkZXJJZAkAASwAAAACAgAAAAxvcmRlcl90b3RhbF8FAAAAB29yZGVySWQBAAAAEGdldE9yZGVyT3duZXJLZXkAAAABAAAAB29yZGVySWQJAAEsAAAAAgIAAAAMb3JkZXJfb3duZXJfBQAAAAdvcmRlcklkAQAAABFnZXRPcmRlckhlaWdodEtleQAAAAEAAAAHb3JkZXJJZAkAASwAAAACAgAAAA1vcmRlcl9oZWlnaHRfBQAAAAdvcmRlcklkAQAAABFnZXRPcmRlclN0YXR1c0tleQAAAAEAAAAHb3JkZXJJZAkAASwAAAACAgAAAA1vcmRlcl9zdGF0dXNfBQAAAAdvcmRlcklkAQAAABZnZXRPcmRlckZpbGxlZFRvdGFsS2V5AAAAAQAAAAdvcmRlcklkCQABLAAAAAICAAAAE29yZGVyX2ZpbGxlZF90b3RhbF8FAAAAB29yZGVySWQBAAAAD2dldFByZXZPcmRlcktleQAAAAEAAAAHb3JkZXJJZAkAASwAAAACAgAAAAtvcmRlcl9wcmV2XwUAAAAHb3JkZXJJZAEAAAAPZ2V0TmV4dE9yZGVyS2V5AAAAAQAAAAdvcmRlcklkCQABLAAAAAICAAAAC29yZGVyX25leHRfBQAAAAdvcmRlcklkAQAAABZjb252ZXJ0TmV1dHJpbm9Ub1dhdmVzAAAAAgAAAAZhbW91bnQAAAAFcHJpY2UJAABrAAAAAwkAAGsAAAADBQAAAAZhbW91bnQAAAAAAAAAAGQFAAAABXByaWNlBQAAAAdXQVZFTEVUBQAAAAVQQVVMSQEAAAAWY29udmVydFdhdmVzVG9OZXV0cmlubwAAAAIAAAAGYW1vdW50AAAABXByaWNlCQAAawAAAAMJAABrAAAAAwUAAAAGYW1vdW50BQAAAAVwcmljZQAAAAAAAAAAZAUAAAAFUEFVTEkFAAAAB1dBVkVMRVQBAAAAEmNvbnZlcnRXYXZlc1RvQm9uZAAAAAIAAAAGYW1vdW50AAAABXByaWNlCQEAAAAWY29udmVydFdhdmVzVG9OZXV0cmlubwAAAAIFAAAABmFtb3VudAUAAAAFcHJpY2UBAAAAEmNvbnZlcnRCb25kVG9XYXZlcwAAAAIAAAAGYW1vdW50AAAABXByaWNlCQEAAAAWY29udmVydE5ldXRyaW5vVG9XYXZlcwAAAAIFAAAABmFtb3VudAUAAAAFcHJpY2UAAAAAEG5ldXRyaW5vQ29udHJhY3QJAQAAAAdBZGRyZXNzAAAAAQEAAAAaAVR1O2+jpXEwiHaIRki/PzSi+Z8Fly/mGckAAAAAD2NvbnRyb2xDb250cmFjdAkBAAAAB0FkZHJlc3MAAAABAQAAABoBVJ6NjgCXlJ9D0o0alC32bFH00Ii3kVXBQwAAAAATbGlxdWlkYXRpb25Db250cmFjdAkBAAAAB0FkZHJlc3MAAAABAQAAABoBVK4futDS37thQTEnmdJrnSbldny0ccOqcwAAAAAPbmV1dHJpbm9Bc3NldElkAQAAACAP8hwSrOTEPJrsRhqrJaiw7LoHK0bMbYhy8LXikkkBtAAAAAALYm9uZEFzc2V0SWQBAAAAIJiaP8dHgV6qmAVLA1XnN25HWE4J95YrI293QXC0yYlIAAAAAAlpc0Jsb2NrZWQJAQAAABZnZXRCb29sQnlBZGRyZXNzQW5kS2V5AAAAAgUAAAAPY29udHJvbENvbnRyYWN0AgAAAAppc19ibG9ja2VkAAAAAAxjdXJyZW50UHJpY2UJAQAAABhnZXROdW1iZXJCeUFkZHJlc3NBbmRLZXkAAAACBQAAAA9jb250cm9sQ29udHJhY3QFAAAACFByaWNlS2V5AAAAABVuZXV0cmlub0xvY2tlZEJhbGFuY2UJAQAAABhnZXROdW1iZXJCeUFkZHJlc3NBbmRLZXkAAAACBQAAABBuZXV0cmlub0NvbnRyYWN0BQAAABhOZXV0cmlub0xvY2tlZEJhbGFuY2VLZXkAAAAAB3Jlc2VydmUJAABlAAAAAgkBAAAADHdhdmVzQmFsYW5jZQAAAAEFAAAAEG5ldXRyaW5vQ29udHJhY3QJAQAAABhnZXROdW1iZXJCeUFkZHJlc3NBbmRLZXkAAAACBQAAABBuZXV0cmlub0NvbnRyYWN0BQAAABVXYXZlc0xvY2tlZEJhbGFuY2VLZXkAAAAADm5ldXRyaW5vU3VwcGx5CQAAZQAAAAIJAABlAAAAAgkAAGQAAAACBQAAABVuZXV0cmlub0xvY2tlZEJhbGFuY2UICQEAAAAHZXh0cmFjdAAAAAEJAAPsAAAAAQUAAAAPbmV1dHJpbm9Bc3NldElkAAAACHF1YW50aXR5CQAD6wAAAAIFAAAAEG5ldXRyaW5vQ29udHJhY3QFAAAAD25ldXRyaW5vQXNzZXRJZAkAA+sAAAACBQAAABNsaXF1aWRhdGlvbkNvbnRyYWN0BQAAAA9uZXV0cmlub0Fzc2V0SWQAAAAAB2RlZmljaXQJAABlAAAAAgUAAAAObmV1dHJpbm9TdXBwbHkJAQAAABZjb252ZXJ0V2F2ZXNUb05ldXRyaW5vAAAAAgUAAAAHcmVzZXJ2ZQUAAAAMY3VycmVudFByaWNlAAAAAApmaXJzdE9yZGVyCQEAAAAOZ2V0U3RyaW5nQnlLZXkAAAABBQAAAA1GaXJzdE9yZGVyS2V5AQAAAA1nZXRPcmRlclByaWNlAAAAAQAAAAJpZAkBAAAADmdldE51bWJlckJ5S2V5AAAAAQkBAAAAEGdldE9yZGVyUHJpY2VLZXkAAAABBQAAAAJpZAEAAAANZ2V0T3JkZXJUb3RhbAAAAAEAAAACaWQJAQAAAA5nZXROdW1iZXJCeUtleQAAAAEJAQAAABBnZXRPcmRlclRvdGFsS2V5AAAAAQUAAAACaWQBAAAADWdldE9yZGVyT3duZXIAAAABAAAAAmlkCQEAAAAOZ2V0U3RyaW5nQnlLZXkAAAABCQEAAAAQZ2V0T3JkZXJPd25lcktleQAAAAEFAAAAAmlkAQAAAA5nZXRPcmRlclN0YXR1cwAAAAEAAAACaWQJAQAAAA5nZXRTdHJpbmdCeUtleQAAAAEJAQAAABFnZXRPcmRlclN0YXR1c0tleQAAAAEFAAAAAmlkAQAAABNnZXRPcmRlckZpbGxlZFRvdGFsAAAAAQAAAAJpZAkBAAAADmdldE51bWJlckJ5S2V5AAAAAQkBAAAAFmdldE9yZGVyRmlsbGVkVG90YWxLZXkAAAABBQAAAAJpZAEAAAAMZ2V0UHJldk9yZGVyAAAAAQAAAAJpZAkBAAAADmdldFN0cmluZ0J5S2V5AAAAAQkBAAAAD2dldFByZXZPcmRlcktleQAAAAEFAAAAAmlkAQAAAAxnZXROZXh0T3JkZXIAAAABAAAAAmlkCQEAAAAOZ2V0U3RyaW5nQnlLZXkAAAABCQEAAAAPZ2V0TmV4dE9yZGVyS2V5AAAAAQUAAAACaWQBAAAACW9yZGVyRGF0YQAAAAYAAAAHb3JkZXJJZAAAAA10b3RhbFdhdmVsZXRzAAAABW93bmVyAAAABnN0YXR1cwAAAANyb2kAAAAFcHJpY2UJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAQAAABBnZXRPcmRlclByaWNlS2V5AAAAAQUAAAAHb3JkZXJJZAUAAAAFcHJpY2UJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAQAAABBnZXRPcmRlclRvdGFsS2V5AAAAAQUAAAAHb3JkZXJJZAUAAAANdG90YWxXYXZlbGV0cwkABEwAAAACCQEAAAAJRGF0YUVudHJ5AAAAAgkBAAAAEGdldE9yZGVyT3duZXJLZXkAAAABBQAAAAdvcmRlcklkBQAAAAVvd25lcgkABEwAAAACCQEAAAAJRGF0YUVudHJ5AAAAAgkBAAAAEWdldE9yZGVySGVpZ2h0S2V5AAAAAQUAAAAHb3JkZXJJZAUAAAAGaGVpZ2h0CQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACCQEAAAARZ2V0T3JkZXJTdGF0dXNLZXkAAAABBQAAAAdvcmRlcklkBQAAAAZzdGF0dXMJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAAEsAAAAAgIAAAAZZGVidWdfb3JkZXJfY3VycmVudFByaWNlXwUAAAAHb3JkZXJJZAUAAAAMY3VycmVudFByaWNlCQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACCQEAAAASZ2V0Um9pQnlPcmRlcklkS2V5AAAAAQUAAAAHb3JkZXJJZAUAAAADcm9pBQAAAANuaWwBAAAAEGludGVybmFsU2VsbEJvbmQAAAAJAAAADWN1cnJlbnRNYXhSb2kAAAALcEZpcnN0T3JkZXIAAAAKcE5leHRPcmRlcgAAAAxwRmlsbGVkVG90YWwAAAAEcFJvaQAAAAZwUHJpY2UAAAAQcFBheW1lbnRXYXZlbGV0cwAAABFvcmRlck93bmVyQWRkcmVzcwAAAAxpbnN0YW50T3JkZXIEAAAAFXByaWNlV2F2ZXNCeUJvbmRDZW50cwkAAGsAAAADCQAAZAAAAAIAAAAAAAAAAGQFAAAABHBSb2kFAAAADGN1cnJlbnRQcmljZQAAAAAAAAAAZAQAAAANcmVtYWluZWRUb3RhbAkAAGUAAAACBQAAABBwUGF5bWVudFdhdmVsZXRzBQAAAAxwRmlsbGVkVG90YWwEAAAAE2ZpbGxhYmxlT3JkZXJBbW91bnQJAQAAABJjb252ZXJ0V2F2ZXNUb0JvbmQAAAACBQAAAA1yZW1haW5lZFRvdGFsBQAAABVwcmljZVdhdmVzQnlCb25kQ2VudHMEAAAAG3RvdGFsT3JkZXJXYXZlbGV0ZXNSZXF1aXJlZAkBAAAAEmNvbnZlcnRCb25kVG9XYXZlcwAAAAIFAAAAE2ZpbGxhYmxlT3JkZXJBbW91bnQFAAAAFXByaWNlV2F2ZXNCeUJvbmRDZW50cwQAAAAVbmJUb2tlbnNTZWxsQ29uZGl0aW9uCQAAZwAAAAIFAAAADWN1cnJlbnRNYXhSb2kFAAAABHBSb2kDCQEAAAABIQAAAAEFAAAAFW5iVG9rZW5zU2VsbENvbmRpdGlvbgkAAAIAAAABCQABLAAAAAICAAAAE2lubmFwcm9wcmlhdGUgcm9pOiAJAAGkAAAAAQUAAAAEcFJvaQMJAAAAAAAAAgUAAAAbdG90YWxPcmRlcldhdmVsZXRlc1JlcXVpcmVkAAAAAAAAAAAACQAAAgAAAAECAAAAH2Nhbm5vdCBmaWxsIG9yZGVyIGF0IHRoZSBtb21lbnQEAAAADmNoYW5nZVdhdmVsZXRzCQAAZQAAAAIFAAAADXJlbWFpbmVkVG90YWwFAAAAG3RvdGFsT3JkZXJXYXZlbGV0ZXNSZXF1aXJlZAQAAAAMd3JpdGVTZXREYXRhAwUAAAAMaW5zdGFudE9yZGVyCQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACCQEAAAAQZ2V0T3JkZXJQcmljZUtleQAAAAEFAAAAC3BGaXJzdE9yZGVyBQAAAAZwUHJpY2UJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAQAAABBnZXRPcmRlclRvdGFsS2V5AAAAAQUAAAALcEZpcnN0T3JkZXIFAAAAEHBQYXltZW50V2F2ZWxldHMJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAQAAABBnZXRPcmRlck93bmVyS2V5AAAAAQUAAAALcEZpcnN0T3JkZXIJAAJYAAAAAQgFAAAAEW9yZGVyT3duZXJBZGRyZXNzAAAABWJ5dGVzCQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACCQEAAAARZ2V0T3JkZXJIZWlnaHRLZXkAAAABBQAAAAtwRmlyc3RPcmRlcgUAAAAGaGVpZ2h0CQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACCQEAAAARZ2V0T3JkZXJTdGF0dXNLZXkAAAABBQAAAAtwRmlyc3RPcmRlcgUAAAAGRklMTEVECQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACCQABLAAAAAICAAAAGWRlYnVnX29yZGVyX2N1cnJlbnRQcmljZV8FAAAAC3BGaXJzdE9yZGVyBQAAAAxjdXJyZW50UHJpY2UJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAQAAABJnZXRSb2lCeU9yZGVySWRLZXkAAAABBQAAAAtwRmlyc3RPcmRlcgUAAAAEcFJvaQUAAAADbmlsCQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACCQEAAAAWZ2V0T3JkZXJGaWxsZWRUb3RhbEtleQAAAAEFAAAAC3BGaXJzdE9yZGVyCQAAZAAAAAIFAAAADHBGaWxsZWRUb3RhbAUAAAAbdG90YWxPcmRlcldhdmVsZXRlc1JlcXVpcmVkCQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACCQEAAAARZ2V0T3JkZXJTdGF0dXNLZXkAAAABBQAAAAtwRmlyc3RPcmRlcgUAAAAGRklMTEVECQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACCQEAAAAQZ2V0T3JkZXJUb3RhbEtleQAAAAEFAAAAC3BGaXJzdE9yZGVyBQAAABBwUGF5bWVudFdhdmVsZXRzCQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACCQEAAAAPZ2V0UHJldk9yZGVyS2V5AAAAAQUAAAAKcE5leHRPcmRlcgIAAAAACQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACBQAAAA1GaXJzdE9yZGVyS2V5BQAAAApwTmV4dE9yZGVyBQAAAANuaWwJAQAAAAxTY3JpcHRSZXN1bHQAAAACCQEAAAAIV3JpdGVTZXQAAAABBQAAAAx3cml0ZVNldERhdGEJAQAAAAtUcmFuc2ZlclNldAAAAAEJAARMAAAAAgkBAAAADlNjcmlwdFRyYW5zZmVyAAAAAwUAAAARb3JkZXJPd25lckFkZHJlc3MFAAAAE2ZpbGxhYmxlT3JkZXJBbW91bnQFAAAAC2JvbmRBc3NldElkCQAETAAAAAIJAQAAAA5TY3JpcHRUcmFuc2ZlcgAAAAMFAAAAEG5ldXRyaW5vQ29udHJhY3QFAAAAG3RvdGFsT3JkZXJXYXZlbGV0ZXNSZXF1aXJlZAUAAAAEdW5pdAkABEwAAAACCQEAAAAOU2NyaXB0VHJhbnNmZXIAAAADBQAAABFvcmRlck93bmVyQWRkcmVzcwUAAAAOY2hhbmdlV2F2ZWxldHMFAAAABHVuaXQFAAAAA25pbAEAAAAXaW50ZXJuYWxBZGRCdXlCb25kT3JkZXIAAAAGAAAADWN1cnJlbnRNYXhSb2kAAAADcm9pAAAABXByaWNlAAAACXByZXZPcmRlcgAAAANpbnYAAAAMaW5zdGFudE9yZGVyBAAAAANwbXQJAQAAAAdleHRyYWN0AAAAAQgFAAAAA2ludgAAAAdwYXltZW50BAAAAApuZXdPcmRlcklkCQACWAAAAAEIBQAAAANpbnYAAAANdHJhbnNhY3Rpb25JZAMFAAAACWlzQmxvY2tlZAkAAAIAAAABAgAAAFljb250cmFjdCBpcyBibG9ja2VkIGJ5IEVNRVJHRU5DWSBTSFVURE9XTiBhY3Rpb25zIHVudGlsIHJlYWN0aXZhdGlvbiBieSBlbWVyZ2VuY3kgb3JhY2xlcwMJAABmAAAAAgUAAAANTUlOT1JERVJUT1RBTAgFAAAAA3BtdAAAAAZhbW91bnQJAAACAAAAAQkAASwAAAACAgAAABdtaW4gb3JkZXIgdG90YWwgZXF1YWxzIAkAAaQAAAABBQAAAA1NSU5PUkRFUlRPVEFMAwkAAGYAAAACBQAAAANyb2kFAAAABk1BWFJPSQkAAAIAAAABAgAAABdtYXggc2V0T3JkZXIgUk9JIGlzIDk1JQMDCQAAZgAAAAIFAAAAB2RlZmljaXQAAAAAAAAAAAAJAABmAAAAAgAAAAAAAAAAAAUAAAADcm9pBwkAAAIAAAABAgAAADJjYW4ndCBwbGFjZSBvcmRlciB3aXRoIG5lZ2F0aXZlIHJvaSBkdXJpbmcgZGVmaWNpdAMJAABmAAAAAgkBAAAAAS0AAAABBQAAAAZNQVhST0kFAAAAA3JvaQkAAAIAAAABAgAAABhtaW4gc2V0T3JkZXIgUk9JIGlzIC05NSUDCQAAAAAAAAIFAAAAA3JvaQAAAAAAAAAAAAkAAAIAAAABAgAAABxyb2kgc2hvdWxkIG5vdCBiZSBlcXVhbCB0byAwAwkBAAAACWlzRGVmaW5lZAAAAAEIBQAAAANwbXQAAAAHYXNzZXRJZAkAAAIAAAABAgAAABJjYW4gdXNlIHdhdmVzIG9ubHkDCQEAAAACIT0AAAACCQEAAAANZ2V0T3JkZXJPd25lcgAAAAEFAAAACm5ld09yZGVySWQCAAAAAAkAAAIAAAABAgAAAAxvcmRlciBleGlzdHMDAwkBAAAAAiE9AAAAAgUAAAAJcHJldk9yZGVyAgAAAAAJAQAAAAIhPQAAAAIJAQAAAA5nZXRPcmRlclN0YXR1cwAAAAEFAAAACXByZXZPcmRlcgUAAAADTkVXBwkAAAIAAAABAgAAABxwcmV2IG9yZGVyIHN0YXR1cyBpcyBub3QgbmV3BAAAABlpc05ld09yZGVyQXRGaXJzdFBvc2l0aW9uCQAAAAAAAAIFAAAACXByZXZPcmRlcgIAAAAABAAAAAVvd25lcgkABCUAAAABCAUAAAADaW52AAAABmNhbGxlcgQAAAAJbmV4dE9yZGVyAwUAAAAZaXNOZXdPcmRlckF0Rmlyc3RQb3NpdGlvbgUAAAAKZmlyc3RPcmRlcgkBAAAADGdldE5leHRPcmRlcgAAAAEFAAAACXByZXZPcmRlcgQAAAAMbmV4dE9yZGVyUm9pCQEAAAAOZ2V0TnVtYmVyQnlLZXkAAAABCQEAAAASZ2V0Um9pQnlPcmRlcklkS2V5AAAAAQUAAAAJbmV4dE9yZGVyBAAAABBpc05leHRPcmRlckVycm9yAwMJAQAAAAIhPQAAAAIFAAAACW5leHRPcmRlcgIAAAAACQAAZwAAAAIFAAAAA3JvaQUAAAAMbmV4dE9yZGVyUm9pBwYHBAAAAAxwcmV2T3JkZXJSb2kJAQAAAA5nZXROdW1iZXJCeUtleQAAAAEJAQAAABJnZXRSb2lCeU9yZGVySWRLZXkAAAABBQAAAAlwcmV2T3JkZXIEAAAAEGlzUHJldk9yZGVyRXJyb3IDAwkBAAAAAiE9AAAAAgUAAAAJcHJldk9yZGVyAgAAAAAJAABmAAAAAgUAAAAMcHJldk9yZGVyUm9pBQAAAANyb2kHBgcDAwUAAAAQaXNOZXh0T3JkZXJFcnJvcgYFAAAAEGlzUHJldk9yZGVyRXJyb3IJAAACAAAAAQkAASwAAAACCQABLAAAAAIJAAEsAAAAAgIAAAAfaW52YWxpZCBvcmRlciBpc1ByZXZPcmRlckVycm9yOgkAAaUAAAABBQAAABBpc1ByZXZPcmRlckVycm9yAgAAABIgaXNOZXh0T3JkZXJFcnJvcjoJAAGlAAAAAQUAAAAQaXNOZXh0T3JkZXJFcnJvcgMDBQAAABlpc05ld09yZGVyQXRGaXJzdFBvc2l0aW9uBQAAAAxpbnN0YW50T3JkZXIHCQEAAAAQaW50ZXJuYWxTZWxsQm9uZAAAAAkFAAAADWN1cnJlbnRNYXhSb2kFAAAACm5ld09yZGVySWQFAAAACW5leHRPcmRlcgAAAAAAAAAAAAUAAAADcm9pBQAAAAVwcmljZQgFAAAAA3BtdAAAAAZhbW91bnQIBQAAAANpbnYAAAAGY2FsbGVyBgMFAAAADGluc3RhbnRPcmRlcgkAAAIAAAABAgAAADJJbnN0YW50IG9yZGVyIGNvdWxkbid0IGJlIGFkZGVkIGludG8gd2FpdGluZyBxdWV1ZQkBAAAACFdyaXRlU2V0AAAAAQkABEwAAAACCQEAAAAJRGF0YUVudHJ5AAAAAgkBAAAAD2dldFByZXZPcmRlcktleQAAAAEFAAAACm5ld09yZGVySWQFAAAACXByZXZPcmRlcgkABEwAAAACCQEAAAAJRGF0YUVudHJ5AAAAAgkBAAAAD2dldE5leHRPcmRlcktleQAAAAEFAAAACm5ld09yZGVySWQFAAAACW5leHRPcmRlcgkABEwAAAACCQEAAAAJRGF0YUVudHJ5AAAAAgkBAAAAD2dldE5leHRPcmRlcktleQAAAAEFAAAACXByZXZPcmRlcgMJAAAAAAAAAgUAAAAJcHJldk9yZGVyAgAAAAACAAAAAAUAAAAKbmV3T3JkZXJJZAkABEwAAAACCQEAAAAJRGF0YUVudHJ5AAAAAgkBAAAAD2dldFByZXZPcmRlcktleQAAAAEFAAAACW5leHRPcmRlcgMJAAAAAAAAAgUAAAAJbmV4dE9yZGVyAgAAAAACAAAAAAUAAAAKbmV3T3JkZXJJZAkABEwAAAACCQEAAAAJRGF0YUVudHJ5AAAAAgUAAAANRmlyc3RPcmRlcktleQMDCQAAAAAAAAIFAAAACmZpcnN0T3JkZXICAAAAAAYJAAAAAAAAAgUAAAAKZmlyc3RPcmRlcgUAAAAJbmV4dE9yZGVyBQAAAApuZXdPcmRlcklkBQAAAApmaXJzdE9yZGVyCQEAAAAJb3JkZXJEYXRhAAAABgUAAAAKbmV3T3JkZXJJZAgFAAAAA3BtdAAAAAZhbW91bnQFAAAABW93bmVyBQAAAANORVcFAAAAA3JvaQUAAAAFcHJpY2UAAAAFAAAAAWkBAAAAFGluc3RhbnRCdXlOc2J0T3JGYWlsAAAAAQAAAA1ub0xlc3NUaGVuUm9pBAAAAANwbXQJAQAAAAdleHRyYWN0AAAAAQgFAAAAAWkAAAAHcGF5bWVudAQAAAANY3VycmVudE1heFJvaQkAAGsAAAADBQAAAAdkZWZpY2l0AAAAAAAAAABkBQAAAA5uZXV0cmlub1N1cHBseQMJAABmAAAAAgUAAAANbm9MZXNzVGhlblJvaQUAAAANY3VycmVudE1heFJvaQkAAAIAAAABCQABLAAAAAIJAAEsAAAAAgkAASwAAAACAgAAAA9DdXJyZW50IG1heFJvaT0JAAGkAAAAAQUAAAANY3VycmVudE1heFJvaQIAAAAtIGlzIGxlc3MgdGhlbiBwYXNzZWQgcGFyYW1ldGVyIG5vTGVzc1RoZW5Sb2k9CQABpAAAAAEFAAAADW5vTGVzc1RoZW5Sb2kEAAAAFXByaWNlV2F2ZXNCeUJvbmRDZW50cwkAAGsAAAADCQAAZAAAAAIAAAAAAAAAAGQFAAAADWN1cnJlbnRNYXhSb2kFAAAADGN1cnJlbnRQcmljZQAAAAAAAAAAZAkBAAAAF2ludGVybmFsQWRkQnV5Qm9uZE9yZGVyAAAABgUAAAANY3VycmVudE1heFJvaQUAAAANY3VycmVudE1heFJvaQkAAGkAAAACCQAAaAAAAAIAAAAAAAAAAGQAAAAAAAAAAGQFAAAAFXByaWNlV2F2ZXNCeUJvbmRDZW50cwIAAAAABQAAAAFpBgAAAAFpAQAAAA9hZGRCdXlCb25kT3JkZXIAAAACAAAABXByaWNlAAAACXByZXZPcmRlcgQAAAADcG10CQEAAAAHZXh0cmFjdAAAAAEIBQAAAAFpAAAAB3BheW1lbnQEAAAAFXByaWNlV2F2ZXNCeUJvbmRDZW50cwkAAGsAAAADAAAAAAAAAABkAAAAAAAAAABkBQAAAAVwcmljZQMJAABnAAAAAgAAAAAAAAAAAAUAAAAFcHJpY2UJAAACAAAAAQIAAAAPcHJpY2UgbGVzcyB6ZXJvCQEAAAAXaW50ZXJuYWxBZGRCdXlCb25kT3JkZXIAAAAGCQAAawAAAAMFAAAAB2RlZmljaXQAAAAAAAAAAGQFAAAADm5ldXRyaW5vU3VwcGx5CQAAawAAAAMJAABlAAAAAgUAAAAVcHJpY2VXYXZlc0J5Qm9uZENlbnRzBQAAAAxjdXJyZW50UHJpY2UAAAAAAAAAAGQFAAAADGN1cnJlbnRQcmljZQUAAAAFcHJpY2UFAAAACXByZXZPcmRlcgUAAAABaQcAAAABaQEAAAALY2FuY2VsT3JkZXIAAAABAAAAB29yZGVySWQEAAAABW93bmVyCQEAAAANZ2V0T3JkZXJPd25lcgAAAAEFAAAAB29yZGVySWQEAAAABmFtb3VudAkAAGUAAAACCQEAAAANZ2V0T3JkZXJUb3RhbAAAAAEFAAAAB29yZGVySWQJAQAAABNnZXRPcmRlckZpbGxlZFRvdGFsAAAAAQUAAAAHb3JkZXJJZAQAAAAGY2FsbGVyCQAEJQAAAAEIBQAAAAFpAAAABmNhbGxlcgQAAAAJbmV4dE9yZGVyCQEAAAAMZ2V0TmV4dE9yZGVyAAAAAQUAAAAHb3JkZXJJZAQAAAAJcHJldk9yZGVyCQEAAAAMZ2V0UHJldk9yZGVyAAAAAQUAAAAHb3JkZXJJZAMFAAAACWlzQmxvY2tlZAkAAAIAAAABAgAAAFljb250cmFjdCBpcyBibG9ja2VkIGJ5IEVNRVJHRU5DWSBTSFVURE9XTiBhY3Rpb25zIHVudGlsIHJlYWN0aXZhdGlvbiBieSBlbWVyZ2VuY3kgb3JhY2xlcwMJAQAAAAIhPQAAAAIFAAAABW93bmVyBQAAAAZjYWxsZXIJAAACAAAAAQIAAAARcGVybWlzc2lvbiBkZW5pZWQDCQEAAAACIT0AAAACCQEAAAAOZ2V0T3JkZXJTdGF0dXMAAAABBQAAAAdvcmRlcklkBQAAAANORVcJAAACAAAAAQIAAAAUaW52YWxpZCBvcmRlciBzdGF0dXMJAQAAAAxTY3JpcHRSZXN1bHQAAAACCQEAAAAIV3JpdGVTZXQAAAABCQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACBQAAAA1GaXJzdE9yZGVyS2V5AwkAAAAAAAACBQAAAApmaXJzdE9yZGVyBQAAAAdvcmRlcklkBQAAAAluZXh0T3JkZXIFAAAACmZpcnN0T3JkZXIJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAQAAAA9nZXROZXh0T3JkZXJLZXkAAAABBQAAAAlwcmV2T3JkZXIFAAAACW5leHRPcmRlcgkABEwAAAACCQEAAAAJRGF0YUVudHJ5AAAAAgkBAAAAD2dldFByZXZPcmRlcktleQAAAAEFAAAACW5leHRPcmRlcgUAAAAJcHJldk9yZGVyCQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACCQEAAAARZ2V0T3JkZXJTdGF0dXNLZXkAAAABBQAAAAdvcmRlcklkBQAAAAhDQU5DRUxFRAUAAAADbmlsCQEAAAALVHJhbnNmZXJTZXQAAAABCQAETAAAAAIJAQAAAA5TY3JpcHRUcmFuc2ZlcgAAAAMIBQAAAAFpAAAABmNhbGxlcgUAAAAGYW1vdW50BQAAAAR1bml0BQAAAANuaWwAAAABaQEAAAAIc2VsbEJvbmQAAAAAAwUAAAAJaXNCbG9ja2VkCQAAAgAAAAECAAAAWWNvbnRyYWN0IGlzIGJsb2NrZWQgYnkgRU1FUkdFTkNZIFNIVVRET1dOIGFjdGlvbnMgdW50aWwgcmVhY3RpdmF0aW9uIGJ5IGVtZXJnZW5jeSBvcmFjbGVzAwkAAAAAAAACBQAAAApmaXJzdE9yZGVyAgAAAAAJAAACAAAAAQIAAAAPZW1wdHkgb3JkZXJib29rBAAAAAluZXh0T3JkZXIJAQAAAAxnZXROZXh0T3JkZXIAAAABBQAAAApmaXJzdE9yZGVyBAAAAAtmaWxsZWRUb3RhbAkBAAAAE2dldE9yZGVyRmlsbGVkVG90YWwAAAABBQAAAApmaXJzdE9yZGVyBAAAAApvcmRlclByaWNlCQEAAAANZ2V0T3JkZXJQcmljZQAAAAEFAAAACmZpcnN0T3JkZXIEAAAAA3JvaQkBAAAADmdldE51bWJlckJ5S2V5AAAAAQkBAAAAEmdldFJvaUJ5T3JkZXJJZEtleQAAAAEFAAAACmZpcnN0T3JkZXIEAAAAD3BheW1lbnRXYXZlbGV0cwkBAAAADWdldE9yZGVyVG90YWwAAAABBQAAAApmaXJzdE9yZGVyBAAAABFvcmRlck93bmVyQWRkcmVzcwkBAAAAB0FkZHJlc3MAAAABCQACWQAAAAEJAQAAAA1nZXRPcmRlck93bmVyAAAAAQUAAAAKZmlyc3RPcmRlcgkBAAAAEGludGVybmFsU2VsbEJvbmQAAAAJCQAAawAAAAMFAAAAB2RlZmljaXQAAAAAAAAAAGQFAAAADm5ldXRyaW5vU3VwcGx5BQAAAApmaXJzdE9yZGVyBQAAAAluZXh0T3JkZXIFAAAAC2ZpbGxlZFRvdGFsBQAAAANyb2kFAAAACm9yZGVyUHJpY2UFAAAAD3BheW1lbnRXYXZlbGV0cwUAAAARb3JkZXJPd25lckFkZHJlc3MHAAAAAWkBAAAAH3VwZGF0ZVJlc2VydmVzQW5kTmV1dHJpbm9TdXBwbHkAAAAACgEAAAAWZ2V0TnVtYmVyQnlLZXlJbnRlcm5hbAAAAAEAAAADa2V5BAAAAAckbWF0Y2gwCQAEGgAAAAIFAAAABHRoaXMFAAAAA2tleQMJAAABAAAAAgUAAAAHJG1hdGNoMAIAAAADSW50BAAAAAFhBQAAAAckbWF0Y2gwBQAAAAFhAAAAAAAAAAAABAAAAANpZHgJAQAAABZnZXROdW1iZXJCeUtleUludGVybmFsAAAAAQIAAAAidXBkYXRlUmVzZXJ2ZXNBbmROZXV0cmlub1N1cHBseUlkeAQAAAAGbmV3SWR4CQAAZAAAAAIFAAAAA2lkeAAAAAAAAAAAAQkBAAAACFdyaXRlU2V0AAAAAQkABEwAAAACCQEAAAAJRGF0YUVudHJ5AAAAAgIAAAAidXBkYXRlUmVzZXJ2ZXNBbmROZXV0cmlub1N1cHBseUlkeAUAAAAGbmV3SWR4CQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACAgAAAAdyZXNlcnZlBQAAAAdyZXNlcnZlCQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACAgAAAA5uZXV0cmlub1N1cHBseQUAAAAObmV1dHJpbm9TdXBwbHkJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAICAAAAB2RlZmljaXQFAAAAB2RlZmljaXQFAAAAA25pbAAAAAEAAAACdHgBAAAABnZlcmlmeQAAAAAEAAAAEHB1YktleUFkbWluc0xpc3QJAARMAAAAAgIAAAAsR1h4bVphQ2lnUGdKc1Q2ZDFjTHI4blVYQTY1bkdYOFY3RnVBenpyWTh3UUUJAARMAAAAAgIAAAAsM3h1bXg0aHJQcGVlb283OUhMR2JaQ2dmejk1TDM5WkZkeHh3V2VTVUMyUHUJAARMAAAAAgIAAAAsRDRDcXRLNWZCc256Um8zM1pNaHJNN25pTHNlREgydVJvSzZ3ZUJxMkpRM0EJAARMAAAAAgIAAAAsNVdSWEZTandjVGJOZktjSnM4WnFYbVNTV1lzU1ZKVXRNdk1xWmo1aEg0TmMFAAAAA25pbAQAAAAFY291bnQJAABkAAAAAgkAAGQAAAACCQAAZAAAAAIDCQAB9AAAAAMIBQAAAAJ0eAAAAAlib2R5Qnl0ZXMJAAGRAAAAAggFAAAAAnR4AAAABnByb29mcwAAAAAAAAAAAAkAAlkAAAABCQABkQAAAAIFAAAAEHB1YktleUFkbWluc0xpc3QAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAADCQAB9AAAAAMIBQAAAAJ0eAAAAAlib2R5Qnl0ZXMJAAGRAAAAAggFAAAAAnR4AAAABnByb29mcwAAAAAAAAAAAQkAAlkAAAABCQABkQAAAAIFAAAAEHB1YktleUFkbWluc0xpc3QAAAAAAAAAAAEAAAAAAAAAAAEAAAAAAAAAAAADCQAB9AAAAAMIBQAAAAJ0eAAAAAlib2R5Qnl0ZXMJAAGRAAAAAggFAAAAAnR4AAAABnByb29mcwAAAAAAAAAAAgkAAlkAAAABCQABkQAAAAIFAAAAEHB1YktleUFkbWluc0xpc3QAAAAAAAAAAAIAAAAAAAAAAAEAAAAAAAAAAAADCQAB9AAAAAMIBQAAAAJ0eAAAAAlib2R5Qnl0ZXMJAAGRAAAAAggFAAAAAnR4AAAABnByb29mcwAAAAAAAAAAAwkAAlkAAAABCQABkQAAAAIFAAAAEHB1YktleUFkbWluc0xpc3QAAAAAAAAAAAMAAAAAAAAAAAIAAAAAAAAAAAAJAABnAAAAAgUAAAAFY291bnQAAAAAAAAAAANMVPVr",
    "chainId": 84,
    "height": 1060693,
    "spentComplexity": 0
}

View: original | compacted
Prev: H8wCYZ6UZPhzUhg9Jo3zNPj77upM4U8N4cJ8qEBWhJAk
Next: A4FCj1KSzxR1vg9zBjoo44cT6K2Kto1AMpXYVHfqUUzD

Diff: 
Old New Differences
162 162  func orderData (orderId,totalWavelets,owner,status,roi,price) = [DataEntry(getOrderPriceKey(orderId), price), DataEntry(getOrderTotalKey(orderId), totalWavelets), DataEntry(getOrderOwnerKey(orderId), owner), DataEntry(getOrderHeightKey(orderId), height), DataEntry(getOrderStatusKey(orderId), status), DataEntry(("debug_order_currentPrice_" + orderId), currentPrice), DataEntry(getRoiByOrderIdKey(orderId), roi)]
163 163  
164 164  
165 - func internalSellBond (pFirstOrder,pNextOrder,pFilledTotal,pRoi,pPrice,pPaymentWavelets,orderOwnerAddress,instantOrder) = {
165 + func internalSellBond (currentMaxRoi,pFirstOrder,pNextOrder,pFilledTotal,pRoi,pPrice,pPaymentWavelets,orderOwnerAddress,instantOrder) = {
166 166      let priceWavesByBondCents = fraction((100 + pRoi), currentPrice, 100)
167 167      let remainedTotal = (pPaymentWavelets - pFilledTotal)
168 168      let fillableOrderAmount = convertWavesToBond(remainedTotal, priceWavesByBondCents)
169 169      let totalOrderWaveletesRequired = convertBondToWaves(fillableOrderAmount, priceWavesByBondCents)
170 -     let nbTokensSellCondition = (fraction(deficit, 100, neutrinoSupply) >= pRoi)
170 +     let nbTokensSellCondition = (currentMaxRoi >= pRoi)
171 171      if (!(nbTokensSellCondition))
172 172          then throw(("innapropriate roi: " + toString(pRoi)))
173 173          else if ((totalOrderWaveletesRequired == 0))
182 182      }
183 183  
184 184  
185 - func internalAddBuyBondOrder (roi,price,prevOrder,inv,instantOrder) = {
185 + func internalAddBuyBondOrder (currentMaxRoi,roi,price,prevOrder,inv,instantOrder) = {
186 186      let pmt = extract(inv.payment)
187 187      let newOrderId = toBase58String(inv.transactionId)
188 188      if (isBlocked)
232 232                                                  else if (if (isNewOrderAtFirstPosition)
233 233                                                      then instantOrder
234 234                                                      else false)
235 -                                                     then internalSellBond(newOrderId, nextOrder, 0, roi, price, pmt.amount, inv.caller, true)
235 +                                                     then internalSellBond(currentMaxRoi, newOrderId, nextOrder, 0, roi, price, pmt.amount, inv.caller, true)
236 236                                                      else if (instantOrder)
237 237                                                          then throw("Instant order couldn't be added into waiting queue")
238 238                                                          else WriteSet([DataEntry(getPrevOrderKey(newOrderId), prevOrder), DataEntry(getNextOrderKey(newOrderId), nextOrder), DataEntry(getNextOrderKey(prevOrder), if ((prevOrder == ""))
249 249  
250 250  
251 251  @Callable(i)
252 - func instantBuyNsbtOrFail (roi) = {
252 + func instantBuyNsbtOrFail (noLessThenRoi) = {
253 253      let pmt = extract(i.payment)
254 -     let priceWavesByBondCents = fraction((100 + roi), currentPrice, 100)
255 -     let price = ((100 * 100) / priceWavesByBondCents)
256 -     internalAddBuyBondOrder(roi, price, "", i, true)
254 +     let currentMaxRoi = fraction(deficit, 100, neutrinoSupply)
255 +     if ((noLessThenRoi > currentMaxRoi))
256 +         then throw(((("Current maxRoi=" + toString(currentMaxRoi)) + " is less then passed parameter noLessThenRoi=") + toString(noLessThenRoi)))
257 +         else {
258 +             let priceWavesByBondCents = fraction((100 + currentMaxRoi), currentPrice, 100)
259 +             internalAddBuyBondOrder(currentMaxRoi, currentMaxRoi, ((100 * 100) / priceWavesByBondCents), "", i, true)
260 +             }
257 261      }
258 262  
259 263  
262 266  func addBuyBondOrder (price,prevOrder) = {
263 267      let pmt = extract(i.payment)
264 268      let priceWavesByBondCents = fraction(100, 100, price)
265 -     let roi = fraction((priceWavesByBondCents - currentPrice), 100, currentPrice)
266 269      if ((0 >= price))
267 270          then throw("price less zero")
268 -         else internalAddBuyBondOrder(roi, price, prevOrder, i, false)
271 +         else internalAddBuyBondOrder(fraction(deficit, 100, neutrinoSupply), fraction((priceWavesByBondCents - currentPrice), 100, currentPrice), price, prevOrder, i, false)
269 272      }
270 273  
271 274  
302 305              let roi = getNumberByKey(getRoiByOrderIdKey(firstOrder))
303 306              let paymentWavelets = getOrderTotal(firstOrder)
304 307              let orderOwnerAddress = Address(fromBase58String(getOrderOwner(firstOrder)))
305 -             internalSellBond(firstOrder, nextOrder, filledTotal, roi, orderPrice, paymentWavelets, orderOwnerAddress, false)
308 +             internalSellBond(fraction(deficit, 100, neutrinoSupply), firstOrder, nextOrder, filledTotal, roi, orderPrice, paymentWavelets, orderOwnerAddress, false)
306 309              }
307 310  
308 311  
Full: 
Old New Differences
1 1  {-# STDLIB_VERSION 3 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 4  func getNumberByKey (key) = match getInteger(this, key) {
5 5      case a: Int => 
6 6          a
7 7      case _ => 
8 8          0
9 9  }
10 10  
11 11  
12 12  func getStringByKey (key) = match getString(this, key) {
13 13      case a: String => 
14 14          a
15 15      case _ => 
16 16          ""
17 17  }
18 18  
19 19  
20 20  func getBoolByAddressAndKey (address,key) = match getBoolean(address, key) {
21 21      case a: Boolean => 
22 22          a
23 23      case _ => 
24 24          false
25 25  }
26 26  
27 27  
28 28  func getStringByAddressAndKey (address,key) = match getString(address, key) {
29 29      case a: String => 
30 30          a
31 31      case _ => 
32 32          ""
33 33  }
34 34  
35 35  
36 36  func getNumberByAddressAndKey (address,key) = match getInteger(address, key) {
37 37      case a: Int => 
38 38          a
39 39      case _ => 
40 40          0
41 41  }
42 42  
43 43  
44 44  let WAVELET = 100000000
45 45  
46 46  let PAULI = 1000000
47 47  
48 48  let MINORDERTOTAL = (10 * WAVELET)
49 49  
50 50  let MAXROI = 95
51 51  
52 52  let CANCELED = "canceled"
53 53  
54 54  let NEW = "new"
55 55  
56 56  let FILLED = "filled"
57 57  
58 58  let NeutrinoContractKey = "neutrino_contract"
59 59  
60 60  let PriceKey = "price"
61 61  
62 62  let BondAssetIdKey = "bond_asset_id"
63 63  
64 64  let NeutrinoAssetIdKey = "neutrino_asset_id"
65 65  
66 66  let ControlContractKey = "control_contract"
67 67  
68 68  let BalanceLockedkKey = "balance_lock_"
69 69  
70 70  let WavesLockedBalanceKey = (BalanceLockedkKey + "waves")
71 71  
72 72  let NeutrinoLockedBalanceKey = (BalanceLockedkKey + "neutrino")
73 73  
74 74  let LiquidationContractKey = "liquidation_contract"
75 75  
76 76  let FirstOrderKey = "order_first"
77 77  
78 78  func getRoiByOrderIdKey (orderId) = ("debug_order_roi_" + orderId)
79 79  
80 80  
81 81  func getOrderPriceKey (orderId) = ("order_price_" + orderId)
82 82  
83 83  
84 84  func getOrderTotalKey (orderId) = ("order_total_" + orderId)
85 85  
86 86  
87 87  func getOrderOwnerKey (orderId) = ("order_owner_" + orderId)
88 88  
89 89  
90 90  func getOrderHeightKey (orderId) = ("order_height_" + orderId)
91 91  
92 92  
93 93  func getOrderStatusKey (orderId) = ("order_status_" + orderId)
94 94  
95 95  
96 96  func getOrderFilledTotalKey (orderId) = ("order_filled_total_" + orderId)
97 97  
98 98  
99 99  func getPrevOrderKey (orderId) = ("order_prev_" + orderId)
100 100  
101 101  
102 102  func getNextOrderKey (orderId) = ("order_next_" + orderId)
103 103  
104 104  
105 105  func convertNeutrinoToWaves (amount,price) = fraction(fraction(amount, 100, price), WAVELET, PAULI)
106 106  
107 107  
108 108  func convertWavesToNeutrino (amount,price) = fraction(fraction(amount, price, 100), PAULI, WAVELET)
109 109  
110 110  
111 111  func convertWavesToBond (amount,price) = convertWavesToNeutrino(amount, price)
112 112  
113 113  
114 114  func convertBondToWaves (amount,price) = convertNeutrinoToWaves(amount, price)
115 115  
116 116  
117 117  let neutrinoContract = Address(base58'3Mzbx34Ex5rRbn39vUHx9kiwh3nneF8S5we')
118 118  
119 119  let controlContract = Address(base58'3N4NS7d4Jo9a6F14LiFUKKYVdUkkf2eP4Zx')
120 120  
121 121  let liquidationContract = Address(base58'3N5nmMvMH8o3RPEyCKCaoWahBTYTexnZy62')
122 122  
123 123  let neutrinoAssetId = base58'25FEqEjRkqK6yCkiT7Lz6SAYz7gUFCtxfCChnrVFD5AT'
124 124  
125 125  let bondAssetId = base58'BGhPYquXSK6UYjnPLEn94gFhetp4Jvf7toekEY4x1VDH'
126 126  
127 127  let isBlocked = getBoolByAddressAndKey(controlContract, "is_blocked")
128 128  
129 129  let currentPrice = getNumberByAddressAndKey(controlContract, PriceKey)
130 130  
131 131  let neutrinoLockedBalance = getNumberByAddressAndKey(neutrinoContract, NeutrinoLockedBalanceKey)
132 132  
133 133  let reserve = (wavesBalance(neutrinoContract) - getNumberByAddressAndKey(neutrinoContract, WavesLockedBalanceKey))
134 134  
135 135  let neutrinoSupply = (((neutrinoLockedBalance + extract(assetInfo(neutrinoAssetId)).quantity) - assetBalance(neutrinoContract, neutrinoAssetId)) - assetBalance(liquidationContract, neutrinoAssetId))
136 136  
137 137  let deficit = (neutrinoSupply - convertWavesToNeutrino(reserve, currentPrice))
138 138  
139 139  let firstOrder = getStringByKey(FirstOrderKey)
140 140  
141 141  func getOrderPrice (id) = getNumberByKey(getOrderPriceKey(id))
142 142  
143 143  
144 144  func getOrderTotal (id) = getNumberByKey(getOrderTotalKey(id))
145 145  
146 146  
147 147  func getOrderOwner (id) = getStringByKey(getOrderOwnerKey(id))
148 148  
149 149  
150 150  func getOrderStatus (id) = getStringByKey(getOrderStatusKey(id))
151 151  
152 152  
153 153  func getOrderFilledTotal (id) = getNumberByKey(getOrderFilledTotalKey(id))
154 154  
155 155  
156 156  func getPrevOrder (id) = getStringByKey(getPrevOrderKey(id))
157 157  
158 158  
159 159  func getNextOrder (id) = getStringByKey(getNextOrderKey(id))
160 160  
161 161  
162 162  func orderData (orderId,totalWavelets,owner,status,roi,price) = [DataEntry(getOrderPriceKey(orderId), price), DataEntry(getOrderTotalKey(orderId), totalWavelets), DataEntry(getOrderOwnerKey(orderId), owner), DataEntry(getOrderHeightKey(orderId), height), DataEntry(getOrderStatusKey(orderId), status), DataEntry(("debug_order_currentPrice_" + orderId), currentPrice), DataEntry(getRoiByOrderIdKey(orderId), roi)]
163 163  
164 164  
165 - func internalSellBond (pFirstOrder,pNextOrder,pFilledTotal,pRoi,pPrice,pPaymentWavelets,orderOwnerAddress,instantOrder) = {
165 + func internalSellBond (currentMaxRoi,pFirstOrder,pNextOrder,pFilledTotal,pRoi,pPrice,pPaymentWavelets,orderOwnerAddress,instantOrder) = {
166 166      let priceWavesByBondCents = fraction((100 + pRoi), currentPrice, 100)
167 167      let remainedTotal = (pPaymentWavelets - pFilledTotal)
168 168      let fillableOrderAmount = convertWavesToBond(remainedTotal, priceWavesByBondCents)
169 169      let totalOrderWaveletesRequired = convertBondToWaves(fillableOrderAmount, priceWavesByBondCents)
170 -     let nbTokensSellCondition = (fraction(deficit, 100, neutrinoSupply) >= pRoi)
170 +     let nbTokensSellCondition = (currentMaxRoi >= pRoi)
171 171      if (!(nbTokensSellCondition))
172 172          then throw(("innapropriate roi: " + toString(pRoi)))
173 173          else if ((totalOrderWaveletesRequired == 0))
174 174              then throw("cannot fill order at the moment")
175 175              else {
176 176                  let changeWavelets = (remainedTotal - totalOrderWaveletesRequired)
177 177                  let writeSetData = if (instantOrder)
178 178                      then [DataEntry(getOrderPriceKey(pFirstOrder), pPrice), DataEntry(getOrderTotalKey(pFirstOrder), pPaymentWavelets), DataEntry(getOrderOwnerKey(pFirstOrder), toBase58String(orderOwnerAddress.bytes)), DataEntry(getOrderHeightKey(pFirstOrder), height), DataEntry(getOrderStatusKey(pFirstOrder), FILLED), DataEntry(("debug_order_currentPrice_" + pFirstOrder), currentPrice), DataEntry(getRoiByOrderIdKey(pFirstOrder), pRoi)]
179 179                      else [DataEntry(getOrderFilledTotalKey(pFirstOrder), (pFilledTotal + totalOrderWaveletesRequired)), DataEntry(getOrderStatusKey(pFirstOrder), FILLED), DataEntry(getOrderTotalKey(pFirstOrder), pPaymentWavelets), DataEntry(getPrevOrderKey(pNextOrder), ""), DataEntry(FirstOrderKey, pNextOrder)]
180 180                  ScriptResult(WriteSet(writeSetData), TransferSet([ScriptTransfer(orderOwnerAddress, fillableOrderAmount, bondAssetId), ScriptTransfer(neutrinoContract, totalOrderWaveletesRequired, unit), ScriptTransfer(orderOwnerAddress, changeWavelets, unit)]))
181 181                  }
182 182      }
183 183  
184 184  
185 - func internalAddBuyBondOrder (roi,price,prevOrder,inv,instantOrder) = {
185 + func internalAddBuyBondOrder (currentMaxRoi,roi,price,prevOrder,inv,instantOrder) = {
186 186      let pmt = extract(inv.payment)
187 187      let newOrderId = toBase58String(inv.transactionId)
188 188      if (isBlocked)
189 189          then throw("contract is blocked by EMERGENCY SHUTDOWN actions until reactivation by emergency oracles")
190 190          else if ((MINORDERTOTAL > pmt.amount))
191 191              then throw(("min order total equals " + toString(MINORDERTOTAL)))
192 192              else if ((roi > MAXROI))
193 193                  then throw("max setOrder ROI is 95%")
194 194                  else if (if ((deficit > 0))
195 195                      then (0 > roi)
196 196                      else false)
197 197                      then throw("can't place order with negative roi during deficit")
198 198                      else if ((-(MAXROI) > roi))
199 199                          then throw("min setOrder ROI is -95%")
200 200                          else if ((roi == 0))
201 201                              then throw("roi should not be equal to 0")
202 202                              else if (isDefined(pmt.assetId))
203 203                                  then throw("can use waves only")
204 204                                  else if ((getOrderOwner(newOrderId) != ""))
205 205                                      then throw("order exists")
206 206                                      else if (if ((prevOrder != ""))
207 207                                          then (getOrderStatus(prevOrder) != NEW)
208 208                                          else false)
209 209                                          then throw("prev order status is not new")
210 210                                          else {
211 211                                              let isNewOrderAtFirstPosition = (prevOrder == "")
212 212                                              let owner = toString(inv.caller)
213 213                                              let nextOrder = if (isNewOrderAtFirstPosition)
214 214                                                  then firstOrder
215 215                                                  else getNextOrder(prevOrder)
216 216                                              let nextOrderRoi = getNumberByKey(getRoiByOrderIdKey(nextOrder))
217 217                                              let isNextOrderError = if (if ((nextOrder != ""))
218 218                                                  then (roi >= nextOrderRoi)
219 219                                                  else false)
220 220                                                  then true
221 221                                                  else false
222 222                                              let prevOrderRoi = getNumberByKey(getRoiByOrderIdKey(prevOrder))
223 223                                              let isPrevOrderError = if (if ((prevOrder != ""))
224 224                                                  then (prevOrderRoi > roi)
225 225                                                  else false)
226 226                                                  then true
227 227                                                  else false
228 228                                              if (if (isNextOrderError)
229 229                                                  then true
230 230                                                  else isPrevOrderError)
231 231                                                  then throw(((("invalid order isPrevOrderError:" + toString(isPrevOrderError)) + " isNextOrderError:") + toString(isNextOrderError)))
232 232                                                  else if (if (isNewOrderAtFirstPosition)
233 233                                                      then instantOrder
234 234                                                      else false)
235 -                                                     then internalSellBond(newOrderId, nextOrder, 0, roi, price, pmt.amount, inv.caller, true)
235 +                                                     then internalSellBond(currentMaxRoi, newOrderId, nextOrder, 0, roi, price, pmt.amount, inv.caller, true)
236 236                                                      else if (instantOrder)
237 237                                                          then throw("Instant order couldn't be added into waiting queue")
238 238                                                          else WriteSet([DataEntry(getPrevOrderKey(newOrderId), prevOrder), DataEntry(getNextOrderKey(newOrderId), nextOrder), DataEntry(getNextOrderKey(prevOrder), if ((prevOrder == ""))
239 239                                                              then ""
240 240                                                              else newOrderId), DataEntry(getPrevOrderKey(nextOrder), if ((nextOrder == ""))
241 241                                                              then ""
242 242                                                              else newOrderId), DataEntry(FirstOrderKey, if (if ((firstOrder == ""))
243 243                                                              then true
244 244                                                              else (firstOrder == nextOrder))
245 245                                                              then newOrderId
246 246                                                              else firstOrder), orderData(newOrderId, pmt.amount, owner, NEW, roi, price)])
247 247                                              }
248 248      }
249 249  
250 250  
251 251  @Callable(i)
252 - func instantBuyNsbtOrFail (roi) = {
252 + func instantBuyNsbtOrFail (noLessThenRoi) = {
253 253      let pmt = extract(i.payment)
254 -     let priceWavesByBondCents = fraction((100 + roi), currentPrice, 100)
255 -     let price = ((100 * 100) / priceWavesByBondCents)
256 -     internalAddBuyBondOrder(roi, price, "", i, true)
254 +     let currentMaxRoi = fraction(deficit, 100, neutrinoSupply)
255 +     if ((noLessThenRoi > currentMaxRoi))
256 +         then throw(((("Current maxRoi=" + toString(currentMaxRoi)) + " is less then passed parameter noLessThenRoi=") + toString(noLessThenRoi)))
257 +         else {
258 +             let priceWavesByBondCents = fraction((100 + currentMaxRoi), currentPrice, 100)
259 +             internalAddBuyBondOrder(currentMaxRoi, currentMaxRoi, ((100 * 100) / priceWavesByBondCents), "", i, true)
260 +             }
257 261      }
258 262  
259 263  
260 264  
261 265  @Callable(i)
262 266  func addBuyBondOrder (price,prevOrder) = {
263 267      let pmt = extract(i.payment)
264 268      let priceWavesByBondCents = fraction(100, 100, price)
265 -     let roi = fraction((priceWavesByBondCents - currentPrice), 100, currentPrice)
266 269      if ((0 >= price))
267 270          then throw("price less zero")
268 -         else internalAddBuyBondOrder(roi, price, prevOrder, i, false)
271 +         else internalAddBuyBondOrder(fraction(deficit, 100, neutrinoSupply), fraction((priceWavesByBondCents - currentPrice), 100, currentPrice), price, prevOrder, i, false)
269 272      }
270 273  
271 274  
272 275  
273 276  @Callable(i)
274 277  func cancelOrder (orderId) = {
275 278      let owner = getOrderOwner(orderId)
276 279      let amount = (getOrderTotal(orderId) - getOrderFilledTotal(orderId))
277 280      let caller = toString(i.caller)
278 281      let nextOrder = getNextOrder(orderId)
279 282      let prevOrder = getPrevOrder(orderId)
280 283      if (isBlocked)
281 284          then throw("contract is blocked by EMERGENCY SHUTDOWN actions until reactivation by emergency oracles")
282 285          else if ((owner != caller))
283 286              then throw("permission denied")
284 287              else if ((getOrderStatus(orderId) != NEW))
285 288                  then throw("invalid order status")
286 289                  else ScriptResult(WriteSet([DataEntry(FirstOrderKey, if ((firstOrder == orderId))
287 290                      then nextOrder
288 291                      else firstOrder), DataEntry(getNextOrderKey(prevOrder), nextOrder), DataEntry(getPrevOrderKey(nextOrder), prevOrder), DataEntry(getOrderStatusKey(orderId), CANCELED)]), TransferSet([ScriptTransfer(i.caller, amount, unit)]))
289 292      }
290 293  
291 294  
292 295  
293 296  @Callable(i)
294 297  func sellBond () = if (isBlocked)
295 298      then throw("contract is blocked by EMERGENCY SHUTDOWN actions until reactivation by emergency oracles")
296 299      else if ((firstOrder == ""))
297 300          then throw("empty orderbook")
298 301          else {
299 302              let nextOrder = getNextOrder(firstOrder)
300 303              let filledTotal = getOrderFilledTotal(firstOrder)
301 304              let orderPrice = getOrderPrice(firstOrder)
302 305              let roi = getNumberByKey(getRoiByOrderIdKey(firstOrder))
303 306              let paymentWavelets = getOrderTotal(firstOrder)
304 307              let orderOwnerAddress = Address(fromBase58String(getOrderOwner(firstOrder)))
305 -             internalSellBond(firstOrder, nextOrder, filledTotal, roi, orderPrice, paymentWavelets, orderOwnerAddress, false)
308 +             internalSellBond(fraction(deficit, 100, neutrinoSupply), firstOrder, nextOrder, filledTotal, roi, orderPrice, paymentWavelets, orderOwnerAddress, false)
306 309              }
307 310  
308 311  
309 312  
310 313  @Callable(i)
311 314  func updateReservesAndNeutrinoSupply () = {
312 315      func getNumberByKeyInternal (key) =         match getInteger(this, key) {
313 316          case a: Int => 
314 317              a
315 318          case _ => 
316 319              0
317 320      }
318 321  
319 322      let idx = getNumberByKeyInternal("updateReservesAndNeutrinoSupplyIdx")
320 323      let newIdx = (idx + 1)
321 324      WriteSet([DataEntry("updateReservesAndNeutrinoSupplyIdx", newIdx), DataEntry("reserve", reserve), DataEntry("neutrinoSupply", neutrinoSupply), DataEntry("deficit", deficit)])
322 325      }
323 326  
324 327  
325 328  @Verifier(tx)
326 329  func verify () = {
327 330      let pubKeyAdminsList = ["GXxmZaCigPgJsT6d1cLr8nUXA65nGX8V7FuAzzrY8wQE", "3xumx4hrPpeeoo79HLGbZCgfz95L39ZFdxxwWeSUC2Pu", "D4CqtK5fBsnzRo33ZMhrM7niLseDH2uRoK6weBq2JQ3A", "5WRXFSjwcTbNfKcJs8ZqXmSSWYsSVJUtMvMqZj5hH4Nc"]
328 331      let count = ((((if (sigVerify(tx.bodyBytes, tx.proofs[0], fromBase58String(pubKeyAdminsList[0])))
329 332          then 1
330 333          else 0) + (if (sigVerify(tx.bodyBytes, tx.proofs[1], fromBase58String(pubKeyAdminsList[1])))
331 334          then 1
332 335          else 0)) + (if (sigVerify(tx.bodyBytes, tx.proofs[2], fromBase58String(pubKeyAdminsList[2])))
333 336          then 1
334 337          else 0)) + (if (sigVerify(tx.bodyBytes, tx.proofs[3], fromBase58String(pubKeyAdminsList[3])))
335 338          then 2
336 339          else 0))
337 340      (count >= 3)
338 341      }
339 342

Old	New		Differences
162	162		func orderData (orderId,totalWavelets,owner,status,roi,price) = [DataEntry(getOrderPriceKey(orderId), price), DataEntry(getOrderTotalKey(orderId), totalWavelets), DataEntry(getOrderOwnerKey(orderId), owner), DataEntry(getOrderHeightKey(orderId), height), DataEntry(getOrderStatusKey(orderId), status), DataEntry(("debug_order_currentPrice_" + orderId), currentPrice), DataEntry(getRoiByOrderIdKey(orderId), roi)]
163	163
164	164
165		-	func internalSellBond (pFirstOrder,pNextOrder,pFilledTotal,pRoi,pPrice,pPaymentWavelets,orderOwnerAddress,instantOrder) = {
	165	+	func internalSellBond (currentMaxRoi,pFirstOrder,pNextOrder,pFilledTotal,pRoi,pPrice,pPaymentWavelets,orderOwnerAddress,instantOrder) = {
166	166		let priceWavesByBondCents = fraction((100 + pRoi), currentPrice, 100)
167	167		let remainedTotal = (pPaymentWavelets - pFilledTotal)
168	168		let fillableOrderAmount = convertWavesToBond(remainedTotal, priceWavesByBondCents)
169	169		let totalOrderWaveletesRequired = convertBondToWaves(fillableOrderAmount, priceWavesByBondCents)
170		-	let nbTokensSellCondition = (~~fraction(deficit, 100, neutrinoSupply)~~ >= pRoi)
	170	+	let nbTokensSellCondition = (currentMaxRoi >= pRoi)
171	171		if (!(nbTokensSellCondition))
172	172		then throw(("innapropriate roi: " + toString(pRoi)))
173	173		else if ((totalOrderWaveletesRequired == 0))

182	182		}
183	183
184	184
185		-	func internalAddBuyBondOrder (roi,price,prevOrder,inv,instantOrder) = {
	185	+	func internalAddBuyBondOrder (currentMaxRoi,roi,price,prevOrder,inv,instantOrder) = {
186	186		let pmt = extract(inv.payment)
187	187		let newOrderId = toBase58String(inv.transactionId)
188	188		if (isBlocked)

232	232		else if (if (isNewOrderAtFirstPosition)
233	233		then instantOrder
234	234		else false)
235		-	then internalSellBond(newOrderId, nextOrder, 0, roi, price, pmt.amount, inv.caller, true)
	235	+	then internalSellBond(currentMaxRoi, newOrderId, nextOrder, 0, roi, price, pmt.amount, inv.caller, true)
236	236		else if (instantOrder)
237	237		then throw("Instant order couldn't be added into waiting queue")
238	238		else WriteSet([DataEntry(getPrevOrderKey(newOrderId), prevOrder), DataEntry(getNextOrderKey(newOrderId), nextOrder), DataEntry(getNextOrderKey(prevOrder), if ((prevOrder == ""))

249	249
250	250
251	251		@Callable(i)
252		-	func instantBuyNsbtOrFail (~~roi~~) = {
	252	+	func instantBuyNsbtOrFail (noLessThenRoi) = {
253	253		let pmt = extract(i.payment)
254		-	let priceWavesByBondCents = fraction((100 + roi), currentPrice, 100)
255		-	let price = ((100 * 100) / priceWavesByBondCents)
256		-	internalAddBuyBondOrder(roi, price, "", i, true)
	254	+	let currentMaxRoi = fraction(deficit, 100, neutrinoSupply)
	255	+	if ((noLessThenRoi > currentMaxRoi))
	256	+	then throw(((("Current maxRoi=" + toString(currentMaxRoi)) + " is less then passed parameter noLessThenRoi=") + toString(noLessThenRoi)))
	257	+	else {
	258	+	let priceWavesByBondCents = fraction((100 + currentMaxRoi), currentPrice, 100)
	259	+	internalAddBuyBondOrder(currentMaxRoi, currentMaxRoi, ((100 * 100) / priceWavesByBondCents), "", i, true)
	260	+	}
257	261		}
258	262
259	263

262	266		func addBuyBondOrder (price,prevOrder) = {
263	267		let pmt = extract(i.payment)
264	268		let priceWavesByBondCents = fraction(100, 100, price)
265		-	let roi = fraction((priceWavesByBondCents - currentPrice), 100, currentPrice)
266	269		if ((0 >= price))
267	270		then throw("price less zero")
268		-	else internalAddBuyBondOrder(~~roi~~, price, prevOrder, i, false)
	271	+	else internalAddBuyBondOrder(fraction(deficit, 100, neutrinoSupply), fraction((priceWavesByBondCents - currentPrice), 100, currentPrice), price, prevOrder, i, false)
269	272		}
270	273
271	274

302	305		let roi = getNumberByKey(getRoiByOrderIdKey(firstOrder))
303	306		let paymentWavelets = getOrderTotal(firstOrder)
304	307		let orderOwnerAddress = Address(fromBase58String(getOrderOwner(firstOrder)))
305		-	internalSellBond(firstOrder, nextOrder, filledTotal, roi, orderPrice, paymentWavelets, orderOwnerAddress, false)
	308	+	internalSellBond(fraction(deficit, 100, neutrinoSupply), firstOrder, nextOrder, filledTotal, roi, orderPrice, paymentWavelets, orderOwnerAddress, false)
306	309		}
307	310
308	311

Old	New		Differences
1	1		{-# STDLIB_VERSION 3 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4	4		func getNumberByKey (key) = match getInteger(this, key) {
5	5		case a: Int =>
6	6		a
7	7		case _ =>
8	8		0
9	9		}
10	10
11	11
12	12		func getStringByKey (key) = match getString(this, key) {
13	13		case a: String =>
14	14		a
15	15		case _ =>
16	16		""
17	17		}
18	18
19	19
20	20		func getBoolByAddressAndKey (address,key) = match getBoolean(address, key) {
21	21		case a: Boolean =>
22	22		a
23	23		case _ =>
24	24		false
25	25		}
26	26
27	27
28	28		func getStringByAddressAndKey (address,key) = match getString(address, key) {
29	29		case a: String =>
30	30		a
31	31		case _ =>
32	32		""
33	33		}
34	34
35	35
36	36		func getNumberByAddressAndKey (address,key) = match getInteger(address, key) {
37	37		case a: Int =>
38	38		a
39	39		case _ =>
40	40		0
41	41		}
42	42
43	43
44	44		let WAVELET = 100000000
45	45
46	46		let PAULI = 1000000
47	47
48	48		let MINORDERTOTAL = (10 * WAVELET)
49	49
50	50		let MAXROI = 95
51	51
52	52		let CANCELED = "canceled"
53	53
54	54		let NEW = "new"
55	55
56	56		let FILLED = "filled"
57	57
58	58		let NeutrinoContractKey = "neutrino_contract"
59	59
60	60		let PriceKey = "price"
61	61
62	62		let BondAssetIdKey = "bond_asset_id"
63	63
64	64		let NeutrinoAssetIdKey = "neutrino_asset_id"
65	65
66	66		let ControlContractKey = "control_contract"
67	67
68	68		let BalanceLockedkKey = "balance_lock_"
69	69
70	70		let WavesLockedBalanceKey = (BalanceLockedkKey + "waves")
71	71
72	72		let NeutrinoLockedBalanceKey = (BalanceLockedkKey + "neutrino")
73	73
74	74		let LiquidationContractKey = "liquidation_contract"
75	75
76	76		let FirstOrderKey = "order_first"
77	77
78	78		func getRoiByOrderIdKey (orderId) = ("debug_order_roi_" + orderId)
79	79
80	80
81	81		func getOrderPriceKey (orderId) = ("order_price_" + orderId)
82	82
83	83
84	84		func getOrderTotalKey (orderId) = ("order_total_" + orderId)
85	85
86	86
87	87		func getOrderOwnerKey (orderId) = ("order_owner_" + orderId)
88	88
89	89
90	90		func getOrderHeightKey (orderId) = ("order_height_" + orderId)
91	91
92	92
93	93		func getOrderStatusKey (orderId) = ("order_status_" + orderId)
94	94
95	95
96	96		func getOrderFilledTotalKey (orderId) = ("order_filled_total_" + orderId)
97	97
98	98
99	99		func getPrevOrderKey (orderId) = ("order_prev_" + orderId)
100	100
101	101
102	102		func getNextOrderKey (orderId) = ("order_next_" + orderId)
103	103
104	104
105	105		func convertNeutrinoToWaves (amount,price) = fraction(fraction(amount, 100, price), WAVELET, PAULI)
106	106
107	107
108	108		func convertWavesToNeutrino (amount,price) = fraction(fraction(amount, price, 100), PAULI, WAVELET)
109	109
110	110
111	111		func convertWavesToBond (amount,price) = convertWavesToNeutrino(amount, price)
112	112
113	113
114	114		func convertBondToWaves (amount,price) = convertNeutrinoToWaves(amount, price)
115	115
116	116
117	117		let neutrinoContract = Address(base58'3Mzbx34Ex5rRbn39vUHx9kiwh3nneF8S5we')
118	118
119	119		let controlContract = Address(base58'3N4NS7d4Jo9a6F14LiFUKKYVdUkkf2eP4Zx')
120	120
121	121		let liquidationContract = Address(base58'3N5nmMvMH8o3RPEyCKCaoWahBTYTexnZy62')
122	122
123	123		let neutrinoAssetId = base58'25FEqEjRkqK6yCkiT7Lz6SAYz7gUFCtxfCChnrVFD5AT'
124	124
125	125		let bondAssetId = base58'BGhPYquXSK6UYjnPLEn94gFhetp4Jvf7toekEY4x1VDH'
126	126
127	127		let isBlocked = getBoolByAddressAndKey(controlContract, "is_blocked")
128	128
129	129		let currentPrice = getNumberByAddressAndKey(controlContract, PriceKey)
130	130
131	131		let neutrinoLockedBalance = getNumberByAddressAndKey(neutrinoContract, NeutrinoLockedBalanceKey)
132	132
133	133		let reserve = (wavesBalance(neutrinoContract) - getNumberByAddressAndKey(neutrinoContract, WavesLockedBalanceKey))
134	134
135	135		let neutrinoSupply = (((neutrinoLockedBalance + extract(assetInfo(neutrinoAssetId)).quantity) - assetBalance(neutrinoContract, neutrinoAssetId)) - assetBalance(liquidationContract, neutrinoAssetId))
136	136
137	137		let deficit = (neutrinoSupply - convertWavesToNeutrino(reserve, currentPrice))
138	138
139	139		let firstOrder = getStringByKey(FirstOrderKey)
140	140
141	141		func getOrderPrice (id) = getNumberByKey(getOrderPriceKey(id))
142	142
143	143
144	144		func getOrderTotal (id) = getNumberByKey(getOrderTotalKey(id))
145	145
146	146
147	147		func getOrderOwner (id) = getStringByKey(getOrderOwnerKey(id))
148	148
149	149
150	150		func getOrderStatus (id) = getStringByKey(getOrderStatusKey(id))
151	151
152	152
153	153		func getOrderFilledTotal (id) = getNumberByKey(getOrderFilledTotalKey(id))
154	154
155	155
156	156		func getPrevOrder (id) = getStringByKey(getPrevOrderKey(id))
157	157
158	158
159	159		func getNextOrder (id) = getStringByKey(getNextOrderKey(id))
160	160
161	161
162	162		func orderData (orderId,totalWavelets,owner,status,roi,price) = [DataEntry(getOrderPriceKey(orderId), price), DataEntry(getOrderTotalKey(orderId), totalWavelets), DataEntry(getOrderOwnerKey(orderId), owner), DataEntry(getOrderHeightKey(orderId), height), DataEntry(getOrderStatusKey(orderId), status), DataEntry(("debug_order_currentPrice_" + orderId), currentPrice), DataEntry(getRoiByOrderIdKey(orderId), roi)]
163	163
164	164
165		-	func internalSellBond (pFirstOrder,pNextOrder,pFilledTotal,pRoi,pPrice,pPaymentWavelets,orderOwnerAddress,instantOrder) = {
	165	+	func internalSellBond (currentMaxRoi,pFirstOrder,pNextOrder,pFilledTotal,pRoi,pPrice,pPaymentWavelets,orderOwnerAddress,instantOrder) = {
166	166		let priceWavesByBondCents = fraction((100 + pRoi), currentPrice, 100)
167	167		let remainedTotal = (pPaymentWavelets - pFilledTotal)
168	168		let fillableOrderAmount = convertWavesToBond(remainedTotal, priceWavesByBondCents)
169	169		let totalOrderWaveletesRequired = convertBondToWaves(fillableOrderAmount, priceWavesByBondCents)
170		-	let nbTokensSellCondition = (~~fraction(deficit, 100, neutrinoSupply)~~ >= pRoi)
	170	+	let nbTokensSellCondition = (currentMaxRoi >= pRoi)
171	171		if (!(nbTokensSellCondition))
172	172		then throw(("innapropriate roi: " + toString(pRoi)))
173	173		else if ((totalOrderWaveletesRequired == 0))
174	174		then throw("cannot fill order at the moment")
175	175		else {
176	176		let changeWavelets = (remainedTotal - totalOrderWaveletesRequired)
177	177		let writeSetData = if (instantOrder)
178	178		then [DataEntry(getOrderPriceKey(pFirstOrder), pPrice), DataEntry(getOrderTotalKey(pFirstOrder), pPaymentWavelets), DataEntry(getOrderOwnerKey(pFirstOrder), toBase58String(orderOwnerAddress.bytes)), DataEntry(getOrderHeightKey(pFirstOrder), height), DataEntry(getOrderStatusKey(pFirstOrder), FILLED), DataEntry(("debug_order_currentPrice_" + pFirstOrder), currentPrice), DataEntry(getRoiByOrderIdKey(pFirstOrder), pRoi)]
179	179		else [DataEntry(getOrderFilledTotalKey(pFirstOrder), (pFilledTotal + totalOrderWaveletesRequired)), DataEntry(getOrderStatusKey(pFirstOrder), FILLED), DataEntry(getOrderTotalKey(pFirstOrder), pPaymentWavelets), DataEntry(getPrevOrderKey(pNextOrder), ""), DataEntry(FirstOrderKey, pNextOrder)]
180	180		ScriptResult(WriteSet(writeSetData), TransferSet([ScriptTransfer(orderOwnerAddress, fillableOrderAmount, bondAssetId), ScriptTransfer(neutrinoContract, totalOrderWaveletesRequired, unit), ScriptTransfer(orderOwnerAddress, changeWavelets, unit)]))
181	181		}
182	182		}
183	183
184	184
185		-	func internalAddBuyBondOrder (roi,price,prevOrder,inv,instantOrder) = {
	185	+	func internalAddBuyBondOrder (currentMaxRoi,roi,price,prevOrder,inv,instantOrder) = {
186	186		let pmt = extract(inv.payment)
187	187		let newOrderId = toBase58String(inv.transactionId)
188	188		if (isBlocked)
189	189		then throw("contract is blocked by EMERGENCY SHUTDOWN actions until reactivation by emergency oracles")
190	190		else if ((MINORDERTOTAL > pmt.amount))
191	191		then throw(("min order total equals " + toString(MINORDERTOTAL)))
192	192		else if ((roi > MAXROI))
193	193		then throw("max setOrder ROI is 95%")
194	194		else if (if ((deficit > 0))
195	195		then (0 > roi)
196	196		else false)
197	197		then throw("can't place order with negative roi during deficit")
198	198		else if ((-(MAXROI) > roi))
199	199		then throw("min setOrder ROI is -95%")
200	200		else if ((roi == 0))
201	201		then throw("roi should not be equal to 0")
202	202		else if (isDefined(pmt.assetId))
203	203		then throw("can use waves only")
204	204		else if ((getOrderOwner(newOrderId) != ""))
205	205		then throw("order exists")
206	206		else if (if ((prevOrder != ""))
207	207		then (getOrderStatus(prevOrder) != NEW)
208	208		else false)
209	209		then throw("prev order status is not new")
210	210		else {
211	211		let isNewOrderAtFirstPosition = (prevOrder == "")
212	212		let owner = toString(inv.caller)
213	213		let nextOrder = if (isNewOrderAtFirstPosition)
214	214		then firstOrder
215	215		else getNextOrder(prevOrder)
216	216		let nextOrderRoi = getNumberByKey(getRoiByOrderIdKey(nextOrder))
217	217		let isNextOrderError = if (if ((nextOrder != ""))
218	218		then (roi >= nextOrderRoi)
219	219		else false)
220	220		then true
221	221		else false
222	222		let prevOrderRoi = getNumberByKey(getRoiByOrderIdKey(prevOrder))
223	223		let isPrevOrderError = if (if ((prevOrder != ""))
224	224		then (prevOrderRoi > roi)
225	225		else false)
226	226		then true
227	227		else false
228	228		if (if (isNextOrderError)
229	229		then true
230	230		else isPrevOrderError)
231	231		then throw(((("invalid order isPrevOrderError:" + toString(isPrevOrderError)) + " isNextOrderError:") + toString(isNextOrderError)))
232	232		else if (if (isNewOrderAtFirstPosition)
233	233		then instantOrder
234	234		else false)
235		-	then internalSellBond(newOrderId, nextOrder, 0, roi, price, pmt.amount, inv.caller, true)
	235	+	then internalSellBond(currentMaxRoi, newOrderId, nextOrder, 0, roi, price, pmt.amount, inv.caller, true)
236	236		else if (instantOrder)
237	237		then throw("Instant order couldn't be added into waiting queue")
238	238		else WriteSet([DataEntry(getPrevOrderKey(newOrderId), prevOrder), DataEntry(getNextOrderKey(newOrderId), nextOrder), DataEntry(getNextOrderKey(prevOrder), if ((prevOrder == ""))
239	239		then ""
240	240		else newOrderId), DataEntry(getPrevOrderKey(nextOrder), if ((nextOrder == ""))
241	241		then ""
242	242		else newOrderId), DataEntry(FirstOrderKey, if (if ((firstOrder == ""))
243	243		then true
244	244		else (firstOrder == nextOrder))
245	245		then newOrderId
246	246		else firstOrder), orderData(newOrderId, pmt.amount, owner, NEW, roi, price)])
247	247		}
248	248		}
249	249
250	250
251	251		@Callable(i)
252		-	func instantBuyNsbtOrFail (~~roi~~) = {
	252	+	func instantBuyNsbtOrFail (noLessThenRoi) = {
253	253		let pmt = extract(i.payment)
254		-	let priceWavesByBondCents = fraction((100 + roi), currentPrice, 100)
255		-	let price = ((100 * 100) / priceWavesByBondCents)
256		-	internalAddBuyBondOrder(roi, price, "", i, true)
	254	+	let currentMaxRoi = fraction(deficit, 100, neutrinoSupply)
	255	+	if ((noLessThenRoi > currentMaxRoi))
	256	+	then throw(((("Current maxRoi=" + toString(currentMaxRoi)) + " is less then passed parameter noLessThenRoi=") + toString(noLessThenRoi)))
	257	+	else {
	258	+	let priceWavesByBondCents = fraction((100 + currentMaxRoi), currentPrice, 100)
	259	+	internalAddBuyBondOrder(currentMaxRoi, currentMaxRoi, ((100 * 100) / priceWavesByBondCents), "", i, true)
	260	+	}
257	261		}
258	262
259	263
260	264
261	265		@Callable(i)
262	266		func addBuyBondOrder (price,prevOrder) = {
263	267		let pmt = extract(i.payment)
264	268		let priceWavesByBondCents = fraction(100, 100, price)
265		-	let roi = fraction((priceWavesByBondCents - currentPrice), 100, currentPrice)
266	269		if ((0 >= price))
267	270		then throw("price less zero")
268		-	else internalAddBuyBondOrder(~~roi~~, price, prevOrder, i, false)
	271	+	else internalAddBuyBondOrder(fraction(deficit, 100, neutrinoSupply), fraction((priceWavesByBondCents - currentPrice), 100, currentPrice), price, prevOrder, i, false)
269	272		}
270	273
271	274
272	275
273	276		@Callable(i)
274	277		func cancelOrder (orderId) = {
275	278		let owner = getOrderOwner(orderId)
276	279		let amount = (getOrderTotal(orderId) - getOrderFilledTotal(orderId))
277	280		let caller = toString(i.caller)
278	281		let nextOrder = getNextOrder(orderId)
279	282		let prevOrder = getPrevOrder(orderId)
280	283		if (isBlocked)
281	284		then throw("contract is blocked by EMERGENCY SHUTDOWN actions until reactivation by emergency oracles")
282	285		else if ((owner != caller))
283	286		then throw("permission denied")
284	287		else if ((getOrderStatus(orderId) != NEW))
285	288		then throw("invalid order status")
286	289		else ScriptResult(WriteSet([DataEntry(FirstOrderKey, if ((firstOrder == orderId))
287	290		then nextOrder
288	291		else firstOrder), DataEntry(getNextOrderKey(prevOrder), nextOrder), DataEntry(getPrevOrderKey(nextOrder), prevOrder), DataEntry(getOrderStatusKey(orderId), CANCELED)]), TransferSet([ScriptTransfer(i.caller, amount, unit)]))
289	292		}
290	293
291	294
292	295
293	296		@Callable(i)
294	297		func sellBond () = if (isBlocked)
295	298		then throw("contract is blocked by EMERGENCY SHUTDOWN actions until reactivation by emergency oracles")
296	299		else if ((firstOrder == ""))
297	300		then throw("empty orderbook")
298	301		else {
299	302		let nextOrder = getNextOrder(firstOrder)
300	303		let filledTotal = getOrderFilledTotal(firstOrder)
301	304		let orderPrice = getOrderPrice(firstOrder)
302	305		let roi = getNumberByKey(getRoiByOrderIdKey(firstOrder))
303	306		let paymentWavelets = getOrderTotal(firstOrder)
304	307		let orderOwnerAddress = Address(fromBase58String(getOrderOwner(firstOrder)))
305		-	internalSellBond(firstOrder, nextOrder, filledTotal, roi, orderPrice, paymentWavelets, orderOwnerAddress, false)
	308	+	internalSellBond(fraction(deficit, 100, neutrinoSupply), firstOrder, nextOrder, filledTotal, roi, orderPrice, paymentWavelets, orderOwnerAddress, false)
306	309		}
307	310
308	311
309	312
310	313		@Callable(i)
311	314		func updateReservesAndNeutrinoSupply () = {
312	315		func getNumberByKeyInternal (key) = match getInteger(this, key) {
313	316		case a: Int =>
314	317		a
315	318		case _ =>
316	319		0
317	320		}
318	321
319	322		let idx = getNumberByKeyInternal("updateReservesAndNeutrinoSupplyIdx")
320	323		let newIdx = (idx + 1)
321	324		WriteSet([DataEntry("updateReservesAndNeutrinoSupplyIdx", newIdx), DataEntry("reserve", reserve), DataEntry("neutrinoSupply", neutrinoSupply), DataEntry("deficit", deficit)])
322	325		}
323	326
324	327
325	328		@Verifier(tx)
326	329		func verify () = {
327	330		let pubKeyAdminsList = ["GXxmZaCigPgJsT6d1cLr8nUXA65nGX8V7FuAzzrY8wQE", "3xumx4hrPpeeoo79HLGbZCgfz95L39ZFdxxwWeSUC2Pu", "D4CqtK5fBsnzRo33ZMhrM7niLseDH2uRoK6weBq2JQ3A", "5WRXFSjwcTbNfKcJs8ZqXmSSWYsSVJUtMvMqZj5hH4Nc"]
328	331		let count = ((((if (sigVerify(tx.bodyBytes, tx.proofs[0], fromBase58String(pubKeyAdminsList[0])))
329	332		then 1
330	333		else 0) + (if (sigVerify(tx.bodyBytes, tx.proofs[1], fromBase58String(pubKeyAdminsList[1])))
331	334		then 1
332	335		else 0)) + (if (sigVerify(tx.bodyBytes, tx.proofs[2], fromBase58String(pubKeyAdminsList[2])))
333	336		then 1
334	337		else 0)) + (if (sigVerify(tx.bodyBytes, tx.proofs[3], fromBase58String(pubKeyAdminsList[3])))
335	338		then 2
336	339		else 0))
337	340		(count >= 3)
338	341		}
339	342

github/deemru/w8io/873ac7e 
60.02 ms ◑