tx · H3UofYNkUJ8D63DUTZuGKak9KpzMzCkeqazg2xhaNKhL

3N9b7vExDf2qqZt2xG9FUsca7iwLVuih1Ta:  -0.01000000 Waves

2023.12.02 23:40 [2869514] smart account 3N9b7vExDf2qqZt2xG9FUsca7iwLVuih1Ta > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "H3UofYNkUJ8D63DUTZuGKak9KpzMzCkeqazg2xhaNKhL",
    "fee": 1000000,
    "feeAssetId": null,
    "timestamp": 1701549670682,
    "version": 2,
    "chainId": 84,
    "sender": "3N9b7vExDf2qqZt2xG9FUsca7iwLVuih1Ta",
    "senderPublicKey": "4rSYGN3SSXzknh6jLyLqqGdGor584DXdjdP2BAbz7kgt",
    "proofs": [
        "4BBj5HShwuQR67ho37BmTtunwf5UNbACsoGJg9Adq6hD1BhE1ou1t9WmXgQAGkydHedGYF4SSeJUP9NBsVC2MTSk"
    ],
    "script": "base64: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",
    "height": 2869514,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: Ach4bwBsL6XXVp42LMqZTrHReaC6ZLX2T2ct9qLyWRc
Next: F9aNEkQxcrYLxtMGTZ6zrL1Qys4mC7oPdV14yoVoPSwZ

Diff: 
Old
New
Differences
21
21
 
func keyOrderId (orderId,caller) = ((("%s%s__orderId__" + orderId) + "__") + caller)
22
22
 
23
23
 
24
-
func keyServiceFee (orderId) = ("%s%s__serviceFee__" + orderId)
24
+
func keyServiceFee (assetId) = ("%s%s__serviceFee__" + assetId)
25
25
 
26
26
 
27
27
 
func getAmount (amount) = amount
37
37
 
    else fromBase58String(assetIdStr)
38
38
 
39
39
 
40
-
func checkAsset (assetId) = {
40
+
func isValidAsset (assetId) = {
41
41
 
    let asset = fromStr(assetId)
42
42
 
    if (if ((asset != unit))
43
43
 
        then (assetInfo(value(asset)) == unit)
44
44
 
        else false)
45
-
        then throw("Invalid assetId: assetInfo missing")
46
-
        else toStr(asset)
45
+
        then false
46
+
        else true
47
47
 
    }
48
48
 
49
49
 
50
50
 
@Callable(i)
51
-
func escrow (orderId,amount,assetId,developerFee) = if (isDefined(getString(this, keyOrderId(orderId, toString(i.caller)))))
52
-
    then throw("Order with this id already exists.")
53
-
    else if ((0 >= amount))
54
-
        then throw("Non-positive order amount")
55
-
        else {
56
-
            let orderAmount = (amount - developerFee)
57
-
[StringEntry(keyOrderId(orderId, toString(i.caller)), orderId), IntegerEntry(keyServiceFee(orderId), developerFee), IntegerEntry(keyAmount(orderId), orderAmount), StringEntry(keyAssetId(orderId), assetId)]
58
-
            }
51
+
func escrow (orderId,amount,assetId,developerFee) = if (!(isValidAsset(assetId)))
52
+
    then throw("Invalid assetId")
53
+
    else if (isDefined(getString(this, keyOrderId(orderId, toString(i.caller)))))
54
+
        then throw("Order with this id already exists.")
55
+
        else if ((0 >= amount))
56
+
            then throw("Non-positive order amount")
57
+
            else {
58
+
                let orderAmount = (amount - developerFee)
59
+
                if (isDefined(getInteger(this, keyServiceFee(assetId))))
60
+
                    then {
61
+
                        let fee = (getIntegerValue(keyServiceFee(assetId)) + developerFee)
62
+
[StringEntry(keyOrderId(orderId, toString(i.caller)), orderId), DeleteEntry(keyServiceFee(assetId)), IntegerEntry(keyServiceFee(assetId), fee), IntegerEntry(keyAmount(orderId), orderAmount), StringEntry(keyAssetId(orderId), assetId)]
63
+
                        }
64
+
                    else [StringEntry(keyOrderId(orderId, toString(i.caller)), orderId), IntegerEntry(keyServiceFee(assetId), developerFee), IntegerEntry(keyAmount(orderId), orderAmount), StringEntry(keyAssetId(orderId), assetId)]
65
+
                }
59
66
 
60
67
 
61
68
 
62
69
 
@Callable(i)
63
-
func deal (orderId,address,amount,minAmount) = if (!(isDefined(getString(this, keyOrderId(orderId, toString(i.caller))))))
70
+
func deal (orderId,address,amount,developerFee,minAmount) = if (!(isDefined(getString(this, keyOrderId(orderId, toString(i.caller))))))
64
71
 
    then throw("Order not found.")
65
72
 
    else if ((amount > getIntegerValue(keyAmount(orderId))))
66
73
 
        then throw("The transaction cannot be executed because the seller does not have enough funds")
69
76
 
            let assetIdKey = keyAssetId(orderId)
70
77
 
            let assetIdRaw = getString(this, assetIdKey)
71
78
 
            let assetIdStr = value(assetIdRaw)
79
+
            let fee = (getIntegerValue(keyServiceFee(assetIdStr)) + developerFee)
72
80
 
            if ((minAmount > restAmount))
73
-
                then [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), ScriptTransfer(i.caller, restAmount, fromStr(assetIdStr)), ScriptTransfer(developer, getIntegerValue(keyServiceFee(orderId)), fromStr(assetIdStr)), DeleteEntry(keyServiceFee(orderId)), DeleteEntry(keyAmount(orderId)), DeleteEntry(keyOrderId(orderId, toString(i.caller))), DeleteEntry(keyAssetId(orderId))]
