tx · 47qw89nafuoj7ZUXCZezfGbc1oGYmmnuw4pMZL3BjssC

3PALtWBkUP7Wg2mRCyW9u3Cf34ATC7XeEud:  -0.01400000 Waves

2020.04.02 15:36 [1999783] smart account 3PALtWBkUP7Wg2mRCyW9u3Cf34ATC7XeEud > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "47qw89nafuoj7ZUXCZezfGbc1oGYmmnuw4pMZL3BjssC",
    "fee": 1400000,
    "feeAssetId": null,
    "timestamp": 1585831003007,
    "version": 1,
    "sender": "3PALtWBkUP7Wg2mRCyW9u3Cf34ATC7XeEud",
    "senderPublicKey": "EcJEh4k1HSFdGmum1fpS7iPt3vus37RN4nhhJzwnDRbZ",
    "proofs": [
        "4u9KvQm9HV7oQXvyfyxrp5ruWYRuZEm7zkBVxUJ9xj6jzCTdyvgm2jnizk3JXc3Knsmm4crizsQhortZH76MFC7F"
    ],
    "script": "base64:AAIDAAAAAAAAABcIARIJCgcICAgICAgBEgASABIECgIBCAAAABUAAAAAD21ha2VyQWRkcmVzc0tleQIAAAAMbWFrZXJBZGRyZXNzAAAAABBvcmFjbGVBZGRyZXNzS2V5AgAAAA1vcmFjbGVBZGRyZXNzAAAAAAxtYWluVG9rZW5LZXkCAAAACW1haW5Ub2tlbgAAAAARc3RhcnREZWNsaW5pbmdLZXkCAAAADnN0YXJ0RGVjbGluaW5nAAAAAA1pbmNyZWFzaW5nS2V5AgAAAAppbmNyZWFzaW5nAAAAAAl3aW5uZXJLZXkCAAAABndpbm5lcgAAAAALbGVzc1RoYW5LZXkCAAAACGxlc3NUaGFuAAAAAAtzZXF1ZW5jZUtleQIAAAAIc2VxdWVuY2UAAAAACnRpbWVvdXRLZXkCAAAADHRpbWVvdXRMYWJlbAAAAAAPcmVkZWVtSGVpZ2h0S2V5AgAAAAxyZWRlZW1IZWlnaHQAAAAACW1haW5Ub2tlbgkBAAAAE3ZhbHVlT3JFcnJvck1lc3NhZ2UAAAACCQAEHQAAAAIFAAAABHRoaXMFAAAADG1haW5Ub2tlbktleQIAAAAabWFpblRva2VuIG5vdCBpbml0aXRhbGl6ZWQAAAAADG1ha2VyQWRkcmVzcwkBAAAAE3ZhbHVlT3JFcnJvck1lc3NhZ2UAAAACCQAEHQAAAAIFAAAABHRoaXMFAAAAD21ha2VyQWRkcmVzc0tleQIAAAAVbWFrZXIgbm90IGluaXRpYWxpemVkAAAAAA1vcmFjbGVBZGRyZXNzCQEAAAATdmFsdWVPckVycm9yTWVzc2FnZQAAAAIJAAQdAAAAAgUAAAAEdGhpcwUAAAAQb3JhY2xlQWRkcmVzc0tleQIAAAAWb3JhY2xlIG5vdCBpbml0aWFsaXplZAAAAAAOc3RhcnREZWNsaW5pbmcJAQAAABN2YWx1ZU9yRXJyb3JNZXNzYWdlAAAAAgkABB0AAAACBQAAAAR0aGlzBQAAABFzdGFydERlY2xpbmluZ0tleQIAAAAfc3RhcnREZWNsaW5pbmcgbm90IGluaXRpdGFsaXplZAAAAAAKaW5jcmVhc2luZwkBAAAAE3ZhbHVlT3JFcnJvck1lc3NhZ2UAAAACCQAEHQAAAAIFAAAABHRoaXMFAAAADWluY3JlYXNpbmdLZXkCAAAAG2luY3JlYXNpbmcgbm90IGluaXRpdGFsaXplZAAAAAAMcmVkZWVtSGVpZ2h0CQEAAAATdmFsdWVPckVycm9yTWVzc2FnZQAAAAIJAAQaAAAAAgUAAAAEdGhpcwUAAAAPcmVkZWVtSGVpZ2h0S2V5AgAAABlyZWRlZW0gaGVpZ2h0IG5vdCBkZWZpbmVkAAAAAAZ3aW5uZXIJAAQdAAAAAgUAAAAEdGhpcwUAAAAJd2lubmVyS2V5AAAAAAhsZXNzVGhhbgkBAAAAE3ZhbHVlT3JFcnJvck1lc3NhZ2UAAAACCQAEGgAAAAIFAAAABHRoaXMFAAAAC2xlc3NUaGFuS2V5AgAAABFtaW4gZG9lc24ndCBleGlzdAAAAAAIc2VxdWVuY2UJAQAAABN2YWx1ZU9yRXJyb3JNZXNzYWdlAAAAAgkABB0AAAACBQAAAAR0aGlzBQAAAAtzZXF1ZW5jZUtleQIAAAAWc2VxdWVuY2UgZG9lc24ndCBleGlzdAAAAAAMdGltZW91dExhYmVsCQEAAAATdmFsdWVPckVycm9yTWVzc2FnZQAAAAIJAAQdAAAAAgUAAAAEdGhpcwUAAAAKdGltZW91dEtleQIAAAARbm8gZXhwaXJhdGlvbiBzZXQAAAAAEHNlcXVlbmNlU3BsaXR0ZXICAAAAAXwAAAAEAAAAAWkBAAAABGluaXQAAAAHAAAABW1ha2VyAAAACW1haW5Ub2tlbgAAAA5zdGFydERlY2xpbmluZwAAAAppbmNyZWFzaW5nAAAAB3RpbWVvdXQAAAAGb3JhY2xlAAAADmlnbm9yZUxlc3NUaGFuAwkBAAAAAiE9AAAAAggFAAAAAWkAAAAGY2FsbGVyBQAAAAR0aGlzCQAAAgAAAAECAAAAGW9ubHkgZGFwcCBpdHNlbGYgY2FuIGluaXQDCQEAAAAJaXNEZWZpbmVkAAAAAQkABB0AAAACBQAAAAR0aGlzBQAAAA9tYWtlckFkZHJlc3NLZXkJAAACAAAAAQIAAAATYWxyZWFkeSBpbml0aWFsaXplZAkBAAAACFdyaXRlU2V0AAAAAQkABEwAAAACCQEAAAAJRGF0YUVudHJ5AAAAAgUAAAAPbWFrZXJBZGRyZXNzS2V5BQAAAAVtYWtlcgkABEwAAAACCQEAAAAJRGF0YUVudHJ5AAAAAgUA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",
    "chainId": 87,
    "height": 1999783,
    "spentComplexity": 0
}

