2021.03.23 17:28 [2515128] smart account 3PGWpD3gQ1CWvtNKQmxMcqRxEYSKreJfYU1 > SELF 0.00000000 Waves
{ "type": 13, "id": "GBtfcw541dyxyfphYS29z6d1MQEaauPUFM4rEUzzqTCp", "fee": 1400000, "feeAssetId": null, "timestamp": 1616509807762, "version": 2, "chainId": 87, "sender": "3PGWpD3gQ1CWvtNKQmxMcqRxEYSKreJfYU1", "senderPublicKey": "5HmUEjyf3scet7v1WGV6k7miZYvEEoKLPhfsp7Te2tws", "proofs": [ "VUpPMkCQrPuDjBVVyEBoYcwDaXoToeBuVjYsqpY4Wk29zQ2KRMt3XLFJfJZsv5NKivMFf1JEvn4oB3msY2APScw" ], "script": "base64:AAIEAAAAAAAAAA4IAhIECgIICBIECgIICAAAAAsAAAAADGFkbWluUHViS2V5MQEAAAAgugnXO4lZpNFdoP/xuzPQquE5aQ/L4r2R1jvuT16o4BMAAAAADGFkbWluUHViS2V5MgEAAAAgwpFEmbPSsLQNIqWRWL2IvKE3uwjL/92M5pTvWxYOfkAAAAAADGFkbWluUHViS2V5MwEAAAAgjh4XLnixBzv0SE56Myhgdih3/JnlkjCjIMLPqKvpDlUAAAAAEGtleVBvb2xzTGlzdE5hbWUCAAAABXBvb2xzAAAAABFrZXlQcmVmaXhQb29sTmFtZQIAAAAFcG9vbF8AAAAAEmtleVByZWZpeFBvb2xJbmRleAIAAAAGaW5kZXhfAAAAAAVwb29scwQAAAAHJG1hdGNoMAkABB0AAAACBQAAAAR0aGlzBQAAABBrZXlQb29sc0xpc3ROYW1lAwkAAAEAAAACBQAAAAckbWF0Y2gwAgAAAAZTdHJpbmcEAAAABnN0cmluZwUAAAAHJG1hdGNoMAkABLUAAAACBQAAAAZzdHJpbmcCAAAAASwEAAAAB25vdGhpbmcFAAAAByRtYXRjaDAFAAAAA25pbAEAAAAMaXNTZWxmSW52b2tlAAAAAQAAAAFpAwkAAAAAAAACCAUAAAABaQAAAAZjYWxsZXIFAAAABHRoaXMFAAAABHVuaXQJAAACAAAAAQIAAAAvT25seSB0aGUgT3JhY2xlIGl0c2VsZiBjYW4gaW52b2tlIHRoaXMgZnVuY3Rpb24BAAAAEHBhcnNlUG9vbEFkZHJlc3MAAAABAAAAB2FkZHJlc3MJAAQlAAAAAQkBAAAAE3ZhbHVlT3JFcnJvck1lc3NhZ2UAAAACCQAEJgAAAAEFAAAAB2FkZHJlc3MCAAAAFEludmFsaWQgcG9vbCBhZGRyZXNzAQAAABJnZXRQb29sTmFtZUlmVmFsaWQAAAABAAAACHBvb2xOYW1lBAAAAA91bmRlcnNjb3JlSW5kZXgJAQAAAAt2YWx1ZU9yRWxzZQAAAAIJAASzAAAAAgUAAAAIcG9vbE5hbWUCAAAAAV8A//////////8EAAAAE3VuZGVyc2NvcmVMYXN0SW5kZXgJAQAAAAt2YWx1ZU9yRWxzZQAAAAIJAAS3AAAAAgUAAAAIcG9vbE5hbWUCAAAAAV8A//////////8EAAAAE2hhc1NpbmdsZVVuZGVyc2NvcmUDAwkAAAAAAAACBQAAAA91bmRlcnNjb3JlSW5kZXgFAAAAE3VuZGVyc2NvcmVMYXN0SW5kZXgJAABmAAAAAgUAAAAPdW5kZXJzY29yZUluZGV4AAAAAAAAAAAABwkBAAAAAiE9AAAAAgUAAAAPdW5kZXJzY29yZUluZGV4CQAAZQAAAAIJAAExAAAAAQUAAAAIcG9vbE5hbWUAAAAAAAAAAAEHAwUAAAATaGFzU2luZ2xlVW5kZXJzY29yZQUAAAAIcG9vbE5hbWUJAAACAAAAAQIAAABOUG9vbCBuYW1lIG11c3QgY29uc2lzdCBvZiB0d28gYXNzZXQgbmFtZXMgc2VwYXJhdGVkIGJ5IGFuIHVuZGVyc2NvcmUgY2hhcmFjdGVyAQAAABFnZXRBZGRyZXNzSWZWYWxpZAAAAAEAAAAHYWRkcmVzcwkABCUAAAABCQEAAAATdmFsdWVPckVycm9yTWVzc2FnZQAAAAIJAAQmAAAAAQUAAAAHYWRkcmVzcwkAASwAAAACCQABLAAAAAICAAAADUNhbid0IHBhcnNlICIFAAAAB2FkZHJlc3MCAAAADCIgYXMgYWRkcmVzcwAAAAIAAAABaQEAAAAHYWRkUG9vbAAAAAIAAAALcG9vbEFkZHJlc3MAAAAIcG9vbE5hbWUJAQAAAAt2YWx1ZU9yRWxzZQAAAAIJAQAAAAxpc1NlbGZJbnZva2UAAAABBQAAAAFpBAAAAAdrZXlOYW1lCQABLAAAAAIFAAAAEWtleVByZWZpeFBvb2xOYW1lCQEAAAAQcGFyc2VQb29sQWRkcmVzcwAAAAEFAAAAC3Bvb2xBZGRyZXNzBAAAAAhrZXlJbmRleAkAASwAAAACBQAAABJrZXlQcmVmaXhQb29sSW5kZXgJAQAAABBwYXJzZVBvb2xBZGRyZXNzAAAAAQUAAAALcG9vbEFkZHJlc3MEAAAAGHBvc3NpYmx5QWxyZWFkeUFkZGVkUG9vbAkABB0AAAACBQAAAAR0aGlzBQAAAAdrZXlOYW1lAwkBAAAACWlzRGVmaW5lZAAAAAEFAAAAGHBvc3NpYmx5QWxyZWFkeUFkZGVkUG9vbAkAAAIAAAABCQABLAAAAAIJAAEsAAAAAgkAASwAAAACCQABLAAAAAICAAAAElBvb2wgd2l0aCBhZGRyZXNzIAUAAAALcG9vbEFkZHJlc3MCAAAAHyBpcyBhbHJlYWR5IGRlZmluZWQgd2l0aCBuYW1lICIJAQAAAAV2YWx1ZQAAAAEFAAAAGHBvc3NpYmx5QWxyZWFkeUFkZGVkUG9vbAIAAAABIgkABEwAAAACCQEAAAAMSW50ZWdlckVudHJ5AAAAAgUAAAAIa2V5SW5kZXgJAAGQAAAAAQUAAAAFcG9vbHMJAARMAAAAAgkBAAAAC1N0cmluZ0VudHJ5AAAAAgUAAAAHa2V5TmFtZQkBAAAAEmdldFBvb2xOYW1lSWZWYWxpZAAAAAEFAAAACHBvb2xOYW1lCQAETAAAAAIJAQAAAAtTdHJpbmdFbnRyeQAAAAIFAAAAEGtleVBvb2xzTGlzdE5hbWUJAAS5AAAAAgkABE0AAAACBQAAAAVwb29scwkBAAAAEWdldEFkZHJlc3NJZlZhbGlkAAAAAQUAAAALcG9vbEFkZHJlc3MCAAAAASwFAAAAA25pbAAAAAFpAQAAAApyZW5hbWVQb29sAAAAAgAAAAtwb29sQWRkcmVzcwAAAAtuZXdQb29sTmFtZQkBAAAAC3ZhbHVlT3JFbHNlAAAAAgkBAAAADGlzU2VsZkludm9rZQAAAAEFAAAAAWkEAAAAB2tleU5hbWUJAAEsAAAAAgUAAAARa2V5UHJlZml4UG9vbE5hbWUJAQAAABBwYXJzZVBvb2xBZGRyZXNzAAAAAQUAAAALcG9vbEFkZHJlc3MEAAAAGHBvc3NpYmx5QWxyZWFkeUFkZGVkUG9vbAkABB0AAAACBQAAAAR0aGlzBQAAAAdrZXlOYW1lAwkBAAAACWlzRGVmaW5lZAAAAAEFAAAAGHBvc3NpYmx5QWxyZWFkeUFkZGVkUG9vbAkABEwAAAACCQEAAAALU3RyaW5nRW50cnkAAAACBQAAAAdrZXlOYW1lCQEAAAASZ2V0UG9vbE5hbWVJZlZhbGlkAAAAAQUAAAALbmV3UG9vbE5hbWUFAAAAA25pbAkAAAIAAAABCQABLAAAAAIJAAEsAAAAAgIAAAASUG9vbCB3aXRoIGFkZHJlc3MgBQAAAAtwb29sQWRkcmVzcwIAAAAXIGhhcyBub3QgeWV0IGJlZW4gYWRkZWQAAAABAAAAAnR4AQAAAAZ2ZXJpZnkAAAAABAAAABJhZG1pblB1YktleTFTaWduZWQDCQAB9AAAAAMIBQAAAAJ0eAAAAAlib2R5Qnl0ZXMJAAGRAAAAAggFAAAAAnR4AAAABnByb29mcwAAAAAAAAAAAAUAAAAMYWRtaW5QdWJLZXkxAAAAAAAAAAABAAAAAAAAAAAABAAAABJhZG1pblB1YktleTJTaWduZWQDCQAB9AAAAAMIBQAAAAJ0eAAAAAlib2R5Qnl0ZXMJAAGRAAAAAggFAAAAAnR4AAAABnByb29mcwAAAAAAAAAAAQUAAAAMYWRtaW5QdWJLZXkyAAAAAAAAAAABAAAAAAAAAAAABAAAABJhZG1pblB1YktleTNTaWduZWQDCQAB9AAAAAMIBQAAAAJ0eAAAAAlib2R5Qnl0ZXMJAAGRAAAAAggFAAAAAnR4AAAABnByb29mcwAAAAAAAAAAAgUAAAAMYWRtaW5QdWJLZXkzAAAAAAAAAAABAAAAAAAAAAAABAAAAA1zaWduZWRCeUFkbWluCQAAZwAAAAIJAABkAAAAAgkAAGQAAAACBQAAABJhZG1pblB1YktleTFTaWduZWQFAAAAEmFkbWluUHViS2V5MlNpZ25lZAUAAAASYWRtaW5QdWJLZXkzU2lnbmVkAAAAAAAAAAACBAAAAAckbWF0Y2gwBQAAAAJ0eAMJAAABAAAAAgUAAAAHJG1hdGNoMAIAAAAXSW52b2tlU2NyaXB0VHJhbnNhY3Rpb24EAAAABmludm9rZQUAAAAHJG1hdGNoMAQAAAAKaXNTZWxmQ2FsbAMJAAAAAAAAAggFAAAABmludm9rZQAAAARkQXBwBQAAAAR0aGlzCQEAAAAPY29udGFpbnNFbGVtZW50AAAAAgkABEwAAAACAgAAAAdhZGRQb29sCQAETAAAAAICAAAACnJlbmFtZVBvb2wFAAAAA25pbAgFAAAABmludm9rZQAAAAhmdW5jdGlvbgcDAwUAAAANc2lnbmVkQnlBZG1pbgkAAAAAAAACCQABkAAAAAEIBQAAAAZpbnZva2UAAAAIcGF5bWVudHMAAAAAAAAAAAAHBQAAAAppc1NlbGZDYWxsBwMDCQAAAQAAAAIFAAAAByRtYXRjaDACAAAABU9yZGVyBgMJAAABAAAAAgUAAAAHJG1hdGNoMAIAAAAPRGF0YVRyYW5zYWN0aW9uBgMJAAABAAAAAgUAAAAHJG1hdGNoMAIAAAAVU3BvbnNvckZlZVRyYW5zYWN0aW9uBgMJAAABAAAAAgUAAAAHJG1hdGNoMAIAAAAUU2V0U2NyaXB0VHJhbnNhY3Rpb24GAwkAAAEAAAACBQAAAAckbWF0Y2gwAgAAABZDcmVhdGVBbGlhc1RyYW5zYWN0aW9uBgMJAAABAAAAAgUAAAAHJG1hdGNoMAIAAAAWTGVhc2VDYW5jZWxUcmFuc2FjdGlvbgYDCQAAAQAAAAIFAAAAByRtYXRjaDACAAAAEExlYXNlVHJhbnNhY3Rpb24GAwkAAAEAAAACBQAAAAckbWF0Y2gwAgAAABBJc3N1ZVRyYW5zYWN0aW9uBgMJAAABAAAAAgUAAAAHJG1hdGNoMAIAAAAaVXBkYXRlQXNzZXRJbmZvVHJhbnNhY3Rpb24GAwkAAAEAAAACBQAAAAckbWF0Y2gwAgAAABdJbnZva2VTY3JpcHRUcmFuc2FjdGlvbgYDCQAAAQAAAAIFAAAAByRtYXRjaDACAAAAGVNldEFzc2V0U2NyaXB0VHJhbnNhY3Rpb24GAwkAAAEAAAACBQAAAAckbWF0Y2gwAgAAABNUcmFuc2ZlclRyYW5zYWN0aW9uBgMJAAABAAAAAgUAAAAHJG1hdGNoMAIAAAATRXhjaGFuZ2VUcmFuc2FjdGlvbgYDCQAAAQAAAAIFAAAAByRtYXRjaDACAAAAF01hc3NUcmFuc2ZlclRyYW5zYWN0aW9uBgMJAAABAAAAAgUAAAAHJG1hdGNoMAIAAAAPQnVyblRyYW5zYWN0aW9uBgkAAAEAAAACBQAAAAckbWF0Y2gwAgAAABJSZWlzc3VlVHJhbnNhY3Rpb24FAAAADXNpZ25lZEJ5QWRtaW4JAAACAAAAAQIAAAALTWF0Y2ggZXJyb3KQLMK7", "height": 2515128, "applicationStatus": "succeeded", "spentComplexity": 0 } View: original | compacted Prev: GgDiePzATp2svd4tEXn9NuWwxxuLMzymKmr2PEgPY6xr Next: 7cnKUYraM74mxAaFn54ibb2hwWkN5TvhPbWDVsN3YCY8 Diff:
Old | New | Differences | |
---|---|---|---|
1 | 1 | {-# STDLIB_VERSION 4 #-} | |
2 | 2 | {-# SCRIPT_TYPE ACCOUNT #-} | |
3 | 3 | {-# CONTENT_TYPE DAPP #-} | |
4 | - | let adminInvoke = base58'Czn4yoAuUZCVCLJDRfskn8URfkwpknwBTZDbs1wFrY7h' | |
5 | - | ||
6 | 4 | let adminPubKey1 = base58'DXDY2itiEcYBtGkVLnkpHtDFyWQUkoLJz79uJ7ECbMrA' | |
7 | 5 | ||
8 | 6 | let adminPubKey2 = base58'E6Wa1SGoktYcjHjsKrvjMiqJY3SWmGKcD8Q5L8kxSPS7' | |
9 | 7 | ||
10 | 8 | let adminPubKey3 = base58'AZmWJtuy4GeVrMmJH4hfFBRApe1StvhJSk4jcbT6bArQ' | |
11 | 9 | ||
10 | + | let keyPoolsListName = "pools" | |
11 | + | ||
12 | 12 | let keyPrefixPoolName = "pool_" | |
13 | + | ||
14 | + | let keyPrefixPoolIndex = "index_" | |
15 | + | ||
16 | + | let pools = match getString(this, keyPoolsListName) { | |
17 | + | case string: String => | |
18 | + | split(string, ",") | |
19 | + | case nothing => | |
20 | + | nil | |
21 | + | } | |
13 | 22 | ||
14 | 23 | func isSelfInvoke (i) = if ((i.caller == this)) | |
15 | 24 | then unit | |
33 | 42 | } | |
34 | 43 | ||
35 | 44 | ||
45 | + | func getAddressIfValid (address) = toString(valueOrErrorMessage(addressFromString(address), (("Can't parse \"" + address) + "\" as address"))) | |
46 | + | ||
47 | + | ||
36 | 48 | @Callable(i) | |
37 | 49 | func addPool (poolAddress,poolName) = valueOrElse(isSelfInvoke(i), { | |
38 | - | let key = (keyPrefixPoolName + parsePoolAddress(poolAddress)) | |
39 | - | let possiblyAlreadyAddedPool = getString(this, key) | |
50 | + | let keyName = (keyPrefixPoolName + parsePoolAddress(poolAddress)) | |
51 | + | let keyIndex = (keyPrefixPoolIndex + parsePoolAddress(poolAddress)) | |
52 | + | let possiblyAlreadyAddedPool = getString(this, keyName) | |
40 | 53 | if (isDefined(possiblyAlreadyAddedPool)) | |
41 | 54 | then throw((((("Pool with address " + poolAddress) + " is already defined with name \"") + value(possiblyAlreadyAddedPool)) + "\"")) | |
42 | - | else [StringEntry( | |
55 | + | else [IntegerEntry(keyIndex, size(pools)), StringEntry(keyName, getPoolNameIfValid(poolName)), StringEntry(keyPoolsListName, makeString((pools :+ getAddressIfValid(poolAddress)), ","))] | |
43 | 56 | }) | |
44 | 57 | ||
45 | 58 | ||
46 | 59 | ||
47 | 60 | @Callable(i) | |
48 | 61 | func renamePool (poolAddress,newPoolName) = valueOrElse(isSelfInvoke(i), { | |
49 | - | let | |
50 | - | let possiblyAlreadyAddedPool = getString(this, | |
62 | + | let keyName = (keyPrefixPoolName + parsePoolAddress(poolAddress)) | |
63 | + | let possiblyAlreadyAddedPool = getString(this, keyName) | |
51 | 64 | if (isDefined(possiblyAlreadyAddedPool)) | |
52 | - | then [StringEntry( | |
65 | + | then [StringEntry(keyName, getPoolNameIfValid(newPoolName))] | |
53 | 66 | else throw((("Pool with address " + poolAddress) + " has not yet been added")) | |
54 | 67 | }) | |
55 | 68 | ||
56 | 69 | ||
57 | 70 | @Verifier(tx) | |
58 | - | func verify () = match tx { | |
59 | - | case invoke: InvokeScriptTransaction => | |
60 | - | let isSelfCall = if ((invoke.dApp == this)) | |
61 | - | then containsElement(["addPool", "renamePool"], invoke.function) | |
62 | - | else false | |
63 | - | let signedByAdmin = sigVerify(tx.bodyBytes, tx.proofs[0], adminInvoke) | |
64 | - | if (if (isSelfCall) | |
65 | - | then (size(invoke.payments) == 0) | |
66 | - | else false) | |
67 | - | then signedByAdmin | |
68 | - | else false | |
69 | - | case _ => | |
70 | - | sigVerify(tx.bodyBytes, tx.proofs[0], base58'5HmUEjyf3scet7v1WGV6k7miZYvEEoKLPhfsp7Te2tws') | |
71 | - | } | |
71 | + | func verify () = { | |
72 | + | let adminPubKey1Signed = if (sigVerify(tx.bodyBytes, tx.proofs[0], adminPubKey1)) | |
73 | + | then 1 | |
74 | + | else 0 | |
75 | + | let adminPubKey2Signed = if (sigVerify(tx.bodyBytes, tx.proofs[1], adminPubKey2)) | |
76 | + | then 1 | |
77 | + | else 0 | |
78 | + | let adminPubKey3Signed = if (sigVerify(tx.bodyBytes, tx.proofs[2], adminPubKey3)) | |
79 | + | then 1 | |
80 | + | else 0 | |
81 | + | let signedByAdmin = (((adminPubKey1Signed + adminPubKey2Signed) + adminPubKey3Signed) >= 2) | |
82 | + | match tx { | |
83 | + | case invoke: InvokeScriptTransaction => | |
84 | + | let isSelfCall = if ((invoke.dApp == this)) | |
85 | + | then containsElement(["addPool", "renamePool"], invoke.function) | |
86 | + | else false | |
87 | + | if (if (signedByAdmin) | |
88 | + | then (size(invoke.payments) == 0) | |
89 | + | else false) | |
90 | + | then isSelfCall | |
91 | + | else false | |
92 | + | case _: Order|DataTransaction|SponsorFeeTransaction|SetScriptTransaction|CreateAliasTransaction|LeaseCancelTransaction|LeaseTransaction|IssueTransaction|UpdateAssetInfoTransaction|InvokeScriptTransaction|SetAssetScriptTransaction|TransferTransaction|ExchangeTransaction|MassTransferTransaction|BurnTransaction|ReissueTransaction => | |
93 | + | signedByAdmin | |
94 | + | case _ => | |
95 | + | throw("Match error") | |
96 | + | } | |
97 | + | } | |
72 | 98 |
Old | New | Differences | |
---|---|---|---|
1 | 1 | {-# STDLIB_VERSION 4 #-} | |
2 | 2 | {-# SCRIPT_TYPE ACCOUNT #-} | |
3 | 3 | {-# CONTENT_TYPE DAPP #-} | |
4 | - | let adminInvoke = base58'Czn4yoAuUZCVCLJDRfskn8URfkwpknwBTZDbs1wFrY7h' | |
5 | - | ||
6 | 4 | let adminPubKey1 = base58'DXDY2itiEcYBtGkVLnkpHtDFyWQUkoLJz79uJ7ECbMrA' | |
7 | 5 | ||
8 | 6 | let adminPubKey2 = base58'E6Wa1SGoktYcjHjsKrvjMiqJY3SWmGKcD8Q5L8kxSPS7' | |
9 | 7 | ||
10 | 8 | let adminPubKey3 = base58'AZmWJtuy4GeVrMmJH4hfFBRApe1StvhJSk4jcbT6bArQ' | |
11 | 9 | ||
10 | + | let keyPoolsListName = "pools" | |
11 | + | ||
12 | 12 | let keyPrefixPoolName = "pool_" | |
13 | + | ||
14 | + | let keyPrefixPoolIndex = "index_" | |
15 | + | ||
16 | + | let pools = match getString(this, keyPoolsListName) { | |
17 | + | case string: String => | |
18 | + | split(string, ",") | |
19 | + | case nothing => | |
20 | + | nil | |
21 | + | } | |
13 | 22 | ||
14 | 23 | func isSelfInvoke (i) = if ((i.caller == this)) | |
15 | 24 | then unit | |
16 | 25 | else throw("Only the Oracle itself can invoke this function") | |
17 | 26 | ||
18 | 27 | ||
19 | 28 | func parsePoolAddress (address) = toString(valueOrErrorMessage(addressFromString(address), "Invalid pool address")) | |
20 | 29 | ||
21 | 30 | ||
22 | 31 | func getPoolNameIfValid (poolName) = { | |
23 | 32 | let underscoreIndex = valueOrElse(indexOf(poolName, "_"), -1) | |
24 | 33 | let underscoreLastIndex = valueOrElse(lastIndexOf(poolName, "_"), -1) | |
25 | 34 | let hasSingleUnderscore = if (if ((underscoreIndex == underscoreLastIndex)) | |
26 | 35 | then (underscoreIndex > 0) | |
27 | 36 | else false) | |
28 | 37 | then (underscoreIndex != (size(poolName) - 1)) | |
29 | 38 | else false | |
30 | 39 | if (hasSingleUnderscore) | |
31 | 40 | then poolName | |
32 | 41 | else throw("Pool name must consist of two asset names separated by an underscore character") | |
33 | 42 | } | |
34 | 43 | ||
35 | 44 | ||
45 | + | func getAddressIfValid (address) = toString(valueOrErrorMessage(addressFromString(address), (("Can't parse \"" + address) + "\" as address"))) | |
46 | + | ||
47 | + | ||
36 | 48 | @Callable(i) | |
37 | 49 | func addPool (poolAddress,poolName) = valueOrElse(isSelfInvoke(i), { | |
38 | - | let key = (keyPrefixPoolName + parsePoolAddress(poolAddress)) | |
39 | - | let possiblyAlreadyAddedPool = getString(this, key) | |
50 | + | let keyName = (keyPrefixPoolName + parsePoolAddress(poolAddress)) | |
51 | + | let keyIndex = (keyPrefixPoolIndex + parsePoolAddress(poolAddress)) | |
52 | + | let possiblyAlreadyAddedPool = getString(this, keyName) | |
40 | 53 | if (isDefined(possiblyAlreadyAddedPool)) | |
41 | 54 | then throw((((("Pool with address " + poolAddress) + " is already defined with name \"") + value(possiblyAlreadyAddedPool)) + "\"")) | |
42 | - | else [StringEntry( | |
55 | + | else [IntegerEntry(keyIndex, size(pools)), StringEntry(keyName, getPoolNameIfValid(poolName)), StringEntry(keyPoolsListName, makeString((pools :+ getAddressIfValid(poolAddress)), ","))] | |
43 | 56 | }) | |
44 | 57 | ||
45 | 58 | ||
46 | 59 | ||
47 | 60 | @Callable(i) | |
48 | 61 | func renamePool (poolAddress,newPoolName) = valueOrElse(isSelfInvoke(i), { | |
49 | - | let | |
50 | - | let possiblyAlreadyAddedPool = getString(this, | |
62 | + | let keyName = (keyPrefixPoolName + parsePoolAddress(poolAddress)) | |
63 | + | let possiblyAlreadyAddedPool = getString(this, keyName) | |
51 | 64 | if (isDefined(possiblyAlreadyAddedPool)) | |
52 | - | then [StringEntry( | |
65 | + | then [StringEntry(keyName, getPoolNameIfValid(newPoolName))] | |
53 | 66 | else throw((("Pool with address " + poolAddress) + " has not yet been added")) | |
54 | 67 | }) | |
55 | 68 | ||
56 | 69 | ||
57 | 70 | @Verifier(tx) | |
58 | - | func verify () = match tx { | |
59 | - | case invoke: InvokeScriptTransaction => | |
60 | - | let isSelfCall = if ((invoke.dApp == this)) | |
61 | - | then containsElement(["addPool", "renamePool"], invoke.function) | |
62 | - | else false | |
63 | - | let signedByAdmin = sigVerify(tx.bodyBytes, tx.proofs[0], adminInvoke) | |
64 | - | if (if (isSelfCall) | |
65 | - | then (size(invoke.payments) == 0) | |
66 | - | else false) | |
67 | - | then signedByAdmin | |
68 | - | else false | |
69 | - | case _ => | |
70 | - | sigVerify(tx.bodyBytes, tx.proofs[0], base58'5HmUEjyf3scet7v1WGV6k7miZYvEEoKLPhfsp7Te2tws') | |
71 | - | } | |
71 | + | func verify () = { | |
72 | + | let adminPubKey1Signed = if (sigVerify(tx.bodyBytes, tx.proofs[0], adminPubKey1)) | |
73 | + | then 1 | |
74 | + | else 0 | |
75 | + | let adminPubKey2Signed = if (sigVerify(tx.bodyBytes, tx.proofs[1], adminPubKey2)) | |
76 | + | then 1 | |
77 | + | else 0 | |
78 | + | let adminPubKey3Signed = if (sigVerify(tx.bodyBytes, tx.proofs[2], adminPubKey3)) | |
79 | + | then 1 | |
80 | + | else 0 | |
81 | + | let signedByAdmin = (((adminPubKey1Signed + adminPubKey2Signed) + adminPubKey3Signed) >= 2) | |
82 | + | match tx { | |
83 | + | case invoke: InvokeScriptTransaction => | |
84 | + | let isSelfCall = if ((invoke.dApp == this)) | |
85 | + | then containsElement(["addPool", "renamePool"], invoke.function) | |
86 | + | else false | |
87 | + | if (if (signedByAdmin) | |
88 | + | then (size(invoke.payments) == 0) | |
89 | + | else false) | |
90 | + | then isSelfCall | |
91 | + | else false | |
92 | + | case _: Order|DataTransaction|SponsorFeeTransaction|SetScriptTransaction|CreateAliasTransaction|LeaseCancelTransaction|LeaseTransaction|IssueTransaction|UpdateAssetInfoTransaction|InvokeScriptTransaction|SetAssetScriptTransaction|TransferTransaction|ExchangeTransaction|MassTransferTransaction|BurnTransaction|ReissueTransaction => | |
93 | + | signedByAdmin | |
94 | + | case _ => | |
95 | + | throw("Match error") | |
96 | + | } | |
97 | + | } | |
72 | 98 |
github/deemru/w8io/786bc32 36.47 ms ◑