Merge pull request #5602 from kodadot/5535-final-prefix

5535 final prefix

components/carousel/utils/useCarousel.ts

@@ -39,7 +39,7 @@ const nftEventVariables = {
   },
 }
 
-const disableChainsOnProduction = ['snek', 'rmrk2']
+const disableChainsOnProduction = ['snek', 'ksm']
 
 const useChainEvents = (chain, type) => {
   if (isProduction && disableChainsOnProduction.includes(chain)) {
@@ -74,7 +74,7 @@ export const useCarouselNftEvents = ({ type }: Types) => {
   const { data: dataBsx } = useChainEvents('bsx', type)
   const { data: dataRmrk } = useChainEvents('rmrk', type)
   const { data: dataSnek } = useChainEvents('snek', type)
-  const { data: dataRmrk2 } = useChainEvents('rmrk2', type)
+  const { data: dataRmrk2 } = useChainEvents('ksm', type)
 
   const nfts = ref<CarouselNFT[]>([])
 
@@ -84,7 +84,7 @@ export const useCarouselNftEvents = ({ type }: Types) => {
     const rmrkNfts = await flattenNFT(dataRmrk.value, 'rmrk')
     const snekNfts = await flattenNFT(dataSnek.value, 'snek')
     const bsxNfts = await flattenNFT(dataBsx.value, 'bsx')
-    const rmrk2Nfts = await flattenNFT(dataRmrk2.value, 'rmrk2')
+    const rmrk2Nfts = await flattenNFT(dataRmrk2.value, 'ksm')
 
     const data = [...rmrkNfts, ...bsxNfts, ...snekNfts, ...rmrk2Nfts]
 
@@ -143,7 +143,7 @@ export const useCarouselRelated = ({ collectionId }) => {
   const { urlPrefix } = usePrefix()
   const { data } = useGraphql({
     queryName: 'collectionEntityById',
-    queryPrefix: urlPrefix.value === 'rmrk2' ? 'chain-rmrk2' : 'subsquid',
+    queryPrefix: urlPrefix.value === 'ksm' ? 'chain-ksm' : 'subsquid',
     variables: {
       id: collectionId,
       nftId: $route.params.id,

components/gallery/GalleryItemAction/GalleryItemActionType/GalleryItemBuy.vue

@@ -103,7 +103,7 @@ const label = computed(() =>
 )
 
 const balance = computed<string>(() => {
-  if (['rmrk', 'rmrk2'].includes(urlPrefix.value)) {
+  if (['rmrk', 'ksm'].includes(urlPrefix.value)) {
     return $store.getters.getAuthBalance
   }
   return $store.getters.getTokenBalanceOf(getKusamaAssetId(urlPrefix.value))

components/gallery/GalleryItemAction/GalleryItemActionType/GalleryItemOffer.vue

@@ -112,7 +112,7 @@ const root = ref<Vue<Record<string, string>>>()
 const connected = computed(() => Boolean(accountId.value))
 
 const balance = computed<string>(() => {
-  if (urlPrefix.value == 'rmrk' || urlPrefix.value == 'rmrk2') {
+  if (urlPrefix.value == 'rmrk' || urlPrefix.value == 'ksm') {
     return $store.getters.getAuthBalance
   }
   return $store.getters.getTokenBalanceOf(tokenId.value)

components/gallery/GalleryItemDescription.vue

@@ -108,7 +108,7 @@ const activeTab = ref('0')
 
 const properties = computed(() => {
   // we have different format between rmrk2 and the other chains
-  if (urlPrefix.value === 'rmrk2') {
+  if (urlPrefix.value === 'ksm') {
     return Object.entries(nftMetadata.value?.properties || {}).map(
       ([key, value]) => {
         return {

components/gallery/GalleryItemTabsPanel/GalleryItemActivityTable.vue

@@ -101,7 +101,7 @@ const { decimals, unit } = useChain()
 const { urlPrefix, tokenId, assets } = usePrefix()
 
 const interaction =
-  urlPrefix.value === 'rmrk2'
+  urlPrefix.value === 'ksm'
     ? dprops.interactions.filter((i) => i !== 'MINTNFT' && i !== 'CONSUME')
     : dprops.interactions
 
@@ -146,7 +146,7 @@ watchEffect(() => {
 
 const formatPrice = (price) => {
   const { symbol } = assets(tokenId.value)
-  const tokenSymbol = ['rmrk', 'rmrk2'].includes(urlPrefix.value)
+  const tokenSymbol = ['rmrk', 'ksm'].includes(urlPrefix.value)
     ? unit.value
     : symbol
 

components/gallery/GalleryItemTabsPanel/GalleryItemTabsPanel.vue

@@ -8,7 +8,7 @@
       :disabled-tooltip="$t('tabs.offersDisabled')">
       <GalleryItemOffers
         v-if="
-          !['rmrk', 'rmrk2'].includes(urlPrefix) &&
+          !['rmrk', 'ksm'].includes(urlPrefix) &&
           nft?.collection.id &&
           nft?.id &&
           nft.currentOwner

components/gallery/useGalleryItem.ts

@@ -45,7 +45,7 @@ export const useGalleryItem = () => {
 
   const queryPath = {
     rmrk: 'chain-rmrk',
-    rmrk2: 'chain-rmrk2',
+    ksm: 'chain-ksm',
   }
 
   const { urlPrefix } = usePrefix()

components/identity/module/IdentityLink.vue

@@ -24,7 +24,7 @@
 <script lang="ts" setup>
 import { GenericAccountId } from '@polkadot/types/generic/AccountId'
 import { getExplorer } from '@kodadot1/static'
-import type { BackwardPrefix } from '@kodadot1/static'
+import type { Prefix } from '@kodadot1/static'
 
 type Address = string | GenericAccountId | undefined
 
@@ -37,7 +37,7 @@ const { $buefy } = useNuxtApp()
 const { urlPrefix } = usePrefix()
 
 const explorerLink = computed(() =>
-  getExplorer(urlPrefix.value as BackwardPrefix, String(props.address))
+  getExplorer(urlPrefix.value as Prefix, String(props.address))
 )
 
 const toast = (message: string) => {

components/items/ItemsGrid/useItemsGrid.ts

@@ -35,7 +35,7 @@ export function useFetchSearch({
     }
     isFetchingData.value = true
 
-    const queryPath = client.value === 'rmrk2' ? 'chain-rmrk2' : client.value
+    const queryPath = client.value === 'ksm' ? 'chain-ksm' : client.value
     const query = await resolveQueryPath(queryPath, 'nftListWithSearch')
     const result = await $apollo.query({
       query: query.default,

components/landing/LandingPage.vue

@@ -12,7 +12,7 @@
     </section>
 
     <!-- top collections -->
-    <section v-if="showCarousel && urlPrefix !== 'rmrk2'" class="py-6 instance">
+    <section v-if="showCarousel && urlPrefix !== 'ksm'" class="py-6 instance">
       <div class="container is-fluid">
         <LazyTopCollections class="my-5" />
       </div>
@@ -43,7 +43,7 @@ const { urlPrefix } = usePrefix()
 const showCarousel = computed(() => {
   return (
     urlPrefix.value === 'rmrk' ||
-    urlPrefix.value === 'rmrk2' ||
+    urlPrefix.value === 'ksm' ||
     urlPrefix.value === 'snek' ||
     urlPrefix.value === 'bsx'
   )

components/massmint/useMassMint.ts

@@ -16,7 +16,7 @@ export const useMassMint = () => {
   const { urlPrefix } = usePrefix()
   const queryPath = {
     rmrk: 'chain-rmrk',
-    rmrk2: 'chain-rmrk2',
+    ksm: 'chain-ksm',
   }
 
   const doFetch = async () => {

components/navbar/NavbarExploreOptions.vue

@@ -35,7 +35,7 @@ const { availableChains } = useChain()
 
 const filteredChains = computed(() => {
   return availableChains?.value.filter((chain) => {
-    return ['rmrk2', 'bsx', 'rmrk'].includes(chain.value)
+    return ['ksm', 'bsx', 'rmrk'].includes(chain.value)
   })
 })
 

components/navbar/ProfileDropdown.vue

@@ -24,7 +24,7 @@
         <b-dropdown-item has-link aria-role="menuitem">
           <nuxt-link to="/settings">{{ $t('settings') }}</nuxt-link>
         </b-dropdown-item>
-        <template v-if="chain === 'rmrk' || chain === 'rmrk2'">
+        <template v-if="chain === 'rmrk' || chain === 'ksm'">
           <b-dropdown-item has-link aria-role="menuitem">
             <a @click="showRampSDK">
               {{ $t('credit') }}

components/navbar/StatsDropdown.vue

@@ -28,7 +28,7 @@
         </b-dropdown-item>
       </b-dropdown>
       <b-dropdown
-        v-if="chain === 'rmrk' || chain === 'rmrk2'"
+        v-if="chain === 'rmrk' || chain === 'ksm'"
         data-cy="stats"
         :triggers="['click']">
         <template #trigger>
@@ -74,7 +74,7 @@
             {{ $t('series.label') }}
           </b-navbar-item>
         </template>
-        <template v-if="chain === 'rmrk' || chain === 'rmrk2'">
+        <template v-if="chain === 'rmrk' || chain === 'ksm'">
           <b-navbar-item data-cy="spotlight" to="/spotlight" tag="nuxt-link">
             {{ $t('spotlight.page') }}
           </b-navbar-item>

composables/collectionActivity/helpers.ts

@@ -12,7 +12,7 @@ import {
 
 export const mintInteraction = () => {
   const { urlPrefix } = usePrefix()
-  return urlPrefix.value === 'rmrk2' ? Interaction.MINT : Interaction.MINTNFT
+  return urlPrefix.value === 'ksm' ? Interaction.MINT : Interaction.MINTNFT
 }
 
 const flipperInitialValue = {

composables/transaction/mintCollection/constructMeta.ts

@@ -12,7 +12,7 @@ const createAttributes = (item: ActionMintCollection) => {
       display_type: null,
     }))
   }
-  if (item.urlPrefix === 'rmrk' || item.urlPrefix === 'rmrk2') {
+  if (item.urlPrefix === 'rmrk' || item.urlPrefix === 'ksm') {
     return []
   }
 

composables/transaction/transactionBurn.ts

@@ -13,7 +13,7 @@ export function execBurnTx(item: ActionConsume, api, executeTransaction) {
     })
   }
 
-  if (item.urlPrefix === 'rmrk2') {
+  if (item.urlPrefix === 'ksm') {
     executeTransaction({
       cb: api.tx.system.remark,
       arg: [createInteraction('BURN' as any, '2.0.0', item.nftId, '')],

composables/transaction/transactionBuy.ts

@@ -36,7 +36,7 @@ function execBuyBasilisk(item: ActionBuy, api, executeTransaction) {
 }
 
 export function execBuyTx(item: ActionBuy, api, executeTransaction) {
-  if (item.urlPrefix === 'rmrk' || item.urlPrefix === 'rmrk2') {
+  if (item.urlPrefix === 'rmrk' || item.urlPrefix === 'ksm') {
     execBuyRmrk(item, api, executeTransaction)
   }
 

composables/transaction/transactionList.ts

@@ -22,7 +22,7 @@ export function execListTx(item: ActionList, api, executeTransaction) {
     return
   }
 
-  if (item.urlPrefix === 'rmrk' || item.urlPrefix === 'rmrk2') {
+  if (item.urlPrefix === 'rmrk' || item.urlPrefix === 'ksm') {
     const version = item.urlPrefix === 'rmrk' ? '1.0.0' : '2.0.0'
     executeTransaction({
       cb: api.tx.system.remark,

composables/transaction/transactionMintCollection.ts

@@ -7,7 +7,7 @@ export function execMintCollection(
   api,
   executeTransaction
 ) {
-  if (item.urlPrefix === 'rmrk' || item.urlPrefix === 'rmrk2') {
+  if (item.urlPrefix === 'rmrk' || item.urlPrefix === 'ksm') {
     return execMintCollectionRmrk(item, api, executeTransaction)
   }
 

composables/transaction/transactionMintToken.ts

@@ -3,7 +3,7 @@ import { execMintBasilisk } from './mintToken/transactionMintBasilisk'
 import { ActionMintToken } from './types'
 
 export function execMintToken(item: ActionMintToken, api, executeTransaction) {
-  if (item.urlPrefix === 'rmrk' || item.urlPrefix === 'rmrk2') {
+  if (item.urlPrefix === 'rmrk' || item.urlPrefix === 'ksm') {
     return execMintRmrk(item, api, executeTransaction)
   }
 

composables/transaction/transactionSend.ts

@@ -60,7 +60,7 @@ export function execSendTx(item: ActionSend, api, executeTransaction) {
     return
   }
 
-  if (item.urlPrefix === 'rmrk' || item.urlPrefix === 'rmrk2') {
+  if (item.urlPrefix === 'rmrk' || item.urlPrefix === 'ksm') {
     execSendRmrk(item, api, executeTransaction)
   }
 

composables/useChain.ts

@@ -25,7 +25,7 @@ export default function () {
   const availableChains = computed(() => availablePrefixes())
 
   const chainSymbol = computed(() => {
-    return ['rmrk', 'rmrk2'].includes(urlPrefix.value) ? unit.value : symbol
+    return ['rmrk', 'ksm'].includes(urlPrefix.value) ? unit.value : symbol
   })
 
   return {

composables/useNft.ts

@@ -62,7 +62,7 @@ export async function getNftMetadata(nft: NFTWithMetadata, prefix: string) {
   }
 
   // if it's rmrk2, we need to check `resources` field
-  if (prefix === 'rmrk2' && nft.resources?.length) {
+  if (prefix === 'ksm' && nft.resources?.length) {
     return await getRmrk2Resources(nft)
   }
 

libs/static/src/chains.ts

@@ -1,11 +1,5 @@
 import { NAMES } from './names'
-import type {
-  BackwardPrefix,
-  ChainProperties,
-  Config,
-  Option,
-  Prefix,
-} from './types'
+import type { ChainProperties, Config, Option, Prefix } from './types'
 
 export const toChainProperty = (
   ss58Format: number,
@@ -64,12 +58,6 @@ export const chainList = (): Option[] => {
   return chainPrefixes.map((prefix) => ({
     info: chainInfo[prefix],
     text: NAMES[prefix],
-    value: prefix === 'ksm' ? 'rmrk2' : prefix,
+    value: prefix,
   }))
 }
-
-// TODO: our url prefix still rmrk2
-// e.g: https://kodadot.xyz/rmrk2/explore/items
-export const rmrk2ToKsm = (prefix: BackwardPrefix): Prefix => {
-  return prefix === 'rmrk2' ? 'ksm' : prefix
-}

libs/static/src/names.ts

@@ -1,11 +1,10 @@
-import { BackwardPrefix } from './types'
+import { Prefix } from './types'
 
-export const NAMES: Record<BackwardPrefix, string> = {
+export const NAMES: Record<Prefix, string> = {
   bsx: 'Basilisk',
   glmr: 'Moonbeam [Beta]',
-  rmrk2: 'RMRK 2.0 [Beta]',
   rmrk: 'Kusama',
-  ksm: 'Kusama',
+  ksm: 'RMRK 2.0 [Beta]',
   movr: 'Moonriver [Beta]',
   snek: 'Snek [Rococo]',
 }

libs/static/src/services.ts

@@ -1,5 +1,4 @@
-import { rmrk2ToKsm } from './chains'
-import type { BackwardPrefix, Prefix } from './types'
+import type { Prefix } from './types'
 
 export const SERVICES: Record<string, string> = {
   directUpload: 'https://direct-upload.w.kodadot.xyz/',
@@ -19,10 +18,10 @@ export const EXPLORERS: Record<Prefix, string> = {
   glmr: 'https://moonbeam.subscan.io/account/',
 }
 
-export const hasExplorer = (prefix: BackwardPrefix): boolean => {
-  return EXPLORERS[rmrk2ToKsm(prefix)] !== undefined
+export const hasExplorer = (prefix: Prefix): boolean => {
+  return EXPLORERS[prefix] !== undefined
 }
 
-export const getExplorer = (prefix: BackwardPrefix, id: string) => {
-  return EXPLORERS[rmrk2ToKsm(prefix)] + id
+export const getExplorer = (prefix: Prefix, id: string) => {
+  return EXPLORERS[prefix] + id
 }

libs/static/src/types.ts

@@ -2,8 +2,6 @@ export type Prefix = 'bsx' | 'glmr' | 'rmrk' | 'movr' | 'ksm' | 'snek'
 // | 'statemine'
 // | 'westmint'
 
-export type BackwardPrefix = Prefix | 'rmrk2'
-
 export type Squid = 'rubick' | 'snekk' | 'click' | 'antick' | 'marck'
 
 export type Config<T = boolean> = Record<Prefix, T>

middleware/prefix.ts

@@ -4,7 +4,7 @@ export const rmrk2ChainPrefixesInHostname = ['rmrk2', 'rmrk']
 
 export default function ({ store, route }): void {
   const prefix = route.params.prefix || route.path.split('/')[1]
-  const chains = ['rmrk2', ...chainPrefixes]
+  const chains = [...chainPrefixes]
   const isAnyChainPrefixInPath = chains.some((prefix) =>
     route.path.includes(prefix)
   )
@@ -29,7 +29,7 @@ export default function ({ store, route }): void {
         '_self'
       )
     } else if (store.getters.currentUrlPrefix !== rmrk2ChainPrefixInHostname) {
-      store.dispatch('setUrlPrefix', 'rmrk2')
+      store.dispatch('setUrlPrefix', 'ksm')
     }
   } else if (
     store.getters.currentUrlPrefix !== prefix &&

package.json

@@ -71,7 +71,7 @@
     "@kodadot1/minimark": "^0.0.1-rc.10",
     "@kodadot1/static": "workspace:*",
     "@kodadot1/sub-api": "0.1.1-alpha.5",
-    "@kodadot1/vuex-options": "0.0.6-rc.0",
+    "@kodadot1/vuex-options": "0.1.0-rc.0",
     "@nuxtjs/apollo": "^4.0.1-rc.5",
     "@nuxtjs/i18n": "^7.3.1",
     "@nuxtjs/sentry": "^7.1.11",
@@ -164,7 +164,6 @@
     "husky": "^7.0.4",
     "jsdom": "^19.0.0",
     "lint-staged": "^12.5.0",
-    "netlify-lambda": "^2.0.16",
     "prettier": "^2.8.7",
     "raw-loader": "^4.0.2",
     "sass": "^1.61.0",