w8 · tx · CkR···xT2

tx · CkRp5hyzdFBw7jExr5V85zQCe3ZBnv3Atj1Fgm1pMxT2

3N9b7vExDf2qqZt2xG9FUsca7iwLVuih1Ta:  -0.01000000 Waves

2023.12.03 11:04 [2870196] smart account 3N9b7vExDf2qqZt2xG9FUsca7iwLVuih1Ta > SELF 0.00000000 Waves

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

View: original | compacted
Prev: FvXE6q3ebWFubHDWZPggjVsV9WAiyT6tf7iM8CiGkQh3
Next: 2snWCWx1fvEf3TJZBLYeQgw4Dsx3AhXj14JomTP3V6Eg

Diff: 
Old New Differences
1 1  {-# STDLIB_VERSION 5 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 - let developer = addressFromStringValue("3Mp6TThvbb8z9npqz4AK3ByqAbvs7dYS8uR")
4 + let developer = addressFromStringValue("3N5BAMAuQCNcdfQSJgQFXUDrLFuHjknmhtM")
5 5  
6 6  func keyPartner (address) = ("%s%s__partner__" + address)
7 7  
92 92          let assetIdKey = keyAssetId(orderId)
93 93          let assetIdRaw = getString(this, assetIdKey)
94 94          let assetIdStr = value(assetIdRaw)
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))]
95 + [ScriptTransfer(i.caller, restAmount, fromStr(assetIdStr)), DeleteEntry(keyOrderId(orderId, toString(i.caller))), DeleteEntry(keyAssetId(orderId)), DeleteEntry(keyAmount(orderId))]
96 96          }
97 97  
98 98  
102 102      then throw("Invalid assetId")
103 103      else if ((i.caller != developer))
104 104          then throw("Invalid caller")
105 -         else [ScriptTransfer(i.caller, getIntegerValue(keyServiceFee(assetId)), fromStr(assetId)), DeleteEntry(keyServiceFee(assetId))]
105 +         else if ((assetId != "WAVES"))
106 +             then [ScriptTransfer(developer, getIntegerValue(keyServiceFee(assetId)), fromStr(assetId)), DeleteEntry(keyServiceFee(assetId))]
107 +             else if (if ((assetId == "WAVES"))
108 +                 then (1000000000 > wavesBalance(this).available)
109 +                 else false)
110 +                 then throw("Not enough WAVES to withdraw.")
111 +                 else [ScriptTransfer(developer, getIntegerValue(keyServiceFee(assetId)), fromStr(assetId)), DeleteEntry(keyServiceFee(assetId))]
106 112  
107 113  
Full: 
Old New Differences
1 1  {-# STDLIB_VERSION 5 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 - let developer = addressFromStringValue("3Mp6TThvbb8z9npqz4AK3ByqAbvs7dYS8uR")
4 + let developer = addressFromStringValue("3N5BAMAuQCNcdfQSJgQFXUDrLFuHjknmhtM")
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 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 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 45          then false
46 46          else true
47 47      }
48 48  
49 49  
50 50  @Callable(i)
51 51  func escrow (orderId,amount,assetId,developerFee) = if (!(isValidAsset(assetId)))
52 52      then throw("Invalid assetId")
53 53      else if (isDefined(getString(this, keyOrderId(orderId, toString(i.caller)))))
54 54          then throw("Order with this id already exists.")
55 55          else if ((0 >= amount))
56 56              then throw("Non-positive order amount")
57 57              else {
58 58                  let orderAmount = (amount - developerFee)
59 59                  if (isDefined(getInteger(this, keyServiceFee(assetId))))
60 60                      then {
61 61                          let fee = (getIntegerValue(keyServiceFee(assetId)) + developerFee)
62 62  [StringEntry(keyOrderId(orderId, toString(i.caller)), orderId), DeleteEntry(keyServiceFee(assetId)), IntegerEntry(keyServiceFee(assetId), fee), IntegerEntry(keyAmount(orderId), orderAmount), StringEntry(keyAssetId(orderId), assetId)]
63 63                          }
64 64                      else [StringEntry(keyOrderId(orderId, toString(i.caller)), orderId), IntegerEntry(keyServiceFee(assetId), developerFee), IntegerEntry(keyAmount(orderId), orderAmount), StringEntry(keyAssetId(orderId), assetId)]
65 65                  }
66 66  
67 67  
68 68  
69 69  @Callable(i)
70 70  func deal (orderId,address,amount,developerFee,minAmount) = if (!(isDefined(getString(this, keyOrderId(orderId, toString(i.caller))))))
71 71      then throw("Order not found.")
72 72      else if ((amount > getIntegerValue(keyAmount(orderId))))
73 73          then throw("The transaction cannot be executed because the seller does not have enough funds")
74 74          else {
75 75              let restAmount = ((getIntegerValue(keyAmount(orderId)) - amount) - developerFee)
76 76              let assetIdKey = keyAssetId(orderId)
77 77              let assetIdRaw = getString(this, assetIdKey)
78 78              let assetIdStr = value(assetIdRaw)
79 79              let fee = (getIntegerValue(keyServiceFee(assetIdStr)) + developerFee)
80 80              if ((minAmount > restAmount))
81 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 82                  else [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), DeleteEntry(keyServiceFee(assetIdStr)), IntegerEntry(keyServiceFee(assetIdStr), fee), DeleteEntry(keyAmount(orderId)), IntegerEntry(keyAmount(orderId), restAmount)]
83 83              }
84 84  
85 85  
86 86  
87 87  @Callable(i)
88 88  func cancel (orderId) = if (!(isDefined(getString(this, keyOrderId(orderId, toString(i.caller))))))
89 89      then throw(("You don't have an active order with this id: " + orderId))
90 90      else {
91 91          let restAmount = getIntegerValue(keyAmount(orderId))
92 92          let assetIdKey = keyAssetId(orderId)
93 93          let assetIdRaw = getString(this, assetIdKey)
94 94          let assetIdStr = value(assetIdRaw)
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))]
95 + [ScriptTransfer(i.caller, restAmount, fromStr(assetIdStr)), DeleteEntry(keyOrderId(orderId, toString(i.caller))), DeleteEntry(keyAssetId(orderId)), DeleteEntry(keyAmount(orderId))]
96 96          }
97 97  
98 98  
99 99  
100 100  @Callable(i)
101 101  func serviceFee (assetId) = if (!(isValidAsset(assetId)))
102 102      then throw("Invalid assetId")
103 103      else if ((i.caller != developer))
104 104          then throw("Invalid caller")
105 -         else [ScriptTransfer(i.caller, getIntegerValue(keyServiceFee(assetId)), fromStr(assetId)), DeleteEntry(keyServiceFee(assetId))]
105 +         else if ((assetId != "WAVES"))
106 +             then [ScriptTransfer(developer, getIntegerValue(keyServiceFee(assetId)), fromStr(assetId)), DeleteEntry(keyServiceFee(assetId))]
107 +             else if (if ((assetId == "WAVES"))
108 +                 then (1000000000 > wavesBalance(this).available)
109 +                 else false)
110 +                 then throw("Not enough WAVES to withdraw.")
111 +                 else [ScriptTransfer(developer, getIntegerValue(keyServiceFee(assetId)), fromStr(assetId)), DeleteEntry(keyServiceFee(assetId))]
106 112  
107 113

