w8 · tx · 5tH···21J

tx · 5tHcPEAocyKjM3oj1bwZrEXy7zhPQYLvTvaJE4zjy21J

3MwLW8P5yh5T2xML9QqFuVxkVkm9RXqnzXh:  -0.00900000 Waves

2022.12.07 00:25 [2349019] smart account 3MwLW8P5yh5T2xML9QqFuVxkVkm9RXqnzXh > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "5tHcPEAocyKjM3oj1bwZrEXy7zhPQYLvTvaJE4zjy21J",
    "fee": 900000,
    "feeAssetId": null,
    "timestamp": 1670361936629,
    "version": 2,
    "chainId": 84,
    "sender": "3MwLW8P5yh5T2xML9QqFuVxkVkm9RXqnzXh",
    "senderPublicKey": "HscGVyJG5M3NMHWKfQbucCBsFLGPi8VmTxTAmcBbaWTa",
    "proofs": [
        "4CE9jQsGSD6TGcnAgiNPDKrWvR3TXwxizMkQAdog3RyEtQyH7St99rxXPTvMJgbjBGFio9UWQ6ax5JS2YLxnykbV"
    ],
    "script": "base64:BgITCAISAwoBCBIDCgEIEgASAwoBARYABlNjYWxlNgDAhD0ABlNjYWxlOACAwtcvAAdTY2FsZTE2CQBoAgUGU2NhbGU4BQZTY2FsZTgACnZhbGlkYXRvcnMJAMwIAgIjM05BbXFHanhSQlJQb1JIWlVVcXZoaU5TNmF4bkdwaW5MSEMFA25pbAAPbW9uZXlCb3hBZGRyZXNzCQEHQWRkcmVzcwEBGgFUZKnP467xWXotJQOt2k8QiNBvrQpHH8SpAAdhc3NldElkAixISG1hRlFwVW9id0t4emp6NEVDYUJQdG9GNjlrdWpLd1UyY296YVV6VHNndgALcHV6emxlUG9vbHMJAMwIAgIjM042U3RKZGdtVGZBUnNSTm45WHQ1ckRZRXMzcHI0S0d5MXYFA25pbAEKZ2V0QmFsYW5jZQEHYXNzZXRJZAQHJG1hdGNoMAUHYXNzZXRJZAMJAAECBQckbWF0Y2gwAgRVbml0BAF4BQckbWF0Y2gwCAkA7wcBBQR0aGlzCWF2YWlsYWJsZQkA8AcCBQR0aGlzCQEFdmFsdWUBBQdhc3NldElkAQl0cnlHZXRJbnQCB2FkZHJlc3MDa2V5BAckbWF0Y2gwCQCaCAIFB2FkZHJlc3MFA2tleQMJAAECBQckbWF0Y2gwAgNJbnQEAWIFByRtYXRjaDAFAWIAAAEJdHJ5R2V0U3RyAgdhZGRyZXNzA2tleQQHJG1hdGNoMAkAnQgCBQdhZGRyZXNzBQNrZXkDCQABAgUHJG1hdGNoMAIGU3RyaW5nBAFiBQckbWF0Y2gwBQFiAgABDmdldEFzc2V0U3RyaW5nAQdhc3NldElkBAckbWF0Y2gwBQdhc3NldElkAwkAAQIFByRtYXRjaDACCkJ5dGVWZWN0b3IEAWIFByRtYXRjaDAJANgEAQUBYgIFV0FWRVMBG2dldFB1enpsZVBvb2xTdXBwbGllZEFtb3VudAEGcG9vbElkBAdiYWxhbmNlCQDwBwIJAQdBZGRyZXNzAQkA2QQBBQZwb29sSWQJANkEAQUHYXNzZXRJZAUHYmFsYW5jZQEWZ2V0VG90YWxTdXBwbGllZEFtb3VudAAEC2N1cnJlbnRQb29sCQEJdHJ5R2V0U3RyAgUEdGhpcwILY3VycmVudFBvb2wDCQAAAgULY3VycmVudFBvb2wCAAkAAgEJAKwCAgIZQ2Fubm90IGZpbmQgcG9vbCB3aXRoIGlkIAULY3VycmVudFBvb2wJARtnZXRQdXp6bGVQb29sU3VwcGxpZWRBbW91bnQBBQtjdXJyZW50UG9vbAEWd2l0aGRyYXdGcm9tUHV6emxlUG9vbAIGcG9vbElkBmFtb3VudAQLcG9vbEFkZHJlc3MJAQdBZGRyZXNzAQkA2QQBBQZwb29sSWQECndpdGhkcmF3VHgDCQBmAgUGYW1vdW50AAAJAPwHBAULcG9vbEFkZHJlc3MCCHdpdGhkcmF3CQDMCAIFB2Fzc2V0SWQJAMwIAgUGYW1vdW50BQNuaWwFA25pbAIAAwkAAAIFCndpdGhkcmF3VHgFCndpdGhkcmF3VHgFCndpdGhkcmF3VHgJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BB2NhbGNGZWUABAxzdGFrZWRBbW91bnQJAQl0cnlHZXRJbnQCBQR0aGlzAg1nbG9iYWxfc3Rha2VkBAlsYXN0U1JhdGUJAQl0cnlHZXRJbnQCBQR0aGlzAhVnbG9iYWxfbGFzdENoZWNrU1JhdGUEB3NBbW91bnQJAGsDBQxzdGFrZWRBbW91bnQFCWxhc3RTUmF0ZQUGU2NhbGU4BA10b3RhbFN1cHBsaWVkCQEWZ2V0VG90YWxTdXBwbGllZEFtb3VudAAEBGRpZmYJAGUCBQ10b3RhbFN1cHBsaWVkBQdzQW1vdW50BANmZWUJAGsDBQRkaWZmAMCWsQIFBlNjYWxlOAMJAGYCBQNmZWUAAAUDZmVlAAABDmNhbGN1bGF0ZVNSYXRlAAQObGFzdENoZWNrU1JhdGUJAQl0cnlHZXRJbnQCBQR0aGlzAhVnbG9iYWxfbGFzdENoZWNrU1JhdGUEDHN0YWtlZEFtb3VudAkBCXRyeUdldEludAIFBHRoaXMCDWdsb2JhbF9zdGFrZWQEEWxhc3RDaGVja1NBbW91bnV0CQBrAwUMc3Rha2VkQW1vdW50BQ5sYXN0Q2hlY2tTUmF0ZQUGU2NhbGU4AwkAAAIFDmxhc3RDaGVja1NSYXRlAAAFBlNjYWxlOAMJAAACBRFsYXN0Q2hlY2tTQW1vdW51dAAABQ5sYXN0Q2hlY2tTUmF0ZQQFc1JhdGUJAGsDBQ5sYXN0Q2hlY2tTUmF0ZQkAZAIJAGsDCQBlAgkAawMJARZnZXRUb3RhbFN1cHBsaWVkQW1vdW50AAUGU2NhbGU2BRFsYXN0Q2hlY2tTQW1vdW51dAUGU2NhbGU2CQBlAgUGU2NhbGU4AMCWsQIFBlNjYWxlOAUGU2NhbGU2BQZTY2FsZTYDCQBmAgUGU2NhbGU4BQVzUmF0ZQUObGFzdENoZWNrU1JhdGUFBXNSYXRlAQxyZWNhbGNSZXN1bHQBDHN0YWtlZENoYW5nZQQMc3Rha2VkQW1vdW50CQEJdHJ5R2V0SW50AgUEdGhpcwINZ2xvYmFsX3N0YWtlZAQFc1JhdGUJAQ5jYWxjdWxhdGVTUmF0ZQADCQBmAgUFc1JhdGUAAAkAAgEJAKwCAgIHc1JhdGU6IAkApAMBBQVzUmF0ZQkAzAgCCQEMSW50ZWdlckVudHJ5AgINZ2xvYmFsX3N0YWtlZAkAZAIFDHN0YWtlZEFtb3VudAUMc3Rha2VkQ2hhbmdlCQDMCAIJAQxJbnRlZ2VyRW50cnkCAhVnbG9iYWxfbGFzdENoZWNrU1JhdGUFBXNSYXRlBQNuaWwBDHN1cHBseVJlc3VsdAIGcG9vbElkA2ZlZQMJAAACCQDPCAIFC3B1enpsZVBvb2xzBQZwb29sSWQFBHVuaXQJAAIBCQCsAgICD1Vua25vd24gcG9vbElkIAUGcG9vbElkBAphc3NldEJ5dGVzCQDZBAEFB2Fzc2V0SWQEB2JhbGFuY2UJAQpnZXRCYWxhbmNlAQUKYXNzZXRCeXRlcwQIc3VwcGx5VHgJAPwHBAkBB0FkZHJlc3MBCQDZBAEFBnBvb2xJZAIGc3VwcGx5BQNuaWwJAMwIAgkBD0F0dGFjaGVkUGF5bWVudAIFCmFzc2V0Qnl0ZXMFB2JhbGFuY2UFA25pbAMJAAACBQhzdXBwbHlUeAUIc3VwcGx5VHgEDXdpdGhkcmF3RmVlVHgJARZ3aXRoZHJhd0Zyb21QdXp6bGVQb29sAgUGcG9vbElkBQNmZWUDCQAAAgUNd2l0aGRyYXdGZWVUeAUNd2l0aGRyYXdGZWVUeAkAzAgCCQELU3RyaW5nRW50cnkCAgtjdXJyZW50UG9vbAUGcG9vbElkCQDMCAIJAQ5TY3JpcHRUcmFuc2ZlcgMFD21vbmV5Qm94QWRkcmVzcwUDZmVlCQDZBAEFB2Fzc2V0SWQFA25pbAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgEOd2l0aGRyYXdSZXN1bHQABAtjdXJyZW50UG9vbAkBCXRyeUdldFN0cgIFBHRoaXMCC2N1cnJlbnRQb29sAwkAAAIFC2N1cnJlbnRQb29sAgAJAAIBCQCsAgICGUNhbm5vdCBmaW5kIHBvb2wgd2l0aCBpZCAFC2N1cnJlbnRQb29sBAZhbW91bnQJARtnZXRQdXp6bGVQb29sU3VwcGxpZWRBbW91bnQBBQtjdXJyZW50UG9vbAQCdHgJARZ3aXRoZHJhd0Zyb21QdXp6bGVQb29sAgULY3VycmVudFBvb2wFBmFtb3VudAMJAAACBQJ0eAUCdHgFAnR4CQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAQtzdGFrZVJlc3VsdAIEdXNlcgZhbW91bnQEB3NBbW91bnQJAGsDBQZhbW91bnQFBlNjYWxlOAkBDmNhbGN1bGF0ZVNSYXRlAAkAzggCCQEMcmVjYWxjUmVzdWx0AQUHc0Ftb3VudAkAzAgCCQEMSW50ZWdlckVudHJ5AgkArAICBQR1c2VyAgdfc3Rha2VkCQBkAgkBCXRyeUdldEludAIFBHRoaXMJAKwCAgUEdXNlcgIHX3N0YWtlZAUHc0Ftb3VudAUDbmlsAQ11bnN0YWtlUmVzdWx0AgR1c2VyBmFtb3VudAQHc0Ftb3VudAkAawMFBmFtb3VudAUGU2NhbGU4CQEOY2FsY3VsYXRlU1JhdGUABAp1c2VyU3Rha2VkCQEJdHJ5R2V0SW50AgUEdGhpcwkArAICBQR1c2VyAgdfc3Rha2VkBA11bnN0YWtlQW1vdW50AwkAZgIFB3NBbW91bnQFCnVzZXJTdGFrZWQFCnVzZXJTdGFrZWQFB3NBbW91bnQJAM4IAgkBDHJlY2FsY1Jlc3VsdAEJAQEtAQUNdW5zdGFrZUFtb3VudAkAzAgCCQEMSW50ZWdlckVudHJ5AgkArAICBQR1c2VyAgdfc3Rha2VkCQBlAgUKdXNlclN0YWtlZAUNdW5zdGFrZUFtb3VudAUDbmlsAQlkb1Vuc3Rha2UEC2N1cnJlbnRQb29sBmNhbGxlcgZhbW91bnQDZmVlBAJ0eAkBFndpdGhkcmF3RnJvbVB1enpsZVBvb2wCBQtjdXJyZW50UG9vbAkAZAIFBmFtb3VudAUDZmVlAwkAAAIFAnR4BQJ0eAkAzAgCCQEOU2NyaXB0VHJhbnNmZXIDBQZjYWxsZXIFBmFtb3VudAkA2QQBBQdhc3NldElkCQDMCAIJAQ5TY3JpcHRUcmFuc2ZlcgMFD21vbmV5Qm94QWRkcmVzcwUDZmVlCQDZBAEFB2Fzc2V0SWQFA25pbAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgQBaQEEaW5pdAEGcG9vbElkBAtjdXJyZW50UG9vbAkBCXRyeUdldFN0cgIFBHRoaXMCC2N1cnJlbnRQb29sAwkAAAIJAM8IAgUKdmFsaWRhdG9ycwkApQgBCAUBaQZjYWxsZXIFBHVuaXQJAAIBAg1BY2Nlc3MgZGVuaWVkAwkAAAIFC2N1cnJlbnRQb29sAgAJAMwIAgkBC1N0cmluZ0VudHJ5AgILY3VycmVudFBvb2wFBnBvb2xJZAUDbmlsBQNuaWwBaQEJcmViYWxhbmNlAQZwb29sSWQEC2N1cnJlbnRQb29sCQEJdHJ5R2V0U3RyAgUEdGhpcwILY3VycmVudFBvb2wDCQAAAgkAzwgCBQp2YWxpZGF0b3JzCQClCAEIBQFpBmNhbGxlcgUEdW5pdAkAAgECDUFjY2VzcyBkZW5pZWQDCQAAAgULY3VycmVudFBvb2wFBnBvb2xJZAkAAgEJAKwCAgITQWxyZWFkeSBzdXBwbGllZCB0bwULY3VycmVudFBvb2wECndpdGhkcmF3VHgJAQ53aXRoZHJhd1Jlc3VsdAADCQAAAgUKd2l0aGRyYXdUeAUKd2l0aGRyYXdUeAkAzggCCQEMc3VwcGx5UmVzdWx0AgUGcG9vbElkAAAJAQxyZWNhbGNSZXN1bHQBAAAJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BaQEFc3Rha2UABAR1c2VyCQClCAEIBQFpBmNhbGxlcgQGYW1vdW50CAkAkQMCCAUBaQhwYXltZW50cwAABmFtb3VudAQLY3VycmVudFBvb2wJAQl0cnlHZXRTdHICBQR0aGlzAgtjdXJyZW50UG9vbAMDCQBnAgAABQZhbW91bnQGCQECIT0CCAkAkQMCCAUBaQhwYXltZW50cwAAB2Fzc2V0SWQJANkEAQUHYXNzZXRJZAkAAgECFmludmFsaWQgdG9rZW4gYXR0YWNoZWQDCQAAAgULY3VycmVudFBvb2wCAAkAAgECFFBvb2wgbm90IGluaXRpYWxpemVkBANmZWUJAQdjYWxjRmVlAAkAzggCCQELc3Rha2VSZXN1bHQCBQR1c2VyBQZhbW91bnQJAQxzdXBwbHlSZXN1bHQCBQtjdXJyZW50UG9vbAUDZmVlAWkBB3Vuc3Rha2UBBmFtb3VudAQEdXNlcgkApQgBCAUBaQZjYWxsZXIEC2N1cnJlbnRQb29sCQEJdHJ5R2V0U3RyAgUEdGhpcwILY3VycmVudFBvb2wEA2ZlZQkBB2NhbGNGZWUABAVhc3NldAkA2QQBBQdhc3NldElkCQDOCAIJAQ11bnN0YWtlUmVzdWx0AgUEdXNlcgUGYW1vdW50CQEJZG9VbnN0YWtlBAULY3VycmVudFBvb2wIBQFpBmNhbGxlcgUGYW1vdW50BQNmZWUBAnR4AQZ2ZXJpZnkACQD0AwMIBQJ0eAlib2R5Qnl0ZXMJAJEDAggFAnR4BnByb29mcwAACAUCdHgPc2VuZGVyUHVibGljS2V51iwgPw==",
    "height": 2349019,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: AiyEJ2Mr4gsuUNeX1c2hjmfXT5o1qhQu5Xn26TVVsM49
