@cardano-sdk/e2e 0.45.0 → 0.45.1

package/local-network/scripts/setup-new-delegator-keys.sh

@@ -53,6 +53,53 @@ getAddressBalance() {
   echo ${total_balance}
 }
 
+getBlockHeight() {
+  cardano-cli query tip --testnet-magic $NETWORK_MAGIC | jq -r '.block'
+}
+
+submitTransactionWithRetry() {
+  local txFile=$1
+  local retryCount=${2:-0}
+  local numberOfConfirmations=5
+
+  if [ "$retryCount" -ge 5 ]; then
+    echo "Transaction failed after $retryCount retries"
+    return 1
+  fi
+
+  cardano-cli latest transaction submit --testnet-magic $NETWORK_MAGIC --tx-file "$txFile"
+
+  local txId=$(cardano-cli latest transaction txid --tx-file "$txFile")
+
+  local mempoolTx="true"
+  while [ "$mempoolTx" == "true" ]; do
+    echo "Transaction is still in the mempool, waiting ${txId}"
+    sleep 1
+    mempoolTx=$(cardano-cli latest query tx-mempool --testnet-magic $NETWORK_MAGIC tx-exists ${txId} --out-file /dev/stdout | jq -r '.exists')
+  done
+
+  local initialTip=$(getBlockHeight)
+  local currentTip=$initialTip
+  local utxo="null"
+  while [ $(($currentTip - $initialTip)) -lt $numberOfConfirmations ]; do
+    sleep 1
+    utxo=$(cardano-cli query utxo --tx-in "${txId}#0" --testnet-magic $NETWORK_MAGIC --out-file /dev/stdout | jq -r 'keys[0]')
+    if [ "$utxo" == "null" ]; then
+      # Transaction was rolled back
+      break;
+    fi
+    currentTip=$(getBlockHeight)
+  done
+
+  if [ "$utxo" == "null" ]; then
+    echo "Transaction rolled back, retrying ${retryCount} ..."
+    submitTransactionWithRetry "$txFile" $((retryCount + 1))
+    return $?
+  fi
+
+  echo "Transaction successful ${txId}"
+}
+
 NETWORK_MAGIC=888
 UTXO_DIR=network-files/utxo-keys
 TRANSACTIONS_DIR=network-files/transactions
@@ -68,7 +115,7 @@ mkdir -p "$DELEGATORS_DIR"
 # GENERATE NEW PAYMENT KEYS
 
 for NODE_ID in ${SP_NODES_ID}; do
-  cardano-cli conway address key-gen \
+  cardano-cli latest address key-gen \
     --verification-key-file "${DELEGATORS_DIR}/payment${NODE_ID}.vkey" \
     --signing-key-file "${DELEGATORS_DIR}/payment${NODE_ID}.skey"
 done
@@ -76,7 +123,7 @@ done
 # GENERATE NEW STAKE
 
 for NODE_ID in ${SP_NODES_ID}; do
-  cardano-cli conway stake-address key-gen \
+  cardano-cli latest stake-address key-gen \
     --verification-key-file "${DELEGATORS_DIR}/staking${NODE_ID}.vkey" \
     --signing-key-file "${DELEGATORS_DIR}/staking${NODE_ID}.skey"
 done
@@ -84,7 +131,7 @@ done
 # BUILD ADDRESSES FOR OUR NEW KEYS
 
 for NODE_ID in ${SP_NODES_ID}; do
-  cardano-cli conway address build \
+  cardano-cli latest address build \
     --testnet-magic $NETWORK_MAGIC \
     --payment-verification-key-file "${DELEGATORS_DIR}/payment${NODE_ID}.vkey" \
     --stake-verification-key-file "${DELEGATORS_DIR}/staking${NODE_ID}.vkey" \
@@ -94,7 +141,7 @@ done
 # BUILD ADDRESSES FOR THE EXISTING KEYS, WE WILL NEED THEM FOR OUR FUTURE TRANSACTIONS
 
 for NODE_ID in ${SP_NODES_ID}; do
-  cardano-cli conway address build \
+  cardano-cli latest address build \
     --testnet-magic $NETWORK_MAGIC \
     --payment-verification-key-file "${UTXO_DIR}/utxo${NODE_ID}.vkey" \
     --out-file  "${UTXO_DIR}/utxo${NODE_ID}.addr"
