tx · 9MNiiv49ChYj3k1kkdKa8zz8PMjkeK42SG2T4utfnYn3

3PR5iZeNs2RtwE6XNERrCSSxvz7J12HpxJp:  -0.01400000 Waves

2019.09.04 20:01 [1691560] smart account 3PR5iZeNs2RtwE6XNERrCSSxvz7J12HpxJp > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "9MNiiv49ChYj3k1kkdKa8zz8PMjkeK42SG2T4utfnYn3",
    "fee": 1400000,
    "feeAssetId": null,
    "timestamp": 1567616453979,
    "version": 1,
    "sender": "3PR5iZeNs2RtwE6XNERrCSSxvz7J12HpxJp",
    "senderPublicKey": "B26jaLxE6dzUWoQ8BcWvKpFC1rFJ86TmazfL13ZfRCn6",
    "proofs": [
        "3i33ktNiz4rtcF9T2EL9fs1VRRHoUP5wZfsCFVaQrEwkhVem1L9ZiCh6RgAPQcBzbn5R3SrvFBX7bU48wz8BkdeT",
        "2zQNJTmHmHM6P45DTSHbot7qQtjMqkCJckjXzFozCMrMW6q5CuMGbrT5kc9t4qGScTTumT33wdbYZPfcpCASQqSS",
        "3zbSi5TYxi8orV3AmE4ZSr62SBy5c9mdaDmcDwiwemSv53eLcQ4UDPBx542b98UsECUcRWNn9pfSuF4f3gBh4o3c",
        "2fFBYkGbukXq5X3c5teyyeM63p3GHau3zzHSJni1oBM11GuMqnmGYMA4TRJ82aXvKvAe8H4x2pmJZRQsjCeRUFTF"
    ],
    "script": "base64:AwQAAAAObWF0Y2hlckFkZHJlc3MJAQAAABFhZGRyZXNzRnJvbVN0cmluZwAAAAECAAAAIzNQSmp3RlJFZzhGOVY2Q3A5Zm5VdUV3UnRzNkhRUWE1bmZQBAAAABBtYXRjaGVyUHVibGljS2V5AQAAACDByq8/10uSb4ln/m2DiE93I/Ngal7Wm/IdCLfujs7XHwQAAAAOZ2F0ZXdheUFkZHJlc3MJAQAAABFhZGRyZXNzRnJvbVN0cmluZwAAAAECAAAAIzNQOVR5cDhXbm94dDcxOWp1QUJuQ2VFclU1d0F2ZmNYQVU5BAAAABB3aGl0ZWxpc3RBZGRyZXNzCQEAAAARYWRkcmVzc0Zyb21TdHJpbmcAAAABAgAAACMzUDg3SGVWRXZKOHhXaVFXNk4zZnBDQkhNeHdjemVHcXlxRAQAAAAUZEFwcFdoaXRlbGlzdEFkZHJlc3MJAQAAAAdBZGRyZXNzAAAAAQEAAAAaAVfO6lLVWHe4KvIB5hQNUIPqAqvCPbIOsNMEAAAAGmdhdGV3YXlDb250cm9sQXNzZXRBZGRyZXNzAQAAACD+GAqhD0IxDHBjbPaZoYqvgxte2kvyIxgEXy6OmEJbNAQAAAAJcEFkZHJlc3MxCQEAAAARYWRkcmVzc0Zyb21TdHJpbmcAAAABAgAAACMzUEF4Q0p5ZmtHZjJaSGlES1h3dEd1SmRjc0Y2MzU3N0VpagQAAAAJcEFkZHJlc3MyCQEAAAARYWRkcmVzc0Zyb21TdHJpbmcAAAABAgAAACMzUEVoSnN5VFFCdW1rRzRCSEhaaWhzczROVDFiUTRpWXd4QgQAAAAJcEFkZHJlc3MzCQEAAAARYWRkcmVzc0Zyb21TdHJpbmcAAAABAgAAACMzUFFucEZyQ0wzTFNkUkw3QVlrNXRaYTV1WVhZZ1ZmdzdBbwQAAAAJcEFkZHJlc3M0CQEAAAARYWRkcmVzc0Zyb21TdHJpbmcAAAABAgAAACMzUEpxMThNWGlOdVdYSFVCZVJvYWlwMnNSWlNWOHlqS2lVOAQAAAAJcEFkZHJlc3M1CQEAAAARYWRkcmVzc0Zyb21TdHJpbmcAAAABAgAAACMzUENRaGFMb3A5VWVUTUQ5NEtMWkpkOTQ3TkJMS24zbkdWSwQAAAAKdmFsaWRTdGF0ZQAAAAAAAAAD6AQAAAADdmVyAgAA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",
    "chainId": 87,
    "height": 1691560,
    "spentComplexity": 0
}

View: original | compacted
Prev: 9Qebj4xxJeHUgsQHi2zUroGKYDL2FxoxTPFxjxefpYBV
Next: JCGjPmwAjpwsdWB8zBoSMZjv9K2nZZZq1jvKWFeNh2Uu

