tx · 95Qmh2UMcxgtRYrLNxj1Hhv9eJE4krhpttBxDFRi5SiR

3NCWFHDzdPHZC6636ZkMLNDup9mjpbTLs7h:  -0.05000000 Waves

2023.03.29 10:12 [2510917] smart account 3NCWFHDzdPHZC6636ZkMLNDup9mjpbTLs7h > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "95Qmh2UMcxgtRYrLNxj1Hhv9eJE4krhpttBxDFRi5SiR",
    "fee": 5000000,
    "feeAssetId": null,
    "timestamp": 1680074003694,
    "version": 2,
    "chainId": 84,
    "sender": "3NCWFHDzdPHZC6636ZkMLNDup9mjpbTLs7h",
    "senderPublicKey": "3z8Q6Zu3KppVmn6fJJvrLc1Wo3krVHSvfaNcerm82md2",
    "proofs": [
        "3XgS9TubgTJHZ3Zcyj8KHMDeEHyoobyc3A8wMN3NE361rBszHtrPVTRverHXdT1gsGr7ataWBsKyQDJXBng6NHK3"
    ],
    "script": "base64:BgIJCAISAwoBARIAEgAMY29udHJhY3RGaWxlAglyZWJhbGFuY2UAD2tleXNUYXJnZXRSYXRpbwIPJXNfX3RhcmdldFJhdGlvABRrZXlBZGRpdGlvbmFsQmFsYW5jZQIaJXNfX2FkZGl0aW9uYWxXYXZlc0JhbGFuY2UAGmtleVNXYXZlc0FkZGl0aW9uYWxCYWxhbmNlAhElc19fc1dhdmVzQmFsYW5jZQAQa2V5U1dhdmVzQXNzZXRJZAIRJXNfX3NXYXZlc0Fzc2V0SWQAD2tleVByb3h5QWRkcmVzcwIQJXNfX3Byb3h5QWRkcmVzcwANa2V5TWluQmFsYW5jZQITJXNfX21pbldhdmVzQmFsYW5jZQAGTVVMVDEyAICglKWNHQEQZ2V0SW50ZWdlck9yWmVybwEKaW50ZWdlcktleQQHJG1hdGNoMAkAmggCBQR0aGlzBQppbnRlZ2VyS2V5AwkAAQIFByRtYXRjaDACA0ludAQDdmFsBQckbWF0Y2gwBQN2YWwAAAEQZ2V0U3RyaW5nT3JUaHJvdwEJc3RyaW5nS2V5BAckbWF0Y2gwCQCdCAIFBHRoaXMFCXN0cmluZ0tleQMJAAECBQckbWF0Y2gwAgZTdHJpbmcEAXMFByRtYXRjaDAFAXMJAAIBCQCsAgIJAKwCAgIBWwUJc3RyaW5nS2V5AgpdIGlzIGVtcHR5AQ5nZXRUYXJnZXRSYXRpbwAEByRtYXRjaDAJAJ8IAQUPa2V5c1RhcmdldFJhdGlvAwkAAQIFByRtYXRjaDACA0ludAQFcmF0aW8FByRtYXRjaDAJAJcDAQkAzAgCAGQJAMwIAgkAlgMBCQDMCAIAAAkAzAgCBQVyYXRpbwUDbmlsBQNuaWwAAAENZ2V0TWluQmFsYW5jZQAEByRtYXRjaDAJAJ8IAQUNa2V5TWluQmFsYW5jZQMJAAECBQckbWF0Y2gwAgNJbnQEAWkFByRtYXRjaDAJAJYDAQkAzAgCAAAJAMwIAgUBaQUDbmlsAAABB2dldFJhdGUABAVwcm94eQkBEUBleHRyTmF0aXZlKDEwNjIpAQkBEGdldFN0cmluZ09yVGhyb3cBBQ9rZXlQcm94eUFkZHJlc3MEA2ludgkA/AcEBQVwcm94eQIHZ2V0UmF0ZQUDbmlsBQNuaWwDCQAAAgUDaW52BQNpbnYEByRtYXRjaDAFA2ludgMJAAECBQckbWF0Y2gwAgZTdHJpbmcEAXMFByRtYXRjaDAJAQ1wYXJzZUludFZhbHVlAQUBcwkAAgECEFJhdGUgaXMgemVybyAoMCkJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BD2dldFByb3h5QWRkcmVzcwAJARFAZXh0ck5hdGl2ZSgxMDYyKQEJARBnZXRTdHJpbmdPclRocm93AQUPa2V5UHJveHlBZGRyZXNzAQtnZXRTV2F2ZXNJZAAJANkEAQkBEGdldFN0cmluZ09yVGhyb3cBBRBrZXlTV2F2ZXNBc3NldElkAQdkZXBvc2l0AQt3YXZlc0Ftb3VudAQFcHJveHkJAQ9nZXRQcm94eUFkZHJlc3MABBhjdXJyZW50QWRkaXRpb25hbEJhbGFuY2UJARBnZXRJbnRlZ2VyT3JaZXJvAQUUa2V5QWRkaXRpb25hbEJhbGFuY2UDCQAAAgUYY3VycmVudEFkZGl0aW9uYWxCYWxhbmNlBRhjdXJyZW50QWRkaXRpb25hbEJhbGFuY2UEFGN1cnJlbnRTV2F2ZXNCYWxhbmNlCQEQZ2V0SW50ZWdlck9yWmVybwEFGmtleVNXYXZlc0FkZGl0aW9uYWxCYWxhbmNlAwkAAAIFFGN1cnJlbnRTV2F2ZXNCYWxhbmNlBRRjdXJyZW50U1dhdmVzQmFsYW5jZQMJAGYCBQt3YXZlc0Ftb3VudAAABA1kZXBvc2l0SW52b2tlCQD8BwQFBXByb3h5AgdkZXBvc2l0BQNuaWwJAMwIAgkBD0F0dGFjaGVkUGF5bWVudAIFBHVuaXQFC3dhdmVzQW1vdW50BQNuaWwDCQAAAgUNZGVwb3NpdEludm9rZQUNZGVwb3NpdEludm9rZQQHJG1hdGNoMAUNZGVwb3NpdEludm9rZQMJAAECBQckbWF0Y2gwAgNJbnQEDnJlY2VpdmVkU1dhdmVzBQckbWF0Y2gwBBRuZXdBZGRpdGlvbmFsQmFsYW5jZQkAZAIFGGN1cnJlbnRBZGRpdGlvbmFsQmFsYW5jZQULd2F2ZXNBbW91bnQEEG5ld1NXYXZlc0JhbGFuY2UJAGQCBRRjdXJyZW50U1dhdmVzQmFsYW5jZQUOcmVjZWl2ZWRTV2F2ZXMJAMwIAgkBDEludGVnZXJFbnRyeQIFFGtleUFkZGl0aW9uYWxCYWxhbmNlBRRuZXdBZGRpdGlvbmFsQmFsYW5jZQkAzAgCCQEMSW50ZWdlckVudHJ5AgUaa2V5U1dhdmVzQWRkaXRpb25hbEJhbGFuY2UFEG5ld1NXYXZlc0JhbGFuY2UFA25pbAUDbmlsCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuBQNuaWwJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BCHdpdGhkcmF3AQt3YXZlc0Ftb3VudAQFcHJveHkJAQ9nZXRQcm94eUFkZHJlc3MABBhjdXJyZW50QWRkaXRpb25hbEJhbGFuY2UJARBnZXRJbnRlZ2VyT3JaZXJvAQUUa2V5QWRkaXRpb25hbEJhbGFuY2UDCQAAAgUYY3VycmVudEFkZGl0aW9uYWxCYWxhbmNlBRhjdXJyZW50QWRkaXRpb25hbEJhbGFuY2UEFGN1cnJlbnRTV2F2ZXNCYWxhbmNlCQEQZ2V0SW50ZWdlck9yWmVybwEFGmtleVNXYXZlc0FkZGl0aW9uYWxCYWxhbmNlAwkAAAIFFGN1cnJlbnRTV2F2ZXNCYWxhbmNlBRRjdXJyZW50U1dhdmVzQmFsYW5jZQQQY3VycmVudFByb3h5UmF0ZQkBB2dldFJhdGUAAwkAAAIFEGN1cnJlbnRQcm94eVJhdGUFEGN1cnJlbnRQcm94eVJhdGUEEHNlbmRTV2F2ZXNBbW91bnQJAGsDBQZNVUxUMTIFC3dhdmVzQW1vdW50BRBjdXJyZW50UHJveHlSYXRlAwkAZgIFEHNlbmRTV2F2ZXNBbW91bnQAAAQOd2l0aGRyYXdJbnZva2UJAPwHBAUFcHJveHkCCHdpdGhkcmF3BQNuaWwJAMwIAgkBD0F0dGFjaGVkUGF5bWVudAIJAQtnZXRTV2F2ZXNJZAAFEHNlbmRTV2F2ZXNBbW91bnQFA25pbAMJAAACBQ53aXRoZHJhd0ludm9rZQUOd2l0aGRyYXdJbnZva2UEByRtYXRjaDAFDndpdGhkcmF3SW52b2tlAwkAAQIFByRtYXRjaDACA0ludAQNcmVjZWl2ZWRXYXZlcwUHJG1hdGNoMAQUbmV3QWRkaXRpb25hbEJhbGFuY2UJAGUCBRhjdXJyZW50QWRkaXRpb25hbEJhbGFuY2UFDXJlY2VpdmVkV2F2ZXMEEG5ld1NXYXZlc0JhbGFuY2UJAGUCBRRjdXJyZW50U1dhdmVzQmFsYW5jZQUQc2VuZFNXYXZlc0Ftb3VudAkAzAgCCQEMSW50ZWdlckVudHJ5AgUUa2V5QWRkaXRpb25hbEJhbGFuY2UFFG5ld0FkZGl0aW9uYWxCYWxhbmNlCQDMCAIJAQxJbnRlZ2VyRW50cnkCBRprZXlTV2F2ZXNBZGRpdGlvbmFsQmFsYW5jZQUQbmV3U1dhdmVzQmFsYW5jZQUDbmlsBQNuaWwJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4FA25pbAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgERcmViYWxhbmNlSW50ZXJuYWwBC3RhcmdldFJhdGlvBA5yZWd1bGFyQmFsYW5jZQkAlgMBCQDMCAIAAAkAzAgCCQBlAggJAO8HAQUEdGhpcwdyZWd1bGFyCQENZ2V0TWluQmFsYW5jZQAFA25pbAMJAAACBQ5yZWd1bGFyQmFsYW5jZQUOcmVndWxhckJhbGFuY2UEEWFkZGl0aW9uYWxCYWxhbmNlCQEQZ2V0SW50ZWdlck9yWmVybwEFFGtleUFkZGl0aW9uYWxCYWxhbmNlAwkAAAIFEWFkZGl0aW9uYWxCYWxhbmNlBRFhZGRpdGlvbmFsQmFsYW5jZQQMd2hvbGVCYWxhbmNlCQBkAgUOcmVndWxhckJhbGFuY2UFEWFkZGl0aW9uYWxCYWxhbmNlBBd0YXJnZXRBZGRpdGlvbmFsQmFsYW5jZQkAawMFC3RhcmdldFJhdGlvBQx3aG9sZUJhbGFuY2UAZAQEZGlmZgkAZQIFEWFkZGl0aW9uYWxCYWxhbmNlBRd0YXJnZXRBZGRpdGlvbmFsQmFsYW5jZQMJAAACBQRkaWZmAAAFA25pbAMJAGYCAAAFBGRpZmYED3NlbmRXYXZlc0Ftb3VudAkBAS0BBQRkaWZmCQEHZGVwb3NpdAEFD3NlbmRXYXZlc0Ftb3VudAQOZ2V0V2F2ZXNBbW91bnQFBGRpZmYJAQh3aXRoZHJhdwEFDmdldFdhdmVzQW1vdW50CQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAgFpAQ5yZWJhbGFuY2VSYXRpbwELdGFyZ2V0UmF0aW8JARFyZWJhbGFuY2VJbnRlcm5hbAEFC3RhcmdldFJhdGlvAWkBCXJlYmFsYW5jZQAJARFyZWJhbGFuY2VJbnRlcm5hbAEJAQ5nZXRUYXJnZXRSYXRpbwAA712fTQ==",
    "height": 2510917,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: Hce4aPAvmT9eMwmJomxYJuuLHT6io955KnNVFzDv8tB