@@ -102,72 +149,90 @@ done
 
 # FUND OUR NEWLY CREATED ADDRESSES
 
-stakeAddr="$(cat "${UTXO_DIR}/utxo1.addr")"
-currentBalance=$(getAddressBalance "$stakeAddr")
-echo "Funding stake addresses with ${AMOUNT_PER_DELEGATOR}"
-
 for NODE_ID in ${SP_NODES_ID}; do
-  cardano-cli conway transaction build \
+  sourceAddr="$(cat "${UTXO_DIR}/utxo${NODE_ID}.addr")"
+  destAddr="$(cat ${DELEGATORS_DIR}/payment${NODE_ID}.addr)"
+  echo "Funding ${destAddr} with ${AMOUNT_PER_DELEGATOR}"
+
+  cardano-cli latest transaction build \
     --testnet-magic $NETWORK_MAGIC \
-    --tx-in "$(cardano-cli query utxo --address "$(cat "${UTXO_DIR}/utxo${NODE_ID}.addr")" --testnet-magic $NETWORK_MAGIC --out-file /dev/stdout | jq -r 'keys[0]')" \
-    --tx-out "$(cat ${DELEGATORS_DIR}/payment${NODE_ID}.addr)+${AMOUNT_PER_DELEGATOR}" \
-    --change-address "$(cat ${UTXO_DIR}/utxo${NODE_ID}.addr)" \
+    --tx-in "$(cardano-cli query utxo --address "$sourceAddr" --testnet-magic $NETWORK_MAGIC --out-file /dev/stdout | jq -r 'keys[0]')" \
+    --tx-out "${destAddr}+${AMOUNT_PER_DELEGATOR}" \
+    --change-address "$sourceAddr" \
     --out-file "${TRANSACTIONS_DIR}/tx${NODE_ID}.raw"
 
-    cardano-cli conway transaction sign --testnet-magic $NETWORK_MAGIC \
-      --tx-body-file "${TRANSACTIONS_DIR}/tx${NODE_ID}.raw" \
-      --signing-key-file "${UTXO_DIR}/utxo${NODE_ID}.skey" \
-      --out-file "${TRANSACTIONS_DIR}/tx${NODE_ID}.signed"
+  cardano-cli latest transaction sign --testnet-magic $NETWORK_MAGIC \
+    --tx-body-file "${TRANSACTIONS_DIR}/tx${NODE_ID}.raw" \
+    --signing-key-file "${UTXO_DIR}/utxo${NODE_ID}.skey" \
+    --out-file "${TRANSACTIONS_DIR}/tx${NODE_ID}.signed"
 
-    cardano-cli conway transaction submit \
-      --testnet-magic $NETWORK_MAGIC \
-      --tx-file "${TRANSACTIONS_DIR}/tx${NODE_ID}.signed"
+  if [ "$NODE_ID" -eq 1 ]; then
+    # This is the first transaction after startin the network.
+    # It usually takes a long time to be included in a block and often rolled back, so use submit with retry.
+    # Do not use submit with retry for regular transactions because it waits for 5 block confirmations before it returns
+    submitTransactionWithRetry "${TRANSACTIONS_DIR}/tx${NODE_ID}.signed"
+  else
+    cardano-cli latest transaction submit --testnet-magic $NETWORK_MAGIC --tx-file "${TRANSACTIONS_DIR}/tx${NODE_ID}.signed"
+  fi
 done
 
-updatedBalance=$(getAddressBalance "$stakeAddr")
-
-while [ "$currentBalance" -eq "$updatedBalance" ]; do
-  updatedBalance=$(getAddressBalance "$stakeAddr")
-  sleep 1
+# Wait for funds to reach destAddr
+for NODE_ID in ${SP_NODES_ID}; do
+  destAddr="$(cat ${DELEGATORS_DIR}/payment${NODE_ID}.addr)"
+
+  currentBalance=$(getAddressBalance "$destAddr")
+  while [ "$currentBalance" -lt "$AMOUNT_PER_DELEGATOR" ]; do
+    echo "Waiting for funds to reach ${destAddr} ${currentBalance} < ${AMOUNT_PER_DELEGATOR}"
+    currentBalance=$(getAddressBalance "$destAddr")
+    sleep 1
+  done
 done
 
 sleep 10
 
 # SHOW THE UTXO DISTRIBUTION
 
