tx · 6ALUh5Dusfyb8W2cBTUoKbpVtHGzRmtG2RziJqU6NsZR
3N1B4HFA6tKHVRNTJTFGzJ6QgqXkAqj4mBg: -1.00000000 Waves
2019.02.08 15:42 [486114] smart asset 3N1B4HFA6tKHVRNTJTFGzJ6QgqXkAqj4mBg > SELF 0.00000000 test
{
"type": 15,
"id": "6ALUh5Dusfyb8W2cBTUoKbpVtHGzRmtG2RziJqU6NsZR",
"fee": 100000000,
"feeAssetId": null,
"timestamp": 1549629735946,
"version": 1,
"sender": "3N1B4HFA6tKHVRNTJTFGzJ6QgqXkAqj4mBg",
"senderPublicKey": "6BidUc1JeUmvWh7Q3vTsAnehjimaLcqSdtUcH6L4DDnz",
"proofs": [
"5oa41LZqfbukAmyuAQAdFLDk8HCeNani2W1CQbGT5VQUu19h5ycEeaTiZrHo43o3da6ySvbjoZUTg7GtzKX1MkjX"
],
"assetId": "79mm7HA7LaHkN7FTEXzhYhYUQNfuiTKU4GW3ZkrP5anQ",
"script": "base64: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",
"chainId": 84,
"height": 486114,
"spentComplexity": 0
}
View: original | compacted
Prev: 4jSuNEw1Snj6njYotZBn9jaAWNCsmuvA95vEaZpq6ijG
Next: none
Diff:
Old | New | | Differences |
---|
12 | 12 | | case _ => |
---|
13 | 13 | | base58'' |
---|
14 | 14 | | } |
---|
15 | | - | let whitelist = extract(addressFromString(extract(getString(adminAddress, toBase58String(extract(assetId)))))) |
---|
| 15 | + | let whitelist = extract(addressFromPublicKey(fromBase58String(extract(getString(adminAddress, toBase58String(extract(assetId))))))) |
---|
16 | 16 | | let senderPK = match tx { |
---|
17 | 17 | | case e: ExchangeTransaction => |
---|
18 | 18 | | e.sellOrder.senderPublicKey |
---|
|
21 | 21 | | case _ => |
---|
22 | 22 | | base58'' |
---|
23 | 23 | | } |
---|
24 | | - | if (!(isDefined(getBoolean(whitelist, toBase58String(senderPK))))) |
---|
| 24 | + | if (!(isDefined(getBoolean(whitelist, toBase58String(extract(addressFromPublicKey(senderPK)).bytes))))) |
---|
25 | 25 | | then throw("You are not in the white list") |
---|
26 | 26 | | else { |
---|
27 | 27 | | let whiteSender = (getBoolean(whitelist, toBase58String(senderPK)) == true) |
---|
Full:
Old | New | | Differences |
---|
1 | 1 | | {-# STDLIB_VERSION 1 #-} |
---|
2 | 2 | | {-# CONTENT_TYPE EXPRESSION #-} |
---|
3 | 3 | | let adminPublicKey = base58'6BidUc1JeUmvWh7Q3vTsAnehjimaLcqSdtUcH6L4DDnz' |
---|
4 | 4 | | let adminAddress = addressFromPublicKey(adminPublicKey) |
---|
5 | 5 | | match tx { |
---|
6 | 6 | | case allow: TransferTransaction|ExchangeTransaction => |
---|
7 | 7 | | let assetId = match tx { |
---|
8 | 8 | | case e: ExchangeTransaction => |
---|
9 | 9 | | e.sellOrder.assetPair.amountAsset |
---|
10 | 10 | | case t: TransferTransaction => |
---|
11 | 11 | | t.assetId |
---|
12 | 12 | | case _ => |
---|
13 | 13 | | base58'' |
---|
14 | 14 | | } |
---|
15 | | - | let whitelist = extract(addressFromString(extract(getString(adminAddress, toBase58String(extract(assetId)))))) |
---|
| 15 | + | let whitelist = extract(addressFromPublicKey(fromBase58String(extract(getString(adminAddress, toBase58String(extract(assetId))))))) |
---|
16 | 16 | | let senderPK = match tx { |
---|
17 | 17 | | case e: ExchangeTransaction => |
---|
18 | 18 | | e.sellOrder.senderPublicKey |
---|
19 | 19 | | case t: TransferTransaction => |
---|
20 | 20 | | t.senderPublicKey |
---|
21 | 21 | | case _ => |
---|
22 | 22 | | base58'' |
---|
23 | 23 | | } |
---|
24 | | - | if (!(isDefined(getBoolean(whitelist, toBase58String(senderPK))))) |
---|
| 24 | + | if (!(isDefined(getBoolean(whitelist, toBase58String(extract(addressFromPublicKey(senderPK)).bytes))))) |
---|
25 | 25 | | then throw("You are not in the white list") |
---|
26 | 26 | | else { |
---|
27 | 27 | | let whiteSender = (getBoolean(whitelist, toBase58String(senderPK)) == true) |
---|
28 | 28 | | let signed = match tx { |
---|
29 | 29 | | case e: ExchangeTransaction => |
---|
30 | 30 | | let sellSigned = sigVerify(e.sellOrder.bodyBytes, e.sellOrder.proofs[0], senderPK) |
---|
31 | 31 | | let buySigned = sigVerify(e.buyOrder.bodyBytes, e.buyOrder.proofs[0], senderPK) |
---|
32 | 32 | | if (sellSigned) |
---|
33 | 33 | | then true |
---|
34 | 34 | | else buySigned |
---|
35 | 35 | | case t: TransferTransaction => |
---|
36 | 36 | | sigVerify(t.bodyBytes, t.proofs[0], senderPK) |
---|
37 | 37 | | case _ => |
---|
38 | 38 | | false |
---|
39 | 39 | | } |
---|
40 | 40 | | if (signed) |
---|
41 | 41 | | then whiteSender |
---|
42 | 42 | | else false |
---|
43 | 43 | | } |
---|
44 | 44 | | case _ => |
---|
45 | 45 | | true |
---|
46 | 46 | | } |
---|