w8 · tx · AfN···HUy

tx · AfNsctNwArHFvjwHPEs8h6hDQbQarCgoGgEeTc2rbHUy

3Mt7wmkWeioUsmfaBu6PsNq9j9SUs7f9qrs:  -0.04000000 Waves

2022.08.23 14:58 [2197101] smart account 3Mt7wmkWeioUsmfaBu6PsNq9j9SUs7f9qrs > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "AfNsctNwArHFvjwHPEs8h6hDQbQarCgoGgEeTc2rbHUy",
    "fee": 4000000,
    "feeAssetId": null,
    "timestamp": 1661256051913,
    "version": 1,
    "sender": "3Mt7wmkWeioUsmfaBu6PsNq9j9SUs7f9qrs",
    "senderPublicKey": "BLEvt3fBtK9gbCuj3VA7nHviqe3TPkRrF9KL6ZaHGgr4",
    "proofs": [
        "2bYJkn4FrVZ8rnrxRmQuAW2E8pN1174RvmCrfJHAHv14UtwaaWvshsYL918UgK8ei41EcBCzZ5R4ksWz246Kw2eN"
    ],
    "script": "base64:BgIQCAISBQoDCAEBEgASAwoBCC8AC3JldmlzaW9uTnVtAgAABkVVTEVSOADWic+BAQAFTVVMVDYAwIQ9AAZNVUxUWDYJALYCAQDAhD0ABU1VTFQ4AIDC1y8ABk1VTFRYOAkAtgIBAIDC1y8ABk1VTFQxMgCAoJSljR0ABk1VTFQxOAkAtgIBAICAkLu61q3wDQADU0VQAgJfXwAHV0FWRVNJRAkA2QQBAgVXQVZFUwEPZ2V0U3RyaW5nT3JGYWlsAgdhZGRyZXNzA2tleQkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCdCAIFB2FkZHJlc3MFA2tleQkAuQkCCQDMCAICCm1hbmRhdG9yeSAJAMwIAgkApQgBBQdhZGRyZXNzCQDMCAICAS4JAMwIAgUDa2V5CQDMCAICDyBpcyBub3QgZGVmaW5lZAUDbmlsAgABDGdldEludE9yRmFpbAIHYWRkcmVzcwNrZXkJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkAmggCBQdhZGRyZXNzBQNrZXkJALkJAgkAzAgCAgptYW5kYXRvcnkgCQDMCAIJAKUIAQUHYWRkcmVzcwkAzAgCAgEuCQDMCAIFA2tleQkAzAgCAg8gaXMgbm90IGRlZmluZWQFA25pbAIAAQ1nZXRCb29sT3JGYWlsAgdhZGRyZXNzA2tleQkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCCQCbCAIFB2FkZHJlc3MFA2tleQkAuQkCCQDMCAICCm1hbmRhdG9yeSAJAMwIAgkApQgBBQdhZGRyZXNzCQDMCAICAS4JAMwIAgUDa2V5CQDMCAICDyBpcyBub3QgZGVmaW5lZAUDbmlsAgABFmNvbnZlcnROZXV0cmlub1RvV2F2ZXMCBmFtb3VudAVwcmljZQkAawMFBmFtb3VudAUFTVVMVDgFBXByaWNlARZjb252ZXJ0V2F2ZXNUb05ldXRyaW5vAgZhbW91bnQFcHJpY2UJAGsDBQZhbW91bnQFBXByaWNlBQVNVUxUOAEJYXNBbnlMaXN0AQN2YWwEByRtYXRjaDAFA3ZhbAMJAAECBQckbWF0Y2gwAglMaXN0W0FueV0ECnZhbEFueUxpc3QFByRtYXRjaDAFCnZhbEFueUxpc3QJAAIBAhtmYWlsIHRvIGNhc3QgaW50byBMaXN0W0FueV0BBWFzSW50AQN2YWwEByRtYXRjaDAFA3ZhbAMJAAECBQckbWF0Y2gwAgNJbnQEBnZhbEludAUHJG1hdGNoMAUGdmFsSW50CQACAQIVZmFpbCB0byBjYXN0IGludG8gSW50AQhhc1N0cmluZwEDdmFsBAckbWF0Y2gwBQN2YWwDCQABAgUHJG1hdGNoMAIGU3RyaW5nBAZ2YWxTdHIFByRtYXRjaDAFBnZhbFN0cgkAAgECGGZhaWwgdG8gY2FzdCBpbnRvIFN0cmluZwEMYXNUdXBsZTJJbnRzAQN2YWwEByRtYXRjaDAFA3ZhbAMJAAECBQckbWF0Y2gwAgooSW50LCBJbnQpBAF2BQckbWF0Y2gwBQF2CQACAQIdZmFpbCB0byBjYXN0IGludG8gVHVwbGUyIGludHMBEmFzU3dhcFBhcmFtc1NUUlVDVAEDdmFsBAckbWF0Y2gwBQN2YWwDCQABAgUHJG1hdGNoMAIjKEludCwgSW50LCBJbnQsIEludCwgSW50LCBJbnQsIEludCkEBnN0cnVjdAUHJG1hdGNoMAUGc3RydWN0CQACAQIiZmFpbCB0byBjYXN0IGludG8gU3dhcFBhcmFtc1NUUlVDVAELdG9UaW1lc3RhbXABBXN0YXJ0AwkAZgIAAAUFc3RhcnQA////////////AQQHJG1hdGNoMAkA7QcBBQVzdGFydAMJAAECBQckbWF0Y2gwAglCbG9ja0luZm8EBWJsb2NrBQckbWF0Y2gwCAUFYmxvY2sJdGltZXN0YW1wAP///////////wEBBXRvWDE4AgdvcmlnVmFsDW9yaWdTY2FsZU11bHQJALwCAwkAtgIBBQdvcmlnVmFsBQZNVUxUMTgJALYCAQUNb3JpZ1NjYWxlTXVsdAEHZnJvbVgxOAIDdmFsD3Jlc3VsdFNjYWxlTXVsdAkAoAMBCQC8AgMFA3ZhbAkAtgIBBQ9yZXN1bHRTY2FsZU11bHQFBk1VTFQxOAAZSWR4Q29udHJvbENmZ05ldXRyaW5vRGFwcAABABhJZHhDb250cm9sQ2ZnQXVjdGlvbkRhcHAAAgAUSWR4Q29udHJvbENmZ1JwZERhcHAAAwAVSWR4Q29udHJvbENmZ01hdGhEYXBwAAQAHElkeENvbnRyb2xDZmdMaXF1aWRhdGlvbkRhcHAABQAVSWR4Q29udHJvbENmZ1Jlc3REYXBwAAYAHUlkeENvbnRyb2xDZmdOb2RlUmVnaXN0cnlEYXBwAAcAHElkeENvbnRyb2xDZmdOc2J0U3Rha2luZ0RhcHAACAAZSWR4Q29udHJvbENmZ01lZGlhdG9yRGFwcAAJABxJZHhDb250cm9sQ2ZnU3VyZlN0YWtpbmdEYXBwAAoAIElkeENvbnRyb2xDZmdHbnNidENvbnRyb2xsZXJEYXBwAAsBEWtleUNvbnRyb2xBZGRyZXNzAAIcJXMlc19fY29uZmlnX19jb250cm9sQWRkcmVzcwENa2V5Q29udHJvbENmZwACESVzX19jb250cm9sQ29uZmlnARRyZWFkQ29udHJvbENmZ09yRmFpbAEHY29udHJvbAkAtQkCCQEPZ2V0U3RyaW5nT3JGYWlsAgUHY29udHJvbAkBDWtleUNvbnRyb2xDZmcABQNTRVABGGdldENvbnRyYWN0QWRkcmVzc09yRmFpbAIKY29udHJvbENmZwNpZHgJARN2YWx1ZU9yRXJyb3JNZXNzYWdlAgkApggBCQCRAwIFCmNvbnRyb2xDZmcFA2lkeAkArAICAi1Db250cm9sIGNmZyBkb2Vzbid0IGNvbnRhaW4gYWRkcmVzcyBhdCBpbmRleCAJAKQDAQUDaWR4AA9jb250cm9sQ29udHJhY3QJARFAZXh0ck5hdGl2ZSgxMDYyKQEJAQt2YWx1ZU9yRWxzZQIJAJ0IAgUEdGhpcwkBEWtleUNvbnRyb2xBZGRyZXNzAAIjM040TlM3ZDRKbzlhNkYxNExpRlVLS1lWZFVra2YyZVA0WngACmNvbnRyb2xDZmcJARRyZWFkQ29udHJvbENmZ09yRmFpbAEFD2NvbnRyb2xDb250cmFjdAAMbWF0aENvbnRyYWN0CQEYZ2V0Q29udHJhY3RBZGRyZXNzT3JGYWlsAgUKY29udHJvbENmZwUVSWR4Q29udHJvbENmZ01hdGhEYXBwABBuZXV0cmlub0NvbnRyYWN0CQEYZ2V0Q29udHJhY3RBZGRyZXNzT3JGYWlsAgUKY29udHJvbENmZwUZSWR4Q29udHJvbENmZ05ldXRyaW5vRGFwcAAPYXVjdGlvbkNvbnRyYWN0CQEYZ2V0Q29udHJhY3RBZGRyZXNzT3JGYWlsAgUKY29udHJvbENmZwUYSWR4Q29udHJvbENmZ0F1Y3Rpb25EYXBwABNsaXF1aWRhdGlvbkNvbnRyYWN0CQEYZ2V0Q29udHJhY3RBZGRyZXNzT3JGYWlsAgUKY29udHJvbENmZwUcSWR4Q29udHJvbENmZ0xpcXVpZGF0aW9uRGFwcAALcnBkQ29udHJhY3QJARhnZXRDb250cmFjdEFkZHJlc3NPckZhaWwCBQpjb250cm9sQ2ZnBRRJZHhDb250cm9sQ2ZnUnBkRGFwcAATbnNidFN0YWtpbmdDb250cmFjdAkBGGdldENvbnRyYWN0QWRkcmVzc09yRmFpbAIFCmNvbnRyb2xDZmcFHElkeENvbnRyb2xDZmdOc2J0U3Rha2luZ0RhcHAAE3N1cmZTdGFraW5nQ29udHJhY3QJARhnZXRDb250cmFjdEFkZHJlc3NPckZhaWwCBQpjb250cm9sQ2ZnBRxJZHhDb250cm9sQ2ZnU3VyZlN0YWtpbmdEYXBwAwFpARRnbnNidEluZm9TWVNSRUFET05MWQMVdXNlckFkZHJlc3NTdHJPckVtcHR5CG5zYnREaWZmCHN1cmZEaWZmBAhuc2J0RGF0YQkBCWFzQW55TGlzdAEJAPwHBAUTbnNidFN0YWtpbmdDb250cmFjdAIWbnNidFN0YWtpbmdTWVNSRUFET05MWQkAzAgCBRV1c2VyQWRkcmVzc1N0ck9yRW1wdHkJAMwIAgUIbnNidERpZmYFA25pbAUDbmlsBAhuc2J0VXNlcgkBBWFzSW50AQkAkQMCBQhuc2J0RGF0YQAABAluc2J0VG90YWwJAQVhc0ludAEJAJEDAgUIbnNidERhdGEAAQQRZ05zYnRGcm9tTnNidFVzZXIFCG5zYnRVc2VyBBJnTnNidEZyb21Oc2J0VG90YWwFCW5zYnRUb3RhbAQIc3VyZkRhdGEJAQlhc0FueUxpc3QBCQD8BwQFE3N1cmZTdGFraW5nQ29udHJhY3QCFnN1cmZTdGFraW5nU1lTUkVBRE9OTFkJAMwIAgUVdXNlckFkZHJlc3NTdHJPckVtcHR5CQDMCAIFCHN1cmZEaWZmBQNuaWwFA25pbAQIc3VyZlVzZXIJAQVhc0ludAEJAJEDAgUIc3VyZkRhdGEAAAQJc3VyZlRvdGFsCQEFYXNJbnQBCQCRAwIFCHN1cmZEYXRhAAEEEWdOc2J0RnJvbVN1cmZVc2VyCQEFYXNJbnQBCQCRAwIFCHN1cmZEYXRhAAIEEmdOc2J0RnJvbVN1cmZUb3RhbAkBBWFzSW50AQkAkQMCBQhzdXJmRGF0YQADBBF2cEVmZmVjdGl2ZUhlaWdodAkBBWFzSW50AQkAkQMCBQhzdXJmRGF0YQAEBBR2cEVmZmVjdGl2ZUhlaWdodE5FVwkBBWFzSW50AQkAkQMCBQhzdXJmRGF0YQAFBAlnTnNidFVzZXIJAGQCBRFnTnNidEZyb21Oc2J0VXNlcgURZ05zYnRGcm9tU3VyZlVzZXIECmdOc2J0VG90YWwJAGQCBRJnTnNidEZyb21Oc2J0VG90YWwFEmdOc2J0RnJvbVN1cmZUb3RhbAkAlAoCBQNuaWwJAMwIAgUJZ05zYnRVc2VyCQDMCAIFCmdOc2J0VG90YWwJAMwIAgkAzAgCBQhuc2J0VXNlcgkAzAgCBQluc2J0VG90YWwJAMwIAgURZ05zYnRGcm9tTnNidFVzZXIJAMwIAgUSZ05zYnRGcm9tTnNidFRvdGFsBQNuaWwJAMwIAgkAzAgCBQhzdXJmVXNlcgkAzAgCBQlzdXJmVG90YWwJAMwIAgURZ05zYnRGcm9tU3VyZlVzZXIJAMwIAgUSZ05zYnRGcm9tU3VyZlRvdGFsBQNuaWwJAMwIAgURdnBFZmZlY3RpdmVIZWlnaHQJAMwIAgUUdnBFZmZlY3RpdmVIZWlnaHRORVcFA25pbAFpAQxjbGFpbVJld2FyZHMABAduc2J0SW52CQD8BwQFE25zYnRTdGFraW5nQ29udHJhY3QCGmNsYWltUmV3YXJkc0J5T3JpZ2luQ2FsbGVyBQNuaWwFA25pbAMJAAACBQduc2J0SW52BQduc2J0SW52BAdzdXJmSW52CQD8BwQFE3N1cmZTdGFraW5nQ29udHJhY3QCGmNsYWltUmV3YXJkc0J5T3JpZ2luQ2FsbGVyBQNuaWwFA25pbAMJAAACBQdzdXJmSW52BQdzdXJmSW52BQNuaWwJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4JAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BaQEXZ25zYnRSZXdhcmRzU1lTUkVBRE9OTFkBFXVzZXJBZGRyZXNzU3RyT3JFbXB0eQQNbnNidFJld2FyZFN0cgkBCGFzU3RyaW5nAQkA/AcEBRNuc2J0U3Rha2luZ0NvbnRyYWN0Ahh1bmNsYWltZWRSZXdhcmRzUkVBRE9OTFkJAMwIAgUVdXNlckFkZHJlc3NTdHJPckVtcHR5BQNuaWwFA25pbAQNc3VyZlJld2FyZFN0cgkBCGFzU3RyaW5nAQkA/AcEBRNzdXJmU3Rha2luZ0NvbnRyYWN0Ahh1bmNsYWltZWRSZXdhcmRzUkVBRE9OTFkJAMwIAgUVdXNlckFkZHJlc3NTdHJPckVtcHR5BQNuaWwFA25pbAkAlAoCBQNuaWwJAMwIAgUNbnNidFJld2FyZFN0cgkAzAgCBQ1zdXJmUmV3YXJkU3RyBQNuaWwAnW86tQ==",
    "chainId": 84,
    "height": 2197101,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: GLWmDACcD6XHBL4R2ZSWNp2XYH2Fi1BoYn9KbYAFwPHq