-cardano-cli conway query utxo --whole-utxo --testnet-magic $NETWORK_MAGIC
+cardano-cli query utxo --whole-utxo --testnet-magic $NETWORK_MAGIC
 
 # REGISTER STAKE ADDRESSES
 
-echo "Registering $(cat "${DELEGATORS_DIR}/payment${NODE_ID}.addr")"
-
 keyDeposit=2000000
 stakeAddr="$(cat "${DELEGATORS_DIR}/payment1.addr")"
 currentBalance=$(getAddressBalance "$stakeAddr")
 
 for NODE_ID in ${SP_NODES_ID}; do
-  cardano-cli conway stake-address registration-certificate \
+  stakeAddr=$(cat "${DELEGATORS_DIR}/payment${NODE_ID}.addr")
+  echo "Registering $stakeAddr"
+
+  cardano-cli latest stake-address registration-certificate \
     --stake-verification-key-file "${DELEGATORS_DIR}/staking${NODE_ID}.vkey" \
     --key-reg-deposit-amt ${keyDeposit} \
     --out-file "${TRANSACTIONS_DIR}/staking${NODE_ID}reg.cert"
 
-  cardano-cli conway transaction build \
+  # Wait for utxo to become available
+  txIn="null";
+  while [ "$txIn" == "null" ]; do
+    echo "Waiting for ${stakeAddr} UTxO..."
+    txInJson="$(cardano-cli latest query utxo --address "$stakeAddr" --testnet-magic $NETWORK_MAGIC --out-file /dev/stdout)";
+    txIn=$(jq -r 'keys[0]' <<< "$txInJson");
+    sleep 0.1
+  done
+
+  cardano-cli latest transaction build \
     --testnet-magic $NETWORK_MAGIC \
-    --tx-in "$(cardano-cli query utxo --address "$(cat "${DELEGATORS_DIR}/payment${NODE_ID}.addr")" --testnet-magic $NETWORK_MAGIC --out-file /dev/stdout | jq -r 'keys[0]')" \
+    --tx-in "$txIn" \
     --change-address "$(cat ${DELEGATORS_DIR}/payment${NODE_ID}.addr)" \
     --certificate-file "${TRANSACTIONS_DIR}/staking${NODE_ID}reg.cert" \
     --witness-override 2 \
     --out-file "${TRANSACTIONS_DIR}/reg-stake-tx${NODE_ID}.raw"
 
-  cardano-cli conway transaction sign --testnet-magic $NETWORK_MAGIC \
+  cardano-cli latest transaction sign --testnet-magic $NETWORK_MAGIC \
     --tx-body-file "${TRANSACTIONS_DIR}/reg-stake-tx${NODE_ID}.raw" \
     --signing-key-file "${DELEGATORS_DIR}/payment${NODE_ID}.skey" \
     --signing-key-file "${DELEGATORS_DIR}/staking${NODE_ID}.skey" \
     --out-file "${TRANSACTIONS_DIR}/reg-stake-tx${NODE_ID}.signed"
 
-  cardano-cli conway transaction submit \
-    --testnet-magic $NETWORK_MAGIC \
-    --tx-file "${TRANSACTIONS_DIR}/reg-stake-tx${NODE_ID}.signed"
+  cardano-cli latest transaction submit --testnet-magic $NETWORK_MAGIC --tx-file "${TRANSACTIONS_DIR}/reg-stake-tx${NODE_ID}.signed"
 done
 
 updatedBalance=$(getAddressBalance "$stakeAddr")

package/local-network/scripts/setup-wallets.sh

@@ -37,7 +37,7 @@ walletAddr5="addr_test1qr0c3frkem9cqn5f73dnvqpena27k2fgqew6wct9eaka03agfwkvzr0zy
 # Spend the first UTxO
 utxo=$(cardano-cli query utxo --address "$genesisAddr" --testnet-magic 888 | awk 'NR == 3 {printf("%s#%s", $1, $2)}')
 
