w8 · tx · 5EX···SFy

tx · 5EXZxsMvBwcNp8KhwnTy3HV1BMWC7k4WBmWPRzqWfSFy

3MxTLPY7MJxVDfpJcNy9Liq2r8pyZxNbjjU:  -0.01400000 Waves

2023.03.15 23:05 [2491594] smart account 3MxTLPY7MJxVDfpJcNy9Liq2r8pyZxNbjjU > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "5EXZxsMvBwcNp8KhwnTy3HV1BMWC7k4WBmWPRzqWfSFy",
    "fee": 1400000,
    "feeAssetId": null,
    "timestamp": 1678910586078,
    "version": 2,
    "chainId": 84,
    "sender": "3MxTLPY7MJxVDfpJcNy9Liq2r8pyZxNbjjU",
    "senderPublicKey": "9iq3qkUQrdNdSB4GA6y4ATzwCKQUBDgLpcfWzmyJshzW",
    "proofs": [
        "3kaxiPC2s6ujFCNt7prLQY1JbgUK41vSgoixsNfURtRfAXLiheqTiF9cX18iqpcb5HKaFWQBchLvUMuCNW5KJNqj"
    ],
    "script": "base64:BgInCAISBAoCCAESBQoDAQgIEgMKAQgSAwoBCBIAEgASAwoBCBIDCgEILAAJU0VQQVJBVE9SAgJfXwAIS0VZX0lOSVQCBElOSVQADEtFWV9NVUxUSVNJRwIITVVMVElTSUcACktFWV9TVEFUVVMCBlNUQVRVUwAKS0VZX1BBVVNFRAIGUEFVU0VEAApLRVlfUEFVU0VSAgZQQVVTRVIADUtFWV9BTExPV0FOQ0UCCUFMTE9XQU5DRQARS0VZX0NBTExfQ0hBSU5fSUQCDUNBTExfQ0hBSU5fSUQADktFWV9FVkVOVF9TSVpFAgpFVkVOVF9TSVpFAAlLRVlfRVZFTlQCBUVWRU5UAAlLRVlfTk9OQ0UCBU5PTkNFAAdNQVhfSU5UAP//////////fwAJU0xPVF9TSVpFACAACVpFUk9fU0xPVAEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABEF92YWxpZGF0ZUFkZHJlc3MCCGFkZHJlc3NfBGVycl8EByRtYXRjaDAJAKYIAQUIYWRkcmVzc18DCQABAgUHJG1hdGNoMAIHQWRkcmVzcwQBYQUHJG1hdGNoMAYJAAIBBQRlcnJfAQxfdmFsaWRhdGVJbnQEBHZhbF8ObG93ZXJCb3VuZGFyeV8OdXBwZXJCb3VuZGFyeV8EZXJyXwMDCQBmAgUObG93ZXJCb3VuZGFyeV8FBHZhbF8GCQBmAgUEdmFsXwUOdXBwZXJCb3VuZGFyeV8JAAIBBQRlcnJfBgEPX3ZhbGlkYXRlU3RyaW5nAgR2YWxfBGVycl8DAwkAZwIAAAkAsQIBBQR2YWxfBgkBCGNvbnRhaW5zAgUEdmFsXwUJU0VQQVJBVE9SCQACAQUEZXJyXwYBCV9sb2FkSW5pdAAEByRtYXRjaDAJAKAIAQUIS0VZX0lOSVQDCQABAgUHJG1hdGNoMAIHQm9vbGVhbgQBYQUHJG1hdGNoMAUBYQcBCV9zYXZlSW5pdAEHaXNJbml0XwkAzAgCCQEMQm9vbGVhbkVudHJ5AgUIS0VZX0lOSVQFB2lzSW5pdF8FA25pbAEKX2xvYWRQYXVzZQAEByRtYXRjaDAJAKAIAQUKS0VZX1BBVVNFRAMJAAECBQckbWF0Y2gwAgdCb29sZWFuBAFhBQckbWF0Y2gwBQFhBwEKX3NhdmVQYXVzZQEJaXNQYXVzZWRfCQDMCAIJAQxCb29sZWFuRW50cnkCBQpLRVlfUEFVU0VEBQlpc1BhdXNlZF8FA25pbAELX2xvYWRQYXVzZXIABAckbWF0Y2gwCQCiCAEFCktFWV9QQVVTRVIDCQABAgUHJG1hdGNoMAIGU3RyaW5nBAFhBQckbWF0Y2gwCQERQGV4dHJOYXRpdmUoMTA2MikBBQFhCQEHQWRkcmVzcwEBAAELX3NhdmVQYXVzZXIBB3BhdXNlcl8JAMwIAgkBC1N0cmluZ0VudHJ5AgUKS0VZX1BBVVNFUgkApQgBBQdwYXVzZXJfBQNuaWwBDl9sb2FkQWxsb3dhbmNlAQdjYWxsZXJfBAckbWF0Y2gwCQCgCAEJALkJAgkAzAgCBQ1LRVlfQUxMT1dBTkNFCQDMCAIJAKUIAQUHY2FsbGVyXwUDbmlsBQlTRVBBUkFUT1IDCQABAgUHJG1hdGNoMAIHQm9vbGVhbgQBYQUHJG1hdGNoMAUBYQcBDl9zYXZlQWxsb3dhbmNlAgdjYWxsZXJfBHZhbF8JAMwIAgkBDEJvb2xlYW5FbnRyeQIJALkJAgkAzAgCBQ1LRVlfQUxMT1dBTkNFCQDMCAIJAKUIAQUHY2FsbGVyXwUDbmlsBQlTRVBBUkFUT1IFBHZhbF8FA25pbAENX2xvYWRNdWx0aXNpZwAEByRtYXRjaDAJAKIIAQUMS0VZX01VTFRJU0lHAwkAAQIFByRtYXRjaDACBlN0cmluZwQBYQUHJG1hdGNoMAkBEUBleHRyTmF0aXZlKDEwNjIpAQUBYQkBB0FkZHJlc3MBAQABDV9zYXZlTXVsdGlzaWcBCW11bHRpc2lnXwkAzAgCCQELU3RyaW5nRW50cnkCBQxLRVlfTVVMVElTSUcJAKUIAQUJbXVsdGlzaWdfBQNuaWwBEF9sb2FkQ2FsbENoYWluSWQABAckbWF0Y2gwCQCfCAEFEUtFWV9DQUxMX0NIQUlOX0lEAwkAAQIFByRtYXRjaDACA0ludAQBYQUHJG1hdGNoMAUBYQAAARBfc2F2ZUNhbGxDaGFpbklkAQxjYWxsQ2hhaW5JZF8JAMwIAgkBDEludGVnZXJFbnRyeQIFEUtFWV9DQUxMX0NIQUlOX0lEBQxjYWxsQ2hhaW5JZF8FA25pbAEOX2xvYWRFdmVudFNpemUABAckbWF0Y2gwCQCfCAEFDktFWV9FVkVOVF9TSVpFAwkAAQIFByRtYXRjaDACA0ludAQBYQUHJG1hdGNoMAUBYQAAAQ5fc2F2ZUV2ZW50U2l6ZQEGaW5kZXhfCQDMCAIJAQxJbnRlZ2VyRW50cnkCBQ5LRVlfRVZFTlRfU0laRQUGaW5kZXhfBQNuaWwBCl9zYXZlRXZlbnQCBmluZGV4XwZldmVudF8JAMwIAgkBC1N0cmluZ0VudHJ5AgkAuQkCCQDMCAIFCUtFWV9FVkVOVAkAzAgCCQCkAwEFBmluZGV4XwUDbmlsBQlTRVBBUkFUT1IJALkJAgkAzAgCCQCkAwEIBQZldmVudF8CXzEJAMwIAgkApAMBCAUGZXZlbnRfAl8yCQDMCAIIBQZldmVudF8CXzMJAMwIAggFBmV2ZW50XwJfNAkAzAgCCQCkAwEIBQZldmVudF8CXzUJAMwIAggFBmV2ZW50XwJfNgkAzAgCCQCkAwEIBQZldmVudF8CXzcFA25pbAUJU0VQQVJBVE9SBQNuaWwBCl9sb2FkTm9uY2UABAckbWF0Y2gwCQCfCAEFCUtFWV9OT05DRQMJAAECBQckbWF0Y2gwAgNJbnQEAWEFByRtYXRjaDAFAWEAAAEKX3NhdmVOb25jZQEEdmFsXwkAzAgCCQEMSW50ZWdlckVudHJ5AgUJS0VZX05PTkNFBQR2YWxfBQNuaWwBEV9vbmx5VGhpc0NvbnRyYWN0AQdjYWxsZXJfAwkBAiE9AgUHY2FsbGVyXwUEdGhpcwkAAgECGV9vbmx5VGhpc0NvbnRyYWN0OiByZXZlcnQGARBfd2hlbk11bHRpc2lnU2V0AAMJAAACCQENX2xvYWRNdWx0aXNpZwAJAQdBZGRyZXNzAQEACQACAQIYX3doZW5NdWx0aXNpZ1NldDogcmV2ZXJ0BgETX3doZW5Ob3RJbml0aWFsaXplZAADCQEJX2xvYWRJbml0AAkAAgECG193aGVuTm90SW5pdGlhbGl6ZWQ6IHJldmVydAYBEF93aGVuSW5pdGlhbGl6ZWQAAwkBASEBCQEJX2xvYWRJbml0AAkAAgECGF93aGVuSW5pdGlhbGl6ZWQ6IHJldmVydAYBDl93aGVuTm90UGF1c2VkAAMJAQpfbG9hZFBhdXNlAAkAAgECFl93aGVuTm90UGF1c2VkOiByZXZlcnQGAQtfd2hlblBhdXNlZAADCQEBIQEJAQpfbG9hZFBhdXNlAAkAAgECE193aGVuUGF1c2VkOiByZXZlcnQGAQtfb25seVBhdXNlcgEHY2FsbGVyXwMJAQIhPQIFB2NhbGxlcl8JAQtfbG9hZFBhdXNlcgAJAAIBAhNfb25seVBhdXNlcjogcmV2ZXJ0BgEMX3doZW5BbGxvd2VkAQdjYWxsZXJfAwkBASEBCQEOX2xvYWRBbGxvd2FuY2UBBQdjYWxsZXJfCQACAQIUX3doZW5BbGxvd2VkOiByZXZlcnQGAQtfYWxpZ25SaWdodAEEdmFsXwkAywECCQDJAQIFCVpFUk9fU0xPVAkAZQIFCVNMT1RfU0laRQkAyAEBBQR2YWxfBQR2YWxfAQdfYWRkQXJnAgljYWxsZGF0YV8EYXJnXwQIY2FsbGRhdGEJAN0EAQkAsAICBQljYWxsZGF0YV8AAgkArAICAgIweAkA3AQBCQDLAQIJAMsBAgkAyQECBQhjYWxsZGF0YQAECQELX2FsaWduUmlnaHQBBQRhcmdfCQDKAQIFCGNhbGxkYXRhAAQIAWkBBGluaXQCB3BhdXNlcl8MY2FsbENoYWluSWRfBANlcnIDAwMDCQERX29ubHlUaGlzQ29udHJhY3QBCAUBaQZjYWxsZXIJARNfd2hlbk5vdEluaXRpYWxpemVkAAcJARBfd2hlbk11bHRpc2lnU2V0AAcJARBfdmFsaWRhdGVBZGRyZXNzAgUHcGF1c2VyXwIUaW5pdDogaW52YWxpZCBwYXVzZXIHCQEMX3ZhbGlkYXRlSW50BAUMY2FsbENoYWluSWRfAAAFB01BWF9JTlQCG2luaXQ6IGludmFsaWQgY2FsbCBjaGFpbiBpZAcDCQAAAgUDZXJyBQNlcnIJAJQKAgkAzggCCQDOCAIJAQlfc2F2ZUluaXQBBgkBC19zYXZlUGF1c2VyAQkBEUBleHRyTmF0aXZlKDEwNjIpAQUHcGF1c2VyXwkBEF9zYXZlQ2FsbENoYWluSWQBBQxjYWxsQ2hhaW5JZF8FBHVuaXQJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BaQEEY2FsbAMRZXhlY3V0aW9uQ2hhaW5JZF8SZXhlY3V0aW9uQ29udHJhY3RfCWNhbGxkYXRhXwQDZXJyAwMDAwkBEF93aGVuSW5pdGlhbGl6ZWQACQEMX3doZW5BbGxvd2VkAQgFAWkGY2FsbGVyBwkBDl93aGVuTm90UGF1c2VkAAcJAQ9fdmFsaWRhdGVTdHJpbmcCBRJleGVjdXRpb25Db250cmFjdF8CH2NhbGw6IGludmFsaWQgZXhlY3V0aW9uQ29udHJhY3QHCQEPX3ZhbGlkYXRlU3RyaW5nAgUJY2FsbGRhdGFfAhZjYWxsOiBpbnZhbGlkIGNhbGxkYXRhBwMJAAACBQNlcnIFA2VycgQFbm9uY2UJAQpfbG9hZE5vbmNlAAQJZXZlbnRTaXplCQEOX2xvYWRFdmVudFNpemUABAVldmVudAkAmQoHCQEQX2xvYWRDYWxsQ2hhaW5JZAAFEWV4ZWN1dGlvbkNoYWluSWRfBRJleGVjdXRpb25Db250cmFjdF8JAQdfYWRkQXJnAgUJY2FsbGRhdGFfCAgFAWkGY2FsbGVyBWJ5dGVzBQVub25jZQkA2AQBCAUBaQ10cmFuc2FjdGlvbklkBQZoZWlnaHQJAJQKAgkAzggCCQDOCAIJAQ5fc2F2ZUV2ZW50U2l6ZQEJAGQCBQlldmVudFNpemUAAQkBCl9zYXZlRXZlbnQCBQlldmVudFNpemUFBWV2ZW50CQEKX3NhdmVOb25jZQEJAGQCBQVub25jZQABBQR1bml0CQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAWkBBWFsbG93AQdjYWxsZXJfBANlcnIDAwkBEV9vbmx5VGhpc0NvbnRyYWN0AQgFAWkGY2FsbGVyCQEQX3doZW5Jbml0aWFsaXplZAAHCQEQX3ZhbGlkYXRlQWRkcmVzcwIFB2NhbGxlcl8CGWFsbG93OiBpbnZhbGlkIGNhbGxlciBhcmcHAwkAAAIFA2VycgUDZXJyCQCUCgIJAQ5fc2F2ZUFsbG93YW5jZQIJARFAZXh0ck5hdGl2ZSgxMDYyKQEFB2NhbGxlcl8GBQR1bml0CQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAWkBCGRpc2FsbG93AQdjYWxsZXJfBANlcnIDAwkBEV9vbmx5VGhpc0NvbnRyYWN0AQgFAWkGY2FsbGVyCQEQX3doZW5Jbml0aWFsaXplZAAHCQEQX3ZhbGlkYXRlQWRkcmVzcwIFB2NhbGxlcl8CHGRpc2FsbG93OiBpbnZhbGlkIGNhbGxlciBhcmcHAwkAAAIFA2VycgUDZXJyCQCUCgIJAQ5fc2F2ZUFsbG93YW5jZQIJARFAZXh0ck5hdGl2ZSgxMDYyKQEFB2NhbGxlcl8HBQR1bml0CQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAWkBBXBhdXNlAAQDZXJyAwMJAQtfb25seVBhdXNlcgEIBQFpBmNhbGxlcgkBEF93aGVuSW5pdGlhbGl6ZWQABwkBDl93aGVuTm90UGF1c2VkAAcDCQAAAgUDZXJyBQNlcnIJAJQKAgkBCl9zYXZlUGF1c2UBBgUEdW5pdAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgFpAQd1bnBhdXNlAAQDZXJyAwMJAQtfb25seVBhdXNlcgEIBQFpBmNhbGxlcgkBEF93aGVuSW5pdGlhbGl6ZWQABwkBC193aGVuUGF1c2VkAAcDCQAAAgUDZXJyBQNlcnIJAJQKAgkBCl9zYXZlUGF1c2UBBwUEdW5pdAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgFpAQx1cGRhdGVQYXVzZXIBB3BhdXNlcl8EA2VycgMDCQERX29ubHlUaGlzQ29udHJhY3QBCAUBaQZjYWxsZXIJARBfd2hlbkluaXRpYWxpemVkAAcJARBfdmFsaWRhdGVBZGRyZXNzAgUHcGF1c2VyXwIUaW5pdDogaW52YWxpZCBwYXVzZXIHAwkAAAIFA2VycgUDZXJyCQCUCgIJAQtfc2F2ZVBhdXNlcgEJARFAZXh0ck5hdGl2ZSgxMDYyKQEFB3BhdXNlcl8FBHVuaXQJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BaQELc2V0TXVsdGlzaWcBCW11bHRpc2lnXwQDZXJyAwkBEV9vbmx5VGhpc0NvbnRyYWN0AQgFAWkGY2FsbGVyCQEQX3ZhbGlkYXRlQWRkcmVzcwIFCW11bHRpc2lnXwIlc2V0TXVsdGlzaWc6IGludmFsaWQgbXVsdGlzaWcgYWRkcmVzcwcDCQAAAgUDZXJyBQNlcnIJAJQKAgkBDV9zYXZlTXVsdGlzaWcBCQERQGV4dHJOYXRpdmUoMTA2MikBBQltdWx0aXNpZ18FBHVuaXQJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BAnR4AQZ2ZXJpZnkABAckbWF0Y2gwCQCiCAEFDEtFWV9NVUxUSVNJRwMJAAECBQckbWF0Y2gwAgZTdHJpbmcECG11bHRpc2lnBQckbWF0Y2gwCQELdmFsdWVPckVsc2UCCQCbCAIJARFAZXh0ck5hdGl2ZSgxMDYyKQEFCG11bHRpc2lnCQC5CQIJAMwIAgUKS0VZX1NUQVRVUwkAzAgCCQClCAEFBHRoaXMJAMwIAgkA2AQBCAUCdHgCaWQFA25pbAUJU0VQQVJBVE9SBwkA9AMDCAUCdHgJYm9keUJ5dGVzCQCRAwIIBQJ0eAZwcm9vZnMAAAgFAnR4D3NlbmRlclB1YmxpY0tlee53iTg=",
    "height": 2491594,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: HfffEfpdbouHSRyMP4KWMeXRHjGYMhaLj3pXp57tQvGP
