w8 · tx · DM7···5WJ

tx · DM77BjUsvQyoKa55eQotWncpuMWoQuEtTWxY1Vt1Y5WJ

3PChRF3AsJG9YX78ED7wkXLwgCz6LuJBT1Z:  -0.01000000 Waves

2024.01.31 23:45 [4021994] smart account 3PChRF3AsJG9YX78ED7wkXLwgCz6LuJBT1Z > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "DM77BjUsvQyoKa55eQotWncpuMWoQuEtTWxY1Vt1Y5WJ",
    "fee": 1000000,
    "feeAssetId": null,
    "timestamp": 1706733990540,
    "version": 2,
    "chainId": 87,
    "sender": "3PChRF3AsJG9YX78ED7wkXLwgCz6LuJBT1Z",
    "senderPublicKey": "Zqe5SqPv6kYySiE63WTvm2zCtWbEqfp7H1DwyaK8H5n",
    "proofs": [
        "4MvkppZ3YPcZ51YQ8L1cJ9PBr6sph3kBFQhi96Ei2DSH78CTX7DJkaYVrigfKnGgYS3CBB6Hhao91JxtUxBKgjLX"
    ],
    "script": "base64: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dHMAAAABBQAAAAtwb29sQWRkcmVzcwUAAAADU0VQBAAAABNhbW91bnRBc3NldEludGVybmFsCQABkQAAAAIFAAAACnBvb2xBc3NldHMAAAAAAAAAAAEEAAAAEnByaWNlQXNzZXRJbnRlcm5hbAkAAZEAAAACBQAAAApwb29sQXNzZXRzAAAAAAAAAAACCQAEtQAAAAIJAQAAABFAZXh0ck5hdGl2ZSgxMDUzKQAAAAIJAQAAAAdmYWN0b3J5AAAAAAkBAAAADWtleVBvb2xDb25maWcAAAACBQAAABNhbW91bnRBc3NldEludGVybmFsBQAAABJwcmljZUFzc2V0SW50ZXJuYWwFAAAAA1NFUAEAAAAQY2hlY2tIZWlnaHREZWx0YQAAAAEAAAALcHJpY2VIZWlnaHQEAAAADm1heEhlaWdodERlbHRhBQAAABVNQVhfUkFURV9IRUlHSFRfREVMVEEEAAAAC2N1cnJlbnREaWZmCQAAZQAAAAIIBQAAAAlsYXN0QmxvY2sAAAAGaGVpZ2h0BQAAAAtwcmljZUhlaWdodAMJAABnAAAAAgUAAAAObWF4SGVpZ2h0RGVsdGEFAAAAC2N1cnJlbnREaWZmBQAAAAR1bml0CQAAAgAAAAECAAAAEkxhcmdlIHByaWNlIGRlbHRhLgEAAAATZ2V0QW10QXNzZXRVc2RQcmljZQAAAAAEAAAABnRpY2tlcgkBAAAAEUBleHRyTmF0aXZlKDEwNTgpAAAAAQkBAAAACWtleVRpY2tlcgAAAAAEAAAAC3ByaWNlSGVpZ2h0CQEAAAARQGV4dHJOYXRpdmUoMTA1MCkAAAACCQEAAAAGb3JhY2xlAAAAAAkBAAAAGmtleU9yYWNsZVRpY2tlclByaWNlSGVpZ2h0AAAAAQUAAAAGdGlja2VyBAAAAAtjaGVja0hlaWdodAkBAAAAEGNoZWNrSGVpZ2h0RGVsdGEAAAABBQAAAAtwcmljZUhlaWdodAMJAAAAAAAAAgUAAAALY2hlY2tIZWlnaHQFAAAAC2NoZWNrSGVpZ2h0BAAAAAVwcmljZQkBAAAAEUBleHRyTmF0aXZlKDEwNTApAAAAAgkBAAAABm9yYWNsZQAAAAAJAQAAABRrZXlPcmFjbGVUaWNrZXJQcmljZQAAAAEFAAAABnRpY2tlcgkAAGsAAAADBQAA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",
    "height": 4021994,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: GofunWbxsiT3b2hQ3VqZFzkAYzr7rZ8iWn6uP9y51zTw
Next: J4onXqBPbCNGEtt7Wo7Xx66FaiD6DZzip8SJeuEqshFd

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

Old	New		Differences
3	3		{-# CONTENT_TYPE DAPP #-}
4	4		let DEFAULT_FACTORY = "3PCuHsTU58WKhCqotbcSwABvdPzqqVAbbTv"
5	5
6		-	let DECIMAL_18 = 1000000000000000000
	6	+	let DECIMAL_18 = toBigInt(1000000000000000000)
7	7
8	8		let SEP = "__"
9	9

144	144		let amtAssetId = cfg[IdxAmtAssetId]
145	145		let priceAssetId = cfg[IdxPriceAssetId]
146	146		let poolLpBalance = value(assetInfo(lpAssetId)).quantity
147		-	let accAmtAssetBalance = asInt(invoke(pool(), "getAccBalanceWrapperREADONLY", [amtAssetId], nil))
148		-	let accPriceAssetBalance = asInt(invoke(pool(), "getAccBalanceWrapperREADONLY", [priceAssetId], nil))
	147	+	let accAmtAssetBalance = toBigInt(asInt(invoke(pool(), "getAccBalanceWrapperREADONLY", [amtAssetId], nil)))
	148	+	let accPriceAssetBalance = toBigInt(asInt(invoke(pool(), "getAccBalanceWrapperREADONLY", [priceAssetId], nil)))
149	149		let accPriceAssetPrice = if ((poolLpBalance == 0))
150		-	then 0
	150	+	then toBigInt(0)
151	151		else parseBigIntValue({
152	152		let @ = ({
153	153		let @ = invoke(pool(), "calcPricesWrapperREADONLY", [accAmtAssetBalance, accPriceAssetBalance, poolLpBalance], nil)

159	159		then @
160	160		else throw("Couldn't cast Any to String")
161	161		})
162		-	$Tuple2(nil, accPriceAssetPrice)
	162	+	let accAmtAssetEq = (accAmtAssetBalance + fraction(accPriceAssetBalance, DECIMAL_18, accPriceAssetPrice))
	163	+	let accAmtAssetPrice = getAmtAssetUsdPrice()
	164	+	$Tuple2(nil, accAmtAssetEq)
163	165		}
164	166
165	167

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

github/deemru/w8io/6500d08 
35.96 ms ◑