-cardano-cli conway transaction build \
+cardano-cli latest transaction build \
   --change-address "$genesisAddr" \
   --tx-in "$utxo" \
   --tx-out "$walletAddr1"+"$AMOUNT_PER_WALLET" \
@@ -48,11 +48,11 @@ cardano-cli conway transaction build \
   --testnet-magic 888 \
   --out-file wallets-tx.raw
 
-cardano-cli transaction sign \
+cardano-cli latest transaction sign \
   --tx-body-file wallets-tx.raw \
   --signing-key-file network-files/utxo-keys/utxo3.skey \
   --testnet-magic 888 \
   --out-file wallets-tx.signed
 
-cardano-cli transaction submit --testnet-magic 888 --tx-file wallets-tx.signed
+cardano-cli latest transaction submit --testnet-magic 888 --tx-file wallets-tx.signed
 wait_tx_complete $utxo

package/local-network/scripts/start.sh

@@ -43,7 +43,6 @@ while [ `cardano-cli query tip --testnet-magic 888 | jq .block` == null ] ; do
   sleep 1
 done
 
-healthy &
 
 ./scripts/setup-new-delegator-keys.sh
 ./scripts/update-stake-pools.sh.sh "$SP_NODES_ID"
@@ -56,4 +55,6 @@ healthy &
 
 touch ./network-files/run/done
 
+healthy &
+
 wait

package/local-network/templates/babbage/db-sync-config.json

@@ -113,6 +113,10 @@
     }
   ],
   "insert_options": {
-    "tx_cbor": "enable"
+    "tx_cbor": "enable",
+    "tx_out": {
+      "value": "consumed",
+      "force_tx_in": true
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardano-sdk/e2e",
-  "version": "0.45.0",
+  "version": "0.45.1",
   "description": "End to end tests for the cardano-js-sdk packages.",
   "repository": "https://github.com/input-output-hk/cardano-js-sdk",
   "license": "Apache-2.0",
@@ -75,21 +75,21 @@
   },
   "dependencies": {
     "@cardano-foundation/ledgerjs-hw-app-cardano": "^7.1.4",
-    "@cardano-ogmios/client": "6.5.0",
-    "@cardano-sdk/cardano-services": "~0.32.0",
-    "@cardano-sdk/cardano-services-client": "~0.22.0",
-    "@cardano-sdk/core": "~0.41.2",
-    "@cardano-sdk/crypto": "~0.1.30",
-    "@cardano-sdk/hardware-ledger": "~0.12.10",
-    "@cardano-sdk/hardware-trezor": "~0.6.9",
-    "@cardano-sdk/input-selection": "~0.13.25",
-    "@cardano-sdk/key-management": "~0.24.8",
-    "@cardano-sdk/ogmios": "~0.18.10",
-    "@cardano-sdk/tx-construction": "~0.21.10",
+    "@cardano-ogmios/client": "6.9.0",
+    "@cardano-sdk/cardano-services": "~0.32.1",
+    "@cardano-sdk/cardano-services-client": "~0.22.1",
+    "@cardano-sdk/core": "~0.41.3",
+    "@cardano-sdk/crypto": "~0.1.31",
+    "@cardano-sdk/hardware-ledger": "~0.12.11",
+    "@cardano-sdk/hardware-trezor": "~0.6.10",
+    "@cardano-sdk/input-selection": "~0.13.26",
+    "@cardano-sdk/key-management": "~0.24.9",
+    "@cardano-sdk/ogmios": "~0.18.11",
+    "@cardano-sdk/tx-construction": "~0.21.11",
     "@cardano-sdk/util": "~0.15.5",
-    "@cardano-sdk/util-dev": "~0.23.10",
-    "@cardano-sdk/util-rxjs": "~0.7.38",
-    "@cardano-sdk/wallet": "~0.44.18",
+    "@cardano-sdk/util-dev": "~0.23.11",
+    "@cardano-sdk/util-rxjs": "~0.7.39",
+    "@cardano-sdk/wallet": "~0.44.19",
     "@dcspark/cardano-multiplatform-lib-nodejs": "^3.1.1",
     "@shiroyasha9/axios-fetch-adapter": "1.0.3",
     "axios": "^1.7.4",
@@ -119,10 +119,10 @@
     "@babel/core": "^7.18.2",
     "@babel/preset-env": "^7.18.2",
     "@babel/preset-typescript": "^7.17.12",
-    "@cardano-sdk/dapp-connector": "~0.12.42",
-    "@cardano-sdk/projection": "~0.12.10",
-    "@cardano-sdk/projection-typeorm": "~0.9.10",
-    "@cardano-sdk/web-extension": "~0.34.17",
+    "@cardano-sdk/dapp-connector": "~0.12.43",
+    "@cardano-sdk/projection": "~0.12.11",
+    "@cardano-sdk/projection-typeorm": "~0.9.11",
+    "@cardano-sdk/web-extension": "~0.34.18",
     "@dcspark/cardano-multiplatform-lib-browser": "^3.1.1",
     "@emurgo/cardano-message-signing-asmjs": "^1.0.1",
     "@types/bunyan": "^1.8.8",
@@ -182,5 +182,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "786381908d2d3ec916d64c37201d43c52ebd5b26"
+  "gitHead": "d1544fc9d1fb3997eb7c5b94a233789bb9e5cd9f"
 }

package/src/factories.ts

@@ -36,6 +36,8 @@ import {
   util
 } from '@cardano-sdk/key-management';
 import {
+  BlockfrostAssetProvider,
+  BlockfrostClient,
   CardanoWsClient,
   assetInfoHttpProvider,
   chainHistoryHttpProvider,
@@ -66,6 +68,7 @@ const HTTP_PROVIDER = 'http';
 const OGMIOS_PROVIDER = 'ogmios';
 const STUB_PROVIDER = 'stub';
 const WS_PROVIDER = 'ws';
+const BLOCKFROST_PROVIDER = 'blockfrost';
 
 const MISSING_URL_PARAM = 'Missing URL';
 
@@ -130,6 +133,19 @@ assetProviderFactory.register(HTTP_PROVIDER, async (params: any, logger: Logger)
   });
 });
 