Next: 9B5o6xrQxZesRAhzUguYrZiAsQDiEBE8rwd8j9ahfLaN

Diff: 
Old
New
Differences
37
37
 
    case ratio: Int => 
38
38
 
        min([100, max([0, ratio])])
39
39
 
    case _ => 
40
-
        80
40
+
        0
41
41
 
}
42
42
 
43
43
 
57
57
 
            case s: String => 
58
58
 
                parseIntValue(s)
59
59
 
            case _ => 
60
-
                throw("ZERO rate")
60
+
                throw("Rate is zero (0)")
61
61
 
        }
62
62
 
        else throw("Strict value is not equal to itself.")
63
63
 
    }
64
64
 
65
65
 
66
+
func getProxyAddress () = addressFromStringValue(getStringOrThrow(keyProxyAddress))
67
+
68
+
69
+
func getSWavesId () = fromBase58String(getStringOrThrow(keySWavesAssetId))
70
+
71
+
66
72
 
func deposit (wavesAmount) = {
67
-
    let proxy = addressFromStringValue(getStringOrThrow(keyProxyAddress))
73
+
    let proxy = getProxyAddress()
68
74
 
    let currentAdditionalBalance = getIntegerOrZero(keyAdditionalBalance)
69
75
 
    if ((currentAdditionalBalance == currentAdditionalBalance))
70
76
 
        then {
92
98
 
93
99
 
94
100
 
func withdraw (wavesAmount) = {
95
-
    let proxy = addressFromStringValue(getStringOrThrow(keyProxyAddress))
96
-
    let sWavesId = fromBase58String(getStringOrThrow(keySWavesAssetId))
97
-
    if ((sWavesId == sWavesId))
101
+
    let proxy = getProxyAddress()
102
+
    let currentAdditionalBalance = getIntegerOrZero(keyAdditionalBalance)
103
+
    if ((currentAdditionalBalance == currentAdditionalBalance))
98
104
 
        then {
99
-
            let currentAdditionalBalance = getIntegerOrZero(keyAdditionalBalance)
100
-
            if ((currentAdditionalBalance == currentAdditionalBalance))
105
+
            let currentSWavesBalance = getIntegerOrZero(keySWavesAdditionalBalance)
106
+
            if ((currentSWavesBalance == currentSWavesBalance))
101
107
 
                then {
102
-
                    let currentSWavesBalance = getIntegerOrZero(keySWavesAdditionalBalance)
103
-
                    if ((currentSWavesBalance == currentSWavesBalance))
108
+
                    let currentProxyRate = getRate()
109
+
                    if ((currentProxyRate == currentProxyRate))
104
110
 
                        then {
105
-
                            let currentProxyRate = getRate()
106
-
                            if ((currentProxyRate == currentProxyRate))
111
+
                            let sendSWavesAmount = fraction(MULT12, wavesAmount, currentProxyRate)
112
+
                            if ((sendSWavesAmount > 0))
107
113
 
                                then {
108
-
                                    let sendSWavesAmount = fraction(MULT12, wavesAmount, currentProxyRate)
109
-
                                    if ((sendSWavesAmount > 0))
110
-
                                        then {
111
-
                                            let depositInvoke = invoke(proxy, "withdraw", nil, [AttachedPayment(sWavesId, sendSWavesAmount)])
112
-
                                            if ((depositInvoke == depositInvoke))
113
-
                                                then                                                 match depositInvoke {
114
-
                                                    case receivedWaves: Int => 
115
-
                                                        let newAdditionalBalance = (currentAdditionalBalance - receivedWaves)
116
-
                                                        let newSWavesBalance = (currentSWavesBalance - sendSWavesAmount)
114
+
                                    let withdrawInvoke = invoke(proxy, "withdraw", nil, [AttachedPayment(getSWavesId(), sendSWavesAmount)])
115
+
                                    if ((withdrawInvoke == withdrawInvoke))
116
+
                                        then                                         match withdrawInvoke {
117
+
                                            case receivedWaves: Int => 
118
+
                                                let newAdditionalBalance = (currentAdditionalBalance - receivedWaves)
119
+
                                                let newSWavesBalance = (currentSWavesBalance - sendSWavesAmount)
117
120
 
[IntegerEntry(keyAdditionalBalance, newAdditionalBalance), IntegerEntry(keySWavesAdditionalBalance, newSWavesBalance)]
118
-
                                                    case _ => 
119
-
                                                        nil
120
-
                                                }
121
-
                                                else throw("Strict value is not equal to itself.")
122
-
                                            }
123
-
                                        else nil
121
+
                                            case _ => 
122
+
                                                nil
123
+
                                        }
124
+
                                        else throw("Strict value is not equal to itself.")
124
125
 
                                    }
125
-
                                else throw("Strict value is not equal to itself.")
126
+
                                else nil
126
127
 
                            }
127
128
 
                        else throw("Strict value is not equal to itself.")
128
129
 
                    }
132
133
 
    }
133
134
 
134
135
 
135
-
@Callable(i)
136
-
func rebalanceRatio (targetRatio) = {
136
+
func rebalanceInternal (targetRatio) = {
137
137
 
    let regularBalance = max([0, (wavesBalance(this).regular - getMinBalance())])
138
138
 
    if ((regularBalance == regularBalance))
139
139
 
        then {
142
142
 
                then {
143
143
 
                    let wholeBalance = (regularBalance + additionalBalance)
144
144
 
                    let targetAdditionalBalance = fraction(targetRatio, wholeBalance, 100)
145
-
                    let change = (additionalBalance - targetAdditionalBalance)
146
-
                    if ((change == 0))
145
+
                    let diff = (additionalBalance - targetAdditionalBalance)
146
+
                    if ((diff == 0))
147
147
 
                        then nil
148
-
                        else if ((0 > change))
148
+
                        else if ((0 > diff))
149
149
 
                            then {
150
-
                                let sendWavesAmount = (change * -1)
150
+
                                let sendWavesAmount = -(diff)
151
151
 
                                deposit(sendWavesAmount)
152
152
 
                                }
153
153
 
                            else {
154
-
                                let getWavesAmount = change
154
+
                                let getWavesAmount = diff
155
155
 
                                withdraw(getWavesAmount)
156
156
 
                                }
157
157
 
                    }
161
161
 
    }
162
162
 
163
163
 
164
+
@Callable(i)
165
+
func rebalanceRatio (targetRatio) = rebalanceInternal(targetRatio)
166
+
167
+
168
+
169
+
@Callable(i)
170
+
func rebalance () = rebalanceInternal(getTargetRatio())
171
+
172
+

Full: 
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
 
let keyMinBalance = "%s__minWavesBalance"
17
17
 
18
18
 
let MULT12 = 1000000000000
19
19
 
20
20
 
func getIntegerOrZero (integerKey) = match getInteger(this, integerKey) {
21
21
 
    case val: Int => 
22
22
 
        val
23
23
 
    case _ => 
24
24
 
        0
25
25
 
}
26
26
 
27
27
 
28
28
 
func getStringOrThrow (stringKey) = match getString(this, stringKey) {
29
29
 
    case s: String => 
30
30
 
        s
31
31
 
    case _ => 
32
32
 
        throw((("[" + stringKey) + "] is empty"))
33
33
 
}
34
34
 
35
35
 
36
36
 
func getTargetRatio () = match getInteger(keysTargetRatio) {
37
37
 
    case ratio: Int => 
38
38
 
        min([100, max([0, ratio])])
39
39
 
    case _ => 
40
-
        80
40
+
        0
41
41
 
}
42
42
 
43
43
 
44
44
 
func getMinBalance () = match getInteger(keyMinBalance) {
45
45
 
    case i: Int => 
46
46
 
        max([0, i])
47
47
 
    case _ => 
48
48
 
        0
49
49
 
}
50
50
 
51
51
 
52
52
 
func getRate () = {
53
53
 
    let proxy = addressFromStringValue(getStringOrThrow(keyProxyAddress))
54
54
 
    let inv = invoke(proxy, "getRate", nil, nil)
55
55
 
    if ((inv == inv))
56
56
 
        then         match inv {
57
57
 
            case s: String => 
58
58
 
                parseIntValue(s)
59
59
 
            case _ => 
60
-
                throw("ZERO rate")
60
+
                throw("Rate is zero (0)")
61
61
 
        }
62
62
 
        else throw("Strict value is not equal to itself.")
63
63
 
    }
64
64
 
65
65
 
66
+
func getProxyAddress () = addressFromStringValue(getStringOrThrow(keyProxyAddress))
67
+
68
+
69
+
func getSWavesId () = fromBase58String(getStringOrThrow(keySWavesAssetId))
70
+
71
+
66
72
 
func deposit (wavesAmount) = {
67
-
    let proxy = addressFromStringValue(getStringOrThrow(keyProxyAddress))
73
+
    let proxy = getProxyAddress()
68
74
 
    let currentAdditionalBalance = getIntegerOrZero(keyAdditionalBalance)
69
75
 
    if ((currentAdditionalBalance == currentAdditionalBalance))
70
76
 
        then {
71
77
 
            let currentSWavesBalance = getIntegerOrZero(keySWavesAdditionalBalance)
72
78
 
            if ((currentSWavesBalance == currentSWavesBalance))
73
79
 
                then if ((wavesAmount > 0))
74
80
 
                    then {
75
81
 
                        let depositInvoke = invoke(proxy, "deposit", nil, [AttachedPayment(unit, wavesAmount)])
76
82
 
                        if ((depositInvoke == depositInvoke))
77
83
 
                            then                             match depositInvoke {
78
84
 
                                case receivedSWaves: Int => 
79
85
 
                                    let newAdditionalBalance = (currentAdditionalBalance + wavesAmount)
80
86
 
                                    let newSWavesBalance = (currentSWavesBalance + receivedSWaves)
81
87
 
[IntegerEntry(keyAdditionalBalance, newAdditionalBalance), IntegerEntry(keySWavesAdditionalBalance, newSWavesBalance)]
82
88
 
                                case _ => 
83
89
 
                                    nil
84
90
 
                            }
85
91
 
                            else throw("Strict value is not equal to itself.")
86
92
 
                        }
87
93
 
                    else nil
88
94
 
                else throw("Strict value is not equal to itself.")
89
95
 
            }
90
96
 
        else throw("Strict value is not equal to itself.")
91
97
 
    }
92
98
 
93
99
 
94
100
 
func withdraw (wavesAmount) = {
95
-
    let proxy = addressFromStringValue(getStringOrThrow(keyProxyAddress))
96
-
    let sWavesId = fromBase58String(getStringOrThrow(keySWavesAssetId))
97
-
    if ((sWavesId == sWavesId))
101
+
    let proxy = getProxyAddress()
102
+
    let currentAdditionalBalance = getIntegerOrZero(keyAdditionalBalance)
103
+
    if ((currentAdditionalBalance == currentAdditionalBalance))
98
104
 
        then {
99
-
            let currentAdditionalBalance = getIntegerOrZero(keyAdditionalBalance)
100
-
            if ((currentAdditionalBalance == currentAdditionalBalance))
105
+
            let currentSWavesBalance = getIntegerOrZero(keySWavesAdditionalBalance)
106
+
            if ((currentSWavesBalance == currentSWavesBalance))
101
107
 
                then {
102
-
                    let currentSWavesBalance = getIntegerOrZero(keySWavesAdditionalBalance)
103
-
                    if ((currentSWavesBalance == currentSWavesBalance))
108
+
                    let currentProxyRate = getRate()
109
+
                    if ((currentProxyRate == currentProxyRate))
104
110
 
                        then {
105
-
                            let currentProxyRate = getRate()
106
-
                            if ((currentProxyRate == currentProxyRate))
111
+
                            let sendSWavesAmount = fraction(MULT12, wavesAmount, currentProxyRate)
112
+
                            if ((sendSWavesAmount > 0))
107
113
 
                                then {
108
-
                                    let sendSWavesAmount = fraction(MULT12, wavesAmount, currentProxyRate)
109
-
                                    if ((sendSWavesAmount > 0))
110
-
                                        then {
111
-
                                            let depositInvoke = invoke(proxy, "withdraw", nil, [AttachedPayment(sWavesId, sendSWavesAmount)])
112
-
                                            if ((depositInvoke == depositInvoke))
113
-
                                                then                                                 match depositInvoke {
114
-
                                                    case receivedWaves: Int => 
115
-
                                                        let newAdditionalBalance = (currentAdditionalBalance - receivedWaves)
116
-
                                                        let newSWavesBalance = (currentSWavesBalance - sendSWavesAmount)
114
+
                                    let withdrawInvoke = invoke(proxy, "withdraw", nil, [AttachedPayment(getSWavesId(), sendSWavesAmount)])
115
+
                                    if ((withdrawInvoke == withdrawInvoke))
116
+
                                        then                                         match withdrawInvoke {
117
+
                                            case receivedWaves: Int => 
118
+
                                                let newAdditionalBalance = (currentAdditionalBalance - receivedWaves)
119
+
                                                let newSWavesBalance = (currentSWavesBalance - sendSWavesAmount)
117
120
 
[IntegerEntry(keyAdditionalBalance, newAdditionalBalance), IntegerEntry(keySWavesAdditionalBalance, newSWavesBalance)]
118
-
                                                    case _ => 
119
-
                                                        nil
120
-
                                                }
121
-
                                                else throw("Strict value is not equal to itself.")
122
-
                                            }
123
-
                                        else nil
121
+
                                            case _ => 
122
+
                                                nil
123
+
                                        }
124
+
                                        else throw("Strict value is not equal to itself.")
124
125
 
                                    }
125
-
                                else throw("Strict value is not equal to itself.")
126
+
                                else nil
126
127
 
                            }
127
128
 
                        else throw("Strict value is not equal to itself.")
128
129
 
                    }
129
130
 
                else throw("Strict value is not equal to itself.")
130
131
 
            }
131
132
 
        else throw("Strict value is not equal to itself.")
132
133
 
    }
133
134
 
134
135
 
135
-
@Callable(i)
136
-
func rebalanceRatio (targetRatio) = {
136
+
func rebalanceInternal (targetRatio) = {
137
137
 
    let regularBalance = max([0, (wavesBalance(this).regular - getMinBalance())])
138
138
 
    if ((regularBalance == regularBalance))
139
139
 
        then {
140
140
 
            let additionalBalance = getIntegerOrZero(keyAdditionalBalance)
141
141
 
            if ((additionalBalance == additionalBalance))
142
142
 
                then {
143
143
 
                    let wholeBalance = (regularBalance + additionalBalance)
144
144
 
                    let targetAdditionalBalance = fraction(targetRatio, wholeBalance, 100)
145
-
                    let change = (additionalBalance - targetAdditionalBalance)
146
-
                    if ((change == 0))
145
+
                    let diff = (additionalBalance - targetAdditionalBalance)
146
+
                    if ((diff == 0))
147
147
 
                        then nil
148
-
                        else if ((0 > change))
148
+
                        else if ((0 > diff))
149
149
 
                            then {
150
-
                                let sendWavesAmount = (change * -1)
150
+
                                let sendWavesAmount = -(diff)
151
151
 
                                deposit(sendWavesAmount)
152
152
 
                                }
153
153
 
                            else {
154
-
                                let getWavesAmount = change
154
+
                                let getWavesAmount = diff
155
155
 
                                withdraw(getWavesAmount)
156
156
 
                                }
157
157
 
                    }
158
158
 
                else throw("Strict value is not equal to itself.")
159
159
 
            }
160
160
 
        else throw("Strict value is not equal to itself.")
161
161
 
    }
162
162
 
163
163
 
164
+
@Callable(i)
165
+
func rebalanceRatio (targetRatio) = rebalanceInternal(targetRatio)
166
+
167
+
168
+
169
+
@Callable(i)
170
+
func rebalance () = rebalanceInternal(getTargetRatio())
171
+
172
+

github/deemru/w8io/169f3d6 
55.39 ms ◑