74
-
                else [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), DeleteEntry(keyAmount(orderId)), IntegerEntry(keyAmount(orderId), restAmount)]
81
+
                then [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), ScriptTransfer(i.caller, restAmount, fromStr(assetIdStr)), DeleteEntry(keyServiceFee(assetIdStr)), IntegerEntry(keyServiceFee(assetIdStr), fee), DeleteEntry(keyAmount(orderId)), DeleteEntry(keyOrderId(orderId, toString(i.caller))), DeleteEntry(keyAssetId(orderId))]
82
+
                else [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), DeleteEntry(keyServiceFee(assetIdStr)), IntegerEntry(keyServiceFee(assetIdStr), fee), DeleteEntry(keyAmount(orderId)), IntegerEntry(keyAmount(orderId), restAmount)]
75
83
 
            }
76
84
 
77
85
 
84
92
 
        let assetIdKey = keyAssetId(orderId)
85
93
 
        let assetIdRaw = getString(this, assetIdKey)
86
94
 
        let assetIdStr = value(assetIdRaw)
87
-
[ScriptTransfer(i.caller, restAmount, fromStr(assetIdStr)), ScriptTransfer(developer, getIntegerValue(keyServiceFee(orderId)), fromStr(assetIdStr)), DeleteEntry(keyServiceFee(orderId)), DeleteEntry(keyAmount(orderId)), DeleteEntry(keyOrderId(orderId, toString(i.caller))), DeleteEntry(keyAssetId(orderId))]
95
+
[ScriptTransfer(i.caller, restAmount, fromStr(assetIdStr)), ScriptTransfer(developer, getIntegerValue(keyServiceFee(orderId)), fromStr(assetIdStr)), DeleteEntry(keyAmount(orderId)), DeleteEntry(keyOrderId(orderId, toString(i.caller))), DeleteEntry(keyAssetId(orderId))]
88
96
 
        }
97
+
98
+
99
+
100
+
@Callable(i)
101
+
func serviceFee (assetId) = if (!(isValidAsset(assetId)))
102
+
    then throw("Invalid assetId")
103
+
    else if ((i.caller != developer))
104
+
        then throw("Invalid caller")
105
+
        else [ScriptTransfer(i.caller, getIntegerValue(keyServiceFee(assetId)), fromStr(assetId))]
89
106
 
90
107
 

Full: 
Old
New
Differences
1
1
 