Old	New		Differences
1	1		{-# STDLIB_VERSION 5 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4		-	let developer = addressFromStringValue("~~3Mp6TThvbb8z9npqz4AK3ByqAbvs7dYS8uR~~")
	4	+	let developer = addressFromStringValue("3N5BAMAuQCNcdfQSJgQFXUDrLFuHjknmhtM")
5	5
6	6		func keyPartner (address) = ("%s%s__partner__" + address)
7	7

92	92		let assetIdKey = keyAssetId(orderId)
93	93		let assetIdRaw = getString(this, assetIdKey)
94	94		let assetIdStr = value(assetIdRaw)
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))]
	95	+	[ScriptTransfer(i.caller, restAmount, fromStr(assetIdStr)), DeleteEntry(keyOrderId(orderId, toString(i.caller))), DeleteEntry(keyAssetId(orderId)), DeleteEntry(keyAmount(orderId))]
96	96		}
97	97
98	98

102	102		then throw("Invalid assetId")
103	103		else if ((i.caller != developer))
104	104		then throw("Invalid caller")
105		-	else [ScriptTransfer(i.caller, getIntegerValue(keyServiceFee(assetId)), fromStr(assetId)), DeleteEntry(keyServiceFee(assetId))]
	105	+	else if ((assetId != "WAVES"))
	106	+	then [ScriptTransfer(developer, getIntegerValue(keyServiceFee(assetId)), fromStr(assetId)), DeleteEntry(keyServiceFee(assetId))]
	107	+	else if (if ((assetId == "WAVES"))
	108	+	then (1000000000 > wavesBalance(this).available)
	109	+	else false)
	110	+	then throw("Not enough WAVES to withdraw.")
	111	+	else [ScriptTransfer(developer, getIntegerValue(keyServiceFee(assetId)), fromStr(assetId)), DeleteEntry(keyServiceFee(assetId))]
106	112
107	113

