w8 · tx · 6ZZ···awE

tx · 6ZZGDGFNQLjXvU6jGVaZjyYx1cWQNoYvkLuftQqZ1awE

3N9b7vExDf2qqZt2xG9FUsca7iwLVuih1Ta:  -0.01000000 Waves

2023.12.01 23:58 [2868089] smart account 3N9b7vExDf2qqZt2xG9FUsca7iwLVuih1Ta > SELF 0.00000000 Waves

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

View: original | compacted
Prev: 5DaEjy3hJRafU133FQC5mc8sXmvUqBQuZ2oqJHX6Hc8b
Next: J8up4RiDgz5Xik3tYrNmev5JGyhkPZ2FvRDgxsEVjrzV

Diff: 
Old New Differences
60 60  
61 61  
62 62  @Callable(i)
63 + func deal (orderId,address,amount,minAmount) = if (!(isDefined(keyOrderId(orderId))))
64 +     then throw(("You don't have an order with this id: " + orderId))
65 +     else if ((amount > getIntegerValue(keyAmount(orderId))))
66 +         then throw("The transaction cannot be executed because the seller does not have enough funds")
67 +         else {
68 +             let restAmount = (getIntegerValue(keyAmount(orderId)) - amount)
69 +             let assetIdKey = keyAssetId(orderId)
70 +             let assetIdRaw = getString(this, assetIdKey)
71 +             let assetIdStr = value(assetIdRaw)
72 +             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)), DeleteEntry(keyAssetId(orderId))]
74 +                 else [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), DeleteEntry(keyAmount(orderId)), IntegerEntry(keyAmount(orderId), restAmount)]
75 +             }
76 + 
77 + 
78 + 
79 + @Callable(i)
63 80  func cancel (orderId) = if (!(isDefined(keyOrderId(orderId))))
64 81      then throw(("You don't have an order with this id: " + orderId))
65 82      else {
71 88          }
72 89  
73 90  
74 - 
75 - @Callable(i)
76 - func deal (orderId,address,amount,minAmount) = if (!(isDefined(keyOrderId(orderId))))
77 -     then throw(("You don't have an order with this id: " + orderId))
78 -     else if ((amount > toInt(toBytes(value(keyAmount(orderId))))))
79 -         then throw("The transaction cannot be executed because the seller does not have enough funds")
80 -         else {
81 -             let restAmount = (toInt(toBytes(value(keyAmount(orderId)))) - amount)
82 -             let assetIdKey = keyAssetId(orderId)
83 -             let assetIdRaw = getString(this, assetIdKey)
84 -             let assetIdStr = value(assetIdRaw)
85 -             if ((minAmount > restAmount))
86 -                 then [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), ScriptTransfer(i.caller, restAmount, fromStr(assetIdStr)), ScriptTransfer(developer, toInt(toBytes(value(keyServiceFee(orderId)))), fromStr(assetIdStr)), DeleteEntry(keyServiceFee(orderId)), DeleteEntry(keyAmount(orderId)), DeleteEntry(keyOrderId(orderId)), DeleteEntry(keyAssetId(orderId))]
87 -                 else [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), DeleteEntry(keyAmount(orderId)), IntegerEntry(keyAmount(orderId), restAmount)]
88 -             }
89 - 
90 - 
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) = ("%s%s__orderId__" + orderId)
22 22  
23 23  
24 24  func keyServiceFee (orderId) = ("%s%s__serviceFee__" + orderId)
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 checkAsset (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 throw("Invalid assetId: assetInfo missing")
46 46          else toStr(asset)
47 47      }
48 48  
49 49  
50 50  @Callable(i)
51 51  func escrow (orderId,amount,assetId,developerFee) = if (isDefined(getString(this, keyOrderId(orderId))))
52 52      then throw(("You already have an order with this id: " + orderId))
53 53      else if ((0 >= amount))
54 54          then throw("Non-positive order amount")
55 55          else {
56 56              let orderAmount = (amount - developerFee)
57 57  [IntegerEntry(keyServiceFee(orderId), developerFee), IntegerEntry(keyAmount(orderId), orderAmount), StringEntry(keyOrderId(orderId), orderId), StringEntry(keyAssetId(orderId), assetId)]
58 58              }
59 59  
60 60  
61 61  
62 62  @Callable(i)
63 + func deal (orderId,address,amount,minAmount) = if (!(isDefined(keyOrderId(orderId))))
64 +     then throw(("You don't have an order with this id: " + orderId))
65 +     else if ((amount > getIntegerValue(keyAmount(orderId))))
66 +         then throw("The transaction cannot be executed because the seller does not have enough funds")
67 +         else {
68 +             let restAmount = (getIntegerValue(keyAmount(orderId)) - amount)
69 +             let assetIdKey = keyAssetId(orderId)
70 +             let assetIdRaw = getString(this, assetIdKey)
71 +             let assetIdStr = value(assetIdRaw)
72 +             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)), DeleteEntry(keyAssetId(orderId))]
74 +                 else [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), DeleteEntry(keyAmount(orderId)), IntegerEntry(keyAmount(orderId), restAmount)]
75 +             }
76 + 
77 + 
78 + 
79 + @Callable(i)
63 80  func cancel (orderId) = if (!(isDefined(keyOrderId(orderId))))
64 81      then throw(("You don't have an order with this id: " + orderId))
65 82      else {
66 83          let restAmount = getIntegerValue(keyAmount(orderId))
67 84          let assetIdKey = keyAssetId(orderId)
68 85          let assetIdRaw = getString(this, assetIdKey)
69 86          let assetIdStr = value(assetIdRaw)
70 87  [ScriptTransfer(i.caller, restAmount, fromStr(assetIdStr)), ScriptTransfer(developer, getIntegerValue(keyServiceFee(orderId)), fromStr(assetIdStr)), DeleteEntry(keyServiceFee(orderId)), DeleteEntry(keyAmount(orderId)), DeleteEntry(keyOrderId(orderId)), DeleteEntry(keyAssetId(orderId))]
71 88          }
72 89  
73 90  
74 - 
75 - @Callable(i)
76 - func deal (orderId,address,amount,minAmount) = if (!(isDefined(keyOrderId(orderId))))
77 -     then throw(("You don't have an order with this id: " + orderId))
78 -     else if ((amount > toInt(toBytes(value(keyAmount(orderId))))))
79 -         then throw("The transaction cannot be executed because the seller does not have enough funds")
80 -         else {
81 -             let restAmount = (toInt(toBytes(value(keyAmount(orderId)))) - amount)
82 -             let assetIdKey = keyAssetId(orderId)
83 -             let assetIdRaw = getString(this, assetIdKey)
84 -             let assetIdStr = value(assetIdRaw)
85 -             if ((minAmount > restAmount))
86 -                 then [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), ScriptTransfer(i.caller, restAmount, fromStr(assetIdStr)), ScriptTransfer(developer, toInt(toBytes(value(keyServiceFee(orderId)))), fromStr(assetIdStr)), DeleteEntry(keyServiceFee(orderId)), DeleteEntry(keyAmount(orderId)), DeleteEntry(keyOrderId(orderId)), DeleteEntry(keyAssetId(orderId))]
87 -                 else [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), DeleteEntry(keyAmount(orderId)), IntegerEntry(keyAmount(orderId), restAmount)]
88 -             }
89 - 
90 -

