tx · D9JhMuaXZVdL6NfjXE3uqWACEoAquoHKPv8rKT18pSfS

3N8f95pbYUxzxmecdHsqeCQXPUoDRSWdGG9:  -0.02800000 Waves

2022.08.31 16:33 [2208703] smart account 3N8f95pbYUxzxmecdHsqeCQXPUoDRSWdGG9 > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "D9JhMuaXZVdL6NfjXE3uqWACEoAquoHKPv8rKT18pSfS",
    "fee": 2800000,
    "feeAssetId": null,
    "timestamp": 1661952579789,
    "version": 2,
    "chainId": 84,
    "sender": "3N8f95pbYUxzxmecdHsqeCQXPUoDRSWdGG9",
    "senderPublicKey": "AGk8X2naFtJSxDiemU3uYY2vUUxjpjdCCL4fWTGt5Dhn",
    "proofs": [
        "3tFhrVgSpPjW76vnAY5KT28TAzxY1x5CWDoaZy5Mau1ngXS2ZC5jyGQdS8njuzEwega2etNQL5dk6ff2Uk8S5dcw"
    ],
    "script": "base64:BgJ/CAISAwoBCBIDCgEIEgASBAoCAQQSBwoFAQEBAQQSAwoBARIAEgcKBQEBAQgBEgQKAgEBEgMKAQESBAoCCAgSBAoCCAgSBAoCCAESABIDCgEIEgUKAwEBARIECgIIARIECgIBARIECgIICBILCgkIAQECAQIIBAQSBgoECAgBCE4ABnNjYWxlOACAwtcvAAxzY2FsZThCaWdJbnQJALYCAQCAwtcvAAdzY2FsZTE4CQC2AgEAgICQu7rWrfANAAp6ZXJvQmlnSW50CQC2AgEAAAAJb25lQmlnSW50CQC2AgEAAQAKc2xpcHBhZ2U0RAkAtgIBCQBlAgUGc2NhbGU4CQBpAgkAaAIFBnNjYWxlOAABBQZzY2FsZTgABUFtdWx0AgMxMDAABURjb252AgExAANTRVACAl9fAAVFTVBUWQIAAApQb29sQWN0aXZlAAEAClBvb2xQdXREaXMAAgAOUG9vbE1hdGNoZXJEaXMAAwAMUG9vbFNodXRkb3duAAQADmlkeFBvb2xBZGRyZXNzAAEACWlkeFBvb2xTdAACAAlpZHhMUEFzSWQAAwAJaWR4QW1Bc0lkAAQACWlkeFByQXNJZAAFAAtpZHhBbXRBc0RjbQAGAA1pZHhQcmljZUFzRGNtAAcAC2lkeElBbXRBc0lkAAgADWlkeElQcmljZUFzSWQACQAPaWR4RmFjdFN0YWtDbnRyAAEAEGlkeEZhY3RTbGlwcENudHIABwARaWR4RmFjdEd3eFJld0NudHIACgAFZGVsYXkCCSVzX19kZWxheQECdDECB29yaWdWYWwNb3JpZ1NjYWxlTXVsdAkAvAIDCQC2AgEFB29yaWdWYWwFB3NjYWxlMTgJALYCAQUNb3JpZ1NjYWxlTXVsdAECZjECA3ZhbA9yZXN1bHRTY2FsZU11bHQJAKADAQkAvAIDBQN2YWwJALYCAQUPcmVzdWx0U2NhbGVNdWx0BQdzY2FsZTE4AQJ0cwMDYW10CHJlc1NjYWxlCGN1clNjYWxlCQBrAwUDYW10BQhyZXNTY2FsZQUIY3VyU2NhbGUBA2FicwEDdmFsAwkAvwICBQp6ZXJvQmlnSW50BQN2YWwJAL4CAQUDdmFsBQN2YWwBAmZjAAITJXNfX2ZhY3RvcnlDb250cmFjdAEDbXBrAAIUJXNfX21hbmFnZXJQdWJsaWNLZXkBBHBtcGsAAhslc19fcGVuZGluZ01hbmFnZXJQdWJsaWNLZXkBAnBsAAIRJXMlc19fcHJpY2VfX2xhc3QBAnBoAgFoAXQJALkJAgkAzAgCAhglcyVzJWQlZF9fcHJpY2VfX2hpc3RvcnkJAMwIAgkApAMBBQFoCQDMCAIJAKQDAQUBdAUDbmlsBQNTRVABA3BhdQICdWEEdHhJZAkArAICCQCsAgIJAKwCAgILJXMlcyVzX19QX18FAnVhAgJfXwUEdHhJZAEDZ2F1AgJ1YQR0eElkCQCsAgIJAKwCAgkArAICAgslcyVzJXNfX0dfXwUCdWECAl9fBQR0eElkAQJhYQACDyVzX19hbW91bnRBc3NldAECcGEAAg4lc19fcHJpY2VBc3NldAEDYW1wAAIHJXNfX2FtcAEDYWRhAAINJXNfX2FkZG9uQWRkcgEFbGdvdGMBBmNhbGxlcgkAuQkCCQDMCAICFyVzJXNfX2xhc3RHZXRPbmVUa25DYWxsCQDMCAIFBmNhbGxlcgUDbmlsBQNTRVABBWxzb3RjAQZjYWxsZXIJALkJAgkAzAgCAhclcyVzX19sYXN0UHV0T25lVGtuQ2FsbAkAzAgCBQZjYWxsZXIFA25pbAUDU0VQAQRmY2ZnAAIRJXNfX2ZhY3RvcnlDb25maWcBBG10cGsAAhglcyVzX19tYXRjaGVyX19wdWJsaWNLZXkBAnBjAgZpQW10QXMFaVByQXMJAKwCAgkArAICCQCsAgIJAKwCAgIIJWQlZCVzX18FBmlBbXRBcwICX18FBWlQckFzAghfX2NvbmZpZwEDbWJhAQViQVN0cgkArAICAiglcyVzJXNfX21hcHBpbmdzX19iYXNlQXNzZXQyaW50ZXJuYWxJZF9fBQViQVN0cgEDYXBzAAIMJXNfX3NodXRkb3duARxrZXlBbGxvd2VkTHBTdGFibGVTY3JpcHRIYXNoAAIdJXNfX2FsbG93ZWRMcFN0YWJsZVNjcmlwdEhhc2gBA3RvZQMDb3JWBnNlbmRyVgZtYXRjaFYJAAIBCQCsAgIJAKwCAgkArAICCQCsAgIJAKwCAgIRRmFpbGVkOiBvcmRWYWxpZD0JAKUDAQUDb3JWAgsgc25kclZhbGlkPQkApQMBBQZzZW5kclYCDCBtdGNoclZhbGlkPQkApQMBBQZtYXRjaFYBA3N0cgEDdmFsBAckbWF0Y2gwBQN2YWwDCQABAgUHJG1hdGNoMAIGU3RyaW5nBAZ2YWxTdHIFByRtYXRjaDAFBnZhbFN0cgkAAgECE2ZhaWwgY2FzdCB0byBTdHJpbmcBBHN0cmYCBGFkZHIDa2V5CQETdmFsdWVPckVycm9yTWVzc2FnZQIJAJ0IAgUEYWRkcgUDa2V5CQC5CQIJAMwIAgIKbWFuZGF0b3J5IAkAzAgCCQClCAEFBGFkZHIJAMwIAgIBLgkAzAgCBQNrZXkJAMwIAgIMIG5vdCBkZWZpbmVkBQNuaWwCAAEEaW50ZgIEYWRkcgNrZXkJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkAmggCBQRhZGRyBQNrZXkJALkJAgkAzAgCAgptYW5kYXRvcnkgCQDMCAIJAKUIAQUEYWRkcgkAzAgCAgEuCQDMCAIFA2tleQkAzAgCAgwgbm90IGRlZmluZWQFA25pbAIAAANmY2EJARFAZXh0ck5hdGl2ZSgxMDYyKQEJAQRzdHJmAgUEdGhpcwkBAmZjAAABQQkBBHN0cmYCBQR0aGlzCQEDYW1wAAEDaWdzAAkBC3ZhbHVlT3JFbHNlAgkAmwgCBQNmY2EJAQNhcHMABwECbXAACQDZBAEJAQRzdHJmAgUDZmNhCQEEbXRwawABA2dwYwAEBWFtdEFzCQEEc3RyZgIFBHRoaXMJAQJhYQAEB3ByaWNlQXMJAQRzdHJmAgUEdGhpcwkBAnBhAAQIaVByaWNlQXMJAQRpbnRmAgUDZmNhCQEDbWJhAQUHcHJpY2VBcwQGaUFtdEFzCQEEaW50ZgIFA2ZjYQkBA21iYQEFBWFtdEFzCQC1CQIJAQRzdHJmAgUDZmNhCQECcGMCCQCkAwEFBmlBbXRBcwkApAMBBQhpUHJpY2VBcwUDU0VQAQNnZmMACQC1CQIJAQRzdHJmAgUDZmNhCQEEZmNmZwAFA1NFUAERZGF0YVB1dEFjdGlvbkluZm8KDWluQW10QXNzZXRBbXQPaW5QcmljZUFzc2V0QW10CG91dExwQW10BXByaWNlCnNsaXBCeVVzZXIMc2xpcHBhZ2VSZWFsCHR4SGVpZ2h0C3R4VGltZXN0YW1wDHNsaXBhZ2VBbUFtdAxzbGlwYWdlUHJBbXQJALkJAgkAzAgCAhQlZCVkJWQlZCVkJWQlZCVkJWQlZAkAzAgCCQCkAwEFDWluQW10QXNzZXRBbXQJAMwIAgkApAMBBQ9pblByaWNlQXNzZXRBbXQJAMwIAgkApAMBBQhvdXRMcEFtdAkAzAgCCQCkAwEFBXByaWNlCQDMCAIJAKQDAQUKc2xpcEJ5VXNlcgkAzAgCCQCkAwEFDHNsaXBwYWdlUmVhbAkAzAgCCQCkAwEFCHR4SGVpZ2h0CQDMCAIJAKQDAQULdHhUaW1lc3RhbXAJAMwIAgkApAMBBQxzbGlwYWdlQW1BbXQJAMwIAgkApAMBBQxzbGlwYWdlUHJBbXQFA25pbAUDU0VQARFkYXRhR2V0QWN0aW9uSW5mbwYOb3V0QW10QXNzZXRBbXQQb3V0UHJpY2VBc3NldEFtdAdpbkxwQW10BXByaWNlCHR4SGVpZ2h0C3R4VGltZXN0YW1wCQC5CQIJAMwIAgIMJWQlZCVkJWQlZCVkCQDMCAIJAKQDAQUOb3V0QW10QXNzZXRBbXQJAMwIAgkApAMBBRBvdXRQcmljZUFzc2V0QW10CQDMCAIJAKQDAQUHaW5McEFtdAkAzAgCCQCkAwEFBXByaWNlCQDMCAIJAKQDAQUIdHhIZWlnaHQJAMwIAgkApAMBBQt0eFRpbWVzdGFtcAUDbmlsBQNTRVABDWdldEFjY0JhbGFuY2UBB2Fzc2V0SWQDCQAAAgUHYXNzZXRJZAIFV0FWRVMICQDvBwEFBHRoaXMJYXZhaWxhYmxlCQDwBwIFBHRoaXMJANkEAQUHYXNzZXRJZAEEY3BiaQIIcHJBbXRYMTgIYW1BbXRYMTgJALwCAwUIcHJBbXRYMTgFB3NjYWxlMTgFCGFtQW10WDE4AQN2YWQDAkExAkEyCHNsaXBwYWdlBARkaWZmCQC8AgMJALgCAgUCQTEFAkEyBQxzY2FsZThCaWdJbnQFAkEyBARwYXNzCQC/AgIJALgCAgUIc2xpcHBhZ2UJAQNhYnMBBQRkaWZmBQp6ZXJvQmlnSW50AwkBASEBBQRwYXNzCQACAQkArAICAgpCaWcgc2xwZzogCQCmAwEFBGRpZmYJAJQKAgUEcGFzcwkAmQMBCQDMCAIFAkExCQDMCAIFAkEyBQNuaWwBAnZkAwJEMQJEMARzbHBnBARkaWZmCQC8AgMFAkQwBQxzY2FsZThCaWdJbnQFAkQxBARmYWlsCQC/AgIFBHNscGcFBGRpZmYDAwUEZmFpbAYJAL8CAgUCRDAFAkQxCQACAQkArAICCQCsAgIJAKwCAgkArAICCQCsAgIJAKwCAgkApgMBBQJEMAIBIAkApgMBBQJEMQIBIAkApgMBBQRkaWZmAgEgCQCmAwEFBHNscGcFBGZhaWwBA3BjcAQKYW1Bc3NldERjbQpwckFzc2V0RGNtBWFtQW10BXByQW10BAthbXRBc0FtdFgxOAkBAnQxAgUFYW1BbXQFCmFtQXNzZXREY20ECnByQXNBbXRYMTgJAQJ0MQIFBXByQW10BQpwckFzc2V0RGNtCQEEY3BiaQIFCnByQXNBbXRYMTgFC2FtdEFzQW10WDE4AQpjYWxjUHJpY2VzAwVhbUFtdAVwckFtdAVscEFtdAQDY2ZnCQEDZ3BjAAQIYW10QXNEY20JAQ1wYXJzZUludFZhbHVlAQkAkQMCBQNjZmcFC2lkeEFtdEFzRGNtBAdwckFzRGNtCQENcGFyc2VJbnRWYWx1ZQEJAJEDAgUDY2ZnBQ1pZHhQcmljZUFzRGNtBAhwcmljZVgxOAkBA3BjcAQFCGFtdEFzRGNtBQdwckFzRGNtBQVhbUFtdAUFcHJBbXQECGFtQW10WDE4CQECdDECBQVhbUFtdAUIYW10QXNEY20ECHByQW10WDE4CQECdDECBQVwckFtdAUHcHJBc0RjbQQIbHBBbXRYMTgJAQJ0MQIFBWxwQW10BQZzY2FsZTgEDWxwUHJJbkFtQXNYMTgJAQRjcGJpAgUIYW1BbXRYMTgFCGxwQW10WDE4BA1scFBySW5QckFzWDE4CQEEY3BiaQIFCHByQW10WDE4BQhscEFtdFgxOAkAzAgCBQhwcmljZVgxOAkAzAgCBQ1scFBySW5BbUFzWDE4CQDMCAIFDWxwUHJJblByQXNYMTgFA25pbAEPY2FsY3VsYXRlUHJpY2VzAwVhbUFtdAVwckFtdAVscEFtdAQBcAkBCmNhbGNQcmljZXMDBQVhbUFtdAUFcHJBbXQFBWxwQW10CQDMCAIJAQJmMQIJAJEDAgUBcAAABQZzY2FsZTgJAMwIAgkBAmYxAgkAkQMCBQFwAAEFBnNjYWxlOAkAzAgCCQECZjECCQCRAwIFAXAAAgUGc2NhbGU4BQNuaWwBA2VnbwQGdHhJZDU4CnBtdEFzc2V0SWQIcG10THBBbXQLdXNlckFkZHJlc3MEA2NmZwkBA2dwYwAEBGxwSWQJAJEDAgUDY2ZnBQlpZHhMUEFzSWQEBGFtSWQJAJEDAgUDY2ZnBQlpZHhBbUFzSWQEBHBySWQJAJEDAgUDY2ZnBQlpZHhQckFzSWQEBWFtRGNtCQENcGFyc2VJbnRWYWx1ZQEJAJEDAgUDY2ZnBQtpZHhBbXRBc0RjbQQFcHJEY20JAQ1wYXJzZUludFZhbHVlAQkAkQMCBQNjZmcFDWlkeFByaWNlQXNEY20EA3N0cwkAkQMCBQNjZmcFCWlkeFBvb2xTdAQHbHBFbWlzcwgJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkA7AcBCQDZBAEFBGxwSWQCC1dyb25nIExQIGlkCHF1YW50aXR5AwkBAiE9AgUEbHBJZAUKcG10QXNzZXRJZAkAAgECD1dyb25nIHBtdCBhc3NldAQJYW1CYWxhbmNlCQENZ2V0QWNjQmFsYW5jZQEFBGFtSWQEDGFtQmFsYW5jZVgxOAkBAnQxAgUJYW1CYWxhbmNlBQVhbURjbQQJcHJCYWxhbmNlCQENZ2V0QWNjQmFsYW5jZQEFBHBySWQEDHByQmFsYW5jZVgxOAkBAnQxAgUJcHJCYWxhbmNlBQVwckRjbQQLY3VyUHJpY2VYMTgJAQRjcGJpAgUMcHJCYWxhbmNlWDE4BQxhbUJhbGFuY2VYMTgECGN1clByaWNlCQECZjECBQtjdXJQcmljZVgxOAUGc2NhbGU4BAtwbXRMcEFtdFgxOAkBAnQxAgUIcG10THBBbXQFBnNjYWxlOAQKbHBFbWlzc1gxOAkBAnQxAgUHbHBFbWlzcwUGc2NhbGU4BAtvdXRBbUFtdFgxOAkAvAIDBQxhbUJhbGFuY2VYMTgFC3BtdExwQW10WDE4BQpscEVtaXNzWDE4BAtvdXRQckFtdFgxOAkAvAIDBQxwckJhbGFuY2VYMTgFC3BtdExwQW10WDE4BQpscEVtaXNzWDE4BAhvdXRBbUFtdAkBAmYxAgULb3V0QW1BbXRYMTgFBWFtRGNtBAhvdXRQckFtdAkBAmYxAgULb3V0UHJBbXRYMTgFBXByRGNtBAVzdGF0ZQMJAAACBQZ0eElkNTgCAAUDbmlsCQDMCAIJAQ5TY3JpcHRUcmFuc2ZlcgMFC3VzZXJBZGRyZXNzBQhvdXRBbUFtdAMJAAACBQRhbUlkAgVXQVZFUwUEdW5pdAkA2QQBBQRhbUlkCQDMCAIJAQ5TY3JpcHRUcmFuc2ZlcgMFC3VzZXJBZGRyZXNzBQhvdXRQckFtdAMJAAACBQRwcklkAgVXQVZFUwUEdW5pdAkA2QQBBQRwcklkCQDMCAIJAQtTdHJpbmdFbnRyeQIJAQNnYXUCCQClCAEFC3VzZXJBZGRyZXNzBQZ0eElkNTgJARFkYXRhR2V0QWN0aW9uSW5mbwYFCG91dEFtQW10BQhvdXRQckFtdAUIcG10THBBbXQFCGN1clByaWNlBQZoZWlnaHQIBQlsYXN0QmxvY2sJdGltZXN0YW1wCQDMCAIJAQxJbnRlZ2VyRW50cnkCCQECcGwABQhjdXJQcmljZQkAzAgCCQEMSW50ZWdlckVudHJ5AgkBAnBoAgUGaGVpZ2h0CAUJbGFzdEJsb2NrCXRpbWVzdGFtcAUIY3VyUHJpY2UFA25pbAkAnAoKBQhvdXRBbUFtdAUIb3V0UHJBbXQFBGFtSWQFBHBySWQFCWFtQmFsYW5jZQUJcHJCYWxhbmNlBQdscEVtaXNzBQtjdXJQcmljZVgxOAUDc3RzBQVzdGF0ZQEDZXBvDAZ0eElkNTgIc2xpcHBhZ2UHaW5BbUFtdAZpbkFtSWQHaW5QckFtdAZpblBySWQLdXNlckFkZHJlc3MGaXNFdmFsBmVtaXRMcAppc09uZUFzc2V0BnBtdEFtdAVwbXRJZAQDY2ZnCQEDZ3BjAAQEbHBJZAkA2QQBCQCRAwIFA2NmZwUJaWR4TFBBc0lkBAdhbUlkU3RyCQCRAwIFA2NmZwUJaWR4QW1Bc0lkBAdwcklkU3RyCQCRAwIFA2NmZwUJaWR4UHJBc0lkBAlpbkFtSWRTdHIJAJEDAgUDY2ZnBQtpZHhJQW10QXNJZAQJaW5QcklkU3RyCQCRAwIFA2NmZwUNaWR4SVByaWNlQXNJZAQGYW10RGNtCQENcGFyc2VJbnRWYWx1ZQEJAJEDAgUDY2ZnBQtpZHhBbXRBc0RjbQQIcHJpY2VEY20JAQ1wYXJzZUludFZhbHVlAQkAkQMCBQNjZmcFDWlkeFByaWNlQXNEY20EA3N0cwkAkQMCBQNjZmcFCWlkeFBvb2xTdAQEbHBFbQgJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkA7AcBBQRscElkAghXciBscCBhcwhxdWFudGl0eQQJYW1CYWxhbmNlAwUGaXNFdmFsCQENZ2V0QWNjQmFsYW5jZQEFB2FtSWRTdHIDAwUKaXNPbmVBc3NldAkAAAIFBXBtdElkBQdhbUlkU3RyBwkAZQIJAQ1nZXRBY2NCYWxhbmNlAQUHYW1JZFN0cgUGcG10QW10AwUKaXNPbmVBc3NldAkBDWdldEFjY0JhbGFuY2UBBQdhbUlkU3RyCQBlAgkBDWdldEFjY0JhbGFuY2UBBQdhbUlkU3RyBQdpbkFtQW10BAlwckJhbGFuY2UDBQZpc0V2YWwJAQ1nZXRBY2NCYWxhbmNlAQUHcHJJZFN0cgMDBQppc09uZUFzc2V0CQAAAgUFcG10SWQFB3BySWRTdHIHCQBlAgkBDWdldEFjY0JhbGFuY2UBBQdwcklkU3RyBQZwbXRBbXQDBQppc09uZUFzc2V0CQENZ2V0QWNjQmFsYW5jZQEFB3BySWRTdHIJAGUCCQENZ2V0QWNjQmFsYW5jZQEFB3BySWRTdHIFB2luUHJBbXQED2luQW1Bc3NldEFtdFgxOAkBAnQxAgUHaW5BbUFtdAUGYW10RGNtBA9pblByQXNzZXRBbXRYMTgJAQJ0MQIFB2luUHJBbXQFCHByaWNlRGNtBAx1c2VyUHJpY2VYMTgJAQRjcGJpAgUPaW5QckFzc2V0QW10WDE4BQ9pbkFtQXNzZXRBbXRYMTgEDGFtQmFsYW5jZVgxOAkBAnQxAgUJYW1CYWxhbmNlBQZhbXREY20EDHByQmFsYW5jZVgxOAkBAnQxAgUJcHJCYWxhbmNlBQhwcmljZURjbQQBcgMJAAACBQRscEVtAAAEC2N1clByaWNlWDE4BQp6ZXJvQmlnSW50BAtzbGlwcGFnZVgxOAUKemVyb0JpZ0ludAQIbHBBbXRYMTgJAHYGCQC5AgIFD2luQW1Bc3NldEFtdFgxOAUPaW5QckFzc2V0QW10WDE4AAAJALYCAQAFAAEAAAUERE9XTgkAlwoFCQECZjECBQhscEFtdFgxOAUGc2NhbGU4CQECZjECBQ9pbkFtQXNzZXRBbXRYMTgFBmFtdERjbQkBAmYxAgUPaW5QckFzc2V0QW10WDE4BQhwcmljZURjbQkBBGNwYmkCCQC3AgIFDHByQmFsYW5jZVgxOAUPaW5QckFzc2V0QW10WDE4CQC3AgIFDGFtQmFsYW5jZVgxOAUPaW5BbUFzc2V0QW10WDE4BQtzbGlwcGFnZVgxOAQLY3VyUHJpY2VYMTgJAQRjcGJpAgUMcHJCYWxhbmNlWDE4BQxhbUJhbGFuY2VYMTgED3NsaXBwYWdlUmVhbFgxOAkAvAIDCQEDYWJzAQkAuAICBQtjdXJQcmljZVgxOAUMdXNlclByaWNlWDE4BQdzY2FsZTE4BQtjdXJQcmljZVgxOAQLc2xpcHBhZ2VYMTgJAQJ0MQIFCHNsaXBwYWdlBQZzY2FsZTgDAwkBAiE9AgULY3VyUHJpY2VYMTgFCnplcm9CaWdJbnQJAL8CAgUPc2xpcHBhZ2VSZWFsWDE4BQtzbGlwcGFnZVgxOAcJAAIBCQCsAgIJAKwCAgkArAICAg9QcmljZSBzbGlwcGFnZSAJAKYDAQUPc2xpcHBhZ2VSZWFsWDE4AgMgPiAJAKYDAQULc2xpcHBhZ2VYMTgEDWxwRW1pc3Npb25YMTgJAQJ0MQIFBGxwRW0FBnNjYWxlOAQKcHJWaWFBbVgxOAkAvAIDBQ9pbkFtQXNzZXRBbXRYMTgFC2N1clByaWNlWDE4BQdzY2FsZTE4BAphbVZpYVByWDE4CQC8AgMFD2luUHJBc3NldEFtdFgxOAUHc2NhbGUxOAULY3VyUHJpY2VYMTgEDGV4cGVjdGVkQW10cwMJAL8CAgUKcHJWaWFBbVgxOAUPaW5QckFzc2V0QW10WDE4CQCUCgIFCmFtVmlhUHJYMTgFD2luUHJBc3NldEFtdFgxOAkAlAoCBQ9pbkFtQXNzZXRBbXRYMTgFCnByVmlhQW1YMTgEEWV4cEFtdEFzc2V0QW10WDE4CAUMZXhwZWN0ZWRBbXRzAl8xBBNleHBQcmljZUFzc2V0QW10WDE4CAUMZXhwZWN0ZWRBbXRzAl8yBAhscEFtdFgxOAkAvAIDBQ1scEVtaXNzaW9uWDE4BRNleHBQcmljZUFzc2V0QW10WDE4BQxwckJhbGFuY2VYMTgJAJcKBQkBAmYxAgUIbHBBbXRYMTgFBnNjYWxlOAkBAmYxAgURZXhwQW10QXNzZXRBbXRYMTgFBmFtdERjbQkBAmYxAgUTZXhwUHJpY2VBc3NldEFtdFgxOAUIcHJpY2VEY20FC2N1clByaWNlWDE4BQtzbGlwcGFnZVgxOAQJY2FsY0xwQW10CAUBcgJfMQQOY2FsY0FtQXNzZXRQbXQIBQFyAl8yBA5jYWxjUHJBc3NldFBtdAgFAXICXzMECGN1clByaWNlCQECZjECCAUBcgJfNAUGc2NhbGU4BAxzbGlwcGFnZUNhbGMJAQJmMQIIBQFyAl81BQZzY2FsZTgDCQBnAgAABQljYWxjTHBBbXQJAAIBAgdMUCA8PSAwBAllbWl0THBBbXQDCQEBIQEFBmVtaXRMcAAABQljYWxjTHBBbXQEBmFtRGlmZgkAZQIFB2luQW1BbXQFDmNhbGNBbUFzc2V0UG10BAZwckRpZmYJAGUCBQdpblByQW10BQ5jYWxjUHJBc3NldFBtdAQNJHQwMTU2MDExNTk0NgMDBQppc09uZUFzc2V0CQAAAgUFcG10SWQFB2FtSWRTdHIHCQCUCgIFBnBtdEFtdAAAAwMFCmlzT25lQXNzZXQJAAACBQVwbXRJZAUHcHJJZFN0cgcJAJQKAgAABQZwbXRBbXQJAJQKAgUOY2FsY0FtQXNzZXRQbXQFDmNhbGNQckFzc2V0UG10BAp3cml0ZUFtQW10CAUNJHQwMTU2MDExNTk0NgJfMQQKd3JpdGVQckFtdAgFDSR0MDE1NjAxMTU5NDYCXzIEC2NvbW1vblN0YXRlCQDMCAIJAQxJbnRlZ2VyRW50cnkCCQECcGwABQhjdXJQcmljZQkAzAgCCQEMSW50ZWdlckVudHJ5AgkBAnBoAgUGaGVpZ2h0CAUJbGFzdEJsb2NrCXRpbWVzdGFtcAUIY3VyUHJpY2UJAMwIAgkBC1N0cmluZ0VudHJ5AgkBA3BhdQIFC3VzZXJBZGRyZXNzBQZ0eElkNTgJARFkYXRhUHV0QWN0aW9uSW5mbwoFCndyaXRlQW1BbXQFCndyaXRlUHJBbXQFCWVtaXRMcEFtdAUIY3VyUHJpY2UFCHNsaXBwYWdlBQxzbGlwcGFnZUNhbGMFBmhlaWdodAgFCWxhc3RCbG9jawl0aW1lc3RhbXAFBmFtRGlmZgUGcHJEaWZmBQNuaWwJAJ8KDQUJY2FsY0xwQW10BQllbWl0THBBbXQFCGN1clByaWNlBQlhbUJhbGFuY2UFCXByQmFsYW5jZQUEbHBFbQUEbHBJZAUDc3RzBQtjb21tb25TdGF0ZQUGYW1EaWZmBQZwckRpZmYFBmluQW1JZAUGaW5QcklkAQNtb2EBBW9yZGVyBANjZmcJAQNncGMABAdhbXRBc0lkCQCRAwIFA2NmZwUJaWR4QW1Bc0lkBAZwckFzSWQJAJEDAgUDY2ZnBQlpZHhQckFzSWQEA3N0cwkBDXBhcnNlSW50VmFsdWUBCQCRAwIFA2NmZwUJaWR4UG9vbFN0BAhhbXRBc0RjbQkBDXBhcnNlSW50VmFsdWUBCQCRAwIFA2NmZwULaWR4QW10QXNEY20EB3ByQXNEY20JAQ1wYXJzZUludFZhbHVlAQkAkQMCBQNjZmcFDWlkeFByaWNlQXNEY20ED2FjY0FtdEFzQmFsYW5jZQkBDWdldEFjY0JhbGFuY2UBBQdhbXRBc0lkBA5hY2NQckFzQmFsYW5jZQkBDWdldEFjY0JhbGFuY2UBBQZwckFzSWQEC2N1clByaWNlWDE4AwkAAAIIBQVvcmRlcglvcmRlclR5cGUFA0J1eQkBA3BjcAQFCGFtdEFzRGNtBQdwckFzRGNtCQBkAgUPYWNjQW10QXNCYWxhbmNlCAUFb3JkZXIGYW1vdW50BQ5hY2NQckFzQmFsYW5jZQkBA3BjcAQFCGFtdEFzRGNtBQdwckFzRGNtCQBlAgUPYWNjQW10QXNCYWxhbmNlCAUFb3JkZXIGYW1vdW50BQ5hY2NQckFzQmFsYW5jZQQIY3VyUHJpY2UJAQJmMQIFC2N1clByaWNlWDE4BQZzY2FsZTgDAwMJAQNpZ3MABgkAAAIFA3N0cwUOUG9vbE1hdGNoZXJEaXMGCQAAAgUDc3RzBQxQb29sU2h1dGRvd24JAAIBAg1BZG1pbiBibG9ja2VkBApvckFtdEFzc2V0CAgFBW9yZGVyCWFzc2V0UGFpcgthbW91bnRBc3NldAQKb3JBbXRBc1N0cgMJAAACBQpvckFtdEFzc2V0BQR1bml0AgVXQVZFUwkA2AQBCQEFdmFsdWUBBQpvckFtdEFzc2V0BAlvclByQXNzZXQICAUFb3JkZXIJYXNzZXRQYWlyCnByaWNlQXNzZXQECW9yUHJBc1N0cgMJAAACBQlvclByQXNzZXQFBHVuaXQCBVdBVkVTCQDYBAEJAQV2YWx1ZQEFCW9yUHJBc3NldAMDCQECIT0CBQpvckFtdEFzU3RyBQdhbXRBc0lkBgkBAiE9AgUJb3JQckFzU3RyBQZwckFzSWQJAAIBAglXciBhc3NldHMECm9yZGVyUHJpY2UIBQVvcmRlcgVwcmljZQQIcHJpY2VEY20JAGsDBQZzY2FsZTgFB3ByQXNEY20FCGFtdEFzRGNtBA5jYXN0T3JkZXJQcmljZQkBAnRzAwUKb3JkZXJQcmljZQUGc2NhbGU4BQhwcmljZURjbQQRaXNPcmRlclByaWNlVmFsaWQDCQAAAggFBW9yZGVyCW9yZGVyVHlwZQUDQnV5CQBnAgUIY3VyUHJpY2UFDmNhc3RPcmRlclByaWNlCQBnAgUOY2FzdE9yZGVyUHJpY2UFCGN1clByaWNlBgECY2cBAWkDCQECIT0CCQCQAwEIBQFpCHBheW1lbnRzAAEJAAIBAgoxIHBtbnQgZXhwBANwbXQJAQV2YWx1ZQEJAJEDAggFAWkIcGF5bWVudHMAAAQKcG10QXNzZXRJZAkBBXZhbHVlAQgFA3BtdAdhc3NldElkBAZwbXRBbXQIBQNwbXQGYW1vdW50BAFyCQEDZWdvBAkA2AQBCAUBaQ10cmFuc2FjdGlvbklkCQDYBAEFCnBtdEFzc2V0SWQFBnBtdEFtdAgFAWkGY2FsbGVyBAhvdXRBbUFtdAgFAXICXzEECG91dFByQW10CAUBcgJfMgQDc3RzCQENcGFyc2VJbnRWYWx1ZQEIBQFyAl85BAVzdGF0ZQgFAXIDXzEwAwMJAQNpZ3MABgkAAAIFA3N0cwUMUG9vbFNodXRkb3duCQACAQkArAICAg9BZG1pbiBibG9ja2VkOiAJAKQDAQUDc3RzCQCXCgUFCG91dEFtQW10BQhvdXRQckFtdAUGcG10QW10BQpwbXRBc3NldElkBQVzdGF0ZQECY3AJBmNhbGxlcgR0eElkB2FtQXNQbXQHcHJBc1BtdAhzbGlwcGFnZQZlbWl0THAKaXNPbmVBc3NldAZwbXRBbXQFcG10SWQEAXIJAQNlcG8MBQR0eElkBQhzbGlwcGFnZQgJAQV2YWx1ZQEFB2FtQXNQbXQGYW1vdW50CAkBBXZhbHVlAQUHYW1Bc1BtdAdhc3NldElkCAkBBXZhbHVlAQUHcHJBc1BtdAZhbW91bnQICQEFdmFsdWUBBQdwckFzUG10B2Fzc2V0SWQFBmNhbGxlcgcFBmVtaXRMcAUKaXNPbmVBc3NldAUGcG10QW10BQVwbXRJZAQDc3RzCQENcGFyc2VJbnRWYWx1ZQEIBQFyAl84AwMDCQEDaWdzAAYJAAACBQNzdHMFClBvb2xQdXREaXMGCQAAAgUDc3RzBQxQb29sU2h1dGRvd24JAAIBCQCsAgICCEJsb2NrZWQ6CQCkAwEFA3N0cwUBcgEBbQAEByRtYXRjaDAJAKIIAQkBA21wawADCQABAgUHJG1hdGNoMAIGU3RyaW5nBAFzBQckbWF0Y2gwCQDZBAEFAXMDCQABAgUHJG1hdGNoMAIEVW5pdAUEdW5pdAkAAgECC01hdGNoIGVycm9yAQJwbQAEByRtYXRjaDAJAKIIAQkBBHBtcGsAAwkAAQIFByRtYXRjaDACBlN0cmluZwQBcwUHJG1hdGNoMAkA2QQBBQFzAwkAAQIFByRtYXRjaDACBFVuaXQFBHVuaXQJAAIBAgtNYXRjaCBlcnJvcgACcGQJAAIBAhFQZXJtaXNzaW9uIGRlbmllZAECbW0BAWkEByRtYXRjaDAJAQFtAAMJAAECBQckbWF0Y2gwAgpCeXRlVmVjdG9yBAJwawUHJG1hdGNoMAMJAAACCAUBaQ9jYWxsZXJQdWJsaWNLZXkFAnBrBgUCcGQDCQABAgUHJG1hdGNoMAIEVW5pdAMJAAACCAUBaQZjYWxsZXIFBHRoaXMGBQJwZAkAAgECC01hdGNoIGVycm9yFQFpAQtjb25zdHJ1Y3RvcgECZmMEAWMJAQJtbQEFAWkDCQAAAgUBYwUBYwkAzAgCCQELU3RyaW5nRW50cnkCCQECZmMABQJmYwUDbmlsCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAWkBCnNldE1hbmFnZXIBF3BlbmRpbmdNYW5hZ2VyUHVibGljS2V5BAFjCQECbW0BBQFpAwkAAAIFAWMFAWMEAmNtCQDZBAEFF3BlbmRpbmdNYW5hZ2VyUHVibGljS2V5AwkAAAIFAmNtBQJjbQkAzAgCCQELU3RyaW5nRW50cnkCCQEEcG1wawAFF3BlbmRpbmdNYW5hZ2VyUHVibGljS2V5BQNuaWwJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BaQEOY29uZmlybU1hbmFnZXIABAFwCQECcG0ABANocG0DCQEJaXNEZWZpbmVkAQUBcAYJAAIBAhJObyBwZW5kaW5nIG1hbmFnZXIDCQAAAgUDaHBtBQNocG0EA2NwbQMJAAACCAUBaQ9jYWxsZXJQdWJsaWNLZXkJAQV2YWx1ZQEFAXAGCQACAQIbWW91IGFyZSBub3QgcGVuZGluZyBtYW5hZ2VyAwkAAAIFA2NwbQUDY3BtCQDMCAIJAQtTdHJpbmdFbnRyeQIJAQNtcGsACQDYBAEJAQV2YWx1ZQEFAXAJAMwIAgkBC0RlbGV0ZUVudHJ5AQkBBHBtcGsABQNuaWwJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BaQEDcHV0AgRzbGlwCWF1dG9TdGFrZQQHZmFjdENmZwkBA2dmYwAEC3N0YWtpbmdDbnRyCQETdmFsdWVPckVycm9yTWVzc2FnZQIJAKYIAQkAkQMCBQdmYWN0Q2ZnBQ9pZHhGYWN0U3Rha0NudHICCldyIHN0IGFkZHIECHNsaXBDbnRyCQETdmFsdWVPckVycm9yTWVzc2FnZQIJAKYIAQkAkQMCBQdmYWN0Q2ZnBRBpZHhGYWN0U2xpcHBDbnRyAgpXciBzbCBhZGRyAwkAZgIAAAUEc2xpcAkAAgECDldyb25nIHNsaXBwYWdlAwkBAiE9AgkAkAMBCAUBaQhwYXltZW50cwACCQACAQIMMiBwbW50cyBleHBkBAFlCQECY3AJCQClCAEIBQFpBmNhbGxlcgkA2AQBCAUBaQ10cmFuc2FjdGlvbklkCQEPQXR0YWNoZWRQYXltZW50AggJAQV2YWx1ZQEJAJEDAggFAWkIcGF5bWVudHMAAAdhc3NldElkCAkBBXZhbHVlAQkAkQMCCAUBaQhwYXltZW50cwAABmFtb3VudAkAkQMCCAUBaQhwYXltZW50cwABBQRzbGlwBgcAAAIABAllbWl0THBBbXQIBQFlAl8yBAlscEFzc2V0SWQIBQFlAl83BAVzdGF0ZQgFAWUCXzkEBmFtRGlmZggFAWUDXzEwBAZwckRpZmYIBQFlA18xMQQEYW1JZAgFAWUDXzEyBARwcklkCAUBZQNfMTMEAXIJAPwHBAUDZmNhAgRlbWl0CQDMCAIFCWVtaXRMcEFtdAUDbmlsBQNuaWwDCQAAAgUBcgUBcgQCZWwEByRtYXRjaDAFAXIDCQABAgUHJG1hdGNoMAIHQWRkcmVzcwQGbGVnYWN5BQckbWF0Y2gwCQD8BwQFBmxlZ2FjeQIEZW1pdAkAzAgCBQllbWl0THBBbXQFA25pbAUDbmlsBQR1bml0AwkAAAIFAmVsBQJlbAQCc2EDCQBmAgUGYW1EaWZmAAAJAPwHBAUIc2xpcENudHICA3B1dAUDbmlsCQDMCAIJAQ9BdHRhY2hlZFBheW1lbnQCBQRhbUlkBQZhbURpZmYFA25pbAUDbmlsAwkAAAIFAnNhBQJzYQQCc3ADCQBmAgUGcHJEaWZmAAAJAPwHBAUIc2xpcENudHICA3B1dAUDbmlsCQDMCAIJAQ9BdHRhY2hlZFBheW1lbnQCBQRwcklkBQZwckRpZmYFA25pbAUDbmlsAwkAAAIFAnNwBQJzcAQIbHBUcm5zZnIDBQlhdXRvU3Rha2UEAnNzCQD8BwQFC3N0YWtpbmdDbnRyAgVzdGFrZQUDbmlsCQDMCAIJAQ9BdHRhY2hlZFBheW1lbnQCBQlscEFzc2V0SWQFCWVtaXRMcEFtdAUDbmlsAwkAAAIFAnNzBQJzcwUDbmlsCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQDMCAIJAQ5TY3JpcHRUcmFuc2ZlcgMIBQFpBmNhbGxlcgUJZW1pdExwQW10BQlscEFzc2V0SWQFA25pbAkAzggCBQVzdGF0ZQUIbHBUcm5zZnIJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BaQEJcHV0T25lVGtuBQthbUFzc2V0UGFydAtwckFzc2V0UGFydAVvdXRMcAhzbGlwcGFnZQlhdXRvU3Rha2UEA2NmZwkBA2dmYwAEC3N0YWtpbmdDbnRyCQETdmFsdWVPckVycm9yTWVzc2FnZQIJAKYIAQkAkQMCBQNjZmcFD2lkeEZhY3RTdGFrQ250cgIKV3Igc3QgYWRkcgQIc2xpcENudHIJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkApggBCQCRAwIFA2NmZwUQaWR4RmFjdFNsaXBwQ250cgIKV3Igc2wgYWRkcgQHZ3d4Q250cgkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCmCAEJAJEDAgUDY2ZnBRFpZHhGYWN0R3d4UmV3Q250cgILV3IgZ3d4IGFkZHIEB3Bvb2xDZmcJAQNncGMABARhbUlkCQCRAwIFB3Bvb2xDZmcFCWlkeEFtQXNJZAQEcHJJZAkAkQMCBQdwb29sQ2ZnBQlpZHhQckFzSWQEBWFtRGNtCQENcGFyc2VJbnRWYWx1ZQEJAJEDAgUHcG9vbENmZwULaWR4QW10QXNEY20EBXByRGNtCQENcGFyc2VJbnRWYWx1ZQEJAJEDAgUHcG9vbENmZwUNaWR4UHJpY2VBc0RjbQQFYWRkb24JAQt2YWx1ZU9yRWxzZQIJAJ0IAgUEdGhpcwkBA2FkYQACAAQLdXNlckFkZHJlc3MDCQAAAgUFYWRkb24JAKUIAQgFAWkGY2FsbGVyCAUBaQxvcmlnaW5DYWxsZXIIBQFpBmNhbGxlcgQNYWRkb25Db250cmFjdAkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCmCAEJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkAoggBCQEDYWRhAAIJbm8gYWRkb25zAhphZGRvbiBhZGRyZXNzIGluIG5vdCB2YWxpZAQFY2hlY2sJAP0HBAUNYWRkb25Db250cmFjdAISZW5zdXJlQ2FuUHV0T25lVGtuCQDMCAIJAKUIAQULdXNlckFkZHJlc3MFA25pbAUDbmlsAwkAAAIFBWNoZWNrBQVjaGVjawMDAwMJAGcCAAAFCHNsaXBwYWdlBgkAZwIAAAULYW1Bc3NldFBhcnQGCQBnAgAABQtwckFzc2V0UGFydAYJAGcCAAAFBW91dExwCQACAQIMV3JvbmcgcGFyYW1zAwkBAiE9AgkAkAMBCAUBaQhwYXltZW50cwABCQACAQILMSBwbW50IGV4cGQEA3BtdAkBBXZhbHVlAQkAkQMCCAUBaQhwYXltZW50cwAABApwbXRBc3NldElkCQDYBAEJAQV2YWx1ZQEIBQNwbXQHYXNzZXRJZAQGcG10QW10CAUDcG10BmFtb3VudAMJAGYCAICt4gQFBnBtdEFtdAkAAgECDVdyb25nIHBtdCBhbXQECWFtQmFsYW5jZQkBDWdldEFjY0JhbGFuY2UBBQRhbUlkBAlwckJhbGFuY2UJAQ1nZXRBY2NCYWxhbmNlAQUEcHJJZAQNJHQwMjQ4NTkyNTQzNQMJAAACBQpwbXRBc3NldElkBQRhbUlkAwMJAGYCBQZwbXRBbXQFCWFtQmFsYW5jZQYJAGYCBQthbUFzc2V0UGFydAUGcG10QW10CQACAQIWaW52YWxpZCBwYXltZW50IGFtb3VudAkAmAoGCQBlAgUJYW1CYWxhbmNlBQZwbXRBbXQFCXByQmFsYW5jZQkAZQIFBnBtdEFtdAULYW1Bc3NldFBhcnQFC3ByQXNzZXRQYXJ0AAAAAAMJAAACBQpwbXRBc3NldElkBQRwcklkAwMJAGYCBQZwbXRBbXQFCXByQmFsYW5jZQYJAGYCBQtwckFzc2V0UGFydAUGcG10QW10CQACAQIWaW52YWxpZCBwYXltZW50IGFtb3VudAkAmAoGBQlhbUJhbGFuY2UJAGUCBQlwckJhbGFuY2UFBnBtdEFtdAAAAAAJAGUCBQZwbXRBbXQFC3ByQXNzZXRQYXJ0BQthbUFzc2V0UGFydAkAAgECEHdyb25nIHBtdEFzc2V0SWQEDGFtQmFsYW5jZU5vdwgFDSR0MDI0ODU5MjU0MzUCXzEEDHByQmFsYW5jZU5vdwgFDSR0MDI0ODU5MjU0MzUCXzIEDHZpcnRTd2FwSW5BbQgFDSR0MDI0ODU5MjU0MzUCXzMEDXZpcnRTd2FwT3V0UHIIBQ0kdDAyNDg1OTI1NDM1Al80BAx2aXJ0U3dhcEluUHIIBQ0kdDAyNDg1OTI1NDM1Al81BA12aXJ0U3dhcE91dEFtCAUNJHQwMjQ4NTkyNTQzNQJfNgQCRDAJAPwHBAUHZ3d4Q250cgIFY2FsY0QJAMwIAgkApAMBBQxhbUJhbGFuY2VOb3cJAMwIAgkApAMBBQxwckJhbGFuY2VOb3cJAMwIAgUBQQkAzAgCBQVBbXVsdAkAzAgCBQVEY29udgUDbmlsBQNuaWwEAkQxCQD8BwQFB2d3eENudHICBWNhbGNECQDMCAIJAKYDAQkAtgIBCQBlAgkAZAIFDGFtQmFsYW5jZU5vdwUMdmlydFN3YXBJbkFtBQ12aXJ0U3dhcE91dEFtCQDMCAIJAKYDAQkAtgIBCQBlAgkAZAIFDHByQmFsYW5jZU5vdwUMdmlydFN3YXBJblByBQ12aXJ0U3dhcE91dFByCQDMCAIFAUEJAMwIAgUFQW11bHQJAMwIAgUFRGNvbnYFA25pbAUDbmlsBAZEMHZzRDEJAQJ2ZAMJAKcDAQkBA3N0cgEFAkQxCQCnAwEJAQNzdHIBBQJEMAUKc2xpcHBhZ2U0RAMJAAACBQZEMHZzRDEFBkQwdnNEMQQGZXN0UHV0CQECY3AJCQClCAEIBQFpBmNhbGxlcgkA2AQBCAUBaQ10cmFuc2FjdGlvbklkCQEPQXR0YWNoZWRQYXltZW50AgkA2QQBBQRhbUlkBQthbUFzc2V0UGFydAkBD0F0dGFjaGVkUGF5bWVudAIJANkEAQUEcHJJZAULcHJBc3NldFBhcnQFCHNsaXBwYWdlBgYFBnBtdEFtdAUKcG10QXNzZXRJZAQHZXN0aW1MUAgFBmVzdFB1dAJfMgQJbHBBc3NldElkCAUGZXN0UHV0Al83BAVzdGF0ZQgFBmVzdFB1dAJfOQQGYW1EaWZmCAUGZXN0UHV0A18xMAQGcHJEaWZmCAUGZXN0UHV0A18xMQQJbHBDYWxjUmVzCQEDdmFkAwkAtgIBBQdlc3RpbUxQCQC2AgEFBW91dExwCQC2AgEFCHNsaXBwYWdlBAllbWl0THBBbXQJAKADAQgFCWxwQ2FsY1JlcwJfMgQBZQkA/AcEBQNmY2ECBGVtaXQJAMwIAgUJZW1pdExwQW10BQNuaWwFA25pbAMJAAACBQFlBQFlBAJlbAQHJG1hdGNoMAUBZQMJAAECBQckbWF0Y2gwAgdBZGRyZXNzBAZsZWdhY3kFByRtYXRjaDAJAPwHBAUGbGVnYWN5AgRlbWl0CQDMCAIFCWVtaXRMcEFtdAUDbmlsBQNuaWwFBHVuaXQDCQAAAgUCZWwFAmVsBAJzYQMJAGYCBQZhbURpZmYAAAkA/AcEBQhzbGlwQ250cgIDcHV0BQNuaWwJAMwIAgkBD0F0dGFjaGVkUGF5bWVudAIJANkEAQUEYW1JZAUGYW1EaWZmBQNuaWwFA25pbAMJAAACBQJzYQUCc2EEAnNwAwkAZgIFBnByRGlmZgAACQD8BwQFCHNsaXBDbnRyAgNwdXQFA25pbAkAzAgCCQEPQXR0YWNoZWRQYXltZW50AgkA2QQBBQRwcklkBQZwckRpZmYFA25pbAUDbmlsAwkAAAIFAnNwBQJzcAQIbHBUcm5zZnIDBQlhdXRvU3Rha2UEAnNzCQD8BwQFC3N0YWtpbmdDbnRyAgVzdGFrZQUDbmlsCQDMCAIJAQ9BdHRhY2hlZFBheW1lbnQCBQlscEFzc2V0SWQFCWVtaXRMcEFtdAUDbmlsAwkAAAIFAnNzBQJzcwUDbmlsCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQDMCAIJAQ5TY3JpcHRUcmFuc2ZlcgMIBQFpBmNhbGxlcgUJZW1pdExwQW10BQlscEFzc2V0SWQFA25pbAkAzggCBQVzdGF0ZQUIbHBUcm5zZnIJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BaQEKcHV0Rm9yRnJlZQEHbWF4U2xwZwMJAGYCAAAFB21heFNscGcJAAIBAgpXcm9uZyBzbHBnAwkBAiE9AgkAkAMBCAUBaQhwYXltZW50cwACCQACAQIMMiBwbW50cyBleHBkBAZlc3RQdXQJAQJjcAkJAKUIAQgFAWkGY2FsbGVyCQDYBAEIBQFpDXRyYW5zYWN0aW9uSWQJAQ9BdHRhY2hlZFBheW1lbnQCCAkBBXZhbHVlAQkAkQMCCAUBaQhwYXltZW50cwAAB2Fzc2V0SWQICQEFdmFsdWUBCQCRAwIIBQFpCHBheW1lbnRzAAAGYW1vdW50CQCRAwIIBQFpCHBheW1lbnRzAAEFB21heFNscGcHBwAAAgAIBQZlc3RQdXQCXzkBaQEDZ2V0AAQBcgkBAmNnAQUBaQQJb3V0QW10QW10CAUBcgJfMQQIb3V0UHJBbXQIBQFyAl8yBAZwbXRBbXQIBQFyAl8zBApwbXRBc3NldElkCAUBcgJfNAQFc3RhdGUIBQFyAl81BAFiCQD8BwQFA2ZjYQIEYnVybgkAzAgCBQZwbXRBbXQFA25pbAkAzAgCCQEPQXR0YWNoZWRQYXltZW50AgUKcG10QXNzZXRJZAUGcG10QW10BQNuaWwDCQAAAgUBYgUBYgUFc3RhdGUJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BaQEJZ2V0T25lVGtuBQpleGNoUmVzdWx0B25vdFVzZWQJb3V0QW1vdW50Cm91dEFzc2V0SWQIc2xpcHBhZ2UDCQECIT0CCQCQAwEIBQFpCHBheW1lbnRzAAEJAAIBAgsxIHBtbnQgZXhwZAQDY2ZnCQEDZ3BjAAQEbHBJZAkAkQMCBQNjZmcFCWlkeExQQXNJZAQEYW1JZAkAkQMCBQNjZmcFCWlkeEFtQXNJZAQEcHJJZAkAkQMCBQNjZmcFCWlkeFByQXNJZAQFYW1EY20JAQ1wYXJzZUludFZhbHVlAQkAkQMCBQNjZmcFC2lkeEFtdEFzRGNtBAVwckRjbQkBDXBhcnNlSW50VmFsdWUBCQCRAwIFA2NmZwUNaWR4UHJpY2VBc0RjbQQDc3RzCQCRAwIFA2NmZwUJaWR4UG9vbFN0BAdmYWN0Q2ZnCQEDZ2ZjAAQHZ3d4Q250cgkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCmCAEJAJEDAgUHZmFjdENmZwURaWR4RmFjdEd3eFJld0NudHICCldyIHNsIGFkZHIEA3BtdAkBBXZhbHVlAQkAkQMCCAUBaQhwYXltZW50cwAABAVhZGRvbgkBC3ZhbHVlT3JFbHNlAgkAnQgCBQR0aGlzCQEDYWRhAAIABAt1c2VyQWRkcmVzcwMJAAACBQVhZGRvbgkApQgBCAUBaQZjYWxsZXIIBQFpDG9yaWdpbkNhbGxlcggFAWkGY2FsbGVyBAZ0eElkNTgJANgEAQgFAWkNdHJhbnNhY3Rpb25JZAQKcG10QXNzZXRJZAkBBXZhbHVlAQgFA3BtdAdhc3NldElkBAZwbXRBbXQIBQNwbXQGYW1vdW50BA1hZGRvbkNvbnRyYWN0CQETdmFsdWVPckVycm9yTWVzc2FnZQIJAKYIAQkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCiCAEJAQNhZGEAAglubyBhZGRvbnMCGmFkZG9uIGFkZHJlc3MgaW4gbm90IHZhbGlkBAVjaGVjawkA/QcEBQ1hZGRvbkNvbnRyYWN0AhJlbnN1cmVDYW5HZXRPbmVUa24JAMwIAgkApQgBBQt1c2VyQWRkcmVzcwUDbmlsBQNuaWwDCQAAAgUFY2hlY2sFBWNoZWNrAwkAZgIAgJTr3AMFBnBtdEFtdAkAAgECDU1pbiBwbXQgMTAgTFADAwMJAGYCAAAFCHNsaXBwYWdlBgkAZgIAAAUKZXhjaFJlc3VsdAYJAGYCAAAFCW91dEFtb3VudAkAAgECDFdyb25nIHBhcmFtcwMJAQIhPQIFBGxwSWQJANgEAQUKcG10QXNzZXRJZAkAAgECCFdyb25nIExQBAFyCQEDZWdvBAkA2AQBCAUBaQ10cmFuc2FjdGlvbklkCQDYBAEFCnBtdEFzc2V0SWQFBnBtdEFtdAgFAWkGY2FsbGVyBAplc3RpbUFtQW10CAUBcgJfMQQKZXN0aW1QckFtdAgFAXICXzIECWFtQmFsYW5jZQkBDWdldEFjY0JhbGFuY2UBBQRhbUlkBAlwckJhbGFuY2UJAQ1nZXRBY2NCYWxhbmNlAQUEcHJJZAQNJHQwMzA0NjYzMDkyMwMJAAACBQpvdXRBc3NldElkBQRhbUlkCQCZCgcJAGUCBQlhbUJhbGFuY2UFCmVzdGltQW1BbXQJAGUCBQlwckJhbGFuY2UFCmVzdGltUHJBbXQFCmV4Y2hSZXN1bHQFCmVzdGltUHJBbXQAAAAACQBkAgUKZXN0aW1BbUFtdAUKZXhjaFJlc3VsdAMJAAACBQpvdXRBc3NldElkBQRwcklkCQCZCgcJAGUCBQlhbUJhbGFuY2UFCmVzdGltQW1BbXQJAGUCBQlwckJhbGFuY2UFCmVzdGltUHJBbXQAAAAABQpleGNoUmVzdWx0BQplc3RpbUFtQW10CQBkAgUKZXN0aW1QckFtdAUKZXhjaFJlc3VsdAkAAgECEHdyb25nIG91dEFzc2V0SWQEDGFtQmFsYW5jZU5vdwgFDSR0MDMwNDY2MzA5MjMCXzEEDHByQmFsYW5jZU5vdwgFDSR0MDMwNDY2MzA5MjMCXzIEDHZpcnRTd2FwSW5BbQgFDSR0MDMwNDY2MzA5MjMCXzMEDXZpcnRTd2FwT3V0UHIIBQ0kdDAzMDQ2NjMwOTIzAl80BAx2aXJ0U3dhcEluUHIIBQ0kdDAzMDQ2NjMwOTIzAl81BA12aXJ0U3dhcE91dEFtCAUNJHQwMzA0NjYzMDkyMwJfNgQIdG90YWxHZXQIBQ0kdDAzMDQ2NjMwOTIzAl83AwMJAGYCAAAFDHZpcnRTd2FwSW5BbQYJAGYCAAAFDHZpcnRTd2FwSW5QcgkAAgECCldyb25nIGNhbGMEAkQwCQD8BwQFB2d3eENudHICBWNhbGNECQDMCAIJAKQDAQUMYW1CYWxhbmNlTm93CQDMCAIJAKQDAQUMcHJCYWxhbmNlTm93CQDMCAIFAUEJAMwIAgUFQW11bHQJAMwIAgUFRGNvbnYFA25pbAUDbmlsBAJEMQkA/AcEBQdnd3hDbnRyAgVjYWxjRAkAzAgCCQCkAwEJAGQCCQBlAgUMYW1CYWxhbmNlTm93BQx2aXJ0U3dhcEluQW0FDXZpcnRTd2FwT3V0QW0JAMwIAgkApAMBCQBlAgkAZAIFDHByQmFsYW5jZU5vdwUNdmlydFN3YXBPdXRQcgUMdmlydFN3YXBJblByCQDMCAIFAUEJAMwIAgUFQW11bHQJAMwIAgUFRGNvbnYFA25pbAUDbmlsBAZEMHZzRDEJAQJ2ZAMJAKcDAQkBA3N0cgEFAkQxCQCnAwEJAQNzdHIBBQJEMAUKc2xpcHBhZ2U0RAMJAAACBQZEMHZzRDEFBkQwdnNEMQQIZmluYWxSZXMJAQN2YWQDCQC2AgEFCHRvdGFsR2V0CQC2AgEFCW91dEFtb3VudAkAtgIBBQhzbGlwcGFnZQMJAAACBQhmaW5hbFJlcwUIZmluYWxSZXMEDSR0MDMxNjI4MzE3MzIDCQAAAgUKb3V0QXNzZXRJZAUEYW1JZAkAlAoCCQCgAwEIBQhmaW5hbFJlcwJfMgAACQCUCgIAAAkAoAMBCAUIZmluYWxSZXMCXzIEBW91dEFtCAUNJHQwMzE2MjgzMTczMgJfMQQFb3V0UHIIBQ0kdDAzMTYyODMxNzMyAl8yBAhjdXJQclgxOAkBBGNwYmkCCQECdDECBQlwckJhbGFuY2UFBXByRGNtCQECdDECBQlhbUJhbGFuY2UFBWFtRGNtBAVjdXJQcgkBAmYxAgUIY3VyUHJYMTgFBnNjYWxlOAQFc3RhdGUJAMwIAgkBDlNjcmlwdFRyYW5zZmVyAwULdXNlckFkZHJlc3MJAGQCBQVvdXRBbQUFb3V0UHIDCQAAAgUKb3V0QXNzZXRJZAIFV0FWRVMFBHVuaXQJANkEAQUKb3V0QXNzZXRJZAkAzAgCCQELU3RyaW5nRW50cnkCCQEDZ2F1AgkApQgBBQt1c2VyQWRkcmVzcwUGdHhJZDU4CQERZGF0YUdldEFjdGlvbkluZm8GBQVvdXRBbQUFb3V0UHIFBnBtdEFtdAUFY3VyUHIFBmhlaWdodAgFCWxhc3RCbG9jawl0aW1lc3RhbXAJAMwIAgkBDEludGVnZXJFbnRyeQIJAQJwbAAFBWN1clByCQDMCAIJAQxJbnRlZ2VyRW50cnkCCQECcGgCBQZoZWlnaHQIBQlsYXN0QmxvY2sJdGltZXN0YW1wBQVjdXJQcgUDbmlsAwkAAAIFBXN0YXRlBQVzdGF0ZQQEYnVybgkA/AcEBQNmY2ECBGJ1cm4JAMwIAgUGcG10QW10BQNuaWwJAMwIAgkBD0F0dGFjaGVkUGF5bWVudAIFCnBtdEFzc2V0SWQFBnBtdEFtdAUDbmlsAwkAAAIFBGJ1cm4FBGJ1cm4FBXN0YXRlCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAWkBCWdldE5vTGVzcwISbm9MZXNzVGhlbkFtdEFzc2V0FG5vTGVzc1RoZW5QcmljZUFzc2V0BAFyCQECY2cBBQFpBAhvdXRBbUFtdAgFAXICXzEECG91dFByQW10CAUBcgJfMgQGcG10QW10CAUBcgJfMwQKcG10QXNzZXRJZAgFAXICXzQEBXN0YXRlCAUBcgJfNQMJAGYCBRJub0xlc3NUaGVuQW10QXNzZXQFCG91dEFtQW10CQACAQkArAICCQCsAgIJAKwCAgIJRmFpbGVkOiAgCQCkAwEFCG91dEFtQW10AgMgPCAJAKQDAQUSbm9MZXNzVGhlbkFtdEFzc2V0AwkAZgIFFG5vTGVzc1RoZW5QcmljZUFzc2V0BQhvdXRQckFtdAkAAgEJAKwCAgkArAICCQCsAgICCEZhaWxlZDogCQCkAwEFCG91dFByQW10AgMgPCAJAKQDAQUUbm9MZXNzVGhlblByaWNlQXNzZXQEFGJ1cm5MUEFzc2V0T25GYWN0b3J5CQD8BwQFA2ZjYQIEYnVybgkAzAgCBQZwbXRBbXQFA25pbAkAzAgCCQEPQXR0YWNoZWRQYXltZW50AgUKcG10QXNzZXRJZAUGcG10QW10BQNuaWwDCQAAAgUUYnVybkxQQXNzZXRPbkZhY3RvcnkFFGJ1cm5MUEFzc2V0T25GYWN0b3J5BQVzdGF0ZQkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgFpAQ11bnN0YWtlQW5kR2V0AQZhbW91bnQEDWNoZWNrUGF5bWVudHMDCQECIT0CCQCQAwEIBQFpCHBheW1lbnRzAAAJAAIBAg1ObyBwbW50cyBleHBkBgMJAAACBQ1jaGVja1BheW1lbnRzBQ1jaGVja1BheW1lbnRzBANjZmcJAQNncGMABApmYWN0b3J5Q2ZnCQEDZ2ZjAAQJbHBBc3NldElkCQDZBAEJAJEDAgUDY2ZnBQlpZHhMUEFzSWQEB3N0YWtpbmcJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkApggBCQCRAwIFCmZhY3RvcnlDZmcFD2lkeEZhY3RTdGFrQ250cgIKV3Igc3QgYWRkcgQKdW5zdGFrZUludgkA/AcEBQdzdGFraW5nAgd1bnN0YWtlCQDMCAIJANgEAQUJbHBBc3NldElkCQDMCAIFBmFtb3VudAUDbmlsBQNuaWwDCQAAAgUKdW5zdGFrZUludgUKdW5zdGFrZUludgQBcgkBA2VnbwQJANgEAQgFAWkNdHJhbnNhY3Rpb25JZAkA2AQBBQlscEFzc2V0SWQFBmFtb3VudAgFAWkGY2FsbGVyBANzdHMJAQ1wYXJzZUludFZhbHVlAQgFAXICXzkEBXN0YXRlCAUBcgNfMTAEAXYDAwkBA2lncwAGCQAAAgUDc3RzBQxQb29sU2h1dGRvd24JAAIBCQCsAgICCUJsb2NrZWQ6IAkApAMBBQNzdHMGAwkAAAIFAXYFAXYEBWJ1cm5BCQD8BwQFA2ZjYQIEYnVybgkAzAgCBQZhbW91bnQFA25pbAkAzAgCCQEPQXR0YWNoZWRQYXltZW50AgUJbHBBc3NldElkBQZhbW91bnQFA25pbAMJAAACBQVidXJuQQUFYnVybkEFBXN0YXRlCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAWkBCGFjdGl2YXRlAghhbXRBc1N0cgdwckFzU3RyAwkBAiE9AgkApQgBCAUBaQZjYWxsZXIJAKUIAQUDZmNhCQACAQIGZGVuaWVkCQCUCgIJAMwIAgkBC1N0cmluZ0VudHJ5AgkBAmFhAAUIYW10QXNTdHIJAMwIAgkBC1N0cmluZ0VudHJ5AgkBAnBhAAUHcHJBc1N0cgUDbmlsAgdzdWNjZXNzAWkBBHNldFMCAWsBdgMJAQIhPQIJAKUIAQgFAWkGY2FsbGVyCQEEc3RyZgIFBHRoaXMJAQNhZGEABQJwZAkAzAgCCQELU3RyaW5nRW50cnkCBQFrBQF2BQNuaWwBaQEEc2V0SQIBawF2AwkBAiE9AgkApQgBCAUBaQZjYWxsZXIJAQRzdHJmAgUEdGhpcwkBA2FkYQAFAnBkCQDMCAIJAQxJbnRlZ2VyRW50cnkCBQFrBQF2BQNuaWwBaQEcZ2V0UG9vbENvbmZpZ1dyYXBwZXJSRUFET05MWQAJAJQKAgUDbmlsCQEDZ3BjAAFpARxnZXRBY2NCYWxhbmNlV3JhcHBlclJFQURPTkxZAQdhc3NldElkCQCUCgIFA25pbAkBDWdldEFjY0JhbGFuY2UBBQdhc3NldElkAWkBGWNhbGNQcmljZXNXcmFwcGVyUkVBRE9OTFkDBWFtQW10BXByQW10BWxwQW10BAJwcgkBCmNhbGNQcmljZXMDBQVhbUFtdAUFcHJBbXQFBWxwQW10CQCUCgIFA25pbAkAzAgCCQCmAwEJAJEDAgUCcHIAAAkAzAgCCQCmAwEJAJEDAgUCcHIAAQkAzAgCCQCmAwEJAJEDAgUCcHIAAgUDbmlsAWkBFmZyb21YMThXcmFwcGVyUkVBRE9OTFkCA3ZhbAxyZXNTY2FsZU11bHQJAJQKAgUDbmlsCQECZjECCQCnAwEFA3ZhbAUMcmVzU2NhbGVNdWx0AWkBFHRvWDE4V3JhcHBlclJFQURPTkxZAgdvcmlnVmFsDW9yaWdTY2FsZU11bHQJAJQKAgUDbmlsCQCmAwEJAQJ0MQIFB29yaWdWYWwFDW9yaWdTY2FsZU11bHQBaQEeY2FsY1ByaWNlQmlnSW50V3JhcHBlclJFQURPTkxZAghwckFtdFgxOAhhbUFtdFgxOAkAlAoCBQNuaWwJAKYDAQkBBGNwYmkCCQCnAwEFCHByQW10WDE4CQCnAwEFCGFtQW10WDE4AWkBI2VzdGltYXRlUHV0T3BlcmF0aW9uV3JhcHBlclJFQURPTkxZCQZ0eElkNTgIc2xpcHBhZ2UHaW5BbUFtdAZpbkFtSWQHaW5QckFtdAZpblBySWQHdXNyQWRkcgZpc0V2YWwGZW1pdExwCQCUCgIFA25pbAkBA2VwbwwFBnR4SWQ1OAUIc2xpcHBhZ2UFB2luQW1BbXQFBmluQW1JZAUHaW5QckFtdAUGaW5QcklkBQd1c3JBZGRyBQZpc0V2YWwFBmVtaXRMcAcAAAIAAWkBI2VzdGltYXRlR2V0T3BlcmF0aW9uV3JhcHBlclJFQURPTkxZBAZ0eElkNTgHcG10QXNJZAhwbXRMcEFtdAd1c3JBZGRyBAFyCQEDZWdvBAUGdHhJZDU4BQdwbXRBc0lkBQhwbXRMcEFtdAkBEUBleHRyTmF0aXZlKDEwNjIpAQUHdXNyQWRkcgkAlAoCBQNuaWwJAJwKCggFAXICXzEIBQFyAl8yCAUBcgJfMwgFAXICXzQIBQFyAl81CAUBcgJfNggFAXICXzcJAKYDAQgFAXICXzgIBQFyAl85CAUBcgNfMTABAnR4AQZ2ZXJpZnkABA90YXJnZXRQdWJsaWNLZXkEByRtYXRjaDAJAQFtAAMJAAECBQckbWF0Y2gwAgpCeXRlVmVjdG9yBAJwawUHJG1hdGNoMAUCcGsDCQABAgUHJG1hdGNoMAIEVW5pdAgFAnR4D3NlbmRlclB1YmxpY0tleQkAAgECC01hdGNoIGVycm9yBAckbWF0Y2gwBQJ0eAMJAAECBQckbWF0Y2gwAgVPcmRlcgQFb3JkZXIFByRtYXRjaDAECm1hdGNoZXJQdWIJAQJtcAAECm9yZGVyVmFsaWQJAQNtb2EBBQVvcmRlcgQLc2VuZGVyVmFsaWQJAPQDAwgFBW9yZGVyCWJvZHlCeXRlcwkAkQMCCAUFb3JkZXIGcHJvb2ZzAAAIBQVvcmRlcg9zZW5kZXJQdWJsaWNLZXkEDG1hdGNoZXJWYWxpZAkA9AMDCAUFb3JkZXIJYm9keUJ5dGVzCQCRAwIIBQVvcmRlcgZwcm9vZnMAAQUKbWF0Y2hlclB1YgMDAwUKb3JkZXJWYWxpZAULc2VuZGVyVmFsaWQHBQxtYXRjaGVyVmFsaWQHBgkBA3RvZQMFCm9yZGVyVmFsaWQFC3NlbmRlclZhbGlkBQxtYXRjaGVyVmFsaWQDCQABAgUHJG1hdGNoMAIUU2V0U2NyaXB0VHJhbnNhY3Rpb24EAXMFByRtYXRjaDAEB25ld0hhc2gJAPYDAQkBBXZhbHVlAQgFAXMGc2NyaXB0BAthbGxvd2VkSGFzaAkA2wQBCQEFdmFsdWUBCQCdCAIFA2ZjYQkBHGtleUFsbG93ZWRMcFN0YWJsZVNjcmlwdEhhc2gABAtjdXJyZW50SGFzaAkA8QcBBQR0aGlzAwMJAAACBQthbGxvd2VkSGFzaAUHbmV3SGFzaAkBAiE9AgULY3VycmVudEhhc2gFB25ld0hhc2gHBgkA9AMDCAUCdHgJYm9keUJ5dGVzCQCRAwIIBQJ0eAZwcm9vZnMAAAUPdGFyZ2V0UHVibGljS2V5CQD0AwMIBQJ0eAlib2R5Qnl0ZXMJAJEDAggFAnR4BnByb29mcwAABQ90YXJnZXRQdWJsaWNLZXm8emkr",
    "height": 2208703,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: D2tsMVcWdW1sszvEEWH9j8cUqQaUSLqgM4oy7hmTd8Qi
