tx · 684Jd7wUnqqTo5wKTkMtaRD7MH8ywJuPvpkJrMW9RGVL 3Mv3BEQ8WS2wzrEXuSfxDm7U9UKb5qLSnUc: -0.01400000 Waves 2019.08.10 17:39 [625058] smart account 3Mv3BEQ8WS2wzrEXuSfxDm7U9UKb5qLSnUc > SELF 0.00000000 Waves
{ "type": 13, "id": "684Jd7wUnqqTo5wKTkMtaRD7MH8ywJuPvpkJrMW9RGVL", "fee": 1400000, "feeAssetId": null, "timestamp": 1565447953001, "version": 1, "sender": "3Mv3BEQ8WS2wzrEXuSfxDm7U9UKb5qLSnUc", "senderPublicKey": "BoKgJQhf9RWMmneqYEhyMKeUXMCYRJRhaBTDd2w1Rtx", "proofs": [ "46WxYdosLMJW7hh2GUkzmg2umb2QoXaUgj5B4HEUvwNMLq2DM5dYTrRAYYtv8Xb42KzCdAEarcMss7eubMYcz3X3" ], "script": "base64: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", "chainId": 84, "height": 625058, "spentComplexity": 0 } View: original | compacted Prev: 98aJXBwkB6LwXbGfASM3CZZVzreBYBFA1Eghu4HVYD85 Next: none Diff:
Old | New | Differences | |
---|---|---|---|
29 | 29 | then throw("asset id must be WAVES") | |
30 | 30 | else { | |
31 | 31 | let orderId = ("buy_" + toBase58String(i.transactionId)) | |
32 | - | WriteSet([DataEntry((orderId + "_amount"), ((payment.amount * | |
32 | + | WriteSet([DataEntry((orderId + "_amount"), ((payment.amount * eightDecimals) / price)), DataEntry((orderId + "_price"), price), DataEntry((orderId + "_owner"), toBase58String(i.caller.bytes)), DataEntry((orderId + "_spent"), 0)]) | |
33 | 33 | } | |
34 | 34 | } | |
35 | 35 | ||
45 | 45 | let owner = getStringValue(this, (orderId + "_owner")) | |
46 | 46 | let price = getIntegerValue(this, (orderId + "_price")) | |
47 | 47 | let wavesAmount = payment.amount | |
48 | - | let vstAmount = ((wavesAmount * | |
48 | + | let vstAmount = ((wavesAmount * eightDecimals) / price) | |
49 | 49 | let amount = getIntegerValue(this, (orderId + "_amount")) | |
50 | 50 | let spent = getIntegerValue(this, (orderId + "_spent")) | |
51 | 51 | let newSpent = (spent + vstAmount) | |
67 | 67 | let owner = getStringValue(this, (orderId + "_owner")) | |
68 | 68 | let price = getIntegerValue(this, (orderId + "_price")) | |
69 | 69 | let vstAmount = payment.amount | |
70 | - | let wavesAmount = ((vstAmount * | |
70 | + | let wavesAmount = ((vstAmount * price) / eightDecimals) | |
71 | 71 | let amount = getIntegerValue(this, (orderId + "_amount")) | |
72 | 72 | let spent = getIntegerValue(this, (orderId + "_spent")) | |
73 | 73 | let newSpent = (spent + vstAmount) | |
89 | 89 | let amount = getIntegerValue(this, (orderId + "_amount")) | |
90 | 90 | let spent = getIntegerValue(this, (orderId + "_spent")) | |
91 | 91 | let price = getIntegerValue(this, (orderId + "_price")) | |
92 | - | let returnAmount = (((amount - spent) * | |
92 | + | let returnAmount = (((amount - spent) * price) / eightDecimals) | |
93 | 93 | if ((0 >= returnAmount)) | |
94 | 94 | then throw("nothing to return") | |
95 | 95 | else ScriptResult(WriteSet([DataEntry((orderId + "_spent"), amount)]), TransferSet([ScriptTransfer(i.caller, returnAmount, unit)])) |
Old | New | Differences | |
---|---|---|---|
1 | 1 | {-# STDLIB_VERSION 3 #-} | |
2 | 2 | {-# SCRIPT_TYPE ACCOUNT #-} | |
3 | 3 | {-# CONTENT_TYPE DAPP #-} | |
4 | 4 | let VSTAssetID = base58'CjxKp2kfytghpfforkYLSoXHzJyJ5QYKLYQYgN7pQV4E' | |
5 | 5 | ||
6 | 6 | let eightDecimals = 100000000 | |
7 | 7 | ||
8 | 8 | @Callable(i) | |
9 | 9 | func makeSellVST (price) = if ((0 >= price)) | |
10 | 10 | then throw("price must be positive") | |
11 | 11 | else { | |
12 | 12 | let payment = extract(i.payment) | |
13 | 13 | if ((payment.assetId != VSTAssetID)) | |
14 | 14 | then throw(("asset id must be " + toBase58String(VSTAssetID))) | |
15 | 15 | else { | |
16 | 16 | let orderId = ("sell_" + toBase58String(i.transactionId)) | |
17 | 17 | WriteSet([DataEntry((orderId + "_amount"), payment.amount), DataEntry((orderId + "_price"), price), DataEntry((orderId + "_owner"), toBase58String(i.caller.bytes)), DataEntry((orderId + "_spent"), 0)]) | |
18 | 18 | } | |
19 | 19 | } | |
20 | 20 | ||
21 | 21 | ||
22 | 22 | ||
23 | 23 | @Callable(i) | |
24 | 24 | func makeBuyVST (price) = if ((0 >= price)) | |
25 | 25 | then throw("price must be positive") | |
26 | 26 | else { | |
27 | 27 | let payment = extract(i.payment) | |
28 | 28 | if ((payment.assetId != unit)) | |
29 | 29 | then throw("asset id must be WAVES") | |
30 | 30 | else { | |
31 | 31 | let orderId = ("buy_" + toBase58String(i.transactionId)) | |
32 | - | WriteSet([DataEntry((orderId + "_amount"), ((payment.amount * | |
32 | + | WriteSet([DataEntry((orderId + "_amount"), ((payment.amount * eightDecimals) / price)), DataEntry((orderId + "_price"), price), DataEntry((orderId + "_owner"), toBase58String(i.caller.bytes)), DataEntry((orderId + "_spent"), 0)]) | |
33 | 33 | } | |
34 | 34 | } | |
35 | 35 | ||
36 | 36 | ||
37 | 37 | ||
38 | 38 | @Callable(i) | |
39 | 39 | func takeSellVST (id) = { | |
40 | 40 | let orderId = ("sell_" + id) | |
41 | 41 | let payment = extract(i.payment) | |
42 | 42 | if ((payment.assetId != unit)) | |
43 | 43 | then throw("asset must be WAVES") | |
44 | 44 | else { | |
45 | 45 | let owner = getStringValue(this, (orderId + "_owner")) | |
46 | 46 | let price = getIntegerValue(this, (orderId + "_price")) | |
47 | 47 | let wavesAmount = payment.amount | |
48 | - | let vstAmount = ((wavesAmount * | |
48 | + | let vstAmount = ((wavesAmount * eightDecimals) / price) | |
49 | 49 | let amount = getIntegerValue(this, (orderId + "_amount")) | |
50 | 50 | let spent = getIntegerValue(this, (orderId + "_spent")) | |
51 | 51 | let newSpent = (spent + vstAmount) | |
52 | 52 | if ((newSpent > amount)) | |
53 | 53 | then throw("not enougth asset in order") | |
54 | 54 | else ScriptResult(WriteSet([DataEntry((orderId + "_spent"), newSpent)]), TransferSet([ScriptTransfer(i.caller, vstAmount, VSTAssetID), ScriptTransfer(extract(addressFromString(owner)), wavesAmount, unit)])) | |
55 | 55 | } | |
56 | 56 | } | |
57 | 57 | ||
58 | 58 | ||
59 | 59 | ||
60 | 60 | @Callable(i) | |
61 | 61 | func takeBuyVST (id) = { | |
62 | 62 | let orderId = ("buy_" + id) | |
63 | 63 | let payment = extract(i.payment) | |
64 | 64 | if ((payment.assetId != VSTAssetID)) | |
65 | 65 | then throw(("asset must be " + toBase58String(VSTAssetID))) | |
66 | 66 | else { | |
67 | 67 | let owner = getStringValue(this, (orderId + "_owner")) | |
68 | 68 | let price = getIntegerValue(this, (orderId + "_price")) | |
69 | 69 | let vstAmount = payment.amount | |
70 | - | let wavesAmount = ((vstAmount * | |
70 | + | let wavesAmount = ((vstAmount * price) / eightDecimals) | |
71 | 71 | let amount = getIntegerValue(this, (orderId + "_amount")) | |
72 | 72 | let spent = getIntegerValue(this, (orderId + "_spent")) | |
73 | 73 | let newSpent = (spent + vstAmount) | |
74 | 74 | if ((newSpent > amount)) | |
75 | 75 | then throw("not enougth asset in order") | |
76 | 76 | else ScriptResult(WriteSet([DataEntry((orderId + "_spent"), newSpent)]), TransferSet([ScriptTransfer(i.caller, wavesAmount, unit), ScriptTransfer(extract(addressFromString(owner)), vstAmount, VSTAssetID)])) | |
77 | 77 | } | |
78 | 78 | } | |
79 | 79 | ||
80 | 80 | ||
81 | 81 | ||
82 | 82 | @Callable(i) | |
83 | 83 | func returnBuyVST (id) = { | |
84 | 84 | let orderId = ("buy_" + id) | |
85 | 85 | let owner = getStringValue(this, (orderId + "_owner")) | |
86 | 86 | if ((owner != toBase58String(i.caller.bytes))) | |
87 | 87 | then throw("return should be called by order owner") | |
88 | 88 | else { | |
89 | 89 | let amount = getIntegerValue(this, (orderId + "_amount")) | |
90 | 90 | let spent = getIntegerValue(this, (orderId + "_spent")) | |
91 | 91 | let price = getIntegerValue(this, (orderId + "_price")) | |
92 | - | let returnAmount = (((amount - spent) * | |
92 | + | let returnAmount = (((amount - spent) * price) / eightDecimals) | |
93 | 93 | if ((0 >= returnAmount)) | |
94 | 94 | then throw("nothing to return") | |
95 | 95 | else ScriptResult(WriteSet([DataEntry((orderId + "_spent"), amount)]), TransferSet([ScriptTransfer(i.caller, returnAmount, unit)])) | |
96 | 96 | } | |
97 | 97 | } | |
98 | 98 | ||
99 | 99 | ||
100 | 100 | ||
101 | 101 | @Callable(i) | |
102 | 102 | func returnSellVST (id) = { | |
103 | 103 | let orderId = ("sell_" + id) | |
104 | 104 | let owner = getStringValue(this, (orderId + "_owner")) | |
105 | 105 | if ((owner != toBase58String(i.caller.bytes))) | |
106 | 106 | then throw("return should be called by order owner") | |
107 | 107 | else { | |
108 | 108 | let amount = getIntegerValue(this, (orderId + "_amount")) | |
109 | 109 | let spent = getIntegerValue(this, (orderId + "_spent")) | |
110 | 110 | let returnAmount = (amount - spent) | |
111 | 111 | if ((0 >= returnAmount)) | |
112 | 112 | then throw("nothing to return") | |
113 | 113 | else ScriptResult(WriteSet([DataEntry((orderId + "_spent"), amount)]), TransferSet([ScriptTransfer(i.caller, returnAmount, VSTAssetID)])) | |
114 | 114 | } | |
115 | 115 | } | |
116 | 116 | ||
117 | 117 |
github/deemru/w8io/169f3d6 54.29 ms ◑![]()