w8 · tx · HvU···1px

tx · HvUr2B356u5yF9UmXMi8LaSzcVFtt1MxGzpDjgGqb1px

3PChRF3AsJG9YX78ED7wkXLwgCz6LuJBT1Z:  -0.01000000 Waves

2024.02.01 14:11 [4022855] smart account 3PChRF3AsJG9YX78ED7wkXLwgCz6LuJBT1Z > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "HvUr2B356u5yF9UmXMi8LaSzcVFtt1MxGzpDjgGqb1px",
    "fee": 1000000,
    "feeAssetId": null,
    "timestamp": 1706785934815,
    "version": 2,
    "chainId": 87,
    "sender": "3PChRF3AsJG9YX78ED7wkXLwgCz6LuJBT1Z",
    "senderPublicKey": "Zqe5SqPv6kYySiE63WTvm2zCtWbEqfp7H1DwyaK8H5n",
    "proofs": [
        "Vx5egN5uaqQXzecEs5pR52e8aBQaU5qykHfawYMPtxDtV3hyHCQQoW8xf56ckhEc8NbxvCqAN7unCPSLDUdGF1S"
    ],
    "script": "base64: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AAARQGV4dHJOYXRpdmUoMTA1OCkAAAABCQEAAAAOa2V5UG9vbEFkZHJlc3MAAAAAAQAAABVnZXRQb29sRmFjdG9yeUFkZHJlc3MAAAAACQEAAAALdmFsdWVPckVsc2UAAAACCQAEIgAAAAEJAQAAABVrZXlQb29sRmFjdG9yeUFkZHJlc3MAAAAABQAAAA9ERUZBVUxUX0ZBQ1RPUlkBAAAABHBvb2wAAAAACQEAAAARQGV4dHJOYXRpdmUoMTA2MikAAAABCQEAAAAOZ2V0UG9vbEFkZHJlc3MAAAAAAQAAAAdmYWN0b3J5AAAAAAkBAAAAEUBleHRyTmF0aXZlKDEwNjIpAAAAAQkBAAAAFWdldFBvb2xGYWN0b3J5QWRkcmVzcwAAAAABAAAABm9yYWNsZQAAAAAJAQAAABFAZXh0ck5hdGl2ZSgxMDYyKQAAAAEJAQAAABN2YWx1ZU9yRXJyb3JNZXNzYWdlAAAAAgkABCIAAAABCQEAAAAQa2V5T3JhY2xlQWRkcmVzcwAAAAACAAAAEU9yYWNsZSBpcyBub3Qgc2V0AQAAAClrZXlNYXBwaW5nUG9vbENvbnRyYWN0QWRkcmVzc1RvUG9vbEFzc2V0cwAAAAEAAAATcG9vbENvbnRyYWN0QWRkcmVzcwkBAAAABGpvaW4AAAABCQAETAAAAAICAAAABiVzJXMlcwkABEwAAAACBQAAABNwb29sQ29udHJhY3RBZGRyZXNzCQAETAAAAAICAAAACG1hcHBpbmdzCQAETAAAAAICAAAAF3Bvb2xDb250cmFjdDJQb29sQXNzZXRzBQAAAANuaWwBAAAADWtleVBvb2xDb25maWcAAAACAAAAE2Ftb3VudEFzc2V0SW50ZXJuYWwAAAAScHJpY2VBc3NldEludGVybmFsCQEAAAAEam9pbgAAAAEJAARMAAAAAgIAAAAGJWQlZCVzCQAETAAAAAIFAAAAE2Ftb3VudEFzc2V0SW50ZXJuYWwJAARMAAAAAgUAAAAScHJpY2VBc3NldEludGVybmFsCQAETAAAAAICAAAABmNvbmZpZwUAAAADbmlsAQAAAA1nZXRQb29sQ29uZmlnAAAAAAQAAAALcG9vbEFkZHJlc3MJAQAAAA5nZXRQb29sQWRkcmVzcwAAAAAEAAAACnBvb2xBc3NldHMJAAS1AAAAAgkBAAAAEUBleHRyTmF0aXZlKDEwNTMpAAAAAgkBAAAAB2ZhY3RvcnkAAAAACQEAAAApa2V5TWFwcGluZ1Bvb2xDb250cmFjdEFkZHJlc3NUb1Bvb2xBc3NldHMAAAABBQAAAAtwb29sQWRkcmVzcwUAAAADU0VQBAAAABNhbW91bnRBc3NldEludGVybmFsCQABkQAAAAIFAAAACnBvb2xBc3NldHMAAAAAAAAAAAEEAAAAEnByaWNlQXNzZXRJbnRlcm5hbAkAAZEAAAACBQAAAApwb29sQXNzZXRzAAAAAAAAAAACCQAEtQAAAAIJAQAAABFAZXh0ck5hdGl2ZSgxMDUzKQAAAAIJAQAAAAdmYWN0b3J5AAAAAAkBAAAADWtleVBvb2xDb25maWcAAAACBQAAABNhbW91bnRBc3NldEludGVybmFsBQAAABJwcmljZUFzc2V0SW50ZXJuYWwFAAAAA1NFUAEAAAAQY2hlY2tIZWlnaHREZWx0YQAAAAEAAAALcHJpY2VIZWlnaHQEAAAADm1heEhlaWdodERlbHRhBQAAABVNQVhfUkFURV9IRUlHSFRfREVMVEEEAAAAC2N1cnJlbnREaWZmCQAAZQAAAAIIBQAAAAlsYXN0QmxvY2sAAAAGaGVpZ2h0BQAAAAtwcmljZUhlaWdodAMJAABnAAAAAgUAAAAObWF4SGVpZ2h0RGVsdGEFAAAAC2N1cnJlbnREaWZmBQAAAAR1bml0CQAAAgAAAAECAAAAEkxhcmdlIHByaWNlIGRlbHRhLgEAAAATZ2V0QW10QXNzZXRVc2RQcmljZQAAAAAEAAAABnRpY2tlcgkBAAAAEUBleHRyTmF0aXZlKDEwNTgpAAAAAQkBAAAACWtleVRpY2tlcgAAAAAEAAAAC3ByaWNlSGVpZ2h0CQEAAAARQGV4dHJOYXRpdmUoMTA1MCkAAAACCQEAAAAGb3JhY2xlAAAAAAkBAAAAGmtleU9yYWNsZVRpY2tlclByaWNlSGVpZ2h0AAAAAQUAAAAGdGlja2VyBAAAAAtjaGVja0hlaWdodAkBAAAAEGNoZWNrSGVpZ2h0RGVsdGEAAAABBQAAAAtwcmljZUhlaWdodAMJAAAAAAAAAgUAAAALY2hlY2tIZWlnaHQFAAAAC2NoZWNrSGVpZ2h0BAAAAAVwcmljZQkBAAAAEUBleHRyTmF0aXZlKDEwNTApAAAAAgkBAAAABm9yYWNsZQAAAAAJAQAAABRrZXlPcmFjbGVUaWNrZXJQcmljZQAAAAEFAAAABnRpY2tlcgkAAGsAAAADBQAAAAVwcmljZQUAAAAJUFJFQ0lTSU9OBQAAAA9PUkFDTEVfREVDSU1BTFMJAAACAAAAAQIAAAAkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAQAAABBnZXRBc3NldFVzZFByaWNlAAAAAAQAAAADY2ZnCQEAAAANZ2V0UG9vbENvbmZpZwAAAAAEAAAACWxwQXNzZXRJZAkAAlkAAAABCQABkQAAAAIFAAAAA2NmZwUAAAAQSWR4UG9vbExQQXNzZXRJZAQAAAAKYW10QXNzZXRJZAkAAZEAAAACBQAAAANjZmcFAAAADUlkeEFtdEFzc2V0SWQEAAAADHByaWNlQXNzZXRJZAkAAZEAAAACBQAAAANjZmcFAAAAD0lkeFByaWNlQXNzZXRJZAQAAAANcG9vbExwQmFsYW5jZQgJAQAAAAV2YWx1ZQAAAAEJAAPsAAAAAQUAAAAJbHBBc3NldElkAAAACHF1YW50aXR5BAAAABJhY2NBbXRBc3NldEJhbGFuY2UJAQAAAAVhc0ludAAAAAEJAAP8AAAABAkBAAAABHBvb2wAAAAAAgAAABxnZXRBY2NCYWxhbmNlV3JhcHBlclJFQURPTkxZCQAETAAAAAIFAAAACmFtdEFzc2V0SWQFAAAAA25pbAUAAAADbmlsBAAAABRhY2NQcmljZUFzc2V0QmFsYW5jZQkBAAAABWFzSW50AAAAAQkAA/wAAAAECQEAAAAEcG9vbAAAAAACAAAAHGdldEFjY0JhbGFuY2VXcmFwcGVyUkVBRE9OTFkJAARMAAAAAgUAAAAMcHJpY2VBc3NldElkBQAAAANuaWwFAAAAA25pbAQAAAASYWNjUHJpY2VBc3NldFByaWNlAwkAAAAAAAACBQAAAA1wb29sTHBCYWxhbmNlAAAAAAAAAAAAAAAAAAAAAAAACQABpwAAAAEKAAAAAAFACQABkQAAAAIKAAAAAAFACQAD/AAAAAQJAQAAAARwb29sAAAAAAIAAAAZY2FsY1ByaWNlc1dyYXBwZXJSRUFET05MWQkABEwAAAACBQAAABJhY2NBbXRBc3NldEJhbGFuY2UJAARMAAAAAgUAAAAUYWNjUHJpY2VBc3NldEJhbGFuY2UJAARMAAAAAgUAAAANcG9vbExwQmFsYW5jZQUAAAADbmlsBQAAAANuaWwDCQAAAQAAAAIFAAAAAUACAAAACUxpc3RbQW55XQUAAAABQAkAAAIAAAABAgAAAB5Db3VsZG4ndCBjYXN0IEFueSB0byBMaXN0W0FueV0AAAAAAAAAAAADCQAAAQAAAAIFAAAAAUACAAAABlN0cmluZwUAAAABQAkAAAIAAAABAgAAABtDb3VsZG4ndCBjYXN0IEFueSB0byBTdHJpbmcJAAUUAAAAAgUAAAADbmlsCQAETAAAAAIFAAAADXBvb2xMcEJhbGFuY2UJAARMAAAAAgUAAAASYWNjQW10QXNzZXRCYWxhbmNlCQAETAAAAAIFAAAAFGFjY1ByaWNlQXNzZXRCYWxhbmNlCQAETAAAAAIFAAAAEmFjY1ByaWNlQXNzZXRQcmljZQUAAAADbmlsAAAAAgAAAAFpAQAAAAppbml0aWFsaXplAAAAAwAAAA5fb3JhY2xlQWRkcmVzcwAAAAxfcG9vbEFkZHJlc3MAAAAHX3RpY2tlcgQAAAAIZG9DaGVja3MJAARMAAAAAgkBAAAADGNoZWNrQWRkcmVzcwAAAAEFAAAADl9vcmFjbGVBZGRyZXNzCQAETAAAAAIJAQAAAAxjaGVja0FkZHJlc3MAAAABBQAAAAxfcG9vbEFkZHJlc3MFAAAAA25pbAMJAAAAAAAAAgUAAAAIZG9DaGVja3MFAAAACGRvQ2hlY2tzCQAETAAAAAIJAQAAAAtTdHJpbmdFbnRyeQAAAAIJAQAAABBrZXlPcmFjbGVBZGRyZXNzAAAAAAUAAAAOX29yYWNsZUFkZHJlc3MJAARMAAAAAgkBAAAAC1N0cmluZ0VudHJ5AAAAAgkBAAAADmtleVBvb2xBZGRyZXNzAAAAAAUAAAAMX3Bvb2xBZGRyZXNzCQAETAAAAAIJAQAAAAtTdHJpbmdFbnRyeQAAAAIJAQAAAAlrZXlUaWNrZXIAAAAABQAAAAdfdGlja2VyBQAAAANuaWwJAAACAAAAAQIAAAAkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAAAAAWkBAAAAEmdldEN1cnJlbnRVc2RQcmljZQAAAAAJAAUUAAAAAgUAAAADbmlsCQEAAAAQZ2V0QXNzZXRVc2RQcmljZQAAAAAAAAABAAAAAnR4AQAAAAZ2ZXJpZnkAAAAACQAB9AAAAAMIBQAAAAJ0eAAAAAlib2R5Qnl0ZXMJAAGRAAAAAggFAAAAAnR4AAAABnByb29mcwAAAAAAAAAAAAgFAAAAAnR4AAAAD3NlbmRlclB1YmxpY0tleZgjTuA=",
    "height": 4022855,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: 2i1jQW5DFctdbaq769vF1dYZg7FgqGJV8e7yRmmpk2Zb