Diff: 
Old
New
Differences
1
-
{-# STDLIB_VERSION 2 #-}
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'
11
-
let ver = "1.0.3"
15
+
let ver = "2.0.0-account"
12
16
 
match tx {
13
17
 
    case o: Order => 
14
18
 
        if (sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey))
15
-
            then (o.matcherPublicKey == base58'E3UwaHCQCySghK3zwNB8EDHoc3b8uhzGPFz3gHmWon4W')
19
+
            then (o.matcherPublicKey == matcherPublicKey)
16
20
 
            else false
17
21
 
    case tx: TransferTransaction => 
18
22
 
        if (!(sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)))
19
23
 
            then throw("Transaction must be signed by owner")
20
24
 
            else {
21
-
                let userState = getInteger(extract(WhitelistAddr), toBase58String(tx.sender.bytes))
25
+
                let userState = getInteger(extract(whitelistAddress), toBase58String(tx.sender.bytes))
22
26
 
                if (!(isDefined(userState)))
23
27
 
                    then throw("Address not in whitelist")
24
28
 
                    else if ((userState != validState))
26
30
 
                        else if (!(isDefined(tx.assetId)))
27
31
 
                            then {
28
32
 
                                let key = (toBase58String(tx.sender.bytes) + "_WAVES")
29
-
                                let minAmount = getInteger(extract(WhitelistAddr), key)
33
+
                                let minAmount = getInteger(extract(whitelistAddress), key)
30
34
 
                                if (isDefined(minAmount))
31
35
 
                                    then {
32
36
 
                                        let curBalance = wavesBalance(extract(tx.sender))
36
40
 
                                        }
37
41
 
                                    else {
38
42
 
                                        let keyOverall = "res_WAVES"
39
-
                                        let minAmountOverall = getInteger(extract(WhitelistAddr), keyOverall)
43
+
                                        let minAmountOverall = getInteger(extract(whitelistAddress), keyOverall)
40
44
 
                                        if (isDefined(minAmountOverall))
41
45
 
                                            then {
42
46
 
                                                let curBalance = wavesBalance(extract(tx.sender))
47
51
 
                                            else true
48
52
 
                                        }
49
53
 
                                }
50
-
                            else {
51
-
                                let TGATEId = base58'J6spRevsYuwKEHgzyPfojvdBPq67C8yvErr6e9ny8Jom'
52
-
                                if ((tx.assetId == TGATEId))
53
-
                                    then (tx.recipient == GatewayAddr)
54
-
                                    else true
55
-
                                }
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
+
                                    }
56
81
 
                }
57
82
 
    case tx: SetScriptTransaction => 
58
-
        let p0signed = if (sigVerify(tx.bodyBytes, tx.proofs[0], protector0))
83
+
        let pKey1Signed = if (isDefined(getInteger(extract(pAddress1), toBase58String(tx.id))))
59
84
 
            then 1
60
85
 
            else 0
61
-
        let p1signed = if (sigVerify(tx.bodyBytes, tx.proofs[1], protector1))
86
+
        let pKey2Signed = if (isDefined(getInteger(extract(pAddress2), toBase58String(tx.id))))
62
87
 
            then 1
63
88
 
            else 0
64
-
        let p2signed = if (sigVerify(tx.bodyBytes, tx.proofs[2], protector2))
89
+
        let pKey3Signed = if (isDefined(getInteger(extract(pAddress3), toBase58String(tx.id))))
65
90
 
            then 1
66
91
 
            else 0
67
-
        let p3signed = if (sigVerify(tx.bodyBytes, tx.proofs[3], protector3))
92
+
        let pKey4Signed = if (isDefined(getInteger(extract(pAddress4), toBase58String(tx.id))))
68
93
 
            then 1
69
94
 
            else 0
70
-
        let p4signed = if (sigVerify(tx.bodyBytes, tx.proofs[4], protector4))
95
+
        let pKey5Signed = if (isDefined(getInteger(extract(pAddress5), toBase58String(tx.id))))
71
96
 
            then 1
72
97
 
            else 0
73
-
        (((((p0signed + p1signed) + p2signed) + p3signed) + p4signed) >= 3)
98
+
        (((((pKey1Signed + pKey2Signed) + pKey3Signed) + pKey4Signed) + pKey5Signed) >= 3)
74
99
 
    case tx: LeaseTransaction => 
75
100
 
        false
76
101
 
    case tx: SponsorFeeTransaction => 
77
102
 
        false
78
103
 
    case tx: MassTransferTransaction => 
79
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
+
        }
80
125
 
    case _ => 
81
126
 
        sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)
