w8 · tx · GgA···Hg3

tx · GgAtmJYCUJs8QnKqQBkWW5aRZBoK6aSk7qU541N6gHg3

3PPEo6YV7XpCFknum9FNVLQuCu3x7AogcJT:  -0.01000000 Waves

2023.05.28 12:22 [3663169] smart account 3PPEo6YV7XpCFknum9FNVLQuCu3x7AogcJT > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "GgAtmJYCUJs8QnKqQBkWW5aRZBoK6aSk7qU541N6gHg3",
    "fee": 1000000,
    "feeAssetId": null,
    "timestamp": 1685265747345,
    "version": 2,
    "chainId": 87,
    "sender": "3PPEo6YV7XpCFknum9FNVLQuCu3x7AogcJT",
    "senderPublicKey": "7kuQGHmvhzQW3ERxGyMrxfq3LuxHSJ6UdBZcuy498sf6",
    "proofs": [
        "34sEww5gC1YfJuqWqScx4EJ5hrPySPDCUx445oqbqxE6vUBkMLyqorqa1PrKCPh2vXXH5UNciY1BskYpnwhSACEC"
    ],
    "script": "base64:BgIaCAISBAoCCAgSAwoBARIFCgMICAgSBAoCCAEZAA1rX2luaXRpYWxpemVkAg1rX2luaXRpYWxpemVkAAdrX2FkbWluAgdrX2FkbWluAAZrX3N0ZXACBmtfc3RlcAAMa19xdW90ZUFzc2V0AgxrX3F1b3RlQXNzZXQADGtfc3BvdE1hcmtldAIMa19zcG90TWFya2V0AA9rX2Z1dHVyZXNNYXJrZXQCD2tfZnV0dXJlc01hcmtldAATa19taW5JbmNyZWFzZVNwcmVhZAITa19taW5JbmNyZWFzZVNwcmVhZAAOa19wb3NpdGlvbkxvbmcCDmtfcG9zaXRpb25Mb25nAA9rX3Bvc2l0aW9uU2hvcnQCD2tfcG9zaXRpb25TaG9ydAAQa19wb3NpdGlvblNwcmVhZAIQa19wb3NpdGlvblNwcmVhZAAOa19wb3NpdGlvblNpemUCDmtfcG9zaXRpb25TaXplAAxERUNJTUFMX1VOSVQJAGgCAAEJAGgCCQBoAgkAaAIJAGgCCQBoAgAKAAoACgAKAAoACgEEZGl2ZAICX3gCX3kJAG4EBQJfeAUMREVDSU1BTF9VTklUBQJfeQUISEFMRkVWRU4BBG11bGQCAl94Al95CQBuBAUCX3gFAl95BQxERUNJTUFMX1VOSVQFCEhBTEZFVkVOAAlESVJfU0hPUlQAAgEOdG9Db21wb3NpdGVLZXkCBF9rZXkIX2FkZHJlc3MJAKwCAgkArAICBQRfa2V5AgFfBQhfYWRkcmVzcwEMYWRtaW5BZGRyZXNzAAkBEUBleHRyTmF0aXZlKDEwNjIpAQkBEUBleHRyTmF0aXZlKDEwNTMpAgUEdGhpcwUHa19hZG1pbgENZ2V0UXVvdGVBc3NldAAJANkEAQkBEUBleHRyTmF0aXZlKDEwNTMpAgUEdGhpcwUMa19xdW90ZUFzc2V0AQ1nZXRTcG90TWFya2V0AQZfYXNzZXQJARFAZXh0ck5hdGl2ZSgxMDYyKQEJARFAZXh0ck5hdGl2ZSgxMDUzKQIFBHRoaXMJAQ50b0NvbXBvc2l0ZUtleQIFDGtfc3BvdE1hcmtldAUGX2Fzc2V0ARBnZXRGdXR1cmVzTWFya2V0AQZfYXNzZXQJARFAZXh0ck5hdGl2ZSgxMDYyKQEJARFAZXh0ck5hdGl2ZSgxMDUzKQIFBHRoaXMJAQ50b0NvbXBvc2l0ZUtleQIFD2tfZnV0dXJlc01hcmtldAUGX2Fzc2V0ARFtaW5JbmNyZWFzZVNwcmVhZAAJARFAZXh0ck5hdGl2ZSgxMDUwKQIFBHRoaXMFE2tfbWluSW5jcmVhc2VTcHJlYWQBC2dldFBvc2l0aW9uAQZfYXNzZXQECGxvbmdTaXplCQELdmFsdWVPckVsc2UCCQCaCAIFBHRoaXMJAQ50b0NvbXBvc2l0ZUtleQIFDmtfcG9zaXRpb25Mb25nBQZfYXNzZXQAAAMJAAACBQhsb25nU2l6ZQAACQCVCgMAAAAAAAAJAJUKAwUIbG9uZ1NpemUJAQt2YWx1ZU9yRWxzZQIJAJoIAgUEdGhpcwkBDnRvQ29tcG9zaXRlS2V5AgUPa19wb3NpdGlvblNob3J0BQZfYXNzZXQAAAkBC3ZhbHVlT3JFbHNlAgkAmggCBQR0aGlzCQEOdG9Db21wb3NpdGVLZXkCBRBrX3Bvc2l0aW9uU3ByZWFkBQZfYXNzZXQAAAEPZ2V0QXNzZXRCYWxhbmNlAQZfYXNzZXQDCQAAAgUGX2Fzc2V0AgVXQVZFUwgJAO8HAQUEdGhpcwdyZWd1bGFyCQDwBwIFBHRoaXMJANkEAQUGX2Fzc2V0AQlub3JtYWxpemUCB19hbW91bnQGX2Fzc2V0BAhkZWNpbWFscwMJAAACBQZfYXNzZXQCBVdBVkVTAAgICQEFdmFsdWUBCQDsBwEJANkEAQUGX2Fzc2V0CGRlY2ltYWxzAwkAAAIFCGRlY2ltYWxzAAgJAGkCBQdfYW1vdW50AGQDCQAAAgUIZGVjaW1hbHMABgUHX2Ftb3VudAkAAgECGkludmFsaWQgZGVjaW1hbHMgZm9yIGFzc2V0AQ51cGRhdGVQb3NpdGlvbgQGX2Fzc2V0DF9uZXdMb25nU2l6ZQ1fbmV3U2hvcnRTaXplDV9uZXdBdmdTcHJlYWQJAMwIAgkBDEludGVnZXJFbnRyeQIJAQ50b0NvbXBvc2l0ZUtleQIFDmtfcG9zaXRpb25Mb25nBQZfYXNzZXQFDF9uZXdMb25nU2l6ZQkAzAgCCQEMSW50ZWdlckVudHJ5AgkBDnRvQ29tcG9zaXRlS2V5AgUPa19wb3NpdGlvblNob3J0BQZfYXNzZXQFDV9uZXdTaG9ydFNpemUJAMwIAgkBDEludGVnZXJFbnRyeQIJAQ50b0NvbXBvc2l0ZUtleQIFEGtfcG9zaXRpb25TcHJlYWQFBl9hc3NldAUNX25ld0F2Z1NwcmVhZAUDbmlsBAFpAQppbml0aWFsaXplAgZfYWRtaW4LX3F1b3RlQXNzZXQDCQECIT0CCAUBaQZjYWxsZXIFBHRoaXMJAAIBAhlJbnZhbGlkIGluaXRpYWxpemUgcGFyYW1zCQDMCAIJAQtTdHJpbmdFbnRyeQIFB2tfYWRtaW4FBl9hZG1pbgkAzAgCCQELU3RyaW5nRW50cnkCBQxrX3F1b3RlQXNzZXQFC19xdW90ZUFzc2V0BQNuaWwBaQEOY2hhbmdlU2V0dGluZ3MBEl9taW5JbmNyZWFzZVNwcmVhZAMJAQIhPQIIBQFpBmNhbGxlcgkBDGFkbWluQWRkcmVzcwAJAAIBAh1JbnZhbGlkIGNoYW5nZVNldHRpbmdzIHBhcmFtcwkAzAgCCQEMSW50ZWdlckVudHJ5AgUTa19taW5JbmNyZWFzZVNwcmVhZAUSX21pbkluY3JlYXNlU3ByZWFkBQNuaWwBaQEJYWRkTWFya2V0AwZfYXNzZXQLX3Nwb3RNYXJrZXQOX2Z1dHVyZXNNYXJrZXQDCQECIT0CCAUBaQZjYWxsZXIJAQxhZG1pbkFkZHJlc3MACQACAQIYSW52YWxpZCBhZGRNYXJrZXQgcGFyYW1zCQDMCAIJAQtTdHJpbmdFbnRyeQIJAQ50b0NvbXBvc2l0ZUtleQIFDGtfc3BvdE1hcmtldAUGX2Fzc2V0BQtfc3BvdE1hcmtldAkAzAgCCQELU3RyaW5nRW50cnkCCQEOdG9Db21wb3NpdGVLZXkCBQ9rX2Z1dHVyZXNNYXJrZXQFBl9hc3NldAUOX2Z1dHVyZXNNYXJrZXQFA25pbAFpARBpbmNyZWFzZVBvc2l0aW9uAgZfYXNzZXQPX3F1b3RlQXNzZXRTdGVwBApxdW90ZUFzc2V0CQENZ2V0UXVvdGVBc3NldAAECnNwb3RNYXJrZXQJAQ1nZXRTcG90TWFya2V0AQUGX2Fzc2V0BAthc3NldEJlZm9yZQkBD2dldEFzc2V0QmFsYW5jZQEFBl9hc3NldAMJAAACBQthc3NldEJlZm9yZQULYXNzZXRCZWZvcmUEB2J1eVNwb3QJAPwHBAUKc3BvdE1hcmtldAIEc3dhcAkAzAgCAAAJAMwIAgUGX2Fzc2V0CQDMCAIJAKUIAQUEdGhpcwUDbmlsCQDMCAIJAQ9BdHRhY2hlZFBheW1lbnQCBQpxdW90ZUFzc2V0BQ9fcXVvdGVBc3NldFN0ZXAFA25pbAMJAAACBQdidXlTcG90BQdidXlTcG90BAphc3NldEFmdGVyCQEPZ2V0QXNzZXRCYWxhbmNlAQUGX2Fzc2V0AwkAAAIFCmFzc2V0QWZ0ZXIFCmFzc2V0QWZ0ZXIEC2Fzc2V0Qm91Z2h0CQBlAgUKYXNzZXRBZnRlcgULYXNzZXRCZWZvcmUED2Fzc2V0Qm91Z2h0Tm9ybQkBCW5vcm1hbGl6ZQIFC2Fzc2V0Qm91Z2h0BQZfYXNzZXQEEGJ1eVByaWNlTm9ybUZhY3QJAQRkaXZkAgUPX3F1b3RlQXNzZXRTdGVwBQ9hc3NldEJvdWdodE5vcm0EDWZ1dHVyZXNNYXJrZXQJARBnZXRGdXR1cmVzTWFya2V0AQUGX2Fzc2V0BAxzaG9ydEZ1dHVyZXMJAPwHBAUNZnV0dXJlc01hcmtldAIQaW5jcmVhc2VQb3NpdGlvbgkAzAgCBQlESVJfU0hPUlQJAMwIAgUMREVDSU1BTF9VTklUCQDMCAIAAAkAzAgCAgAJAMwIAgIABQNuaWwJAMwIAgkBD0F0dGFjaGVkUGF5bWVudAIFCnF1b3RlQXNzZXQFD19xdW90ZUFzc2V0U3RlcAUDbmlsAwkAAAIFDHNob3J0RnV0dXJlcwUMc2hvcnRGdXR1cmVzBAtwb3NpdGlvbktleQkArAICCQCsAgIJAKUIAQUEdGhpcwIBXwkApAMBBQlESVJfU0hPUlQED3Bvc2l0aW9uRnVsbEtleQkBDnRvQ29tcG9zaXRlS2V5AgUOa19wb3NpdGlvblNpemUFC3Bvc2l0aW9uS2V5BA5hc3NldFNob3J0Tm9ybQkBAS0BCQERQGV4dHJOYXRpdmUoMTA1MCkCBQ1mdXR1cmVzTWFya2V0BQ9wb3NpdGlvbkZ1bGxLZXkEEnNob3J0UHJpY2VOb3JtRmFjdAkBBGRpdmQCBQ9fcXVvdGVBc3NldFN0ZXAFDmFzc2V0U2hvcnROb3JtBApzcHJlYWRGYWN0CQBlAgUMREVDSU1BTF9VTklUCQEEZGl2ZAIFEGJ1eVByaWNlTm9ybUZhY3QFEnNob3J0UHJpY2VOb3JtRmFjdAQJbWluU3ByZWFkCQERbWluSW5jcmVhc2VTcHJlYWQAAwkAZgIFCnNwcmVhZEZhY3QFCW1pblNwcmVhZAQLJHQwNTAxNDUwNzIJAQtnZXRQb3NpdGlvbgEFBl9hc3NldAQIbG9uZ1NpemUIBQskdDA1MDE0NTA3MgJfMQQJc2hvcnRTaXplCAULJHQwNTAxNDUwNzICXzIECWF2Z1NwcmVhZAgFCyR0MDUwMTQ1MDcyAl8zBAtuZXdMb25nU2l6ZQkAZAIFCGxvbmdTaXplBQ9hc3NldEJvdWdodE5vcm0EDG5ld1Nob3J0U2l6ZQkAZAIFCXNob3J0U2l6ZQUOYXNzZXRTaG9ydE5vcm0EDG5ld0F2Z1NwcmVhZAkBBGRpdmQCCQBkAgkBBG11bGQCBQlhdmdTcHJlYWQJAGQCBQhsb25nU2l6ZQUJc2hvcnRTaXplCQEEbXVsZAIFCnNwcmVhZEZhY3QJAGQCBQ9hc3NldEJvdWdodE5vcm0FDmFzc2V0U2hvcnROb3JtCQBkAgkAZAIJAGQCBQhsb25nU2l6ZQUJc2hvcnRTaXplBQ9hc3NldEJvdWdodE5vcm0FDmFzc2V0U2hvcnROb3JtCQEOdXBkYXRlUG9zaXRpb24EBQZfYXNzZXQFC25ld0xvbmdTaXplBQxuZXdTaG9ydFNpemUFDG5ld0F2Z1NwcmVhZAQEZGF0YQkAzAgCCQCkAwEFD2Fzc2V0Qm91Z2h0Tm9ybQkAzAgCCQCkAwEFEGJ1eVByaWNlTm9ybUZhY3QJAMwIAgkApAMBBQ5hc3NldFNob3J0Tm9ybQkAzAgCCQCkAwEFEnNob3J0UHJpY2VOb3JtRmFjdAkAzAgCCQCkAwEFCnNwcmVhZEZhY3QJAMwIAgkApAMBBQltaW5TcHJlYWQFA25pbAkAAgEJAKwCAgIQSW52YWxpZCBzcHJlYWQ6IAkAuQkCBQRkYXRhAgEsCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAIRqA5s=",
    "height": 3663169,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: GGLp8hvTkhz166BmKSae7EvK7C7r6Tu6jvx6DJkhQJDy
