Merge pull request #192 from public-awesome/develop

Sync dev > main

components/badges/creation/ImageUploadDetails.tsx

@@ -106,8 +106,8 @@ export const ImageUploadDetails = ({ onChange, mintRule }: ImageUploadDetailsPro
           .replace(/,/g, '')
           .replace(/"/g, '')
           .replace(/'/g, '')
-          .replace(/ /g, '')
+          .replace(regex, '')
-          .replace(regex, ''),
+          .trim(),
       }
       onChange(data)
     } catch (error: any) {

components/collections/actions/Action.tsx

@@ -12,6 +12,7 @@ import { AddressInput, NumberInput } from 'components/forms/FormInput'
 import { useInputState, useNumberInputState } from 'components/forms/FormInput.hooks'
 import { InputDateTime } from 'components/InputDateTime'
 import { JsonPreview } from 'components/JsonPreview'
+import { Tooltip } from 'components/Tooltip'
 import { TransactionHash } from 'components/TransactionHash'
 import { useWallet } from 'contexts/wallet'
 import type { BaseMinterInstance } from 'contracts/baseMinter'
@@ -63,6 +64,7 @@ export const CollectionActions = ({
   const [collectionInfo, setCollectionInfo] = useState<CollectionInfo>()
   const [explicitContent, setExplicitContent] = useState<ExplicitContentType>(undefined)
   const [resolvedRecipientAddress, setResolvedRecipientAddress] = useState<string>('')
+  const [jsonExtensions, setJsonExtensions] = useState<boolean>(false)
 
   const actionComboboxState = useActionsComboboxState()
   const type = actionComboboxState.value?.id
@@ -228,6 +230,7 @@ export const CollectionActions = ({
       ? baseURIState.value.trim().slice(0, -1)
       : baseURIState.value.trim(),
     collectionInfo,
+    jsonExtensions,
   }
   const resolveRecipientAddress = async () => {
     await resolveAddress(recipientState.value.trim(), wallet).then((resolvedAddress) => {
@@ -507,6 +510,26 @@ export const CollectionActions = ({
               <InputDateTime minDate={new Date()} onChange={(date) => setEndTimestamp(date)} value={endTimestamp} />
             </FormControl>
           </Conditional>
+          <Conditional test={showBaseUriField}>
+            <Tooltip
+              backgroundColor="bg-blue-500"
+              className="ml-7"
+              label="Please toggle this on if the IPFS folder contains files with .json extensions."
+              placement="bottom"
+            >
+              <div className="mt-2 w-3/4 form-control">
+                <label className="justify-start cursor-pointer label">
+                  <span className="mr-4 font-bold">Metadata files with .json extensions?</span>
+                  <input
+                    checked={jsonExtensions}
+                    className={`toggle ${jsonExtensions ? `bg-stargaze` : `bg-gray-600`}`}
+                    onClick={() => setJsonExtensions(!jsonExtensions)}
+                    type="checkbox"
+                  />
+                </label>
+              </div>
+            </Tooltip>
+          </Conditional>
         </div>
         <div className="-mt-6">
           <div className="relative mb-2">

components/collections/actions/actions.ts

@@ -327,6 +327,7 @@ export interface DispatchExecuteArgs {
   tokenRecipients: AirdropAllocation[]
   collectionInfo: CollectionInfo | undefined
   baseUri: string
+  jsonExtensions: boolean
 }
 
 export const dispatchExecute = async (args: DispatchExecuteArgs) => {
@@ -387,7 +388,7 @@ export const dispatchExecute = async (args: DispatchExecuteArgs) => {
       return sg721Messages.updateTokenMetadata(args.tokenId.toString(), args.tokenUri)
     }
     case 'batch_update_token_metadata': {
-      return sg721Messages.batchUpdateTokenMetadata(args.tokenIds, args.baseUri)
+      return sg721Messages.batchUpdateTokenMetadata(args.tokenIds, args.baseUri, args.jsonExtensions)
     }
     case 'freeze_token_metadata': {
       return sg721Messages.freezeTokenMetadata()
@@ -494,7 +495,7 @@ export const previewExecutePayload = (args: DispatchExecuteArgs) => {
       return sg721Messages(sg721Contract)?.updateTokenMetadata(args.tokenId.toString(), args.tokenUri)
     }
     case 'batch_update_token_metadata': {
-      return sg721Messages(sg721Contract)?.batchUpdateTokenMetadata(args.tokenIds, args.baseUri)
+      return sg721Messages(sg721Contract)?.batchUpdateTokenMetadata(args.tokenIds, args.baseUri, args.jsonExtensions)
     }
     case 'freeze_token_metadata': {
       return sg721Messages(sg721Contract)?.freezeTokenMetadata()

components/collections/creation/UploadDetails.tsx

@@ -239,15 +239,15 @@ export const UploadDetails = ({ onChange, minterType, baseMinterAcquisitionMetho
           .replace(/,/g, '')
           .replace(/"/g, '')
           .replace(/'/g, '')
-          .replace(/ /g, '')
+          .replace(regex, '')
-          .replace(regex, ''),
+          .trim(),
         imageUrl: coverImageUrlState.value
           .replace('IPFS://', 'ipfs://')
           .replace(/,/g, '')
           .replace(/"/g, '')
           .replace(/'/g, '')
-          .replace(/ /g, '')
+          .replace(regex, '')
-          .replace(regex, ''),
+          .trim(),
         baseMinterMetadataFile,
       }
       onChange(data)

components/openEdition/ImageUploadDetails.tsx

@@ -115,8 +115,8 @@ export const ImageUploadDetails = ({ onChange }: ImageUploadDetailsProps) => {
           .replace(/,/g, '')
           .replace(/"/g, '')
           .replace(/'/g, '')
-          .replace(/ /g, '')
+          .replace(regex, '')
-          .replace(regex, ''),
+          .trim(),
         coverImageUrl: coverImageUrlState.value.trim(),
       }
       onChange(data)

components/openEdition/OffChainMetadataUploadDetails.tsx

@@ -194,15 +194,15 @@ export const OffChainMetadataUploadDetails = ({
           .replace(/,/g, '')
           .replace(/"/g, '')
           .replace(/'/g, '')
-          .replace(/ /g, '')
+          .replace(regex, '')
-          .replace(regex, ''),
+          .trim(),
         imageUrl: coverImageUrlState.value
           .replace('IPFS://', 'ipfs://')
           .replace(/,/g, '')
           .replace(/"/g, '')
           .replace(/'/g, '')
-          .replace(/ /g, '')
+          .replace(regex, '')
-          .replace(regex, ''),
+          .trim(),
         openEditionMinterMetadataFile,
       }
       onChange(data)

contracts/sg721/contract.ts

@@ -87,7 +87,7 @@ export interface SG721Instance {
   batchBurn: (tokenIds: string) => Promise<string>
   batchTransfer: (recipient: string, tokenIds: string) => Promise<string>
   updateTokenMetadata: (tokenId: string, tokenURI: string) => Promise<string>
-  batchUpdateTokenMetadata: (tokenIds: string, tokenURI: string) => Promise<string>
+  batchUpdateTokenMetadata: (tokenIds: string, tokenURI: string, jsonExtensions: boolean) => Promise<string>
   freezeTokenMetadata: () => Promise<string>
   enableUpdatable: () => Promise<string>
 }
@@ -106,7 +106,11 @@ export interface Sg721Messages {
   updateCollectionInfo: (collectionInfo: CollectionInfo) => UpdateCollectionInfoMessage
   freezeCollectionInfo: () => FreezeCollectionInfoMessage
   updateTokenMetadata: (tokenId: string, tokenURI: string) => UpdateTokenMetadataMessage
-  batchUpdateTokenMetadata: (tokenIds: string, tokenURI: string) => BatchUpdateTokenMetadataMessage
+  batchUpdateTokenMetadata: (
+    tokenIds: string,
+    tokenURI: string,
+    jsonExtensions: boolean,
+  ) => BatchUpdateTokenMetadataMessage
   freezeTokenMetadata: () => FreezeTokenMetadataMessage
   enableUpdatable: () => EnableUpdatableMessage
 }
@@ -611,13 +615,20 @@ export const SG721 = (client: SigningCosmWasmClient, txSigner: string): SG721Con
       return res.transactionHash
     }
 
-    const batchUpdateTokenMetadata = async (tokenIds: string, baseURI: string): Promise<string> => {
+    const batchUpdateTokenMetadata = async (
+      tokenIds: string,
+      baseURI: string,
+      jsonExtensions: boolean,
+    ): Promise<string> => {
       const executeContractMsgs: MsgExecuteContractEncodeObject[] = []
       if (tokenIds.includes(':')) {
         const [start, end] = tokenIds.split(':').map(Number)
         for (let i = start; i <= end; i++) {
           const msg = {
-            update_token_metadata: { token_id: i.toString(), token_uri: `${baseURI}/${i}` },
+            update_token_metadata: {
+              token_id: i.toString(),
+              token_uri: `${baseURI}/${i}${jsonExtensions ? '.json' : ''}`,
+            },
           }
           const executeContractMsg: MsgExecuteContractEncodeObject = {
             typeUrl: '/cosmwasm.wasm.v1.MsgExecuteContract',
@@ -634,7 +645,10 @@ export const SG721 = (client: SigningCosmWasmClient, txSigner: string): SG721Con
         const tokenNumbers = tokenIds.split(',').map(Number)
         for (let i = 0; i < tokenNumbers.length; i++) {
           const msg = {
-            update_token_metadata: { token_id: tokenNumbers[i].toString(), token_uri: `${baseURI}/${tokenNumbers[i]}` },
+            update_token_metadata: {
+              token_id: tokenNumbers[i].toString(),
+              token_uri: `${baseURI}/${tokenNumbers[i]}${jsonExtensions ? '.json' : ''}`,
+            },
           }
           const executeContractMsg: MsgExecuteContractEncodeObject = {
             typeUrl: '/cosmwasm.wasm.v1.MsgExecuteContract',
@@ -936,20 +950,30 @@ export const SG721 = (client: SigningCosmWasmClient, txSigner: string): SG721Con
       }
     }
 
-    const batchUpdateTokenMetadata = (tokenIds: string, baseURI: string): BatchUpdateTokenMetadataMessage => {
+    const batchUpdateTokenMetadata = (
+      tokenIds: string,
+      baseURI: string,
+      jsonExtensions: boolean,
+    ): BatchUpdateTokenMetadataMessage => {
       const msg: Record<string, unknown>[] = []
       if (tokenIds.includes(':')) {
         const [start, end] = tokenIds.split(':').map(Number)
         for (let i = start; i <= end; i++) {
           msg.push({
-            update_token_metadata: { token_id: i.toString(), token_uri: `${baseURI}/${i}` },
+            update_token_metadata: {
+              token_id: i.toString(),
+              token_uri: `${baseURI}/${i}${jsonExtensions ? '.json' : ''}`,
+            },
           })
         }
       } else {
         const tokenNumbers = tokenIds.split(',').map(Number)
         for (let i = 0; i < tokenNumbers.length; i++) {
           msg.push({
-            update_token_metadata: { token_id: tokenNumbers[i].toString(), token_uri: `${baseURI}/${tokenNumbers[i]}` },
+            update_token_metadata: {
+              token_id: tokenNumbers[i].toString(),
+              token_uri: `${baseURI}/${tokenNumbers[i]}${jsonExtensions ? '.json' : ''}`,
+            },
           })
         }
       }

pages/revoke.tsx

@@ -0,0 +1,96 @@
+/* eslint-disable eslint-comments/disable-enable-pair */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+import { coins } from '@cosmjs/proto-signing'
+import { ContractPageHeader } from 'components/ContractPageHeader'
+import { TextInput } from 'components/forms/FormInput'
+import { useInputState } from 'components/forms/FormInput.hooks'
+import { useWallet } from 'contexts/wallet'
+import type { NextPage } from 'next'
+import { NextSeo } from 'next-seo'
+import { useState } from 'react'
+import toast from 'react-hot-toast'
+import { withMetadata } from 'utils/layout'
+import { links } from 'utils/links'
+
+const RevokeAuthorization: NextPage = () => {
+  const wallet = useWallet()
+  const client = wallet.getClient()
+
+  const [transactionHash, setTransactionHash] = useState<string | undefined>(undefined)
+
+  const granteeAddressState = useInputState({
+    id: 'grantee-address',
+    name: 'granteeAddress',
+    title: 'Grantee Address',
+    subtitle: 'Address to revoke message authorization',
+    placeholder: 'stars1234567890abcdefghijklmnopqrstuvwxyz...',
+    defaultValue: 'stars12vfpmlvmqrh9p0kcrtv6lw9ylkh7reuczdmmz5',
+  })
+
+  const messageState = useInputState({
+    id: 'message',
+    name: 'message',
+    title: 'Message',
+    subtitle: 'Message to revoke authorization for',
+    placeholder: '/cosmos.bank.v1beta1.MsgSend',
+    defaultValue: '/cosmos.bank.v1beta1.MsgSend',
+  })
+
+  const revokeAuthorization = async (granteeAddress: string, msg: string) => {
+    console.log('Wallet Address: ', wallet.address)
+    try {
+      await wallet.connect()
+      const result = await client.signAndBroadcast(
+        wallet.address,
+        [
+          {
+            typeUrl: '/cosmos.authz.v1beta1.MsgRevoke',
+            value: {
+              granter: wallet.address,
+              grantee: granteeAddress,
+              msgTypeUrl: msg,
+              funds: coins('100000', 'ustars'),
+            },
+          },
+        ],
+        'auto',
+      )
+      setTransactionHash(result.transactionHash)
+    } catch (e: any) {
+      console.log(e)
+      toast.error(e.message, { style: { maxWidth: 'none' } })
+    }
+  }
+
+  return (
+    <section className="py-6 px-12 space-y-4">
+      <NextSeo title="Revoke Authorization" />
+      <ContractPageHeader description="Revoke Authorization." link={links.Documentation} title="Revoke Authorization" />
+      <TextInput {...granteeAddressState} />
+      <div className="font-bold">Message Types</div>
+      <select
+        className="py-2 px-4 bg-black border-2 border-white"
+        onChange={(e) => messageState.onChange(e.target.value)}
+      >
+        <option className="bg-black" value="/cosmos.bank.v1beta1.MsgSend">
+          /cosmos.bank.v1beta1.MsgSend
+        </option>
+        <option className="bg-black" value="/cosmos.staking.v1beta1.MsgUndelegate">
+          /cosmos.staking.v1beta1.MsgUndelegate
+        </option>
+      </select>
+      <TextInput {...messageState} />
+      <button
+        className="text-white bg-stargaze btn"
+        onClick={() => void revokeAuthorization(granteeAddressState.value, messageState.value)}
+        type="button"
+      >
+        Revoke Authorization
+      </button>
+      {transactionHash && (
+        <div className="justify-center items-center space-y-2">{`Transaction Hash: ${transactionHash}`}</div>
+      )}
+    </section>
+  )
+}
+export default withMetadata(RevokeAuthorization, { center: false })