tx · HEgxnAN6CCxypKKfVYgvfWjra8WJkuqUhyUfVCWSSjHz 3P4BSnhrD2jQrMTeDhcDykZYzxCyiZix5bn: -0.01400000 Waves 2019.09.04 20:01 [1691560] smart account 3P4BSnhrD2jQrMTeDhcDykZYzxCyiZix5bn > SELF 0.00000000 Waves
{ "type": 13, "id": "HEgxnAN6CCxypKKfVYgvfWjra8WJkuqUhyUfVCWSSjHz", "fee": 1400000, "feeAssetId": null, "timestamp": 1567616455764, "version": 1, "sender": "3P4BSnhrD2jQrMTeDhcDykZYzxCyiZix5bn", "senderPublicKey": "HoPrhQL2q43g7LBDbpx9inwi6HY5r7En1kgnDJ8uW3Qo", "proofs": [ "bmEtUKRCqG4P6qcaXNo5hRCKwvrPzVSVKTNKEQXZ4D61Jj2Urv6S4DYSUhRzoSwDh6NpZ8r3rxU4TwAxSXPtx56", "3tuPjBXyCtJYrvj8x5F7EDevd6q9qmgUNF9VmaQ9L2kThrjpuhhiVK7tb6grzArKo37s4FxPE4k3HibEi3r6jood", "7ubwZosC8B7CuuuQFBuY3Pp9kH5zszD8rpRehSGSf7WuCpBDC5nGqMG1NGMM7BSn4c7SUKYjwS9vXS4xCwcedzK", "4LZYdRMqcumoiyg7Y6CtzkhCPvvPLioDXy3qPqSVqqtdY7dsZF8Vvg5wR1aNYW2HsG8XBeTBdTeyh1ax8BemYjJA" ], "script": "base64:AwQAAAAObWF0Y2hlckFkZHJlc3MJAQAAABFhZGRyZXNzRnJvbVN0cmluZwAAAAECAAAAIzNQSmp3RlJFZzhGOVY2Q3A5Zm5VdUV3UnRzNkhRUWE1bmZQBAAAABBtYXRjaGVyUHVibGljS2V5AQAAACDByq8/10uSb4ln/m2DiE93I/Ngal7Wm/IdCLfujs7XHwQAAAAOZ2F0ZXdheUFkZHJlc3MJAQAAABFhZGRyZXNzRnJvbVN0cmluZwAAAAECAAAAIzNQOVR5cDhXbm94dDcxOWp1QUJuQ2VFclU1d0F2ZmNYQVU5BAAAABB3aGl0ZWxpc3RBZGRyZXNzCQEAAAARYWRkcmVzc0Zyb21TdHJpbmcAAAABAgAAACMzUDg3SGVWRXZKOHhXaVFXNk4zZnBDQkhNeHdjemVHcXlxRAQAAAAUZEFwcFdoaXRlbGlzdEFkZHJlc3MJAQAAAAdBZGRyZXNzAAAAAQEAAAAaAVfO6lLVWHe4KvIB5hQNUIPqAqvCPbIOsNMEAAAAGmdhdGV3YXlDb250cm9sQXNzZXRBZGRyZXNzAQAAACD+GAqhD0IxDHBjbPaZoYqvgxte2kvyIxgEXy6OmEJbNAQAAAAJcEFkZHJlc3MxCQEAAAARYWRkcmVzc0Zyb21TdHJpbmcAAAABAgAAACMzUEF4Q0p5ZmtHZjJaSGlES1h3dEd1SmRjc0Y2MzU3N0VpagQAAAAJcEFkZHJlc3MyCQEAAAARYWRkcmVzc0Zyb21TdHJpbmcAAAABAgAAACMzUEVoSnN5VFFCdW1rRzRCSEhaaWhzczROVDFiUTRpWXd4QgQAAAAJcEFkZHJlc3MzCQEAAAARYWRkcmVzc0Zyb21TdHJpbmcAAAABAgAAACMzUFFucEZyQ0wzTFNkUkw3QVlrNXRaYTV1WVhZZ1ZmdzdBbwQAAAAJcEFkZHJlc3M0CQEAAAARYWRkcmVzc0Zyb21TdHJpbmcAAAABAgAAACMzUEpxMThNWGlOdVdYSFVCZVJvYWlwMnNSWlNWOHlqS2lVOAQAAAAJcEFkZHJlc3M1CQEAAAARYWRkcmVzc0Zyb21TdHJpbmcAAAABAgAAACMzUENRaGFMb3A5VWVUTUQ5NEtMWkpkOTQ3TkJMS24zbkdWSwQAAAAKdmFsaWRTdGF0ZQAAAAAAAAAD6AQAAAADdmVyAgAA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", "chainId": 87, "height": 1691560, "spentComplexity": 0 } View: original | compacted Prev: 5S3ZF1JCuAW3BHoBepq6oQQtUpEPLrxuYgAvW8FmYZ3F Next: ExDoD2C34MXyTJ8mPGqtU37yhYYXYQiYuqZjNSSVCd4F Diff:
Old | New | Differences | |
---|---|---|---|
1 | - | {-# STDLIB_VERSION | |
1 | + | {-# STDLIB_VERSION 3 #-} | |
2 | 2 | {-# CONTENT_TYPE EXPRESSION #-} | |
3 | - | let WhitelistAddr = addressFromString("3P87HeVEvJ8xWiQW6N3fpCBHMxwczeGqyqD") | |
4 | - | let GatewayAddr = addressFromString("3P9Typ8Wnoxt719juABnCeErU5wAvfcXAU9") | |
3 | + | let matcherAddress = addressFromString("3PJjwFREg8F9V6Cp9fnUuEwRts6HQQa5nfP") | |
4 | + | let matcherPublicKey = base58'E3UwaHCQCySghK3zwNB8EDHoc3b8uhzGPFz3gHmWon4W' | |
5 | + | let gatewayAddress = addressFromString("3P9Typ8Wnoxt719juABnCeErU5wAvfcXAU9") | |
6 | + | let whitelistAddress = addressFromString("3P87HeVEvJ8xWiQW6N3fpCBHMxwczeGqyqD") | |
7 | + | let dAppWhitelistAddress = Address(base58'3PLnxdrGeK8e3uw5GigpZhRvkjSnwnt7Sgz') | |
8 | + | let gatewayControlAssetAddress = base58'J6spRevsYuwKEHgzyPfojvdBPq67C8yvErr6e9ny8Jom' | |
9 | + | let pAddress1 = addressFromString("3PAxCJyfkGf2ZHiDKXwtGuJdcsF63577Eij") | |
10 | + | let pAddress2 = addressFromString("3PEhJsyTQBumkG4BHHZihss4NT1bQ4iYwxB") | |
11 | + | let pAddress3 = addressFromString("3PQnpFrCL3LSdRL7AYk5tZa5uYXYgVfw7Ao") | |
12 | + | let pAddress4 = addressFromString("3PJq18MXiNuWXHUBeRoaip2sRZSV8yjKiU8") | |
13 | + | let pAddress5 = addressFromString("3PCQhaLop9UeTMD94KLZJd947NBLKn3nGVK") | |
5 | 14 | let validState = 1000 | |
6 | - | let protector0 = base58'288ncauvQoCp71m2oXUXC6LMt7yEv8vPLeAD6mo4hF8Q' | |
7 | - | let protector1 = base58'4q7deHa3UojcsSDSFBvwsj2oXa39BMT9iTMnLfk3Rbpp' | |
8 | - | let protector2 = base58'C92PjnMxbMtvwyZLWdNJKeK2MfZU6wsESVzYjof1mSVu' | |
9 | - | let protector3 = base58'HUKkWXsC7xzSncw7EDb5NPsXKFx5VJq82hUMgB1G7ELK' | |
10 | - | let protector4 = base58'E9rAmSbNdH2F3dYffqTSbvRA96pX1HBYWbAHQrNJu2Ej' | |
15 | + | let ver = "2.0.0-account" | |
11 | 16 | match tx { | |
12 | 17 | case o: Order => | |
13 | 18 | if (sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)) | |
14 | - | then (o.matcherPublicKey == | |
19 | + | then (o.matcherPublicKey == matcherPublicKey) | |
15 | 20 | else false | |
16 | 21 | case tx: TransferTransaction => | |
17 | 22 | if (!(sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey))) | |
18 | 23 | then throw("Transaction must be signed by owner") | |
19 | 24 | else { | |
20 | - | let userState = getInteger(extract( | |
25 | + | let userState = getInteger(extract(whitelistAddress), toBase58String(tx.sender.bytes)) | |
21 | 26 | if (!(isDefined(userState))) | |
22 | 27 | then throw("Address not in whitelist") | |
23 | 28 | else if ((userState != validState)) | |
25 | 30 | else if (!(isDefined(tx.assetId))) | |
26 | 31 | then { | |
27 | 32 | let key = (toBase58String(tx.sender.bytes) + "_WAVES") | |
28 | - | let minAmount = getInteger(extract( | |
33 | + | let minAmount = getInteger(extract(whitelistAddress), key) | |
29 | 34 | if (isDefined(minAmount)) | |
30 | 35 | then { | |
31 | 36 | let curBalance = wavesBalance(extract(tx.sender)) | |
35 | 40 | } | |
36 | 41 | else { | |
37 | 42 | let keyOverall = "res_WAVES" | |
38 | - | let minAmountOverall = getInteger(extract( | |
43 | + | let minAmountOverall = getInteger(extract(whitelistAddress), keyOverall) | |
39 | 44 | if (isDefined(minAmountOverall)) | |
40 | 45 | then { | |
41 | 46 | let curBalance = wavesBalance(extract(tx.sender)) | |
46 | 51 | else true | |
47 | 52 | } | |
48 | 53 | } | |
49 | - | else { | |
50 | - | let TGATEId = base58'J6spRevsYuwKEHgzyPfojvdBPq67C8yvErr6e9ny8Jom' | |
51 | - | if ((tx.assetId == TGATEId)) | |
52 | - | then (tx.recipient == GatewayAddr) | |
53 | - | else true | |
54 | - | } | |
54 | + | else if ((tx.assetId == gatewayControlAssetAddress)) | |
55 | + | then (tx.recipient == gatewayAddress) | |
56 | + | else { | |
57 | + | let white1List = toBase58String(tx.sender.bytes) | |
58 | + | let assetTxt = toBase58String(extract(tx.assetId)) | |
59 | + | let white1ListAsset = ((white1List + "_") + assetTxt) | |
60 | + | let white1ListOverall = ("res_" + assetTxt) | |
61 | + | let white1ListAssetEntry = getInteger(extract(whitelistAddress), white1ListAsset) | |
62 | + | if (!(isDefined(white1ListAssetEntry))) | |
63 | + | then { | |
64 | + | let white1ListOverallEntry = getInteger(extract(whitelistAddress), white1ListOverall) | |
65 | + | if (!(isDefined(white1ListOverallEntry))) | |
66 | + | then true | |
67 | + | else { | |
68 | + | let cur1Balance = assetBalance(tx.sender, tx.assetId) | |
69 | + | if ((extract(white1ListOverallEntry) > (cur1Balance - tx.amount))) | |
70 | + | then throw("Unable to send such amount (type=1)") | |
71 | + | else true | |
72 | + | } | |
73 | + | } | |
74 | + | else { | |
75 | + | let cur1Balance = assetBalance(tx.sender, tx.assetId) | |
76 | + | if ((extract(white1ListAssetEntry) > (cur1Balance - tx.amount))) | |
77 | + | then throw("Unable to send such amount (type=2)") | |
78 | + | else true | |
79 | + | } | |
80 | + | } | |
55 | 81 | } | |
56 | 82 | case tx: SetScriptTransaction => | |
57 | - | let | |
83 | + | let pKey1Signed = if (isDefined(getInteger(extract(pAddress1), toBase58String(tx.id)))) | |
58 | 84 | then 1 | |
59 | 85 | else 0 | |
60 | - | let | |
86 | + | let pKey2Signed = if (isDefined(getInteger(extract(pAddress2), toBase58String(tx.id)))) | |
61 | 87 | then 1 | |
62 | 88 | else 0 | |
63 | - | let | |
89 | + | let pKey3Signed = if (isDefined(getInteger(extract(pAddress3), toBase58String(tx.id)))) | |
64 | 90 | then 1 | |
65 | 91 | else 0 | |
66 | - | let | |
92 | + | let pKey4Signed = if (isDefined(getInteger(extract(pAddress4), toBase58String(tx.id)))) | |
67 | 93 | then 1 | |
68 | 94 | else 0 | |
69 | - | let | |
95 | + | let pKey5Signed = if (isDefined(getInteger(extract(pAddress5), toBase58String(tx.id)))) | |
70 | 96 | then 1 | |
71 | 97 | else 0 | |
72 | - | ((((( | |
98 | + | (((((pKey1Signed + pKey2Signed) + pKey3Signed) + pKey4Signed) + pKey5Signed) >= 3) | |
73 | 99 | case tx: LeaseTransaction => | |
74 | 100 | false | |
75 | 101 | case tx: SponsorFeeTransaction => | |
76 | 102 | false | |
77 | 103 | case tx: MassTransferTransaction => | |
78 | 104 | false | |
105 | + | case tx: IssueTransaction => | |
106 | + | false | |
107 | + | case tx: ReissueTransaction => | |
108 | + | false | |
109 | + | case tx: BurnTransaction => | |
110 | + | false | |
111 | + | case tx: ExchangeTransaction => | |
112 | + | false | |
113 | + | case tx: InvokeScriptTransaction => | |
114 | + | match tx.payment { | |
115 | + | case a: AttachedPayment => | |
116 | + | match getInteger(dAppWhitelistAddress, toBase58String(addressFromRecipient(tx.dApp).bytes)) { | |
117 | + | case unused: Int => | |
118 | + | true | |
119 | + | case _ => | |
120 | + | false | |
121 | + | } | |
122 | + | case _ => | |
123 | + | true | |
124 | + | } | |
79 | 125 | case _ => | |
80 | 126 | sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey) | |
81 | 127 | } |
Old | New | Differences | |
---|---|---|---|
1 | - | {-# STDLIB_VERSION | |
1 | + | {-# STDLIB_VERSION 3 #-} | |
2 | 2 | {-# CONTENT_TYPE EXPRESSION #-} | |
3 | - | let WhitelistAddr = addressFromString("3P87HeVEvJ8xWiQW6N3fpCBHMxwczeGqyqD") | |
4 | - | let GatewayAddr = addressFromString("3P9Typ8Wnoxt719juABnCeErU5wAvfcXAU9") | |
3 | + | let matcherAddress = addressFromString("3PJjwFREg8F9V6Cp9fnUuEwRts6HQQa5nfP") | |
4 | + | let matcherPublicKey = base58'E3UwaHCQCySghK3zwNB8EDHoc3b8uhzGPFz3gHmWon4W' | |
5 | + | let gatewayAddress = addressFromString("3P9Typ8Wnoxt719juABnCeErU5wAvfcXAU9") | |
6 | + | let whitelistAddress = addressFromString("3P87HeVEvJ8xWiQW6N3fpCBHMxwczeGqyqD") | |
7 | + | let dAppWhitelistAddress = Address(base58'3PLnxdrGeK8e3uw5GigpZhRvkjSnwnt7Sgz') | |
8 | + | let gatewayControlAssetAddress = base58'J6spRevsYuwKEHgzyPfojvdBPq67C8yvErr6e9ny8Jom' | |
9 | + | let pAddress1 = addressFromString("3PAxCJyfkGf2ZHiDKXwtGuJdcsF63577Eij") | |
10 | + | let pAddress2 = addressFromString("3PEhJsyTQBumkG4BHHZihss4NT1bQ4iYwxB") | |
11 | + | let pAddress3 = addressFromString("3PQnpFrCL3LSdRL7AYk5tZa5uYXYgVfw7Ao") | |
12 | + | let pAddress4 = addressFromString("3PJq18MXiNuWXHUBeRoaip2sRZSV8yjKiU8") | |
13 | + | let pAddress5 = addressFromString("3PCQhaLop9UeTMD94KLZJd947NBLKn3nGVK") | |
5 | 14 | let validState = 1000 | |
6 | - | let protector0 = base58'288ncauvQoCp71m2oXUXC6LMt7yEv8vPLeAD6mo4hF8Q' | |
7 | - | let protector1 = base58'4q7deHa3UojcsSDSFBvwsj2oXa39BMT9iTMnLfk3Rbpp' | |
8 | - | let protector2 = base58'C92PjnMxbMtvwyZLWdNJKeK2MfZU6wsESVzYjof1mSVu' | |
9 | - | let protector3 = base58'HUKkWXsC7xzSncw7EDb5NPsXKFx5VJq82hUMgB1G7ELK' | |
10 | - | let protector4 = base58'E9rAmSbNdH2F3dYffqTSbvRA96pX1HBYWbAHQrNJu2Ej' | |
15 | + | let ver = "2.0.0-account" | |
11 | 16 | match tx { | |
12 | 17 | case o: Order => | |
13 | 18 | if (sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)) | |
14 | - | then (o.matcherPublicKey == | |
19 | + | then (o.matcherPublicKey == matcherPublicKey) | |
15 | 20 | else false | |
16 | 21 | case tx: TransferTransaction => | |
17 | 22 | if (!(sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey))) | |
18 | 23 | then throw("Transaction must be signed by owner") | |
19 | 24 | else { | |
20 | - | let userState = getInteger(extract( | |
25 | + | let userState = getInteger(extract(whitelistAddress), toBase58String(tx.sender.bytes)) | |
21 | 26 | if (!(isDefined(userState))) | |
22 | 27 | then throw("Address not in whitelist") | |
23 | 28 | else if ((userState != validState)) | |
24 | 29 | then throw("User not in valid state") | |
25 | 30 | else if (!(isDefined(tx.assetId))) | |
26 | 31 | then { | |
27 | 32 | let key = (toBase58String(tx.sender.bytes) + "_WAVES") | |
28 | - | let minAmount = getInteger(extract( | |
33 | + | let minAmount = getInteger(extract(whitelistAddress), key) | |
29 | 34 | if (isDefined(minAmount)) | |
30 | 35 | then { | |
31 | 36 | let curBalance = wavesBalance(extract(tx.sender)) | |
32 | 37 | if ((extract(minAmount) > (curBalance - tx.amount))) | |
33 | 38 | then throw("Unable to send such amount (type=2)") | |
34 | 39 | else true | |
35 | 40 | } | |
36 | 41 | else { | |
37 | 42 | let keyOverall = "res_WAVES" | |
38 | - | let minAmountOverall = getInteger(extract( | |
43 | + | let minAmountOverall = getInteger(extract(whitelistAddress), keyOverall) | |
39 | 44 | if (isDefined(minAmountOverall)) | |
40 | 45 | then { | |
41 | 46 | let curBalance = wavesBalance(extract(tx.sender)) | |
42 | 47 | if ((extract(minAmountOverall) > (curBalance - tx.amount))) | |
43 | 48 | then throw("Unable to send such amount (type=1)") | |
44 | 49 | else true | |
45 | 50 | } | |
46 | 51 | else true | |
47 | 52 | } | |
48 | 53 | } | |
49 | - | else { | |
50 | - | let TGATEId = base58'J6spRevsYuwKEHgzyPfojvdBPq67C8yvErr6e9ny8Jom' | |
51 | - | if ((tx.assetId == TGATEId)) | |
52 | - | then (tx.recipient == GatewayAddr) | |
53 | - | else true | |
54 | - | } | |
54 | + | else if ((tx.assetId == gatewayControlAssetAddress)) | |
55 | + | then (tx.recipient == gatewayAddress) | |
56 | + | else { | |
57 | + | let white1List = toBase58String(tx.sender.bytes) | |
58 | + | let assetTxt = toBase58String(extract(tx.assetId)) | |
59 | + | let white1ListAsset = ((white1List + "_") + assetTxt) | |
60 | + | let white1ListOverall = ("res_" + assetTxt) | |
61 | + | let white1ListAssetEntry = getInteger(extract(whitelistAddress), white1ListAsset) | |
62 | + | if (!(isDefined(white1ListAssetEntry))) | |
63 | + | then { | |
64 | + | let white1ListOverallEntry = getInteger(extract(whitelistAddress), white1ListOverall) | |
65 | + | if (!(isDefined(white1ListOverallEntry))) | |
66 | + | then true | |
67 | + | else { | |
68 | + | let cur1Balance = assetBalance(tx.sender, tx.assetId) | |
69 | + | if ((extract(white1ListOverallEntry) > (cur1Balance - tx.amount))) | |
70 | + | then throw("Unable to send such amount (type=1)") | |
71 | + | else true | |
72 | + | } | |
73 | + | } | |
74 | + | else { | |
75 | + | let cur1Balance = assetBalance(tx.sender, tx.assetId) | |
76 | + | if ((extract(white1ListAssetEntry) > (cur1Balance - tx.amount))) | |
77 | + | then throw("Unable to send such amount (type=2)") | |
78 | + | else true | |
79 | + | } | |
80 | + | } | |
55 | 81 | } | |
56 | 82 | case tx: SetScriptTransaction => | |
57 | - | let | |
83 | + | let pKey1Signed = if (isDefined(getInteger(extract(pAddress1), toBase58String(tx.id)))) | |
58 | 84 | then 1 | |
59 | 85 | else 0 | |
60 | - | let | |
86 | + | let pKey2Signed = if (isDefined(getInteger(extract(pAddress2), toBase58String(tx.id)))) | |
61 | 87 | then 1 | |
62 | 88 | else 0 | |
63 | - | let | |
89 | + | let pKey3Signed = if (isDefined(getInteger(extract(pAddress3), toBase58String(tx.id)))) | |
64 | 90 | then 1 | |
65 | 91 | else 0 | |
66 | - | let | |
92 | + | let pKey4Signed = if (isDefined(getInteger(extract(pAddress4), toBase58String(tx.id)))) | |
67 | 93 | then 1 | |
68 | 94 | else 0 | |
69 | - | let | |
95 | + | let pKey5Signed = if (isDefined(getInteger(extract(pAddress5), toBase58String(tx.id)))) | |
70 | 96 | then 1 | |
71 | 97 | else 0 | |
72 | - | ((((( | |
98 | + | (((((pKey1Signed + pKey2Signed) + pKey3Signed) + pKey4Signed) + pKey5Signed) >= 3) | |
73 | 99 | case tx: LeaseTransaction => | |
74 | 100 | false | |
75 | 101 | case tx: SponsorFeeTransaction => | |
76 | 102 | false | |
77 | 103 | case tx: MassTransferTransaction => | |
78 | 104 | false | |
105 | + | case tx: IssueTransaction => | |
106 | + | false | |
107 | + | case tx: ReissueTransaction => | |
108 | + | false | |
109 | + | case tx: BurnTransaction => | |
110 | + | false | |
111 | + | case tx: ExchangeTransaction => | |
112 | + | false | |
113 | + | case tx: InvokeScriptTransaction => | |
114 | + | match tx.payment { | |
115 | + | case a: AttachedPayment => | |
116 | + | match getInteger(dAppWhitelistAddress, toBase58String(addressFromRecipient(tx.dApp).bytes)) { | |
117 | + | case unused: Int => | |
118 | + | true | |
119 | + | case _ => | |
120 | + | false | |
121 | + | } | |
122 | + | case _ => | |
123 | + | true | |
124 | + | } | |
79 | 125 | case _ => | |
80 | 126 | sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey) | |
81 | 127 | } |
github/deemru/w8io/0e76f2f 85.06 ms ◑