feat: update Mint native Token

packages/desktop/components/popups/MintNativeTokenConfirmationPopup.svelte

@@ -32,12 +32,12 @@
 
     async function prepareFoundryOutput(): Promise<void> {
         if ($mintTokenDetails && $selectedWallet && metadata) {
-            const { totalSupply, circulatingSupply, accountId } = $mintTokenDetails
+            const { totalSupply, circulatingSupply, accountAddress } = $mintTokenDetails
             const outputData = await buildFoundryOutputData(
                 Number(totalSupply),
                 Number(circulatingSupply),
                 metadata,
-                accountId
+                accountAddress
             )
             const client = await getClient()
             const preparedOutput = await client.buildFoundryOutput(outputData)
@@ -61,10 +61,10 @@
         details: IMintTokenDetails | undefined
     ): { [key: string]: { data: string; tooltipText?: string; isCopyable?: boolean } } | undefined {
         if (details) {
-            const { name: tokenName, symbol, accountId, url, logoUrl, decimals, totalSupply } = details
+            const { name: tokenName, symbol, accountAddress, url, logoUrl, decimals, totalSupply } = details
             return {
-                ...(accountId && {
-                    account: { data: accountId, isCopyable: true },
+                ...(accountAddress && {
+                    account: { data: accountAddress, isCopyable: true },
                 }),
                 ...(storageDeposit && {
                     storageDeposit: { data: storageDeposit },

packages/desktop/components/popups/MintNativeTokenFormPopup.svelte

@@ -3,7 +3,7 @@
     import { localize } from '@core/i18n'
     import { setMintTokenDetails, mintTokenDetails, IMintTokenDetails } from '@core/wallet'
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
-    import { Button, Error, NumberInput, Text, TextInput, OptionalInput, FontWeight, AccountInput } from '@ui'
+    import { Button, Error, NumberInput, Text, TextInput, OptionalInput, FontWeight, AccountInput, TextType } from '@ui'
     import { onMount } from 'svelte'
     import { MAX_SUPPORTED_DECIMALS } from '@core/wallet/constants/max-supported-decimals.constants'
     import { handleError } from '@core/error/handlers/handleError'
@@ -19,7 +19,7 @@
         description: undefined,
         url: undefined,
         logoUrl: undefined,
-        accountId: undefined,
+        accountAddress: undefined,
     }
 
     let {
@@ -31,7 +31,7 @@
         description,
         url,
         logoUrl,
-        accountId,
+        accountAddress,
     } = $mintTokenDetails ?? DEFAULT
 
     let nameError: string = ''
@@ -42,8 +42,8 @@
     $: circulatingSupply, (circulatingSupplyError = '')
     let symbolError: string
     $: symbol, (symbolError = '')
-    let accountIdError: string
-    $: accountId, (accountIdError = '')
+    let accountAddressError: string
+    $: accountAddress, (accountAddressError = '')
 
     let error: BaseError
     let decimalsInput: OptionalInput
@@ -64,7 +64,7 @@
             description,
             url,
             logoUrl,
-            accountId,
+            accountAddress,
         }
         if (valid && isEverythingDefined(tokenDetailsForm)) {
             setMintTokenDetails(tokenDetailsForm)
@@ -82,7 +82,7 @@
             form.circulatingSupply !== undefined &&
             form.decimals !== undefined &&
             form.symbol !== undefined &&
-            form.accountId !== undefined
+            form.accountAddress !== undefined
         )
     }
 
@@ -170,12 +170,12 @@
 </script>
 
 <div class="space-y-6">
-    <Text type="h4" fontSize="18" lineHeight="6" fontWeight={FontWeight.semibold}>
+    <Text type={TextType.h4} fontSize="18" lineHeight="6" fontWeight={FontWeight.semibold}>
         {localize('popups.nativeToken.formTitle')}
     </Text>
 
     <div class="space-y-4 max-h-100 scrollable-y flex-1">
-        <AccountInput bind:this={accountInput} bind:account={accountId} bind:error={accountIdError} />
+        <AccountInput bind:this={accountInput} bind:account={accountAddress} bind:error={accountAddressError} />
         <TextInput
             bind:value={tokenName}
             label={localize('popups.nativeToken.property.tokenName')}
@@ -212,25 +212,25 @@
                 maxlength={MAX_SUPPORTED_DECIMALS}
                 label={localize('popups.nativeToken.property.decimals')}
                 description={localize('tooltips.mintNativeToken.decimals')}
-                fontSize="14"
+                fontSize={14}
             />
             <OptionalInput
                 bind:value={description}
                 label={localize('popups.nativeToken.property.description')}
                 description={localize('tooltips.mintNativeToken.description')}
-                fontSize="14"
+                fontSize={14}
             />
             <OptionalInput
                 bind:value={url}
                 label={localize('popups.nativeToken.property.url')}
                 description={localize('tooltips.mintNativeToken.url')}
-                fontSize="14"
+                fontSize={14}
             />
             <OptionalInput
                 bind:value={logoUrl}
                 label={localize('popups.nativeToken.property.logoUrl')}
                 description={localize('tooltips.mintNativeToken.logoUrl')}
-                fontSize="14"
+                fontSize={14}
             />
         </optional-inputs>
         {#if error}

packages/desktop/features/developer-tools.features.ts

@@ -9,7 +9,7 @@ const developerToolsFeatures: IDeveloperFeatures = {
         enabled: true,
     },
     mintNativeTokens: {
-        enabled: false,
+        enabled: true,
     },
     account: {
         enabled: false,

packages/shared/components/inputs/AccountInput.svelte

@@ -13,9 +13,9 @@
     let modal: Modal = undefined
 
     const accountOptions: IOption[] =
-        $selectedWallet.balances?.accounts.map((hexAccountId: string, index: number) => {
-            const accountId = AddressConverter.addressToBech32(new AccountAddress(hexAccountId))
-            return { key: 'Account' + (index + 1), value: accountId }
+        $selectedWallet?.balances?.accounts.map((hexAccountId: string, index: number) => {
+            const accountAddress = AddressConverter.addressToBech32(new AccountAddress(hexAccountId))
+            return { key: 'Account ' + (index + 1), value: accountAddress }
         }) ?? []
 
     let selected: IOption = accountOptions.find((option) => option.value === account)

packages/shared/components/inputs/OptionalInput.svelte

@@ -7,7 +7,7 @@
 
     export let label: string = ''
     export let description: string = ''
-    export let value: string | undefined = undefined
+    export let value: string | number | undefined = undefined
     export let fontSize: number = 15
     export let error: string = ''
     export let classes: string = null

packages/shared/lib/core/nfts/constants/index.ts

@@ -4,4 +4,3 @@ export * from './default-max-nft-downloading-time-in-seconds.constant'
 export * from './default-max-nft-size-in-megabytes.constant'
 export * from './nft-id-byte-length.constant'
 export * from './nft-media-file-name.constant'
-export * from './default-nft-feature-entry-key.constant'

packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts

@@ -1,5 +1,6 @@
 import { plainToInstance } from 'class-transformer'
 import { IWrappedOutput } from '../../wallet/interfaces'
+import { DEFAULT_METADATA_FEATURE_ENTRY_KEY } from '../../wallet/constants'
 import { buildNftFromNftOutput } from '../utils/buildNftFromNftOutput'
 import {
     AddressUnlockCondition,
@@ -10,7 +11,6 @@ import {
     TimelockUnlockCondition,
 } from '@iota/sdk/out/types'
 import { Address, AddressType, NftOutput } from '@iota/sdk/out/types'
-import { DEFAULT_NFT_FEATURE_ENTRY_KEY } from '../constants'
 
 const accountAddress = 'rms1qr47ee0fhahukrzec088v9lngv7w5k2sn3jjtwvkcpjfgxhhsazlsurxrx9'
 
@@ -22,7 +22,7 @@ function buildImmutableFeatures() {
     return [
         new IssuerFeature(new Ed25519Address('0x20dceb927cfdc2cea642fbf77aed81f42400145b5a4fd906f1aa40af1c31afb1')),
         new MetadataFeature({
-            [DEFAULT_NFT_FEATURE_ENTRY_KEY]:
+            [DEFAULT_METADATA_FEATURE_ENTRY_KEY]:
                 '0x7b227374616e64617264223a224952433237222c2276657273696f6e223a2276312e30222c226e616d65223a227364617364222c2274797065223a22696d6167652f706e67222c22757269223a2268747470733a2f2f697066732e696f2f697066732f516d51717a4d546176516754346634543576365057427037584e4b746f506d43396a766e313257505433676b5345227d',
         }),
     ]

packages/shared/lib/core/wallet/actions/mintNft.ts

@@ -1,11 +1,6 @@
 import { showAppNotification } from '@auxiliary/notification'
 import { localize } from '@core/i18n'
-import {
-    addOrUpdateNftInAllWalletNfts,
-    buildNftFromNftOutput,
-    DEFAULT_NFT_FEATURE_ENTRY_KEY,
-    IIrc27Metadata,
-} from '@core/nfts'
+import { addOrUpdateNftInAllWalletNfts, buildNftFromNftOutput, IIrc27Metadata } from '@core/nfts'
 import { Converter } from '@core/utils'
 import { MetadataFeature, MintNftParams, OutputType } from '@iota/sdk/out/types'
 import { ActivityAction } from '../enums'
@@ -18,6 +13,7 @@ import {
 import { NftActivity } from '../types'
 import { getDefaultTransactionOptions, preprocessOutgoingTransaction } from '../utils'
 import { generateSingleNftActivity } from '../utils/generateActivity/generateSingleNftActivity'
+import { DEFAULT_METADATA_FEATURE_ENTRY_KEY } from '../constants'
 
 export async function mintNft(metadata: IIrc27Metadata, quantity: number): Promise<void> {
     try {
@@ -29,7 +25,7 @@ export async function mintNft(metadata: IIrc27Metadata, quantity: number): Promi
             issuer: wallet.depositAddress,
             address: wallet.depositAddress,
             immutableMetadata: new MetadataFeature({
-                [DEFAULT_NFT_FEATURE_ENTRY_KEY]: Converter.utf8ToHex(JSON.stringify(metadata)),
+                [DEFAULT_METADATA_FEATURE_ENTRY_KEY]: Converter.utf8ToHex(JSON.stringify(metadata)),
             }),
         }
 

packages/shared/lib/core/wallet/actions/prepareCreateNativeToken.ts

@@ -1,8 +1,9 @@
 import { Converter } from '@core/utils'
-import { CreateNativeTokenParams, PreparedCreateNativeTokenTransaction } from '@iota/sdk/out/types'
+import { CreateNativeTokenParams, MetadataFeature, PreparedCreateNativeTokenTransaction } from '@iota/sdk/out/types'
 import { IIrc30Metadata } from '../interfaces'
 import { getSelectedWallet } from '../stores'
 import { getDefaultTransactionOptions } from '../utils'
+import { DEFAULT_METADATA_FEATURE_ENTRY_KEY } from '../constants'
 
 export async function prepareCreateNativeToken(
     maximumSupply: number,
@@ -15,7 +16,9 @@ export async function prepareCreateNativeToken(
         const params: CreateNativeTokenParams = {
             maximumSupply: BigInt(maximumSupply),
             circulatingSupply: BigInt(circulatingSupply),
-            foundryMetadata: Converter.utf8ToHex(JSON.stringify(metadata)),
+            foundryMetadata: new MetadataFeature({
+                [DEFAULT_METADATA_FEATURE_ENTRY_KEY]: Converter.utf8ToHex(JSON.stringify(metadata)),
+            }),
         }
 
         return wallet.prepareCreateNativeToken(params, getDefaultTransactionOptions())

packages/shared/lib/core/wallet/actions/prepareMintNft.ts

@@ -1,15 +1,9 @@
-import { DEFAULT_NFT_FEATURE_ENTRY_KEY, IIrc27Metadata } from '@core/nfts'
+import { IIrc27Metadata } from '@core/nfts'
 import { Converter } from '@core/utils'
-import { Bech32Address, MetadataFeature, MintNftParams, PreparedTransaction } from '@iota/sdk/out/types'
+import { MetadataFeature, MintNftParams, PreparedTransaction } from '@iota/sdk/out/types'
 import { getSelectedWallet } from '../stores'
 import { getDefaultTransactionOptions } from '../utils'
-
-// TODO: Update this temporary interface when fixed in the SDK, linked issue https://github.com/iotaledger/firefly/issues/8134
-interface MintNftParamsTemp {
-    issuer: Bech32Address
-    address: Bech32Address
-    immutableMetadata: MetadataFeature
-}
+import { DEFAULT_METADATA_FEATURE_ENTRY_KEY } from '../constants'
 
 export async function prepareMintNft(
     metadata: IIrc27Metadata,
@@ -18,11 +12,11 @@ export async function prepareMintNft(
     try {
         const wallet = getSelectedWallet()
         if (!wallet) return
-        const mintNftParams: MintNftParamsTemp = {
+        const mintNftParams: MintNftParams = {
             issuer: wallet.depositAddress,
             address: wallet.depositAddress,
             immutableMetadata: new MetadataFeature({
-                [DEFAULT_NFT_FEATURE_ENTRY_KEY]: Converter.utf8ToHex(JSON.stringify(metadata)),
+                [DEFAULT_METADATA_FEATURE_ENTRY_KEY]: Converter.utf8ToHex(JSON.stringify(metadata)),
             }),
         }
 

packages/shared/lib/core/wallet/constants/default-metadata-feature-entry-key.constant.ts

@@ -0,0 +1 @@
+export const DEFAULT_METADATA_FEATURE_ENTRY_KEY = 'data'

packages/shared/lib/core/wallet/constants/index.ts

@@ -12,3 +12,4 @@ export * from './official-token-ids.constant'
 export * from './reserved-tag-keywords.constant'
 export * from './max-wallet-name-length.constant'
 export * from './default-sync-options.constant'
+export * from './default-metadata-feature-entry-key.constant'

packages/shared/lib/core/wallet/interfaces/mint-token-details.interface.ts

@@ -7,5 +7,5 @@ export interface IMintTokenDetails {
     description?: string
     url?: string
     logoUrl?: string
-    accountId: string
+    accountAddress: string
 }

packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts

@@ -10,23 +10,23 @@ import {
 import { Converter } from '@core/utils'
 import { IIrc30Metadata } from '../interfaces'
 import { getSerialNumberFromAccountAddress } from './outputs'
+import { DEFAULT_METADATA_FEATURE_ENTRY_KEY } from '../constants'
+import { AddressConverter } from './AddressConverter'
 
 export async function buildFoundryOutputData(
     totalSupply: number,
     circulatingSupply: number,
     metadata: IIrc30Metadata,
-    accountId: string
+    accountAddress: string
 ): Promise<FoundryOutputBuilderParams> {
-    const immutableAccountUnlockCondition = new ImmutableAccountAddressUnlockCondition(new AccountAddress(accountId))
-
-    const unlockConditions: UnlockCondition[] = [immutableAccountUnlockCondition]
-
+    const accountId = AddressConverter.parseBech32Address(accountAddress)
+    const unlockConditions: UnlockCondition[] = [
+        new ImmutableAccountAddressUnlockCondition(new AccountAddress(accountId)),
+    ]
     const tokenScheme = new SimpleTokenScheme(BigInt(circulatingSupply), BigInt(0), BigInt(totalSupply))
-
-    const metadataFeature = new MetadataFeature(Converter.utf8ToHex(JSON.stringify(metadata)))
-
-    const immutableFeatures: Feature[] = [metadataFeature]
-
+    const immutableFeatures: Feature[] = [
+        new MetadataFeature({ [DEFAULT_METADATA_FEATURE_ENTRY_KEY]: Converter.utf8ToHex(JSON.stringify(metadata)) }),
+    ]
     const serialNumber = await getSerialNumberFromAccountAddress(accountId)
 
     return {

packages/shared/lib/core/wallet/utils/buildNftOutputData.ts

@@ -1,7 +1,7 @@
 import { AddressUnlockCondition, Ed25519Address, MetadataFeature, NftOutputBuilderParams } from '@iota/sdk/out/types'
 import { Converter } from '@core/utils'
-import { EMPTY_HEX_ID } from '../constants'
-import { IIrc27Metadata, DEFAULT_NFT_FEATURE_ENTRY_KEY } from '@core/nfts'
+import { DEFAULT_METADATA_FEATURE_ENTRY_KEY, EMPTY_HEX_ID } from '../constants'
+import { IIrc27Metadata } from '@core/nfts'
 import { AddressConverter } from './AddressConverter'
 
 export function buildNftOutputData(metadata: IIrc27Metadata, address: string): NftOutputBuilderParams {
@@ -12,7 +12,7 @@ export function buildNftOutputData(metadata: IIrc27Metadata, address: string): N
     const unlockConditions: AddressUnlockCondition[] = [addressUnlockCondition]
 
     const metadataFeature = new MetadataFeature({
-        [DEFAULT_NFT_FEATURE_ENTRY_KEY]: Converter.utf8ToHex(JSON.stringify(metadata)),
+        [DEFAULT_METADATA_FEATURE_ENTRY_KEY]: Converter.utf8ToHex(JSON.stringify(metadata)),
     })
 
     const immutableFeatures: MetadataFeature[] = [metadataFeature]

packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts

@@ -4,7 +4,7 @@ import { EXTERNALLY_OWNED_ACCOUNT } from '@core/layer-2/constants'
 import { parseLayer2MetadataForTransfer } from '@core/layer-2/utils'
 import { containsControlCharacters, Converter } from '@core/utils'
 import { CommonOutput, FeatureType, MetadataFeature, Output } from '@iota/sdk/out/types'
-import { DEFAULT_NFT_FEATURE_ENTRY_KEY } from '@core/nfts'
+import { DEFAULT_METADATA_FEATURE_ENTRY_KEY } from '../../../constants'
 
 export function getMetadataFromOutput(output: Output): string | undefined {
     const commonOutput = output as CommonOutput
@@ -13,7 +13,7 @@ export function getMetadataFromOutput(output: Output): string | undefined {
 
     if (metadataFeature) {
         // TODO: update this to return all entries, linked issue https://github.com/iotaledger/firefly/issues/8120
-        const data = metadataFeature?.entries?.[DEFAULT_NFT_FEATURE_ENTRY_KEY] ?? undefined
+        const data = metadataFeature?.entries?.[DEFAULT_METADATA_FEATURE_ENTRY_KEY] ?? undefined
 
         if (data) {
             const isVotingOutput = isParticipationOutput(output)

packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts

@@ -1,15 +1,16 @@
 import { FeatureType, FoundryOutput, MetadataFeature } from '@iota/sdk/out/types'
+import { DEFAULT_METADATA_FEATURE_ENTRY_KEY } from '../constants'
 
-export function getMetadataFromFoundryOutput(foundry: FoundryOutput): string {
+export function getMetadataFromFoundryOutput(foundry: FoundryOutput): string | undefined {
     for (const feature of foundry?.immutableFeatures ?? []) {
         if (feature?.type === FeatureType.Metadata) {
-            return (feature as MetadataFeature).data
+            return (feature as MetadataFeature)?.entries?.[DEFAULT_METADATA_FEATURE_ENTRY_KEY]
         }
     }
 
     for (const feature of foundry?.features ?? []) {
         if (feature?.type === FeatureType.Metadata) {
-            return (feature as MetadataFeature).data
+            return (feature as MetadataFeature)?.entries?.[DEFAULT_METADATA_FEATURE_ENTRY_KEY]
         }
     }
 

packages/shared/lib/core/wallet/utils/outputs/getMetadataFromNftOutput.ts

@@ -1,10 +1,10 @@
 import { FeatureType, MetadataFeature, NftOutput } from '@iota/sdk/out/types'
-import { DEFAULT_NFT_FEATURE_ENTRY_KEY } from '@core/nfts'
+import { DEFAULT_METADATA_FEATURE_ENTRY_KEY } from '../../constants'
 
 export function getMetadataFromNftOutput(output: NftOutput): string {
     const metadata = output.immutableFeatures?.find(
         (feature) => feature.type === FeatureType.Metadata
     ) as MetadataFeature
     // TODO: update this to return all entries, linked issue https://github.com/iotaledger/firefly/issues/8120
-    return metadata?.entries?.[DEFAULT_NFT_FEATURE_ENTRY_KEY]
+    return metadata?.entries?.[DEFAULT_METADATA_FEATURE_ENTRY_KEY]
 }