Next: DfzCmYxhQwbE8Zv7XvaL5ooU4YszUcfFdeiM5XuqJbrK

Diff: 
Old New Differences
20 20  let SEP = "__"
21 21  
22 22  let WAVESID = fromBase58String("WAVES")
23 - 
24 - func keyGnsbtFromSurfCoeff () = "%s%s__cfg__gnsbtFromSurfCoeff"
25 - 
26 23  
27 24  func getStringOrFail (address,key) = valueOrErrorMessage(getString(address, key), makeString(["mandatory ", toString(address), ".", key, " is not defined"], ""))
28 25  
72 69  
73 70  
74 71  func asSwapParamsSTRUCT (val) = match val {
75 -     case struct: (Int, Int, Int, Int, Int) => 
72 +     case struct: (Int, Int, Int, Int, Int, Int, Int) => 
76 73          struct
77 74      case _ => 
78 -         throw("fail to cast into Int")
75 +         throw("fail to cast into SwapParamsSTRUCT")
79 76  }
80 77  
81 78  
147 144  
148 145  let surfStakingContract = getContractAddressOrFail(controlCfg, IdxControlCfgSurfStakingDapp)
149 146  
150 - let gnsbtFromSurfCoeff = valueOrElse(getInteger(this, keyGnsbtFromSurfCoeff()), 300)
151 - 
152 - @Callable(i)
153 - func gnsbtFromSurfSYSREADONLY (surfAmt) = $Tuple2(nil, (surfAmt / gnsbtFromSurfCoeff))
154 - 
155 - 
156 - 
157 147  @Callable(i)
158 148  func gnsbtInfoSYSREADONLY (userAddressStrOrEmpty,nsbtDiff,surfDiff) = {
159 149      let nsbtData = asAnyList(invoke(nsbtStakingContract, "nsbtStakingSYSREADONLY", [userAddressStrOrEmpty, nsbtDiff], nil))
Full: 
Old New Differences
1 1  {-# STDLIB_VERSION 6 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 4  let revisionNum = ""
5 5  
6 6  let EULER8 = 271828182
7 7  
8 8  let MULT6 = 1000000
9 9  
10 10  let MULTX6 = toBigInt(1000000)
11 11  
12 12  let MULT8 = 100000000
13 13  
14 14  let MULTX8 = toBigInt(100000000)
15 15  
16 16  let MULT12 = 1000000000000
17 17  
18 18  let MULT18 = toBigInt(1000000000000000000)
19 19  
20 20  let SEP = "__"
21 21  
22 22  let WAVESID = fromBase58String("WAVES")
23 - 
24 - func keyGnsbtFromSurfCoeff () = "%s%s__cfg__gnsbtFromSurfCoeff"
25 - 
26 23  
27 24  func getStringOrFail (address,key) = valueOrErrorMessage(getString(address, key), makeString(["mandatory ", toString(address), ".", key, " is not defined"], ""))
28 25  
29 26  
30 27  func getIntOrFail (address,key) = valueOrErrorMessage(getInteger(address, key), makeString(["mandatory ", toString(address), ".", key, " is not defined"], ""))
31 28  
32 29  
33 30  func getBoolOrFail (address,key) = valueOrErrorMessage(getBoolean(address, key), makeString(["mandatory ", toString(address), ".", key, " is not defined"], ""))
34 31  
35 32  
36 33  func convertNeutrinoToWaves (amount,price) = fraction(amount, MULT8, price)
37 34  
38 35  
39 36  func convertWavesToNeutrino (amount,price) = fraction(amount, price, MULT8)
40 37  
41 38  
42 39  func asAnyList (val) = match val {
43 40      case valAnyList: List[Any] => 
44 41          valAnyList
45 42      case _ => 
46 43          throw("fail to cast into List[Any]")
47 44  }
48 45  
49 46  
50 47  func asInt (val) = match val {
51 48      case valInt: Int => 
52 49          valInt
53 50      case _ => 
54 51          throw("fail to cast into Int")
55 52  }
56 53  
57 54  
58 55  func asString (val) = match val {
59 56      case valStr: String => 
60 57          valStr
61 58      case _ => 
62 59          throw("fail to cast into String")
63 60  }
64 61  
65 62  
66 63  func asTuple2Ints (val) = match val {
67 64      case v: (Int, Int) => 
68 65          v
69 66      case _ => 
70 67          throw("fail to cast into Tuple2 ints")
71 68  }
72 69  
73 70  
74 71  func asSwapParamsSTRUCT (val) = match val {
75 -     case struct: (Int, Int, Int, Int, Int) => 
72 +     case struct: (Int, Int, Int, Int, Int, Int, Int) => 
76 73          struct
77 74      case _ => 
78 -         throw("fail to cast into Int")
75 +         throw("fail to cast into SwapParamsSTRUCT")
79 76  }
80 77  
81 78  
82 79  func toTimestamp (start) = if ((0 > start))
83 80      then -1
84 81      else     match blockInfoByHeight(start) {
85 82          case block: BlockInfo => 
86 83              block.timestamp
87 84          case _ => 
88 85              -1
89 86      }
90 87  
91 88  
92 89  func toX18 (origVal,origScaleMult) = fraction(toBigInt(origVal), MULT18, toBigInt(origScaleMult))
93 90  
94 91  
95 92  func fromX18 (val,resultScaleMult) = toInt(fraction(val, toBigInt(resultScaleMult), MULT18))
96 93  
97 94  
98 95  let IdxControlCfgNeutrinoDapp = 1
99 96  
100 97  let IdxControlCfgAuctionDapp = 2
101 98  
102 99  let IdxControlCfgRpdDapp = 3
103 100  
104 101  let IdxControlCfgMathDapp = 4
105 102  
106 103  let IdxControlCfgLiquidationDapp = 5
107 104  
108 105  let IdxControlCfgRestDapp = 6
109 106  
110 107  let IdxControlCfgNodeRegistryDapp = 7
111 108  
112 109  let IdxControlCfgNsbtStakingDapp = 8
113 110  
114 111  let IdxControlCfgMediatorDapp = 9
115 112  
116 113  let IdxControlCfgSurfStakingDapp = 10
117 114  
118 115  let IdxControlCfgGnsbtControllerDapp = 11
119 116  
120 117  func keyControlAddress () = "%s%s__config__controlAddress"
121 118  
122 119  
123 120  func keyControlCfg () = "%s__controlConfig"
124 121  
125 122  
126 123  func readControlCfgOrFail (control) = split(getStringOrFail(control, keyControlCfg()), SEP)
127 124  
128 125  
129 126  func getContractAddressOrFail (controlCfg,idx) = valueOrErrorMessage(addressFromString(controlCfg[idx]), ("Control cfg doesn't contain address at index " + toString(idx)))
130 127  
131 128  
132 129  let controlContract = addressFromStringValue(valueOrElse(getString(this, keyControlAddress()), "3N4NS7d4Jo9a6F14LiFUKKYVdUkkf2eP4Zx"))
133 130  
134 131  let controlCfg = readControlCfgOrFail(controlContract)
135 132  
136 133  let mathContract = getContractAddressOrFail(controlCfg, IdxControlCfgMathDapp)
137 134  
138 135  let neutrinoContract = getContractAddressOrFail(controlCfg, IdxControlCfgNeutrinoDapp)
139 136  
140 137  let auctionContract = getContractAddressOrFail(controlCfg, IdxControlCfgAuctionDapp)
141 138  
142 139  let liquidationContract = getContractAddressOrFail(controlCfg, IdxControlCfgLiquidationDapp)
143 140  
144 141  let rpdContract = getContractAddressOrFail(controlCfg, IdxControlCfgRpdDapp)
145 142  
146 143  let nsbtStakingContract = getContractAddressOrFail(controlCfg, IdxControlCfgNsbtStakingDapp)
147 144  
148 145  let surfStakingContract = getContractAddressOrFail(controlCfg, IdxControlCfgSurfStakingDapp)
149 146  
150 - let gnsbtFromSurfCoeff = valueOrElse(getInteger(this, keyGnsbtFromSurfCoeff()), 300)
151 - 
152 - @Callable(i)
153 - func gnsbtFromSurfSYSREADONLY (surfAmt) = $Tuple2(nil, (surfAmt / gnsbtFromSurfCoeff))
154 - 
155 - 
156 - 
157 147  @Callable(i)
158 148  func gnsbtInfoSYSREADONLY (userAddressStrOrEmpty,nsbtDiff,surfDiff) = {
159 149      let nsbtData = asAnyList(invoke(nsbtStakingContract, "nsbtStakingSYSREADONLY", [userAddressStrOrEmpty, nsbtDiff], nil))
160 150      let nsbtUser = asInt(nsbtData[0])
161 151      let nsbtTotal = asInt(nsbtData[1])
162 152      let gNsbtFromNsbtUser = nsbtUser
163 153      let gNsbtFromNsbtTotal = nsbtTotal
164 154      let surfData = asAnyList(invoke(surfStakingContract, "surfStakingSYSREADONLY", [userAddressStrOrEmpty, surfDiff], nil))
165 155      let surfUser = asInt(surfData[0])
166 156      let surfTotal = asInt(surfData[1])
167 157      let gNsbtFromSurfUser = asInt(surfData[2])
168 158      let gNsbtFromSurfTotal = asInt(surfData[3])
169 159      let vpEffectiveHeight = asInt(surfData[4])
170 160      let vpEffectiveHeightNEW = asInt(surfData[5])
171 161      let gNsbtUser = (gNsbtFromNsbtUser + gNsbtFromSurfUser)
172 162      let gNsbtTotal = (gNsbtFromNsbtTotal + gNsbtFromSurfTotal)
173 163      $Tuple2(nil, [gNsbtUser, gNsbtTotal, [nsbtUser, nsbtTotal, gNsbtFromNsbtUser, gNsbtFromNsbtTotal], [surfUser, surfTotal, gNsbtFromSurfUser, gNsbtFromSurfTotal], vpEffectiveHeight, vpEffectiveHeightNEW])
174 164      }
175 165  
176 166  
177 167  
178 168  @Callable(i)
179 169  func claimRewards () = {
180 170      let nsbtInv = invoke(nsbtStakingContract, "claimRewardsByOriginCaller", nil, nil)
181 171      if ((nsbtInv == nsbtInv))
182 172          then {
183 173              let surfInv = invoke(surfStakingContract, "claimRewardsByOriginCaller", nil, nil)
184 174              if ((surfInv == surfInv))
185 175                  then nil
186 176                  else throw("Strict value is not equal to itself.")
187 177              }
188 178          else throw("Strict value is not equal to itself.")
189 179      }
190 180  
191 181  
192 182  
193 183  @Callable(i)
194 184  func gnsbtRewardsSYSREADONLY (userAddressStrOrEmpty) = {
195 185      let nsbtRewardStr = asString(invoke(nsbtStakingContract, "unclaimedRewardsREADONLY", [userAddressStrOrEmpty], nil))
196 186      let surfRewardStr = asString(invoke(surfStakingContract, "unclaimedRewardsREADONLY", [userAddressStrOrEmpty], nil))
197 187      $Tuple2(nil, [nsbtRewardStr, surfRewardStr])
198 188      }
199 189  
200 190

Old	New		Differences
20	20		let SEP = "__"
21	21
22	22		let WAVESID = fromBase58String("WAVES")
23		-
24		-	func keyGnsbtFromSurfCoeff () = "%s%s__cfg__gnsbtFromSurfCoeff"
25		-
26	23
27	24		func getStringOrFail (address,key) = valueOrErrorMessage(getString(address, key), makeString(["mandatory ", toString(address), ".", key, " is not defined"], ""))
28	25

72	69
73	70
74	71		func asSwapParamsSTRUCT (val) = match val {
75		-	case struct: (Int, Int, Int, Int, Int) =>
	72	+	case struct: (Int, Int, Int, Int, Int, Int, Int) =>
76	73		struct
77	74		case _ =>
78		-	throw("fail to cast into ~~Int~~")
	75	+	throw("fail to cast into SwapParamsSTRUCT")
79	76		}
80	77
81	78

147	144
148	145		let surfStakingContract = getContractAddressOrFail(controlCfg, IdxControlCfgSurfStakingDapp)
149	146
150		-	let gnsbtFromSurfCoeff = valueOrElse(getInteger(this, keyGnsbtFromSurfCoeff()), 300)
151		-
152		-	@Callable(i)
153		-	func gnsbtFromSurfSYSREADONLY (surfAmt) = $Tuple2(nil, (surfAmt / gnsbtFromSurfCoeff))
154		-
155		-
156		-
157	147		@Callable(i)
158	148		func gnsbtInfoSYSREADONLY (userAddressStrOrEmpty,nsbtDiff,surfDiff) = {
159	149		let nsbtData = asAnyList(invoke(nsbtStakingContract, "nsbtStakingSYSREADONLY", [userAddressStrOrEmpty, nsbtDiff], nil))

Old	New		Differences
1	1		{-# STDLIB_VERSION 6 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4	4		let revisionNum = ""
5	5
6	6		let EULER8 = 271828182
7	7
8	8		let MULT6 = 1000000
9	9
10	10		let MULTX6 = toBigInt(1000000)
11	11
12	12		let MULT8 = 100000000
13	13
14	14		let MULTX8 = toBigInt(100000000)
15	15
16	16		let MULT12 = 1000000000000
17	17
18	18		let MULT18 = toBigInt(1000000000000000000)
19	19
20	20		let SEP = "__"
21	21
22	22		let WAVESID = fromBase58String("WAVES")
23		-
24		-	func keyGnsbtFromSurfCoeff () = "%s%s__cfg__gnsbtFromSurfCoeff"
25		-
26	23
27	24		func getStringOrFail (address,key) = valueOrErrorMessage(getString(address, key), makeString(["mandatory ", toString(address), ".", key, " is not defined"], ""))
28	25
29	26
30	27		func getIntOrFail (address,key) = valueOrErrorMessage(getInteger(address, key), makeString(["mandatory ", toString(address), ".", key, " is not defined"], ""))
31	28
32	29
33	30		func getBoolOrFail (address,key) = valueOrErrorMessage(getBoolean(address, key), makeString(["mandatory ", toString(address), ".", key, " is not defined"], ""))
34	31
35	32
36	33		func convertNeutrinoToWaves (amount,price) = fraction(amount, MULT8, price)
37	34
38	35
39	36		func convertWavesToNeutrino (amount,price) = fraction(amount, price, MULT8)
40	37
41	38
42	39		func asAnyList (val) = match val {
43	40		case valAnyList: List[Any] =>
44	41		valAnyList
45	42		case _ =>
46	43		throw("fail to cast into List[Any]")
47	44		}
48	45
49	46
50	47		func asInt (val) = match val {
51	48		case valInt: Int =>
52	49		valInt
53	50		case _ =>
54	51		throw("fail to cast into Int")
55	52		}
56	53
57	54
58	55		func asString (val) = match val {
59	56		case valStr: String =>
60	57		valStr
61	58		case _ =>
62	59		throw("fail to cast into String")
63	60		}
64	61
65	62
66	63		func asTuple2Ints (val) = match val {
67	64		case v: (Int, Int) =>
68	65		v
69	66		case _ =>
70	67		throw("fail to cast into Tuple2 ints")
71	68		}
72	69
73	70
74	71		func asSwapParamsSTRUCT (val) = match val {
75		-	case struct: (Int, Int, Int, Int, Int) =>
	72	+	case struct: (Int, Int, Int, Int, Int, Int, Int) =>
76	73		struct
77	74		case _ =>
78		-	throw("fail to cast into ~~Int~~")
	75	+	throw("fail to cast into SwapParamsSTRUCT")
79	76		}
80	77
81	78
82	79		func toTimestamp (start) = if ((0 > start))
83	80		then -1
84	81		else match blockInfoByHeight(start) {
85	82		case block: BlockInfo =>
86	83		block.timestamp
87	84		case _ =>
88	85		-1
89	86		}
90	87
91	88
92	89		func toX18 (origVal,origScaleMult) = fraction(toBigInt(origVal), MULT18, toBigInt(origScaleMult))
93	90
94	91
95	92		func fromX18 (val,resultScaleMult) = toInt(fraction(val, toBigInt(resultScaleMult), MULT18))
96	93
97	94
98	95		let IdxControlCfgNeutrinoDapp = 1
99	96
100	97		let IdxControlCfgAuctionDapp = 2
101	98
102	99		let IdxControlCfgRpdDapp = 3
103	100
104	101		let IdxControlCfgMathDapp = 4
105	102
106	103		let IdxControlCfgLiquidationDapp = 5
107	104
108	105		let IdxControlCfgRestDapp = 6
109	106
110	107		let IdxControlCfgNodeRegistryDapp = 7
111	108
112	109		let IdxControlCfgNsbtStakingDapp = 8
113	110
114	111		let IdxControlCfgMediatorDapp = 9
115	112
116	113		let IdxControlCfgSurfStakingDapp = 10
117	114
118	115		let IdxControlCfgGnsbtControllerDapp = 11
119	116
120	117		func keyControlAddress () = "%s%s__config__controlAddress"
121	118
122	119
123	120		func keyControlCfg () = "%s__controlConfig"
124	121
125	122
126	123		func readControlCfgOrFail (control) = split(getStringOrFail(control, keyControlCfg()), SEP)
127	124
128	125
129	126		func getContractAddressOrFail (controlCfg,idx) = valueOrErrorMessage(addressFromString(controlCfg[idx]), ("Control cfg doesn't contain address at index " + toString(idx)))
130	127
131	128
132	129		let controlContract = addressFromStringValue(valueOrElse(getString(this, keyControlAddress()), "3N4NS7d4Jo9a6F14LiFUKKYVdUkkf2eP4Zx"))
133	130
134	131		let controlCfg = readControlCfgOrFail(controlContract)
135	132
136	133		let mathContract = getContractAddressOrFail(controlCfg, IdxControlCfgMathDapp)
137	134
138	135		let neutrinoContract = getContractAddressOrFail(controlCfg, IdxControlCfgNeutrinoDapp)
139	136
140	137		let auctionContract = getContractAddressOrFail(controlCfg, IdxControlCfgAuctionDapp)
141	138
142	139		let liquidationContract = getContractAddressOrFail(controlCfg, IdxControlCfgLiquidationDapp)
143	140
144	141		let rpdContract = getContractAddressOrFail(controlCfg, IdxControlCfgRpdDapp)
145	142
146	143		let nsbtStakingContract = getContractAddressOrFail(controlCfg, IdxControlCfgNsbtStakingDapp)
147	144
148	145		let surfStakingContract = getContractAddressOrFail(controlCfg, IdxControlCfgSurfStakingDapp)
149	146
150		-	let gnsbtFromSurfCoeff = valueOrElse(getInteger(this, keyGnsbtFromSurfCoeff()), 300)
151		-
152		-	@Callable(i)
153		-	func gnsbtFromSurfSYSREADONLY (surfAmt) = $Tuple2(nil, (surfAmt / gnsbtFromSurfCoeff))
154		-
155		-
156		-
157	147		@Callable(i)
158	148		func gnsbtInfoSYSREADONLY (userAddressStrOrEmpty,nsbtDiff,surfDiff) = {
159	149		let nsbtData = asAnyList(invoke(nsbtStakingContract, "nsbtStakingSYSREADONLY", [userAddressStrOrEmpty, nsbtDiff], nil))
160	150		let nsbtUser = asInt(nsbtData[0])
161	151		let nsbtTotal = asInt(nsbtData[1])
162	152		let gNsbtFromNsbtUser = nsbtUser
163	153		let gNsbtFromNsbtTotal = nsbtTotal
164	154		let surfData = asAnyList(invoke(surfStakingContract, "surfStakingSYSREADONLY", [userAddressStrOrEmpty, surfDiff], nil))
165	155		let surfUser = asInt(surfData[0])
166	156		let surfTotal = asInt(surfData[1])
167	157		let gNsbtFromSurfUser = asInt(surfData[2])
168	158		let gNsbtFromSurfTotal = asInt(surfData[3])
169	159		let vpEffectiveHeight = asInt(surfData[4])
170	160		let vpEffectiveHeightNEW = asInt(surfData[5])
171	161		let gNsbtUser = (gNsbtFromNsbtUser + gNsbtFromSurfUser)
172	162		let gNsbtTotal = (gNsbtFromNsbtTotal + gNsbtFromSurfTotal)
173	163		$Tuple2(nil, [gNsbtUser, gNsbtTotal, [nsbtUser, nsbtTotal, gNsbtFromNsbtUser, gNsbtFromNsbtTotal], [surfUser, surfTotal, gNsbtFromSurfUser, gNsbtFromSurfTotal], vpEffectiveHeight, vpEffectiveHeightNEW])
174	164		}
175	165
176	166
177	167
178	168		@Callable(i)
179	169		func claimRewards () = {
180	170		let nsbtInv = invoke(nsbtStakingContract, "claimRewardsByOriginCaller", nil, nil)
181	171		if ((nsbtInv == nsbtInv))
182	172		then {
183	173		let surfInv = invoke(surfStakingContract, "claimRewardsByOriginCaller", nil, nil)
184	174		if ((surfInv == surfInv))
185	175		then nil
186	176		else throw("Strict value is not equal to itself.")
187	177		}
188	178		else throw("Strict value is not equal to itself.")
189	179		}
190	180
191	181
192	182
193	183		@Callable(i)
194	184		func gnsbtRewardsSYSREADONLY (userAddressStrOrEmpty) = {
195	185		let nsbtRewardStr = asString(invoke(nsbtStakingContract, "unclaimedRewardsREADONLY", [userAddressStrOrEmpty], nil))
196	186		let surfRewardStr = asString(invoke(surfStakingContract, "unclaimedRewardsREADONLY", [userAddressStrOrEmpty], nil))
197	187		$Tuple2(nil, [nsbtRewardStr, surfRewardStr])
198	188		}
199	189
200	190

github/deemru/w8io/873ac7e 
43.99 ms ◑