tx · AAKjujiZapLJhWuAQVFy4YKVqx2V2iVJNPuy1eVQXT7X 3NATMChCuzdHBV89FhZMpRTiMZMxyAvK9yP: -0.05000000 Waves 2022.02.25 12:07 [1938960] smart account 3NATMChCuzdHBV89FhZMpRTiMZMxyAvK9yP > SELF 0.00000000 Waves
{ "type": 13, "id": "AAKjujiZapLJhWuAQVFy4YKVqx2V2iVJNPuy1eVQXT7X", "fee": 5000000, "feeAssetId": null, "timestamp": 1645780051044, "version": 2, "chainId": 84, "sender": "3NATMChCuzdHBV89FhZMpRTiMZMxyAvK9yP", "senderPublicKey": "89LFt4Pg8y6n1ZYsj4eeagWgkpVvSAyszsXGyo6ZfnVM", "proofs": [ "5a1Ncrjub7YTUe1AD4jHyJJcgAGgsfVvzVMEh57xQnuBr9mJ12dUFku9y1SGNaC8S1T83UTeP8ctwnfyo2JR5278" ], "script": "base64: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BQAAAAIkYQkAAAIAAAABAgAAABNMaXN0IHNpemUgZXhjZWVkcyAzCQEAAAAFJGYwXzIAAAACCQEAAAAFJGYwXzEAAAACCQEAAAAFJGYwXzEAAAACCQEAAAAFJGYwXzEAAAACBQAAAAUkYWNjMAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAgAAAAAAAAAAAwMJAABmAAAAAgAAAAAAAAAAAAUAAAABYQUAAAAVYW1vdW50VG9TZW5kRXN0aW1hdGVkBQAAAAFhBQAAABBhbW91bnRUb1NlbmRCZXN0AAAAAQAAAAFpAQAAAAhleGNoYW5nZQAAAAYAAAAIYmFsYW5jZUEAAAAIYmFsYW5jZUIAAAAJcG10QW1vdW50AAAACnBtdEFzc2V0SWQAAAAYZXN0aW1hdGVkQW1vdW50VG9SZWNlaXZlAAAAEm1pbkFtb3VudFRvUmVjZWl2ZQQAAAAGYW1vdW50CQEAAAATY2FsY3VsYXRlU2VuZEFtb3VudAAAAAYFAAAACGJhbGFuY2VBBQAAAAhiYWxhbmNlQgUAAAAYZXN0aW1hdGVkQW1vdW50VG9SZWNlaXZlBQAAABJtaW5BbW91bnRUb1JlY2VpdmUFAAAACXBtdEFtb3VudAUAAAAKcG10QXNzZXRJZAQAAAAQZ292ZXJuYW5jZVJld2FyZAkAAGsAAAADBQAAAAZhbW91bnQFAAAADWZlZUdvdmVybmFuY2UFAAAACWZlZVNjYWxlNgQAAAAOYW1vdW50TWludXNGZWUJAABrAAAAAwUAAAAGYW1vdW50CQAAZQAAAAIFAAAACWZlZVNjYWxlNgUAAAADZmVlBQAAAAlmZWVTY2FsZTYJAAROAAAAAgkABEwAAAACCQEAAAAMSW50ZWdlckVudHJ5AAAAAgIAAAAKc2VuZEFtb3VudAUAAAAGYW1vdW50CQAETAAAAAIJAQAAAAxJbnRlZ2VyRW50cnkAAAACAgAAABdzZW5kQW1vdW50V2l0aENvbWlzc2lvbgUAAAAOYW1vdW50TWludXNGZWUJAARMAAAAAgkBAAAADEludGVnZXJFbnRyeQAAAAICAAAACWludmFyaWFudAkBAAAADWludmFyaWFudENhbGMAAAACBQAAAAhiYWxhbmNlQQUAAAAIYmFsYW5jZUIFAAAAA25pbAMJAAAAAAAAAgUAAAAKcG10QXNzZXRJZAUAAAALc3RyQXNzZXRJZEEJAARMAAAAAgkBAAAADEludGVnZXJFbnRyeQAAAAICAAAADGludmFyaWFudE5ldwkBAAAADWludmFyaWFudENhbGMAAAACCQAAZAAAAAIFAAAACGJhbGFuY2VBBQAAAAlwbXRBbW91bnQJAABlAAAAAgUAAAAIYmFsYW5jZUIFAAAABmFtb3VudAUAAAADbmlsCQAETAAAAAIJAQAAAAxJbnRlZ2VyRW50cnkAAAACAgAAAAxpbnZhcmlhbnROZXcJAQAAAA1pbnZhcmlhbnRDYWxjAAAAAgkAAGUAAAACBQAAAAhiYWxhbmNlQQUAAAAGYW1vdW50CQAAZAAAAAIFAAAACGJhbGFuY2VCBQAAAAlwbXRBbW91bnQFAAAAA25pbAAAAAEAAAACdHgBAAAABnZlcmlmeQAAAAAJAAH0AAAAAwgFAAAAAnR4AAAACWJvZHlCeXRlcwkAAZEAAAACCAUAAAACdHgAAAAGcHJvb2ZzAAAAAAAAAAAACAUAAAACdHgAAAAPc2VuZGVyUHVibGljS2V5NW38zA==", "height": 1938960, "applicationStatus": "succeeded", "spentComplexity": 0 } View: original | compacted Prev: DmcjYPkR6FrrgDqzc1PN81t2PFPNRxLsqLXvp7mkqXws Next: 5W4aQ1Dw6o7QbPSJpVMvqVH9PaRHuVNhdPjU7X8rBFxc Diff:
Old | New | Differences | |
---|---|---|---|
57 | 57 | ||
58 | 58 | ||
59 | 59 | func calculateSendAmount (balanceA,balanceB,amountToSendEstimated,minTokenReceiveAmount,tokenReceiveAmount,tokenId) = { | |
60 | - | let | |
60 | + | let worstAllowedNewInvariantRatio = (scale8 - ((scale8 * 1) / 10000000)) | |
61 | 61 | let deltaBetweenMaxAndMinSendValue = (amountToSendEstimated - minTokenReceiveAmount) | |
62 | + | let invariant = invariantCalc(balanceA, balanceB) | |
62 | 63 | let x = (balanceA + tokenReceiveAmount) | |
63 | 64 | let y = (balanceB + tokenReceiveAmount) | |
64 | - | let invariant = invariantCalc(balanceA, balanceB) | |
65 | - | let invariantNew = if ((tokenId == strAssetIdA)) | |
66 | - | then invariantCalc(x, (balanceB - amountToSendEstimated)) | |
67 | - | else if ((tokenId == strAssetIdB)) | |
68 | - | then invariantCalc((balanceA - amountToSendEstimated), y) | |
69 | - | else throw("Wrong asset in payment") | |
70 | - | let invariantEstimatedRatio = fraction(scale8, invariant, invariantNew) | |
71 | 65 | func getStepAmount (acc,step) = if ((acc == -1)) | |
72 | 66 | then { | |
73 | - | let amountToSend = (amountToSendEstimated - ((step * deltaBetweenMaxAndMinSendValue) / | |
67 | + | let amountToSend = (amountToSendEstimated - (((step * deltaBetweenMaxAndMinSendValue) / 3) / scale3)) | |
74 | 68 | let stepInvariant = if ((tokenId == strAssetIdA)) | |
75 | 69 | then invariantCalc(x, (balanceB - amountToSend)) | |
76 | 70 | else invariantCalc((balanceA - amountToSend), y) | |
80 | 74 | } | |
81 | 75 | else acc | |
82 | 76 | ||
83 | - | let stepAmount = { | |
84 | - | let $l = [1, 2, 3, 4, 5] | |
85 | - | let $s = size($l) | |
86 | - | let $acc0 = -1 | |
87 | - | func $f0_1 ($a,$i) = if (($i >= $s)) | |
88 | - | then $a | |
89 | - | else getStepAmount($a, $l[$i]) | |
77 | + | let amountToSendMin = getStepAmount(-1, 3) | |
78 | + | if ((0 > amountToSendMin)) | |
79 | + | then throw("!!!!!") | |
80 | + | else { | |
81 | + | let invEstimated = if ((tokenId == strAssetIdA)) | |
82 | + | then invariantCalc(x, (balanceB - amountToSendEstimated)) | |
83 | + | else if ((tokenId == strAssetIdB)) | |
84 | + | then invariantCalc((balanceA - amountToSendEstimated), y) | |
85 | + | else throw("Wrong asset in payment") | |
86 | + | if ((worstAllowedNewInvariantRatio >= fraction(scale8, invariant, invEstimated))) | |
87 | + | then throw("Bad estimation provided") | |
88 | + | else { | |
89 | + | let amountToSendBest = if ((invariant > invEstimated)) | |
90 | + | then { | |
91 | + | let a = { | |
92 | + | let $l = [25, 200, 500] | |
93 | + | let $s = size($l) | |
94 | + | let $acc0 = -1 | |
95 | + | func $f0_1 ($a,$i) = if (($i >= $s)) | |
96 | + | then $a | |
97 | + | else getStepAmount($a, $l[$i]) | |
90 | 98 | ||
91 | - | func $f0_2 ($a,$i) = if (($i >= $s)) | |
92 | - | then $a | |
93 | - | else throw("List size exceeds | |
99 | + | func $f0_2 ($a,$i) = if (($i >= $s)) | |
100 | + | then $a | |
101 | + | else throw("List size exceeds 3") | |
94 | 102 | ||
95 | - | $f0_2($f0_1($f0_1($f0_1($f0_1($f0_1($acc0, 0), 1), 2), 3), 4), 5) | |
96 | - | } | |
97 | - | if ((0 > stepAmount)) | |
98 | - | then throw("something went wrong while working with amountToSend") | |
99 | - | else if (if ((invariantEstimatedRatio > slippageValue)) | |
100 | - | then (invariantNew > invariant) | |
101 | - | else false) | |
102 | - | then amountToSendEstimated | |
103 | - | else stepAmount | |
103 | + | $f0_2($f0_1($f0_1($f0_1($acc0, 0), 1), 2), 3) | |
104 | + | } | |
105 | + | if ((0 > a)) | |
106 | + | then amountToSendMin | |
107 | + | else a | |
108 | + | } | |
109 | + | else { | |
110 | + | let a = { | |
111 | + | let $l = [-500, -200, -25] | |
112 | + | let $s = size($l) | |
113 | + | let $acc0 = -1 | |
114 | + | func $f0_1 ($a,$i) = if (($i >= $s)) | |
115 | + | then $a | |
116 | + | else getStepAmount($a, $l[$i]) | |
117 | + | ||
118 | + | func $f0_2 ($a,$i) = if (($i >= $s)) | |
119 | + | then $a | |
120 | + | else throw("List size exceeds 3") | |
121 | + | ||
122 | + | $f0_2($f0_1($f0_1($f0_1($acc0, 0), 1), 2), 3) | |
123 | + | } | |
124 | + | if ((0 > a)) | |
125 | + | then amountToSendEstimated | |
126 | + | else a | |
127 | + | } | |
128 | + | amountToSendBest | |
129 | + | } | |
130 | + | } | |
104 | 131 | } | |
105 | 132 | ||
106 | 133 |
Old | New | Differences | |
---|---|---|---|
1 | 1 | {-# STDLIB_VERSION 5 #-} | |
2 | 2 | {-# SCRIPT_TYPE ACCOUNT #-} | |
3 | 3 | {-# CONTENT_TYPE DAPP #-} | |
4 | 4 | let strAssetIdA = "34N9YcEETLWn93qYQ64EsP1x89tSruJU44RrEMSXXEPJ" | |
5 | 5 | ||
6 | 6 | let strAssetIdB = "DG2xFkPdDwKUoBkzGAhQtLpSGzfXLiCYPEzeKH2Ad24p" | |
7 | 7 | ||
8 | 8 | let assetIdA = if ((strAssetIdA == "WAVES")) | |
9 | 9 | then unit | |
10 | 10 | else fromBase58String(strAssetIdA) | |
11 | 11 | ||
12 | 12 | let assetIdB = if ((strAssetIdB == "WAVES")) | |
13 | 13 | then unit | |
14 | 14 | else fromBase58String(strAssetIdB) | |
15 | 15 | ||
16 | 16 | let fee = 500 | |
17 | 17 | ||
18 | 18 | let feeGovernance = 200 | |
19 | 19 | ||
20 | 20 | let feeScale6 = 1000000 | |
21 | 21 | ||
22 | 22 | let scale3 = 1000 | |
23 | 23 | ||
24 | 24 | let scale8 = 100000000 | |
25 | 25 | ||
26 | 26 | let scale12 = 1000000000000 | |
27 | 27 | ||
28 | 28 | let scale16 = 10000000000000000 | |
29 | 29 | ||
30 | 30 | let slippageScale3 = 1000 | |
31 | 31 | ||
32 | 32 | let digits8 = 8 | |
33 | 33 | ||
34 | 34 | let digits12 = 12 | |
35 | 35 | ||
36 | 36 | let dAppThreshold = 50 | |
37 | 37 | ||
38 | 38 | let dAppThresholdScale2 = 100 | |
39 | 39 | ||
40 | 40 | let exchangeRatioLimitMin = 90000000 | |
41 | 41 | ||
42 | 42 | let exchangeRatioLimitMax = 110000000 | |
43 | 43 | ||
44 | 44 | let alpha = 50 | |
45 | 45 | ||
46 | 46 | let alphaDigits = 2 | |
47 | 47 | ||
48 | 48 | let beta = 4600000000000000 | |
49 | 49 | ||
50 | 50 | func skewness (x,y) = ((fraction(scale16, x, y) + fraction(scale16, y, x)) / 2) | |
51 | 51 | ||
52 | 52 | ||
53 | 53 | func invariantCalc (x,y) = { | |
54 | 54 | let sk = skewness(x, y) | |
55 | 55 | (fraction((x + y), scale16, pow(sk, digits8, alpha, alphaDigits, digits8, CEILING)) + (2 * fraction(toInt(pow(fraction(toBigInt(x), toBigInt(y), toBigInt(scale8)), 0, toBigInt(5), 1, (digits8 / 2), DOWN)), pow((sk - beta), digits8, alpha, alphaDigits, digits8, DOWN), scale8))) | |
56 | 56 | } | |
57 | 57 | ||
58 | 58 | ||
59 | 59 | func calculateSendAmount (balanceA,balanceB,amountToSendEstimated,minTokenReceiveAmount,tokenReceiveAmount,tokenId) = { | |
60 | - | let | |
60 | + | let worstAllowedNewInvariantRatio = (scale8 - ((scale8 * 1) / 10000000)) | |
61 | 61 | let deltaBetweenMaxAndMinSendValue = (amountToSendEstimated - minTokenReceiveAmount) | |
62 | + | let invariant = invariantCalc(balanceA, balanceB) | |
62 | 63 | let x = (balanceA + tokenReceiveAmount) | |
63 | 64 | let y = (balanceB + tokenReceiveAmount) | |
64 | - | let invariant = invariantCalc(balanceA, balanceB) | |
65 | - | let invariantNew = if ((tokenId == strAssetIdA)) | |
66 | - | then invariantCalc(x, (balanceB - amountToSendEstimated)) | |
67 | - | else if ((tokenId == strAssetIdB)) | |
68 | - | then invariantCalc((balanceA - amountToSendEstimated), y) | |
69 | - | else throw("Wrong asset in payment") | |
70 | - | let invariantEstimatedRatio = fraction(scale8, invariant, invariantNew) | |
71 | 65 | func getStepAmount (acc,step) = if ((acc == -1)) | |
72 | 66 | then { | |
73 | - | let amountToSend = (amountToSendEstimated - ((step * deltaBetweenMaxAndMinSendValue) / | |
67 | + | let amountToSend = (amountToSendEstimated - (((step * deltaBetweenMaxAndMinSendValue) / 3) / scale3)) | |
74 | 68 | let stepInvariant = if ((tokenId == strAssetIdA)) | |
75 | 69 | then invariantCalc(x, (balanceB - amountToSend)) | |
76 | 70 | else invariantCalc((balanceA - amountToSend), y) | |
77 | 71 | if ((stepInvariant > invariant)) | |
78 | 72 | then amountToSend | |
79 | 73 | else -1 | |
80 | 74 | } | |
81 | 75 | else acc | |
82 | 76 | ||
83 | - | let stepAmount = { | |
84 | - | let $l = [1, 2, 3, 4, 5] | |
85 | - | let $s = size($l) | |
86 | - | let $acc0 = -1 | |
87 | - | func $f0_1 ($a,$i) = if (($i >= $s)) | |
88 | - | then $a | |
89 | - | else getStepAmount($a, $l[$i]) | |
77 | + | let amountToSendMin = getStepAmount(-1, 3) | |
78 | + | if ((0 > amountToSendMin)) | |
79 | + | then throw("!!!!!") | |
80 | + | else { | |
81 | + | let invEstimated = if ((tokenId == strAssetIdA)) | |
82 | + | then invariantCalc(x, (balanceB - amountToSendEstimated)) | |
83 | + | else if ((tokenId == strAssetIdB)) | |
84 | + | then invariantCalc((balanceA - amountToSendEstimated), y) | |
85 | + | else throw("Wrong asset in payment") | |
86 | + | if ((worstAllowedNewInvariantRatio >= fraction(scale8, invariant, invEstimated))) | |
87 | + | then throw("Bad estimation provided") | |
88 | + | else { | |
89 | + | let amountToSendBest = if ((invariant > invEstimated)) | |
90 | + | then { | |
91 | + | let a = { | |
92 | + | let $l = [25, 200, 500] | |
93 | + | let $s = size($l) | |
94 | + | let $acc0 = -1 | |
95 | + | func $f0_1 ($a,$i) = if (($i >= $s)) | |
96 | + | then $a | |
97 | + | else getStepAmount($a, $l[$i]) | |
90 | 98 | ||
91 | - | func $f0_2 ($a,$i) = if (($i >= $s)) | |
92 | - | then $a | |
93 | - | else throw("List size exceeds | |
99 | + | func $f0_2 ($a,$i) = if (($i >= $s)) | |
100 | + | then $a | |
101 | + | else throw("List size exceeds 3") | |
94 | 102 | ||
95 | - | $f0_2($f0_1($f0_1($f0_1($f0_1($f0_1($acc0, 0), 1), 2), 3), 4), 5) | |
96 | - | } | |
97 | - | if ((0 > stepAmount)) | |
98 | - | then throw("something went wrong while working with amountToSend") | |
99 | - | else if (if ((invariantEstimatedRatio > slippageValue)) | |
100 | - | then (invariantNew > invariant) | |
101 | - | else false) | |
102 | - | then amountToSendEstimated | |
103 | - | else stepAmount | |
103 | + | $f0_2($f0_1($f0_1($f0_1($acc0, 0), 1), 2), 3) | |
104 | + | } | |
105 | + | if ((0 > a)) | |
106 | + | then amountToSendMin | |
107 | + | else a | |
108 | + | } | |
109 | + | else { | |
110 | + | let a = { | |
111 | + | let $l = [-500, -200, -25] | |
112 | + | let $s = size($l) | |
113 | + | let $acc0 = -1 | |
114 | + | func $f0_1 ($a,$i) = if (($i >= $s)) | |
115 | + | then $a | |
116 | + | else getStepAmount($a, $l[$i]) | |
117 | + | ||
118 | + | func $f0_2 ($a,$i) = if (($i >= $s)) | |
119 | + | then $a | |
120 | + | else throw("List size exceeds 3") | |
121 | + | ||
122 | + | $f0_2($f0_1($f0_1($f0_1($acc0, 0), 1), 2), 3) | |
123 | + | } | |
124 | + | if ((0 > a)) | |
125 | + | then amountToSendEstimated | |
126 | + | else a | |
127 | + | } | |
128 | + | amountToSendBest | |
129 | + | } | |
130 | + | } | |
104 | 131 | } | |
105 | 132 | ||
106 | 133 | ||
107 | 134 | @Callable(i) | |
108 | 135 | func exchange (balanceA,balanceB,pmtAmount,pmtAssetId,estimatedAmountToReceive,minAmountToReceive) = { | |
109 | 136 | let amount = calculateSendAmount(balanceA, balanceB, estimatedAmountToReceive, minAmountToReceive, pmtAmount, pmtAssetId) | |
110 | 137 | let governanceReward = fraction(amount, feeGovernance, feeScale6) | |
111 | 138 | let amountMinusFee = fraction(amount, (feeScale6 - fee), feeScale6) | |
112 | 139 | ([IntegerEntry("sendAmount", amount), IntegerEntry("sendAmountWithComission", amountMinusFee), IntegerEntry("invariant", invariantCalc(balanceA, balanceB))] ++ (if ((pmtAssetId == strAssetIdA)) | |
113 | 140 | then [IntegerEntry("invariantNew", invariantCalc((balanceA + pmtAmount), (balanceB - amount)))] | |
114 | 141 | else [IntegerEntry("invariantNew", invariantCalc((balanceA - amount), (balanceB + pmtAmount)))])) | |
115 | 142 | } | |
116 | 143 | ||
117 | 144 | ||
118 | 145 | @Verifier(tx) | |
119 | 146 | func verify () = sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey) | |
120 | 147 |
github/deemru/w8io/873ac7e 40.55 ms ◑![]()