tx · CieraDHKh9CkRCKxksgAMzUDpRrAbu8hqNqmhznwuH9T

3NAefciWv6f9fWvEXdGgpHfanJFG8HqfjuT:  -0.03400000 Waves

2022.08.30 14:57 [2207153] smart account 3NAefciWv6f9fWvEXdGgpHfanJFG8HqfjuT > SELF 0.00000000 Waves

{ "type": 13, "id": "CieraDHKh9CkRCKxksgAMzUDpRrAbu8hqNqmhznwuH9T", "fee": 3400000, "feeAssetId": null, "timestamp": 1661859503910, "version": 2, "chainId": 84, "sender": "3NAefciWv6f9fWvEXdGgpHfanJFG8HqfjuT", "senderPublicKey": "D1BL65meykxFZTCuq7jq9HSGLLnWvQamQPUNrguW5w39", "proofs": [ "3PFcMtHLAfxub4GfXH8gmz4bfbYrLCsyaVNAzTBdXAuA7BxRKwztmoNvRsmZfhGHb9AeHRPmxrYybVeD6kZGxW1i" ], "script": "base64:BgJ/CAISAwoBCBIDCgEIEgASBAoCAQQSBwoFAQEBAQQSAwoBARIAEgcKBQEBAQgBEgQKAgEBEgMKAQESBAoCCAgSBAoCCAgSBAoCCAESABIDCgEIEgUKAwEBARIECgIIARIECgIBARIECgIICBILCgkIAQECAQIIBAQSBgoECAgBCFIAD2RlZmF1bHREZWNpbWFscwDAhD0ABnNjYWxlOACAwtcvAAxzY2FsZThCaWdJbnQJALYCAQCAwtcvAAdzY2FsZTE4CQC2AgEAgICQu7rWrfANAAh0aG91c2FuZADoBwAKemVyb0JpZ0ludAkAtgIBAAAACW9uZUJpZ0ludAkAtgIBAAEACnNsaXBwYWdlNEQJALYCAQkAZQIFBnNjYWxlOAkAaQIJAGgCBQZzY2FsZTgAAQUGc2NhbGU4AAVBbXVsdAIDMTAwAAVEY29udgIBMQADU0VQAgJfXwAFRU1QVFkCAAAKUG9vbEFjdGl2ZQABAApQb29sUHV0RGlzAAIADlBvb2xNYXRjaGVyRGlzAAMADFBvb2xTaHV0ZG93bgAEAA5pZHhQb29sQWRkcmVzcwABAAlpZHhQb29sU3QAAgAJaWR4TFBBc0lkAAMACWlkeEFtQXNJZAAEAAlpZHhQckFzSWQABQALaWR4QW10QXNEY20ABgANaWR4UHJpY2VBc0RjbQAHAAtpZHhJQW10QXNJZAAIAA1pZHhJUHJpY2VBc0lkAAkAD2lkeEZhY3RTdGFrQ250cgABABBpZHhGYWN0U2xpcHBDbnRyAAcAEWlkeEZhY3RHd3hSZXdDbnRyAAoAEmZlZVBlcm1pbGxlRGVmYXVsdAAAAQV0b1gxOAIHb3JpZ1ZhbA1vcmlnU2NhbGVNdWx0CQC8AgMJALYCAQUHb3JpZ1ZhbAUHc2NhbGUxOAkAtgIBBQ1vcmlnU2NhbGVNdWx0AQdmcm9tWDE4AgN2YWwPcmVzdWx0U2NhbGVNdWx0CQCgAwEJALwCAwUDdmFsCQC2AgEFD3Jlc3VsdFNjYWxlTXVsdAUHc2NhbGUxOAECdHMDA2FtdAhyZXNTY2FsZQhjdXJTY2FsZQkAawMFA2FtdAUIcmVzU2NhbGUFCGN1clNjYWxlAQNhYnMBA3ZhbAMJAL8CAgUKemVyb0JpZ0ludAUDdmFsCQC+AgEFA3ZhbAUDdmFsARFrZXlGYWN0b3J5Q29udGFjdAACEyVzX19mYWN0b3J5Q29udHJhY3QBE2tleU1hbmFnZXJQdWJsaWNLZXkAAhQlc19fbWFuYWdlclB1YmxpY0tleQEaa2V5UGVuZGluZ01hbmFnZXJQdWJsaWNLZXkAAhslc19fcGVuZGluZ01hbmFnZXJQdWJsaWNLZXkBDGtleVByaWNlTGFzdAACESVzJXNfX3ByaWNlX19sYXN0AQ9rZXlQcmljZUhpc3RvcnkCAWgBdAkAuQkCCQDMCAICGCVzJXMlZCVkX19wcmljZV9faGlzdG9yeQkAzAgCCQCkAwEFAWgJAMwIAgkApAMBBQF0BQNuaWwFA1NFUAESa2V5UHV0QWN0aW9uQnlVc2VyAgJ1YQR0eElkCQCsAgIJAKwCAgkArAICAgslcyVzJXNfX1BfXwUCdWECAl9fBQR0eElkARJrZXlHZXRBY3Rpb25CeVVzZXICAnVhBHR4SWQJAKwCAgkArAICCQCsAgICCyVzJXMlc19fR19fBQJ1YQICX18FBHR4SWQBDmtleUFtb3VudEFzc2V0AAIPJXNfX2Ftb3VudEFzc2V0AQ1rZXlQcmljZUFzc2V0AAIOJXNfX3ByaWNlQXNzZXQBD2tleUFtcGxpZmljYXRvcgACByVzX19hbXABD2tleUFkZG9uQWRkcmVzcwACDSVzX19hZGRvbkFkZHIADmtleUZlZVBlcm1pbGxlAg8lc19fZmVlUGVybWlsbGUAC2ZlZVBlcm1pbGxlCQELdmFsdWVPckVsc2UCCQCaCAIFBHRoaXMFDmtleUZlZVBlcm1pbGxlBRJmZWVQZXJtaWxsZURlZmF1bHQBEGtleUZhY3RvcnlDb25maWcAAhElc19fZmFjdG9yeUNvbmZpZwENa2V5TWF0Y2hlclB1YgACGCVzJXNfX21hdGNoZXJfX3B1YmxpY0tleQENa2V5UG9vbENvbmZpZwIGaUFtdEFzBWlQckFzCQCsAgIJAKwCAgkArAICCQCsAgICCCVkJWQlc19fBQZpQW10QXMCAl9fBQVpUHJBcwIIX19jb25maWcBH2tleU1hcHBpbmdzQmFzZUFzc2V0MmludGVybmFsSWQBBWJBU3RyCQCsAgICKCVzJXMlc19fbWFwcGluZ3NfX2Jhc2VBc3NldDJpbnRlcm5hbElkX18FBWJBU3RyARNrZXlBbGxQb29sc1NodXRkb3duAAIMJXNfX3NodXRkb3duAQh0aHJvd0VycgEDbXNnCQACAQkAuQkCCQDMCAICD2xwX3N0YWJsZS5yaWRlOgkAzAgCBQNtc2cFA25pbAIBIAEPdGhyb3dPcmRlckVycm9yAwNvclYGc2VuZHJWBm1hdGNoVgkBCHRocm93RXJyAQkArAICCQCsAgIJAKwCAgkArAICCQCsAgICEUZhaWxlZDogb3JkVmFsaWQ9CQClAwEFA29yVgILIHNuZHJWYWxpZD0JAKUDAQUGc2VuZHJWAgwgbXRjaHJWYWxpZD0JAKUDAQUGbWF0Y2hWAQNzdHIBA3ZhbAQHJG1hdGNoMAUDdmFsAwkAAQIFByRtYXRjaDACBlN0cmluZwQGdmFsU3RyBQckbWF0Y2gwBQZ2YWxTdHIJAQh0aHJvd0VycgECE2ZhaWwgY2FzdCB0byBTdHJpbmcBD2dldFN0cmluZ09yRmFpbAIEYWRkcgNrZXkJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkAnQgCBQRhZGRyBQNrZXkJALkJAgkAzAgCAgptYW5kYXRvcnkgCQDMCAIJAKUIAQUEYWRkcgkAzAgCAgEuCQDMCAIFA2tleQkAzAgCAgwgbm90IGRlZmluZWQFA25pbAIAAQxnZXRJbnRPckZhaWwCBGFkZHIDa2V5CQETdmFsdWVPckVycm9yTWVzc2FnZQIJAJoIAgUEYWRkcgUDa2V5CQC5CQIJAMwIAgIKbWFuZGF0b3J5IAkAzAgCCQClCAEFBGFkZHIJAMwIAgIBLgkAzAgCBQNrZXkJAMwIAgIMIG5vdCBkZWZpbmVkBQNuaWwCAAAPZmFjdG9yeUNvbnRyYWN0CQERQGV4dHJOYXRpdmUoMTA2MikBCQEPZ2V0U3RyaW5nT3JGYWlsAgUEdGhpcwkBEWtleUZhY3RvcnlDb250YWN0AAAMYW1wbGlmaWNhdG9yCQEPZ2V0U3RyaW5nT3JGYWlsAgUEdGhpcwkBD2tleUFtcGxpZmljYXRvcgABEGlzR2xvYmFsU2h1dGRvd24ACQELdmFsdWVPckVsc2UCCQCbCAIFD2ZhY3RvcnlDb250cmFjdAkBE2tleUFsbFBvb2xzU2h1dGRvd24ABwETZ2V0TWF0Y2hlclB1Yk9yRmFpbAAJANkEAQkBD2dldFN0cmluZ09yRmFpbAIFD2ZhY3RvcnlDb250cmFjdAkBDWtleU1hdGNoZXJQdWIAAA5tYXRjaGVyQWRkcmVzcwkApwgBCQETZ2V0TWF0Y2hlclB1Yk9yRmFpbAABDWdldFBvb2xDb25maWcABAVhbXRBcwkBD2dldFN0cmluZ09yRmFpbAIFBHRoaXMJAQ5rZXlBbW91bnRBc3NldAAEB3ByaWNlQXMJAQ9nZXRTdHJpbmdPckZhaWwCBQR0aGlzCQENa2V5UHJpY2VBc3NldAAECGlQcmljZUFzCQEMZ2V0SW50T3JGYWlsAgUPZmFjdG9yeUNvbnRyYWN0CQEfa2V5TWFwcGluZ3NCYXNlQXNzZXQyaW50ZXJuYWxJZAEFB3ByaWNlQXMEBmlBbXRBcwkBDGdldEludE9yRmFpbAIFD2ZhY3RvcnlDb250cmFjdAkBH2tleU1hcHBpbmdzQmFzZUFzc2V0MmludGVybmFsSWQBBQVhbXRBcwkAtQkCCQEPZ2V0U3RyaW5nT3JGYWlsAgUPZmFjdG9yeUNvbnRyYWN0CQENa2V5UG9vbENvbmZpZwIJAKQDAQUGaUFtdEFzCQCkAwEFCGlQcmljZUFzBQNTRVABEGdldEZhY3RvcnlDb25maWcACQC1CQIJAQ9nZXRTdHJpbmdPckZhaWwCBQ9mYWN0b3J5Q29udHJhY3QJARBrZXlGYWN0b3J5Q29uZmlnAAUDU0VQARFkYXRhUHV0QWN0aW9uSW5mbwoNaW5BbXRBc3NldEFtdA9pblByaWNlQXNzZXRBbXQIb3V0THBBbXQFcHJpY2UKc2xpcEJ5VXNlcgxzbGlwcGFnZVJlYWwIdHhIZWlnaHQLdHhUaW1lc3RhbXAMc2xpcGFnZUFtQW10DHNsaXBhZ2VQckFtdAkAuQkCCQDMCAICFCVkJWQlZCVkJWQlZCVkJWQlZCVkCQDMCAIJAKQDAQUNaW5BbXRBc3NldEFtdAkAzAgCCQCkAwEFD2luUHJpY2VBc3NldEFtdAkAzAgCCQCkAwEFCG91dExwQW10CQDMCAIJAKQDAQUFcHJpY2UJAMwIAgkApAMBBQpzbGlwQnlVc2VyCQDMCAIJAKQDAQUMc2xpcHBhZ2VSZWFsCQDMCAIJAKQDAQUIdHhIZWlnaHQJAMwIAgkApAMBBQt0eFRpbWVzdGFtcAkAzAgCCQCkAwEFDHNsaXBhZ2VBbUFtdAkAzAgCCQCkAwEFDHNsaXBhZ2VQckFtdAUDbmlsBQNTRVABEWRhdGFHZXRBY3Rpb25JbmZvBg5vdXRBbXRBc3NldEFtdBBvdXRQcmljZUFzc2V0QW10B2luTHBBbXQFcHJpY2UIdHhIZWlnaHQLdHhUaW1lc3RhbXAJALkJAgkAzAgCAgwlZCVkJWQlZCVkJWQJAMwIAgkApAMBBQ5vdXRBbXRBc3NldEFtdAkAzAgCCQCkAwEFEG91dFByaWNlQXNzZXRBbXQJAMwIAgkApAMBBQdpbkxwQW10CQDMCAIJAKQDAQUFcHJpY2UJAMwIAgkApAMBBQh0eEhlaWdodAkAzAgCCQCkAwEFC3R4VGltZXN0YW1wBQNuaWwFA1NFUAENZ2V0QWNjQmFsYW5jZQEHYXNzZXRJZAMJAAACBQdhc3NldElkAgVXQVZFUwgJAO8HAQUEdGhpcwlhdmFpbGFibGUJAPAHAgUEdGhpcwkA2QQBBQdhc3NldElkAQ9jYWxjUHJpY2VCaWdJbnQCCHByQW10WDE4CGFtQW10WDE4CQC8AgMFCHByQW10WDE4BQdzY2FsZTE4BQhhbUFtdFgxOAEPdmFsaWRhdGVBYnNEaWZmAwplc3RpbWF0ZUxQBW91dExwCHNsaXBwYWdlBARkaWZmCQC8AgMJALgCAgUKZXN0aW1hdGVMUAUFb3V0THAFDHNjYWxlOEJpZ0ludAUFb3V0THAEBHBhc3MJAL8CAgkAuAICBQhzbGlwcGFnZQkBA2FicwEFBGRpZmYFCnplcm9CaWdJbnQDCQEBIQEFBHBhc3MJAQh0aHJvd0VycgEJAKwCAgIOQmlnIHNsaXBwYWdlOiAJAKYDAQUEZGlmZgkAlAoCBQRwYXNzCQCZAwEJAMwIAgUKZXN0aW1hdGVMUAkAzAgCBQVvdXRMcAUDbmlsAQl2YWxpZGF0ZUQDAkQxAkQwCHNsaXBwYWdlBARkaWZmCQC8AgMFAkQwBQxzY2FsZThCaWdJbnQFAkQxBARmYWlsCQC/AgIFCHNsaXBwYWdlBQRkaWZmAwMFBGZhaWwGCQC/AgIFAkQwBQJEMQkBCHRocm93RXJyAQkArAICCQCsAgIJAKwCAgkArAICCQCsAgIJAKwCAgkApgMBBQJEMAIBIAkApgMBBQJEMQIBIAkApgMBBQRkaWZmAgEgCQCmAwEFCHNsaXBwYWdlBQRmYWlsARBwcml2YXRlQ2FsY1ByaWNlBAphbUFzc2V0RGNtCnByQXNzZXREY20FYW1BbXQFcHJBbXQEC2FtdEFzQW10WDE4CQEFdG9YMTgCBQVhbUFtdAUKYW1Bc3NldERjbQQKcHJBc0FtdFgxOAkBBXRvWDE4AgUFcHJBbXQFCnByQXNzZXREY20JAQ9jYWxjUHJpY2VCaWdJbnQCBQpwckFzQW10WDE4BQthbXRBc0FtdFgxOAEKY2FsY1ByaWNlcwMFYW1BbXQFcHJBbXQFbHBBbXQEA2NmZwkBDWdldFBvb2xDb25maWcABAhhbXRBc0RjbQkBDXBhcnNlSW50VmFsdWUBCQCRAwIFA2NmZwULaWR4QW10QXNEY20EB3ByQXNEY20JAQ1wYXJzZUludFZhbHVlAQkAkQMCBQNjZmcFDWlkeFByaWNlQXNEY20ECHByaWNlWDE4CQEQcHJpdmF0ZUNhbGNQcmljZQQFCGFtdEFzRGNtBQdwckFzRGNtBQVhbUFtdAUFcHJBbXQECGFtQW10WDE4CQEFdG9YMTgCBQVhbUFtdAUIYW10QXNEY20ECHByQW10WDE4CQEFdG9YMTgCBQVwckFtdAUHcHJBc0RjbQQIbHBBbXRYMTgJAQV0b1gxOAIFBWxwQW10BQZzY2FsZTgEDWxwUHJJbkFtQXNYMTgJAQ9jYWxjUHJpY2VCaWdJbnQCBQhhbUFtdFgxOAUIbHBBbXRYMTgEDWxwUHJJblByQXNYMTgJAQ9jYWxjUHJpY2VCaWdJbnQCBQhwckFtdFgxOAUIbHBBbXRYMTgJAMwIAgUIcHJpY2VYMTgJAMwIAgUNbHBQckluQW1Bc1gxOAkAzAgCBQ1scFBySW5QckFzWDE4BQNuaWwBD2NhbGN1bGF0ZVByaWNlcwMFYW1BbXQFcHJBbXQFbHBBbXQEAXAJAQpjYWxjUHJpY2VzAwUFYW1BbXQFBXByQW10BQVscEFtdAkAzAgCCQEHZnJvbVgxOAIJAJEDAgUBcAAABQZzY2FsZTgJAMwIAgkBB2Zyb21YMTgCCQCRAwIFAXAAAQUGc2NhbGU4CQDMCAIJAQdmcm9tWDE4AgkAkQMCBQFwAAIFBnNjYWxlOAUDbmlsARRlc3RpbWF0ZUdldE9wZXJhdGlvbgQGdHhJZDU4DnBheW1lbnRBc3NldElkD3BheW1lbnRMcEFtb3VudAt1c2VyQWRkcmVzcwQDY2ZnCQENZ2V0UG9vbENvbmZpZwAECWxwQXNzZXRJZAkAkQMCBQNjZmcFCWlkeExQQXNJZAQIYW1vdW50SWQJAJEDAgUDY2ZnBQlpZHhBbUFzSWQEB3ByaWNlSWQJAJEDAgUDY2ZnBQlpZHhQckFzSWQEDmFtb3VudERlY2ltYWxzCQENcGFyc2VJbnRWYWx1ZQEJAJEDAgUDY2ZnBQtpZHhBbXRBc0RjbQQNcHJpY2VEZWNpbWFscwkBDXBhcnNlSW50VmFsdWUBCQCRAwIFA2NmZwUNaWR4UHJpY2VBc0RjbQQDc3RzCQCRAwIFA2NmZwUJaWR4UG9vbFN0BApscEVtaXNzaW9uCAkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQDsBwEJANkEAQUJbHBBc3NldElkAgtXcm9uZyBMUCBpZAhxdWFudGl0eQQPdmFsaWRhdGlvbkJsb2NrAwkAAAIFCWxwQXNzZXRJZAUOcGF5bWVudEFzc2V0SWQGCQEIdGhyb3dFcnIBAhNXcm9uZyBwYXltZW50IGFzc2V0AwkAAAIFD3ZhbGlkYXRpb25CbG9jawUPdmFsaWRhdGlvbkJsb2NrBA1hbW91bnRCYWxhbmNlCQENZ2V0QWNjQmFsYW5jZQEFCGFtb3VudElkBAxwcmljZUJhbGFuY2UJAQ1nZXRBY2NCYWxhbmNlAQUHcHJpY2VJZAQcYW1vdW50QmFsYW5jZURlZmF1bHREZWNpbWFscwkAawMFDWFtb3VudEJhbGFuY2UFD2RlZmF1bHREZWNpbWFscwUOYW1vdW50RGVjaW1hbHMEG3ByaWNlQmFsYW5jZURlZmF1bHREZWNpbWFscwkAawMFDHByaWNlQmFsYW5jZQUPZGVmYXVsdERlY2ltYWxzBQ1wcmljZURlY2ltYWxzBBBhbW91bnRCYWxhbmNlWDE4CQEFdG9YMTgCBRxhbW91bnRCYWxhbmNlRGVmYXVsdERlY2ltYWxzBQ9kZWZhdWx0RGVjaW1hbHMED3ByaWNlQmFsYW5jZVgxOAkBBXRvWDE4AgUbcHJpY2VCYWxhbmNlRGVmYXVsdERlY2ltYWxzBQ9kZWZhdWx0RGVjaW1hbHMED2N1cnJlbnRQcmljZVgxOAkBD2NhbGNQcmljZUJpZ0ludAIFD3ByaWNlQmFsYW5jZVgxOAUQYW1vdW50QmFsYW5jZVgxOAQIY3VyUHJpY2UJAQdmcm9tWDE4AgUPY3VycmVudFByaWNlWDE4BQZzY2FsZTgEEnBheW1lbnRMcEFtb3VudFgxOAkBBXRvWDE4AgUPcGF5bWVudExwQW1vdW50BQZzY2FsZTgEDWxwRW1pc3Npb25YMTgJAQV0b1gxOAIFCmxwRW1pc3Npb24FBnNjYWxlOAQSb3V0QW1vdW50QW1vdW50WDE4CQC8AgMFEGFtb3VudEJhbGFuY2VYMTgFEnBheW1lbnRMcEFtb3VudFgxOAUNbHBFbWlzc2lvblgxOAQRb3V0UHJpY2VBbW91bnRYMTgJALwCAwUPcHJpY2VCYWxhbmNlWDE4BRJwYXltZW50THBBbW91bnRYMTgFDWxwRW1pc3Npb25YMTgEHm91dEFtb3VudEFtb3VudERlZmF1bHREZWNpbWFscwkBB2Zyb21YMTgCBRJvdXRBbW91bnRBbW91bnRYMTgFD2RlZmF1bHREZWNpbWFscwQdb3V0UHJpY2VBbW91bnREZWZhdWx0RGVjaW1hbHMJAQdmcm9tWDE4AgURb3V0UHJpY2VBbW91bnRYMTgFD2RlZmF1bHREZWNpbWFscwQPb3V0QW1vdW50QW1vdW50CQBrAwUeb3V0QW1vdW50QW1vdW50RGVmYXVsdERlY2ltYWxzBQ5hbW91bnREZWNpbWFscwUPZGVmYXVsdERlY2ltYWxzBA5vdXRQcmljZUFtb3VudAkAawMFHW91dFByaWNlQW1vdW50RGVmYXVsdERlY2ltYWxzBQ1wcmljZURlY2ltYWxzBQ9kZWZhdWx0RGVjaW1hbHMEBXN0YXRlAwkAAAIFBnR4SWQ1OAIABQNuaWwJAMwIAgkBDlNjcmlwdFRyYW5zZmVyAwULdXNlckFkZHJlc3MFD291dEFtb3VudEFtb3VudAMJAAACBQhhbW91bnRJZAIFV0FWRVMFBHVuaXQJANkEAQUIYW1vdW50SWQJAMwIAgkBDlNjcmlwdFRyYW5zZmVyAwULdXNlckFkZHJlc3MFDm91dFByaWNlQW1vdW50AwkAAAIFB3ByaWNlSWQCBVdBVkVTBQR1bml0CQDZBAEFB3ByaWNlSWQJAMwIAgkBC1N0cmluZ0VudHJ5AgkBEmtleUdldEFjdGlvbkJ5VXNlcgIJAKUIAQULdXNlckFkZHJlc3MFBnR4SWQ1OAkBEWRhdGFHZXRBY3Rpb25JbmZvBgUPb3V0QW1vdW50QW1vdW50BQ5vdXRQcmljZUFtb3VudAUPcGF5bWVudExwQW1vdW50BQhjdXJQcmljZQUGaGVpZ2h0CAUJbGFzdEJsb2NrCXRpbWVzdGFtcAkAzAgCCQEMSW50ZWdlckVudHJ5AgkBDGtleVByaWNlTGFzdAAFCGN1clByaWNlCQDMCAIJAQxJbnRlZ2VyRW50cnkCCQEPa2V5UHJpY2VIaXN0b3J5AgUGaGVpZ2h0CAUJbGFzdEJsb2NrCXRpbWVzdGFtcAUIY3VyUHJpY2UFA25pbAkAnAoKBQ9vdXRBbW91bnRBbW91bnQFDm91dFByaWNlQW1vdW50BQhhbW91bnRJZAUHcHJpY2VJZAUNYW1vdW50QmFsYW5jZQUMcHJpY2VCYWxhbmNlBQpscEVtaXNzaW9uBQ9jdXJyZW50UHJpY2VYMTgFA3N0cwUFc3RhdGUJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BFGVzdGltYXRlUHV0T3BlcmF0aW9uDAZ0eElkNTgRc2xpcHBhZ2VUb2xlcmFuY2UTaW5BbW91bnRBc3NldEFtb3VudA9pbkFtb3VudEFzc2V0SWQSaW5QcmljZUFzc2V0QW1vdW50DmluUHJpY2VBc3NldElkC3VzZXJBZGRyZXNzCmlzRXZhbHVhdGUGZW1pdExwCmlzT25lQXNzZXQNcGF5bWVudEFtb3VudAlwYXltZW50SWQEA2NmZwkBDWdldFBvb2xDb25maWcABAlscEFzc2V0SWQJANkEAQkAkQMCBQNjZmcFCWlkeExQQXNJZAQLYW1vdW50SWRTdHIJAJEDAgUDY2ZnBQlpZHhBbUFzSWQECnByaWNlSWRTdHIJAJEDAgUDY2ZnBQlpZHhQckFzSWQEDWluQW1vdW50SWRTdHIJAJEDAgUDY2ZnBQtpZHhJQW10QXNJZAQMaW5QcmljZUlkU3RyCQCRAwIFA2NmZwUNaWR4SVByaWNlQXNJZAQOYW1vdW50RGVjaW1hbHMJAQ1wYXJzZUludFZhbHVlAQkAkQMCBQNjZmcFC2lkeEFtdEFzRGNtBA1wcmljZURlY2ltYWxzCQENcGFyc2VJbnRWYWx1ZQEJAJEDAgUDY2ZnBQ1pZHhQcmljZUFzRGNtBANzdHMJAJEDAgUDY2ZnBQlpZHhQb29sU3QECmxwRW1pc3Npb24ICQETdmFsdWVPckVycm9yTWVzc2FnZQIJAOwHAQUJbHBBc3NldElkAg5Xcm9uZyBscCBhc3NldAhxdWFudGl0eQQNYW1vdW50QmFsYW5jZQMFCmlzRXZhbHVhdGUJAQ1nZXRBY2NCYWxhbmNlAQULYW1vdW50SWRTdHIDAwUKaXNPbmVBc3NldAkAAAIFCXBheW1lbnRJZAULYW1vdW50SWRTdHIHCQBlAgkBDWdldEFjY0JhbGFuY2UBBQthbW91bnRJZFN0cgUNcGF5bWVudEFtb3VudAMFCmlzT25lQXNzZXQJAQ1nZXRBY2NCYWxhbmNlAQULYW1vdW50SWRTdHIJAGUCCQENZ2V0QWNjQmFsYW5jZQEFC2Ftb3VudElkU3RyBRNpbkFtb3VudEFzc2V0QW1vdW50BAxwcmljZUJhbGFuY2UDBQppc0V2YWx1YXRlCQENZ2V0QWNjQmFsYW5jZQEFCnByaWNlSWRTdHIDAwUKaXNPbmVBc3NldAkAAAIFCXBheW1lbnRJZAUKcHJpY2VJZFN0cgcJAGUCCQENZ2V0QWNjQmFsYW5jZQEFCnByaWNlSWRTdHIFDXBheW1lbnRBbW91bnQDBQppc09uZUFzc2V0CQENZ2V0QWNjQmFsYW5jZQEFCnByaWNlSWRTdHIJAGUCCQENZ2V0QWNjQmFsYW5jZQEFCnByaWNlSWRTdHIFEmluUHJpY2VBc3NldEFtb3VudAQcYW1vdW50QmFsYW5jZURlZmF1bHREZWNpbWFscwkAawMFDWFtb3VudEJhbGFuY2UFD2RlZmF1bHREZWNpbWFscwUOYW1vdW50RGVjaW1hbHMEG3ByaWNlQmFsYW5jZURlZmF1bHREZWNpbWFscwkAawMFDHByaWNlQmFsYW5jZQUPZGVmYXVsdERlY2ltYWxzBQ1wcmljZURlY2ltYWxzBCJpbkFtb3VudEFzc2V0QW1vdW50RGVmYXVsdERlY2ltYWxzCQBrAwUTaW5BbW91bnRBc3NldEFtb3VudAUPZGVmYXVsdERlY2ltYWxzBQ5hbW91bnREZWNpbWFscwQhaW5QcmljZUFzc2V0QW1vdW50RGVmYXVsdERlY2ltYWxzCQBrAwUSaW5QcmljZUFzc2V0QW1vdW50BQ9kZWZhdWx0RGVjaW1hbHMFDXByaWNlRGVjaW1hbHMEFmluQW1vdW50QXNzZXRBbW91bnRYMTgJAQV0b1gxOAIFImluQW1vdW50QXNzZXRBbW91bnREZWZhdWx0RGVjaW1hbHMFD2RlZmF1bHREZWNpbWFscwQVaW5QcmljZUFzc2V0QW1vdW50WDE4CQEFdG9YMTgCBSFpblByaWNlQXNzZXRBbW91bnREZWZhdWx0RGVjaW1hbHMFD2RlZmF1bHREZWNpbWFscwQMdXNlclByaWNlWDE4CQEPY2FsY1ByaWNlQmlnSW50AgUVaW5QcmljZUFzc2V0QW1vdW50WDE4BRZpbkFtb3VudEFzc2V0QW1vdW50WDE4BBBhbW91bnRCYWxhbmNlWDE4CQEFdG9YMTgCBRxhbW91bnRCYWxhbmNlRGVmYXVsdERlY2ltYWxzBQ9kZWZhdWx0RGVjaW1hbHMED3ByaWNlQmFsYW5jZVgxOAkBBXRvWDE4AgUbcHJpY2VCYWxhbmNlRGVmYXVsdERlY2ltYWxzBQ9kZWZhdWx0RGVjaW1hbHMEAXIDCQAAAgUKbHBFbWlzc2lvbgAABA9jdXJyZW50UHJpY2VYMTgFCnplcm9CaWdJbnQEC3NsaXBwYWdlWDE4BQp6ZXJvQmlnSW50BAtscEFtb3VudFgxOAkAdgYJALkCAgUWaW5BbW91bnRBc3NldEFtb3VudFgxOAUVaW5QcmljZUFzc2V0QW1vdW50WDE4AAAJALYCAQAFAAEAAAUERE9XTgkAlwoFCQEHZnJvbVgxOAIFC2xwQW1vdW50WDE4BQZzY2FsZTgJAQdmcm9tWDE4AgUWaW5BbW91bnRBc3NldEFtb3VudFgxOAUPZGVmYXVsdERlY2ltYWxzCQEHZnJvbVgxOAIFFWluUHJpY2VBc3NldEFtb3VudFgxOAUPZGVmYXVsdERlY2ltYWxzCQEPY2FsY1ByaWNlQmlnSW50AgkAtwICBQ9wcmljZUJhbGFuY2VYMTgFFWluUHJpY2VBc3NldEFtb3VudFgxOAkAtwICBRBhbW91bnRCYWxhbmNlWDE4BRZpbkFtb3VudEFzc2V0QW1vdW50WDE4BQtzbGlwcGFnZVgxOAQPY3VycmVudFByaWNlWDE4CQEPY2FsY1ByaWNlQmlnSW50AgUPcHJpY2VCYWxhbmNlWDE4BRBhbW91bnRCYWxhbmNlWDE4BA9zbGlwcGFnZVJlYWxYMTgJALwCAwkBA2FicwEJALgCAgUPY3VycmVudFByaWNlWDE4BQx1c2VyUHJpY2VYMTgFB3NjYWxlMTgFD2N1cnJlbnRQcmljZVgxOAQLc2xpcHBhZ2VYMTgJAQV0b1gxOAIFEXNsaXBwYWdlVG9sZXJhbmNlBQZzY2FsZTgEEHZhbGlkYXRlU2xpcHBhZ2UDCQAAAgMJAQIhPQIFD2N1cnJlbnRQcmljZVgxOAUKemVyb0JpZ0ludAkAvwICBQ9zbGlwcGFnZVJlYWxYMTgFC3NsaXBwYWdlWDE4BwcGCQEIdGhyb3dFcnIBCQCsAgIJAKwCAgkArAICAg9QcmljZSBzbGlwcGFnZSAJAKYDAQUPc2xpcHBhZ2VSZWFsWDE4AgMgPiAJAKYDAQULc2xpcHBhZ2VYMTgDCQAAAgUQdmFsaWRhdGVTbGlwcGFnZQUQdmFsaWRhdGVTbGlwcGFnZQQNbHBFbWlzc2lvblgxOAkBBXRvWDE4AgUKbHBFbWlzc2lvbgUGc2NhbGU4BApwclZpYUFtWDE4CQC8AgMFFmluQW1vdW50QXNzZXRBbW91bnRYMTgFD2N1cnJlbnRQcmljZVgxOAUHc2NhbGUxOAQKYW1WaWFQclgxOAkAvAIDBRVpblByaWNlQXNzZXRBbW91bnRYMTgFB3NjYWxlMTgFD2N1cnJlbnRQcmljZVgxOAQPZXhwZWN0ZWRBbW91bnRzAwkAvwICBQpwclZpYUFtWDE4BRVpblByaWNlQXNzZXRBbW91bnRYMTgJAJQKAgUKYW1WaWFQclgxOAUWaW5BbW91bnRBc3NldEFtb3VudFgxOAkAlAoCBRZpbkFtb3VudEFzc2V0QW1vdW50WDE4BQpwclZpYUFtWDE4BBxleHBlY3RlZEFtb3VudEFzc2V0QW1vdW50WDE4CAUPZXhwZWN0ZWRBbW91bnRzAl8xBBtleHBlY3RlZFByaWNlQXNzZXRBbW91bnRYMTgIBQ9leHBlY3RlZEFtb3VudHMCXzIEC2xwQW1vdW50WDE4CQC8AgMFDWxwRW1pc3Npb25YMTgFG2V4cGVjdGVkUHJpY2VBc3NldEFtb3VudFgxOAUPcHJpY2VCYWxhbmNlWDE4CQCXCgUJAQdmcm9tWDE4AgULbHBBbW91bnRYMTgFBnNjYWxlOAkBB2Zyb21YMTgCBRxleHBlY3RlZEFtb3VudEFzc2V0QW1vdW50WDE4BQ9kZWZhdWx0RGVjaW1hbHMJAQdmcm9tWDE4AgUbZXhwZWN0ZWRQcmljZUFzc2V0QW1vdW50WDE4BQ9kZWZhdWx0RGVjaW1hbHMFD2N1cnJlbnRQcmljZVgxOAULc2xpcHBhZ2VYMTgJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4EEWNhbGN1bGF0ZUxwQW1vdW50CAUBcgJfMQQbY2FsY3VsYXRlQW1vdW50QXNzZXRQYXltZW50CQBrAwgFAXICXzIFDmFtb3VudERlY2ltYWxzBQ9kZWZhdWx0RGVjaW1hbHMEGmNhbGN1bGF0ZVByaWNlQXNzZXRQYXltZW50CQBrAwgFAXICXzMFDXByaWNlRGVjaW1hbHMFD2RlZmF1bHREZWNpbWFscwQMY3VycmVudFByaWNlCQEHZnJvbVgxOAIIBQFyAl80BQZzY2FsZTgEEXNsaXBwYWdlQ2FsY3VsYXRlCQEHZnJvbVgxOAIIBQFyAl81BQZzY2FsZTgEEWNoZWNrQ2FsY0xwQW1vdW50AwkAZgIFEWNhbGN1bGF0ZUxwQW1vdW50AAAGCQEIdGhyb3dFcnIBAgdMUCA8PSAwAwkAAAIFEWNoZWNrQ2FsY0xwQW1vdW50BRFjaGVja0NhbGNMcEFtb3VudAQMZW1pdExwQW1vdW50AwkBASEBBQZlbWl0THAAAAURY2FsY3VsYXRlTHBBbW91bnQECmFtb3VudERpZmYJAGUCBRNpbkFtb3VudEFzc2V0QW1vdW50BRtjYWxjdWxhdGVBbW91bnRBc3NldFBheW1lbnQECXByaWNlRGlmZgkAZQIFEmluUHJpY2VBc3NldEFtb3VudAUaY2FsY3VsYXRlUHJpY2VBc3NldFBheW1lbnQEDSR0MDE3MTUwMTc0MDkDAwUKaXNPbmVBc3NldAkAAAIFCXBheW1lbnRJZAULYW1vdW50SWRTdHIHCQCUCgIFDXBheW1lbnRBbW91bnQAAAMDBQppc09uZUFzc2V0CQAAAgUJcGF5bWVudElkBQpwcmljZUlkU3RyBwkAlAoCAAAFDXBheW1lbnRBbW91bnQJAJQKAgUbY2FsY3VsYXRlQW1vdW50QXNzZXRQYXltZW50BRpjYWxjdWxhdGVQcmljZUFzc2V0UGF5bWVudAQKd3JpdGVBbUFtdAgFDSR0MDE3MTUwMTc0MDkCXzEECndyaXRlUHJBbXQIBQ0kdDAxNzE1MDE3NDA5Al8yBAtjb21tb25TdGF0ZQkAzAgCCQEMSW50ZWdlckVudHJ5AgkBDGtleVByaWNlTGFzdAAFDGN1cnJlbnRQcmljZQkAzAgCCQEMSW50ZWdlckVudHJ5AgkBD2tleVByaWNlSGlzdG9yeQIFBmhlaWdodAgFCWxhc3RCbG9jawl0aW1lc3RhbXAFDGN1cnJlbnRQcmljZQkAzAgCCQELU3RyaW5nRW50cnkCCQESa2V5UHV0QWN0aW9uQnlVc2VyAgULdXNlckFkZHJlc3MFBnR4SWQ1OAkBEWRhdGFQdXRBY3Rpb25JbmZvCgUKd3JpdGVBbUFtdAUKd3JpdGVQckFtdAUMZW1pdExwQW1vdW50BQxjdXJyZW50UHJpY2UFEXNsaXBwYWdlVG9sZXJhbmNlBRFzbGlwcGFnZUNhbGN1bGF0ZQUGaGVpZ2h0CAUJbGFzdEJsb2NrCXRpbWVzdGFtcAUKYW1vdW50RGlmZgUJcHJpY2VEaWZmBQNuaWwJAJ8KDQURY2FsY3VsYXRlTHBBbW91bnQFDGVtaXRMcEFtb3VudAUMY3VycmVudFByaWNlBQ1hbW91bnRCYWxhbmNlBQxwcmljZUJhbGFuY2UFCmxwRW1pc3Npb24FCWxwQXNzZXRJZAUDc3RzBQtjb21tb25TdGF0ZQUKYW1vdW50RGlmZgUJcHJpY2VEaWZmBQ9pbkFtb3VudEFzc2V0SWQFDmluUHJpY2VBc3NldElkCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuARt2YWxpZGF0ZU1hdGNoZXJPcmRlckFsbG93ZWQBBW9yZGVyBANjZmcJAQ1nZXRQb29sQ29uZmlnAAQHYW10QXNJZAkAkQMCBQNjZmcFCWlkeEFtQXNJZAQGcHJBc0lkCQCRAwIFA2NmZwUJaWR4UHJBc0lkBANzdHMJAQ1wYXJzZUludFZhbHVlAQkAkQMCBQNjZmcFCWlkeFBvb2xTdAQIYW10QXNEY20JAQ1wYXJzZUludFZhbHVlAQkAkQMCBQNjZmcFC2lkeEFtdEFzRGNtBAdwckFzRGNtCQENcGFyc2VJbnRWYWx1ZQEJAJEDAgUDY2ZnBQ1pZHhQcmljZUFzRGNtBA9hY2NBbXRBc0JhbGFuY2UJAQ1nZXRBY2NCYWxhbmNlAQUHYW10QXNJZAQOYWNjUHJBc0JhbGFuY2UJAQ1nZXRBY2NCYWxhbmNlAQUGcHJBc0lkBA9jdXJyZW50UHJpY2VYMTgDCQAAAggFBW9yZGVyCW9yZGVyVHlwZQUDQnV5CQEQcHJpdmF0ZUNhbGNQcmljZQQFCGFtdEFzRGNtBQdwckFzRGNtCQBkAgUPYWNjQW10QXNCYWxhbmNlCAUFb3JkZXIGYW1vdW50BQ5hY2NQckFzQmFsYW5jZQkBEHByaXZhdGVDYWxjUHJpY2UEBQhhbXRBc0RjbQUHcHJBc0RjbQkAZQIFD2FjY0FtdEFzQmFsYW5jZQgFBW9yZGVyBmFtb3VudAUOYWNjUHJBc0JhbGFuY2UECGN1clByaWNlCQEHZnJvbVgxOAIFD2N1cnJlbnRQcmljZVgxOAUGc2NhbGU4AwMDCQEQaXNHbG9iYWxTaHV0ZG93bgAGCQAAAgUDc3RzBQ5Qb29sTWF0Y2hlckRpcwYJAAACBQNzdHMFDFBvb2xTaHV0ZG93bgkBCHRocm93RXJyAQINQWRtaW4gYmxvY2tlZAQKb3JBbXRBc3NldAgIBQVvcmRlcglhc3NldFBhaXILYW1vdW50QXNzZXQECm9yQW10QXNTdHIDCQAAAgUKb3JBbXRBc3NldAUEdW5pdAIFV0FWRVMJANgEAQkBBXZhbHVlAQUKb3JBbXRBc3NldAQJb3JQckFzc2V0CAgFBW9yZGVyCWFzc2V0UGFpcgpwcmljZUFzc2V0BAlvclByQXNTdHIDCQAAAgUJb3JQckFzc2V0BQR1bml0AgVXQVZFUwkA2AQBCQEFdmFsdWUBBQlvclByQXNzZXQDAwkBAiE9AgUKb3JBbXRBc1N0cgUHYW10QXNJZAYJAQIhPQIFCW9yUHJBc1N0cgUGcHJBc0lkCQEIdGhyb3dFcnIBAglXciBhc3NldHMECm9yZGVyUHJpY2UIBQVvcmRlcgVwcmljZQQNcHJpY2VEZWNpbWFscwkAawMFBnNjYWxlOAUHcHJBc0RjbQUIYW10QXNEY20EDmNhc3RPcmRlclByaWNlCQECdHMDBQpvcmRlclByaWNlBQZzY2FsZTgFDXByaWNlRGVjaW1hbHMEEWlzT3JkZXJQcmljZVZhbGlkAwkAAAIIBQVvcmRlcglvcmRlclR5cGUFA0J1eQkAZwIFCGN1clByaWNlBQ5jYXN0T3JkZXJQcmljZQkAZwIFDmNhc3RPcmRlclByaWNlBQhjdXJQcmljZQYBCWNvbW1vbkdldAEBaQQNY2hlY2tQYXltZW50cwMJAAACCQCQAwEIBQFpCHBheW1lbnRzAAEGCQEIdGhyb3dFcnIBAhIxIHBheW1lbnQgZXhwZWN0ZWQDCQAAAgUNY2hlY2tQYXltZW50cwUNY2hlY2tQYXltZW50cwQHcGF5bWVudAkBBXZhbHVlAQkAkQMCCAUBaQhwYXltZW50cwAABA5wYXltZW50QXNzZXRJZAkBBXZhbHVlAQgFB3BheW1lbnQHYXNzZXRJZAQNcGF5bWVudEFtb3VudAgFB3BheW1lbnQGYW1vdW50BAFyCQEUZXN0aW1hdGVHZXRPcGVyYXRpb24ECQDYBAEIBQFpDXRyYW5zYWN0aW9uSWQJANgEAQUOcGF5bWVudEFzc2V0SWQFDXBheW1lbnRBbW91bnQIBQFpBmNhbGxlcgQPb3V0QW1vdW50QW1vdW50CAUBcgJfMQQOb3V0UHJpY2VBbW91bnQIBQFyAl8yBANzdHMJAQ1wYXJzZUludFZhbHVlAQgFAXICXzkEBXN0YXRlCAUBcgNfMTADAwkBEGlzR2xvYmFsU2h1dGRvd24ABgkAAAIFA3N0cwUMUG9vbFNodXRkb3duCQEIdGhyb3dFcnIBCQCsAgICD0FkbWluIGJsb2NrZWQ6IAkApAMBBQNzdHMJAJcKBQUPb3V0QW1vdW50QW1vdW50BQ5vdXRQcmljZUFtb3VudAUNcGF5bWVudEFtb3VudAUOcGF5bWVudEFzc2V0SWQFBXN0YXRlCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAQljb21tb25QdXQJBmNhbGxlcgR0eElkEmFtb3VudEFzc2V0UGF5bWVudBFwcmljZUFzc2V0UGF5bWVudAhzbGlwcGFnZQZlbWl0THAKaXNPbmVBc3NldA1wYXltZW50QW1vdW50CXBheW1lbnRJZAQBcgkBFGVzdGltYXRlUHV0T3BlcmF0aW9uDAUEdHhJZAUIc2xpcHBhZ2UICQEFdmFsdWUBBRJhbW91bnRBc3NldFBheW1lbnQGYW1vdW50CAkBBXZhbHVlAQUSYW1vdW50QXNzZXRQYXltZW50B2Fzc2V0SWQICQEFdmFsdWUBBRFwcmljZUFzc2V0UGF5bWVudAZhbW91bnQICQEFdmFsdWUBBRFwcmljZUFzc2V0UGF5bWVudAdhc3NldElkBQZjYWxsZXIHBQZlbWl0THAFCmlzT25lQXNzZXQFDXBheW1lbnRBbW91bnQFCXBheW1lbnRJZAQDc3RzCQENcGFyc2VJbnRWYWx1ZQEIBQFyAl84AwMDCQEQaXNHbG9iYWxTaHV0ZG93bgAGCQAAAgUDc3RzBQpQb29sUHV0RGlzBgkAAAIFA3N0cwUMUG9vbFNodXRkb3duCQEIdGhyb3dFcnIBCQCsAgICCEJsb2NrZWQ6CQCkAwEFA3N0cwUBcgEHdGFrZUZlZQEGYW1vdW50BANmZWUJAGsDBQZhbW91bnQFC2ZlZVBlcm1pbGxlBQh0aG91c2FuZAkAlAoCCQBlAgUGYW1vdW50BQNmZWUFA2ZlZQEWbWFuYWdlclB1YmxpY0tleU9yVW5pdAAEByRtYXRjaDAJAKIIAQkBE2tleU1hbmFnZXJQdWJsaWNLZXkAAwkAAQIFByRtYXRjaDACBlN0cmluZwQBcwUHJG1hdGNoMAkA2QQBBQFzAwkAAQIFByRtYXRjaDACBFVuaXQFBHVuaXQJAAIBAgtNYXRjaCBlcnJvcgEdcGVuZGluZ01hbmFnZXJQdWJsaWNLZXlPclVuaXQABAckbWF0Y2gwCQCiCAEJARprZXlQZW5kaW5nTWFuYWdlclB1YmxpY0tleQADCQABAgUHJG1hdGNoMAIGU3RyaW5nBAFzBQckbWF0Y2gwCQDZBAEFAXMDCQABAgUHJG1hdGNoMAIEVW5pdAUEdW5pdAkAAgECC01hdGNoIGVycm9yAAJwZAkBCHRocm93RXJyAQIRUGVybWlzc2lvbiBkZW5pZWQBC211c3RNYW5hZ2VyAQFpBAckbWF0Y2gwCQEWbWFuYWdlclB1YmxpY0tleU9yVW5pdAADCQABAgUHJG1hdGNoMAIKQnl0ZVZlY3RvcgQCcGsFByRtYXRjaDADCQAAAggFAWkPY2FsbGVyUHVibGljS2V5BQJwawYFAnBkAwkAAQIFByRtYXRjaDACBFVuaXQDCQAAAggFAWkGY2FsbGVyBQR0aGlzBgUCcGQJAAIBAgtNYXRjaCBlcnJvchUBaQELY29uc3RydWN0b3IBD2ZhY3RvcnlDb250cmFjdAQLY2hlY2tDYWxsZXIJAQttdXN0TWFuYWdlcgEFAWkDCQAAAgULY2hlY2tDYWxsZXIFC2NoZWNrQ2FsbGVyCQDMCAIJAQtTdHJpbmdFbnRyeQIJARFrZXlGYWN0b3J5Q29udGFjdAAFD2ZhY3RvcnlDb250cmFjdAUDbmlsCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAWkBCnNldE1hbmFnZXIBF3BlbmRpbmdNYW5hZ2VyUHVibGljS2V5BAtjaGVja0NhbGxlcgkBC211c3RNYW5hZ2VyAQUBaQMJAAACBQtjaGVja0NhbGxlcgULY2hlY2tDYWxsZXIEFWNoZWNrTWFuYWdlclB1YmxpY0tleQkA2QQBBRdwZW5kaW5nTWFuYWdlclB1YmxpY0tleQMJAAACBRVjaGVja01hbmFnZXJQdWJsaWNLZXkFFWNoZWNrTWFuYWdlclB1YmxpY0tleQkAzAgCCQELU3RyaW5nRW50cnkCCQEaa2V5UGVuZGluZ01hbmFnZXJQdWJsaWNLZXkABRdwZW5kaW5nTWFuYWdlclB1YmxpY0tleQUDbmlsCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAWkBDmNvbmZpcm1NYW5hZ2VyAAQCcG0JAR1wZW5kaW5nTWFuYWdlclB1YmxpY0tleU9yVW5pdAAEBWhhc1BNAwkBCWlzRGVmaW5lZAEFAnBtBgkBCHRocm93RXJyAQISTm8gcGVuZGluZyBtYW5hZ2VyAwkAAAIFBWhhc1BNBQVoYXNQTQQHY2hlY2tQTQMJAAACCAUBaQ9jYWxsZXJQdWJsaWNLZXkJAQV2YWx1ZQEFAnBtBgkBCHRocm93RXJyAQIbWW91IGFyZSBub3QgcGVuZGluZyBtYW5hZ2VyAwkAAAIFB2NoZWNrUE0FB2NoZWNrUE0JAMwIAgkBC1N0cmluZ0VudHJ5AgkBE2tleU1hbmFnZXJQdWJsaWNLZXkACQDYBAEJAQV2YWx1ZQEFAnBtCQDMCAIJAQtEZWxldGVFbnRyeQEJARprZXlQZW5kaW5nTWFuYWdlclB1YmxpY0tleQAFA25pbAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgFpAQNwdXQCCHNsaXBwYWdlCWF1dG9TdGFrZQQHZmFjdENmZwkBEGdldEZhY3RvcnlDb25maWcABA9zdGFraW5nQ29udHJhY3QJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkApggBCQCRAwIFB2ZhY3RDZmcFD2lkeEZhY3RTdGFrQ250cgIWV3Jvbmcgc3Rha2luZyBjb250cmFjdAQQc2xpcHBhZ2VDb250cmFjdAkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCmCAEJAJEDAgUHZmFjdENmZwUQaWR4RmFjdFNsaXBwQ250cgIXV3JvZ24gc2xpcHBhZ2UgY29udHJhY3QEDXNsaXBwYWdlQ2hlY2sDCQBnAgUIc2xpcHBhZ2UAAAYJAQh0aHJvd0VycgECDndyb25nIHNsaXBwYWdlAwkAAAIFDXNsaXBwYWdlQ2hlY2sFDXNsaXBwYWdlQ2hlY2sEDXBheW1lbnRzQ2hlY2sDCQAAAgkAkAMBCAUBaQhwYXltZW50cwACBgkBCHRocm93RXJyAQITMiBwYXltZW50cyBleHBlY3RlZAMJAAACBQ1wYXltZW50c0NoZWNrBQ1wYXltZW50c0NoZWNrBAtlc3RpbWF0ZVB1dAkBCWNvbW1vblB1dAkJAKUIAQgFAWkGY2FsbGVyCQDYBAEIBQFpDXRyYW5zYWN0aW9uSWQJAQ9BdHRhY2hlZFBheW1lbnQCCAkBBXZhbHVlAQkAkQMCCAUBaQhwYXltZW50cwAAB2Fzc2V0SWQICQEFdmFsdWUBCQCRAwIIBQFpCHBheW1lbnRzAAAGYW1vdW50CQCRAwIIBQFpCHBheW1lbnRzAAEFCHNsaXBwYWdlBgcAAAIABAxlbWl0THBBbW91bnQIBQtlc3RpbWF0ZVB1dAJfMgQJbHBBc3NldElkCAULZXN0aW1hdGVQdXQCXzcEBXN0YXRlCAULZXN0aW1hdGVQdXQCXzkECmFtb3VudERpZmYIBQtlc3RpbWF0ZVB1dANfMTAECXByaWNlRGlmZggFC2VzdGltYXRlUHV0A18xMQQIYW1vdW50SWQIBQtlc3RpbWF0ZVB1dANfMTIEB3ByaWNlSWQIBQtlc3RpbWF0ZVB1dANfMTMEAXIJAPwHBAUPZmFjdG9yeUNvbnRyYWN0AgRlbWl0CQDMCAIFDGVtaXRMcEFtb3VudAUDbmlsBQNuaWwDCQAAAgUBcgUBcgQCZWwEByRtYXRjaDAFAXIDCQABAgUHJG1hdGNoMAIHQWRkcmVzcwQGbGVnYWN5BQckbWF0Y2gwCQD8BwQFBmxlZ2FjeQIEZW1pdAkAzAgCBQxlbWl0THBBbW91bnQFA25pbAUDbmlsBQR1bml0AwkAAAIFAmVsBQJlbAQCc2EDCQBmAgUKYW1vdW50RGlmZgAACQD8BwQFEHNsaXBwYWdlQ29udHJhY3QCA3B1dAUDbmlsCQDMCAIJAQ9BdHRhY2hlZFBheW1lbnQCBQhhbW91bnRJZAUKYW1vdW50RGlmZgUDbmlsBQNuaWwDCQAAAgUCc2EFAnNhBAJzcAMJAGYCBQlwcmljZURpZmYAAAkA/AcEBRBzbGlwcGFnZUNvbnRyYWN0AgNwdXQFA25pbAkAzAgCCQEPQXR0YWNoZWRQYXltZW50AgUHcHJpY2VJZAUJcHJpY2VEaWZmBQNuaWwFA25pbAMJAAACBQJzcAUCc3AECWxwVHJhc2ZlcgMFCWF1dG9TdGFrZQQCc3MJAPwHBAUPc3Rha2luZ0NvbnRyYWN0AgVzdGFrZQUDbmlsCQDMCAIJAQ9BdHRhY2hlZFBheW1lbnQCBQlscEFzc2V0SWQFDGVtaXRMcEFtb3VudAUDbmlsAwkAAAIFAnNzBQJzcwUDbmlsCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQDMCAIJAQ5TY3JpcHRUcmFuc2ZlcgMIBQFpBmNhbGxlcgUMZW1pdExwQW1vdW50BQlscEFzc2V0SWQFA25pbAkAzggCBQVzdGF0ZQUJbHBUcmFzZmVyCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAWkBCXB1dE9uZVRrbgUPYW1vdW50QXNzZXRQYXJ0DnByaWNlQXNzZXRQYXJ0BW91dExwCHNsaXBwYWdlCWF1dG9TdGFrZQQDY2ZnCQEQZ2V0RmFjdG9yeUNvbmZpZwAED3N0YWtpbmdDb250cmFjdAkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCmCAEJAJEDAgUDY2ZnBQ9pZHhGYWN0U3Rha0NudHICFldyb25nIHN0YWtpbmcgY29udHJhY3QEEHNsaXBwYWdlQ29udHJhY3QJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkApggBCQCRAwIFA2NmZwUQaWR4RmFjdFNsaXBwQ250cgIXV3Jvbmcgc2xpcHBhZ2UgY29udHJhY3QEEWd3eFJld2FyZENvbnRyYWN0CQETdmFsdWVPckVycm9yTWVzc2FnZQIJAKYIAQkAkQMCBQNjZmcFEWlkeEZhY3RHd3hSZXdDbnRyAhlXcm9uZyBnd3ggcmV3YXJkIGNvbnRyYWN0BAdwb29sQ2ZnCQENZ2V0UG9vbENvbmZpZwAECGFtb3VudElkCQCRAwIFB3Bvb2xDZmcFCWlkeEFtQXNJZAQHcHJpY2VJZAkAkQMCBQdwb29sQ2ZnBQlpZHhQckFzSWQEDmFtb3VudERlY2ltYWxzCQENcGFyc2VJbnRWYWx1ZQEJAJEDAgUHcG9vbENmZwULaWR4QW10QXNEY20EDXByaWNlRGVjaW1hbHMJAQ1wYXJzZUludFZhbHVlAQkAkQMCBQdwb29sQ2ZnBQ1pZHhQcmljZUFzRGNtBAVhZGRvbgkBC3ZhbHVlT3JFbHNlAgkAnQgCBQR0aGlzCQEPa2V5QWRkb25BZGRyZXNzAAIABAt1c2VyQWRkcmVzcwMJAAACBQVhZGRvbgkApQgBCAUBaQZjYWxsZXIIBQFpDG9yaWdpbkNhbGxlcggFAWkGY2FsbGVyAwMDAwkAZwIAAAUIc2xpcHBhZ2UGCQBnAgAABQ9hbW91bnRBc3NldFBhcnQGCQBnAgAABQ5wcmljZUFzc2V0UGFydAYJAGcCAAAFBW91dExwCQEIdGhyb3dFcnIBAgxXcm9uZyBwYXJhbXMDCQECIT0CCQCQAwEIBQFpCHBheW1lbnRzAAEJAQh0aHJvd0VycgECEjEgcGF5bWVudCBleHBlY3RlZAQHcGF5bWVudAkBBXZhbHVlAQkAkQMCCAUBaQhwYXltZW50cwAABA5wYXltZW50QXNzZXRJZAkA2AQBCQEFdmFsdWUBCAUHcGF5bWVudAdhc3NldElkBBBwYXltZW50QW1vdW50UmF3CAUHcGF5bWVudAZhbW91bnQEDSR0MDI2NTY5MjY2MjgJAQd0YWtlRmVlAQUQcGF5bWVudEFtb3VudFJhdwQNcGF5bWVudEFtb3VudAgFDSR0MDI2NTY5MjY2MjgCXzEECWZlZUFtb3VudAgFDSR0MDI2NTY5MjY2MjgCXzIDAwMJAGYCBQ9hbW91bnRBc3NldFBhcnQFDXBheW1lbnRBbW91bnQGCQBmAgUOcHJpY2VBc3NldFBhcnQFDXBheW1lbnRBbW91bnQGCQBmAgCAreIEBQ1wYXltZW50QW1vdW50CQEIdGhyb3dFcnIBAhR3cm9uZyBwYXltZW50IGFtb3VudAQNYW1vdW50QmFsYW5jZQkBDWdldEFjY0JhbGFuY2UBBQhhbW91bnRJZAQMcHJpY2VCYWxhbmNlCQENZ2V0QWNjQmFsYW5jZQEFB3ByaWNlSWQEDSR0MDI2ODkzMjczNDgDCQAAAgUOcGF5bWVudEFzc2V0SWQFCGFtb3VudElkCQCYCgYJAGUCBQ1hbW91bnRCYWxhbmNlBQ1wYXltZW50QW1vdW50BQxwcmljZUJhbGFuY2UJAGUCBQ1wYXltZW50QW1vdW50BQ9hbW91bnRBc3NldFBhcnQFDnByaWNlQXNzZXRQYXJ0AAAAAAMJAAACBQ5wYXltZW50QXNzZXRJZAUHcHJpY2VJZAkAmAoGBQ1hbW91bnRCYWxhbmNlCQBlAgUMcHJpY2VCYWxhbmNlBQ1wYXltZW50QW1vdW50AAAAAAkAZQIFDXBheW1lbnRBbW91bnQFDnByaWNlQXNzZXRQYXJ0BQ9hbW91bnRBc3NldFBhcnQJAQh0aHJvd0VycgECFHdyb25nIHBheW1lbnRBc3NldElkBBBhbW91bnRCYWxhbmNlTm93CAUNJHQwMjY4OTMyNzM0OAJfMQQPcHJpY2VCYWxhbmNlTm93CAUNJHQwMjY4OTMyNzM0OAJfMgQMdmlydFN3YXBJbkFtCAUNJHQwMjY4OTMyNzM0OAJfMwQNdmlydFN3YXBPdXRQcggFDSR0MDI2ODkzMjczNDgCXzQEDHZpcnRTd2FwSW5QcggFDSR0MDI2ODkzMjczNDgCXzUEDXZpcnRTd2FwT3V0QW0IBQ0kdDAyNjg5MzI3MzQ4Al82BAJEMAkA/AcEBRFnd3hSZXdhcmRDb250cmFjdAIFY2FsY0QJAMwIAgkApAMBBRBhbW91bnRCYWxhbmNlTm93CQDMCAIJAKQDAQUPcHJpY2VCYWxhbmNlTm93CQDMCAIFDGFtcGxpZmljYXRvcgkAzAgCBQVBbXVsdAkAzAgCBQVEY29udgUDbmlsBQNuaWwEAkQxCQD8BwQFEWd3eFJld2FyZENvbnRyYWN0AgVjYWxjRAkAzAgCCQCmAwEJALYCAQkAZQIJAGQCBRBhbW91bnRCYWxhbmNlTm93BQx2aXJ0U3dhcEluQW0FDXZpcnRTd2FwT3V0QW0JAMwIAgkApgMBCQC2AgEJAGUCCQBkAgUPcHJpY2VCYWxhbmNlTm93BQx2aXJ0U3dhcEluUHIFDXZpcnRTd2FwT3V0UHIJAMwIAgUMYW1wbGlmaWNhdG9yCQDMCAIFBUFtdWx0CQDMCAIFBURjb252BQNuaWwFA25pbAQGRDB2c0QxCQEJdmFsaWRhdGVEAwkApwMBCQEDc3RyAQUCRDEJAKcDAQkBA3N0cgEFAkQwBQpzbGlwcGFnZTREAwkAAAIFBkQwdnNEMQUGRDB2c0QxBAtlc3RpbWF0ZVB1dAkBCWNvbW1vblB1dAkJAKUIAQgFAWkGY2FsbGVyCQDYBAEIBQFpDXRyYW5zYWN0aW9uSWQJAQ9BdHRhY2hlZFBheW1lbnQCCQDZBAEFCGFtb3VudElkBQ9hbW91bnRBc3NldFBhcnQJAQ9BdHRhY2hlZFBheW1lbnQCCQDZBAEFB3ByaWNlSWQFDnByaWNlQXNzZXRQYXJ0BQhzbGlwcGFnZQYGBQ1wYXltZW50QW1vdW50BQ5wYXltZW50QXNzZXRJZAQKZXN0aW1hdGVMUAgFC2VzdGltYXRlUHV0Al8yBAlscEFzc2V0SWQIBQtlc3RpbWF0ZVB1dAJfNwQFc3RhdGUIBQtlc3RpbWF0ZVB1dAJfOQQKYW1vdW50RGlmZggFC2VzdGltYXRlUHV0A18xMAQJcHJpY2VEaWZmCAULZXN0aW1hdGVQdXQDXzExBAlscENhbGNSZXMJAQ92YWxpZGF0ZUFic0RpZmYDCQC2AgEFCmVzdGltYXRlTFAJALYCAQUFb3V0THAJALYCAQUIc2xpcHBhZ2UEDGVtaXRMcEFtb3VudAkAoAMBCAUJbHBDYWxjUmVzAl8yBAFlCQD8BwQFD2ZhY3RvcnlDb250cmFjdAIEZW1pdAkAzAgCBQxlbWl0THBBbW91bnQFA25pbAUDbmlsAwkAAAIFAWUFAWUEAmVsBAckbWF0Y2gwBQFlAwkAAQIFByRtYXRjaDACB0FkZHJlc3MEBmxlZ2FjeQUHJG1hdGNoMAkA/AcEBQZsZWdhY3kCBGVtaXQJAMwIAgUMZW1pdExwQW1vdW50BQNuaWwFA25pbAUEdW5pdAMJAAACBQJlbAUCZWwEAnNhAwkAZgIFCmFtb3VudERpZmYAAAkA/AcEBRBzbGlwcGFnZUNvbnRyYWN0AgNwdXQFA25pbAkAzAgCCQEPQXR0YWNoZWRQYXltZW50AgkA2QQBBQhhbW91bnRJZAUKYW1vdW50RGlmZgUDbmlsBQNuaWwDCQAAAgUCc2EFAnNhBAJzcAMJAGYCBQlwcmljZURpZmYAAAkA/AcEBRBzbGlwcGFnZUNvbnRyYWN0AgNwdXQFA25pbAkAzAgCCQEPQXR0YWNoZWRQYXltZW50AgkA2QQBBQdwcmljZUlkBQlwcmljZURpZmYFA25pbAUDbmlsAwkAAAIFAnNwBQJzcAQJbHBUcmFzZmVyAwUJYXV0b1N0YWtlBAJzcwkA/AcEBQ9zdGFraW5nQ29udHJhY3QCBXN0YWtlBQNuaWwJAMwIAgkBD0F0dGFjaGVkUGF5bWVudAIFCWxwQXNzZXRJZAUMZW1pdExwQW1vdW50BQNuaWwDCQAAAgUCc3MFAnNzBQNuaWwJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAMwIAgkBDlNjcmlwdFRyYW5zZmVyAwgFAWkGY2FsbGVyBQxlbWl0THBBbW91bnQFCWxwQXNzZXRJZAUDbmlsBBBzZW5kRmVlVG9NYXRjaGVyAwkAZgIFCWZlZUFtb3VudAAACQDMCAIJAQ5TY3JpcHRUcmFuc2ZlcgMFDm1hdGNoZXJBZGRyZXNzBQlmZWVBbW91bnQJANkEAQUOcGF5bWVudEFzc2V0SWQFA25pbAUDbmlsCQDOCAIJAM4IAgUFc3RhdGUFCWxwVHJhc2ZlcgUQc2VuZEZlZVRvTWF0Y2hlcgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgFpAQpwdXRGb3JGcmVlAQttYXhzbGlwcGFnZQMJAGYCAAAFC21heHNsaXBwYWdlCQEIdGhyb3dFcnIBAg53cm9uZyBzbGlwcGFnZQMJAQIhPQIJAJADAQgFAWkIcGF5bWVudHMAAgkBCHRocm93RXJyAQITMiBwYXltZW50cyBleHBlY3RlZAQLZXN0aW1hdGVQdXQJAQljb21tb25QdXQJCQClCAEIBQFpBmNhbGxlcgkA2AQBCAUBaQ10cmFuc2FjdGlvbklkCQEPQXR0YWNoZWRQYXltZW50AggJAQV2YWx1ZQEJAJEDAggFAWkIcGF5bWVudHMAAAdhc3NldElkCAkBBXZhbHVlAQkAkQMCCAUBaQhwYXltZW50cwAABmFtb3VudAkAkQMCCAUBaQhwYXltZW50cwABBQttYXhzbGlwcGFnZQcHAAACAAgFC2VzdGltYXRlUHV0Al85AWkBA2dldAAEAXIJAQljb21tb25HZXQBBQFpBAlvdXRBbXRBbXQIBQFyAl8xBA5vdXRQcmljZUFtb3VudAgFAXICXzIEDXBheW1lbnRBbW91bnQIBQFyAl8zBA5wYXltZW50QXNzZXRJZAgFAXICXzQEBXN0YXRlCAUBcgJfNQQBYgkA/AcEBQ9mYWN0b3J5Q29udHJhY3QCBGJ1cm4JAMwIAgUNcGF5bWVudEFtb3VudAUDbmlsCQDMCAIJAQ9BdHRhY2hlZFBheW1lbnQCBQ5wYXltZW50QXNzZXRJZAUNcGF5bWVudEFtb3VudAUDbmlsAwkAAAIFAWIFAWIFBXN0YXRlCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAWkBCWdldE9uZVRrbgUKZXhjaFJlc3VsdAdub3RVc2VkCW91dEFtb3VudApvdXRBc3NldElkCHNsaXBwYWdlAwkBAiE9AgkAkAMBCAUBaQhwYXltZW50cwABCQEIdGhyb3dFcnIBAhIxIHBheW1lbnQgZXhwZWN0ZWQEA2NmZwkBDWdldFBvb2xDb25maWcABAlscEFzc2V0SWQJAJEDAgUDY2ZnBQlpZHhMUEFzSWQECGFtb3VudElkCQCRAwIFA2NmZwUJaWR4QW1Bc0lkBAdwcmljZUlkCQCRAwIFA2NmZwUJaWR4UHJBc0lkBA5hbW91bnREZWNpbWFscwkBDXBhcnNlSW50VmFsdWUBCQCRAwIFA2NmZwULaWR4QW10QXNEY20EDXByaWNlRGVjaW1hbHMJAQ1wYXJzZUludFZhbHVlAQkAkQMCBQNjZmcFDWlkeFByaWNlQXNEY20EA3N0cwkAkQMCBQNjZmcFCWlkeFBvb2xTdAQHZmFjdENmZwkBEGdldEZhY3RvcnlDb25maWcABBFnd3hSZXdhcmRDb250cmFjdAkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCmCAEJAJEDAgUHZmFjdENmZwURaWR4RmFjdEd3eFJld0NudHICH1dyb25nIGd3eFJld2FyZENvbnRyYWN0IGFkZHJlc3MEB3BheW1lbnQJAQV2YWx1ZQEJAJEDAggFAWkIcGF5bWVudHMAAAQFYWRkb24JAQt2YWx1ZU9yRWxzZQIJAJ0IAgUEdGhpcwkBD2tleUFkZG9uQWRkcmVzcwACAAQLdXNlckFkZHJlc3MDCQAAAgUFYWRkb24JAKUIAQgFAWkGY2FsbGVyCAUBaQxvcmlnaW5DYWxsZXIIBQFpBmNhbGxlcgQGdHhJZDU4CQDYBAEIBQFpDXRyYW5zYWN0aW9uSWQEDnBheW1lbnRBc3NldElkCQEFdmFsdWUBCAUHcGF5bWVudAdhc3NldElkBA1wYXltZW50QW1vdW50CAUHcGF5bWVudAZhbW91bnQDCQBmAgCAlOvcAwUNcGF5bWVudEFtb3VudAkBCHRocm93RXJyAQIRTWluIHBheW1lbnQgMTAgTFADAwMJAGYCAAAFCHNsaXBwYWdlBgkAZgIAAAUKZXhjaFJlc3VsdAYJAGYCAAAFCW91dEFtb3VudAkBCHRocm93RXJyAQIMV3JvbmcgcGFyYW1zAwkBAiE9AgUJbHBBc3NldElkCQDYBAEFDnBheW1lbnRBc3NldElkCQEIdGhyb3dFcnIBAghXcm9uZyBMUAQBcgkBFGVzdGltYXRlR2V0T3BlcmF0aW9uBAkA2AQBCAUBaQ10cmFuc2FjdGlvbklkCQDYBAEFDnBheW1lbnRBc3NldElkBQ1wYXltZW50QW1vdW50CAUBaQZjYWxsZXIECmVzdGltQW1BbXQIBQFyAl8xBAplc3RpbVByQW10CAUBcgJfMgQNYW1vdW50QmFsYW5jZQkBDWdldEFjY0JhbGFuY2UBBQhhbW91bnRJZAQMcHJpY2VCYWxhbmNlCQENZ2V0QWNjQmFsYW5jZQEFB3ByaWNlSWQEDSR0MDMyNDk2MzI5NjQDCQAAAgUKb3V0QXNzZXRJZAUIYW1vdW50SWQJAJkKBwkAZQIFDWFtb3VudEJhbGFuY2UFCmVzdGltQW1BbXQJAGUCBQxwcmljZUJhbGFuY2UFCmVzdGltUHJBbXQFCmV4Y2hSZXN1bHQFCmVzdGltUHJBbXQAAAAACQBkAgUKZXN0aW1BbUFtdAUKZXhjaFJlc3VsdAMJAAACBQpvdXRBc3NldElkBQdwcmljZUlkCQCZCgcJAGUCBQ1hbW91bnRCYWxhbmNlBQplc3RpbUFtQW10CQBlAgUMcHJpY2VCYWxhbmNlBQplc3RpbVByQW10AAAAAAUKZXhjaFJlc3VsdAUKZXN0aW1BbUFtdAkAZAIFCmVzdGltUHJBbXQFCmV4Y2hSZXN1bHQJAQh0aHJvd0VycgECEHdyb25nIG91dEFzc2V0SWQEEGFtb3VudEJhbGFuY2VOb3cIBQ0kdDAzMjQ5NjMyOTY0Al8xBA9wcmljZUJhbGFuY2VOb3cIBQ0kdDAzMjQ5NjMyOTY0Al8yBAx2aXJ0U3dhcEluQW0IBQ0kdDAzMjQ5NjMyOTY0Al8zBA12aXJ0U3dhcE91dFByCAUNJHQwMzI0OTYzMjk2NAJfNAQMdmlydFN3YXBJblByCAUNJHQwMzI0OTYzMjk2NAJfNQQNdmlydFN3YXBPdXRBbQgFDSR0MDMyNDk2MzI5NjQCXzYECHRvdGFsR2V0CAUNJHQwMzI0OTYzMjk2NAJfNwMDCQBmAgAABQx2aXJ0U3dhcEluQW0GCQBmAgAABQx2aXJ0U3dhcEluUHIJAQh0aHJvd0VycgECCldyb25nIGNhbGMEAkQwCQD8BwQFEWd3eFJld2FyZENvbnRyYWN0AgVjYWxjRAkAzAgCCQCkAwEFEGFtb3VudEJhbGFuY2VOb3cJAMwIAgkApAMBBQ9wcmljZUJhbGFuY2VOb3cJAMwIAgUMYW1wbGlmaWNhdG9yCQDMCAIFBUFtdWx0CQDMCAIFBURjb252BQNuaWwFA25pbAQCRDEJAPwHBAURZ3d4UmV3YXJkQ29udHJhY3QCBWNhbGNECQDMCAIJAKQDAQkAZAIJAGUCBRBhbW91bnRCYWxhbmNlTm93BQx2aXJ0U3dhcEluQW0FDXZpcnRTd2FwT3V0QW0JAMwIAgkApAMBCQBlAgkAZAIFD3ByaWNlQmFsYW5jZU5vdwUNdmlydFN3YXBPdXRQcgUMdmlydFN3YXBJblByCQDMCAIFDGFtcGxpZmljYXRvcgkAzAgCBQVBbXVsdAkAzAgCBQVEY29udgUDbmlsBQNuaWwEBkQwdnNEMQkBCXZhbGlkYXRlRAMJAKcDAQkBA3N0cgEFAkQxCQCnAwEJAQNzdHIBBQJEMAUKc2xpcHBhZ2U0RAMJAAACBQZEMHZzRDEFBkQwdnNEMQQIZmluYWxSZXMJAQ92YWxpZGF0ZUFic0RpZmYDCQC2AgEFCHRvdGFsR2V0CQC2AgEFCW91dEFtb3VudAkAtgIBBQhzbGlwcGFnZQMJAAACBQhmaW5hbFJlcwUIZmluYWxSZXMEDSR0MDMzNjMzMzM3NDEDCQAAAgUKb3V0QXNzZXRJZAUIYW1vdW50SWQJAJQKAgkAoAMBCAUIZmluYWxSZXMCXzIAAAkAlAoCAAAJAKADAQgFCGZpbmFsUmVzAl8yBAVvdXRBbQgFDSR0MDMzNjMzMzM3NDECXzEEBW91dFByCAUNJHQwMzM2MzMzMzc0MQJfMgQOdG90YWxBbW91bnRSYXcJAGQCBQVvdXRBbQUFb3V0UHIEDSR0MDMzNzgxMzM4MzYJAQd0YWtlRmVlAQUOdG90YWxBbW91bnRSYXcEC3RvdGFsQW1vdW50CAUNJHQwMzM3ODEzMzgzNgJfMQQJZmVlQW1vdW50CAUNJHQwMzM3ODEzMzgzNgJfMgQRb3V0QXNzZXRJZE9yV2F2ZXMDCQAAAgUKb3V0QXNzZXRJZAIFV0FWRVMFBHVuaXQJANkEAQUKb3V0QXNzZXRJZAQQc2VuZEZlZVRvTWF0Y2hlcgMJAGYCBQlmZWVBbW91bnQAAAkAzAgCCQEOU2NyaXB0VHJhbnNmZXIDBQ5tYXRjaGVyQWRkcmVzcwUJZmVlQW1vdW50BRFvdXRBc3NldElkT3JXYXZlcwUDbmlsBQNuaWwECGRlY2ltYWxzAwkAZwIFDmFtb3VudERlY2ltYWxzBQ1wcmljZURlY2ltYWxzBQ5hbW91bnREZWNpbWFscwUNcHJpY2VEZWNpbWFscwMJAAACBQhkZWNpbWFscwUIZGVjaW1hbHMECGN1clByWDE4CQEPY2FsY1ByaWNlQmlnSW50AgkBBXRvWDE4AgUMcHJpY2VCYWxhbmNlBQhkZWNpbWFscwkBBXRvWDE4AgUNYW1vdW50QmFsYW5jZQUIZGVjaW1hbHMEBWN1clByCQEHZnJvbVgxOAIFCGN1clByWDE4BQZzY2FsZTgEBXN0YXRlCQDMCAIJAQ5TY3JpcHRUcmFuc2ZlcgMFC3VzZXJBZGRyZXNzBQt0b3RhbEFtb3VudAURb3V0QXNzZXRJZE9yV2F2ZXMJAMwIAgkBC1N0cmluZ0VudHJ5AgkBEmtleUdldEFjdGlvbkJ5VXNlcgIJAKUIAQULdXNlckFkZHJlc3MFBnR4SWQ1OAkBEWRhdGFHZXRBY3Rpb25JbmZvBgUFb3V0QW0FBW91dFByBQ1wYXltZW50QW1vdW50BQVjdXJQcgUGaGVpZ2h0CAUJbGFzdEJsb2NrCXRpbWVzdGFtcAkAzAgCCQEMSW50ZWdlckVudHJ5AgkBDGtleVByaWNlTGFzdAAFBWN1clByCQDMCAIJAQxJbnRlZ2VyRW50cnkCCQEPa2V5UHJpY2VIaXN0b3J5AgUGaGVpZ2h0CAUJbGFzdEJsb2NrCXRpbWVzdGFtcAUFY3VyUHIFA25pbAMJAAACBQVzdGF0ZQUFc3RhdGUEBGJ1cm4JAPwHBAUPZmFjdG9yeUNvbnRyYWN0AgRidXJuCQDMCAIFDXBheW1lbnRBbW91bnQFA25pbAkAzAgCCQEPQXR0YWNoZWRQYXltZW50AgUOcGF5bWVudEFzc2V0SWQFDXBheW1lbnRBbW91bnQFA25pbAMJAAACBQRidXJuBQRidXJuCQDOCAIFBXN0YXRlBRBzZW5kRmVlVG9NYXRjaGVyCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAWkBCWdldE5vTGVzcwISbm9MZXNzVGhlbkFtdEFzc2V0FG5vTGVzc1RoZW5QcmljZUFzc2V0BAFyCQEJY29tbW9uR2V0AQUBaQQPb3V0QW1vdW50QW1vdW50CAUBcgJfMQQOb3V0UHJpY2VBbW91bnQIBQFyAl8yBA1wYXltZW50QW1vdW50CAUBcgJfMwQOcGF5bWVudEFzc2V0SWQIBQFyAl80BAVzdGF0ZQgFAXICXzUEFGNoZWNrT3V0QW1vdW50QW1vdW50AwkAZwIFD291dEFtb3VudEFtb3VudAUSbm9MZXNzVGhlbkFtdEFzc2V0BgkBCHRocm93RXJyAQkArAICCQCsAgIJAKwCAgIJRmFpbGVkOiAgCQCkAwEFD291dEFtb3VudEFtb3VudAIDIDwgCQCkAwEFEm5vTGVzc1RoZW5BbXRBc3NldAMJAAACBRRjaGVja091dEFtb3VudEFtb3VudAUUY2hlY2tPdXRBbW91bnRBbW91bnQEE2NoZWNrT3V0UHJpY2VBbW91bnQDCQBnAgUOb3V0UHJpY2VBbW91bnQFFG5vTGVzc1RoZW5QcmljZUFzc2V0BgkBCHRocm93RXJyAQkArAICCQCsAgIJAKwCAgIIRmFpbGVkOiAJAKQDAQUOb3V0UHJpY2VBbW91bnQCAyA8IAkApAMBBRRub0xlc3NUaGVuUHJpY2VBc3NldAMJAAACBRNjaGVja091dFByaWNlQW1vdW50BRNjaGVja091dFByaWNlQW1vdW50BBRidXJuTFBBc3NldE9uRmFjdG9yeQkA/AcEBQ9mYWN0b3J5Q29udHJhY3QCBGJ1cm4JAMwIAgUNcGF5bWVudEFtb3VudAUDbmlsCQDMCAIJAQ9BdHRhY2hlZFBheW1lbnQCBQ5wYXltZW50QXNzZXRJZAUNcGF5bWVudEFtb3VudAUDbmlsAwkAAAIFFGJ1cm5MUEFzc2V0T25GYWN0b3J5BRRidXJuTFBBc3NldE9uRmFjdG9yeQUFc3RhdGUJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BaQENdW5zdGFrZUFuZEdldAEGYW1vdW50BA1jaGVja1BheW1lbnRzAwkBAiE9AgkAkAMBCAUBaQhwYXltZW50cwAACQEIdGhyb3dFcnIBAhRubyBwYXltZW50cyBleHBlY3RlZAYDCQAAAgUNY2hlY2tQYXltZW50cwUNY2hlY2tQYXltZW50cwQDY2ZnCQENZ2V0UG9vbENvbmZpZwAECmZhY3RvcnlDZmcJARBnZXRGYWN0b3J5Q29uZmlnAAQJbHBBc3NldElkCQDZBAEJAJEDAgUDY2ZnBQlpZHhMUEFzSWQEB3N0YWtpbmcJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkApggBCQCRAwIFCmZhY3RvcnlDZmcFD2lkeEZhY3RTdGFrQ250cgIFd3JvbmcECnVuc3Rha2VJbnYJAPwHBAUHc3Rha2luZwIHdW5zdGFrZQkAzAgCCQDYBAEFCWxwQXNzZXRJZAkAzAgCBQZhbW91bnQFA25pbAUDbmlsAwkAAAIFCnVuc3Rha2VJbnYFCnVuc3Rha2VJbnYEAXIJARRlc3RpbWF0ZUdldE9wZXJhdGlvbgQJANgEAQgFAWkNdHJhbnNhY3Rpb25JZAkA2AQBBQlscEFzc2V0SWQFBmFtb3VudAgFAWkGY2FsbGVyBANzdHMJAQ1wYXJzZUludFZhbHVlAQgFAXICXzkEBXN0YXRlCAUBcgNfMTAEAXYDAwkBEGlzR2xvYmFsU2h1dGRvd24ABgkAAAIFA3N0cwUMUG9vbFNodXRkb3duCQEIdGhyb3dFcnIBCQCsAgICCUJsb2NrZWQ6IAkApAMBBQNzdHMGAwkAAAIFAXYFAXYEBWJ1cm5BCQD8BwQFD2ZhY3RvcnlDb250cmFjdAIEYnVybgkAzAgCBQZhbW91bnQFA25pbAkAzAgCCQEPQXR0YWNoZWRQYXltZW50AgUJbHBBc3NldElkBQZhbW91bnQFA25pbAMJAAACBQVidXJuQQUFYnVybkEFBXN0YXRlCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAWkBCGFjdGl2YXRlAghhbXRBc1N0cgdwckFzU3RyAwkBAiE9AgkApQgBCAUBaQZjYWxsZXIJAKUIAQUPZmFjdG9yeUNvbnRyYWN0CQEIdGhyb3dFcnIBAgZkZW5pZWQJAJQKAgkAzAgCCQELU3RyaW5nRW50cnkCCQEOa2V5QW1vdW50QXNzZXQABQhhbXRBc1N0cgkAzAgCCQELU3RyaW5nRW50cnkCCQENa2V5UHJpY2VBc3NldAAFB3ByQXNTdHIFA25pbAIHc3VjY2VzcwFpAQRzZXRTAgFrAXYDCQECIT0CCQClCAEIBQFpBmNhbGxlcgkBD2dldFN0cmluZ09yRmFpbAIFBHRoaXMJAQ9rZXlBZGRvbkFkZHJlc3MABQJwZAkAzAgCCQELU3RyaW5nRW50cnkCBQFrBQF2BQNuaWwBaQEEc2V0SQIBawF2AwkBAiE9AgkApQgBCAUBaQZjYWxsZXIJAQ9nZXRTdHJpbmdPckZhaWwCBQR0aGlzCQEPa2V5QWRkb25BZGRyZXNzAAUCcGQJAMwIAgkBDEludGVnZXJFbnRyeQIFAWsFAXYFA25pbAFpARxnZXRQb29sQ29uZmlnV3JhcHBlclJFQURPTkxZAAkAlAoCBQNuaWwJAQ1nZXRQb29sQ29uZmlnAAFpARxnZXRBY2NCYWxhbmNlV3JhcHBlclJFQURPTkxZAQdhc3NldElkCQCUCgIFA25pbAkBDWdldEFjY0JhbGFuY2UBBQdhc3NldElkAWkBGWNhbGNQcmljZXNXcmFwcGVyUkVBRE9OTFkDBWFtQW10BXByQW10BWxwQW10BAJwcgkBCmNhbGNQcmljZXMDBQVhbUFtdAUFcHJBbXQFBWxwQW10CQCUCgIFA25pbAkAzAgCCQCmAwEJAJEDAgUCcHIAAAkAzAgCCQCmAwEJAJEDAgUCcHIAAQkAzAgCCQCmAwEJAJEDAgUCcHIAAgUDbmlsAWkBFmZyb21YMThXcmFwcGVyUkVBRE9OTFkCA3ZhbAxyZXNTY2FsZU11bHQJAJQKAgUDbmlsCQEHZnJvbVgxOAIJAKcDAQUDdmFsBQxyZXNTY2FsZU11bHQBaQEUdG9YMThXcmFwcGVyUkVBRE9OTFkCB29yaWdWYWwNb3JpZ1NjYWxlTXVsdAkAlAoCBQNuaWwJAKYDAQkBBXRvWDE4AgUHb3JpZ1ZhbAUNb3JpZ1NjYWxlTXVsdAFpAR5jYWxjUHJpY2VCaWdJbnRXcmFwcGVyUkVBRE9OTFkCCHByQW10WDE4CGFtQW10WDE4CQCUCgIFA25pbAkApgMBCQEPY2FsY1ByaWNlQmlnSW50AgkApwMBBQhwckFtdFgxOAkApwMBBQhhbUFtdFgxOAFpASNlc3RpbWF0ZVB1dE9wZXJhdGlvbldyYXBwZXJSRUFET05MWQkGdHhJZDU4CHNsaXBwYWdlE2luQW1vdW50QXNzZXRBbW91bnQGaW5BbUlkEmluUHJpY2VBc3NldEFtb3VudAZpblBySWQHdXNyQWRkcgppc0V2YWx1YXRlBmVtaXRMcAkAlAoCBQNuaWwJARRlc3RpbWF0ZVB1dE9wZXJhdGlvbgwFBnR4SWQ1OAUIc2xpcHBhZ2UFE2luQW1vdW50QXNzZXRBbW91bnQFBmluQW1JZAUSaW5QcmljZUFzc2V0QW1vdW50BQZpblBySWQFB3VzckFkZHIFCmlzRXZhbHVhdGUFBmVtaXRMcAcAAAIAAWkBI2VzdGltYXRlR2V0T3BlcmF0aW9uV3JhcHBlclJFQURPTkxZBAZ0eElkNTgLcGF5bWVudEFzSWQPcGF5bWVudExwQW1vdW50B3VzckFkZHIEAXIJARRlc3RpbWF0ZUdldE9wZXJhdGlvbgQFBnR4SWQ1OAULcGF5bWVudEFzSWQFD3BheW1lbnRMcEFtb3VudAkBEUBleHRyTmF0aXZlKDEwNjIpAQUHdXNyQWRkcgkAlAoCBQNuaWwJAJwKCggFAXICXzEIBQFyAl8yCAUBcgJfMwgFAXICXzQIBQFyAl81CAUBcgJfNggFAXICXzcJAKYDAQgFAXICXzgIBQFyAl85CAUBcgNfMTABAnR4AQZ2ZXJpZnkABAckbWF0Y2gwBQJ0eAMJAAECBQckbWF0Y2gwAgVPcmRlcgQFb3JkZXIFByRtYXRjaDAEB210Y2hQdWIJARNnZXRNYXRjaGVyUHViT3JGYWlsAAQDb3JWCQEbdmFsaWRhdGVNYXRjaGVyT3JkZXJBbGxvd2VkAQUFb3JkZXIEBXNuZHJWCQD0AwMIBQVvcmRlcglib2R5Qnl0ZXMJAJEDAggFBW9yZGVyBnByb29mcwAACAUFb3JkZXIPc2VuZGVyUHVibGljS2V5BAVtdGNoVgkA9AMDCAUFb3JkZXIJYm9keUJ5dGVzCQCRAwIIBQVvcmRlcgZwcm9vZnMAAQUHbXRjaFB1YgMDAwUDb3JWBQVzbmRyVgcFBW10Y2hWBwYJAQ90aHJvd09yZGVyRXJyb3IDBQNvclYFBXNuZHJWBQVtdGNoVgQPdGFyZ2V0UHVibGljS2V5BAckbWF0Y2gxCQEWbWFuYWdlclB1YmxpY0tleU9yVW5pdAADCQABAgUHJG1hdGNoMQIKQnl0ZVZlY3RvcgQCcGsFByRtYXRjaDEFAnBrAwkAAQIFByRtYXRjaDECBFVuaXQIBQJ0eA9zZW5kZXJQdWJsaWNLZXkJAAIBAgtNYXRjaCBlcnJvcgkA9AMDCAUCdHgJYm9keUJ5dGVzCQCRAwIIBQJ0eAZwcm9vZnMAAAUPdGFyZ2V0UHVibGljS2V5/Xi9zQ==", "height": 2207153, "applicationStatus": "succeeded", "spentComplexity": 0 } View: original | compacted Prev: 2ZcMt7cwgMM14AL65mfXEuTRnvj4PrjaLMXSMNDHKsiM Next: 2Lc1wWf4hy28zpcw5cBeTbcRpque7QZedQtNjUsgS1Ni Diff:
OldNewDifferences
11 {-# STDLIB_VERSION 6 #-}
22 {-# SCRIPT_TYPE ACCOUNT #-}
33 {-# CONTENT_TYPE DAPP #-}
4+let defaultDecimals = 1000000
5+
46 let scale8 = 100000000
57
68 let scale8BigInt = toBigInt(100000000)
5759
5860 let feePermilleDefault = 0
5961
60-func t1 (origVal,origScaleMult) = fraction(toBigInt(origVal), scale18, toBigInt(origScaleMult))
62+func toX18 (origVal,origScaleMult) = fraction(toBigInt(origVal), scale18, toBigInt(origScaleMult))
6163
6264
63-func f1 (val,resultScaleMult) = toInt(fraction(val, toBigInt(resultScaleMult), scale18))
65+func fromX18 (val,resultScaleMult) = toInt(fraction(val, toBigInt(resultScaleMult), scale18))
6466
6567
6668 func ts (amt,resScale,curScale) = fraction(amt, resScale, curScale)
7173 else val
7274
7375
74-func fc () = "%s__factoryContract"
76+func keyFactoryContact () = "%s__factoryContract"
7577
7678
77-func mpk () = "%s__managerPublicKey"
79+func keyManagerPublicKey () = "%s__managerPublicKey"
7880
7981
80-func pmpk () = "%s__pendingManagerPublicKey"
82+func keyPendingManagerPublicKey () = "%s__pendingManagerPublicKey"
8183
8284
83-func pl () = "%s%s__price__last"
85+func keyPriceLast () = "%s%s__price__last"
8486
8587
86-func ph (h,t) = makeString(["%s%s%d%d__price__history", toString(h), toString(t)], SEP)
88+func keyPriceHistory (h,t) = makeString(["%s%s%d%d__price__history", toString(h), toString(t)], SEP)
8789
8890
89-func pau (ua,txId) = ((("%s%s%s__P__" + ua) + "__") + txId)
91+func keyPutActionByUser (ua,txId) = ((("%s%s%s__P__" + ua) + "__") + txId)
9092
9193
92-func gau (ua,txId) = ((("%s%s%s__G__" + ua) + "__") + txId)
94+func keyGetActionByUser (ua,txId) = ((("%s%s%s__G__" + ua) + "__") + txId)
9395
9496
95-func aa () = "%s__amountAsset"
97+func keyAmountAsset () = "%s__amountAsset"
9698
9799
98-func pa () = "%s__priceAsset"
100+func keyPriceAsset () = "%s__priceAsset"
99101
100102
101-func amp () = "%s__amp"
103+func keyAmplificator () = "%s__amp"
102104
103105
104-func ada () = "%s__addonAddr"
106+func keyAddonAddress () = "%s__addonAddr"
105107
106108
107109 let keyFeePermille = "%s__feePermille"
108110
109111 let feePermille = valueOrElse(getInteger(this, keyFeePermille), feePermilleDefault)
110112
111-func fcfg () = "%s__factoryConfig"
113+func keyFactoryConfig () = "%s__factoryConfig"
112114
113115
114-func mtpk () = "%s%s__matcher__publicKey"
116+func keyMatcherPub () = "%s%s__matcher__publicKey"
115117
116118
117-func pc (iAmtAs,iPrAs) = (((("%d%d%s__" + iAmtAs) + "__") + iPrAs) + "__config")
119+func keyPoolConfig (iAmtAs,iPrAs) = (((("%d%d%s__" + iAmtAs) + "__") + iPrAs) + "__config")
118120
119121
120-func mba (bAStr) = ("%s%s%s__mappings__baseAsset2internalId__" + bAStr)
122+func keyMappingsBaseAsset2internalId (bAStr) = ("%s%s%s__mappings__baseAsset2internalId__" + bAStr)
121123
122124
123-func aps () = "%s__shutdown"
125+func keyAllPoolsShutdown () = "%s__shutdown"
124126
125127
126-func keyAllowedLpStableScriptHash () = "%s__allowedLpStableScriptHash"
128+func throwErr (msg) = throw(makeString(["lp_stable.ride:", msg], " "))
127129
128130
129-func toe (orV,sendrV,matchV) = throw(((((("Failed: ordValid=" + toString(orV)) + " sndrValid=") + toString(sendrV)) + " mtchrValid=") + toString(matchV)))
131+func throwOrderError (orV,sendrV,matchV) = throwErr(((((("Failed: ordValid=" + toString(orV)) + " sndrValid=") + toString(sendrV)) + " mtchrValid=") + toString(matchV)))
130132
131133
132134 func str (val) = match val {
133135 case valStr: String =>
134136 valStr
135137 case _ =>
136- throw("fail cast to String")
138+ throwErr("fail cast to String")
137139 }
138140
139141
140-func strf (addr,key) = valueOrErrorMessage(getString(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
142+func getStringOrFail (addr,key) = valueOrErrorMessage(getString(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
141143
142144
143-func intf (addr,key) = valueOrErrorMessage(getInteger(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
145+func getIntOrFail (addr,key) = valueOrErrorMessage(getInteger(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
144146
145147
146-let fca = addressFromStringValue(strf(this, fc()))
148+let factoryContract = addressFromStringValue(getStringOrFail(this, keyFactoryContact()))
147149
148-let A = strf(this, amp())
150+let amplificator = getStringOrFail(this, keyAmplificator())
149151
150-func igs () = valueOrElse(getBoolean(fca, aps()), false)
152+func isGlobalShutdown () = valueOrElse(getBoolean(factoryContract, keyAllPoolsShutdown()), false)
151153
152154
153-func mp () = fromBase58String(strf(fca, mtpk()))
155+func getMatcherPubOrFail () = fromBase58String(getStringOrFail(factoryContract, keyMatcherPub()))
154156
155157
156-let matcherAddress = addressFromPublicKey(mp())
158+let matcherAddress = addressFromPublicKey(getMatcherPubOrFail())
157159
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)
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)
164166 }
165167
166168
167-func gfc () = split(strf(fca, fcfg()), SEP)
169+func getFactoryConfig () = split(getStringOrFail(factoryContract, keyFactoryConfig()), SEP)
168170
169171
170172 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)
178180 else assetBalance(this, fromBase58String(assetId))
179181
180182
181-func cpbi (prAmtX18,amAmtX18) = fraction(prAmtX18, scale18, amAmtX18)
183+func calcPriceBigInt (prAmtX18,amAmtX18) = fraction(prAmtX18, scale18, amAmtX18)
182184
183185
184-func vad (A1,A2,slippage) = {
185- let diff = fraction((A1 - A2), scale8BigInt, A2)
186+func validateAbsDiff (estimateLP,outLp,slippage) = {
187+ let diff = fraction((estimateLP - outLp), scale8BigInt, outLp)
186188 let pass = ((slippage - abs(diff)) > zeroBigInt)
187189 if (!(pass))
188- then throw(("Big slpg: " + toString(diff)))
189- else $Tuple2(pass, min([A1, A2]))
190+ then throwErr(("Big slippage: " + toString(diff)))
191+ else $Tuple2(pass, min([estimateLP, outLp]))
190192 }
191193
192194
193-func vd (D1,D0,slpg) = {
195+func validateD (D1,D0,slippage) = {
194196 let diff = fraction(D0, scale8BigInt, D1)
195- let fail = (slpg > diff)
197+ let fail = (slippage > diff)
196198 if (if (fail)
197199 then true
198200 else (D0 > D1))
199- then throw(((((((toString(D0) + " ") + toString(D1)) + " ") + toString(diff)) + " ") + toString(slpg)))
201+ then throwErr(((((((toString(D0) + " ") + toString(D1)) + " ") + toString(diff)) + " ") + toString(slippage)))
200202 else fail
201203 }
202204
203205
204-func pcp (amAssetDcm,prAssetDcm,amAmt,prAmt) = {
205- let amtAsAmtX18 = t1(amAmt, amAssetDcm)
206- let prAsAmtX18 = t1(prAmt, prAssetDcm)
207- cpbi(prAsAmtX18, amtAsAmtX18)
206+func privateCalcPrice (amAssetDcm,prAssetDcm,amAmt,prAmt) = {
207+ let amtAsAmtX18 = toX18(amAmt, amAssetDcm)
208+ let prAsAmtX18 = toX18(prAmt, prAssetDcm)
209+ calcPriceBigInt(prAsAmtX18, amtAsAmtX18)
208210 }
209211
210212
211213 func calcPrices (amAmt,prAmt,lpAmt) = {
212- let cfg = gpc()
214+ let cfg = getPoolConfig()
213215 let amtAsDcm = parseIntValue(cfg[idxAmtAsDcm])
214216 let prAsDcm = parseIntValue(cfg[idxPriceAsDcm])
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)
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)
221223 [priceX18, lpPrInAmAsX18, lpPrInPrAsX18]
222224 }
223225
224226
225227 func calculatePrices (amAmt,prAmt,lpAmt) = {
226228 let p = calcPrices(amAmt, prAmt, lpAmt)
227-[f1(p[0], scale8), f1(p[1], scale8), f1(p[2], scale8)]
229+[fromX18(p[0], scale8), fromX18(p[1], scale8), fromX18(p[2], scale8)]
228230 }
229231
230232
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])
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])
238240 let sts = cfg[idxPoolSt]
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 amBalanceX18 = t1(amBalance, amDcm)
245- let prBalance = getAccBalance(prId)
246- let prBalanceX18 = t1(prBalance, prDcm)
247- let curPriceX18 = cpbi(prBalanceX18, amBalanceX18)
248- let curPrice = f1(curPriceX18, scale8)
249- let pmtLpAmtX18 = t1(pmtLpAmt, scale8)
250- let lpEmissX18 = t1(lpEmiss, scale8)
251- let outAmAmtX18 = fraction(amBalanceX18, pmtLpAmtX18, lpEmissX18)
252- let outPrAmtX18 = fraction(prBalanceX18, pmtLpAmtX18, lpEmissX18)
253- let outAmAmt = f1(outAmAmtX18, amDcm)
254- let outPrAmt = f1(outPrAmtX18, prDcm)
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)
255263 let state = if ((txId58 == ""))
256264 then nil
257- else [ScriptTransfer(userAddress, outAmAmt, if ((amId == "WAVES"))
265+ else [ScriptTransfer(userAddress, outAmountAmount, if ((amountId == "WAVES"))
258266 then unit
259- else fromBase58String(amId)), ScriptTransfer(userAddress, outPrAmt, if ((prId == "WAVES"))
267+ else fromBase58String(amountId)), ScriptTransfer(userAddress, outPriceAmount, if ((priceId == "WAVES"))
260268 then unit
261- 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)]
262- $Tuple10(outAmAmt, outPrAmt, amId, prId, amBalance, prBalance, lpEmiss, curPriceX18, sts, state)
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)
263271 }
272+ else throw("Strict value is not equal to itself.")
264273 }
265274
266275
267-func epo (txId58,slippage,inAmAmt,inAmId,inPrAmt,inPrId,userAddress,isEval,emitLp,isOneAsset,pmtAmt,pmtId) = {
268- let cfg = gpc()
269- let lpId = fromBase58String(cfg[idxLPAsId])
270- let amIdStr = cfg[idxAmAsId]
271- let prIdStr = cfg[idxPrAsId]
272- let inAmIdStr = cfg[idxIAmtAsId]
273- let inPrIdStr = cfg[idxIPriceAsId]
274- let amtDcm = parseIntValue(cfg[idxAmtAsDcm])
275- let priceDcm = parseIntValue(cfg[idxPriceAsDcm])
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])
276285 let sts = cfg[idxPoolSt]
277- let lpEm = valueOrErrorMessage(assetInfo(lpId), "Wr lp as").quantity
278- let amBalance = if (isEval)
279- then getAccBalance(amIdStr)
286+ let lpEmission = valueOrErrorMessage(assetInfo(lpAssetId), "Wrong lp asset").quantity
287+ let amountBalance = if (isEvaluate)
288+ then getAccBalance(amountIdStr)
280289 else if (if (isOneAsset)
281- then (pmtId == amIdStr)
290+ then (paymentId == amountIdStr)
282291 else false)
283- then (getAccBalance(amIdStr) - pmtAmt)
292+ then (getAccBalance(amountIdStr) - paymentAmount)
284293 else if (isOneAsset)
285- then getAccBalance(amIdStr)
286- else (getAccBalance(amIdStr) - inAmAmt)
287- let prBalance = if (isEval)
288- then getAccBalance(prIdStr)
294+ then getAccBalance(amountIdStr)
295+ else (getAccBalance(amountIdStr) - inAmountAssetAmount)
296+ let priceBalance = if (isEvaluate)
297+ then getAccBalance(priceIdStr)
289298 else if (if (isOneAsset)
290- then (pmtId == prIdStr)
299+ then (paymentId == priceIdStr)
291300 else false)
292- then (getAccBalance(prIdStr) - pmtAmt)
301+ then (getAccBalance(priceIdStr) - paymentAmount)
293302 else if (isOneAsset)
294- then getAccBalance(prIdStr)
295- else (getAccBalance(prIdStr) - inPrAmt)
296- let inAmAssetAmtX18 = t1(inAmAmt, amtDcm)
297- let inPrAssetAmtX18 = t1(inPrAmt, priceDcm)
298- let userPriceX18 = cpbi(inPrAssetAmtX18, inAmAssetAmtX18)
299- let amBalanceX18 = t1(amBalance, amtDcm)
300- let prBalanceX18 = t1(prBalance, priceDcm)
301- let r = if ((lpEm == 0))
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))
302315 then {
303- let curPriceX18 = zeroBigInt
316+ let currentPriceX18 = zeroBigInt
304317 let slippageX18 = zeroBigInt
305- let lpAmtX18 = pow((inAmAssetAmtX18 * inPrAssetAmtX18), 0, toBigInt(5), 1, 0, DOWN)
306- $Tuple5(f1(lpAmtX18, scale8), f1(inAmAssetAmtX18, amtDcm), f1(inPrAssetAmtX18, priceDcm), cpbi((prBalanceX18 + inPrAssetAmtX18), (amBalanceX18 + inAmAssetAmtX18)), slippageX18)
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)
307320 }
308321 else {
309- let curPriceX18 = cpbi(prBalanceX18, amBalanceX18)
310- let slippageRealX18 = fraction(abs((curPriceX18 - userPriceX18)), scale18, curPriceX18)
311- let slippageX18 = t1(slippage, scale8)
312- if (if ((curPriceX18 != zeroBigInt))
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))
313326 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)
342+ }
343+ else throw("Strict value is not equal to itself.")
344+ }
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))
356+ 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)
314362 else false)
315- then throw(((("Price slippage " + toString(slippageRealX18)) + " > ") + toString(slippageX18)))
316- else {
317- let lpEmissionX18 = t1(lpEm, scale8)
318- let prViaAmX18 = fraction(inAmAssetAmtX18, curPriceX18, scale18)
319- let amViaPrX18 = fraction(inPrAssetAmtX18, scale18, curPriceX18)
320- let expectedAmts = if ((prViaAmX18 > inPrAssetAmtX18))
321- then $Tuple2(amViaPrX18, inPrAssetAmtX18)
322- else $Tuple2(inAmAssetAmtX18, prViaAmX18)
323- let expAmtAssetAmtX18 = expectedAmts._1
324- let expPriceAssetAmtX18 = expectedAmts._2
325- let lpAmtX18 = fraction(lpEmissionX18, expPriceAssetAmtX18, prBalanceX18)
326- $Tuple5(f1(lpAmtX18, scale8), f1(expAmtAssetAmtX18, amtDcm), f1(expPriceAssetAmtX18, priceDcm), curPriceX18, slippageX18)
327- }
363+ then $Tuple2(paymentAmount, 0)
364+ else if (if (isOneAsset)
365+ then (paymentId == priceIdStr)
366+ 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)
328373 }
329- let calcLpAmt = r._1
330- let calcAmAssetPmt = r._2
331- let calcPrAssetPmt = r._3
332- let curPrice = f1(r._4, scale8)
333- let slippageCalc = f1(r._5, scale8)
334- if ((0 >= calcLpAmt))
335- then throw("LP <= 0")
336- else {
337- let emitLpAmt = if (!(emitLp))
338- then 0
339- else calcLpAmt
340- let amDiff = (inAmAmt - calcAmAssetPmt)
341- let prDiff = (inPrAmt - calcPrAssetPmt)
342- let $t01558715932 = if (if (isOneAsset)
343- then (pmtId == amIdStr)
344- else false)
345- then $Tuple2(pmtAmt, 0)
346- else if (if (isOneAsset)
347- then (pmtId == prIdStr)
348- else false)
349- then $Tuple2(0, pmtAmt)
350- else $Tuple2(calcAmAssetPmt, calcPrAssetPmt)
351- let writeAmAmt = $t01558715932._1
352- let writePrAmt = $t01558715932._2
353- 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))]
354- $Tuple13(calcLpAmt, emitLpAmt, curPrice, amBalance, prBalance, lpEm, lpId, sts, commonState, amDiff, prDiff, inAmId, inPrId)
355- }
374+ else throw("Strict value is not equal to itself.")
356375 }
357376
358377
359-func moa (order) = {
360- let cfg = gpc()
378+func validateMatcherOrderAllowed (order) = {
379+ let cfg = getPoolConfig()
361380 let amtAsId = cfg[idxAmAsId]
362381 let prAsId = cfg[idxPrAsId]
363382 let sts = parseIntValue(cfg[idxPoolSt])
365384 let prAsDcm = parseIntValue(cfg[idxPriceAsDcm])
366385 let accAmtAsBalance = getAccBalance(amtAsId)
367386 let accPrAsBalance = getAccBalance(prAsId)
368- let curPriceX18 = if ((order.orderType == Buy))
369- then pcp(amtAsDcm, prAsDcm, (accAmtAsBalance + order.amount), accPrAsBalance)
370- else pcp(amtAsDcm, prAsDcm, (accAmtAsBalance - order.amount), accPrAsBalance)
371- let curPrice = f1(curPriceX18, scale8)
372- if (if (if (igs())
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())
373392 then true
374393 else (sts == PoolMatcherDis))
375394 then true
376395 else (sts == PoolShutdown))
377- then throw("Admin blocked")
396+ then throwErr("Admin blocked")
378397 else {
379398 let orAmtAsset = order.assetPair.amountAsset
380399 let orAmtAsStr = if ((orAmtAsset == unit))
387406 if (if ((orAmtAsStr != amtAsId))
388407 then true
389408 else (orPrAsStr != prAsId))
390- then throw("Wr assets")
409+ then throwErr("Wr assets")
391410 else {
392411 let orderPrice = order.price
393- let priceDcm = fraction(scale8, prAsDcm, amtAsDcm)
394- let castOrderPrice = ts(orderPrice, scale8, priceDcm)
412+ let priceDecimals = fraction(scale8, prAsDcm, amtAsDcm)
413+ let castOrderPrice = ts(orderPrice, scale8, priceDecimals)
395414 let isOrderPriceValid = if ((order.orderType == Buy))
396415 then (curPrice >= castOrderPrice)
397416 else (castOrderPrice >= curPrice)
401420 }
402421
403422
404-func cg (i) = if ((size(i.payments) != 1))
405- then throw("1 pmnt exp")
406- else {
407- let pmt = value(i.payments[0])
408- let pmtAssetId = value(pmt.assetId)
409- let pmtAmt = pmt.amount
410- let r = ego(toBase58String(i.transactionId), toBase58String(pmtAssetId), pmtAmt, i.caller)
411- let outAmAmt = r._1
412- let outPrAmt = r._2
413- let sts = parseIntValue(r._9)
414- let state = r._10
415- if (if (igs())
416- then true
417- else (sts == PoolShutdown))
418- then throw(("Admin blocked: " + toString(sts)))
419- else $Tuple5(outAmAmt, outPrAmt, pmtAmt, pmtAssetId, state)
420- }
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+ }
421445
422446
423-func cp (caller,txId,amAsPmt,prAsPmt,slippage,emitLp,isOneAsset,pmtAmt,pmtId) = {
424- let r = epo(txId, slippage, value(amAsPmt).amount, value(amAsPmt).assetId, value(prAsPmt).amount, value(prAsPmt).assetId, caller, false, emitLp, isOneAsset, pmtAmt, pmtId)
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)
425449 let sts = parseIntValue(r._8)
426- if (if (if (igs())
450+ if (if (if (isGlobalShutdown())
427451 then true
428452 else (sts == PoolPutDis))
429453 then true
430454 else (sts == PoolShutdown))
431- then throw(("Blocked:" + toString(sts)))
455+ then throwErr(("Blocked:" + toString(sts)))
432456 else r
433457 }
434458
439463 }
440464
441465
442-func m () = match getString(mpk()) {
466+func managerPublicKeyOrUnit () = match getString(keyManagerPublicKey()) {
443467 case s: String =>
444468 fromBase58String(s)
445469 case _: Unit =>
449473 }
450474
451475
452-func pm () = match getString(pmpk()) {
476+func pendingManagerPublicKeyOrUnit () = match getString(keyPendingManagerPublicKey()) {
453477 case s: String =>
454478 fromBase58String(s)
455479 case _: Unit =>
459483 }
460484
461485
462-let pd = throw("Permission denied")
486+let pd = throwErr("Permission denied")
463487
464-func mm (i) = match m() {
488+func mustManager (i) = match managerPublicKeyOrUnit() {
465489 case pk: ByteVector =>
466490 if ((i.callerPublicKey == pk))
467491 then true
476500
477501
478502 @Callable(i)
479-func constructor (fc) = {
480- let c = mm(i)
481- if ((c == c))
482- then [StringEntry(fc(), fc)]
503+func constructor (factoryContract) = {
504+ let checkCaller = mustManager(i)
505+ if ((checkCaller == checkCaller))
506+ then [StringEntry(keyFactoryContact(), factoryContract)]
483507 else throw("Strict value is not equal to itself.")
484508 }
485509
487511
488512 @Callable(i)
489513 func setManager (pendingManagerPublicKey) = {
490- let c = mm(i)
491- if ((c == c))
514+ let checkCaller = mustManager(i)
515+ if ((checkCaller == checkCaller))
492516 then {
493- let cm = fromBase58String(pendingManagerPublicKey)
494- if ((cm == cm))
495- then [StringEntry(pmpk(), pendingManagerPublicKey)]
517+ let checkManagerPublicKey = fromBase58String(pendingManagerPublicKey)
518+ if ((checkManagerPublicKey == checkManagerPublicKey))
519+ then [StringEntry(keyPendingManagerPublicKey(), pendingManagerPublicKey)]
496520 else throw("Strict value is not equal to itself.")
497521 }
498522 else throw("Strict value is not equal to itself.")
502526
503527 @Callable(i)
504528 func confirmManager () = {
505- let p = pm()
506- let hpm = if (isDefined(p))
529+ let pm = pendingManagerPublicKeyOrUnit()
530+ let hasPM = if (isDefined(pm))
507531 then true
508- else throw("No pending manager")
509- if ((hpm == hpm))
532+ else throwErr("No pending manager")
533+ if ((hasPM == hasPM))
510534 then {
511- let cpm = if ((i.callerPublicKey == value(p)))
535+ let checkPM = if ((i.callerPublicKey == value(pm)))
512536 then true
513- else throw("You are not pending manager")
514- if ((cpm == cpm))
515- then [StringEntry(mpk(), toBase58String(value(p))), DeleteEntry(pmpk())]
537+ else throwErr("You are not pending manager")
538+ if ((checkPM == checkPM))
539+ then [StringEntry(keyManagerPublicKey(), toBase58String(value(pm))), DeleteEntry(keyPendingManagerPublicKey())]
516540 else throw("Strict value is not equal to itself.")
517541 }
518542 else throw("Strict value is not equal to itself.")
521545
522546
523547 @Callable(i)
524-func put (slip,autoStake) = {
525- let factCfg = gfc()
526- let stakingCntr = valueOrErrorMessage(addressFromString(factCfg[idxFactStakCntr]), "Wr st addr")
527- let slipCntr = valueOrErrorMessage(addressFromString(factCfg[idxFactSlippCntr]), "Wr sl addr")
528- if ((0 > slip))
529- then throw("Wrong slippage")
530- else if ((size(i.payments) != 2))
531- then throw("2 pmnts expd")
532- else {
533- 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, "")
534- let emitLpAmt = e._2
535- let lpAssetId = e._7
536- let state = e._9
537- let amDiff = e._10
538- let prDiff = e._11
539- let amId = e._12
540- let prId = e._13
541- let r = invoke(fca, "emit", [emitLpAmt], nil)
542- if ((r == r))
543- then {
544- let el = match r {
545- case legacy: Address =>
546- invoke(legacy, "emit", [emitLpAmt], nil)
547- case _ =>
548- unit
549- }
550- if ((el == el))
551- then {
552- let sa = if ((amDiff > 0))
553- then invoke(slipCntr, "put", nil, [AttachedPayment(amId, amDiff)])
554- else nil
555- if ((sa == sa))
556- then {
557- let sp = if ((prDiff > 0))
558- then invoke(slipCntr, "put", nil, [AttachedPayment(prId, prDiff)])
559- else nil
560- if ((sp == sp))
561- then {
562- let lpTrnsfr = if (autoStake)
563- then {
564- let ss = invoke(stakingCntr, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmt)])
565- if ((ss == ss))
566- then nil
567- else throw("Strict value is not equal to itself.")
568- }
569- else [ScriptTransfer(i.caller, emitLpAmt, lpAssetId)]
570- (state ++ lpTrnsfr)
571- }
572- else throw("Strict value is not equal to itself.")
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- }
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.")
580612 }
581613
582614
583615
584616 @Callable(i)
585-func putOneTkn (amAssetPart,prAssetPart,outLp,slippage,autoStake) = {
586- let cfg = gfc()
587- let stakingCntr = valueOrErrorMessage(addressFromString(cfg[idxFactStakCntr]), "Wr st addr")
588- let slipCntr = valueOrErrorMessage(addressFromString(cfg[idxFactSlippCntr]), "Wr sl addr")
589- let gwxCntr = valueOrErrorMessage(addressFromString(cfg[idxFactGwxRewCntr]), "Wr gwx addr")
590- let poolCfg = gpc()
591- let amId = poolCfg[idxAmAsId]
592- let prId = poolCfg[idxPrAsId]
593- let amDcm = parseIntValue(poolCfg[idxAmtAsDcm])
594- let prDcm = parseIntValue(poolCfg[idxPriceAsDcm])
595- let addon = valueOrElse(getString(this, ada()), "")
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()), "")
596628 let userAddress = if ((addon == toString(i.caller)))
597629 then i.originCaller
598630 else i.caller
599631 if (if (if (if ((0 >= slippage))
600632 then true
601- else (0 >= amAssetPart))
633+ else (0 >= amountAssetPart))
602634 then true
603- else (0 >= prAssetPart))
635+ else (0 >= priceAssetPart))
604636 then true
605637 else (0 >= outLp))
606- then throw("Wrong params")
638+ then throwErr("Wrong params")
607639 else if ((size(i.payments) != 1))
608- then throw("1 pmnt expd")
640+ then throwErr("1 payment expected")
609641 else {
610- let pmt = value(i.payments[0])
611- let pmtAssetId = toBase58String(value(pmt.assetId))
612- let paymentAmountRaw = pmt.amount
613- let $t02454924601 = takeFee(paymentAmountRaw)
614- let pmtAmt = $t02454924601._1
615- let feeAmount = $t02454924601._2
616- if ((10000000 > paymentAmountRaw))
617- then throw("Wrong pmt amt")
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")
618654 else {
619- let amBalance = getAccBalance(amId)
620- let prBalance = getAccBalance(prId)
621- let $t02476125337 = if ((pmtAssetId == amId))
622- then if (if ((pmtAmt > amBalance))
623- then true
624- else (amAssetPart > pmtAmt))
625- then throw("invalid payment amount")
626- else $Tuple6((amBalance - pmtAmt), prBalance, (pmtAmt - amAssetPart), prAssetPart, 0, 0)
627- else if ((pmtAssetId == prId))
628- then if (if ((pmtAmt > prBalance))
629- then true
630- else (prAssetPart > pmtAmt))
631- then throw("invalid payment amount")
632- else $Tuple6(amBalance, (prBalance - pmtAmt), 0, 0, (pmtAmt - prAssetPart), amAssetPart)
633- else throw("wrong pmtAssetId")
634- let amBalanceNow = $t02476125337._1
635- let prBalanceNow = $t02476125337._2
636- let virtSwapInAm = $t02476125337._3
637- let virtSwapOutPr = $t02476125337._4
638- let virtSwapInPr = $t02476125337._5
639- let virtSwapOutAm = $t02476125337._6
640- let D0 = invoke(gwxCntr, "calcD", [toString(amBalanceNow), toString(prBalanceNow), A, Amult, Dconv], nil)
641- let D1 = invoke(gwxCntr, "calcD", [toString(toBigInt(((amBalanceNow + virtSwapInAm) - virtSwapOutAm))), toString(toBigInt(((prBalanceNow + virtSwapInPr) - virtSwapOutPr))), A, Amult, Dconv], nil)
642- let D0vsD1 = vd(parseBigIntValue(str(D1)), parseBigIntValue(str(D0)), slippage4D)
655+ let amountBalance = getAccBalance(amountId)
656+ let priceBalance = getAccBalance(priceId)
657+ let $t02689327348 = if ((paymentAssetId == amountId))
658+ then $Tuple6((amountBalance - paymentAmount), priceBalance, (paymentAmount - amountAssetPart), priceAssetPart, 0, 0)
659+ else if ((paymentAssetId == priceId))
660+ then $Tuple6(amountBalance, (priceBalance - paymentAmount), 0, 0, (paymentAmount - priceAssetPart), amountAssetPart)
661+ else throwErr("wrong paymentAssetId")
662+ let amountBalanceNow = $t02689327348._1
663+ let priceBalanceNow = $t02689327348._2
664+ let virtSwapInAm = $t02689327348._3
665+ let virtSwapOutPr = $t02689327348._4
666+ let virtSwapInPr = $t02689327348._5
667+ let virtSwapOutAm = $t02689327348._6
668+ let D0 = invoke(gwxRewardContract, "calcD", [toString(amountBalanceNow), toString(priceBalanceNow), amplificator, Amult, Dconv], nil)
669+ let D1 = invoke(gwxRewardContract, "calcD", [toString(toBigInt(((amountBalanceNow + virtSwapInAm) - virtSwapOutAm))), toString(toBigInt(((priceBalanceNow + virtSwapInPr) - virtSwapOutPr))), amplificator, Amult, Dconv], nil)
670+ let D0vsD1 = validateD(parseBigIntValue(str(D1)), parseBigIntValue(str(D0)), slippage4D)
643671 if ((D0vsD1 == D0vsD1))
644672 then {
645- let estPut = cp(toString(i.caller), toBase58String(i.transactionId), AttachedPayment(fromBase58String(amId), amAssetPart), AttachedPayment(fromBase58String(prId), prAssetPart), slippage, true, true, pmtAmt, pmtAssetId)
646- let estimLP = estPut._2
647- let lpAssetId = estPut._7
648- let state = estPut._9
649- let amDiff = estPut._10
650- let prDiff = estPut._11
651- let lpCalcRes = vad(toBigInt(estimLP), toBigInt(outLp), toBigInt(slippage))
652- let emitLpAmt = toInt(lpCalcRes._2)
653- let e = invoke(fca, "emit", [emitLpAmt], nil)
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)
654682 if ((e == e))
655683 then {
656684 let el = match e {
657685 case legacy: Address =>
658- invoke(legacy, "emit", [emitLpAmt], nil)
686+ invoke(legacy, "emit", [emitLpAmount], nil)
659687 case _ =>
660688 unit
661689 }
662690 if ((el == el))
663691 then {
664- let sa = if ((amDiff > 0))
665- then invoke(slipCntr, "put", nil, [AttachedPayment(fromBase58String(amId), amDiff)])
692+ let sa = if ((amountDiff > 0))
693+ then invoke(slippageContract, "put", nil, [AttachedPayment(fromBase58String(amountId), amountDiff)])
666694 else nil
667695 if ((sa == sa))
668696 then {
669- let sp = if ((prDiff > 0))
670- then invoke(slipCntr, "put", nil, [AttachedPayment(fromBase58String(prId), prDiff)])
697+ let sp = if ((priceDiff > 0))
698+ then invoke(slippageContract, "put", nil, [AttachedPayment(fromBase58String(priceId), priceDiff)])
671699 else nil
672700 if ((sp == sp))
673701 then {
674- let lpTrnsfr = if (autoStake)
702+ let lpTrasfer = if (autoStake)
675703 then {
676- let ss = invoke(stakingCntr, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmt)])
704+ let ss = invoke(stakingContract, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmount)])
677705 if ((ss == ss))
678706 then nil
679707 else throw("Strict value is not equal to itself.")
680708 }
681- else [ScriptTransfer(i.caller, emitLpAmt, lpAssetId)]
709+ else [ScriptTransfer(i.caller, emitLpAmount, lpAssetId)]
682710 let sendFeeToMatcher = if ((feeAmount > 0))
683- then [ScriptTransfer(matcherAddress, feeAmount, fromBase58String(pmtAssetId))]
711+ then [ScriptTransfer(matcherAddress, feeAmount, fromBase58String(paymentAssetId))]
684712 else nil
685- ((state ++ lpTrnsfr) ++ sendFeeToMatcher)
713+ ((state ++ lpTrasfer) ++ sendFeeToMatcher)
686714 }
687715 else throw("Strict value is not equal to itself.")
688716 }
700728
701729
702730 @Callable(i)
703-func putForFree (maxSlpg) = if ((0 > maxSlpg))
704- then throw("Wrong slpg")
731+func putForFree (maxslippage) = if ((0 > maxslippage))
732+ then throwErr("wrong slippage")
705733 else if ((size(i.payments) != 2))
706- then throw("2 pmnts expd")
734+ then throwErr("2 payments expected")
707735 else {
708- 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, "")
709- estPut._9
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
710738 }
711739
712740
713741
714742 @Callable(i)
715743 func get () = {
716- let r = cg(i)
744+ let r = commonGet(i)
717745 let outAmtAmt = r._1
718- let outPrAmt = r._2
719- let pmtAmt = r._3
720- let pmtAssetId = r._4
746+ let outPriceAmount = r._2
747+ let paymentAmount = r._3
748+ let paymentAssetId = r._4
721749 let state = r._5
722- let b = invoke(fca, "burn", [pmtAmt], [AttachedPayment(pmtAssetId, pmtAmt)])
750+ let b = invoke(factoryContract, "burn", [paymentAmount], [AttachedPayment(paymentAssetId, paymentAmount)])
723751 if ((b == b))
724752 then state
725753 else throw("Strict value is not equal to itself.")
729757
730758 @Callable(i)
731759 func getOneTkn (exchResult,notUsed,outAmount,outAssetId,slippage) = if ((size(i.payments) != 1))
732- then throw("1 pmnt expd")
760+ then throwErr("1 payment expected")
733761 else {
734- let cfg = gpc()
735- let lpId = cfg[idxLPAsId]
736- let amId = cfg[idxAmAsId]
737- let prId = cfg[idxPrAsId]
738- let amDcm = parseIntValue(cfg[idxAmtAsDcm])
739- let prDcm = parseIntValue(cfg[idxPriceAsDcm])
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])
740768 let sts = cfg[idxPoolSt]
741- let factCfg = gfc()
742- let gwxCntr = valueOrErrorMessage(addressFromString(factCfg[idxFactGwxRewCntr]), "Wr sl addr")
743- let pmt = value(i.payments[0])
744- let addon = valueOrElse(getString(this, ada()), "")
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()), "")
745773 let userAddress = if ((addon == toString(i.caller)))
746774 then i.originCaller
747775 else i.caller
748776 let txId58 = toBase58String(i.transactionId)
749- let pmtAssetId = value(pmt.assetId)
750- let pmtAmt = pmt.amount
751- if ((1000000000 > pmtAmt))
752- then throw("Min pmt 10 LP")
777+ let paymentAssetId = value(payment.assetId)
778+ let paymentAmount = payment.amount
779+ if ((1000000000 > paymentAmount))
780+ then throwErr("Min payment 10 LP")
753781 else if (if (if ((0 > slippage))
754782 then true
755783 else (0 > exchResult))
756784 then true
757785 else (0 > outAmount))
758- then throw("Wrong params")
759- else if ((lpId != toBase58String(pmtAssetId)))
760- then throw("Wrong LP")
786+ then throwErr("Wrong params")
787+ else if ((lpAssetId != toBase58String(paymentAssetId)))
788+ then throwErr("Wrong LP")
761789 else {
762- let r = ego(toBase58String(i.transactionId), toBase58String(pmtAssetId), pmtAmt, i.caller)
790+ let r = estimateGetOperation(toBase58String(i.transactionId), toBase58String(paymentAssetId), paymentAmount, i.caller)
763791 let estimAmAmt = r._1
764792 let estimPrAmt = r._2
765- let amBalance = getAccBalance(amId)
766- let prBalance = getAccBalance(prId)
767- let $t03027530735 = if ((outAssetId == amId))
768- then $Tuple7((amBalance - estimAmAmt), (prBalance - estimPrAmt), exchResult, estimPrAmt, 0, 0, (estimAmAmt + exchResult))
769- else if ((outAssetId == prId))
770- then $Tuple7((amBalance - estimAmAmt), (prBalance - estimPrAmt), 0, 0, exchResult, estimAmAmt, (estimPrAmt + exchResult))
771- else throw("wrong outAssetId")
772- let amBalanceNow = $t03027530735._1
773- let prBalanceNow = $t03027530735._2
774- let virtSwapInAm = $t03027530735._3
775- let virtSwapOutPr = $t03027530735._4
776- let virtSwapInPr = $t03027530735._5
777- let virtSwapOutAm = $t03027530735._6
778- let totalGetRaw = $t03027530735._7
793+ let amountBalance = getAccBalance(amountId)
794+ let priceBalance = getAccBalance(priceId)
795+ let $t03249632964 = if ((outAssetId == amountId))
796+ then $Tuple7((amountBalance - estimAmAmt), (priceBalance - estimPrAmt), exchResult, estimPrAmt, 0, 0, (estimAmAmt + exchResult))
797+ else if ((outAssetId == priceId))
798+ then $Tuple7((amountBalance - estimAmAmt), (priceBalance - estimPrAmt), 0, 0, exchResult, estimAmAmt, (estimPrAmt + exchResult))
799+ else throwErr("wrong outAssetId")
800+ let amountBalanceNow = $t03249632964._1
801+ let priceBalanceNow = $t03249632964._2
802+ let virtSwapInAm = $t03249632964._3
803+ let virtSwapOutPr = $t03249632964._4
804+ let virtSwapInPr = $t03249632964._5
805+ let virtSwapOutAm = $t03249632964._6
806+ let totalGet = $t03249632964._7
779807 if (if ((0 > virtSwapInAm))
780808 then true
781809 else (0 > virtSwapInPr))
782- then throw("Wrong calc")
810+ then throwErr("Wrong calc")
783811 else {
784- let D0 = invoke(gwxCntr, "calcD", [toString(amBalanceNow), toString(prBalanceNow), A, Amult, Dconv], nil)
785- let D1 = invoke(gwxCntr, "calcD", [toString(((amBalanceNow - virtSwapInAm) + virtSwapOutAm)), toString(((prBalanceNow + virtSwapOutPr) - virtSwapInPr)), A, Amult, Dconv], nil)
786- let D0vsD1 = vd(parseBigIntValue(str(D1)), parseBigIntValue(str(D0)), slippage4D)
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)
787815 if ((D0vsD1 == D0vsD1))
788816 then {
789- let totalGet = takeFee(totalGetRaw)._1
790- let finalRes = vad(toBigInt(totalGet), toBigInt(outAmount), toBigInt(slippage))
817+ let finalRes = validateAbsDiff(toBigInt(totalGet), toBigInt(outAmount), toBigInt(slippage))
791818 if ((finalRes == finalRes))
792819 then {
793- let $t03148231586 = if ((outAssetId == amId))
820+ let $t03363333741 = if ((outAssetId == amountId))
794821 then $Tuple2(toInt(finalRes._2), 0)
795822 else $Tuple2(0, toInt(finalRes._2))
796- let outAm = $t03148231586._1
797- let outPr = $t03148231586._2
798- let totalAmount = (outAm + outPr)
799- let feeAmount = (totalGetRaw - totalGet)
823+ let outAm = $t03363333741._1
824+ let outPr = $t03363333741._2
825+ let totalAmountRaw = (outAm + outPr)
826+ let $t03378133836 = takeFee(totalAmountRaw)
827+ let totalAmount = $t03378133836._1
828+ let feeAmount = $t03378133836._2
800829 let outAssetIdOrWaves = if ((outAssetId == "WAVES"))
801830 then unit
802831 else fromBase58String(outAssetId)
803832 let sendFeeToMatcher = if ((feeAmount > 0))
804833 then [ScriptTransfer(matcherAddress, feeAmount, outAssetIdOrWaves)]
805834 else nil
806- let curPrX18 = cpbi(t1(prBalance, prDcm), t1(amBalance, amDcm))
807- let curPr = f1(curPrX18, scale8)
808- let state = [ScriptTransfer(userAddress, totalAmount, outAssetIdOrWaves), StringEntry(gau(toString(userAddress), txId58), dataGetActionInfo(outAm, outPr, pmtAmt, curPr, height, lastBlock.timestamp)), IntegerEntry(pl(), curPr), IntegerEntry(ph(height, lastBlock.timestamp), curPr)]
809- if ((state == state))
835+ let decimals = if ((amountDecimals >= priceDecimals))
836+ then amountDecimals
837+ else priceDecimals
838+ if ((decimals == decimals))
810839 then {
811- let burn = invoke(fca, "burn", [pmtAmt], [AttachedPayment(pmtAssetId, pmtAmt)])
812- if ((burn == burn))
813- then (state ++ sendFeeToMatcher)
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+ }
814850 else throw("Strict value is not equal to itself.")
815851 }
816852 else throw("Strict value is not equal to itself.")
826862
827863 @Callable(i)
828864 func getNoLess (noLessThenAmtAsset,noLessThenPriceAsset) = {
829- let r = cg(i)
830- let outAmAmt = r._1
831- let outPrAmt = r._2
832- let pmtAmt = r._3
833- let pmtAssetId = r._4
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
834870 let state = r._5
835- if ((noLessThenAmtAsset > outAmAmt))
836- then throw(((("Failed: " + toString(outAmAmt)) + " < ") + toString(noLessThenAmtAsset)))
837- else if ((noLessThenPriceAsset > outPrAmt))
838- then throw(((("Failed: " + toString(outPrAmt)) + " < ") + toString(noLessThenPriceAsset)))
839- else {
840- let burnLPAssetOnFactory = invoke(fca, "burn", [pmtAmt], [AttachedPayment(pmtAssetId, pmtAmt)])
841- if ((burnLPAssetOnFactory == burnLPAssetOnFactory))
842- then state
843- else throw("Strict value is not equal to itself.")
844- }
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.")
845889 }
846890
847891
849893 @Callable(i)
850894 func unstakeAndGet (amount) = {
851895 let checkPayments = if ((size(i.payments) != 0))
852- then throw("No pmnts expd")
896+ then throwErr("no payments expected")
853897 else true
854898 if ((checkPayments == checkPayments))
855899 then {
856- let cfg = gpc()
857- let factoryCfg = gfc()
900+ let cfg = getPoolConfig()
901+ let factoryCfg = getFactoryConfig()
858902 let lpAssetId = fromBase58String(cfg[idxLPAsId])
859- let staking = valueOrErrorMessage(addressFromString(factoryCfg[idxFactStakCntr]), "Wr st addr")
903+ let staking = valueOrErrorMessage(addressFromString(factoryCfg[idxFactStakCntr]), "wrong")
860904 let unstakeInv = invoke(staking, "unstake", [toBase58String(lpAssetId), amount], nil)
861905 if ((unstakeInv == unstakeInv))
862906 then {
863- let r = ego(toBase58String(i.transactionId), toBase58String(lpAssetId), amount, i.caller)
907+ let r = estimateGetOperation(toBase58String(i.transactionId), toBase58String(lpAssetId), amount, i.caller)
864908 let sts = parseIntValue(r._9)
865909 let state = r._10
866- let v = if (if (igs())
910+ let v = if (if (isGlobalShutdown())
867911 then true
868912 else (sts == PoolShutdown))
869- then throw(("Blocked: " + toString(sts)))
913+ then throwErr(("Blocked: " + toString(sts)))
870914 else true
871915 if ((v == v))
872916 then {
873- let burnA = invoke(fca, "burn", [amount], [AttachedPayment(lpAssetId, amount)])
917+ let burnA = invoke(factoryContract, "burn", [amount], [AttachedPayment(lpAssetId, amount)])
874918 if ((burnA == burnA))
875919 then state
876920 else throw("Strict value is not equal to itself.")
885929
886930
887931 @Callable(i)
888-func activate (amtAsStr,prAsStr) = if ((toString(i.caller) != toString(fca)))
889- then throw("denied")
890- else $Tuple2([StringEntry(aa(), amtAsStr), StringEntry(pa(), prAsStr)], "success")
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")
891935
892936
893937
894938 @Callable(i)
895-func setS (k,v) = if ((toString(i.caller) != strf(this, ada())))
939+func setS (k,v) = if ((toString(i.caller) != getStringOrFail(this, keyAddonAddress())))
896940 then pd
897941 else [StringEntry(k, v)]
898942
899943
900944
901945 @Callable(i)
902-func setI (k,v) = if ((toString(i.caller) != strf(this, ada())))
946+func setI (k,v) = if ((toString(i.caller) != getStringOrFail(this, keyAddonAddress())))
903947 then pd
904948 else [IntegerEntry(k, v)]
905949
906950
907951
908952 @Callable(i)
909-func getPoolConfigWrapperREADONLY () = $Tuple2(nil, gpc())
953+func getPoolConfigWrapperREADONLY () = $Tuple2(nil, getPoolConfig())
910954
911955
912956
924968
925969
926970 @Callable(i)
927-func fromX18WrapperREADONLY (val,resScaleMult) = $Tuple2(nil, f1(parseBigIntValue(val), resScaleMult))
971+func fromX18WrapperREADONLY (val,resScaleMult) = $Tuple2(nil, fromX18(parseBigIntValue(val), resScaleMult))
928972
929973
930974
931975 @Callable(i)
932-func toX18WrapperREADONLY (origVal,origScaleMult) = $Tuple2(nil, toString(t1(origVal, origScaleMult)))
976+func toX18WrapperREADONLY (origVal,origScaleMult) = $Tuple2(nil, toString(toX18(origVal, origScaleMult)))
933977
934978
935979
936980 @Callable(i)
937-func calcPriceBigIntWrapperREADONLY (prAmtX18,amAmtX18) = $Tuple2(nil, toString(cpbi(parseBigIntValue(prAmtX18), parseBigIntValue(amAmtX18))))
981+func calcPriceBigIntWrapperREADONLY (prAmtX18,amAmtX18) = $Tuple2(nil, toString(calcPriceBigInt(parseBigIntValue(prAmtX18), parseBigIntValue(amAmtX18))))
938982
939983
940984
941985 @Callable(i)
942-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, ""))
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, ""))
943987
944988
945989
946990 @Callable(i)
947-func estimateGetOperationWrapperREADONLY (txId58,pmtAsId,pmtLpAmt,usrAddr) = {
948- let r = ego(txId58, pmtAsId, pmtLpAmt, addressFromStringValue(usrAddr))
991+func estimateGetOperationWrapperREADONLY (txId58,paymentAsId,paymentLpAmount,usrAddr) = {
992+ let r = estimateGetOperation(txId58, paymentAsId, paymentLpAmount, addressFromStringValue(usrAddr))
949993 $Tuple2(nil, $Tuple10(r._1, r._2, r._3, r._4, r._5, r._6, r._7, toString(r._8), r._9, r._10))
950994 }
951995
952996
953997 @Verifier(tx)
954-func verify () = {
955- let targetPublicKey = match m() {
956- case pk: ByteVector =>
957- pk
958- case _: Unit =>
959- tx.senderPublicKey
960- case _ =>
961- throw("Match error")
962- }
963- match tx {
964- case order: Order =>
965- let matcherPub = mp()
966- let orderValid = moa(order)
967- let senderValid = sigVerify(order.bodyBytes, order.proofs[0], order.senderPublicKey)
968- let matcherValid = sigVerify(order.bodyBytes, order.proofs[1], matcherPub)
969- if (if (if (orderValid)
970- then senderValid
971- else false)
972- then matcherValid
973- else false)
974- then true
975- else toe(orderValid, senderValid, matcherValid)
976- case s: SetScriptTransaction =>
977- let newHash = blake2b256(value(s.script))
978- let allowedHash = fromBase64String(value(getString(fca, keyAllowedLpStableScriptHash())))
979- let currentHash = scriptHash(this)
980- if (if ((allowedHash == newHash))
981- then (currentHash != newHash)
982- else false)
983- then true
984- else sigVerify(tx.bodyBytes, tx.proofs[0], targetPublicKey)
985- case _ =>
986- sigVerify(tx.bodyBytes, tx.proofs[0], targetPublicKey)
987- }
988- }
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+}
9891022
Full:
OldNewDifferences
11 {-# STDLIB_VERSION 6 #-}
22 {-# SCRIPT_TYPE ACCOUNT #-}
33 {-# CONTENT_TYPE DAPP #-}
4+let defaultDecimals = 1000000
5+
46 let scale8 = 100000000
57
68 let scale8BigInt = toBigInt(100000000)
79
810 let scale18 = toBigInt(1000000000000000000)
911
1012 let thousand = 1000
1113
1214 let zeroBigInt = toBigInt(0)
1315
1416 let oneBigInt = toBigInt(1)
1517
1618 let slippage4D = toBigInt((scale8 - ((scale8 * 1) / scale8)))
1719
1820 let Amult = "100"
1921
2022 let Dconv = "1"
2123
2224 let SEP = "__"
2325
2426 let EMPTY = ""
2527
2628 let PoolActive = 1
2729
2830 let PoolPutDis = 2
2931
3032 let PoolMatcherDis = 3
3133
3234 let PoolShutdown = 4
3335
3436 let idxPoolAddress = 1
3537
3638 let idxPoolSt = 2
3739
3840 let idxLPAsId = 3
3941
4042 let idxAmAsId = 4
4143
4244 let idxPrAsId = 5
4345
4446 let idxAmtAsDcm = 6
4547
4648 let idxPriceAsDcm = 7
4749
4850 let idxIAmtAsId = 8
4951
5052 let idxIPriceAsId = 9
5153
5254 let idxFactStakCntr = 1
5355
5456 let idxFactSlippCntr = 7
5557
5658 let idxFactGwxRewCntr = 10
5759
5860 let feePermilleDefault = 0
5961
60-func t1 (origVal,origScaleMult) = fraction(toBigInt(origVal), scale18, toBigInt(origScaleMult))
62+func toX18 (origVal,origScaleMult) = fraction(toBigInt(origVal), scale18, toBigInt(origScaleMult))
6163
6264
63-func f1 (val,resultScaleMult) = toInt(fraction(val, toBigInt(resultScaleMult), scale18))
65+func fromX18 (val,resultScaleMult) = toInt(fraction(val, toBigInt(resultScaleMult), scale18))
6466
6567
6668 func ts (amt,resScale,curScale) = fraction(amt, resScale, curScale)
6769
6870
6971 func abs (val) = if ((zeroBigInt > val))
7072 then -(val)
7173 else val
7274
7375
74-func fc () = "%s__factoryContract"
76+func keyFactoryContact () = "%s__factoryContract"
7577
7678
77-func mpk () = "%s__managerPublicKey"
79+func keyManagerPublicKey () = "%s__managerPublicKey"
7880
7981
80-func pmpk () = "%s__pendingManagerPublicKey"
82+func keyPendingManagerPublicKey () = "%s__pendingManagerPublicKey"
8183
8284
83-func pl () = "%s%s__price__last"
85+func keyPriceLast () = "%s%s__price__last"
8486
8587
86-func ph (h,t) = makeString(["%s%s%d%d__price__history", toString(h), toString(t)], SEP)
88+func keyPriceHistory (h,t) = makeString(["%s%s%d%d__price__history", toString(h), toString(t)], SEP)
8789
8890
89-func pau (ua,txId) = ((("%s%s%s__P__" + ua) + "__") + txId)
91+func keyPutActionByUser (ua,txId) = ((("%s%s%s__P__" + ua) + "__") + txId)
9092
9193
92-func gau (ua,txId) = ((("%s%s%s__G__" + ua) + "__") + txId)
94+func keyGetActionByUser (ua,txId) = ((("%s%s%s__G__" + ua) + "__") + txId)
9395
9496
95-func aa () = "%s__amountAsset"
97+func keyAmountAsset () = "%s__amountAsset"
9698
9799
98-func pa () = "%s__priceAsset"
100+func keyPriceAsset () = "%s__priceAsset"
99101
100102
101-func amp () = "%s__amp"
103+func keyAmplificator () = "%s__amp"
102104
103105
104-func ada () = "%s__addonAddr"
106+func keyAddonAddress () = "%s__addonAddr"
105107
106108
107109 let keyFeePermille = "%s__feePermille"
108110
109111 let feePermille = valueOrElse(getInteger(this, keyFeePermille), feePermilleDefault)
110112
111-func fcfg () = "%s__factoryConfig"
113+func keyFactoryConfig () = "%s__factoryConfig"
112114
113115
114-func mtpk () = "%s%s__matcher__publicKey"
116+func keyMatcherPub () = "%s%s__matcher__publicKey"
115117
116118
117-func pc (iAmtAs,iPrAs) = (((("%d%d%s__" + iAmtAs) + "__") + iPrAs) + "__config")
119+func keyPoolConfig (iAmtAs,iPrAs) = (((("%d%d%s__" + iAmtAs) + "__") + iPrAs) + "__config")
118120
119121
120-func mba (bAStr) = ("%s%s%s__mappings__baseAsset2internalId__" + bAStr)
122+func keyMappingsBaseAsset2internalId (bAStr) = ("%s%s%s__mappings__baseAsset2internalId__" + bAStr)
121123
122124
123-func aps () = "%s__shutdown"
125+func keyAllPoolsShutdown () = "%s__shutdown"
124126
125127
126-func keyAllowedLpStableScriptHash () = "%s__allowedLpStableScriptHash"
128+func throwErr (msg) = throw(makeString(["lp_stable.ride:", msg], " "))
127129
128130
129-func toe (orV,sendrV,matchV) = throw(((((("Failed: ordValid=" + toString(orV)) + " sndrValid=") + toString(sendrV)) + " mtchrValid=") + toString(matchV)))
131+func throwOrderError (orV,sendrV,matchV) = throwErr(((((("Failed: ordValid=" + toString(orV)) + " sndrValid=") + toString(sendrV)) + " mtchrValid=") + toString(matchV)))
130132
131133
132134 func str (val) = match val {
133135 case valStr: String =>
134136 valStr
135137 case _ =>
136- throw("fail cast to String")
138+ throwErr("fail cast to String")
137139 }
138140
139141
140-func strf (addr,key) = valueOrErrorMessage(getString(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
142+func getStringOrFail (addr,key) = valueOrErrorMessage(getString(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
141143
142144
143-func intf (addr,key) = valueOrErrorMessage(getInteger(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
145+func getIntOrFail (addr,key) = valueOrErrorMessage(getInteger(addr, key), makeString(["mandatory ", toString(addr), ".", key, " not defined"], ""))
144146
145147
146-let fca = addressFromStringValue(strf(this, fc()))
148+let factoryContract = addressFromStringValue(getStringOrFail(this, keyFactoryContact()))
147149
148-let A = strf(this, amp())
150+let amplificator = getStringOrFail(this, keyAmplificator())
149151
150-func igs () = valueOrElse(getBoolean(fca, aps()), false)
152+func isGlobalShutdown () = valueOrElse(getBoolean(factoryContract, keyAllPoolsShutdown()), false)
151153
152154
153-func mp () = fromBase58String(strf(fca, mtpk()))
155+func getMatcherPubOrFail () = fromBase58String(getStringOrFail(factoryContract, keyMatcherPub()))
154156
155157
156-let matcherAddress = addressFromPublicKey(mp())
158+let matcherAddress = addressFromPublicKey(getMatcherPubOrFail())
157159
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)
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)
164166 }
165167
166168
167-func gfc () = split(strf(fca, fcfg()), SEP)
169+func getFactoryConfig () = split(getStringOrFail(factoryContract, keyFactoryConfig()), SEP)
168170
169171
170172 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)
171173
172174
173175 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)
174176
175177
176178 func getAccBalance (assetId) = if ((assetId == "WAVES"))
177179 then wavesBalance(this).available
178180 else assetBalance(this, fromBase58String(assetId))
179181
180182
181-func cpbi (prAmtX18,amAmtX18) = fraction(prAmtX18, scale18, amAmtX18)
183+func calcPriceBigInt (prAmtX18,amAmtX18) = fraction(prAmtX18, scale18, amAmtX18)
182184
183185
184-func vad (A1,A2,slippage) = {
185- let diff = fraction((A1 - A2), scale8BigInt, A2)
186+func validateAbsDiff (estimateLP,outLp,slippage) = {
187+ let diff = fraction((estimateLP - outLp), scale8BigInt, outLp)
186188 let pass = ((slippage - abs(diff)) > zeroBigInt)
187189 if (!(pass))
188- then throw(("Big slpg: " + toString(diff)))
189- else $Tuple2(pass, min([A1, A2]))
190+ then throwErr(("Big slippage: " + toString(diff)))
191+ else $Tuple2(pass, min([estimateLP, outLp]))
190192 }
191193
192194
193-func vd (D1,D0,slpg) = {
195+func validateD (D1,D0,slippage) = {
194196 let diff = fraction(D0, scale8BigInt, D1)
195- let fail = (slpg > diff)
197+ let fail = (slippage > diff)
196198 if (if (fail)
197199 then true
198200 else (D0 > D1))
199- then throw(((((((toString(D0) + " ") + toString(D1)) + " ") + toString(diff)) + " ") + toString(slpg)))
201+ then throwErr(((((((toString(D0) + " ") + toString(D1)) + " ") + toString(diff)) + " ") + toString(slippage)))
200202 else fail
201203 }
202204
203205
204-func pcp (amAssetDcm,prAssetDcm,amAmt,prAmt) = {
205- let amtAsAmtX18 = t1(amAmt, amAssetDcm)
206- let prAsAmtX18 = t1(prAmt, prAssetDcm)
207- cpbi(prAsAmtX18, amtAsAmtX18)
206+func privateCalcPrice (amAssetDcm,prAssetDcm,amAmt,prAmt) = {
207+ let amtAsAmtX18 = toX18(amAmt, amAssetDcm)
208+ let prAsAmtX18 = toX18(prAmt, prAssetDcm)
209+ calcPriceBigInt(prAsAmtX18, amtAsAmtX18)
208210 }
209211
210212
211213 func calcPrices (amAmt,prAmt,lpAmt) = {
212- let cfg = gpc()
214+ let cfg = getPoolConfig()
213215 let amtAsDcm = parseIntValue(cfg[idxAmtAsDcm])
214216 let prAsDcm = parseIntValue(cfg[idxPriceAsDcm])
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)
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)
221223 [priceX18, lpPrInAmAsX18, lpPrInPrAsX18]
222224 }
223225
224226
225227 func calculatePrices (amAmt,prAmt,lpAmt) = {
226228 let p = calcPrices(amAmt, prAmt, lpAmt)
227-[f1(p[0], scale8), f1(p[1], scale8), f1(p[2], scale8)]
229+[fromX18(p[0], scale8), fromX18(p[1], scale8), fromX18(p[2], scale8)]
228230 }
229231
230232
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])
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])
238240 let sts = cfg[idxPoolSt]
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 amBalanceX18 = t1(amBalance, amDcm)
245- let prBalance = getAccBalance(prId)
246- let prBalanceX18 = t1(prBalance, prDcm)
247- let curPriceX18 = cpbi(prBalanceX18, amBalanceX18)
248- let curPrice = f1(curPriceX18, scale8)
249- let pmtLpAmtX18 = t1(pmtLpAmt, scale8)
250- let lpEmissX18 = t1(lpEmiss, scale8)
251- let outAmAmtX18 = fraction(amBalanceX18, pmtLpAmtX18, lpEmissX18)
252- let outPrAmtX18 = fraction(prBalanceX18, pmtLpAmtX18, lpEmissX18)
253- let outAmAmt = f1(outAmAmtX18, amDcm)
254- let outPrAmt = f1(outPrAmtX18, prDcm)
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)
255263 let state = if ((txId58 == ""))
256264 then nil
257- else [ScriptTransfer(userAddress, outAmAmt, if ((amId == "WAVES"))
265+ else [ScriptTransfer(userAddress, outAmountAmount, if ((amountId == "WAVES"))
258266 then unit
259- else fromBase58String(amId)), ScriptTransfer(userAddress, outPrAmt, if ((prId == "WAVES"))
267+ else fromBase58String(amountId)), ScriptTransfer(userAddress, outPriceAmount, if ((priceId == "WAVES"))
260268 then unit
261- 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)]
262- $Tuple10(outAmAmt, outPrAmt, amId, prId, amBalance, prBalance, lpEmiss, curPriceX18, sts, state)
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)
263271 }
272+ else throw("Strict value is not equal to itself.")
264273 }
265274
266275
267-func epo (txId58,slippage,inAmAmt,inAmId,inPrAmt,inPrId,userAddress,isEval,emitLp,isOneAsset,pmtAmt,pmtId) = {
268- let cfg = gpc()
269- let lpId = fromBase58String(cfg[idxLPAsId])
270- let amIdStr = cfg[idxAmAsId]
271- let prIdStr = cfg[idxPrAsId]
272- let inAmIdStr = cfg[idxIAmtAsId]
273- let inPrIdStr = cfg[idxIPriceAsId]
274- let amtDcm = parseIntValue(cfg[idxAmtAsDcm])
275- let priceDcm = parseIntValue(cfg[idxPriceAsDcm])
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])
276285 let sts = cfg[idxPoolSt]
277- let lpEm = valueOrErrorMessage(assetInfo(lpId), "Wr lp as").quantity
278- let amBalance = if (isEval)
279- then getAccBalance(amIdStr)
286+ let lpEmission = valueOrErrorMessage(assetInfo(lpAssetId), "Wrong lp asset").quantity
287+ let amountBalance = if (isEvaluate)
288+ then getAccBalance(amountIdStr)
280289 else if (if (isOneAsset)
281- then (pmtId == amIdStr)
290+ then (paymentId == amountIdStr)
282291 else false)
283- then (getAccBalance(amIdStr) - pmtAmt)
292+ then (getAccBalance(amountIdStr) - paymentAmount)
284293 else if (isOneAsset)
285- then getAccBalance(amIdStr)
286- else (getAccBalance(amIdStr) - inAmAmt)
287- let prBalance = if (isEval)
288- then getAccBalance(prIdStr)
294+ then getAccBalance(amountIdStr)
295+ else (getAccBalance(amountIdStr) - inAmountAssetAmount)
296+ let priceBalance = if (isEvaluate)
297+ then getAccBalance(priceIdStr)
289298 else if (if (isOneAsset)
290- then (pmtId == prIdStr)
299+ then (paymentId == priceIdStr)
291300 else false)
292- then (getAccBalance(prIdStr) - pmtAmt)
301+ then (getAccBalance(priceIdStr) - paymentAmount)
293302 else if (isOneAsset)
294- then getAccBalance(prIdStr)
295- else (getAccBalance(prIdStr) - inPrAmt)
296- let inAmAssetAmtX18 = t1(inAmAmt, amtDcm)
297- let inPrAssetAmtX18 = t1(inPrAmt, priceDcm)
298- let userPriceX18 = cpbi(inPrAssetAmtX18, inAmAssetAmtX18)
299- let amBalanceX18 = t1(amBalance, amtDcm)
300- let prBalanceX18 = t1(prBalance, priceDcm)
301- let r = if ((lpEm == 0))
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))
302315 then {
303- let curPriceX18 = zeroBigInt
316+ let currentPriceX18 = zeroBigInt
304317 let slippageX18 = zeroBigInt
305- let lpAmtX18 = pow((inAmAssetAmtX18 * inPrAssetAmtX18), 0, toBigInt(5), 1, 0, DOWN)
306- $Tuple5(f1(lpAmtX18, scale8), f1(inAmAssetAmtX18, amtDcm), f1(inPrAssetAmtX18, priceDcm), cpbi((prBalanceX18 + inPrAssetAmtX18), (amBalanceX18 + inAmAssetAmtX18)), slippageX18)
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)
307320 }
308321 else {
309- let curPriceX18 = cpbi(prBalanceX18, amBalanceX18)
310- let slippageRealX18 = fraction(abs((curPriceX18 - userPriceX18)), scale18, curPriceX18)
311- let slippageX18 = t1(slippage, scale8)
312- if (if ((curPriceX18 != zeroBigInt))
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))
313326 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)
342+ }
343+ else throw("Strict value is not equal to itself.")
344+ }
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))
356+ 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)
314362 else false)
315- then throw(((("Price slippage " + toString(slippageRealX18)) + " > ") + toString(slippageX18)))
316- else {
317- let lpEmissionX18 = t1(lpEm, scale8)
318- let prViaAmX18 = fraction(inAmAssetAmtX18, curPriceX18, scale18)
319- let amViaPrX18 = fraction(inPrAssetAmtX18, scale18, curPriceX18)
320- let expectedAmts = if ((prViaAmX18 > inPrAssetAmtX18))
321- then $Tuple2(amViaPrX18, inPrAssetAmtX18)
322- else $Tuple2(inAmAssetAmtX18, prViaAmX18)
323- let expAmtAssetAmtX18 = expectedAmts._1
324- let expPriceAssetAmtX18 = expectedAmts._2
325- let lpAmtX18 = fraction(lpEmissionX18, expPriceAssetAmtX18, prBalanceX18)
326- $Tuple5(f1(lpAmtX18, scale8), f1(expAmtAssetAmtX18, amtDcm), f1(expPriceAssetAmtX18, priceDcm), curPriceX18, slippageX18)
327- }
363+ then $Tuple2(paymentAmount, 0)
364+ else if (if (isOneAsset)
365+ then (paymentId == priceIdStr)
366+ 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)
328373 }
329- let calcLpAmt = r._1
330- let calcAmAssetPmt = r._2
331- let calcPrAssetPmt = r._3
332- let curPrice = f1(r._4, scale8)
333- let slippageCalc = f1(r._5, scale8)
334- if ((0 >= calcLpAmt))
335- then throw("LP <= 0")
336- else {
337- let emitLpAmt = if (!(emitLp))
338- then 0
339- else calcLpAmt
340- let amDiff = (inAmAmt - calcAmAssetPmt)
341- let prDiff = (inPrAmt - calcPrAssetPmt)
342- let $t01558715932 = if (if (isOneAsset)
343- then (pmtId == amIdStr)
344- else false)
345- then $Tuple2(pmtAmt, 0)
346- else if (if (isOneAsset)
347- then (pmtId == prIdStr)
348- else false)
349- then $Tuple2(0, pmtAmt)
350- else $Tuple2(calcAmAssetPmt, calcPrAssetPmt)
351- let writeAmAmt = $t01558715932._1
352- let writePrAmt = $t01558715932._2
353- 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))]
354- $Tuple13(calcLpAmt, emitLpAmt, curPrice, amBalance, prBalance, lpEm, lpId, sts, commonState, amDiff, prDiff, inAmId, inPrId)
355- }
374+ else throw("Strict value is not equal to itself.")
356375 }
357376
358377
359-func moa (order) = {
360- let cfg = gpc()
378+func validateMatcherOrderAllowed (order) = {
379+ let cfg = getPoolConfig()
361380 let amtAsId = cfg[idxAmAsId]
362381 let prAsId = cfg[idxPrAsId]
363382 let sts = parseIntValue(cfg[idxPoolSt])
364383 let amtAsDcm = parseIntValue(cfg[idxAmtAsDcm])
365384 let prAsDcm = parseIntValue(cfg[idxPriceAsDcm])
366385 let accAmtAsBalance = getAccBalance(amtAsId)
367386 let accPrAsBalance = getAccBalance(prAsId)
368- let curPriceX18 = if ((order.orderType == Buy))
369- then pcp(amtAsDcm, prAsDcm, (accAmtAsBalance + order.amount), accPrAsBalance)
370- else pcp(amtAsDcm, prAsDcm, (accAmtAsBalance - order.amount), accPrAsBalance)
371- let curPrice = f1(curPriceX18, scale8)
372- if (if (if (igs())
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())
373392 then true
374393 else (sts == PoolMatcherDis))
375394 then true
376395 else (sts == PoolShutdown))
377- then throw("Admin blocked")
396+ then throwErr("Admin blocked")
378397 else {
379398 let orAmtAsset = order.assetPair.amountAsset
380399 let orAmtAsStr = if ((orAmtAsset == unit))
381400 then "WAVES"
382401 else toBase58String(value(orAmtAsset))
383402 let orPrAsset = order.assetPair.priceAsset
384403 let orPrAsStr = if ((orPrAsset == unit))
385404 then "WAVES"
386405 else toBase58String(value(orPrAsset))
387406 if (if ((orAmtAsStr != amtAsId))
388407 then true
389408 else (orPrAsStr != prAsId))
390- then throw("Wr assets")
409+ then throwErr("Wr assets")
391410 else {
392411 let orderPrice = order.price
393- let priceDcm = fraction(scale8, prAsDcm, amtAsDcm)
394- let castOrderPrice = ts(orderPrice, scale8, priceDcm)
412+ let priceDecimals = fraction(scale8, prAsDcm, amtAsDcm)
413+ let castOrderPrice = ts(orderPrice, scale8, priceDecimals)
395414 let isOrderPriceValid = if ((order.orderType == Buy))
396415 then (curPrice >= castOrderPrice)
397416 else (castOrderPrice >= curPrice)
398417 true
399418 }
400419 }
401420 }
402421
403422
404-func cg (i) = if ((size(i.payments) != 1))
405- then throw("1 pmnt exp")
406- else {
407- let pmt = value(i.payments[0])
408- let pmtAssetId = value(pmt.assetId)
409- let pmtAmt = pmt.amount
410- let r = ego(toBase58String(i.transactionId), toBase58String(pmtAssetId), pmtAmt, i.caller)
411- let outAmAmt = r._1
412- let outPrAmt = r._2
413- let sts = parseIntValue(r._9)
414- let state = r._10
415- if (if (igs())
416- then true
417- else (sts == PoolShutdown))
418- then throw(("Admin blocked: " + toString(sts)))
419- else $Tuple5(outAmAmt, outPrAmt, pmtAmt, pmtAssetId, state)
420- }
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+ }
421445
422446
423-func cp (caller,txId,amAsPmt,prAsPmt,slippage,emitLp,isOneAsset,pmtAmt,pmtId) = {
424- let r = epo(txId, slippage, value(amAsPmt).amount, value(amAsPmt).assetId, value(prAsPmt).amount, value(prAsPmt).assetId, caller, false, emitLp, isOneAsset, pmtAmt, pmtId)
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)
425449 let sts = parseIntValue(r._8)
426- if (if (if (igs())
450+ if (if (if (isGlobalShutdown())
427451 then true
428452 else (sts == PoolPutDis))
429453 then true
430454 else (sts == PoolShutdown))
431- then throw(("Blocked:" + toString(sts)))
455+ then throwErr(("Blocked:" + toString(sts)))
432456 else r
433457 }
434458
435459
436460 func takeFee (amount) = {
437461 let fee = fraction(amount, feePermille, thousand)
438462 $Tuple2((amount - fee), fee)
439463 }
440464
441465
442-func m () = match getString(mpk()) {
466+func managerPublicKeyOrUnit () = match getString(keyManagerPublicKey()) {
443467 case s: String =>
444468 fromBase58String(s)
445469 case _: Unit =>
446470 unit
447471 case _ =>
448472 throw("Match error")
449473 }
450474
451475
452-func pm () = match getString(pmpk()) {
476+func pendingManagerPublicKeyOrUnit () = match getString(keyPendingManagerPublicKey()) {
453477 case s: String =>
454478 fromBase58String(s)
455479 case _: Unit =>
456480 unit
457481 case _ =>
458482 throw("Match error")
459483 }
460484
461485
462-let pd = throw("Permission denied")
486+let pd = throwErr("Permission denied")
463487
464-func mm (i) = match m() {
488+func mustManager (i) = match managerPublicKeyOrUnit() {
465489 case pk: ByteVector =>
466490 if ((i.callerPublicKey == pk))
467491 then true
468492 else pd
469493 case _: Unit =>
470494 if ((i.caller == this))
471495 then true
472496 else pd
473497 case _ =>
474498 throw("Match error")
475499 }
476500
477501
478502 @Callable(i)
479-func constructor (fc) = {
480- let c = mm(i)
481- if ((c == c))
482- then [StringEntry(fc(), fc)]
503+func constructor (factoryContract) = {
504+ let checkCaller = mustManager(i)
505+ if ((checkCaller == checkCaller))
506+ then [StringEntry(keyFactoryContact(), factoryContract)]
483507 else throw("Strict value is not equal to itself.")
484508 }
485509
486510
487511
488512 @Callable(i)
489513 func setManager (pendingManagerPublicKey) = {
490- let c = mm(i)
491- if ((c == c))
514+ let checkCaller = mustManager(i)
515+ if ((checkCaller == checkCaller))
492516 then {
493- let cm = fromBase58String(pendingManagerPublicKey)
494- if ((cm == cm))
495- then [StringEntry(pmpk(), pendingManagerPublicKey)]
517+ let checkManagerPublicKey = fromBase58String(pendingManagerPublicKey)
518+ if ((checkManagerPublicKey == checkManagerPublicKey))
519+ then [StringEntry(keyPendingManagerPublicKey(), pendingManagerPublicKey)]
496520 else throw("Strict value is not equal to itself.")
497521 }
498522 else throw("Strict value is not equal to itself.")
499523 }
500524
501525
502526
503527 @Callable(i)
504528 func confirmManager () = {
505- let p = pm()
506- let hpm = if (isDefined(p))
529+ let pm = pendingManagerPublicKeyOrUnit()
530+ let hasPM = if (isDefined(pm))
507531 then true
508- else throw("No pending manager")
509- if ((hpm == hpm))
532+ else throwErr("No pending manager")
533+ if ((hasPM == hasPM))
510534 then {
511- let cpm = if ((i.callerPublicKey == value(p)))
535+ let checkPM = if ((i.callerPublicKey == value(pm)))
512536 then true
513- else throw("You are not pending manager")
514- if ((cpm == cpm))
515- then [StringEntry(mpk(), toBase58String(value(p))), DeleteEntry(pmpk())]
537+ else throwErr("You are not pending manager")
538+ if ((checkPM == checkPM))
539+ then [StringEntry(keyManagerPublicKey(), toBase58String(value(pm))), DeleteEntry(keyPendingManagerPublicKey())]
516540 else throw("Strict value is not equal to itself.")
517541 }
518542 else throw("Strict value is not equal to itself.")
519543 }
520544
521545
522546
523547 @Callable(i)
524-func put (slip,autoStake) = {
525- let factCfg = gfc()
526- let stakingCntr = valueOrErrorMessage(addressFromString(factCfg[idxFactStakCntr]), "Wr st addr")
527- let slipCntr = valueOrErrorMessage(addressFromString(factCfg[idxFactSlippCntr]), "Wr sl addr")
528- if ((0 > slip))
529- then throw("Wrong slippage")
530- else if ((size(i.payments) != 2))
531- then throw("2 pmnts expd")
532- else {
533- 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, "")
534- let emitLpAmt = e._2
535- let lpAssetId = e._7
536- let state = e._9
537- let amDiff = e._10
538- let prDiff = e._11
539- let amId = e._12
540- let prId = e._13
541- let r = invoke(fca, "emit", [emitLpAmt], nil)
542- if ((r == r))
543- then {
544- let el = match r {
545- case legacy: Address =>
546- invoke(legacy, "emit", [emitLpAmt], nil)
547- case _ =>
548- unit
549- }
550- if ((el == el))
551- then {
552- let sa = if ((amDiff > 0))
553- then invoke(slipCntr, "put", nil, [AttachedPayment(amId, amDiff)])
554- else nil
555- if ((sa == sa))
556- then {
557- let sp = if ((prDiff > 0))
558- then invoke(slipCntr, "put", nil, [AttachedPayment(prId, prDiff)])
559- else nil
560- if ((sp == sp))
561- then {
562- let lpTrnsfr = if (autoStake)
563- then {
564- let ss = invoke(stakingCntr, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmt)])
565- if ((ss == ss))
566- then nil
567- else throw("Strict value is not equal to itself.")
568- }
569- else [ScriptTransfer(i.caller, emitLpAmt, lpAssetId)]
570- (state ++ lpTrnsfr)
571- }
572- else throw("Strict value is not equal to itself.")
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- }
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.")
580612 }
581613
582614
583615
584616 @Callable(i)
585-func putOneTkn (amAssetPart,prAssetPart,outLp,slippage,autoStake) = {
586- let cfg = gfc()
587- let stakingCntr = valueOrErrorMessage(addressFromString(cfg[idxFactStakCntr]), "Wr st addr")
588- let slipCntr = valueOrErrorMessage(addressFromString(cfg[idxFactSlippCntr]), "Wr sl addr")
589- let gwxCntr = valueOrErrorMessage(addressFromString(cfg[idxFactGwxRewCntr]), "Wr gwx addr")
590- let poolCfg = gpc()
591- let amId = poolCfg[idxAmAsId]
592- let prId = poolCfg[idxPrAsId]
593- let amDcm = parseIntValue(poolCfg[idxAmtAsDcm])
594- let prDcm = parseIntValue(poolCfg[idxPriceAsDcm])
595- let addon = valueOrElse(getString(this, ada()), "")
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()), "")
596628 let userAddress = if ((addon == toString(i.caller)))
597629 then i.originCaller
598630 else i.caller
599631 if (if (if (if ((0 >= slippage))
600632 then true
601- else (0 >= amAssetPart))
633+ else (0 >= amountAssetPart))
602634 then true
603- else (0 >= prAssetPart))
635+ else (0 >= priceAssetPart))
604636 then true
605637 else (0 >= outLp))
606- then throw("Wrong params")
638+ then throwErr("Wrong params")
607639 else if ((size(i.payments) != 1))
608- then throw("1 pmnt expd")
640+ then throwErr("1 payment expected")
609641 else {
610- let pmt = value(i.payments[0])
611- let pmtAssetId = toBase58String(value(pmt.assetId))
612- let paymentAmountRaw = pmt.amount
613- let $t02454924601 = takeFee(paymentAmountRaw)
614- let pmtAmt = $t02454924601._1
615- let feeAmount = $t02454924601._2
616- if ((10000000 > paymentAmountRaw))
617- then throw("Wrong pmt amt")
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")
618654 else {
619- let amBalance = getAccBalance(amId)
620- let prBalance = getAccBalance(prId)
621- let $t02476125337 = if ((pmtAssetId == amId))
622- then if (if ((pmtAmt > amBalance))
623- then true
624- else (amAssetPart > pmtAmt))
625- then throw("invalid payment amount")
626- else $Tuple6((amBalance - pmtAmt), prBalance, (pmtAmt - amAssetPart), prAssetPart, 0, 0)
627- else if ((pmtAssetId == prId))
628- then if (if ((pmtAmt > prBalance))
629- then true
630- else (prAssetPart > pmtAmt))
631- then throw("invalid payment amount")
632- else $Tuple6(amBalance, (prBalance - pmtAmt), 0, 0, (pmtAmt - prAssetPart), amAssetPart)
633- else throw("wrong pmtAssetId")
634- let amBalanceNow = $t02476125337._1
635- let prBalanceNow = $t02476125337._2
636- let virtSwapInAm = $t02476125337._3
637- let virtSwapOutPr = $t02476125337._4
638- let virtSwapInPr = $t02476125337._5
639- let virtSwapOutAm = $t02476125337._6
640- let D0 = invoke(gwxCntr, "calcD", [toString(amBalanceNow), toString(prBalanceNow), A, Amult, Dconv], nil)
641- let D1 = invoke(gwxCntr, "calcD", [toString(toBigInt(((amBalanceNow + virtSwapInAm) - virtSwapOutAm))), toString(toBigInt(((prBalanceNow + virtSwapInPr) - virtSwapOutPr))), A, Amult, Dconv], nil)
642- let D0vsD1 = vd(parseBigIntValue(str(D1)), parseBigIntValue(str(D0)), slippage4D)
655+ let amountBalance = getAccBalance(amountId)
656+ let priceBalance = getAccBalance(priceId)
657+ let $t02689327348 = if ((paymentAssetId == amountId))
658+ then $Tuple6((amountBalance - paymentAmount), priceBalance, (paymentAmount - amountAssetPart), priceAssetPart, 0, 0)
659+ else if ((paymentAssetId == priceId))
660+ then $Tuple6(amountBalance, (priceBalance - paymentAmount), 0, 0, (paymentAmount - priceAssetPart), amountAssetPart)
661+ else throwErr("wrong paymentAssetId")
662+ let amountBalanceNow = $t02689327348._1
663+ let priceBalanceNow = $t02689327348._2
664+ let virtSwapInAm = $t02689327348._3
665+ let virtSwapOutPr = $t02689327348._4
666+ let virtSwapInPr = $t02689327348._5
667+ let virtSwapOutAm = $t02689327348._6
668+ let D0 = invoke(gwxRewardContract, "calcD", [toString(amountBalanceNow), toString(priceBalanceNow), amplificator, Amult, Dconv], nil)
669+ let D1 = invoke(gwxRewardContract, "calcD", [toString(toBigInt(((amountBalanceNow + virtSwapInAm) - virtSwapOutAm))), toString(toBigInt(((priceBalanceNow + virtSwapInPr) - virtSwapOutPr))), amplificator, Amult, Dconv], nil)
670+ let D0vsD1 = validateD(parseBigIntValue(str(D1)), parseBigIntValue(str(D0)), slippage4D)
643671 if ((D0vsD1 == D0vsD1))
644672 then {
645- let estPut = cp(toString(i.caller), toBase58String(i.transactionId), AttachedPayment(fromBase58String(amId), amAssetPart), AttachedPayment(fromBase58String(prId), prAssetPart), slippage, true, true, pmtAmt, pmtAssetId)
646- let estimLP = estPut._2
647- let lpAssetId = estPut._7
648- let state = estPut._9
649- let amDiff = estPut._10
650- let prDiff = estPut._11
651- let lpCalcRes = vad(toBigInt(estimLP), toBigInt(outLp), toBigInt(slippage))
652- let emitLpAmt = toInt(lpCalcRes._2)
653- let e = invoke(fca, "emit", [emitLpAmt], nil)
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)
654682 if ((e == e))
655683 then {
656684 let el = match e {
657685 case legacy: Address =>
658- invoke(legacy, "emit", [emitLpAmt], nil)
686+ invoke(legacy, "emit", [emitLpAmount], nil)
659687 case _ =>
660688 unit
661689 }
662690 if ((el == el))
663691 then {
664- let sa = if ((amDiff > 0))
665- then invoke(slipCntr, "put", nil, [AttachedPayment(fromBase58String(amId), amDiff)])
692+ let sa = if ((amountDiff > 0))
693+ then invoke(slippageContract, "put", nil, [AttachedPayment(fromBase58String(amountId), amountDiff)])
666694 else nil
667695 if ((sa == sa))
668696 then {
669- let sp = if ((prDiff > 0))
670- then invoke(slipCntr, "put", nil, [AttachedPayment(fromBase58String(prId), prDiff)])
697+ let sp = if ((priceDiff > 0))
698+ then invoke(slippageContract, "put", nil, [AttachedPayment(fromBase58String(priceId), priceDiff)])
671699 else nil
672700 if ((sp == sp))
673701 then {
674- let lpTrnsfr = if (autoStake)
702+ let lpTrasfer = if (autoStake)
675703 then {
676- let ss = invoke(stakingCntr, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmt)])
704+ let ss = invoke(stakingContract, "stake", nil, [AttachedPayment(lpAssetId, emitLpAmount)])
677705 if ((ss == ss))
678706 then nil
679707 else throw("Strict value is not equal to itself.")
680708 }
681- else [ScriptTransfer(i.caller, emitLpAmt, lpAssetId)]
709+ else [ScriptTransfer(i.caller, emitLpAmount, lpAssetId)]
682710 let sendFeeToMatcher = if ((feeAmount > 0))
683- then [ScriptTransfer(matcherAddress, feeAmount, fromBase58String(pmtAssetId))]
711+ then [ScriptTransfer(matcherAddress, feeAmount, fromBase58String(paymentAssetId))]
684712 else nil
685- ((state ++ lpTrnsfr) ++ sendFeeToMatcher)
713+ ((state ++ lpTrasfer) ++ sendFeeToMatcher)
686714 }
687715 else throw("Strict value is not equal to itself.")
688716 }
689717 else throw("Strict value is not equal to itself.")
690718 }
691719 else throw("Strict value is not equal to itself.")
692720 }
693721 else throw("Strict value is not equal to itself.")
694722 }
695723 else throw("Strict value is not equal to itself.")
696724 }
697725 }
698726 }
699727
700728
701729
702730 @Callable(i)
703-func putForFree (maxSlpg) = if ((0 > maxSlpg))
704- then throw("Wrong slpg")
731+func putForFree (maxslippage) = if ((0 > maxslippage))
732+ then throwErr("wrong slippage")
705733 else if ((size(i.payments) != 2))
706- then throw("2 pmnts expd")
734+ then throwErr("2 payments expected")
707735 else {
708- 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, "")
709- estPut._9
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
710738 }
711739
712740
713741
714742 @Callable(i)
715743 func get () = {
716- let r = cg(i)
744+ let r = commonGet(i)
717745 let outAmtAmt = r._1
718- let outPrAmt = r._2
719- let pmtAmt = r._3
720- let pmtAssetId = r._4
746+ let outPriceAmount = r._2
747+ let paymentAmount = r._3
748+ let paymentAssetId = r._4
721749 let state = r._5
722- let b = invoke(fca, "burn", [pmtAmt], [AttachedPayment(pmtAssetId, pmtAmt)])
750+ let b = invoke(factoryContract, "burn", [paymentAmount], [AttachedPayment(paymentAssetId, paymentAmount)])
723751 if ((b == b))
724752 then state
725753 else throw("Strict value is not equal to itself.")
726754 }
727755
728756
729757
730758 @Callable(i)
731759 func getOneTkn (exchResult,notUsed,outAmount,outAssetId,slippage) = if ((size(i.payments) != 1))
732- then throw("1 pmnt expd")
760+ then throwErr("1 payment expected")
733761 else {
734- let cfg = gpc()
735- let lpId = cfg[idxLPAsId]
736- let amId = cfg[idxAmAsId]
737- let prId = cfg[idxPrAsId]
738- let amDcm = parseIntValue(cfg[idxAmtAsDcm])
739- let prDcm = parseIntValue(cfg[idxPriceAsDcm])
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])
740768 let sts = cfg[idxPoolSt]
741- let factCfg = gfc()
742- let gwxCntr = valueOrErrorMessage(addressFromString(factCfg[idxFactGwxRewCntr]), "Wr sl addr")
743- let pmt = value(i.payments[0])
744- let addon = valueOrElse(getString(this, ada()), "")
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()), "")
745773 let userAddress = if ((addon == toString(i.caller)))
746774 then i.originCaller
747775 else i.caller
748776 let txId58 = toBase58String(i.transactionId)
749- let pmtAssetId = value(pmt.assetId)
750- let pmtAmt = pmt.amount
751- if ((1000000000 > pmtAmt))
752- then throw("Min pmt 10 LP")
777+ let paymentAssetId = value(payment.assetId)
778+ let paymentAmount = payment.amount
779+ if ((1000000000 > paymentAmount))
780+ then throwErr("Min payment 10 LP")
753781 else if (if (if ((0 > slippage))
754782 then true
755783 else (0 > exchResult))
756784 then true
757785 else (0 > outAmount))
758- then throw("Wrong params")
759- else if ((lpId != toBase58String(pmtAssetId)))
760- then throw("Wrong LP")
786+ then throwErr("Wrong params")
787+ else if ((lpAssetId != toBase58String(paymentAssetId)))
788+ then throwErr("Wrong LP")
761789 else {
762- let r = ego(toBase58String(i.transactionId), toBase58String(pmtAssetId), pmtAmt, i.caller)
790+ let r = estimateGetOperation(toBase58String(i.transactionId), toBase58String(paymentAssetId), paymentAmount, i.caller)
763791 let estimAmAmt = r._1
764792 let estimPrAmt = r._2
765- let amBalance = getAccBalance(amId)
766- let prBalance = getAccBalance(prId)
767- let $t03027530735 = if ((outAssetId == amId))
768- then $Tuple7((amBalance - estimAmAmt), (prBalance - estimPrAmt), exchResult, estimPrAmt, 0, 0, (estimAmAmt + exchResult))
769- else if ((outAssetId == prId))
770- then $Tuple7((amBalance - estimAmAmt), (prBalance - estimPrAmt), 0, 0, exchResult, estimAmAmt, (estimPrAmt + exchResult))
771- else throw("wrong outAssetId")
772- let amBalanceNow = $t03027530735._1
773- let prBalanceNow = $t03027530735._2
774- let virtSwapInAm = $t03027530735._3
775- let virtSwapOutPr = $t03027530735._4
776- let virtSwapInPr = $t03027530735._5
777- let virtSwapOutAm = $t03027530735._6
778- let totalGetRaw = $t03027530735._7
793+ let amountBalance = getAccBalance(amountId)
794+ let priceBalance = getAccBalance(priceId)
795+ let $t03249632964 = if ((outAssetId == amountId))
796+ then $Tuple7((amountBalance - estimAmAmt), (priceBalance - estimPrAmt), exchResult, estimPrAmt, 0, 0, (estimAmAmt + exchResult))
797+ else if ((outAssetId == priceId))
798+ then $Tuple7((amountBalance - estimAmAmt), (priceBalance - estimPrAmt), 0, 0, exchResult, estimAmAmt, (estimPrAmt + exchResult))
799+ else throwErr("wrong outAssetId")
800+ let amountBalanceNow = $t03249632964._1
801+ let priceBalanceNow = $t03249632964._2
802+ let virtSwapInAm = $t03249632964._3
803+ let virtSwapOutPr = $t03249632964._4
804+ let virtSwapInPr = $t03249632964._5
805+ let virtSwapOutAm = $t03249632964._6
806+ let totalGet = $t03249632964._7
779807 if (if ((0 > virtSwapInAm))
780808 then true
781809 else (0 > virtSwapInPr))
782- then throw("Wrong calc")
810+ then throwErr("Wrong calc")
783811 else {
784- let D0 = invoke(gwxCntr, "calcD", [toString(amBalanceNow), toString(prBalanceNow), A, Amult, Dconv], nil)
785- let D1 = invoke(gwxCntr, "calcD", [toString(((amBalanceNow - virtSwapInAm) + virtSwapOutAm)), toString(((prBalanceNow + virtSwapOutPr) - virtSwapInPr)), A, Amult, Dconv], nil)
786- let D0vsD1 = vd(parseBigIntValue(str(D1)), parseBigIntValue(str(D0)), slippage4D)
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)
787815 if ((D0vsD1 == D0vsD1))
788816 then {
789- let totalGet = takeFee(totalGetRaw)._1
790- let finalRes = vad(toBigInt(totalGet), toBigInt(outAmount), toBigInt(slippage))
817+ let finalRes = validateAbsDiff(toBigInt(totalGet), toBigInt(outAmount), toBigInt(slippage))
791818 if ((finalRes == finalRes))
792819 then {
793- let $t03148231586 = if ((outAssetId == amId))
820+ let $t03363333741 = if ((outAssetId == amountId))
794821 then $Tuple2(toInt(finalRes._2), 0)
795822 else $Tuple2(0, toInt(finalRes._2))
796- let outAm = $t03148231586._1
797- let outPr = $t03148231586._2
798- let totalAmount = (outAm + outPr)
799- let feeAmount = (totalGetRaw - totalGet)
823+ let outAm = $t03363333741._1
824+ let outPr = $t03363333741._2
825+ let totalAmountRaw = (outAm + outPr)
826+ let $t03378133836 = takeFee(totalAmountRaw)
827+ let totalAmount = $t03378133836._1
828+ let feeAmount = $t03378133836._2
800829 let outAssetIdOrWaves = if ((outAssetId == "WAVES"))
801830 then unit
802831 else fromBase58String(outAssetId)
803832 let sendFeeToMatcher = if ((feeAmount > 0))
804833 then [ScriptTransfer(matcherAddress, feeAmount, outAssetIdOrWaves)]
805834 else nil
806- let curPrX18 = cpbi(t1(prBalance, prDcm), t1(amBalance, amDcm))
807- let curPr = f1(curPrX18, scale8)
808- let state = [ScriptTransfer(userAddress, totalAmount, outAssetIdOrWaves), StringEntry(gau(toString(userAddress), txId58), dataGetActionInfo(outAm, outPr, pmtAmt, curPr, height, lastBlock.timestamp)), IntegerEntry(pl(), curPr), IntegerEntry(ph(height, lastBlock.timestamp), curPr)]
809- if ((state == state))
835+ let decimals = if ((amountDecimals >= priceDecimals))
836+ then amountDecimals
837+ else priceDecimals
838+ if ((decimals == decimals))
810839 then {
811- let burn = invoke(fca, "burn", [pmtAmt], [AttachedPayment(pmtAssetId, pmtAmt)])
812- if ((burn == burn))
813- then (state ++ sendFeeToMatcher)
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+ }
814850 else throw("Strict value is not equal to itself.")
815851 }
816852 else throw("Strict value is not equal to itself.")
817853 }
818854 else throw("Strict value is not equal to itself.")
819855 }
820856 else throw("Strict value is not equal to itself.")
821857 }
822858 }
823859 }
824860
825861
826862
827863 @Callable(i)
828864 func getNoLess (noLessThenAmtAsset,noLessThenPriceAsset) = {
829- let r = cg(i)
830- let outAmAmt = r._1
831- let outPrAmt = r._2
832- let pmtAmt = r._3
833- let pmtAssetId = r._4
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
834870 let state = r._5
835- if ((noLessThenAmtAsset > outAmAmt))
836- then throw(((("Failed: " + toString(outAmAmt)) + " < ") + toString(noLessThenAmtAsset)))
837- else if ((noLessThenPriceAsset > outPrAmt))
838- then throw(((("Failed: " + toString(outPrAmt)) + " < ") + toString(noLessThenPriceAsset)))
839- else {
840- let burnLPAssetOnFactory = invoke(fca, "burn", [pmtAmt], [AttachedPayment(pmtAssetId, pmtAmt)])
841- if ((burnLPAssetOnFactory == burnLPAssetOnFactory))
842- then state
843- else throw("Strict value is not equal to itself.")
844- }
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.")
845889 }
846890
847891
848892
849893 @Callable(i)
850894 func unstakeAndGet (amount) = {
851895 let checkPayments = if ((size(i.payments) != 0))
852- then throw("No pmnts expd")
896+ then throwErr("no payments expected")
853897 else true
854898 if ((checkPayments == checkPayments))
855899 then {
856- let cfg = gpc()
857- let factoryCfg = gfc()
900+ let cfg = getPoolConfig()
901+ let factoryCfg = getFactoryConfig()
858902 let lpAssetId = fromBase58String(cfg[idxLPAsId])
859- let staking = valueOrErrorMessage(addressFromString(factoryCfg[idxFactStakCntr]), "Wr st addr")
903+ let staking = valueOrErrorMessage(addressFromString(factoryCfg[idxFactStakCntr]), "wrong")
860904 let unstakeInv = invoke(staking, "unstake", [toBase58String(lpAssetId), amount], nil)
861905 if ((unstakeInv == unstakeInv))
862906 then {
863- let r = ego(toBase58String(i.transactionId), toBase58String(lpAssetId), amount, i.caller)
907+ let r = estimateGetOperation(toBase58String(i.transactionId), toBase58String(lpAssetId), amount, i.caller)
864908 let sts = parseIntValue(r._9)
865909 let state = r._10
866- let v = if (if (igs())
910+ let v = if (if (isGlobalShutdown())
867911 then true
868912 else (sts == PoolShutdown))
869- then throw(("Blocked: " + toString(sts)))
913+ then throwErr(("Blocked: " + toString(sts)))
870914 else true
871915 if ((v == v))
872916 then {
873- let burnA = invoke(fca, "burn", [amount], [AttachedPayment(lpAssetId, amount)])
917+ let burnA = invoke(factoryContract, "burn", [amount], [AttachedPayment(lpAssetId, amount)])
874918 if ((burnA == burnA))
875919 then state
876920 else throw("Strict value is not equal to itself.")
877921 }
878922 else throw("Strict value is not equal to itself.")
879923 }
880924 else throw("Strict value is not equal to itself.")
881925 }
882926 else throw("Strict value is not equal to itself.")
883927 }
884928
885929
886930
887931 @Callable(i)
888-func activate (amtAsStr,prAsStr) = if ((toString(i.caller) != toString(fca)))
889- then throw("denied")
890- else $Tuple2([StringEntry(aa(), amtAsStr), StringEntry(pa(), prAsStr)], "success")
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")
891935
892936
893937
894938 @Callable(i)
895-func setS (k,v) = if ((toString(i.caller) != strf(this, ada())))
939+func setS (k,v) = if ((toString(i.caller) != getStringOrFail(this, keyAddonAddress())))
896940 then pd
897941 else [StringEntry(k, v)]
898942
899943
900944
901945 @Callable(i)
902-func setI (k,v) = if ((toString(i.caller) != strf(this, ada())))
946+func setI (k,v) = if ((toString(i.caller) != getStringOrFail(this, keyAddonAddress())))
903947 then pd
904948 else [IntegerEntry(k, v)]
905949
906950
907951
908952 @Callable(i)
909-func getPoolConfigWrapperREADONLY () = $Tuple2(nil, gpc())
953+func getPoolConfigWrapperREADONLY () = $Tuple2(nil, getPoolConfig())
910954
911955
912956
913957 @Callable(i)
914958 func getAccBalanceWrapperREADONLY (assetId) = $Tuple2(nil, getAccBalance(assetId))
915959
916960
917961
918962 @Callable(i)
919963 func calcPricesWrapperREADONLY (amAmt,prAmt,lpAmt) = {
920964 let pr = calcPrices(amAmt, prAmt, lpAmt)
921965 $Tuple2(nil, [toString(pr[0]), toString(pr[1]), toString(pr[2])])
922966 }
923967
924968
925969
926970 @Callable(i)
927-func fromX18WrapperREADONLY (val,resScaleMult) = $Tuple2(nil, f1(parseBigIntValue(val), resScaleMult))
971+func fromX18WrapperREADONLY (val,resScaleMult) = $Tuple2(nil, fromX18(parseBigIntValue(val), resScaleMult))
928972
929973
930974
931975 @Callable(i)
932-func toX18WrapperREADONLY (origVal,origScaleMult) = $Tuple2(nil, toString(t1(origVal, origScaleMult)))
976+func toX18WrapperREADONLY (origVal,origScaleMult) = $Tuple2(nil, toString(toX18(origVal, origScaleMult)))
933977
934978
935979
936980 @Callable(i)
937-func calcPriceBigIntWrapperREADONLY (prAmtX18,amAmtX18) = $Tuple2(nil, toString(cpbi(parseBigIntValue(prAmtX18), parseBigIntValue(amAmtX18))))
981+func calcPriceBigIntWrapperREADONLY (prAmtX18,amAmtX18) = $Tuple2(nil, toString(calcPriceBigInt(parseBigIntValue(prAmtX18), parseBigIntValue(amAmtX18))))
938982
939983
940984
941985 @Callable(i)
942-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, ""))
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, ""))
943987
944988
945989
946990 @Callable(i)
947-func estimateGetOperationWrapperREADONLY (txId58,pmtAsId,pmtLpAmt,usrAddr) = {
948- let r = ego(txId58, pmtAsId, pmtLpAmt, addressFromStringValue(usrAddr))
991+func estimateGetOperationWrapperREADONLY (txId58,paymentAsId,paymentLpAmount,usrAddr) = {
992+ let r = estimateGetOperation(txId58, paymentAsId, paymentLpAmount, addressFromStringValue(usrAddr))
949993 $Tuple2(nil, $Tuple10(r._1, r._2, r._3, r._4, r._5, r._6, r._7, toString(r._8), r._9, r._10))
950994 }
951995
952996
953997 @Verifier(tx)
954-func verify () = {
955- let targetPublicKey = match m() {
956- case pk: ByteVector =>
957- pk
958- case _: Unit =>
959- tx.senderPublicKey
960- case _ =>
961- throw("Match error")
962- }
963- match tx {
964- case order: Order =>
965- let matcherPub = mp()
966- let orderValid = moa(order)
967- let senderValid = sigVerify(order.bodyBytes, order.proofs[0], order.senderPublicKey)
968- let matcherValid = sigVerify(order.bodyBytes, order.proofs[1], matcherPub)
969- if (if (if (orderValid)
970- then senderValid
971- else false)
972- then matcherValid
973- else false)
974- then true
975- else toe(orderValid, senderValid, matcherValid)
976- case s: SetScriptTransaction =>
977- let newHash = blake2b256(value(s.script))
978- let allowedHash = fromBase64String(value(getString(fca, keyAllowedLpStableScriptHash())))
979- let currentHash = scriptHash(this)
980- if (if ((allowedHash == newHash))
981- then (currentHash != newHash)
982- else false)
983- then true
984- else sigVerify(tx.bodyBytes, tx.proofs[0], targetPublicKey)
985- case _ =>
986- sigVerify(tx.bodyBytes, tx.proofs[0], targetPublicKey)
987- }
988- }
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+}
9891022

github/deemru/w8io/873ac7e 
233.11 ms