w8 · tx · D45···TEd

tx · D45XfBnhSAf739GpSBnEYmzb4iAvqNnWBbXzLhBeQTEd

3MwLW8P5yh5T2xML9QqFuVxkVkm9RXqnzXh:  -0.01000000 Waves

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

{
    "type": 13,
    "id": "D45XfBnhSAf739GpSBnEYmzb4iAvqNnWBbXzLhBeQTEd",
    "fee": 1000000,
    "feeAssetId": null,
    "timestamp": 1670354582966,
    "version": 2,
    "chainId": 84,
    "sender": "3MwLW8P5yh5T2xML9QqFuVxkVkm9RXqnzXh",
    "senderPublicKey": "HscGVyJG5M3NMHWKfQbucCBsFLGPi8VmTxTAmcBbaWTa",
    "proofs": [
        "5Ep2YtuidaDYrFfBUSmJrPEEzJoF2ay1eVBekPLsUHmbgpszJyg2zMAzGgSZp43zLMQ6PHAfHgeDFDiFK59UVR3d"
    ],
    "script": "base64:BgITCAISAwoBCBIDCgEIEgASAwoBARYABlNjYWxlNgDAhD0ABlNjYWxlOACAwtcvAAdTY2FsZTE2CQBoAgUGU2NhbGU4BQZTY2FsZTgACnZhbGlkYXRvcnMJAMwIAgIjM05BbXFHanhSQlJQb1JIWlVVcXZoaU5TNmF4bkdwaW5MSEMFA25pbAAPbW9uZXlCb3hBZGRyZXNzCQEHQWRkcmVzcwEBGgFUZKnP467xWXotJQOt2k8QiNBvrQpHH8SpAAdhc3NldElkAixISG1hRlFwVW9id0t4emp6NEVDYUJQdG9GNjlrdWpLd1UyY296YVV6VHNndgALcHV6emxlUG9vbHMJAMwIAgIjM042U3RKZGdtVGZBUnNSTm45WHQ1ckRZRXMzcHI0S0d5MXYFA25pbAEKZ2V0QmFsYW5jZQEHYXNzZXRJZAQHJG1hdGNoMAUHYXNzZXRJZAMJAAECBQckbWF0Y2gwAgRVbml0BAF4BQckbWF0Y2gwCAkA7wcBBQR0aGlzCWF2YWlsYWJsZQkA8AcCBQR0aGlzCQEFdmFsdWUBBQdhc3NldElkAQl0cnlHZXRJbnQCB2FkZHJlc3MDa2V5BAckbWF0Y2gwCQCaCAIFB2FkZHJlc3MFA2tleQMJAAECBQckbWF0Y2gwAgNJbnQEAWIFByRtYXRjaDAFAWIAAAEJdHJ5R2V0U3RyAgdhZGRyZXNzA2tleQQHJG1hdGNoMAkAnQgCBQdhZGRyZXNzBQNrZXkDCQABAgUHJG1hdGNoMAIGU3RyaW5nBAFiBQckbWF0Y2gwBQFiAgABDmdldEFzc2V0U3RyaW5nAQdhc3NldElkBAckbWF0Y2gwBQdhc3NldElkAwkAAQIFByRtYXRjaDACCkJ5dGVWZWN0b3IEAWIFByRtYXRjaDAJANgEAQUBYgIFV0FWRVMBG2dldFB1enpsZVBvb2xTdXBwbGllZEFtb3VudAEGcG9vbElkBAdiYWxhbmNlCQDwBwIJAQdBZGRyZXNzAQkA2QQBBQZwb29sSWQJANkEAQUHYXNzZXRJZAUHYmFsYW5jZQEWZ2V0VG90YWxTdXBwbGllZEFtb3VudAAEC2N1cnJlbnRQb29sCQEJdHJ5R2V0U3RyAgUEdGhpcwILY3VycmVudFBvb2wDCQAAAgULY3VycmVudFBvb2wCAAkAAgEJAKwCAgIZQ2Fubm90IGZpbmQgcG9vbCB3aXRoIGlkIAULY3VycmVudFBvb2wJARtnZXRQdXp6bGVQb29sU3VwcGxpZWRBbW91bnQBBQtjdXJyZW50UG9vbAEWd2l0aGRyYXdGcm9tUHV6emxlUG9vbAIGcG9vbElkBmFtb3VudAQLcG9vbEFkZHJlc3MJAQdBZGRyZXNzAQkA2QQBBQZwb29sSWQECndpdGhkcmF3VHgDCQBmAgUGYW1vdW50AAAJAPwHBAULcG9vbEFkZHJlc3MCCHdpdGhkcmF3CQDMCAIFB2Fzc2V0SWQJAMwIAgUGYW1vdW50BQNuaWwFA25pbAIAAwkAAAIFCndpdGhkcmF3VHgFCndpdGhkcmF3VHgFCndpdGhkcmF3VHgJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BB2NhbGNGZWUABAxzdGFrZWRBbW91bnQJAQl0cnlHZXRJbnQCBQR0aGlzAg1nbG9iYWxfc3Rha2VkBAlsYXN0U1JhdGUJAQl0cnlHZXRJbnQCBQR0aGlzAhVnbG9iYWxfbGFzdENoZWNrU1JhdGUEB3NBbW91bnQJAGsDBQxzdGFrZWRBbW91bnQFCWxhc3RTUmF0ZQUGU2NhbGU4BA10b3RhbFN1cHBsaWVkCQEWZ2V0VG90YWxTdXBwbGllZEFtb3VudAAEBGRpZmYJAGUCBQ10b3RhbFN1cHBsaWVkBQdzQW1vdW50BANmZWUJAGsDBQRkaWZmAMCWsQIFBlNjYWxlOAMJAGYCBQNmZWUAAAUDZmVlAAABDmNhbGN1bGF0ZVNSYXRlAAQObGFzdENoZWNrU1JhdGUJAQl0cnlHZXRJbnQCBQR0aGlzAhVnbG9iYWxfbGFzdENoZWNrU1JhdGUEDHN0YWtlZEFtb3VudAkBCXRyeUdldEludAIFBHRoaXMCDWdsb2JhbF9zdGFrZWQEEWxhc3RDaGVja1NBbW91bnV0CQBrAwUMc3Rha2VkQW1vdW50BQ5sYXN0Q2hlY2tTUmF0ZQUGU2NhbGU4AwkAAAIFDmxhc3RDaGVja1NSYXRlAAAFBlNjYWxlOAMJAAACBRFsYXN0Q2hlY2tTQW1vdW51dAAABQ5sYXN0Q2hlY2tTUmF0ZQQFc1JhdGUJAGsDBQ5sYXN0Q2hlY2tTUmF0ZQkAZAIJAGsDCQBlAgkAawMJARZnZXRUb3RhbFN1cHBsaWVkQW1vdW50AAUGU2NhbGU2BRFsYXN0Q2hlY2tTQW1vdW51dAUGU2NhbGU2CQBlAgUGU2NhbGU4AMCWsQIFBlNjYWxlOAUGU2NhbGU2BQZTY2FsZTYDCQBmAgUGU2NhbGU4BQVzUmF0ZQUObGFzdENoZWNrU1JhdGUFBXNSYXRlAQ9jaGFyZ2VGZWVSZXN1bHQABAtjdXJyZW50UG9vbAkBCXRyeUdldFN0cgIFBHRoaXMCC2N1cnJlbnRQb29sBANmZWUJAQdjYWxjRmVlAAMJAAACBQtjdXJyZW50UG9vbAIACQACAQkArAICAhlDYW5ub3QgZmluZCBwb29sIHdpdGggaWQgBQtjdXJyZW50UG9vbAQKd2l0aGRyYXdUeAkBFndpdGhkcmF3RnJvbVB1enpsZVBvb2wCBQtjdXJyZW50UG9vbAUDZmVlAwkAAAIFCndpdGhkcmF3VHgFCndpdGhkcmF3VHgECGNoYXJnZVR4CQD8BwQFD21vbmV5Qm94QWRkcmVzcwIHZGVwb3NpdAUDbmlsCQDMCAIJAQ9BdHRhY2hlZFBheW1lbnQCCQDZBAEFB2Fzc2V0SWQFA2ZlZQUDbmlsAwkAAAIFCGNoYXJnZVR4BQhjaGFyZ2VUeAUIY2hhcmdlVHgJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BDHJlY2FsY1Jlc3VsdAEMc3Rha2VkQ2hhbmdlBAxzdGFrZWRBbW91bnQJAQl0cnlHZXRJbnQCBQR0aGlzAg1nbG9iYWxfc3Rha2VkBAVzUmF0ZQkBDmNhbGN1bGF0ZVNSYXRlAAMJAGYCBQVzUmF0ZQAACQACAQkArAICAgdzUmF0ZTogCQCkAwEFBXNSYXRlCQDMCAIJAQxJbnRlZ2VyRW50cnkCAg1nbG9iYWxfc3Rha2VkCQBkAgUMc3Rha2VkQW1vdW50BQxzdGFrZWRDaGFuZ2UJAMwIAgkBDEludGVnZXJFbnRyeQICFWdsb2JhbF9sYXN0Q2hlY2tTUmF0ZQUFc1JhdGUFA25pbAEMc3VwcGx5UmVzdWx0AQZwb29sSWQDCQAAAgkAzwgCBQtwdXp6bGVQb29scwUGcG9vbElkBQR1bml0CQACAQkArAICAg9Vbmtub3duIHBvb2xJZCAFBnBvb2xJZAQKYXNzZXRCeXRlcwkA2QQBBQdhc3NldElkBAdiYWxhbmNlCQEKZ2V0QmFsYW5jZQEFCmFzc2V0Qnl0ZXMEA2ludgkA/AcECQEHQWRkcmVzcwEJANkEAQUGcG9vbElkAgZzdXBwbHkFA25pbAkAzAgCCQEPQXR0YWNoZWRQYXltZW50AgUKYXNzZXRCeXRlcwUHYmFsYW5jZQUDbmlsAwkAAAIFA2ludgUDaW52CQDMCAIJAQtTdHJpbmdFbnRyeQICC2N1cnJlbnRQb29sBQZwb29sSWQFA25pbAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgEOd2l0aGRyYXdSZXN1bHQABAtjdXJyZW50UG9vbAkBCXRyeUdldFN0cgIFBHRoaXMCC2N1cnJlbnRQb29sAwkAAAIFC2N1cnJlbnRQb29sAgAJAAIBCQCsAgICGUNhbm5vdCBmaW5kIHBvb2wgd2l0aCBpZCAFC2N1cnJlbnRQb29sBAZhbW91bnQJARtnZXRQdXp6bGVQb29sU3VwcGxpZWRBbW91bnQBBQtjdXJyZW50UG9vbAQCdHgJARZ3aXRoZHJhd0Zyb21QdXp6bGVQb29sAgULY3VycmVudFBvb2wFBmFtb3VudAMJAAACBQJ0eAUCdHgFAnR4CQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAQtzdGFrZVJlc3VsdAIEdXNlcgZhbW91bnQEB3NBbW91bnQJAGsDBQZhbW91bnQFBlNjYWxlOAkBDmNhbGN1bGF0ZVNSYXRlAAkAzggCCQEMcmVjYWxjUmVzdWx0AQUHc0Ftb3VudAkAzAgCCQEMSW50ZWdlckVudHJ5AgkArAICBQR1c2VyAgdfc3Rha2VkCQBkAgkBCXRyeUdldEludAIFBHRoaXMJAKwCAgUEdXNlcgIHX3N0YWtlZAUHc0Ftb3VudAUDbmlsAQ11bnN0YWtlUmVzdWx0AgR1c2VyBmFtb3VudAQHc0Ftb3VudAkAawMFBmFtb3VudAUGU2NhbGU4CQEOY2FsY3VsYXRlU1JhdGUABAp1c2VyU3Rha2VkCQEJdHJ5R2V0SW50AgUEdGhpcwkArAICBQR1c2VyAgdfc3Rha2VkBA11bnN0YWtlQW1vdW50AwkAZgIFB3NBbW91bnQFCnVzZXJTdGFrZWQFCnVzZXJTdGFrZWQFB3NBbW91bnQJAM4IAgkBDHJlY2FsY1Jlc3VsdAEJAQEtAQUNdW5zdGFrZUFtb3VudAkAzAgCCQEMSW50ZWdlckVudHJ5AgkArAICBQR1c2VyAgdfc3Rha2VkCQBlAgUKdXNlclN0YWtlZAUNdW5zdGFrZUFtb3VudAUDbmlsBAFpAQRpbml0AQZwb29sSWQEC2N1cnJlbnRQb29sCQEJdHJ5R2V0U3RyAgUEdGhpcwILY3VycmVudFBvb2wDCQAAAgkAzwgCBQp2YWxpZGF0b3JzCQClCAEIBQFpBmNhbGxlcgUEdW5pdAkAAgECDUFjY2VzcyBkZW5pZWQDCQAAAgULY3VycmVudFBvb2wCAAkAzAgCCQELU3RyaW5nRW50cnkCAgtjdXJyZW50UG9vbAUGcG9vbElkBQNuaWwFA25pbAFpAQlyZWJhbGFuY2UBBnBvb2xJZAQLY3VycmVudFBvb2wJAQl0cnlHZXRTdHICBQR0aGlzAgtjdXJyZW50UG9vbAMJAAACCQDPCAIFCnZhbGlkYXRvcnMJAKUIAQgFAWkGY2FsbGVyBQR1bml0CQACAQINQWNjZXNzIGRlbmllZAMJAAACBQtjdXJyZW50UG9vbAUGcG9vbElkCQACAQkArAICAhNBbHJlYWR5IHN1cHBsaWVkIHRvBQtjdXJyZW50UG9vbAQKd2l0aGRyYXdUeAkBDndpdGhkcmF3UmVzdWx0AAMJAAACBQp3aXRoZHJhd1R4BQp3aXRoZHJhd1R4CQDOCAIJAQxzdXBwbHlSZXN1bHQBBQZwb29sSWQJAQxyZWNhbGNSZXN1bHQBAAAJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BaQEFc3Rha2UABAR1c2VyCQClCAEIBQFpBmNhbGxlcgQGYW1vdW50CAkAkQMCCAUBaQhwYXltZW50cwAABmFtb3VudAQLY3VycmVudFBvb2wJAQl0cnlHZXRTdHICBQR0aGlzAgtjdXJyZW50UG9vbAMDCQBnAgAABQZhbW91bnQGCQECIT0CCAkAkQMCCAUBaQhwYXltZW50cwAAB2Fzc2V0SWQJANkEAQUHYXNzZXRJZAkAAgECFmludmFsaWQgdG9rZW4gYXR0YWNoZWQDCQAAAgULY3VycmVudFBvb2wCAAkAAgECFFBvb2wgbm90IGluaXRpYWxpemVkBAVzdGF0ZQkAzggCCQELc3Rha2VSZXN1bHQCBQR1c2VyBQZhbW91bnQJAQxzdXBwbHlSZXN1bHQBBQtjdXJyZW50UG9vbAQLY2hhcmdlRmVlVHgJAQ9jaGFyZ2VGZWVSZXN1bHQAAwkAAAIFC2NoYXJnZUZlZVR4BQtjaGFyZ2VGZWVUeAUFc3RhdGUJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BaQEHdW5zdGFrZQEGYW1vdW50BAR1c2VyCQClCAEIBQFpBmNhbGxlcgQLY3VycmVudFBvb2wJAQl0cnlHZXRTdHICBQR0aGlzAgtjdXJyZW50UG9vbAQLY2hhcmdlRmVlVHgJAQ9jaGFyZ2VGZWVSZXN1bHQAAwkAAAIFC2NoYXJnZUZlZVR4BQtjaGFyZ2VGZWVUeAQCdHgJARZ3aXRoZHJhd0Zyb21QdXp6bGVQb29sAgULY3VycmVudFBvb2wFBmFtb3VudAMJAAACBQJ0eAUCdHgJAM4IAgkBDXVuc3Rha2VSZXN1bHQCBQR1c2VyBQZhbW91bnQJAMwIAgkBDlNjcmlwdFRyYW5zZmVyAwgFAWkGY2FsbGVyBQZhbW91bnQJANkEAQUHYXNzZXRJZAUDbmlsCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAQJ0eAEGdmVyaWZ5AAkA9AMDCAUCdHgJYm9keUJ5dGVzCQCRAwIIBQJ0eAZwcm9vZnMAAAgFAnR4D3NlbmRlclB1YmxpY0tled7zlwE=",
    "height": 2348900,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: DUbowf6xbdgoX2J4J3X2tUyWK9WpH2H9uRNWHZFqgeiy
Next: E4yCgUwXz7dvTkeuzvwdo991JMgMptmv2TkNccnnvqZA

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

Old	New		Differences
206	206		let user = toString(i.caller)
207	207		let amount = i.payments[0].amount
208	208		let currentPool = tryGetStr(this, "currentPool")
209		-	let chargeFeeTx = chargeFeeResult()
210		-	if ((chargeFeeTx == chargeFeeTx))
211		-	then if (if ((0 >= amount))
212		-	then true
213		-	else (i.payments[0].assetId != fromBase58String(assetId)))
214		-	then throw("invalid token attached")
215		-	else if ((currentPool == ""))
216		-	then throw("Pool not initialized")
217		-	else (stakeResult(user, amount) ++ supplyResult(currentPool))
218		-	else throw("Strict value is not equal to itself.")
	209	+	if (if ((0 >= amount))
	210	+	then true
	211	+	else (i.payments[0].assetId != fromBase58String(assetId)))
	212	+	then throw("invalid token attached")
	213	+	else if ((currentPool == ""))
	214	+	then throw("Pool not initialized")
	215	+	else {
	216	+	let state = (stakeResult(user, amount) ++ supplyResult(currentPool))
	217	+	let chargeFeeTx = chargeFeeResult()
	218	+	if ((chargeFeeTx == chargeFeeTx))
	219	+	then state
	220	+	else throw("Strict value is not equal to itself.")
	221	+	}
219	222		}
220	223
221	224

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

github/deemru/w8io/169f3d6 
28.74 ms ◑