View: original | compacted
Prev: BQskYrqAFnbuNPnPTyHrtdQkvwTqKfNVrgupDTEruuQY
Next: none

Diff: 
Old
New
Differences
19
19
 
20
20
 
let timeoutKey = "timeoutLabel"
21
21
 
22
+
let redeemHeightKey = "redeemHeight"
23
+
22
24
 
let mainToken = valueOrErrorMessage(getString(this, mainTokenKey), "mainToken not inititalized")
23
25
 
24
26
 
let makerAddress = valueOrErrorMessage(getString(this, makerAddressKey), "maker not initialized")
28
30
 
let startDeclining = valueOrErrorMessage(getString(this, startDecliningKey), "startDeclining not inititalized")
29
31
 
30
32
 
let increasing = valueOrErrorMessage(getString(this, increasingKey), "increasing not inititalized")
33
+
34
+
let redeemHeight = valueOrErrorMessage(getInteger(this, redeemHeightKey), "redeem height not defined")
31
35
 
32
36
 
let winner = getString(this, winnerKey)
33
37
 
69
73
 
70
74
 
71
75
 
@Callable(i)
72
-
func redeem () = match winner {
73
-
    case s: String => 
74
-
        let message = (("payment in " + s) + " must be attached")
75
-
        let tkn = (s == toBase58String(valueOrErrorMessage(valueOrErrorMessage(i.payment, message).assetId, message)))
76
-
        let amt = valueOrErrorMessage(i.payment, message).amount
77
-
        if (tkn)
78
-
            then TransferSet([ScriptTransfer(i.caller, amt, fromBase58String(mainToken))])
79
-
            else throw(message)
80
-
    case _ => 
81
-
        throw("not defined yet")
82
-
}
76
+
func redeem () = if ((redeemHeight > height))
77
+
    then throw(("redeem starts after block " + toString(redeemHeight)))
