tx · rk5yywP3cG2ajhpvgn4AWPtmW1bGdqP9qVA4Mj9YuwC

3MpdFd8mFewyMMJob54svBAVfYurNQgLut5:  -0.01400000 Waves

2020.08.10 16:47 [1126480] smart account 3MpdFd8mFewyMMJob54svBAVfYurNQgLut5 > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "rk5yywP3cG2ajhpvgn4AWPtmW1bGdqP9qVA4Mj9YuwC",
    "fee": 1400000,
    "feeAssetId": null,
    "timestamp": 1597067220457,
    "version": 1,
    "sender": "3MpdFd8mFewyMMJob54svBAVfYurNQgLut5",
    "senderPublicKey": "EeR3yFBaxZF3ZQRmQuR7SseMUKFcwTJjMBE7U5s87Xp7",
    "proofs": [
        "52BrWbQNJUtrcqdLj2VDKdADfsNHSgPEyZc2eaV7jHRe5NZMAxmTyF6M5iZcrT7UhRkN9dTXsq2bvaWCNU8orHcq",
        "2qeSeMHcNirWpz8XZ3XDNY4s1vfwtXPxgCVmFAxuLN32mBdvfbenextoTLpnwU85cmfdgpt9QPEYxEAQwrxbi9SS",
        "5ZNdVjVppL44cpfvn2HebfvQa2a7nGGsjmdfkc5iAzzzEnuoWMWP7Kv23xS4bA1efR7CFngk4eTg7DLQFHHSJkUc"
    ],
    "script": "base64:AwQAAAALYWRkcmVzc0Jvb2sJAQAAAAdBZGRyZXNzAAAAAQEAAAAaAVRWgdR5NBM7vuJoxo7QLI34uXJ2wFdvAd4EAAAAE3doaXRlbGlzdEFkZHJlc3NLZXkCAAAAEHdoaXRlbGlzdEFkZHJlc3MEAAAAF2RBcHBXaGl0ZWxpc3RBZGRyZXNzS2V5AgAAABRkQXBwV2hpdGVsaXN0QWRkcmVzcwQAAAARbWF0Y2hlckFkZHJlc3NLZXkCAAAADm1hdGNoZXJBZGRyZXNzBAAAABFnYXRld2F5QWRkcmVzc0tleQIAAAAOZ2F0ZXdheUFkZHJlc3MEAAAAFmdhdGV3YXlDb250cm9sQXNzZXRLZXkCAAAAE2dhdGV3YXlDb250cm9sQXNzZXQEAAAACnZhbGlkU3RhdGUAAAAAAAAAA+gEAAAAA3ZlcgIAAAAFNS4wLjQKAQAAABJnZXRBZGRyZXNzRnJvbUJvb2sAAAABAAAAA2tleQQAAAAHJG1hdGNoMAkABB0AAAACBQAAAAthZGRyZXNzQm9vawUAAAADa2V5AwkAAAEAAAACBQAAAAckbWF0Y2gwAgAAAAZTdHJpbmcEAAAAAWEFAAAAByRtYXRjaDAJAQAAAAdBZGRyZXNzAAAAAQkAAlkAAAABBQAAAAFhCQAAAgAAAAECAAAABm5vIGtleQoBAAAAF2dldEFzc2V0RnJvbUFkZHJlc3NCb29rAAAAAAQAAAAHJG1hdGNoMAkABB0AAAACCQEAAAAHZXh0cmFjdAAAAAEFAAAAC2FkZHJlc3NCb29rBQAAABZnYXRld2F5Q29udHJvbEFzc2V0S2V5AwkAAAEAAAACBQAAAAckbWF0Y2gwAgAAAAZTdHJpbmcEAAAAAWEFAAAAByRtYXRjaDAJAAGbAAAAAQUAAAABYQkAAAIAAAABAgAAAAZubyBrZXkEAAAAByRtYXRjaDAFAAAAAnR4AwkAAAEAAAACBQAAAAckbWF0Y2gwAgAAAAVPcmRlcgQAAAABbwUAAAAHJG1hdGNoMAMJAAH0AAAAAwgFAAAAAnR4AAAACWJvZHlCeXRlcwkAAZEAAAACCAUAAAACdHgAAAAGcHJvb2ZzAAAAAAAAAAAACAUAAAACdHgAAAAPc2VuZGVyUHVibGljS2V5CQAAAAAAAAIJAQAAABRhZGRyZXNzRnJvbVB1YmxpY0tleQAAAAEIBQAAAAFvAAAAEG1hdGNoZXJQdWJsaWNLZXkJAQAAABJnZXRBZGRyZXNzRnJvbUJvb2sAAAABBQAAABFtYXRjaGVyQWRkcmVzc0tleQcDCQAAAQAAAAIFAAAAByRtYXRjaDACAAAAE1RyYW5zZmVyVHJhbnNhY3Rpb24EAAAAAnR4BQAAAAckbWF0Y2gwAwkBAAAAASEAAAABCQAB9AAAAAMIBQAAAAJ0eAAAAAlib2R5Qnl0ZXMJAAGRAAAAAggFAAAAAnR4AAAABnByb29mcwAAAAAAAAAAAAgFAAAAAnR4AAAAD3NlbmRlclB1YmxpY0tleQkAAAIAAAABAgAAACNUcmFuc2FjdGlvbiBtdXN0IGJlIHNpZ25lZCBieSBvd25lcgQAAAAJdXNlclN0YXRlCQAEGgAAAAIJAQAAABJnZXRBZGRyZXNzRnJvbUJvb2sAAAABBQAAABN3aGl0ZWxpc3RBZGRyZXNzS2V5CQACWAAAAAEICAUAAAACdHgAAAAGc2VuZGVyAAAABWJ5dGVzAwkBAAAAASEAAAABCQEAAAAJaXNEZWZpbmVkAAAAAQUAAAAJdXNlclN0YXRlCQAAAgAAAAECAAAAGEFkZHJlc3Mgbm90IGluIHdoaXRlbGlzdAMJAQAAAAIhPQAAAAIFAAAACXVzZXJTdGF0ZQUAAAAKdmFsaWRTdGF0ZQkAAAIAAAABAgAAABdVc2VyIG5vdCBpbiB2YWxpZCBzdGF0ZQMJAQAAAAEhAAAAAQkBAAAACWlzRGVmaW5lZAAAAAEIBQAAAAJ0eAAAAAdhc3NldElkBAAAAANrZXkJAAEsAAAAAgkAAlgAAAABCAgFAAAAAnR4AAAABnNlbmRlcgAAAAVieXRlcwIAAAAGX1dBVkVTBAAAAAltaW5BbW91bnQJAAQaAAAAAgkBAAAAEmdldEFkZHJlc3NGcm9tQm9vawAAAAEFAAAAE3doaXRlbGlzdEFkZHJlc3NLZXkFAAAAA2tleQMJAQAAAAlpc0RlZmluZWQAAAABBQAAAAltaW5BbW91bnQEAAAACmN1ckJhbGFuY2UJAQAAAAx3YXZlc0JhbGFuY2UAAAABCQEAAAAHZXh0cmFjdAAAAAEIBQAAAAJ0eAAAAAZzZW5kZXIDCQAAZgAAAAIJAQAAAAdleHRyYWN0AAAAAQUAAAAJbWluQW1vdW50CQAAZQAAAAIFAAAACmN1ckJhbGFuY2UIBQAAAAJ0eAAAAAZhbW91bnQJAAACAAAAAQIAAAAjVW5hYmxlIHRvIHNlbmQgc3VjaCBhbW91bnQgKHR5cGU9MikGBAAAAAprZXlPdmVyYWxsAgAAAAlyZXNfV0FWRVMEAAAAEG1pbkFtb3VudE92ZXJhbGwJAAQaAAAAAgkBAAAAEmdldEFkZHJlc3NGcm9tQm9vawAAAAEFAAAAE3doaXRlbGlzdEFkZHJlc3NLZXkFAAAACmtleU92ZXJhbGwDCQEAAAAJaXNEZWZpbmVkAAAAAQUAAAAQbWluQW1vdW50T3ZlcmFsbAQAAAAKY3VyQmFsYW5jZQkBAAAADHdhdmVzQmFsYW5jZQAAAAEJAQAAAAdleHRyYWN0AAAAAQgFAAAAAnR4AAAABnNlbmRlcgMJAABmAAAAAgkBAAAAB2V4dHJhY3QAAAABBQAAABBtaW5BbW91bnRPdmVyYWxsCQAAZQAAAAIFAAAACmN1ckJhbGFuY2UIBQAAAAJ0eAAAAAZhbW91bnQJAAACAAAAAQIAAAAjVW5hYmxlIHRvIHNlbmQgc3VjaCBhbW91bnQgKHR5cGU9MSkGBgMJAAAAAAAAAggFAAAAAnR4AAAAB2Fzc2V0SWQJAQAAABdnZXRBc3NldEZyb21BZGRyZXNzQm9vawAAAAAJAAAAAAAAAggFAAAAAnR4AAAACXJlY2lwaWVudAkBAAAAEmdldEFkZHJlc3NGcm9tQm9vawAAAAEFAAAAEWdhdGV3YXlBZGRyZXNzS2V5BAAAAAp3aGl0ZTFMaXN0CQACWAAAAAEICAUAAAACdHgAAAAGc2VuZGVyAAAABWJ5dGVzBAAAAAhhc3NldFR4dAkAAlgAAAABCQEAAAAHZXh0cmFjdAAAAAEIBQAAAAJ0eAAAAAdhc3NldElkBAAAAA93aGl0ZTFMaXN0QXNzZXQJAAEsAAAAAgkAASwAAAACBQAAAAp3aGl0ZTFMaXN0AgAAAAFfBQAAAAhhc3NldFR4dAQAAAARd2hpdGUxTGlzdE92ZXJhbGwJAAEsAAAAAgIAAAAEcmVzXwUAAAAIYXNzZXRUeHQEAAAAFHdoaXRlMUxpc3RBc3NldEVudHJ5CQAEGgAAAAIJAQAAABJnZXRBZGRyZXNzRnJvbUJvb2sAAAABBQAAABN3aGl0ZWxpc3RBZGRyZXNzS2V5BQAAAA93aGl0ZTFMaXN0QXNzZXQDCQEAAAABIQAAAAEJAQAAAAlpc0RlZmluZWQAAAABBQAAABR3aGl0ZTFMaXN0QXNzZXRFbnRyeQQAAAAWd2hpdGUxTGlzdE92ZXJhbGxFbnRyeQkABBoAAAACCQEAAAASZ2V0QWRkcmVzc0Zyb21Cb29rAAAAAQUAAAATd2hpdGVsaXN0QWRkcmVzc0tleQUAAAARd2hpdGUxTGlzdE92ZXJhbGwDCQEAAAABIQAAAAEJAQAAAAlpc0RlZmluZWQAAAABBQAAABZ3aGl0ZTFMaXN0T3ZlcmFsbEVudHJ5BgQAAAALY3VyMUJhbGFuY2UJAAPrAAAAAggFAAAAAnR4AAAABnNlbmRlcggFAAAAAnR4AAAAB2Fzc2V0SWQDCQAAZgAAAAIJAQAAAAdleHRyYWN0AAAAAQUAAAAWd2hpdGUxTGlzdE92ZXJhbGxFbnRyeQkAAGUAAAACBQAAAAtjdXIxQmFsYW5jZQgFAAAAAnR4AAAABmFtb3VudAkAAAIAAAABAgAAACNVbmFibGUgdG8gc2VuZCBzdWNoIGFtb3VudCAodHlwZT0xKQYEAAAAC2N1cjFCYWxhbmNlCQAD6wAAAAIIBQAAAAJ0eAAAAAZzZW5kZXIIBQAAAAJ0eAAAAAdhc3NldElkAwkAAGYAAAACCQEAAAAHZXh0cmFjdAAAAAEFAAAAFHdoaXRlMUxpc3RBc3NldEVudHJ5CQAAZQAAAAIFAAAAC2N1cjFCYWxhbmNlCAUAAAACdHgAAAAGYW1vdW50CQAAAgAAAAECAAAAI1VuYWJsZSB0byBzZW5kIHN1Y2ggYW1vdW50ICh0eXBlPTIpBgMJAAABAAAAAgUAAAAHJG1hdGNoMAIAAAAUU2V0U2NyaXB0VHJhbnNhY3Rpb24EAAAAAnR4BQAAAAckbWF0Y2gwBAAAAAR0eElkCQACWAAAAAEIBQAAAAJ0eAAAAAJpZAQAAAAJcEFkZHJlc3MxCQEAAAASZ2V0QWRkcmVzc0Zyb21Cb29rAAAAAQIAAAAJcEFkZHJlc3MxBAAAAAlwQWRkcmVzczIJAQAAABJnZXRBZGRyZXNzRnJvbUJvb2sAAAABAgAAAAlwQWRkcmVzczIEAAAA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",
    "chainId": 84,
    "height": 1126480,
    "spentComplexity": 0
}

