w8 · tx · DFX···Er5

tx · DFXagidqvtSvNB9NXPAufUXbiARjqbYWAzG5P5EGVEr5

3MwLW8P5yh5T2xML9QqFuVxkVkm9RXqnzXh:  -0.01000000 Waves

2022.12.07 02:15 [2349132] smart account 3MwLW8P5yh5T2xML9QqFuVxkVkm9RXqnzXh > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "DFXagidqvtSvNB9NXPAufUXbiARjqbYWAzG5P5EGVEr5",
    "fee": 1000000,
    "feeAssetId": null,
    "timestamp": 1670368515842,
    "version": 2,
    "chainId": 84,
    "sender": "3MwLW8P5yh5T2xML9QqFuVxkVkm9RXqnzXh",
    "senderPublicKey": "HscGVyJG5M3NMHWKfQbucCBsFLGPi8VmTxTAmcBbaWTa",
    "proofs": [
        "4g7vNi655wbvPg1MN5ALWQ93WV7jsaBkCLqB8g7ki51jhNir2yHrZWpwDLgNmnR1fUZLmiUzznJDU3rTYxisr1nr"
    ],
    "script": "base64:BgITCAISAwoBCBIDCgEIEgASAwoBARcABlNjYWxlNgDAhD0ABlNjYWxlOACAwtcvAAdTY2FsZTE2CQBoAgUGU2NhbGU4BQZTY2FsZTgACnZhbGlkYXRvcnMJAMwIAgIjM05BbXFHanhSQlJQb1JIWlVVcXZoaU5TNmF4bkdwaW5MSEMFA25pbAAPbW9uZXlCb3hBZGRyZXNzCQEHQWRkcmVzcwEBGgFUZKnP467xWXotJQOt2k8QiNBvrQpHH8SpAAdhc3NldElkAixISG1hRlFwVW9id0t4emp6NEVDYUJQdG9GNjlrdWpLd1UyY296YVV6VHNndgALcHV6emxlUG9vbHMJAMwIAgIjM042U3RKZGdtVGZBUnNSTm45WHQ1ckRZRXMzcHI0S0d5MXYFA25pbAEKZ2V0QmFsYW5jZQEHYXNzZXRJZAQHJG1hdGNoMAUHYXNzZXRJZAMJAAECBQckbWF0Y2gwAgRVbml0BAF4BQckbWF0Y2gwCAkA7wcBBQR0aGlzCWF2YWlsYWJsZQkA8AcCBQR0aGlzCQEFdmFsdWUBBQdhc3NldElkAQl0cnlHZXRJbnQCB2FkZHJlc3MDa2V5BAckbWF0Y2gwCQCaCAIFB2FkZHJlc3MFA2tleQMJAAECBQckbWF0Y2gwAgNJbnQEAWIFByRtYXRjaDAFAWIAAAEJdHJ5R2V0U3RyAgdhZGRyZXNzA2tleQQHJG1hdGNoMAkAnQgCBQdhZGRyZXNzBQNrZXkDCQABAgUHJG1hdGNoMAIGU3RyaW5nBAFiBQckbWF0Y2gwBQFiAgABDmdldEFzc2V0U3RyaW5nAQdhc3NldElkBAckbWF0Y2gwBQdhc3NldElkAwkAAQIFByRtYXRjaDACCkJ5dGVWZWN0b3IEAWIFByRtYXRjaDAJANgEAQUBYgIFV0FWRVMBG2dldFB1enpsZVBvb2xTdXBwbGllZEFtb3VudAEGcG9vbElkBAdiYWxhbmNlCQDwBwIJAQdBZGRyZXNzAQkA2QQBBQZwb29sSWQJANkEAQUHYXNzZXRJZAUHYmFsYW5jZQEWZ2V0VG90YWxTdXBwbGllZEFtb3VudAAEC2N1cnJlbnRQb29sCQEJdHJ5R2V0U3RyAgUEdGhpcwILY3VycmVudFBvb2wDCQAAAgULY3VycmVudFBvb2wCAAkAAgEJAKwCAgIZQ2Fubm90IGZpbmQgcG9vbCB3aXRoIGlkIAULY3VycmVudFBvb2wJARtnZXRQdXp6bGVQb29sU3VwcGxpZWRBbW91bnQBBQtjdXJyZW50UG9vbAEWd2l0aGRyYXdGcm9tUHV6emxlUG9vbAIGcG9vbElkBmFtb3VudAQLcG9vbEFkZHJlc3MJAQdBZGRyZXNzAQkA2QQBBQZwb29sSWQECndpdGhkcmF3VHgDCQBmAgUGYW1vdW50AAAJAPwHBAULcG9vbEFkZHJlc3MCCHdpdGhkcmF3CQDMCAIFB2Fzc2V0SWQJAMwIAgUGYW1vdW50BQNuaWwFA25pbAIAAwkAAAIFCndpdGhkcmF3VHgFCndpdGhkcmF3VHgFCndpdGhkcmF3VHgJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BDGNhbGN1bGF0ZUZlZQAEDHN0YWtlZEFtb3VudAkBCXRyeUdldEludAIFBHRoaXMCDWdsb2JhbF9zdGFrZWQECWxhc3RTUmF0ZQkBCXRyeUdldEludAIFBHRoaXMCFWdsb2JhbF9sYXN0Q2hlY2tTUmF0ZQQHc0Ftb3VudAkAawMFDHN0YWtlZEFtb3VudAUJbGFzdFNSYXRlBQZTY2FsZTgEDXRvdGFsU3VwcGxpZWQJARZnZXRUb3RhbFN1cHBsaWVkQW1vdW50AAQEZGlmZgkAZQIFDXRvdGFsU3VwcGxpZWQFB3NBbW91bnQEA2ZlZQkAawMFBGRpZmYAwJaxAgUGU2NhbGU4AwkAZgIFA2ZlZQAABQNmZWUAAAEOY2FsY3VsYXRlU1JhdGUABA5sYXN0Q2hlY2tTUmF0ZQkBCXRyeUdldEludAIFBHRoaXMCFWdsb2JhbF9sYXN0Q2hlY2tTUmF0ZQQMc3Rha2VkQW1vdW50CQEJdHJ5R2V0SW50AgUEdGhpcwINZ2xvYmFsX3N0YWtlZAQRbGFzdENoZWNrU0Ftb3VudXQJAGsDBQxzdGFrZWRBbW91bnQFDmxhc3RDaGVja1NSYXRlBQZTY2FsZTgDCQAAAgUObGFzdENoZWNrU1JhdGUAAAUGU2NhbGU4AwkAAAIFEWxhc3RDaGVja1NBbW91bnV0AAAFDmxhc3RDaGVja1NSYXRlBAVzUmF0ZQkAawMFDmxhc3RDaGVja1NSYXRlCQBkAgkAawMJAGUCCQBrAwkBFmdldFRvdGFsU3VwcGxpZWRBbW91bnQABQZTY2FsZTYFEWxhc3RDaGVja1NBbW91bnV0BQZTY2FsZTYJAGUCBQZTY2FsZTgAwJaxAgUGU2NhbGU4BQZTY2FsZTYFBlNjYWxlNgMJAGYCBQZTY2FsZTgFBXNSYXRlBQ5sYXN0Q2hlY2tTUmF0ZQUFc1JhdGUBDHJlY2FsY1Jlc3VsdAEMc3Rha2VkQ2hhbmdlBAxzdGFrZWRBbW91bnQJAQl0cnlHZXRJbnQCBQR0aGlzAg1nbG9iYWxfc3Rha2VkBAVzUmF0ZQkBDmNhbGN1bGF0ZVNSYXRlAAkAzAgCCQEMSW50ZWdlckVudHJ5AgINZ2xvYmFsX3N0YWtlZAkAZAIFDHN0YWtlZEFtb3VudAUMc3Rha2VkQ2hhbmdlCQDMCAIJAQxJbnRlZ2VyRW50cnkCAhVnbG9iYWxfbGFzdENoZWNrU1JhdGUFBXNSYXRlBQNuaWwBDHN1cHBseVJlc3VsdAEGcG9vbElkAwkAAAIJAM8IAgULcHV6emxlUG9vbHMFBnBvb2xJZAUEdW5pdAkAAgEJAKwCAgIPVW5rbm93biBwb29sSWQgBQZwb29sSWQECmFzc2V0Qnl0ZXMJANkEAQUHYXNzZXRJZAQHYmFsYW5jZQkBCmdldEJhbGFuY2UBBQphc3NldEJ5dGVzBANpbnYJAPwHBAkBB0FkZHJlc3MBCQDZBAEFBnBvb2xJZAIGc3VwcGx5BQNuaWwJAMwIAgkBD0F0dGFjaGVkUGF5bWVudAIFCmFzc2V0Qnl0ZXMFB2JhbGFuY2UFA25pbAMJAAACBQNpbnYFA2ludgkAzAgCCQELU3RyaW5nRW50cnkCAgtjdXJyZW50UG9vbAUGcG9vbElkBQNuaWwJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BD2NoYXJnZUZlZVJlc3VsdAIGcG9vbElkA2ZlZQQNd2l0aGRyYXdGZWVUeAkBFndpdGhkcmF3RnJvbVB1enpsZVBvb2wCBQZwb29sSWQFA2ZlZQMJAAACBQ13aXRoZHJhd0ZlZVR4BQ13aXRoZHJhd0ZlZVR4CQDMCAIJAQ5TY3JpcHRUcmFuc2ZlcgMFD21vbmV5Qm94QWRkcmVzcwUDZmVlCQDZBAEFB2Fzc2V0SWQFA25pbAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgEOd2l0aGRyYXdSZXN1bHQABAtjdXJyZW50UG9vbAkBCXRyeUdldFN0cgIFBHRoaXMCC2N1cnJlbnRQb29sAwkAAAIFC2N1cnJlbnRQb29sAgAJAAIBCQCsAgICGUNhbm5vdCBmaW5kIHBvb2wgd2l0aCBpZCAFC2N1cnJlbnRQb29sBAZhbW91bnQJARtnZXRQdXp6bGVQb29sU3VwcGxpZWRBbW91bnQBBQtjdXJyZW50UG9vbAQCdHgJARZ3aXRoZHJhd0Zyb21QdXp6bGVQb29sAgULY3VycmVudFBvb2wFBmFtb3VudAMJAAACBQJ0eAUCdHgFAnR4CQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAQtzdGFrZVJlc3VsdAIEdXNlcgZhbW91bnQEB3NBbW91bnQJAGsDBQZhbW91bnQFBlNjYWxlOAkBDmNhbGN1bGF0ZVNSYXRlAAkAzggCCQEMcmVjYWxjUmVzdWx0AQUHc0Ftb3VudAkAzAgCCQEMSW50ZWdlckVudHJ5AgkArAICBQR1c2VyAgdfc3Rha2VkCQBkAgkBCXRyeUdldEludAIFBHRoaXMJAKwCAgUEdXNlcgIHX3N0YWtlZAUHc0Ftb3VudAUDbmlsAQ11bnN0YWtlUmVzdWx0AgR1c2VyBmFtb3VudAQHc0Ftb3VudAkAawMFBmFtb3VudAUGU2NhbGU4CQEOY2FsY3VsYXRlU1JhdGUABAp1c2VyU3Rha2VkCQEJdHJ5R2V0SW50AgUEdGhpcwkArAICBQR1c2VyAgdfc3Rha2VkBA11bnN0YWtlQW1vdW50AwkAZgIFB3NBbW91bnQFCnVzZXJTdGFrZWQFCnVzZXJTdGFrZWQFB3NBbW91bnQJAM4IAgkBDHJlY2FsY1Jlc3VsdAEJAQEtAQUNdW5zdGFrZUFtb3VudAkAzAgCCQEMSW50ZWdlckVudHJ5AgkArAICBQR1c2VyAgdfc3Rha2VkCQBlAgUKdXNlclN0YWtlZAUNdW5zdGFrZUFtb3VudAUDbmlsARh1bnN0YWtlQW5kVHJhbnNmZXJSZXN1bHQDC2N1cnJlbnRQb29sBmNhbGxlcgZhbW91bnQEAnR4CQEWd2l0aGRyYXdGcm9tUHV6emxlUG9vbAIFC2N1cnJlbnRQb29sBQZhbW91bnQDCQAAAgUCdHgFAnR4CQDMCAIJAQ5TY3JpcHRUcmFuc2ZlcgMFBmNhbGxlcgUGYW1vdW50CQDZBAEFB2Fzc2V0SWQFA25pbAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgQBaQEEaW5pdAEGcG9vbElkBAtjdXJyZW50UG9vbAkBCXRyeUdldFN0cgIFBHRoaXMCC2N1cnJlbnRQb29sAwkAAAIJAM8IAgUKdmFsaWRhdG9ycwkApQgBCAUBaQZjYWxsZXIFBHVuaXQJAAIBAg1BY2Nlc3MgZGVuaWVkAwkAAAIFC2N1cnJlbnRQb29sAgAJAMwIAgkBC1N0cmluZ0VudHJ5AgILY3VycmVudFBvb2wFBnBvb2xJZAUDbmlsBQNuaWwBaQEJcmViYWxhbmNlAQZwb29sSWQEC2N1cnJlbnRQb29sCQEJdHJ5R2V0U3RyAgUEdGhpcwILY3VycmVudFBvb2wDCQAAAgkAzwgCBQp2YWxpZGF0b3JzCQClCAEIBQFpBmNhbGxlcgUEdW5pdAkAAgECDUFjY2VzcyBkZW5pZWQDCQAAAgULY3VycmVudFBvb2wFBnBvb2xJZAkAAgEJAKwCAgITQWxyZWFkeSBzdXBwbGllZCB0bwULY3VycmVudFBvb2wECndpdGhkcmF3VHgJAQ53aXRoZHJhd1Jlc3VsdAADCQAAAgUKd2l0aGRyYXdUeAUKd2l0aGRyYXdUeAkBDHN1cHBseVJlc3VsdAEFBnBvb2xJZAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgFpAQVzdGFrZQAEBHVzZXIJAKUIAQgFAWkGY2FsbGVyBAZhbW91bnQICQCRAwIIBQFpCHBheW1lbnRzAAAGYW1vdW50BAtjdXJyZW50UG9vbAkBCXRyeUdldFN0cgIFBHRoaXMCC2N1cnJlbnRQb29sAwMJAGcCAAAFBmFtb3VudAYJAQIhPQIICQCRAwIIBQFpCHBheW1lbnRzAAAHYXNzZXRJZAkA2QQBBQdhc3NldElkCQACAQIWaW52YWxpZCB0b2tlbiBhdHRhY2hlZAMJAAACBQtjdXJyZW50UG9vbAIACQACAQIUUG9vbCBub3QgaW5pdGlhbGl6ZWQEA2ZlZQkBDGNhbGN1bGF0ZUZlZQAEAWEDCQBmAgUDZmVlBQZTY2FsZTYCAAIAAwkAAAIFAWEFAWEJAM4IAgkAzggCCQELc3Rha2VSZXN1bHQCBQR1c2VyBQZhbW91bnQJAQxzdXBwbHlSZXN1bHQBBQtjdXJyZW50UG9vbAkBD2NoYXJnZUZlZVJlc3VsdAIFC2N1cnJlbnRQb29sBQNmZWUJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BaQEHdW5zdGFrZQEGYW1vdW50BAR1c2VyCQClCAEIBQFpBmNhbGxlcgQLY3VycmVudFBvb2wJAQl0cnlHZXRTdHICBQR0aGlzAgtjdXJyZW50UG9vbAQFYXNzZXQJANkEAQUHYXNzZXRJZAQDZmVlCQEMY2FsY3VsYXRlRmVlAAQBYQMJAGYCBQNmZWUFBlNjYWxlNgIAAgADCQAAAgUBYQUBYQkAzggCCQDOCAIJAQ11bnN0YWtlUmVzdWx0AgUEdXNlcgUGYW1vdW50CQEYdW5zdGFrZUFuZFRyYW5zZmVyUmVzdWx0AwULY3VycmVudFBvb2wIBQFpBmNhbGxlcgUGYW1vdW50CQEPY2hhcmdlRmVlUmVzdWx0AgULY3VycmVudFBvb2wFA2ZlZQkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgECdHgBBnZlcmlmeQAJAPQDAwgFAnR4CWJvZHlCeXRlcwkAkQMCCAUCdHgGcHJvb2ZzAAAIBQJ0eA9zZW5kZXJQdWJsaWNLZXnfEoaD",
    "height": 2349132,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: G27ZPgtsToTpCweFXxVRqoJHodazBMLqGLut2KGefwFv
Next: GwJ2diYt1z551jVSUAc6byKiP5tgonYWVGtyF4AAmvvy

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

Old	New		Differences
122	122
123	123
124	124		func chargeFeeResult (poolId,fee) = {
125		-	let a = if ((fee > Scale6))
126		-	then throw(("1) Fee " + toString(fee)))
127		-	else ""
128		-	if ((a == a))
129		-	then {
130		-	let withdrawFeeTx = withdrawFromPuzzlePool(poolId, fee)
131		-	if ((withdrawFeeTx == withdrawFeeTx))
132		-	then [ScriptTransfer(moneyBoxAddress, fee, fromBase58String(assetId))]
133		-	else throw("Strict value is not equal to itself.")
134		-	}
	125	+	let withdrawFeeTx = withdrawFromPuzzlePool(poolId, fee)
	126	+	if ((withdrawFeeTx == withdrawFeeTx))
	127	+	then [ScriptTransfer(moneyBoxAddress, fee, fromBase58String(assetId))]
135	128		else throw("Strict value is not equal to itself.")
136	129		}
137	130

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

github/deemru/w8io/026f985 
41.12 ms ◑