Old	New		Differences
1	1		{-# STDLIB_VERSION 5 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4		-	let developer = addressFromStringValue("~~3Mp6TThvbb8z9npqz4AK3ByqAbvs7dYS8uR~~")
	4	+	let developer = addressFromStringValue("3N5BAMAuQCNcdfQSJgQFXUDrLFuHjknmhtM")
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	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	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	45		then false
46	46		else true
47	47		}
48	48
49	49
50	50		@Callable(i)
51	51		func escrow (orderId,amount,assetId,developerFee) = if (!(isValidAsset(assetId)))
52	52		then throw("Invalid assetId")
53	53		else if (isDefined(getString(this, keyOrderId(orderId, toString(i.caller)))))
54	54		then throw("Order with this id already exists.")
55	55		else if ((0 >= amount))
56	56		then throw("Non-positive order amount")
57	57		else {
58	58		let orderAmount = (amount - developerFee)
59	59		if (isDefined(getInteger(this, keyServiceFee(assetId))))
60	60		then {
61	61		let fee = (getIntegerValue(keyServiceFee(assetId)) + developerFee)
62	62		[StringEntry(keyOrderId(orderId, toString(i.caller)), orderId), DeleteEntry(keyServiceFee(assetId)), IntegerEntry(keyServiceFee(assetId), fee), IntegerEntry(keyAmount(orderId), orderAmount), StringEntry(keyAssetId(orderId), assetId)]
63	63		}
64	64		else [StringEntry(keyOrderId(orderId, toString(i.caller)), orderId), IntegerEntry(keyServiceFee(assetId), developerFee), IntegerEntry(keyAmount(orderId), orderAmount), StringEntry(keyAssetId(orderId), assetId)]
65	65		}
66	66
67	67
68	68
69	69		@Callable(i)
70	70		func deal (orderId,address,amount,developerFee,minAmount) = if (!(isDefined(getString(this, keyOrderId(orderId, toString(i.caller))))))
71	71		then throw("Order not found.")
72	72		else if ((amount > getIntegerValue(keyAmount(orderId))))
73	73		then throw("The transaction cannot be executed because the seller does not have enough funds")
74	74		else {
75	75		let restAmount = ((getIntegerValue(keyAmount(orderId)) - amount) - developerFee)
76	76		let assetIdKey = keyAssetId(orderId)
77	77		let assetIdRaw = getString(this, assetIdKey)
78	78		let assetIdStr = value(assetIdRaw)
79	79		let fee = (getIntegerValue(keyServiceFee(assetIdStr)) + developerFee)
80	80		if ((minAmount > restAmount))
81	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	82		else [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), DeleteEntry(keyServiceFee(assetIdStr)), IntegerEntry(keyServiceFee(assetIdStr), fee), DeleteEntry(keyAmount(orderId)), IntegerEntry(keyAmount(orderId), restAmount)]
83	83		}
84	84
85	85
86	86
87	87		@Callable(i)
88	88		func cancel (orderId) = if (!(isDefined(getString(this, keyOrderId(orderId, toString(i.caller))))))
89	89		then throw(("You don't have an active order with this id: " + orderId))
90	90		else {
91	91		let restAmount = getIntegerValue(keyAmount(orderId))
92	92		let assetIdKey = keyAssetId(orderId)
93	93		let assetIdRaw = getString(this, assetIdKey)
94	94		let assetIdStr = value(assetIdRaw)
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))]
	95	+	[ScriptTransfer(i.caller, restAmount, fromStr(assetIdStr)), DeleteEntry(keyOrderId(orderId, toString(i.caller))), DeleteEntry(keyAssetId(orderId)), DeleteEntry(keyAmount(orderId))]
96	96		}
97	97
98	98
99	99
100	100		@Callable(i)
101	101		func serviceFee (assetId) = if (!(isValidAsset(assetId)))
102	102		then throw("Invalid assetId")
103	103		else if ((i.caller != developer))
104	104		then throw("Invalid caller")
105		-	else [ScriptTransfer(i.caller, getIntegerValue(keyServiceFee(assetId)), fromStr(assetId)), DeleteEntry(keyServiceFee(assetId))]
	105	+	else if ((assetId != "WAVES"))
	106	+	then [ScriptTransfer(developer, getIntegerValue(keyServiceFee(assetId)), fromStr(assetId)), DeleteEntry(keyServiceFee(assetId))]
	107	+	else if (if ((assetId == "WAVES"))
	108	+	then (1000000000 > wavesBalance(this).available)
	109	+	else false)
	110	+	then throw("Not enough WAVES to withdraw.")
	111	+	else [ScriptTransfer(developer, getIntegerValue(keyServiceFee(assetId)), fromStr(assetId)), DeleteEntry(keyServiceFee(assetId))]
106	112
107	113

github/deemru/w8io/169f3d6 
67.87 ms ◑