Fetch legacy and shelley utxos together

vacuumlabs · Oct 15, 2021 · a7e3a8a · a7e3a8a
1 parent cfd8bb6
commit a7e3a8a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/app/frontend/actions/common.ts b/app/frontend/actions/common.ts
@@ -49,11 +49,9 @@ export default (store: Store) => {
   const prepareTxPlan = async (args: TxPlanArgs): Promise<TxPlanResult> => {
     const state = getState()
     try {
-      const utxos = getSourceAccountInfo(state).utxos
-
       return await getWallet()
         .getAccount(state.sourceAccountIndex)
-        .getTxPlan(args, utxos)
+        .getTxPlan(args, getSourceAccountInfo(state).utxos)
     } catch (e) {
       // TODO: refactor setErrorState to check all errors if there unexpected
       if (

diff --git a/app/frontend/wallet/account.ts b/app/frontend/wallet/account.ts
@@ -438,9 +438,7 @@ const Account = ({config, cryptoProvider, blockchainExplorer, accountIndex}: Acc
 
   async function getUtxos(): Promise<Array<UTxO>> {
     const {legacy, base} = await myAddresses.discoverAllAddresses()
-    const baseUtxos = await blockchainExplorer.fetchUnspentTxOutputs(base)
-    const nonStakingUtxos = await blockchainExplorer.fetchUnspentTxOutputs(legacy)
-    return [...nonStakingUtxos, ...baseUtxos]
+    return await blockchainExplorer.fetchUnspentTxOutputs([...legacy, ...base])
   }
 
   async function getVisibleAddresses() {

diff --git a/app/frontend/wallet/blockchain-explorer.ts b/app/frontend/wallet/blockchain-explorer.ts
@@ -233,17 +233,22 @@ const blockchainExplorer = (ADALITE_CONFIG) => {
   }
 
   async function fetchUnspentTxOutputs(addresses: Array<string>): Promise<UTxO[]> {
-    const chunks = range(0, Math.ceil(addresses.length / gapLimit))
+    // utxos can be fetched by chunks of 50 (backend limit) instead of discovery gap limit, because
+    // differently from the rest of calls, these are not involved in address discovery
+    // so they don't have to align with the gap limit in order to always request the same
+    // addresses to hit the cache (the caching key is the stringified list of addresses requested)
+    const chunkSize = 50
+    const chunks = range(0, Math.ceil(addresses.length / chunkSize))
 
     const url = `${ADALITE_CONFIG.ADALITE_BLOCKCHAIN_EXPLORER_URL}/api/bulk/addresses/utxo`
     const response = (
       await Promise.all(
         chunks.map(async (index) => {
-          const beginIndex = index * gapLimit
+          const beginIndex = index * chunkSize
           const response: BulkAdressesUtxoResponse = await request(
             url,
             'POST',
-            JSON.stringify(addresses.slice(beginIndex, beginIndex + gapLimit)),
+            JSON.stringify(addresses.slice(beginIndex, beginIndex + chunkSize)),
             {
               'Accept': 'application/json',
               'Content-Type': 'application/json',