tx · 7NXY6k4e2uyrY1u2DJBfpoDuHgpPZArA2R5uTSP7nBTy

3N1ytAUyhtig9X6F2hHHs1jbzYxr47Yp8Fr:  -0.00600000 Waves

2024.10.14 09:22 [3326149] smart account 3N1ytAUyhtig9X6F2hHHs1jbzYxr47Yp8Fr > SELF 0.00000000 Waves

{ "type": 13, "id": "7NXY6k4e2uyrY1u2DJBfpoDuHgpPZArA2R5uTSP7nBTy", "fee": 600000, "feeAssetId": null, "timestamp": 1728886997980, "version": 2, "chainId": 84, "sender": "3N1ytAUyhtig9X6F2hHHs1jbzYxr47Yp8Fr", "senderPublicKey": "jXCTQV8PjX2uC9UHBFveupYy9cjhY7stHbzE9cptymw", "proofs": [ "5evdTnTWdNc3fp1Bgc5HFJn2vcfbh1ZdQT8iR6ECqBJ8DsTbH1qSxPKJ6u4h6wVm7VMX3Kx3KmUpFwhL18zC5VQv" ], "script": "base64:BwIZCAISAwoBCBIECgICGBIECgICGBIECgICGCYACXNlcGFyYXRvcgICX18AC3dhdmVzU3RyaW5nAgVXQVZFUwAQY29udHJhY3RGaWxlbmFtZQIXbWVtZV9pbV9jYWxjdWxhdG9yLnJpZGUABW11bHQ4AIDC1y8BB3dyYXBFcnIBAXMJAKwCAgkArAICBRBjb250cmFjdEZpbGVuYW1lAgI6IAUBcwEIdGhyb3dFcnIBAXMJAAIBCQEHd3JhcEVycgEFAXMBD3ZhbGlkYXRlQWRkcmVzcwEHYWRkcmVzcwkBCWlzRGVmaW5lZAEJAKYIAQUHYWRkcmVzcwAMU1RBVFVTX0VNUFRZAAAADFNUQVRVU19SRUFEWQABAAlrU2h1dGRvd24CDnNodXRkb3duX19mbGFnAAtrUHJpY2VBc3NldAIMcHJpY2VfX2Fzc2V0AA5rTGlzdGluZ1ZvbHVtZQIPbGlzdGluZ19fdm9sdW1lAAxrQ3JlYXRpb25GZWUCEnNldHVwX19jcmVhdGlvbkZlZQAMa0N1cnZlVGFyZ2V0AhJzZXR1cF9fY3VydmVUYXJnZXQAEWtWaXJ0dWFsTGlxdWlkaXR5AhdzZXR1cF9fdmlydHVhbExpcXVpZGl0eQARa1Bvb2xDb250cmFjdEhhc2gCFHBvb2xfX2NvbnRyYWN0X19oYXNoABNrTGFzdEVtcHR5UG9vbEluZGV4AhdsYXN0X19lbXB0eV9wb29sX19pbmRleAAUa0ZpcnN0RW1wdHlQb29sSW5kZXgCGWZpcnN0X19lbXB0eV9fcG9vbF9faW5kZXgBFWtQb29sQWRkcmVzc0Zyb21JbmRleAEFaW5kZXgJALkJAgkAzAgCAgRwb29sCQDMCAIJAKQDAQUFaW5kZXgFA25pbAUJc2VwYXJhdG9yARVrUG9vbEluZGV4RnJvbUFkZHJlc3MBB2FkZHJlc3MJALkJAgkAzAgCAgRwb29sCQDMCAIJAKUIAQUHYWRkcmVzcwUDbmlsBQlzZXBhcmF0b3IBCmtQb29sQXNzZXQBB2FkZHJlc3MJALkJAgkAzAgCAgVhc3NldAkAzAgCCQClCAEFB2FkZHJlc3MFA25pbAUJc2VwYXJhdG9yAQtrUG9vbFN0YXR1cwEFaW5kZXgJALkJAgkAzAgCAgRwb29sCQDMCAICBnN0YXR1cwkAzAgCCQCkAwEFBWluZGV4BQNuaWwFCXNlcGFyYXRvcgAPa0ZhY3RvcnlBZGRyZXNzAhBmYWN0b3J5X19hZGRyZXNzABRmYWN0b3J5QWRkcmVzc09wdGlvbgQHJG1hdGNoMAkAnQgCBQR0aGlzBQ9rRmFjdG9yeUFkZHJlc3MDCQABAgUHJG1hdGNoMAIGU3RyaW5nBAFzBQckbWF0Y2gwCQCmCAEFAXMDCQABAgUHJG1hdGNoMAIEVW5pdAUEdW5pdAkAAgECC01hdGNoIGVycm9yAA5mYWN0b3J5QWRkcmVzcwkBE3ZhbHVlT3JFcnJvck1lc3NhZ2UCBRRmYWN0b3J5QWRkcmVzc09wdGlvbgkBB3dyYXBFcnIBAhdpbnZhbGlkIGZhY3RvcnkgYWRkcmVzcwAIc2h1dGRvd24JAQt2YWx1ZU9yRWxzZQIJAJsIAgUOZmFjdG9yeUFkZHJlc3MFCWtTaHV0ZG93bgcADmxhc3RFbXB0eUluZGV4CQELdmFsdWVPckVsc2UCCQCaCAIFDmZhY3RvcnlBZGRyZXNzBRNrTGFzdEVtcHR5UG9vbEluZGV4AAAAD2ZpcnN0RW1wdHlJbmRleAkBC3ZhbHVlT3JFbHNlAgkAmggCBQ5mYWN0b3J5QWRkcmVzcwUUa0ZpcnN0RW1wdHlQb29sSW5kZXgAAAANbGlzdGluZ1ZvbHVtZQkBC3ZhbHVlT3JFbHNlAgkAmggCBQ5mYWN0b3J5QWRkcmVzcwUOa0xpc3RpbmdWb2x1bWUAAAALY3JlYXRpb25GZWUJAQt2YWx1ZU9yRWxzZQIJAJoIAgUOZmFjdG9yeUFkZHJlc3MFDGtDcmVhdGlvbkZlZQAAABBwb29sQ29udHJhY3RIYXNoCQEFdmFsdWUBCQCcCAIFDmZhY3RvcnlBZGRyZXNzBRFrUG9vbENvbnRyYWN0SGFzaAEMcGFyc2VBc3NldElkAQVpbnB1dAMJAAACBQVpbnB1dAULd2F2ZXNTdHJpbmcFBHVuaXQJANkEAQUFaW5wdXQBD2Fzc2V0SWRUb1N0cmluZwEFaW5wdXQDCQAAAgUFaW5wdXQFBHVuaXQFC3dhdmVzU3RyaW5nCQDYBAEJAQV2YWx1ZQEFBWlucHV0AQttdXN0QWRkcmVzcwIGY2FsbGVyB2FkZHJlc3MDCQAAAgUGY2FsbGVyBQdhZGRyZXNzBgkBCHRocm93RXJyAQIRcGVybWlzc2lvbiBkZW5pZWQBCG11c3RUaGlzAQZjYWxsZXIJAQttdXN0QWRkcmVzcwIFBmNhbGxlcgUEdGhpcwELbXVzdEZhY3RvcnkBBmNhbGxlcgkBC211c3RBZGRyZXNzAgUGY2FsbGVyBQ5mYWN0b3J5QWRkcmVzcwERY2hlY2tDb250cmFjdEhhc2gBB2FkZHJlc3MEByRtYXRjaDAFEHBvb2xDb250cmFjdEhhc2gDCQABAgUHJG1hdGNoMAIKQnl0ZVZlY3RvcgQBaAUHJG1hdGNoMAkAAAIJAPEHAQUHYWRkcmVzcwUBaAYBDGlzUG9vbEV4aXN0cwELcG9vbEFkZHJlc3MJAQlpc0RlZmluZWQBCQCaCAIFDmZhY3RvcnlBZGRyZXNzCQEVa1Bvb2xJbmRleEZyb21BZGRyZXNzAQULcG9vbEFkZHJlc3MEAWkBBGluaXQBEWZhY3RvcnlBZGRyZXNzU3RyBAtjaGVja0NhbGxlcgkBCG11c3RUaGlzAQgFAWkGY2FsbGVyAwkAAAIFC2NoZWNrQ2FsbGVyBQtjaGVja0NhbGxlcgkAzAgCCQELU3RyaW5nRW50cnkCBQ9rRmFjdG9yeUFkZHJlc3MFEWZhY3RvcnlBZGRyZXNzU3RyBQNuaWwJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BaQEMYWRkRW1wdHlQb29sAg9jYWxsZXJQdWJsaWNLZXkEYXJncwQObmV3UG9vbEFkZHJlc3MJAKcIAQUPY2FsbGVyUHVibGljS2V5BAxuZXdQb29sSW5kZXgJAGQCBQ5sYXN0RW1wdHlJbmRleAABBAZjaGVja3MJAMwIAgMJAQEhAQUIc2h1dGRvd24GCQEIdGhyb3dFcnIBAhZub3QgYWxsb3dlZCAoc2h1dGRvd24pCQDMCAIDCQERY2hlY2tDb250cmFjdEhhc2gBBQ5uZXdQb29sQWRkcmVzcwYJAQh0aHJvd0VycgECH3Bvb2wgc2NyaXB0IGhhc2ggaXMgbm90IGFsbG93ZWQJAMwIAgMJAQEhAQkBDGlzUG9vbEV4aXN0cwEFDm5ld1Bvb2xBZGRyZXNzBgkBCHRocm93RXJyAQIicG9vbCBhZGRyZXNzIGlzIGFscmVhZHkgcmVnaXN0ZXJlZAUDbmlsAwkAAAIFBmNoZWNrcwUGY2hlY2tzBA5mYWN0b3J5QWN0aW9ucwkAzAgCCQD8BwQFDmZhY3RvcnlBZGRyZXNzAgxpbnRlZ2VyRW50cnkJAMwIAgUTa0xhc3RFbXB0eVBvb2xJbmRleAkAzAgCBQxuZXdQb29sSW5kZXgFA25pbAUDbmlsCQDMCAIJAPwHBAUOZmFjdG9yeUFkZHJlc3MCC3N0cmluZ0VudHJ5CQDMCAIJARVrUG9vbEFkZHJlc3NGcm9tSW5kZXgBBQxuZXdQb29sSW5kZXgJAMwIAgkApQgBBQ5uZXdQb29sQWRkcmVzcwUDbmlsBQNuaWwJAMwIAgkA/AcEBQ5mYWN0b3J5QWRkcmVzcwIMaW50ZWdlckVudHJ5CQDMCAIJARVrUG9vbEluZGV4RnJvbUFkZHJlc3MBBQ5uZXdQb29sQWRkcmVzcwkAzAgCBQxuZXdQb29sSW5kZXgFA25pbAUDbmlsCQDMCAIJAPwHBAUOZmFjdG9yeUFkZHJlc3MCDGludGVnZXJFbnRyeQkAzAgCCQELa1Bvb2xTdGF0dXMBBQxuZXdQb29sSW5kZXgJAMwIAgUMU1RBVFVTX0VNUFRZBQNuaWwFA25pbAUDbmlsCQCUCgIFA25pbAUOZmFjdG9yeUFjdGlvbnMJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4BaQEKY3JlYXRlUG9vbAIPY2FsbGVyUHVibGljS2V5BGFyZ3MECm1pblBheW1lbnQJAGQCBQ1saXN0aW5nVm9sdW1lBQtjcmVhdGlvbkZlZQQGY2hlY2tzCQDMCAIDCQEBIQEFCHNodXRkb3duBgkBCHRocm93RXJyAQIWbm90IGFsbG93ZWQgKHNodXRkb3duKQkAzAgCCQELbXVzdEZhY3RvcnkBCAUBaQZjYWxsZXIJAMwIAgMJAGYCCQBlAgUObGFzdEVtcHR5SW5kZXgFD2ZpcnN0RW1wdHlJbmRleAAABgkBCHRocm93RXJyAQIYbm8gZW1wdHkgcG9vbHMgYXZhaWxhYmxlCQDMCAIDCQAAAggJAJEDAggFAWkIcGF5bWVudHMAAAdhc3NldElkBQR1bml0BgkBCHRocm93RXJyAQIacGF5bWVudCBzaG91bGQgYmUgaW4gV0FWRVMJAMwIAgMJAGcCCAkAkQMCCAUBaQhwYXltZW50cwAABmFtb3VudAUKbWluUGF5bWVudAYJAQh0aHJvd0VycgEJAKwCAgImcGF5bWVudCBhbW91bnQgc2hvdWxkIGJlIGdyZWF0ZXIgdGhhbiAJAKQDAQUKbWluUGF5bWVudAkAzAgCAwkBCWlzRGVmaW5lZAEJAJEDAgUEYXJncwAABgkBCHRocm93RXJyAQIZdG9rZW5OYW1lIGlzIG5vdCBwcm92aWRlZAkAzAgCAwkBCWlzRGVmaW5lZAEJAJEDAgUEYXJncwABBgkBCHRocm93RXJyAQIgdG9rZW5EZXNjcmlwdGlvbiBpcyBub3QgcHJvdmlkZWQJAMwIAgMJAQlpc0RlZmluZWQBCQCRAwIFBGFyZ3MAAgYJAQh0aHJvd0VycgECHXRva2VuUXVhbnRpdHkgaXMgbm90IHByb3ZpZGVkBQNuaWwDCQAAAgUGY2hlY2tzBQZjaGVja3MECXBvb2xJbmRleAkAZAIFD2ZpcnN0RW1wdHlJbmRleAABBBFwb29sQWRkcmVzc1N0cmluZwkBEUBleHRyTmF0aXZlKDEwNTMpAgUOZmFjdG9yeUFkZHJlc3MJARVrUG9vbEFkZHJlc3NGcm9tSW5kZXgBBQlwb29sSW5kZXgEC3Bvb2xBZGRyZXNzCQERQGV4dHJOYXRpdmUoMTA2MikBBRFwb29sQWRkcmVzc1N0cmluZwQNY2FsbGVyQWRkcmVzcwkApwgBBQ9jYWxsZXJQdWJsaWNLZXkECnBvb2xEb21haW4JAK8CAgURcG9vbEFkZHJlc3NTdHJpbmcACAQJcG9vbE93bmVyCQClCAEFDWNhbGxlckFkZHJlc3MECXRva2VuTmFtZQkAkQMCBQRhcmdzAAAECXRva2VuRGVzYwkAkQMCBQRhcmdzAAEEDXRva2VuUXVhbnRpdHkJAJEDAgUEYXJncwACBA5pbml0UG9vbEludm9rZQkA/AcEBQ5mYWN0b3J5QWRkcmVzcwIOaW5pdFBvb2xJbnZva2UJAMwIAgURcG9vbEFkZHJlc3NTdHJpbmcJAMwIAgkAzAgCBQpwb29sRG9tYWluCQDMCAIFCXBvb2xPd25lcgkAzAgCBQl0b2tlbk5hbWUJAMwIAgUJdG9rZW5EZXNjCQDMCAIFDXRva2VuUXVhbnRpdHkFA25pbAUDbmlsCQDMCAIJAQ9BdHRhY2hlZFBheW1lbnQCCAkAkQMCCAUBaQhwYXltZW50cwAAB2Fzc2V0SWQICQCRAwIIBQFpCHBheW1lbnRzAAAGYW1vdW50BQNuaWwDCQAAAgUOaW5pdFBvb2xJbnZva2UFDmluaXRQb29sSW52b2tlBA5mYWN0b3J5QWN0aW9ucwkAzAgCCQD8BwQFDmZhY3RvcnlBZGRyZXNzAgxpbnRlZ2VyRW50cnkJAMwIAgUUa0ZpcnN0RW1wdHlQb29sSW5kZXgJAMwIAgUJcG9vbEluZGV4BQNuaWwFA25pbAkAzAgCCQD8BwQFDmZhY3RvcnlBZGRyZXNzAgxpbnRlZ2VyRW50cnkJAMwIAgkBC2tQb29sU3RhdHVzAQUJcG9vbEluZGV4CQDMCAIFDFNUQVRVU19SRUFEWQUDbmlsBQNuaWwFA25pbAkAlAoCBQNuaWwFDmZhY3RvcnlBY3Rpb25zCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuCQACAQIkU3RyaWN0IHZhbHVlIGlzIG5vdCBlcXVhbCB0byBpdHNlbGYuAWkBEm5vdGlmeVN0YXR1c1VwZGF0ZQIPY2FsbGVyUHVibGljS2V5BGFyZ3MEC3Bvb2xBZGRyZXNzCQCnCAEFD2NhbGxlclB1YmxpY0tleQQGY2hlY2tzCQDMCAIDCQEMaXNQb29sRXhpc3RzAQULcG9vbEFkZHJlc3MGCQEIdGhyb3dFcnIBAg5wb29sIG5vdCBmb3VuZAUDbmlsAwkAAAIFBmNoZWNrcwUGY2hlY2tzBAlwb29sSW5kZXgJARFAZXh0ck5hdGl2ZSgxMDUwKQIFDmZhY3RvcnlBZGRyZXNzCQEVa1Bvb2xJbmRleEZyb21BZGRyZXNzAQULcG9vbEFkZHJlc3MECW5ld1N0YXR1cwkBDXBhcnNlSW50VmFsdWUBCQCRAwIFBGFyZ3MAAAQOZmFjdG9yeUFjdGlvbnMJAMwIAgkA/AcEBQ5mYWN0b3J5QWRkcmVzcwIMaW50ZWdlckVudHJ5CQDMCAIJAQtrUG9vbFN0YXR1cwEFCXBvb2xJbmRleAkAzAgCBQluZXdTdGF0dXMFA25pbAUDbmlsBQNuaWwJAJQKAgUDbmlsBQ5mYWN0b3J5QWN0aW9ucwkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgC7QfUo", "height": 3326149, "applicationStatus": "succeeded", "spentComplexity": 0 } View: original | compacted Prev: 7HhGoX2KGrwQJWc9LaBuDMmvHpLNsCrLd6o8dnoh7w5s Next: ErZh2Cy8xigxkf5jGfEeqexNvWmNJNJKxdWptzDCJWfy Diff:
OldNewDifferences
2727 let kPriceAsset = "price__asset"
2828
2929 let kListingVolume = "listing__volume"
30+
31+let kCreationFee = "setup__creationFee"
32+
33+let kCurveTarget = "setup__curveTarget"
34+
35+let kVirtualLiquidity = "setup__virtualLiquidity"
3036
3137 let kPoolContractHash = "pool__contract__hash"
3238
6773
6874 let listingVolume = valueOrElse(getInteger(factoryAddress, kListingVolume), 0)
6975
76+let creationFee = valueOrElse(getInteger(factoryAddress, kCreationFee), 0)
77+
78+let poolContractHash = value(getBinary(factoryAddress, kPoolContractHash))
79+
7080 func parseAssetId (input) = if ((input == wavesString))
7181 then unit
7282 else fromBase58String(input)
8898 func mustFactory (caller) = mustAddress(caller, factoryAddress)
8999
90100
91-func poolContractHash () = valueOrErrorMessage(getBinary(factoryAddress, kPoolContractHash), wrapErr("pool contract script hash is not set"))
101+func checkContractHash (address) = match poolContractHash {
102+ case h: ByteVector =>
103+ (scriptHash(address) == h)
104+ case _ =>
105+ true
106+}
92107
93108
94109 func isPoolExists (poolAddress) = isDefined(getInteger(factoryAddress, kPoolIndexFromAddress(poolAddress)))
110125 let newPoolIndex = (lastEmptyIndex + 1)
111126 let checks = [if (!(shutdown))
112127 then true
113- else throwErr("not allowed (shutdown)"), if (!(isPoolExists(newPoolAddress)))
128+ else throwErr("not allowed (shutdown)"), if (checkContractHash(newPoolAddress))
129+ then true
130+ else throwErr("pool script hash is not allowed"), if (!(isPoolExists(newPoolAddress)))
114131 then true
115132 else throwErr("pool address is already registered")]
116133 if ((checks == checks))
125142
126143 @Callable(i)
127144 func createPool (callerPublicKey,args) = {
145+ let minPayment = (listingVolume + creationFee)
128146 let checks = [if (!(shutdown))
129147 then true
130148 else throwErr("not allowed (shutdown)"), mustFactory(i.caller), if (((lastEmptyIndex - firstEmptyIndex) > 0))
131149 then true
132150 else throwErr("no empty pools available"), if ((i.payments[0].assetId == unit))
133151 then true
134- else throwErr("payment should be in WAVES"), if ((i.payments[0].amount > listingVolume))
152+ else throwErr("payment should be in WAVES"), if ((i.payments[0].amount >= minPayment))
135153 then true
136- else throwErr("payment amount should be greater than listing volume"), if (isDefined(args[0]))
154+ else throwErr(("payment amount should be greater than " + toString(minPayment))), if (isDefined(args[0]))
137155 then true
138156 else throwErr("tokenName is not provided"), if (isDefined(args[1]))
139157 then true
Full:
OldNewDifferences
11 {-# STDLIB_VERSION 7 #-}
22 {-# SCRIPT_TYPE ACCOUNT #-}
33 {-# CONTENT_TYPE DAPP #-}
44 let separator = "__"
55
66 let wavesString = "WAVES"
77
88 let contractFilename = "meme_im_calculator.ride"
99
1010 let mult8 = 100000000
1111
1212 func wrapErr (s) = ((contractFilename + ": ") + s)
1313
1414
1515 func throwErr (s) = throw(wrapErr(s))
1616
1717
1818 func validateAddress (address) = isDefined(addressFromString(address))
1919
2020
2121 let STATUS_EMPTY = 0
2222
2323 let STATUS_READY = 1
2424
2525 let kShutdown = "shutdown__flag"
2626
2727 let kPriceAsset = "price__asset"
2828
2929 let kListingVolume = "listing__volume"
30+
31+let kCreationFee = "setup__creationFee"
32+
33+let kCurveTarget = "setup__curveTarget"
34+
35+let kVirtualLiquidity = "setup__virtualLiquidity"
3036
3137 let kPoolContractHash = "pool__contract__hash"
3238
3339 let kLastEmptyPoolIndex = "last__empty_pool__index"
3440
3541 let kFirstEmptyPoolIndex = "first__empty__pool__index"
3642
3743 func kPoolAddressFromIndex (index) = makeString(["pool", toString(index)], separator)
3844
3945
4046 func kPoolIndexFromAddress (address) = makeString(["pool", toString(address)], separator)
4147
4248
4349 func kPoolAsset (address) = makeString(["asset", toString(address)], separator)
4450
4551
4652 func kPoolStatus (index) = makeString(["pool", "status", toString(index)], separator)
4753
4854
4955 let kFactoryAddress = "factory__address"
5056
5157 let factoryAddressOption = match getString(this, kFactoryAddress) {
5258 case s: String =>
5359 addressFromString(s)
5460 case _: Unit =>
5561 unit
5662 case _ =>
5763 throw("Match error")
5864 }
5965
6066 let factoryAddress = valueOrErrorMessage(factoryAddressOption, wrapErr("invalid factory address"))
6167
6268 let shutdown = valueOrElse(getBoolean(factoryAddress, kShutdown), false)
6369
6470 let lastEmptyIndex = valueOrElse(getInteger(factoryAddress, kLastEmptyPoolIndex), 0)
6571
6672 let firstEmptyIndex = valueOrElse(getInteger(factoryAddress, kFirstEmptyPoolIndex), 0)
6773
6874 let listingVolume = valueOrElse(getInteger(factoryAddress, kListingVolume), 0)
6975
76+let creationFee = valueOrElse(getInteger(factoryAddress, kCreationFee), 0)
77+
78+let poolContractHash = value(getBinary(factoryAddress, kPoolContractHash))
79+
7080 func parseAssetId (input) = if ((input == wavesString))
7181 then unit
7282 else fromBase58String(input)
7383
7484
7585 func assetIdToString (input) = if ((input == unit))
7686 then wavesString
7787 else toBase58String(value(input))
7888
7989
8090 func mustAddress (caller,address) = if ((caller == address))
8191 then true
8292 else throwErr("permission denied")
8393
8494
8595 func mustThis (caller) = mustAddress(caller, this)
8696
8797
8898 func mustFactory (caller) = mustAddress(caller, factoryAddress)
8999
90100
91-func poolContractHash () = valueOrErrorMessage(getBinary(factoryAddress, kPoolContractHash), wrapErr("pool contract script hash is not set"))
101+func checkContractHash (address) = match poolContractHash {
102+ case h: ByteVector =>
103+ (scriptHash(address) == h)
104+ case _ =>
105+ true
106+}
92107
93108
94109 func isPoolExists (poolAddress) = isDefined(getInteger(factoryAddress, kPoolIndexFromAddress(poolAddress)))
95110
96111
97112 @Callable(i)
98113 func init (factoryAddressStr) = {
99114 let checkCaller = mustThis(i.caller)
100115 if ((checkCaller == checkCaller))
101116 then [StringEntry(kFactoryAddress, factoryAddressStr)]
102117 else throw("Strict value is not equal to itself.")
103118 }
104119
105120
106121
107122 @Callable(i)
108123 func addEmptyPool (callerPublicKey,args) = {
109124 let newPoolAddress = addressFromPublicKey(callerPublicKey)
110125 let newPoolIndex = (lastEmptyIndex + 1)
111126 let checks = [if (!(shutdown))
112127 then true
113- else throwErr("not allowed (shutdown)"), if (!(isPoolExists(newPoolAddress)))
128+ else throwErr("not allowed (shutdown)"), if (checkContractHash(newPoolAddress))
129+ then true
130+ else throwErr("pool script hash is not allowed"), if (!(isPoolExists(newPoolAddress)))
114131 then true
115132 else throwErr("pool address is already registered")]
116133 if ((checks == checks))
117134 then {
118135 let factoryActions = [invoke(factoryAddress, "integerEntry", [kLastEmptyPoolIndex, newPoolIndex], nil), invoke(factoryAddress, "stringEntry", [kPoolAddressFromIndex(newPoolIndex), toString(newPoolAddress)], nil), invoke(factoryAddress, "integerEntry", [kPoolIndexFromAddress(newPoolAddress), newPoolIndex], nil), invoke(factoryAddress, "integerEntry", [kPoolStatus(newPoolIndex), STATUS_EMPTY], nil)]
119136 $Tuple2(nil, factoryActions)
120137 }
121138 else throw("Strict value is not equal to itself.")
122139 }
123140
124141
125142
126143 @Callable(i)
127144 func createPool (callerPublicKey,args) = {
145+ let minPayment = (listingVolume + creationFee)
128146 let checks = [if (!(shutdown))
129147 then true
130148 else throwErr("not allowed (shutdown)"), mustFactory(i.caller), if (((lastEmptyIndex - firstEmptyIndex) > 0))
131149 then true
132150 else throwErr("no empty pools available"), if ((i.payments[0].assetId == unit))
133151 then true
134- else throwErr("payment should be in WAVES"), if ((i.payments[0].amount > listingVolume))
152+ else throwErr("payment should be in WAVES"), if ((i.payments[0].amount >= minPayment))
135153 then true
136- else throwErr("payment amount should be greater than listing volume"), if (isDefined(args[0]))
154+ else throwErr(("payment amount should be greater than " + toString(minPayment))), if (isDefined(args[0]))
137155 then true
138156 else throwErr("tokenName is not provided"), if (isDefined(args[1]))
139157 then true
140158 else throwErr("tokenDescription is not provided"), if (isDefined(args[2]))
141159 then true
142160 else throwErr("tokenQuantity is not provided")]
143161 if ((checks == checks))
144162 then {
145163 let poolIndex = (firstEmptyIndex + 1)
146164 let poolAddressString = getStringValue(factoryAddress, kPoolAddressFromIndex(poolIndex))
147165 let poolAddress = addressFromStringValue(poolAddressString)
148166 let callerAddress = addressFromPublicKey(callerPublicKey)
149167 let poolDomain = take(poolAddressString, 8)
150168 let poolOwner = toString(callerAddress)
151169 let tokenName = args[0]
152170 let tokenDesc = args[1]
153171 let tokenQuantity = args[2]
154172 let initPoolInvoke = invoke(factoryAddress, "initPoolInvoke", [poolAddressString, [poolDomain, poolOwner, tokenName, tokenDesc, tokenQuantity]], [AttachedPayment(i.payments[0].assetId, i.payments[0].amount)])
155173 if ((initPoolInvoke == initPoolInvoke))
156174 then {
157175 let factoryActions = [invoke(factoryAddress, "integerEntry", [kFirstEmptyPoolIndex, poolIndex], nil), invoke(factoryAddress, "integerEntry", [kPoolStatus(poolIndex), STATUS_READY], nil)]
158176 $Tuple2(nil, factoryActions)
159177 }
160178 else throw("Strict value is not equal to itself.")
161179 }
162180 else throw("Strict value is not equal to itself.")
163181 }
164182
165183
166184
167185 @Callable(i)
168186 func notifyStatusUpdate (callerPublicKey,args) = {
169187 let poolAddress = addressFromPublicKey(callerPublicKey)
170188 let checks = [if (isPoolExists(poolAddress))
171189 then true
172190 else throwErr("pool not found")]
173191 if ((checks == checks))
174192 then {
175193 let poolIndex = getIntegerValue(factoryAddress, kPoolIndexFromAddress(poolAddress))
176194 let newStatus = parseIntValue(args[0])
177195 let factoryActions = [invoke(factoryAddress, "integerEntry", [kPoolStatus(poolIndex), newStatus], nil)]
178196 $Tuple2(nil, factoryActions)
179197 }
180198 else throw("Strict value is not equal to itself.")
181199 }
182200
183201

github/deemru/w8io/c3f4982 
23.77 ms