Next: 7csLnRLptEWDYsXpdeCKZ1oP1NtCS7rX21g9DW9x4hMt

Diff: 
Old New Differences
158 158      }
159 159  
160 160  
161 + func doUnstake (currentPool,caller,amount,fee) = {
162 +     let tx = withdrawFromPuzzlePool(currentPool, (amount + fee))
163 +     if ((tx == tx))
164 +         then [ScriptTransfer(caller, amount, fromBase58String(assetId)), ScriptTransfer(moneyBoxAddress, fee, fromBase58String(assetId))]
165 +         else throw("Strict value is not equal to itself.")
166 +     }
167 + 
168 + 
161 169  @Callable(i)
162 170  func init (poolId) = {
163 171      let currentPool = tryGetStr(this, "currentPool")
212 220      let currentPool = tryGetStr(this, "currentPool")
213 221      let fee = calcFee()
214 222      let asset = fromBase58String(assetId)
215 -     let unstakeResultState = unstakeResult(user, amount)
216 -     unstakeResultState
223 +     (unstakeResult(user, amount) ++ doUnstake(currentPool, i.caller, amount, fee))
217 224      }
218 225  
219 226  
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      if ((sRate > 0))
109 109          then throw(("sRate: " + toString(sRate)))
110 110          else [IntegerEntry("global_staked", (stakedAmount + stakedChange)), IntegerEntry("global_lastCheckSRate", sRate)]
111 111      }
112 112  
113 113  
114 114  func supplyResult (poolId,fee) = if ((indexOf(puzzlePools, poolId) == unit))
115 115      then throw(("Unknown poolId " + poolId))
116 116      else {
117 117          let assetBytes = fromBase58String(assetId)
118 118          let balance = getBalance(assetBytes)
119 119          let supplyTx = invoke(Address(fromBase58String(poolId)), "supply", nil, [AttachedPayment(assetBytes, balance)])
120 120          if ((supplyTx == supplyTx))
121 121              then {
122 122                  let withdrawFeeTx = withdrawFromPuzzlePool(poolId, fee)
123 123                  if ((withdrawFeeTx == withdrawFeeTx))
124 124                      then [StringEntry("currentPool", poolId), ScriptTransfer(moneyBoxAddress, fee, fromBase58String(assetId))]
125 125                      else throw("Strict value is not equal to itself.")
126 126                  }
127 127              else throw("Strict value is not equal to itself.")
128 128          }
129 129  
130 130  
131 131  func withdrawResult () = {
132 132      let currentPool = tryGetStr(this, "currentPool")
133 133      if ((currentPool == ""))
134 134          then throw(("Cannot find pool with id " + currentPool))
135 135          else {
136 136              let amount = getPuzzlePoolSuppliedAmount(currentPool)
137 137              let tx = withdrawFromPuzzlePool(currentPool, amount)
138 138              if ((tx == tx))
139 139                  then tx
140 140                  else throw("Strict value is not equal to itself.")
141 141              }
142 142      }
143 143  
144 144  
145 145  func stakeResult (user,amount) = {
146 146      let sAmount = fraction(amount, Scale8, calculateSRate())
147 147      (recalcResult(sAmount) ++ [IntegerEntry((user + "_staked"), (tryGetInt(this, (user + "_staked")) + sAmount))])
148 148      }
149 149  
150 150  
151 151  func unstakeResult (user,amount) = {
152 152      let sAmount = fraction(amount, Scale8, calculateSRate())
153 153      let userStaked = tryGetInt(this, (user + "_staked"))
154 154      let unstakeAmount = if ((sAmount > userStaked))
155 155          then userStaked
156 156          else sAmount
157 157      (recalcResult(-(unstakeAmount)) ++ [IntegerEntry((user + "_staked"), (userStaked - unstakeAmount))])
158 158      }
159 159  
160 160  
161 + func doUnstake (currentPool,caller,amount,fee) = {
162 +     let tx = withdrawFromPuzzlePool(currentPool, (amount + fee))
163 +     if ((tx == tx))
164 +         then [ScriptTransfer(caller, amount, fromBase58String(assetId)), ScriptTransfer(moneyBoxAddress, fee, fromBase58String(assetId))]
165 +         else throw("Strict value is not equal to itself.")
166 +     }
167 + 
168 + 
161 169  @Callable(i)
162 170  func init (poolId) = {
163 171      let currentPool = tryGetStr(this, "currentPool")
164 172      if ((indexOf(validators, toString(i.caller)) == unit))
165 173          then throw("Access denied")
166 174          else if ((currentPool == ""))
167 175              then [StringEntry("currentPool", poolId)]
168 176              else nil
169 177      }
170 178  
171 179  
172 180  
173 181  @Callable(i)
174 182  func rebalance (poolId) = {
175 183      let currentPool = tryGetStr(this, "currentPool")
176 184      if ((indexOf(validators, toString(i.caller)) == unit))
177 185          then throw("Access denied")
178 186          else if ((currentPool == poolId))
179 187              then throw(("Already supplied to" + currentPool))
180 188              else {
181 189                  let withdrawTx = withdrawResult()
182 190                  if ((withdrawTx == withdrawTx))
183 191                      then (supplyResult(poolId, 0) ++ recalcResult(0))
184 192                      else throw("Strict value is not equal to itself.")
185 193                  }
186 194      }
187 195  
188 196  
189 197  
190 198  @Callable(i)
191 199  func stake () = {
192 200      let user = toString(i.caller)
193 201      let amount = i.payments[0].amount
194 202      let currentPool = tryGetStr(this, "currentPool")
195 203      if (if ((0 >= amount))
196 204          then true
197 205          else (i.payments[0].assetId != fromBase58String(assetId)))
198 206          then throw("invalid token attached")
199 207          else if ((currentPool == ""))
200 208              then throw("Pool not initialized")
201 209              else {
202 210                  let fee = calcFee()
203 211                  (stakeResult(user, amount) ++ supplyResult(currentPool, fee))
204 212                  }
205 213      }
206 214  
207 215  
208 216  
209 217  @Callable(i)
210 218  func unstake (amount) = {
211 219      let user = toString(i.caller)
212 220      let currentPool = tryGetStr(this, "currentPool")
213 221      let fee = calcFee()
214 222      let asset = fromBase58String(assetId)
215 -     let unstakeResultState = unstakeResult(user, amount)
216 -     unstakeResultState
223 +     (unstakeResult(user, amount) ++ doUnstake(currentPool, i.caller, amount, fee))
217 224      }
218 225  
219 226  
220 227  @Verifier(tx)
221 228  func verify () = sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)
222 229