Old	New		Differences
60	60
61	61
62	62		@Callable(i)
	63	+	func deal (orderId,address,amount,minAmount) = if (!(isDefined(keyOrderId(orderId))))
	64	+	then throw(("You don't have an order with this id: " + orderId))
	65	+	else if ((amount > getIntegerValue(keyAmount(orderId))))
	66	+	then throw("The transaction cannot be executed because the seller does not have enough funds")
	67	+	else {
	68	+	let restAmount = (getIntegerValue(keyAmount(orderId)) - amount)
	69	+	let assetIdKey = keyAssetId(orderId)
	70	+	let assetIdRaw = getString(this, assetIdKey)
	71	+	let assetIdStr = value(assetIdRaw)
	72	+	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)), DeleteEntry(keyAssetId(orderId))]
	74	+	else [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), DeleteEntry(keyAmount(orderId)), IntegerEntry(keyAmount(orderId), restAmount)]
	75	+	}
	76	+
	77	+
	78	+
	79	+	@Callable(i)
63	80		func cancel (orderId) = if (!(isDefined(keyOrderId(orderId))))
64	81		then throw(("You don't have an order with this id: " + orderId))
65	82		else {

71	88		}
72	89
73	90
74		-
75		-	@Callable(i)
76		-	func deal (orderId,address,amount,minAmount) = if (!(isDefined(keyOrderId(orderId))))
77		-	then throw(("You don't have an order with this id: " + orderId))
78		-	else if ((amount > toInt(toBytes(value(keyAmount(orderId))))))
79		-	then throw("The transaction cannot be executed because the seller does not have enough funds")
80		-	else {
81		-	let restAmount = (toInt(toBytes(value(keyAmount(orderId)))) - amount)
82		-	let assetIdKey = keyAssetId(orderId)
83		-	let assetIdRaw = getString(this, assetIdKey)
84		-	let assetIdStr = value(assetIdRaw)
85		-	if ((minAmount > restAmount))
86		-	then [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), ScriptTransfer(i.caller, restAmount, fromStr(assetIdStr)), ScriptTransfer(developer, toInt(toBytes(value(keyServiceFee(orderId)))), fromStr(assetIdStr)), DeleteEntry(keyServiceFee(orderId)), DeleteEntry(keyAmount(orderId)), DeleteEntry(keyOrderId(orderId)), DeleteEntry(keyAssetId(orderId))]
87		-	else [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), DeleteEntry(keyAmount(orderId)), IntegerEntry(keyAmount(orderId), restAmount)]
88		-	}
89		-
90		-

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) = ("%s%s__orderId__" + orderId)
22	22
23	23
24	24		func keyServiceFee (orderId) = ("%s%s__serviceFee__" + orderId)
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 checkAsset (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 throw("Invalid assetId: assetInfo missing")
46	46		else toStr(asset)
47	47		}
48	48
49	49
50	50		@Callable(i)
51	51		func escrow (orderId,amount,assetId,developerFee) = if (isDefined(getString(this, keyOrderId(orderId))))
52	52		then throw(("You already have an order with this id: " + orderId))
53	53		else if ((0 >= amount))
54	54		then throw("Non-positive order amount")
55	55		else {
56	56		let orderAmount = (amount - developerFee)
57	57		[IntegerEntry(keyServiceFee(orderId), developerFee), IntegerEntry(keyAmount(orderId), orderAmount), StringEntry(keyOrderId(orderId), orderId), StringEntry(keyAssetId(orderId), assetId)]
58	58		}
59	59
60	60
61	61
62	62		@Callable(i)
	63	+	func deal (orderId,address,amount,minAmount) = if (!(isDefined(keyOrderId(orderId))))
	64	+	then throw(("You don't have an order with this id: " + orderId))
	65	+	else if ((amount > getIntegerValue(keyAmount(orderId))))
	66	+	then throw("The transaction cannot be executed because the seller does not have enough funds")
	67	+	else {
	68	+	let restAmount = (getIntegerValue(keyAmount(orderId)) - amount)
	69	+	let assetIdKey = keyAssetId(orderId)
	70	+	let assetIdRaw = getString(this, assetIdKey)
	71	+	let assetIdStr = value(assetIdRaw)
	72	+	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)), DeleteEntry(keyAssetId(orderId))]
	74	+	else [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), DeleteEntry(keyAmount(orderId)), IntegerEntry(keyAmount(orderId), restAmount)]
	75	+	}
	76	+
	77	+
	78	+
	79	+	@Callable(i)
