w8 · tx · GCF···8w8

tx · GCFJER6U7ihPFSghzdDeSiv12rYaWWxfncKS7eMGk8w8

3MwyXzxpp65TzAvdJxnexgz9G5kFkcqGLMF:  -0.01400000 Waves

2019.06.27 22:35 [560963] smart account 3MwyXzxpp65TzAvdJxnexgz9G5kFkcqGLMF > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "GCFJER6U7ihPFSghzdDeSiv12rYaWWxfncKS7eMGk8w8",
    "fee": 1400000,
    "feeAssetId": null,
    "timestamp": 1561664198915,
    "version": 1,
    "sender": "3MwyXzxpp65TzAvdJxnexgz9G5kFkcqGLMF",
    "senderPublicKey": "7pDDrtFSiQHYSxpdxuBQVCeBQBwa3fFWMBmtJ85aytGX",
    "proofs": [
        "65zumoHHdehyhDAv8NjLfQKe95BEnq119rjTBHJbgpNhSwsFKwgWkZ4JCYk57LNpuWQQ8KabkTn3KTD9zYjatziz"
    ],
    "script": "base64:AAIDAAAAAAAAAAAAAAAEAQAAABNnZXRBZGRyZXNzRnJvbUVudHJ5AAAAAQAAAANrZXkEAAAAB2FkZHJlc3MEAAAAByRtYXRjaDAJAAQdAAAAAgUAAAAEdGhpcwUAAAADa2V5AwkAAAEAAAACBQAAAAckbWF0Y2gwAgAAAAZTdHJpbmcEAAAAA3N0cgUAAAAHJG1hdGNoMAUAAAADc3RyCQAAAgAAAAECAAAAFkZpcnN0IGFkZHJlc3Mgbm90IHNldCEFAAAAB2FkZHJlc3MBAAAAGmdldEFkZHJlc3NGcm9tRW50cnlPckVtcHR5AAAAAQAAAANrZXkEAAAAB2FkZHJlc3MEAAAAByRtYXRjaDAJAAQdAAAAAgUAAAAEdGhpcwUAAAADa2V5AwkAAAEAAAACBQAAAAckbWF0Y2gwAgAAAAZTdHJpbmcEAAAAA3N0cgUAAAAHJG1hdGNoMAUAAAADc3RyAgAAAAAFAAAAB2FkZHJlc3MBAAAADWdldEludEZyb21LZXkAAAABAAAAA2tleQQAAAASZmlyc3RBZGRyZXNzQW1vdW50BAAAAAckbWF0Y2gwCQAEGgAAAAIFAAAABHRoaXMFAAAAA2tleQMJAAABAAAAAgUAAAAHJG1hdGNoMAIAAAADSW50BAAAAAFuBQAAAAckbWF0Y2gwBQAAAAFuAAAAAAAAAAAABQAAABJmaXJzdEFkZHJlc3NBbW91bnQBAAAAJmNoZWNrSWZNZXRob2RDYWxsQ29tZXNGcm9tVmFsaWRBY2NvdW50AAAAAQAAAAZzZW5kZXIEAAAADGZpcnN0QWRkcmVzcwkBAAAAE2dldEFkZHJlc3NGcm9tRW50cnkAAAABAgAAAAxmaXJzdEFkZHJlc3MEAAAADXNlY29uZEFkZHJlc3MJAQAAABNnZXRBZGRyZXNzRnJvbUVudHJ5AAAAAQIAAAANc2Vjb25kQWRkcmVzcwMDCQEAAAACIT0AAAACBQAAAAxmaXJzdEFkZHJlc3MFAAAABnNlbmRlcgkBAAAAAiE9AAAAAgUAAAANc2Vjb25kQWRkcmVzcwUAAAAGc2VuZGVyBwkAAAIAAAABCQABLAAAAAICAAAAIk1ldGhvZCBjYWxsIGZyb20gaW52YWxpZCBhY2NvdW50OiAFAAAABnNlbmRlcgYAAAAGAAAAAWkBAAAADWNsYWltQ2hlYXRpbmcAAAAGAAAACnJlY2lwaWVudEEAAAAQYW1vdW50UmVjaXBpZW50QQAAAApyZWNpcGllbnRCAAAAEGFtb3VudFJlY2lwaWVudEIAAAAJdGltZXN0YW1wAAAACXNpZ25hdHVyZQQAAAAGc2VuZGVyCQACWAAAAAEICAUAAAABaQAAAAZjYWxsZXIAAAAFYnl0ZXMEAAAAC3ZhbGlkU2VuZGVyCQEAAAAmY2hlY2tJZk1ldGhvZENhbGxDb21lc0Zyb21WYWxpZEFjY291bnQAAAABBQAAAAZzZW5kZXIEAAAADm9yaWdpbmFsU3RyaW5nCQABLAAAAAIJAAEsAAAAAgkAASwAAAACCQABLAAAAAIFAAAACnJlY2lwaWVudEEJAAGkAAAAAQUAAAAQYW1vdW50UmVjaXBpZW50QQUAAAAKcmVjaXBpZW50QgkAAaQAAAABBQAAABBhbW91bnRSZWNpcGllbnRCCQABpAAAAAEFAAAACXRpbWVzdGFtcAQAAAALY291bnRlclBhcnQJAQAAABNnZXRBZGRyZXNzRnJvbUVudHJ5AAAAAQkAASwAAAACBQAAAAZzZW5kZXICAAAADF9jb3VudGVycGFydAQAAAATc2lnbmVkQnlDb3VudGVycGFydAkAAfQAAAADCQACWQAAAAEFAAAADm9yaWdpbmFsU3RyaW5nCQACWQAAAAEFAAAACXNpZ25hdHVyZQkAAlkAAAABBQAAAAtjb3VudGVyUGFydAQAAAAMb2xkVGltZXN0YW1wCQEAAAANZ2V0SW50RnJvbUtleQAAAAECAAAACXRpbWVzdGFtcAMDAwUAAAALdmFsaWRTZW5kZXIFAAAAE3NpZ25lZEJ5Q291bnRlcnBhcnQHCQAAZgAAAAIFAAAACXRpbWVzdGFtcAUAAAAMb2xkVGltZXN0YW1wBwkBAAAAC1RyYW5zZmVyU2V0AAAAAQkABEwAAAACCQEAAAAOU2NyaXB0VHJhbnNmZXIAAAADCAUAAAABaQAAAAZjYWxsZXIJAABkAAAAAgUAAAAQYW1vdW50UmVjaXBpZW50QQUAAAAQYW1vdW50UmVjaXBpZW50QgUAAAAEdW5pdAUAAAADbmlsCQAAAgAAAAECAAAAJ1dyb25nIHNpZ25hdHVyZSBvciB0aW1lc3RhbXAgbm90IG5ld2VyIQAAAAFpAQAAAAxjb25maXJtQ2xvc2UAAAAABAAAAAZzZW5kZXIJAAJYAAAAAQgIBQAAAAFpAAAABmNhbGxlcgAAAAVieXRlcwQAAAALdmFsaWRTZW5kZXIJAQAAACZjaGVja0lmTWV0aG9kQ2FsbENvbWVzRnJvbVZhbGlkQWNjb3VudAAAAAEFAAAABnNlbmRlcgQAAAAJaW5pdGlhdG9yCQAEHQAAAAIFAAAABHRoaXMCAAAAFGNsb3NpbmdfaW5pdGlhdGVkX2J5AwMJAQAAAAIhPQAAAAIFAAAABnNlbmRlcgUAAAAJaW5pdGlhdG9yBQAAAAt2YWxpZFNlbmRlcgcEAAAADGZpcnN0QWRkcmVzcwkBAAAAE2dldEFkZHJlc3NGcm9tRW50cnkAAAABAgAAAAxmaXJzdEFkZHJlc3MEAAAADXNlY29uZEFkZHJlc3MJAQAAABNnZXRBZGRyZXNzRnJvbUVudHJ5AAAAAQIAAAANc2Vjb25kQWRkcmVzcwQAAAASZmlyc3RBZGRyZXNzQW1vdW50CQEAAAANZ2V0SW50RnJvbUtleQAAAAEFAAAADGZpcnN0QWRkcmVzcwQAAAATc2Vjb25kQWRkcmVzc0Ftb3VudAkBAAAADWdldEludEZyb21LZXkAAAABBQAAAA1zZWNvbmRBZGRyZXNzCQEAAAALVHJhbnNmZXJTZXQAAAABCQAETAAAAAIJAQAAAA5TY3JpcHRUcmFuc2ZlcgAAAAMJAQAAAAdBZGRyZXNzAAAAAQkAAlkAAAABBQAAAAxmaXJzdEFkZHJlc3MFAAAAEmZpcnN0QWRkcmVzc0Ftb3VudAUAAAAEdW5pdAkABEwAAAACCQEAAAAOU2NyaXB0VHJhbnNmZXIAAAADCQEAAAAHQWRkcmVzcwAAAAEJAAJZAAAAAQUAAAANc2Vjb25kQWRkcmVzcwUAAAATc2Vjb25kQWRkcmVzc0Ftb3VudAUAAAAEdW5pdAUAAAADbmlsCQAAAgAAAAECAAAAMUluaXRpYXRvciBjYW4gbm90IGNvbmZpcm0gY2xvc2luZyBvZiB0aGUgY2hhbm5lbCEAAAABaQEAAAASY2xvc2VBZnRlclRpbWVsb2NrAAAAAAQAAAAGc2VuZGVyCQACWAAAAAEICAUAAAABaQAAAAZjYWxsZXIAAAAFYnl0ZXMEAAAAC3ZhbGlkU2VuZGVyCQEAAAAmY2hlY2tJZk1ldGhvZENhbGxDb21lc0Zyb21WYWxpZEFjY291bnQAAAABBQAAAAZzZW5kZXIEAAAACHRpbWVsb2NrCQEAAAANZ2V0SW50RnJvbUtleQAAAAECAAAACHRpbWVsb2NrAwMJAABmAAAAAgUAAAAGaGVpZ2h0BQAAAAh0aW1lbG9jawUAAAALdmFsaWRTZW5kZXIHBAAAAAxmaXJzdEFkZHJlc3MJAQAAABNnZXRBZGRyZXNzRnJvbUVudHJ5AAAAAQIAAAAMZmlyc3RBZGRyZXNzBAAAAA1zZWNvbmRBZGRyZXNzCQEAAAATZ2V0QWRkcmVzc0Zyb21FbnRyeQAAAAECAAAADXNlY29uZEFkZHJlc3MEAAAAEmZpcnN0QWRkcmVzc0Ftb3VudAkBAAAADWdldEludEZyb21LZXkAAAABBQAAAAxmaXJzdEFkZHJlc3MEAAAAE3NlY29uZEFkZHJlc3NBbW91bnQJAQAAAA1nZXRJbnRGcm9tS2V5AAAAAQUAAAANc2Vjb25kQWRkcmVzcwkBAAAAC1RyYW5zZmVyU2V0AAAAAQkABEwAAAACCQEAAAAOU2NyaXB0VHJhbnNmZXIAAAADCQEAAAAHQWRkcmVzcwAAAAEJAAJZAAAAAQUAAAAMZmlyc3RBZGRyZXNzBQAAABJmaXJzdEFkZHJlc3NBbW91bnQFAAAABHVuaXQJAARMAAAAAgkBAAAADlNjcmlwdFRyYW5zZmVyAAAAAwkBAAAAB0FkZHJlc3MAAAABCQACWQAAAAEFAAAADXNlY29uZEFkZHJlc3MFAAAAE3NlY29uZEFkZHJlc3NBbW91bnQFAAAABHVuaXQFAAAAA25pbAkAAAIAAAABAgAAABVUaW1lbG9jayBzdGlsbCB2YWxpZCEAAAABaQEAAAAOaW5pdGlhbENsb3NpbmcAAAAGAAAACnJlY2lwaWVudEEAAAAQYW1vdW50UmVjaXBpZW50QQAAAApyZWNpcGllbnRCAAAAEGFtb3VudFJlY2lwaWVudEIAAAAJdGltZXN0YW1wAAAACXNpZ25hdHVyZQQAAAAGc2VuZGVyCQACWAAAAAEICAUAAAABaQAAAAZjYWxsZXIAAAAFYnl0ZXMEAAAAC3ZhbGlkU2VuZGVyCQEAAAAmY2hlY2tJZk1ldGhvZENhbGxDb21lc0Zyb21WYWxpZEFjY291bnQAAAABBQAAAAZzZW5kZXIEAAAADm9yaWdpbmFsU3RyaW5nAQAAAFozTXdSWmRxTXlkRTdTaFNZTXZURkFlVEVZbWlCbmFNYU5uMTgwMDNOQlB2ZldWRkpUcE1RdWRBb0Rkc3JoNlFHc0VZMzVBZ3AxMTIwMDE1NjE1NzY0MzI4MTMEAAAAC2NvdW50ZXJQYXJ0CQEAAAATZ2V0QWRkcmVzc0Zyb21FbnRyeQAAAAEJAAEsAAAAAgUAAAAGc2VuZGVyAgAAAAxfY291bnRlcnBhcnQEAAAAE3NpZ25lZEJ5Q291bnRlcnBhcnQJAAH0AAAAAwUAAAAOb3JpZ2luYWxTdHJpbmcJAAGbAAAAAQUAAAAJc2lnbmF0dXJlCQACWQAAAAEFAAAAC2NvdW50ZXJQYXJ0BAAAAA50aW1lbG9ja1BlcmlvZAkBAAAADWdldEludEZyb21LZXkAAAABAgAAAA50aW1lbG9ja1BlcmlvZAMDBQAAABNzaWduZWRCeUNvdW50ZXJwYXJ0BQAAAAt2YWxpZFNlbmRlcgcJAQAAAAhXcml0ZVNldAAAAAEJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIFAAAACnJlY2lwaWVudEEFAAAAEGFtb3VudFJlY2lwaWVudEEJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIFAAAACnJlY2lwaWVudEIFAAAAEGFtb3VudFJlY2lwaWVudEIJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAICAAAAFGNsb3NpbmdfaW5pdGlhdGVkX2J5BQAAAAZzZW5kZXIJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAICAAAACXRpbWVzdGFtcAUAAAAJdGltZXN0YW1wCQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACAgAAAAh0aW1lbG9jawkAAGQAAAACBQAAAAZoZWlnaHQFAAAADnRpbWVsb2NrUGVyaW9kBQAAAANuaWwJAAACAAAAAQIAAAAQV3Jvbmcgc2lnbmF0dXJlIQAAAAFpAQAAAARmdW5kAAAAAAQAAAAGc2VuZGVyCQACWAAAAAEICAUAAAABaQAAAAZjYWxsZXIAAAAFYnl0ZXMEAAAAC3ZhbGlkU2VuZGVyCQEAAAAmY2hlY2tJZk1ldGhvZENhbGxDb21lc0Zyb21WYWxpZEFjY291bnQAAAABBQAAAAZzZW5kZXIEAAAAB3BheW1lbnQJAQAAAAdleHRyYWN0AAAAAQgFAAAAAWkAAAAHcGF5bWVudAQAAAAJYW1vdW50S2V5CQABLAAAAAIFAAAABnNlbmRlcgIAAAAHX2Ftb3VudAQAAAANY3VycmVudEFtb3VudAkBAAAADWdldEludEZyb21LZXkAAAABBQAAAAlhbW91bnRLZXkDBQAAAAt2YWxpZFNlbmRlcgMJAQAAAAIhPQAAAAIFAAAADWN1cnJlbnRBbW91bnQAAAAAAAAAAAAJAAACAAAAAQIAAAAoVXNlciBoYXMgYWxyZWFkeSBmdW5kZWQgcGF5bWVudCBjaGFubmVsIQkBAAAACFdyaXRlU2V0AAAAAQkABEwAAAACCQEAAAAJRGF0YUVudHJ5AAAAAgUAAAAJYW1vdW50S2V5CQAAZAAAAAIFAAAADWN1cnJlbnRBbW91bnQIBQAAAAdwYXltZW50AAAABmFtb3VudAUAAAADbmlsCQAAAgAAAAECAAAAJFdyb25nIGFjY291bnQgdHJpZXMgdG8gZnVuZCBjaGFubmVsIQAAAAFpAQAAAARpbml0AAAABQAAAAxmaXJzdEFkZHJlc3MAAAAOZmlyc3RQdWJsaWNLZXkAAAANc2Vjb25kQWRkcmVzcwAAAA9zZWNvbmRQdWJsaWNLZXkAAAAOdGltZWxvY2tQZXJpb2QEAAAAE2N1cnJlbnRGaXJzdEFkZHJlc3MJAQAAABpnZXRBZGRyZXNzRnJvbUVudHJ5T3JFbXB0eQAAAAEJAAEsAAAAAgUAAAAMZmlyc3RBZGRyZXNzAgAAAAxfY291bnRlcnBhcnQEAAAAFGN1cnJlbnRTZWNvbmRBZGRyZXNzCQEAAAAaZ2V0QWRkcmVzc0Zyb21FbnRyeU9yRW1wdHkAAAABCQABLAAAAAIFAAAADXNlY29uZEFkZHJlc3MCAAAADF9jb3VudGVycGFydAMDCQEAAAACIT0AAAACBQAAABNjdXJyZW50Rmlyc3RBZGRyZXNzAgAAAAAGCQEAAAACIT0AAAACBQAAABRjdXJyZW50U2Vjb25kQWRkcmVzcwIAAAAACQAAAgAAAAECAAAAG0NvbnRyYWN0IGFscmVhZHkgaW5pdGlhdGVkIQkBAAAACFdyaXRlU2V0AAAAAQkABEwAAAACCQEAAAAJRGF0YUVudHJ5AAAAAgIAAAAMZmlyc3RBZGRyZXNzBQAAAAxmaXJzdEFkZHJlc3MJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAICAAAADXNlY29uZEFkZHJlc3MFAAAADXNlY29uZEFkZHJlc3MJAARMAAAAAgkBAAAACURhdGFFbnRyeQAAAAIJAAEsAAAAAgUAAAAMZmlyc3RBZGRyZXNzAgAAAAxfY291bnRlcnBhcnQFAAAAD3NlY29uZFB1YmxpY0tleQkABEwAAAACCQEAAAAJRGF0YUVudHJ5AAAAAgkAASwAAAACBQAAAA1zZWNvbmRBZGRyZXNzAgAAAAxfY291bnRlcnBhcnQFAAAADmZpcnN0UHVibGljS2V5CQAETAAAAAIJAQAAAAlEYXRhRW50cnkAAAACAgAAAA50aW1lbG9ja1BlcmlvZAUAAAAOdGltZWxvY2tQZXJpb2QFAAAAA25pbAAAAAEAAAACdHgBAAAABnZlcmlmeQAAAAAEAAAAByRtYXRjaDAFAAAAAnR4Bp4IY0U=",
    "chainId": 84,
    "height": 560963,
    "spentComplexity": 0
}

