LaconicNetwork/stargaze-studio
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle existing wl-flex address during collection creation

Browse Source
This commit is contained in:
Serkan Reis 2023-04-28 15:00:39 +03:00
parent ccf1b13f5b
commit 6f5c204b08
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/collections/creation/WhitelistDetails.tsx
View File

@ -143,6 +143,7 @@ export const WhitelistDetails = ({ onChange }: WhitelistDetailsProps) => {
name="whitelistRadioOptions1" name="whitelistRadioOptions1"
onClick={() => { onClick={() => {
setWhitelistState('none') setWhitelistState('none')
setWhitelistType('standard')
}} }}
type="radio" type="radio"
value="None" value="None"

16
pages/collections/create.tsx
View File

@ -487,7 +487,7 @@ const CollectionCreationPage: NextPage = () => {
console.log('Whitelist Type: ', whitelistDetails?.whitelistType) console.log('Whitelist Type: ', whitelistDetails?.whitelistType)
console.log( console.log(
'Factory Address: ', 'Factory Address: ',
whitelistDetails?.whitelistState === 'new' && whitelistDetails.whitelistType === 'flex' whitelistDetails?.whitelistState !== 'none' && whitelistDetails?.whitelistType === 'flex'
? VENDING_FACTORY_FLEX_ADDRESS ? VENDING_FACTORY_FLEX_ADDRESS
: collectionDetails?.updatable : collectionDetails?.updatable
? VENDING_FACTORY_UPDATABLE_ADDRESS ? VENDING_FACTORY_UPDATABLE_ADDRESS
@ -497,7 +497,7 @@ const CollectionCreationPage: NextPage = () => {
console.log('Whitelist: ', whitelist) console.log('Whitelist: ', whitelist)
const payload: VendingFactoryDispatchExecuteArgs = { const payload: VendingFactoryDispatchExecuteArgs = {
contract: contract:
whitelistDetails?.whitelistState === 'new' && whitelistDetails.whitelistType === 'flex' whitelistDetails?.whitelistState !== 'none' && whitelistDetails?.whitelistType === 'flex'
? VENDING_FACTORY_FLEX_ADDRESS ? VENDING_FACTORY_FLEX_ADDRESS
: collectionDetails?.updatable : collectionDetails?.updatable
? VENDING_FACTORY_UPDATABLE_ADDRESS ? VENDING_FACTORY_UPDATABLE_ADDRESS
@ -507,7 +507,7 @@ const CollectionCreationPage: NextPage = () => {
msg, msg,
funds: [ funds: [
coin( coin(
whitelistDetails?.whitelistState === 'new' && whitelistDetails.whitelistType === 'flex' whitelistDetails?.whitelistState !== 'none' && whitelistDetails?.whitelistType === 'flex'
? (vendingMinterFlexCreationFee as string) ? (vendingMinterFlexCreationFee as string)
: collectionDetails?.updatable : collectionDetails?.updatable
? (vendingMinterUpdatableCreationFee as string) ? (vendingMinterUpdatableCreationFee as string)
@ -516,7 +516,7 @@ const CollectionCreationPage: NextPage = () => {
), ),
], ],
updatable: collectionDetails?.updatable, updatable: collectionDetails?.updatable,
flex: whitelistDetails?.whitelistState === 'new' && whitelistDetails.whitelistType === 'flex', flex: whitelistDetails?.whitelistState !== 'none' && whitelistDetails?.whitelistType === 'flex',
} }
const data = await vendingFactoryDispatchExecute(payload) const data = await vendingFactoryDispatchExecute(payload)
setTransactionHash(data.transactionHash) setTransactionHash(data.transactionHash)
@ -820,7 +820,7 @@ const CollectionCreationPage: NextPage = () => {
const checkMintingDetails = () => { const checkMintingDetails = () => {
if (!mintingDetails) throw new Error('Please fill out the minting details') if (!mintingDetails) throw new Error('Please fill out the minting details')
if (mintingDetails.numTokens < 1 || mintingDetails.numTokens > 10000) throw new Error('Invalid number of tokens') if (mintingDetails.numTokens < 1 || mintingDetails.numTokens > 10000) throw new Error('Invalid number of tokens')
if (whitelistDetails?.whitelistState === 'new' && whitelistDetails.whitelistType === 'flex') { if (whitelistDetails?.whitelistState !== 'none' && whitelistDetails?.whitelistType === 'flex') {
if (Number(mintingDetails.unitPrice) < Number(minimumFlexMintPrice)) if (Number(mintingDetails.unitPrice) < Number(minimumFlexMintPrice))
throw new Error(`Invalid unit price: The minimum unit price is ${Number(minimumFlexMintPrice) / 1000000} STARS`) throw new Error(`Invalid unit price: The minimum unit price is ${Number(minimumFlexMintPrice) / 1000000} STARS`)
} else if (collectionDetails?.updatable) { } else if (collectionDetails?.updatable) {
@ -865,6 +865,8 @@ const CollectionCreationPage: NextPage = () => {
const contract = whitelistContract?.use(whitelistDetails.contractAddress) const contract = whitelistContract?.use(whitelistDetails.contractAddress)
//check if the address belongs to a whitelist contract (see performChecks()) //check if the address belongs to a whitelist contract (see performChecks())
const config = await contract?.config() const config = await contract?.config()
if (JSON.stringify(config).includes('whale_cap')) whitelistDetails.whitelistType = 'flex'
else whitelistDetails.whitelistType = 'standard'
if (Number(config?.start_time) !== Number(mintingDetails?.startTime)) { if (Number(config?.start_time) !== Number(mintingDetails?.startTime)) {
const whitelistStartDate = new Date(Number(config?.start_time) / 1000000) const whitelistStartDate = new Date(Number(config?.start_time) / 1000000)
throw Error(`Whitelist start time (${whitelistStartDate.toLocaleString()}) does not match minting start time`) throw Error(`Whitelist start time (${whitelistStartDate.toLocaleString()}) does not match minting start time`)
@ -1013,7 +1015,9 @@ const CollectionCreationPage: NextPage = () => {
} else { } else {
const amountNeeded = const amountNeeded =
minterType === 'vending' minterType === 'vending'
? collectionDetails?.updatable ? whitelistDetails?.whitelistState === 'existing' && whitelistDetails.whitelistType === 'flex'
? Number(vendingMinterFlexCreationFee)
: collectionDetails?.updatable
? Number(vendingMinterUpdatableCreationFee) ? Number(vendingMinterUpdatableCreationFee)
: Number(vendingMinterCreationFee) : Number(vendingMinterCreationFee)
: collectionDetails?.updatable : collectionDetails?.updatable