@@ -187,8 +187,17 @@ export const ImageUploadDetails = ({ onChange, mintRule }: ImageUploadDetailsPro {' '} and upload your image manually to get an image URL for your badge.
-
-
@@ -252,31 +261,33 @@ export const ImageUploadDetails = ({ onChange, mintRule }: ImageUploadDetailsPro
+
+
+ 
+
+
-
-
-
-
diff --git a/components/collections/actions/Action.tsx b/components/collections/actions/Action.tsx
index f25590a..9cdfad6 100644
--- a/components/collections/actions/Action.tsx
+++ b/components/collections/actions/Action.tsx
@@ -124,8 +124,8 @@ export const CollectionActions = ({
const priceState = useNumberInputState({
id: 'update-mint-price',
name: 'updateMintPrice',
- title: 'Update Mint Price',
- subtitle: 'New minting price in STARS',
+ title: type === 'update_discount_price' ? 'Discount Price' : 'Update Mint Price',
+ subtitle: type === 'update_discount_price' ? 'New discount price in STARS' : 'New minting price in STARS',
})
const descriptionState = useInputState({
@@ -161,7 +161,7 @@ export const CollectionActions = ({
name: 'royaltyShare',
title: 'Share Percentage',
subtitle: 'Percentage of royalties to be paid',
- placeholder: '8%',
+ placeholder: '5%',
})
const showTokenUriField = isEitherType(type, ['mint_token_uri', 'update_token_metadata'])
@@ -185,7 +185,7 @@ export const CollectionActions = ({
'batch_mint_for',
])
const showAirdropFileField = type === 'airdrop'
- const showPriceField = type === 'update_mint_price'
+ const showPriceField = isEitherType(type, ['update_mint_price', 'update_discount_price'])
const showDescriptionField = type === 'update_collection_info'
const showImageField = type === 'update_collection_info'
const showExternalLinkField = type === 'update_collection_info'
@@ -379,8 +379,8 @@ export const CollectionActions = ({
{showTokenIdField &&
-
+
+
+
+
+ >
+
+
+
+
-
+
+
+
+
{
{myBadges.map((badge: any, index: any) => {
return (
-
+
{
-
- {badge.description}
+
+ {badge.description ? badge.description : 'No description provided.'}
{/*
*/} {/* */}
diff --git a/pages/collections/create.tsx b/pages/collections/create.tsx
index d200120..902e7ea 100644
--- a/pages/collections/create.tsx
+++ b/pages/collections/create.tsx
@@ -754,12 +754,17 @@ const CollectionCreationPage: NextPage = () => {
mintingDetails.perAddressLimit > mintingDetails.numTokens
)
throw new Error('Invalid limit for tokens per address')
+ if (mintingDetails.numTokens < 100 && mintingDetails.perAddressLimit > 3)
+ throw new Error(
+ 'Invalid limit for tokens per address. Tokens per address limit cannot exceed 3 for collections with less than 100 tokens in total.',
+ )
if (
- mintingDetails.numTokens > 100 &&
- mintingDetails.numTokens < 100 * mintingDetails.perAddressLimit &&
- mintingDetails.perAddressLimit > mintingDetails.numTokens / 100
+ mintingDetails.numTokens >= 100 &&
+ mintingDetails.perAddressLimit > Math.ceil((mintingDetails.numTokens / 100) * 3)
)
- throw new Error('Invalid limit for tokens per address. The limit cannot exceed 1% of the total number of tokens.')
+ throw new Error(
+ 'Invalid limit for tokens per address. Tokens per address limit cannot exceed 3% of the total number of tokens in the collection.',
+ )
if (mintingDetails.startTime === '') throw new Error('Start time is required')
if (Number(mintingDetails.startTime) < new Date().getTime() * 1000000) throw new Error('Invalid start time')
}
@@ -776,15 +781,25 @@ const CollectionCreationPage: NextPage = () => {
const whitelistStartDate = new Date(Number(config?.start_time) / 1000000)
throw Error(`Whitelist start time (${whitelistStartDate.toLocaleString()}) does not match minting start time`)
}
- if (
- mintingDetails?.numTokens &&
- config?.per_address_limit &&
- mintingDetails.numTokens > 100 &&
- Number(config.per_address_limit) > mintingDetails.numTokens / 100
- )
- throw Error(
- `Invalid limit for tokens per address (${config.per_address_limit} tokens). The limit cannot exceed 1% of the total number of tokens.`,
- )
+
+ if (mintingDetails?.numTokens && config?.per_address_limit) {
+ if (mintingDetails.numTokens >= 100 && Number(config.per_address_limit) > 50) {
+ throw Error(
+ `Invalid limit for tokens per address (${config.per_address_limit} tokens). Tokens per address limit cannot exceed 50 regardless of the total number of tokens.`,
+ )
+ } else if (
+ mintingDetails.numTokens >= 100 &&
+ Number(config.per_address_limit) > Math.ceil((mintingDetails.numTokens / 100) * 3)
+ ) {
+ throw Error(
+ `Invalid limit for tokens per address (${config.per_address_limit} tokens). Tokens per address limit cannot exceed 3% of the total number of tokens in the collection.`,
+ )
+ } else if (mintingDetails.numTokens < 100 && Number(config.per_address_limit) > 3) {
+ throw Error(
+ `Invalid limit for tokens per address (${config.per_address_limit} tokens). Tokens per address limit cannot exceed 3 for collections with less than 100 tokens in total.`,
+ )
+ }
+ }
}
} else if (whitelistDetails.whitelistType === 'new') {
if (whitelistDetails.members?.length === 0) throw new Error('Whitelist member list cannot be empty')
@@ -801,15 +816,24 @@ const CollectionCreationPage: NextPage = () => {
throw new Error('Whitelist start time cannot be later than whitelist end time')
if (Number(whitelistDetails.startTime) !== Number(mintingDetails?.startTime))
throw new Error('Whitelist start time must be the same as the minting start time')
- if (
- mintingDetails?.numTokens &&
- whitelistDetails.perAddressLimit &&
- mintingDetails.numTokens > 100 &&
- whitelistDetails.perAddressLimit > mintingDetails.numTokens / 100
- )
- throw Error(
- `Invalid limit for tokens per address (${whitelistDetails.perAddressLimit} tokens). The limit cannot exceed 1% of the total number of tokens.`,
- )
+ if (whitelistDetails.perAddressLimit && mintingDetails?.numTokens) {
+ if (mintingDetails.numTokens >= 100 && whitelistDetails.perAddressLimit > 50) {
+ throw Error(
+ `Invalid limit for tokens per address. Tokens per address limit cannot exceed 50 regardless of the total number of tokens.`,
+ )
+ } else if (
+ mintingDetails.numTokens >= 100 &&
+ whitelistDetails.perAddressLimit > Math.ceil((mintingDetails.numTokens / 100) * 3)
+ ) {
+ throw Error(
+ `Invalid limit for tokens per address. Tokens per address limit cannot exceed 3% of the total number of tokens in the collection.`,
+ )
+ } else if (mintingDetails.numTokens < 100 && whitelistDetails.perAddressLimit > 3) {
+ throw Error(
+ `Invalid limit for tokens per address. Tokens per address limit cannot exceed 3 for collections with less than 100 tokens in total.`,
+ )
+ }
+ }
}
}
diff --git a/pages/contracts/badgeHub/execute.tsx b/pages/contracts/badgeHub/execute.tsx
index 4980e61..e078be8 100644
--- a/pages/contracts/badgeHub/execute.tsx
+++ b/pages/contracts/badgeHub/execute.tsx
@@ -1,17 +1,22 @@
/* eslint-disable eslint-comments/disable-enable-pair */
+/* eslint-disable no-nested-ternary */
/* eslint-disable @typescript-eslint/no-unnecessary-type-assertion */
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
import { toUtf8 } from '@cosmjs/encoding'
+import clsx from 'clsx'
import { Alert } from 'components/Alert'
+import type { MintRule } from 'components/badges/creation/ImageUploadDetails'
import { Button } from 'components/Button'
import { Conditional } from 'components/Conditional'
import { ContractPageHeader } from 'components/ContractPageHeader'
import { ExecuteCombobox } from 'components/contracts/badgeHub/ExecuteCombobox'
import { useExecuteComboboxState } from 'components/contracts/badgeHub/ExecuteCombobox.hooks'
import { FormControl } from 'components/FormControl'
+import { AddressList } from 'components/forms/AddressList'
+import { useAddressListState } from 'components/forms/AddressList.hooks'
import { AddressInput, NumberInput } from 'components/forms/FormInput'
import { useInputState, useNumberInputState } from 'components/forms/FormInput.hooks'
import { InputDateTime } from 'components/InputDateTime'
@@ -20,6 +25,7 @@ import { LinkTabs } from 'components/LinkTabs'
import { badgeHubLinkTabs } from 'components/LinkTabs.data'
import { Tooltip } from 'components/Tooltip'
import { TransactionHash } from 'components/TransactionHash'
+import { WhitelistUpload } from 'components/WhitelistUpload'
import { useContracts } from 'contexts/contracts'
import { useWallet } from 'contexts/wallet'
import type { Badge } from 'contracts/badgeHub'
@@ -40,7 +46,8 @@ import { useMutation } from 'react-query'
import * as secp256k1 from 'secp256k1'
import { copy } from 'utils/clipboard'
import { NETWORK } from 'utils/constants'
-import { sha256 } from 'utils/hash'
+import { generateKeyPairs, sha256 } from 'utils/hash'
+import { isValidAddress } from 'utils/isValidAddress'
import { withMetadata } from 'utils/layout'
import { links } from 'utils/links'
import { resolveAddress } from 'utils/resolveAddress'
@@ -62,10 +69,15 @@ const BadgeHubExecutePage: NextPage = () => {
const [createdBadgeId, setCreatedBadgeId] = useState(null)
const [createdBadgeKey, setCreatedBadgeKey] = useState(undefined)
const [resolvedOwnerAddress, setResolvedOwnerAddress] = useState('')
+ const [resolvedMinterAddress, setResolvedMinterAddress] = useState('')
const [signature, setSignature] = useState('')
+ const [ownerList, setOwnerList] = useState([])
const [editFee, setEditFee] = useState(undefined)
const [triggerDispatch, setTriggerDispatch] = useState(false)
const qrRef = useRef(null)
+ const [numberOfKeys, setNumberOfKeys] = useState(0)
+ const [keyPairs, setKeyPairs] = useState<{ publicKey: string; privateKey: string }[]>([])
+ const [mintRule, setMintRule] = useState('by_key')
const comboboxState = useExecuteComboboxState()
const type = comboboxState.value?.id
@@ -173,20 +185,26 @@ const BadgeHubExecutePage: NextPage = () => {
name: 'owner',
title: 'Owner',
subtitle: 'The owner of the badge',
+ defaultValue: wallet.address,
})
+ const ownerListState = useAddressListState()
+
const pubkeyState = useInputState({
id: 'pubkey',
name: 'pubkey',
title: 'Pubkey',
- subtitle: 'The public key for the badge',
+ subtitle: 'The whitelisted public key authorized to mint a badge',
})
const privateKeyState = useInputState({
id: 'privateKey',
name: 'privateKey',
title: 'Private Key',
- subtitle: 'The private key generated during badge creation',
+ subtitle:
+ type === 'mint_by_keys'
+ ? 'The corresponding private key for the whitelisted public key'
+ : 'The private key that was generated during badge creation',
})
const nftState = useInputState({
@@ -200,15 +218,34 @@ const BadgeHubExecutePage: NextPage = () => {
id: 'limit',
name: 'limit',
title: 'Limit',
- subtitle: 'Number of keys/owners to execute the action for',
+ subtitle: 'Number of keys/owners to execute the action for (0 for all)',
+ })
+
+ const designatedMinterState = useInputState({
+ id: 'designatedMinter',
+ name: 'designatedMinter',
+ title: 'Minter Address',
+ subtitle: 'The address of the designated minter for this badge',
+ defaultValue: wallet.address,
})
const showBadgeField = type === 'create_badge'
const showMetadataField = isEitherType(type, ['create_badge', 'edit_badge'])
- const showIdField = isEitherType(type, ['edit_badge', 'mint_by_key'])
+ const showIdField = isEitherType(type, [
+ 'edit_badge',
+ 'add_keys',
+ 'purge_keys',
+ 'purge_owners',
+ 'mint_by_key',
+ 'mint_by_keys',
+ 'mint_by_minter',
+ ])
+ const showLimitField = isEitherType(type, ['purge_keys', 'purge_owners'])
const showNFTField = type === 'set_nft'
- const showOwnerField = type === 'mint_by_key'
- const showPrivateKeyField = type === 'mint_by_key'
+ const showOwnerField = isEitherType(type, ['mint_by_key', 'mint_by_keys'])
+ const showOwnerListField = isEitherType(type, ['mint_by_minter'])
+ const showPubkeyField = isEitherType(type, ['mint_by_keys'])
+ const showPrivateKeyField = isEitherType(type, ['mint_by_key', 'mint_by_keys'])
const messages = useMemo(() => contract?.use(contractState.value), [contract, wallet.address, contractState.value])
const payload: DispatchExecuteArgs = {
@@ -234,9 +271,16 @@ const BadgeHubExecutePage: NextPage = () => {
youtube_url: youtubeUrlState.value || undefined,
},
transferrable,
- rule: {
- by_key: keyState.value,
- },
+ rule:
+ mintRule === 'by_key'
+ ? {
+ by_key: keyState.value,
+ }
+ : mintRule === 'by_minter'
+ ? {
+ by_minter: resolvedMinterAddress,
+ }
+ : 'by_keys',
expiry: timestamp ? timestamp.getTime() * 1000000 : undefined,
max_supply: maxSupplyState.value || undefined,
},
@@ -260,12 +304,19 @@ const BadgeHubExecutePage: NextPage = () => {
youtube_url: youtubeUrlState.value || undefined,
},
id: badgeIdState.value,
- owner: ownerState.value,
+ owner: resolvedOwnerAddress,
pubkey: pubkeyState.value,
signature,
- keys: [],
- limit: limitState.value,
- owners: [],
+ keys: keyPairs.map((keyPair) => keyPair.publicKey),
+ limit: limitState.value || undefined,
+ owners: [
+ ...new Set(
+ ownerListState.values
+ .map((a) => a.address.trim())
+ .filter((address) => address !== '' && isValidAddress(address.trim()) && address.startsWith('stars'))
+ .concat(ownerList),
+ ),
+ ],
nft: nftState.value,
editFee,
contract: contractState.value,
@@ -337,6 +388,7 @@ const BadgeHubExecutePage: NextPage = () => {
if (txHash) {
setLastTx(txHash.split(':')[0])
setCreatedBadgeId(txHash.split(':')[1])
+ badgeIdState.onChange(!isNaN(Number(txHash.split(':')[1])) ? Number(txHash.split(':')[1]) : 1)
}
}
},
@@ -388,6 +440,14 @@ const BadgeHubExecutePage: NextPage = () => {
link.click()
})
}
+ const handleDownloadKeys = () => {
+ const element = document.createElement('a')
+ const file = new Blob([JSON.stringify(keyPairs)], { type: 'text/plain' })
+ element.href = URL.createObjectURL(file)
+ element.download = `badge-${badgeIdState.value}-keys.json`
+ document.body.appendChild(element)
+ element.click()
+ }
const copyClaimURL = async () => {
const baseURL = NETWORK === 'testnet' ? 'https://badges.publicawesome.dev' : 'https://badges.stargaze.zone'
@@ -409,6 +469,12 @@ const BadgeHubExecutePage: NextPage = () => {
}
}
+ useEffect(() => {
+ if (numberOfKeys > 0) {
+ setKeyPairs(generateKeyPairs(numberOfKeys))
+ }
+ }, [numberOfKeys])
+
useEffect(() => {
if (privateKeyState.value.length === 64 && resolvedOwnerAddress)
handleGenerateSignature(badgeIdState.value, resolvedOwnerAddress, privateKeyState.value)
@@ -448,6 +514,15 @@ const BadgeHubExecutePage: NextPage = () => {
void resolveOwnerAddress()
}, [ownerState.value])
+ const resolveMinterAddress = async () => {
+ await resolveAddress(designatedMinterState.value.trim(), wallet).then((resolvedAddress) => {
+ setResolvedMinterAddress(resolvedAddress)
+ })
+ }
+ useEffect(() => {
+ void resolveMinterAddress()
+ }, [designatedMinterState.value])
+
const resolveManagerAddress = async () => {
await resolveAddress(managerState.value.trim(), wallet).then((resolvedAddress) => {
setBadge({
@@ -472,9 +547,16 @@ const BadgeHubExecutePage: NextPage = () => {
youtube_url: youtubeUrlState.value || undefined,
},
transferrable,
- rule: {
- by_key: keyState.value,
- },
+ rule:
+ mintRule === 'by_key'
+ ? {
+ by_key: keyState.value,
+ }
+ : mintRule === 'by_minter'
+ ? {
+ by_minter: resolvedMinterAddress,
+ }
+ : 'by_keys',
expiry: timestamp ? timestamp.getTime() * 1000000 : undefined,
max_supply: maxSupplyState.value || undefined,
})
@@ -508,9 +590,16 @@ const BadgeHubExecutePage: NextPage = () => {
youtube_url: youtubeUrlState.value || undefined,
},
transferrable,
- rule: {
- by_key: keyState.value,
- },
+ rule:
+ mintRule === 'by_key'
+ ? {
+ by_key: keyState.value,
+ }
+ : mintRule === 'by_minter'
+ ? {
+ by_minter: resolvedMinterAddress,
+ }
+ : 'by_keys',
expiry: timestamp ? timestamp.getTime() * 1000000 : undefined,
max_supply: maxSupplyState.value || undefined,
})
@@ -541,7 +630,7 @@ const BadgeHubExecutePage: NextPage = () => {
/>
+
+ )}
+
+ {showBadgeField && createdBadgeId && mintRule === 'by_minter' && (
+
+
+ )}
+
+
+
-
+
+
+
+
+
+ Number of Keys
+
+ The number of key pairs to be whitelisted for post-creation access control
+
+
+ setNumberOfKeys(Number(e.target.value))}
+ required
+ type="number"
+ value={numberOfKeys}
+ />
+
+
+
-
{badge.name}
++ {badge.name ? badge.name : 'No name provided.'} +
Badge ID: {badge.tokenId}
*/} {/* */}
@@ -598,14 +687,116 @@ const BadgeHubExecutePage: NextPage = () => {
+ Badge ID:{` ${createdBadgeId as string}`}
+
+
+ +
+
+
+
+ You may select Message Type {'>'} Add Keys to add whitelisted keys authorized to mint a badge.
+
+
+
+ Badge successfully created with ID:{` ${createdBadgeId as string}`}
+
+ Designated Minter Address: {` ${resolvedMinterAddress}`} +
+
+ + Designated Minter Address: {` ${resolvedMinterAddress}`} +
+
+
+
+
+ You may select Message Type {'>'} Mint by Minter to mint badges using the designated minter wallet.
+
+
+