63	80		func cancel (orderId) = if (!(isDefined(keyOrderId(orderId))))
64	81		then throw(("You don't have an order with this id: " + orderId))
65	82		else {
66	83		let restAmount = getIntegerValue(keyAmount(orderId))
67	84		let assetIdKey = keyAssetId(orderId)
68	85		let assetIdRaw = getString(this, assetIdKey)
69	86		let assetIdStr = value(assetIdRaw)
70	87		[ScriptTransfer(i.caller, restAmount, fromStr(assetIdStr)), ScriptTransfer(developer, getIntegerValue(keyServiceFee(orderId)), fromStr(assetIdStr)), DeleteEntry(keyServiceFee(orderId)), DeleteEntry(keyAmount(orderId)), DeleteEntry(keyOrderId(orderId)), DeleteEntry(keyAssetId(orderId))]
71	88		}
72	89
73	90
74		-
75		-	@Callable(i)
76		-	func deal (orderId,address,amount,minAmount) = if (!(isDefined(keyOrderId(orderId))))
77		-	then throw(("You don't have an order with this id: " + orderId))
78		-	else if ((amount > toInt(toBytes(value(keyAmount(orderId))))))
79		-	then throw("The transaction cannot be executed because the seller does not have enough funds")
80		-	else {
81		-	let restAmount = (toInt(toBytes(value(keyAmount(orderId)))) - amount)
82		-	let assetIdKey = keyAssetId(orderId)
83		-	let assetIdRaw = getString(this, assetIdKey)
84		-	let assetIdStr = value(assetIdRaw)
85		-	if ((minAmount > restAmount))
86		-	then [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), ScriptTransfer(i.caller, restAmount, fromStr(assetIdStr)), ScriptTransfer(developer, toInt(toBytes(value(keyServiceFee(orderId)))), fromStr(assetIdStr)), DeleteEntry(keyServiceFee(orderId)), DeleteEntry(keyAmount(orderId)), DeleteEntry(keyOrderId(orderId)), DeleteEntry(keyAssetId(orderId))]
87		-	else [ScriptTransfer(addressFromStringValue(address), amount, fromStr(assetIdStr)), DeleteEntry(keyAmount(orderId)), IntegerEntry(keyAmount(orderId), restAmount)]
88		-	}
89		-
90		-

github/deemru/w8io/026f985 
24.47 ms ◑