fix: remove encoding from utxo query

input-output-hk · Jan 18, 2021 · 1e13857 · 1e13857
1 parent 0f9943c
commit 1e13857
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/cardano-rosetta-server/src/server/db/blockchain-repository.ts b/cardano-rosetta-server/src/server/db/blockchain-repository.ts
@@ -490,7 +490,7 @@ export const configure = (databaseInstance: Pool): BlockchainRepository => ({
       value: utxo.value,
       transactionHash: hexFormatter(utxo.txHash),
       index: utxo.index,
-      maName: utxo.maName,
+      maName: utxo.maName ? utxo.maName.toString() : utxo.maName,
       maPolicy: utxo.maPolicy ? hexFormatter(utxo.maPolicy) : utxo.maPolicy,
       quantity: utxo.quantity
     }));

diff --git a/cardano-rosetta-server/src/server/db/queries/blockchain-queries.ts b/cardano-rosetta-server/src/server/db/queries/blockchain-queries.ts
@@ -229,7 +229,7 @@ export interface FindUtxo {
   txHash: Buffer;
   index: number;
   maPolicy: Buffer;
-  maName: string;
+  maName: Buffer;
   quantity: string;
 }
 
@@ -256,7 +256,7 @@ const selectUtxoDetail = `SELECT
   tx_out.value as value,
   tx_out_tx.hash as "txHash",
   tx_out.index as index,
-  ENCODE(ma_tx_out.name, 'escape') as "maName",
+  ma_tx_out.name as "maName",
   ma_tx_out.policy as "maPolicy",
   ma_tx_out.quantity`;
 

diff --git a/cardano-rosetta-server/src/server/utils/data-mapper.ts b/cardano-rosetta-server/src/server/utils/data-mapper.ts
@@ -29,7 +29,7 @@ export const mapAmount = (lovelace: string): Components.Schemas.Amount => ({
 });
 
 export const mapMaAmount = (maUtxo: Utxo): Components.Schemas.Amount => ({
-  value: maUtxo.quantity.toString(),
+  value: maUtxo.quantity,
   currency: {
     symbol: maUtxo.maName,
     decimals: MULTI_ASSET_DECIMALS,
@@ -294,8 +294,7 @@ const calculateTotalMaAmount = (multiAssetsUtxo: Utxo[], maUtxo: Utxo): string =
  */
 const convertToMultiAssetBalances = (multiAssetsUtxo: Utxo[]): Components.Schemas.Amount[] => {
   const multiAssetsAmounts: Utxo[] = [];
-  for (let i = 0; i < multiAssetsUtxo.length; i++) {
-    const maUtxo = multiAssetsUtxo[i];
+  multiAssetsUtxo.forEach(maUtxo => {
     if (
       !multiAssetsAmounts.some(maAmount => maAmount.maPolicy === maUtxo.maPolicy && maAmount.maName === maUtxo.maName)
     ) {
@@ -306,7 +305,7 @@ const convertToMultiAssetBalances = (multiAssetsUtxo: Utxo[]): Components.Schema
         quantity: totalMaAmount
       });
     }
-  }
+  });
   return multiAssetsAmounts.map(mapMaAmount);
 };