View: original | compacted
Prev: Ea3kgKDbzXtHhCYaZsMqmkGupPM9JnSk3sjmZFVyo28c
Next: none

Diff: 
Old
New
Differences
1
1
 
{-# STDLIB_VERSION 3 #-}
2
2
 
{-# CONTENT_TYPE EXPRESSION #-}
3
-
let matcherAddress = addressFromString("3Ms8fSfAxBLDjKvNVgACRzQoBLCtCWxtawu")
4
-
let matcherPublicKey = base58'6d1nbhBxLCxjUyL9xXcX2VVxj2kcKiYny7VqH4FwbApv'
5
-
let gatewayAddress = addressFromString("3Mrhtzv9KEtjx4mG47oxgjahHKW33oTntEV")
6
-
let whitelistAddress = addressFromString("3N6DwWxT82nGJUwBwd7L514r2u71gr7WhwJ")
7
-
let dAppWhitelistAddress = Address(base58'3N1SPvLZgv6FMfe5WNUtnPzt3okYxcJhYnR')
8
-
let gatewayControlAssetAddress = base58'3w8UGTKzu3YvwRrvWeDuXkUVxdg1RuX1VCy6QRw86Fw4'
9
-
let pAddress1 = addressFromString("3NCVDaT1ASbRd42hBSw4EG6ojGVRGtvMiz1")
10
-
let pAddress2 = addressFromString("3Ms2kTAxdrcXDxwedfbNjSi6ewGCUqt3heZ")
11
-
let pAddress3 = addressFromString("3N6ognm7xnQSFiownS1Df1LacJUQXvfDFLe")
12
-
let pAddress4 = addressFromString("3MtVCmN9MZbWf9qxiMFoEPBrdc2fLp3SvuC")
13
-
let pAddress5 = addressFromString("3MuWG8gsTK4RQBsm97sMCuUXW99JvRxwYSg")
3
+
let addressBook = Address(base58'3MwoVRAPfC2NKuuYJKHVAVtUFhq8MyTEfQh')
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-testnet"
10
+
let ver = "5.0.4"
11
+
func getAddressFromBook (key) = match getString(addressBook, key) {
12
+
    case a: String => 
13
+
        Address(fromBase58String(a))
14
+
    case _ => 
15
+
        throw("no key")
16
+
}
17
+
18
+
func getAssetFromAddressBook () = match getString(extract(addressBook), gatewayControlAssetKey) {
19
+
    case a: String => 
20
+
        toBytes(a)
21
+
    case _ => 
22
+
        throw("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 == 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
32
 
            then throw("Transaction must be signed by owner")
24
33
 
            else {
25
-
                let userState = getInteger(extract(whitelistAddress), toBase58String(tx.sender.bytes))
34
+
                let userState = getInteger(getAddressFromBook(whitelistAddressKey), toBase58String(tx.sender.bytes))
26
35
 
                if (!(isDefined(userState)))
27
36
 
                    then throw("Address not in whitelist")
28
37
 
                    else if ((userState != validState))
30
39
 
                        else if (!(isDefined(tx.assetId)))
31
40
 
                            then {
32
41
 
                                let key = (toBase58String(tx.sender.bytes) + "_WAVES")
33
-
                                let minAmount = getInteger(extract(whitelistAddress), key)
42
+
                                let minAmount = getInteger(getAddressFromBook(whitelistAddressKey), key)
34
43
 
                                if (isDefined(minAmount))
35
44
 
                                    then {
36
45
 
                                        let curBalance = wavesBalance(extract(tx.sender))
40
49
 
                                        }
41
50
 
                                    else {
42
51
 
                                        let keyOverall = "res_WAVES"
43
-
                                        let minAmountOverall = getInteger(extract(whitelistAddress), keyOverall)
52
+
                                        let minAmountOverall = getInteger(getAddressFromBook(whitelistAddressKey), keyOverall)
44
53
 
                                        if (isDefined(minAmountOverall))
45
54
 
                                            then {
46
55
 
                                                let curBalance = wavesBalance(extract(tx.sender))
51
60
 
                                            else true
52
61
 
                                        }
53
62
 
                                }
54
-
                            else if ((tx.assetId == gatewayControlAssetAddress))
55
-
                                then (tx.recipient == gatewayAddress)
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(extract(whitelistAddress), white1ListAsset)
70
+
                                    let white1ListAssetEntry = getInteger(getAddressFromBook(whitelistAddressKey), white1ListAsset)
62
71
 
                                    if (!(isDefined(white1ListAssetEntry)))
63
72
 
                                        then {
64
-
                                            let white1ListOverallEntry = getInteger(extract(whitelistAddress), white1ListOverall)
73
+
                                            let white1ListOverallEntry = getInteger(getAddressFromBook(whitelistAddressKey), white1ListOverall)
65
74
 
                                            if (!(isDefined(white1ListOverallEntry)))
66
75
 
                                                then true
67
76
 
                                                else {
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(extract(pAddress2), toBase58String(tx.id))))
104
+
        let pKey2Signed = if (isDefined(getInteger(pAddress2, txId)))
87
105
 
            then 1
88
106
 
            else 0
89
-
        let pKey3Signed = if (isDefined(getInteger(extract(pAddress3), toBase58String(tx.id))))
107
+
        let pKey3Signed = if (isDefined(getInteger(pAddress3, txId)))
90
108
 
            then 1
91
109
 
            else 0
92
-
        let pKey4Signed = if (isDefined(getInteger(extract(pAddress4), toBase58String(tx.id))))
110
+
        let pKey4Signed = if (isDefined(getInteger(pAddress4, txId)))
93
111
 
            then 1
94
112
 
            else 0
95
-
        let pKey5Signed = if (isDefined(getInteger(extract(pAddress5), toBase58String(tx.id))))
113
+
        let pKey5Signed = if (isDefined(getInteger(pAddress5, txId)))
96
114
 
            then 1
97
115
 
            else 0
98
-
        (((((pKey1Signed + pKey2Signed) + pKey3Signed) + pKey4Signed) + pKey5Signed) >= 3)
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)
99
126
 
    case tx: LeaseTransaction => 
100
127
 
        false
101
128
 
    case tx: SponsorFeeTransaction => 
113
140
 
    case tx: InvokeScriptTransaction => 
114
141
 
        match tx.payment {
115
142
 
            case a: AttachedPayment => 
116
-
                match getInteger(dAppWhitelistAddress, toBase58String(addressFromRecipient(tx.dApp).bytes)) {
143
+
                match getInteger(getAddressFromBook(dAppWhitelistAddressKey), toBase58String(addressFromRecipient(tx.dApp).bytes)) {
117
144
 
                    case unused: Int => 
118
145
 
                        true
119
146
 
                    case _ => 
Full: 
Old
New
Differences
1
1
 
{-# STDLIB_VERSION 3 #-}
2
2
 
{-# CONTENT_TYPE EXPRESSION #-}
3
-
let matcherAddress = addressFromString("3Ms8fSfAxBLDjKvNVgACRzQoBLCtCWxtawu")
4
-
let matcherPublicKey = base58'6d1nbhBxLCxjUyL9xXcX2VVxj2kcKiYny7VqH4FwbApv'
5
-
let gatewayAddress = addressFromString("3Mrhtzv9KEtjx4mG47oxgjahHKW33oTntEV")
6
-
let whitelistAddress = addressFromString("3N6DwWxT82nGJUwBwd7L514r2u71gr7WhwJ")
7
-
let dAppWhitelistAddress = Address(base58'3N1SPvLZgv6FMfe5WNUtnPzt3okYxcJhYnR')
8
-
let gatewayControlAssetAddress = base58'3w8UGTKzu3YvwRrvWeDuXkUVxdg1RuX1VCy6QRw86Fw4'
9
-
let pAddress1 = addressFromString("3NCVDaT1ASbRd42hBSw4EG6ojGVRGtvMiz1")
10
-
let pAddress2 = addressFromString("3Ms2kTAxdrcXDxwedfbNjSi6ewGCUqt3heZ")
11
-
let pAddress3 = addressFromString("3N6ognm7xnQSFiownS1Df1LacJUQXvfDFLe")
12
-
let pAddress4 = addressFromString("3MtVCmN9MZbWf9qxiMFoEPBrdc2fLp3SvuC")
13
-
let pAddress5 = addressFromString("3MuWG8gsTK4RQBsm97sMCuUXW99JvRxwYSg")
3
+
let addressBook = Address(base58'3MwoVRAPfC2NKuuYJKHVAVtUFhq8MyTEfQh')
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-testnet"
10
+
let ver = "5.0.4"
11
+
func getAddressFromBook (key) = match getString(addressBook, key) {
12
+
    case a: String => 
13
+
        Address(fromBase58String(a))
14
+
    case _ => 
15
+
        throw("no key")
16
+
}
17
+
18
+
func getAssetFromAddressBook () = match getString(extract(addressBook), gatewayControlAssetKey) {
19
+
    case a: String => 
20
+
        toBytes(a)
21
+
    case _ => 
22
+
        throw("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 == 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
32
 
            then throw("Transaction must be signed by owner")
24
33
 
            else {
25
-
                let userState = getInteger(extract(whitelistAddress), toBase58String(tx.sender.bytes))
34
+
                let userState = getInteger(getAddressFromBook(whitelistAddressKey), toBase58String(tx.sender.bytes))
26
35
 
                if (!(isDefined(userState)))
27
36
 
                    then throw("Address not in whitelist")
28
37
 
                    else if ((userState != validState))
29
38
 
                        then throw("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(extract(whitelistAddress), key)
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
47
 
                                            then throw("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(extract(whitelistAddress), keyOverall)
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
57
 
                                                    then throw("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 == gatewayControlAssetAddress))
55
-
                                then (tx.recipient == gatewayAddress)
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(extract(whitelistAddress), white1ListAsset)
70
+
                                    let white1ListAssetEntry = getInteger(getAddressFromBook(whitelistAddressKey), white1ListAsset)
62
71
 
                                    if (!(isDefined(white1ListAssetEntry)))
63
72
 
                                        then {
64
-
                                            let white1ListOverallEntry = getInteger(extract(whitelistAddress), white1ListOverall)
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
79
 
                                                        then throw("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
86
 
                                                then throw("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(extract(pAddress2), toBase58String(tx.id))))
104
+
        let pKey2Signed = if (isDefined(getInteger(pAddress2, txId)))
87
105
 
            then 1
88
106
 
            else 0
89
-
        let pKey3Signed = if (isDefined(getInteger(extract(pAddress3), toBase58String(tx.id))))
107
+
        let pKey3Signed = if (isDefined(getInteger(pAddress3, txId)))
90
108
 
            then 1
91
109
 
            else 0
92
-
        let pKey4Signed = if (isDefined(getInteger(extract(pAddress4), toBase58String(tx.id))))
110
+
        let pKey4Signed = if (isDefined(getInteger(pAddress4, txId)))
93
111
 
            then 1
94
112
 
            else 0
95
-
        let pKey5Signed = if (isDefined(getInteger(extract(pAddress5), toBase58String(tx.id))))
113
+
        let pKey5Signed = if (isDefined(getInteger(pAddress5, txId)))
96
114
 
            then 1
97
115
 
            else 0
98
-
        (((((pKey1Signed + pKey2Signed) + pKey3Signed) + pKey4Signed) + pKey5Signed) >= 3)
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)
99
126
 
    case tx: LeaseTransaction => 
100
127
 
        false
101
128
 
    case tx: SponsorFeeTransaction => 
102
129
 
        false
103
130
 
    case tx: MassTransferTransaction => 
104
131
 
        false
105
132
 
    case tx: IssueTransaction => 
106
133
 
        false
107
134
 
    case tx: ReissueTransaction => 
108
135
 
        false
109
136
 
    case tx: BurnTransaction => 
110
137
 
        false
111
138
 
    case tx: ExchangeTransaction => 
112
139
 
        false
113
140
 
    case tx: InvokeScriptTransaction => 
114
141
 
        match tx.payment {
115
142
 
            case a: AttachedPayment => 
116
-
                match getInteger(dAppWhitelistAddress, toBase58String(addressFromRecipient(tx.dApp).bytes)) {
143
+
                match getInteger(getAddressFromBook(dAppWhitelistAddressKey), toBase58String(addressFromRecipient(tx.dApp).bytes)) {
117
144
 
                    case unused: Int => 
118
145
 
                        true
119
146
 
                    case _ => 
120
147
 
                        false
121
148
 
                }
122
149
 
            case _ => 
123
150
 
                true
124
151
 
        }
125
152
 
    case _ => 
126
153
 
        sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)
127
154
 
}

github/deemru/w8io/026f985 
46.04 ms ◑