w8 · tx · FhD···hfi

tx · FhD6HjdtZEwPJJyuFxmXQHUi3PMpaUvRXBm2bKULHhfi

3MwLW8P5yh5T2xML9QqFuVxkVkm9RXqnzXh:  -0.00900000 Waves

2022.12.06 22:49 [2348927] smart account 3MwLW8P5yh5T2xML9QqFuVxkVkm9RXqnzXh > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "FhD6HjdtZEwPJJyuFxmXQHUi3PMpaUvRXBm2bKULHhfi",
    "fee": 900000,
    "feeAssetId": null,
    "timestamp": 1670356178022,
    "version": 2,
    "chainId": 84,
    "sender": "3MwLW8P5yh5T2xML9QqFuVxkVkm9RXqnzXh",
    "senderPublicKey": "HscGVyJG5M3NMHWKfQbucCBsFLGPi8VmTxTAmcBbaWTa",
    "proofs": [
        "4ySrWdhyRvGpSPhptn23VfY3N6mAmC4DQ4Kt8ZrZ96KfxyJDfYSSmp6UJ29JADYo6XJ61yr8sfbyqkKABDbNAp37"
    ],
    "script": "base64:BgITCAISAwoBCBIDCgEIEgASAwoBARUABlNjYWxlNgDAhD0ABlNjYWxlOACAwtcvAAdTY2FsZTE2CQBoAgUGU2NhbGU4BQZTY2FsZTgACnZhbGlkYXRvcnMJAMwIAgIjM05BbXFHanhSQlJQb1JIWlVVcXZoaU5TNmF4bkdwaW5MSEMFA25pbAAPbW9uZXlCb3hBZGRyZXNzCQEHQWRkcmVzcwEBGgFUZKnP467xWXotJQOt2k8QiNBvrQpHH8SpAAdhc3NldElkAixISG1hRlFwVW9id0t4emp6NEVDYUJQdG9GNjlrdWpLd1UyY296YVV6VHNndgALcHV6emxlUG9vbHMJAMwIAgIjM042U3RKZGdtVGZBUnNSTm45WHQ1ckRZRXMzcHI0S0d5MXYFA25pbAEKZ2V0QmFsYW5jZQEHYXNzZXRJZAQHJG1hdGNoMAUHYXNzZXRJZAMJAAECBQckbWF0Y2gwAgRVbml0BAF4BQckbWF0Y2gwCAkA7wcBBQR0aGlzCWF2YWlsYWJsZQkA8AcCBQR0aGlzCQEFdmFsdWUBBQdhc3NldElkAQl0cnlHZXRJbnQCB2FkZHJlc3MDa2V5BAckbWF0Y2gwCQCaCAIFB2FkZHJlc3MFA2tleQMJAAECBQckbWF0Y2gwAgNJbnQEAWIFByRtYXRjaDAFAWIAAAEJdHJ5R2V0U3RyAgdhZGRyZXNzA2tleQQHJG1hdGNoMAkAnQgCBQdhZGRyZXNzBQNrZXkDCQABAgUHJG1hdGNoMAIGU3RyaW5nBAFiBQckbWF0Y2gwBQFiAgABDmdldEFzc2V0U3RyaW5nAQdhc3NldElkBAckbWF0Y2gwBQdhc3NldElkAwkAAQIFByRtYXRjaDACCkJ5dGVWZWN0b3IEAWIFByRtYXRjaDAJANgEAQUBYgIFV0FWRVMBG2dldFB1enpsZVBvb2xTdXBwbGllZEFtb3VudAEGcG9vbElkBAdiYWxhbmNlCQDwBwIJAQdBZGRyZXNzAQkA2QQBBQZwb29sSWQJANkEAQUHYXNzZXRJZAUHYmFsYW5jZQEWZ2V0VG90YWxTdXBwbGllZEFtb3VudAAEC2N1cnJlbnRQb29sCQEJdHJ5R2V0U3RyAgUEdGhpcwILY3VycmVudFBvb2wDCQAAAgULY3VycmVudFBvb2wCAAkAAgEJAKwCAgIZQ2Fubm90IGZpbmQgcG9vbCB3aXRoIGlkIAULY3VycmVudFBvb2wJARtnZXRQdXp6bGVQb29sU3VwcGxpZWRBbW91bnQBBQtjdXJyZW50UG9vbAEWd2l0aGRyYXdGcm9tUHV6emxlUG9vbAIGcG9vbElkBmFtb3VudAQLcG9vbEFkZHJlc3MJAQdBZGRyZXNzAQkA2QQBBQZwb29sSWQECndpdGhkcmF3VHgDCQBmAgUGYW1vdW50AAAJAPwHBAULcG9vbEFkZHJlc3MCCHdpdGhkcmF3CQDMCAIFB2Fzc2V0SWQJAMwIAgUGYW1vdW50BQNuaWwFA25pbAIAAwkAAAIFCndpdGhkcmF3VHgFCndpdGhkcmF3VHgFCndpdGhkcmF3VHgJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BB2NhbGNGZWUABAxzdGFrZWRBbW91bnQJAQl0cnlHZXRJbnQCBQR0aGlzAg1nbG9iYWxfc3Rha2VkBAlsYXN0U1JhdGUJAQl0cnlHZXRJbnQCBQR0aGlzAhVnbG9iYWxfbGFzdENoZWNrU1JhdGUEB3NBbW91bnQJAGsDBQxzdGFrZWRBbW91bnQFCWxhc3RTUmF0ZQUGU2NhbGU4BA10b3RhbFN1cHBsaWVkCQEWZ2V0VG90YWxTdXBwbGllZEFtb3VudAAEBGRpZmYJAGUCBQ10b3RhbFN1cHBsaWVkBQdzQW1vdW50BANmZWUJAGsDBQRkaWZmAMCWsQIFBlNjYWxlOAMJAGYCBQNmZWUAAAUDZmVlAAABDmNhbGN1bGF0ZVNSYXRlAAQObGFzdENoZWNrU1JhdGUJAQl0cnlHZXRJbnQCBQR0aGlzAhVnbG9iYWxfbGFzdENoZWNrU1JhdGUEDHN0YWtlZEFtb3VudAkBCXRyeUdldEludAIFBHRoaXMCDWdsb2JhbF9zdGFrZWQEEWxhc3RDaGVja1NBbW91bnV0CQBrAwUMc3Rha2VkQW1vdW50BQ5sYXN0Q2hlY2tTUmF0ZQUGU2NhbGU4AwkAAAIFDmxhc3RDaGVja1NSYXRlAAAFBlNjYWxlOAMJAAACBRFsYXN0Q2hlY2tTQW1vdW51dAAABQ5sYXN0Q2hlY2tTUmF0ZQQFc1JhdGUJAGsDBQ5sYXN0Q2hlY2tTUmF0ZQkAZAIJAGsDCQBlAgkAawMJARZnZXRUb3RhbFN1cHBsaWVkQW1vdW50AAUGU2NhbGU2BRFsYXN0Q2hlY2tTQW1vdW51dAUGU2NhbGU2CQBlAgUGU2NhbGU4AMCWsQIFBlNjYWxlOAUGU2NhbGU2BQZTY2FsZTYDCQBmAgUGU2NhbGU4BQVzUmF0ZQUObGFzdENoZWNrU1JhdGUFBXNSYXRlAQxyZWNhbGNSZXN1bHQBDHN0YWtlZENoYW5nZQQMc3Rha2VkQW1vdW50CQEJdHJ5R2V0SW50AgUEdGhpcwINZ2xvYmFsX3N0YWtlZAQFc1JhdGUJAQ5jYWxjdWxhdGVTUmF0ZQAJAMwIAgkBDEludGVnZXJFbnRyeQICDWdsb2JhbF9zdGFrZWQJAGQCBQxzdGFrZWRBbW91bnQFDHN0YWtlZENoYW5nZQkAzAgCCQEMSW50ZWdlckVudHJ5AgIVZ2xvYmFsX2xhc3RDaGVja1NSYXRlBQVzUmF0ZQUDbmlsAQxzdXBwbHlSZXN1bHQCBnBvb2xJZANmZWUDCQAAAgkAzwgCBQtwdXp6bGVQb29scwUGcG9vbElkBQR1bml0CQACAQkArAICAg9Vbmtub3duIHBvb2xJZCAFBnBvb2xJZAQKYXNzZXRCeXRlcwkA2QQBBQdhc3NldElkBAdiYWxhbmNlCQEKZ2V0QmFsYW5jZQEFCmFzc2V0Qnl0ZXMEA2ludgkA/AcECQEHQWRkcmVzcwEJANkEAQUGcG9vbElkAgZzdXBwbHkFA25pbAkAzAgCCQEPQXR0YWNoZWRQYXltZW50AgUKYXNzZXRCeXRlcwUHYmFsYW5jZQUDbmlsAwkAAAIFA2ludgUDaW52BAp3aXRoZHJhd1R4CQEWd2l0aGRyYXdGcm9tUHV6emxlUG9vbAIFBnBvb2xJZAUDZmVlAwkAAAIFCndpdGhkcmF3VHgFCndpdGhkcmF3VHgJAMwIAgkBC1N0cmluZ0VudHJ5AgILY3VycmVudFBvb2wFBnBvb2xJZAkAzAgCCQEOU2NyaXB0VHJhbnNmZXIDBQ9tb25leUJveEFkZHJlc3MFA2ZlZQkA2QQBBQdhc3NldElkBQNuaWwJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BDndpdGhkcmF3UmVzdWx0AAQLY3VycmVudFBvb2wJAQl0cnlHZXRTdHICBQR0aGlzAgtjdXJyZW50UG9vbAMJAAACBQtjdXJyZW50UG9vbAIACQACAQkArAICAhlDYW5ub3QgZmluZCBwb29sIHdpdGggaWQgBQtjdXJyZW50UG9vbAQGYW1vdW50CQEbZ2V0UHV6emxlUG9vbFN1cHBsaWVkQW1vdW50AQULY3VycmVudFBvb2wEAnR4CQEWd2l0aGRyYXdGcm9tUHV6emxlUG9vbAIFC2N1cnJlbnRQb29sBQZhbW91bnQDCQAAAgUCdHgFAnR4BQJ0eAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgELc3Rha2VSZXN1bHQCBHVzZXIGYW1vdW50BAdzQW1vdW50CQBrAwUGYW1vdW50BQZTY2FsZTgJAQ5jYWxjdWxhdGVTUmF0ZQAJAM4IAgkBDHJlY2FsY1Jlc3VsdAEFB3NBbW91bnQJAMwIAgkBDEludGVnZXJFbnRyeQIJAKwCAgUEdXNlcgIHX3N0YWtlZAkAZAIJAQl0cnlHZXRJbnQCBQR0aGlzCQCsAgIFBHVzZXICB19zdGFrZWQFB3NBbW91bnQFA25pbAENdW5zdGFrZVJlc3VsdAIEdXNlcgZhbW91bnQEB3NBbW91bnQJAGsDBQZhbW91bnQFBlNjYWxlOAkBDmNhbGN1bGF0ZVNSYXRlAAQKdXNlclN0YWtlZAkBCXRyeUdldEludAIFBHRoaXMJAKwCAgUEdXNlcgIHX3N0YWtlZAQNdW5zdGFrZUFtb3VudAMJAGYCBQdzQW1vdW50BQp1c2VyU3Rha2VkBQp1c2VyU3Rha2VkBQdzQW1vdW50CQDOCAIJAQxyZWNhbGNSZXN1bHQBCQEBLQEFDXVuc3Rha2VBbW91bnQJAMwIAgkBDEludGVnZXJFbnRyeQIJAKwCAgUEdXNlcgIHX3N0YWtlZAkAZQIFCnVzZXJTdGFrZWQFDXVuc3Rha2VBbW91bnQFA25pbAQBaQEEaW5pdAEGcG9vbElkBAtjdXJyZW50UG9vbAkBCXRyeUdldFN0cgIFBHRoaXMCC2N1cnJlbnRQb29sAwkAAAIJAM8IAgUKdmFsaWRhdG9ycwkApQgBCAUBaQZjYWxsZXIFBHVuaXQJAAIBAg1BY2Nlc3MgZGVuaWVkAwkAAAIFC2N1cnJlbnRQb29sAgAJAMwIAgkBC1N0cmluZ0VudHJ5AgILY3VycmVudFBvb2wFBnBvb2xJZAUDbmlsBQNuaWwBaQEJcmViYWxhbmNlAQZwb29sSWQEC2N1cnJlbnRQb29sCQEJdHJ5R2V0U3RyAgUEdGhpcwILY3VycmVudFBvb2wDCQAAAgkAzwgCBQp2YWxpZGF0b3JzCQClCAEIBQFpBmNhbGxlcgUEdW5pdAkAAgECDUFjY2VzcyBkZW5pZWQDCQAAAgULY3VycmVudFBvb2wFBnBvb2xJZAkAAgEJAKwCAgITQWxyZWFkeSBzdXBwbGllZCB0bwULY3VycmVudFBvb2wECndpdGhkcmF3VHgJAQ53aXRoZHJhd1Jlc3VsdAADCQAAAgUKd2l0aGRyYXdUeAUKd2l0aGRyYXdUeAkAzggCCQEMc3VwcGx5UmVzdWx0AgUGcG9vbElkAAAJAQxyZWNhbGNSZXN1bHQBAAAJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BaQEFc3Rha2UABAR1c2VyCQClCAEIBQFpBmNhbGxlcgQGYW1vdW50CAkAkQMCCAUBaQhwYXltZW50cwAABmFtb3VudAQLY3VycmVudFBvb2wJAQl0cnlHZXRTdHICBQR0aGlzAgtjdXJyZW50UG9vbAMDCQBnAgAABQZhbW91bnQGCQECIT0CCAkAkQMCCAUBaQhwYXltZW50cwAAB2Fzc2V0SWQJANkEAQUHYXNzZXRJZAkAAgECFmludmFsaWQgdG9rZW4gYXR0YWNoZWQDCQAAAgULY3VycmVudFBvb2wCAAkAAgECFFBvb2wgbm90IGluaXRpYWxpemVkBANmZWUJAQdjYWxjRmVlAAkAzggCCQELc3Rha2VSZXN1bHQCBQR1c2VyBQZhbW91bnQJAQxzdXBwbHlSZXN1bHQCBQtjdXJyZW50UG9vbAUDZmVlAWkBB3Vuc3Rha2UBBmFtb3VudAQEdXNlcgkApQgBCAUBaQZjYWxsZXIEC2N1cnJlbnRQb29sCQEJdHJ5R2V0U3RyAgUEdGhpcwILY3VycmVudFBvb2wEAnR4CQEWd2l0aGRyYXdGcm9tUHV6emxlUG9vbAIFC2N1cnJlbnRQb29sBQZhbW91bnQDCQAAAgUCdHgFAnR4CQDOCAIJAQ11bnN0YWtlUmVzdWx0AgUEdXNlcgUGYW1vdW50CQDMCAIJAQ5TY3JpcHRUcmFuc2ZlcgMIBQFpBmNhbGxlcgUGYW1vdW50CQDZBAEFB2Fzc2V0SWQFA25pbAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgECdHgBBnZlcmlmeQAJAPQDAwgFAnR4CWJvZHlCeXRlcwkAkQMCCAUCdHgGcHJvb2ZzAAAIBQJ0eA9zZW5kZXJQdWJsaWNLZXmwXcPD",
    "height": 2348927,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: 4SAWMSxAwgNgBKfWh2y7fs83veUZPBPdMEdxfw7J74Fk
