tx · DA3zoP5BzG6UaxYYQtqWdLZaQfRpDFJD9x3ocCjhRrvG

3PRAEZqBjrUDaDvv45HGWPb94DhD6UuZfWg:  -0.00600000 Waves

2023.09.19 13:10 [3827918] smart account 3PRAEZqBjrUDaDvv45HGWPb94DhD6UuZfWg > SELF 0.00000000 Waves

{ "type": 13, "id": "DA3zoP5BzG6UaxYYQtqWdLZaQfRpDFJD9x3ocCjhRrvG", "fee": 600000, "feeAssetId": null, "timestamp": 1695118248379, "version": 1, "sender": "3PRAEZqBjrUDaDvv45HGWPb94DhD6UuZfWg", "senderPublicKey": "DWfBoSph5SQ9fuKvBjSecymWnfmRnBFh9FYg2QEV6bwS", "proofs": [ "4gFo1LSTGe9e1uxVSqMJc1ggxm6WD3FGmWyYF3Nh8gfYWgaP1rjofGttEn8ddPwu4gY5775EEjdhQ29p58oGCn7q" ], "script": "base64:BgIXCAISBAoCCAESBgoECAEBBBIDCgEIEgAWABJjb25maWdBZGRyZXNzU3RvcmUCBmNvbmZpZwANY29uZmlnQWRkcmVzcwkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCmCAEJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkAnQgCBQR0aGlzBRJjb25maWdBZGRyZXNzU3RvcmUCH2NoaWxkOiBjb25maWcgYWRkcmVzcyBub3QgZm91bmQCFmludmFsaWQgY29uZmlnIGFkZHJlc3MABkhFSUdIVAUGaGVpZ2h0AQ5vcEFsbG93ZWRTdG9yZQECb3AJAKwCAgkArAICAgNvcF8FAm9wAghfYWxsb3dlZAANdm90aW5nUmVzdWx0cwkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCmCAEJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkAnQgCBQ1jb25maWdBZGRyZXNzAhZjb250cmFjdF92b3RpbmdfcmVzdWx0AhlubyBjb250cmFjdF92b3RpbmdfcmVzdWx0Ah5pbnZhbGlkIGNvbnRyYWN0X3ZvdGluZ19yZXN1bHQBFXdhdmVsZXRzUGVyQmxvY2tTdG9yZQEHYWRkcmVzcwkArAICBQdhZGRyZXNzAhNfd2F2ZWxldHNfcGVyX2Jsb2NrARBzdGFydEhlaWdodFN0b3JlAQdhZGRyZXNzCQCsAgIFB2FkZHJlc3MCDV9zdGFydF9oZWlnaHQBDGNsYWltZWRTdG9yZQEHYWRkcmVzcwkArAICBQdhZGRyZXNzAhB3YXZlbGV0c19jbGFpbWVkAQ9jbGFpbWVkVVNEU3RvcmUBB2FkZHJlc3MJAKwCAgUHYWRkcmVzcwIVX3dhdmVsZXRzX2NsYWltZWRfdXNkARFtYXhDbGFpbWFibGVTdG9yZQEHYWRkcmVzcwkArAICBQdhZGRyZXNzAhdfd2F2ZWxldHNfbWF4X2NsYWltYWJsZQEWbWF4Q2xhaW1hYmxlSXNVU0RTdG9yZQEHYWRkcmVzcwkArAICBQdhZGRyZXNzAh5fd2F2ZWxldHNfbWF4X2NsYWltYWJsZV9pc191c2QACHN1bVN0b3JlAhZ3YXZlbGV0c19wZXJfYmxvY2tfc3VtAAhtYXhTdG9yZQIWd2F2ZWxldHNfcGVyX2Jsb2NrX21heAAHbWF4aW11bQkBC3ZhbHVlT3JFbHNlAgkAmggCBQR0aGlzAhZ3YXZlbGV0c19wZXJfYmxvY2tfbWF4ALDQyVoABm9yYWNsZQkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCmCAEJAQt2YWx1ZU9yRWxzZQIJAKIIAQIGb3JhY2xlAiMzUEtrb2pLZGQ2QkJ6VGYxUlhiUVZmVURyYU5GWFhIS3pRRgIWaW52YWxpZCBvcmFjbGUgYWRkcmVzcwAOd2F2ZVByaWNlU3RvcmUJAQt2YWx1ZU9yRWxzZQIJAKIIAQIOd2F2ZS1wcmljZS1rZXkCFyVzJXNfX3ByaWNlX19XQVZFUy1VU0RUAAl3YXZlUHJpY2UJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkAmggCBQZvcmFjbGUFDndhdmVQcmljZVN0b3JlAiBXQVZFUyBwcmljZSBpcyBub3QgaW4gdGhlIE9yYWNsZQEKd2F2ZXNUb1VTRAEFd2F2ZXMJAGsDBQV3YXZlcwUJd2F2ZVByaWNlAMCEPQEKdXNkVG9XYXZlcwEFd2F2ZXMJAGsDBQV3YXZlcwCAwtcvBQl3YXZlUHJpY2UABm9sZFN1bQkBC3ZhbHVlT3JFbHNlAgkAnwgBBQhzdW1TdG9yZQAAAQxhdmFpbGFibGVOb3cBAnRvBAhwZXJCbG9jawkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCfCAEJARV3YXZlbGV0c1BlckJsb2NrU3RvcmUBBQJ0bwIRYWRkcmVzcyBub3QgZm91bmQEBXRvdGFsAwkAAAIFCHBlckJsb2NrAAAAAAQKZmlyc3RCbG9jawkBBXZhbHVlAQkAnwgBCQEQc3RhcnRIZWlnaHRTdG9yZQEFAnRvBAZibG9ja3MJAGUCBQZoZWlnaHQFCmZpcnN0QmxvY2sJAGgCBQhwZXJCbG9jawUGYmxvY2tzBAxjbGFpbWVkV0FWRVMJAQt2YWx1ZU9yRWxzZQIJAJ8IAQkBDGNsYWltZWRTdG9yZQEFAnRvAAAECXJlc3RXYXZlcwkAZQIFBXRvdGFsBQxjbGFpbWVkV0FWRVMEDG1heENsYWltYWJsZQkAnwgBCQERbWF4Q2xhaW1hYmxlU3RvcmUBBQJ0bwMJAQlpc0RlZmluZWQBBQxtYXhDbGFpbWFibGUEEW1heENsYWltYWJsZVZhbHVlCQEFdmFsdWUBBQxtYXhDbGFpbWFibGUDCQELdmFsdWVPckVsc2UCCQCgCAEJARZtYXhDbGFpbWFibGVJc1VTRFN0b3JlAQUCdG8HBApjbGFpbWVkVVNECQELdmFsdWVPckVsc2UCCQCfCAEJAQ9jbGFpbWVkVVNEU3RvcmUBBQJ0bwkBCndhdmVzVG9VU0QBBQxjbGFpbWVkV0FWRVMEB3Jlc3RVU0QJAGUCBRFtYXhDbGFpbWFibGVWYWx1ZQUKY2xhaW1lZFVTRAQOcmVzdFVzZEluV2F2ZXMJAQp1c2RUb1dhdmVzAQUHcmVzdFVTRAkAlwMBCQDMCAIFDnJlc3RVc2RJbldhdmVzCQDMCAIFCXJlc3RXYXZlcwUDbmlsBAVncmFudAkAlwMBCQDMCAIFBXRvdGFsCQDMCAIFEW1heENsYWltYWJsZVZhbHVlBQNuaWwJAGUCBQVncmFudAUMY2xhaW1lZFdBVkVTBQlyZXN0V2F2ZXMBE3NldFNjaGVkdWxlSW50ZXJuYWwFAnRvEHdhdmVsZXRzUGVyQmxvY2sMbWF4Q2xhaW1hYmxlEWlzTWF4Q2xhaW1hYmxlVVNEA3N1bQMJAGYCAAAFEHdhdmVsZXRzUGVyQmxvY2sJAAIBAh93YXZlbGV0c1BlckJsb2NrIHNob3VsZCBiZSA+PSAwBA1wZXJCbG9ja1N0b3JlCQEVd2F2ZWxldHNQZXJCbG9ja1N0b3JlAQUCdG8EC29sZFBlckJsb2NrCQELdmFsdWVPckVsc2UCCQCfCAEFDXBlckJsb2NrU3RvcmUAAAQGbmV3U3VtCQBkAgkAZQIFA3N1bQULb2xkUGVyQmxvY2sFEHdhdmVsZXRzUGVyQmxvY2sEDGhlaWdodFN0b3JlMQkBEHN0YXJ0SGVpZ2h0U3RvcmUBBQJ0bwQHY2xhaW1lZAkBDGNsYWltZWRTdG9yZQEFAnRvAwkAZgIFBm5ld1N1bQUHbWF4aW11bQkAAgECEG1heGltdW0gZXhjZWVkZWQEEm1heENsYWltYWJsZVN0b3JlMQkBEW1heENsYWltYWJsZVN0b3JlAQUCdG8EF21heENsYWltYWJsZUlzVVNEU3RvcmUxCQEWbWF4Q2xhaW1hYmxlSXNVU0RTdG9yZQEFAnRvBBFtYXhDbGFpbWFibGVFbnRyeQMJAAACBQxtYXhDbGFpbWFibGUAAAUDbmlsAwkAZgIAAAUMbWF4Q2xhaW1hYmxlCQDMCAIJAQtEZWxldGVFbnRyeQEFEm1heENsYWltYWJsZVN0b3JlMQkAzAgCCQELRGVsZXRlRW50cnkBBRdtYXhDbGFpbWFibGVJc1VTRFN0b3JlMQUDbmlsCQDMCAIJAQxJbnRlZ2VyRW50cnkCBRJtYXhDbGFpbWFibGVTdG9yZTEFDG1heENsYWltYWJsZQkAzAgCCQEMQm9vbGVhbkVudHJ5AgUXbWF4Q2xhaW1hYmxlSXNVU0RTdG9yZTEFEWlzTWF4Q2xhaW1hYmxlVVNEBQNuaWwJAJQKAgkAzggCCQDMCAIJAQxJbnRlZ2VyRW50cnkCBQ1wZXJCbG9ja1N0b3JlBRB3YXZlbGV0c1BlckJsb2NrCQDMCAIJAQxJbnRlZ2VyRW50cnkCBQxoZWlnaHRTdG9yZTEFBmhlaWdodAkAzAgCCQEMSW50ZWdlckVudHJ5AgUHY2xhaW1lZAkBAS0BCQEMYXZhaWxhYmxlTm93AQUCdG8JAMwIAgkBDEludGVnZXJFbnRyeQIFCHN1bVN0b3JlBQZuZXdTdW0FA25pbAURbWF4Q2xhaW1hYmxlRW50cnkFBm5ld1N1bQQBaQEKc2V0U2NlZHVsZQICdG8Qd2F2ZWxldHNQZXJCbG9jawMJAQIhPQIIBQFpBmNhbGxlcgUEdGhpcwkAAgECBmRlbmllZAkBE3NldFNjaGVkdWxlSW50ZXJuYWwFBQJ0bwUQd2F2ZWxldHNQZXJCbG9jawAABwUGb2xkU3VtAWkBC3NldFNjaGVkdWxlBAJ0bxB3YXZlbGV0c1BlckJsb2NrDG1heENsYWltYWJsZRFpc01heENsYWltYWJsZVVTRAMJAQIhPQIIBQFpBmNhbGxlcgUEdGhpcwkAAgECBmRlbmllZAkBE3NldFNjaGVkdWxlSW50ZXJuYWwFBQJ0bwUQd2F2ZWxldHNQZXJCbG9jawUMbWF4Q2xhaW1hYmxlBRFpc01heENsYWltYWJsZVVTRAUGb2xkU3VtAWkBEHNldE11bHRpU2NoZWR1bGUBCXNjaGVkdWxlcwMJAQIhPQIIBQFpBmNhbGxlcgUEdGhpcwkAAgECBmRlbmllZAoBBGZvbGQCA2FjYwhzY2hlZHVsZQMJAAACBQhzY2hlZHVsZQIACQACAQIRaW52YWxpZCBzY2hlZHVsZXMEBXBhcnRzCQC1CQIFCHNjaGVkdWxlAgE9AwkBAiE9AgkAkAMBBQVwYXJ0cwACCQACAQIqaW52YWxpZCBmb3JtYXQ6IGFkcj13YXZlbGV0c1BlckJsb2NrWyxtYXhdBAJ0bwkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCmCAEJAJEDAgUFcGFydHMAAAkArAICAhFpbnZhbGlkIGFkZHJlc3M6IAkAkQMCBQVwYXJ0cwAABA1ibG9ja01heFBhcnRzCQC1CQIJAJEDAgUFcGFydHMAAQIBLAQId2F2ZWxldHMJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkAtgkBCQCRAwIFDWJsb2NrTWF4UGFydHMAAAkArAICAhlpbnZhbGlkIHdhdmV0ZXRzIG51bWJlcjogCQCRAwIFDWJsb2NrTWF4UGFydHMAAAQLJHQwNTIyOTU1OTUDCQAAAgkAkAMBBQ1ibG9ja01heFBhcnRzAAIEDW1heEFuZFVzZFBhcnQJALUJAgkAkQMCBQ1ibG9ja01heFBhcnRzAAECASQJAJQKAgkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQC2CQEJAJEDAgUNbWF4QW5kVXNkUGFydAAACQCsAgICFGludmFsaWQgbWF4IG51bWJlcjogCQCRAwIFDW1heEFuZFVzZFBhcnQAAAkAAAIJAJADAQUNbWF4QW5kVXNkUGFydAACCQCUCgIAAAcEDG1heENsYWltYWJsZQgFCyR0MDUyMjk1NTk1Al8xBBFpc01heENsYWltYWJsZVVTRAgFCyR0MDUyMjk1NTk1Al8yBAskdDA1NjEzNTY0NQUDYWNjBARjbWRzCAULJHQwNTYxMzU2NDUCXzEEA3N1bQgFCyR0MDU2MTM1NjQ1Al8yBAlhZGRyZXNzZXMIBQskdDA1NjEzNTY0NQJfMwQFdG9TdHIJAKUIAQUCdG8DCQEJaXNEZWZpbmVkAQkAzwgCBQlhZGRyZXNzZXMFBXRvU3RyCQACAQkArAICAgtkdWJsaWNhdGU6IAUFdG9TdHIECyR0MDU3NzY1ODc0CQETc2V0U2NoZWR1bGVJbnRlcm5hbAUFBXRvU3RyBQh3YXZlbGV0cwUMbWF4Q2xhaW1hYmxlBRFpc01heENsYWltYWJsZVVTRAUDc3VtBAduZXdDbWRzCAULJHQwNTc3NjU4NzQCXzEEBm5ld1N1bQgFCyR0MDU3NzY1ODc0Al8yCQCVCgMJAM4IAgUEY21kcwUHbmV3Q21kcwUGbmV3U3VtCQDOCAIFCWFkZHJlc3NlcwkAzAgCBQV0b1N0cgUDbmlsBAskdDA1OTQyNjAxOAoAAiRsCQC1CQIFCXNjaGVkdWxlcwIBfAoAAiRzCQCQAwEFAiRsCgAFJGFjYzAJAJUKAwUDbmlsBQZvbGRTdW0FA25pbAoBBSRmMF8xAgIkYQIkaQMJAGcCBQIkaQUCJHMFAiRhCQEEZm9sZAIFAiRhCQCRAwIFAiRsBQIkaQoBBSRmMF8yAgIkYQIkaQMJAGcCBQIkaQUCJHMFAiRhCQACAQIUTGlzdCBzaXplIGV4Y2VlZHMgMjAJAQUkZjBfMgIJAQUkZjBfMQIJAQUkZjBfMQIJAQUkZjBfMQIJAQUkZjBfMQIJAQUkZjBfMQIJAQUkZjBfMQIJAQUkZjBfMQIJAQUkZjBfMQIJAQUkZjBfMQIJAQUkZjBfMQIJAQUkZjBfMQIJAQUkZjBfMQIJAQUkZjBfMQIJAQUkZjBfMQIJAQUkZjBfMQIJAQUkZjBfMQIJAQUkZjBfMQIJAQUkZjBfMQIJAQUkZjBfMQIJAQUkZjBfMQIFBSRhY2MwAAAAAQACAAMABAAFAAYABwAIAAkACgALAAwADQAOAA8AEAARABIAEwAUBARjbWRzCAULJHQwNTk0MjYwMTgCXzEEA3N1bQgFCyR0MDU5NDI2MDE4Al8yBAJ4XwgFCyR0MDU5NDI2MDE4Al8zCQCUCgIFBGNtZHMFA3N1bQFpAQVDbGFpbQAEBXRvQWRyCAUBaQZjYWxsZXIEAnRvCQClCAEFBXRvQWRyBAZhbW91bnQJAQxhdmFpbGFibGVOb3cBBQJ0bwQHcGF5bWVudAkAlwMBCQDMCAIICQDvBwEFBHRoaXMJYXZhaWxhYmxlCQDMCAIFBmFtb3VudAUDbmlsAwkAZwIAAAUHcGF5bWVudAkAAgECEG5vdGhpbmcgdG8gY2xhaW0EDWNsYWltZWRTdG9yZTEJAQxjbGFpbWVkU3RvcmUBBQJ0bwQHY2xhaW1lZAkBC3ZhbHVlT3JFbHNlAgkAnwgBBQ1jbGFpbWVkU3RvcmUxAAAEEGNsYWltZWRVU0RTdG9yZTEJAQ9jbGFpbWVkVVNEU3RvcmUBBQJ0bwQKY2xhaW1lZFVTRAkBC3ZhbHVlT3JFbHNlAgkAnwgBBRBjbGFpbWVkVVNEU3RvcmUxCQEKd2F2ZXNUb1VTRAEFB2NsYWltZWQECnBheW1lbnRVU0QJAQp3YXZlc1RvVVNEAQUHcGF5bWVudAkAzAgCCQEOU2NyaXB0VHJhbnNmZXIDBQV0b0FkcgUHcGF5bWVudAUEdW5pdAkAzAgCCQEMSW50ZWdlckVudHJ5AgUNY2xhaW1lZFN0b3JlMQkAZAIFB2NsYWltZWQFB3BheW1lbnQJAMwIAgkBDEludGVnZXJFbnRyeQIFEGNsYWltZWRVU0RTdG9yZTEJAGQCBQpjbGFpbWVkVVNEBQpwYXltZW50VVNEBQNuaWwAKVc5SQ==", "chainId": 87, "height": 3827918, "applicationStatus": "succeeded", "spentComplexity": 0 } View: original | compacted Prev: 7W7Lhxp1ZmDEneRwiMC4v4uNunyMbf9D65grj5kpoECo Next: FHsaor6cMeoAeY9YKV5MkHMXAFAwYu4R588EGRhMP2xK Diff:
OldNewDifferences
5151 let oldSum = valueOrElse(getInteger(sumStore), 0)
5252
5353 func availableNow (to) = {
54- let perBlock = getInteger(waveletsPerBlockStore(to))
55- let total = if (!(isDefined(perBlock)))
54+ let perBlock = valueOrErrorMessage(getInteger(waveletsPerBlockStore(to)), "address not found")
55+ let total = if ((perBlock == 0))
5656 then 0
5757 else {
5858 let firstBlock = value(getInteger(startHeightStore(to)))
5959 let blocks = (height - firstBlock)
60- (value(perBlock) * blocks)
60+ (perBlock * blocks)
6161 }
6262 let claimedWAVES = valueOrElse(getInteger(claimedStore(to)), 0)
6363 let restWaves = (total - claimedWAVES)
6464 let maxClaimable = getInteger(maxClaimableStore(to))
6565 if (isDefined(maxClaimable))
66- then if (valueOrElse(getBoolean(maxClaimableIsUSDStore(to)), false))
67- then {
68- let claimedUSD = valueOrElse(getInteger(claimedUSDStore(to)), wavesToUSD(claimedWAVES))
69- let restUSD = (value(maxClaimable) - claimedUSD)
70- let restUsdInWaves = usdToWaves(restUSD)
71- min([restUsdInWaves, restWaves])
72- }
73- else {
74- let grant = min([total, value(maxClaimable)])
75- (grant - claimedWAVES)
76- }
66+ then {
67+ let maxClaimableValue = value(maxClaimable)
68+ if (valueOrElse(getBoolean(maxClaimableIsUSDStore(to)), false))
69+ then {
70+ let claimedUSD = valueOrElse(getInteger(claimedUSDStore(to)), wavesToUSD(claimedWAVES))
71+ let restUSD = (maxClaimableValue - claimedUSD)
72+ let restUsdInWaves = usdToWaves(restUSD)
73+ min([restUsdInWaves, restWaves])
74+ }
75+ else {
76+ let grant = min([total, maxClaimableValue])
77+ (grant - claimedWAVES)
78+ }
79+ }
7780 else restWaves
7881 }
7982
129132 let to = valueOrErrorMessage(addressFromString(parts[0]), ("invalid address: " + parts[0]))
130133 let blockMaxParts = split(parts[1], ",")
131134 let wavelets = valueOrErrorMessage(parseInt(blockMaxParts[0]), ("invalid wavetets number: " + blockMaxParts[0]))
132- let $t051685534 = if ((size(blockMaxParts) == 2))
135+ let $t052295595 = if ((size(blockMaxParts) == 2))
133136 then {
134137 let maxAndUsdPart = split(blockMaxParts[1], "$")
135138 $Tuple2(valueOrErrorMessage(parseInt(maxAndUsdPart[0]), ("invalid max number: " + maxAndUsdPart[0])), (size(maxAndUsdPart) == 2))
136139 }
137140 else $Tuple2(0, false)
138- let maxClaimable = $t051685534._1
139- let isMaxClaimableUSD = $t051685534._2
140- let $t055525584 = acc
141- let cmds = $t055525584._1
142- let sum = $t055525584._2
143- let addresses = $t055525584._3
141+ let maxClaimable = $t052295595._1
142+ let isMaxClaimableUSD = $t052295595._2
143+ let $t056135645 = acc
144+ let cmds = $t056135645._1
145+ let sum = $t056135645._2
146+ let addresses = $t056135645._3
144147 let toStr = toString(to)
145148 if (isDefined(indexOf(addresses, toStr)))
146149 then throw(("dublicate: " + toStr))
147150 else {
148- let $t057155813 = setScheduleInternal(toStr, wavelets, maxClaimable, isMaxClaimableUSD, sum)
149- let newCmds = $t057155813._1
150- let newSum = $t057155813._2
151+ let $t057765874 = setScheduleInternal(toStr, wavelets, maxClaimable, isMaxClaimableUSD, sum)
152+ let newCmds = $t057765874._1
153+ let newSum = $t057765874._2
151154 $Tuple3((cmds ++ newCmds), newSum, (addresses ++ [toStr]))
152155 }
153156 }
154157 }
155158
156- let $t058815957 = {
159+ let $t059426018 = {
157160 let $l = split(schedules, "|")
158161 let $s = size($l)
159162 let $acc0 = $Tuple3(nil, oldSum, nil)
167170
168171 $f0_2($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($acc0, 0), 1), 2), 3), 4), 5), 6), 7), 8), 9), 10), 11), 12), 13), 14), 15), 16), 17), 18), 19), 20)
169172 }
170- let cmds = $t058815957._1
171- let sum = $t058815957._2
172- let x_ = $t058815957._3
173+ let cmds = $t059426018._1
174+ let sum = $t059426018._2
175+ let x_ = $t059426018._3
173176 $Tuple2(cmds, sum)
174177 }
175178
179182 func Claim () = {
180183 let toAdr = i.caller
181184 let to = toString(toAdr)
182- let a = valueOrErrorMessage(getInteger(waveletsPerBlockStore(to)), "address not found")
183- if ((a == a))
184- then {
185- let amount = availableNow(to)
186- let payment = min([wavesBalance(this).available, amount])
187- if ((0 >= payment))
188- then throw("nothing to claim")
189- else {
190- let claimedStore1 = claimedStore(to)
191- let claimed = valueOrElse(getInteger(claimedStore1), 0)
192- let claimedUSDStore1 = claimedUSDStore(to)
193- let claimedUSD = valueOrElse(getInteger(claimedUSDStore1), wavesToUSD(claimed))
194- let paymentUSD = wavesToUSD(payment)
185+ let amount = availableNow(to)
186+ let payment = min([wavesBalance(this).available, amount])
187+ if ((0 >= payment))
188+ then throw("nothing to claim")
189+ else {
190+ let claimedStore1 = claimedStore(to)
191+ let claimed = valueOrElse(getInteger(claimedStore1), 0)
192+ let claimedUSDStore1 = claimedUSDStore(to)
193+ let claimedUSD = valueOrElse(getInteger(claimedUSDStore1), wavesToUSD(claimed))
194+ let paymentUSD = wavesToUSD(payment)
195195 [ScriptTransfer(toAdr, payment, unit), IntegerEntry(claimedStore1, (claimed + payment)), IntegerEntry(claimedUSDStore1, (claimedUSD + paymentUSD))]
196- }
197196 }
198- else throw("Strict value is not equal to itself.")
199197 }
200198
201199
Full:
OldNewDifferences
11 {-# STDLIB_VERSION 6 #-}
22 {-# SCRIPT_TYPE ACCOUNT #-}
33 {-# CONTENT_TYPE DAPP #-}
44 let configAddressStore = "config"
55
66 let configAddress = valueOrErrorMessage(addressFromString(valueOrErrorMessage(getString(this, configAddressStore), "child: config address not found")), "invalid config address")
77
88 let HEIGHT = height
99
1010 func opAllowedStore (op) = (("op_" + op) + "_allowed")
1111
1212
1313 let votingResults = valueOrErrorMessage(addressFromString(valueOrErrorMessage(getString(configAddress, "contract_voting_result"), "no contract_voting_result")), "invalid contract_voting_result")
1414
1515 func waveletsPerBlockStore (address) = (address + "_wavelets_per_block")
1616
1717
1818 func startHeightStore (address) = (address + "_start_height")
1919
2020
2121 func claimedStore (address) = (address + "wavelets_claimed")
2222
2323
2424 func claimedUSDStore (address) = (address + "_wavelets_claimed_usd")
2525
2626
2727 func maxClaimableStore (address) = (address + "_wavelets_max_claimable")
2828
2929
3030 func maxClaimableIsUSDStore (address) = (address + "_wavelets_max_claimable_is_usd")
3131
3232
3333 let sumStore = "wavelets_per_block_sum"
3434
3535 let maxStore = "wavelets_per_block_max"
3636
3737 let maximum = valueOrElse(getInteger(this, "wavelets_per_block_max"), 189950000)
3838
3939 let oracle = valueOrErrorMessage(addressFromString(valueOrElse(getString("oracle"), "3PKkojKdd6BBzTf1RXbQVfUDraNFXXHKzQF")), "invalid oracle address")
4040
4141 let wavePriceStore = valueOrElse(getString("wave-price-key"), "%s%s__price__WAVES-USDT")
4242
4343 let wavePrice = valueOrErrorMessage(getInteger(oracle, wavePriceStore), "WAVES price is not in the Oracle")
4444
4545 func wavesToUSD (waves) = fraction(waves, wavePrice, 1000000)
4646
4747
4848 func usdToWaves (waves) = fraction(waves, 100000000, wavePrice)
4949
5050
5151 let oldSum = valueOrElse(getInteger(sumStore), 0)
5252
5353 func availableNow (to) = {
54- let perBlock = getInteger(waveletsPerBlockStore(to))
55- let total = if (!(isDefined(perBlock)))
54+ let perBlock = valueOrErrorMessage(getInteger(waveletsPerBlockStore(to)), "address not found")
55+ let total = if ((perBlock == 0))
5656 then 0
5757 else {
5858 let firstBlock = value(getInteger(startHeightStore(to)))
5959 let blocks = (height - firstBlock)
60- (value(perBlock) * blocks)
60+ (perBlock * blocks)
6161 }
6262 let claimedWAVES = valueOrElse(getInteger(claimedStore(to)), 0)
6363 let restWaves = (total - claimedWAVES)
6464 let maxClaimable = getInteger(maxClaimableStore(to))
6565 if (isDefined(maxClaimable))
66- then if (valueOrElse(getBoolean(maxClaimableIsUSDStore(to)), false))
67- then {
68- let claimedUSD = valueOrElse(getInteger(claimedUSDStore(to)), wavesToUSD(claimedWAVES))
69- let restUSD = (value(maxClaimable) - claimedUSD)
70- let restUsdInWaves = usdToWaves(restUSD)
71- min([restUsdInWaves, restWaves])
72- }
73- else {
74- let grant = min([total, value(maxClaimable)])
75- (grant - claimedWAVES)
76- }
66+ then {
67+ let maxClaimableValue = value(maxClaimable)
68+ if (valueOrElse(getBoolean(maxClaimableIsUSDStore(to)), false))
69+ then {
70+ let claimedUSD = valueOrElse(getInteger(claimedUSDStore(to)), wavesToUSD(claimedWAVES))
71+ let restUSD = (maxClaimableValue - claimedUSD)
72+ let restUsdInWaves = usdToWaves(restUSD)
73+ min([restUsdInWaves, restWaves])
74+ }
75+ else {
76+ let grant = min([total, maxClaimableValue])
77+ (grant - claimedWAVES)
78+ }
79+ }
7780 else restWaves
7881 }
7982
8083
8184 func setScheduleInternal (to,waveletsPerBlock,maxClaimable,isMaxClaimableUSD,sum) = if ((0 > waveletsPerBlock))
8285 then throw("waveletsPerBlock should be >= 0")
8386 else {
8487 let perBlockStore = waveletsPerBlockStore(to)
8588 let oldPerBlock = valueOrElse(getInteger(perBlockStore), 0)
8689 let newSum = ((sum - oldPerBlock) + waveletsPerBlock)
8790 let heightStore1 = startHeightStore(to)
8891 let claimed = claimedStore(to)
8992 if ((newSum > maximum))
9093 then throw("maximum exceeded")
9194 else {
9295 let maxClaimableStore1 = maxClaimableStore(to)
9396 let maxClaimableIsUSDStore1 = maxClaimableIsUSDStore(to)
9497 let maxClaimableEntry = if ((maxClaimable == 0))
9598 then nil
9699 else if ((0 > maxClaimable))
97100 then [DeleteEntry(maxClaimableStore1), DeleteEntry(maxClaimableIsUSDStore1)]
98101 else [IntegerEntry(maxClaimableStore1, maxClaimable), BooleanEntry(maxClaimableIsUSDStore1, isMaxClaimableUSD)]
99102 $Tuple2(([IntegerEntry(perBlockStore, waveletsPerBlock), IntegerEntry(heightStore1, height), IntegerEntry(claimed, -(availableNow(to))), IntegerEntry(sumStore, newSum)] ++ maxClaimableEntry), newSum)
100103 }
101104 }
102105
103106
104107 @Callable(i)
105108 func setScedule (to,waveletsPerBlock) = if ((i.caller != this))
106109 then throw("denied")
107110 else setScheduleInternal(to, waveletsPerBlock, 0, false, oldSum)
108111
109112
110113
111114 @Callable(i)
112115 func setSchedule (to,waveletsPerBlock,maxClaimable,isMaxClaimableUSD) = if ((i.caller != this))
113116 then throw("denied")
114117 else setScheduleInternal(to, waveletsPerBlock, maxClaimable, isMaxClaimableUSD, oldSum)
115118
116119
117120
118121 @Callable(i)
119122 func setMultiSchedule (schedules) = if ((i.caller != this))
120123 then throw("denied")
121124 else {
122125 func fold (acc,schedule) = if ((schedule == ""))
123126 then throw("invalid schedules")
124127 else {
125128 let parts = split(schedule, "=")
126129 if ((size(parts) != 2))
127130 then throw("invalid format: adr=waveletsPerBlock[,max]")
128131 else {
129132 let to = valueOrErrorMessage(addressFromString(parts[0]), ("invalid address: " + parts[0]))
130133 let blockMaxParts = split(parts[1], ",")
131134 let wavelets = valueOrErrorMessage(parseInt(blockMaxParts[0]), ("invalid wavetets number: " + blockMaxParts[0]))
132- let $t051685534 = if ((size(blockMaxParts) == 2))
135+ let $t052295595 = if ((size(blockMaxParts) == 2))
133136 then {
134137 let maxAndUsdPart = split(blockMaxParts[1], "$")
135138 $Tuple2(valueOrErrorMessage(parseInt(maxAndUsdPart[0]), ("invalid max number: " + maxAndUsdPart[0])), (size(maxAndUsdPart) == 2))
136139 }
137140 else $Tuple2(0, false)
138- let maxClaimable = $t051685534._1
139- let isMaxClaimableUSD = $t051685534._2
140- let $t055525584 = acc
141- let cmds = $t055525584._1
142- let sum = $t055525584._2
143- let addresses = $t055525584._3
141+ let maxClaimable = $t052295595._1
142+ let isMaxClaimableUSD = $t052295595._2
143+ let $t056135645 = acc
144+ let cmds = $t056135645._1
145+ let sum = $t056135645._2
146+ let addresses = $t056135645._3
144147 let toStr = toString(to)
145148 if (isDefined(indexOf(addresses, toStr)))
146149 then throw(("dublicate: " + toStr))
147150 else {
148- let $t057155813 = setScheduleInternal(toStr, wavelets, maxClaimable, isMaxClaimableUSD, sum)
149- let newCmds = $t057155813._1
150- let newSum = $t057155813._2
151+ let $t057765874 = setScheduleInternal(toStr, wavelets, maxClaimable, isMaxClaimableUSD, sum)
152+ let newCmds = $t057765874._1
153+ let newSum = $t057765874._2
151154 $Tuple3((cmds ++ newCmds), newSum, (addresses ++ [toStr]))
152155 }
153156 }
154157 }
155158
156- let $t058815957 = {
159+ let $t059426018 = {
157160 let $l = split(schedules, "|")
158161 let $s = size($l)
159162 let $acc0 = $Tuple3(nil, oldSum, nil)
160163 func $f0_1 ($a,$i) = if (($i >= $s))
161164 then $a
162165 else fold($a, $l[$i])
163166
164167 func $f0_2 ($a,$i) = if (($i >= $s))
165168 then $a
166169 else throw("List size exceeds 20")
167170
168171 $f0_2($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($f0_1($acc0, 0), 1), 2), 3), 4), 5), 6), 7), 8), 9), 10), 11), 12), 13), 14), 15), 16), 17), 18), 19), 20)
169172 }
170- let cmds = $t058815957._1
171- let sum = $t058815957._2
172- let x_ = $t058815957._3
173+ let cmds = $t059426018._1
174+ let sum = $t059426018._2
175+ let x_ = $t059426018._3
173176 $Tuple2(cmds, sum)
174177 }
175178
176179
177180
178181 @Callable(i)
179182 func Claim () = {
180183 let toAdr = i.caller
181184 let to = toString(toAdr)
182- let a = valueOrErrorMessage(getInteger(waveletsPerBlockStore(to)), "address not found")
183- if ((a == a))
184- then {
185- let amount = availableNow(to)
186- let payment = min([wavesBalance(this).available, amount])
187- if ((0 >= payment))
188- then throw("nothing to claim")
189- else {
190- let claimedStore1 = claimedStore(to)
191- let claimed = valueOrElse(getInteger(claimedStore1), 0)
192- let claimedUSDStore1 = claimedUSDStore(to)
193- let claimedUSD = valueOrElse(getInteger(claimedUSDStore1), wavesToUSD(claimed))
194- let paymentUSD = wavesToUSD(payment)
185+ let amount = availableNow(to)
186+ let payment = min([wavesBalance(this).available, amount])
187+ if ((0 >= payment))
188+ then throw("nothing to claim")
189+ else {
190+ let claimedStore1 = claimedStore(to)
191+ let claimed = valueOrElse(getInteger(claimedStore1), 0)
192+ let claimedUSDStore1 = claimedUSDStore(to)
193+ let claimedUSD = valueOrElse(getInteger(claimedUSDStore1), wavesToUSD(claimed))
194+ let paymentUSD = wavesToUSD(payment)
195195 [ScriptTransfer(toAdr, payment, unit), IntegerEntry(claimedStore1, (claimed + payment)), IntegerEntry(claimedUSDStore1, (claimedUSD + paymentUSD))]
196- }
197196 }
198- else throw("Strict value is not equal to itself.")
199197 }
200198
201199

github/deemru/w8io/6500d08 
54.39 ms