tx · 6ARjEzFb9Ny3m2AjSEVvzyk6kXEHfcX59bafUAQft86N

3MyeMZm2BLBkcgK2VBeTU8h1n562iB3zA2Z:  -0.02900000 Waves

2022.09.12 08:17 [2225450] smart account 3MyeMZm2BLBkcgK2VBeTU8h1n562iB3zA2Z > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "6ARjEzFb9Ny3m2AjSEVvzyk6kXEHfcX59bafUAQft86N",
    "fee": 2900000,
    "feeAssetId": null,
    "timestamp": 1662959881305,
    "version": 2,
    "chainId": 84,
    "sender": "3MyeMZm2BLBkcgK2VBeTU8h1n562iB3zA2Z",
    "senderPublicKey": "5bHbDgAVwbyzkor8HrHKU8zcg5RfwKy3rNihVqk8YUvP",
    "proofs": [
        "4venNYWWqZNve2BxfsKhot5kH3njRcBCNvtC2EbJ2tevFTxoLD7XY2A2jxECuzBPwLPdjZoAQsxchPcxbQbAXKFF"
    ],
    "script": "base64:BgJ/CAISAwoBCBIDCgEIEgASBAoCAQQSBwoFAQEBAQQSAwoBARIAEgcKBQEBAQgBEgQKAgEBEgMKAQESBAoCCAgSBAoCCAgSBAoCCAESABIDCgEIEgUKAwEBARIECgIIARIECgIBARIECgIICBILCgkIAQECAQIIBAQSBgoECAgBCE8AD2RlZmF1bHREZWNpbWFscwCAwtcvAAZzY2FsZTgAgMLXLwAMc2NhbGU4QmlnSW50CQC2AgEAgMLXLwAHc2NhbGUxOAkAtgIBAICAkLu61q3wDQAKemVyb0JpZ0ludAkAtgIBAAAACW9uZUJpZ0ludAkAtgIBAAEACnNsaXBwYWdlNEQJALYCAQkAZQIFBnNjYWxlOAkAaQIJAGgCBQZzY2FsZTgAAQUGc2NhbGU4AAVBbXVsdAIDMTAwAAVEY29udgIBMQADU0VQAgJfXwAFRU1QVFkCAAAKUG9vbEFjdGl2ZQABAApQb29sUHV0RGlzAAIADlBvb2xNYXRjaGVyRGlzAAMADFBvb2xTaHV0ZG93bgAEAA5pZHhQb29sQWRkcmVzcwABAAlpZHhQb29sU3QAAgAJaWR4TFBBc0lkAAMACWlkeEFtQXNJZAAEAAlpZHhQckFzSWQABQALaWR4QW10QXNEY20ABgANaWR4UHJpY2VBc0RjbQAHAAtpZHhJQW10QXNJZAAIAA1pZHhJUHJpY2VBc0lkAAkAD2lkeEZhY3RTdGFrQ250cgABABBpZHhGYWN0U2xpcHBDbnRyAAcAEWlkeEZhY3RHd3hSZXdDbnRyAAoABWRlbGF5Agklc19fZGVsYXkBAnQxAgdvcmlnVmFsDW9yaWdTY2FsZU11bHQJALwCAwkAtgIBBQdvcmlnVmFsBQdzY2FsZTE4CQC2AgEFDW9yaWdTY2FsZU11bHQBAmYxAgN2YWwPcmVzdWx0U2NhbGVNdWx0CQCgAwEJALwCAwUDdmFsCQC2AgEFD3Jlc3VsdFNjYWxlTXVsdAUHc2NhbGUxOAECdHMDA2FtdAhyZXNTY2FsZQhjdXJTY2FsZQkAawMFA2FtdAUIcmVzU2NhbGUFCGN1clNjYWxlAQNhYnMBA3ZhbAMJAL8CAgUKemVyb0JpZ0ludAUDdmFsCQC+AgEFA3ZhbAUDdmFsAQJmYwACEyVzX19mYWN0b3J5Q29udHJhY3QBA21wawACFCVzX19tYW5hZ2VyUHVibGljS2V5AQRwbXBrAAIbJXNfX3BlbmRpbmdNYW5hZ2VyUHVibGljS2V5AQJwbAACESVzJXNfX3ByaWNlX19sYXN0AQJwaAIBaAF0CQC5CQIJAMwIAgIYJXMlcyVkJWRfX3ByaWNlX19oaXN0b3J5CQDMCAIJAKQDAQUBaAkAzAgCCQCkAwEFAXQFA25pbAUDU0VQAQNwYXUCAnVhBHR4SWQJAKwCAgkArAICCQCsAgICCyVzJXMlc19fUF9fBQJ1YQICX18FBHR4SWQBA2dhdQICdWEEdHhJZAkArAICCQCsAgIJAKwCAgILJXMlcyVzX19HX18FAnVhAgJfXwUEdHhJZAECYWEAAg8lc19fYW1vdW50QXNzZXQBAnBhAAIOJXNfX3ByaWNlQXNzZXQBA2FtcAACByVzX19hbXABA2FkYQACDSVzX19hZGRvbkFkZHIBBWxnb3RjAQZjYWxsZXIJALkJAgkAzAgCAhclcyVzX19sYXN0R2V0T25lVGtuQ2FsbAkAzAgCBQZjYWxsZXIFA25pbAUDU0VQAQVsc290YwEGY2FsbGVyCQC5CQIJAMwIAgIXJXMlc19fbGFzdFB1dE9uZVRrbkNhbGwJAMwIAgUGY2FsbGVyBQNuaWwFA1NFUAEEZmNmZwACESVzX19mYWN0b3J5Q29uZmlnAQRtdHBrAAIYJXMlc19fbWF0Y2hlcl9fcHVibGljS2V5AQJwYwIGaUFtdEFzBWlQckFzCQCsAgIJAKwCAgkArAICCQCsAgICCCVkJWQlc19fBQZpQW10QXMCAl9fBQVpUHJBcwIIX19jb25maWcBA21iYQEFYkFTdHIJAKwCAgIoJXMlcyVzX19tYXBwaW5nc19fYmFzZUFzc2V0MmludGVybmFsSWRfXwUFYkFTdHIBA2FwcwACDCVzX19zaHV0ZG93bgEca2V5QWxsb3dlZExwU3RhYmxlU2NyaXB0SGFzaAACHSVzX19hbGxvd2VkTHBTdGFibGVTY3JpcHRIYXNoAQN0b2UDA29yVgZzZW5kclYGbWF0Y2hWCQACAQkArAICCQCsAgIJAKwCAgkArAICCQCsAgICEUZhaWxlZDogb3JkVmFsaWQ9CQClAwEFA29yVgILIHNuZHJWYWxpZD0JAKUDAQUGc2VuZHJWAgwgbXRjaHJWYWxpZD0JAKUDAQUGbWF0Y2hWAQNzdHIBA3ZhbAQHJG1hdGNoMAUDdmFsAwkAAQIFByRtYXRjaDACBlN0cmluZwQGdmFsU3RyBQckbWF0Y2gwBQZ2YWxTdHIJAAIBAhNmYWlsIGNhc3QgdG8gU3RyaW5nAQRzdHJmAgRhZGRyA2tleQkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCdCAIFBGFkZHIFA2tleQkAuQkCCQDMCAICCm1hbmRhdG9yeSAJAMwIAgkApQgBBQRhZGRyCQDMCAICAS4JAMwIAgUDa2V5CQDMCAICDCBub3QgZGVmaW5lZAUDbmlsAgABBGludGYCBGFkZHIDa2V5CQETdmFsdWVPckVycm9yTWVzc2FnZQIJAJoIAgUEYWRkcgUDa2V5CQC5CQIJAMwIAgIKbWFuZGF0b3J5IAkAzAgCCQClCAEFBGFkZHIJAMwIAgIBLgkAzAgCBQNrZXkJAMwIAgIMIG5vdCBkZWZpbmVkBQNuaWwCAAADZmNhCQERQGV4dHJOYXRpdmUoMTA2MikBCQEEc3RyZgIFBHRoaXMJAQJmYwAAAUEJAQRzdHJmAgUEdGhpcwkBA2FtcAABA2lncwAJAQt2YWx1ZU9yRWxzZQIJAJsIAgUDZmNhCQEDYXBzAAcBAm1wAAkA2QQBCQEEc3RyZgIFA2ZjYQkBBG10cGsAAQNncGMABAVhbXRBcwkBBHN0cmYCBQR0aGlzCQECYWEABAdwcmljZUFzCQEEc3RyZgIFBHRoaXMJAQJwYQAECGlQcmljZUFzCQEEaW50ZgIFA2ZjYQkBA21iYQEFB3ByaWNlQXMEBmlBbXRBcwkBBGludGYCBQNmY2EJAQNtYmEBBQVhbXRBcwkAtQkCCQEEc3RyZgIFA2ZjYQkBAnBjAgkApAMBBQZpQW10QXMJAKQDAQUIaVByaWNlQXMFA1NFUAEDZ2ZjAAkAtQkCCQEEc3RyZgIFA2ZjYQkBBGZjZmcABQNTRVABEWRhdGFQdXRBY3Rpb25JbmZvCg1pbkFtdEFzc2V0QW10D2luUHJpY2VBc3NldEFtdAhvdXRMcEFtdAVwcmljZQpzbGlwQnlVc2VyDHNsaXBwYWdlUmVhbAh0eEhlaWdodAt0eFRpbWVzdGFtcAxzbGlwYWdlQW1BbXQMc2xpcGFnZVByQW10CQC5CQIJAMwIAgIUJWQlZCVkJWQlZCVkJWQlZCVkJWQJAMwIAgkApAMBBQ1pbkFtdEFzc2V0QW10CQDMCAIJAKQDAQUPaW5QcmljZUFzc2V0QW10CQDMCAIJAKQDAQUIb3V0THBBbXQJAMwIAgkApAMBBQVwcmljZQkAzAgCCQCkAwEFCnNsaXBCeVVzZXIJAMwIAgkApAMBBQxzbGlwcGFnZVJlYWwJAMwIAgkApAMBBQh0eEhlaWdodAkAzAgCCQCkAwEFC3R4VGltZXN0YW1wCQDMCAIJAKQDAQUMc2xpcGFnZUFtQW10CQDMCAIJAKQDAQUMc2xpcGFnZVByQW10BQNuaWwFA1NFUAERZGF0YUdldEFjdGlvbkluZm8GDm91dEFtdEFzc2V0QW10EG91dFByaWNlQXNzZXRBbXQHaW5McEFtdAVwcmljZQh0eEhlaWdodAt0eFRpbWVzdGFtcAkAuQkCCQDMCAICDCVkJWQlZCVkJWQlZAkAzAgCCQCkAwEFDm91dEFtdEFzc2V0QW10CQDMCAIJAKQDAQUQb3V0UHJpY2VBc3NldEFtdAkAzAgCCQCkAwEFB2luTHBBbXQJAMwIAgkApAMBBQVwcmljZQkAzAgCCQCkAwEFCHR4SGVpZ2h0CQDMCAIJAKQDAQULdHhUaW1lc3RhbXAFA25pbAUDU0VQAQ1nZXRBY2NCYWxhbmNlAQdhc3NldElkAwkAAAIFB2Fzc2V0SWQCBVdBVkVTCAkA7wcBBQR0aGlzCWF2YWlsYWJsZQkA8AcCBQR0aGlzCQDZBAEFB2Fzc2V0SWQBBGNwYmkCCHByQW10WDE4CGFtQW10WDE4CQC8AgMFCHByQW10WDE4BQdzY2FsZTE4BQhhbUFtdFgxOAEDdmFkAwJBMQJBMghzbGlwcGFnZQQEZGlmZgkAvAIDCQC4AgIFAkExBQJBMgUMc2NhbGU4QmlnSW50BQJBMgQEcGFzcwkAvwICCQC4AgIFCHNsaXBwYWdlCQEDYWJzAQUEZGlmZgUKemVyb0JpZ0ludAMJAQEhAQUEcGFzcwkAAgEJAKwCAgIKQmlnIHNscGc6IAkApgMBBQRkaWZmCQCUCgIFBHBhc3MJAJkDAQkAzAgCBQJBMQkAzAgCBQJBMgUDbmlsAQJ2ZAMCRDECRDAEc2xwZwQEZGlmZgkAvAIDBQJEMAUMc2NhbGU4QmlnSW50BQJEMQQEZmFpbAkAvwICBQRzbHBnBQRkaWZmAwMFBGZhaWwGCQC/AgIFAkQwBQJEMQkAAgEJAKwCAgkArAICCQCsAgIJAKwCAgkArAICCQCsAgIJAKYDAQUCRDACASAJAKYDAQUCRDECASAJAKYDAQUEZGlmZgIBIAkApgMBBQRzbHBnBQRmYWlsAQNwY3AECmFtQXNzZXREY20KcHJBc3NldERjbQVhbUFtdAVwckFtdAQLYW10QXNBbXRYMTgJAQJ0MQIFBWFtQW10BQphbUFzc2V0RGNtBApwckFzQW10WDE4CQECdDECBQVwckFtdAUKcHJBc3NldERjbQkBBGNwYmkCBQpwckFzQW10WDE4BQthbXRBc0FtdFgxOAEKY2FsY1ByaWNlcwMFYW1BbXQFcHJBbXQFbHBBbXQEA2NmZwkBA2dwYwAECGFtdEFzRGNtCQENcGFyc2VJbnRWYWx1ZQEJAJEDAgUDY2ZnBQtpZHhBbXRBc0RjbQQHcHJBc0RjbQkBDXBhcnNlSW50VmFsdWUBCQCRAwIFA2NmZwUNaWR4UHJpY2VBc0RjbQQIcHJpY2VYMTgJAQNwY3AEBQhhbXRBc0RjbQUHcHJBc0RjbQUFYW1BbXQFBXByQW10BAhhbUFtdFgxOAkBAnQxAgUFYW1BbXQFCGFtdEFzRGNtBAhwckFtdFgxOAkBAnQxAgUFcHJBbXQFB3ByQXNEY20ECGxwQW10WDE4CQECdDECBQVscEFtdAUGc2NhbGU4BA1scFBySW5BbUFzWDE4CQEEY3BiaQIFCGFtQW10WDE4BQhscEFtdFgxOAQNbHBQckluUHJBc1gxOAkBBGNwYmkCBQhwckFtdFgxOAUIbHBBbXRYMTgJAMwIAgUIcHJpY2VYMTgJAMwIAgUNbHBQckluQW1Bc1gxOAkAzAgCBQ1scFBySW5QckFzWDE4BQNuaWwBD2NhbGN1bGF0ZVByaWNlcwMFYW1BbXQFcHJBbXQFbHBBbXQEAXAJAQpjYWxjUHJpY2VzAwUFYW1BbXQFBXByQW10BQVscEFtdAkAzAgCCQECZjECCQCRAwIFAXAAAAUGc2NhbGU4CQDMCAIJAQJmMQIJAJEDAgUBcAABBQZzY2FsZTgJAMwIAgkBAmYxAgkAkQMCBQFwAAIFBnNjYWxlOAUDbmlsAQNlZ28EBnR4SWQ1OApwbXRBc3NldElkCHBtdExwQW10C3VzZXJBZGRyZXNzBANjZmcJAQNncGMABARscElkCQCRAwIFA2NmZwUJaWR4TFBBc0lkBARhbUlkCQCRAwIFA2NmZwUJaWR4QW1Bc0lkBARwcklkCQCRAwIFA2NmZwUJaWR4UHJBc0lkBAVhbURjbQkBDXBhcnNlSW50VmFsdWUBCQCRAwIFA2NmZwULaWR4QW10QXNEY20EBXByRGNtCQENcGFyc2VJbnRWYWx1ZQEJAJEDAgUDY2ZnBQ1pZHhQcmljZUFzRGNtBANzdHMJAJEDAgUDY2ZnBQlpZHhQb29sU3QEB2xwRW1pc3MICQETdmFsdWVPckVycm9yTWVzc2FnZQIJAOwHAQkA2QQBBQRscElkAgtXcm9uZyBMUCBpZAhxdWFudGl0eQMJAQIhPQIFBGxwSWQFCnBtdEFzc2V0SWQJAAIBAg9Xcm9uZyBwbXQgYXNzZXQECWFtQmFsYW5jZQkBDWdldEFjY0JhbGFuY2UBBQRhbUlkBAlwckJhbGFuY2UJAQ1nZXRBY2NCYWxhbmNlAQUEcHJJZAQcYW1vdW50QmFsYW5jZURlZmF1bHREZWNpbWFscwkAawMFCWFtQmFsYW5jZQUPZGVmYXVsdERlY2ltYWxzBQVhbURjbQQbcHJpY2VCYWxhbmNlRGVmYXVsdERlY2ltYWxzCQBrAwUJcHJCYWxhbmNlBQ9kZWZhdWx0RGVjaW1hbHMFBXByRGNtBAxhbUJhbGFuY2VYMTgJAQJ0MQIFHGFtb3VudEJhbGFuY2VEZWZhdWx0RGVjaW1hbHMFD2RlZmF1bHREZWNpbWFscwQMcHJCYWxhbmNlWDE4CQECdDECBRtwcmljZUJhbGFuY2VEZWZhdWx0RGVjaW1hbHMFD2RlZmF1bHREZWNpbWFscwQLY3VyUHJpY2VYMTgJAQRjcGJpAgUMcHJCYWxhbmNlWDE4BQxhbUJhbGFuY2VYMTgECGN1clByaWNlCQECZjECBQtjdXJQcmljZVgxOAUGc2NhbGU4BAtwbXRMcEFtdFgxOAkBAnQxAgUIcG10THBBbXQFBnNjYWxlOAQKbHBFbWlzc1gxOAkBAnQxAgUHbHBFbWlzcwUGc2NhbGU4BAtvdXRBbUFtdFgxOAkAvAIDBQxhbUJhbGFuY2VYMTgFC3BtdExwQW10WDE4BQpscEVtaXNzWDE4BAtvdXRQckFtdFgxOAkAvAIDBQxwckJhbGFuY2VYMTgFC3BtdExwQW10WDE4BQpscEVtaXNzWDE4BB5vdXRBbW91bnRBbW91bnREZWZhdWx0RGVjaW1hbHMJAQJmMQIFC291dEFtQW10WDE4BQ9kZWZhdWx0RGVjaW1hbHMEHW91dFByaWNlQW1vdW50RGVmYXVsdERlY2ltYWxzCQECZjECBQtvdXRQckFtdFgxOAUPZGVmYXVsdERlY2ltYWxzBAhvdXRBbUFtdAkAawMFHm91dEFtb3VudEFtb3VudERlZmF1bHREZWNpbWFscwUFYW1EY20FD2RlZmF1bHREZWNpbWFscwQIb3V0UHJBbXQJAGsDBR1vdXRQcmljZUFtb3VudERlZmF1bHREZWNpbWFscwUFcHJEY20FD2RlZmF1bHREZWNpbWFscwQFc3RhdGUDCQAAAgUGdHhJZDU4AgAFA25pbAkAzAgCCQEOU2NyaXB0VHJhbnNmZXIDBQt1c2VyQWRkcmVzcwUIb3V0QW1BbXQDCQAAAgUEYW1JZAIFV0FWRVMFBHVuaXQJANkEAQUEYW1JZAkAzAgCCQEOU2NyaXB0VHJhbnNmZXIDBQt1c2VyQWRkcmVzcwUIb3V0UHJBbXQDCQAAAgUEcHJJZAIFV0FWRVMFBHVuaXQJANkEAQUEcHJJZAkAzAgCCQELU3RyaW5nRW50cnkCCQEDZ2F1AgkApQgBBQt1c2VyQWRkcmVzcwUGdHhJZDU4CQERZGF0YUdldEFjdGlvbkluZm8GBQhvdXRBbUFtdAUIb3V0UHJBbXQFCHBtdExwQW10BQhjdXJQcmljZQUGaGVpZ2h0CAUJbGFzdEJsb2NrCXRpbWVzdGFtcAkAzAgCCQEMSW50ZWdlckVudHJ5AgkBAnBsAAUIY3VyUHJpY2UJAMwIAgkBDEludGVnZXJFbnRyeQIJAQJwaAIFBmhlaWdodAgFCWxhc3RCbG9jawl0aW1lc3RhbXAFCGN1clByaWNlBQNuaWwJAJwKCgUIb3V0QW1BbXQFCG91dFByQW10BQRhbUlkBQRwcklkBQlhbUJhbGFuY2UFCXByQmFsYW5jZQUHbHBFbWlzcwULY3VyUHJpY2VYMTgFA3N0cwUFc3RhdGUBA2VwbwwGdHhJZDU4CHNsaXBwYWdlB2luQW1BbXQGaW5BbUlkB2luUHJBbXQGaW5QcklkC3VzZXJBZGRyZXNzBmlzRXZhbAZlbWl0THAKaXNPbmVBc3NldAZwbXRBbXQFcG10SWQEA2NmZwkBA2dwYwAEBGxwSWQJANkEAQkAkQMCBQNjZmcFCWlkeExQQXNJZAQHYW1JZFN0cgkAkQMCBQNjZmcFCWlkeEFtQXNJZAQHcHJJZFN0cgkAkQMCBQNjZmcFCWlkeFByQXNJZAQJaW5BbUlkU3RyCQCRAwIFA2NmZwULaWR4SUFtdEFzSWQECWluUHJJZFN0cgkAkQMCBQNjZmcFDWlkeElQcmljZUFzSWQEBmFtdERjbQkBDXBhcnNlSW50VmFsdWUBCQCRAwIFA2NmZwULaWR4QW10QXNEY20ECHByaWNlRGNtCQENcGFyc2VJbnRWYWx1ZQEJAJEDAgUDY2ZnBQ1pZHhQcmljZUFzRGNtBANzdHMJAJEDAgUDY2ZnBQlpZHhQb29sU3QEBGxwRW0ICQETdmFsdWVPckVycm9yTWVzc2FnZQIJAOwHAQUEbHBJZAIIV3IgbHAgYXMIcXVhbnRpdHkECWFtQmFsYW5jZQMFBmlzRXZhbAkBDWdldEFjY0JhbGFuY2UBBQdhbUlkU3RyAwMFCmlzT25lQXNzZXQJAAACBQVwbXRJZAUHYW1JZFN0cgcJAGUCCQENZ2V0QWNjQmFsYW5jZQEFB2FtSWRTdHIFBnBtdEFtdAMFCmlzT25lQXNzZXQJAQ1nZXRBY2NCYWxhbmNlAQUHYW1JZFN0cgkAZQIJAQ1nZXRBY2NCYWxhbmNlAQUHYW1JZFN0cgUHaW5BbUFtdAQJcHJCYWxhbmNlAwUGaXNFdmFsCQENZ2V0QWNjQmFsYW5jZQEFB3BySWRTdHIDAwUKaXNPbmVBc3NldAkAAAIFBXBtdElkBQdwcklkU3RyBwkAZQIJAQ1nZXRBY2NCYWxhbmNlAQUHcHJJZFN0cgUGcG10QW10AwUKaXNPbmVBc3NldAkBDWdldEFjY0JhbGFuY2UBBQdwcklkU3RyCQBlAgkBDWdldEFjY0JhbGFuY2UBBQdwcklkU3RyBQdpblByQW10BBxhbW91bnRCYWxhbmNlRGVmYXVsdERlY2ltYWxzCQBrAwUJYW1CYWxhbmNlBQ9kZWZhdWx0RGVjaW1hbHMFBmFtdERjbQQbcHJpY2VCYWxhbmNlRGVmYXVsdERlY2ltYWxzCQBrAwUJcHJCYWxhbmNlBQ9kZWZhdWx0RGVjaW1hbHMFCHByaWNlRGNtBCJpbkFtb3VudEFzc2V0QW1vdW50RGVmYXVsdERlY2ltYWxzCQBrAwUHaW5BbUFtdAUPZGVmYXVsdERlY2ltYWxzBQZhbXREY20EIWluUHJpY2VBc3NldEFtb3VudERlZmF1bHREZWNpbWFscwkAawMFB2luUHJBbXQFD2RlZmF1bHREZWNpbWFscwUIcHJpY2VEY20ED2luQW1Bc3NldEFtdFgxOAkBAnQxAgUiaW5BbW91bnRBc3NldEFtb3VudERlZmF1bHREZWNpbWFscwUPZGVmYXVsdERlY2ltYWxzBA9pblByQXNzZXRBbXRYMTgJAQJ0MQIFIWluUHJpY2VBc3NldEFtb3VudERlZmF1bHREZWNpbWFscwUPZGVmYXVsdERlY2ltYWxzBAx1c2VyUHJpY2VYMTgJAQRjcGJpAgUPaW5QckFzc2V0QW10WDE4BQ9pbkFtQXNzZXRBbXRYMTgEDGFtQmFsYW5jZVgxOAkBAnQxAgUcYW1vdW50QmFsYW5jZURlZmF1bHREZWNpbWFscwUPZGVmYXVsdERlY2ltYWxzBAxwckJhbGFuY2VYMTgJAQJ0MQIFG3ByaWNlQmFsYW5jZURlZmF1bHREZWNpbWFscwUPZGVmYXVsdERlY2ltYWxzBAFyAwkAAAIFBGxwRW0AAAQLY3VyUHJpY2VYMTgFCnplcm9CaWdJbnQEC3NsaXBwYWdlWDE4BQp6ZXJvQmlnSW50BAhscEFtdFgxOAkAdgYJALkCAgUPaW5BbUFzc2V0QW10WDE4BQ9pblByQXNzZXRBbXRYMTgAAAkAtgIBAAUAAQAABQRET1dOCQCXCgUJAQJmMQIFCGxwQW10WDE4BQZzY2FsZTgJAQJmMQIFD2luQW1Bc3NldEFtdFgxOAUPZGVmYXVsdERlY2ltYWxzCQECZjECBQ9pblByQXNzZXRBbXRYMTgFD2RlZmF1bHREZWNpbWFscwkBBGNwYmkCCQC3AgIFDHByQmFsYW5jZVgxOAUPaW5QckFzc2V0QW10WDE4CQC3AgIFDGFtQmFsYW5jZVgxOAUPaW5BbUFzc2V0QW10WDE4BQtzbGlwcGFnZVgxOAQLY3VyUHJpY2VYMTgJAQRjcGJpAgUMcHJCYWxhbmNlWDE4BQxhbUJhbGFuY2VYMTgED3NsaXBwYWdlUmVhbFgxOAkAvAIDCQEDYWJzAQkAuAICBQtjdXJQcmljZVgxOAUMdXNlclByaWNlWDE4BQdzY2FsZTE4BQtjdXJQcmljZVgxOAQLc2xpcHBhZ2VYMTgJAQJ0MQIFCHNsaXBwYWdlBQZzY2FsZTgDAwkBAiE9AgULY3VyUHJpY2VYMTgFCnplcm9CaWdJbnQJAL8CAgUPc2xpcHBhZ2VSZWFsWDE4BQtzbGlwcGFnZVgxOAcJAAIBCQCsAgIJAKwCAgkArAICAg9QcmljZSBzbGlwcGFnZSAJAKYDAQUPc2xpcHBhZ2VSZWFsWDE4AgMgPiAJAKYDAQULc2xpcHBhZ2VYMTgEDWxwRW1pc3Npb25YMTgJAQJ0MQIFBGxwRW0FBnNjYWxlOAQKcHJWaWFBbVgxOAkAvAIDBQ9pbkFtQXNzZXRBbXRYMTgFC2N1clByaWNlWDE4BQdzY2FsZTE4BAphbVZpYVByWDE4CQC8AgMFD2luUHJBc3NldEFtdFgxOAUHc2NhbGUxOAULY3VyUHJpY2VYMTgEDGV4cGVjdGVkQW10cwMJAL8CAgUKcHJWaWFBbVgxOAUPaW5QckFzc2V0QW10WDE4CQCUCgIFCmFtVmlhUHJYMTgFD2luUHJBc3NldEFtdFgxOAkAlAoCBQ9pbkFtQXNzZXRBbXRYMTgFCnByVmlhQW1YMTgEEWV4cEFtdEFzc2V0QW10WDE4CAUMZXhwZWN0ZWRBbXRzAl8xBBNleHBQcmljZUFzc2V0QW10WDE4CAUMZXhwZWN0ZWRBbXRzAl8yBAhscEFtdFgxOAkAvAIDBQ1scEVtaXNzaW9uWDE4BRNleHBQcmljZUFzc2V0QW10WDE4BQxwckJhbGFuY2VYMTgJAJcKBQkBAmYxAgUIbHBBbXRYMTgFBnNjYWxlOAkBAmYxAgURZXhwQW10QXNzZXRBbXRYMTgFD2RlZmF1bHREZWNpbWFscwkBAmYxAgUTZXhwUHJpY2VBc3NldEFtdFgxOAUPZGVmYXVsdERlY2ltYWxzBQtjdXJQcmljZVgxOAULc2xpcHBhZ2VYMTgECWNhbGNMcEFtdAgFAXICXzEEDmNhbGNBbUFzc2V0UG10CQBrAwgFAXICXzIFBmFtdERjbQUPZGVmYXVsdERlY2ltYWxzBA5jYWxjUHJBc3NldFBtdAkAawMIBQFyAl8zBQhwcmljZURjbQUPZGVmYXVsdERlY2ltYWxzBAhjdXJQcmljZQkBAmYxAggFAXICXzQFBnNjYWxlOAQMc2xpcHBhZ2VDYWxjCQECZjECCAUBcgJfNQUGc2NhbGU4AwkAZwIAAAUJY2FsY0xwQW10CQACAQIHTFAgPD0gMAQJZW1pdExwQW10AwkBASEBBQZlbWl0THAAAAUJY2FsY0xwQW10BAZhbURpZmYJAGUCBQdpbkFtQW10BQ5jYWxjQW1Bc3NldFBtdAQGcHJEaWZmCQBlAgUHaW5QckFtdAUOY2FsY1ByQXNzZXRQbXQEDSR0MDE2NjQ5MTY5OTQDAwUKaXNPbmVBc3NldAkAAAIFBXBtdElkBQdhbUlkU3RyBwkAlAoCBQZwbXRBbXQAAAMDBQppc09uZUFzc2V0CQAAAgUFcG10SWQFB3BySWRTdHIHCQCUCgIAAAUGcG10QW10CQCUCgIFDmNhbGNBbUFzc2V0UG10BQ5jYWxjUHJBc3NldFBtdAQKd3JpdGVBbUFtdAgFDSR0MDE2NjQ5MTY5OTQCXzEECndyaXRlUHJBbXQIBQ0kdDAxNjY0OTE2OTk0Al8yBAtjb21tb25TdGF0ZQkAzAgCCQEMSW50ZWdlckVudHJ5AgkBAnBsAAUIY3VyUHJpY2UJAMwIAgkBDEludGVnZXJFbnRyeQIJAQJwaAIFBmhlaWdodAgFCWxhc3RCbG9jawl0aW1lc3RhbXAFCGN1clByaWNlCQDMCAIJAQtTdHJpbmdFbnRyeQIJAQNwYXUCBQt1c2VyQWRkcmVzcwUGdHhJZDU4CQERZGF0YVB1dEFjdGlvbkluZm8KBQp3cml0ZUFtQW10BQp3cml0ZVByQW10BQllbWl0THBBbXQFCGN1clByaWNlBQhzbGlwcGFnZQUMc2xpcHBhZ2VDYWxjBQZoZWlnaHQIBQlsYXN0QmxvY2sJdGltZXN0YW1wBQZhbURpZmYFBnByRGlmZgUDbmlsCQCfCg0FCWNhbGNMcEFtdAUJZW1pdExwQW10BQhjdXJQcmljZQUJYW1CYWxhbmNlBQlwckJhbGFuY2UFBGxwRW0FBGxwSWQFA3N0cwULY29tbW9uU3RhdGUFBmFtRGlmZgUGcHJEaWZmBQZpbkFtSWQFBmluUHJJZAEDbW9hAQVvcmRlcgQDY2ZnCQEDZ3BjAAQHYW10QXNJZAkAkQMCBQNjZmcFCWlkeEFtQXNJZAQGcHJBc0lkCQCRAwIFA2NmZwUJaWR4UHJBc0lkBANzdHMJAQ1wYXJzZUludFZhbHVlAQkAkQMCBQNjZmcFCWlkeFBvb2xTdAQIYW10QXNEY20JAQ1wYXJzZUludFZhbHVlAQkAkQMCBQNjZmcFC2lkeEFtdEFzRGNtBAdwckFzRGNtCQENcGFyc2VJbnRWYWx1ZQEJAJEDAgUDY2ZnBQ1pZHhQcmljZUFzRGNtBA9hY2NBbXRBc0JhbGFuY2UJAQ1nZXRBY2NCYWxhbmNlAQUHYW10QXNJZAQOYWNjUHJBc0JhbGFuY2UJAQ1nZXRBY2NCYWxhbmNlAQUGcHJBc0lkBAtjdXJQcmljZVgxOAMJAAACCAUFb3JkZXIJb3JkZXJUeXBlBQNCdXkJAQNwY3AEBQhhbXRBc0RjbQUHcHJBc0RjbQkAZAIFD2FjY0FtdEFzQmFsYW5jZQgFBW9yZGVyBmFtb3VudAUOYWNjUHJBc0JhbGFuY2UJAQNwY3AEBQhhbXRBc0RjbQUHcHJBc0RjbQkAZQIFD2FjY0FtdEFzQmFsYW5jZQgFBW9yZGVyBmFtb3VudAUOYWNjUHJBc0JhbGFuY2UECGN1clByaWNlCQECZjECBQtjdXJQcmljZVgxOAUGc2NhbGU4AwMDCQEDaWdzAAYJAAACBQNzdHMFDlBvb2xNYXRjaGVyRGlzBgkAAAIFA3N0cwUMUG9vbFNodXRkb3duCQACAQINQWRtaW4gYmxvY2tlZAQKb3JBbXRBc3NldAgIBQVvcmRlcglhc3NldFBhaXILYW1vdW50QXNzZXQECm9yQW10QXNTdHIDCQAAAgUKb3JBbXRBc3NldAUEdW5pdAIFV0FWRVMJANgEAQkBBXZhbHVlAQUKb3JBbXRBc3NldAQJb3JQckFzc2V0CAgFBW9yZGVyCWFzc2V0UGFpcgpwcmljZUFzc2V0BAlvclByQXNTdHIDCQAAAgUJb3JQckFzc2V0BQR1bml0AgVXQVZFUwkA2AQBCQEFdmFsdWUBBQlvclByQXNzZXQDAwkBAiE9AgUKb3JBbXRBc1N0cgUHYW10QXNJZAYJAQIhPQIFCW9yUHJBc1N0cgUGcHJBc0lkCQACAQIJV3IgYXNzZXRzBApvcmRlclByaWNlCAUFb3JkZXIFcHJpY2UECHByaWNlRGNtCQBrAwUGc2NhbGU4BQdwckFzRGNtBQhhbXRBc0RjbQQOY2FzdE9yZGVyUHJpY2UJAQJ0cwMFCm9yZGVyUHJpY2UFBnNjYWxlOAUIcHJpY2VEY20EEWlzT3JkZXJQcmljZVZhbGlkAwkAAAIIBQVvcmRlcglvcmRlclR5cGUFA0J1eQkAZwIFCGN1clByaWNlBQ5jYXN0T3JkZXJQcmljZQkAZwIFDmNhc3RPcmRlclByaWNlBQhjdXJQcmljZQYBAmNnAQFpAwkBAiE9AgkAkAMBCAUBaQhwYXltZW50cwABCQACAQIKMSBwbW50IGV4cAQDcG10CQEFdmFsdWUBCQCRAwIIBQFpCHBheW1lbnRzAAAECnBtdEFzc2V0SWQJAQV2YWx1ZQEIBQNwbXQHYXNzZXRJZAQGcG10QW10CAUDcG10BmFtb3VudAQBcgkBA2VnbwQJANgEAQgFAWkNdHJhbnNhY3Rpb25JZAkA2AQBBQpwbXRBc3NldElkBQZwbXRBbXQIBQFpBmNhbGxlcgQIb3V0QW1BbXQIBQFyAl8xBAhvdXRQckFtdAgFAXICXzIEA3N0cwkBDXBhcnNlSW50VmFsdWUBCAUBcgJfOQQFc3RhdGUIBQFyA18xMAMDCQEDaWdzAAYJAAACBQNzdHMFDFBvb2xTaHV0ZG93bgkAAgEJAKwCAgIPQWRtaW4gYmxvY2tlZDogCQCkAwEFA3N0cwkAlwoFBQhvdXRBbUFtdAUIb3V0UHJBbXQFBnBtdEFtdAUKcG10QXNzZXRJZAUFc3RhdGUBAmNwCQZjYWxsZXIEdHhJZAdhbUFzUG10B3ByQXNQbXQIc2xpcHBhZ2UGZW1pdExwCmlzT25lQXNzZXQGcG10QW10BXBtdElkBAFyCQEDZXBvDAUEdHhJZAUIc2xpcHBhZ2UICQEFdmFsdWUBBQdhbUFzUG10BmFtb3VudAgJAQV2YWx1ZQEFB2FtQXNQbXQHYXNzZXRJZAgJAQV2YWx1ZQEFB3ByQXNQbXQGYW1vdW50CAkBBXZhbHVlAQUHcHJBc1BtdAdhc3NldElkBQZjYWxsZXIHBQZlbWl0THAFCmlzT25lQXNzZXQFBnBtdEFtdAUFcG10SWQEA3N0cwkBDXBhcnNlSW50VmFsdWUBCAUBcgJfOAMDAwkBA2lncwAGCQAAAgUDc3RzBQpQb29sUHV0RGlzBgkAAAIFA3N0cwUMUG9vbFNodXRkb3duCQACAQkArAICAghCbG9ja2VkOgkApAMBBQNzdHMFAXIBAW0ABAckbWF0Y2gwCQCiCAEJAQNtcGsAAwkAAQIFByRtYXRjaDACBlN0cmluZwQBcwUHJG1hdGNoMAkA2QQBBQFzAwkAAQIFByRtYXRjaDACBFVuaXQFBHVuaXQJAAIBAgtNYXRjaCBlcnJvcgECcG0ABAckbWF0Y2gwCQCiCAEJAQRwbXBrAAMJAAECBQckbWF0Y2gwAgZTdHJpbmcEAXMFByRtYXRjaDAJANkEAQUBcwMJAAECBQckbWF0Y2gwAgRVbml0BQR1bml0CQACAQILTWF0Y2ggZXJyb3IAAnBkCQACAQIRUGVybWlzc2lvbiBkZW5pZWQBAm1tAQFpBAckbWF0Y2gwCQEBbQADCQABAgUHJG1hdGNoMAIKQnl0ZVZlY3RvcgQCcGsFByRtYXRjaDADCQAAAggFAWkPY2FsbGVyUHVibGljS2V5BQJwawYFAnBkAwkAAQIFByRtYXRjaDACBFVuaXQDCQAAAggFAWkGY2FsbGVyBQR0aGlzBgUCcGQJAAIBAgtNYXRjaCBlcnJvchUBaQELY29uc3RydWN0b3IBAmZjBAFjCQECbW0BBQFpAwkAAAIFAWMFAWMJAMwIAgkBC1N0cmluZ0VudHJ5AgkBAmZjAAUCZmMFA25pbAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgFpAQpzZXRNYW5hZ2VyARdwZW5kaW5nTWFuYWdlclB1YmxpY0tleQQBYwkBAm1tAQUBaQMJAAACBQFjBQFjBAJjbQkA2QQBBRdwZW5kaW5nTWFuYWdlclB1YmxpY0tleQMJAAACBQJjbQUCY20JAMwIAgkBC1N0cmluZ0VudHJ5AgkBBHBtcGsABRdwZW5kaW5nTWFuYWdlclB1YmxpY0tleQUDbmlsCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAWkBDmNvbmZpcm1NYW5hZ2VyAAQBcAkBAnBtAAQDaHBtAwkBCWlzRGVmaW5lZAEFAXAGCQACAQISTm8gcGVuZGluZyBtYW5hZ2VyAwkAAAIFA2hwbQUDaHBtBANjcG0DCQAAAggFAWkPY2FsbGVyUHVibGljS2V5CQEFdmFsdWUBBQFwBgkAAgECG1lvdSBhcmUgbm90IHBlbmRpbmcgbWFuYWdlcgMJAAACBQNjcG0FA2NwbQkAzAgCCQELU3RyaW5nRW50cnkCCQEDbXBrAAkA2AQBCQEFdmFsdWUBBQFwCQDMCAIJAQtEZWxldGVFbnRyeQEJAQRwbXBrAAUDbmlsCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAWkBA3B1dAIEc2xpcAlhdXRvU3Rha2UEB2ZhY3RDZmcJAQNnZmMABAtzdGFraW5nQ250cgkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCmCAEJAJEDAgUHZmFjdENmZwUPaWR4RmFjdFN0YWtDbnRyAgpXciBzdCBhZGRyBAhzbGlwQ250cgkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCmCAEJAJEDAgUHZmFjdENmZwUQaWR4RmFjdFNsaXBwQ250cgIKV3Igc2wgYWRkcgMJAGYCAAAFBHNsaXAJAAIBAg5Xcm9uZyBzbGlwcGFnZQMJAQIhPQIJAJADAQgFAWkIcGF5bWVudHMAAgkAAgECDDIgcG1udHMgZXhwZAQBZQkBAmNwCQkApQgBCAUBaQZjYWxsZXIJANgEAQgFAWkNdHJhbnNhY3Rpb25JZAkBD0F0dGFjaGVkUGF5bWVudAIICQEFdmFsdWUBCQCRAwIIBQFpCHBheW1lbnRzAAAHYXNzZXRJZAgJAQV2YWx1ZQEJAJEDAggFAWkIcGF5bWVudHMAAAZhbW91bnQJAJEDAggFAWkIcGF5bWVudHMAAQUEc2xpcAYHAAACAAQJZW1pdExwQW10CAUBZQJfMgQJbHBBc3NldElkCAUBZQJfNwQFc3RhdGUIBQFlAl85BAZhbURpZmYIBQFlA18xMAQGcHJEaWZmCAUBZQNfMTEEBGFtSWQIBQFlA18xMgQEcHJJZAgFAWUDXzEzBAFyCQD8BwQFA2ZjYQIEZW1pdAkAzAgCBQllbWl0THBBbXQFA25pbAUDbmlsAwkAAAIFAXIFAXIEAmVsBAckbWF0Y2gwBQFyAwkAAQIFByRtYXRjaDACB0FkZHJlc3MEBmxlZ2FjeQUHJG1hdGNoMAkA/AcEBQZsZWdhY3kCBGVtaXQJAMwIAgUJZW1pdExwQW10BQNuaWwFA25pbAUEdW5pdAMJAAACBQJlbAUCZWwEAnNhAwkAZgIFBmFtRGlmZgAACQD8BwQFCHNsaXBDbnRyAgNwdXQFA25pbAkAzAgCCQEPQXR0YWNoZWRQYXltZW50AgUEYW1JZAUGYW1EaWZmBQNuaWwFA25pbAMJAAACBQJzYQUCc2EEAnNwAwkAZgIFBnByRGlmZgAACQD8BwQFCHNsaXBDbnRyAgNwdXQFA25pbAkAzAgCCQEPQXR0YWNoZWRQYXltZW50AgUEcHJJZAUGcHJEaWZmBQNuaWwFA25pbAMJAAACBQJzcAUCc3AECGxwVHJuc2ZyAwUJYXV0b1N0YWtlBAJzcwkA/AcEBQtzdGFraW5nQ250cgIFc3Rha2UFA25pbAkAzAgCCQEPQXR0YWNoZWRQYXltZW50AgUJbHBBc3NldElkBQllbWl0THBBbXQFA25pbAMJAAACBQJzcwUCc3MFA25pbAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAzAgCCQEOU2NyaXB0VHJhbnNmZXIDCAUBaQZjYWxsZXIFCWVtaXRMcEFtdAUJbHBBc3NldElkBQNuaWwJAM4IAgUFc3RhdGUFCGxwVHJuc2ZyCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAWkBCXB1dE9uZVRrbgULYW1Bc3NldFBhcnQLcHJBc3NldFBhcnQFb3V0THAIc2xpcHBhZ2UJYXV0b1N0YWtlBANjZmcJAQNnZmMABAtzdGFraW5nQ250cgkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCmCAEJAJEDAgUDY2ZnBQ9pZHhGYWN0U3Rha0NudHICCldyIHN0IGFkZHIECHNsaXBDbnRyCQETdmFsdWVPckVycm9yTWVzc2FnZQIJAKYIAQkAkQMCBQNjZmcFEGlkeEZhY3RTbGlwcENudHICCldyIHNsIGFkZHIEB2d3eENudHIJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkApggBCQCRAwIFA2NmZwURaWR4RmFjdEd3eFJld0NudHICC1dyIGd3eCBhZGRyBAdwb29sQ2ZnCQEDZ3BjAAQEYW1JZAkAkQMCBQdwb29sQ2ZnBQlpZHhBbUFzSWQEBHBySWQJAJEDAgUHcG9vbENmZwUJaWR4UHJBc0lkBAVhbURjbQkBDXBhcnNlSW50VmFsdWUBCQCRAwIFB3Bvb2xDZmcFC2lkeEFtdEFzRGNtBAVwckRjbQkBDXBhcnNlSW50VmFsdWUBCQCRAwIFB3Bvb2xDZmcFDWlkeFByaWNlQXNEY20EBWFkZG9uCQELdmFsdWVPckVsc2UCCQCdCAIFBHRoaXMJAQNhZGEAAgAEC3VzZXJBZGRyZXNzAwkAAAIFBWFkZG9uCQClCAEIBQFpBmNhbGxlcggFAWkMb3JpZ2luQ2FsbGVyCAUBaQZjYWxsZXIDAwMDCQBnAgAABQhzbGlwcGFnZQYJAGcCAAAFC2FtQXNzZXRQYXJ0BgkAZwIAAAULcHJBc3NldFBhcnQGCQBnAgAABQVvdXRMcAkAAgECDFdyb25nIHBhcmFtcwMJAQIhPQIJAJADAQgFAWkIcGF5bWVudHMAAQkAAgECCzEgcG1udCBleHBkBANwbXQJAQV2YWx1ZQEJAJEDAggFAWkIcGF5bWVudHMAAAQKcG10QXNzZXRJZAkA2AQBCQEFdmFsdWUBCAUDcG10B2Fzc2V0SWQEC3BtdERlY2ltYWxzCAkBBXZhbHVlAQkA7AcBCQEFdmFsdWUBCAkAkQMCCAUBaQhwYXltZW50cwAAB2Fzc2V0SWQIZGVjaW1hbHMEBnBtdEFtdAgFA3BtdAZhbW91bnQEFXBtdEFtdERlZmF1bHREZWNpbWFscwkAaQIJAGgCBQZwbXRBbXQFD2RlZmF1bHREZWNpbWFscwkAbAYACgAABQtwbXREZWNpbWFscwAAAAAFBERPV04DCQBmAgCAreIEBRVwbXRBbXREZWZhdWx0RGVjaW1hbHMJAAIBAg1Xcm9uZyBwbXQgYW10BAlhbUJhbGFuY2UJAQ1nZXRBY2NCYWxhbmNlAQUEYW1JZAQJcHJCYWxhbmNlCQENZ2V0QWNjQmFsYW5jZQEFBHBySWQEDSR0MDI1ODM4MjY1MzQDCQAAAgUKcG10QXNzZXRJZAUEYW1JZAMDCQBmAgUVcG10QW10RGVmYXVsdERlY2ltYWxzBQlhbUJhbGFuY2UGCQBmAgULYW1Bc3NldFBhcnQFFXBtdEFtdERlZmF1bHREZWNpbWFscwkAAgECFmludmFsaWQgcGF5bWVudCBhbW91bnQJAJgKBgkAZQIFCWFtQmFsYW5jZQUVcG10QW10RGVmYXVsdERlY2ltYWxzBQlwckJhbGFuY2UJAGUCBRVwbXRBbXREZWZhdWx0RGVjaW1hbHMFC2FtQXNzZXRQYXJ0BQtwckFzc2V0UGFydAAAAAADCQAAAgUKcG10QXNzZXRJZAUEcHJJZAMDCQBmAgUVcG10QW10RGVmYXVsdERlY2ltYWxzBQlwckJhbGFuY2UGCQBmAgULcHJBc3NldFBhcnQFFXBtdEFtdERlZmF1bHREZWNpbWFscwkAAgECFmludmFsaWQgcGF5bWVudCBhbW91bnQJAJgKBgUJYW1CYWxhbmNlCQBlAgUJcHJCYWxhbmNlBRVwbXRBbXREZWZhdWx0RGVjaW1hbHMAAAAACQBlAgUVcG10QW10RGVmYXVsdERlY2ltYWxzBQtwckFzc2V0UGFydAULYW1Bc3NldFBhcnQJAAIBAhB3cm9uZyBwbXRBc3NldElkBAxhbUJhbGFuY2VOb3cIBQ0kdDAyNTgzODI2NTM0Al8xBAxwckJhbGFuY2VOb3cIBQ0kdDAyNTgzODI2NTM0Al8yBAx2aXJ0U3dhcEluQW0IBQ0kdDAyNTgzODI2NTM0Al8zBA12aXJ0U3dhcE91dFByCAUNJHQwMjU4MzgyNjUzNAJfNAQMdmlydFN3YXBJblByCAUNJHQwMjU4MzgyNjUzNAJfNQQNdmlydFN3YXBPdXRBbQgFDSR0MDI1ODM4MjY1MzQCXzYEAkQwCQD8BwQFB2d3eENudHICBWNhbGNECQDMCAIJAKQDAQUMYW1CYWxhbmNlTm93CQDMCAIJAKQDAQUMcHJCYWxhbmNlTm93CQDMCAIFAUEJAMwIAgUFQW11bHQJAMwIAgUFRGNvbnYFA25pbAUDbmlsBAJEMQkA/AcEBQdnd3hDbnRyAgVjYWxjRAkAzAgCCQCmAwEJALYCAQkAZQIJAGQCBQxhbUJhbGFuY2VOb3cFDHZpcnRTd2FwSW5BbQUNdmlydFN3YXBPdXRBbQkAzAgCCQCmAwEJALYCAQkAZQIJAGQCBQxwckJhbGFuY2VOb3cFDHZpcnRTd2FwSW5QcgUNdmlydFN3YXBPdXRQcgkAzAgCBQFBCQDMCAIFBUFtdWx0CQDMCAIFBURjb252BQNuaWwFA25pbAQGRDB2c0QxCQECdmQDCQCnAwEJAQNzdHIBBQJEMQkApwMBCQEDc3RyAQUCRDAFCnNsaXBwYWdlNEQDCQAAAgUGRDB2c0QxBQZEMHZzRDEEBmVzdFB1dAkBAmNwCQkApQgBCAUBaQZjYWxsZXIJANgEAQgFAWkNdHJhbnNhY3Rpb25JZAkBD0F0dGFjaGVkUGF5bWVudAIJANkEAQUEYW1JZAULYW1Bc3NldFBhcnQJAQ9BdHRhY2hlZFBheW1lbnQCCQDZBAEFBHBySWQFC3ByQXNzZXRQYXJ0BQhzbGlwcGFnZQYGBQZwbXRBbXQFCnBtdEFzc2V0SWQEB2VzdGltTFAIBQZlc3RQdXQCXzIECWxwQXNzZXRJZAgFBmVzdFB1dAJfNwQFc3RhdGUIBQZlc3RQdXQCXzkEBmFtRGlmZggFBmVzdFB1dANfMTAEBnByRGlmZggFBmVzdFB1dANfMTEECWxwQ2FsY1JlcwkBA3ZhZAMJALYCAQUHZXN0aW1MUAkAtgIBBQVvdXRMcAkAtgIBBQhzbGlwcGFnZQQJZW1pdExwQW10CQCgAwEIBQlscENhbGNSZXMCXzIEAWUJAPwHBAUDZmNhAgRlbWl0CQDMCAIFCWVtaXRMcEFtdAUDbmlsBQNuaWwDCQAAAgUBZQUBZQQCZWwEByRtYXRjaDAFAWUDCQABAgUHJG1hdGNoMAIHQWRkcmVzcwQGbGVnYWN5BQckbWF0Y2gwCQD8BwQFBmxlZ2FjeQIEZW1pdAkAzAgCBQllbWl0THBBbXQFA25pbAUDbmlsBQR1bml0AwkAAAIFAmVsBQJlbAQCc2EDCQBmAgUGYW1EaWZmAAAJAPwHBAUIc2xpcENudHICA3B1dAUDbmlsCQDMCAIJAQ9BdHRhY2hlZFBheW1lbnQCCQDZBAEFBGFtSWQFBmFtRGlmZgUDbmlsBQNuaWwDCQAAAgUCc2EFAnNhBAJzcAMJAGYCBQZwckRpZmYAAAkA/AcEBQhzbGlwQ250cgIDcHV0BQNuaWwJAMwIAgkBD0F0dGFjaGVkUGF5bWVudAIJANkEAQUEcHJJZAUGcHJEaWZmBQNuaWwFA25pbAMJAAACBQJzcAUCc3AECGxwVHJuc2ZyAwUJYXV0b1N0YWtlBAJzcwkA/AcEBQtzdGFraW5nQ250cgIFc3Rha2UFA25pbAkAzAgCCQEPQXR0YWNoZWRQYXltZW50AgUJbHBBc3NldElkBQllbWl0THBBbXQFA25pbAMJAAACBQJzcwUCc3MFA25pbAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAzAgCCQEOU2NyaXB0VHJhbnNmZXIDCAUBaQZjYWxsZXIFCWVtaXRMcEFtdAUJbHBBc3NldElkBQNuaWwJAM4IAgUFc3RhdGUFCGxwVHJuc2ZyCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAWkBCnB1dEZvckZyZWUBB21heFNscGcDCQBmAgAABQdtYXhTbHBnCQACAQIKV3Jvbmcgc2xwZwMJAQIhPQIJAJADAQgFAWkIcGF5bWVudHMAAgkAAgECDDIgcG1udHMgZXhwZAQGZXN0UHV0CQECY3AJCQClCAEIBQFpBmNhbGxlcgkA2AQBCAUBaQ10cmFuc2FjdGlvbklkCQEPQXR0YWNoZWRQYXltZW50AggJAQV2YWx1ZQEJAJEDAggFAWkIcGF5bWVudHMAAAdhc3NldElkCAkBBXZhbHVlAQkAkQMCCAUBaQhwYXltZW50cwAABmFtb3VudAkAkQMCCAUBaQhwYXltZW50cwABBQdtYXhTbHBnBwcAAAIACAUGZXN0UHV0Al85AWkBA2dldAAEAXIJAQJjZwEFAWkECW91dEFtdEFtdAgFAXICXzEECG91dFByQW10CAUBcgJfMgQGcG10QW10CAUBcgJfMwQKcG10QXNzZXRJZAgFAXICXzQEBXN0YXRlCAUBcgJfNQQBYgkA/AcEBQNmY2ECBGJ1cm4JAMwIAgUGcG10QW10BQNuaWwJAMwIAgkBD0F0dGFjaGVkUGF5bWVudAIFCnBtdEFzc2V0SWQFBnBtdEFtdAUDbmlsAwkAAAIFAWIFAWIFBXN0YXRlCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAWkBCWdldE9uZVRrbgUKZXhjaFJlc3VsdAdub3RVc2VkCW91dEFtb3VudApvdXRBc3NldElkCHNsaXBwYWdlAwkBAiE9AgkAkAMBCAUBaQhwYXltZW50cwABCQACAQILMSBwbW50IGV4cGQEA2NmZwkBA2dwYwAEBGxwSWQJAJEDAgUDY2ZnBQlpZHhMUEFzSWQEBGFtSWQJAJEDAgUDY2ZnBQlpZHhBbUFzSWQEBHBySWQJAJEDAgUDY2ZnBQlpZHhQckFzSWQEBWFtRGNtCQENcGFyc2VJbnRWYWx1ZQEJAJEDAgUDY2ZnBQtpZHhBbXRBc0RjbQQFcHJEY20JAQ1wYXJzZUludFZhbHVlAQkAkQMCBQNjZmcFDWlkeFByaWNlQXNEY20EA3N0cwkAkQMCBQNjZmcFCWlkeFBvb2xTdAQHZmFjdENmZwkBA2dmYwAEB2d3eENudHIJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkApggBCQCRAwIFB2ZhY3RDZmcFEWlkeEZhY3RHd3hSZXdDbnRyAgpXciBzbCBhZGRyBANwbXQJAQV2YWx1ZQEJAJEDAggFAWkIcGF5bWVudHMAAAQFYWRkb24JAQt2YWx1ZU9yRWxzZQIJAJ0IAgUEdGhpcwkBA2FkYQACAAQLdXNlckFkZHJlc3MDCQAAAgUFYWRkb24JAKUIAQgFAWkGY2FsbGVyCAUBaQxvcmlnaW5DYWxsZXIIBQFpBmNhbGxlcgQGdHhJZDU4CQDYBAEIBQFpDXRyYW5zYWN0aW9uSWQECnBtdEFzc2V0SWQJAQV2YWx1ZQEIBQNwbXQHYXNzZXRJZAQGcG10QW10CAUDcG10BmFtb3VudAMJAGYCAICU69wDBQZwbXRBbXQJAAIBAg1NaW4gcG10IDEwIExQAwMDCQBmAgAABQhzbGlwcGFnZQYJAGYCAAAFCmV4Y2hSZXN1bHQGCQBmAgAABQlvdXRBbW91bnQJAAIBAgxXcm9uZyBwYXJhbXMDCQECIT0CBQRscElkCQDYBAEFCnBtdEFzc2V0SWQJAAIBAghXcm9uZyBMUAQBcgkBA2VnbwQJANgEAQgFAWkNdHJhbnNhY3Rpb25JZAkA2AQBBQpwbXRBc3NldElkBQZwbXRBbXQIBQFpBmNhbGxlcgQKZXN0aW1BbUFtdAgFAXICXzEECmVzdGltUHJBbXQIBQFyAl8yBAlhbUJhbGFuY2UJAQ1nZXRBY2NCYWxhbmNlAQUEYW1JZAQJcHJCYWxhbmNlCQENZ2V0QWNjQmFsYW5jZQEFBHBySWQEDSR0MDMxMzEzMzE3NzADCQAAAgUKb3V0QXNzZXRJZAUEYW1JZAkAmQoHCQBlAgUJYW1CYWxhbmNlBQplc3RpbUFtQW10CQBlAgUJcHJCYWxhbmNlBQplc3RpbVByQW10BQpleGNoUmVzdWx0BQplc3RpbVByQW10AAAAAAkAZAIFCmVzdGltQW1BbXQFCmV4Y2hSZXN1bHQDCQAAAgUKb3V0QXNzZXRJZAUEcHJJZAkAmQoHCQBlAgUJYW1CYWxhbmNlBQplc3RpbUFtQW10CQBlAgUJcHJCYWxhbmNlBQplc3RpbVByQW10AAAAAAUKZXhjaFJlc3VsdAUKZXN0aW1BbUFtdAkAZAIFCmVzdGltUHJBbXQFCmV4Y2hSZXN1bHQJAAIBAhB3cm9uZyBvdXRBc3NldElkBAxhbUJhbGFuY2VOb3cIBQ0kdDAzMTMxMzMxNzcwAl8xBAxwckJhbGFuY2VOb3cIBQ0kdDAzMTMxMzMxNzcwAl8yBAx2aXJ0U3dhcEluQW0IBQ0kdDAzMTMxMzMxNzcwAl8zBA12aXJ0U3dhcE91dFByCAUNJHQwMzEzMTMzMTc3MAJfNAQMdmlydFN3YXBJblByCAUNJHQwMzEzMTMzMTc3MAJfNQQNdmlydFN3YXBPdXRBbQgFDSR0MDMxMzEzMzE3NzACXzYECHRvdGFsR2V0CAUNJHQwMzEzMTMzMTc3MAJfNwMDCQBmAgAABQx2aXJ0U3dhcEluQW0GCQBmAgAABQx2aXJ0U3dhcEluUHIJAAIBAgpXcm9uZyBjYWxjBAJEMAkA/AcEBQdnd3hDbnRyAgVjYWxjRAkAzAgCCQCkAwEFDGFtQmFsYW5jZU5vdwkAzAgCCQCkAwEFDHByQmFsYW5jZU5vdwkAzAgCBQFBCQDMCAIFBUFtdWx0CQDMCAIFBURjb252BQNuaWwFA25pbAQCRDEJAPwHBAUHZ3d4Q250cgIFY2FsY0QJAMwIAgkApAMBCQBkAgkAZQIFDGFtQmFsYW5jZU5vdwUMdmlydFN3YXBJbkFtBQ12aXJ0U3dhcE91dEFtCQDMCAIJAKQDAQkAZQIJAGQCBQxwckJhbGFuY2VOb3cFDXZpcnRTd2FwT3V0UHIFDHZpcnRTd2FwSW5QcgkAzAgCBQFBCQDMCAIFBUFtdWx0CQDMCAIFBURjb252BQNuaWwFA25pbAQGRDB2c0QxCQECdmQDCQCnAwEJAQNzdHIBBQJEMQkApwMBCQEDc3RyAQUCRDAFCnNsaXBwYWdlNEQDCQAAAgUGRDB2c0QxBQZEMHZzRDEECGZpbmFsUmVzCQEDdmFkAwkAtgIBBQh0b3RhbEdldAkAtgIBBQlvdXRBbW91bnQJALYCAQUIc2xpcHBhZ2UDCQAAAgUIZmluYWxSZXMFCGZpbmFsUmVzBA0kdDAzMjQ3NTMyNTc5AwkAAAIFCm91dEFzc2V0SWQFBGFtSWQJAJQKAgkAoAMBCAUIZmluYWxSZXMCXzIAAAkAlAoCAAAJAKADAQgFCGZpbmFsUmVzAl8yBAVvdXRBbQgFDSR0MDMyNDc1MzI1NzkCXzEEBW91dFByCAUNJHQwMzI0NzUzMjU3OQJfMgQIY3VyUHJYMTgJAQRjcGJpAgkBAnQxAgUJcHJCYWxhbmNlBQVwckRjbQkBAnQxAgUJYW1CYWxhbmNlBQVhbURjbQQFY3VyUHIJAQJmMQIFCGN1clByWDE4BQZzY2FsZTgEBXN0YXRlCQDMCAIJAQ5TY3JpcHRUcmFuc2ZlcgMFC3VzZXJBZGRyZXNzCQBkAgUFb3V0QW0FBW91dFByAwkAAAIFCm91dEFzc2V0SWQCBVdBVkVTBQR1bml0CQDZBAEFCm91dEFzc2V0SWQJAMwIAgkBC1N0cmluZ0VudHJ5AgkBA2dhdQIJAKUIAQULdXNlckFkZHJlc3MFBnR4SWQ1OAkBEWRhdGFHZXRBY3Rpb25JbmZvBgUFb3V0QW0FBW91dFByBQZwbXRBbXQFBWN1clByBQZoZWlnaHQIBQlsYXN0QmxvY2sJdGltZXN0YW1wCQDMCAIJAQxJbnRlZ2VyRW50cnkCCQECcGwABQVjdXJQcgkAzAgCCQEMSW50ZWdlckVudHJ5AgkBAnBoAgUGaGVpZ2h0CAUJbGFzdEJsb2NrCXRpbWVzdGFtcAUFY3VyUHIFA25pbAMJAAACBQVzdGF0ZQUFc3RhdGUEBGJ1cm4JAPwHBAUDZmNhAgRidXJuCQDMCAIFBnBtdEFtdAUDbmlsCQDMCAIJAQ9BdHRhY2hlZFBheW1lbnQCBQpwbXRBc3NldElkBQZwbXRBbXQFA25pbAMJAAACBQRidXJuBQRidXJuBQVzdGF0ZQkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgFpAQlnZXROb0xlc3MCEm5vTGVzc1RoZW5BbXRBc3NldBRub0xlc3NUaGVuUHJpY2VBc3NldAQBcgkBAmNnAQUBaQQIb3V0QW1BbXQIBQFyAl8xBAhvdXRQckFtdAgFAXICXzIEBnBtdEFtdAgFAXICXzMECnBtdEFzc2V0SWQIBQFyAl80BAVzdGF0ZQgFAXICXzUDCQBmAgUSbm9MZXNzVGhlbkFtdEFzc2V0BQhvdXRBbUFtdAkAAgEJAKwCAgkArAICCQCsAgICCUZhaWxlZDogIAkApAMBBQhvdXRBbUFtdAIDIDwgCQCkAwEFEm5vTGVzc1RoZW5BbXRBc3NldAMJAGYCBRRub0xlc3NUaGVuUHJpY2VBc3NldAUIb3V0UHJBbXQJAAIBCQCsAgIJAKwCAgkArAICAghGYWlsZWQ6IAkApAMBBQhvdXRQckFtdAIDIDwgCQCkAwEFFG5vTGVzc1RoZW5QcmljZUFzc2V0BBRidXJuTFBBc3NldE9uRmFjdG9yeQkA/AcEBQNmY2ECBGJ1cm4JAMwIAgUGcG10QW10BQNuaWwJAMwIAgkBD0F0dGFjaGVkUGF5bWVudAIFCnBtdEFzc2V0SWQFBnBtdEFtdAUDbmlsAwkAAAIFFGJ1cm5MUEFzc2V0T25GYWN0b3J5BRRidXJuTFBBc3NldE9uRmFjdG9yeQUFc3RhdGUJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BaQENdW5zdGFrZUFuZEdldAEGYW1vdW50BA1jaGVja1BheW1lbnRzAwkBAiE9AgkAkAMBCAUBaQhwYXltZW50cwAACQACAQINTm8gcG1udHMgZXhwZAYDCQAAAgUNY2hlY2tQYXltZW50cwUNY2hlY2tQYXltZW50cwQDY2ZnCQEDZ3BjAAQKZmFjdG9yeUNmZwkBA2dmYwAECWxwQXNzZXRJZAkA2QQBCQCRAwIFA2NmZwUJaWR4TFBBc0lkBAdzdGFraW5nCQETdmFsdWVPckVycm9yTWVzc2FnZQIJAKYIAQkAkQMCBQpmYWN0b3J5Q2ZnBQ9pZHhGYWN0U3Rha0NudHICCldyIHN0IGFkZHIECnVuc3Rha2VJbnYJAPwHBAUHc3Rha2luZwIHdW5zdGFrZQkAzAgCCQDYBAEFCWxwQXNzZXRJZAkAzAgCBQZhbW91bnQFA25pbAUDbmlsAwkAAAIFCnVuc3Rha2VJbnYFCnVuc3Rha2VJbnYEAXIJAQNlZ28ECQDYBAEIBQFpDXRyYW5zYWN0aW9uSWQJANgEAQUJbHBBc3NldElkBQZhbW91bnQIBQFpBmNhbGxlcgQDc3RzCQENcGFyc2VJbnRWYWx1ZQEIBQFyAl85BAVzdGF0ZQgFAXIDXzEwBAF2AwMJAQNpZ3MABgkAAAIFA3N0cwUMUG9vbFNodXRkb3duCQACAQkArAICAglCbG9ja2VkOiAJAKQDAQUDc3RzBgMJAAACBQF2BQF2BAVidXJuQQkA/AcEBQNmY2ECBGJ1cm4JAMwIAgUGYW1vdW50BQNuaWwJAMwIAgkBD0F0dGFjaGVkUGF5bWVudAIFCWxwQXNzZXRJZAUGYW1vdW50BQNuaWwDCQAAAgUFYnVybkEFBWJ1cm5BBQVzdGF0ZQkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgFpAQhhY3RpdmF0ZQIIYW10QXNTdHIHcHJBc1N0cgMJAQIhPQIJAKUIAQgFAWkGY2FsbGVyCQClCAEFA2ZjYQkAAgECBmRlbmllZAkAlAoCCQDMCAIJAQtTdHJpbmdFbnRyeQIJAQJhYQAFCGFtdEFzU3RyCQDMCAIJAQtTdHJpbmdFbnRyeQIJAQJwYQAFB3ByQXNTdHIFA25pbAIHc3VjY2VzcwFpAQRzZXRTAgFrAXYDCQECIT0CCQClCAEIBQFpBmNhbGxlcgkBBHN0cmYCBQR0aGlzCQEDYWRhAAUCcGQJAMwIAgkBC1N0cmluZ0VudHJ5AgUBawUBdgUDbmlsAWkBBHNldEkCAWsBdgMJAQIhPQIJAKUIAQgFAWkGY2FsbGVyCQEEc3RyZgIFBHRoaXMJAQNhZGEABQJwZAkAzAgCCQEMSW50ZWdlckVudHJ5AgUBawUBdgUDbmlsAWkBHGdldFBvb2xDb25maWdXcmFwcGVyUkVBRE9OTFkACQCUCgIFA25pbAkBA2dwYwABaQEcZ2V0QWNjQmFsYW5jZVdyYXBwZXJSRUFET05MWQEHYXNzZXRJZAkAlAoCBQNuaWwJAQ1nZXRBY2NCYWxhbmNlAQUHYXNzZXRJZAFpARljYWxjUHJpY2VzV3JhcHBlclJFQURPTkxZAwVhbUFtdAVwckFtdAVscEFtdAQCcHIJAQpjYWxjUHJpY2VzAwUFYW1BbXQFBXByQW10BQVscEFtdAkAlAoCBQNuaWwJAMwIAgkApgMBCQCRAwIFAnByAAAJAMwIAgkApgMBCQCRAwIFAnByAAEJAMwIAgkApgMBCQCRAwIFAnByAAIFA25pbAFpARZmcm9tWDE4V3JhcHBlclJFQURPTkxZAgN2YWwMcmVzU2NhbGVNdWx0CQCUCgIFA25pbAkBAmYxAgkApwMBBQN2YWwFDHJlc1NjYWxlTXVsdAFpARR0b1gxOFdyYXBwZXJSRUFET05MWQIHb3JpZ1ZhbA1vcmlnU2NhbGVNdWx0CQCUCgIFA25pbAkApgMBCQECdDECBQdvcmlnVmFsBQ1vcmlnU2NhbGVNdWx0AWkBHmNhbGNQcmljZUJpZ0ludFdyYXBwZXJSRUFET05MWQIIcHJBbXRYMTgIYW1BbXRYMTgJAJQKAgUDbmlsCQCmAwEJAQRjcGJpAgkApwMBBQhwckFtdFgxOAkApwMBBQhhbUFtdFgxOAFpASNlc3RpbWF0ZVB1dE9wZXJhdGlvbldyYXBwZXJSRUFET05MWQkGdHhJZDU4CHNsaXBwYWdlB2luQW1BbXQGaW5BbUlkB2luUHJBbXQGaW5QcklkB3VzckFkZHIGaXNFdmFsBmVtaXRMcAkAlAoCBQNuaWwJAQNlcG8MBQZ0eElkNTgFCHNsaXBwYWdlBQdpbkFtQW10BQZpbkFtSWQFB2luUHJBbXQFBmluUHJJZAUHdXNyQWRkcgUGaXNFdmFsBQZlbWl0THAHAAACAAFpASNlc3RpbWF0ZUdldE9wZXJhdGlvbldyYXBwZXJSRUFET05MWQQGdHhJZDU4B3BtdEFzSWQIcG10THBBbXQHdXNyQWRkcgQBcgkBA2VnbwQFBnR4SWQ1OAUHcG10QXNJZAUIcG10THBBbXQJARFAZXh0ck5hdGl2ZSgxMDYyKQEFB3VzckFkZHIJAJQKAgUDbmlsCQCcCgoIBQFyAl8xCAUBcgJfMggFAXICXzMIBQFyAl80CAUBcgJfNQgFAXICXzYIBQFyAl83CQCmAwEIBQFyAl84CAUBcgJfOQgFAXIDXzEwAQJ0eAEGdmVyaWZ5AAQPdGFyZ2V0UHVibGljS2V5BAckbWF0Y2gwCQEBbQADCQABAgUHJG1hdGNoMAIKQnl0ZVZlY3RvcgQCcGsFByRtYXRjaDAFAnBrAwkAAQIFByRtYXRjaDACBFVuaXQIBQJ0eA9zZW5kZXJQdWJsaWNLZXkJAAIBAgtNYXRjaCBlcnJvcgQHJG1hdGNoMAUCdHgDCQABAgUHJG1hdGNoMAIFT3JkZXIEBW9yZGVyBQckbWF0Y2gwBAptYXRjaGVyUHViCQECbXAABApvcmRlclZhbGlkCQEDbW9hAQUFb3JkZXIEC3NlbmRlclZhbGlkCQD0AwMIBQVvcmRlcglib2R5Qnl0ZXMJAJEDAggFBW9yZGVyBnByb29mcwAACAUFb3JkZXIPc2VuZGVyUHVibGljS2V5BAxtYXRjaGVyVmFsaWQJAPQDAwgFBW9yZGVyCWJvZHlCeXRlcwkAkQMCCAUFb3JkZXIGcHJvb2ZzAAEFCm1hdGNoZXJQdWIDAwMFCm9yZGVyVmFsaWQFC3NlbmRlclZhbGlkBwUMbWF0Y2hlclZhbGlkBwYJAQN0b2UDBQpvcmRlclZhbGlkBQtzZW5kZXJWYWxpZAUMbWF0Y2hlclZhbGlkAwkAAQIFByRtYXRjaDACFFNldFNjcmlwdFRyYW5zYWN0aW9uBAFzBQckbWF0Y2gwBAduZXdIYXNoCQD2AwEJAQV2YWx1ZQEIBQFzBnNjcmlwdAQLYWxsb3dlZEhhc2gJANsEAQkBBXZhbHVlAQkAnQgCBQNmY2EJARxrZXlBbGxvd2VkTHBTdGFibGVTY3JpcHRIYXNoAAQLY3VycmVudEhhc2gJAPEHAQUEdGhpcwMDCQAAAgULYWxsb3dlZEhhc2gFB25ld0hhc2gJAQIhPQIFC2N1cnJlbnRIYXNoBQduZXdIYXNoBwYJAPQDAwgFAnR4CWJvZHlCeXRlcwkAkQMCCAUCdHgGcHJvb2ZzAAAFD3RhcmdldFB1YmxpY0tleQkA9AMDCAUCdHgJYm9keUJ5dGVzCQCRAwIIBQJ0eAZwcm9vZnMAAAUPdGFyZ2V0UHVibGljS2V52/sDAA==",
    "height": 2225450,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: 4GW6KXRJtc9GAKVxtdUgYHWL5AUXBpJBEDnE9FeVAopy
