fix mint token decimals in Api Server

Author: OBorce

api-server/stack-test-suite/tests/v2/transaction.rs

@@ -196,7 +196,7 @@ async fn multiple_tx_in_same_block(#[case] seed: Seed) {
                 "is_replaceable": transaction.is_replaceable(),
                 "flags": transaction.flags(),
                 "inputs": transaction.inputs().iter().zip(utxos).map(|(inp, utxo)| json!({
-                    "input": tx_input_to_json(inp, &chain_config),
+                    "input": tx_input_to_json(inp, &TokenDecimals::Single(None), &chain_config),
                     "utxo": utxo.as_ref().map(|txo| txoutput_to_json(txo, &chain_config, &TokenDecimals::Single(None))),
                     })).collect::<Vec<_>>(),
                 "outputs": transaction.outputs()
@@ -342,7 +342,7 @@ async fn ok(#[case] seed: Seed) {
                 "is_replaceable": transaction.is_replaceable(),
                 "flags": transaction.flags(),
                 "inputs": transaction.inputs().iter().zip(utxos).map(|(inp, utxo)| json!({
-                    "input": tx_input_to_json(inp, &chain_config),
+                    "input": tx_input_to_json(inp, &TokenDecimals::Single(None), &chain_config),
                     "utxo": utxo.as_ref().map(|txo| txoutput_to_json(txo, &chain_config, &TokenDecimals::Single(None))),
                     })).collect::<Vec<_>>(),
                 "outputs": transaction.outputs()

api-server/web-server/src/api/json_helpers.rs

@@ -287,7 +287,11 @@ pub fn utxo_outpoint_to_json(utxo: &UtxoOutPoint) -> serde_json::Value {
     }
 }
 
-pub fn tx_input_to_json(inp: &TxInput, chain_config: &ChainConfig) -> serde_json::Value {
+pub fn tx_input_to_json(
+    inp: &TxInput,
+    token_decimals: &TokenDecimals,
+    chain_config: &ChainConfig,
+) -> serde_json::Value {
     match inp {
         TxInput::Utxo(utxo) => match utxo.source_id() {
             OutPointSourceId::Transaction(tx_id) => {
@@ -349,7 +353,7 @@ pub fn tx_input_to_json(inp: &TxInput, chain_config: &ChainConfig) -> serde_json
                     "input_type": "AccountCommand",
                     "command": "MintTokens",
                     "token_id": Address::new(chain_config, *token_id).expect("addressable").to_string(),
-                    "amount": amount_to_json(*amount, chain_config.coin_decimals()),
+                    "amount": amount_to_json(*amount, token_decimals.get(token_id)),
                     "nonce": nonce,
                 })
             }
@@ -432,19 +436,20 @@ pub fn tx_to_json(
     additional_info: &TxAdditionalInfo,
     chain_config: &ChainConfig,
 ) -> serde_json::Value {
+    let token_decimals = &(&additional_info.token_decimals).into();
     json!({
     "id": tx.get_id().to_hash().encode_hex::<String>(),
     "version_byte": tx.version_byte(),
     "is_replaceable": tx.is_replaceable(),
     "flags": tx.flags(),
     "fee": amount_to_json(additional_info.fee, chain_config.coin_decimals()),
     "inputs": tx.inputs().iter().zip(additional_info.input_utxos.iter()).map(|(inp, utxo)| json!({
-        "input": tx_input_to_json(inp, chain_config),
-        "utxo": utxo.as_ref().map(|txo| txoutput_to_json(txo, chain_config, &(&additional_info.token_decimals).into())),
+        "input": tx_input_to_json(inp, token_decimals, chain_config),
+        "utxo": utxo.as_ref().map(|txo| txoutput_to_json(txo, chain_config, token_decimals)),
         })).collect::<Vec<_>>(),
     "outputs": tx.outputs()
             .iter()
-            .map(|out| txoutput_to_json(out, chain_config, &(&additional_info.token_decimals).into()))
+            .map(|out| txoutput_to_json(out, chain_config, token_decimals))
             .collect::<Vec<_>>()
     })
 }