Next: E72bvt47Q2WuXn2bc7kpjy6MFZuFzTsgajAb5v3UWVFs

Diff: 

OldNewDifferences
11 {-# STDLIB_VERSION 6 #-}
22 {-# SCRIPT_TYPE ACCOUNT #-}
33 {-# CONTENT_TYPE DAPP #-}
4-let defaultDecimals = 1000000
5-
64 let scale8 = 100000000
75 
86 let scale8BigInt = toBigInt(100000000)
97 
108 let scale18 = toBigInt(1000000000000000000)
11-
12-let thousand = 1000
139 
1410 let zeroBigInt = toBigInt(0)
1511 
5753 
5854 let idxFactGwxRewCntr = 10
5955 
60-let feePermilleDefault = 0
56+let delay = "%s__delay"
6157 
62-func toX18 (origVal,origScaleMult) = fraction(toBigInt(origVal), scale18, toBigInt(origScaleMult))
58+func t1 (origVal,origScaleMult) = fraction(toBigInt(origVal), scale18, toBigInt(origScaleMult))
6359 
6460 
65-func fromX18 (val,resultScaleMult) = toInt(fraction(val, toBigInt(resultScaleMult), scale18))
61+func f1 (val,resultScaleMult) = toInt(fraction(val, toBigInt(resultScaleMult), scale18))
6662 
6763 
6864 func ts (amt,resScale,curScale) = fraction(amt, resScale, curScale)
7369     else val
7470 
7571 
76-func keyFactoryContact () = "%s__factoryContract"
72+func fc () = "%s__factoryContract"
7773 
7874 
79-func keyManagerPublicKey () = "%s__managerPublicKey"
75+func mpk () = "%s__managerPublicKey"
8076 
8177 
82-func keyPendingManagerPublicKey () = "%s__pendingManagerPublicKey"
78+func pmpk () = "%s__pendingManagerPublicKey"
8379 
8480 
85-func keyPriceLast () = "%s%s__price__last"
81+func pl () = "%s%s__price__last"
8682 
8783 
88-func keyPriceHistory (h,t) = makeString(["%s%s%d%d__price__history", toString(h), toString(t)], SEP)
84+func ph (h,t) = makeString(["%s%s%d%d__price__history", toString(h), toString(t)], SEP)
8985 
9086 
91-func keyPutActionByUser (ua,txId) = ((("%s%s%s__P__" + ua) + "__") + txId)
87+func pau (ua,txId) = ((("%s%s%s__P__" + ua) + "__") + txId)
9288 
9389 
94-func keyGetActionByUser (ua,txId) = ((("%s%s%s__G__" + ua) + "__") + txId)
90+func gau (ua,txId) = ((("%s%s%s__G__" + ua) + "__") + txId)
9591 
9692 
97-func keyAmountAsset () = "%s__amountAsset"
93+func aa () = "%s__amountAsset"
9894 
9995 
100-func keyPriceAsset () = "%s__priceAsset"
96+func pa () = "%s__priceAsset"
10197 
10298 
103-func keyAmplificator () = "%s__amp"
99+func amp () = "%s__amp"
104100 
105101 
106-func keyAddonAddress () = "%s__addonAddr"
102+func ada () = "%s__addonAddr"
107103 
108104 
109-let keyFeePermille = "%s__feePermille"
110-
111-let feePermille = valueOrElse(getInteger(this, keyFeePermille), feePermilleDefault)
112-
113-func keyFactoryConfig () = "%s__factoryConfig"
105+func lgotc (caller) = makeString(["%s%s__lastGetOneTknCall", caller], SEP)
114106 
115107 
116-func keyMatcherPub () = "%s%s__matcher__publicKey"
108+func lsotc (caller) = makeString(["%s%s__lastPutOneTknCall", caller], SEP)
117109 
118110 
119-func keyPoolConfig (iAmtAs,iPrAs) = (((("%d%d%s__" + iAmtAs) + "__") + iPrAs) + "__config")
111+func fcfg () = "%s__factoryConfig"
120112 
121113 
122-func keyMappingsBaseAsset2internalId (bAStr) = ("%s%s%s__mappings__baseAsset2internalId__" + bAStr)
114+func mtpk () = "%s%s__matcher__publicKey"
123115 
124116 
125-func keyAllPoolsShutdown () = "%s__shutdown"
117+func pc (iAmtAs,iPrAs) = (((("%d%d%s__" + iAmtAs) + "__") + iPrAs) + "__config")
126118 
127119 
128-func throwErr (msg) = throw(makeString(["lp_stable.ride:", msg], " "))
120+func mba (bAStr) = ("%s%s%s__mappings__baseAsset2internalId__" + bAStr)
129121 
130122 
131-func throwOrderError (orV,sendrV,matchV) = throwErr(((((("Failed: ordValid=" + toString(orV)) + " sndrValid=") + toString(sendrV)) + " mtchrValid=") + toString(matchV)))
123+func aps () = "%s__shutdown"
124+
125+
126+func keyAllowedLpStableScriptHash () = "%s__allowedLpStableScriptHash"
127+
128+
129+func toe (orV,sendrV,matchV) = throw(((((("Failed: ordValid=" + toString(orV)) + " sndrValid=") + toString(sendrV)) + " mtchrValid=") + toString(matchV)))
132130 
133131 
134132 func str (val) = match val {
135133     case valStr: String => 
136134         valStr
137135     case _ => 
138-        throwErr("fail cast to String")
136+        throw("fail cast to String")
139137 }
140138 
141139 
142-func getStringOrFail (addr,key) = valueOrErrorMessage(getString(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
140+func strf (addr,key) = valueOrErrorMessage(getString(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
143141 
144142 
145-func getIntOrFail (addr,key) = valueOrErrorMessage(getInteger(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
143+func intf (addr,key) = valueOrErrorMessage(getInteger(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
146144 
147145 
148-let factoryContract = addressFromStringValue(getStringOrFail(this, keyFactoryContact()))
146+let fca = addressFromStringValue(strf(this, fc()))
149147 
150-let amplificator = getStringOrFail(this, keyAmplificator())
148+let A = strf(this, amp())
151149 
152-func isGlobalShutdown () = valueOrElse(getBoolean(factoryContract, keyAllPoolsShutdown()), false)
150+func igs () = valueOrElse(getBoolean(fca, aps()), false)
153151 
154152 
155-func getMatcherPubOrFail () = fromBase58String(getStringOrFail(factoryContract, keyMatcherPub()))
153+func mp () = fromBase58String(strf(fca, mtpk()))
156154 
157155 
158-let matcherAddress = addressFromPublicKey(getMatcherPubOrFail())
159-
160-func getPoolConfig () = {
161-    let amtAs = getStringOrFail(this, keyAmountAsset())
162-    let priceAs = getStringOrFail(this, keyPriceAsset())
163-    let iPriceAs = getIntOrFail(factoryContract, keyMappingsBaseAsset2internalId(priceAs))
164-    let iAmtAs = getIntOrFail(factoryContract, keyMappingsBaseAsset2internalId(amtAs))
165-    split(getStringOrFail(factoryContract, keyPoolConfig(toString(iAmtAs), toString(iPriceAs))), SEP)
156+func gpc () = {
157+    let amtAs = strf(this, aa())
158+    let priceAs = strf(this, pa())
159+    let iPriceAs = intf(fca, mba(priceAs))
160+    let iAmtAs = intf(fca, mba(amtAs))
161+    split(strf(fca, pc(toString(iAmtAs), toString(iPriceAs))), SEP)
166162     }
167163 
168164 
169-func getFactoryConfig () = split(getStringOrFail(factoryContract, keyFactoryConfig()), SEP)
165+func gfc () = split(strf(fca, fcfg()), SEP)
170166 
171167 
172168 func dataPutActionInfo (inAmtAssetAmt,inPriceAssetAmt,outLpAmt,price,slipByUser,slippageReal,txHeight,txTimestamp,slipageAmAmt,slipagePrAmt) = makeString(["%d%d%d%d%d%d%d%d%d%d", toString(inAmtAssetAmt), toString(inPriceAssetAmt), toString(outLpAmt), toString(price), toString(slipByUser), toString(slippageReal), toString(txHeight), toString(txTimestamp), toString(slipageAmAmt), toString(slipagePrAmt)], SEP)
180176     else assetBalance(this, fromBase58String(assetId))
181177 
182178 
183-func calcPriceBigInt (prAmtX18,amAmtX18) = fraction(prAmtX18, scale18, amAmtX18)
179+func cpbi (prAmtX18,amAmtX18) = fraction(prAmtX18, scale18, amAmtX18)
184180 
185181 
186-func validateAbsDiff (estimateLP,outLp,slippage) = {
187-    let diff = fraction((estimateLP - outLp), scale8BigInt, outLp)
182+func vad (A1,A2,slippage) = {
183+    let diff = fraction((A1 - A2), scale8BigInt, A2)
188184     let pass = ((slippage - abs(diff)) > zeroBigInt)
189185     if (!(pass))
190-        then throwErr(("Big slippage: " + toString(diff)))
191-        else $Tuple2(pass, min([estimateLP, outLp]))
186+        then throw(("Big slpg: " + toString(diff)))
187+        else $Tuple2(pass, min([A1, A2]))
192188     }
193189 
194190 
195-func validateD (D1,D0,slippage) = {
191+func vd (D1,D0,slpg) = {
196192     let diff = fraction(D0, scale8BigInt, D1)
197-    let fail = (slippage > diff)
193+    let fail = (slpg > diff)
198194     if (if (fail)
199195         then true
200196         else (D0 > D1))
201-        then throwErr(((((((toString(D0) + " ") + toString(D1)) + " ") + toString(diff)) + " ") + toString(slippage)))
197+        then throw(((((((toString(D0) + " ") + toString(D1)) + " ") + toString(diff)) + " ") + toString(slpg)))
202198         else fail
203199     }
204200 
205201 
206-func privateCalcPrice (amAssetDcm,prAssetDcm,amAmt,prAmt) = {
207-    let amtAsAmtX18 = toX18(amAmt, amAssetDcm)
208-    let prAsAmtX18 = toX18(prAmt, prAssetDcm)
209-    calcPriceBigInt(prAsAmtX18, amtAsAmtX18)
202+func pcp (amAssetDcm,prAssetDcm,amAmt,prAmt) = {
203+    let amtAsAmtX18 = t1(amAmt, amAssetDcm)
204+    let prAsAmtX18 = t1(prAmt, prAssetDcm)
205+    cpbi(prAsAmtX18, amtAsAmtX18)
210206     }
211207 
212208 
213209 func calcPrices (amAmt,prAmt,lpAmt) = {
214-    let cfg = getPoolConfig()
210+    let cfg = gpc()
215211     let amtAsDcm = parseIntValue(cfg[idxAmtAsDcm])
216212     let prAsDcm = parseIntValue(cfg[idxPriceAsDcm])
217-    let priceX18 = privateCalcPrice(amtAsDcm, prAsDcm, amAmt, prAmt)
218-    let amAmtX18 = toX18(amAmt, amtAsDcm)
219-    let prAmtX18 = toX18(prAmt, prAsDcm)
220-    let lpAmtX18 = toX18(lpAmt, scale8)
221-    let lpPrInAmAsX18 = calcPriceBigInt(amAmtX18, lpAmtX18)
222-    let lpPrInPrAsX18 = calcPriceBigInt(prAmtX18, lpAmtX18)
213+    let priceX18 = pcp(amtAsDcm, prAsDcm, amAmt, prAmt)
214+    let amAmtX18 = t1(amAmt, amtAsDcm)
215+    let prAmtX18 = t1(prAmt, prAsDcm)
216+    let lpAmtX18 = t1(lpAmt, scale8)
217+    let lpPrInAmAsX18 = cpbi(amAmtX18, lpAmtX18)
218+    let lpPrInPrAsX18 = cpbi(prAmtX18, lpAmtX18)
223219 [priceX18, lpPrInAmAsX18, lpPrInPrAsX18]
224220     }
225221 
226222 
227223 func calculatePrices (amAmt,prAmt,lpAmt) = {
228224     let p = calcPrices(amAmt, prAmt, lpAmt)
229-[fromX18(p[0], scale8), fromX18(p[1], scale8), fromX18(p[2], scale8)]
225+[f1(p[0], scale8), f1(p[1], scale8), f1(p[2], scale8)]
230226     }
231227 
232228 
233-func estimateGetOperation (txId58,paymentAssetId,paymentLpAmount,userAddress) = {
234-    let cfg = getPoolConfig()
235-    let lpAssetId = cfg[idxLPAsId]
236-    let amountId = cfg[idxAmAsId]
237-    let priceId = cfg[idxPrAsId]
238-    let amountDecimals = parseIntValue(cfg[idxAmtAsDcm])
239-    let priceDecimals = parseIntValue(cfg[idxPriceAsDcm])
229+func ego (txId58,pmtAssetId,pmtLpAmt,userAddress) = {
230+    let cfg = gpc()
231+    let lpId = cfg[idxLPAsId]
232+    let amId = cfg[idxAmAsId]
233+    let prId = cfg[idxPrAsId]
234+    let amDcm = parseIntValue(cfg[idxAmtAsDcm])
235+    let prDcm = parseIntValue(cfg[idxPriceAsDcm])
240236     let sts = cfg[idxPoolSt]
241-    let lpEmission = valueOrErrorMessage(assetInfo(fromBase58String(lpAssetId)), "Wrong LP id").quantity
242-    let validationBlock = if ((lpAssetId == paymentAssetId))
243-        then true
244-        else throwErr("Wrong payment asset")
245-    if ((validationBlock == validationBlock))
246-        then {
247-            let amountBalance = getAccBalance(amountId)
248-            let priceBalance = getAccBalance(priceId)
249-            let amountBalanceDefaultDecimals = fraction(amountBalance, defaultDecimals, amountDecimals)
250-            let priceBalanceDefaultDecimals = fraction(priceBalance, defaultDecimals, priceDecimals)
251-            let amountBalanceX18 = toX18(amountBalanceDefaultDecimals, defaultDecimals)
252-            let priceBalanceX18 = toX18(priceBalanceDefaultDecimals, defaultDecimals)
253-            let currentPriceX18 = calcPriceBigInt(priceBalanceX18, amountBalanceX18)
254-            let curPrice = fromX18(currentPriceX18, scale8)
255-            let paymentLpAmountX18 = toX18(paymentLpAmount, scale8)
256-            let lpEmissionX18 = toX18(lpEmission, scale8)
257-            let outAmountAmountX18 = fraction(amountBalanceX18, paymentLpAmountX18, lpEmissionX18)
258-            let outPriceAmountX18 = fraction(priceBalanceX18, paymentLpAmountX18, lpEmissionX18)
259-            let outAmountAmountDefaultDecimals = fromX18(outAmountAmountX18, defaultDecimals)
260-            let outPriceAmountDefaultDecimals = fromX18(outPriceAmountX18, defaultDecimals)
261-            let outAmountAmount = fraction(outAmountAmountDefaultDecimals, amountDecimals, defaultDecimals)
262-            let outPriceAmount = fraction(outPriceAmountDefaultDecimals, priceDecimals, defaultDecimals)
237+    let lpEmiss = valueOrErrorMessage(assetInfo(fromBase58String(lpId)), "Wrong LP id").quantity
238+    if ((lpId != pmtAssetId))
239+        then throw("Wrong pmt asset")
240+        else {
241+            let amBalance = getAccBalance(amId)
242+            let amBalanceX18 = t1(amBalance, amDcm)
243+            let prBalance = getAccBalance(prId)
244+            let prBalanceX18 = t1(prBalance, prDcm)
245+            let curPriceX18 = cpbi(prBalanceX18, amBalanceX18)
246+            let curPrice = f1(curPriceX18, scale8)
247+            let pmtLpAmtX18 = t1(pmtLpAmt, scale8)
248+            let lpEmissX18 = t1(lpEmiss, scale8)
249+            let outAmAmtX18 = fraction(amBalanceX18, pmtLpAmtX18, lpEmissX18)
250+            let outPrAmtX18 = fraction(prBalanceX18, pmtLpAmtX18, lpEmissX18)
251+            let outAmAmt = f1(outAmAmtX18, amDcm)
252+            let outPrAmt = f1(outPrAmtX18, prDcm)
263253             let state = if ((txId58 == ""))
264254                 then nil
265-                else [ScriptTransfer(userAddress, outAmountAmount, if ((amountId == "WAVES"))
255+                else [ScriptTransfer(userAddress, outAmAmt, if ((amId == "WAVES"))
266256                     then unit
267-                    else fromBase58String(amountId)), ScriptTransfer(userAddress, outPriceAmount, if ((priceId == "WAVES"))
257+                    else fromBase58String(amId)), ScriptTransfer(userAddress, outPrAmt, if ((prId == "WAVES"))
268258                     then unit
269-                    else fromBase58String(priceId)), StringEntry(keyGetActionByUser(toString(userAddress), txId58), dataGetActionInfo(outAmountAmount, outPriceAmount, paymentLpAmount, curPrice, height, lastBlock.timestamp)), IntegerEntry(keyPriceLast(), curPrice), IntegerEntry(keyPriceHistory(height, lastBlock.timestamp), curPrice)]
270-            $Tuple10(outAmountAmount, outPriceAmount, amountId, priceId, amountBalance, priceBalance, lpEmission, currentPriceX18, sts, state)
259+                    else fromBase58String(prId)), StringEntry(gau(toString(userAddress), txId58), dataGetActionInfo(outAmAmt, outPrAmt, pmtLpAmt, curPrice, height, lastBlock.timestamp)), IntegerEntry(pl(), curPrice), IntegerEntry(ph(height, lastBlock.timestamp), curPrice)]
260+            $Tuple10(outAmAmt, outPrAmt, amId, prId, amBalance, prBalance, lpEmiss, curPriceX18, sts, state)
271261             }
272-        else throw("Strict value is not equal to itself.")
273262     }
274263 
275264 
276-func estimatePutOperation (txId58,slippageTolerance,inAmountAssetAmount,inAmountAssetId,inPriceAssetAmount,inPriceAssetId,userAddress,isEvaluate,emitLp,isOneAsset,paymentAmount,paymentId) = {
277-    let cfg = getPoolConfig()
278-    let lpAssetId = fromBase58String(cfg[idxLPAsId])
279-    let amountIdStr = cfg[idxAmAsId]
280-    let priceIdStr = cfg[idxPrAsId]
281-    let inAmountIdStr = cfg[idxIAmtAsId]
282-    let inPriceIdStr = cfg[idxIPriceAsId]
283-    let amountDecimals = parseIntValue(cfg[idxAmtAsDcm])
284-    let priceDecimals = parseIntValue(cfg[idxPriceAsDcm])
265+func epo (txId58,slippage,inAmAmt,inAmId,inPrAmt,inPrId,userAddress,isEval,emitLp,isOneAsset,pmtAmt,pmtId) = {
266+    let cfg = gpc()
267+    let lpId = fromBase58String(cfg[idxLPAsId])
268+    let amIdStr = cfg[idxAmAsId]
269+    let prIdStr = cfg[idxPrAsId]
270+    let inAmIdStr = cfg[idxIAmtAsId]
271+    let inPrIdStr = cfg[idxIPriceAsId]
272+    let amtDcm = parseIntValue(cfg[idxAmtAsDcm])
273+    let priceDcm = parseIntValue(cfg[idxPriceAsDcm])
285274     let sts = cfg[idxPoolSt]
286-    let lpEmission = valueOrErrorMessage(assetInfo(lpAssetId), "Wrong lp asset").quantity
287-    let amountBalance = if (isEvaluate)
288-        then getAccBalance(amountIdStr)
275+    let lpEm = valueOrErrorMessage(assetInfo(lpId), "Wr lp as").quantity
276+    let amBalance = if (isEval)
277+        then getAccBalance(amIdStr)
289278         else if (if (isOneAsset)
290-            then (paymentId == amountIdStr)
279+            then (pmtId == amIdStr)
291280             else false)
292-            then (getAccBalance(amountIdStr) - paymentAmount)
281+            then (getAccBalance(amIdStr) - pmtAmt)
293282             else if (isOneAsset)
294-                then getAccBalance(amountIdStr)
295-                else (getAccBalance(amountIdStr) - inAmountAssetAmount)
296-    let priceBalance = if (isEvaluate)
297-        then getAccBalance(priceIdStr)
283+                then getAccBalance(amIdStr)
284+                else (getAccBalance(amIdStr) - inAmAmt)
285+    let prBalance = if (isEval)
286+        then getAccBalance(prIdStr)
298287         else if (if (isOneAsset)
299-            then (paymentId == priceIdStr)
288+            then (pmtId == prIdStr)
300289             else false)
301-            then (getAccBalance(priceIdStr) - paymentAmount)
290+            then (getAccBalance(prIdStr) - pmtAmt)
302291             else if (isOneAsset)
303-                then getAccBalance(priceIdStr)
304-                else (getAccBalance(priceIdStr) - inPriceAssetAmount)
305-    let amountBalanceDefaultDecimals = fraction(amountBalance, defaultDecimals, amountDecimals)
306-    let priceBalanceDefaultDecimals = fraction(priceBalance, defaultDecimals, priceDecimals)
307-    let inAmountAssetAmountDefaultDecimals = fraction(inAmountAssetAmount, defaultDecimals, amountDecimals)
308-    let inPriceAssetAmountDefaultDecimals = fraction(inPriceAssetAmount, defaultDecimals, priceDecimals)
309-    let inAmountAssetAmountX18 = toX18(inAmountAssetAmountDefaultDecimals, defaultDecimals)
310-    let inPriceAssetAmountX18 = toX18(inPriceAssetAmountDefaultDecimals, defaultDecimals)
311-    let userPriceX18 = calcPriceBigInt(inPriceAssetAmountX18, inAmountAssetAmountX18)
312-    let amountBalanceX18 = toX18(amountBalanceDefaultDecimals, defaultDecimals)
313-    let priceBalanceX18 = toX18(priceBalanceDefaultDecimals, defaultDecimals)
314-    let r = if ((lpEmission == 0))
292+                then getAccBalance(prIdStr)
293+                else (getAccBalance(prIdStr) - inPrAmt)
294+    let inAmAssetAmtX18 = t1(inAmAmt, amtDcm)
295+    let inPrAssetAmtX18 = t1(inPrAmt, priceDcm)
296+    let userPriceX18 = cpbi(inPrAssetAmtX18, inAmAssetAmtX18)
297+    let amBalanceX18 = t1(amBalance, amtDcm)
298+    let prBalanceX18 = t1(prBalance, priceDcm)
299+    let r = if ((lpEm == 0))
315300         then {
316-            let currentPriceX18 = zeroBigInt
301+            let curPriceX18 = zeroBigInt
317302             let slippageX18 = zeroBigInt
318-            let lpAmountX18 = pow((inAmountAssetAmountX18 * inPriceAssetAmountX18), 0, toBigInt(5), 1, 0, DOWN)
319-            $Tuple5(fromX18(lpAmountX18, scale8), fromX18(inAmountAssetAmountX18, defaultDecimals), fromX18(inPriceAssetAmountX18, defaultDecimals), calcPriceBigInt((priceBalanceX18 + inPriceAssetAmountX18), (amountBalanceX18 + inAmountAssetAmountX18)), slippageX18)
303+            let lpAmtX18 = pow((inAmAssetAmtX18 * inPrAssetAmtX18), 0, toBigInt(5), 1, 0, DOWN)
304+            $Tuple5(f1(lpAmtX18, scale8), f1(inAmAssetAmtX18, amtDcm), f1(inPrAssetAmtX18, priceDcm), cpbi((prBalanceX18 + inPrAssetAmtX18), (amBalanceX18 + inAmAssetAmtX18)), slippageX18)
320305             }
321306         else {
322-            let currentPriceX18 = calcPriceBigInt(priceBalanceX18, amountBalanceX18)
323-            let slippageRealX18 = fraction(abs((currentPriceX18 - userPriceX18)), scale18, currentPriceX18)
324-            let slippageX18 = toX18(slippageTolerance, scale8)
325-            let validateSlippage = if (((if ((currentPriceX18 != zeroBigInt))
307+            let curPriceX18 = cpbi(prBalanceX18, amBalanceX18)
308+            let slippageRealX18 = fraction(abs((curPriceX18 - userPriceX18)), scale18, curPriceX18)
309+            let slippageX18 = t1(slippage, scale8)
310+            if (if ((curPriceX18 != zeroBigInt))
326311                 then (slippageRealX18 > slippageX18)
327-                else false) == false))
328-                then true
329-                else throwErr(((("Price slippage " + toString(slippageRealX18)) + " > ") + toString(slippageX18)))
330-            if ((validateSlippage == validateSlippage))
331-                then {
332-                    let lpEmissionX18 = toX18(lpEmission, scale8)
333-                    let prViaAmX18 = fraction(inAmountAssetAmountX18, currentPriceX18, scale18)
334-                    let amViaPrX18 = fraction(inPriceAssetAmountX18, scale18, currentPriceX18)
335-                    let expectedAmounts = if ((prViaAmX18 > inPriceAssetAmountX18))
336-                        then $Tuple2(amViaPrX18, inAmountAssetAmountX18)
337-                        else $Tuple2(inAmountAssetAmountX18, prViaAmX18)
338-                    let expectedAmountAssetAmountX18 = expectedAmounts._1
339-                    let expectedPriceAssetAmountX18 = expectedAmounts._2
340-                    let lpAmountX18 = fraction(lpEmissionX18, expectedPriceAssetAmountX18, priceBalanceX18)
341-                    $Tuple5(fromX18(lpAmountX18, scale8), fromX18(expectedAmountAssetAmountX18, defaultDecimals), fromX18(expectedPriceAssetAmountX18, defaultDecimals), currentPriceX18, slippageX18)
312+                else false)
313+                then throw(((("Price slippage " + toString(slippageRealX18)) + " > ") + toString(slippageX18)))
314+                else {
315+                    let lpEmissionX18 = t1(lpEm, scale8)
316+                    let prViaAmX18 = fraction(inAmAssetAmtX18, curPriceX18, scale18)
317+                    let amViaPrX18 = fraction(inPrAssetAmtX18, scale18, curPriceX18)
318+                    let expectedAmts = if ((prViaAmX18 > inPrAssetAmtX18))
319+                        then $Tuple2(amViaPrX18, inPrAssetAmtX18)
320+                        else $Tuple2(inAmAssetAmtX18, prViaAmX18)
321+                    let expAmtAssetAmtX18 = expectedAmts._1
322+                    let expPriceAssetAmtX18 = expectedAmts._2
323+                    let lpAmtX18 = fraction(lpEmissionX18, expPriceAssetAmtX18, prBalanceX18)
324+                    $Tuple5(f1(lpAmtX18, scale8), f1(expAmtAssetAmtX18, amtDcm), f1(expPriceAssetAmtX18, priceDcm), curPriceX18, slippageX18)
342325                     }
343-                else throw("Strict value is not equal to itself.")
344326             }
345-    let calculateLpAmount = r._1
346-    let calculateAmountAssetPayment = fraction(r._2, amountDecimals, defaultDecimals)
347-    let calculatePriceAssetPayment = fraction(r._3, priceDecimals, defaultDecimals)
348-    let currentPrice = fromX18(r._4, scale8)
349-    let slippageCalculate = fromX18(r._5, scale8)
350-    let checkCalcLpAmount = if ((calculateLpAmount > 0))
351-        then true
352-        else throwErr("LP <= 0")
353-    if ((checkCalcLpAmount == checkCalcLpAmount))
354-        then {
355-            let emitLpAmount = if (!(emitLp))
327+    let calcLpAmt = r._1
328+    let calcAmAssetPmt = r._2
329+    let calcPrAssetPmt = r._3
330+    let curPrice = f1(r._4, scale8)
331+    let slippageCalc = f1(r._5, scale8)
332+    if ((0 >= calcLpAmt))
333+        then throw("LP <= 0")
334+        else {
335+            let emitLpAmt = if (!(emitLp))
356336                 then 0
357-                else calculateLpAmount
358-            let amountDiff = (inAmountAssetAmount - calculateAmountAssetPayment)
359-            let priceDiff = (inPriceAssetAmount - calculatePriceAssetPayment)
360-            let $t01715017409 = if (if (isOneAsset)
361-                then (paymentId == amountIdStr)
337+                else calcLpAmt
338+            let amDiff = (inAmAmt - calcAmAssetPmt)
339+            let prDiff = (inPrAmt - calcPrAssetPmt)
340+            let $t01560115946 = if (if (isOneAsset)
341+                then (pmtId == amIdStr)
362342                 else false)
363-                then $Tuple2(paymentAmount, 0)
343+                then $Tuple2(pmtAmt, 0)
364344                 else if (if (isOneAsset)
365-                    then (paymentId == priceIdStr)
345+                    then (pmtId == prIdStr)
366346                     else false)
367-                    then $Tuple2(0, paymentAmount)
368-                    else $Tuple2(calculateAmountAssetPayment, calculatePriceAssetPayment)
369-            let writeAmAmt = $t01715017409._1
370-            let writePrAmt = $t01715017409._2
371-            let commonState = [IntegerEntry(keyPriceLast(), currentPrice), IntegerEntry(keyPriceHistory(height, lastBlock.timestamp), currentPrice), StringEntry(keyPutActionByUser(userAddress, txId58), dataPutActionInfo(writeAmAmt, writePrAmt, emitLpAmount, currentPrice, slippageTolerance, slippageCalculate, height, lastBlock.timestamp, amountDiff, priceDiff))]
372-            $Tuple13(calculateLpAmount, emitLpAmount, currentPrice, amountBalance, priceBalance, lpEmission, lpAssetId, sts, commonState, amountDiff, priceDiff, inAmountAssetId, inPriceAssetId)
347+                    then $Tuple2(0, pmtAmt)
348+                    else $Tuple2(calcAmAssetPmt, calcPrAssetPmt)
349+            let writeAmAmt = $t01560115946._1
350+            let writePrAmt = $t01560115946._2
351+            let commonState = [IntegerEntry(pl(), curPrice), IntegerEntry(ph(height, lastBlock.timestamp), curPrice), StringEntry(pau(userAddress, txId58), dataPutActionInfo(writeAmAmt, writePrAmt, emitLpAmt, curPrice, slippage, slippageCalc, height, lastBlock.timestamp, amDiff, prDiff))]
352+            $Tuple13(calcLpAmt, emitLpAmt, curPrice, amBalance, prBalance, lpEm, lpId, sts, commonState, amDiff, prDiff, inAmId, inPrId)
373353             }
374-        else throw("Strict value is not equal to itself.")
375354     }
376355 
377356 
378-func validateMatcherOrderAllowed (order) = {
379-    let cfg = getPoolConfig()
357+func moa (order) = {
358+    let cfg = gpc()
380359     let amtAsId = cfg[idxAmAsId]
381360     let prAsId = cfg[idxPrAsId]
382361     let sts = parseIntValue(cfg[idxPoolSt])
384363     let prAsDcm = parseIntValue(cfg[idxPriceAsDcm])
385364     let accAmtAsBalance = getAccBalance(amtAsId)
386365     let accPrAsBalance = getAccBalance(prAsId)
387-    let currentPriceX18 = if ((order.orderType == Buy))
388-        then privateCalcPrice(amtAsDcm, prAsDcm, (accAmtAsBalance + order.amount), accPrAsBalance)
389-        else privateCalcPrice(amtAsDcm, prAsDcm, (accAmtAsBalance - order.amount), accPrAsBalance)
390-    let curPrice = fromX18(currentPriceX18, scale8)
391-    if (if (if (isGlobalShutdown())
366+    let curPriceX18 = if ((order.orderType == Buy))
367+        then pcp(amtAsDcm, prAsDcm, (accAmtAsBalance + order.amount), accPrAsBalance)
368+        else pcp(amtAsDcm, prAsDcm, (accAmtAsBalance - order.amount), accPrAsBalance)
369+    let curPrice = f1(curPriceX18, scale8)
370+    if (if (if (igs())
392371         then true
393372         else (sts == PoolMatcherDis))
394373         then true
395374         else (sts == PoolShutdown))
396-        then throwErr("Admin blocked")
375+        then throw("Admin blocked")
397376         else {
398377             let orAmtAsset = order.assetPair.amountAsset
399378             let orAmtAsStr = if ((orAmtAsset == unit))
406385             if (if ((orAmtAsStr != amtAsId))
407386                 then true
408387                 else (orPrAsStr != prAsId))
409-                then throwErr("Wr assets")
388+                then throw("Wr assets")
410389                 else {
411390                     let orderPrice = order.price
412-                    let priceDecimals = fraction(scale8, prAsDcm, amtAsDcm)
413-                    let castOrderPrice = ts(orderPrice, scale8, priceDecimals)
391+                    let priceDcm = fraction(scale8, prAsDcm, amtAsDcm)
392+                    let castOrderPrice = ts(orderPrice, scale8, priceDcm)
414393                     let isOrderPriceValid = if ((order.orderType == Buy))
415394                         then (curPrice >= castOrderPrice)
416395                         else (castOrderPrice >= curPrice)
420399     }
421400 
422401 
423-func commonGet (i) = {
424-    let checkPayments = if ((size(i.payments) == 1))
425-        then true
426-        else throwErr("1 payment expected")
427-    if ((checkPayments == checkPayments))
428-        then {
429-            let payment = value(i.payments[0])
430-            let paymentAssetId = value(payment.assetId)
431-            let paymentAmount = payment.amount
432-            let r = estimateGetOperation(toBase58String(i.transactionId), toBase58String(paymentAssetId), paymentAmount, i.caller)
433-            let outAmountAmount = r._1
434-            let outPriceAmount = r._2
435-            let sts = parseIntValue(r._9)
436-            let state = r._10
437-            if (if (isGlobalShutdown())
438-                then true
439-                else (sts == PoolShutdown))
440-                then throwErr(("Admin blocked: " + toString(sts)))
441-                else $Tuple5(outAmountAmount, outPriceAmount, paymentAmount, paymentAssetId, state)
442-            }
443-        else throw("Strict value is not equal to itself.")
444-    }
402+func cg (i) = if ((size(i.payments) != 1))
403+    then throw("1 pmnt exp")
404+    else {
405+        let pmt = value(i.payments[0])
406+        let pmtAssetId = value(pmt.assetId)
407+        let pmtAmt = pmt.amount
408+        let r = ego(toBase58String(i.transactionId), toBase58String(pmtAssetId), pmtAmt, i.caller)
409+        let outAmAmt = r._1
410+        let outPrAmt = r._2
411+        let sts = parseIntValue(r._9)
412+        let state = r._10
413+        if (if (igs())
414+            then true
415+            else (sts == PoolShutdown))
416+            then throw(("Admin blocked: " + toString(sts)))
417+            else $Tuple5(outAmAmt, outPrAmt, pmtAmt, pmtAssetId, state)
418+        }
445419 
446420 
447-func commonPut (caller,txId,amountAssetPayment,priceAssetPayment,slippage,emitLp,isOneAsset,paymentAmount,paymentId) = {
448-    let r = estimatePutOperation(txId, slippage, value(amountAssetPayment).amount, value(amountAssetPayment).assetId, value(priceAssetPayment).amount, value(priceAssetPayment).assetId, caller, false, emitLp, isOneAsset, paymentAmount, paymentId)
421+func cp (caller,txId,amAsPmt,prAsPmt,slippage,emitLp,isOneAsset,pmtAmt,pmtId) = {
422+    let r = epo(txId, slippage, value(amAsPmt).amount, value(amAsPmt).assetId, value(prAsPmt).amount, value(prAsPmt).assetId, caller, false, emitLp, isOneAsset, pmtAmt, pmtId)
449423     let sts = parseIntValue(r._8)
450-    if (if (if (isGlobalShutdown())
424+    if (if (if (igs())
451425         then true
452426         else (sts == PoolPutDis))
453427         then true
454428         else (sts == PoolShutdown))
455-        then throwErr(("Blocked:" + toString(sts)))
429+        then throw(("Blocked:" + toString(sts)))
456430         else r
457431     }
458432 
459433 
460-func takeFee (amount) = {
461-    let fee = fraction(amount, feePermille, thousand)
462-    $Tuple2((amount - fee), fee)
463-    }
464-
465-
466-func managerPublicKeyOrUnit () = match getString(keyManagerPublicKey()) {
434+func m () = match getString(mpk()) {
467435     case s: String => 
468436         fromBase58String(s)
469437     case _: Unit => 
473441 }
474442 
475443 
476-func pendingManagerPublicKeyOrUnit () = match getString(keyPendingManagerPublicKey()) {
444+func pm () = match getString(pmpk()) {
477445     case s: String => 
478446         fromBase58String(s)
479447     case _: Unit => 
483451 }
484452 
485453 
486-let pd = throwErr("Permission denied")
454+let pd = throw("Permission denied")
487455 
488-func mustManager (i) = match managerPublicKeyOrUnit() {
456+func mm (i) = match m() {
489457     case pk: ByteVector => 
490458         if ((i.callerPublicKey == pk))
491459             then true
500468 
501469 
502470 @Callable(i)
503-func constructor (factoryContract) = {
504-    let checkCaller = mustManager(i)
505-    if ((checkCaller == checkCaller))
506-        then [StringEntry(keyFactoryContact(), factoryContract)]
471+func constructor (fc) = {
472+    let c = mm(i)
473+    if ((c == c))
474+        then [StringEntry(fc(), fc)]
507475         else throw("Strict value is not equal to itself.")
508476     }
509477 
511479 
512480 @Callable(i)
513481 func setManager (pendingManagerPublicKey) = {
514-    let checkCaller = mustManager(i)
515-    if ((checkCaller == checkCaller))
482+    let c = mm(i)
483+    if ((c == c))
516484         then {
517-            let checkManagerPublicKey = fromBase58String(pendingManagerPublicKey)
518-            if ((checkManagerPublicKey == checkManagerPublicKey))
519-                then [StringEntry(keyPendingManagerPublicKey(), pendingManagerPublicKey)]
485+            let cm = fromBase58String(pendingManagerPublicKey)
486+            if ((cm == cm))
487+                then [StringEntry(pmpk(), pendingManagerPublicKey)]
520488                 else throw("Strict value is not equal to itself.")
521489             }
522490         else throw("Strict value is not equal to itself.")
526494 
527495 @Callable(i)
528496 func confirmManager () = {
529-    let pm = pendingManagerPublicKeyOrUnit()
530-    let hasPM = if (isDefined(pm))
497+    let p = pm()
498+    let hpm = if (isDefined(p))
531499         then true
532-        else throwErr("No pending manager")
533-    if ((hasPM == hasPM))
500+        else throw("No pending manager")
501+    if ((hpm == hpm))
534502         then {
535-            let checkPM = if ((i.callerPublicKey == value(pm)))
503+            let cpm = if ((i.callerPublicKey == value(p)))
536504                 then true
537-                else throwErr("You are not pending manager")
538-            if ((checkPM == checkPM))
539-                then [StringEntry(keyManagerPublicKey(), toBase58String(value(pm))), DeleteEntry(keyPendingManagerPublicKey())]
505+                else throw("You are not pending manager")
506+            if ((cpm == cpm))
507+                then [StringEntry(mpk(), toBase58String(value(p))), DeleteEntry(pmpk())]
540508                 else throw("Strict value is not equal to itself.")
541509             }
542510         else throw("Strict value is not equal to itself.")
545513 
546514 
547515 @Callable(i)
548-func put (slippage,autoStake) = {
549-    let factCfg = getFactoryConfig()
550-    let stakingContract = valueOrErrorMessage(addressFromString(factCfg[idxFactStakCntr]), "Wrong staking contract")
551-    let slippageContract = valueOrErrorMessage(addressFromString(factCfg[idxFactSlippCntr]), "Wrogn slippage contract")
552-    let slippageCheck = if ((slippage >= 0))
553-        then true
554-        else throwErr("wrong slippage")
555-    if ((slippageCheck == slippageCheck))
556-        then {
557-            let paymentsCheck = if ((size(i.payments) == 2))
558-                then true
559-                else throwErr("2 payments expected")
560-            if ((paymentsCheck == paymentsCheck))
561-                then {
562-                    let estimatePut = commonPut(toString(i.caller), toBase58String(i.transactionId), AttachedPayment(value(i.payments[0]).assetId, value(i.payments[0]).amount), i.payments[1], slippage, true, false, 0, "")
563-                    let emitLpAmount = estimatePut._2
564-                    let lpAssetId = estimatePut._7
565-                    let state = estimatePut._9
566-                    let amountDiff = estimatePut._10
567-                    let priceDiff = estimatePut._11
568-                    let amountId = estimatePut._12
569-                    let priceId = estimatePut._13
570-                    let r = invoke(factoryContract, "emit", [emitLpAmount], nil)
571-                    if ((r == r))
572-                        then {
573-                            let el =                             match r {
574-                                case legacy: Address => 
575-                                    invoke(legacy, "emit", [emitLpAmount], nil)
576-                                case _ => 
577-                                    unit
578-                            }
579-                            if ((el == el))
516+func put (slip,autoStake) = {
517+    let factCfg = gfc()
518+    let stakingCntr = valueOrErrorMessage(addressFromString(factCfg[idxFactStakCntr]), "Wr st addr")
519+    let slipCntr = valueOrErrorMessage(addressFromString(factCfg[idxFactSlippCntr]), "Wr sl addr")
520+    if ((0 > slip))
521+        then throw("Wrong slippage")
522+        else if ((size(i.payments) != 2))
523+            then throw("2 pmnts expd")
524+            else {
525+                let e = cp(toString(i.caller), toBase58String(i.transactionId), AttachedPayment(value(i.payments[0]).assetId, value(i.payments[0]).amount), i.payments[1], slip, true, false, 0, "")
526+                let emitLpAmt = e._2
527+                let lpAssetId = e._7
528+                let state = e._9
529+                let amDiff = e._10
530+                let prDiff = e._11
531+                let amId = e._12
532+                let prId = e._13
533+                let r = invoke(fca, "emit", [emitLpAmt], nil)
534+                if ((r == r))
535+                    then {
536+                        let el =                         match r {
537+                            case legacy: Address => 
538+                                invoke(legacy, "emit", [emitLpAmt], nil)
539+                            case _ => 
540+                                unit
541+                        }
542+                        if ((el == el))
543+                            then {
544+                                let sa = if ((amDiff > 0))
545+                                    then invoke(slipCntr, "put", nil, [AttachedPayment(amId, amDiff)])
546+                                    else nil
547+                                if ((sa == sa))
548+                                    then {
549+                                        let sp = if ((prDiff > 0))
550+                                            then invoke(slipCntr, "put", nil, [AttachedPayment(prId, prDiff)])
551+                                            else nil
552+                                        if ((sp == sp))
553+                                            then {
554+                                                let lpTrnsfr = if (autoStake)
555+                                                    then {
556+                                                        let ss = invoke(stakingCntr, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmt)])
557+                                                        if ((ss == ss))
558+                                                            then nil
559+                                                            else throw("Strict value is not equal to itself.")
560+                                                        }
561+                                                    else [ScriptTransfer(i.caller, emitLpAmt, lpAssetId)]
562+                                                (state ++ lpTrnsfr)
563+                                                }
564+                                            else throw("Strict value is not equal to itself.")
565+                                        }
566+                                    else throw("Strict value is not equal to itself.")
567+                                }
568+                            else throw("Strict value is not equal to itself.")
569+                        }
570+                    else throw("Strict value is not equal to itself.")
571+                }
572+    }
573+
574+
575+
576+@Callable(i)
577+func putOneTkn (amAssetPart,prAssetPart,outLp,slippage,autoStake) = {
578+    let cfg = gfc()
579+    let stakingCntr = valueOrErrorMessage(addressFromString(cfg[idxFactStakCntr]), "Wr st addr")
580+    let slipCntr = valueOrErrorMessage(addressFromString(cfg[idxFactSlippCntr]), "Wr sl addr")
581+    let gwxCntr = valueOrErrorMessage(addressFromString(cfg[idxFactGwxRewCntr]), "Wr gwx addr")
582+    let poolCfg = gpc()
583+    let amId = poolCfg[idxAmAsId]
584+    let prId = poolCfg[idxPrAsId]
585+    let amDcm = parseIntValue(poolCfg[idxAmtAsDcm])
586+    let prDcm = parseIntValue(poolCfg[idxPriceAsDcm])
587+    let addon = valueOrElse(getString(this, ada()), "")
588+    let userAddress = if ((addon == toString(i.caller)))
589+        then i.originCaller
590+        else i.caller
591+    let addonContract = valueOrErrorMessage(addressFromString(valueOrErrorMessage(getString(ada()), "no addons")), "addon address in not valid")
592+    let check = reentrantInvoke(addonContract, "ensureCanPutOneTkn", [toString(userAddress)], nil)
593+    if ((check == check))
594+        then if (if (if (if ((0 >= slippage))
595+            then true
596+            else (0 >= amAssetPart))
597+            then true
598+            else (0 >= prAssetPart))
599+            then true
600+            else (0 >= outLp))
601+            then throw("Wrong params")
602+            else if ((size(i.payments) != 1))
603+                then throw("1 pmnt expd")
604+                else {
605+                    let pmt = value(i.payments[0])
606+                    let pmtAssetId = toBase58String(value(pmt.assetId))
607+                    let pmtAmt = pmt.amount
608+                    if ((10000000 > pmtAmt))
609+                        then throw("Wrong pmt amt")
610+                        else {
611+                            let amBalance = getAccBalance(amId)
612+                            let prBalance = getAccBalance(prId)
613+                            let $t02485925435 = if ((pmtAssetId == amId))
614+                                then if (if ((pmtAmt > amBalance))
615+                                    then true
616+                                    else (amAssetPart > pmtAmt))
617+                                    then throw("invalid payment amount")
618+                                    else $Tuple6((amBalance - pmtAmt), prBalance, (pmtAmt - amAssetPart), prAssetPart, 0, 0)
619+                                else if ((pmtAssetId == prId))
620+                                    then if (if ((pmtAmt > prBalance))
621+                                        then true
622+                                        else (prAssetPart > pmtAmt))
623+                                        then throw("invalid payment amount")
624+                                        else $Tuple6(amBalance, (prBalance - pmtAmt), 0, 0, (pmtAmt - prAssetPart), amAssetPart)
625+                                    else throw("wrong pmtAssetId")
626+                            let amBalanceNow = $t02485925435._1
627+                            let prBalanceNow = $t02485925435._2
628+                            let virtSwapInAm = $t02485925435._3
629+                            let virtSwapOutPr = $t02485925435._4
630+                            let virtSwapInPr = $t02485925435._5
631+                            let virtSwapOutAm = $t02485925435._6
632+                            let D0 = invoke(gwxCntr, "calcD", [toString(amBalanceNow), toString(prBalanceNow), A, Amult, Dconv], nil)
633+                            let D1 = invoke(gwxCntr, "calcD", [toString(toBigInt(((amBalanceNow + virtSwapInAm) - virtSwapOutAm))), toString(toBigInt(((prBalanceNow + virtSwapInPr) - virtSwapOutPr))), A, Amult, Dconv], nil)
634+                            let D0vsD1 = vd(parseBigIntValue(str(D1)), parseBigIntValue(str(D0)), slippage4D)
635+                            if ((D0vsD1 == D0vsD1))
580636                                 then {
581-                                    let sa = if ((amountDiff > 0))
582-                                        then invoke(slippageContract, "put", nil, [AttachedPayment(amountId, amountDiff)])
583-                                        else nil
584-                                    if ((sa == sa))
637+                                    let estPut = cp(toString(i.caller), toBase58String(i.transactionId), AttachedPayment(fromBase58String(amId), amAssetPart), AttachedPayment(fromBase58String(prId), prAssetPart), slippage, true, true, pmtAmt, pmtAssetId)
638+                                    let estimLP = estPut._2
639+                                    let lpAssetId = estPut._7
640+                                    let state = estPut._9
641+                                    let amDiff = estPut._10
642+                                    let prDiff = estPut._11
643+                                    let lpCalcRes = vad(toBigInt(estimLP), toBigInt(outLp), toBigInt(slippage))
644+                                    let emitLpAmt = toInt(lpCalcRes._2)
645+                                    let e = invoke(fca, "emit", [emitLpAmt], nil)
646+                                    if ((e == e))
585647                                         then {
586-                                            let sp = if ((priceDiff > 0))
587-                                                then invoke(slippageContract, "put", nil, [AttachedPayment(priceId, priceDiff)])
588-                                                else nil
589-                                            if ((sp == sp))
648+                                            let el =                                             match e {
649+                                                case legacy: Address => 
650+                                                    invoke(legacy, "emit", [emitLpAmt], nil)
651+                                                case _ => 
652+                                                    unit
653+                                            }
654+                                            if ((el == el))
590655                                                 then {
591-                                                    let lpTrasfer = if (autoStake)
656+                                                    let sa = if ((amDiff > 0))
657+                                                        then invoke(slipCntr, "put", nil, [AttachedPayment(fromBase58String(amId), amDiff)])
658+                                                        else nil
659+                                                    if ((sa == sa))
592660                                                         then {
593-                                                            let ss = invoke(stakingContract, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmount)])
594-                                                            if ((ss == ss))
595-                                                                then nil
661+                                                            let sp = if ((prDiff > 0))
662+                                                                then invoke(slipCntr, "put", nil, [AttachedPayment(fromBase58String(prId), prDiff)])
663+                                                                else nil
664+                                                            if ((sp == sp))
665+                                                                then {
666+                                                                    let lpTrnsfr = if (autoStake)
667+                                                                        then {
668+                                                                            let ss = invoke(stakingCntr, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmt)])
669+                                                                            if ((ss == ss))
670+                                                                                then nil
671+                                                                                else throw("Strict value is not equal to itself.")
672+                                                                            }
673+                                                                        else [ScriptTransfer(i.caller, emitLpAmt, lpAssetId)]
674+                                                                    (state ++ lpTrnsfr)
675+                                                                    }
596676                                                                 else throw("Strict value is not equal to itself.")
597677                                                             }
598-                                                        else [ScriptTransfer(i.caller, emitLpAmount, lpAssetId)]
599-                                                    (state ++ lpTrasfer)
678+                                                        else throw("Strict value is not equal to itself.")
600679                                                     }
601680                                                 else throw("Strict value is not equal to itself.")
602681                                             }
604683                                     }
605684                                 else throw("Strict value is not equal to itself.")
606685                             }
607-                        else throw("Strict value is not equal to itself.")
608686                     }
609-                else throw("Strict value is not equal to itself.")
610-            }
611687         else throw("Strict value is not equal to itself.")
612688     }
613689 
614690 
615691 
616692 @Callable(i)
617-func putOneTkn (amountAssetPart,priceAssetPart,outLp,slippage,autoStake) = {
618-    let cfg = getFactoryConfig()
619-    let stakingContract = valueOrErrorMessage(addressFromString(cfg[idxFactStakCntr]), "Wrong staking contract")
620-    let slippageContract = valueOrErrorMessage(addressFromString(cfg[idxFactSlippCntr]), "Wrong slippage contract")
621-    let gwxRewardContract = valueOrErrorMessage(addressFromString(cfg[idxFactGwxRewCntr]), "Wrong gwx reward contract")
622-    let poolCfg = getPoolConfig()
623-    let amountId = poolCfg[idxAmAsId]
624-    let priceId = poolCfg[idxPrAsId]
625-    let amountDecimals = parseIntValue(poolCfg[idxAmtAsDcm])
626-    let priceDecimals = parseIntValue(poolCfg[idxPriceAsDcm])
627-    let addon = valueOrElse(getString(this, keyAddonAddress()), "")
628-    let userAddress = if ((addon == toString(i.caller)))
629-        then i.originCaller
630-        else i.caller
631-    if (if (if (if ((0 >= slippage))
632-        then true
633-        else (0 >= amountAssetPart))
634-        then true
635-        else (0 >= priceAssetPart))
636-        then true
637-        else (0 >= outLp))
638-        then throwErr("Wrong params")
639-        else if ((size(i.payments) != 1))
640-            then throwErr("1 payment expected")
641-            else {
642-                let payment = value(i.payments[0])
643-                let paymentAssetId = toBase58String(value(payment.assetId))
644-                let paymentAmountRaw = payment.amount
645-                let $t02656926628 = takeFee(paymentAmountRaw)
646-                let paymentAmount = $t02656926628._1
647-                let feeAmount = $t02656926628._2
648-                if (if (if ((amountAssetPart > paymentAmount))
649-                    then true
650-                    else (priceAssetPart > paymentAmount))
651-                    then true
652-                    else (10000000 > paymentAmount))
653-                    then throwErr("wrong payment amount")
654-                    else {
655-                        let amountBalance = getAccBalance(amountId)
656-                        let priceBalance = getAccBalance(priceId)
657-                        let $t02689327348 = if ((paymentAssetId == amountId))
658-                            then $Tuple6((amountBalance - paymentAmount), priceBalance, (paymentAmount - amountAssetPart), priceAssetPart, 0, 0)
659-                            else if ((paymentAssetId == priceId))
660-                                then $Tuple6(amountBalance, (priceBalance - paymentAmount), 0, 0, (paymentAmount - priceAssetPart), amountAssetPart)
661-                                else throwErr("wrong paymentAssetId")
662-                        let amountBalanceNow = $t02689327348._1
663-                        let priceBalanceNow = $t02689327348._2
664-                        let virtSwapInAm = $t02689327348._3
665-                        let virtSwapOutPr = $t02689327348._4
666-                        let virtSwapInPr = $t02689327348._5
667-                        let virtSwapOutAm = $t02689327348._6
668-                        let D0 = invoke(gwxRewardContract, "calcD", [toString(amountBalanceNow), toString(priceBalanceNow), amplificator, Amult, Dconv], nil)
669-                        let D1 = invoke(gwxRewardContract, "calcD", [toString(toBigInt(((amountBalanceNow + virtSwapInAm) - virtSwapOutAm))), toString(toBigInt(((priceBalanceNow + virtSwapInPr) - virtSwapOutPr))), amplificator, Amult, Dconv], nil)
670-                        let D0vsD1 = validateD(parseBigIntValue(str(D1)), parseBigIntValue(str(D0)), slippage4D)
671-                        if ((D0vsD1 == D0vsD1))
672-                            then {
673-                                let estimatePut = commonPut(toString(i.caller), toBase58String(i.transactionId), AttachedPayment(fromBase58String(amountId), amountAssetPart), AttachedPayment(fromBase58String(priceId), priceAssetPart), slippage, true, true, paymentAmount, paymentAssetId)
674-                                let estimateLP = estimatePut._2
675-                                let lpAssetId = estimatePut._7
676-                                let state = estimatePut._9
677-                                let amountDiff = estimatePut._10
678-                                let priceDiff = estimatePut._11
679-                                let lpCalcRes = validateAbsDiff(toBigInt(estimateLP), toBigInt(outLp), toBigInt(slippage))
680-                                let emitLpAmount = toInt(lpCalcRes._2)
681-                                let e = invoke(factoryContract, "emit", [emitLpAmount], nil)
682-                                if ((e == e))
683-                                    then {
684-                                        let el =                                         match e {
685-                                            case legacy: Address => 
686-                                                invoke(legacy, "emit", [emitLpAmount], nil)
687-                                            case _ => 
688-                                                unit
689-                                        }
690-                                        if ((el == el))
691-                                            then {
692-                                                let sa = if ((amountDiff > 0))
693-                                                    then invoke(slippageContract, "put", nil, [AttachedPayment(fromBase58String(amountId), amountDiff)])
694-                                                    else nil
695-                                                if ((sa == sa))
696-                                                    then {
697-                                                        let sp = if ((priceDiff > 0))
698-                                                            then invoke(slippageContract, "put", nil, [AttachedPayment(fromBase58String(priceId), priceDiff)])
699-                                                            else nil
700-                                                        if ((sp == sp))
701-                                                            then {
702-                                                                let lpTrasfer = if (autoStake)
703-                                                                    then {
704-                                                                        let ss = invoke(stakingContract, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmount)])
705-                                                                        if ((ss == ss))
706-                                                                            then nil
707-                                                                            else throw("Strict value is not equal to itself.")
708-                                                                        }
709-                                                                    else [ScriptTransfer(i.caller, emitLpAmount, lpAssetId)]
710-                                                                let sendFeeToMatcher = if ((feeAmount > 0))
711-                                                                    then [ScriptTransfer(matcherAddress, feeAmount, fromBase58String(paymentAssetId))]
712-                                                                    else nil
713-                                                                ((state ++ lpTrasfer) ++ sendFeeToMatcher)
714-                                                                }
715-                                                            else throw("Strict value is not equal to itself.")
716-                                                        }
717-                                                    else throw("Strict value is not equal to itself.")
718-                                                }
719-                                            else throw("Strict value is not equal to itself.")
720-                                        }
721-                                    else throw("Strict value is not equal to itself.")
722-                                }
723-                            else throw("Strict value is not equal to itself.")
724-                        }
725-                }
726-    }
727-
728-
729-
730-@Callable(i)
731-func putForFree (maxslippage) = if ((0 > maxslippage))
732-    then throwErr("wrong slippage")
693+func putForFree (maxSlpg) = if ((0 > maxSlpg))
694+    then throw("Wrong slpg")
733695     else if ((size(i.payments) != 2))
734-        then throwErr("2 payments expected")
696+        then throw("2 pmnts expd")
735697         else {
736-            let estimatePut = commonPut(toString(i.caller), toBase58String(i.transactionId), AttachedPayment(value(i.payments[0]).assetId, value(i.payments[0]).amount), i.payments[1], maxslippage, false, false, 0, "")
737-            estimatePut._9
698+            let estPut = cp(toString(i.caller), toBase58String(i.transactionId), AttachedPayment(value(i.payments[0]).assetId, value(i.payments[0]).amount), i.payments[1], maxSlpg, false, false, 0, "")
699+            estPut._9
738700             }
739701 
740702 
741703 
742704 @Callable(i)
743705 func get () = {
744-    let r = commonGet(i)
706+    let r = cg(i)
745707     let outAmtAmt = r._1
746-    let outPriceAmount = r._2
747-    let paymentAmount = r._3
748-    let paymentAssetId = r._4
708+    let outPrAmt = r._2
709+    let pmtAmt = r._3
710+    let pmtAssetId = r._4
749711     let state = r._5
750-    let b = invoke(factoryContract, "burn", [paymentAmount], [AttachedPayment(paymentAssetId, paymentAmount)])
712+    let b = invoke(fca, "burn", [pmtAmt], [AttachedPayment(pmtAssetId, pmtAmt)])
751713     if ((b == b))
752714         then state
753715         else throw("Strict value is not equal to itself.")
757719 
758720 @Callable(i)
759721 func getOneTkn (exchResult,notUsed,outAmount,outAssetId,slippage) = if ((size(i.payments) != 1))
760-    then throwErr("1 payment expected")
722+    then throw("1 pmnt expd")
761723     else {
762-        let cfg = getPoolConfig()
763-        let lpAssetId = cfg[idxLPAsId]
764-        let amountId = cfg[idxAmAsId]
765-        let priceId = cfg[idxPrAsId]
766-        let amountDecimals = parseIntValue(cfg[idxAmtAsDcm])
767-        let priceDecimals = parseIntValue(cfg[idxPriceAsDcm])
724+        let cfg = gpc()
725+        let lpId = cfg[idxLPAsId]
726+        let amId = cfg[idxAmAsId]
727+        let prId = cfg[idxPrAsId]
728+        let amDcm = parseIntValue(cfg[idxAmtAsDcm])
729+        let prDcm = parseIntValue(cfg[idxPriceAsDcm])
768730         let sts = cfg[idxPoolSt]
769-        let factCfg = getFactoryConfig()
770-        let gwxRewardContract = valueOrErrorMessage(addressFromString(factCfg[idxFactGwxRewCntr]), "Wrong gwxRewardContract address")
771-        let payment = value(i.payments[0])
772-        let addon = valueOrElse(getString(this, keyAddonAddress()), "")
731+        let factCfg = gfc()
732+        let gwxCntr = valueOrErrorMessage(addressFromString(factCfg[idxFactGwxRewCntr]), "Wr sl addr")
733+        let pmt = value(i.payments[0])
734+        let addon = valueOrElse(getString(this, ada()), "")
773735         let userAddress = if ((addon == toString(i.caller)))
774736             then i.originCaller
775737             else i.caller
776738         let txId58 = toBase58String(i.transactionId)
777-        let paymentAssetId = value(payment.assetId)
778-        let paymentAmount = payment.amount
779-        if ((1000000000 > paymentAmount))
780-            then throwErr("Min payment 10 LP")
781-            else if (if (if ((0 > slippage))
782-                then true
783-                else (0 > exchResult))
784-                then true
785-                else (0 > outAmount))
786-                then throwErr("Wrong params")
787-                else if ((lpAssetId != toBase58String(paymentAssetId)))
788-                    then throwErr("Wrong LP")
789-                    else {
790-                        let r = estimateGetOperation(toBase58String(i.transactionId), toBase58String(paymentAssetId), paymentAmount, i.caller)
791-                        let estimAmAmt = r._1
792-                        let estimPrAmt = r._2
793-                        let amountBalance = getAccBalance(amountId)
794-                        let priceBalance = getAccBalance(priceId)
795-                        let $t03249632964 = if ((outAssetId == amountId))
796-                            then $Tuple7((amountBalance - estimAmAmt), (priceBalance - estimPrAmt), exchResult, estimPrAmt, 0, 0, (estimAmAmt + exchResult))
797-                            else if ((outAssetId == priceId))
798-                                then $Tuple7((amountBalance - estimAmAmt), (priceBalance - estimPrAmt), 0, 0, exchResult, estimAmAmt, (estimPrAmt + exchResult))
799-                                else throwErr("wrong outAssetId")
800-                        let amountBalanceNow = $t03249632964._1
801-                        let priceBalanceNow = $t03249632964._2
802-                        let virtSwapInAm = $t03249632964._3
803-                        let virtSwapOutPr = $t03249632964._4
804-                        let virtSwapInPr = $t03249632964._5
805-                        let virtSwapOutAm = $t03249632964._6
806-                        let totalGet = $t03249632964._7
807-                        if (if ((0 > virtSwapInAm))
808-                            then true
809-                            else (0 > virtSwapInPr))
810-                            then throwErr("Wrong calc")
811-                            else {
812-                                let D0 = invoke(gwxRewardContract, "calcD", [toString(amountBalanceNow), toString(priceBalanceNow), amplificator, Amult, Dconv], nil)
813-                                let D1 = invoke(gwxRewardContract, "calcD", [toString(((amountBalanceNow - virtSwapInAm) + virtSwapOutAm)), toString(((priceBalanceNow + virtSwapOutPr) - virtSwapInPr)), amplificator, Amult, Dconv], nil)
814-                                let D0vsD1 = validateD(parseBigIntValue(str(D1)), parseBigIntValue(str(D0)), slippage4D)
815-                                if ((D0vsD1 == D0vsD1))
816-                                    then {
817-                                        let finalRes = validateAbsDiff(toBigInt(totalGet), toBigInt(outAmount), toBigInt(slippage))
818-                                        if ((finalRes == finalRes))
819-                                            then {
820-                                                let $t03363333741 = if ((outAssetId == amountId))
821-                                                    then $Tuple2(toInt(finalRes._2), 0)
822-                                                    else $Tuple2(0, toInt(finalRes._2))
823-                                                let outAm = $t03363333741._1
824-                                                let outPr = $t03363333741._2
825-                                                let totalAmountRaw = (outAm + outPr)
826-                                                let $t03378133836 = takeFee(totalAmountRaw)
827-                                                let totalAmount = $t03378133836._1
828-                                                let feeAmount = $t03378133836._2
829-                                                let outAssetIdOrWaves = if ((outAssetId == "WAVES"))
830-                                                    then unit
831-                                                    else fromBase58String(outAssetId)
832-                                                let sendFeeToMatcher = if ((feeAmount > 0))
833-                                                    then [ScriptTransfer(matcherAddress, feeAmount, outAssetIdOrWaves)]
834-                                                    else nil
835-                                                let decimals = if ((amountDecimals >= priceDecimals))
836-                                                    then amountDecimals
837-                                                    else priceDecimals
838-                                                if ((decimals == decimals))
839-                                                    then {
840-                                                        let curPrX18 = calcPriceBigInt(toX18(priceBalance, decimals), toX18(amountBalance, decimals))
841-                                                        let curPr = fromX18(curPrX18, scale8)
842-                                                        let state = [ScriptTransfer(userAddress, totalAmount, outAssetIdOrWaves), StringEntry(keyGetActionByUser(toString(userAddress), txId58), dataGetActionInfo(outAm, outPr, paymentAmount, curPr, height, lastBlock.timestamp)), IntegerEntry(keyPriceLast(), curPr), IntegerEntry(keyPriceHistory(height, lastBlock.timestamp), curPr)]
843-                                                        if ((state == state))
844-                                                            then {
845-                                                                let burn = invoke(factoryContract, "burn", [paymentAmount], [AttachedPayment(paymentAssetId, paymentAmount)])
846-                                                                if ((burn == burn))
847-                                                                    then (state ++ sendFeeToMatcher)
848-                                                                    else throw("Strict value is not equal to itself.")
849-                                                                }
850-                                                            else throw("Strict value is not equal to itself.")
851-                                                        }
852-                                                    else throw("Strict value is not equal to itself.")
853-                                                }
854-                                            else throw("Strict value is not equal to itself.")
855-                                        }
856-                                    else throw("Strict value is not equal to itself.")
857-                                }
858-                        }
739+        let pmtAssetId = value(pmt.assetId)
740+        let pmtAmt = pmt.amount
741+        let addonContract = valueOrErrorMessage(addressFromString(valueOrErrorMessage(getString(ada()), "no addons")), "addon address in not valid")
742+        let check = reentrantInvoke(addonContract, "ensureCanGetOneTkn", [toString(userAddress)], nil)
743+        if ((check == check))
744+            then if ((1000000000 > pmtAmt))
745+                then throw("Min pmt 10 LP")
746+                else if (if (if ((0 > slippage))
747+                    then true
748+                    else (0 > exchResult))
749+                    then true
750+                    else (0 > outAmount))
751+                    then throw("Wrong params")
752+                    else if ((lpId != toBase58String(pmtAssetId)))
753+                        then throw("Wrong LP")
754+                        else {
755+                            let r = ego(toBase58String(i.transactionId), toBase58String(pmtAssetId), pmtAmt, i.caller)
756+                            let estimAmAmt = r._1
757+                            let estimPrAmt = r._2
758+                            let amBalance = getAccBalance(amId)
759+                            let prBalance = getAccBalance(prId)
760+                            let $t03046630923 = if ((outAssetId == amId))
761+                                then $Tuple7((amBalance - estimAmAmt), (prBalance - estimPrAmt), exchResult, estimPrAmt, 0, 0, (estimAmAmt + exchResult))
762+                                else if ((outAssetId == prId))
763+                                    then $Tuple7((amBalance - estimAmAmt), (prBalance - estimPrAmt), 0, 0, exchResult, estimAmAmt, (estimPrAmt + exchResult))
764+                                    else throw("wrong outAssetId")
765+                            let amBalanceNow = $t03046630923._1
766+                            let prBalanceNow = $t03046630923._2
767+                            let virtSwapInAm = $t03046630923._3
768+                            let virtSwapOutPr = $t03046630923._4
769+                            let virtSwapInPr = $t03046630923._5
770+                            let virtSwapOutAm = $t03046630923._6
771+                            let totalGet = $t03046630923._7
772+                            if (if ((0 > virtSwapInAm))
773+                                then true
774+                                else (0 > virtSwapInPr))
775+                                then throw("Wrong calc")
776+                                else {
777+                                    let D0 = invoke(gwxCntr, "calcD", [toString(amBalanceNow), toString(prBalanceNow), A, Amult, Dconv], nil)
778+                                    let D1 = invoke(gwxCntr, "calcD", [toString(((amBalanceNow - virtSwapInAm) + virtSwapOutAm)), toString(((prBalanceNow + virtSwapOutPr) - virtSwapInPr)), A, Amult, Dconv], nil)
779+                                    let D0vsD1 = vd(parseBigIntValue(str(D1)), parseBigIntValue(str(D0)), slippage4D)
780+                                    if ((D0vsD1 == D0vsD1))
781+                                        then {
782+                                            let finalRes = vad(toBigInt(totalGet), toBigInt(outAmount), toBigInt(slippage))
783+                                            if ((finalRes == finalRes))
784+                                                then {
785+                                                    let $t03162831732 = if ((outAssetId == amId))
786+                                                        then $Tuple2(toInt(finalRes._2), 0)
787+                                                        else $Tuple2(0, toInt(finalRes._2))
788+                                                    let outAm = $t03162831732._1
789+                                                    let outPr = $t03162831732._2
790+                                                    let curPrX18 = cpbi(t1(prBalance, prDcm), t1(amBalance, amDcm))
791+                                                    let curPr = f1(curPrX18, scale8)
792+                                                    let state = [ScriptTransfer(userAddress, (outAm + outPr), if ((outAssetId == "WAVES"))
793+                                                        then unit
794+                                                        else fromBase58String(outAssetId)), StringEntry(gau(toString(userAddress), txId58), dataGetActionInfo(outAm, outPr, pmtAmt, curPr, height, lastBlock.timestamp)), IntegerEntry(pl(), curPr), IntegerEntry(ph(height, lastBlock.timestamp), curPr)]
795+                                                    if ((state == state))
796+                                                        then {
797+                                                            let burn = invoke(fca, "burn", [pmtAmt], [AttachedPayment(pmtAssetId, pmtAmt)])
798+                                                            if ((burn == burn))
799+                                                                then state
800+                                                                else throw("Strict value is not equal to itself.")
801+                                                            }
802+                                                        else throw("Strict value is not equal to itself.")
803+                                                    }
804+                                                else throw("Strict value is not equal to itself.")
805+                                            }
806+                                        else throw("Strict value is not equal to itself.")
807+                                    }
808+                            }
809+            else throw("Strict value is not equal to itself.")
859810         }
860811 
861812 
862813 
863814 @Callable(i)
864815 func getNoLess (noLessThenAmtAsset,noLessThenPriceAsset) = {
865-    let r = commonGet(i)
866-    let outAmountAmount = r._1
867-    let outPriceAmount = r._2
868-    let paymentAmount = r._3
869-    let paymentAssetId = r._4
816+    let r = cg(i)
817+    let outAmAmt = r._1
818+    let outPrAmt = r._2
819+    let pmtAmt = r._3
820+    let pmtAssetId = r._4
870821     let state = r._5
871-    let checkOutAmountAmount = if ((outAmountAmount >= noLessThenAmtAsset))
872-        then true
873-        else throwErr(((("Failed:  " + toString(outAmountAmount)) + " < ") + toString(noLessThenAmtAsset)))
874-    if ((checkOutAmountAmount == checkOutAmountAmount))
875-        then {
876-            let checkOutPriceAmount = if ((outPriceAmount >= noLessThenPriceAsset))
877-                then true
878-                else throwErr(((("Failed: " + toString(outPriceAmount)) + " < ") + toString(noLessThenPriceAsset)))
879-            if ((checkOutPriceAmount == checkOutPriceAmount))
880-                then {
881-                    let burnLPAssetOnFactory = invoke(factoryContract, "burn", [paymentAmount], [AttachedPayment(paymentAssetId, paymentAmount)])
882-                    if ((burnLPAssetOnFactory == burnLPAssetOnFactory))
883-                        then state
884-                        else throw("Strict value is not equal to itself.")
885-                    }
886-                else throw("Strict value is not equal to itself.")
887-            }
888-        else throw("Strict value is not equal to itself.")
822+    if ((noLessThenAmtAsset > outAmAmt))
823+        then throw(((("Failed:  " + toString(outAmAmt)) + " < ") + toString(noLessThenAmtAsset)))
824+        else if ((noLessThenPriceAsset > outPrAmt))
825+            then throw(((("Failed: " + toString(outPrAmt)) + " < ") + toString(noLessThenPriceAsset)))
826+            else {
827+                let burnLPAssetOnFactory = invoke(fca, "burn", [pmtAmt], [AttachedPayment(pmtAssetId, pmtAmt)])
828+                if ((burnLPAssetOnFactory == burnLPAssetOnFactory))
829+                    then state
830+                    else throw("Strict value is not equal to itself.")
831+                }
889832     }
890833 
891834 
893836 @Callable(i)
894837 func unstakeAndGet (amount) = {
895838     let checkPayments = if ((size(i.payments) != 0))
896-        then throwErr("no payments expected")
839+        then throw("No pmnts expd")
897840         else true
898841     if ((checkPayments == checkPayments))
899842         then {
900-            let cfg = getPoolConfig()
901-            let factoryCfg = getFactoryConfig()
843+            let cfg = gpc()
844+            let factoryCfg = gfc()
902845             let lpAssetId = fromBase58String(cfg[idxLPAsId])
903-            let staking = valueOrErrorMessage(addressFromString(factoryCfg[idxFactStakCntr]), "wrong")
846+            let staking = valueOrErrorMessage(addressFromString(factoryCfg[idxFactStakCntr]), "Wr st addr")
904847             let unstakeInv = invoke(staking, "unstake", [toBase58String(lpAssetId), amount], nil)
905848             if ((unstakeInv == unstakeInv))
906849                 then {
907-                    let r = estimateGetOperation(toBase58String(i.transactionId), toBase58String(lpAssetId), amount, i.caller)
850+                    let r = ego(toBase58String(i.transactionId), toBase58String(lpAssetId), amount, i.caller)
908851                     let sts = parseIntValue(r._9)
909852                     let state = r._10
910-                    let v = if (if (isGlobalShutdown())
853+                    let v = if (if (igs())
911854                         then true
912855                         else (sts == PoolShutdown))
913-                        then throwErr(("Blocked: " + toString(sts)))
856+                        then throw(("Blocked: " + toString(sts)))
914857                         else true
915858                     if ((v == v))
916859                         then {
917-                            let burnA = invoke(factoryContract, "burn", [amount], [AttachedPayment(lpAssetId, amount)])
860+                            let burnA = invoke(fca, "burn", [amount], [AttachedPayment(lpAssetId, amount)])
918861                             if ((burnA == burnA))
919862                                 then state
920863                                 else throw("Strict value is not equal to itself.")
929872 
930873 
931874 @Callable(i)
932-func activate (amtAsStr,prAsStr) = if ((toString(i.caller) != toString(factoryContract)))
933-    then throwErr("denied")
934-    else $Tuple2([StringEntry(keyAmountAsset(), amtAsStr), StringEntry(keyPriceAsset(), prAsStr)], "success")
875+func activate (amtAsStr,prAsStr) = if ((toString(i.caller) != toString(fca)))
876+    then throw("denied")
877+    else $Tuple2([StringEntry(aa(), amtAsStr), StringEntry(pa(), prAsStr)], "success")
935878 
936879 
937880 
938881 @Callable(i)
939-func setS (k,v) = if ((toString(i.caller) != getStringOrFail(this, keyAddonAddress())))
882+func setS (k,v) = if ((toString(i.caller) != strf(this, ada())))
940883     then pd
941884     else [StringEntry(k, v)]
942885 
943886 
944887 
945888 @Callable(i)
946-func setI (k,v) = if ((toString(i.caller) != getStringOrFail(this, keyAddonAddress())))
889+func setI (k,v) = if ((toString(i.caller) != strf(this, ada())))
947890     then pd
948891     else [IntegerEntry(k, v)]
949892 
950893 
951894 
952895 @Callable(i)
953-func getPoolConfigWrapperREADONLY () = $Tuple2(nil, getPoolConfig())
896+func getPoolConfigWrapperREADONLY () = $Tuple2(nil, gpc())
954897 
955898 
956899 
968911 
969912 
970913 @Callable(i)
971-func fromX18WrapperREADONLY (val,resScaleMult) = $Tuple2(nil, fromX18(parseBigIntValue(val), resScaleMult))
914+func fromX18WrapperREADONLY (val,resScaleMult) = $Tuple2(nil, f1(parseBigIntValue(val), resScaleMult))
972915 
973916 
974917 
975918 @Callable(i)
976-func toX18WrapperREADONLY (origVal,origScaleMult) = $Tuple2(nil, toString(toX18(origVal, origScaleMult)))
919+func toX18WrapperREADONLY (origVal,origScaleMult) = $Tuple2(nil, toString(t1(origVal, origScaleMult)))
977920 
978921 
979922 
980923 @Callable(i)
981-func calcPriceBigIntWrapperREADONLY (prAmtX18,amAmtX18) = $Tuple2(nil, toString(calcPriceBigInt(parseBigIntValue(prAmtX18), parseBigIntValue(amAmtX18))))
924+func calcPriceBigIntWrapperREADONLY (prAmtX18,amAmtX18) = $Tuple2(nil, toString(cpbi(parseBigIntValue(prAmtX18), parseBigIntValue(amAmtX18))))
982925 
983926 
984927 
985928 @Callable(i)
986-func estimatePutOperationWrapperREADONLY (txId58,slippage,inAmountAssetAmount,inAmId,inPriceAssetAmount,inPrId,usrAddr,isEvaluate,emitLp) = $Tuple2(nil, estimatePutOperation(txId58, slippage, inAmountAssetAmount, inAmId, inPriceAssetAmount, inPrId, usrAddr, isEvaluate, emitLp, false, 0, ""))
929+func estimatePutOperationWrapperREADONLY (txId58,slippage,inAmAmt,inAmId,inPrAmt,inPrId,usrAddr,isEval,emitLp) = $Tuple2(nil, epo(txId58, slippage, inAmAmt, inAmId, inPrAmt, inPrId, usrAddr, isEval, emitLp, false, 0, ""))
987930 
988931 
989932 
990933 @Callable(i)
991-func estimateGetOperationWrapperREADONLY (txId58,paymentAsId,paymentLpAmount,usrAddr) = {
992-    let r = estimateGetOperation(txId58, paymentAsId, paymentLpAmount, addressFromStringValue(usrAddr))
934+func estimateGetOperationWrapperREADONLY (txId58,pmtAsId,pmtLpAmt,usrAddr) = {
935+    let r = ego(txId58, pmtAsId, pmtLpAmt, addressFromStringValue(usrAddr))
993936     $Tuple2(nil, $Tuple10(r._1, r._2, r._3, r._4, r._5, r._6, r._7, toString(r._8), r._9, r._10))
994937     }
995938 
996939 
997940 @Verifier(tx)
998-func verify () = match tx {
999-    case order: Order => 
1000-        let mtchPub = getMatcherPubOrFail()
1001-        let orV = validateMatcherOrderAllowed(order)
1002-        let sndrV = sigVerify(order.bodyBytes, order.proofs[0], order.senderPublicKey)
1003-        let mtchV = sigVerify(order.bodyBytes, order.proofs[1], mtchPub)
1004-        if (if (if (orV)
1005-            then sndrV
1006-            else false)
1007-            then mtchV
1008-            else false)
1009-            then true
1010-            else throwOrderError(orV, sndrV, mtchV)
1011-    case _ => 
1012-        let targetPublicKey =         match managerPublicKeyOrUnit() {
1013-            case pk: ByteVector => 
1014-                pk
1015-            case _: Unit => 
1016-                tx.senderPublicKey
1017-            case _ => 
1018-                throw("Match error")
1019-        }
1020-        sigVerify(tx.bodyBytes, tx.proofs[0], targetPublicKey)
1021-}
941+func verify () = {
942+    let targetPublicKey =     match m() {
943+        case pk: ByteVector => 
944+            pk
945+        case _: Unit => 
946+            tx.senderPublicKey
947+        case _ => 
948+            throw("Match error")
949+    }
950+    match tx {
951+        case order: Order => 
952+            let matcherPub = mp()
953+            let orderValid = moa(order)
954+            let senderValid = sigVerify(order.bodyBytes, order.proofs[0], order.senderPublicKey)
955+            let matcherValid = sigVerify(order.bodyBytes, order.proofs[1], matcherPub)
956+            if (if (if (orderValid)
957+                then senderValid
958+                else false)
959+                then matcherValid
960+                else false)
961+                then true
962+                else toe(orderValid, senderValid, matcherValid)
963+        case s: SetScriptTransaction => 
964+            let newHash = blake2b256(value(s.script))
965+            let allowedHash = fromBase64String(value(getString(fca, keyAllowedLpStableScriptHash())))
966+            let currentHash = scriptHash(this)
967+            if (if ((allowedHash == newHash))
968+                then (currentHash != newHash)
969+                else false)
970+                then true
971+                else sigVerify(tx.bodyBytes, tx.proofs[0], targetPublicKey)
972+        case _ => 
973+            sigVerify(tx.bodyBytes, tx.proofs[0], targetPublicKey)
974+    }
975+    }
1022976 

Full: 

OldNewDifferences
11 {-# STDLIB_VERSION 6 #-}
22 {-# SCRIPT_TYPE ACCOUNT #-}
33 {-# CONTENT_TYPE DAPP #-}
4-let defaultDecimals = 1000000
5-
64 let scale8 = 100000000
75 
86 let scale8BigInt = toBigInt(100000000)
97 
108 let scale18 = toBigInt(1000000000000000000)
11-
12-let thousand = 1000
139 
1410 let zeroBigInt = toBigInt(0)
1511 
1612 let oneBigInt = toBigInt(1)
1713 
1814 let slippage4D = toBigInt((scale8 - ((scale8 * 1) / scale8)))
1915 
2016 let Amult = "100"
2117 
2218 let Dconv = "1"
2319 
2420 let SEP = "__"
2521 
2622 let EMPTY = ""
2723 
2824 let PoolActive = 1
2925 
3026 let PoolPutDis = 2
3127 
3228 let PoolMatcherDis = 3
3329 
3430 let PoolShutdown = 4
3531 
3632 let idxPoolAddress = 1
3733 
3834 let idxPoolSt = 2
3935 
4036 let idxLPAsId = 3
4137 
4238 let idxAmAsId = 4
4339 
4440 let idxPrAsId = 5
4541 
4642 let idxAmtAsDcm = 6
4743 
4844 let idxPriceAsDcm = 7
4945 
5046 let idxIAmtAsId = 8
5147 
5248 let idxIPriceAsId = 9
5349 
5450 let idxFactStakCntr = 1
5551 
5652 let idxFactSlippCntr = 7
5753 
5854 let idxFactGwxRewCntr = 10
5955 
60-let feePermilleDefault = 0
56+let delay = "%s__delay"
6157 
62-func toX18 (origVal,origScaleMult) = fraction(toBigInt(origVal), scale18, toBigInt(origScaleMult))
58+func t1 (origVal,origScaleMult) = fraction(toBigInt(origVal), scale18, toBigInt(origScaleMult))
6359 
6460 
65-func fromX18 (val,resultScaleMult) = toInt(fraction(val, toBigInt(resultScaleMult), scale18))
61+func f1 (val,resultScaleMult) = toInt(fraction(val, toBigInt(resultScaleMult), scale18))
6662 
6763 
6864 func ts (amt,resScale,curScale) = fraction(amt, resScale, curScale)
6965 
7066 
7167 func abs (val) = if ((zeroBigInt > val))
7268     then -(val)
7369     else val
7470 
7571 
76-func keyFactoryContact () = "%s__factoryContract"
72+func fc () = "%s__factoryContract"
7773 
7874 
79-func keyManagerPublicKey () = "%s__managerPublicKey"
75+func mpk () = "%s__managerPublicKey"
8076 
8177 
82-func keyPendingManagerPublicKey () = "%s__pendingManagerPublicKey"
78+func pmpk () = "%s__pendingManagerPublicKey"
8379 
8480 
85-func keyPriceLast () = "%s%s__price__last"
81+func pl () = "%s%s__price__last"
8682 
8783 
88-func keyPriceHistory (h,t) = makeString(["%s%s%d%d__price__history", toString(h), toString(t)], SEP)
84+func ph (h,t) = makeString(["%s%s%d%d__price__history", toString(h), toString(t)], SEP)
8985 
9086 
91-func keyPutActionByUser (ua,txId) = ((("%s%s%s__P__" + ua) + "__") + txId)
87+func pau (ua,txId) = ((("%s%s%s__P__" + ua) + "__") + txId)
9288 
9389 
94-func keyGetActionByUser (ua,txId) = ((("%s%s%s__G__" + ua) + "__") + txId)
90+func gau (ua,txId) = ((("%s%s%s__G__" + ua) + "__") + txId)
9591 
9692 
97-func keyAmountAsset () = "%s__amountAsset"
93+func aa () = "%s__amountAsset"
9894 
9995 
100-func keyPriceAsset () = "%s__priceAsset"
96+func pa () = "%s__priceAsset"
10197 
10298 
103-func keyAmplificator () = "%s__amp"
99+func amp () = "%s__amp"
104100 
105101 
106-func keyAddonAddress () = "%s__addonAddr"
102+func ada () = "%s__addonAddr"
107103 
108104 
109-let keyFeePermille = "%s__feePermille"
110-
111-let feePermille = valueOrElse(getInteger(this, keyFeePermille), feePermilleDefault)
112-
113-func keyFactoryConfig () = "%s__factoryConfig"
105+func lgotc (caller) = makeString(["%s%s__lastGetOneTknCall", caller], SEP)
114106 
115107 
116-func keyMatcherPub () = "%s%s__matcher__publicKey"
108+func lsotc (caller) = makeString(["%s%s__lastPutOneTknCall", caller], SEP)
117109 
118110 
119-func keyPoolConfig (iAmtAs,iPrAs) = (((("%d%d%s__" + iAmtAs) + "__") + iPrAs) + "__config")
111+func fcfg () = "%s__factoryConfig"
120112 
121113 
122-func keyMappingsBaseAsset2internalId (bAStr) = ("%s%s%s__mappings__baseAsset2internalId__" + bAStr)
114+func mtpk () = "%s%s__matcher__publicKey"
123115 
124116 
125-func keyAllPoolsShutdown () = "%s__shutdown"
117+func pc (iAmtAs,iPrAs) = (((("%d%d%s__" + iAmtAs) + "__") + iPrAs) + "__config")
126118 
127119 
128-func throwErr (msg) = throw(makeString(["lp_stable.ride:", msg], " "))
120+func mba (bAStr) = ("%s%s%s__mappings__baseAsset2internalId__" + bAStr)
129121 
130122 
131-func throwOrderError (orV,sendrV,matchV) = throwErr(((((("Failed: ordValid=" + toString(orV)) + " sndrValid=") + toString(sendrV)) + " mtchrValid=") + toString(matchV)))
123+func aps () = "%s__shutdown"
124+
125+
126+func keyAllowedLpStableScriptHash () = "%s__allowedLpStableScriptHash"
127+
128+
129+func toe (orV,sendrV,matchV) = throw(((((("Failed: ordValid=" + toString(orV)) + " sndrValid=") + toString(sendrV)) + " mtchrValid=") + toString(matchV)))
132130 
133131 
134132 func str (val) = match val {
135133     case valStr: String => 
136134         valStr
137135     case _ => 
138-        throwErr("fail cast to String")
136+        throw("fail cast to String")
139137 }
140138 
141139 
142-func getStringOrFail (addr,key) = valueOrErrorMessage(getString(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
140+func strf (addr,key) = valueOrErrorMessage(getString(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
143141 
144142 
145-func getIntOrFail (addr,key) = valueOrErrorMessage(getInteger(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
143+func intf (addr,key) = valueOrErrorMessage(getInteger(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
146144 
147145 
148-let factoryContract = addressFromStringValue(getStringOrFail(this, keyFactoryContact()))
146+let fca = addressFromStringValue(strf(this, fc()))
149147 
150-let amplificator = getStringOrFail(this, keyAmplificator())
148+let A = strf(this, amp())
151149 
152-func isGlobalShutdown () = valueOrElse(getBoolean(factoryContract, keyAllPoolsShutdown()), false)
150+func igs () = valueOrElse(getBoolean(fca, aps()), false)
153151 
154152 
155-func getMatcherPubOrFail () = fromBase58String(getStringOrFail(factoryContract, keyMatcherPub()))
153+func mp () = fromBase58String(strf(fca, mtpk()))
156154 
157155 
158-let matcherAddress = addressFromPublicKey(getMatcherPubOrFail())
159-
160-func getPoolConfig () = {
161-    let amtAs = getStringOrFail(this, keyAmountAsset())
162-    let priceAs = getStringOrFail(this, keyPriceAsset())
163-    let iPriceAs = getIntOrFail(factoryContract, keyMappingsBaseAsset2internalId(priceAs))
164-    let iAmtAs = getIntOrFail(factoryContract, keyMappingsBaseAsset2internalId(amtAs))
165-    split(getStringOrFail(factoryContract, keyPoolConfig(toString(iAmtAs), toString(iPriceAs))), SEP)
156+func gpc () = {
157+    let amtAs = strf(this, aa())
158+    let priceAs = strf(this, pa())
159+    let iPriceAs = intf(fca, mba(priceAs))
160+    let iAmtAs = intf(fca, mba(amtAs))
161+    split(strf(fca, pc(toString(iAmtAs), toString(iPriceAs))), SEP)
166162     }
167163 
168164 
169-func getFactoryConfig () = split(getStringOrFail(factoryContract, keyFactoryConfig()), SEP)
165+func gfc () = split(strf(fca, fcfg()), SEP)
170166 
171167 
172168 func dataPutActionInfo (inAmtAssetAmt,inPriceAssetAmt,outLpAmt,price,slipByUser,slippageReal,txHeight,txTimestamp,slipageAmAmt,slipagePrAmt) = makeString(["%d%d%d%d%d%d%d%d%d%d", toString(inAmtAssetAmt), toString(inPriceAssetAmt), toString(outLpAmt), toString(price), toString(slipByUser), toString(slippageReal), toString(txHeight), toString(txTimestamp), toString(slipageAmAmt), toString(slipagePrAmt)], SEP)
173169 
174170 
175171 func dataGetActionInfo (outAmtAssetAmt,outPriceAssetAmt,inLpAmt,price,txHeight,txTimestamp) = makeString(["%d%d%d%d%d%d", toString(outAmtAssetAmt), toString(outPriceAssetAmt), toString(inLpAmt), toString(price), toString(txHeight), toString(txTimestamp)], SEP)
176172 
177173 
178174 func getAccBalance (assetId) = if ((assetId == "WAVES"))
179175     then wavesBalance(this).available
180176     else assetBalance(this, fromBase58String(assetId))
181177 
182178 
183-func calcPriceBigInt (prAmtX18,amAmtX18) = fraction(prAmtX18, scale18, amAmtX18)
179+func cpbi (prAmtX18,amAmtX18) = fraction(prAmtX18, scale18, amAmtX18)
184180 
185181 
186-func validateAbsDiff (estimateLP,outLp,slippage) = {
187-    let diff = fraction((estimateLP - outLp), scale8BigInt, outLp)
182+func vad (A1,A2,slippage) = {
183+    let diff = fraction((A1 - A2), scale8BigInt, A2)
188184     let pass = ((slippage - abs(diff)) > zeroBigInt)
189185     if (!(pass))
190-        then throwErr(("Big slippage: " + toString(diff)))
191-        else $Tuple2(pass, min([estimateLP, outLp]))
186+        then throw(("Big slpg: " + toString(diff)))
187+        else $Tuple2(pass, min([A1, A2]))
192188     }
193189 
194190 
195-func validateD (D1,D0,slippage) = {
191+func vd (D1,D0,slpg) = {
196192     let diff = fraction(D0, scale8BigInt, D1)
197-    let fail = (slippage > diff)
193+    let fail = (slpg > diff)
198194     if (if (fail)
199195         then true
200196         else (D0 > D1))
201-        then throwErr(((((((toString(D0) + " ") + toString(D1)) + " ") + toString(diff)) + " ") + toString(slippage)))
197+        then throw(((((((toString(D0) + " ") + toString(D1)) + " ") + toString(diff)) + " ") + toString(slpg)))
202198         else fail
203199     }
204200 
205201 
206-func privateCalcPrice (amAssetDcm,prAssetDcm,amAmt,prAmt) = {
207-    let amtAsAmtX18 = toX18(amAmt, amAssetDcm)
208-    let prAsAmtX18 = toX18(prAmt, prAssetDcm)
209-    calcPriceBigInt(prAsAmtX18, amtAsAmtX18)
202+func pcp (amAssetDcm,prAssetDcm,amAmt,prAmt) = {
203+    let amtAsAmtX18 = t1(amAmt, amAssetDcm)
204+    let prAsAmtX18 = t1(prAmt, prAssetDcm)
205+    cpbi(prAsAmtX18, amtAsAmtX18)
210206     }
211207 
212208 
213209 func calcPrices (amAmt,prAmt,lpAmt) = {
214-    let cfg = getPoolConfig()
210+    let cfg = gpc()
215211     let amtAsDcm = parseIntValue(cfg[idxAmtAsDcm])
216212     let prAsDcm = parseIntValue(cfg[idxPriceAsDcm])
217-    let priceX18 = privateCalcPrice(amtAsDcm, prAsDcm, amAmt, prAmt)
218-    let amAmtX18 = toX18(amAmt, amtAsDcm)
219-    let prAmtX18 = toX18(prAmt, prAsDcm)
220-    let lpAmtX18 = toX18(lpAmt, scale8)
221-    let lpPrInAmAsX18 = calcPriceBigInt(amAmtX18, lpAmtX18)
222-    let lpPrInPrAsX18 = calcPriceBigInt(prAmtX18, lpAmtX18)
213+    let priceX18 = pcp(amtAsDcm, prAsDcm, amAmt, prAmt)
214+    let amAmtX18 = t1(amAmt, amtAsDcm)
215+    let prAmtX18 = t1(prAmt, prAsDcm)
216+    let lpAmtX18 = t1(lpAmt, scale8)
217+    let lpPrInAmAsX18 = cpbi(amAmtX18, lpAmtX18)
218+    let lpPrInPrAsX18 = cpbi(prAmtX18, lpAmtX18)
223219 [priceX18, lpPrInAmAsX18, lpPrInPrAsX18]
224220     }
225221 
226222 
227223 func calculatePrices (amAmt,prAmt,lpAmt) = {
228224     let p = calcPrices(amAmt, prAmt, lpAmt)
229-[fromX18(p[0], scale8), fromX18(p[1], scale8), fromX18(p[2], scale8)]
225+[f1(p[0], scale8), f1(p[1], scale8), f1(p[2], scale8)]
230226     }
231227 
232228 
233-func estimateGetOperation (txId58,paymentAssetId,paymentLpAmount,userAddress) = {
234-    let cfg = getPoolConfig()
235-    let lpAssetId = cfg[idxLPAsId]
236-    let amountId = cfg[idxAmAsId]
237-    let priceId = cfg[idxPrAsId]
238-    let amountDecimals = parseIntValue(cfg[idxAmtAsDcm])
239-    let priceDecimals = parseIntValue(cfg[idxPriceAsDcm])
229+func ego (txId58,pmtAssetId,pmtLpAmt,userAddress) = {
230+    let cfg = gpc()
231+    let lpId = cfg[idxLPAsId]
232+    let amId = cfg[idxAmAsId]
233+    let prId = cfg[idxPrAsId]
234+    let amDcm = parseIntValue(cfg[idxAmtAsDcm])
235+    let prDcm = parseIntValue(cfg[idxPriceAsDcm])
240236     let sts = cfg[idxPoolSt]
241-    let lpEmission = valueOrErrorMessage(assetInfo(fromBase58String(lpAssetId)), "Wrong LP id").quantity
242-    let validationBlock = if ((lpAssetId == paymentAssetId))
243-        then true
244-        else throwErr("Wrong payment asset")
245-    if ((validationBlock == validationBlock))
246-        then {
247-            let amountBalance = getAccBalance(amountId)
248-            let priceBalance = getAccBalance(priceId)
249-            let amountBalanceDefaultDecimals = fraction(amountBalance, defaultDecimals, amountDecimals)
250-            let priceBalanceDefaultDecimals = fraction(priceBalance, defaultDecimals, priceDecimals)
251-            let amountBalanceX18 = toX18(amountBalanceDefaultDecimals, defaultDecimals)
252-            let priceBalanceX18 = toX18(priceBalanceDefaultDecimals, defaultDecimals)
253-            let currentPriceX18 = calcPriceBigInt(priceBalanceX18, amountBalanceX18)
254-            let curPrice = fromX18(currentPriceX18, scale8)
255-            let paymentLpAmountX18 = toX18(paymentLpAmount, scale8)
256-            let lpEmissionX18 = toX18(lpEmission, scale8)
257-            let outAmountAmountX18 = fraction(amountBalanceX18, paymentLpAmountX18, lpEmissionX18)
258-            let outPriceAmountX18 = fraction(priceBalanceX18, paymentLpAmountX18, lpEmissionX18)
259-            let outAmountAmountDefaultDecimals = fromX18(outAmountAmountX18, defaultDecimals)
260-            let outPriceAmountDefaultDecimals = fromX18(outPriceAmountX18, defaultDecimals)
261-            let outAmountAmount = fraction(outAmountAmountDefaultDecimals, amountDecimals, defaultDecimals)
262-            let outPriceAmount = fraction(outPriceAmountDefaultDecimals, priceDecimals, defaultDecimals)
237+    let lpEmiss = valueOrErrorMessage(assetInfo(fromBase58String(lpId)), "Wrong LP id").quantity
238+    if ((lpId != pmtAssetId))
239+        then throw("Wrong pmt asset")
240+        else {
241+            let amBalance = getAccBalance(amId)
242+            let amBalanceX18 = t1(amBalance, amDcm)
243+            let prBalance = getAccBalance(prId)
244+            let prBalanceX18 = t1(prBalance, prDcm)
245+            let curPriceX18 = cpbi(prBalanceX18, amBalanceX18)
246+            let curPrice = f1(curPriceX18, scale8)
247+            let pmtLpAmtX18 = t1(pmtLpAmt, scale8)
248+            let lpEmissX18 = t1(lpEmiss, scale8)
249+            let outAmAmtX18 = fraction(amBalanceX18, pmtLpAmtX18, lpEmissX18)
250+            let outPrAmtX18 = fraction(prBalanceX18, pmtLpAmtX18, lpEmissX18)
251+            let outAmAmt = f1(outAmAmtX18, amDcm)
252+            let outPrAmt = f1(outPrAmtX18, prDcm)
263253             let state = if ((txId58 == ""))
264254                 then nil
265-                else [ScriptTransfer(userAddress, outAmountAmount, if ((amountId == "WAVES"))
255+                else [ScriptTransfer(userAddress, outAmAmt, if ((amId == "WAVES"))
266256                     then unit
267-                    else fromBase58String(amountId)), ScriptTransfer(userAddress, outPriceAmount, if ((priceId == "WAVES"))
257+                    else fromBase58String(amId)), ScriptTransfer(userAddress, outPrAmt, if ((prId == "WAVES"))
268258                     then unit
269-                    else fromBase58String(priceId)), StringEntry(keyGetActionByUser(toString(userAddress), txId58), dataGetActionInfo(outAmountAmount, outPriceAmount, paymentLpAmount, curPrice, height, lastBlock.timestamp)), IntegerEntry(keyPriceLast(), curPrice), IntegerEntry(keyPriceHistory(height, lastBlock.timestamp), curPrice)]
270-            $Tuple10(outAmountAmount, outPriceAmount, amountId, priceId, amountBalance, priceBalance, lpEmission, currentPriceX18, sts, state)
259+                    else fromBase58String(prId)), StringEntry(gau(toString(userAddress), txId58), dataGetActionInfo(outAmAmt, outPrAmt, pmtLpAmt, curPrice, height, lastBlock.timestamp)), IntegerEntry(pl(), curPrice), IntegerEntry(ph(height, lastBlock.timestamp), curPrice)]
260+            $Tuple10(outAmAmt, outPrAmt, amId, prId, amBalance, prBalance, lpEmiss, curPriceX18, sts, state)
271261             }
272-        else throw("Strict value is not equal to itself.")
273262     }
274263 
275264 
276-func estimatePutOperation (txId58,slippageTolerance,inAmountAssetAmount,inAmountAssetId,inPriceAssetAmount,inPriceAssetId,userAddress,isEvaluate,emitLp,isOneAsset,paymentAmount,paymentId) = {
277-    let cfg = getPoolConfig()
278-    let lpAssetId = fromBase58String(cfg[idxLPAsId])
279-    let amountIdStr = cfg[idxAmAsId]
280-    let priceIdStr = cfg[idxPrAsId]
281-    let inAmountIdStr = cfg[idxIAmtAsId]
282-    let inPriceIdStr = cfg[idxIPriceAsId]
283-    let amountDecimals = parseIntValue(cfg[idxAmtAsDcm])
284-    let priceDecimals = parseIntValue(cfg[idxPriceAsDcm])
265+func epo (txId58,slippage,inAmAmt,inAmId,inPrAmt,inPrId,userAddress,isEval,emitLp,isOneAsset,pmtAmt,pmtId) = {
266+    let cfg = gpc()
267+    let lpId = fromBase58String(cfg[idxLPAsId])
268+    let amIdStr = cfg[idxAmAsId]
269+    let prIdStr = cfg[idxPrAsId]
270+    let inAmIdStr = cfg[idxIAmtAsId]
271+    let inPrIdStr = cfg[idxIPriceAsId]
272+    let amtDcm = parseIntValue(cfg[idxAmtAsDcm])
273+    let priceDcm = parseIntValue(cfg[idxPriceAsDcm])
285274     let sts = cfg[idxPoolSt]
286-    let lpEmission = valueOrErrorMessage(assetInfo(lpAssetId), "Wrong lp asset").quantity
287-    let amountBalance = if (isEvaluate)
288-        then getAccBalance(amountIdStr)
275+    let lpEm = valueOrErrorMessage(assetInfo(lpId), "Wr lp as").quantity
276+    let amBalance = if (isEval)
277+        then getAccBalance(amIdStr)
289278         else if (if (isOneAsset)
290-            then (paymentId == amountIdStr)
279+            then (pmtId == amIdStr)
291280             else false)
292-            then (getAccBalance(amountIdStr) - paymentAmount)
281+            then (getAccBalance(amIdStr) - pmtAmt)
293282             else if (isOneAsset)
294-                then getAccBalance(amountIdStr)
295-                else (getAccBalance(amountIdStr) - inAmountAssetAmount)
296-    let priceBalance = if (isEvaluate)
297-        then getAccBalance(priceIdStr)
283+                then getAccBalance(amIdStr)
284+                else (getAccBalance(amIdStr) - inAmAmt)
285+    let prBalance = if (isEval)
286+        then getAccBalance(prIdStr)
298287         else if (if (isOneAsset)
299-            then (paymentId == priceIdStr)
288+            then (pmtId == prIdStr)
300289             else false)
301-            then (getAccBalance(priceIdStr) - paymentAmount)
290+            then (getAccBalance(prIdStr) - pmtAmt)
302291             else if (isOneAsset)
303-                then getAccBalance(priceIdStr)
304-                else (getAccBalance(priceIdStr) - inPriceAssetAmount)
305-    let amountBalanceDefaultDecimals = fraction(amountBalance, defaultDecimals, amountDecimals)
306-    let priceBalanceDefaultDecimals = fraction(priceBalance, defaultDecimals, priceDecimals)
307-    let inAmountAssetAmountDefaultDecimals = fraction(inAmountAssetAmount, defaultDecimals, amountDecimals)
308-    let inPriceAssetAmountDefaultDecimals = fraction(inPriceAssetAmount, defaultDecimals, priceDecimals)
309-    let inAmountAssetAmountX18 = toX18(inAmountAssetAmountDefaultDecimals, defaultDecimals)
310-    let inPriceAssetAmountX18 = toX18(inPriceAssetAmountDefaultDecimals, defaultDecimals)
311-    let userPriceX18 = calcPriceBigInt(inPriceAssetAmountX18, inAmountAssetAmountX18)
312-    let amountBalanceX18 = toX18(amountBalanceDefaultDecimals, defaultDecimals)
313-    let priceBalanceX18 = toX18(priceBalanceDefaultDecimals, defaultDecimals)
314-    let r = if ((lpEmission == 0))
292+                then getAccBalance(prIdStr)
293+                else (getAccBalance(prIdStr) - inPrAmt)
294+    let inAmAssetAmtX18 = t1(inAmAmt, amtDcm)
295+    let inPrAssetAmtX18 = t1(inPrAmt, priceDcm)
296+    let userPriceX18 = cpbi(inPrAssetAmtX18, inAmAssetAmtX18)
297+    let amBalanceX18 = t1(amBalance, amtDcm)
298+    let prBalanceX18 = t1(prBalance, priceDcm)
299+    let r = if ((lpEm == 0))
315300         then {
316-            let currentPriceX18 = zeroBigInt
301+            let curPriceX18 = zeroBigInt
317302             let slippageX18 = zeroBigInt
318-            let lpAmountX18 = pow((inAmountAssetAmountX18 * inPriceAssetAmountX18), 0, toBigInt(5), 1, 0, DOWN)
319-            $Tuple5(fromX18(lpAmountX18, scale8), fromX18(inAmountAssetAmountX18, defaultDecimals), fromX18(inPriceAssetAmountX18, defaultDecimals), calcPriceBigInt((priceBalanceX18 + inPriceAssetAmountX18), (amountBalanceX18 + inAmountAssetAmountX18)), slippageX18)
303+            let lpAmtX18 = pow((inAmAssetAmtX18 * inPrAssetAmtX18), 0, toBigInt(5), 1, 0, DOWN)
304+            $Tuple5(f1(lpAmtX18, scale8), f1(inAmAssetAmtX18, amtDcm), f1(inPrAssetAmtX18, priceDcm), cpbi((prBalanceX18 + inPrAssetAmtX18), (amBalanceX18 + inAmAssetAmtX18)), slippageX18)
320305             }
321306         else {
322-            let currentPriceX18 = calcPriceBigInt(priceBalanceX18, amountBalanceX18)
323-            let slippageRealX18 = fraction(abs((currentPriceX18 - userPriceX18)), scale18, currentPriceX18)
324-            let slippageX18 = toX18(slippageTolerance, scale8)
325-            let validateSlippage = if (((if ((currentPriceX18 != zeroBigInt))
307+            let curPriceX18 = cpbi(prBalanceX18, amBalanceX18)
308+            let slippageRealX18 = fraction(abs((curPriceX18 - userPriceX18)), scale18, curPriceX18)
309+            let slippageX18 = t1(slippage, scale8)
310+            if (if ((curPriceX18 != zeroBigInt))
326311                 then (slippageRealX18 > slippageX18)
327-                else false) == false))
328-                then true
329-                else throwErr(((("Price slippage " + toString(slippageRealX18)) + " > ") + toString(slippageX18)))
330-            if ((validateSlippage == validateSlippage))
331-                then {
332-                    let lpEmissionX18 = toX18(lpEmission, scale8)
333-                    let prViaAmX18 = fraction(inAmountAssetAmountX18, currentPriceX18, scale18)
334-                    let amViaPrX18 = fraction(inPriceAssetAmountX18, scale18, currentPriceX18)
335-                    let expectedAmounts = if ((prViaAmX18 > inPriceAssetAmountX18))
336-                        then $Tuple2(amViaPrX18, inAmountAssetAmountX18)
337-                        else $Tuple2(inAmountAssetAmountX18, prViaAmX18)
338-                    let expectedAmountAssetAmountX18 = expectedAmounts._1
339-                    let expectedPriceAssetAmountX18 = expectedAmounts._2
340-                    let lpAmountX18 = fraction(lpEmissionX18, expectedPriceAssetAmountX18, priceBalanceX18)
341-                    $Tuple5(fromX18(lpAmountX18, scale8), fromX18(expectedAmountAssetAmountX18, defaultDecimals), fromX18(expectedPriceAssetAmountX18, defaultDecimals), currentPriceX18, slippageX18)
312+                else false)
313+                then throw(((("Price slippage " + toString(slippageRealX18)) + " > ") + toString(slippageX18)))
314+                else {
315+                    let lpEmissionX18 = t1(lpEm, scale8)
316+                    let prViaAmX18 = fraction(inAmAssetAmtX18, curPriceX18, scale18)
317+                    let amViaPrX18 = fraction(inPrAssetAmtX18, scale18, curPriceX18)
318+                    let expectedAmts = if ((prViaAmX18 > inPrAssetAmtX18))
319+                        then $Tuple2(amViaPrX18, inPrAssetAmtX18)
320+                        else $Tuple2(inAmAssetAmtX18, prViaAmX18)
321+                    let expAmtAssetAmtX18 = expectedAmts._1
322+                    let expPriceAssetAmtX18 = expectedAmts._2
323+                    let lpAmtX18 = fraction(lpEmissionX18, expPriceAssetAmtX18, prBalanceX18)
324+                    $Tuple5(f1(lpAmtX18, scale8), f1(expAmtAssetAmtX18, amtDcm), f1(expPriceAssetAmtX18, priceDcm), curPriceX18, slippageX18)
342325                     }
343-                else throw("Strict value is not equal to itself.")
344326             }
345-    let calculateLpAmount = r._1
346-    let calculateAmountAssetPayment = fraction(r._2, amountDecimals, defaultDecimals)
347-    let calculatePriceAssetPayment = fraction(r._3, priceDecimals, defaultDecimals)
348-    let currentPrice = fromX18(r._4, scale8)
349-    let slippageCalculate = fromX18(r._5, scale8)
350-    let checkCalcLpAmount = if ((calculateLpAmount > 0))
351-        then true
352-        else throwErr("LP <= 0")
353-    if ((checkCalcLpAmount == checkCalcLpAmount))
354-        then {
355-            let emitLpAmount = if (!(emitLp))
327+    let calcLpAmt = r._1
328+    let calcAmAssetPmt = r._2
329+    let calcPrAssetPmt = r._3
330+    let curPrice = f1(r._4, scale8)
331+    let slippageCalc = f1(r._5, scale8)
332+    if ((0 >= calcLpAmt))
333+        then throw("LP <= 0")
334+        else {
335+            let emitLpAmt = if (!(emitLp))
356336                 then 0
357-                else calculateLpAmount
358-            let amountDiff = (inAmountAssetAmount - calculateAmountAssetPayment)
359-            let priceDiff = (inPriceAssetAmount - calculatePriceAssetPayment)
360-            let $t01715017409 = if (if (isOneAsset)
361-                then (paymentId == amountIdStr)
337+                else calcLpAmt
338+            let amDiff = (inAmAmt - calcAmAssetPmt)
339+            let prDiff = (inPrAmt - calcPrAssetPmt)
340+            let $t01560115946 = if (if (isOneAsset)
341+                then (pmtId == amIdStr)
362342                 else false)
363-                then $Tuple2(paymentAmount, 0)
343+                then $Tuple2(pmtAmt, 0)
364344                 else if (if (isOneAsset)
365-                    then (paymentId == priceIdStr)
345+                    then (pmtId == prIdStr)
366346                     else false)
367-                    then $Tuple2(0, paymentAmount)
368-                    else $Tuple2(calculateAmountAssetPayment, calculatePriceAssetPayment)
369-            let writeAmAmt = $t01715017409._1
370-            let writePrAmt = $t01715017409._2
371-            let commonState = [IntegerEntry(keyPriceLast(), currentPrice), IntegerEntry(keyPriceHistory(height, lastBlock.timestamp), currentPrice), StringEntry(keyPutActionByUser(userAddress, txId58), dataPutActionInfo(writeAmAmt, writePrAmt, emitLpAmount, currentPrice, slippageTolerance, slippageCalculate, height, lastBlock.timestamp, amountDiff, priceDiff))]
372-            $Tuple13(calculateLpAmount, emitLpAmount, currentPrice, amountBalance, priceBalance, lpEmission, lpAssetId, sts, commonState, amountDiff, priceDiff, inAmountAssetId, inPriceAssetId)
347+                    then $Tuple2(0, pmtAmt)
348+                    else $Tuple2(calcAmAssetPmt, calcPrAssetPmt)
349+            let writeAmAmt = $t01560115946._1
350+            let writePrAmt = $t01560115946._2
351+            let commonState = [IntegerEntry(pl(), curPrice), IntegerEntry(ph(height, lastBlock.timestamp), curPrice), StringEntry(pau(userAddress, txId58), dataPutActionInfo(writeAmAmt, writePrAmt, emitLpAmt, curPrice, slippage, slippageCalc, height, lastBlock.timestamp, amDiff, prDiff))]
352+            $Tuple13(calcLpAmt, emitLpAmt, curPrice, amBalance, prBalance, lpEm, lpId, sts, commonState, amDiff, prDiff, inAmId, inPrId)
373353             }
374-        else throw("Strict value is not equal to itself.")
375354     }
376355 
377356 
378-func validateMatcherOrderAllowed (order) = {
379-    let cfg = getPoolConfig()
357+func moa (order) = {
358+    let cfg = gpc()
380359     let amtAsId = cfg[idxAmAsId]
381360     let prAsId = cfg[idxPrAsId]
382361     let sts = parseIntValue(cfg[idxPoolSt])
383362     let amtAsDcm = parseIntValue(cfg[idxAmtAsDcm])
384363     let prAsDcm = parseIntValue(cfg[idxPriceAsDcm])
385364     let accAmtAsBalance = getAccBalance(amtAsId)
386365     let accPrAsBalance = getAccBalance(prAsId)
387-    let currentPriceX18 = if ((order.orderType == Buy))
388-        then privateCalcPrice(amtAsDcm, prAsDcm, (accAmtAsBalance + order.amount), accPrAsBalance)
389-        else privateCalcPrice(amtAsDcm, prAsDcm, (accAmtAsBalance - order.amount), accPrAsBalance)
390-    let curPrice = fromX18(currentPriceX18, scale8)
391-    if (if (if (isGlobalShutdown())
366+    let curPriceX18 = if ((order.orderType == Buy))
367+        then pcp(amtAsDcm, prAsDcm, (accAmtAsBalance + order.amount), accPrAsBalance)
368+        else pcp(amtAsDcm, prAsDcm, (accAmtAsBalance - order.amount), accPrAsBalance)
369+    let curPrice = f1(curPriceX18, scale8)
370+    if (if (if (igs())
392371         then true
393372         else (sts == PoolMatcherDis))
394373         then true
395374         else (sts == PoolShutdown))
396-        then throwErr("Admin blocked")
375+        then throw("Admin blocked")
397376         else {
398377             let orAmtAsset = order.assetPair.amountAsset
399378             let orAmtAsStr = if ((orAmtAsset == unit))
400379                 then "WAVES"
401380                 else toBase58String(value(orAmtAsset))
402381             let orPrAsset = order.assetPair.priceAsset
403382             let orPrAsStr = if ((orPrAsset == unit))
404383                 then "WAVES"
405384                 else toBase58String(value(orPrAsset))
406385             if (if ((orAmtAsStr != amtAsId))
407386                 then true
408387                 else (orPrAsStr != prAsId))
409-                then throwErr("Wr assets")
388+                then throw("Wr assets")
410389                 else {
411390                     let orderPrice = order.price
412-                    let priceDecimals = fraction(scale8, prAsDcm, amtAsDcm)
413-                    let castOrderPrice = ts(orderPrice, scale8, priceDecimals)
391+                    let priceDcm = fraction(scale8, prAsDcm, amtAsDcm)
392+                    let castOrderPrice = ts(orderPrice, scale8, priceDcm)
414393                     let isOrderPriceValid = if ((order.orderType == Buy))
415394                         then (curPrice >= castOrderPrice)
416395                         else (castOrderPrice >= curPrice)
417396                     true
418397                     }
419398             }
420399     }
421400 
422401 
423-func commonGet (i) = {
424-    let checkPayments = if ((size(i.payments) == 1))
425-        then true
426-        else throwErr("1 payment expected")
427-    if ((checkPayments == checkPayments))
428-        then {
429-            let payment = value(i.payments[0])
430-            let paymentAssetId = value(payment.assetId)
431-            let paymentAmount = payment.amount
432-            let r = estimateGetOperation(toBase58String(i.transactionId), toBase58String(paymentAssetId), paymentAmount, i.caller)
433-            let outAmountAmount = r._1
434-            let outPriceAmount = r._2
435-            let sts = parseIntValue(r._9)
436-            let state = r._10
437-            if (if (isGlobalShutdown())
438-                then true
439-                else (sts == PoolShutdown))
440-                then throwErr(("Admin blocked: " + toString(sts)))
441-                else $Tuple5(outAmountAmount, outPriceAmount, paymentAmount, paymentAssetId, state)
442-            }
443-        else throw("Strict value is not equal to itself.")
444-    }
402+func cg (i) = if ((size(i.payments) != 1))
403+    then throw("1 pmnt exp")
404+    else {
405+        let pmt = value(i.payments[0])
406+        let pmtAssetId = value(pmt.assetId)
407+        let pmtAmt = pmt.amount
408+        let r = ego(toBase58String(i.transactionId), toBase58String(pmtAssetId), pmtAmt, i.caller)
409+        let outAmAmt = r._1
410+        let outPrAmt = r._2
411+        let sts = parseIntValue(r._9)
412+        let state = r._10
413+        if (if (igs())
414+            then true
415+            else (sts == PoolShutdown))
416+            then throw(("Admin blocked: " + toString(sts)))
417+            else $Tuple5(outAmAmt, outPrAmt, pmtAmt, pmtAssetId, state)
418+        }
445419 
446420 
447-func commonPut (caller,txId,amountAssetPayment,priceAssetPayment,slippage,emitLp,isOneAsset,paymentAmount,paymentId) = {
448-    let r = estimatePutOperation(txId, slippage, value(amountAssetPayment).amount, value(amountAssetPayment).assetId, value(priceAssetPayment).amount, value(priceAssetPayment).assetId, caller, false, emitLp, isOneAsset, paymentAmount, paymentId)
421+func cp (caller,txId,amAsPmt,prAsPmt,slippage,emitLp,isOneAsset,pmtAmt,pmtId) = {
422+    let r = epo(txId, slippage, value(amAsPmt).amount, value(amAsPmt).assetId, value(prAsPmt).amount, value(prAsPmt).assetId, caller, false, emitLp, isOneAsset, pmtAmt, pmtId)
449423     let sts = parseIntValue(r._8)
450-    if (if (if (isGlobalShutdown())
424+    if (if (if (igs())
451425         then true
452426         else (sts == PoolPutDis))
453427         then true
454428         else (sts == PoolShutdown))
455-        then throwErr(("Blocked:" + toString(sts)))
429+        then throw(("Blocked:" + toString(sts)))
456430         else r
457431     }
458432 
459433 
460-func takeFee (amount) = {
461-    let fee = fraction(amount, feePermille, thousand)
462-    $Tuple2((amount - fee), fee)
463-    }
464-
465-
466-func managerPublicKeyOrUnit () = match getString(keyManagerPublicKey()) {
434+func m () = match getString(mpk()) {
467435     case s: String => 
468436         fromBase58String(s)
469437     case _: Unit => 
470438         unit
471439     case _ => 
472440         throw("Match error")
473441 }
474442 
475443 
476-func pendingManagerPublicKeyOrUnit () = match getString(keyPendingManagerPublicKey()) {
444+func pm () = match getString(pmpk()) {
477445     case s: String => 
478446         fromBase58String(s)
479447     case _: Unit => 
480448         unit
481449     case _ => 
482450         throw("Match error")
483451 }
484452 
485453 
486-let pd = throwErr("Permission denied")
454+let pd = throw("Permission denied")
487455 
488-func mustManager (i) = match managerPublicKeyOrUnit() {
456+func mm (i) = match m() {
489457     case pk: ByteVector => 
490458         if ((i.callerPublicKey == pk))
491459             then true
492460             else pd
493461     case _: Unit => 
494462         if ((i.caller == this))
495463             then true
496464             else pd
497465     case _ => 
498466         throw("Match error")
499467 }
500468 
501469 
502470 @Callable(i)
503-func constructor (factoryContract) = {
504-    let checkCaller = mustManager(i)
505-    if ((checkCaller == checkCaller))
506-        then [StringEntry(keyFactoryContact(), factoryContract)]
471+func constructor (fc) = {
472+    let c = mm(i)
473+    if ((c == c))
474+        then [StringEntry(fc(), fc)]
507475         else throw("Strict value is not equal to itself.")
508476     }
509477 
510478 
511479 
512480 @Callable(i)
513481 func setManager (pendingManagerPublicKey) = {
514-    let checkCaller = mustManager(i)
515-    if ((checkCaller == checkCaller))
482+    let c = mm(i)
483+    if ((c == c))
516484         then {
517-            let checkManagerPublicKey = fromBase58String(pendingManagerPublicKey)
518-            if ((checkManagerPublicKey == checkManagerPublicKey))
519-                then [StringEntry(keyPendingManagerPublicKey(), pendingManagerPublicKey)]
485+            let cm = fromBase58String(pendingManagerPublicKey)
486+            if ((cm == cm))
487+                then [StringEntry(pmpk(), pendingManagerPublicKey)]
520488                 else throw("Strict value is not equal to itself.")
521489             }
522490         else throw("Strict value is not equal to itself.")
523491     }
524492 
525493 
526494 
527495 @Callable(i)
528496 func confirmManager () = {
529-    let pm = pendingManagerPublicKeyOrUnit()
530-    let hasPM = if (isDefined(pm))
497+    let p = pm()
498+    let hpm = if (isDefined(p))
531499         then true
532-        else throwErr("No pending manager")
533-    if ((hasPM == hasPM))
500+        else throw("No pending manager")
501+    if ((hpm == hpm))
534502         then {
535-            let checkPM = if ((i.callerPublicKey == value(pm)))
503+            let cpm = if ((i.callerPublicKey == value(p)))
536504                 then true
537-                else throwErr("You are not pending manager")
538-            if ((checkPM == checkPM))
539-                then [StringEntry(keyManagerPublicKey(), toBase58String(value(pm))), DeleteEntry(keyPendingManagerPublicKey())]
505+                else throw("You are not pending manager")
506+            if ((cpm == cpm))
507+                then [StringEntry(mpk(), toBase58String(value(p))), DeleteEntry(pmpk())]
540508                 else throw("Strict value is not equal to itself.")
541509             }
542510         else throw("Strict value is not equal to itself.")
543511     }
544512 
545513 
546514 
547515 @Callable(i)
548-func put (slippage,autoStake) = {
549-    let factCfg = getFactoryConfig()
550-    let stakingContract = valueOrErrorMessage(addressFromString(factCfg[idxFactStakCntr]), "Wrong staking contract")
551-    let slippageContract = valueOrErrorMessage(addressFromString(factCfg[idxFactSlippCntr]), "Wrogn slippage contract")
552-    let slippageCheck = if ((slippage >= 0))
553-        then true
554-        else throwErr("wrong slippage")
555-    if ((slippageCheck == slippageCheck))
556-        then {
557-            let paymentsCheck = if ((size(i.payments) == 2))
558-                then true
559-                else throwErr("2 payments expected")
560-            if ((paymentsCheck == paymentsCheck))
561-                then {
562-                    let estimatePut = commonPut(toString(i.caller), toBase58String(i.transactionId), AttachedPayment(value(i.payments[0]).assetId, value(i.payments[0]).amount), i.payments[1], slippage, true, false, 0, "")
563-                    let emitLpAmount = estimatePut._2
564-                    let lpAssetId = estimatePut._7
565-                    let state = estimatePut._9
566-                    let amountDiff = estimatePut._10
567-                    let priceDiff = estimatePut._11
568-                    let amountId = estimatePut._12
569-                    let priceId = estimatePut._13
570-                    let r = invoke(factoryContract, "emit", [emitLpAmount], nil)
571-                    if ((r == r))
572-                        then {
573-                            let el =                             match r {
574-                                case legacy: Address => 
575-                                    invoke(legacy, "emit", [emitLpAmount], nil)
576-                                case _ => 
577-                                    unit
578-                            }
579-                            if ((el == el))
516+func put (slip,autoStake) = {
517+    let factCfg = gfc()
518+    let stakingCntr = valueOrErrorMessage(addressFromString(factCfg[idxFactStakCntr]), "Wr st addr")
519+    let slipCntr = valueOrErrorMessage(addressFromString(factCfg[idxFactSlippCntr]), "Wr sl addr")
520+    if ((0 > slip))
521+        then throw("Wrong slippage")
522+        else if ((size(i.payments) != 2))
523+            then throw("2 pmnts expd")
524+            else {
525+                let e = cp(toString(i.caller), toBase58String(i.transactionId), AttachedPayment(value(i.payments[0]).assetId, value(i.payments[0]).amount), i.payments[1], slip, true, false, 0, "")
526+                let emitLpAmt = e._2
527+                let lpAssetId = e._7
528+                let state = e._9
529+                let amDiff = e._10
530+                let prDiff = e._11
531+                let amId = e._12
532+                let prId = e._13
533+                let r = invoke(fca, "emit", [emitLpAmt], nil)
534+                if ((r == r))
535+                    then {
536+                        let el =                         match r {
537+                            case legacy: Address => 
538+                                invoke(legacy, "emit", [emitLpAmt], nil)
539+                            case _ => 
540+                                unit
541+                        }
542+                        if ((el == el))
543+                            then {
544+                                let sa = if ((amDiff > 0))
545+                                    then invoke(slipCntr, "put", nil, [AttachedPayment(amId, amDiff)])
546+                                    else nil
547+                                if ((sa == sa))
548+                                    then {
549+                                        let sp = if ((prDiff > 0))
550+                                            then invoke(slipCntr, "put", nil, [AttachedPayment(prId, prDiff)])
551+                                            else nil
552+                                        if ((sp == sp))
553+                                            then {
554+                                                let lpTrnsfr = if (autoStake)
555+                                                    then {
556+                                                        let ss = invoke(stakingCntr, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmt)])
557+                                                        if ((ss == ss))
558+                                                            then nil
559+                                                            else throw("Strict value is not equal to itself.")
560+                                                        }
561+                                                    else [ScriptTransfer(i.caller, emitLpAmt, lpAssetId)]
562+                                                (state ++ lpTrnsfr)
563+                                                }
564+                                            else throw("Strict value is not equal to itself.")
565+                                        }
566+                                    else throw("Strict value is not equal to itself.")
567+                                }
568+                            else throw("Strict value is not equal to itself.")
569+                        }
570+                    else throw("Strict value is not equal to itself.")
571+                }
572+    }
573+
574+
575+
576+@Callable(i)
577+func putOneTkn (amAssetPart,prAssetPart,outLp,slippage,autoStake) = {
578+    let cfg = gfc()
579+    let stakingCntr = valueOrErrorMessage(addressFromString(cfg[idxFactStakCntr]), "Wr st addr")
580+    let slipCntr = valueOrErrorMessage(addressFromString(cfg[idxFactSlippCntr]), "Wr sl addr")
581+    let gwxCntr = valueOrErrorMessage(addressFromString(cfg[idxFactGwxRewCntr]), "Wr gwx addr")
582+    let poolCfg = gpc()
583+    let amId = poolCfg[idxAmAsId]
584+    let prId = poolCfg[idxPrAsId]
585+    let amDcm = parseIntValue(poolCfg[idxAmtAsDcm])
586+    let prDcm = parseIntValue(poolCfg[idxPriceAsDcm])
587+    let addon = valueOrElse(getString(this, ada()), "")
588+    let userAddress = if ((addon == toString(i.caller)))
589+        then i.originCaller
590+        else i.caller
591+    let addonContract = valueOrErrorMessage(addressFromString(valueOrErrorMessage(getString(ada()), "no addons")), "addon address in not valid")
592+    let check = reentrantInvoke(addonContract, "ensureCanPutOneTkn", [toString(userAddress)], nil)
593+    if ((check == check))
594+        then if (if (if (if ((0 >= slippage))
595+            then true
596+            else (0 >= amAssetPart))
597+            then true
598+            else (0 >= prAssetPart))
599+            then true
600+            else (0 >= outLp))
601+            then throw("Wrong params")
602+            else if ((size(i.payments) != 1))
603+                then throw("1 pmnt expd")
604+                else {
605+                    let pmt = value(i.payments[0])
606+                    let pmtAssetId = toBase58String(value(pmt.assetId))
607+                    let pmtAmt = pmt.amount
608+                    if ((10000000 > pmtAmt))
609+                        then throw("Wrong pmt amt")
610+                        else {
611+                            let amBalance = getAccBalance(amId)
612+                            let prBalance = getAccBalance(prId)
613+                            let $t02485925435 = if ((pmtAssetId == amId))
614+                                then if (if ((pmtAmt > amBalance))
615+                                    then true
616+                                    else (amAssetPart > pmtAmt))
617+                                    then throw("invalid payment amount")
618+                                    else $Tuple6((amBalance - pmtAmt), prBalance, (pmtAmt - amAssetPart), prAssetPart, 0, 0)
619+                                else if ((pmtAssetId == prId))
620+                                    then if (if ((pmtAmt > prBalance))
621+                                        then true
622+                                        else (prAssetPart > pmtAmt))
623+                                        then throw("invalid payment amount")
624+                                        else $Tuple6(amBalance, (prBalance - pmtAmt), 0, 0, (pmtAmt - prAssetPart), amAssetPart)
625+                                    else throw("wrong pmtAssetId")
626+                            let amBalanceNow = $t02485925435._1
627+                            let prBalanceNow = $t02485925435._2
628+                            let virtSwapInAm = $t02485925435._3
629+                            let virtSwapOutPr = $t02485925435._4
630+                            let virtSwapInPr = $t02485925435._5
631+                            let virtSwapOutAm = $t02485925435._6
632+                            let D0 = invoke(gwxCntr, "calcD", [toString(amBalanceNow), toString(prBalanceNow), A, Amult, Dconv], nil)
633+                            let D1 = invoke(gwxCntr, "calcD", [toString(toBigInt(((amBalanceNow + virtSwapInAm) - virtSwapOutAm))), toString(toBigInt(((prBalanceNow + virtSwapInPr) - virtSwapOutPr))), A, Amult, Dconv], nil)
634+                            let D0vsD1 = vd(parseBigIntValue(str(D1)), parseBigIntValue(str(D0)), slippage4D)
635+                            if ((D0vsD1 == D0vsD1))
580636                                 then {
581-                                    let sa = if ((amountDiff > 0))
582-                                        then invoke(slippageContract, "put", nil, [AttachedPayment(amountId, amountDiff)])
583-                                        else nil
584-                                    if ((sa == sa))
637+                                    let estPut = cp(toString(i.caller), toBase58String(i.transactionId), AttachedPayment(fromBase58String(amId), amAssetPart), AttachedPayment(fromBase58String(prId), prAssetPart), slippage, true, true, pmtAmt, pmtAssetId)
638+                                    let estimLP = estPut._2
639+                                    let lpAssetId = estPut._7
640+                                    let state = estPut._9
641+                                    let amDiff = estPut._10
642+                                    let prDiff = estPut._11
643+                                    let lpCalcRes = vad(toBigInt(estimLP), toBigInt(outLp), toBigInt(slippage))
644+                                    let emitLpAmt = toInt(lpCalcRes._2)
645+                                    let e = invoke(fca, "emit", [emitLpAmt], nil)
646+                                    if ((e == e))
585647                                         then {
586-                                            let sp = if ((priceDiff > 0))
587-                                                then invoke(slippageContract, "put", nil, [AttachedPayment(priceId, priceDiff)])
588-                                                else nil
589-                                            if ((sp == sp))
648+                                            let el =                                             match e {
649+                                                case legacy: Address => 
650+                                                    invoke(legacy, "emit", [emitLpAmt], nil)
651+                                                case _ => 
652+                                                    unit
653+                                            }
654+                                            if ((el == el))
590655                                                 then {
591-                                                    let lpTrasfer = if (autoStake)
656+                                                    let sa = if ((amDiff > 0))
657+                                                        then invoke(slipCntr, "put", nil, [AttachedPayment(fromBase58String(amId), amDiff)])
658+                                                        else nil
659+                                                    if ((sa == sa))
592660                                                         then {
593-                                                            let ss = invoke(stakingContract, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmount)])
594-                                                            if ((ss == ss))
595-                                                                then nil
661+                                                            let sp = if ((prDiff > 0))
662+                                                                then invoke(slipCntr, "put", nil, [AttachedPayment(fromBase58String(prId), prDiff)])
663+                                                                else nil
664+                                                            if ((sp == sp))
665+                                                                then {
666+                                                                    let lpTrnsfr = if (autoStake)
667+                                                                        then {
668+                                                                            let ss = invoke(stakingCntr, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmt)])
669+                                                                            if ((ss == ss))
670+                                                                                then nil
671+                                                                                else throw("Strict value is not equal to itself.")
672+                                                                            }
673+                                                                        else [ScriptTransfer(i.caller, emitLpAmt, lpAssetId)]
674+                                                                    (state ++ lpTrnsfr)
675+                                                                    }
596676                                                                 else throw("Strict value is not equal to itself.")
597677                                                             }
598-                                                        else [ScriptTransfer(i.caller, emitLpAmount, lpAssetId)]
599-                                                    (state ++ lpTrasfer)
678+                                                        else throw("Strict value is not equal to itself.")
600679                                                     }
601680                                                 else throw("Strict value is not equal to itself.")
602681                                             }
603682                                         else throw("Strict value is not equal to itself.")
604683                                     }
605684                                 else throw("Strict value is not equal to itself.")
606685                             }
607-                        else throw("Strict value is not equal to itself.")
608686                     }
609-                else throw("Strict value is not equal to itself.")
610-            }
611687         else throw("Strict value is not equal to itself.")
612688     }
613689 
614690 
615691 
616692 @Callable(i)
617-func putOneTkn (amountAssetPart,priceAssetPart,outLp,slippage,autoStake) = {
618-    let cfg = getFactoryConfig()
619-    let stakingContract = valueOrErrorMessage(addressFromString(cfg[idxFactStakCntr]), "Wrong staking contract")
620-    let slippageContract = valueOrErrorMessage(addressFromString(cfg[idxFactSlippCntr]), "Wrong slippage contract")
621-    let gwxRewardContract = valueOrErrorMessage(addressFromString(cfg[idxFactGwxRewCntr]), "Wrong gwx reward contract")
622-    let poolCfg = getPoolConfig()
623-    let amountId = poolCfg[idxAmAsId]
624-    let priceId = poolCfg[idxPrAsId]
625-    let amountDecimals = parseIntValue(poolCfg[idxAmtAsDcm])
626-    let priceDecimals = parseIntValue(poolCfg[idxPriceAsDcm])
627-    let addon = valueOrElse(getString(this, keyAddonAddress()), "")
628-    let userAddress = if ((addon == toString(i.caller)))
629-        then i.originCaller
630-        else i.caller
631-    if (if (if (if ((0 >= slippage))
632-        then true
633-        else (0 >= amountAssetPart))
634-        then true
635-        else (0 >= priceAssetPart))
636-        then true
637-        else (0 >= outLp))
638-        then throwErr("Wrong params")
639-        else if ((size(i.payments) != 1))
640-            then throwErr("1 payment expected")
641-            else {
642-                let payment = value(i.payments[0])
643-                let paymentAssetId = toBase58String(value(payment.assetId))
644-                let paymentAmountRaw = payment.amount
645-                let $t02656926628 = takeFee(paymentAmountRaw)
646-                let paymentAmount = $t02656926628._1
647-                let feeAmount = $t02656926628._2
648-                if (if (if ((amountAssetPart > paymentAmount))
649-                    then true
650-                    else (priceAssetPart > paymentAmount))
651-                    then true
652-                    else (10000000 > paymentAmount))
653-                    then throwErr("wrong payment amount")
654-                    else {
655-                        let amountBalance = getAccBalance(amountId)
656-                        let priceBalance = getAccBalance(priceId)
657-                        let $t02689327348 = if ((paymentAssetId == amountId))
658-                            then $Tuple6((amountBalance - paymentAmount), priceBalance, (paymentAmount - amountAssetPart), priceAssetPart, 0, 0)
659-                            else if ((paymentAssetId == priceId))
660-                                then $Tuple6(amountBalance, (priceBalance - paymentAmount), 0, 0, (paymentAmount - priceAssetPart), amountAssetPart)
661-                                else throwErr("wrong paymentAssetId")
662-                        let amountBalanceNow = $t02689327348._1
663-                        let priceBalanceNow = $t02689327348._2
664-                        let virtSwapInAm = $t02689327348._3
665-                        let virtSwapOutPr = $t02689327348._4
666-                        let virtSwapInPr = $t02689327348._5
667-                        let virtSwapOutAm = $t02689327348._6
668-                        let D0 = invoke(gwxRewardContract, "calcD", [toString(amountBalanceNow), toString(priceBalanceNow), amplificator, Amult, Dconv], nil)
669-                        let D1 = invoke(gwxRewardContract, "calcD", [toString(toBigInt(((amountBalanceNow + virtSwapInAm) - virtSwapOutAm))), toString(toBigInt(((priceBalanceNow + virtSwapInPr) - virtSwapOutPr))), amplificator, Amult, Dconv], nil)
670-                        let D0vsD1 = validateD(parseBigIntValue(str(D1)), parseBigIntValue(str(D0)), slippage4D)
671-                        if ((D0vsD1 == D0vsD1))
672-                            then {
673-                                let estimatePut = commonPut(toString(i.caller), toBase58String(i.transactionId), AttachedPayment(fromBase58String(amountId), amountAssetPart), AttachedPayment(fromBase58String(priceId), priceAssetPart), slippage, true, true, paymentAmount, paymentAssetId)
674-                                let estimateLP = estimatePut._2
675-                                let lpAssetId = estimatePut._7
676-                                let state = estimatePut._9
677-                                let amountDiff = estimatePut._10
678-                                let priceDiff = estimatePut._11
679-                                let lpCalcRes = validateAbsDiff(toBigInt(estimateLP), toBigInt(outLp), toBigInt(slippage))
680-                                let emitLpAmount = toInt(lpCalcRes._2)
681-                                let e = invoke(factoryContract, "emit", [emitLpAmount], nil)
682-                                if ((e == e))
683-                                    then {
684-                                        let el =                                         match e {
685-                                            case legacy: Address => 
686-                                                invoke(legacy, "emit", [emitLpAmount], nil)
687-                                            case _ => 
688-                                                unit
689-                                        }
690-                                        if ((el == el))
691-                                            then {
692-                                                let sa = if ((amountDiff > 0))
693-                                                    then invoke(slippageContract, "put", nil, [AttachedPayment(fromBase58String(amountId), amountDiff)])
694-                                                    else nil
695-                                                if ((sa == sa))
696-                                                    then {
697-                                                        let sp = if ((priceDiff > 0))
698-                                                            then invoke(slippageContract, "put", nil, [AttachedPayment(fromBase58String(priceId), priceDiff)])
699-                                                            else nil
700-                                                        if ((sp == sp))
701-                                                            then {
702-                                                                let lpTrasfer = if (autoStake)
703-                                                                    then {
704-                                                                        let ss = invoke(stakingContract, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmount)])
705-                                                                        if ((ss == ss))
706-                                                                            then nil
707-                                                                            else throw("Strict value is not equal to itself.")
708-                                                                        }
709-                                                                    else [ScriptTransfer(i.caller, emitLpAmount, lpAssetId)]
710-                                                                let sendFeeToMatcher = if ((feeAmount > 0))
711-                                                                    then [ScriptTransfer(matcherAddress, feeAmount, fromBase58String(paymentAssetId))]
712-                                                                    else nil
713-                                                                ((state ++ lpTrasfer) ++ sendFeeToMatcher)
714-                                                                }
715-                                                            else throw("Strict value is not equal to itself.")
716-                                                        }
717-                                                    else throw("Strict value is not equal to itself.")
718-                                                }
719-                                            else throw("Strict value is not equal to itself.")
720-                                        }
721-                                    else throw("Strict value is not equal to itself.")
722-                                }
723-                            else throw("Strict value is not equal to itself.")
724-                        }
725-                }
726-    }
727-
728-
729-
730-@Callable(i)
731-func putForFree (maxslippage) = if ((0 > maxslippage))
732-    then throwErr("wrong slippage")
693+func putForFree (maxSlpg) = if ((0 > maxSlpg))
694+    then throw("Wrong slpg")
733695     else if ((size(i.payments) != 2))
734-        then throwErr("2 payments expected")
696+        then throw("2 pmnts expd")
735697         else {
736-            let estimatePut = commonPut(toString(i.caller), toBase58String(i.transactionId), AttachedPayment(value(i.payments[0]).assetId, value(i.payments[0]).amount), i.payments[1], maxslippage, false, false, 0, "")
737-            estimatePut._9
698+            let estPut = cp(toString(i.caller), toBase58String(i.transactionId), AttachedPayment(value(i.payments[0]).assetId, value(i.payments[0]).amount), i.payments[1], maxSlpg, false, false, 0, "")
699+            estPut._9
738700             }
739701 
740702 
741703 
742704 @Callable(i)
743705 func get () = {
744-    let r = commonGet(i)
706+    let r = cg(i)
745707     let outAmtAmt = r._1
746-    let outPriceAmount = r._2
747-    let paymentAmount = r._3
748-    let paymentAssetId = r._4
708+    let outPrAmt = r._2
709+    let pmtAmt = r._3
710+    let pmtAssetId = r._4
749711     let state = r._5
750-    let b = invoke(factoryContract, "burn", [paymentAmount], [AttachedPayment(paymentAssetId, paymentAmount)])
712+    let b = invoke(fca, "burn", [pmtAmt], [AttachedPayment(pmtAssetId, pmtAmt)])
751713     if ((b == b))
752714         then state
753715         else throw("Strict value is not equal to itself.")
754716     }
755717 
756718 
757719 
758720 @Callable(i)
759721 func getOneTkn (exchResult,notUsed,outAmount,outAssetId,slippage) = if ((size(i.payments) != 1))
760-    then throwErr("1 payment expected")
722+    then throw("1 pmnt expd")
761723     else {
762-        let cfg = getPoolConfig()
763-        let lpAssetId = cfg[idxLPAsId]
764-        let amountId = cfg[idxAmAsId]
765-        let priceId = cfg[idxPrAsId]
766-        let amountDecimals = parseIntValue(cfg[idxAmtAsDcm])
767-        let priceDecimals = parseIntValue(cfg[idxPriceAsDcm])
724+        let cfg = gpc()
725+        let lpId = cfg[idxLPAsId]
726+        let amId = cfg[idxAmAsId]
727+        let prId = cfg[idxPrAsId]
728+        let amDcm = parseIntValue(cfg[idxAmtAsDcm])
729+        let prDcm = parseIntValue(cfg[idxPriceAsDcm])
768730         let sts = cfg[idxPoolSt]
769-        let factCfg = getFactoryConfig()
770-        let gwxRewardContract = valueOrErrorMessage(addressFromString(factCfg[idxFactGwxRewCntr]), "Wrong gwxRewardContract address")
771-        let payment = value(i.payments[0])
772-        let addon = valueOrElse(getString(this, keyAddonAddress()), "")
731+        let factCfg = gfc()
732+        let gwxCntr = valueOrErrorMessage(addressFromString(factCfg[idxFactGwxRewCntr]), "Wr sl addr")
733+        let pmt = value(i.payments[0])
734+        let addon = valueOrElse(getString(this, ada()), "")
773735         let userAddress = if ((addon == toString(i.caller)))
774736             then i.originCaller
775737             else i.caller
776738         let txId58 = toBase58String(i.transactionId)
777-        let paymentAssetId = value(payment.assetId)
778-        let paymentAmount = payment.amount
779-        if ((1000000000 > paymentAmount))
780-            then throwErr("Min payment 10 LP")
781-            else if (if (if ((0 > slippage))
782-                then true
783-                else (0 > exchResult))
784-                then true
785-                else (0 > outAmount))
786-                then throwErr("Wrong params")
787-                else if ((lpAssetId != toBase58String(paymentAssetId)))
788-                    then throwErr("Wrong LP")
789-                    else {
790-                        let r = estimateGetOperation(toBase58String(i.transactionId), toBase58String(paymentAssetId), paymentAmount, i.caller)
791-                        let estimAmAmt = r._1
792-                        let estimPrAmt = r._2
793-                        let amountBalance = getAccBalance(amountId)
794-                        let priceBalance = getAccBalance(priceId)
795-                        let $t03249632964 = if ((outAssetId == amountId))
796-                            then $Tuple7((amountBalance - estimAmAmt), (priceBalance - estimPrAmt), exchResult, estimPrAmt, 0, 0, (estimAmAmt + exchResult))
797-                            else if ((outAssetId == priceId))
798-                                then $Tuple7((amountBalance - estimAmAmt), (priceBalance - estimPrAmt), 0, 0, exchResult, estimAmAmt, (estimPrAmt + exchResult))
799-                                else throwErr("wrong outAssetId")
800-                        let amountBalanceNow = $t03249632964._1
801-                        let priceBalanceNow = $t03249632964._2
802-                        let virtSwapInAm = $t03249632964._3
803-                        let virtSwapOutPr = $t03249632964._4
804-                        let virtSwapInPr = $t03249632964._5
805-                        let virtSwapOutAm = $t03249632964._6
806-                        let totalGet = $t03249632964._7
807-                        if (if ((0 > virtSwapInAm))
808-                            then true
809-                            else (0 > virtSwapInPr))
810-                            then throwErr("Wrong calc")
811-                            else {
812-                                let D0 = invoke(gwxRewardContract, "calcD", [toString(amountBalanceNow), toString(priceBalanceNow), amplificator, Amult, Dconv], nil)
813-                                let D1 = invoke(gwxRewardContract, "calcD", [toString(((amountBalanceNow - virtSwapInAm) + virtSwapOutAm)), toString(((priceBalanceNow + virtSwapOutPr) - virtSwapInPr)), amplificator, Amult, Dconv], nil)
814-                                let D0vsD1 = validateD(parseBigIntValue(str(D1)), parseBigIntValue(str(D0)), slippage4D)
815-                                if ((D0vsD1 == D0vsD1))
816-                                    then {
817-                                        let finalRes = validateAbsDiff(toBigInt(totalGet), toBigInt(outAmount), toBigInt(slippage))
818-                                        if ((finalRes == finalRes))
819-                                            then {
820-                                                let $t03363333741 = if ((outAssetId == amountId))
821-                                                    then $Tuple2(toInt(finalRes._2), 0)
822-                                                    else $Tuple2(0, toInt(finalRes._2))
823-                                                let outAm = $t03363333741._1
824-                                                let outPr = $t03363333741._2
825-                                                let totalAmountRaw = (outAm + outPr)
826-                                                let $t03378133836 = takeFee(totalAmountRaw)
827-                                                let totalAmount = $t03378133836._1
828-                                                let feeAmount = $t03378133836._2
829-                                                let outAssetIdOrWaves = if ((outAssetId == "WAVES"))
830-                                                    then unit
831-                                                    else fromBase58String(outAssetId)
832-                                                let sendFeeToMatcher = if ((feeAmount > 0))
833-                                                    then [ScriptTransfer(matcherAddress, feeAmount, outAssetIdOrWaves)]
834-                                                    else nil
835-                                                let decimals = if ((amountDecimals >= priceDecimals))
836-                                                    then amountDecimals
837-                                                    else priceDecimals
838-                                                if ((decimals == decimals))
839-                                                    then {
840-                                                        let curPrX18 = calcPriceBigInt(toX18(priceBalance, decimals), toX18(amountBalance, decimals))
841-                                                        let curPr = fromX18(curPrX18, scale8)
842-                                                        let state = [ScriptTransfer(userAddress, totalAmount, outAssetIdOrWaves), StringEntry(keyGetActionByUser(toString(userAddress), txId58), dataGetActionInfo(outAm, outPr, paymentAmount, curPr, height, lastBlock.timestamp)), IntegerEntry(keyPriceLast(), curPr), IntegerEntry(keyPriceHistory(height, lastBlock.timestamp), curPr)]
843-                                                        if ((state == state))
844-                                                            then {
845-                                                                let burn = invoke(factoryContract, "burn", [paymentAmount], [AttachedPayment(paymentAssetId, paymentAmount)])
846-                                                                if ((burn == burn))
847-                                                                    then (state ++ sendFeeToMatcher)
848-                                                                    else throw("Strict value is not equal to itself.")
849-                                                                }
850-                                                            else throw("Strict value is not equal to itself.")
851-                                                        }
852-                                                    else throw("Strict value is not equal to itself.")
853-                                                }
854-                                            else throw("Strict value is not equal to itself.")
855-                                        }
856-                                    else throw("Strict value is not equal to itself.")
857-                                }
858-                        }
739+        let pmtAssetId = value(pmt.assetId)
740+        let pmtAmt = pmt.amount
741+        let addonContract = valueOrErrorMessage(addressFromString(valueOrErrorMessage(getString(ada()), "no addons")), "addon address in not valid")
742+        let check = reentrantInvoke(addonContract, "ensureCanGetOneTkn", [toString(userAddress)], nil)
743+        if ((check == check))
744+            then if ((1000000000 > pmtAmt))
745+                then throw("Min pmt 10 LP")
746+                else if (if (if ((0 > slippage))
747+                    then true
748+                    else (0 > exchResult))
749+                    then true
750+                    else (0 > outAmount))
751+                    then throw("Wrong params")
752+                    else if ((lpId != toBase58String(pmtAssetId)))
753+                        then throw("Wrong LP")
754+                        else {
755+                            let r = ego(toBase58String(i.transactionId), toBase58String(pmtAssetId), pmtAmt, i.caller)
756+                            let estimAmAmt = r._1
757+                            let estimPrAmt = r._2
758+                            let amBalance = getAccBalance(amId)
759+                            let prBalance = getAccBalance(prId)
760+                            let $t03046630923 = if ((outAssetId == amId))
761+                                then $Tuple7((amBalance - estimAmAmt), (prBalance - estimPrAmt), exchResult, estimPrAmt, 0, 0, (estimAmAmt + exchResult))
762+                                else if ((outAssetId == prId))
763+                                    then $Tuple7((amBalance - estimAmAmt), (prBalance - estimPrAmt), 0, 0, exchResult, estimAmAmt, (estimPrAmt + exchResult))
764+                                    else throw("wrong outAssetId")
765+                            let amBalanceNow = $t03046630923._1
766+                            let prBalanceNow = $t03046630923._2
767+                            let virtSwapInAm = $t03046630923._3
768+                            let virtSwapOutPr = $t03046630923._4
769+                            let virtSwapInPr = $t03046630923._5
770+                            let virtSwapOutAm = $t03046630923._6
771+                            let totalGet = $t03046630923._7
772+                            if (if ((0 > virtSwapInAm))
773+                                then true
774+                                else (0 > virtSwapInPr))
775+                                then throw("Wrong calc")
776+                                else {
777+                                    let D0 = invoke(gwxCntr, "calcD", [toString(amBalanceNow), toString(prBalanceNow), A, Amult, Dconv], nil)
778+                                    let D1 = invoke(gwxCntr, "calcD", [toString(((amBalanceNow - virtSwapInAm) + virtSwapOutAm)), toString(((prBalanceNow + virtSwapOutPr) - virtSwapInPr)), A, Amult, Dconv], nil)
779+                                    let D0vsD1 = vd(parseBigIntValue(str(D1)), parseBigIntValue(str(D0)), slippage4D)
780+                                    if ((D0vsD1 == D0vsD1))
781+                                        then {
782+                                            let finalRes = vad(toBigInt(totalGet), toBigInt(outAmount), toBigInt(slippage))
783+                                            if ((finalRes == finalRes))
784+                                                then {
785+                                                    let $t03162831732 = if ((outAssetId == amId))
786+                                                        then $Tuple2(toInt(finalRes._2), 0)
787+                                                        else $Tuple2(0, toInt(finalRes._2))
788+                                                    let outAm = $t03162831732._1
789+                                                    let outPr = $t03162831732._2
790+                                                    let curPrX18 = cpbi(t1(prBalance, prDcm), t1(amBalance, amDcm))
791+                                                    let curPr = f1(curPrX18, scale8)
792+                                                    let state = [ScriptTransfer(userAddress, (outAm + outPr), if ((outAssetId == "WAVES"))
793+                                                        then unit
794+                                                        else fromBase58String(outAssetId)), StringEntry(gau(toString(userAddress), txId58), dataGetActionInfo(outAm, outPr, pmtAmt, curPr, height, lastBlock.timestamp)), IntegerEntry(pl(), curPr), IntegerEntry(ph(height, lastBlock.timestamp), curPr)]
795+                                                    if ((state == state))
796+                                                        then {
797+                                                            let burn = invoke(fca, "burn", [pmtAmt], [AttachedPayment(pmtAssetId, pmtAmt)])
798+                                                            if ((burn == burn))
799+                                                                then state
800+                                                                else throw("Strict value is not equal to itself.")
801+                                                            }
802+                                                        else throw("Strict value is not equal to itself.")
803+                                                    }
804+                                                else throw("Strict value is not equal to itself.")
805+                                            }
806+                                        else throw("Strict value is not equal to itself.")
807+                                    }
808+                            }
809+            else throw("Strict value is not equal to itself.")
859810         }
860811 
861812 
862813 
863814 @Callable(i)
864815 func getNoLess (noLessThenAmtAsset,noLessThenPriceAsset) = {
865-    let r = commonGet(i)
866-    let outAmountAmount = r._1
867-    let outPriceAmount = r._2
868-    let paymentAmount = r._3
869-    let paymentAssetId = r._4
816+    let r = cg(i)
817+    let outAmAmt = r._1
818+    let outPrAmt = r._2
819+    let pmtAmt = r._3
820+    let pmtAssetId = r._4
870821     let state = r._5
871-    let checkOutAmountAmount = if ((outAmountAmount >= noLessThenAmtAsset))
872-        then true
873-        else throwErr(((("Failed:  " + toString(outAmountAmount)) + " < ") + toString(noLessThenAmtAsset)))
874-    if ((checkOutAmountAmount == checkOutAmountAmount))
875-        then {
876-            let checkOutPriceAmount = if ((outPriceAmount >= noLessThenPriceAsset))
877-                then true
878-                else throwErr(((("Failed: " + toString(outPriceAmount)) + " < ") + toString(noLessThenPriceAsset)))
879-            if ((checkOutPriceAmount == checkOutPriceAmount))
880-                then {
881-                    let burnLPAssetOnFactory = invoke(factoryContract, "burn", [paymentAmount], [AttachedPayment(paymentAssetId, paymentAmount)])
882-                    if ((burnLPAssetOnFactory == burnLPAssetOnFactory))
883-                        then state
884-                        else throw("Strict value is not equal to itself.")
885-                    }
886-                else throw("Strict value is not equal to itself.")
887-            }
888-        else throw("Strict value is not equal to itself.")
822+    if ((noLessThenAmtAsset > outAmAmt))
823+        then throw(((("Failed:  " + toString(outAmAmt)) + " < ") + toString(noLessThenAmtAsset)))
824+        else if ((noLessThenPriceAsset > outPrAmt))
825+            then throw(((("Failed: " + toString(outPrAmt)) + " < ") + toString(noLessThenPriceAsset)))
826+            else {
827+                let burnLPAssetOnFactory = invoke(fca, "burn", [pmtAmt], [AttachedPayment(pmtAssetId, pmtAmt)])
828+                if ((burnLPAssetOnFactory == burnLPAssetOnFactory))
829+                    then state
830+                    else throw("Strict value is not equal to itself.")
831+                }
889832     }
890833 
891834 
892835 
893836 @Callable(i)
894837 func unstakeAndGet (amount) = {
895838     let checkPayments = if ((size(i.payments) != 0))
896-        then throwErr("no payments expected")
839+        then throw("No pmnts expd")
897840         else true
898841     if ((checkPayments == checkPayments))
899842         then {
900-            let cfg = getPoolConfig()
901-            let factoryCfg = getFactoryConfig()
843+            let cfg = gpc()
844+            let factoryCfg = gfc()
902845             let lpAssetId = fromBase58String(cfg[idxLPAsId])
903-            let staking = valueOrErrorMessage(addressFromString(factoryCfg[idxFactStakCntr]), "wrong")
846+            let staking = valueOrErrorMessage(addressFromString(factoryCfg[idxFactStakCntr]), "Wr st addr")
904847             let unstakeInv = invoke(staking, "unstake", [toBase58String(lpAssetId), amount], nil)
905848             if ((unstakeInv == unstakeInv))
906849                 then {
907-                    let r = estimateGetOperation(toBase58String(i.transactionId), toBase58String(lpAssetId), amount, i.caller)
850+                    let r = ego(toBase58String(i.transactionId), toBase58String(lpAssetId), amount, i.caller)
908851                     let sts = parseIntValue(r._9)
909852                     let state = r._10
910-                    let v = if (if (isGlobalShutdown())
853+                    let v = if (if (igs())
911854                         then true
912855                         else (sts == PoolShutdown))
913-                        then throwErr(("Blocked: " + toString(sts)))
856+                        then throw(("Blocked: " + toString(sts)))
914857                         else true
915858                     if ((v == v))
916859                         then {
917-                            let burnA = invoke(factoryContract, "burn", [amount], [AttachedPayment(lpAssetId, amount)])
860+                            let burnA = invoke(fca, "burn", [amount], [AttachedPayment(lpAssetId, amount)])
918861                             if ((burnA == burnA))
919862                                 then state
920863                                 else throw("Strict value is not equal to itself.")
921864                             }
922865                         else throw("Strict value is not equal to itself.")
923866                     }
924867                 else throw("Strict value is not equal to itself.")
925868             }
926869         else throw("Strict value is not equal to itself.")
927870     }
928871 
929872 
930873 
931874 @Callable(i)
932-func activate (amtAsStr,prAsStr) = if ((toString(i.caller) != toString(factoryContract)))
933-    then throwErr("denied")
934-    else $Tuple2([StringEntry(keyAmountAsset(), amtAsStr), StringEntry(keyPriceAsset(), prAsStr)], "success")
875+func activate (amtAsStr,prAsStr) = if ((toString(i.caller) != toString(fca)))
876+    then throw("denied")
877+    else $Tuple2([StringEntry(aa(), amtAsStr), StringEntry(pa(), prAsStr)], "success")
935878 
936879 
937880 
938881 @Callable(i)
939-func setS (k,v) = if ((toString(i.caller) != getStringOrFail(this, keyAddonAddress())))
882+func setS (k,v) = if ((toString(i.caller) != strf(this, ada())))
940883     then pd
941884     else [StringEntry(k, v)]
942885 
943886 
944887 
945888 @Callable(i)
946-func setI (k,v) = if ((toString(i.caller) != getStringOrFail(this, keyAddonAddress())))
889+func setI (k,v) = if ((toString(i.caller) != strf(this, ada())))
947890     then pd
948891     else [IntegerEntry(k, v)]
949892 
950893 
951894 
952895 @Callable(i)
953-func getPoolConfigWrapperREADONLY () = $Tuple2(nil, getPoolConfig())
896+func getPoolConfigWrapperREADONLY () = $Tuple2(nil, gpc())
954897 
955898 
956899 
957900 @Callable(i)
958901 func getAccBalanceWrapperREADONLY (assetId) = $Tuple2(nil, getAccBalance(assetId))
959902 
960903 
961904 
962905 @Callable(i)
963906 func calcPricesWrapperREADONLY (amAmt,prAmt,lpAmt) = {
964907     let pr = calcPrices(amAmt, prAmt, lpAmt)
965908     $Tuple2(nil, [toString(pr[0]), toString(pr[1]), toString(pr[2])])
966909     }
967910 
968911 
969912 
970913 @Callable(i)
971-func fromX18WrapperREADONLY (val,resScaleMult) = $Tuple2(nil, fromX18(parseBigIntValue(val), resScaleMult))
914+func fromX18WrapperREADONLY (val,resScaleMult) = $Tuple2(nil, f1(parseBigIntValue(val), resScaleMult))
972915 
973916 
974917 
975918 @Callable(i)
976-func toX18WrapperREADONLY (origVal,origScaleMult) = $Tuple2(nil, toString(toX18(origVal, origScaleMult)))
919+func toX18WrapperREADONLY (origVal,origScaleMult) = $Tuple2(nil, toString(t1(origVal, origScaleMult)))
977920 
978921 
979922 
980923 @Callable(i)
981-func calcPriceBigIntWrapperREADONLY (prAmtX18,amAmtX18) = $Tuple2(nil, toString(calcPriceBigInt(parseBigIntValue(prAmtX18), parseBigIntValue(amAmtX18))))
924+func calcPriceBigIntWrapperREADONLY (prAmtX18,amAmtX18) = $Tuple2(nil, toString(cpbi(parseBigIntValue(prAmtX18), parseBigIntValue(amAmtX18))))
982925 
983926 
984927 
985928 @Callable(i)
986-func estimatePutOperationWrapperREADONLY (txId58,slippage,inAmountAssetAmount,inAmId,inPriceAssetAmount,inPrId,usrAddr,isEvaluate,emitLp) = $Tuple2(nil, estimatePutOperation(txId58, slippage, inAmountAssetAmount, inAmId, inPriceAssetAmount, inPrId, usrAddr, isEvaluate, emitLp, false, 0, ""))
929+func estimatePutOperationWrapperREADONLY (txId58,slippage,inAmAmt,inAmId,inPrAmt,inPrId,usrAddr,isEval,emitLp) = $Tuple2(nil, epo(txId58, slippage, inAmAmt, inAmId, inPrAmt, inPrId, usrAddr, isEval, emitLp, false, 0, ""))
987930 
988931 
989932 
990933 @Callable(i)
991-func estimateGetOperationWrapperREADONLY (txId58,paymentAsId,paymentLpAmount,usrAddr) = {
992-    let r = estimateGetOperation(txId58, paymentAsId, paymentLpAmount, addressFromStringValue(usrAddr))
934+func estimateGetOperationWrapperREADONLY (txId58,pmtAsId,pmtLpAmt,usrAddr) = {
935+    let r = ego(txId58, pmtAsId, pmtLpAmt, addressFromStringValue(usrAddr))
993936     $Tuple2(nil, $Tuple10(r._1, r._2, r._3, r._4, r._5, r._6, r._7, toString(r._8), r._9, r._10))
994937     }
995938 
996939 
997940 @Verifier(tx)
998-func verify () = match tx {
999-    case order: Order => 
1000-        let mtchPub = getMatcherPubOrFail()
1001-        let orV = validateMatcherOrderAllowed(order)
1002-        let sndrV = sigVerify(order.bodyBytes, order.proofs[0], order.senderPublicKey)
1003-        let mtchV = sigVerify(order.bodyBytes, order.proofs[1], mtchPub)
1004-        if (if (if (orV)
1005-            then sndrV
1006-            else false)
1007-            then mtchV
1008-            else false)
1009-            then true
1010-            else throwOrderError(orV, sndrV, mtchV)
1011-    case _ => 
1012-        let targetPublicKey =         match managerPublicKeyOrUnit() {
1013-            case pk: ByteVector => 
1014-                pk
1015-            case _: Unit => 
1016-                tx.senderPublicKey
1017-            case _ => 
1018-                throw("Match error")
1019-        }
1020-        sigVerify(tx.bodyBytes, tx.proofs[0], targetPublicKey)
1021-}
941+func verify () = {
942+    let targetPublicKey =     match m() {
943+        case pk: ByteVector => 
944+            pk
945+        case _: Unit => 
946+            tx.senderPublicKey
947+        case _ => 
948+            throw("Match error")
949+    }
950+    match tx {
951+        case order: Order => 
952+            let matcherPub = mp()
953+            let orderValid = moa(order)
954+            let senderValid = sigVerify(order.bodyBytes, order.proofs[0], order.senderPublicKey)
955+            let matcherValid = sigVerify(order.bodyBytes, order.proofs[1], matcherPub)
956+            if (if (if (orderValid)
957+                then senderValid
958+                else false)
959+                then matcherValid
960+                else false)
961+                then true
962+                else toe(orderValid, senderValid, matcherValid)
963+        case s: SetScriptTransaction => 
964+            let newHash = blake2b256(value(s.script))
965+            let allowedHash = fromBase64String(value(getString(fca, keyAllowedLpStableScriptHash())))
966+            let currentHash = scriptHash(this)
967+            if (if ((allowedHash == newHash))
968+                then (currentHash != newHash)
969+                else false)
970+                then true
971+                else sigVerify(tx.bodyBytes, tx.proofs[0], targetPublicKey)
972+        case _ => 
973+            sigVerify(tx.bodyBytes, tx.proofs[0], targetPublicKey)
974+    }
975+    }
1022976 
github/deemru/w8io/169f3d6 
190.14 ms ◑