w8 · tx · 9ER···6NQ

tx · 9ERtDKbs1ibCxdktKFqzm9pWLj5p2guH4ApS8GtSD6NQ

3N61Cvq5XcnPk9rxpy2Rnp3bSr4syNGUJph:  -0.01400000 Waves

2021.10.26 12:25 [1763089] smart account 3N61Cvq5XcnPk9rxpy2Rnp3bSr4syNGUJph > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "9ERtDKbs1ibCxdktKFqzm9pWLj5p2guH4ApS8GtSD6NQ",
    "fee": 1400000,
    "feeAssetId": null,
    "timestamp": 1635240359718,
    "version": 2,
    "chainId": 84,
    "sender": "3N61Cvq5XcnPk9rxpy2Rnp3bSr4syNGUJph",
    "senderPublicKey": "G7cNXePvAHUHmZfXa1eHnvFeH6DuykPC5wm9v9djTKgD",
    "proofs": [
        "4wdJTpHiENt5rcGXd3bX7tSo4nGfShyVCBp86RdzY9jYiUKsgPRK4GfELpRhjpPj7SoL2jZmjEGAaziziY1HxZd3"
    ],
    "script": "base64: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",
    "height": 1763089,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: CqPsHMZeRhH1FGaR6PKs9a4KspGLSjqxFyU9VWGHGtKx
Next: 9mZTorj4nh3Wq6q4Rsnnp5ZN7reFcPDWwsCFZdNW1Bvs