View: original | compacted
Prev: EFoWEcepJrzq1uS7N5ZCGSCaer5VHcqwz861zwF5xEwZ
Next: 2s3h14MpDKwzrbMv2NXQumLzFCCqh2Gmb4eb5puWWTk6

Diff: 
Old New Differences
108 108  func initialClosing (recipientA,amountRecipientA,recipientB,amountRecipientB,timestamp,signature) = {
109 109      let sender = toBase58String(i.caller.bytes)
110 110      let validSender = checkIfMethodCallComesFromValidAccount(sender)
111 -     let originalString = ((((recipientA + toString(amountRecipientA)) + recipientB) + toString(amountRecipientB)) + toString(timestamp))
111 +     let originalString = base58'93M7wAymK2hDNWAzYkHZcWgiL2Cey4ZvTtfLPTFyhf23yVE3H1ikTSpBuHkSU5vi9qXbXWiJmhxamKyUuA17SxgGpWvwy1MqwBLDh8c5hh6iudfiY3mj5UeGM4n'
112 112      let counterPart = getAddressFromEntry((sender + "_counterpart"))
113 -     let signedByCounterpart = sigVerify(toBytes(originalString), toBytes(signature), fromBase58String(counterPart))
113 +     let signedByCounterpart = sigVerify(originalString, toBytes(signature), fromBase58String(counterPart))
114 114      let timelockPeriod = getIntFromKey("timelockPeriod")
115 115      if (if (signedByCounterpart)
116 116          then validSender
Full: 
Old New Differences
1 1  {-# STDLIB_VERSION 3 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 4  func getAddressFromEntry (key) = {
5 5      let address =     match getString(this, key) {
6 6          case str: String => 
7 7              str
8 8          case _ => 
9 9              throw("First address not set!")
10 10      }
11 11      address
12 12      }
13 13  
14 14  
15 15  func getAddressFromEntryOrEmpty (key) = {
16 16      let address =     match getString(this, key) {
17 17          case str: String => 
18 18              str
19 19          case _ => 
20 20              ""
21 21      }
22 22      address
23 23      }
24 24  
25 25  
26 26  func getIntFromKey (key) = {
27 27      let firstAddressAmount =     match getInteger(this, key) {
28 28          case n: Int => 
29 29              n
30 30          case _ => 
31 31              0
32 32      }
33 33      firstAddressAmount
34 34      }
35 35  
36 36  
37 37  func checkIfMethodCallComesFromValidAccount (sender) = {
38 38      let firstAddress = getAddressFromEntry("firstAddress")
39 39      let secondAddress = getAddressFromEntry("secondAddress")
40 40      if (if ((firstAddress != sender))
41 41          then (secondAddress != sender)
42 42          else false)
43 43          then throw(("Method call from invalid account: " + sender))
44 44          else true
45 45      }
46 46  
47 47  
48 48  @Callable(i)
49 49  func claimCheating (recipientA,amountRecipientA,recipientB,amountRecipientB,timestamp,signature) = {
50 50      let sender = toBase58String(i.caller.bytes)
51 51      let validSender = checkIfMethodCallComesFromValidAccount(sender)
52 52      let originalString = ((((recipientA + toString(amountRecipientA)) + recipientB) + toString(amountRecipientB)) + toString(timestamp))
53 53      let counterPart = getAddressFromEntry((sender + "_counterpart"))
54 54      let signedByCounterpart = sigVerify(fromBase58String(originalString), fromBase58String(signature), fromBase58String(counterPart))
55 55      let oldTimestamp = getIntFromKey("timestamp")
56 56      if (if (if (validSender)
57 57          then signedByCounterpart
58 58          else false)
59 59          then (timestamp > oldTimestamp)
60 60          else false)
61 61          then TransferSet([ScriptTransfer(i.caller, (amountRecipientA + amountRecipientB), unit)])
62 62          else throw("Wrong signature or timestamp not newer!")
63 63      }
64 64  
65 65  
66 66  
67 67  @Callable(i)
68 68  func confirmClose () = {
69 69      let sender = toBase58String(i.caller.bytes)
70 70      let validSender = checkIfMethodCallComesFromValidAccount(sender)
71 71      let initiator = getString(this, "closing_initiated_by")
72 72      if (if ((sender != initiator))
73 73          then validSender
74 74          else false)
75 75          then {
76 76              let firstAddress = getAddressFromEntry("firstAddress")
77 77              let secondAddress = getAddressFromEntry("secondAddress")
78 78              let firstAddressAmount = getIntFromKey(firstAddress)
79 79              let secondAddressAmount = getIntFromKey(secondAddress)
80 80              TransferSet([ScriptTransfer(Address(fromBase58String(firstAddress)), firstAddressAmount, unit), ScriptTransfer(Address(fromBase58String(secondAddress)), secondAddressAmount, unit)])
81 81              }
82 82          else throw("Initiator can not confirm closing of the channel!")
83 83      }
84 84  
85 85  
86 86  
87 87  @Callable(i)
88 88  func closeAfterTimelock () = {
89 89      let sender = toBase58String(i.caller.bytes)
90 90      let validSender = checkIfMethodCallComesFromValidAccount(sender)
91 91      let timelock = getIntFromKey("timelock")
92 92      if (if ((height > timelock))
93 93          then validSender
94 94          else false)
95 95          then {
96 96              let firstAddress = getAddressFromEntry("firstAddress")
97 97              let secondAddress = getAddressFromEntry("secondAddress")
98 98              let firstAddressAmount = getIntFromKey(firstAddress)
99 99              let secondAddressAmount = getIntFromKey(secondAddress)
100 100              TransferSet([ScriptTransfer(Address(fromBase58String(firstAddress)), firstAddressAmount, unit), ScriptTransfer(Address(fromBase58String(secondAddress)), secondAddressAmount, unit)])
101 101              }
102 102          else throw("Timelock still valid!")
103 103      }
104 104  
105 105  
106 106  
107 107  @Callable(i)
108 108  func initialClosing (recipientA,amountRecipientA,recipientB,amountRecipientB,timestamp,signature) = {
109 109      let sender = toBase58String(i.caller.bytes)
110 110      let validSender = checkIfMethodCallComesFromValidAccount(sender)
111 -     let originalString = ((((recipientA + toString(amountRecipientA)) + recipientB) + toString(amountRecipientB)) + toString(timestamp))
111 +     let originalString = base58'93M7wAymK2hDNWAzYkHZcWgiL2Cey4ZvTtfLPTFyhf23yVE3H1ikTSpBuHkSU5vi9qXbXWiJmhxamKyUuA17SxgGpWvwy1MqwBLDh8c5hh6iudfiY3mj5UeGM4n'
112 112      let counterPart = getAddressFromEntry((sender + "_counterpart"))
113 -     let signedByCounterpart = sigVerify(toBytes(originalString), toBytes(signature), fromBase58String(counterPart))
113 +     let signedByCounterpart = sigVerify(originalString, toBytes(signature), fromBase58String(counterPart))
114 114      let timelockPeriod = getIntFromKey("timelockPeriod")
115 115      if (if (signedByCounterpart)
116 116          then validSender
117 117          else false)
118 118          then WriteSet([DataEntry(recipientA, amountRecipientA), DataEntry(recipientB, amountRecipientB), DataEntry("closing_initiated_by", sender), DataEntry("timestamp", timestamp), DataEntry("timelock", (height + timelockPeriod))])
119 119          else throw("Wrong signature!")
120 120      }
121 121  
122 122  
123 123  
124 124  @Callable(i)
125 125  func fund () = {
126 126      let sender = toBase58String(i.caller.bytes)
127 127      let validSender = checkIfMethodCallComesFromValidAccount(sender)
128 128      let payment = extract(i.payment)
129 129      let amountKey = (sender + "_amount")
130 130      let currentAmount = getIntFromKey(amountKey)
131 131      if (validSender)
132 132          then if ((currentAmount != 0))
133 133              then throw("User has already funded payment channel!")
134 134              else WriteSet([DataEntry(amountKey, (currentAmount + payment.amount))])
135 135          else throw("Wrong account tries to fund channel!")
136 136      }
137 137  
138 138  
139 139  
140 140  @Callable(i)
141 141  func init (firstAddress,firstPublicKey,secondAddress,secondPublicKey,timelockPeriod) = {
142 142      let currentFirstAddress = getAddressFromEntryOrEmpty((firstAddress + "_counterpart"))
143 143      let currentSecondAddress = getAddressFromEntryOrEmpty((secondAddress + "_counterpart"))
144 144      if (if ((currentFirstAddress != ""))
145 145          then true
146 146          else (currentSecondAddress != ""))
147 147          then throw("Contract already initiated!")
148 148          else WriteSet([DataEntry("firstAddress", firstAddress), DataEntry("secondAddress", secondAddress), DataEntry((firstAddress + "_counterpart"), secondPublicKey), DataEntry((secondAddress + "_counterpart"), firstPublicKey), DataEntry("timelockPeriod", timelockPeriod)])
149 149      }
150 150  
151 151  
152 152  @Verifier(tx)
153 153  func verify () = match tx {
154 154      case _ => 
155 155          true
156 156  }
157 157

Old	New		Differences
108	108		func initialClosing (recipientA,amountRecipientA,recipientB,amountRecipientB,timestamp,signature) = {
109	109		let sender = toBase58String(i.caller.bytes)
110	110		let validSender = checkIfMethodCallComesFromValidAccount(sender)
111		-	let originalString = ~~((((recipientA + toString(amountRecipientA)) + recipientB) + toString(amountRecipientB)) + toString(timestamp))~~
	111	+	let originalString = base58'93M7wAymK2hDNWAzYkHZcWgiL2Cey4ZvTtfLPTFyhf23yVE3H1ikTSpBuHkSU5vi9qXbXWiJmhxamKyUuA17SxgGpWvwy1MqwBLDh8c5hh6iudfiY3mj5UeGM4n'
112	112		let counterPart = getAddressFromEntry((sender + "_counterpart"))
113		-	let signedByCounterpart = sigVerify(~~toBytes(~~originalString), toBytes(signature), fromBase58String(counterPart))
	113	+	let signedByCounterpart = sigVerify(originalString, toBytes(signature), fromBase58String(counterPart))
114	114		let timelockPeriod = getIntFromKey("timelockPeriod")
115	115		if (if (signedByCounterpart)
116	116		then validSender

Old	New		Differences
1	1		{-# STDLIB_VERSION 3 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4	4		func getAddressFromEntry (key) = {
5	5		let address = match getString(this, key) {
6	6		case str: String =>
7	7		str
8	8		case _ =>
9	9		throw("First address not set!")
10	10		}
11	11		address
12	12		}
13	13
14	14
15	15		func getAddressFromEntryOrEmpty (key) = {
16	16		let address = match getString(this, key) {
17	17		case str: String =>
18	18		str
19	19		case _ =>
20	20		""
21	21		}
22	22		address
23	23		}
24	24
25	25
26	26		func getIntFromKey (key) = {
27	27		let firstAddressAmount = match getInteger(this, key) {
28	28		case n: Int =>
29	29		n
30	30		case _ =>
31	31		0
32	32		}
33	33		firstAddressAmount
34	34		}
35	35
36	36
37	37		func checkIfMethodCallComesFromValidAccount (sender) = {
38	38		let firstAddress = getAddressFromEntry("firstAddress")
39	39		let secondAddress = getAddressFromEntry("secondAddress")
40	40		if (if ((firstAddress != sender))
41	41		then (secondAddress != sender)
42	42		else false)
43	43		then throw(("Method call from invalid account: " + sender))
44	44		else true
45	45		}
46	46
47	47
48	48		@Callable(i)
49	49		func claimCheating (recipientA,amountRecipientA,recipientB,amountRecipientB,timestamp,signature) = {
50	50		let sender = toBase58String(i.caller.bytes)
51	51		let validSender = checkIfMethodCallComesFromValidAccount(sender)
52	52		let originalString = ((((recipientA + toString(amountRecipientA)) + recipientB) + toString(amountRecipientB)) + toString(timestamp))
53	53		let counterPart = getAddressFromEntry((sender + "_counterpart"))
54	54		let signedByCounterpart = sigVerify(fromBase58String(originalString), fromBase58String(signature), fromBase58String(counterPart))
55	55		let oldTimestamp = getIntFromKey("timestamp")
56	56		if (if (if (validSender)
57	57		then signedByCounterpart
58	58		else false)
59	59		then (timestamp > oldTimestamp)
60	60		else false)
61	61		then TransferSet([ScriptTransfer(i.caller, (amountRecipientA + amountRecipientB), unit)])
62	62		else throw("Wrong signature or timestamp not newer!")
63	63		}
64	64
65	65
66	66
67	67		@Callable(i)
68	68		func confirmClose () = {
69	69		let sender = toBase58String(i.caller.bytes)
70	70		let validSender = checkIfMethodCallComesFromValidAccount(sender)
71	71		let initiator = getString(this, "closing_initiated_by")
72	72		if (if ((sender != initiator))
73	73		then validSender
74	74		else false)
75	75		then {
76	76		let firstAddress = getAddressFromEntry("firstAddress")
77	77		let secondAddress = getAddressFromEntry("secondAddress")
78	78		let firstAddressAmount = getIntFromKey(firstAddress)
79	79		let secondAddressAmount = getIntFromKey(secondAddress)
80	80		TransferSet([ScriptTransfer(Address(fromBase58String(firstAddress)), firstAddressAmount, unit), ScriptTransfer(Address(fromBase58String(secondAddress)), secondAddressAmount, unit)])
81	81		}
82	82		else throw("Initiator can not confirm closing of the channel!")
83	83		}
84	84
85	85
86	86
87	87		@Callable(i)
88	88		func closeAfterTimelock () = {
89	89		let sender = toBase58String(i.caller.bytes)
90	90		let validSender = checkIfMethodCallComesFromValidAccount(sender)
91	91		let timelock = getIntFromKey("timelock")
92	92		if (if ((height > timelock))
93	93		then validSender
94	94		else false)
95	95		then {
96	96		let firstAddress = getAddressFromEntry("firstAddress")
97	97		let secondAddress = getAddressFromEntry("secondAddress")
98	98		let firstAddressAmount = getIntFromKey(firstAddress)
99	99		let secondAddressAmount = getIntFromKey(secondAddress)
100	100		TransferSet([ScriptTransfer(Address(fromBase58String(firstAddress)), firstAddressAmount, unit), ScriptTransfer(Address(fromBase58String(secondAddress)), secondAddressAmount, unit)])
101	101		}
102	102		else throw("Timelock still valid!")
103	103		}
104	104
105	105
106	106
107	107		@Callable(i)
108	108		func initialClosing (recipientA,amountRecipientA,recipientB,amountRecipientB,timestamp,signature) = {
109	109		let sender = toBase58String(i.caller.bytes)
110	110		let validSender = checkIfMethodCallComesFromValidAccount(sender)
111		-	let originalString = ~~((((recipientA + toString(amountRecipientA)) + recipientB) + toString(amountRecipientB)) + toString(timestamp))~~
	111	+	let originalString = base58'93M7wAymK2hDNWAzYkHZcWgiL2Cey4ZvTtfLPTFyhf23yVE3H1ikTSpBuHkSU5vi9qXbXWiJmhxamKyUuA17SxgGpWvwy1MqwBLDh8c5hh6iudfiY3mj5UeGM4n'
112	112		let counterPart = getAddressFromEntry((sender + "_counterpart"))
113		-	let signedByCounterpart = sigVerify(~~toBytes(~~originalString), toBytes(signature), fromBase58String(counterPart))
	113	+	let signedByCounterpart = sigVerify(originalString, toBytes(signature), fromBase58String(counterPart))
114	114		let timelockPeriod = getIntFromKey("timelockPeriod")
115	115		if (if (signedByCounterpart)
116	116		then validSender
117	117		else false)
118	118		then WriteSet([DataEntry(recipientA, amountRecipientA), DataEntry(recipientB, amountRecipientB), DataEntry("closing_initiated_by", sender), DataEntry("timestamp", timestamp), DataEntry("timelock", (height + timelockPeriod))])
119	119		else throw("Wrong signature!")
120	120		}
121	121
122	122
123	123
124	124		@Callable(i)
125	125		func fund () = {
126	126		let sender = toBase58String(i.caller.bytes)
127	127		let validSender = checkIfMethodCallComesFromValidAccount(sender)
128	128		let payment = extract(i.payment)
129	129		let amountKey = (sender + "_amount")
130	130		let currentAmount = getIntFromKey(amountKey)
131	131		if (validSender)
132	132		then if ((currentAmount != 0))
133	133		then throw("User has already funded payment channel!")
134	134		else WriteSet([DataEntry(amountKey, (currentAmount + payment.amount))])
135	135		else throw("Wrong account tries to fund channel!")
136	136		}
137	137
138	138
139	139
140	140		@Callable(i)
141	141		func init (firstAddress,firstPublicKey,secondAddress,secondPublicKey,timelockPeriod) = {
142	142		let currentFirstAddress = getAddressFromEntryOrEmpty((firstAddress + "_counterpart"))
143	143		let currentSecondAddress = getAddressFromEntryOrEmpty((secondAddress + "_counterpart"))
144	144		if (if ((currentFirstAddress != ""))
145	145		then true
146	146		else (currentSecondAddress != ""))
147	147		then throw("Contract already initiated!")
148	148		else WriteSet([DataEntry("firstAddress", firstAddress), DataEntry("secondAddress", secondAddress), DataEntry((firstAddress + "_counterpart"), secondPublicKey), DataEntry((secondAddress + "_counterpart"), firstPublicKey), DataEntry("timelockPeriod", timelockPeriod)])
149	149		}
150	150
151	151
152	152		@Verifier(tx)
153	153		func verify () = match tx {
154	154		case _ =>
155	155		true
156	156		}
157	157

github/deemru/w8io/873ac7e 
30.73 ms ◑