Next: DRvtvEyJKYkYovjfSTM44wyqDKauuQc5uw6KzVc36ga5

Diff: 
Old New Differences
109 109      }
110 110  
111 111  
112 - func supplyResult (poolId) = if ((indexOf(puzzlePools, poolId) == unit))
112 + func supplyResult (poolId,fee) = if ((indexOf(puzzlePools, poolId) == unit))
113 113      then throw(("Unknown poolId " + poolId))
114 114      else {
115 -         let fee = calcFee()
116 115          let assetBytes = fromBase58String(assetId)
117 116          let balance = getBalance(assetBytes)
118 117          let inv = invoke(Address(fromBase58String(poolId)), "supply", nil, [AttachedPayment(assetBytes, balance)])
179 178              else {
180 179                  let withdrawTx = withdrawResult()
181 180                  if ((withdrawTx == withdrawTx))
182 -                     then (supplyResult(poolId) ++ recalcResult(0))
181 +                     then (supplyResult(poolId, 0) ++ recalcResult(0))
183 182                      else throw("Strict value is not equal to itself.")
184 183                  }
185 184      }
197 196          then throw("invalid token attached")
198 197          else if ((currentPool == ""))
199 198              then throw("Pool not initialized")
200 -             else (stakeResult(user, amount) ++ supplyResult(currentPool))
199 +             else {
200 +                 let fee = calcFee()
201 +                 (stakeResult(user, amount) ++ supplyResult(currentPool, fee))
202 +                 }
201 203      }
202 204  
203 205  
Full: 
Old New Differences
1 1  {-# STDLIB_VERSION 6 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 4  let Scale6 = 1000000
5 5  
6 6  let Scale8 = 100000000
7 7  
8 8  let Scale16 = (Scale8 * Scale8)
9 9  
10 10  let validators = ["3NAmqGjxRBRPoRHZUUqvhiNS6axnGpinLHC"]
11 11  
12 12  let moneyBoxAddress = Address(base58'3My6LmrRSRvJ73T14oT5k53SGPavGFoacWc')
13 13  
14 14  let assetId = "HHmaFQpUobwKxzjz4ECaBPtoF69kujKwU2cozaUzTsgv"
15 15  
16 16  let puzzlePools = ["3N6StJdgmTfARsRNn9Xt5rDYEs3pr4KGy1v"]
17 17  
18 18  func getBalance (assetId) = match assetId {
19 19      case x: Unit => 
20 20          wavesBalance(this).available
21 21      case _ => 
22 22          assetBalance(this, value(assetId))
23 23  }
24 24  
25 25  
26 26  func tryGetInt (address,key) = match getInteger(address, key) {
27 27      case b: Int => 
28 28          b
29 29      case _ => 
30 30          0
31 31  }
32 32  
33 33  
34 34  func tryGetStr (address,key) = match getString(address, key) {
35 35      case b: String => 
36 36          b
37 37      case _ => 
38 38          ""
39 39  }
40 40  
41 41  
42 42  func getAssetString (assetId) = match assetId {
43 43      case b: ByteVector => 
44 44          toBase58String(b)
45 45      case _ => 
46 46          "WAVES"
47 47  }
48 48  
49 49  
50 50  func getPuzzlePoolSuppliedAmount (poolId) = {
51 51      let balance = assetBalance(Address(fromBase58String(poolId)), fromBase58String(assetId))
52 52      balance
53 53      }
54 54  
55 55  
56 56  func getTotalSuppliedAmount () = {
57 57      let currentPool = tryGetStr(this, "currentPool")
58 58      if ((currentPool == ""))
59 59          then throw(("Cannot find pool with id " + currentPool))
60 60          else getPuzzlePoolSuppliedAmount(currentPool)
61 61      }
62 62  
63 63  
64 64  func withdrawFromPuzzlePool (poolId,amount) = {
65 65      let poolAddress = Address(fromBase58String(poolId))
66 66      let withdrawTx = if ((amount > 0))
67 67          then invoke(poolAddress, "withdraw", [assetId, amount], nil)
68 68          else ""
69 69      if ((withdrawTx == withdrawTx))
70 70          then withdrawTx
71 71          else throw("Strict value is not equal to itself.")
72 72      }
73 73  
74 74  
75 75  func calcFee () = {
76 76      let stakedAmount = tryGetInt(this, "global_staked")
77 77      let lastSRate = tryGetInt(this, "global_lastCheckSRate")
78 78      let sAmount = fraction(stakedAmount, lastSRate, Scale8)
79 79      let totalSupplied = getTotalSuppliedAmount()
80 80      let diff = (totalSupplied - sAmount)
81 81      let fee = fraction(diff, 5000000, Scale8)
82 82      if ((fee > 0))
83 83          then fee
84 84          else 0
85 85      }
86 86  
87 87  
88 88  func calculateSRate () = {
89 89      let lastCheckSRate = tryGetInt(this, "global_lastCheckSRate")
90 90      let stakedAmount = tryGetInt(this, "global_staked")
91 91      let lastCheckSAmounut = fraction(stakedAmount, lastCheckSRate, Scale8)
92 92      if ((lastCheckSRate == 0))
93 93          then Scale8
94 94          else if ((lastCheckSAmounut == 0))
95 95              then lastCheckSRate
96 96              else {
97 97                  let sRate = fraction(lastCheckSRate, (fraction((fraction(getTotalSuppliedAmount(), Scale6, lastCheckSAmounut) - Scale6), (Scale8 - 5000000), Scale8) + Scale6), Scale6)
98 98                  if ((Scale8 > sRate))
99 99                      then lastCheckSRate
100 100                      else sRate
101 101                  }
102 102      }
103 103  
104 104  
105 105  func recalcResult (stakedChange) = {
106 106      let stakedAmount = tryGetInt(this, "global_staked")
107 107      let sRate = calculateSRate()
108 108  [IntegerEntry("global_staked", (stakedAmount + stakedChange)), IntegerEntry("global_lastCheckSRate", sRate)]
109 109      }
110 110  
111 111  
112 - func supplyResult (poolId) = if ((indexOf(puzzlePools, poolId) == unit))
112 + func supplyResult (poolId,fee) = if ((indexOf(puzzlePools, poolId) == unit))
113 113      then throw(("Unknown poolId " + poolId))
114 114      else {
115 -         let fee = calcFee()
116 115          let assetBytes = fromBase58String(assetId)
117 116          let balance = getBalance(assetBytes)
118 117          let inv = invoke(Address(fromBase58String(poolId)), "supply", nil, [AttachedPayment(assetBytes, balance)])
119 118          if ((inv == inv))
120 119              then {
121 120                  let withdrawTx = withdrawFromPuzzlePool(poolId, fee)
122 121                  if ((withdrawTx == withdrawTx))
123 122                      then [StringEntry("currentPool", poolId), ScriptTransfer(moneyBoxAddress, fee, fromBase58String(assetId))]
124 123                      else throw("Strict value is not equal to itself.")
125 124                  }
126 125              else throw("Strict value is not equal to itself.")
127 126          }
128 127  
129 128  
130 129  func withdrawResult () = {
131 130      let currentPool = tryGetStr(this, "currentPool")
132 131      if ((currentPool == ""))
133 132          then throw(("Cannot find pool with id " + currentPool))
134 133          else {
135 134              let amount = getPuzzlePoolSuppliedAmount(currentPool)
136 135              let tx = withdrawFromPuzzlePool(currentPool, amount)
137 136              if ((tx == tx))
138 137                  then tx
139 138                  else throw("Strict value is not equal to itself.")
140 139              }
141 140      }
142 141  
143 142  
144 143  func stakeResult (user,amount) = {
145 144      let sAmount = fraction(amount, Scale8, calculateSRate())
146 145      (recalcResult(sAmount) ++ [IntegerEntry((user + "_staked"), (tryGetInt(this, (user + "_staked")) + sAmount))])
147 146      }
148 147  
149 148  
150 149  func unstakeResult (user,amount) = {
151 150      let sAmount = fraction(amount, Scale8, calculateSRate())
152 151      let userStaked = tryGetInt(this, (user + "_staked"))
153 152      let unstakeAmount = if ((sAmount > userStaked))
154 153          then userStaked
155 154          else sAmount
156 155      (recalcResult(-(unstakeAmount)) ++ [IntegerEntry((user + "_staked"), (userStaked - unstakeAmount))])
157 156      }
158 157  
159 158  
160 159  @Callable(i)
161 160  func init (poolId) = {
162 161      let currentPool = tryGetStr(this, "currentPool")
163 162      if ((indexOf(validators, toString(i.caller)) == unit))
164 163          then throw("Access denied")
165 164          else if ((currentPool == ""))
166 165              then [StringEntry("currentPool", poolId)]
167 166              else nil
168 167      }
169 168  
170 169  
171 170  
172 171  @Callable(i)
173 172  func rebalance (poolId) = {
174 173      let currentPool = tryGetStr(this, "currentPool")
175 174      if ((indexOf(validators, toString(i.caller)) == unit))
176 175          then throw("Access denied")
177 176          else if ((currentPool == poolId))
178 177              then throw(("Already supplied to" + currentPool))
179 178              else {
180 179                  let withdrawTx = withdrawResult()
181 180                  if ((withdrawTx == withdrawTx))
182 -                     then (supplyResult(poolId) ++ recalcResult(0))
181 +                     then (supplyResult(poolId, 0) ++ recalcResult(0))
183 182                      else throw("Strict value is not equal to itself.")
184 183                  }
185 184      }
186 185  
187 186  
188 187  
189 188  @Callable(i)
190 189  func stake () = {
191 190      let user = toString(i.caller)
192 191      let amount = i.payments[0].amount
193 192      let currentPool = tryGetStr(this, "currentPool")
194 193      if (if ((0 >= amount))
195 194          then true
196 195          else (i.payments[0].assetId != fromBase58String(assetId)))
197 196          then throw("invalid token attached")
198 197          else if ((currentPool == ""))
199 198              then throw("Pool not initialized")
200 -             else (stakeResult(user, amount) ++ supplyResult(currentPool))
199 +             else {
200 +                 let fee = calcFee()
201 +                 (stakeResult(user, amount) ++ supplyResult(currentPool, fee))
202 +                 }
201 203      }
202 204  
203 205  
204 206  
205 207  @Callable(i)
206 208  func unstake (amount) = {
207 209      let user = toString(i.caller)
208 210      let currentPool = tryGetStr(this, "currentPool")
209 211      let tx = withdrawFromPuzzlePool(currentPool, amount)
210 212      if ((tx == tx))
211 213          then (unstakeResult(user, amount) ++ [ScriptTransfer(i.caller, amount, fromBase58String(assetId))])
212 214          else throw("Strict value is not equal to itself.")
213 215      }
214 216  
215 217  
216 218  @Verifier(tx)
217 219  func verify () = sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)
218 220

