Merge pull request #11245 from kodadot/chore/minimark-out-utils

chore/minimark out utils

components/collection/unlockable/utils.ts

@@ -1,4 +1,4 @@
-import { createMetadata } from '@kodadot1/minimark/utils'
+import { createOpenSeaMetadata as createMetadata } from '@kodadot1/hyperdata'
 
 export const UNLOCKABLE_CAMPAIGN = 'bbw2023'
 export const UNLOCKABLE_NAME = 'Berlin (Blockchain) Waifus'

components/common/EditNftModal.vue

@@ -82,10 +82,11 @@
 
 <script setup lang="ts">
 import { NeoButton, NeoField, NeoInput, NeoModal } from '@kodadot1/brick'
-import type { Metadata, Attribute } from '@kodadot1/minimark/common'
+import type { OpenSeaAttribute as Attribute } from '@kodadot1/hyperdata'
 import type { ActionMetadataSetMetadata } from '@/composables/transaction/types'
 import ModalBody from '@/components/shared/modals/ModalBody.vue'
 import CustomAttributeInput from '@/components/rmrk/Create/CustomAttributeInput.vue'
+import type { Metadata } from '@/services/nftStorage'
 
 const emit = defineEmits(['submit'])
 const props = defineProps<{

components/gallery/GalleryItemButton/GalleryItemEditNftButton.vue

@@ -23,11 +23,11 @@
 
 <script setup lang="ts">
 import { NeoDropdownItem } from '@kodadot1/brick'
-import type { Metadata } from '@kodadot1/minimark/common'
 import { useQuery } from '@tanstack/vue-query'
 import { refreshOdaTokenMetadata } from '@/services/oda'
 import { type ActionMetadataSetMetadata, NFTs } from '@/composables/transaction/types'
 import type { NFT } from '@/types'
+import type { Metadata } from '@/services/nftStorage'
 
 const props = defineProps<{
   nft?: NFT

components/rmrk/Create/CustomAttributeInput.vue

@@ -30,7 +30,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { Attribute } from '@kodadot1/minimark/common'
+import type { OpenSeaAttribute as Attribute } from '@kodadot1/hyperdata'
 import { NeoButton } from '@kodadot1/brick'
 import AttributeInput from './AttributeInput.vue'
 

components/shared/gallery/Properties.vue

@@ -22,7 +22,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { Attribute } from '@kodadot1/minimark/common'
+import type { OpenSeaAttribute as Attribute } from '@kodadot1/hyperdata'
 import { emptyArray } from '~/utils/empty'
 import CollapseCardWrapper from '@/components/shared/collapse/CollapseCardWrapper.vue'
 

composables/transaction/mintCollection/constructMeta.ts

@@ -1,4 +1,4 @@
-import { createMetadata, unSanitizeIpfsUrl } from '@kodadot1/minimark/utils'
+import { createOpenSeaMetadata as createMetadata, protocolize } from '@kodadot1/hyperdata'
 import type { ActionMintCollection } from '../types'
 import { pinJson } from '@/services/nftStorage'
 import { uploadDirect } from '@/utils/directUpload'
@@ -28,5 +28,5 @@ export async function constructMeta(item: ActionMintCollection) {
     uploadDirect(file, imageHash).catch($consola.warn)
   }
 
-  return unSanitizeIpfsUrl(metaHash)
+  return protocolize(metaHash)
 }

composables/transaction/mintToken/constructDirectoryMeta.ts

@@ -1,4 +1,4 @@
-import { createMetadata, unSanitizeIpfsUrl } from '@kodadot1/minimark/utils'
+import { createOpenSeaMetadata as createMetadata, protocolize } from '@kodadot1/hyperdata'
 import type { TokenToMint } from '../types'
 import { pinDirectory } from '@/services/nftStorage'
 
@@ -40,7 +40,7 @@ export const uploadMediaAndMetadataDirectories = async (
   )
 
   return metadataFiles.map((_, index) =>
-    unSanitizeIpfsUrl(`ipfs://${metaDirectoryCid}/${index}.json`),
+    protocolize(`ipfs://${metaDirectoryCid}/${index}.json`),
   )
 }
 

composables/transaction/mintToken/constructMeta.ts