82
127
 
}
Full: 
Old
New
Differences
1
-
{-# STDLIB_VERSION 2 #-}
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'
11
-
let ver = "1.0.3"
15
+
let ver = "2.0.0-account"
12
16
 
match tx {
13
17
 
    case o: Order => 
14
18
 
        if (sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey))
15
-
            then (o.matcherPublicKey == base58'E3UwaHCQCySghK3zwNB8EDHoc3b8uhzGPFz3gHmWon4W')
19
+
            then (o.matcherPublicKey == matcherPublicKey)
16
20
 
            else false
17
21
 
    case tx: TransferTransaction => 
18
22
 
        if (!(sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)))
19
23
 
            then throw("Transaction must be signed by owner")
20
24
 
            else {
21
-
                let userState = getInteger(extract(WhitelistAddr), toBase58String(tx.sender.bytes))
25
+
                let userState = getInteger(extract(whitelistAddress), toBase58String(tx.sender.bytes))
22
26
 
                if (!(isDefined(userState)))
23
27
 
                    then throw("Address not in whitelist")
24
28
 
                    else if ((userState != validState))
25
29
 
                        then throw("User not in valid state")
26
30
 
                        else if (!(isDefined(tx.assetId)))
27
31
 
                            then {
28
32
 
                                let key = (toBase58String(tx.sender.bytes) + "_WAVES")
29
-
                                let minAmount = getInteger(extract(WhitelistAddr), key)
33
+
                                let minAmount = getInteger(extract(whitelistAddress), key)
30
34
 
                                if (isDefined(minAmount))
31
35
 
                                    then {
32
36
 
                                        let curBalance = wavesBalance(extract(tx.sender))
33
37
 
                                        if ((extract(minAmount) > (curBalance - tx.amount)))
34
38
 
                                            then throw("Unable to send such amount (type=2)")
35
39
 
                                            else true
36
40
 
                                        }
37
41
 
                                    else {
38
42
 
                                        let keyOverall = "res_WAVES"
39
-
                                        let minAmountOverall = getInteger(extract(WhitelistAddr), keyOverall)
43
+
                                        let minAmountOverall = getInteger(extract(whitelistAddress), keyOverall)
40
44
 
                                        if (isDefined(minAmountOverall))
41
45
 
                                            then {
42
46
 
                                                let curBalance = wavesBalance(extract(tx.sender))
43
47
 
                                                if ((extract(minAmountOverall) > (curBalance - tx.amount)))
44
48
 
                                                    then throw("Unable to send such amount (type=1)")
45
49
 
                                                    else true
46
50
 
                                                }
47
51
 
                                            else true
48
52
 
                                        }
49
53
 
                                }
50
-
                            else {
51
-
                                let TGATEId = base58'J6spRevsYuwKEHgzyPfojvdBPq67C8yvErr6e9ny8Jom'
52
-
                                if ((tx.assetId == TGATEId))
53
-
                                    then (tx.recipient == GatewayAddr)
54
-
                                    else true
55
-
                                }
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
+
                                    }
56
81
 
                }
57
82
 
    case tx: SetScriptTransaction => 
58
-
        let p0signed = if (sigVerify(tx.bodyBytes, tx.proofs[0], protector0))
83
+
        let pKey1Signed = if (isDefined(getInteger(extract(pAddress1), toBase58String(tx.id))))
59
84
 
            then 1
60
85
 
            else 0
61
-
        let p1signed = if (sigVerify(tx.bodyBytes, tx.proofs[1], protector1))
86
+
        let pKey2Signed = if (isDefined(getInteger(extract(pAddress2), toBase58String(tx.id))))
62
87
 
            then 1
63
88
 
            else 0
64
-
        let p2signed = if (sigVerify(tx.bodyBytes, tx.proofs[2], protector2))
89
+
        let pKey3Signed = if (isDefined(getInteger(extract(pAddress3), toBase58String(tx.id))))
65
90
 
            then 1
66
91
 
            else 0
67
-
        let p3signed = if (sigVerify(tx.bodyBytes, tx.proofs[3], protector3))
92
+
        let pKey4Signed = if (isDefined(getInteger(extract(pAddress4), toBase58String(tx.id))))
68
93
 
            then 1
69
94
 
            else 0
70
-
        let p4signed = if (sigVerify(tx.bodyBytes, tx.proofs[4], protector4))
95
+
        let pKey5Signed = if (isDefined(getInteger(extract(pAddress5), toBase58String(tx.id))))
71
96
 
            then 1
72
97
 
            else 0
73
-
        (((((p0signed + p1signed) + p2signed) + p3signed) + p4signed) >= 3)
98
+
        (((((pKey1Signed + pKey2Signed) + pKey3Signed) + pKey4Signed) + pKey5Signed) >= 3)
74
99
 
    case tx: LeaseTransaction => 
75
100
 
        false
76
101
 
    case tx: SponsorFeeTransaction => 
77
102
 
        false
78
103
 
    case tx: MassTransferTransaction => 
79
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
+
        }
80
125
 
    case _ => 
81
126
 
        sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)
82
127
 
}

github/deemru/w8io/3ef1775 
89.67 ms ◑