Next: GFAXnuQrWD66GaC8oU43ZfWyPodBryQynaktP3MdhtRc

Diff: 
Old New Differences
4 4  let DEFAULT_FACTORY = "3PCuHsTU58WKhCqotbcSwABvdPzqqVAbbTv"
5 5  
6 6  let DECIMAL_18 = 1000000000000000000
7 + 
8 + let DECIMAL_10 = 10000000000
7 9  
8 10  let SEP = "__"
9 11  
46 48  }
47 49  
48 50  
49 - func toIntScale8 (val) = toInt((val / toBigInt(10000000000)))
51 + func toIntScale8 (val) = toInt((val / toBigInt(DECIMAL_18)))
50 52  
51 53  
52 54  let IdxPoolAddress = 1
151 153      let accPriceAssetBalance = asInt(invoke(pool(), "getAccBalanceWrapperREADONLY", [priceAssetId], nil))
152 154      let accPriceAssetPrice = if ((poolLpBalance == 0))
153 155          then 0
154 -         else toIntScale8(parseBigIntValue({
156 +         else parseBigIntValue({
155 157              let @ = ({
156 158                  let @ = invoke(pool(), "calcPricesWrapperREADONLY", [accAmtAssetBalance, accPriceAssetBalance, poolLpBalance], nil)
157 159                  if ($isInstanceOf(@, "List[Any]"))
161 163              if ($isInstanceOf(@, "String"))
162 164                  then @
163 165                  else throw("Couldn't cast Any to String")
164 -             }))
165 -     let accAmtAssetEq = (accAmtAssetBalance + fraction(accPriceAssetBalance, DECIMAL_18, accPriceAssetPrice))
166 -     let accAmtAssetPrice = getAmtAssetUsdPrice()
167 -     let LPPrice = fraction(accAmtAssetEq, accAmtAssetPrice, poolLpBalance)
168 -     $Tuple2(nil, [poolLpBalance, accAmtAssetBalance, accPriceAssetBalance, accAmtAssetEq, accAmtAssetPrice, LPPrice])
166 +             })
167 +     $Tuple2(nil, [poolLpBalance, accAmtAssetBalance, accPriceAssetBalance, accPriceAssetPrice])
169 168      }
170 169  
171 170  
Full: 
Old New Differences
1 1  {-# STDLIB_VERSION 5 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 4  let DEFAULT_FACTORY = "3PCuHsTU58WKhCqotbcSwABvdPzqqVAbbTv"
5 5  
6 6  let DECIMAL_18 = 1000000000000000000
7 + 
8 + let DECIMAL_10 = 10000000000
7 9  
8 10  let SEP = "__"
9 11  
10 12  let EMPTY = ""
11 13  
12 14  let PRECISION = 1000000000000
13 15  
14 16  let DECIMALS = 100000000
15 17  
16 18  let MAX_RATE_HEIGHT_DELTA = 5
17 19  
18 20  let ORACLE_DECIMALS = 1000000
19 21  
20 22  func join (ar) = makeString(ar, SEP)
21 23  
22 24  
23 25  func checkAddress (_address) = match addressFromString(_address) {
24 26      case address: Address => 
25 27          true
26 28      case _: Unit => 
27 29          throw("Invalid address")
28 30      case _ => 
29 31          throw("Match error")
30 32  }
31 33  
32 34  
33 35  func asInt (val) = match val {
34 36      case valInt: Int => 
35 37          valInt
36 38      case _ => 
37 39          throw("fail to cast into Int")
38 40  }
39 41  
40 42  
41 43  func asString (val) = match val {
42 44      case valStr: String => 
43 45          valStr
44 46      case _ => 
45 47          throw("fail to cast into String")
46 48  }
47 49  
48 50  
49 - func toIntScale8 (val) = toInt((val / toBigInt(10000000000)))
51 + func toIntScale8 (val) = toInt((val / toBigInt(DECIMAL_18)))
50 52  
51 53  
52 54  let IdxPoolAddress = 1
53 55  
54 56  let IdxPoolStatus = 2
55 57  
56 58  let IdxPoolLPAssetId = 3
57 59  
58 60  let IdxAmtAssetId = 4
59 61  
60 62  let IdxPriceAssetId = 5
61 63  
62 64  let IdxAmtAssetDcm = 6
63 65  
64 66  let IdxPriceAssetDcm = 7
65 67  
66 68  let IdxIAmtAssetId = 8
67 69  
68 70  let IdxIPriceAssetId = 9
69 71  
70 72  let IdxLPAssetDcm = 10
71 73  
72 74  let IdxPoolType = 11
73 75  
74 76  func keyPoolAddress () = join(["%s", "poolAddress"])
75 77  
76 78  
77 79  func keyPoolFactoryAddress () = join(["%s", "poolFactoryAddress"])
78 80  
79 81  
80 82  func keyTicker () = join(["%s", "ticker"])
81 83  
82 84  
83 85  func keyOracleTickerPriceHeight (ticker) = join(["%s%s", "lastHeight", ticker])
84 86  
85 87  
86 88  func keyOracleAddress () = join(["%s", "oracleAddress"])
87 89  
88 90  
89 91  func keyOracleTickerPrice (ticker) = join(["%s%s", "price", ticker])
90 92  
91 93  
92 94  func getPoolAddress () = getStringValue(keyPoolAddress())
93 95  
94 96  
95 97  func getPoolFactoryAddress () = valueOrElse(getString(keyPoolFactoryAddress()), DEFAULT_FACTORY)
96 98  
97 99  
98 100  func pool () = addressFromStringValue(getPoolAddress())
99 101  
100 102  
101 103  func factory () = addressFromStringValue(getPoolFactoryAddress())
102 104  
103 105  
104 106  func oracle () = addressFromStringValue(valueOrErrorMessage(getString(keyOracleAddress()), "Oracle is not set"))
105 107  
106 108  
107 109  func keyMappingPoolContractAddressToPoolAssets (poolContractAddress) = join(["%s%s%s", poolContractAddress, "mappings", "poolContract2PoolAssets"])
108 110  
109 111  
110 112  func keyPoolConfig (amountAssetInternal,priceAssetInternal) = join(["%d%d%s", amountAssetInternal, priceAssetInternal, "config"])
111 113  
112 114  
113 115  func getPoolConfig () = {
114 116      let poolAddress = getPoolAddress()
115 117      let poolAssets = split(getStringValue(factory(), keyMappingPoolContractAddressToPoolAssets(poolAddress)), SEP)
116 118      let amountAssetInternal = poolAssets[1]
117 119      let priceAssetInternal = poolAssets[2]
118 120      split(getStringValue(factory(), keyPoolConfig(amountAssetInternal, priceAssetInternal)), SEP)
119 121      }
120 122  
121 123  
122 124  func checkHeightDelta (priceHeight) = {
123 125      let maxHeightDelta = MAX_RATE_HEIGHT_DELTA
124 126      let currentDiff = (lastBlock.height - priceHeight)
125 127      if ((maxHeightDelta >= currentDiff))
126 128          then unit
127 129          else throw("Large price delta.")
128 130      }
129 131  
130 132  
131 133  func getAmtAssetUsdPrice () = {
132 134      let ticker = getStringValue(keyTicker())
133 135      let priceHeight = getIntegerValue(oracle(), keyOracleTickerPriceHeight(ticker))
134 136      let checkHeight = checkHeightDelta(priceHeight)
135 137      if ((checkHeight == checkHeight))
136 138          then {
137 139              let price = getIntegerValue(oracle(), keyOracleTickerPrice(ticker))
138 140              fraction(price, PRECISION, ORACLE_DECIMALS)
139 141              }
140 142          else throw("Strict value is not equal to itself.")
141 143      }
142 144  
143 145  
144 146  func getAssetUsdPrice () = {
145 147      let cfg = getPoolConfig()
146 148      let lpAssetId = fromBase58String(cfg[IdxPoolLPAssetId])
147 149      let amtAssetId = cfg[IdxAmtAssetId]
148 150      let priceAssetId = cfg[IdxPriceAssetId]
149 151      let poolLpBalance = value(assetInfo(lpAssetId)).quantity
150 152      let accAmtAssetBalance = asInt(invoke(pool(), "getAccBalanceWrapperREADONLY", [amtAssetId], nil))
151 153      let accPriceAssetBalance = asInt(invoke(pool(), "getAccBalanceWrapperREADONLY", [priceAssetId], nil))
152 154      let accPriceAssetPrice = if ((poolLpBalance == 0))
153 155          then 0
154 -         else toIntScale8(parseBigIntValue({
156 +         else parseBigIntValue({
155 157              let @ = ({
156 158                  let @ = invoke(pool(), "calcPricesWrapperREADONLY", [accAmtAssetBalance, accPriceAssetBalance, poolLpBalance], nil)
157 159                  if ($isInstanceOf(@, "List[Any]"))
158 160                      then @
159 161                      else throw("Couldn't cast Any to List[Any]")
160 162                  })[0]
161 163              if ($isInstanceOf(@, "String"))
162 164                  then @
163 165                  else throw("Couldn't cast Any to String")
164 -             }))
165 -     let accAmtAssetEq = (accAmtAssetBalance + fraction(accPriceAssetBalance, DECIMAL_18, accPriceAssetPrice))
166 -     let accAmtAssetPrice = getAmtAssetUsdPrice()
167 -     let LPPrice = fraction(accAmtAssetEq, accAmtAssetPrice, poolLpBalance)
168 -     $Tuple2(nil, [poolLpBalance, accAmtAssetBalance, accPriceAssetBalance, accAmtAssetEq, accAmtAssetPrice, LPPrice])
166 +             })
167 +     $Tuple2(nil, [poolLpBalance, accAmtAssetBalance, accPriceAssetBalance, accPriceAssetPrice])
169 168      }
170 169  
171 170  
172 171  @Callable(i)
173 172  func initialize (_oracleAddress,_poolAddress,_ticker) = {
174 173      let doChecks = [checkAddress(_oracleAddress), checkAddress(_poolAddress)]
175 174      if ((doChecks == doChecks))
176 175          then [StringEntry(keyOracleAddress(), _oracleAddress), StringEntry(keyPoolAddress(), _poolAddress), StringEntry(keyTicker(), _ticker)]
177 176          else throw("Strict value is not equal to itself.")
178 177      }
179 178  
180 179  
181 180  
182 181  @Callable(i)
183 182  func getCurrentUsdPrice () = $Tuple2(nil, getAssetUsdPrice())
184 183  
185 184  
186 185  @Verifier(tx)
187 186  func verify () = sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)
188 187

Old	New		Differences
4	4		let DEFAULT_FACTORY = "3PCuHsTU58WKhCqotbcSwABvdPzqqVAbbTv"
5	5
6	6		let DECIMAL_18 = 1000000000000000000
	7	+
	8	+	let DECIMAL_10 = 10000000000
7	9
8	10		let SEP = "__"
9	11

46	48		}
47	49
48	50
49		-	func toIntScale8 (val) = toInt((val / toBigInt(~~10000000000~~)))
	51	+	func toIntScale8 (val) = toInt((val / toBigInt(DECIMAL_18)))