@@ -1,4 +1,4 @@
-import { createMetadata, unSanitizeIpfsUrl } from '@kodadot1/minimark/utils'
+import { createOpenSeaMetadata as createMetadata, protocolize } from '@kodadot1/hyperdata'
 import type { TokenToMint } from '../types'
 import {
   nsfwAttribute,
@@ -63,5 +63,5 @@ export async function constructMeta(
     [file, secondFile],
     [fileHash, secondFileHash],
   ).catch($consola.warn)
-  return unSanitizeIpfsUrl(metaHash)
+  return protocolize(metaHash)
 }

composables/transaction/transactionSetNftMetadata.ts

@@ -1,6 +1,6 @@
-import { unSanitizeIpfsUrl } from '@kodadot1/minimark/utils'
-import { type Metadata } from '@kodadot1/minimark/common'
+import { protocolize } from '@kodadot1/hyperdata'
 import type { SetNftMetadataParams, ActionSetNftMetadata } from './types'
+import type { Metadata } from '@/services/nftStorage'
 import { pinJson, rateLimitedPinFileToIPFS } from '@/services/nftStorage'
 
 const constructMeta = async (item: ActionSetNftMetadata) => {
@@ -10,7 +10,7 @@ const constructMeta = async (item: ActionSetNftMetadata) => {
   let type: string | undefined
 
   if (image instanceof File) {
-    imageHash = unSanitizeIpfsUrl(await rateLimitedPinFileToIPFS(image))
+    imageHash = protocolize(await rateLimitedPinFileToIPFS(image))
     type = getImageTypeSafe(image)
   }
   else {
@@ -29,7 +29,7 @@ const constructMeta = async (item: ActionSetNftMetadata) => {
 
   const metaHash = await pinJson(meta)
 
-  return unSanitizeIpfsUrl(metaHash)
+  return protocolize(metaHash)
 }
 
 async function execSetNftMetadataStatmine({ item, api, executeTransaction, isLoading, status }: SetNftMetadataParams) {

composables/transaction/transactionUpdateCollection.ts

@@ -1,4 +1,4 @@
-import { createMetadata, unSanitizeIpfsUrl } from '@kodadot1/minimark/utils'
+import { createOpenSeaMetadata as createMetadata, protocolize } from '@kodadot1/hyperdata'
 import type { SubmittableExtrinsic } from '@polkadot/api-base/types'
 import { uploadMediaFiles } from './mintToken/constructDirectoryMeta'
 import type { ActionUpdateCollection, UpdateCollectionParams } from './types'
@@ -53,11 +53,11 @@ const constructMeta = async (item: ActionUpdateCollection) => {
   )
 
   // TODO: add banner field to minimark https://github.com/kodadot/packages/blob/main/minimark/src/utils/metadata.ts#L4
-  Object.assign(meta, { banner: banner ? unSanitizeIpfsUrl(banner) : '' })
+  Object.assign(meta, { banner: banner ? protocolize(banner) : '' })
 
   const metaHash = await pinJson(meta as any)
 
-  return unSanitizeIpfsUrl(metaHash)
+  return protocolize(metaHash)
 }
 
 async function execUpdateCollectionStatmine({ item, api, executeTransaction, isLoading, status }: UpdateCollectionParams) {

composables/transaction/types.ts

@@ -1,4 +1,4 @@
-import type { Attribute, Metadata } from '@kodadot1/minimark/common'
+import type { OpenSeaAttribute as Attribute } from '@kodadot1/hyperdata'
 import type { Interaction } from '@kodadot1/minimark/v1'
 import type { ApiPromise } from '@polkadot/api'
 import type { Prefix } from '@kodadot1/static'
@@ -8,6 +8,7 @@ import type { BaseTokenType } from '@/components/base/types'
 import type { Royalty } from '@/utils/royalty'
 import type { ShoppingActions } from '@/utils/shoppingActions'
 import type { Extrinsic } from '@/utils/transactionExecutor'
+import type { Metadata } from '@/services/nftStorage'
 
 type SuccessFunctionMessage = (blockNumber: string) => string
 export type ObjectMessage = {

package.json

@@ -55,7 +55,7 @@
     "@fortawesome/fontawesome-svg-core": "^6.4.2",
     "@fortawesome/vue-fontawesome": "^3.0.8",
     "@kodadot1/brick": "workspace:*",
-    "@kodadot1/hyperdata": "0.0.1-rc.6",
+    "@kodadot1/hyperdata": "0.0.2-rc.1",
     "@kodadot1/minimark": "^0.1.14-rc.0",
     "@kodadot1/minipfs": "0.4.3-rc.1",
     "@kodadot1/static": "workspace:*",