+assetProviderFactory.register(BLOCKFROST_PROVIDER, async (params: any, logger): Promise<AssetProvider> => {
+  if (params.baseUrl === undefined) throw new Error(`${BlockfrostAssetProvider.name}: ${MISSING_URL_PARAM}`);
+
+  return new Promise<AssetProvider>(async (resolve) => {
+    resolve(
+      new BlockfrostAssetProvider(
+        new BlockfrostClient({ baseUrl: params.baseUrl }, { rateLimiter: { schedule: (task) => task() } }),
+        logger
+      )
+    );
+  });
+});
+
 chainHistoryProviderFactory.register(
   HTTP_PROVIDER,
   async (params: any, logger: Logger): Promise<ChainHistoryProvider> => {

package/test/blockfrost/getAsset.test.ts

@@ -1,11 +1,21 @@
-import { BlockfrostAssetProvider } from '@cardano-sdk/cardano-services-client';
 import { Cardano } from '@cardano-sdk/core';
+import { assetProviderFactory, getEnv, walletVariables } from '../../src';
 import { logger } from '@cardano-sdk/util-dev';
-import { util } from '@cardano-sdk/cardano-services';
+
+const env = getEnv(walletVariables);
 
 describe('BlockfrostAssetProvider', () => {
+  beforeAll(() => {
+    if (env.TEST_CLIENT_ASSET_PROVIDER !== 'blockfrost')
+      throw new Error('TEST_CLIENT_ASSET_PROVIDER must be "blockfrost" to run these tests');
+  });
+
   test('getAsset', async () => {
-    const assetProvider = new BlockfrostAssetProvider(util.getBlockfrostClient(), logger);
+    const assetProvider = await assetProviderFactory.create(
+      'blockfrost',
+      env.TEST_CLIENT_ASSET_PROVIDER_PARAMS,
+      logger
+    );
     const asset = await assetProvider.getAsset({
       assetId: Cardano.AssetId(
         'b27160f0c50a9cf168bf945dcbfcabbfbee5c7a801e7b467093b41534d6574616c4d6f6e7374657230303036'

package/test/blockfrost-providers/networkInfo.test.ts

@@ -5,7 +5,7 @@ import { logger } from '@cardano-sdk/util-dev';
 import { networkInfoHttpProvider } from '@cardano-sdk/cardano-services-client';
 import { toSerializableObject } from '@cardano-sdk/util';
 
-// LW-11697 to enable this
+// LW-11858 to enable this
 describe.skip('Web Socket', () => {
   const legacyProvider = networkInfoHttpProvider({ baseUrl: 'http://localhost:4000/', logger });
   const provider = networkInfoHttpProvider({ baseUrl: 'http://localhost:4001/', logger });

package/test/wallet_epoch_0/PersonalWallet/nft.test.ts

@@ -46,7 +46,6 @@ describe('PersonalWallet.assets/nft', () => {
   let policyId: Cardano.PolicyId;
   let policyScript: Cardano.NativeScript;
   let assetIds: Cardano.AssetId[];
-  let fingerprints: Cardano.AssetFingerprint[];
   const assetNames = ['4e46542d66696c6573', '4e46542d303031', '4e46542d303032'];
   let walletAddress: Cardano.PaymentAddress;
   const coins = 10_000_000n; // number of coins to use in each transaction
@@ -101,12 +100,6 @@ describe('PersonalWallet.assets/nft', () => {
       [assetIds[TOKEN_BURN_INDEX], 1n]
     ]);
 
-    fingerprints = [
-      Cardano.AssetFingerprint.fromParts(policyId, Cardano.AssetName(assetNames[TOKEN_METADATA_1_INDEX])),
-      Cardano.AssetFingerprint.fromParts(policyId, Cardano.AssetName(assetNames[TOKEN_METADATA_2_INDEX])),
-      Cardano.AssetFingerprint.fromParts(policyId, Cardano.AssetName(assetNames[TOKEN_BURN_INDEX]))
-    ];
-
     walletAddress = (await firstValueFrom(wallet.addresses$))[0].address;
 
     const txMetadatum = metadatum.jsonToMetadatum({
@@ -199,23 +192,13 @@ describe('PersonalWallet.assets/nft', () => {
     // Check balance here because asset info will not be re-fetched when balance changes due to minting and burning
     expect(walletAssetBalance?.get(assetIds[TOKEN_METADATA_2_INDEX])).toBe(1n);
 
-    expect(nfts.find((nft) => nft.assetId === assetIds[TOKEN_METADATA_2_INDEX])).toMatchObject({
-      assetId: assetIds[TOKEN_METADATA_2_INDEX],
-      fingerprint: fingerprints[TOKEN_METADATA_2_INDEX],
-      name: assetNames[TOKEN_METADATA_2_INDEX],
-      nftMetadata: {
-        image: 'ipfs://some_hash1',
-        name: 'One',
-        otherProperties: new Map([['version', '1.0']]),
-        version: '1.0'
-      },
-      policyId,
-      // in case of repeated tests on the same network, total asset supply is not updated due to
-      // the limitation that asset info is not refreshed on wallet balance changes
-      quantity: expect.anything(),
-      supply: expect.anything(),
-      tokenMetadata: null
+    const secondTokenMetadata = nfts.find((nft) => nft.assetId === assetIds[TOKEN_METADATA_2_INDEX])?.nftMetadata;
+    expect(secondTokenMetadata).toMatchObject({
+      image: 'ipfs://some_hash1',
+      name: 'One',
+      version: '1.0'
     });
+
     expect(nfts.find((nft) => nft.assetId === assetIds[TOKEN_METADATA_1_INDEX])).toBeDefined();
   });
 
@@ -225,37 +208,20 @@ describe('PersonalWallet.assets/nft', () => {
     // Check balance here because asset info will not be re-fetched when balance changes due to minting and burning
     expect(walletAssetBalance?.get(assetIds[TOKEN_METADATA_1_INDEX])).toBe(1n);
 
-    expect(nfts.find((nft) => nft.assetId === assetIds[TOKEN_METADATA_1_INDEX])).toMatchObject({
-      assetId: assetIds[TOKEN_METADATA_1_INDEX],
-      fingerprint: fingerprints[TOKEN_METADATA_1_INDEX],
-      name: assetNames[TOKEN_METADATA_1_INDEX],
-      nftMetadata: {
-        description: 'NFT with different types of files',
-        files: [
-          {
-            mediaType: 'video/mp4',
-            name: 'some name',
-            src: 'ipfs://Qmb78QQ4RXxKQrteRn4X3WaMXXfmi2BU2dLjfWxuJoF2N5'
-          },
-          {
-            mediaType: 'audio/mpeg',
-            name: 'some name',
-            src: 'ipfs://Qmb78QQ4RXxKQrteRn4X3WaMXXfmi2BU2dLjfWxuJoF2Ny'
-          }
-        ],
-        image: 'ipfs://somehash',
-        mediaType: 'image/png',
-        name: 'NFT with files',
-        otherProperties: new Map([
-          ['id', '1'],
-          ['version', '1.0']
-        ]),
-        version: '1.0'
-      } as Asset.NftMetadata,
-      policyId,
-      supply: expect.anything(),
-      tokenMetadata: null
-    });
+    const nftMetadata = nfts.find((nft) => nft.assetId === assetIds[TOKEN_METADATA_1_INDEX])?.nftMetadata;
+    expect(nftMetadata?.otherProperties?.get('id')).toBe('1');
+    expect(nftMetadata?.files).toEqual([
+      expect.objectContaining({
+        mediaType: 'video/mp4',
+        name: 'some name',
+        src: 'ipfs://Qmb78QQ4RXxKQrteRn4X3WaMXXfmi2BU2dLjfWxuJoF2N5'
+      }),
+      expect.objectContaining({
+        mediaType: 'audio/mpeg',
+        name: 'some name',
+        src: 'ipfs://Qmb78QQ4RXxKQrteRn4X3WaMXXfmi2BU2dLjfWxuJoF2Ny'
+      })
+    ]);
   });
 
   it('supports burning tokens', async () => {
@@ -313,7 +279,6 @@ describe('PersonalWallet.assets/nft', () => {
 
         const assetNameHex = Buffer.from(assetName).toString('hex');
         const assetId = Cardano.AssetId(`${policyId}${assetNameHex}`);
-        const fingerprint = Cardano.AssetFingerprint.fromParts(policyId, Cardano.AssetName(assetNameHex));
         const tokens = new Map([[assetId, 1n]]);
 
         const txDataMetadatum = new Map([
@@ -325,7 +290,7 @@ describe('PersonalWallet.assets/nft', () => {
                 metadatum.jsonToMetadatum({
                   image: ['ipfs://some_hash1'],
                   name: assetName,
-                  version: '1.0'
+                  version
                 })
               ]
             ])
@@ -369,26 +334,18 @@ describe('PersonalWallet.assets/nft', () => {
 
         // try remove the asset.nftMetadata filter
         const [, nfts] = await firstValueFromTimed(walletBalanceAssetsAndNfts(wallet));
+        const nftMetadata = nfts.find((nft) => nft.assetId === assetId)?.nftMetadata;
 
-        expect(nfts.find((nft) => nft.assetId === assetId)).toMatchObject({
-          assetId,
-          fingerprint,
-          name: assetNameHex,
-          nftMetadata: {
-            image: 'ipfs://some_hash1',
-            name: assetName,
-            otherProperties: new Map([['version', '1.0']]),
-            version: '1.0'
-          },
-          policyId,
-          quantity: expect.anything(),
-          supply: expect.anything(),
-          tokenMetadata: null
-        });
+        expect(nftMetadata?.image).toBe('ipfs://some_hash1');
+        expect(nftMetadata?.name).toBe(assetName);
       });
 
     CIP0025Test('supports CIP-25 v1, assetName hex encoded', 'CIP-0025-v1-hex', 1, 'hex');
     CIP0025Test('supports CIP-25 v1, assetName utf8 encoded', 'CIP-0025-v1-utf8', 1, 'utf8');
-    CIP0025Test('supports CIP-25 v2', 'CIP-0025-v2', 2);
+
+    // https://input-output-rnd.slack.com/archives/C06J663L2A2/p1731505470694659
+    env.TEST_CLIENT_ASSET_PROVIDER !== 'blockfrost'
+      ? CIP0025Test('supports CIP-25 v2', 'CIP-0025-v2', 2)
+      : test.todo('"supports CIP-25 v2" test is disabled when running with Blockfrost asset provider');
   });
 });