78
+
    else     match winner {
79
+
        case s: String => 
80
+
            let message = (("payment in " + s) + " must be attached")
81
+
            let tkn = (s == toBase58String(valueOrErrorMessage(valueOrErrorMessage(i.payment, message).assetId, message)))
82
+
            let amt = valueOrErrorMessage(i.payment, message).amount
83
+
            if (tkn)
84
+
                then TransferSet([ScriptTransfer(i.caller, amt, fromBase58String(mainToken))])
85
+
                else throw(message)
86
+
        case _ => 
87
+
            throw("not defined yet")
88
+
    }
83
89
 
84
90
 
85
91
 
87
93
 
func registerItem (newEntry,label) = {
88
94
 
    func detectDecline () =     {
89
95
 
        let data = split(sequence, sequenceSplitter)
90
-
        if (if ((lessThan > newEntry))
91
-
            then true
92
-
            else (14 > size(data)))
96
+
        if ((14 > size(data)))
93
97
 
            then false
94
98
 
            else {
95
99
 
                let today = newEntry
96
-
                let weekBefore = parseIntValue(data[6])
97
-
                let twoWeeksBefore = parseIntValue(data[13])
98
-
                ((weekBefore - twoWeeksBefore) > (today - weekBefore))
100
+
                if ((parseIntValue(data[0]) > today))
101
+
                    then throw("bad value: new entry value less than yesterday's")
102
+
                    else {
103
+
                        let weekBefore = parseIntValue(data[6])
104
+
                        let twoWeeksBefore = parseIntValue(data[13])
105
+
                        ((weekBefore - twoWeeksBefore) > (today - weekBefore))
106
+
                        }
99
107
 
                }
100
108
 
        }
101
109
 
102
110
 
    if ((toBase58String(i.caller.bytes) != oracleAddress))
103
111
 
        then throw("only oracle can do")
104
-
        else if (isDefined(winner))
112
+
        else if (if (isDefined(winner))
113
+
            then (value(winner) != "")
114
+
            else false)
105
115
 
            then throw("winner already defined")
106
116
 
            else if (isDefined(getInteger(this, label)))
107
117
 
                then throw(("already registered for " + label))
109
119
 
                    let timeout = (label == timeoutLabel)
110
120
 
                    let decline = detectDecline()
111
121
 
                    let items = [DataEntry(sequenceKey, ((toString(newEntry) + sequenceSplitter) + sequence)), DataEntry(label, newEntry)]
122
+
                    let heightEntry = DataEntry(redeemHeightKey, (height + 1440))
112
123
 
                    WriteSet(if (decline)
113
-
                        then DataEntry(winnerKey, startDeclining) :: items
124
+
                        then [DataEntry(winnerKey, startDeclining), heightEntry] :: items
114
125
 
                        else if (timeout)
115
-
                            then DataEntry(winnerKey, increasing) :: items
126
+
                            then [DataEntry(winnerKey, increasing), heightEntry] :: items
116
127
 
                            else items)
117
128
 
                    }
118
129
 
    }
Full: 
Old
New
Differences
1
1
 