Next: 33LTp7GzK57XGqba9MPmw1NEukQCHKAQrEQ6ZoMj77pi

Diff: 
Old New Differences
135 135                                              let newLongSize = (longSize + assetBoughtNorm)
136 136                                              let newShortSize = (shortSize + assetShortNorm)
137 137                                              let newAvgSpread = divd((muld(avgSpread, (longSize + shortSize)) + muld(spreadFact, (assetBoughtNorm + assetShortNorm))), (((longSize + shortSize) + assetBoughtNorm) + assetShortNorm))
138 -                                             let data = [toString(assetBoughtNorm), toString(buyPriceNormFact), toString(assetShortNorm), toString(shortPriceNormFact), toString(spreadFact), toString(minSpread)]
139 -                                             throw(("Correct spread: " + makeString(data, ",")))
138 +                                             updatePosition(_asset, newLongSize, newShortSize, newAvgSpread)
140 139                                              }
141 140                                          else {
142 141                                              let data = [toString(assetBoughtNorm), toString(buyPriceNormFact), toString(assetShortNorm), toString(shortPriceNormFact), toString(spreadFact), toString(minSpread)]
Full: 
Old New Differences
1 1  {-# STDLIB_VERSION 6 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 4  let k_initialized = "k_initialized"
5 5  
6 6  let k_admin = "k_admin"
7 7  
8 8  let k_step = "k_step"
9 9  
10 10  let k_quoteAsset = "k_quoteAsset"
11 11  
12 12  let k_spotMarket = "k_spotMarket"
13 13  
14 14  let k_futuresMarket = "k_futuresMarket"
15 15  
16 16  let k_minIncreaseSpread = "k_minIncreaseSpread"
17 17  
18 18  let k_positionLong = "k_positionLong"
19 19  
20 20  let k_positionShort = "k_positionShort"
21 21  
22 22  let k_positionSpread = "k_positionSpread"
23 23  
24 24  let k_positionSize = "k_positionSize"
25 25  
26 26  let DECIMAL_UNIT = (1 * (((((10 * 10) * 10) * 10) * 10) * 10))
27 27  
28 28  func divd (_x,_y) = fraction(_x, DECIMAL_UNIT, _y, HALFEVEN)
29 29  
30 30  
31 31  func muld (_x,_y) = fraction(_x, _y, DECIMAL_UNIT, HALFEVEN)
32 32  
33 33  
34 34  let DIR_SHORT = 2
35 35  
36 36  func toCompositeKey (_key,_address) = ((_key + "_") + _address)
37 37  
38 38  
39 39  func adminAddress () = addressFromStringValue(getStringValue(this, k_admin))
40 40  
41 41  
42 42  func getQuoteAsset () = fromBase58String(getStringValue(this, k_quoteAsset))
43 43  
44 44  
45 45  func getSpotMarket (_asset) = addressFromStringValue(getStringValue(this, toCompositeKey(k_spotMarket, _asset)))
46 46  
47 47  
48 48  func getFuturesMarket (_asset) = addressFromStringValue(getStringValue(this, toCompositeKey(k_futuresMarket, _asset)))
49 49  
50 50  
51 51  func minIncreaseSpread () = getIntegerValue(this, k_minIncreaseSpread)
52 52  
53 53  
54 54  func getPosition (_asset) = {
55 55      let longSize = valueOrElse(getInteger(this, toCompositeKey(k_positionLong, _asset)), 0)
56 56      if ((longSize == 0))
57 57          then $Tuple3(0, 0, 0)
58 58          else $Tuple3(longSize, valueOrElse(getInteger(this, toCompositeKey(k_positionShort, _asset)), 0), valueOrElse(getInteger(this, toCompositeKey(k_positionSpread, _asset)), 0))
59 59      }
60 60  
61 61  
62 62  func getAssetBalance (_asset) = if ((_asset == "WAVES"))
63 63      then wavesBalance(this).regular
64 64      else assetBalance(this, fromBase58String(_asset))
65 65  
66 66  
67 67  func normalize (_amount,_asset) = {
68 68      let decimals = if ((_asset == "WAVES"))
69 69          then 8
70 70          else value(assetInfo(fromBase58String(_asset))).decimals
71 71      if ((decimals == 8))
72 72          then (_amount / 100)
73 73          else if ((decimals == 6))
74 74              then _amount
75 75              else throw("Invalid decimals for asset")
76 76      }
77 77  
78 78  
79 79  func updatePosition (_asset,_newLongSize,_newShortSize,_newAvgSpread) = [IntegerEntry(toCompositeKey(k_positionLong, _asset), _newLongSize), IntegerEntry(toCompositeKey(k_positionShort, _asset), _newShortSize), IntegerEntry(toCompositeKey(k_positionSpread, _asset), _newAvgSpread)]
80 80  
81 81  
82 82  @Callable(i)
83 83  func initialize (_admin,_quoteAsset) = if ((i.caller != this))
84 84      then throw("Invalid initialize params")
85 85      else [StringEntry(k_admin, _admin), StringEntry(k_quoteAsset, _quoteAsset)]
86 86  
87 87  
88 88  
89 89  @Callable(i)
90 90  func changeSettings (_minIncreaseSpread) = if ((i.caller != adminAddress()))
91 91      then throw("Invalid changeSettings params")
92 92      else [IntegerEntry(k_minIncreaseSpread, _minIncreaseSpread)]
93 93  
94 94  
95 95  
96 96  @Callable(i)
97 97  func addMarket (_asset,_spotMarket,_futuresMarket) = if ((i.caller != adminAddress()))
98 98      then throw("Invalid addMarket params")
99 99      else [StringEntry(toCompositeKey(k_spotMarket, _asset), _spotMarket), StringEntry(toCompositeKey(k_futuresMarket, _asset), _futuresMarket)]
100 100  
101 101  
102 102  
103 103  @Callable(i)
104 104  func increasePosition (_asset,_quoteAssetStep) = {
105 105      let quoteAsset = getQuoteAsset()
106 106      let spotMarket = getSpotMarket(_asset)
107 107      let assetBefore = getAssetBalance(_asset)
108 108      if ((assetBefore == assetBefore))
109 109          then {
110 110              let buySpot = invoke(spotMarket, "swap", [0, _asset, toString(this)], [AttachedPayment(quoteAsset, _quoteAssetStep)])
111 111              if ((buySpot == buySpot))
112 112                  then {
113 113                      let assetAfter = getAssetBalance(_asset)
114 114                      if ((assetAfter == assetAfter))
115 115                          then {
116 116                              let assetBought = (assetAfter - assetBefore)
117 117                              let assetBoughtNorm = normalize(assetBought, _asset)
118 118                              let buyPriceNormFact = divd(_quoteAssetStep, assetBoughtNorm)
119 119                              let futuresMarket = getFuturesMarket(_asset)
120 120                              let shortFutures = invoke(futuresMarket, "increasePosition", [DIR_SHORT, DECIMAL_UNIT, 0, "", ""], [AttachedPayment(quoteAsset, _quoteAssetStep)])
121 121                              if ((shortFutures == shortFutures))
122 122                                  then {
123 123                                      let positionKey = ((toString(this) + "_") + toString(DIR_SHORT))
124 124                                      let positionFullKey = toCompositeKey(k_positionSize, positionKey)
125 125                                      let assetShortNorm = -(getIntegerValue(futuresMarket, positionFullKey))
126 126                                      let shortPriceNormFact = divd(_quoteAssetStep, assetShortNorm)
127 127                                      let spreadFact = (DECIMAL_UNIT - divd(buyPriceNormFact, shortPriceNormFact))
128 128                                      let minSpread = minIncreaseSpread()
129 129                                      if ((spreadFact > minSpread))
130 130                                          then {
131 131                                              let $t050145072 = getPosition(_asset)
132 132                                              let longSize = $t050145072._1
133 133                                              let shortSize = $t050145072._2
134 134                                              let avgSpread = $t050145072._3
135 135                                              let newLongSize = (longSize + assetBoughtNorm)
136 136                                              let newShortSize = (shortSize + assetShortNorm)
137 137                                              let newAvgSpread = divd((muld(avgSpread, (longSize + shortSize)) + muld(spreadFact, (assetBoughtNorm + assetShortNorm))), (((longSize + shortSize) + assetBoughtNorm) + assetShortNorm))
138 -                                             let data = [toString(assetBoughtNorm), toString(buyPriceNormFact), toString(assetShortNorm), toString(shortPriceNormFact), toString(spreadFact), toString(minSpread)]
139 -                                             throw(("Correct spread: " + makeString(data, ",")))
138 +                                             updatePosition(_asset, newLongSize, newShortSize, newAvgSpread)
140 139                                              }
141 140                                          else {
142 141                                              let data = [toString(assetBoughtNorm), toString(buyPriceNormFact), toString(assetShortNorm), toString(shortPriceNormFact), toString(spreadFact), toString(minSpread)]
143 142                                              throw(("Invalid spread: " + makeString(data, ",")))
144 143                                              }
145 144                                      }
146 145                                  else throw("Strict value is not equal to itself.")
147 146                              }
148 147                          else throw("Strict value is not equal to itself.")
149 148                      }
150 149                  else throw("Strict value is not equal to itself.")
151 150              }
152 151          else throw("Strict value is not equal to itself.")
153 152      }
154 153  
155 154

Old	New		Differences
135	135		let newLongSize = (longSize + assetBoughtNorm)
136	136		let newShortSize = (shortSize + assetShortNorm)
137	137		let newAvgSpread = divd((muld(avgSpread, (longSize + shortSize)) + muld(spreadFact, (assetBoughtNorm + assetShortNorm))), (((longSize + shortSize) + assetBoughtNorm) + assetShortNorm))
138		-	let data = [toString(assetBoughtNorm), toString(buyPriceNormFact), toString(assetShortNorm), toString(shortPriceNormFact), toString(spreadFact), toString(minSpread)]
139		-	throw(("Correct spread: " + makeString(data, ",")))
	138	+	updatePosition(_asset, newLongSize, newShortSize, newAvgSpread)
140	139		}
141	140		else {
142	141		let data = [toString(assetBoughtNorm), toString(buyPriceNormFact), toString(assetShortNorm), toString(shortPriceNormFact), toString(spreadFact), toString(minSpread)]

Old	New		Differences
1	1		{-# STDLIB_VERSION 6 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4	4		let k_initialized = "k_initialized"
5	5
6	6		let k_admin = "k_admin"
7	7
8	8		let k_step = "k_step"
9	9
10	10		let k_quoteAsset = "k_quoteAsset"
11	11
12	12		let k_spotMarket = "k_spotMarket"
13	13
14	14		let k_futuresMarket = "k_futuresMarket"
15	15
16	16		let k_minIncreaseSpread = "k_minIncreaseSpread"
17	17
18	18		let k_positionLong = "k_positionLong"
19	19
20	20		let k_positionShort = "k_positionShort"
21	21
22	22		let k_positionSpread = "k_positionSpread"
23	23
24	24		let k_positionSize = "k_positionSize"
25	25
26	26		let DECIMAL_UNIT = (1 * (((((10 * 10) * 10) * 10) * 10) * 10))
27	27
28	28		func divd (_x,_y) = fraction(_x, DECIMAL_UNIT, _y, HALFEVEN)
29	29
30	30
31	31		func muld (_x,_y) = fraction(_x, _y, DECIMAL_UNIT, HALFEVEN)
32	32
33	33
34	34		let DIR_SHORT = 2
35	35
36	36		func toCompositeKey (_key,_address) = ((_key + "_") + _address)
37	37
38	38
39	39		func adminAddress () = addressFromStringValue(getStringValue(this, k_admin))
40	40
41	41
42	42		func getQuoteAsset () = fromBase58String(getStringValue(this, k_quoteAsset))
43	43
44	44
45	45		func getSpotMarket (_asset) = addressFromStringValue(getStringValue(this, toCompositeKey(k_spotMarket, _asset)))
46	46
47	47
48	48		func getFuturesMarket (_asset) = addressFromStringValue(getStringValue(this, toCompositeKey(k_futuresMarket, _asset)))
49	49
50	50
51	51		func minIncreaseSpread () = getIntegerValue(this, k_minIncreaseSpread)
52	52
53	53
54	54		func getPosition (_asset) = {
55	55		let longSize = valueOrElse(getInteger(this, toCompositeKey(k_positionLong, _asset)), 0)
56	56		if ((longSize == 0))
57	57		then $Tuple3(0, 0, 0)
58	58		else $Tuple3(longSize, valueOrElse(getInteger(this, toCompositeKey(k_positionShort, _asset)), 0), valueOrElse(getInteger(this, toCompositeKey(k_positionSpread, _asset)), 0))
59	59		}
60	60
61	61
62	62		func getAssetBalance (_asset) = if ((_asset == "WAVES"))
63	63		then wavesBalance(this).regular
64	64		else assetBalance(this, fromBase58String(_asset))
65	65
66	66
67	67		func normalize (_amount,_asset) = {
68	68		let decimals = if ((_asset == "WAVES"))
69	69		then 8
70	70		else value(assetInfo(fromBase58String(_asset))).decimals
71	71		if ((decimals == 8))
72	72		then (_amount / 100)
73	73		else if ((decimals == 6))
74	74		then _amount
75	75		else throw("Invalid decimals for asset")
76	76		}
77	77
78	78
79	79		func updatePosition (_asset,_newLongSize,_newShortSize,_newAvgSpread) = [IntegerEntry(toCompositeKey(k_positionLong, _asset), _newLongSize), IntegerEntry(toCompositeKey(k_positionShort, _asset), _newShortSize), IntegerEntry(toCompositeKey(k_positionSpread, _asset), _newAvgSpread)]
80	80
81	81
82	82		@Callable(i)
83	83		func initialize (_admin,_quoteAsset) = if ((i.caller != this))
84	84		then throw("Invalid initialize params")
85	85		else [StringEntry(k_admin, _admin), StringEntry(k_quoteAsset, _quoteAsset)]
86	86
87	87
88	88
89	89		@Callable(i)
90	90		func changeSettings (_minIncreaseSpread) = if ((i.caller != adminAddress()))
91	91		then throw("Invalid changeSettings params")
92	92		else [IntegerEntry(k_minIncreaseSpread, _minIncreaseSpread)]
93	93
94	94
95	95
96	96		@Callable(i)
97	97		func addMarket (_asset,_spotMarket,_futuresMarket) = if ((i.caller != adminAddress()))
98	98		then throw("Invalid addMarket params")
99	99		else [StringEntry(toCompositeKey(k_spotMarket, _asset), _spotMarket), StringEntry(toCompositeKey(k_futuresMarket, _asset), _futuresMarket)]
100	100
101	101
102	102
103	103		@Callable(i)
104	104		func increasePosition (_asset,_quoteAssetStep) = {
105	105		let quoteAsset = getQuoteAsset()
106	106		let spotMarket = getSpotMarket(_asset)
107	107		let assetBefore = getAssetBalance(_asset)
108	108		if ((assetBefore == assetBefore))
109	109		then {
110	110		let buySpot = invoke(spotMarket, "swap", [0, _asset, toString(this)], [AttachedPayment(quoteAsset, _quoteAssetStep)])
111	111		if ((buySpot == buySpot))
112	112		then {
113	113		let assetAfter = getAssetBalance(_asset)
114	114		if ((assetAfter == assetAfter))
115	115		then {
116	116		let assetBought = (assetAfter - assetBefore)
117	117		let assetBoughtNorm = normalize(assetBought, _asset)
118	118		let buyPriceNormFact = divd(_quoteAssetStep, assetBoughtNorm)
119	119		let futuresMarket = getFuturesMarket(_asset)
120	120		let shortFutures = invoke(futuresMarket, "increasePosition", [DIR_SHORT, DECIMAL_UNIT, 0, "", ""], [AttachedPayment(quoteAsset, _quoteAssetStep)])
121	121		if ((shortFutures == shortFutures))
122	122		then {
123	123		let positionKey = ((toString(this) + "_") + toString(DIR_SHORT))
124	124		let positionFullKey = toCompositeKey(k_positionSize, positionKey)
125	125		let assetShortNorm = -(getIntegerValue(futuresMarket, positionFullKey))
126	126		let shortPriceNormFact = divd(_quoteAssetStep, assetShortNorm)
127	127		let spreadFact = (DECIMAL_UNIT - divd(buyPriceNormFact, shortPriceNormFact))
128	128		let minSpread = minIncreaseSpread()
129	129		if ((spreadFact > minSpread))
130	130		then {
131	131		let $t050145072 = getPosition(_asset)
132	132		let longSize = $t050145072._1
133	133		let shortSize = $t050145072._2
134	134		let avgSpread = $t050145072._3
135	135		let newLongSize = (longSize + assetBoughtNorm)
136	136		let newShortSize = (shortSize + assetShortNorm)
137	137		let newAvgSpread = divd((muld(avgSpread, (longSize + shortSize)) + muld(spreadFact, (assetBoughtNorm + assetShortNorm))), (((longSize + shortSize) + assetBoughtNorm) + assetShortNorm))
138		-	let data = [toString(assetBoughtNorm), toString(buyPriceNormFact), toString(assetShortNorm), toString(shortPriceNormFact), toString(spreadFact), toString(minSpread)]
139		-	throw(("Correct spread: " + makeString(data, ",")))
	138	+	updatePosition(_asset, newLongSize, newShortSize, newAvgSpread)
140	139		}
141	140		else {
142	141		let data = [toString(assetBoughtNorm), toString(buyPriceNormFact), toString(assetShortNorm), toString(shortPriceNormFact), toString(spreadFact), toString(minSpread)]
143	142		throw(("Invalid spread: " + makeString(data, ",")))
144	143		}
145	144		}
146	145		else throw("Strict value is not equal to itself.")
147	146		}
148	147		else throw("Strict value is not equal to itself.")
149	148		}
150	149		else throw("Strict value is not equal to itself.")
151	150		}
152	151		else throw("Strict value is not equal to itself.")
153	152		}
154	153
155	154

github/deemru/w8io/6500d08 
30.00 ms ◑