Old	New		Differences
158	158		}
159	159
160	160
	161	+	func doUnstake (currentPool,caller,amount,fee) = {
	162	+	let tx = withdrawFromPuzzlePool(currentPool, (amount + fee))
	163	+	if ((tx == tx))
	164	+	then [ScriptTransfer(caller, amount, fromBase58String(assetId)), ScriptTransfer(moneyBoxAddress, fee, fromBase58String(assetId))]
	165	+	else throw("Strict value is not equal to itself.")
	166	+	}
	167	+
	168	+
161	169		@Callable(i)
162	170		func init (poolId) = {
163	171		let currentPool = tryGetStr(this, "currentPool")

212	220		let currentPool = tryGetStr(this, "currentPool")
213	221		let fee = calcFee()
214	222		let asset = fromBase58String(assetId)
215		-	let unstakeResultState = unstakeResult(user, amount)
216		-	unstakeResultState
	223	+	(unstakeResult(user, amount) ++ doUnstake(currentPool, i.caller, amount, fee))
217	224		}
218	225
219	226

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		if ((sRate > 0))
109	109		then throw(("sRate: " + toString(sRate)))
110	110		else [IntegerEntry("global_staked", (stakedAmount + stakedChange)), IntegerEntry("global_lastCheckSRate", sRate)]
111	111		}
112	112
113	113
114	114		func supplyResult (poolId,fee) = if ((indexOf(puzzlePools, poolId) == unit))
115	115		then throw(("Unknown poolId " + poolId))
116	116		else {
117	117		let assetBytes = fromBase58String(assetId)
118	118		let balance = getBalance(assetBytes)
119	119		let supplyTx = invoke(Address(fromBase58String(poolId)), "supply", nil, [AttachedPayment(assetBytes, balance)])
120	120		if ((supplyTx == supplyTx))
121	121		then {
122	122		let withdrawFeeTx = withdrawFromPuzzlePool(poolId, fee)
123	123		if ((withdrawFeeTx == withdrawFeeTx))
124	124		then [StringEntry("currentPool", poolId), ScriptTransfer(moneyBoxAddress, fee, fromBase58String(assetId))]
125	125		else throw("Strict value is not equal to itself.")
126	126		}
127	127		else throw("Strict value is not equal to itself.")
128	128		}
129	129
130	130
131	131		func withdrawResult () = {
132	132		let currentPool = tryGetStr(this, "currentPool")
133	133		if ((currentPool == ""))
134	134		then throw(("Cannot find pool with id " + currentPool))
135	135		else {
136	136		let amount = getPuzzlePoolSuppliedAmount(currentPool)
137	137		let tx = withdrawFromPuzzlePool(currentPool, amount)
138	138		if ((tx == tx))
139	139		then tx
140	140		else throw("Strict value is not equal to itself.")
141	141		}
142	142		}
143	143
144	144
145	145		func stakeResult (user,amount) = {
146	146		let sAmount = fraction(amount, Scale8, calculateSRate())
147	147		(recalcResult(sAmount) ++ [IntegerEntry((user + "_staked"), (tryGetInt(this, (user + "_staked")) + sAmount))])
148	148		}
149	149
150	150
151	151		func unstakeResult (user,amount) = {
152	152		let sAmount = fraction(amount, Scale8, calculateSRate())
153	153		let userStaked = tryGetInt(this, (user + "_staked"))
154	154		let unstakeAmount = if ((sAmount > userStaked))
155	155		then userStaked
156	156		else sAmount
157	157		(recalcResult(-(unstakeAmount)) ++ [IntegerEntry((user + "_staked"), (userStaked - unstakeAmount))])
158	158		}
159	159
160	160
	161	+	func doUnstake (currentPool,caller,amount,fee) = {
	162	+	let tx = withdrawFromPuzzlePool(currentPool, (amount + fee))
	163	+	if ((tx == tx))
	164	+	then [ScriptTransfer(caller, amount, fromBase58String(assetId)), ScriptTransfer(moneyBoxAddress, fee, fromBase58String(assetId))]
	165	+	else throw("Strict value is not equal to itself.")
	166	+	}
	167	+
	168	+