{-# STDLIB_VERSION 5 #-}
2
2
 
{-# SCRIPT_TYPE ACCOUNT #-}
3
3
 
{-# CONTENT_TYPE DAPP #-}
4
4
 
let developer = addressFromStringValue("3Mp6TThvbb8z9npqz4AK3ByqAbvs7dYS8uR")
5
5
 
6
6
 
func keyPartner (address) = ("%s%s__partner__" + address)
7
7
 
8
8
 
9
9
 
func keyWantedAssetId (address) = ("%s%s__wantedAssetId__" + address)
10
10
 
11
11
 
12
12
 
func keyWantedAmount (address) = ("%s%s__wantedAmount__" + address)
13
13
 
14
14
 
15
15
 
func keyAssetId (orderId) = ("%s%s__assetId__" + orderId)
16
16
 
17
17
 
18
18
 
func keyAmount (orderId) = ("%s%s__amount__" + orderId)
19
19
 
20
20
 
21
21
 
func keyOrderId (orderId,caller) = ((("%s%s__orderId__" + orderId) + "__") + caller)
22
22
 
23
23
 
24
-
func keyServiceFee (orderId) = ("%s%s__serviceFee__" + orderId)
24
+
func keyServiceFee (assetId) = ("%s%s__serviceFee__" + assetId)
25
25
 
26
26
 
27
27
 
func getAmount (amount) = amount
28
28
 
29
29
 
30
30
 
func toStr (assetId) = if ((assetId == unit))
31
31
 
    then "WAVES"
32
32
 
    else toBase58String(value(assetId))
33
33
 
34
34
 
35
35
 
func fromStr (assetIdStr) = if ((assetIdStr == "WAVES"))
36
36
 
    then unit
37
37
 
    else fromBase58String(assetIdStr)
38
38
 
39
39
 
40
-
func checkAsset (assetId) = {
40
+
func isValidAsset (assetId) = {
41
41
 
    let asset = fromStr(assetId)
42
42
 
    if (if ((asset != unit))
43
43
 
        then (assetInfo(value(asset)) == unit)
44
44
 
        else false)
45
-
        then throw("Invalid assetId: assetInfo missing")
46
-
        else toStr(asset)
45
+
        then false
46
+
        else true
47
47
 
    }
48
48
 
49
49
 
50
50
 
@Callable(i)
51
-
func escrow (orderId,amount,assetId,developerFee) = if (isDefined(getString(this, keyOrderId(orderId, toString(i.caller)))))
52
-
    then throw("Order with this id already exists.")
53
-
    else if ((0 >= amount))
54
-
        then throw("Non-positive order amount")
55
-
        else {
56
-
            let orderAmount = (amount - developerFee)
57
-
[StringEntry(keyOrderId(orderId, toString(i.caller)), orderId), IntegerEntry(keyServiceFee(orderId), developerFee), IntegerEntry(keyAmount(orderId), orderAmount), StringEntry(keyAssetId(orderId), assetId)]
58
-
            }
51
+
func escrow (orderId,amount,assetId,developerFee) = if (!(isValidAsset(assetId)))
52
+
    then throw("Invalid assetId")
53
+
    else if (isDefined(getString(this, keyOrderId(orderId, toString(i.caller)))))
54
+
        then throw("Order with this id already exists.")
55
+
        else if ((0 >= amount))
56
+
            then throw("Non-positive order amount")
57
+
            else {
58
+
                let orderAmount = (amount - developerFee)
59
+
                if (isDefined(getInteger(this, keyServiceFee(assetId))))
60
+
                    then {
61
+
                        let fee = (getIntegerValue(keyServiceFee(assetId)) + developerFee)
62
+
[StringEntry(keyOrderId(orderId, toString(i.caller)), orderId), DeleteEntry(keyServiceFee(assetId)), IntegerEntry(keyServiceFee(assetId), fee), IntegerEntry(keyAmount(orderId), orderAmount), StringEntry(keyAssetId(orderId), assetId)]
63
+
                        }
64
+
                    else [StringEntry(keyOrderId(orderId, toString(i.caller)), orderId), IntegerEntry(keyServiceFee(assetId), developerFee), IntegerEntry(keyAmount(orderId), orderAmount), StringEntry(keyAssetId(orderId), assetId)]
65
+
                }
59
66
 
60
67
 
61
68
 
62
69
 
@Callable(i)
63
-
func deal (orderId,address,amount,minAmount) = if (!(isDefined(getString(this, keyOrderId(orderId, toString(i.caller))))))
70
+
func deal (orderId,address,amount,developerFee,minAmount) = if (!(isDefined(getString(this, keyOrderId(orderId, toString(i.caller))))))
64
71
 
    then throw("Order not found.")
65
72
 
    else if ((amount > getIntegerValue(keyAmount(orderId))))
66
73
 
        then throw("The transaction cannot be executed because the seller does not have enough funds")
67
74
 
        else {
68
75
 
            let restAmount = (getIntegerValue(keyAmount(orderId)) - amount)
69
76
 
            let assetIdKey = keyAssetId(orderId)
70
77
 
            let assetIdRaw = getString(this, assetIdKey)
71
78
 
            let assetIdStr = value(assetIdRaw)
79
+
            let fee = (getIntegerValue(keyServiceFee(assetIdStr)) + developerFee)
72
80
 
            if ((minAmount > restAmount))
73
-
                then [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), ScriptTransfer(i.caller, restAmount, fromStr(assetIdStr)), ScriptTransfer(developer, getIntegerValue(keyServiceFee(orderId)), fromStr(assetIdStr)), DeleteEntry(keyServiceFee(orderId)), DeleteEntry(keyAmount(orderId)), DeleteEntry(keyOrderId(orderId, toString(i.caller))), DeleteEntry(keyAssetId(orderId))]
74
-
                else [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), DeleteEntry(keyAmount(orderId)), IntegerEntry(keyAmount(orderId), restAmount)]
81
+
                then [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), ScriptTransfer(i.caller, restAmount, fromStr(assetIdStr)), DeleteEntry(keyServiceFee(assetIdStr)), IntegerEntry(keyServiceFee(assetIdStr), fee), DeleteEntry(keyAmount(orderId)), DeleteEntry(keyOrderId(orderId, toString(i.caller))), DeleteEntry(keyAssetId(orderId))]
82
+
                else [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), DeleteEntry(keyServiceFee(assetIdStr)), IntegerEntry(keyServiceFee(assetIdStr), fee), DeleteEntry(keyAmount(orderId)), IntegerEntry(keyAmount(orderId), restAmount)]
75
83
 
            }