Old	New		Differences
109	109		}
110	110
111	111
112		-	func supplyResult (poolId) = if ((indexOf(puzzlePools, poolId) == unit))
	112	+	func supplyResult (poolId,fee) = if ((indexOf(puzzlePools, poolId) == unit))
113	113		then throw(("Unknown poolId " + poolId))
114	114		else {
115		-	let fee = calcFee()
116	115		let assetBytes = fromBase58String(assetId)
117	116		let balance = getBalance(assetBytes)
118	117		let inv = invoke(Address(fromBase58String(poolId)), "supply", nil, [AttachedPayment(assetBytes, balance)])

179	178		else {
180	179		let withdrawTx = withdrawResult()
181	180		if ((withdrawTx == withdrawTx))
182		-	then (supplyResult(poolId) ++ recalcResult(0))
	181	+	then (supplyResult(poolId, 0) ++ recalcResult(0))
183	182		else throw("Strict value is not equal to itself.")
184	183		}
185	184		}

197	196		then throw("invalid token attached")
198	197		else if ((currentPool == ""))
199	198		then throw("Pool not initialized")
200		-	else (stakeResult(user, amount) ++ supplyResult(currentPool))
	199	+	else {
	200	+	let fee = calcFee()
	201	+	(stakeResult(user, amount) ++ supplyResult(currentPool, fee))
	202	+	}