161	169		@Callable(i)
162	170		func init (poolId) = {
163	171		let currentPool = tryGetStr(this, "currentPool")
164	172		if ((indexOf(validators, toString(i.caller)) == unit))
165	173		then throw("Access denied")
166	174		else if ((currentPool == ""))
167	175		then [StringEntry("currentPool", poolId)]
168	176		else nil
169	177		}
170	178
171	179
172	180
173	181		@Callable(i)
174	182		func rebalance (poolId) = {
175	183		let currentPool = tryGetStr(this, "currentPool")
176	184		if ((indexOf(validators, toString(i.caller)) == unit))
177	185		then throw("Access denied")
178	186		else if ((currentPool == poolId))
179	187		then throw(("Already supplied to" + currentPool))
180	188		else {
181	189		let withdrawTx = withdrawResult()
182	190		if ((withdrawTx == withdrawTx))
183	191		then (supplyResult(poolId, 0) ++ recalcResult(0))
184	192		else throw("Strict value is not equal to itself.")
185	193		}
186	194		}
187	195
188	196
189	197
190	198		@Callable(i)
191	199		func stake () = {
192	200		let user = toString(i.caller)
193	201		let amount = i.payments[0].amount
194	202		let currentPool = tryGetStr(this, "currentPool")
195	203		if (if ((0 >= amount))
196	204		then true
197	205		else (i.payments[0].assetId != fromBase58String(assetId)))
198	206		then throw("invalid token attached")
199	207		else if ((currentPool == ""))
200	208		then throw("Pool not initialized")
201	209		else {
202	210		let fee = calcFee()
203	211		(stakeResult(user, amount) ++ supplyResult(currentPool, fee))
204	212		}
205	213		}
206	214
207	215
208	216
209	217		@Callable(i)
210	218		func unstake (amount) = {
211	219		let user = toString(i.caller)
212	220		let currentPool = tryGetStr(this, "currentPool")
213	221		let fee = calcFee()
214	222		let asset = fromBase58String(assetId)
215		-	let unstakeResultState = unstakeResult(user, amount)
216		-	unstakeResultState
	223	+	(unstakeResult(user, amount) ++ doUnstake(currentPool, i.caller, amount, fee))
217	224		}
218	225
219	226
220	227		@Verifier(tx)
221	228		func verify () = sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)
222	229

github/deemru/w8io/169f3d6 
44.64 ms ◑