tx · 5e6RQ3BK84QLTHsyHgUcrjwzC1Q2ubgK2Cbn7yw58UU2 3PHSC1X1nwLs9JmqMGHkUh1LcpdAopBzbM8: -0.01000000 Waves 2022.06.07 13:42 [3151420] smart account 3PHSC1X1nwLs9JmqMGHkUh1LcpdAopBzbM8 > SELF 0.00000000 Waves
{ "type": 13, "id": "5e6RQ3BK84QLTHsyHgUcrjwzC1Q2ubgK2Cbn7yw58UU2", "fee": 1000000, "feeAssetId": null, "timestamp": 1654598555226, "version": 2, "chainId": 87, "sender": "3PHSC1X1nwLs9JmqMGHkUh1LcpdAopBzbM8", "senderPublicKey": "EED2BmVD8x3hLUpgpBRJCmXPPYXSP5eLquCiTbUUApJM", "proofs": [ "2UtU52mSeVsB4oKX86ipQQw4HXL8eSQmfyEVWp3tGTYvfQmrbKXCiQNUgkPFHvUkCXr3E4kCAaWqXvF2gxvwDaAs" ], "script": "base64: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", "height": 3151420, "applicationStatus": "succeeded", "spentComplexity": 0 } View: original | compacted Prev: Eu8RHQkgPFqSGM6FnQvqqvFFnQyXHxNzDn39Ye3txkSa Next: HqXio2kTAugg3j2ov8sSnLUBKAZWkpa4wNJ3w4YKHFja Diff:
Old | New | Differences | |
---|---|---|---|
97 | 97 | } | |
98 | 98 | let FreelancerAddressStr = getStringValue(this, FreelancerAddress) | |
99 | 99 | let PaymentAssetId = getStringValue(this, PaymentAsset) | |
100 | + | let Mydecimal = if (if (if (if ((PaymentAssetId == toBase58String(value(BUsd)))) | |
101 | + | then true | |
102 | + | else (PaymentAssetId == toBase58String(value(USDT)))) | |
103 | + | then true | |
104 | + | else (PaymentAssetId == toBase58String(value(USDC)))) | |
105 | + | then true | |
106 | + | else (PaymentAssetId == toBase58String(value(USDN)))) | |
107 | + | then 1000000 | |
108 | + | else 100000000 | |
100 | 109 | let AddressFreeLancer = addressFromStringValue(FreelancerAddressStr) | |
101 | 110 | let dAppFrees = Address(dAppFees) | |
102 | 111 | let AssetUsed = if ((PaymentAssetId == "Waves")) | |
103 | 112 | then unit | |
104 | 113 | else fromBase58String(PaymentAssetId) | |
105 | - | if ((0 >= (((95 * amount) / 100) - (PayFreelancer * 100000000)))) | |
106 | - | then throw(("You do not have enough funds to make payment, your available funds are: " + toString((amount / 100000000)))) | |
114 | + | if (if ((0 >= (((95 * amount) / 100) - (PayFreelancer * Mydecimal)))) | |
115 | + | then true | |
116 | + | else (amount == 0)) | |
117 | + | then throw(("You do not have enough funds to make payment, your available funds are: " + toString((amount / Mydecimal)))) | |
107 | 118 | else if (if ((PaidtrxLast >= 12)) | |
108 | 119 | then (amount > 0) | |
109 | 120 | else false) | |
111 | 122 | else { | |
112 | 123 | let UserAccount = if ((PaidtrxLast == 11)) | |
113 | 124 | then 0 | |
114 | - | else (amount - (PayFreelancer * | |
125 | + | else (amount - (PayFreelancer * Mydecimal)) | |
115 | 126 | let Payment2Freelance = if ((PaidtrxLast == 11)) | |
116 | 127 | then ((95 * amount) / 100) | |
117 | - | else ((95 * PayFreelancer) * | |
128 | + | else (((95 * PayFreelancer) * Mydecimal) / 100) | |
118 | 129 | let FeePaid = if ((PaidtrxLast == 11)) | |
119 | 130 | then ((5 * amount) / 100) | |
120 | - | else ((5 * PayFreelancer) * | |
131 | + | else (((5 * PayFreelancer) * Mydecimal) / 100) | |
121 | 132 | let PaidtrxValue = if ((PaidtrxLast == 11)) | |
122 | 133 | then 0 | |
123 | 134 | else (PaidtrxLast + 1) | |
124 | - | $Tuple2([IntegerEntry((toBase58String(i.caller.bytes) + "_Payment"), UserAccount), IntegerEntry((toBase58String(i.caller.bytes) + "_Paidtrx"), PaidtrxValue), ScriptTransfer(AddressFreeLancer, Payment2Freelance, AssetUsed), ScriptTransfer(dAppFrees, FeePaid, AssetUsed)], AssetUsed) | |
135 | + | $Tuple2([IntegerEntry((toBase58String(i.caller.bytes) + "_Payment"), UserAccount), IntegerEntry((toBase58String(i.caller.bytes) + "_Paidtrx"), PaidtrxValue), IntegerEntry((toBase58String(i.caller.bytes) + "_Payment2Freelance"), Payment2Freelance), ScriptTransfer(AddressFreeLancer, Payment2Freelance, AssetUsed), ScriptTransfer(dAppFrees, FeePaid, AssetUsed)], AssetUsed) | |
125 | 136 | } | |
126 | 137 | } | |
127 | 138 | ||
135 | 146 | else { | |
136 | 147 | let FreeLancerPayment = (User + "_Payment") | |
137 | 148 | let FreelancerAddress = (User + "_Freelancer") | |
138 | - | let PaymentAsset = ( | |
149 | + | let PaymentAsset = (toBase58String(i.caller.bytes) + "_Asset") | |
139 | 150 | let amount = match getInteger(this, FreeLancerPayment) { | |
140 | 151 | case a: Int => | |
141 | 152 | a | |
151 | 162 | then unit | |
152 | 163 | else fromBase58String(PaymentAssetId) | |
153 | 164 | if ((amount == 0)) | |
154 | - | then throw("User's balance is 0 | |
165 | + | then throw("User's balance is 0, cannot realize any payment") | |
155 | 166 | else $Tuple2([IntegerEntry((User + "_Payment"), 0), ScriptTransfer(AddressFreeLancer, ((ToFreelancer * amount) / 100), AssetUsed), ScriptTransfer(AddressUser, ((ToUser * amount) / 100), AssetUsed), ScriptTransfer(dAppFrees, ((AdminFee * amount) / 100), AssetUsed)], AssetUsed) | |
156 | 167 | } | |
157 | 168 |
Old | New | Differences | |
---|---|---|---|
1 | 1 | {-# STDLIB_VERSION 5 #-} | |
2 | 2 | {-# SCRIPT_TYPE ACCOUNT #-} | |
3 | 3 | {-# CONTENT_TYPE DAPP #-} | |
4 | 4 | let BUsd = base58'8DLiYZjo3UUaRBTHU7Ayoqg4ihwb6YH1AfXrrhdjQ7K1' | |
5 | 5 | ||
6 | 6 | let USDT = base58'34N9YcEETLWn93qYQ64EsP1x89tSruJU44RrEMSXXEPJ' | |
7 | 7 | ||
8 | 8 | let USDC = base58'6XtHjpXbs9RRJP2Sr9GUyVqzACcby9TkThHXnjVC5CDJ' | |
9 | 9 | ||
10 | 10 | let BTC = base58'8LQW8f7P5d5PZM7GtZEBgaqRPGSzS3DfPuiXrURJ4AJS' | |
11 | 11 | ||
12 | 12 | let ETH = base58'474jTeYx2r2Va35794tCScAXWJG9hU2HcgxzMowaZUnu' | |
13 | 13 | ||
14 | 14 | let BNB = base58'5UYBPpq4WoU5n4MwpFkgJnW3Fq4B1u3ukpK33ik4QerR' | |
15 | 15 | ||
16 | 16 | let USDN = base58'DG2xFkPdDwKUoBkzGAhQtLpSGzfXLiCYPEzeKH2Ad24p' | |
17 | 17 | ||
18 | 18 | let HASH = base58'7RgM3A5AVCUZFbL3EwBicv1eHFCVsaY8z71yda77zrAv' | |
19 | 19 | ||
20 | 20 | let KUSD = base58'FXvNWA5Gfy8yLPHGScm6Gmn4DSZX9brFZ9qmEkPxAhGk' | |
21 | 21 | ||
22 | 22 | let dAppFees = base58'3PG1NyiC2rdgX46jb8c5zPGuEAzWXhr4L2W' | |
23 | 23 | ||
24 | 24 | let AdmindApp = base58'3PG1NyiC2rdgX46jb8c5zPGuEAzWXhr4L2W' | |
25 | 25 | ||
26 | 26 | @Callable(i) | |
27 | 27 | func DepositFunds (ScopeDesc,Deliverables,FreelancerAddress) = { | |
28 | 28 | let FreeLancerPayment = (toBase58String(i.caller.bytes) + "_Payment") | |
29 | 29 | let amount = match getInteger(this, FreeLancerPayment) { | |
30 | 30 | case a: Int => | |
31 | 31 | a | |
32 | 32 | case _ => | |
33 | 33 | 0 | |
34 | 34 | } | |
35 | 35 | if ((amount != 0)) | |
36 | 36 | then throw("You have already deposited funds, deposits can only be done once") | |
37 | 37 | else { | |
38 | 38 | let pmt = if ((size(i.payments) == 1)) | |
39 | 39 | then i.payments[0] | |
40 | 40 | else throw("Attached payment is required") | |
41 | 41 | if (if (if (if (if (if (if (if (if (if (if ((0 >= pmt.amount)) | |
42 | 42 | then (pmt.assetId != BUsd) | |
43 | 43 | else false) | |
44 | 44 | then (pmt.assetId != USDT) | |
45 | 45 | else false) | |
46 | 46 | then (pmt.assetId != USDC) | |
47 | 47 | else false) | |
48 | 48 | then (pmt.assetId != BTC) | |
49 | 49 | else false) | |
50 | 50 | then (pmt.assetId != ETH) | |
51 | 51 | else false) | |
52 | 52 | then (pmt.assetId != BNB) | |
53 | 53 | else false) | |
54 | 54 | then (pmt.assetId != USDN) | |
55 | 55 | else false) | |
56 | 56 | then (pmt.assetId != HASH) | |
57 | 57 | else false) | |
58 | 58 | then (pmt.assetId != KUSD) | |
59 | 59 | else false) | |
60 | 60 | then isDefined(pmt.assetId) | |
61 | 61 | else false) | |
62 | 62 | then throw("Can only deposit accepted tokens, and amount should be positive") | |
63 | 63 | else if (if (if ((ScopeDesc == "")) | |
64 | 64 | then true | |
65 | 65 | else (Deliverables == "")) | |
66 | 66 | then true | |
67 | 67 | else (FreelancerAddress == "")) | |
68 | 68 | then throw("Job Scope, Deliverables desc and Freelancer Wallet Address cannot be empty") | |
69 | 69 | else { | |
70 | 70 | let AssetUsed = if (isDefined(pmt.assetId)) | |
71 | 71 | then toBase58String(value(pmt.assetId)) | |
72 | 72 | else "Waves" | |
73 | 73 | [StringEntry((toBase58String(i.caller.bytes) + "_Scope"), ScopeDesc), StringEntry((toBase58String(i.caller.bytes) + "_Deliv"), Deliverables), StringEntry((toBase58String(i.caller.bytes) + "_Asset"), AssetUsed), StringEntry((toBase58String(i.caller.bytes) + "_Freelancer"), FreelancerAddress), IntegerEntry((toBase58String(i.caller.bytes) + "_Payment"), pmt.amount)] | |
74 | 74 | } | |
75 | 75 | } | |
76 | 76 | } | |
77 | 77 | ||
78 | 78 | ||
79 | 79 | ||
80 | 80 | @Callable(i) | |
81 | 81 | func PayFreelancer (PayFreelancer) = { | |
82 | 82 | let FreeLancerPayment = (toBase58String(i.caller.bytes) + "_Payment") | |
83 | 83 | let FreelancerAddress = (toBase58String(i.caller.bytes) + "_Freelancer") | |
84 | 84 | let PaymentAsset = (toBase58String(i.caller.bytes) + "_Asset") | |
85 | 85 | let Paidtrx = (toBase58String(i.caller.bytes) + "_Paidtrx") | |
86 | 86 | let amount = match getInteger(this, FreeLancerPayment) { | |
87 | 87 | case a: Int => | |
88 | 88 | a | |
89 | 89 | case _ => | |
90 | 90 | 0 | |
91 | 91 | } | |
92 | 92 | let PaidtrxLast = match getInteger(this, Paidtrx) { | |
93 | 93 | case a: Int => | |
94 | 94 | a | |
95 | 95 | case _ => | |
96 | 96 | 0 | |
97 | 97 | } | |
98 | 98 | let FreelancerAddressStr = getStringValue(this, FreelancerAddress) | |
99 | 99 | let PaymentAssetId = getStringValue(this, PaymentAsset) | |
100 | + | let Mydecimal = if (if (if (if ((PaymentAssetId == toBase58String(value(BUsd)))) | |
101 | + | then true | |
102 | + | else (PaymentAssetId == toBase58String(value(USDT)))) | |
103 | + | then true | |
104 | + | else (PaymentAssetId == toBase58String(value(USDC)))) | |
105 | + | then true | |
106 | + | else (PaymentAssetId == toBase58String(value(USDN)))) | |
107 | + | then 1000000 | |
108 | + | else 100000000 | |
100 | 109 | let AddressFreeLancer = addressFromStringValue(FreelancerAddressStr) | |
101 | 110 | let dAppFrees = Address(dAppFees) | |
102 | 111 | let AssetUsed = if ((PaymentAssetId == "Waves")) | |
103 | 112 | then unit | |
104 | 113 | else fromBase58String(PaymentAssetId) | |
105 | - | if ((0 >= (((95 * amount) / 100) - (PayFreelancer * 100000000)))) | |
106 | - | then throw(("You do not have enough funds to make payment, your available funds are: " + toString((amount / 100000000)))) | |
114 | + | if (if ((0 >= (((95 * amount) / 100) - (PayFreelancer * Mydecimal)))) | |
115 | + | then true | |
116 | + | else (amount == 0)) | |
117 | + | then throw(("You do not have enough funds to make payment, your available funds are: " + toString((amount / Mydecimal)))) | |
107 | 118 | else if (if ((PaidtrxLast >= 12)) | |
108 | 119 | then (amount > 0) | |
109 | 120 | else false) | |
110 | 121 | then throw("You have already done 12 payments, you cannot make more payments") | |
111 | 122 | else { | |
112 | 123 | let UserAccount = if ((PaidtrxLast == 11)) | |
113 | 124 | then 0 | |
114 | - | else (amount - (PayFreelancer * | |
125 | + | else (amount - (PayFreelancer * Mydecimal)) | |
115 | 126 | let Payment2Freelance = if ((PaidtrxLast == 11)) | |
116 | 127 | then ((95 * amount) / 100) | |
117 | - | else ((95 * PayFreelancer) * | |
128 | + | else (((95 * PayFreelancer) * Mydecimal) / 100) | |
118 | 129 | let FeePaid = if ((PaidtrxLast == 11)) | |
119 | 130 | then ((5 * amount) / 100) | |
120 | - | else ((5 * PayFreelancer) * | |
131 | + | else (((5 * PayFreelancer) * Mydecimal) / 100) | |
121 | 132 | let PaidtrxValue = if ((PaidtrxLast == 11)) | |
122 | 133 | then 0 | |
123 | 134 | else (PaidtrxLast + 1) | |
124 | - | $Tuple2([IntegerEntry((toBase58String(i.caller.bytes) + "_Payment"), UserAccount), IntegerEntry((toBase58String(i.caller.bytes) + "_Paidtrx"), PaidtrxValue), ScriptTransfer(AddressFreeLancer, Payment2Freelance, AssetUsed), ScriptTransfer(dAppFrees, FeePaid, AssetUsed)], AssetUsed) | |
135 | + | $Tuple2([IntegerEntry((toBase58String(i.caller.bytes) + "_Payment"), UserAccount), IntegerEntry((toBase58String(i.caller.bytes) + "_Paidtrx"), PaidtrxValue), IntegerEntry((toBase58String(i.caller.bytes) + "_Payment2Freelance"), Payment2Freelance), ScriptTransfer(AddressFreeLancer, Payment2Freelance, AssetUsed), ScriptTransfer(dAppFrees, FeePaid, AssetUsed)], AssetUsed) | |
125 | 136 | } | |
126 | 137 | } | |
127 | 138 | ||
128 | 139 | ||
129 | 140 | ||
130 | 141 | @Callable(i) | |
131 | 142 | func AdminTransfer (User,Freelancer,ToFreelancer,ToUser,AdminFee) = if ((i.caller.bytes != AdmindApp)) | |
132 | 143 | then throw("Only Admin can do this") | |
133 | 144 | else if ((((ToUser + ToFreelancer) + AdminFee) != 100)) | |
134 | 145 | then throw("Total of Percentages cannot be different from 100%") | |
135 | 146 | else { | |
136 | 147 | let FreeLancerPayment = (User + "_Payment") | |
137 | 148 | let FreelancerAddress = (User + "_Freelancer") | |
138 | - | let PaymentAsset = ( | |
149 | + | let PaymentAsset = (toBase58String(i.caller.bytes) + "_Asset") | |
139 | 150 | let amount = match getInteger(this, FreeLancerPayment) { | |
140 | 151 | case a: Int => | |
141 | 152 | a | |
142 | 153 | case _ => | |
143 | 154 | 0 | |
144 | 155 | } | |
145 | 156 | let FreelancerAddressStr = getStringValue(this, FreelancerAddress) | |
146 | 157 | let AddressFreeLancer = addressFromStringValue(FreelancerAddressStr) | |
147 | 158 | let PaymentAssetId = getStringValue(this, PaymentAsset) | |
148 | 159 | let dAppFrees = Address(dAppFees) | |
149 | 160 | let AddressUser = addressFromStringValue(User) | |
150 | 161 | let AssetUsed = if ((PaymentAssetId == "Waves")) | |
151 | 162 | then unit | |
152 | 163 | else fromBase58String(PaymentAssetId) | |
153 | 164 | if ((amount == 0)) | |
154 | - | then throw("User's balance is 0 | |
165 | + | then throw("User's balance is 0, cannot realize any payment") | |
155 | 166 | else $Tuple2([IntegerEntry((User + "_Payment"), 0), ScriptTransfer(AddressFreeLancer, ((ToFreelancer * amount) / 100), AssetUsed), ScriptTransfer(AddressUser, ((ToUser * amount) / 100), AssetUsed), ScriptTransfer(dAppFrees, ((AdminFee * amount) / 100), AssetUsed)], AssetUsed) | |
156 | 167 | } | |
157 | 168 | ||
158 | 169 |
github/deemru/w8io/3ef1775 53.60 ms ◑