50	52
51	53
52	54		let IdxPoolAddress = 1

151	153		let accPriceAssetBalance = asInt(invoke(pool(), "getAccBalanceWrapperREADONLY", [priceAssetId], nil))
152	154		let accPriceAssetPrice = if ((poolLpBalance == 0))
153	155		then 0
154		-	else ~~toIntScale8(~~parseBigIntValue({
	156	+	else parseBigIntValue({
155	157		let @ = ({
156	158		let @ = invoke(pool(), "calcPricesWrapperREADONLY", [accAmtAssetBalance, accPriceAssetBalance, poolLpBalance], nil)
157	159		if ($isInstanceOf(@, "List[Any]"))

161	163		if ($isInstanceOf(@, "String"))
162	164		then @
163	165		else throw("Couldn't cast Any to String")
164		-	}))
165		-	let accAmtAssetEq = (accAmtAssetBalance + fraction(accPriceAssetBalance, DECIMAL_18, accPriceAssetPrice))
166		-	let accAmtAssetPrice = getAmtAssetUsdPrice()
167		-	let LPPrice = fraction(accAmtAssetEq, accAmtAssetPrice, poolLpBalance)
168		-	$Tuple2(nil, [poolLpBalance, accAmtAssetBalance, accPriceAssetBalance, accAmtAssetEq, accAmtAssetPrice, LPPrice])
	166	+	})
	167	+	$Tuple2(nil, [poolLpBalance, accAmtAssetBalance, accPriceAssetBalance, accPriceAssetPrice])
169	168		}
170	169
171	170

Old	New		Differences
1	1		{-# STDLIB_VERSION 5 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4	4		let DEFAULT_FACTORY = "3PCuHsTU58WKhCqotbcSwABvdPzqqVAbbTv"
5	5
6	6		let DECIMAL_18 = 1000000000000000000
	7	+
	8	+	let DECIMAL_10 = 10000000000
7	9
8	10		let SEP = "__"
9	11
10	12		let EMPTY = ""
11	13
12	14		let PRECISION = 1000000000000
13	15
14	16		let DECIMALS = 100000000
15	17
16	18		let MAX_RATE_HEIGHT_DELTA = 5
17	19
18	20		let ORACLE_DECIMALS = 1000000
19	21
20	22		func join (ar) = makeString(ar, SEP)
21	23
22	24
23	25		func checkAddress (_address) = match addressFromString(_address) {
24	26		case address: Address =>
25	27		true
26	28		case _: Unit =>
27	29		throw("Invalid address")
28	30		case _ =>
29	31		throw("Match error")
30	32		}
31	33
32	34
33	35		func asInt (val) = match val {
34	36		case valInt: Int =>
35	37		valInt
36	38		case _ =>
37	39		throw("fail to cast into Int")
38	40		}
39	41
40	42
41	43		func asString (val) = match val {
42	44		case valStr: String =>
43	45		valStr
44	46		case _ =>
45	47		throw("fail to cast into String")
46	48		}
47	49
48	50
49		-	func toIntScale8 (val) = toInt((val / toBigInt(~~10000000000~~)))
	51	+	func toIntScale8 (val) = toInt((val / toBigInt(DECIMAL_18)))
50	52
51	53
52	54		let IdxPoolAddress = 1
53	55
54	56		let IdxPoolStatus = 2
55	57
56	58		let IdxPoolLPAssetId = 3
57	59
58	60		let IdxAmtAssetId = 4
59	61
60	62		let IdxPriceAssetId = 5
61	63
62	64		let IdxAmtAssetDcm = 6
63	65
64	66		let IdxPriceAssetDcm = 7
65	67
66	68		let IdxIAmtAssetId = 8
67	69
68	70		let IdxIPriceAssetId = 9
69	71
70	72		let IdxLPAssetDcm = 10
71	73
72	74		let IdxPoolType = 11
73	75
74	76		func keyPoolAddress () = join(["%s", "poolAddress"])
75	77
76	78
77	79		func keyPoolFactoryAddress () = join(["%s", "poolFactoryAddress"])
78	80
79	81
80	82		func keyTicker () = join(["%s", "ticker"])
81	83
82	84
83	85		func keyOracleTickerPriceHeight (ticker) = join(["%s%s", "lastHeight", ticker])
84	86
85	87
86	88		func keyOracleAddress () = join(["%s", "oracleAddress"])
87	89
88	90
89	91		func keyOracleTickerPrice (ticker) = join(["%s%s", "price", ticker])
90	92
91	93
92	94		func getPoolAddress () = getStringValue(keyPoolAddress())
93	95
94	96
95	97		func getPoolFactoryAddress () = valueOrElse(getString(keyPoolFactoryAddress()), DEFAULT_FACTORY)
96	98
97	99
98	100		func pool () = addressFromStringValue(getPoolAddress())
99	101
100	102
101	103		func factory () = addressFromStringValue(getPoolFactoryAddress())
102	104
103	105
104	106		func oracle () = addressFromStringValue(valueOrErrorMessage(getString(keyOracleAddress()), "Oracle is not set"))
105	107
106	108
107	109		func keyMappingPoolContractAddressToPoolAssets (poolContractAddress) = join(["%s%s%s", poolContractAddress, "mappings", "poolContract2PoolAssets"])
108	110
109	111
110	112		func keyPoolConfig (amountAssetInternal,priceAssetInternal) = join(["%d%d%s", amountAssetInternal, priceAssetInternal, "config"])
111	113
112	114
113	115		func getPoolConfig () = {
114	116		let poolAddress = getPoolAddress()
115	117		let poolAssets = split(getStringValue(factory(), keyMappingPoolContractAddressToPoolAssets(poolAddress)), SEP)
116	118		let amountAssetInternal = poolAssets[1]
117	119		let priceAssetInternal = poolAssets[2]
118	120		split(getStringValue(factory(), keyPoolConfig(amountAssetInternal, priceAssetInternal)), SEP)
119	121		}
120	122
121	123
122	124		func checkHeightDelta (priceHeight) = {
123	125		let maxHeightDelta = MAX_RATE_HEIGHT_DELTA
124	126		let currentDiff = (lastBlock.height - priceHeight)
125	127		if ((maxHeightDelta >= currentDiff))
126	128		then unit
127	129		else throw("Large price delta.")
128	130		}
129	131
130	132
131	133		func getAmtAssetUsdPrice () = {
132	134		let ticker = getStringValue(keyTicker())
133	135		let priceHeight = getIntegerValue(oracle(), keyOracleTickerPriceHeight(ticker))
134	136		let checkHeight = checkHeightDelta(priceHeight)
135	137		if ((checkHeight == checkHeight))
136	138		then {
137	139		let price = getIntegerValue(oracle(), keyOracleTickerPrice(ticker))
138	140		fraction(price, PRECISION, ORACLE_DECIMALS)
139	141		}
140	142		else throw("Strict value is not equal to itself.")
141	143		}
142	144
143	145
144	146		func getAssetUsdPrice () = {
145	147		let cfg = getPoolConfig()
146	148		let lpAssetId = fromBase58String(cfg[IdxPoolLPAssetId])
147	149		let amtAssetId = cfg[IdxAmtAssetId]
148	150		let priceAssetId = cfg[IdxPriceAssetId]
149	151		let poolLpBalance = value(assetInfo(lpAssetId)).quantity
150	152		let accAmtAssetBalance = asInt(invoke(pool(), "getAccBalanceWrapperREADONLY", [amtAssetId], nil))
151	153		let accPriceAssetBalance = asInt(invoke(pool(), "getAccBalanceWrapperREADONLY", [priceAssetId], nil))
152	154		let accPriceAssetPrice = if ((poolLpBalance == 0))
153	155		then 0
154		-	else ~~toIntScale8(~~parseBigIntValue({
	156	+	else parseBigIntValue({
155	157		let @ = ({
156	158		let @ = invoke(pool(), "calcPricesWrapperREADONLY", [accAmtAssetBalance, accPriceAssetBalance, poolLpBalance], nil)
157	159		if ($isInstanceOf(@, "List[Any]"))
158	160		then @
159	161		else throw("Couldn't cast Any to List[Any]")
160	162		})[0]
161	163		if ($isInstanceOf(@, "String"))
162	164		then @
163	165		else throw("Couldn't cast Any to String")
164		-	}))
165		-	let accAmtAssetEq = (accAmtAssetBalance + fraction(accPriceAssetBalance, DECIMAL_18, accPriceAssetPrice))
166		-	let accAmtAssetPrice = getAmtAssetUsdPrice()
167		-	let LPPrice = fraction(accAmtAssetEq, accAmtAssetPrice, poolLpBalance)
168		-	$Tuple2(nil, [poolLpBalance, accAmtAssetBalance, accPriceAssetBalance, accAmtAssetEq, accAmtAssetPrice, LPPrice])
	166	+	})
	167	+	$Tuple2(nil, [poolLpBalance, accAmtAssetBalance, accPriceAssetBalance, accPriceAssetPrice])
169	168		}
170	169
171	170
172	171		@Callable(i)
173	172		func initialize (_oracleAddress,_poolAddress,_ticker) = {
174	173		let doChecks = [checkAddress(_oracleAddress), checkAddress(_poolAddress)]
175	174		if ((doChecks == doChecks))
176	175		then [StringEntry(keyOracleAddress(), _oracleAddress), StringEntry(keyPoolAddress(), _poolAddress), StringEntry(keyTicker(), _ticker)]
177	176		else throw("Strict value is not equal to itself.")
178	177		}
179	178
180	179
181	180
182	181		@Callable(i)
183	182		func getCurrentUsdPrice () = $Tuple2(nil, getAssetUsdPrice())
184	183
185	184
186	185		@Verifier(tx)
187	186		func verify () = sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)
188	187

github/deemru/w8io/6500d08 
28.93 ms ◑