201	203		}
202	204
203	205

Old	New		Differences
1	1		{-# STDLIB_VERSION 6 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4	4		let Scale6 = 1000000
5	5
6	6		let Scale8 = 100000000
7	7
8	8		let Scale16 = (Scale8 * Scale8)
9	9
10	10		let validators = ["3NAmqGjxRBRPoRHZUUqvhiNS6axnGpinLHC"]
11	11
12	12		let moneyBoxAddress = Address(base58'3My6LmrRSRvJ73T14oT5k53SGPavGFoacWc')
13	13
14	14		let assetId = "HHmaFQpUobwKxzjz4ECaBPtoF69kujKwU2cozaUzTsgv"
15	15
16	16		let puzzlePools = ["3N6StJdgmTfARsRNn9Xt5rDYEs3pr4KGy1v"]
17	17
18	18		func getBalance (assetId) = match assetId {
19	19		case x: Unit =>
20	20		wavesBalance(this).available
21	21		case _ =>
22	22		assetBalance(this, value(assetId))
23	23		}
24	24
25	25
26	26		func tryGetInt (address,key) = match getInteger(address, key) {
27	27		case b: Int =>
28	28		b
29	29		case _ =>
30	30		0
31	31		}
32	32
33	33
34	34		func tryGetStr (address,key) = match getString(address, key) {
35	35		case b: String =>
36	36		b
37	37		case _ =>
38	38		""
39	39		}
40	40
41	41
42	42		func getAssetString (assetId) = match assetId {
43	43		case b: ByteVector =>
44	44		toBase58String(b)
45	45		case _ =>
46	46		"WAVES"
47	47		}
48	48
49	49
50	50		func getPuzzlePoolSuppliedAmount (poolId) = {
51	51		let balance = assetBalance(Address(fromBase58String(poolId)), fromBase58String(assetId))
52	52		balance
53	53		}
54	54
55	55
56	56		func getTotalSuppliedAmount () = {
57	57		let currentPool = tryGetStr(this, "currentPool")
58	58		if ((currentPool == ""))
59	59		then throw(("Cannot find pool with id " + currentPool))
60	60		else getPuzzlePoolSuppliedAmount(currentPool)
61	61		}
62	62
63	63
64	64		func withdrawFromPuzzlePool (poolId,amount) = {
65	65		let poolAddress = Address(fromBase58String(poolId))
66	66		let withdrawTx = if ((amount > 0))
67	67		then invoke(poolAddress, "withdraw", [assetId, amount], nil)
68	68		else ""
69	69		if ((withdrawTx == withdrawTx))
70	70		then withdrawTx
71	71		else throw("Strict value is not equal to itself.")
72	72		}
73	73
74	74
75	75		func calcFee () = {
76	76		let stakedAmount = tryGetInt(this, "global_staked")
77	77		let lastSRate = tryGetInt(this, "global_lastCheckSRate")
78	78		let sAmount = fraction(stakedAmount, lastSRate, Scale8)
79	79		let totalSupplied = getTotalSuppliedAmount()
80	80		let diff = (totalSupplied - sAmount)
81	81		let fee = fraction(diff, 5000000, Scale8)
82	82		if ((fee > 0))
83	83		then fee
84	84		else 0
85	85		}
86	86
87	87
88	88		func calculateSRate () = {
89	89		let lastCheckSRate = tryGetInt(this, "global_lastCheckSRate")
90	90		let stakedAmount = tryGetInt(this, "global_staked")
91	91		let lastCheckSAmounut = fraction(stakedAmount, lastCheckSRate, Scale8)
92	92		if ((lastCheckSRate == 0))
93	93		then Scale8
94	94		else if ((lastCheckSAmounut == 0))
95	95		then lastCheckSRate
96	96		else {
97	97		let sRate = fraction(lastCheckSRate, (fraction((fraction(getTotalSuppliedAmount(), Scale6, lastCheckSAmounut) - Scale6), (Scale8 - 5000000), Scale8) + Scale6), Scale6)
98	98		if ((Scale8 > sRate))
99	99		then lastCheckSRate
100	100		else sRate
101	101		}
102	102		}
103	103
104	104
105	105		func recalcResult (stakedChange) = {
106	106		let stakedAmount = tryGetInt(this, "global_staked")
107	107		let sRate = calculateSRate()
108	108		[IntegerEntry("global_staked", (stakedAmount + stakedChange)), IntegerEntry("global_lastCheckSRate", sRate)]
109	109		}
110	110
111	111
112		-	func supplyResult (poolId) = if ((indexOf(puzzlePools, poolId) == unit))
	112	+	func supplyResult (poolId,fee) = if ((indexOf(puzzlePools, poolId) == unit))
113	113		then throw(("Unknown poolId " + poolId))
114	114		else {
115		-	let fee = calcFee()
116	115		let assetBytes = fromBase58String(assetId)
117	116		let balance = getBalance(assetBytes)
118	117		let inv = invoke(Address(fromBase58String(poolId)), "supply", nil, [AttachedPayment(assetBytes, balance)])
119	118		if ((inv == inv))
120	119		then {
121	120		let withdrawTx = withdrawFromPuzzlePool(poolId, fee)
122	121		if ((withdrawTx == withdrawTx))
123	122		then [StringEntry("currentPool", poolId), ScriptTransfer(moneyBoxAddress, fee, fromBase58String(assetId))]
124	123		else throw("Strict value is not equal to itself.")
125	124		}
126	125		else throw("Strict value is not equal to itself.")
127	126		}
128	127
129	128
130	129		func withdrawResult () = {
131	130		let currentPool = tryGetStr(this, "currentPool")
132	131		if ((currentPool == ""))
133	132		then throw(("Cannot find pool with id " + currentPool))
134	133		else {
135	134		let amount = getPuzzlePoolSuppliedAmount(currentPool)
136	135		let tx = withdrawFromPuzzlePool(currentPool, amount)
137	136		if ((tx == tx))
138	137		then tx
139	138		else throw("Strict value is not equal to itself.")
140	139		}
141	140		}
142	141
143	142
144	143		func stakeResult (user,amount) = {
145	144		let sAmount = fraction(amount, Scale8, calculateSRate())
146	145		(recalcResult(sAmount) ++ [IntegerEntry((user + "_staked"), (tryGetInt(this, (user + "_staked")) + sAmount))])
147	146		}
148	147
149	148
150	149		func unstakeResult (user,amount) = {
151	150		let sAmount = fraction(amount, Scale8, calculateSRate())
152	151		let userStaked = tryGetInt(this, (user + "_staked"))
153	152		let unstakeAmount = if ((sAmount > userStaked))
154	153		then userStaked
155	154		else sAmount
156	155		(recalcResult(-(unstakeAmount)) ++ [IntegerEntry((user + "_staked"), (userStaked - unstakeAmount))])
157	156		}
158	157
159	158
160	159		@Callable(i)
161	160		func init (poolId) = {
162	161		let currentPool = tryGetStr(this, "currentPool")
163	162		if ((indexOf(validators, toString(i.caller)) == unit))
164	163		then throw("Access denied")
165	164		else if ((currentPool == ""))
166	165		then [StringEntry("currentPool", poolId)]
167	166		else nil
168	167		}
169	168
170	169
171	170
172	171		@Callable(i)
173	172		func rebalance (poolId) = {
174	173		let currentPool = tryGetStr(this, "currentPool")
175	174		if ((indexOf(validators, toString(i.caller)) == unit))
176	175		then throw("Access denied")
177	176		else if ((currentPool == poolId))
178	177		then throw(("Already supplied to" + currentPool))
179	178		else {
180	179		let withdrawTx = withdrawResult()
181	180		if ((withdrawTx == withdrawTx))
182		-	then (supplyResult(poolId) ++ recalcResult(0))
	181	+	then (supplyResult(poolId, 0) ++ recalcResult(0))
183	182		else throw("Strict value is not equal to itself.")
184	183		}
185	184		}
186	185
187	186
188	187
189	188		@Callable(i)
190	189		func stake () = {
191	190		let user = toString(i.caller)
192	191		let amount = i.payments[0].amount
193	192		let currentPool = tryGetStr(this, "currentPool")
194	193		if (if ((0 >= amount))
195	194		then true
196	195		else (i.payments[0].assetId != fromBase58String(assetId)))
197	196		then throw("invalid token attached")
198	197		else if ((currentPool == ""))
199	198		then throw("Pool not initialized")
200		-	else (stakeResult(user, amount) ++ supplyResult(currentPool))
	199	+	else {
	200	+	let fee = calcFee()
	201	+	(stakeResult(user, amount) ++ supplyResult(currentPool, fee))
	202	+	}
201	203		}
202	204
203	205
204	206
205	207		@Callable(i)
206	208		func unstake (amount) = {
207	209		let user = toString(i.caller)
208	210		let currentPool = tryGetStr(this, "currentPool")
209	211		let tx = withdrawFromPuzzlePool(currentPool, amount)
210	212		if ((tx == tx))
211	213		then (unstakeResult(user, amount) ++ [ScriptTransfer(i.caller, amount, fromBase58String(assetId))])
212	214		else throw("Strict value is not equal to itself.")
213	215		}
214	216
215	217
216	218		@Verifier(tx)
217	219		func verify () = sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)
218	220

github/deemru/w8io/c3f4982 
51.65 ms ◑