2023.02.01 17:44 [3496243] smart account 3PLPCb3wF2H2gtzohoAjeWcGaMKEiJvtE5X > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "Hbe6zv4ojt75cQqpiJjxLavBZVPXjhyFJYf9AjbD2r7c",
    "fee": 1000000,
    "feeAssetId": null,
    "timestamp": 1675262744393,
    "version": 2,
    "chainId": 87,
    "sender": "3PLPCb3wF2H2gtzohoAjeWcGaMKEiJvtE5X",
    "senderPublicKey": "7or3jPDGBqg4WDqCuftD79WiF7FqgpMTqKdQ8HoMh7Wj",
    "proofs": [
        "ahLbDYGscWVbfZATDLPBC3pBj6GHmauL1PwmSfAAJV1WbT3jS6tw8XdUhZjUuNsQBrbUaWXu4GRVmSwEvBZqq6X"
    ],
    "script": "base64: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",
    "height": 3496243,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: B9RtGXJGD35cUAG5o2dc79dzZPKwMRq3F2tmZdatV34F
Next: 8GAuU3uS6wbJdp54imzRXGg2kb9E9uaobHbKkTLYTRdi

Diff: 
Old
New
Differences
43
43
 
44
44
 
45
45
 
@Callable(i)
46
-
func exchangeAndSendTo (asset1IdStr,recipient) = {
46
+
func exchangeThenTransfer (asset1IdStr,recipient,minToReceive) = {
47
47
 
    let request = toBase58String(i.transactionId)
48
-
[StringEntry((request + "_sendTo"), recipient), StringEntry((request + "_status"), "open"), StringEntry(("awaits_" + request), ((((getAssetString(i.payments[0].assetId) + ",") + toString(i.payments[0].amount)) + ",") + asset1IdStr))]
48
+
[StringEntry((request + "_sendTo"), recipient), StringEntry((request + "_status"), "open"), IntegerEntry((request + "_minToReceive"), minToReceive), StringEntry(("awaits_" + request), ((((getAssetString(i.payments[0].assetId) + ",") + toString(i.payments[0].amount)) + ",") + asset1IdStr))]
49
+
    }
50
+
51
+
52
+
53
+
@Callable(i)
54
+
func exchangeThenInvoke (asset1IdStr,dApp,function,args,minToReceive) = {
55
+
    let request = toBase58String(i.transactionId)
56
+
[StringEntry((request + "_dApp"), dApp), StringEntry((request + "_function"), function), StringEntry((request + "_args"), makeString(args, "|||")), StringEntry((request + "_status"), "open"), IntegerEntry((request + "_minToReceive"), minToReceive), StringEntry(("awaits_" + request), ((((getAssetString(i.payments[0].assetId) + ",") + toString(i.payments[0].amount)) + ",") + asset1IdStr))]
49
57
 
    }
50
58
 
51
59
 
54
62
 
func cancelExchange (request) = {
55
63
 
    let canCancel = (tryGetString((request + "_sendTo")) == toString(i.caller))
56
64
 
    if (canCancel)
57
-
        then [DeleteEntry((request + "_sendTo")), DeleteEntry((request + "_status")), DeleteEntry(("awaits_" + request))]
65
+
        then [DeleteEntry((request + "_sendTo")), DeleteEntry((request + "_status")), DeleteEntry(("awaits_" + request)), DeleteEntry((request + "_dApp")), DeleteEntry((request + "_function")), DeleteEntry((request + "_args"))]
58
66
 
        else throw("only request owner can use this method")
59
67
 
    }
60
68
 
75
83
 
                        then {
76
84
 
                            let amount1 = (getBalance(getAssetBytes(swapData[2])) - balanceBefore)
77
85
 
                            if ((amount1 == amount1))
78
-
                                then {
79
-
                                    let sendAction = if ((addressFromString(tryGetString((request + "_sendTo"))) != unit))
80
-
                                        then [ScriptTransfer(addressFromStringValue(tryGetString((request + "_sendTo"))), amount1, getAssetBytes(swapData[2]))]
81
-
                                        else nil
82
-
                                    ([DeleteEntry((request + "_status")), DeleteEntry((request + "_sendTo")), DeleteEntry(("awaits_" + request))] ++ sendAction)
83
-
                                    }
86
+
                                then if ((tryGetInteger((request + "_minToReceive")) > amount1))
87
+
                                    then throw("amount to receive is too small")
88
+
                                    else {
89
+
                                        let sendAction = if ((addressFromString(tryGetString((request + "_sendTo"))) != unit))
90
+
                                            then [DeleteEntry((request + "_sendTo")), ScriptTransfer(addressFromStringValue(tryGetString((request + "_sendTo"))), amount1, getAssetBytes(swapData[2]))]
91
+
                                            else {
92
+
                                                let inv2 = invoke(addressFromStringValue(tryGetString((request + "_dApp"))), tryGetString((request + "_function")), split(tryGetString((request + "_args")), "|||"), [AttachedPayment(getAssetBytes(swapData[2]), amount1)])
93
+
                                                if ((inv2 == inv2))
94
+
                                                    then [DeleteEntry((request + "_dApp")), DeleteEntry((request + "_function")), DeleteEntry((request + "_args"))]
95
+
                                                    else throw("Strict value is not equal to itself.")
96
+
                                                }
97
+
                                        ([DeleteEntry((request + "_status")), DeleteEntry(("awaits_" + request))] ++ sendAction)
98
+
                                        }
84
99
 
                                else throw("Strict value is not equal to itself.")
85
100
 
                            }
86
101
 
                        else throw("Strict value is not equal to itself.")
Full: 
Old
New
Differences
1
1
 
{-# STDLIB_VERSION 5 #-}
2
2
 
{-# SCRIPT_TYPE ACCOUNT #-}
3
3
 
{-# CONTENT_TYPE DAPP #-}
4
4
 
let aggregatorAddress = Address(base58'3PGFHzVGT4NTigwCKP1NcwoXkodVZwvBuuU')
5
5
 
6
6
 
let whitelist = [Address(base58'3PBTPFGaKL7qEdj9Tz1QUqbvJUcPNu934j4')]
7
7
 
8
8
 
func tryGetInteger (key) = match getInteger(this, key) {
9
9
 
    case b: Int => 
10
10
 
        b
11
11
 
    case _ => 
12
12
 
        0
13
13
 
}
14
14
 
15
15
 
16
16
 
func tryGetString (key) = match getString(this, key) {
17
17
 
    case b: String => 
18
18
 
        b
19
19
 
    case _ => 
20
20
 
        ""
21
21
 
}
22
22
 
23
23
 
24
24
 
func getAssetString (assetId) = match assetId {
25
25
 
    case b: ByteVector => 
26
26
 
        toBase58String(b)
27
27
 
    case _ => 
28
28
 
        "WAVES"
29
29
 
}
30
30
 
31
31
 
32
32
 
func getAssetBytes (assetIdStr) = if ((assetIdStr == "WAVES"))
33
33
 
    then unit
34
34
 
    else fromBase58String(assetIdStr)
35
35
 
36
36
 
37
37
 
func getBalance (assetId) = match assetId {
38
38
 
    case x: Unit => 
39
39
 
        wavesBalance(this).available
40
40
 
    case _ => 
41
41
 
        assetBalance(this, value(assetId))
42
42
 
}
43
43
 
44
44
 
45
45
 
@Callable(i)
46
-
func exchangeAndSendTo (asset1IdStr,recipient) = {
46
+
func exchangeThenTransfer (asset1IdStr,recipient,minToReceive) = {
47
47
 
    let request = toBase58String(i.transactionId)
48
-
[StringEntry((request + "_sendTo"), recipient), StringEntry((request + "_status"), "open"), StringEntry(("awaits_" + request), ((((getAssetString(i.payments[0].assetId) + ",") + toString(i.payments[0].amount)) + ",") + asset1IdStr))]
48
+
[StringEntry((request + "_sendTo"), recipient), StringEntry((request + "_status"), "open"), IntegerEntry((request + "_minToReceive"), minToReceive), StringEntry(("awaits_" + request), ((((getAssetString(i.payments[0].assetId) + ",") + toString(i.payments[0].amount)) + ",") + asset1IdStr))]
49
+
    }
50
+
51
+
52
+
53
+
@Callable(i)
54
+
func exchangeThenInvoke (asset1IdStr,dApp,function,args,minToReceive) = {
55
+
    let request = toBase58String(i.transactionId)
56
+
[StringEntry((request + "_dApp"), dApp), StringEntry((request + "_function"), function), StringEntry((request + "_args"), makeString(args, "|||")), StringEntry((request + "_status"), "open"), IntegerEntry((request + "_minToReceive"), minToReceive), StringEntry(("awaits_" + request), ((((getAssetString(i.payments[0].assetId) + ",") + toString(i.payments[0].amount)) + ",") + asset1IdStr))]
49
57
 
    }
50
58
 
51
59
 
52
60
 
53
61
 
@Callable(i)
54
62
 
func cancelExchange (request) = {
55
63
 
    let canCancel = (tryGetString((request + "_sendTo")) == toString(i.caller))
56
64
 
    if (canCancel)
57
-
        then [DeleteEntry((request + "_sendTo")), DeleteEntry((request + "_status")), DeleteEntry(("awaits_" + request))]
65
+
        then [DeleteEntry((request + "_sendTo")), DeleteEntry((request + "_status")), DeleteEntry(("awaits_" + request)), DeleteEntry((request + "_dApp")), DeleteEntry((request + "_function")), DeleteEntry((request + "_args"))]
58
66
 
        else throw("only request owner can use this method")
59
67
 
    }
60
68
 
61
69
 
62
70
 
63
71
 
@Callable(i)
64
72
 
func puzzleSwap (request,routeStr) = if ((indexOf(whitelist, i.caller) == unit))
65
73
 
    then throw("whitelist only")
66
74
 
    else if ((tryGetString((request + "_status")) != "open"))
67
75
 
        then throw("operation is not possible")
68
76
 
        else {
69
77
 
            let swapData = split(tryGetString(("awaits_" + request)), ",")
70
78
 
            let balanceBefore = getBalance(getAssetBytes(swapData[2]))
71
79
 
            if ((balanceBefore == balanceBefore))
72
80
 
                then {
73
81
 
                    let inv = invoke(aggregatorAddress, "swap", [routeStr, 0], [AttachedPayment(getAssetBytes(swapData[0]), parseIntValue(swapData[1]))])
74
82
 
                    if ((inv == inv))
75
83
 
                        then {
76
84
 
                            let amount1 = (getBalance(getAssetBytes(swapData[2])) - balanceBefore)
77
85
 
                            if ((amount1 == amount1))
78
-
                                then {
79
-
                                    let sendAction = if ((addressFromString(tryGetString((request + "_sendTo"))) != unit))
80
-
                                        then [ScriptTransfer(addressFromStringValue(tryGetString((request + "_sendTo"))), amount1, getAssetBytes(swapData[2]))]
81
-
                                        else nil
82
-
                                    ([DeleteEntry((request + "_status")), DeleteEntry((request + "_sendTo")), DeleteEntry(("awaits_" + request))] ++ sendAction)
83
-
                                    }
86
+
                                then if ((tryGetInteger((request + "_minToReceive")) > amount1))
87
+
                                    then throw("amount to receive is too small")
88
+
                                    else {
89
+
                                        let sendAction = if ((addressFromString(tryGetString((request + "_sendTo"))) != unit))
90
+
                                            then [DeleteEntry((request + "_sendTo")), ScriptTransfer(addressFromStringValue(tryGetString((request + "_sendTo"))), amount1, getAssetBytes(swapData[2]))]
91
+
                                            else {
92
+
                                                let inv2 = invoke(addressFromStringValue(tryGetString((request + "_dApp"))), tryGetString((request + "_function")), split(tryGetString((request + "_args")), "|||"), [AttachedPayment(getAssetBytes(swapData[2]), amount1)])
93
+
                                                if ((inv2 == inv2))
94
+
                                                    then [DeleteEntry((request + "_dApp")), DeleteEntry((request + "_function")), DeleteEntry((request + "_args"))]
95
+
                                                    else throw("Strict value is not equal to itself.")
96
+
                                                }
97
+
                                        ([DeleteEntry((request + "_status")), DeleteEntry(("awaits_" + request))] ++ sendAction)
98
+
                                        }
84
99
 
                                else throw("Strict value is not equal to itself.")
85
100
 
                            }
86
101
 
                        else throw("Strict value is not equal to itself.")
87
102
 
                    }
88
103
 
                else throw("Strict value is not equal to itself.")
89
104
 
            }
90
105
 
91
106
 
92
107
 
@Verifier(tx)
93
108
 
func verify () = sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)
94
109
 

github/deemru/w8io/786bc32 
28.17 ms ◑