tx · 4VHwizpMMroRhRF53RMpb91zSeXY377fSRtjhDYnKGGK 3PEWm5cC1Da2ws2ZTYMAVErePUqpq2H9XoC: -0.01400000 Waves 2021.02.09 17:41 [2454537] smart account 3PEWm5cC1Da2ws2ZTYMAVErePUqpq2H9XoC > SELF 0.00000000 Waves
{ "type": 13, "id": "4VHwizpMMroRhRF53RMpb91zSeXY377fSRtjhDYnKGGK", "fee": 1400000, "feeAssetId": null, "timestamp": 1612881690589, "version": 1, "sender": "3PEWm5cC1Da2ws2ZTYMAVErePUqpq2H9XoC", "senderPublicKey": "GbQrhuo5FtrnoccErj6zy6Ks7PAz2ZmsCBXQ1UVAqBQP", "proofs": [ "5Hbd8YyWSXGzFCH4iqPCnPDfmbdFquePrgGL8VwzmYBBP5w9HZgASMYmsVcwS3Zr3tfaHYzWMd8SKCpCjvfQYYbq", "449zVqDLnM2X6oxWCyyDEsnTXEc5oSm1PirMxQwATexeqqvSphSaY6k3jUZsgW3Q9erfSUgmVi7eChXR14JhQeLH", "2QH8vmj6R3QpaA7kruoMRgjZZWgrHG6QxGQBJ4sgRM8uzudrTZQfL5Hy3knbvXzzienP2EKSiFtF3kvw69oqNgBz" ], "script": "base64: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dEFzc2V0RW50cnkJAAQaAAAAAgkBAAAAEmdldEFkZHJlc3NGcm9tQm9vawAAAAEFAAAAE3doaXRlbGlzdEFkZHJlc3NLZXkFAAAAD3doaXRlMUxpc3RBc3NldAMJAQAAAAEhAAAAAQkBAAAACWlzRGVmaW5lZAAAAAEFAAAAFHdoaXRlMUxpc3RBc3NldEVudHJ5BAAAABZ3aGl0ZTFMaXN0T3ZlcmFsbEVudHJ5CQAEGgAAAAIJAQAAABJnZXRBZGRyZXNzRnJvbUJvb2sAAAABBQAAABN3aGl0ZWxpc3RBZGRyZXNzS2V5BQAAABF3aGl0ZTFMaXN0T3ZlcmFsbAMJAQAAAAEhAAAAAQkBAAAACWlzRGVmaW5lZAAAAAEFAAAAFndoaXRlMUxpc3RPdmVyYWxsRW50cnkGBAAAAAtjdXIxQmFsYW5jZQkAA+sAAAACCAUAAAACdHgAAAAGc2VuZGVyCAUAAAACdHgAAAAHYXNzZXRJZAMJAABmAAAAAgkBAAAAB2V4dHJhY3QAAAABBQAAABZ3aGl0ZTFMaXN0T3ZlcmFsbEVudHJ5CQAAZQAAAAIFAAAAC2N1cjFCYWxhbmNlCAUAAAACdHgAAAAGYW1vdW50CQAAAgAAAAECAAAAKCMwMDYgVW5hYmxlIHRvIHNlbmQgc3VjaCBhbW91bnQgKHR5cGU9MSkGBAAAAAtjdXIxQmFsYW5jZQkAA+sAAAACCAUAAAACdHgAAAAGc2VuZGVyCAUAAAACdHgAAAAHYXNzZXRJZAMJAABmAAAAAgkBAAAAB2V4dHJhY3QAAAABBQAAABR3aGl0ZTFMaXN0QXNzZXRFbnRyeQkAAGUAAAACBQAAAAtjdXIxQmFsYW5jZQgFAAAAAnR4AAAABmFtb3VudAkAAAIAAAABAgAAACgjMDA3IFVuYWJsZSB0byBzZW5kIHN1Y2ggYW1vdW50ICh0eXBlPTIpBgMJAAABAAAAAgUAAAAHJG1hdGNoMAIAAAAUU2V0U2NyaXB0VHJhbnNhY3Rpb24EAAAAAnR4BQAAAAckbWF0Y2gwBAAAAAR0eElkCQACWAAAAAEIBQAAAAJ0eAAAAAJpZAQAAAAJcEFkZHJlc3MxCQEAAAASZ2V0QWRkcmVzc0Zyb21Cb29rAAAAAQIAAAAJcEFkZHJlc3MxBAAAAAlwQWRkcmVzczIJ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", "chainId": 87, "height": 2454537, "applicationStatus": "succeeded", "spentComplexity": 0 } View: original | compacted Prev: XJERNzUWsffoJJBCMwNfqBrhdLM8nB8JnUq2aAWKrKB Next: none Diff:
Old | New | Differences | |
---|---|---|---|
1 | 1 | {-# STDLIB_VERSION 3 #-} | |
2 | 2 | {-# CONTENT_TYPE EXPRESSION #-} | |
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") | |
3 | + | let addressBook = Address(base58'3PQnTVr1QV9NAyfJkco7ZittcXf53NjeJg8') | |
4 | + | let whitelistAddressKey = "whitelistAddress" | |
5 | + | let dAppWhitelistAddressKey = "dAppWhitelistAddress" | |
6 | + | let matcherAddressKey = "matcherAddress" | |
7 | + | let gatewayAddressKey = "gatewayAddress" | |
8 | + | let gatewayControlAssetKey = "gatewayControlAsset" | |
14 | 9 | let validState = 1000 | |
15 | - | let ver = "2.0.0-account" | |
10 | + | let ver = "5.0.2" | |
11 | + | func getAddressFromBook (key) = match getString(addressBook, key) { | |
12 | + | case a: String => | |
13 | + | Address(fromBase58String(a)) | |
14 | + | case _ => | |
15 | + | throw("#008 no key") | |
16 | + | } | |
17 | + | ||
18 | + | func getAssetFromAddressBook () = match getString(extract(addressBook), gatewayControlAssetKey) { | |
19 | + | case a: String => | |
20 | + | toBytes(a) | |
21 | + | case _ => | |
22 | + | throw("#009 no key") | |
23 | + | } | |
24 | + | ||
16 | 25 | match tx { | |
17 | 26 | case o: Order => | |
18 | 27 | if (sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)) | |
19 | - | then (o.matcherPublicKey == | |
28 | + | then (addressFromPublicKey(o.matcherPublicKey) == getAddressFromBook(matcherAddressKey)) | |
20 | 29 | else false | |
21 | 30 | case tx: TransferTransaction => | |
22 | 31 | if (!(sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey))) | |
23 | - | then throw("Transaction must be signed by owner") | |
32 | + | then throw("#001 Transaction must be signed by owner") | |
24 | 33 | else { | |
25 | - | let userState = getInteger( | |
34 | + | let userState = getInteger(getAddressFromBook(whitelistAddressKey), toBase58String(tx.sender.bytes)) | |
26 | 35 | if (!(isDefined(userState))) | |
27 | - | then throw("Address not in whitelist") | |
36 | + | then throw("#002 Address not in whitelist") | |
28 | 37 | else if ((userState != validState)) | |
29 | - | then throw("User not in valid state") | |
38 | + | then throw("#003 User not in valid state") | |
30 | 39 | else if (!(isDefined(tx.assetId))) | |
31 | 40 | then { | |
32 | 41 | let key = (toBase58String(tx.sender.bytes) + "_WAVES") | |
33 | - | let minAmount = getInteger( | |
42 | + | let minAmount = getInteger(getAddressFromBook(whitelistAddressKey), key) | |
34 | 43 | if (isDefined(minAmount)) | |
35 | 44 | then { | |
36 | 45 | let curBalance = wavesBalance(extract(tx.sender)) | |
37 | 46 | if ((extract(minAmount) > (curBalance - tx.amount))) | |
38 | - | then throw("Unable to send such amount (type=2)") | |
47 | + | then throw("#004 Unable to send such amount (type=2)") | |
39 | 48 | else true | |
40 | 49 | } | |
41 | 50 | else { | |
42 | 51 | let keyOverall = "res_WAVES" | |
43 | - | let minAmountOverall = getInteger( | |
52 | + | let minAmountOverall = getInteger(getAddressFromBook(whitelistAddressKey), keyOverall) | |
44 | 53 | if (isDefined(minAmountOverall)) | |
45 | 54 | then { | |
46 | 55 | let curBalance = wavesBalance(extract(tx.sender)) | |
47 | 56 | if ((extract(minAmountOverall) > (curBalance - tx.amount))) | |
48 | - | then throw("Unable to send such amount (type=1)") | |
57 | + | then throw("#005 Unable to send such amount (type=1)") | |
49 | 58 | else true | |
50 | 59 | } | |
51 | 60 | else true | |
52 | 61 | } | |
53 | 62 | } | |
54 | - | else if ((tx.assetId == | |
55 | - | then (tx.recipient == | |
63 | + | else if ((tx.assetId == getAssetFromAddressBook())) | |
64 | + | then (tx.recipient == getAddressFromBook(gatewayAddressKey)) | |
56 | 65 | else { | |
57 | 66 | let white1List = toBase58String(tx.sender.bytes) | |
58 | 67 | let assetTxt = toBase58String(extract(tx.assetId)) | |
59 | 68 | let white1ListAsset = ((white1List + "_") + assetTxt) | |
60 | 69 | let white1ListOverall = ("res_" + assetTxt) | |
61 | - | let white1ListAssetEntry = getInteger( | |
70 | + | let white1ListAssetEntry = getInteger(getAddressFromBook(whitelistAddressKey), white1ListAsset) | |
62 | 71 | if (!(isDefined(white1ListAssetEntry))) | |
63 | 72 | then { | |
64 | - | let white1ListOverallEntry = getInteger( | |
73 | + | let white1ListOverallEntry = getInteger(getAddressFromBook(whitelistAddressKey), white1ListOverall) | |
65 | 74 | if (!(isDefined(white1ListOverallEntry))) | |
66 | 75 | then true | |
67 | 76 | else { | |
68 | 77 | let cur1Balance = assetBalance(tx.sender, tx.assetId) | |
69 | 78 | if ((extract(white1ListOverallEntry) > (cur1Balance - tx.amount))) | |
70 | - | then throw("Unable to send such amount (type=1)") | |
79 | + | then throw("#006 Unable to send such amount (type=1)") | |
71 | 80 | else true | |
72 | 81 | } | |
73 | 82 | } | |
74 | 83 | else { | |
75 | 84 | let cur1Balance = assetBalance(tx.sender, tx.assetId) | |
76 | 85 | if ((extract(white1ListAssetEntry) > (cur1Balance - tx.amount))) | |
77 | - | then throw("Unable to send such amount (type=2)") | |
86 | + | then throw("#007 Unable to send such amount (type=2)") | |
78 | 87 | else true | |
79 | 88 | } | |
80 | 89 | } | |
81 | 90 | } | |
82 | 91 | case tx: SetScriptTransaction => | |
83 | - | let pKey1Signed = if (isDefined(getInteger(extract(pAddress1), toBase58String(tx.id)))) | |
92 | + | let txId = toBase58String(tx.id) | |
93 | + | let pAddress1 = getAddressFromBook("pAddress1") | |
94 | + | let pAddress2 = getAddressFromBook("pAddress2") | |
95 | + | let pAddress3 = getAddressFromBook("pAddress3") | |
96 | + | let pAddress4 = getAddressFromBook("pAddress4") | |
97 | + | let pAddress5 = getAddressFromBook("pAddress5") | |
98 | + | let pAddress6 = getAddressFromBook("pAddress6") | |
99 | + | let pAddress7 = getAddressFromBook("pAddress7") | |
100 | + | let pAddress8 = getAddressFromBook("pAddress8") | |
101 | + | let pKey1Signed = if (isDefined(getInteger(pAddress1, txId))) | |
84 | 102 | then 1 | |
85 | 103 | else 0 | |
86 | - | let pKey2Signed = if (isDefined(getInteger( | |
104 | + | let pKey2Signed = if (isDefined(getInteger(pAddress2, txId))) | |
87 | 105 | then 1 | |
88 | 106 | else 0 | |
89 | - | let pKey3Signed = if (isDefined(getInteger( | |
107 | + | let pKey3Signed = if (isDefined(getInteger(pAddress3, txId))) | |
90 | 108 | then 1 | |
91 | 109 | else 0 | |
92 | - | let pKey4Signed = if (isDefined(getInteger( | |
110 | + | let pKey4Signed = if (isDefined(getInteger(pAddress4, txId))) | |
93 | 111 | then 1 | |
94 | 112 | else 0 | |
95 | - | let pKey5Signed = if (isDefined(getInteger( | |
113 | + | let pKey5Signed = if (isDefined(getInteger(pAddress5, txId))) | |
96 | 114 | then 1 | |
97 | 115 | else 0 | |
98 | - | (((((pKey1Signed + pKey2Signed) + pKey3Signed) + pKey4Signed) + pKey5Signed) >= 3) | |
99 | - | case tx: LeaseTransaction => | |
116 | + | let pKey6Signed = if (isDefined(getInteger(pAddress6, txId))) | |
117 | + | then 1 | |
118 | + | else 0 | |
119 | + | let pKey7Signed = if (isDefined(getInteger(pAddress7, txId))) | |
120 | + | then 1 | |
121 | + | else 0 | |
122 | + | let pKey8Signed = if (isDefined(getInteger(pAddress8, txId))) | |
123 | + | then 1 | |
124 | + | else 0 | |
125 | + | ((((((((pKey1Signed + pKey2Signed) + pKey3Signed) + pKey4Signed) + pKey5Signed) + pKey6Signed) + pKey7Signed) + pKey8Signed) >= 3) | |
126 | + | case _: LeaseTransaction => | |
100 | 127 | false | |
101 | - | case | |
128 | + | case _: SponsorFeeTransaction => | |
102 | 129 | false | |
103 | - | case | |
130 | + | case _: MassTransferTransaction => | |
104 | 131 | false | |
105 | - | case | |
132 | + | case _: IssueTransaction => | |
106 | 133 | false | |
107 | - | case | |
134 | + | case _: ReissueTransaction => | |
108 | 135 | false | |
109 | - | case | |
136 | + | case _: BurnTransaction => | |
110 | 137 | false | |
111 | - | case | |
138 | + | case _: ExchangeTransaction => | |
112 | 139 | false | |
113 | 140 | case tx: InvokeScriptTransaction => | |
114 | - | match tx.payment { | |
115 | - | case a: AttachedPayment => | |
116 | - | match getInteger(dAppWhitelistAddress, toBase58String(addressFromRecipient(tx.dApp).bytes)) { | |
117 | - | case unused: Int => | |
141 | + | let isSigned = sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey) | |
142 | + | let payment = match tx.payment { | |
143 | + | case _: AttachedPayment => | |
144 | + | match getInteger(getAddressFromBook(dAppWhitelistAddressKey), toBase58String(addressFromRecipient(tx.dApp).bytes)) { | |
145 | + | case _: Int => | |
118 | 146 | true | |
119 | 147 | case _ => | |
120 | 148 | false | |
122 | 150 | case _ => | |
123 | 151 | true | |
124 | 152 | } | |
153 | + | if (isSigned) | |
154 | + | then payment | |
155 | + | else false | |
125 | 156 | case _ => | |
126 | 157 | sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey) | |
127 | 158 | } |
Old | New | Differences | |
---|---|---|---|
1 | 1 | {-# STDLIB_VERSION 3 #-} | |
2 | 2 | {-# CONTENT_TYPE EXPRESSION #-} | |
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") | |
3 | + | let addressBook = Address(base58'3PQnTVr1QV9NAyfJkco7ZittcXf53NjeJg8') | |
4 | + | let whitelistAddressKey = "whitelistAddress" | |
5 | + | let dAppWhitelistAddressKey = "dAppWhitelistAddress" | |
6 | + | let matcherAddressKey = "matcherAddress" | |
7 | + | let gatewayAddressKey = "gatewayAddress" | |
8 | + | let gatewayControlAssetKey = "gatewayControlAsset" | |
14 | 9 | let validState = 1000 | |
15 | - | let ver = "2.0.0-account" | |
10 | + | let ver = "5.0.2" | |
11 | + | func getAddressFromBook (key) = match getString(addressBook, key) { | |
12 | + | case a: String => | |
13 | + | Address(fromBase58String(a)) | |
14 | + | case _ => | |
15 | + | throw("#008 no key") | |
16 | + | } | |
17 | + | ||
18 | + | func getAssetFromAddressBook () = match getString(extract(addressBook), gatewayControlAssetKey) { | |
19 | + | case a: String => | |
20 | + | toBytes(a) | |
21 | + | case _ => | |
22 | + | throw("#009 no key") | |
23 | + | } | |
24 | + | ||
16 | 25 | match tx { | |
17 | 26 | case o: Order => | |
18 | 27 | if (sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)) | |
19 | - | then (o.matcherPublicKey == | |
28 | + | then (addressFromPublicKey(o.matcherPublicKey) == getAddressFromBook(matcherAddressKey)) | |
20 | 29 | else false | |
21 | 30 | case tx: TransferTransaction => | |
22 | 31 | if (!(sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey))) | |
23 | - | then throw("Transaction must be signed by owner") | |
32 | + | then throw("#001 Transaction must be signed by owner") | |
24 | 33 | else { | |
25 | - | let userState = getInteger( | |
34 | + | let userState = getInteger(getAddressFromBook(whitelistAddressKey), toBase58String(tx.sender.bytes)) | |
26 | 35 | if (!(isDefined(userState))) | |
27 | - | then throw("Address not in whitelist") | |
36 | + | then throw("#002 Address not in whitelist") | |
28 | 37 | else if ((userState != validState)) | |
29 | - | then throw("User not in valid state") | |
38 | + | then throw("#003 User not in valid state") | |
30 | 39 | else if (!(isDefined(tx.assetId))) | |
31 | 40 | then { | |
32 | 41 | let key = (toBase58String(tx.sender.bytes) + "_WAVES") | |
33 | - | let minAmount = getInteger( | |
42 | + | let minAmount = getInteger(getAddressFromBook(whitelistAddressKey), key) | |
34 | 43 | if (isDefined(minAmount)) | |
35 | 44 | then { | |
36 | 45 | let curBalance = wavesBalance(extract(tx.sender)) | |
37 | 46 | if ((extract(minAmount) > (curBalance - tx.amount))) | |
38 | - | then throw("Unable to send such amount (type=2)") | |
47 | + | then throw("#004 Unable to send such amount (type=2)") | |
39 | 48 | else true | |
40 | 49 | } | |
41 | 50 | else { | |
42 | 51 | let keyOverall = "res_WAVES" | |
43 | - | let minAmountOverall = getInteger( | |
52 | + | let minAmountOverall = getInteger(getAddressFromBook(whitelistAddressKey), keyOverall) | |
44 | 53 | if (isDefined(minAmountOverall)) | |
45 | 54 | then { | |
46 | 55 | let curBalance = wavesBalance(extract(tx.sender)) | |
47 | 56 | if ((extract(minAmountOverall) > (curBalance - tx.amount))) | |
48 | - | then throw("Unable to send such amount (type=1)") | |
57 | + | then throw("#005 Unable to send such amount (type=1)") | |
49 | 58 | else true | |
50 | 59 | } | |
51 | 60 | else true | |
52 | 61 | } | |
53 | 62 | } | |
54 | - | else if ((tx.assetId == | |
55 | - | then (tx.recipient == | |
63 | + | else if ((tx.assetId == getAssetFromAddressBook())) | |
64 | + | then (tx.recipient == getAddressFromBook(gatewayAddressKey)) | |
56 | 65 | else { | |
57 | 66 | let white1List = toBase58String(tx.sender.bytes) | |
58 | 67 | let assetTxt = toBase58String(extract(tx.assetId)) | |
59 | 68 | let white1ListAsset = ((white1List + "_") + assetTxt) | |
60 | 69 | let white1ListOverall = ("res_" + assetTxt) | |
61 | - | let white1ListAssetEntry = getInteger( | |
70 | + | let white1ListAssetEntry = getInteger(getAddressFromBook(whitelistAddressKey), white1ListAsset) | |
62 | 71 | if (!(isDefined(white1ListAssetEntry))) | |
63 | 72 | then { | |
64 | - | let white1ListOverallEntry = getInteger( | |
73 | + | let white1ListOverallEntry = getInteger(getAddressFromBook(whitelistAddressKey), white1ListOverall) | |
65 | 74 | if (!(isDefined(white1ListOverallEntry))) | |
66 | 75 | then true | |
67 | 76 | else { | |
68 | 77 | let cur1Balance = assetBalance(tx.sender, tx.assetId) | |
69 | 78 | if ((extract(white1ListOverallEntry) > (cur1Balance - tx.amount))) | |
70 | - | then throw("Unable to send such amount (type=1)") | |
79 | + | then throw("#006 Unable to send such amount (type=1)") | |
71 | 80 | else true | |
72 | 81 | } | |
73 | 82 | } | |
74 | 83 | else { | |
75 | 84 | let cur1Balance = assetBalance(tx.sender, tx.assetId) | |
76 | 85 | if ((extract(white1ListAssetEntry) > (cur1Balance - tx.amount))) | |
77 | - | then throw("Unable to send such amount (type=2)") | |
86 | + | then throw("#007 Unable to send such amount (type=2)") | |
78 | 87 | else true | |
79 | 88 | } | |
80 | 89 | } | |
81 | 90 | } | |
82 | 91 | case tx: SetScriptTransaction => | |
83 | - | let pKey1Signed = if (isDefined(getInteger(extract(pAddress1), toBase58String(tx.id)))) | |
92 | + | let txId = toBase58String(tx.id) | |
93 | + | let pAddress1 = getAddressFromBook("pAddress1") | |
94 | + | let pAddress2 = getAddressFromBook("pAddress2") | |
95 | + | let pAddress3 = getAddressFromBook("pAddress3") | |
96 | + | let pAddress4 = getAddressFromBook("pAddress4") | |
97 | + | let pAddress5 = getAddressFromBook("pAddress5") | |
98 | + | let pAddress6 = getAddressFromBook("pAddress6") | |
99 | + | let pAddress7 = getAddressFromBook("pAddress7") | |
100 | + | let pAddress8 = getAddressFromBook("pAddress8") | |
101 | + | let pKey1Signed = if (isDefined(getInteger(pAddress1, txId))) | |
84 | 102 | then 1 | |
85 | 103 | else 0 | |
86 | - | let pKey2Signed = if (isDefined(getInteger( | |
104 | + | let pKey2Signed = if (isDefined(getInteger(pAddress2, txId))) | |
87 | 105 | then 1 | |
88 | 106 | else 0 | |
89 | - | let pKey3Signed = if (isDefined(getInteger( | |
107 | + | let pKey3Signed = if (isDefined(getInteger(pAddress3, txId))) | |
90 | 108 | then 1 | |
91 | 109 | else 0 | |
92 | - | let pKey4Signed = if (isDefined(getInteger( | |
110 | + | let pKey4Signed = if (isDefined(getInteger(pAddress4, txId))) | |
93 | 111 | then 1 | |
94 | 112 | else 0 | |
95 | - | let pKey5Signed = if (isDefined(getInteger( | |
113 | + | let pKey5Signed = if (isDefined(getInteger(pAddress5, txId))) | |
96 | 114 | then 1 | |
97 | 115 | else 0 | |
98 | - | (((((pKey1Signed + pKey2Signed) + pKey3Signed) + pKey4Signed) + pKey5Signed) >= 3) | |
99 | - | case tx: LeaseTransaction => | |
116 | + | let pKey6Signed = if (isDefined(getInteger(pAddress6, txId))) | |
117 | + | then 1 | |
118 | + | else 0 | |
119 | + | let pKey7Signed = if (isDefined(getInteger(pAddress7, txId))) | |
120 | + | then 1 | |
121 | + | else 0 | |
122 | + | let pKey8Signed = if (isDefined(getInteger(pAddress8, txId))) | |
123 | + | then 1 | |
124 | + | else 0 | |
125 | + | ((((((((pKey1Signed + pKey2Signed) + pKey3Signed) + pKey4Signed) + pKey5Signed) + pKey6Signed) + pKey7Signed) + pKey8Signed) >= 3) | |
126 | + | case _: LeaseTransaction => | |
100 | 127 | false | |
101 | - | case | |
128 | + | case _: SponsorFeeTransaction => | |
102 | 129 | false | |
103 | - | case | |
130 | + | case _: MassTransferTransaction => | |
104 | 131 | false | |
105 | - | case | |
132 | + | case _: IssueTransaction => | |
106 | 133 | false | |
107 | - | case | |
134 | + | case _: ReissueTransaction => | |
108 | 135 | false | |
109 | - | case | |
136 | + | case _: BurnTransaction => | |
110 | 137 | false | |
111 | - | case | |
138 | + | case _: ExchangeTransaction => | |
112 | 139 | false | |
113 | 140 | case tx: InvokeScriptTransaction => | |
114 | - | match tx.payment { | |
115 | - | case a: AttachedPayment => | |
116 | - | match getInteger(dAppWhitelistAddress, toBase58String(addressFromRecipient(tx.dApp).bytes)) { | |
117 | - | case unused: Int => | |
141 | + | let isSigned = sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey) | |
142 | + | let payment = match tx.payment { | |
143 | + | case _: AttachedPayment => | |
144 | + | match getInteger(getAddressFromBook(dAppWhitelistAddressKey), toBase58String(addressFromRecipient(tx.dApp).bytes)) { | |
145 | + | case _: Int => | |
118 | 146 | true | |
119 | 147 | case _ => | |
120 | 148 | false | |
121 | 149 | } | |
122 | 150 | case _ => | |
123 | 151 | true | |
124 | 152 | } | |
153 | + | if (isSigned) | |
154 | + | then payment | |
155 | + | else false | |
125 | 156 | case _ => | |
126 | 157 | sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey) | |
127 | 158 | } |
github/deemru/w8io/0e76f2f 67.84 ms ◑