76
84
 
77
85
 
78
86
 
79
87
 
@Callable(i)
80
88
 
func cancel (orderId) = if (!(isDefined(getString(this, keyOrderId(orderId, toString(i.caller))))))
81
89
 
    then throw(("You don't have an active order with this id: " + orderId))
82
90
 
    else {
83
91
 
        let restAmount = getIntegerValue(keyAmount(orderId))
84
92
 
        let assetIdKey = keyAssetId(orderId)
85
93
 
        let assetIdRaw = getString(this, assetIdKey)
86
94
 
        let assetIdStr = value(assetIdRaw)
87
-
[ScriptTransfer(i.caller, restAmount, fromStr(assetIdStr)), ScriptTransfer(developer, getIntegerValue(keyServiceFee(orderId)), fromStr(assetIdStr)), DeleteEntry(keyServiceFee(orderId)), DeleteEntry(keyAmount(orderId)), DeleteEntry(keyOrderId(orderId, toString(i.caller))), DeleteEntry(keyAssetId(orderId))]
95
+
[ScriptTransfer(i.caller, restAmount, fromStr(assetIdStr)), ScriptTransfer(developer, getIntegerValue(keyServiceFee(orderId)), fromStr(assetIdStr)), DeleteEntry(keyAmount(orderId)), DeleteEntry(keyOrderId(orderId, toString(i.caller))), DeleteEntry(keyAssetId(orderId))]
88
96
 
        }
97
+
98
+
99
+
100
+
@Callable(i)
101
+
func serviceFee (assetId) = if (!(isValidAsset(assetId)))
102
+
    then throw("Invalid assetId")
103
+
    else if ((i.caller != developer))
104
+
        then throw("Invalid caller")
105
+
        else [ScriptTransfer(i.caller, getIntegerValue(keyServiceFee(assetId)), fromStr(assetId))]
89
106
 
90
107
 

github/deemru/w8io/169f3d6 
301.77 ms ◑