Diff: 
Old New Differences
6 6  let dAppAsset = "7apSJxLnxDKunb7aBGaug5qfTX88jpc3R2249pbuJU2x"
7 7  
8 8  @Callable(a8)
9 - func init () = [IntegerEntry("3PPH7x7iqobW5ziyiRCic19rQqKr6nPYaK1_asset_balance", 0), IntegerEntry("3PPH7x7iqobW5ziyiRCic19rQqKr6nPYaK1_3MthsuC5EDyehGoKvyzwhZvMENroHPsgaXS_earned", 0), IntegerEntry("3PPH7x7iqobW5ziyiRCic19rQqKr6nPYaK1_3MthsuC5EDyehGoKvyzwhZvMENroHPsgaXS_asset_balance", 0)]
9 + func init () = [IntegerEntry("3PPH7x7iqobW5ziyiRCic19rQqKr6nPYaK1_3MthsuC5EDyehGoKvyzwhZvMENroHPsgaXS_earned", 0)]
10 10  
11 11  
12 12  
42 42  
43 43  
44 44  @Callable(i)
45 - func withdraw (pool,shareTokenCost) = {
45 + func withdraw (pool,userEarned) = {
46 46      let amount = i.payments[0].amount
47 47      let assetId = i.payments[0].assetId
48 48      let poolAmountKey = (pool + "_asset_balance")
56 56          case nothing => 
57 57              0
58 58      }
59 -     let userEarned =     match getInteger(userPoolAmountKey) {
59 +     let userEarnedBefore =     match getInteger(userPoolAmountKey) {
60 60          case int: Int => 
61 61              int
62 62          case nothing => 
69 69          case _ => 
70 70              throw("Can't find asset")
71 71      }
72 -     let newUserEarned = (userEarned + ((amount / pow(10, 0, liquidityTokenDecimal, 0, 0, DOWN)) * shareTokenCost))
72 +     let userEarnedTotal = (userEarned + userEarnedBefore)
73 73      let newPoolAmount = (poolAmount - amount)
74 74      if ((userAmount >= amount))
75 75          then {
76 76              let newUserPoolAmount = (userAmount - amount)
77 - [ScriptTransfer(i.caller, amount, fromBase58String(dAppAssetAddress)), IntegerEntry(poolAmountKey, newPoolAmount), IntegerEntry(userPoolAmountKey, newUserPoolAmount), IntegerEntry(userPoolEarnedKey, newUserEarned)]
77 + [ScriptTransfer(i.caller, amount, fromBase58String(dAppAssetAddress)), IntegerEntry(poolAmountKey, newPoolAmount), IntegerEntry(userPoolAmountKey, newUserPoolAmount), IntegerEntry(userPoolEarnedKey, userEarnedTotal)]
78 78              }
79 79          else throw("You have not such balance for withdraw")
80 80      }
Full: 
Old New Differences
1 1  {-# STDLIB_VERSION 5 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 4  let userAsset = "Grfgpczccrn5AbruLctXwC941dgwipBy6HZYDaQXHbuk"
5 5  
6 6  let dAppAsset = "7apSJxLnxDKunb7aBGaug5qfTX88jpc3R2249pbuJU2x"
7 7  
8 8  @Callable(a8)
9 - func init () = [IntegerEntry("3PPH7x7iqobW5ziyiRCic19rQqKr6nPYaK1_asset_balance", 0), IntegerEntry("3PPH7x7iqobW5ziyiRCic19rQqKr6nPYaK1_3MthsuC5EDyehGoKvyzwhZvMENroHPsgaXS_earned", 0), IntegerEntry("3PPH7x7iqobW5ziyiRCic19rQqKr6nPYaK1_3MthsuC5EDyehGoKvyzwhZvMENroHPsgaXS_asset_balance", 0)]
9 + func init () = [IntegerEntry("3PPH7x7iqobW5ziyiRCic19rQqKr6nPYaK1_3MthsuC5EDyehGoKvyzwhZvMENroHPsgaXS_earned", 0)]
10 10  
11 11  
12 12  
13 13  @Callable(a8)
14 14  func call () = {
15 15      let a9 = Issue("Asset1", "Asset from dApp", 100000, 2, true, unit, 0)
16 16      let b1 = calculateAssetId(a9)
17 17  [BinaryEntry("bin", base58''), BooleanEntry("bool", true), IntegerEntry("int", 1), StringEntry("str", ""), DeleteEntry("str"), a9]
18 18      }
19 19  
20 20  
21 21  
22 22  @Callable(i)
23 23  func deposit (pool) = {
24 24      let amount = i.payments[0].amount
25 25      let assetId = i.payments[0].assetId
26 26      let poolAmountKey = (pool + "_asset_balance")
27 27      let userAddress = toString(i.caller)
28 28      let userPoolAmountKey = (((pool + "_") + userAddress) + "_asset_balance")
29 29      let dAppAssetAddress = getStringValue(this, (pool + "_service_token"))
30 30      let poolAmount = getIntegerValue(this, poolAmountKey)
31 31      let userAmount =     match getInteger(userPoolAmountKey) {
32 32          case int: Int => 
33 33              int
34 34          case nothing => 
35 35              0
36 36      }
37 37      let newPoolAmount = (poolAmount + amount)
38 38      let newUserPoolAmount = (userAmount + amount)
39 39  [ScriptTransfer(i.caller, amount, fromBase58String(dAppAssetAddress)), IntegerEntry(poolAmountKey, newPoolAmount), IntegerEntry(userPoolAmountKey, newUserPoolAmount)]
40 40      }
41 41  
42 42  
43 43  
44 44  @Callable(i)
45 - func withdraw (pool,shareTokenCost) = {
45 + func withdraw (pool,userEarned) = {
46 46      let amount = i.payments[0].amount
47 47      let assetId = i.payments[0].assetId
48 48      let poolAmountKey = (pool + "_asset_balance")
49 49      let userAddress = toString(i.caller)
50 50      let userPoolAmountKey = (((pool + "_") + userAddress) + "_asset_balance")
51 51      let userPoolEarnedKey = (((pool + "_") + userAddress) + "_earned")
52 52      let poolAmount = getIntegerValue(this, poolAmountKey)
53 53      let userAmount =     match getInteger(userPoolAmountKey) {
54 54          case int: Int => 
55 55              int
56 56          case nothing => 
57 57              0
58 58      }
59 -     let userEarned =     match getInteger(userPoolAmountKey) {
59 +     let userEarnedBefore =     match getInteger(userPoolAmountKey) {
60 60          case int: Int => 
61 61              int
62 62          case nothing => 
63 63              0
64 64      }
65 65      let dAppAssetAddress = getStringValue(this, (pool + "_liquidity_token"))
66 66      let liquidityTokenDecimal =     match assetInfo(fromBase58String(dAppAssetAddress)) {
67 67          case asset: Asset => 
68 68              asset.decimals
69 69          case _ => 
70 70              throw("Can't find asset")
71 71      }
72 -     let newUserEarned = (userEarned + ((amount / pow(10, 0, liquidityTokenDecimal, 0, 0, DOWN)) * shareTokenCost))
72 +     let userEarnedTotal = (userEarned + userEarnedBefore)
73 73      let newPoolAmount = (poolAmount - amount)
74 74      if ((userAmount >= amount))
75 75          then {
76 76              let newUserPoolAmount = (userAmount - amount)
77 - [ScriptTransfer(i.caller, amount, fromBase58String(dAppAssetAddress)), IntegerEntry(poolAmountKey, newPoolAmount), IntegerEntry(userPoolAmountKey, newUserPoolAmount), IntegerEntry(userPoolEarnedKey, newUserEarned)]
77 + [ScriptTransfer(i.caller, amount, fromBase58String(dAppAssetAddress)), IntegerEntry(poolAmountKey, newPoolAmount), IntegerEntry(userPoolAmountKey, newUserPoolAmount), IntegerEntry(userPoolEarnedKey, userEarnedTotal)]
78 78              }
79 79          else throw("You have not such balance for withdraw")
80 80      }
81 81  
82 82  
83 83  @Verifier(b6)
84 84  func b7 () = sigVerify(b6.bodyBytes, b6.proofs[0], b6.senderPublicKey)
85 85

Old	New		Differences
6	6		let dAppAsset = "7apSJxLnxDKunb7aBGaug5qfTX88jpc3R2249pbuJU2x"
7	7
8	8		@Callable(a8)
9		-	func init () = [IntegerEntry("3PPH7x7iqobW5ziyiRCic19rQqKr6nPYaK1_~~asset_balance", 0), IntegerEntry("3PPH7x7iqobW5ziyiRCic19rQqKr6nPYaK1_~~3MthsuC5EDyehGoKvyzwhZvMENroHPsgaXS_earned", 0)~~, IntegerEntry("3PPH7x7iqobW5ziyiRCic19rQqKr6nPYaK1_3MthsuC5EDyehGoKvyzwhZvMENroHPsgaXS_asset_balance", 0)~~]
	9	+	func init () = [IntegerEntry("3PPH7x7iqobW5ziyiRCic19rQqKr6nPYaK1_3MthsuC5EDyehGoKvyzwhZvMENroHPsgaXS_earned", 0)]
10	10
11	11
12	12

42	42
43	43
44	44		@Callable(i)
45		-	func withdraw (pool,~~shareTokenCost~~) = {
	45	+	func withdraw (pool,userEarned) = {
46	46		let amount = i.payments[0].amount
47	47		let assetId = i.payments[0].assetId
48	48		let poolAmountKey = (pool + "_asset_balance")

56	56		case nothing =>
57	57		0
58	58		}
59		-	let ~~userEarned~~ = match getInteger(userPoolAmountKey) {
	59	+	let userEarnedBefore = match getInteger(userPoolAmountKey) {
60	60		case int: Int =>
61	61		int
62	62		case nothing =>

69	69		case _ =>
70	70		throw("Can't find asset")
71	71		}
72		-	let ~~newUserEarned~~ = (userEarned + ~~((amount / pow(10, 0, liquidityTokenDecimal, 0, 0, DOWN~~)~~) * shareTokenCost))~~
	72	+	let userEarnedTotal = (userEarned + userEarnedBefore)
73	73		let newPoolAmount = (poolAmount - amount)
74	74		if ((userAmount >= amount))
75	75		then {
76	76		let newUserPoolAmount = (userAmount - amount)
77		-	[ScriptTransfer(i.caller, amount, fromBase58String(dAppAssetAddress)), IntegerEntry(poolAmountKey, newPoolAmount), IntegerEntry(userPoolAmountKey, newUserPoolAmount), IntegerEntry(userPoolEarnedKey, ~~newUserEarned~~)]
	77	+	[ScriptTransfer(i.caller, amount, fromBase58String(dAppAssetAddress)), IntegerEntry(poolAmountKey, newPoolAmount), IntegerEntry(userPoolAmountKey, newUserPoolAmount), IntegerEntry(userPoolEarnedKey, userEarnedTotal)]
78	78		}
79	79		else throw("You have not such balance for withdraw")
80	80		}

Old	New		Differences
1	1		{-# STDLIB_VERSION 5 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4	4		let userAsset = "Grfgpczccrn5AbruLctXwC941dgwipBy6HZYDaQXHbuk"
5	5
6	6		let dAppAsset = "7apSJxLnxDKunb7aBGaug5qfTX88jpc3R2249pbuJU2x"
7	7
8	8		@Callable(a8)
9		-	func init () = [IntegerEntry("3PPH7x7iqobW5ziyiRCic19rQqKr6nPYaK1_~~asset_balance", 0), IntegerEntry("3PPH7x7iqobW5ziyiRCic19rQqKr6nPYaK1_~~3MthsuC5EDyehGoKvyzwhZvMENroHPsgaXS_earned", 0)~~, IntegerEntry("3PPH7x7iqobW5ziyiRCic19rQqKr6nPYaK1_3MthsuC5EDyehGoKvyzwhZvMENroHPsgaXS_asset_balance", 0)~~]
	9	+	func init () = [IntegerEntry("3PPH7x7iqobW5ziyiRCic19rQqKr6nPYaK1_3MthsuC5EDyehGoKvyzwhZvMENroHPsgaXS_earned", 0)]
10	10
11	11
12	12
13	13		@Callable(a8)
14	14		func call () = {
15	15		let a9 = Issue("Asset1", "Asset from dApp", 100000, 2, true, unit, 0)
16	16		let b1 = calculateAssetId(a9)
17	17		[BinaryEntry("bin", base58''), BooleanEntry("bool", true), IntegerEntry("int", 1), StringEntry("str", ""), DeleteEntry("str"), a9]
18	18		}
19	19
20	20
21	21
22	22		@Callable(i)
23	23		func deposit (pool) = {
24	24		let amount = i.payments[0].amount
25	25		let assetId = i.payments[0].assetId
26	26		let poolAmountKey = (pool + "_asset_balance")
27	27		let userAddress = toString(i.caller)
28	28		let userPoolAmountKey = (((pool + "_") + userAddress) + "_asset_balance")
29	29		let dAppAssetAddress = getStringValue(this, (pool + "_service_token"))
30	30		let poolAmount = getIntegerValue(this, poolAmountKey)
31	31		let userAmount = match getInteger(userPoolAmountKey) {
32	32		case int: Int =>
33	33		int
34	34		case nothing =>
35	35		0
36	36		}
37	37		let newPoolAmount = (poolAmount + amount)
38	38		let newUserPoolAmount = (userAmount + amount)
39	39		[ScriptTransfer(i.caller, amount, fromBase58String(dAppAssetAddress)), IntegerEntry(poolAmountKey, newPoolAmount), IntegerEntry(userPoolAmountKey, newUserPoolAmount)]
40	40		}
41	41
42	42
43	43
44	44		@Callable(i)
45		-	func withdraw (pool,~~shareTokenCost~~) = {
	45	+	func withdraw (pool,userEarned) = {
46	46		let amount = i.payments[0].amount
47	47		let assetId = i.payments[0].assetId
48	48		let poolAmountKey = (pool + "_asset_balance")
49	49		let userAddress = toString(i.caller)
50	50		let userPoolAmountKey = (((pool + "_") + userAddress) + "_asset_balance")
51	51		let userPoolEarnedKey = (((pool + "_") + userAddress) + "_earned")
52	52		let poolAmount = getIntegerValue(this, poolAmountKey)
53	53		let userAmount = match getInteger(userPoolAmountKey) {
54	54		case int: Int =>
55	55		int
56	56		case nothing =>
57	57		0
58	58		}
59		-	let ~~userEarned~~ = match getInteger(userPoolAmountKey) {
	59	+	let userEarnedBefore = match getInteger(userPoolAmountKey) {
60	60		case int: Int =>
61	61		int
62	62		case nothing =>
63	63		0
64	64		}
65	65		let dAppAssetAddress = getStringValue(this, (pool + "_liquidity_token"))
66	66		let liquidityTokenDecimal = match assetInfo(fromBase58String(dAppAssetAddress)) {
67	67		case asset: Asset =>
68	68		asset.decimals
69	69		case _ =>
70	70		throw("Can't find asset")
71	71		}
72		-	let ~~newUserEarned~~ = (userEarned + ~~((amount / pow(10, 0, liquidityTokenDecimal, 0, 0, DOWN~~)~~) * shareTokenCost))~~
	72	+	let userEarnedTotal = (userEarned + userEarnedBefore)
73	73		let newPoolAmount = (poolAmount - amount)
74	74		if ((userAmount >= amount))
75	75		then {
76	76		let newUserPoolAmount = (userAmount - amount)
77		-	[ScriptTransfer(i.caller, amount, fromBase58String(dAppAssetAddress)), IntegerEntry(poolAmountKey, newPoolAmount), IntegerEntry(userPoolAmountKey, newUserPoolAmount), IntegerEntry(userPoolEarnedKey, ~~newUserEarned~~)]
	77	+	[ScriptTransfer(i.caller, amount, fromBase58String(dAppAssetAddress)), IntegerEntry(poolAmountKey, newPoolAmount), IntegerEntry(userPoolAmountKey, newUserPoolAmount), IntegerEntry(userPoolEarnedKey, userEarnedTotal)]
78	78		}
79	79		else throw("You have not such balance for withdraw")
80	80		}
81	81
82	82
83	83		@Verifier(b6)
84	84		func b7 () = sigVerify(b6.bodyBytes, b6.proofs[0], b6.senderPublicKey)
85	85

github/deemru/w8io/169f3d6 
57.57 ms ◑