Merge branch 'main' into issue-10747

kodadot · Aug 9, 2024 · 3d3c6c3 · 3d3c6c3
2 parents 45830bc + c1fc3bf
commit 3d3c6c3
Show file tree

Hide file tree

Showing 24 changed files with 75 additions and 50 deletions.
diff --git a/.github/diagram.svg b/.github/diagram.svg
diff --git a/components/Navbar.vue b/components/Navbar.vue
@@ -290,7 +290,7 @@ const logoSrc = computed(() => {
 const dropsPath = computed(() => {
   const prefix = pickByVm({
     SUB: 'ahp',
-    EVM: 'base',
+    EVM: urlPrefix.value,
   })
   return `/${prefix}/drops`
 })

diff --git a/components/carousel/CarouselTypeDrops.vue b/components/carousel/CarouselTypeDrops.vue
@@ -28,9 +28,10 @@
 <script lang="ts" setup>
 import type { Drop } from '@/components/drops/useDrops'
 import { useDrops } from '@/components/drops/useDrops'
+import { vmOf } from '@/utils/config/chain.config'
 
 let queries = {
-  limit: 12,
+  limit: 14,
   active: [true],
   chain: ['ahp', 'base'],
 }
@@ -47,7 +48,7 @@ if (!isProduction && urlPrefix.value === 'ahk') {
 const container = ref()
 
 const { accountId } = useAuth()
-const { vmOf, vm } = useChain()
+const { vm } = useChain()
 const router = useRouter()
 const { doAfterReconnect } = useDoAfterReconnect()
 const { cols, isReady: isDynamicGridReady } = useDynamicGrid({
@@ -63,7 +64,7 @@ const skeletonCount = computed(() =>
   Number.isInteger(perView.value) ? perView.value : Math.ceil(perView.value),
 )
 
-const { drops, loaded: isReady } = useDrops(queries)
+const { drops, loaded: isReady } = useDrops(queries, { filterOutMinted: true })
 const dropsAlias = computed(() => drops.value.map(drop => drop.alias))
 
 const onDropClick = ({ path, drop }: { path: string, drop: Drop }) => {

diff --git a/components/drops/useDrops.ts b/components/drops/useDrops.ts
@@ -49,7 +49,7 @@ const DROP_LIST_ORDER = [
 
 const ONE_DAYH_IN_MS = 24 * 60 * 60 * 1000
 
-export function useDrops(query?: GetDropsQuery, { async = false }: { async?: boolean } = { }) {
+export function useDrops(query?: GetDropsQuery, { async = false, filterOutMinted = false }: { async?: boolean, filterOutMinted?: boolean } = { }) {
   const drops = ref<Drop[]>([])
   const dropsList = ref<DropItem[]>([])
   const count = computed(() => dropsList.value.length)
@@ -79,7 +79,7 @@ export function useDrops(query?: GetDropsQuery, { async = false }: { async?: boo
     else {
       drops.value = await Promise.all(
         dropsList.value.map(async drop => getFormattedDropItem(drop, drop)),
-      )
+      ).then(dropsList => filterOutMinted ? dropsList.filter(drop => !drop.isMintedOut) : dropsList)
 
       loaded.value = true
     }

diff --git a/composables/transaction/transactionBurn.ts b/composables/transaction/transactionBurn.ts
@@ -5,6 +5,7 @@ import {
 } from '@kodadot1/minimark/v2'
 import type { ApiPromise } from '@polkadot/api'
 import type { PalletNftsDestroyWitness } from '@polkadot/types/lookup'
+import type { Prefix } from '@kodadot1/static'
 import { GENSOL_ABI } from './evm/utils'
 import type {
   ActionDeleteCollection,
@@ -31,7 +32,7 @@ function execBurnEvm(item: ActionConsume, executeTransaction: ExecuteTransaction
 }
 
 export function execBurnTx(item: ActionConsume, api, executeTransaction) {
-  if (item.urlPrefix === 'base' || item.urlPrefix === 'imx') {
+  if (isEvm(item.urlPrefix as Prefix)) {
     return execBurnEvm(item, executeTransaction)
   }
 

diff --git a/composables/transaction/transactionMintDrop.ts b/composables/transaction/transactionMintDrop.ts
@@ -61,7 +61,7 @@ export function execMintDrop({ item, ...params }: MintDropParams) {
     } as SubstrateMintDropParams)
   }
 
-  if (item.prefix === 'base') {
+  if (isEvm(item.prefix)) {
     return execEvmMintDrop({
       item,
       ...params,

diff --git a/composables/transaction/transactionSend.ts b/composables/transaction/transactionSend.ts
@@ -4,6 +4,7 @@ import {
   createInteraction as createNewInteraction,
 } from '@kodadot1/minimark/v2'
 import { checkAddress, isAddress } from '@polkadot/util-crypto'
+import type { Prefix } from '@kodadot1/static'
 import type { ActionSend, ExecuteTransaction } from './types'
 import { GENSOL_ABI } from './evm/utils'
 import {
@@ -82,7 +83,7 @@ export function execSendTx(
   api,
   executeTransaction: ExecuteTransaction,
 ) {
-  if (item.urlPrefix === 'base') {
+  if (isEvm(item.urlPrefix as Prefix)) {
     return execSendEvm(item, executeTransaction)
   }
 

diff --git a/composables/useChain.ts b/composables/useChain.ts
@@ -55,8 +55,6 @@ export default function () {
     )
   }
 
-  const vmOf = (prefix: Prefix): ChainVM => chainPropListOf(prefix).vm
-
   const existentialDeposit = computed<number>(
     () => chainsExistentialDeposit[urlPrefix.value],
   )
@@ -86,7 +84,6 @@ export default function () {
     withoutDecimals,
     unit,
     vm,
-    vmOf,
     offersDisabled,
     chainProperties,
     availableChains,

diff --git a/composables/useIsChain.ts b/composables/useIsChain.ts
@@ -1,6 +1,9 @@
 import type { Prefix } from '@kodadot1/static'
 import type { ComputedRef } from 'vue'
-import { chainPropListOf } from '@/utils/config/chain.config'
+import { vmOf } from '@/utils/config/chain.config'
+
+export const isEvm = (prefix: Prefix) => vmOf(prefix) === 'EVM'
+export const isSub = (prefix: Prefix) => vmOf(prefix) === 'SUB'
 
 export default function (prefix: ComputedRef<Prefix>) {
   const isRemark = computed(
@@ -15,15 +18,12 @@ export default function (prefix: ComputedRef<Prefix>) {
 
   const isBase = computed(() => 'base' === prefix.value)
 
-  const isEvm = computed(() => chainPropListOf(prefix.value).vm === 'EVM')
-  const isSub = computed(() => chainPropListOf(prefix.value).vm === 'SUB')
-
   return {
     isRemark,
     isAssetHub,
-    isEvm,
-    isSub,
     isRmrk,
     isBase,
+    isEvm: computed(() => isEvm(prefix.value)),
+    isSub: computed(() => isSub(prefix.value)),
   }
 }
diff --git a/composables/useMultipleBalance.ts b/composables/useMultipleBalance.ts
@@ -23,6 +23,7 @@ export const networkToPrefix: Partial<Record<ChainType, Prefix>> = {
   polkadotHub: 'ahp',
   base: 'base',
   immutablex: 'imx',
+  mantle: 'mnt',
   // rococoHub: 'ahr',
 }
 
@@ -34,6 +35,7 @@ export const prefixToNetwork: Partial<Record<Prefix, ChainType>> = {
   ahp: 'polkadotHub',
   base: 'base',
   imx: 'immutablex',
+  mnt: 'mantle',
   // ahr: 'rococoHub',
 }
 
@@ -87,6 +89,8 @@ export default function (refetchPeriodically: boolean = false) {
         multiBalances.value.chains.base?.eth?.nativeBalance,
     [Chain.IMMUTABLEX]:
         multiBalances.value.chains.immutablex?.eth?.nativeBalance,
+    [Chain.MANTLE]:
+        multiBalances.value.chains.mantle?.mnt?.nativeBalance,
   }))
 
   const currentChain = computed(() => prefixToChainMap[urlPrefix.value])

diff --git a/composables/useWagmi.ts b/composables/useWagmi.ts
@@ -1,5 +1,5 @@
 import { defaultWagmiConfig } from '@web3modal/wagmi/vue'
-import { base, immutableZkEvm } from 'viem/chains'
+import { base, immutableZkEvm, mantle } from 'viem/chains'
 import { useAccount, useDisconnect } from 'use-wagmi'
 import type { DisconnectMutateAsync } from 'use-wagmi/query'
 
@@ -11,7 +11,7 @@ export const buildWagmiConfig = () => {
     icons: ['https://avatars.githubusercontent.com/u/37784886'],
   }
 
-  const chains = [base, immutableZkEvm]
+  const chains = [base, immutableZkEvm, mantle]
 
   return defaultWagmiConfig({
     chains,

diff --git a/libs/static/src/chains.ts b/libs/static/src/chains.ts
@@ -32,7 +32,8 @@ export const CHAINS: Config<ChainProperties> = {
   dot: toChainProperty(0, 10, 'DOT', 'https://polkadot.subscan.io/', 'SUB'),
   ahp: toChainProperty(0, 10, 'DOT', 'https://statemint.subscan.io/', 'SUB'),
   imx: toChainProperty(42, 18, 'IMX', 'https://explorer.immutable.com/', 'EVM'), // ss58Format is not available
-  base: toChainProperty(42, 18, 'ETH', 'https://basescan.org', 'EVM'), // ss58Format is not available
+  base: toChainProperty(42, 18, 'ETH', 'https://basescan.org', 'EVM'),
+  mnt: toChainProperty(42, 18, 'MNT', 'https://mantlescan.xyz', 'EVM'), // ss58Format is not available
   // ahr: toChainProperty(42, 12, 'ROC', 'https://rockmine.subscan.io/'),
   // movr: toChainProperty(1285, 18, 'MOVR', 'https://moonriver.subscan.io/'),
   // glmr: toChainProperty(1284, 18, 'GLMR', 'https://moonbeam.subscan.io/'),
@@ -53,6 +54,7 @@ export const chainPrefixes: Prefix[] = [
   'dot',
   'imx',
   'base',
+  'mnt',
   // 'ahr',
   // 'movr',
   // 'glmr',
@@ -73,6 +75,7 @@ export const chainInfo: Record<Prefix, string> = {
   ahp: 'statemint',
   imx: 'immutable',
   base: 'base',
+  mnt: 'mantle',
   // ahr: 'rockmine',
   // movr: 'moonriver',
   // glmr: 'moonbeam',
@@ -86,6 +89,7 @@ export const chainNames: Record<Prefix, string> = {
   ahp: 'Polkadot AssetHub',
   imx: 'Immutable zkEVM',
   base: 'Base',
+  mnt: 'Mantle',
   // ahr: 'Rococo AssetHub',
   // movr: 'Moonriver',
   // glmr: 'Moonbeam',
@@ -113,6 +117,7 @@ export const teleportExistentialDeposit: Record<Prefix, number> = {
   ahp: 5000000000,
   imx: 0,
   base: 0,
+  mnt: 0,
 }
 
 export const existentialDeposit: Record<Prefix, number> = {
@@ -123,4 +128,5 @@ export const existentialDeposit: Record<Prefix, number> = {
   ahp: 1e8,
   imx: 1e15, // nothing like ED in EVM :)
   base: 1e15,
+  mnt: 1e15,
 }
diff --git a/libs/static/src/endpoints.ts b/libs/static/src/endpoints.ts
@@ -43,6 +43,7 @@ export const ALTERNATIVE_ENDPOINT_MAP: Config<ENDPOINT_URL[]> = {
   ahp: AHP_ENDPOINTS,
   imx: ['https://rpc.immutable.com'],
   base: ['https://mainnet.base.org'],
+  mnt: ['https://rpc.mantle.xyz'],
   // ahr: ['wss://rococo-asset-hub-rpc.polkadot.io'],
   // glmr: ['wss://public-rpc.pinknode.io/moonbeam'],
   // movr: ['wss://wss.api.moonriver.moonbeam.network'],
@@ -56,6 +57,7 @@ export const ENDPOINT_MAP: Config<ENDPOINT_URL> = {
   ahp: AHP_ENDPOINTS[0],
   imx: 'https://rpc.immutable.com',
   base: 'https://mainnet.base.org',
+  mnt: 'https://rpc.mantle.xyz',
   // ahr: 'wss://rococo-asset-hub-rpc.polkadot.io',
   // glmr: 'wss://public-rpc.pinknode.io/moonbeam',
   // movr: 'wss://wss.api.moonriver.moonbeam.network',

diff --git a/libs/static/src/indexers.ts b/libs/static/src/indexers.ts
@@ -15,6 +15,7 @@ export const INDEXERS: Config<SquidEndpoint> = {
   dot: 'https://squid.subsquid.io/rubick/graphql', // TODO: change to dot indexer when available
   imx: 'https://squid.subsquid.io/flick/graphql',
   base: 'https://kodadot.squids.live/basick/graphql',
+  mnt: 'https://squid.subsquid.io/flock/graphql',
   // ahr: 'https://squid.subsquid.io/snack/graphql',
   // movr: 'https://squid.subsquid.io/antick/v/001-rc0/graphql',
   // glmr: 'https://squid.subsquid.io/click/v/002/graphql',

diff --git a/libs/static/src/names.ts b/libs/static/src/names.ts
@@ -8,6 +8,7 @@ export const NAMES: Record<Prefix, string> = {
   ahp: 'PolkadotHub',
   imx: 'Immutable zkEVM',
   base: 'Base',
+  mnt: 'Mantle',
   // ahr: 'RococoHub',
   // glmr: 'Moonbeam [Beta]',
   // movr: 'Moonriver [Beta]',

diff --git a/libs/static/src/services.ts b/libs/static/src/services.ts
@@ -17,6 +17,7 @@ export const EXPLORERS: Record<Prefix, string> = {
   ahp: 'https://assethub-polkadot.subscan.io/account/',
   imx: 'https://explorer.immutable.com/address/',
   base: 'https://basescan.org/address/',
+  mnt: 'https://mantlescan.xyz/address/',
   // ahr: 'https://assethub-rococo.subscan.io/account/',
   // movr: 'https://moonriver.subscan.io/account/',
   // glmr: 'https://moonbeam.subscan.io/account/',

diff --git a/libs/static/src/types.ts b/libs/static/src/types.ts
@@ -1,9 +1,9 @@
-export type Prefix = 'rmrk' | 'ksm' | 'ahk' | 'dot' | 'ahp' | 'imx' | 'base'
+export type Prefix = 'rmrk' | 'ksm' | 'ahk' | 'dot' | 'ahp' | 'imx' | 'base' | 'mnt'
 //  | 'ahr'
 // | 'glmr'
 // | 'movr'
 
-export type Squid = 'rubick' | 'marck' | 'stick' | 'speck' | 'flick' | 'basick'
+export type Squid = 'rubick' | 'marck' | 'stick' | 'speck' | 'flick' | 'basick' | 'flock'
 // | 'snack'
 // | 'click'
 // | 'antick'

diff --git a/stores/fiat.ts b/stores/fiat.ts
@@ -4,17 +4,9 @@ import type { TokenName } from '~/utils/coinprice'
 type FiatPrice = string | number | null
 
 interface State {
-  fiatPrice: {
-    kusama: {
-      usd: FiatPrice
-    }
-    polkadot: {
-      usd: FiatPrice
-    }
-    ethereum: {
-      usd: FiatPrice
-    }
-  }
+  fiatPrice: Record<TokenName, {
+    usd: FiatPrice
+  }>
 }
 
 export const useFiatStore = defineStore('fiat', {
@@ -29,6 +21,9 @@ export const useFiatStore = defineStore('fiat', {
       ethereum: {
         usd: null,
       },
+      mantle: {
+        usd: null,
+      },
     },
   }),
   getters: {
@@ -42,14 +37,16 @@ export const useFiatStore = defineStore('fiat', {
     getCurrentROCValue: (_state): FiatPrice => 0,
     getCurrentTokenValue:
       state =>
-        (token: string): FiatPrice => {
+        (token: Token): FiatPrice => {
           switch (token) {
             case 'KSM':
               return state.fiatPrice.kusama.usd
             case 'DOT':
               return state.fiatPrice.polkadot.usd
             case 'ETH':
               return state.fiatPrice.ethereum.usd
+            case 'MNT':
+              return state.fiatPrice.mantle.usd
             default:
               return 0
           }
@@ -58,7 +55,7 @@ export const useFiatStore = defineStore('fiat', {
   actions: {
     async fetchFiatPrice() {
       const prices = await Promise.all(
-        (['kusama', 'polkadot', 'ethereum'] as TokenName[]).map(getPrice),
+        (['kusama', 'polkadot', 'ethereum', 'mantle'] as TokenName[]).map(getPrice),
       )
       prices.forEach((price) => {
         this.fiatPrice = Object.assign({}, this.fiatPrice, price)

diff --git a/stores/identity.ts b/stores/identity.ts
@@ -11,6 +11,7 @@ const DEFAULT_BALANCE_STATE = {
   dot: '0',
   ahp: '0',
   eth: '0',
+  mnt: '0',
   // ahr: '0',
   // glmr: '0',
   // movr: '0',
@@ -34,6 +35,7 @@ export type ChainType =
   | 'polkadotHub'
   | 'base'
   | 'immutablex'
+  | 'mantle'
 // | 'rococoHub'
 
 type ChainDetail = {
@@ -43,7 +45,7 @@ type ChainDetail = {
   selected: boolean
   address: string
 }
-export type ChainToken = Partial<Record<'dot' | 'ksm' | 'eth', ChainDetail>>
+export type ChainToken = Partial<Record<'dot' | 'ksm' | 'eth' | 'mnt', ChainDetail>>
 
 interface MultiBalances {
   address: string
@@ -105,6 +107,7 @@ export const useIdentityStore = defineStore('identity', {
       { chain: 'polkadotHub', token: 'DOT' },
       { chain: 'base', token: 'ETH' },
       { chain: 'immutablex', token: 'ETH' },
+      { chain: 'mantle', token: 'MNT' },
     ],
     multiBalanceAssetsTestnet: [
       // { chain: 'rococoHub', token: 'ROC' },

diff --git a/utils/coinprice.ts b/utils/coinprice.ts
@@ -60,12 +60,14 @@ export const getPrice = async (id: string): Promise<GetPrice> => {
   return emptyPrice
 }
 
-export type TokenName = 'kusama' | 'polkadot' | 'ethereum'
+export type Token = 'KSM' | 'DOT' | 'ETH' | 'MNT'
+export type TokenName = 'kusama' | 'polkadot' | 'ethereum' | 'mantle'
 // tokenMap but reversed
-const tokenMap: Record<string, TokenName> = {
+const tokenMap: Record<Token, TokenName> = {
   KSM: 'kusama',
   DOT: 'polkadot',
   ETH: 'ethereum',
+  MNT: 'mantle',
 }
 
 export const getApproximatePriceOf = async (id: string): Promise<number> => {