tx · A2saRMNi6Am5rvtqqKKFHBnS3rYLnNEtJS9CaAVKVhb2 3NCWFHDzdPHZC6636ZkMLNDup9mjpbTLs7h: -0.05000000 Waves 2023.03.29 09:05 [2510847] smart account 3NCWFHDzdPHZC6636ZkMLNDup9mjpbTLs7h > SELF 0.00000000 Waves
{ "type": 13, "id": "A2saRMNi6Am5rvtqqKKFHBnS3rYLnNEtJS9CaAVKVhb2", "fee": 5000000, "feeAssetId": null, "timestamp": 1680069961116, "version": 2, "chainId": 84, "sender": "3NCWFHDzdPHZC6636ZkMLNDup9mjpbTLs7h", "senderPublicKey": "3z8Q6Zu3KppVmn6fJJvrLc1Wo3krVHSvfaNcerm82md2", "proofs": [ "5wXfRBLLHzUPB16Rofxxw2WcTiQ75USDgfb26zTAaBZchGT4NNyYw177gzVWwVU2H2EjUkz6n4tYy2Bh6cigwYBm" ], "script": "base64:BgIHCAISAwoBAQwADGNvbnRyYWN0RmlsZQIJcmViYWxhbmNlAA9rZXlzVGFyZ2V0UmF0aW8CDyVzX190YXJnZXRSYXRpbwAUa2V5QWRkaXRpb25hbEJhbGFuY2UCGiVzX19hZGRpdGlvbmFsV2F2ZXNCYWxhbmNlABprZXlTV2F2ZXNBZGRpdGlvbmFsQmFsYW5jZQIRJXNfX3NXYXZlc0JhbGFuY2UAEGtleVNXYXZlc0Fzc2V0SWQCESVzX19zV2F2ZXNBc3NldElkAA9rZXlQcm94eUFkZHJlc3MCECVzX19wcm94eUFkZHJlc3MBEGdldEludGVnZXJPclplcm8BCmludGVnZXJLZXkEByRtYXRjaDAJAJoIAgUEdGhpcwUKaW50ZWdlcktleQMJAAECBQckbWF0Y2gwAgNJbnQEA3ZhbAUHJG1hdGNoMAUDdmFsAAABEGdldFN0cmluZ09yVGhyb3cBCXN0cmluZ0tleQQHJG1hdGNoMAkAnQgCBQR0aGlzBQlzdHJpbmdLZXkDCQABAgUHJG1hdGNoMAIGU3RyaW5nBAFzBQckbWF0Y2gwBQFzCQACAQkArAICCQCsAgICAVsFCXN0cmluZ0tleQIKXSBpcyBlbXB0eQEOZ2V0VGFyZ2V0UmF0aW8ABAckbWF0Y2gwCQCfCAEFD2tleXNUYXJnZXRSYXRpbwMJAAECBQckbWF0Y2gwAgNJbnQEAXMFByRtYXRjaDAJAJcDAQkAzAgCAGQJAMwIAgkAlgMBCQDMCAIAAAkAzAgCBQFzBQNuaWwFA25pbABQAQdnZXRSYXRlAAQFcHJveHkJARFAZXh0ck5hdGl2ZSgxMDYyKQEJARBnZXRTdHJpbmdPclRocm93AQUPa2V5UHJveHlBZGRyZXNzBANpbnYJAPwHBAUFcHJveHkCB2dldFJhdGUFA25pbAUDbmlsAwkAAAIFA2ludgUDaW52BAckbWF0Y2gwBQNpbnYDCQABAgUHJG1hdGNoMAIGU3RyaW5nBAFzBQckbWF0Y2gwCQENcGFyc2VJbnRWYWx1ZQEFAXMJAAIBAglaRVJPIHJhdGUJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BB2RlcG9zaXQBC3dhdmVzQW1vdW50BAVwcm94eQkBEUBleHRyTmF0aXZlKDEwNjIpAQkBEGdldFN0cmluZ09yVGhyb3cBBQ9rZXlQcm94eUFkZHJlc3MEGGN1cnJlbnRBZGRpdGlvbmFsQmFsYW5jZQkBEGdldEludGVnZXJPclplcm8BBRRrZXlBZGRpdGlvbmFsQmFsYW5jZQMJAAACBRhjdXJyZW50QWRkaXRpb25hbEJhbGFuY2UFGGN1cnJlbnRBZGRpdGlvbmFsQmFsYW5jZQQUY3VycmVudFNXYXZlc0JhbGFuY2UJARBnZXRJbnRlZ2VyT3JaZXJvAQUaa2V5U1dhdmVzQWRkaXRpb25hbEJhbGFuY2UDCQAAAgUUY3VycmVudFNXYXZlc0JhbGFuY2UFFGN1cnJlbnRTV2F2ZXNCYWxhbmNlAwkAZgIFC3dhdmVzQW1vdW50AAAEDWRlcG9zaXRJbnZva2UJAPwHBAUFcHJveHkCB2RlcG9zaXQFA25pbAkAzAgCCQEPQXR0YWNoZWRQYXltZW50AgUEdW5pdAULd2F2ZXNBbW91bnQFA25pbAMJAAACBQ1kZXBvc2l0SW52b2tlBQ1kZXBvc2l0SW52b2tlBAckbWF0Y2gwBQ1kZXBvc2l0SW52b2tlAwkAAQIFByRtYXRjaDACA0ludAQOcmVjZWl2ZWRTV2F2ZXMFByRtYXRjaDAEFG5ld0FkZGl0aW9uYWxCYWxhbmNlCQBkAgUYY3VycmVudEFkZGl0aW9uYWxCYWxhbmNlBQt3YXZlc0Ftb3VudAQQbmV3U1dhdmVzQmFsYW5jZQkAZAIFFGN1cnJlbnRTV2F2ZXNCYWxhbmNlBQ5yZWNlaXZlZFNXYXZlcwkAzAgCCQEMSW50ZWdlckVudHJ5AgUUa2V5QWRkaXRpb25hbEJhbGFuY2UFFG5ld0FkZGl0aW9uYWxCYWxhbmNlCQDMCAIJAQxJbnRlZ2VyRW50cnkCBRprZXlTV2F2ZXNBZGRpdGlvbmFsQmFsYW5jZQUQbmV3U1dhdmVzQmFsYW5jZQUDbmlsBQNuaWwJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4FA25pbAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgEId2l0aGRyYXcBC3dhdmVzQW1vdW50BAVwcm94eQkBEUBleHRyTmF0aXZlKDEwNjIpAQkBEGdldFN0cmluZ09yVGhyb3cBBQ9rZXlQcm94eUFkZHJlc3MECHNXYXZlc0lkCQDZBAEJARBnZXRTdHJpbmdPclRocm93AQUQa2V5U1dhdmVzQXNzZXRJZAMJAAACBQhzV2F2ZXNJZAUIc1dhdmVzSWQEGGN1cnJlbnRBZGRpdGlvbmFsQmFsYW5jZQkBEGdldEludGVnZXJPclplcm8BBRRrZXlBZGRpdGlvbmFsQmFsYW5jZQMJAAACBRhjdXJyZW50QWRkaXRpb25hbEJhbGFuY2UFGGN1cnJlbnRBZGRpdGlvbmFsQmFsYW5jZQQUY3VycmVudFNXYXZlc0JhbGFuY2UJARBnZXRJbnRlZ2VyT3JaZXJvAQUaa2V5U1dhdmVzQWRkaXRpb25hbEJhbGFuY2UDCQAAAgUUY3VycmVudFNXYXZlc0JhbGFuY2UFFGN1cnJlbnRTV2F2ZXNCYWxhbmNlBBBjdXJyZW50UHJveHlSYXRlCQEHZ2V0UmF0ZQADCQAAAgUQY3VycmVudFByb3h5UmF0ZQUQY3VycmVudFByb3h5UmF0ZQQQc2VuZFNXYXZlc0Ftb3VudAkAawMAgKCUpY0dBQt3YXZlc0Ftb3VudAUQY3VycmVudFByb3h5UmF0ZQMJAGYCBRBzZW5kU1dhdmVzQW1vdW50AAAEDWRlcG9zaXRJbnZva2UJAPwHBAUFcHJveHkCCHdpdGhkcmF3BQNuaWwJAMwIAgkBD0F0dGFjaGVkUGF5bWVudAIFCHNXYXZlc0lkBRBzZW5kU1dhdmVzQW1vdW50BQNuaWwDCQAAAgUNZGVwb3NpdEludm9rZQUNZGVwb3NpdEludm9rZQQHJG1hdGNoMAUNZGVwb3NpdEludm9rZQMJAAECBQckbWF0Y2gwAgNJbnQEDXJlY2VpdmVkV2F2ZXMFByRtYXRjaDAEFG5ld0FkZGl0aW9uYWxCYWxhbmNlCQBlAgUYY3VycmVudEFkZGl0aW9uYWxCYWxhbmNlBQ1yZWNlaXZlZFdhdmVzBBBuZXdTV2F2ZXNCYWxhbmNlCQBlAgUUY3VycmVudFNXYXZlc0JhbGFuY2UFEHNlbmRTV2F2ZXNBbW91bnQJAMwIAgkBDEludGVnZXJFbnRyeQIFFGtleUFkZGl0aW9uYWxCYWxhbmNlBRRuZXdBZGRpdGlvbmFsQmFsYW5jZQkAzAgCCQEMSW50ZWdlckVudHJ5AgUaa2V5U1dhdmVzQWRkaXRpb25hbEJhbGFuY2UFEG5ld1NXYXZlc0JhbGFuY2UFA25pbAUDbmlsCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuBQNuaWwJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BAWkBDnJlYmFsYW5jZVJhdGlvAQt0YXJnZXRSYXRpbwQOcmVndWxhckJhbGFuY2UICQDvBwEFBHRoaXMHcmVndWxhcgMJAAACBQ5yZWd1bGFyQmFsYW5jZQUOcmVndWxhckJhbGFuY2UEEWFkZGl0aW9uYWxCYWxhbmNlCQEQZ2V0SW50ZWdlck9yWmVybwEFFGtleUFkZGl0aW9uYWxCYWxhbmNlAwkAAAIFEWFkZGl0aW9uYWxCYWxhbmNlBRFhZGRpdGlvbmFsQmFsYW5jZQQMd2hvbGVCYWxhbmNlCQBkAgUOcmVndWxhckJhbGFuY2UFEWFkZGl0aW9uYWxCYWxhbmNlBBd0YXJnZXRBZGRpdGlvbmFsQmFsYW5jZQkAawMFC3RhcmdldFJhdGlvBQx3aG9sZUJhbGFuY2UAZAQGY2hhbmdlCQBlAgURYWRkaXRpb25hbEJhbGFuY2UFF3RhcmdldEFkZGl0aW9uYWxCYWxhbmNlBAZuZXdSZWcJAGQCBQ5yZWd1bGFyQmFsYW5jZQUGY2hhbmdlAwkAAAIFBmNoYW5nZQAABQNuaWwDCQBmAgAABQZjaGFuZ2UED3NlbmRXYXZlc0Ftb3VudAkAaAIFBmNoYW5nZQD///////////8BCQEHZGVwb3NpdAEFD3NlbmRXYXZlc0Ftb3VudAQOZ2V0V2F2ZXNBbW91bnQFBmNoYW5nZQkBCHdpdGhkcmF3AQUOZ2V0V2F2ZXNBbW91bnQJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4AiasUFg==", "height": 2510847, "applicationStatus": "succeeded", "spentComplexity": 0 } View: original | compacted Prev: 8vn7jQm3xrr5emPUkFcVhBFSghRNd1VwaTFoh145uxMB Next: 36UVQqSDA8X6FYQvznVGRyYbXPYZyp6AecqTJBzfp4u1 Diff:
Old | New | Differences | |
---|---|---|---|
31 | 31 | ||
32 | 32 | func getTargetRatio () = match getInteger(keysTargetRatio) { | |
33 | 33 | case s: Int => | |
34 | - | s | |
34 | + | min([100, max([0, s])]) | |
35 | 35 | case _ => | |
36 | 36 | 80 | |
37 | 37 | } | |
38 | - | ||
39 | - | ||
40 | - | func internalWavesBalance () = (wavesBalance(this).regular + getIntegerOrZero(keyAdditionalBalance)) | |
41 | - | ||
42 | - | ||
43 | - | func internalRate () = { | |
44 | - | let additionalBalance = getIntegerOrZero(keyAdditionalBalance) | |
45 | - | let sWavesBalance = getIntegerOrZero(keySWavesAdditionalBalance) | |
46 | - | if ((additionalBalance == 0)) | |
47 | - | then 0 | |
48 | - | else fraction(100000000000, additionalBalance, sWavesBalance) | |
49 | - | } | |
50 | 38 | ||
51 | 39 | ||
52 | 40 | func getRate () = { | |
133 | 121 | ||
134 | 122 | ||
135 | 123 | @Callable(i) | |
136 | - | func calcRatio () = { | |
137 | - | let regularWavesBalance = wavesBalance(this).regular | |
138 | - | let additional = getIntegerOrZero(keyAdditionalBalance) | |
139 | - | let ratio = fraction(100, additional, (additional + regularWavesBalance)) | |
140 | - | $Tuple2(nil, ratio) | |
141 | - | } | |
142 | - | ||
143 | - | ||
144 | - | ||
145 | - | @Callable(i) | |
146 | - | func calcRatioTest (regularBalance,additional,targetRatio) = { | |
147 | - | let sum = (regularBalance + additional) | |
148 | - | let targetAdditionalBalance = fraction(targetRatio, sum, 100) | |
149 | - | let change = (additional - targetAdditionalBalance) | |
150 | - | let newReg = (regularBalance + change) | |
151 | - | if ((0 > change)) | |
152 | - | then { | |
153 | - | let sendAmount = (change * -1) | |
154 | - | $Tuple2(nil, [newReg, targetAdditionalBalance, change, ("deposit: " + toString(sendAmount))]) | |
155 | - | } | |
156 | - | else { | |
157 | - | let sendAmount = change | |
158 | - | $Tuple2(nil, [newReg, targetAdditionalBalance, change, ("withdraw: " + toString(sendAmount))]) | |
159 | - | } | |
160 | - | } | |
161 | - | ||
162 | - | ||
163 | - | ||
164 | - | @Callable(i) | |
165 | 124 | func rebalanceRatio (targetRatio) = { | |
166 | 125 | let regularBalance = wavesBalance(this).regular | |
167 | 126 | if ((regularBalance == regularBalance)) | |
169 | 128 | let additionalBalance = getIntegerOrZero(keyAdditionalBalance) | |
170 | 129 | if ((additionalBalance == additionalBalance)) | |
171 | 130 | then { | |
172 | - | let | |
173 | - | let targetAdditionalBalance = fraction(targetRatio, | |
131 | + | let wholeBalance = (regularBalance + additionalBalance) | |
132 | + | let targetAdditionalBalance = fraction(targetRatio, wholeBalance, 100) | |
174 | 133 | let change = (additionalBalance - targetAdditionalBalance) | |
175 | 134 | let newReg = (regularBalance + change) | |
176 | 135 | if ((change == 0)) |
Old | New | Differences | |
---|---|---|---|
1 | 1 | {-# STDLIB_VERSION 6 #-} | |
2 | 2 | {-# SCRIPT_TYPE ACCOUNT #-} | |
3 | 3 | {-# CONTENT_TYPE DAPP #-} | |
4 | 4 | let contractFile = "rebalance" | |
5 | 5 | ||
6 | 6 | let keysTargetRatio = "%s__targetRatio" | |
7 | 7 | ||
8 | 8 | let keyAdditionalBalance = "%s__additionalWavesBalance" | |
9 | 9 | ||
10 | 10 | let keySWavesAdditionalBalance = "%s__sWavesBalance" | |
11 | 11 | ||
12 | 12 | let keySWavesAssetId = "%s__sWavesAssetId" | |
13 | 13 | ||
14 | 14 | let keyProxyAddress = "%s__proxyAddress" | |
15 | 15 | ||
16 | 16 | func getIntegerOrZero (integerKey) = match getInteger(this, integerKey) { | |
17 | 17 | case val: Int => | |
18 | 18 | val | |
19 | 19 | case _ => | |
20 | 20 | 0 | |
21 | 21 | } | |
22 | 22 | ||
23 | 23 | ||
24 | 24 | func getStringOrThrow (stringKey) = match getString(this, stringKey) { | |
25 | 25 | case s: String => | |
26 | 26 | s | |
27 | 27 | case _ => | |
28 | 28 | throw((("[" + stringKey) + "] is empty")) | |
29 | 29 | } | |
30 | 30 | ||
31 | 31 | ||
32 | 32 | func getTargetRatio () = match getInteger(keysTargetRatio) { | |
33 | 33 | case s: Int => | |
34 | - | s | |
34 | + | min([100, max([0, s])]) | |
35 | 35 | case _ => | |
36 | 36 | 80 | |
37 | 37 | } | |
38 | - | ||
39 | - | ||
40 | - | func internalWavesBalance () = (wavesBalance(this).regular + getIntegerOrZero(keyAdditionalBalance)) | |
41 | - | ||
42 | - | ||
43 | - | func internalRate () = { | |
44 | - | let additionalBalance = getIntegerOrZero(keyAdditionalBalance) | |
45 | - | let sWavesBalance = getIntegerOrZero(keySWavesAdditionalBalance) | |
46 | - | if ((additionalBalance == 0)) | |
47 | - | then 0 | |
48 | - | else fraction(100000000000, additionalBalance, sWavesBalance) | |
49 | - | } | |
50 | 38 | ||
51 | 39 | ||
52 | 40 | func getRate () = { | |
53 | 41 | let proxy = addressFromStringValue(getStringOrThrow(keyProxyAddress)) | |
54 | 42 | let inv = invoke(proxy, "getRate", nil, nil) | |
55 | 43 | if ((inv == inv)) | |
56 | 44 | then match inv { | |
57 | 45 | case s: String => | |
58 | 46 | parseIntValue(s) | |
59 | 47 | case _ => | |
60 | 48 | throw("ZERO rate") | |
61 | 49 | } | |
62 | 50 | else throw("Strict value is not equal to itself.") | |
63 | 51 | } | |
64 | 52 | ||
65 | 53 | ||
66 | 54 | func deposit (wavesAmount) = { | |
67 | 55 | let proxy = addressFromStringValue(getStringOrThrow(keyProxyAddress)) | |
68 | 56 | let currentAdditionalBalance = getIntegerOrZero(keyAdditionalBalance) | |
69 | 57 | if ((currentAdditionalBalance == currentAdditionalBalance)) | |
70 | 58 | then { | |
71 | 59 | let currentSWavesBalance = getIntegerOrZero(keySWavesAdditionalBalance) | |
72 | 60 | if ((currentSWavesBalance == currentSWavesBalance)) | |
73 | 61 | then if ((wavesAmount > 0)) | |
74 | 62 | then { | |
75 | 63 | let depositInvoke = invoke(proxy, "deposit", nil, [AttachedPayment(unit, wavesAmount)]) | |
76 | 64 | if ((depositInvoke == depositInvoke)) | |
77 | 65 | then match depositInvoke { | |
78 | 66 | case receivedSWaves: Int => | |
79 | 67 | let newAdditionalBalance = (currentAdditionalBalance + wavesAmount) | |
80 | 68 | let newSWavesBalance = (currentSWavesBalance + receivedSWaves) | |
81 | 69 | [IntegerEntry(keyAdditionalBalance, newAdditionalBalance), IntegerEntry(keySWavesAdditionalBalance, newSWavesBalance)] | |
82 | 70 | case _ => | |
83 | 71 | nil | |
84 | 72 | } | |
85 | 73 | else throw("Strict value is not equal to itself.") | |
86 | 74 | } | |
87 | 75 | else nil | |
88 | 76 | else throw("Strict value is not equal to itself.") | |
89 | 77 | } | |
90 | 78 | else throw("Strict value is not equal to itself.") | |
91 | 79 | } | |
92 | 80 | ||
93 | 81 | ||
94 | 82 | func withdraw (wavesAmount) = { | |
95 | 83 | let proxy = addressFromStringValue(getStringOrThrow(keyProxyAddress)) | |
96 | 84 | let sWavesId = fromBase58String(getStringOrThrow(keySWavesAssetId)) | |
97 | 85 | if ((sWavesId == sWavesId)) | |
98 | 86 | then { | |
99 | 87 | let currentAdditionalBalance = getIntegerOrZero(keyAdditionalBalance) | |
100 | 88 | if ((currentAdditionalBalance == currentAdditionalBalance)) | |
101 | 89 | then { | |
102 | 90 | let currentSWavesBalance = getIntegerOrZero(keySWavesAdditionalBalance) | |
103 | 91 | if ((currentSWavesBalance == currentSWavesBalance)) | |
104 | 92 | then { | |
105 | 93 | let currentProxyRate = getRate() | |
106 | 94 | if ((currentProxyRate == currentProxyRate)) | |
107 | 95 | then { | |
108 | 96 | let sendSWavesAmount = fraction(1000000000000, wavesAmount, currentProxyRate) | |
109 | 97 | if ((sendSWavesAmount > 0)) | |
110 | 98 | then { | |
111 | 99 | let depositInvoke = invoke(proxy, "withdraw", nil, [AttachedPayment(sWavesId, sendSWavesAmount)]) | |
112 | 100 | if ((depositInvoke == depositInvoke)) | |
113 | 101 | then match depositInvoke { | |
114 | 102 | case receivedWaves: Int => | |
115 | 103 | let newAdditionalBalance = (currentAdditionalBalance - receivedWaves) | |
116 | 104 | let newSWavesBalance = (currentSWavesBalance - sendSWavesAmount) | |
117 | 105 | [IntegerEntry(keyAdditionalBalance, newAdditionalBalance), IntegerEntry(keySWavesAdditionalBalance, newSWavesBalance)] | |
118 | 106 | case _ => | |
119 | 107 | nil | |
120 | 108 | } | |
121 | 109 | else throw("Strict value is not equal to itself.") | |
122 | 110 | } | |
123 | 111 | else nil | |
124 | 112 | } | |
125 | 113 | else throw("Strict value is not equal to itself.") | |
126 | 114 | } | |
127 | 115 | else throw("Strict value is not equal to itself.") | |
128 | 116 | } | |
129 | 117 | else throw("Strict value is not equal to itself.") | |
130 | 118 | } | |
131 | 119 | else throw("Strict value is not equal to itself.") | |
132 | 120 | } | |
133 | 121 | ||
134 | 122 | ||
135 | 123 | @Callable(i) | |
136 | - | func calcRatio () = { | |
137 | - | let regularWavesBalance = wavesBalance(this).regular | |
138 | - | let additional = getIntegerOrZero(keyAdditionalBalance) | |
139 | - | let ratio = fraction(100, additional, (additional + regularWavesBalance)) | |
140 | - | $Tuple2(nil, ratio) | |
141 | - | } | |
142 | - | ||
143 | - | ||
144 | - | ||
145 | - | @Callable(i) | |
146 | - | func calcRatioTest (regularBalance,additional,targetRatio) = { | |
147 | - | let sum = (regularBalance + additional) | |
148 | - | let targetAdditionalBalance = fraction(targetRatio, sum, 100) | |
149 | - | let change = (additional - targetAdditionalBalance) | |
150 | - | let newReg = (regularBalance + change) | |
151 | - | if ((0 > change)) | |
152 | - | then { | |
153 | - | let sendAmount = (change * -1) | |
154 | - | $Tuple2(nil, [newReg, targetAdditionalBalance, change, ("deposit: " + toString(sendAmount))]) | |
155 | - | } | |
156 | - | else { | |
157 | - | let sendAmount = change | |
158 | - | $Tuple2(nil, [newReg, targetAdditionalBalance, change, ("withdraw: " + toString(sendAmount))]) | |
159 | - | } | |
160 | - | } | |
161 | - | ||
162 | - | ||
163 | - | ||
164 | - | @Callable(i) | |
165 | 124 | func rebalanceRatio (targetRatio) = { | |
166 | 125 | let regularBalance = wavesBalance(this).regular | |
167 | 126 | if ((regularBalance == regularBalance)) | |
168 | 127 | then { | |
169 | 128 | let additionalBalance = getIntegerOrZero(keyAdditionalBalance) | |
170 | 129 | if ((additionalBalance == additionalBalance)) | |
171 | 130 | then { | |
172 | - | let | |
173 | - | let targetAdditionalBalance = fraction(targetRatio, | |
131 | + | let wholeBalance = (regularBalance + additionalBalance) | |
132 | + | let targetAdditionalBalance = fraction(targetRatio, wholeBalance, 100) | |
174 | 133 | let change = (additionalBalance - targetAdditionalBalance) | |
175 | 134 | let newReg = (regularBalance + change) | |
176 | 135 | if ((change == 0)) | |
177 | 136 | then nil | |
178 | 137 | else if ((0 > change)) | |
179 | 138 | then { | |
180 | 139 | let sendWavesAmount = (change * -1) | |
181 | 140 | deposit(sendWavesAmount) | |
182 | 141 | } | |
183 | 142 | else { | |
184 | 143 | let getWavesAmount = change | |
185 | 144 | withdraw(getWavesAmount) | |
186 | 145 | } | |
187 | 146 | } | |
188 | 147 | else throw("Strict value is not equal to itself.") | |
189 | 148 | } | |
190 | 149 | else throw("Strict value is not equal to itself.") | |
191 | 150 | } | |
192 | 151 | ||
193 | 152 |
github/deemru/w8io/169f3d6 124.90 ms ◑