Next: GUpMxyZQmTczx19YvnwihhixsXw3smudYtE2uzkPhioe

Diff: 

OldNewDifferences
11 {-# STDLIB_VERSION 6 #-}
22 {-# SCRIPT_TYPE ACCOUNT #-}
33 {-# CONTENT_TYPE DAPP #-}
4-let defaultDecimals = 1000000
4+let defaultDecimals = 100000000
55 
66 let scale8 = 100000000
77 
88 let scale8BigInt = toBigInt(100000000)
99 
1010 let scale18 = toBigInt(1000000000000000000)
11-
12-let thousand = 1000
1311 
1412 let zeroBigInt = toBigInt(0)
1513 
5755 
5856 let idxFactGwxRewCntr = 10
5957 
60-let feePermilleDefault = 0
58+let delay = "%s__delay"
6159 
62-func toX18 (origVal,origScaleMult) = fraction(toBigInt(origVal), scale18, toBigInt(origScaleMult))
60+func t1 (origVal,origScaleMult) = fraction(toBigInt(origVal), scale18, toBigInt(origScaleMult))
6361 
6462 
65-func fromX18 (val,resultScaleMult) = toInt(fraction(val, toBigInt(resultScaleMult), scale18))
63+func f1 (val,resultScaleMult) = toInt(fraction(val, toBigInt(resultScaleMult), scale18))
6664 
6765 
6866 func ts (amt,resScale,curScale) = fraction(amt, resScale, curScale)
7371     else val
7472 
7573 
76-func keyFactoryContact () = "%s__factoryContract"
74+func fc () = "%s__factoryContract"
7775 
7876 
79-func keyManagerPublicKey () = "%s__managerPublicKey"
77+func mpk () = "%s__managerPublicKey"
8078 
8179 
82-func keyPendingManagerPublicKey () = "%s__pendingManagerPublicKey"
80+func pmpk () = "%s__pendingManagerPublicKey"
8381 
8482 
85-func keyPriceLast () = "%s%s__price__last"
83+func pl () = "%s%s__price__last"
8684 
8785 
88-func keyPriceHistory (h,t) = makeString(["%s%s%d%d__price__history", toString(h), toString(t)], SEP)
86+func ph (h,t) = makeString(["%s%s%d%d__price__history", toString(h), toString(t)], SEP)
8987 
9088 
91-func keyPutActionByUser (ua,txId) = ((("%s%s%s__P__" + ua) + "__") + txId)
89+func pau (ua,txId) = ((("%s%s%s__P__" + ua) + "__") + txId)
9290 
9391 
94-func keyGetActionByUser (ua,txId) = ((("%s%s%s__G__" + ua) + "__") + txId)
92+func gau (ua,txId) = ((("%s%s%s__G__" + ua) + "__") + txId)
9593 
9694 
97-func keyAmountAsset () = "%s__amountAsset"
95+func aa () = "%s__amountAsset"
9896 
9997 
100-func keyPriceAsset () = "%s__priceAsset"
98+func pa () = "%s__priceAsset"
10199 
102100 
103-func keyAmplificator () = "%s__amp"
101+func amp () = "%s__amp"
104102 
105103 
106-func keyAddonAddress () = "%s__addonAddr"
104+func ada () = "%s__addonAddr"
107105 
108106 
109-let keyFeePermille = "%s__feePermille"
110-
111-let feePermille = valueOrElse(getInteger(this, keyFeePermille), feePermilleDefault)
112-
113-func keyFactoryConfig () = "%s__factoryConfig"
107+func lgotc (caller) = makeString(["%s%s__lastGetOneTknCall", caller], SEP)
114108 
115109 
116-func keyMatcherPub () = "%s%s__matcher__publicKey"
110+func lsotc (caller) = makeString(["%s%s__lastPutOneTknCall", caller], SEP)
117111 
118112 
119-func keyPoolConfig (iAmtAs,iPrAs) = (((("%d%d%s__" + iAmtAs) + "__") + iPrAs) + "__config")
113+func fcfg () = "%s__factoryConfig"
120114 
121115 
122-func keyMappingsBaseAsset2internalId (bAStr) = ("%s%s%s__mappings__baseAsset2internalId__" + bAStr)
116+func mtpk () = "%s%s__matcher__publicKey"
123117 
124118 
125-func keyAllPoolsShutdown () = "%s__shutdown"
119+func pc (iAmtAs,iPrAs) = (((("%d%d%s__" + iAmtAs) + "__") + iPrAs) + "__config")
126120 
127121 
128-func throwErr (msg) = throw(makeString(["lp_stable.ride:", msg], " "))
122+func mba (bAStr) = ("%s%s%s__mappings__baseAsset2internalId__" + bAStr)
129123 
130124 
131-func throwOrderError (orV,sendrV,matchV) = throwErr(((((("Failed: ordValid=" + toString(orV)) + " sndrValid=") + toString(sendrV)) + " mtchrValid=") + toString(matchV)))
125+func aps () = "%s__shutdown"
126+
127+
128+func keyAllowedLpStableScriptHash () = "%s__allowedLpStableScriptHash"
129+
130+
131+func toe (orV,sendrV,matchV) = throw(((((("Failed: ordValid=" + toString(orV)) + " sndrValid=") + toString(sendrV)) + " mtchrValid=") + toString(matchV)))
132132 
133133 
134134 func str (val) = match val {
135135     case valStr: String => 
136136         valStr
137137     case _ => 
138-        throwErr("fail cast to String")
138+        throw("fail cast to String")
139139 }
140140 
141141 
142-func getStringOrFail (addr,key) = valueOrErrorMessage(getString(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
142+func strf (addr,key) = valueOrErrorMessage(getString(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
143143 
144144 
145-func getIntOrFail (addr,key) = valueOrErrorMessage(getInteger(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
145+func intf (addr,key) = valueOrErrorMessage(getInteger(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
146146 
147147 
148-let factoryContract = addressFromStringValue(getStringOrFail(this, keyFactoryContact()))
148+let fca = addressFromStringValue(strf(this, fc()))
149149 
150-let amplificator = getStringOrFail(this, keyAmplificator())
150+let A = strf(this, amp())
151151 
152-func isGlobalShutdown () = valueOrElse(getBoolean(factoryContract, keyAllPoolsShutdown()), false)
152+func igs () = valueOrElse(getBoolean(fca, aps()), false)
153153 
154154 
155-func getMatcherPubOrFail () = fromBase58String(getStringOrFail(factoryContract, keyMatcherPub()))
155+func mp () = fromBase58String(strf(fca, mtpk()))
156156 
157157 
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)
158+func gpc () = {
159+    let amtAs = strf(this, aa())
160+    let priceAs = strf(this, pa())
161+    let iPriceAs = intf(fca, mba(priceAs))
162+    let iAmtAs = intf(fca, mba(amtAs))
163+    split(strf(fca, pc(toString(iAmtAs), toString(iPriceAs))), SEP)
166164     }
167165 
168166 
169-func getFactoryConfig () = split(getStringOrFail(factoryContract, keyFactoryConfig()), SEP)
167+func gfc () = split(strf(fca, fcfg()), SEP)
170168 
171169 
172170 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)
180178     else assetBalance(this, fromBase58String(assetId))
181179 
182180 
183-func calcPriceBigInt (prAmtX18,amAmtX18) = fraction(prAmtX18, scale18, amAmtX18)
181+func cpbi (prAmtX18,amAmtX18) = fraction(prAmtX18, scale18, amAmtX18)
184182 
185183 
186-func validateAbsDiff (estimateLP,outLp,slippage) = {
187-    let diff = fraction((estimateLP - outLp), scale8BigInt, outLp)
184+func vad (A1,A2,slippage) = {
185+    let diff = fraction((A1 - A2), scale8BigInt, A2)
188186     let pass = ((slippage - abs(diff)) > zeroBigInt)
189187     if (!(pass))
190-        then throwErr(("Big slippage: " + toString(diff)))
191-        else $Tuple2(pass, min([estimateLP, outLp]))
188+        then throw(("Big slpg: " + toString(diff)))
189+        else $Tuple2(pass, min([A1, A2]))
192190     }
193191 
194192 
195-func validateD (D1,D0,slippage) = {
193+func vd (D1,D0,slpg) = {
196194     let diff = fraction(D0, scale8BigInt, D1)
197-    let fail = (slippage > diff)
195+    let fail = (slpg > diff)
198196     if (if (fail)
199197         then true
200198         else (D0 > D1))
201-        then throwErr(((((((toString(D0) + " ") + toString(D1)) + " ") + toString(diff)) + " ") + toString(slippage)))
199+        then throw(((((((toString(D0) + " ") + toString(D1)) + " ") + toString(diff)) + " ") + toString(slpg)))
202200         else fail
203201     }
204202 
205203 
206-func privateCalcPrice (amAssetDcm,prAssetDcm,amAmt,prAmt) = {
207-    let amtAsAmtX18 = toX18(amAmt, amAssetDcm)
208-    let prAsAmtX18 = toX18(prAmt, prAssetDcm)
209-    calcPriceBigInt(prAsAmtX18, amtAsAmtX18)
204+func pcp (amAssetDcm,prAssetDcm,amAmt,prAmt) = {
205+    let amtAsAmtX18 = t1(amAmt, amAssetDcm)
206+    let prAsAmtX18 = t1(prAmt, prAssetDcm)
207+    cpbi(prAsAmtX18, amtAsAmtX18)
210208     }
211209 
212210 
213211 func calcPrices (amAmt,prAmt,lpAmt) = {
214-    let cfg = getPoolConfig()
212+    let cfg = gpc()
215213     let amtAsDcm = parseIntValue(cfg[idxAmtAsDcm])
216214     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)
215+    let priceX18 = pcp(amtAsDcm, prAsDcm, amAmt, prAmt)
216+    let amAmtX18 = t1(amAmt, amtAsDcm)
217+    let prAmtX18 = t1(prAmt, prAsDcm)
218+    let lpAmtX18 = t1(lpAmt, scale8)
219+    let lpPrInAmAsX18 = cpbi(amAmtX18, lpAmtX18)
220+    let lpPrInPrAsX18 = cpbi(prAmtX18, lpAmtX18)
223221 [priceX18, lpPrInAmAsX18, lpPrInPrAsX18]
224222     }
225223 
226224 
227225 func calculatePrices (amAmt,prAmt,lpAmt) = {
228226     let p = calcPrices(amAmt, prAmt, lpAmt)
229-[fromX18(p[0], scale8), fromX18(p[1], scale8), fromX18(p[2], scale8)]
227+[f1(p[0], scale8), f1(p[1], scale8), f1(p[2], scale8)]
230228     }
231229 
232230 
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])
231+func ego (txId58,pmtAssetId,pmtLpAmt,userAddress) = {
232+    let cfg = gpc()
233+    let lpId = cfg[idxLPAsId]
234+    let amId = cfg[idxAmAsId]
235+    let prId = cfg[idxPrAsId]
236+    let amDcm = parseIntValue(cfg[idxAmtAsDcm])
237+    let prDcm = parseIntValue(cfg[idxPriceAsDcm])
240238     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)
239+    let lpEmiss = valueOrErrorMessage(assetInfo(fromBase58String(lpId)), "Wrong LP id").quantity
240+    if ((lpId != pmtAssetId))
241+        then throw("Wrong pmt asset")
242+        else {
243+            let amBalance = getAccBalance(amId)
244+            let prBalance = getAccBalance(prId)
245+            let amountBalanceDefaultDecimals = fraction(amBalance, defaultDecimals, amDcm)
246+            let priceBalanceDefaultDecimals = fraction(prBalance, defaultDecimals, prDcm)
247+            let amBalanceX18 = t1(amountBalanceDefaultDecimals, defaultDecimals)
248+            let prBalanceX18 = t1(priceBalanceDefaultDecimals, defaultDecimals)
249+            let curPriceX18 = cpbi(prBalanceX18, amBalanceX18)
250+            let curPrice = f1(curPriceX18, scale8)
251+            let pmtLpAmtX18 = t1(pmtLpAmt, scale8)
252+            let lpEmissX18 = t1(lpEmiss, scale8)
253+            let outAmAmtX18 = fraction(amBalanceX18, pmtLpAmtX18, lpEmissX18)
254+            let outPrAmtX18 = fraction(prBalanceX18, pmtLpAmtX18, lpEmissX18)
255+            let outAmountAmountDefaultDecimals = f1(outAmAmtX18, defaultDecimals)
256+            let outPriceAmountDefaultDecimals = f1(outPrAmtX18, defaultDecimals)
257+            let outAmAmt = fraction(outAmountAmountDefaultDecimals, amDcm, defaultDecimals)
258+            let outPrAmt = fraction(outPriceAmountDefaultDecimals, prDcm, defaultDecimals)
263259             let state = if ((txId58 == ""))
264260                 then nil
265-                else [ScriptTransfer(userAddress, outAmountAmount, if ((amountId == "WAVES"))
261+                else [ScriptTransfer(userAddress, outAmAmt, if ((amId == "WAVES"))
266262                     then unit
267-                    else fromBase58String(amountId)), ScriptTransfer(userAddress, outPriceAmount, if ((priceId == "WAVES"))
263+                    else fromBase58String(amId)), ScriptTransfer(userAddress, outPrAmt, if ((prId == "WAVES"))
268264                     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)
265+                    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)]
266+            $Tuple10(outAmAmt, outPrAmt, amId, prId, amBalance, prBalance, lpEmiss, curPriceX18, sts, state)
271267             }
272-        else throw("Strict value is not equal to itself.")
273268     }
274269 
275270 
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])
271+func epo (txId58,slippage,inAmAmt,inAmId,inPrAmt,inPrId,userAddress,isEval,emitLp,isOneAsset,pmtAmt,pmtId) = {
272+    let cfg = gpc()
273+    let lpId = fromBase58String(cfg[idxLPAsId])
274+    let amIdStr = cfg[idxAmAsId]
275+    let prIdStr = cfg[idxPrAsId]
276+    let inAmIdStr = cfg[idxIAmtAsId]
277+    let inPrIdStr = cfg[idxIPriceAsId]
278+    let amtDcm = parseIntValue(cfg[idxAmtAsDcm])
279+    let priceDcm = parseIntValue(cfg[idxPriceAsDcm])
285280     let sts = cfg[idxPoolSt]
286-    let lpEmission = valueOrErrorMessage(assetInfo(lpAssetId), "Wrong lp asset").quantity
287-    let amountBalance = if (isEvaluate)
288-        then getAccBalance(amountIdStr)
281+    let lpEm = valueOrErrorMessage(assetInfo(lpId), "Wr lp as").quantity
282+    let amBalance = if (isEval)
283+        then getAccBalance(amIdStr)
289284         else if (if (isOneAsset)
290-            then (paymentId == amountIdStr)
285+            then (pmtId == amIdStr)
291286             else false)
292-            then (getAccBalance(amountIdStr) - paymentAmount)
287+            then (getAccBalance(amIdStr) - pmtAmt)
293288             else if (isOneAsset)
294-                then getAccBalance(amountIdStr)
295-                else (getAccBalance(amountIdStr) - inAmountAssetAmount)
296-    let priceBalance = if (isEvaluate)
297-        then getAccBalance(priceIdStr)
289+                then getAccBalance(amIdStr)
290+                else (getAccBalance(amIdStr) - inAmAmt)
291+    let prBalance = if (isEval)
292+        then getAccBalance(prIdStr)
298293         else if (if (isOneAsset)
299-            then (paymentId == priceIdStr)
294+            then (pmtId == prIdStr)
300295             else false)
301-            then (getAccBalance(priceIdStr) - paymentAmount)
296+            then (getAccBalance(prIdStr) - pmtAmt)
302297             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))
298+                then getAccBalance(prIdStr)
299+                else (getAccBalance(prIdStr) - inPrAmt)
300+    let amountBalanceDefaultDecimals = fraction(amBalance, defaultDecimals, amtDcm)
301+    let priceBalanceDefaultDecimals = fraction(prBalance, defaultDecimals, priceDcm)
302+    let inAmountAssetAmountDefaultDecimals = fraction(inAmAmt, defaultDecimals, amtDcm)
303+    let inPriceAssetAmountDefaultDecimals = fraction(inPrAmt, defaultDecimals, priceDcm)
304+    let inAmAssetAmtX18 = t1(inAmountAssetAmountDefaultDecimals, defaultDecimals)
305+    let inPrAssetAmtX18 = t1(inPriceAssetAmountDefaultDecimals, defaultDecimals)
306+    let userPriceX18 = cpbi(inPrAssetAmtX18, inAmAssetAmtX18)
307+    let amBalanceX18 = t1(amountBalanceDefaultDecimals, defaultDecimals)
308+    let prBalanceX18 = t1(priceBalanceDefaultDecimals, defaultDecimals)
309+    let r = if ((lpEm == 0))
315310         then {
316-            let currentPriceX18 = zeroBigInt
311+            let curPriceX18 = zeroBigInt
317312             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)
313+            let lpAmtX18 = pow((inAmAssetAmtX18 * inPrAssetAmtX18), 0, toBigInt(5), 1, 0, DOWN)
314+            $Tuple5(f1(lpAmtX18, scale8), f1(inAmAssetAmtX18, defaultDecimals), f1(inPrAssetAmtX18, defaultDecimals), cpbi((prBalanceX18 + inPrAssetAmtX18), (amBalanceX18 + inAmAssetAmtX18)), slippageX18)
320315             }
321316         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))
317+            let curPriceX18 = cpbi(prBalanceX18, amBalanceX18)
318+            let slippageRealX18 = fraction(abs((curPriceX18 - userPriceX18)), scale18, curPriceX18)
319+            let slippageX18 = t1(slippage, scale8)
320+            if (if ((curPriceX18 != zeroBigInt))
326321                 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)
322+                else false)
323+                then throw(((("Price slippage " + toString(slippageRealX18)) + " > ") + toString(slippageX18)))
324+                else {
325+                    let lpEmissionX18 = t1(lpEm, scale8)
326+                    let prViaAmX18 = fraction(inAmAssetAmtX18, curPriceX18, scale18)
327+                    let amViaPrX18 = fraction(inPrAssetAmtX18, scale18, curPriceX18)
328+                    let expectedAmts = if ((prViaAmX18 > inPrAssetAmtX18))
329+                        then $Tuple2(amViaPrX18, inPrAssetAmtX18)
330+                        else $Tuple2(inAmAssetAmtX18, prViaAmX18)
331+                    let expAmtAssetAmtX18 = expectedAmts._1
332+                    let expPriceAssetAmtX18 = expectedAmts._2
333+                    let lpAmtX18 = fraction(lpEmissionX18, expPriceAssetAmtX18, prBalanceX18)
334+                    $Tuple5(f1(lpAmtX18, scale8), f1(expAmtAssetAmtX18, defaultDecimals), f1(expPriceAssetAmtX18, defaultDecimals), curPriceX18, slippageX18)
342335                     }
343-                else throw("Strict value is not equal to itself.")
344336             }
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))
337+    let calcLpAmt = r._1
338+    let calcAmAssetPmt = fraction(r._2, amtDcm, defaultDecimals)
339+    let calcPrAssetPmt = fraction(r._3, priceDcm, defaultDecimals)
340+    let curPrice = f1(r._4, scale8)
341+    let slippageCalc = f1(r._5, scale8)
342+    if ((0 >= calcLpAmt))
343+        then throw("LP <= 0")
344+        else {
345+            let emitLpAmt = if (!(emitLp))
356346                 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)
347+                else calcLpAmt
348+            let amDiff = (inAmAmt - calcAmAssetPmt)
349+            let prDiff = (inPrAmt - calcPrAssetPmt)
350+            let $t01664916994 = if (if (isOneAsset)
351+                then (pmtId == amIdStr)
362352                 else false)
363-                then $Tuple2(paymentAmount, 0)
353+                then $Tuple2(pmtAmt, 0)
364354                 else if (if (isOneAsset)
365-                    then (paymentId == priceIdStr)
355+                    then (pmtId == prIdStr)
366356                     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)
357+                    then $Tuple2(0, pmtAmt)
358+                    else $Tuple2(calcAmAssetPmt, calcPrAssetPmt)
359+            let writeAmAmt = $t01664916994._1
360+            let writePrAmt = $t01664916994._2
361+            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))]
362+            $Tuple13(calcLpAmt, emitLpAmt, curPrice, amBalance, prBalance, lpEm, lpId, sts, commonState, amDiff, prDiff, inAmId, inPrId)
373363             }
374-        else throw("Strict value is not equal to itself.")
375364     }
376365 
377366 
378-func validateMatcherOrderAllowed (order) = {
379-    let cfg = getPoolConfig()
367+func moa (order) = {
368+    let cfg = gpc()
380369     let amtAsId = cfg[idxAmAsId]
381370     let prAsId = cfg[idxPrAsId]
382371     let sts = parseIntValue(cfg[idxPoolSt])
384373     let prAsDcm = parseIntValue(cfg[idxPriceAsDcm])
385374     let accAmtAsBalance = getAccBalance(amtAsId)
386375     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())
376+    let curPriceX18 = if ((order.orderType == Buy))
377+        then pcp(amtAsDcm, prAsDcm, (accAmtAsBalance + order.amount), accPrAsBalance)
378+        else pcp(amtAsDcm, prAsDcm, (accAmtAsBalance - order.amount), accPrAsBalance)
379+    let curPrice = f1(curPriceX18, scale8)
380+    if (if (if (igs())
392381         then true
393382         else (sts == PoolMatcherDis))
394383         then true
395384         else (sts == PoolShutdown))
396-        then throwErr("Admin blocked")
385+        then throw("Admin blocked")
397386         else {
398387             let orAmtAsset = order.assetPair.amountAsset
399388             let orAmtAsStr = if ((orAmtAsset == unit))
406395             if (if ((orAmtAsStr != amtAsId))
407396                 then true
408397                 else (orPrAsStr != prAsId))
409-                then throwErr("Wr assets")
398+                then throw("Wr assets")
410399                 else {
411400                     let orderPrice = order.price
412-                    let priceDecimals = fraction(scale8, prAsDcm, amtAsDcm)
413-                    let castOrderPrice = ts(orderPrice, scale8, priceDecimals)
401+                    let priceDcm = fraction(scale8, prAsDcm, amtAsDcm)
402+                    let castOrderPrice = ts(orderPrice, scale8, priceDcm)
414403                     let isOrderPriceValid = if ((order.orderType == Buy))
415404                         then (curPrice >= castOrderPrice)
416405                         else (castOrderPrice >= curPrice)
420409     }
421410 
422411 
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-    }
412+func cg (i) = if ((size(i.payments) != 1))
413+    then throw("1 pmnt exp")
414+    else {
415+        let pmt = value(i.payments[0])
416+        let pmtAssetId = value(pmt.assetId)
417+        let pmtAmt = pmt.amount
418+        let r = ego(toBase58String(i.transactionId), toBase58String(pmtAssetId), pmtAmt, i.caller)
419+        let outAmAmt = r._1
420+        let outPrAmt = r._2
421+        let sts = parseIntValue(r._9)
422+        let state = r._10
423+        if (if (igs())
424+            then true
425+            else (sts == PoolShutdown))
426+            then throw(("Admin blocked: " + toString(sts)))
427+            else $Tuple5(outAmAmt, outPrAmt, pmtAmt, pmtAssetId, state)
428+        }
445429 
446430 
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)
431+func cp (caller,txId,amAsPmt,prAsPmt,slippage,emitLp,isOneAsset,pmtAmt,pmtId) = {
432+    let r = epo(txId, slippage, value(amAsPmt).amount, value(amAsPmt).assetId, value(prAsPmt).amount, value(prAsPmt).assetId, caller, false, emitLp, isOneAsset, pmtAmt, pmtId)
449433     let sts = parseIntValue(r._8)
450-    if (if (if (isGlobalShutdown())
434+    if (if (if (igs())
451435         then true
452436         else (sts == PoolPutDis))
453437         then true
454438         else (sts == PoolShutdown))
455-        then throwErr(("Blocked:" + toString(sts)))
439+        then throw(("Blocked:" + toString(sts)))
456440         else r
457441     }
458442 
459443 
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()) {
444+func m () = match getString(mpk()) {
467445     case s: String => 
468446         fromBase58String(s)
469447     case _: Unit => 
473451 }
474452 
475453 
476-func pendingManagerPublicKeyOrUnit () = match getString(keyPendingManagerPublicKey()) {
454+func pm () = match getString(pmpk()) {
477455     case s: String => 
478456         fromBase58String(s)
479457     case _: Unit => 
483461 }
484462 
485463 
486-let pd = throwErr("Permission denied")
464+let pd = throw("Permission denied")
487465 
488-func mustManager (i) = match managerPublicKeyOrUnit() {
466+func mm (i) = match m() {
489467     case pk: ByteVector => 
490468         if ((i.callerPublicKey == pk))
491469             then true
500478 
501479 
502480 @Callable(i)
503-func constructor (factoryContract) = {
504-    let checkCaller = mustManager(i)
505-    if ((checkCaller == checkCaller))
506-        then [StringEntry(keyFactoryContact(), factoryContract)]
481+func constructor (fc) = {
482+    let c = mm(i)
483+    if ((c == c))
484+        then [StringEntry(fc(), fc)]
507485         else throw("Strict value is not equal to itself.")
508486     }
509487 
511489 
512490 @Callable(i)
513491 func setManager (pendingManagerPublicKey) = {
514-    let checkCaller = mustManager(i)
515-    if ((checkCaller == checkCaller))
492+    let c = mm(i)
493+    if ((c == c))
516494         then {
517-            let checkManagerPublicKey = fromBase58String(pendingManagerPublicKey)
518-            if ((checkManagerPublicKey == checkManagerPublicKey))
519-                then [StringEntry(keyPendingManagerPublicKey(), pendingManagerPublicKey)]
495+            let cm = fromBase58String(pendingManagerPublicKey)
496+            if ((cm == cm))
497+                then [StringEntry(pmpk(), pendingManagerPublicKey)]
520498                 else throw("Strict value is not equal to itself.")
521499             }
522500         else throw("Strict value is not equal to itself.")
526504 
527505 @Callable(i)
528506 func confirmManager () = {
529-    let pm = pendingManagerPublicKeyOrUnit()
530-    let hasPM = if (isDefined(pm))
507+    let p = pm()
508+    let hpm = if (isDefined(p))
531509         then true
532-        else throwErr("No pending manager")
533-    if ((hasPM == hasPM))
510+        else throw("No pending manager")
511+    if ((hpm == hpm))
534512         then {
535-            let checkPM = if ((i.callerPublicKey == value(pm)))
513+            let cpm = if ((i.callerPublicKey == value(p)))
536514                 then true
537-                else throwErr("You are not pending manager")
538-            if ((checkPM == checkPM))
539-                then [StringEntry(keyManagerPublicKey(), toBase58String(value(pm))), DeleteEntry(keyPendingManagerPublicKey())]
515+                else throw("You are not pending manager")
516+            if ((cpm == cpm))
517+                then [StringEntry(mpk(), toBase58String(value(p))), DeleteEntry(pmpk())]
540518                 else throw("Strict value is not equal to itself.")
541519             }
542520         else throw("Strict value is not equal to itself.")
545523 
546524 
547525 @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))
580-                                then {
581-                                    let sa = if ((amountDiff > 0))
582-                                        then invoke(slippageContract, "put", nil, [AttachedPayment(amountId, amountDiff)])
583-                                        else nil
584-                                    if ((sa == sa))
585-                                        then {
586-                                            let sp = if ((priceDiff > 0))
587-                                                then invoke(slippageContract, "put", nil, [AttachedPayment(priceId, priceDiff)])
588-                                                else nil
589-                                            if ((sp == sp))
590-                                                then {
591-                                                    let lpTrasfer = if (autoStake)
592-                                                        then {
593-                                                            let ss = invoke(stakingContract, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmount)])
594-                                                            if ((ss == ss))
595-                                                                then nil
596-                                                                else throw("Strict value is not equal to itself.")
597-                                                            }
598-                                                        else [ScriptTransfer(i.caller, emitLpAmount, lpAssetId)]
599-                                                    (state ++ lpTrasfer)
600-                                                    }
601-                                                else throw("Strict value is not equal to itself.")
602-                                            }
603-                                        else throw("Strict value is not equal to itself.")
604-                                    }
605-                                else throw("Strict value is not equal to itself.")
606-                            }
607-                        else throw("Strict value is not equal to itself.")
608-                    }
609-                else throw("Strict value is not equal to itself.")
610-            }
611-        else throw("Strict value is not equal to itself.")
526+func put (slip,autoStake) = {
527+    let factCfg = gfc()
528+    let stakingCntr = valueOrErrorMessage(addressFromString(factCfg[idxFactStakCntr]), "Wr st addr")
529+    let slipCntr = valueOrErrorMessage(addressFromString(factCfg[idxFactSlippCntr]), "Wr sl addr")
530+    if ((0 > slip))
531+        then throw("Wrong slippage")
532+        else if ((size(i.payments) != 2))
533+            then throw("2 pmnts expd")
534+            else {
535+                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, "")
536+                let emitLpAmt = e._2
537+                let lpAssetId = e._7
538+                let state = e._9
539+                let amDiff = e._10
540+                let prDiff = e._11
541+                let amId = e._12
542+                let prId = e._13
543+                let r = invoke(fca, "emit", [emitLpAmt], nil)
544+                if ((r == r))
545+                    then {
546+                        let el =                         match r {
547+                            case legacy: Address => 
548+                                invoke(legacy, "emit", [emitLpAmt], nil)
549+                            case _ => 
550+                                unit
551+                        }
552+                        if ((el == el))
553+                            then {
554+                                let sa = if ((amDiff > 0))
555+                                    then invoke(slipCntr, "put", nil, [AttachedPayment(amId, amDiff)])
556+                                    else nil
557+                                if ((sa == sa))
558+                                    then {
559+                                        let sp = if ((prDiff > 0))
560+                                            then invoke(slipCntr, "put", nil, [AttachedPayment(prId, prDiff)])
561+                                            else nil
562+                                        if ((sp == sp))
563+                                            then {
564+                                                let lpTrnsfr = if (autoStake)
565+                                                    then {
566+                                                        let ss = invoke(stakingCntr, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmt)])
567+                                                        if ((ss == ss))
568+                                                            then nil
569+                                                            else throw("Strict value is not equal to itself.")
570+                                                        }
571+                                                    else [ScriptTransfer(i.caller, emitLpAmt, lpAssetId)]
572+                                                (state ++ lpTrnsfr)
573+                                                }
574+                                            else throw("Strict value is not equal to itself.")
575+                                        }
576+                                    else throw("Strict value is not equal to itself.")
577+                                }
578+                            else throw("Strict value is not equal to itself.")
579+                        }
580+                    else throw("Strict value is not equal to itself.")
581+                }
612582     }
613583 
614584 
615585 
616586 @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()), "")
587+func putOneTkn (amAssetPart,prAssetPart,outLp,slippage,autoStake) = {
588+    let cfg = gfc()
589+    let stakingCntr = valueOrErrorMessage(addressFromString(cfg[idxFactStakCntr]), "Wr st addr")
590+    let slipCntr = valueOrErrorMessage(addressFromString(cfg[idxFactSlippCntr]), "Wr sl addr")
591+    let gwxCntr = valueOrErrorMessage(addressFromString(cfg[idxFactGwxRewCntr]), "Wr gwx addr")
592+    let poolCfg = gpc()
593+    let amId = poolCfg[idxAmAsId]
594+    let prId = poolCfg[idxPrAsId]
595+    let amDcm = parseIntValue(poolCfg[idxAmtAsDcm])
596+    let prDcm = parseIntValue(poolCfg[idxPriceAsDcm])
597+    let addon = valueOrElse(getString(this, ada()), "")
628598     let userAddress = if ((addon == toString(i.caller)))
629599         then i.originCaller
630600         else i.caller
631601     if (if (if (if ((0 >= slippage))
632602         then true
633-        else (0 >= amountAssetPart))
603+        else (0 >= amAssetPart))
634604         then true
635-        else (0 >= priceAssetPart))
605+        else (0 >= prAssetPart))
636606         then true
637607         else (0 >= outLp))
638-        then throwErr("Wrong params")
608+        then throw("Wrong params")
639609         else if ((size(i.payments) != 1))
640-            then throwErr("1 payment expected")
610+            then throw("1 pmnt expd")
641611             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")
612+                let pmt = value(i.payments[0])
613+                let pmtAssetId = toBase58String(value(pmt.assetId))
614+                let pmtDecimals = value(assetInfo(value(i.payments[0].assetId))).decimals
615+                let pmtAmt = pmt.amount
616+                let pmtAmtDefaultDecimals = ((pmtAmt * defaultDecimals) / pow(10, 0, pmtDecimals, 0, 0, DOWN))
617+                if ((10000000 > pmtAmtDefaultDecimals))
618+                    then throw("Wrong pmt amt")
654619                     else {
655-                        let amountBalance = getAccBalance(amountId)
656-                        let priceBalance = getAccBalance(priceId)
657-                        let $t02689227347 = 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 = $t02689227347._1
663-                        let priceBalanceNow = $t02689227347._2
664-                        let virtSwapInAm = $t02689227347._3
665-                        let virtSwapOutPr = $t02689227347._4
666-                        let virtSwapInPr = $t02689227347._5
667-                        let virtSwapOutAm = $t02689227347._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)
620+                        let amBalance = getAccBalance(amId)
621+                        let prBalance = getAccBalance(prId)
622+                        let $t02583826534 = if ((pmtAssetId == amId))
623+                            then if (if ((pmtAmtDefaultDecimals > amBalance))
624+                                then true
625+                                else (amAssetPart > pmtAmtDefaultDecimals))
626+                                then throw("invalid payment amount")
627+                                else $Tuple6((amBalance - pmtAmtDefaultDecimals), prBalance, (pmtAmtDefaultDecimals - amAssetPart), prAssetPart, 0, 0)
628+                            else if ((pmtAssetId == prId))
629+                                then if (if ((pmtAmtDefaultDecimals > prBalance))
630+                                    then true
631+                                    else (prAssetPart > pmtAmtDefaultDecimals))
632+                                    then throw("invalid payment amount")
633+                                    else $Tuple6(amBalance, (prBalance - pmtAmtDefaultDecimals), 0, 0, (pmtAmtDefaultDecimals - prAssetPart), amAssetPart)
634+                                else throw("wrong pmtAssetId")
635+                        let amBalanceNow = $t02583826534._1
636+                        let prBalanceNow = $t02583826534._2
637+                        let virtSwapInAm = $t02583826534._3
638+                        let virtSwapOutPr = $t02583826534._4
639+                        let virtSwapInPr = $t02583826534._5
640+                        let virtSwapOutAm = $t02583826534._6
641+                        let D0 = invoke(gwxCntr, "calcD", [toString(amBalanceNow), toString(prBalanceNow), A, Amult, Dconv], nil)
642+                        let D1 = invoke(gwxCntr, "calcD", [toString(toBigInt(((amBalanceNow + virtSwapInAm) - virtSwapOutAm))), toString(toBigInt(((prBalanceNow + virtSwapInPr) - virtSwapOutPr))), A, Amult, Dconv], nil)
643+                        let D0vsD1 = vd(parseBigIntValue(str(D1)), parseBigIntValue(str(D0)), slippage4D)
671644                         if ((D0vsD1 == D0vsD1))
672645                             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)
646+                                let estPut = cp(toString(i.caller), toBase58String(i.transactionId), AttachedPayment(fromBase58String(amId), amAssetPart), AttachedPayment(fromBase58String(prId), prAssetPart), slippage, true, true, pmtAmt, pmtAssetId)
647+                                let estimLP = estPut._2
648+                                let lpAssetId = estPut._7
649+                                let state = estPut._9
650+                                let amDiff = estPut._10
651+                                let prDiff = estPut._11
652+                                let lpCalcRes = vad(toBigInt(estimLP), toBigInt(outLp), toBigInt(slippage))
653+                                let emitLpAmt = toInt(lpCalcRes._2)
654+                                let e = invoke(fca, "emit", [emitLpAmt], nil)
682655                                 if ((e == e))
683656                                     then {
684657                                         let el =                                         match e {
685658                                             case legacy: Address => 
686-                                                invoke(legacy, "emit", [emitLpAmount], nil)
659+                                                invoke(legacy, "emit", [emitLpAmt], nil)
687660                                             case _ => 
688661                                                 unit
689662                                         }
690663                                         if ((el == el))
691664                                             then {
692-                                                let sa = if ((amountDiff > 0))
693-                                                    then invoke(slippageContract, "put", nil, [AttachedPayment(fromBase58String(amountId), amountDiff)])
665+                                                let sa = if ((amDiff > 0))
666+                                                    then invoke(slipCntr, "put", nil, [AttachedPayment(fromBase58String(amId), amDiff)])
694667                                                     else nil
695668                                                 if ((sa == sa))
696669                                                     then {
697-                                                        let sp = if ((priceDiff > 0))
698-                                                            then invoke(slippageContract, "put", nil, [AttachedPayment(fromBase58String(priceId), priceDiff)])
670+                                                        let sp = if ((prDiff > 0))
671+                                                            then invoke(slipCntr, "put", nil, [AttachedPayment(fromBase58String(prId), prDiff)])
699672                                                             else nil
700673                                                         if ((sp == sp))
701674                                                             then {
702-                                                                let lpTrasfer = if (autoStake)
675+                                                                let lpTrnsfr = if (autoStake)
703676                                                                     then {
704-                                                                        let ss = invoke(stakingContract, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmount)])
677+                                                                        let ss = invoke(stakingCntr, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmt)])
705678                                                                         if ((ss == ss))
706679                                                                             then nil
707680                                                                             else throw("Strict value is not equal to itself.")
708681                                                                         }
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)
682+                                                                    else [ScriptTransfer(i.caller, emitLpAmt, lpAssetId)]
683+                                                                (state ++ lpTrnsfr)
714684                                                                 }
715685                                                             else throw("Strict value is not equal to itself.")
716686                                                         }
728698 
729699 
730700 @Callable(i)
731-func putForFree (maxslippage) = if ((0 > maxslippage))
732-    then throwErr("wrong slippage")
701+func putForFree (maxSlpg) = if ((0 > maxSlpg))
702+    then throw("Wrong slpg")
733703     else if ((size(i.payments) != 2))
734-        then throwErr("2 payments expected")
704+        then throw("2 pmnts expd")
735705         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
706+            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, "")
707+            estPut._9
738708             }
739709 
740710 
741711 
742712 @Callable(i)
743713 func get () = {
744-    let r = commonGet(i)
714+    let r = cg(i)
745715     let outAmtAmt = r._1
746-    let outPriceAmount = r._2
747-    let paymentAmount = r._3
748-    let paymentAssetId = r._4
716+    let outPrAmt = r._2
717+    let pmtAmt = r._3
718+    let pmtAssetId = r._4
749719     let state = r._5
750-    let b = invoke(factoryContract, "burn", [paymentAmount], [AttachedPayment(paymentAssetId, paymentAmount)])
720+    let b = invoke(fca, "burn", [pmtAmt], [AttachedPayment(pmtAssetId, pmtAmt)])
751721     if ((b == b))
752722         then state
753723         else throw("Strict value is not equal to itself.")
757727 
758728 @Callable(i)
759729 func getOneTkn (exchResult,notUsed,outAmount,outAssetId,slippage) = if ((size(i.payments) != 1))
760-    then throwErr("1 payment expected")
730+    then throw("1 pmnt expd")
761731     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])
732+        let cfg = gpc()
733+        let lpId = cfg[idxLPAsId]
734+        let amId = cfg[idxAmAsId]
735+        let prId = cfg[idxPrAsId]
736+        let amDcm = parseIntValue(cfg[idxAmtAsDcm])
737+        let prDcm = parseIntValue(cfg[idxPriceAsDcm])
768738         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()), "")
739+        let factCfg = gfc()
740+        let gwxCntr = valueOrErrorMessage(addressFromString(factCfg[idxFactGwxRewCntr]), "Wr sl addr")
741+        let pmt = value(i.payments[0])
742+        let addon = valueOrElse(getString(this, ada()), "")
773743         let userAddress = if ((addon == toString(i.caller)))
774744             then i.originCaller
775745             else i.caller
776746         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")
747+        let pmtAssetId = value(pmt.assetId)
748+        let pmtAmt = pmt.amount
749+        if ((1000000000 > pmtAmt))
750+            then throw("Min pmt 10 LP")
781751             else if (if (if ((0 > slippage))
782752                 then true
783753                 else (0 > exchResult))
784754                 then true
785755                 else (0 > outAmount))
786-                then throwErr("Wrong params")
787-                else if ((lpAssetId != toBase58String(paymentAssetId)))
788-                    then throwErr("Wrong LP")
756+                then throw("Wrong params")
757+                else if ((lpId != toBase58String(pmtAssetId)))
758+                    then throw("Wrong LP")
789759                     else {
790-                        let r = estimateGetOperation(toBase58String(i.transactionId), toBase58String(paymentAssetId), paymentAmount, i.caller)
760+                        let r = ego(toBase58String(i.transactionId), toBase58String(pmtAssetId), pmtAmt, i.caller)
791761                         let estimAmAmt = r._1
792762                         let estimPrAmt = r._2
793-                        let amountBalance = getAccBalance(amountId)
794-                        let priceBalance = getAccBalance(priceId)
795-                        let $t03249432962 = 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 = $t03249432962._1
801-                        let priceBalanceNow = $t03249432962._2
802-                        let virtSwapInAm = $t03249432962._3
803-                        let virtSwapOutPr = $t03249432962._4
804-                        let virtSwapInPr = $t03249432962._5
805-                        let virtSwapOutAm = $t03249432962._6
806-                        let totalGet = $t03249432962._7
763+                        let amBalance = getAccBalance(amId)
764+                        let prBalance = getAccBalance(prId)
765+                        let $t03131331770 = if ((outAssetId == amId))
766+                            then $Tuple7((amBalance - estimAmAmt), (prBalance - estimPrAmt), exchResult, estimPrAmt, 0, 0, (estimAmAmt + exchResult))
767+                            else if ((outAssetId == prId))
768+                                then $Tuple7((amBalance - estimAmAmt), (prBalance - estimPrAmt), 0, 0, exchResult, estimAmAmt, (estimPrAmt + exchResult))
769+                                else throw("wrong outAssetId")
770+                        let amBalanceNow = $t03131331770._1
771+                        let prBalanceNow = $t03131331770._2
772+                        let virtSwapInAm = $t03131331770._3
773+                        let virtSwapOutPr = $t03131331770._4
774+                        let virtSwapInPr = $t03131331770._5
775+                        let virtSwapOutAm = $t03131331770._6
776+                        let totalGet = $t03131331770._7
807777                         if (if ((0 > virtSwapInAm))
808778                             then true
809779                             else (0 > virtSwapInPr))
810-                            then throwErr("Wrong calc")
780+                            then throw("Wrong calc")
811781                             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)
782+                                let D0 = invoke(gwxCntr, "calcD", [toString(amBalanceNow), toString(prBalanceNow), A, Amult, Dconv], nil)
783+                                let D1 = invoke(gwxCntr, "calcD", [toString(((amBalanceNow - virtSwapInAm) + virtSwapOutAm)), toString(((prBalanceNow + virtSwapOutPr) - virtSwapInPr)), A, Amult, Dconv], nil)
784+                                let D0vsD1 = vd(parseBigIntValue(str(D1)), parseBigIntValue(str(D0)), slippage4D)
815785                                 if ((D0vsD1 == D0vsD1))
816786                                     then {
817-                                        let finalRes = validateAbsDiff(toBigInt(totalGet), toBigInt(outAmount), toBigInt(slippage))
787+                                        let finalRes = vad(toBigInt(totalGet), toBigInt(outAmount), toBigInt(slippage))
818788                                         if ((finalRes == finalRes))
819789                                             then {
820-                                                let $t03363133739 = if ((outAssetId == amountId))
790+                                                let $t03247532579 = if ((outAssetId == amId))
821791                                                     then $Tuple2(toInt(finalRes._2), 0)
822792                                                     else $Tuple2(0, toInt(finalRes._2))
823-                                                let outAm = $t03363133739._1
824-                                                let outPr = $t03363133739._2
825-                                                let totalAmountRaw = (outAm + outPr)
826-                                                let $t03377933834 = takeFee(totalAmountRaw)
827-                                                let totalAmount = $t03377933834._1
828-                                                let feeAmount = $t03377933834._2
829-                                                let outAssetIdOrWaves = if ((outAssetId == "WAVES"))
793+                                                let outAm = $t03247532579._1
794+                                                let outPr = $t03247532579._2
795+                                                let curPrX18 = cpbi(t1(prBalance, prDcm), t1(amBalance, amDcm))
796+                                                let curPr = f1(curPrX18, scale8)
797+                                                let state = [ScriptTransfer(userAddress, (outAm + outPr), if ((outAssetId == "WAVES"))
830798                                                     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))
799+                                                    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)]
800+                                                if ((state == state))
839801                                                     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-                                                                }
802+                                                        let burn = invoke(fca, "burn", [pmtAmt], [AttachedPayment(pmtAssetId, pmtAmt)])
803+                                                        if ((burn == burn))
804+                                                            then state
850805                                                             else throw("Strict value is not equal to itself.")
851806                                                         }
852807                                                     else throw("Strict value is not equal to itself.")
862817 
863818 @Callable(i)
864819 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
820+    let r = cg(i)
821+    let outAmAmt = r._1
822+    let outPrAmt = r._2
823+    let pmtAmt = r._3
824+    let pmtAssetId = r._4
870825     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.")
826+    if ((noLessThenAmtAsset > outAmAmt))
827+        then throw(((("Failed:  " + toString(outAmAmt)) + " < ") + toString(noLessThenAmtAsset)))
828+        else if ((noLessThenPriceAsset > outPrAmt))
829+            then throw(((("Failed: " + toString(outPrAmt)) + " < ") + toString(noLessThenPriceAsset)))
830+            else {
831+                let burnLPAssetOnFactory = invoke(fca, "burn", [pmtAmt], [AttachedPayment(pmtAssetId, pmtAmt)])
832+                if ((burnLPAssetOnFactory == burnLPAssetOnFactory))
833+                    then state
834+                    else throw("Strict value is not equal to itself.")
835+                }
889836     }
890837 
891838 
893840 @Callable(i)
894841 func unstakeAndGet (amount) = {
895842     let checkPayments = if ((size(i.payments) != 0))
896-        then throwErr("no payments expected")
843+        then throw("No pmnts expd")
897844         else true
898845     if ((checkPayments == checkPayments))
899846         then {
900-            let cfg = getPoolConfig()
901-            let factoryCfg = getFactoryConfig()
847+            let cfg = gpc()
848+            let factoryCfg = gfc()
902849             let lpAssetId = fromBase58String(cfg[idxLPAsId])
903-            let staking = valueOrErrorMessage(addressFromString(factoryCfg[idxFactStakCntr]), "wrong")
850+            let staking = valueOrErrorMessage(addressFromString(factoryCfg[idxFactStakCntr]), "Wr st addr")
904851             let unstakeInv = invoke(staking, "unstake", [toBase58String(lpAssetId), amount], nil)
905852             if ((unstakeInv == unstakeInv))
906853                 then {
907-                    let r = estimateGetOperation(toBase58String(i.transactionId), toBase58String(lpAssetId), amount, i.caller)
854+                    let r = ego(toBase58String(i.transactionId), toBase58String(lpAssetId), amount, i.caller)
908855                     let sts = parseIntValue(r._9)
909856                     let state = r._10
910-                    let v = if (if (isGlobalShutdown())
857+                    let v = if (if (igs())
911858                         then true
912859                         else (sts == PoolShutdown))
913-                        then throwErr(("Blocked: " + toString(sts)))
860+                        then throw(("Blocked: " + toString(sts)))
914861                         else true
915862                     if ((v == v))
916863                         then {
917-                            let burnA = invoke(factoryContract, "burn", [amount], [AttachedPayment(lpAssetId, amount)])
864+                            let burnA = invoke(fca, "burn", [amount], [AttachedPayment(lpAssetId, amount)])
918865                             if ((burnA == burnA))
919866                                 then state
920867                                 else throw("Strict value is not equal to itself.")
929876 
930877 
931878 @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")
879+func activate (amtAsStr,prAsStr) = if ((toString(i.caller) != toString(fca)))
880+    then throw("denied")
881+    else $Tuple2([StringEntry(aa(), amtAsStr), StringEntry(pa(), prAsStr)], "success")
935882 
936883 
937884 
938885 @Callable(i)
939-func setS (k,v) = if ((toString(i.caller) != getStringOrFail(this, keyAddonAddress())))
886+func setS (k,v) = if ((toString(i.caller) != strf(this, ada())))
940887     then pd
941888     else [StringEntry(k, v)]
942889 
943890 
944891 
945892 @Callable(i)
946-func setI (k,v) = if ((toString(i.caller) != getStringOrFail(this, keyAddonAddress())))
893+func setI (k,v) = if ((toString(i.caller) != strf(this, ada())))
947894     then pd
948895     else [IntegerEntry(k, v)]
949896 
950897 
951898 
952899 @Callable(i)
953-func getPoolConfigWrapperREADONLY () = $Tuple2(nil, getPoolConfig())
900+func getPoolConfigWrapperREADONLY () = $Tuple2(nil, gpc())
954901 
955902 
956903 
968915 
969916 
970917 @Callable(i)
971-func fromX18WrapperREADONLY (val,resScaleMult) = $Tuple2(nil, fromX18(parseBigIntValue(val), resScaleMult))
918+func fromX18WrapperREADONLY (val,resScaleMult) = $Tuple2(nil, f1(parseBigIntValue(val), resScaleMult))
972919 
973920 
974921 
975922 @Callable(i)
976-func toX18WrapperREADONLY (origVal,origScaleMult) = $Tuple2(nil, toString(toX18(origVal, origScaleMult)))
923+func toX18WrapperREADONLY (origVal,origScaleMult) = $Tuple2(nil, toString(t1(origVal, origScaleMult)))
977924 
978925 
979926 
980927 @Callable(i)
981-func calcPriceBigIntWrapperREADONLY (prAmtX18,amAmtX18) = $Tuple2(nil, toString(calcPriceBigInt(parseBigIntValue(prAmtX18), parseBigIntValue(amAmtX18))))
928+func calcPriceBigIntWrapperREADONLY (prAmtX18,amAmtX18) = $Tuple2(nil, toString(cpbi(parseBigIntValue(prAmtX18), parseBigIntValue(amAmtX18))))
982929 
983930 
984931 
985932 @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, ""))
933+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, ""))
987934 
988935 
989936 
990937 @Callable(i)
991-func estimateGetOperationWrapperREADONLY (txId58,paymentAsId,paymentLpAmount,usrAddr) = {
992-    let r = estimateGetOperation(txId58, paymentAsId, paymentLpAmount, addressFromStringValue(usrAddr))
938+func estimateGetOperationWrapperREADONLY (txId58,pmtAsId,pmtLpAmt,usrAddr) = {
939+    let r = ego(txId58, pmtAsId, pmtLpAmt, addressFromStringValue(usrAddr))
993940     $Tuple2(nil, $Tuple10(r._1, r._2, r._3, r._4, r._5, r._6, r._7, toString(r._8), r._9, r._10))
994941     }
995942 
996943 
997944 @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-}
945+func verify () = {
946+    let targetPublicKey =     match m() {
947+        case pk: ByteVector => 
948+            pk
949+        case _: Unit => 
950+            tx.senderPublicKey
951+        case _ => 
952+            throw("Match error")
953+    }
954+    match tx {
955+        case order: Order => 
956+            let matcherPub = mp()
957+            let orderValid = moa(order)
958+            let senderValid = sigVerify(order.bodyBytes, order.proofs[0], order.senderPublicKey)
959+            let matcherValid = sigVerify(order.bodyBytes, order.proofs[1], matcherPub)
960+            if (if (if (orderValid)
961+                then senderValid
962+                else false)
963+                then matcherValid
964+                else false)
965+                then true
966+                else toe(orderValid, senderValid, matcherValid)
967+        case s: SetScriptTransaction => 
968+            let newHash = blake2b256(value(s.script))
969+            let allowedHash = fromBase64String(value(getString(fca, keyAllowedLpStableScriptHash())))
970+            let currentHash = scriptHash(this)
971+            if (if ((allowedHash == newHash))
972+                then (currentHash != newHash)
973+                else false)
974+                then true
975+                else sigVerify(tx.bodyBytes, tx.proofs[0], targetPublicKey)
976+        case _ => 
977+            sigVerify(tx.bodyBytes, tx.proofs[0], targetPublicKey)
978+    }
979+    }
1022980 

Full: 

OldNewDifferences
11 {-# STDLIB_VERSION 6 #-}
22 {-# SCRIPT_TYPE ACCOUNT #-}
33 {-# CONTENT_TYPE DAPP #-}
4-let defaultDecimals = 1000000
4+let defaultDecimals = 100000000
55 
66 let scale8 = 100000000
77 
88 let scale8BigInt = toBigInt(100000000)
99 
1010 let scale18 = toBigInt(1000000000000000000)
11-
12-let thousand = 1000
1311 
1412 let zeroBigInt = toBigInt(0)
1513 
1614 let oneBigInt = toBigInt(1)
1715 
1816 let slippage4D = toBigInt((scale8 - ((scale8 * 1) / scale8)))
1917 
2018 let Amult = "100"
2119 
2220 let Dconv = "1"
2321 
2422 let SEP = "__"
2523 
2624 let EMPTY = ""
2725 
2826 let PoolActive = 1
2927 
3028 let PoolPutDis = 2
3129 
3230 let PoolMatcherDis = 3
3331 
3432 let PoolShutdown = 4
3533 
3634 let idxPoolAddress = 1
3735 
3836 let idxPoolSt = 2
3937 
4038 let idxLPAsId = 3
4139 
4240 let idxAmAsId = 4
4341 
4442 let idxPrAsId = 5
4543 
4644 let idxAmtAsDcm = 6
4745 
4846 let idxPriceAsDcm = 7
4947 
5048 let idxIAmtAsId = 8
5149 
5250 let idxIPriceAsId = 9
5351 
5452 let idxFactStakCntr = 1
5553 
5654 let idxFactSlippCntr = 7
5755 
5856 let idxFactGwxRewCntr = 10
5957 
60-let feePermilleDefault = 0
58+let delay = "%s__delay"
6159 
62-func toX18 (origVal,origScaleMult) = fraction(toBigInt(origVal), scale18, toBigInt(origScaleMult))
60+func t1 (origVal,origScaleMult) = fraction(toBigInt(origVal), scale18, toBigInt(origScaleMult))
6361 
6462 
65-func fromX18 (val,resultScaleMult) = toInt(fraction(val, toBigInt(resultScaleMult), scale18))
63+func f1 (val,resultScaleMult) = toInt(fraction(val, toBigInt(resultScaleMult), scale18))
6664 
6765 
6866 func ts (amt,resScale,curScale) = fraction(amt, resScale, curScale)
6967 
7068 
7169 func abs (val) = if ((zeroBigInt > val))
7270     then -(val)
7371     else val
7472 
7573 
76-func keyFactoryContact () = "%s__factoryContract"
74+func fc () = "%s__factoryContract"
7775 
7876 
79-func keyManagerPublicKey () = "%s__managerPublicKey"
77+func mpk () = "%s__managerPublicKey"
8078 
8179 
82-func keyPendingManagerPublicKey () = "%s__pendingManagerPublicKey"
80+func pmpk () = "%s__pendingManagerPublicKey"
8381 
8482 
85-func keyPriceLast () = "%s%s__price__last"
83+func pl () = "%s%s__price__last"
8684 
8785 
88-func keyPriceHistory (h,t) = makeString(["%s%s%d%d__price__history", toString(h), toString(t)], SEP)
86+func ph (h,t) = makeString(["%s%s%d%d__price__history", toString(h), toString(t)], SEP)
8987 
9088 
91-func keyPutActionByUser (ua,txId) = ((("%s%s%s__P__" + ua) + "__") + txId)
89+func pau (ua,txId) = ((("%s%s%s__P__" + ua) + "__") + txId)
9290 
9391 
94-func keyGetActionByUser (ua,txId) = ((("%s%s%s__G__" + ua) + "__") + txId)
92+func gau (ua,txId) = ((("%s%s%s__G__" + ua) + "__") + txId)
9593 
9694 
97-func keyAmountAsset () = "%s__amountAsset"
95+func aa () = "%s__amountAsset"
9896 
9997 
100-func keyPriceAsset () = "%s__priceAsset"
98+func pa () = "%s__priceAsset"
10199 
102100 
103-func keyAmplificator () = "%s__amp"
101+func amp () = "%s__amp"
104102 
105103 
106-func keyAddonAddress () = "%s__addonAddr"
104+func ada () = "%s__addonAddr"
107105 
108106 
109-let keyFeePermille = "%s__feePermille"
110-
111-let feePermille = valueOrElse(getInteger(this, keyFeePermille), feePermilleDefault)
112-
113-func keyFactoryConfig () = "%s__factoryConfig"
107+func lgotc (caller) = makeString(["%s%s__lastGetOneTknCall", caller], SEP)
114108 
115109 
116-func keyMatcherPub () = "%s%s__matcher__publicKey"
110+func lsotc (caller) = makeString(["%s%s__lastPutOneTknCall", caller], SEP)
117111 
118112 
119-func keyPoolConfig (iAmtAs,iPrAs) = (((("%d%d%s__" + iAmtAs) + "__") + iPrAs) + "__config")
113+func fcfg () = "%s__factoryConfig"
120114 
121115 
122-func keyMappingsBaseAsset2internalId (bAStr) = ("%s%s%s__mappings__baseAsset2internalId__" + bAStr)
116+func mtpk () = "%s%s__matcher__publicKey"
123117 
124118 
125-func keyAllPoolsShutdown () = "%s__shutdown"
119+func pc (iAmtAs,iPrAs) = (((("%d%d%s__" + iAmtAs) + "__") + iPrAs) + "__config")
126120 
127121 
128-func throwErr (msg) = throw(makeString(["lp_stable.ride:", msg], " "))
122+func mba (bAStr) = ("%s%s%s__mappings__baseAsset2internalId__" + bAStr)
129123 
130124 
131-func throwOrderError (orV,sendrV,matchV) = throwErr(((((("Failed: ordValid=" + toString(orV)) + " sndrValid=") + toString(sendrV)) + " mtchrValid=") + toString(matchV)))
125+func aps () = "%s__shutdown"
126+
127+
128+func keyAllowedLpStableScriptHash () = "%s__allowedLpStableScriptHash"
129+
130+
131+func toe (orV,sendrV,matchV) = throw(((((("Failed: ordValid=" + toString(orV)) + " sndrValid=") + toString(sendrV)) + " mtchrValid=") + toString(matchV)))
132132 
133133 
134134 func str (val) = match val {
135135     case valStr: String => 
136136         valStr
137137     case _ => 
138-        throwErr("fail cast to String")
138+        throw("fail cast to String")
139139 }
140140 
141141 
142-func getStringOrFail (addr,key) = valueOrErrorMessage(getString(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
142+func strf (addr,key) = valueOrErrorMessage(getString(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
143143 
144144 
145-func getIntOrFail (addr,key) = valueOrErrorMessage(getInteger(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
145+func intf (addr,key) = valueOrErrorMessage(getInteger(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
146146 
147147 
148-let factoryContract = addressFromStringValue(getStringOrFail(this, keyFactoryContact()))
148+let fca = addressFromStringValue(strf(this, fc()))
149149 
150-let amplificator = getStringOrFail(this, keyAmplificator())
150+let A = strf(this, amp())
151151 
152-func isGlobalShutdown () = valueOrElse(getBoolean(factoryContract, keyAllPoolsShutdown()), false)
152+func igs () = valueOrElse(getBoolean(fca, aps()), false)
153153 
154154 
155-func getMatcherPubOrFail () = fromBase58String(getStringOrFail(factoryContract, keyMatcherPub()))
155+func mp () = fromBase58String(strf(fca, mtpk()))
156156 
157157 
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)
158+func gpc () = {
159+    let amtAs = strf(this, aa())
160+    let priceAs = strf(this, pa())
161+    let iPriceAs = intf(fca, mba(priceAs))
162+    let iAmtAs = intf(fca, mba(amtAs))
163+    split(strf(fca, pc(toString(iAmtAs), toString(iPriceAs))), SEP)
166164     }
167165 
168166 
169-func getFactoryConfig () = split(getStringOrFail(factoryContract, keyFactoryConfig()), SEP)
167+func gfc () = split(strf(fca, fcfg()), SEP)
170168 
171169 
172170 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)
173171 
174172 
175173 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)
176174 
177175 
178176 func getAccBalance (assetId) = if ((assetId == "WAVES"))
179177     then wavesBalance(this).available
180178     else assetBalance(this, fromBase58String(assetId))
181179 
182180 
183-func calcPriceBigInt (prAmtX18,amAmtX18) = fraction(prAmtX18, scale18, amAmtX18)
181+func cpbi (prAmtX18,amAmtX18) = fraction(prAmtX18, scale18, amAmtX18)
184182 
185183 
186-func validateAbsDiff (estimateLP,outLp,slippage) = {
187-    let diff = fraction((estimateLP - outLp), scale8BigInt, outLp)
184+func vad (A1,A2,slippage) = {
185+    let diff = fraction((A1 - A2), scale8BigInt, A2)
188186     let pass = ((slippage - abs(diff)) > zeroBigInt)
189187     if (!(pass))
190-        then throwErr(("Big slippage: " + toString(diff)))
191-        else $Tuple2(pass, min([estimateLP, outLp]))
188+        then throw(("Big slpg: " + toString(diff)))
189+        else $Tuple2(pass, min([A1, A2]))
192190     }
193191 
194192 
195-func validateD (D1,D0,slippage) = {
193+func vd (D1,D0,slpg) = {
196194     let diff = fraction(D0, scale8BigInt, D1)
197-    let fail = (slippage > diff)
195+    let fail = (slpg > diff)
198196     if (if (fail)
199197         then true
200198         else (D0 > D1))
201-        then throwErr(((((((toString(D0) + " ") + toString(D1)) + " ") + toString(diff)) + " ") + toString(slippage)))
199+        then throw(((((((toString(D0) + " ") + toString(D1)) + " ") + toString(diff)) + " ") + toString(slpg)))
202200         else fail
203201     }
204202 
205203 
206-func privateCalcPrice (amAssetDcm,prAssetDcm,amAmt,prAmt) = {
207-    let amtAsAmtX18 = toX18(amAmt, amAssetDcm)
208-    let prAsAmtX18 = toX18(prAmt, prAssetDcm)
209-    calcPriceBigInt(prAsAmtX18, amtAsAmtX18)
204+func pcp (amAssetDcm,prAssetDcm,amAmt,prAmt) = {
205+    let amtAsAmtX18 = t1(amAmt, amAssetDcm)
206+    let prAsAmtX18 = t1(prAmt, prAssetDcm)
207+    cpbi(prAsAmtX18, amtAsAmtX18)
210208     }
211209 
212210 
213211 func calcPrices (amAmt,prAmt,lpAmt) = {
214-    let cfg = getPoolConfig()
212+    let cfg = gpc()
215213     let amtAsDcm = parseIntValue(cfg[idxAmtAsDcm])
216214     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)
215+    let priceX18 = pcp(amtAsDcm, prAsDcm, amAmt, prAmt)
216+    let amAmtX18 = t1(amAmt, amtAsDcm)
217+    let prAmtX18 = t1(prAmt, prAsDcm)
218+    let lpAmtX18 = t1(lpAmt, scale8)
219+    let lpPrInAmAsX18 = cpbi(amAmtX18, lpAmtX18)
220+    let lpPrInPrAsX18 = cpbi(prAmtX18, lpAmtX18)
223221 [priceX18, lpPrInAmAsX18, lpPrInPrAsX18]
224222     }
225223 
226224 
227225 func calculatePrices (amAmt,prAmt,lpAmt) = {
228226     let p = calcPrices(amAmt, prAmt, lpAmt)
229-[fromX18(p[0], scale8), fromX18(p[1], scale8), fromX18(p[2], scale8)]
227+[f1(p[0], scale8), f1(p[1], scale8), f1(p[2], scale8)]
230228     }
231229 
232230 
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])
231+func ego (txId58,pmtAssetId,pmtLpAmt,userAddress) = {
232+    let cfg = gpc()
233+    let lpId = cfg[idxLPAsId]
234+    let amId = cfg[idxAmAsId]
235+    let prId = cfg[idxPrAsId]
236+    let amDcm = parseIntValue(cfg[idxAmtAsDcm])
237+    let prDcm = parseIntValue(cfg[idxPriceAsDcm])
240238     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)
239+    let lpEmiss = valueOrErrorMessage(assetInfo(fromBase58String(lpId)), "Wrong LP id").quantity
240+    if ((lpId != pmtAssetId))
241+        then throw("Wrong pmt asset")
242+        else {
243+            let amBalance = getAccBalance(amId)
244+            let prBalance = getAccBalance(prId)
245+            let amountBalanceDefaultDecimals = fraction(amBalance, defaultDecimals, amDcm)
246+            let priceBalanceDefaultDecimals = fraction(prBalance, defaultDecimals, prDcm)
247+            let amBalanceX18 = t1(amountBalanceDefaultDecimals, defaultDecimals)
248+            let prBalanceX18 = t1(priceBalanceDefaultDecimals, defaultDecimals)
249+            let curPriceX18 = cpbi(prBalanceX18, amBalanceX18)
250+            let curPrice = f1(curPriceX18, scale8)
251+            let pmtLpAmtX18 = t1(pmtLpAmt, scale8)
252+            let lpEmissX18 = t1(lpEmiss, scale8)
253+            let outAmAmtX18 = fraction(amBalanceX18, pmtLpAmtX18, lpEmissX18)
254+            let outPrAmtX18 = fraction(prBalanceX18, pmtLpAmtX18, lpEmissX18)
255+            let outAmountAmountDefaultDecimals = f1(outAmAmtX18, defaultDecimals)
256+            let outPriceAmountDefaultDecimals = f1(outPrAmtX18, defaultDecimals)
257+            let outAmAmt = fraction(outAmountAmountDefaultDecimals, amDcm, defaultDecimals)
258+            let outPrAmt = fraction(outPriceAmountDefaultDecimals, prDcm, defaultDecimals)
263259             let state = if ((txId58 == ""))
264260                 then nil
265-                else [ScriptTransfer(userAddress, outAmountAmount, if ((amountId == "WAVES"))
261+                else [ScriptTransfer(userAddress, outAmAmt, if ((amId == "WAVES"))
266262                     then unit
267-                    else fromBase58String(amountId)), ScriptTransfer(userAddress, outPriceAmount, if ((priceId == "WAVES"))
263+                    else fromBase58String(amId)), ScriptTransfer(userAddress, outPrAmt, if ((prId == "WAVES"))
268264                     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)
265+                    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)]
266+            $Tuple10(outAmAmt, outPrAmt, amId, prId, amBalance, prBalance, lpEmiss, curPriceX18, sts, state)
271267             }
272-        else throw("Strict value is not equal to itself.")
273268     }
274269 
275270 
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])
271+func epo (txId58,slippage,inAmAmt,inAmId,inPrAmt,inPrId,userAddress,isEval,emitLp,isOneAsset,pmtAmt,pmtId) = {
272+    let cfg = gpc()
273+    let lpId = fromBase58String(cfg[idxLPAsId])
274+    let amIdStr = cfg[idxAmAsId]
275+    let prIdStr = cfg[idxPrAsId]
276+    let inAmIdStr = cfg[idxIAmtAsId]
277+    let inPrIdStr = cfg[idxIPriceAsId]
278+    let amtDcm = parseIntValue(cfg[idxAmtAsDcm])
279+    let priceDcm = parseIntValue(cfg[idxPriceAsDcm])
285280     let sts = cfg[idxPoolSt]
286-    let lpEmission = valueOrErrorMessage(assetInfo(lpAssetId), "Wrong lp asset").quantity
287-    let amountBalance = if (isEvaluate)
288-        then getAccBalance(amountIdStr)
281+    let lpEm = valueOrErrorMessage(assetInfo(lpId), "Wr lp as").quantity
282+    let amBalance = if (isEval)
283+        then getAccBalance(amIdStr)
289284         else if (if (isOneAsset)
290-            then (paymentId == amountIdStr)
285+            then (pmtId == amIdStr)
291286             else false)
292-            then (getAccBalance(amountIdStr) - paymentAmount)
287+            then (getAccBalance(amIdStr) - pmtAmt)
293288             else if (isOneAsset)
294-                then getAccBalance(amountIdStr)
295-                else (getAccBalance(amountIdStr) - inAmountAssetAmount)
296-    let priceBalance = if (isEvaluate)
297-        then getAccBalance(priceIdStr)
289+                then getAccBalance(amIdStr)
290+                else (getAccBalance(amIdStr) - inAmAmt)
291+    let prBalance = if (isEval)
292+        then getAccBalance(prIdStr)
298293         else if (if (isOneAsset)
299-            then (paymentId == priceIdStr)
294+            then (pmtId == prIdStr)
300295             else false)
301-            then (getAccBalance(priceIdStr) - paymentAmount)
296+            then (getAccBalance(prIdStr) - pmtAmt)
302297             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))
298+                then getAccBalance(prIdStr)
299+                else (getAccBalance(prIdStr) - inPrAmt)
300+    let amountBalanceDefaultDecimals = fraction(amBalance, defaultDecimals, amtDcm)
301+    let priceBalanceDefaultDecimals = fraction(prBalance, defaultDecimals, priceDcm)
302+    let inAmountAssetAmountDefaultDecimals = fraction(inAmAmt, defaultDecimals, amtDcm)
303+    let inPriceAssetAmountDefaultDecimals = fraction(inPrAmt, defaultDecimals, priceDcm)
304+    let inAmAssetAmtX18 = t1(inAmountAssetAmountDefaultDecimals, defaultDecimals)
305+    let inPrAssetAmtX18 = t1(inPriceAssetAmountDefaultDecimals, defaultDecimals)
306+    let userPriceX18 = cpbi(inPrAssetAmtX18, inAmAssetAmtX18)
307+    let amBalanceX18 = t1(amountBalanceDefaultDecimals, defaultDecimals)
308+    let prBalanceX18 = t1(priceBalanceDefaultDecimals, defaultDecimals)
309+    let r = if ((lpEm == 0))
315310         then {
316-            let currentPriceX18 = zeroBigInt
311+            let curPriceX18 = zeroBigInt
317312             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)
313+            let lpAmtX18 = pow((inAmAssetAmtX18 * inPrAssetAmtX18), 0, toBigInt(5), 1, 0, DOWN)
314+            $Tuple5(f1(lpAmtX18, scale8), f1(inAmAssetAmtX18, defaultDecimals), f1(inPrAssetAmtX18, defaultDecimals), cpbi((prBalanceX18 + inPrAssetAmtX18), (amBalanceX18 + inAmAssetAmtX18)), slippageX18)
320315             }
321316         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))
317+            let curPriceX18 = cpbi(prBalanceX18, amBalanceX18)
318+            let slippageRealX18 = fraction(abs((curPriceX18 - userPriceX18)), scale18, curPriceX18)
319+            let slippageX18 = t1(slippage, scale8)
320+            if (if ((curPriceX18 != zeroBigInt))
326321                 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)
322+                else false)
323+                then throw(((("Price slippage " + toString(slippageRealX18)) + " > ") + toString(slippageX18)))
324+                else {
325+                    let lpEmissionX18 = t1(lpEm, scale8)
326+                    let prViaAmX18 = fraction(inAmAssetAmtX18, curPriceX18, scale18)
327+                    let amViaPrX18 = fraction(inPrAssetAmtX18, scale18, curPriceX18)
328+                    let expectedAmts = if ((prViaAmX18 > inPrAssetAmtX18))
329+                        then $Tuple2(amViaPrX18, inPrAssetAmtX18)
330+                        else $Tuple2(inAmAssetAmtX18, prViaAmX18)
331+                    let expAmtAssetAmtX18 = expectedAmts._1
332+                    let expPriceAssetAmtX18 = expectedAmts._2
333+                    let lpAmtX18 = fraction(lpEmissionX18, expPriceAssetAmtX18, prBalanceX18)
334+                    $Tuple5(f1(lpAmtX18, scale8), f1(expAmtAssetAmtX18, defaultDecimals), f1(expPriceAssetAmtX18, defaultDecimals), curPriceX18, slippageX18)
342335                     }
343-                else throw("Strict value is not equal to itself.")
344336             }
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))
337+    let calcLpAmt = r._1
338+    let calcAmAssetPmt = fraction(r._2, amtDcm, defaultDecimals)
339+    let calcPrAssetPmt = fraction(r._3, priceDcm, defaultDecimals)
340+    let curPrice = f1(r._4, scale8)
341+    let slippageCalc = f1(r._5, scale8)
342+    if ((0 >= calcLpAmt))
343+        then throw("LP <= 0")
344+        else {
345+            let emitLpAmt = if (!(emitLp))
356346                 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)
347+                else calcLpAmt
348+            let amDiff = (inAmAmt - calcAmAssetPmt)
349+            let prDiff = (inPrAmt - calcPrAssetPmt)
350+            let $t01664916994 = if (if (isOneAsset)
351+                then (pmtId == amIdStr)
362352                 else false)
363-                then $Tuple2(paymentAmount, 0)
353+                then $Tuple2(pmtAmt, 0)
364354                 else if (if (isOneAsset)
365-                    then (paymentId == priceIdStr)
355+                    then (pmtId == prIdStr)
366356                     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)
357+                    then $Tuple2(0, pmtAmt)
358+                    else $Tuple2(calcAmAssetPmt, calcPrAssetPmt)
359+            let writeAmAmt = $t01664916994._1
360+            let writePrAmt = $t01664916994._2
361+            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))]
362+            $Tuple13(calcLpAmt, emitLpAmt, curPrice, amBalance, prBalance, lpEm, lpId, sts, commonState, amDiff, prDiff, inAmId, inPrId)
373363             }
374-        else throw("Strict value is not equal to itself.")
375364     }
376365 
377366 
378-func validateMatcherOrderAllowed (order) = {
379-    let cfg = getPoolConfig()
367+func moa (order) = {
368+    let cfg = gpc()
380369     let amtAsId = cfg[idxAmAsId]
381370     let prAsId = cfg[idxPrAsId]
382371     let sts = parseIntValue(cfg[idxPoolSt])
383372     let amtAsDcm = parseIntValue(cfg[idxAmtAsDcm])
384373     let prAsDcm = parseIntValue(cfg[idxPriceAsDcm])
385374     let accAmtAsBalance = getAccBalance(amtAsId)
386375     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())
376+    let curPriceX18 = if ((order.orderType == Buy))
377+        then pcp(amtAsDcm, prAsDcm, (accAmtAsBalance + order.amount), accPrAsBalance)
378+        else pcp(amtAsDcm, prAsDcm, (accAmtAsBalance - order.amount), accPrAsBalance)
379+    let curPrice = f1(curPriceX18, scale8)
380+    if (if (if (igs())
392381         then true
393382         else (sts == PoolMatcherDis))
394383         then true
395384         else (sts == PoolShutdown))
396-        then throwErr("Admin blocked")
385+        then throw("Admin blocked")
397386         else {
398387             let orAmtAsset = order.assetPair.amountAsset
399388             let orAmtAsStr = if ((orAmtAsset == unit))
400389                 then "WAVES"
401390                 else toBase58String(value(orAmtAsset))
402391             let orPrAsset = order.assetPair.priceAsset
403392             let orPrAsStr = if ((orPrAsset == unit))
404393                 then "WAVES"
405394                 else toBase58String(value(orPrAsset))
406395             if (if ((orAmtAsStr != amtAsId))
407396                 then true
408397                 else (orPrAsStr != prAsId))
409-                then throwErr("Wr assets")
398+                then throw("Wr assets")
410399                 else {
411400                     let orderPrice = order.price
412-                    let priceDecimals = fraction(scale8, prAsDcm, amtAsDcm)
413-                    let castOrderPrice = ts(orderPrice, scale8, priceDecimals)
401+                    let priceDcm = fraction(scale8, prAsDcm, amtAsDcm)
402+                    let castOrderPrice = ts(orderPrice, scale8, priceDcm)
414403                     let isOrderPriceValid = if ((order.orderType == Buy))
415404                         then (curPrice >= castOrderPrice)
416405                         else (castOrderPrice >= curPrice)
417406                     true
418407                     }
419408             }
420409     }
421410 
422411 
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-    }
412+func cg (i) = if ((size(i.payments) != 1))
413+    then throw("1 pmnt exp")
414+    else {
415+        let pmt = value(i.payments[0])
416+        let pmtAssetId = value(pmt.assetId)
417+        let pmtAmt = pmt.amount
418+        let r = ego(toBase58String(i.transactionId), toBase58String(pmtAssetId), pmtAmt, i.caller)
419+        let outAmAmt = r._1
420+        let outPrAmt = r._2
421+        let sts = parseIntValue(r._9)
422+        let state = r._10
423+        if (if (igs())
424+            then true
425+            else (sts == PoolShutdown))
426+            then throw(("Admin blocked: " + toString(sts)))
427+            else $Tuple5(outAmAmt, outPrAmt, pmtAmt, pmtAssetId, state)
428+        }
445429 
446430 
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)
431+func cp (caller,txId,amAsPmt,prAsPmt,slippage,emitLp,isOneAsset,pmtAmt,pmtId) = {
432+    let r = epo(txId, slippage, value(amAsPmt).amount, value(amAsPmt).assetId, value(prAsPmt).amount, value(prAsPmt).assetId, caller, false, emitLp, isOneAsset, pmtAmt, pmtId)
449433     let sts = parseIntValue(r._8)
450-    if (if (if (isGlobalShutdown())
434+    if (if (if (igs())
451435         then true
452436         else (sts == PoolPutDis))
453437         then true
454438         else (sts == PoolShutdown))
455-        then throwErr(("Blocked:" + toString(sts)))
439+        then throw(("Blocked:" + toString(sts)))
456440         else r
457441     }
458442 
459443 
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()) {
444+func m () = match getString(mpk()) {
467445     case s: String => 
468446         fromBase58String(s)
469447     case _: Unit => 
470448         unit
471449     case _ => 
472450         throw("Match error")
473451 }
474452 
475453 
476-func pendingManagerPublicKeyOrUnit () = match getString(keyPendingManagerPublicKey()) {
454+func pm () = match getString(pmpk()) {
477455     case s: String => 
478456         fromBase58String(s)
479457     case _: Unit => 
480458         unit
481459     case _ => 
482460         throw("Match error")
483461 }
484462 
485463 
486-let pd = throwErr("Permission denied")
464+let pd = throw("Permission denied")
487465 
488-func mustManager (i) = match managerPublicKeyOrUnit() {
466+func mm (i) = match m() {
489467     case pk: ByteVector => 
490468         if ((i.callerPublicKey == pk))
491469             then true
492470             else pd
493471     case _: Unit => 
494472         if ((i.caller == this))
495473             then true
496474             else pd
497475     case _ => 
498476         throw("Match error")
499477 }
500478 
501479 
502480 @Callable(i)
503-func constructor (factoryContract) = {
504-    let checkCaller = mustManager(i)
505-    if ((checkCaller == checkCaller))
506-        then [StringEntry(keyFactoryContact(), factoryContract)]
481+func constructor (fc) = {
482+    let c = mm(i)
483+    if ((c == c))
484+        then [StringEntry(fc(), fc)]
507485         else throw("Strict value is not equal to itself.")
508486     }
509487 
510488 
511489 
512490 @Callable(i)
513491 func setManager (pendingManagerPublicKey) = {
514-    let checkCaller = mustManager(i)
515-    if ((checkCaller == checkCaller))
492+    let c = mm(i)
493+    if ((c == c))
516494         then {
517-            let checkManagerPublicKey = fromBase58String(pendingManagerPublicKey)
518-            if ((checkManagerPublicKey == checkManagerPublicKey))
519-                then [StringEntry(keyPendingManagerPublicKey(), pendingManagerPublicKey)]
495+            let cm = fromBase58String(pendingManagerPublicKey)
496+            if ((cm == cm))
497+                then [StringEntry(pmpk(), pendingManagerPublicKey)]
520498                 else throw("Strict value is not equal to itself.")
521499             }
522500         else throw("Strict value is not equal to itself.")
523501     }
524502 
525503 
526504 
527505 @Callable(i)
528506 func confirmManager () = {
529-    let pm = pendingManagerPublicKeyOrUnit()
530-    let hasPM = if (isDefined(pm))
507+    let p = pm()
508+    let hpm = if (isDefined(p))
531509         then true
532-        else throwErr("No pending manager")
533-    if ((hasPM == hasPM))
510+        else throw("No pending manager")
511+    if ((hpm == hpm))
534512         then {
535-            let checkPM = if ((i.callerPublicKey == value(pm)))
513+            let cpm = if ((i.callerPublicKey == value(p)))
536514                 then true
537-                else throwErr("You are not pending manager")
538-            if ((checkPM == checkPM))
539-                then [StringEntry(keyManagerPublicKey(), toBase58String(value(pm))), DeleteEntry(keyPendingManagerPublicKey())]
515+                else throw("You are not pending manager")
516+            if ((cpm == cpm))
517+                then [StringEntry(mpk(), toBase58String(value(p))), DeleteEntry(pmpk())]
540518                 else throw("Strict value is not equal to itself.")
541519             }
542520         else throw("Strict value is not equal to itself.")
543521     }
544522 
545523 
546524 
547525 @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))
580-                                then {
581-                                    let sa = if ((amountDiff > 0))
582-                                        then invoke(slippageContract, "put", nil, [AttachedPayment(amountId, amountDiff)])
583-                                        else nil
584-                                    if ((sa == sa))
585-                                        then {
586-                                            let sp = if ((priceDiff > 0))
587-                                                then invoke(slippageContract, "put", nil, [AttachedPayment(priceId, priceDiff)])
588-                                                else nil
589-                                            if ((sp == sp))
590-                                                then {
591-                                                    let lpTrasfer = if (autoStake)
592-                                                        then {
593-                                                            let ss = invoke(stakingContract, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmount)])
594-                                                            if ((ss == ss))
595-                                                                then nil
596-                                                                else throw("Strict value is not equal to itself.")
597-                                                            }
598-                                                        else [ScriptTransfer(i.caller, emitLpAmount, lpAssetId)]
599-                                                    (state ++ lpTrasfer)
600-                                                    }
601-                                                else throw("Strict value is not equal to itself.")
602-                                            }
603-                                        else throw("Strict value is not equal to itself.")
604-                                    }
605-                                else throw("Strict value is not equal to itself.")
606-                            }
607-                        else throw("Strict value is not equal to itself.")
608-                    }
609-                else throw("Strict value is not equal to itself.")
610-            }
611-        else throw("Strict value is not equal to itself.")
526+func put (slip,autoStake) = {
527+    let factCfg = gfc()
528+    let stakingCntr = valueOrErrorMessage(addressFromString(factCfg[idxFactStakCntr]), "Wr st addr")
529+    let slipCntr = valueOrErrorMessage(addressFromString(factCfg[idxFactSlippCntr]), "Wr sl addr")
530+    if ((0 > slip))
531+        then throw("Wrong slippage")
532+        else if ((size(i.payments) != 2))
533+            then throw("2 pmnts expd")
534+            else {
535+                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, "")
536+                let emitLpAmt = e._2
537+                let lpAssetId = e._7
538+                let state = e._9
539+                let amDiff = e._10
540+                let prDiff = e._11
541+                let amId = e._12
542+                let prId = e._13
543+                let r = invoke(fca, "emit", [emitLpAmt], nil)
544+                if ((r == r))
545+                    then {
546+                        let el =                         match r {
547+                            case legacy: Address => 
548+                                invoke(legacy, "emit", [emitLpAmt], nil)
549+                            case _ => 
550+                                unit
551+                        }
552+                        if ((el == el))
553+                            then {
554+                                let sa = if ((amDiff > 0))
555+                                    then invoke(slipCntr, "put", nil, [AttachedPayment(amId, amDiff)])
556+                                    else nil
557+                                if ((sa == sa))
558+                                    then {
559+                                        let sp = if ((prDiff > 0))
560+                                            then invoke(slipCntr, "put", nil, [AttachedPayment(prId, prDiff)])
561+                                            else nil
562+                                        if ((sp == sp))
563+                                            then {
564+                                                let lpTrnsfr = if (autoStake)
565+                                                    then {
566+                                                        let ss = invoke(stakingCntr, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmt)])
567+                                                        if ((ss == ss))
568+                                                            then nil
569+                                                            else throw("Strict value is not equal to itself.")
570+                                                        }
571+                                                    else [ScriptTransfer(i.caller, emitLpAmt, lpAssetId)]
572+                                                (state ++ lpTrnsfr)
573+                                                }
574+                                            else throw("Strict value is not equal to itself.")
575+                                        }
576+                                    else throw("Strict value is not equal to itself.")
577+                                }
578+                            else throw("Strict value is not equal to itself.")
579+                        }
580+                    else throw("Strict value is not equal to itself.")
581+                }
612582     }
613583 
614584 
615585 
616586 @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()), "")
587+func putOneTkn (amAssetPart,prAssetPart,outLp,slippage,autoStake) = {
588+    let cfg = gfc()
589+    let stakingCntr = valueOrErrorMessage(addressFromString(cfg[idxFactStakCntr]), "Wr st addr")
590+    let slipCntr = valueOrErrorMessage(addressFromString(cfg[idxFactSlippCntr]), "Wr sl addr")
591+    let gwxCntr = valueOrErrorMessage(addressFromString(cfg[idxFactGwxRewCntr]), "Wr gwx addr")
592+    let poolCfg = gpc()
593+    let amId = poolCfg[idxAmAsId]
594+    let prId = poolCfg[idxPrAsId]
595+    let amDcm = parseIntValue(poolCfg[idxAmtAsDcm])
596+    let prDcm = parseIntValue(poolCfg[idxPriceAsDcm])
597+    let addon = valueOrElse(getString(this, ada()), "")
628598     let userAddress = if ((addon == toString(i.caller)))
629599         then i.originCaller
630600         else i.caller
631601     if (if (if (if ((0 >= slippage))
632602         then true
633-        else (0 >= amountAssetPart))
603+        else (0 >= amAssetPart))
634604         then true
635-        else (0 >= priceAssetPart))
605+        else (0 >= prAssetPart))
636606         then true
637607         else (0 >= outLp))
638-        then throwErr("Wrong params")
608+        then throw("Wrong params")
639609         else if ((size(i.payments) != 1))
640-            then throwErr("1 payment expected")
610+            then throw("1 pmnt expd")
641611             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")
612+                let pmt = value(i.payments[0])
613+                let pmtAssetId = toBase58String(value(pmt.assetId))
614+                let pmtDecimals = value(assetInfo(value(i.payments[0].assetId))).decimals
615+                let pmtAmt = pmt.amount
616+                let pmtAmtDefaultDecimals = ((pmtAmt * defaultDecimals) / pow(10, 0, pmtDecimals, 0, 0, DOWN))
617+                if ((10000000 > pmtAmtDefaultDecimals))
618+                    then throw("Wrong pmt amt")
654619                     else {
655-                        let amountBalance = getAccBalance(amountId)
656-                        let priceBalance = getAccBalance(priceId)
657-                        let $t02689227347 = 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 = $t02689227347._1
663-                        let priceBalanceNow = $t02689227347._2
664-                        let virtSwapInAm = $t02689227347._3
665-                        let virtSwapOutPr = $t02689227347._4
666-                        let virtSwapInPr = $t02689227347._5
667-                        let virtSwapOutAm = $t02689227347._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)
620+                        let amBalance = getAccBalance(amId)
621+                        let prBalance = getAccBalance(prId)
622+                        let $t02583826534 = if ((pmtAssetId == amId))
623+                            then if (if ((pmtAmtDefaultDecimals > amBalance))
624+                                then true
625+                                else (amAssetPart > pmtAmtDefaultDecimals))
626+                                then throw("invalid payment amount")
627+                                else $Tuple6((amBalance - pmtAmtDefaultDecimals), prBalance, (pmtAmtDefaultDecimals - amAssetPart), prAssetPart, 0, 0)
628+                            else if ((pmtAssetId == prId))
629+                                then if (if ((pmtAmtDefaultDecimals > prBalance))
630+                                    then true
631+                                    else (prAssetPart > pmtAmtDefaultDecimals))
632+                                    then throw("invalid payment amount")
633+                                    else $Tuple6(amBalance, (prBalance - pmtAmtDefaultDecimals), 0, 0, (pmtAmtDefaultDecimals - prAssetPart), amAssetPart)
634+                                else throw("wrong pmtAssetId")
635+                        let amBalanceNow = $t02583826534._1
636+                        let prBalanceNow = $t02583826534._2
637+                        let virtSwapInAm = $t02583826534._3
638+                        let virtSwapOutPr = $t02583826534._4
639+                        let virtSwapInPr = $t02583826534._5
640+                        let virtSwapOutAm = $t02583826534._6
641+                        let D0 = invoke(gwxCntr, "calcD", [toString(amBalanceNow), toString(prBalanceNow), A, Amult, Dconv], nil)
642+                        let D1 = invoke(gwxCntr, "calcD", [toString(toBigInt(((amBalanceNow + virtSwapInAm) - virtSwapOutAm))), toString(toBigInt(((prBalanceNow + virtSwapInPr) - virtSwapOutPr))), A, Amult, Dconv], nil)
643+                        let D0vsD1 = vd(parseBigIntValue(str(D1)), parseBigIntValue(str(D0)), slippage4D)
671644                         if ((D0vsD1 == D0vsD1))
672645                             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)
646+                                let estPut = cp(toString(i.caller), toBase58String(i.transactionId), AttachedPayment(fromBase58String(amId), amAssetPart), AttachedPayment(fromBase58String(prId), prAssetPart), slippage, true, true, pmtAmt, pmtAssetId)
647+                                let estimLP = estPut._2
648+                                let lpAssetId = estPut._7
649+                                let state = estPut._9
650+                                let amDiff = estPut._10
651+                                let prDiff = estPut._11
652+                                let lpCalcRes = vad(toBigInt(estimLP), toBigInt(outLp), toBigInt(slippage))
653+                                let emitLpAmt = toInt(lpCalcRes._2)
654+                                let e = invoke(fca, "emit", [emitLpAmt], nil)
682655                                 if ((e == e))
683656                                     then {
684657                                         let el =                                         match e {
685658                                             case legacy: Address => 
686-                                                invoke(legacy, "emit", [emitLpAmount], nil)
659+                                                invoke(legacy, "emit", [emitLpAmt], nil)
687660                                             case _ => 
688661                                                 unit
689662                                         }
690663                                         if ((el == el))
691664                                             then {
692-                                                let sa = if ((amountDiff > 0))
693-                                                    then invoke(slippageContract, "put", nil, [AttachedPayment(fromBase58String(amountId), amountDiff)])
665+                                                let sa = if ((amDiff > 0))
666+                                                    then invoke(slipCntr, "put", nil, [AttachedPayment(fromBase58String(amId), amDiff)])
694667                                                     else nil
695668                                                 if ((sa == sa))
696669                                                     then {
697-                                                        let sp = if ((priceDiff > 0))
698-                                                            then invoke(slippageContract, "put", nil, [AttachedPayment(fromBase58String(priceId), priceDiff)])
670+                                                        let sp = if ((prDiff > 0))
671+                                                            then invoke(slipCntr, "put", nil, [AttachedPayment(fromBase58String(prId), prDiff)])
699672                                                             else nil
700673                                                         if ((sp == sp))
701674                                                             then {
702-                                                                let lpTrasfer = if (autoStake)
675+                                                                let lpTrnsfr = if (autoStake)
703676                                                                     then {
704-                                                                        let ss = invoke(stakingContract, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmount)])
677+                                                                        let ss = invoke(stakingCntr, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmt)])
705678                                                                         if ((ss == ss))
706679                                                                             then nil
707680                                                                             else throw("Strict value is not equal to itself.")
708681                                                                         }
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)
682+                                                                    else [ScriptTransfer(i.caller, emitLpAmt, lpAssetId)]
683+                                                                (state ++ lpTrnsfr)
714684                                                                 }
715685                                                             else throw("Strict value is not equal to itself.")
716686                                                         }
717687                                                     else throw("Strict value is not equal to itself.")
718688                                                 }
719689                                             else throw("Strict value is not equal to itself.")
720690                                         }
721691                                     else throw("Strict value is not equal to itself.")
722692                                 }
723693                             else throw("Strict value is not equal to itself.")
724694                         }
725695                 }
726696     }
727697 
728698 
729699 
730700 @Callable(i)
731-func putForFree (maxslippage) = if ((0 > maxslippage))
732-    then throwErr("wrong slippage")
701+func putForFree (maxSlpg) = if ((0 > maxSlpg))
702+    then throw("Wrong slpg")
733703     else if ((size(i.payments) != 2))
734-        then throwErr("2 payments expected")
704+        then throw("2 pmnts expd")
735705         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
706+            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, "")
707+            estPut._9
738708             }
739709 
740710 
741711 
742712 @Callable(i)
743713 func get () = {
744-    let r = commonGet(i)
714+    let r = cg(i)
745715     let outAmtAmt = r._1
746-    let outPriceAmount = r._2
747-    let paymentAmount = r._3
748-    let paymentAssetId = r._4
716+    let outPrAmt = r._2
717+    let pmtAmt = r._3
718+    let pmtAssetId = r._4
749719     let state = r._5
750-    let b = invoke(factoryContract, "burn", [paymentAmount], [AttachedPayment(paymentAssetId, paymentAmount)])
720+    let b = invoke(fca, "burn", [pmtAmt], [AttachedPayment(pmtAssetId, pmtAmt)])
751721     if ((b == b))
752722         then state
753723         else throw("Strict value is not equal to itself.")
754724     }
755725 
756726 
757727 
758728 @Callable(i)
759729 func getOneTkn (exchResult,notUsed,outAmount,outAssetId,slippage) = if ((size(i.payments) != 1))
760-    then throwErr("1 payment expected")
730+    then throw("1 pmnt expd")
761731     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])
732+        let cfg = gpc()
733+        let lpId = cfg[idxLPAsId]
734+        let amId = cfg[idxAmAsId]
735+        let prId = cfg[idxPrAsId]
736+        let amDcm = parseIntValue(cfg[idxAmtAsDcm])
737+        let prDcm = parseIntValue(cfg[idxPriceAsDcm])
768738         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()), "")
739+        let factCfg = gfc()
740+        let gwxCntr = valueOrErrorMessage(addressFromString(factCfg[idxFactGwxRewCntr]), "Wr sl addr")
741+        let pmt = value(i.payments[0])
742+        let addon = valueOrElse(getString(this, ada()), "")
773743         let userAddress = if ((addon == toString(i.caller)))
774744             then i.originCaller
775745             else i.caller
776746         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")
747+        let pmtAssetId = value(pmt.assetId)
748+        let pmtAmt = pmt.amount
749+        if ((1000000000 > pmtAmt))
750+            then throw("Min pmt 10 LP")
781751             else if (if (if ((0 > slippage))
782752                 then true
783753                 else (0 > exchResult))
784754                 then true
785755                 else (0 > outAmount))
786-                then throwErr("Wrong params")
787-                else if ((lpAssetId != toBase58String(paymentAssetId)))
788-                    then throwErr("Wrong LP")
756+                then throw("Wrong params")
757+                else if ((lpId != toBase58String(pmtAssetId)))
758+                    then throw("Wrong LP")
789759                     else {
790-                        let r = estimateGetOperation(toBase58String(i.transactionId), toBase58String(paymentAssetId), paymentAmount, i.caller)
760+                        let r = ego(toBase58String(i.transactionId), toBase58String(pmtAssetId), pmtAmt, i.caller)
791761                         let estimAmAmt = r._1
792762                         let estimPrAmt = r._2
793-                        let amountBalance = getAccBalance(amountId)
794-                        let priceBalance = getAccBalance(priceId)
795-                        let $t03249432962 = 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 = $t03249432962._1
801-                        let priceBalanceNow = $t03249432962._2
802-                        let virtSwapInAm = $t03249432962._3
803-                        let virtSwapOutPr = $t03249432962._4
804-                        let virtSwapInPr = $t03249432962._5
805-                        let virtSwapOutAm = $t03249432962._6
806-                        let totalGet = $t03249432962._7
763+                        let amBalance = getAccBalance(amId)
764+                        let prBalance = getAccBalance(prId)
765+                        let $t03131331770 = if ((outAssetId == amId))
766+                            then $Tuple7((amBalance - estimAmAmt), (prBalance - estimPrAmt), exchResult, estimPrAmt, 0, 0, (estimAmAmt + exchResult))
767+                            else if ((outAssetId == prId))
768+                                then $Tuple7((amBalance - estimAmAmt), (prBalance - estimPrAmt), 0, 0, exchResult, estimAmAmt, (estimPrAmt + exchResult))
769+                                else throw("wrong outAssetId")
770+                        let amBalanceNow = $t03131331770._1
771+                        let prBalanceNow = $t03131331770._2
772+                        let virtSwapInAm = $t03131331770._3
773+                        let virtSwapOutPr = $t03131331770._4
774+                        let virtSwapInPr = $t03131331770._5
775+                        let virtSwapOutAm = $t03131331770._6
776+                        let totalGet = $t03131331770._7
807777                         if (if ((0 > virtSwapInAm))
808778                             then true
809779                             else (0 > virtSwapInPr))
810-                            then throwErr("Wrong calc")
780+                            then throw("Wrong calc")
811781                             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)
782+                                let D0 = invoke(gwxCntr, "calcD", [toString(amBalanceNow), toString(prBalanceNow), A, Amult, Dconv], nil)
783+                                let D1 = invoke(gwxCntr, "calcD", [toString(((amBalanceNow - virtSwapInAm) + virtSwapOutAm)), toString(((prBalanceNow + virtSwapOutPr) - virtSwapInPr)), A, Amult, Dconv], nil)
784+                                let D0vsD1 = vd(parseBigIntValue(str(D1)), parseBigIntValue(str(D0)), slippage4D)
815785                                 if ((D0vsD1 == D0vsD1))
816786                                     then {
817-                                        let finalRes = validateAbsDiff(toBigInt(totalGet), toBigInt(outAmount), toBigInt(slippage))
787+                                        let finalRes = vad(toBigInt(totalGet), toBigInt(outAmount), toBigInt(slippage))
818788                                         if ((finalRes == finalRes))
819789                                             then {
820-                                                let $t03363133739 = if ((outAssetId == amountId))
790+                                                let $t03247532579 = if ((outAssetId == amId))
821791                                                     then $Tuple2(toInt(finalRes._2), 0)
822792                                                     else $Tuple2(0, toInt(finalRes._2))
823-                                                let outAm = $t03363133739._1
824-                                                let outPr = $t03363133739._2
825-                                                let totalAmountRaw = (outAm + outPr)
826-                                                let $t03377933834 = takeFee(totalAmountRaw)
827-                                                let totalAmount = $t03377933834._1
828-                                                let feeAmount = $t03377933834._2
829-                                                let outAssetIdOrWaves = if ((outAssetId == "WAVES"))
793+                                                let outAm = $t03247532579._1
794+                                                let outPr = $t03247532579._2
795+                                                let curPrX18 = cpbi(t1(prBalance, prDcm), t1(amBalance, amDcm))
796+                                                let curPr = f1(curPrX18, scale8)
797+                                                let state = [ScriptTransfer(userAddress, (outAm + outPr), if ((outAssetId == "WAVES"))
830798                                                     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))
799+                                                    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)]
800+                                                if ((state == state))
839801                                                     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-                                                                }
802+                                                        let burn = invoke(fca, "burn", [pmtAmt], [AttachedPayment(pmtAssetId, pmtAmt)])
803+                                                        if ((burn == burn))
804+                                                            then state
850805                                                             else throw("Strict value is not equal to itself.")
851806                                                         }
852807                                                     else throw("Strict value is not equal to itself.")
853808                                                 }
854809                                             else throw("Strict value is not equal to itself.")
855810                                         }
856811                                     else throw("Strict value is not equal to itself.")
857812                                 }
858813                         }
859814         }
860815 
861816 
862817 
863818 @Callable(i)
864819 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
820+    let r = cg(i)
821+    let outAmAmt = r._1
822+    let outPrAmt = r._2
823+    let pmtAmt = r._3
824+    let pmtAssetId = r._4
870825     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.")
826+    if ((noLessThenAmtAsset > outAmAmt))
827+        then throw(((("Failed:  " + toString(outAmAmt)) + " < ") + toString(noLessThenAmtAsset)))
828+        else if ((noLessThenPriceAsset > outPrAmt))
829+            then throw(((("Failed: " + toString(outPrAmt)) + " < ") + toString(noLessThenPriceAsset)))
830+            else {
831+                let burnLPAssetOnFactory = invoke(fca, "burn", [pmtAmt], [AttachedPayment(pmtAssetId, pmtAmt)])
832+                if ((burnLPAssetOnFactory == burnLPAssetOnFactory))
833+                    then state
834+                    else throw("Strict value is not equal to itself.")
835+                }
889836     }
890837 
891838 
892839 
893840 @Callable(i)
894841 func unstakeAndGet (amount) = {
895842     let checkPayments = if ((size(i.payments) != 0))
896-        then throwErr("no payments expected")
843+        then throw("No pmnts expd")
897844         else true
898845     if ((checkPayments == checkPayments))
899846         then {
900-            let cfg = getPoolConfig()
901-            let factoryCfg = getFactoryConfig()
847+            let cfg = gpc()
848+            let factoryCfg = gfc()
902849             let lpAssetId = fromBase58String(cfg[idxLPAsId])
903-            let staking = valueOrErrorMessage(addressFromString(factoryCfg[idxFactStakCntr]), "wrong")
850+            let staking = valueOrErrorMessage(addressFromString(factoryCfg[idxFactStakCntr]), "Wr st addr")
904851             let unstakeInv = invoke(staking, "unstake", [toBase58String(lpAssetId), amount], nil)
905852             if ((unstakeInv == unstakeInv))
906853                 then {
907-                    let r = estimateGetOperation(toBase58String(i.transactionId), toBase58String(lpAssetId), amount, i.caller)
854+                    let r = ego(toBase58String(i.transactionId), toBase58String(lpAssetId), amount, i.caller)
908855                     let sts = parseIntValue(r._9)
909856                     let state = r._10
910-                    let v = if (if (isGlobalShutdown())
857+                    let v = if (if (igs())
911858                         then true
912859                         else (sts == PoolShutdown))
913-                        then throwErr(("Blocked: " + toString(sts)))
860+                        then throw(("Blocked: " + toString(sts)))
914861                         else true
915862                     if ((v == v))
916863                         then {
917-                            let burnA = invoke(factoryContract, "burn", [amount], [AttachedPayment(lpAssetId, amount)])
864+                            let burnA = invoke(fca, "burn", [amount], [AttachedPayment(lpAssetId, amount)])
918865                             if ((burnA == burnA))
919866                                 then state
920867                                 else throw("Strict value is not equal to itself.")
921868                             }
922869                         else throw("Strict value is not equal to itself.")
923870                     }
924871                 else throw("Strict value is not equal to itself.")
925872             }
926873         else throw("Strict value is not equal to itself.")
927874     }
928875 
929876 
930877 
931878 @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")
879+func activate (amtAsStr,prAsStr) = if ((toString(i.caller) != toString(fca)))
880+    then throw("denied")
881+    else $Tuple2([StringEntry(aa(), amtAsStr), StringEntry(pa(), prAsStr)], "success")
935882 
936883 
937884 
938885 @Callable(i)
939-func setS (k,v) = if ((toString(i.caller) != getStringOrFail(this, keyAddonAddress())))
886+func setS (k,v) = if ((toString(i.caller) != strf(this, ada())))
940887     then pd
941888     else [StringEntry(k, v)]
942889 
943890 
944891 
945892 @Callable(i)
946-func setI (k,v) = if ((toString(i.caller) != getStringOrFail(this, keyAddonAddress())))
893+func setI (k,v) = if ((toString(i.caller) != strf(this, ada())))
947894     then pd
948895     else [IntegerEntry(k, v)]
949896 
950897 
951898 
952899 @Callable(i)
953-func getPoolConfigWrapperREADONLY () = $Tuple2(nil, getPoolConfig())
900+func getPoolConfigWrapperREADONLY () = $Tuple2(nil, gpc())
954901 
955902 
956903 
957904 @Callable(i)
958905 func getAccBalanceWrapperREADONLY (assetId) = $Tuple2(nil, getAccBalance(assetId))
959906 
960907 
961908 
962909 @Callable(i)
963910 func calcPricesWrapperREADONLY (amAmt,prAmt,lpAmt) = {
964911     let pr = calcPrices(amAmt, prAmt, lpAmt)
965912     $Tuple2(nil, [toString(pr[0]), toString(pr[1]), toString(pr[2])])
966913     }
967914 
968915 
969916 
970917 @Callable(i)
971-func fromX18WrapperREADONLY (val,resScaleMult) = $Tuple2(nil, fromX18(parseBigIntValue(val), resScaleMult))
918+func fromX18WrapperREADONLY (val,resScaleMult) = $Tuple2(nil, f1(parseBigIntValue(val), resScaleMult))
972919 
973920 
974921 
975922 @Callable(i)
976-func toX18WrapperREADONLY (origVal,origScaleMult) = $Tuple2(nil, toString(toX18(origVal, origScaleMult)))
923+func toX18WrapperREADONLY (origVal,origScaleMult) = $Tuple2(nil, toString(t1(origVal, origScaleMult)))
977924 
978925 
979926 
980927 @Callable(i)
981-func calcPriceBigIntWrapperREADONLY (prAmtX18,amAmtX18) = $Tuple2(nil, toString(calcPriceBigInt(parseBigIntValue(prAmtX18), parseBigIntValue(amAmtX18))))
928+func calcPriceBigIntWrapperREADONLY (prAmtX18,amAmtX18) = $Tuple2(nil, toString(cpbi(parseBigIntValue(prAmtX18), parseBigIntValue(amAmtX18))))
982929 
983930 
984931 
985932 @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, ""))
933+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, ""))
987934 
988935 
989936 
990937 @Callable(i)
991-func estimateGetOperationWrapperREADONLY (txId58,paymentAsId,paymentLpAmount,usrAddr) = {
992-    let r = estimateGetOperation(txId58, paymentAsId, paymentLpAmount, addressFromStringValue(usrAddr))
938+func estimateGetOperationWrapperREADONLY (txId58,pmtAsId,pmtLpAmt,usrAddr) = {
939+    let r = ego(txId58, pmtAsId, pmtLpAmt, addressFromStringValue(usrAddr))
993940     $Tuple2(nil, $Tuple10(r._1, r._2, r._3, r._4, r._5, r._6, r._7, toString(r._8), r._9, r._10))
994941     }
995942 
996943 
997944 @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-}
945+func verify () = {
946+    let targetPublicKey =     match m() {
947+        case pk: ByteVector => 
948+            pk
949+        case _: Unit => 
950+            tx.senderPublicKey
951+        case _ => 
952+            throw("Match error")
953+    }
954+    match tx {
955+        case order: Order => 
956+            let matcherPub = mp()
957+            let orderValid = moa(order)
958+            let senderValid = sigVerify(order.bodyBytes, order.proofs[0], order.senderPublicKey)
959+            let matcherValid = sigVerify(order.bodyBytes, order.proofs[1], matcherPub)
960+            if (if (if (orderValid)
961+                then senderValid
962+                else false)
963+                then matcherValid
964+                else false)
965+                then true
966+                else toe(orderValid, senderValid, matcherValid)
967+        case s: SetScriptTransaction => 
968+            let newHash = blake2b256(value(s.script))
969+            let allowedHash = fromBase64String(value(getString(fca, keyAllowedLpStableScriptHash())))
970+            let currentHash = scriptHash(this)
971+            if (if ((allowedHash == newHash))
972+                then (currentHash != newHash)
973+                else false)
974+                then true
975+                else sigVerify(tx.bodyBytes, tx.proofs[0], targetPublicKey)
976+        case _ => 
977+            sigVerify(tx.bodyBytes, tx.proofs[0], targetPublicKey)
978+    }
979+    }
1022980 
github/deemru/w8io/169f3d6 
241.20 ms ◑