{-# STDLIB_VERSION 3 #-}
2
2
 
{-# SCRIPT_TYPE ACCOUNT #-}
3
3
 
{-# CONTENT_TYPE DAPP #-}
4
4
 
let makerAddressKey = "makerAddress"
5
5
 
6
6
 
let oracleAddressKey = "oracleAddress"
7
7
 
8
8
 
let mainTokenKey = "mainToken"
9
9
 
10
10
 
let startDecliningKey = "startDeclining"
11
11
 
12
12
 
let increasingKey = "increasing"
13
13
 
14
14
 
let winnerKey = "winner"
15
15
 
16
16
 
let lessThanKey = "lessThan"
17
17
 
18
18
 
let sequenceKey = "sequence"
19
19
 
20
20
 
let timeoutKey = "timeoutLabel"
21
21
 
22
+
let redeemHeightKey = "redeemHeight"
23
+
22
24
 
let mainToken = valueOrErrorMessage(getString(this, mainTokenKey), "mainToken not inititalized")
23
25
 
24
26
 
let makerAddress = valueOrErrorMessage(getString(this, makerAddressKey), "maker not initialized")
25
27
 
26
28
 
let oracleAddress = valueOrErrorMessage(getString(this, oracleAddressKey), "oracle not initialized")
27
29
 
28
30
 
let startDeclining = valueOrErrorMessage(getString(this, startDecliningKey), "startDeclining not inititalized")
29
31
 
30
32
 
let increasing = valueOrErrorMessage(getString(this, increasingKey), "increasing not inititalized")
33
+
34
+
let redeemHeight = valueOrErrorMessage(getInteger(this, redeemHeightKey), "redeem height not defined")
31
35
 
32
36
 
let winner = getString(this, winnerKey)
33
37
 
34
38
 
let lessThan = valueOrErrorMessage(getInteger(this, lessThanKey), "min doesn't exist")
35
39
 
36
40
 
let sequence = valueOrErrorMessage(getString(this, sequenceKey), "sequence doesn't exist")
37
41
 
38
42
 
let timeoutLabel = valueOrErrorMessage(getString(this, timeoutKey), "no expiration set")
39
43
 
40
44
 
let sequenceSplitter = "|"
41
45
 
42
46
 
@Callable(i)
43
47
 
func init (maker,mainToken,startDeclining,increasing,timeout,oracle,ignoreLessThan) = if ((i.caller != this))
44
48
 
    then throw("only dapp itself can init")
45
49
 
    else if (isDefined(getString(this, makerAddressKey)))
46
50
 
        then throw("already initialized")
47
51
 
        else WriteSet([DataEntry(makerAddressKey, maker), DataEntry(oracleAddressKey, oracle), DataEntry(startDecliningKey, startDeclining), DataEntry(increasingKey, increasing), DataEntry(mainTokenKey, mainToken), DataEntry(sequenceKey, "0"), DataEntry(timeoutKey, timeout), DataEntry(lessThanKey, ignoreLessThan)])
48
52
 
49
53
 
50
54
 
51
55
 
@Callable(i)
52
56
 
func issue () = if ((toBase58String(i.caller.bytes) != makerAddress))
53
57
 
    then throw("only maker can do")
54
58
 
    else     match i.payment {
55
59
 
        case a: AttachedPayment => 
56
60
 
            let amount =             match a.assetId {
57
61
 
                case b: ByteVector => 
58
62
 
                    if ((toBase58String(b) != mainToken))
59
63
 
                        then throw(("main token not supplied, expecting " + mainToken))
60
64
 
                        else a.amount
61
65
 
                case _ => 
62
66
 
                    throw("main token not supplied")
63
67
 
            }
64
68
 
            TransferSet([ScriptTransfer(i.caller, amount, fromBase58String(startDeclining)), ScriptTransfer(i.caller, amount, fromBase58String(increasing))])
65
69
 
        case _ => 
66
70
 
            throw("payment in maintoken must be attached")
67
71
 
    }
68
72
 
69
73
 
70
74
 
71
75
 
@Callable(i)
72
-
func redeem () = match winner {
73
-
    case s: String => 
74
-
        let message = (("payment in " + s) + " must be attached")
75
-
        let tkn = (s == toBase58String(valueOrErrorMessage(valueOrErrorMessage(i.payment, message).assetId, message)))
76
-
        let amt = valueOrErrorMessage(i.payment, message).amount
77
-
        if (tkn)
78
-
            then TransferSet([ScriptTransfer(i.caller, amt, fromBase58String(mainToken))])
79
-
            else throw(message)
80
-
    case _ => 
81
-
        throw("not defined yet")
82
-
}
76
+
func redeem () = if ((redeemHeight > height))
77
+
    then throw(("redeem starts after block " + toString(redeemHeight)))
78
+
    else     match winner {
79
+
        case s: String => 
80
+
            let message = (("payment in " + s) + " must be attached")
81
+
            let tkn = (s == toBase58String(valueOrErrorMessage(valueOrErrorMessage(i.payment, message).assetId, message)))
82
+
            let amt = valueOrErrorMessage(i.payment, message).amount
83
+
            if (tkn)
84
+
                then TransferSet([ScriptTransfer(i.caller, amt, fromBase58String(mainToken))])
85
+
                else throw(message)
86
+
        case _ => 
87
+
            throw("not defined yet")
88
+
    }
83
89
 
84
90
 
85
91
 
86
92
 
@Callable(i)
87
93
 
func registerItem (newEntry,label) = {
88
94
 
    func detectDecline () =     {
89
95
 
        let data = split(sequence, sequenceSplitter)
90
-
        if (if ((lessThan > newEntry))
91
-
            then true
92
-
            else (14 > size(data)))
96
+
        if ((14 > size(data)))
93
97
 
            then false
94
98
 
            else {
95
99
 
                let today = newEntry
96
-
                let weekBefore = parseIntValue(data[6])
97
-
                let twoWeeksBefore = parseIntValue(data[13])
98
-
                ((weekBefore - twoWeeksBefore) > (today - weekBefore))
100
+
                if ((parseIntValue(data[0]) > today))
101
+
                    then throw("bad value: new entry value less than yesterday's")
102
+
                    else {
103
+
                        let weekBefore = parseIntValue(data[6])
104
+
                        let twoWeeksBefore = parseIntValue(data[13])
105
+
                        ((weekBefore - twoWeeksBefore) > (today - weekBefore))
106
+
                        }
99
107
 
                }
100
108
 
        }
101
109
 
102
110
 
    if ((toBase58String(i.caller.bytes) != oracleAddress))
103
111
 
        then throw("only oracle can do")
104
-
        else if (isDefined(winner))
112
+
        else if (if (isDefined(winner))
113
+
            then (value(winner) != "")
114
+
            else false)
105
115
 
            then throw("winner already defined")
106
116
 
            else if (isDefined(getInteger(this, label)))
107
117
 
                then throw(("already registered for " + label))
108
118
 
                else {
109
119
 
                    let timeout = (label == timeoutLabel)
110
120
 
                    let decline = detectDecline()
111
121
 
                    let items = [DataEntry(sequenceKey, ((toString(newEntry) + sequenceSplitter) + sequence)), DataEntry(label, newEntry)]
122
+
                    let heightEntry = DataEntry(redeemHeightKey, (height + 1440))
112
123
 
                    WriteSet(if (decline)
113
-
                        then DataEntry(winnerKey, startDeclining) :: items
124
+
                        then [DataEntry(winnerKey, startDeclining), heightEntry] :: items
114
125
 
                        else if (timeout)
115
-
                            then DataEntry(winnerKey, increasing) :: items
126
+
                            then [DataEntry(winnerKey, increasing), heightEntry] :: items
116
127
 
                            else items)
117
128
 
                    }
118
129
 
    }
119
130
 
120
131
 

github/deemru/w8io/873ac7e 
63.42 ms ◑