Next: none

Diff: 
Old New Differences
40 40  func _validateInt (val_,lowerBoundary_,upperBoundary_,err_) = if (if ((lowerBoundary_ > val_))
41 41      then true
42 42      else (val_ > upperBoundary_))
43 +     then throw(err_)
44 +     else true
45 + 
46 + 
47 + func _validateString (val_,err_) = if (if ((0 >= size(val_)))
48 +     then true
49 +     else contains(val_, SEPARATOR))
43 50      then throw(err_)
44 51      else true
45 52  
204 211  
205 212  @Callable(i)
206 213  func call (executionChainId_,executionContract_,calldata_) = {
207 -     let err = if (if (_whenInitialized())
214 +     let err = if (if (if (if (_whenInitialized())
208 215          then _whenAllowed(i.caller)
209 216          else false)
210 217          then _whenNotPaused()
218 +         else false)
219 +         then _validateString(executionContract_, "call: invalid executionContract")
220 +         else false)
221 +         then _validateString(calldata_, "call: invalid calldata")
211 222          else false
212 223      if ((err == err))
213 224          then {
Full: 
Old New Differences
1 1  {-# STDLIB_VERSION 6 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 4  let SEPARATOR = "__"
5 5  
6 6  let KEY_INIT = "INIT"
7 7  
8 8  let KEY_MULTISIG = "MULTISIG"
9 9  
10 10  let KEY_STATUS = "STATUS"
11 11  
12 12  let KEY_PAUSED = "PAUSED"
13 13  
14 14  let KEY_PAUSER = "PAUSER"
15 15  
16 16  let KEY_ALLOWANCE = "ALLOWANCE"
17 17  
18 18  let KEY_CALL_CHAIN_ID = "CALL_CHAIN_ID"
19 19  
20 20  let KEY_EVENT_SIZE = "EVENT_SIZE"
21 21  
22 22  let KEY_EVENT = "EVENT"
23 23  
24 24  let KEY_NONCE = "NONCE"
25 25  
26 26  let MAX_INT = 9223372036854775807
27 27  
28 28  let SLOT_SIZE = 32
29 29  
30 30  let ZERO_SLOT = base58'11111111111111111111111111111111'
31 31  
32 32  func _validateAddress (address_,err_) = match addressFromString(address_) {
33 33      case a: Address => 
34 34          true
35 35      case _ => 
36 36          throw(err_)
37 37  }
38 38  
39 39  
40 40  func _validateInt (val_,lowerBoundary_,upperBoundary_,err_) = if (if ((lowerBoundary_ > val_))
41 41      then true
42 42      else (val_ > upperBoundary_))
43 +     then throw(err_)
44 +     else true
45 + 
46 + 
47 + func _validateString (val_,err_) = if (if ((0 >= size(val_)))
48 +     then true
49 +     else contains(val_, SEPARATOR))
43 50      then throw(err_)
44 51      else true
45 52  
46 53  
47 54  func _loadInit () = match getBoolean(KEY_INIT) {
48 55      case a: Boolean => 
49 56          a
50 57      case _ => 
51 58          false
52 59  }
53 60  
54 61  
55 62  func _saveInit (isInit_) = [BooleanEntry(KEY_INIT, isInit_)]
56 63  
57 64  
58 65  func _loadPause () = match getBoolean(KEY_PAUSED) {
59 66      case a: Boolean => 
60 67          a
61 68      case _ => 
62 69          false
63 70  }
64 71  
65 72  
66 73  func _savePause (isPaused_) = [BooleanEntry(KEY_PAUSED, isPaused_)]
67 74  
68 75  
69 76  func _loadPauser () = match getString(KEY_PAUSER) {
70 77      case a: String => 
71 78          addressFromStringValue(a)
72 79      case _ => 
73 80          Address(base58'')
74 81  }
75 82  
76 83  
77 84  func _savePauser (pauser_) = [StringEntry(KEY_PAUSER, toString(pauser_))]
78 85  
79 86  
80 87  func _loadAllowance (caller_) = match getBoolean(makeString([KEY_ALLOWANCE, toString(caller_)], SEPARATOR)) {
81 88      case a: Boolean => 
82 89          a
83 90      case _ => 
84 91          false
85 92  }
86 93  
87 94  
88 95  func _saveAllowance (caller_,val_) = [BooleanEntry(makeString([KEY_ALLOWANCE, toString(caller_)], SEPARATOR), val_)]
89 96  
90 97  
91 98  func _loadMultisig () = match getString(KEY_MULTISIG) {
92 99      case a: String => 
93 100          addressFromStringValue(a)
94 101      case _ => 
95 102          Address(base58'')
96 103  }
97 104  
98 105  
99 106  func _saveMultisig (multisig_) = [StringEntry(KEY_MULTISIG, toString(multisig_))]
100 107  
101 108  
102 109  func _loadCallChainId () = match getInteger(KEY_CALL_CHAIN_ID) {
103 110      case a: Int => 
104 111          a
105 112      case _ => 
106 113          0
107 114  }
108 115  
109 116  
110 117  func _saveCallChainId (callChainId_) = [IntegerEntry(KEY_CALL_CHAIN_ID, callChainId_)]
111 118  
112 119  
113 120  func _loadEventSize () = match getInteger(KEY_EVENT_SIZE) {
114 121      case a: Int => 
115 122          a
116 123      case _ => 
117 124          0
118 125  }
119 126  
120 127  
121 128  func _saveEventSize (index_) = [IntegerEntry(KEY_EVENT_SIZE, index_)]
122 129  
123 130  
124 131  func _saveEvent (index_,event_) = [StringEntry(makeString([KEY_EVENT, toString(index_)], SEPARATOR), makeString([toString(event_._1), toString(event_._2), event_._3, event_._4, toString(event_._5), event_._6, toString(event_._7)], SEPARATOR))]
125 132  
126 133  
127 134  func _loadNonce () = match getInteger(KEY_NONCE) {
128 135      case a: Int => 
129 136          a
130 137      case _ => 
131 138          0
132 139  }
133 140  
134 141  
135 142  func _saveNonce (val_) = [IntegerEntry(KEY_NONCE, val_)]
136 143  
137 144  
138 145  func _onlyThisContract (caller_) = if ((caller_ != this))
139 146      then throw("_onlyThisContract: revert")
140 147      else true
141 148  
142 149  
143 150  func _whenMultisigSet () = if ((_loadMultisig() == Address(base58'')))
144 151      then throw("_whenMultisigSet: revert")
145 152      else true
146 153  
147 154  
148 155  func _whenNotInitialized () = if (_loadInit())
149 156      then throw("_whenNotInitialized: revert")
150 157      else true
151 158  
152 159  
153 160  func _whenInitialized () = if (!(_loadInit()))
154 161      then throw("_whenInitialized: revert")
155 162      else true
156 163  
157 164  
158 165  func _whenNotPaused () = if (_loadPause())
159 166      then throw("_whenNotPaused: revert")
160 167      else true
161 168  
162 169  
163 170  func _whenPaused () = if (!(_loadPause()))
164 171      then throw("_whenPaused: revert")
165 172      else true
166 173  
167 174  
168 175  func _onlyPauser (caller_) = if ((caller_ != _loadPauser()))
169 176      then throw("_onlyPauser: revert")
170 177      else true
171 178  
172 179  
173 180  func _whenAllowed (caller_) = if (!(_loadAllowance(caller_)))
174 181      then throw("_whenAllowed: revert")
175 182      else true
176 183  
177 184  
178 185  func _alignRight (val_) = (take(ZERO_SLOT, (SLOT_SIZE - size(val_))) + val_)
179 186  
180 187  
181 188  func _addArg (calldata_,arg_) = {
182 189      let calldata = fromBase16String(drop(calldata_, 2))
183 190      ("0x" + toBase16String(((take(calldata, 4) + _alignRight(arg_)) + drop(calldata, 4))))
184 191      }
185 192  
186 193  
187 194  @Callable(i)
188 195  func init (pauser_,callChainId_) = {
189 196      let err = if (if (if (if (_onlyThisContract(i.caller))
190 197          then _whenNotInitialized()
191 198          else false)
192 199          then _whenMultisigSet()
193 200          else false)
194 201          then _validateAddress(pauser_, "init: invalid pauser")
195 202          else false)
196 203          then _validateInt(callChainId_, 0, MAX_INT, "init: invalid call chain id")
197 204          else false
198 205      if ((err == err))
199 206          then $Tuple2(((_saveInit(true) ++ _savePauser(addressFromStringValue(pauser_))) ++ _saveCallChainId(callChainId_)), unit)
200 207          else throw("Strict value is not equal to itself.")
201 208      }
202 209  
203 210  
204 211  
205 212  @Callable(i)
206 213  func call (executionChainId_,executionContract_,calldata_) = {
207 -     let err = if (if (_whenInitialized())
214 +     let err = if (if (if (if (_whenInitialized())
208 215          then _whenAllowed(i.caller)
209 216          else false)
210 217          then _whenNotPaused()
218 +         else false)
219 +         then _validateString(executionContract_, "call: invalid executionContract")
220 +         else false)
221 +         then _validateString(calldata_, "call: invalid calldata")
211 222          else false
212 223      if ((err == err))
213 224          then {
214 225              let nonce = _loadNonce()
215 226              let eventSize = _loadEventSize()
216 227              let event = $Tuple7(_loadCallChainId(), executionChainId_, executionContract_, _addArg(calldata_, i.caller.bytes), nonce, toBase58String(i.transactionId), height)
217 228              $Tuple2(((_saveEventSize((eventSize + 1)) ++ _saveEvent(eventSize, event)) ++ _saveNonce((nonce + 1))), unit)
218 229              }
219 230          else throw("Strict value is not equal to itself.")
220 231      }
221 232  
222 233  
223 234  
224 235  @Callable(i)
225 236  func allow (caller_) = {
226 237      let err = if (if (_onlyThisContract(i.caller))
227 238          then _whenInitialized()
228 239          else false)
229 240          then _validateAddress(caller_, "allow: invalid caller arg")
230 241          else false
231 242      if ((err == err))
232 243          then $Tuple2(_saveAllowance(addressFromStringValue(caller_), true), unit)
233 244          else throw("Strict value is not equal to itself.")
234 245      }
235 246  
236 247  
237 248  
238 249  @Callable(i)
239 250  func disallow (caller_) = {
240 251      let err = if (if (_onlyThisContract(i.caller))
241 252          then _whenInitialized()
242 253          else false)
243 254          then _validateAddress(caller_, "disallow: invalid caller arg")
244 255          else false
245 256      if ((err == err))
246 257          then $Tuple2(_saveAllowance(addressFromStringValue(caller_), false), unit)
247 258          else throw("Strict value is not equal to itself.")
248 259      }
249 260  
250 261  
251 262  
252 263  @Callable(i)
253 264  func pause () = {
254 265      let err = if (if (_onlyPauser(i.caller))
255 266          then _whenInitialized()
256 267          else false)
257 268          then _whenNotPaused()
258 269          else false
259 270      if ((err == err))
260 271          then $Tuple2(_savePause(true), unit)
261 272          else throw("Strict value is not equal to itself.")
262 273      }
263 274  
264 275  
265 276  
266 277  @Callable(i)
267 278  func unpause () = {
268 279      let err = if (if (_onlyPauser(i.caller))
269 280          then _whenInitialized()
270 281          else false)
271 282          then _whenPaused()
272 283          else false
273 284      if ((err == err))
274 285          then $Tuple2(_savePause(false), unit)
275 286          else throw("Strict value is not equal to itself.")
276 287      }
277 288  
278 289  
279 290  
280 291  @Callable(i)
281 292  func updatePauser (pauser_) = {
282 293      let err = if (if (_onlyThisContract(i.caller))
283 294          then _whenInitialized()
284 295          else false)
285 296          then _validateAddress(pauser_, "init: invalid pauser")
286 297          else false
287 298      if ((err == err))
288 299          then $Tuple2(_savePauser(addressFromStringValue(pauser_)), unit)
289 300          else throw("Strict value is not equal to itself.")
290 301      }
291 302  
292 303  
293 304  
294 305  @Callable(i)
295 306  func setMultisig (multisig_) = {
296 307      let err = if (_onlyThisContract(i.caller))
297 308          then _validateAddress(multisig_, "setMultisig: invalid multisig address")
298 309          else false
299 310      if ((err == err))
300 311          then $Tuple2(_saveMultisig(addressFromStringValue(multisig_)), unit)
301 312          else throw("Strict value is not equal to itself.")
302 313      }
303 314  
304 315  
305 316  @Verifier(tx)
306 317  func verify () = match getString(KEY_MULTISIG) {
307 318      case multisig: String => 
308 319          valueOrElse(getBoolean(addressFromStringValue(multisig), makeString([KEY_STATUS, toString(this), toBase58String(tx.id)], SEPARATOR)), false)
309 320      case _ => 
310 321          sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)
311 322  }
312 323

Old	New		Differences
40	40		func _validateInt (val_,lowerBoundary_,upperBoundary_,err_) = if (if ((lowerBoundary_ > val_))
41	41		then true
42	42		else (val_ > upperBoundary_))
	43	+	then throw(err_)
	44	+	else true
	45	+
	46	+
	47	+	func _validateString (val_,err_) = if (if ((0 >= size(val_)))
	48	+	then true
	49	+	else contains(val_, SEPARATOR))
43	50		then throw(err_)
44	51		else true
45	52

204	211
205	212		@Callable(i)
206	213		func call (executionChainId_,executionContract_,calldata_) = {
207		-	let err = if (if (_whenInitialized())
	214	+	let err = if (if (if (if (_whenInitialized())
208	215		then _whenAllowed(i.caller)
209	216		else false)
210	217		then _whenNotPaused()
	218	+	else false)
	219	+	then _validateString(executionContract_, "call: invalid executionContract")
	220	+	else false)
	221	+	then _validateString(calldata_, "call: invalid calldata")
211	222		else false
212	223		if ((err == err))
213	224		then {

Old	New		Differences
1	1		{-# STDLIB_VERSION 6 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4	4		let SEPARATOR = "__"
5	5
6	6		let KEY_INIT = "INIT"
7	7
8	8		let KEY_MULTISIG = "MULTISIG"
9	9
10	10		let KEY_STATUS = "STATUS"
11	11
12	12		let KEY_PAUSED = "PAUSED"
13	13
14	14		let KEY_PAUSER = "PAUSER"
15	15
16	16		let KEY_ALLOWANCE = "ALLOWANCE"
17	17
18	18		let KEY_CALL_CHAIN_ID = "CALL_CHAIN_ID"
19	19
20	20		let KEY_EVENT_SIZE = "EVENT_SIZE"
21	21
22	22		let KEY_EVENT = "EVENT"
23	23
24	24		let KEY_NONCE = "NONCE"
25	25
26	26		let MAX_INT = 9223372036854775807
27	27
28	28		let SLOT_SIZE = 32
29	29
30	30		let ZERO_SLOT = base58'11111111111111111111111111111111'
31	31
32	32		func _validateAddress (address_,err_) = match addressFromString(address_) {
33	33		case a: Address =>
34	34		true
35	35		case _ =>
36	36		throw(err_)
37	37		}
38	38
39	39
40	40		func _validateInt (val_,lowerBoundary_,upperBoundary_,err_) = if (if ((lowerBoundary_ > val_))
41	41		then true
42	42		else (val_ > upperBoundary_))
	43	+	then throw(err_)
	44	+	else true
	45	+
	46	+
	47	+	func _validateString (val_,err_) = if (if ((0 >= size(val_)))
	48	+	then true
	49	+	else contains(val_, SEPARATOR))
43	50		then throw(err_)
44	51		else true
45	52
46	53
47	54		func _loadInit () = match getBoolean(KEY_INIT) {
48	55		case a: Boolean =>
49	56		a
50	57		case _ =>
51	58		false
52	59		}
53	60
54	61
55	62		func _saveInit (isInit_) = [BooleanEntry(KEY_INIT, isInit_)]
56	63
57	64
58	65		func _loadPause () = match getBoolean(KEY_PAUSED) {
59	66		case a: Boolean =>
60	67		a
61	68		case _ =>
62	69		false
63	70		}
64	71
65	72
66	73		func _savePause (isPaused_) = [BooleanEntry(KEY_PAUSED, isPaused_)]
67	74
68	75
69	76		func _loadPauser () = match getString(KEY_PAUSER) {
70	77		case a: String =>
71	78		addressFromStringValue(a)
72	79		case _ =>
73	80		Address(base58'')
74	81		}
75	82
76	83
77	84		func _savePauser (pauser_) = [StringEntry(KEY_PAUSER, toString(pauser_))]
78	85
79	86
80	87		func _loadAllowance (caller_) = match getBoolean(makeString([KEY_ALLOWANCE, toString(caller_)], SEPARATOR)) {
81	88		case a: Boolean =>
82	89		a
83	90		case _ =>
84	91		false
85	92		}
86	93
87	94
88	95		func _saveAllowance (caller_,val_) = [BooleanEntry(makeString([KEY_ALLOWANCE, toString(caller_)], SEPARATOR), val_)]
89	96
90	97
91	98		func _loadMultisig () = match getString(KEY_MULTISIG) {
92	99		case a: String =>
93	100		addressFromStringValue(a)
94	101		case _ =>
95	102		Address(base58'')
96	103		}
97	104
98	105
99	106		func _saveMultisig (multisig_) = [StringEntry(KEY_MULTISIG, toString(multisig_))]
100	107
101	108
102	109		func _loadCallChainId () = match getInteger(KEY_CALL_CHAIN_ID) {
103	110		case a: Int =>
104	111		a
105	112		case _ =>
106	113		0
107	114		}
108	115
109	116
110	117		func _saveCallChainId (callChainId_) = [IntegerEntry(KEY_CALL_CHAIN_ID, callChainId_)]
111	118
112	119
113	120		func _loadEventSize () = match getInteger(KEY_EVENT_SIZE) {
114	121		case a: Int =>
115	122		a
116	123		case _ =>
117	124		0
118	125		}
119	126
120	127
121	128		func _saveEventSize (index_) = [IntegerEntry(KEY_EVENT_SIZE, index_)]
122	129
123	130
124	131		func _saveEvent (index_,event_) = [StringEntry(makeString([KEY_EVENT, toString(index_)], SEPARATOR), makeString([toString(event_._1), toString(event_._2), event_._3, event_._4, toString(event_._5), event_._6, toString(event_._7)], SEPARATOR))]
125	132
126	133
127	134		func _loadNonce () = match getInteger(KEY_NONCE) {
128	135		case a: Int =>
129	136		a
130	137		case _ =>
131	138		0
132	139		}
133	140
134	141
135	142		func _saveNonce (val_) = [IntegerEntry(KEY_NONCE, val_)]
136	143
137	144
138	145		func _onlyThisContract (caller_) = if ((caller_ != this))
139	146		then throw("_onlyThisContract: revert")
140	147		else true
141	148
142	149
143	150		func _whenMultisigSet () = if ((_loadMultisig() == Address(base58'')))
144	151		then throw("_whenMultisigSet: revert")
145	152		else true
146	153
147	154
148	155		func _whenNotInitialized () = if (_loadInit())
149	156		then throw("_whenNotInitialized: revert")
150	157		else true
151	158
152	159
153	160		func _whenInitialized () = if (!(_loadInit()))
154	161		then throw("_whenInitialized: revert")
155	162		else true
156	163
157	164
158	165		func _whenNotPaused () = if (_loadPause())
159	166		then throw("_whenNotPaused: revert")
160	167		else true
161	168
162	169
163	170		func _whenPaused () = if (!(_loadPause()))
164	171		then throw("_whenPaused: revert")
165	172		else true
166	173
167	174
168	175		func _onlyPauser (caller_) = if ((caller_ != _loadPauser()))
169	176		then throw("_onlyPauser: revert")
170	177		else true
171	178
172	179
173	180		func _whenAllowed (caller_) = if (!(_loadAllowance(caller_)))
174	181		then throw("_whenAllowed: revert")
175	182		else true
176	183
177	184
178	185		func _alignRight (val_) = (take(ZERO_SLOT, (SLOT_SIZE - size(val_))) + val_)
179	186
180	187
181	188		func _addArg (calldata_,arg_) = {
182	189		let calldata = fromBase16String(drop(calldata_, 2))
183	190		("0x" + toBase16String(((take(calldata, 4) + _alignRight(arg_)) + drop(calldata, 4))))
184	191		}
185	192
186	193
187	194		@Callable(i)
188	195		func init (pauser_,callChainId_) = {
189	196		let err = if (if (if (if (_onlyThisContract(i.caller))
190	197		then _whenNotInitialized()
191	198		else false)
192	199		then _whenMultisigSet()
193	200		else false)
194	201		then _validateAddress(pauser_, "init: invalid pauser")
195	202		else false)
196	203		then _validateInt(callChainId_, 0, MAX_INT, "init: invalid call chain id")
197	204		else false
198	205		if ((err == err))
199	206		then $Tuple2(((_saveInit(true) ++ _savePauser(addressFromStringValue(pauser_))) ++ _saveCallChainId(callChainId_)), unit)
200	207		else throw("Strict value is not equal to itself.")
201	208		}
202	209
203	210
204	211
205	212		@Callable(i)
206	213		func call (executionChainId_,executionContract_,calldata_) = {
207		-	let err = if (if (_whenInitialized())
	214	+	let err = if (if (if (if (_whenInitialized())
208	215		then _whenAllowed(i.caller)
209	216		else false)
210	217		then _whenNotPaused()
	218	+	else false)
	219	+	then _validateString(executionContract_, "call: invalid executionContract")
	220	+	else false)
	221	+	then _validateString(calldata_, "call: invalid calldata")
211	222		else false
212	223		if ((err == err))
213	224		then {
214	225		let nonce = _loadNonce()
215	226		let eventSize = _loadEventSize()
216	227		let event = $Tuple7(_loadCallChainId(), executionChainId_, executionContract_, _addArg(calldata_, i.caller.bytes), nonce, toBase58String(i.transactionId), height)
217	228		$Tuple2(((_saveEventSize((eventSize + 1)) ++ _saveEvent(eventSize, event)) ++ _saveNonce((nonce + 1))), unit)
218	229		}
219	230		else throw("Strict value is not equal to itself.")
220	231		}
221	232
222	233
223	234
224	235		@Callable(i)
225	236		func allow (caller_) = {
226	237		let err = if (if (_onlyThisContract(i.caller))
227	238		then _whenInitialized()
228	239		else false)
229	240		then _validateAddress(caller_, "allow: invalid caller arg")
230	241		else false
231	242		if ((err == err))
232	243		then $Tuple2(_saveAllowance(addressFromStringValue(caller_), true), unit)
233	244		else throw("Strict value is not equal to itself.")
234	245		}
235	246
236	247
237	248
238	249		@Callable(i)
239	250		func disallow (caller_) = {
240	251		let err = if (if (_onlyThisContract(i.caller))
241	252		then _whenInitialized()
242	253		else false)
243	254		then _validateAddress(caller_, "disallow: invalid caller arg")
244	255		else false
245	256		if ((err == err))
246	257		then $Tuple2(_saveAllowance(addressFromStringValue(caller_), false), unit)
247	258		else throw("Strict value is not equal to itself.")
248	259		}
249	260
250	261
251	262
252	263		@Callable(i)
253	264		func pause () = {
254	265		let err = if (if (_onlyPauser(i.caller))
255	266		then _whenInitialized()
256	267		else false)
257	268		then _whenNotPaused()
258	269		else false
259	270		if ((err == err))
260	271		then $Tuple2(_savePause(true), unit)
261	272		else throw("Strict value is not equal to itself.")
262	273		}
263	274
264	275
265	276
266	277		@Callable(i)
267	278		func unpause () = {
268	279		let err = if (if (_onlyPauser(i.caller))
269	280		then _whenInitialized()
270	281		else false)
271	282		then _whenPaused()
272	283		else false
273	284		if ((err == err))
274	285		then $Tuple2(_savePause(false), unit)
275	286		else throw("Strict value is not equal to itself.")
276	287		}
277	288
278	289
279	290
280	291		@Callable(i)
281	292		func updatePauser (pauser_) = {
282	293		let err = if (if (_onlyThisContract(i.caller))
283	294		then _whenInitialized()
284	295		else false)
285	296		then _validateAddress(pauser_, "init: invalid pauser")
286	297		else false
287	298		if ((err == err))
288	299		then $Tuple2(_savePauser(addressFromStringValue(pauser_)), unit)
289	300		else throw("Strict value is not equal to itself.")
290	301		}
291	302
292	303
293	304
294	305		@Callable(i)
295	306		func setMultisig (multisig_) = {
296	307		let err = if (_onlyThisContract(i.caller))
297	308		then _validateAddress(multisig_, "setMultisig: invalid multisig address")
298	309		else false
299	310		if ((err == err))
300	311		then $Tuple2(_saveMultisig(addressFromStringValue(multisig_)), unit)
301	312		else throw("Strict value is not equal to itself.")
302	313		}
303	314
304	315
305	316		@Verifier(tx)
306	317		func verify () = match getString(KEY_MULTISIG) {
307	318		case multisig: String =>
308	319		valueOrElse(getBoolean(addressFromStringValue(multisig), makeString([KEY_STATUS, toString(this), toBase58String(tx.id)], SEPARATOR)), false)
309	320		case _ =>
310	321		sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)
311	322		}
312	323

github/deemru/w8io/169f3d6 
34.91 ms ◑