fix: remove request to account endpoint

Author: anyxem

packages/sdk/src/mintlayer-connect-sdk.ts

@@ -161,14 +161,14 @@ export interface ApiProvider {
 
 export class MintlayerApiProvider implements ApiProvider {
   private readonly baseUrl: string;
-  private readonly utxoUrl: string;
+  private readonly batchUrl: string;
 
   constructor(
     baseUrl: string,
-    utxoUrl: string = 'https://api.mintini.app',
+    batchUrl: string,
   ) {
     this.baseUrl = baseUrl.replace(/\/$/, '');
-    this.utxoUrl = utxoUrl.replace(/\/$/, '');
+    this.batchUrl = batchUrl.replace(/\/$/, '');
   }
 
   private async get(path: string): Promise<any> {
@@ -239,15 +239,20 @@ export class MintlayerApiProvider implements ApiProvider {
   }
 
   async getAccountUtxos(addresses: string[], network: number): Promise<any> {
-    const response = await fetch(`${this.utxoUrl}/account`, {
+    const response = await fetch(this.batchUrl, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ addresses, network }),
+      body: JSON.stringify({
+        ids: addresses,
+        type: '/address/:address/spendable-utxos',
+        network,
+      }),
     });
     if (!response.ok) {
       throw new Error(`Failed to fetch utxos: ${response.status}`);
     }
-    return response.json();
+    const data = await response.json();
+    return (data.results ?? []).flat();
   }
 }
 
@@ -1222,7 +1227,7 @@ class Client {
     this.publicKeys = { receiving: [], change: [] };
     this.isInitialized = false;
     this.accountProvider = options.accountProvider || new MojitoAccountProvider();
-    this.apiProvider = options.apiProvider || new MintlayerApiProvider(this.getDefaultApiServer());
+    this.apiProvider = options.apiProvider || new MintlayerApiProvider(this.getDefaultApiServer(), this.getDefaultBatchServer());
   }
 
   /**
@@ -1332,6 +1337,16 @@ class Client {
       : 'https://api-server.mintlayer.org/api/v2';
   }
 
+  /**
+   * Returns the default batch server URL based on the network.
+   * @private
+   */
+  private getDefaultBatchServer(): string {
+    return this.network === 'testnet'
+      ? 'https://mojito-api.mintlayer.org/mintlayer/testnet/batch'
+      : 'https://mojito-api.mintlayer.org/mintlayer/mainnet/batch';
+  }
+
   /**
    * Initializes the SDK.
    * @private
@@ -2419,7 +2434,7 @@ class Client {
     const currentAddress = address;
     const addressList = [...currentAddress.receiving, ...currentAddress.change];
 
-    const data = await this.apiProvider.getAccountUtxos(
+    const data_utxos = await this.apiProvider.getAccountUtxos(
       addressList,
       this.network === 'mainnet' ? 0 : 1,
     );
@@ -2433,7 +2448,7 @@ class Client {
       utxo: item.utxo,
     })) : [];
 
-    const utxos: UtxoEntry[] = data.utxos.filter((item: UtxoEntry) => {
+    const utxos: UtxoEntry[] = data_utxos.filter((item: UtxoEntry) => {
       // filter out UTXO with type htlc, they have to be added manually
       if (item.utxo.type === 'Htlc') {
         return false;

packages/sdk/tests/htlc.test.ts

@@ -279,10 +279,10 @@ beforeEach(() => {
       return JSON.stringify({ a: 'b' });
     }
 
-    if(url.endsWith('/account')) {
+    if(url.endsWith('/batch')) {
       return {
         body: JSON.stringify({
-          utxos: utxos,
+          results: [utxos],
         }),
       };
     }

packages/sdk/tests/issue-token.test.ts

@@ -85,10 +85,10 @@ beforeEach(() => {
       return JSON.stringify({ a: 'b' });
     }
 
-    if(url.endsWith('/account')) {
+    if(url.endsWith('/batch')) {
       return {
         body: JSON.stringify({
-          utxos: utxos,
+          results: [utxos],
         }),
       };
     }

packages/sdk/tests/orders.test.ts

@@ -183,10 +183,10 @@ beforeEach(() => {
       }
     }
 
-    if(url.endsWith('/account')) {
+    if(url.endsWith('/batch')) {
       return {
         body: JSON.stringify({
-          utxos: utxos,
+          results: [utxos],
         }),
       };
     }

packages/sdk/tests/signer.test.ts

@@ -101,10 +101,10 @@ beforeEach(() => {
       return JSON.stringify({ a: 'b' });
     }
 
-    if(url.endsWith('/account')) {
+    if(url.endsWith('/batch')) {
       return {
         body: JSON.stringify({
-          utxos: utxos,
+          results: [utxos],
         }),
       };
     }

packages/sdk/tests/staking.test.ts

@@ -142,10 +142,10 @@ beforeEach(() => {
       }
     }
 
-    if(url.endsWith('/account')) {
+    if(url.endsWith('/batch')) {
       return {
         body: JSON.stringify({
-          utxos: utxos,
+          results: [utxos],
         }),
       };
     }

packages/sdk/tests/standalone-providers.test.ts

@@ -35,7 +35,7 @@ function setupFetchMock() {
   fetchMock.doMock();
   fetchMock.mockResponse(async (req) => {
     if (req.url.endsWith('/chain/tip')) return JSON.stringify({ height: 200000 });
-    if (req.url.endsWith('/account')) return JSON.stringify({ utxos: UTXOS });
+    if (req.url.endsWith('/batch')) return JSON.stringify({ results: [UTXOS] });
     return JSON.stringify({});
   });
 }

packages/sdk/tests/token-commands.test.ts

@@ -85,10 +85,10 @@ beforeEach(() => {
       return JSON.stringify({ a: 'b' });
     }
 
-    if(url.endsWith('/account')) {
+    if(url.endsWith('/batch')) {
       return {
         body: JSON.stringify({
-          utxos: utxos,
+          results: [utxos],
         }),
       };
     }

packages/sdk/tests/transfer-nft.test.ts

@@ -158,10 +158,10 @@ beforeEach(() => {
       return JSON.stringify({ a: 'b' });
     }
 
-    if(url.endsWith('/account')) {
+    if(url.endsWith('/batch')) {
       return {
         body: JSON.stringify({
-          utxos: utxos,
+          results: [utxos],
         }),
       };
     }

packages/sdk/tests/transfer-token.test.ts

@@ -85,10 +85,10 @@ beforeEach(() => {
       return JSON.stringify({ a: 'b' });
     }
 
-    if(url.endsWith('/account')) {
+    if(url.endsWith('/batch')) {
       return {
         body: JSON.stringify({
-          utxos: utxos,
+          results: [utxos],
         }),
       };
     }