Merge branch 'master' into regtest-1

frontend/src/app/services/api.service.ts

@@ -117,6 +117,14 @@ export class ApiService {
     return this.httpClient.get<LiquidPegs[]>(this.apiBaseUrl + this.apiBasePath + '/api/v1/liquid/pegs/month');
   }
 
+  listFeaturedAssets$(): Observable<any[]> {
+    return this.httpClient.get<any[]>(this.apiBaseUrl + '/api/v1/assets/featured');
+  }
+
+  getAssetGroup$(id: string): Observable<any> {
+    return this.httpClient.get<any[]>(this.apiBaseUrl + '/api/v1/assets/group/' + id);
+  }
+
   postTransaction$(hexPayload: string): Observable<any> {
     return this.httpClient.post<any>(this.apiBaseUrl + this.apiBasePath + '/api/tx', hexPayload, { responseType: 'text' as 'json'});
   }

frontend/src/app/services/assets.service.ts

@@ -3,12 +3,16 @@ import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { map, shareReplay, switchMap } from 'rxjs/operators';
 import { StateService } from './state.service';
+import { environment } from 'src/environments/environment';
+import { AssetExtended } from '../interfaces/electrs.interface';
 
 @Injectable({
   providedIn: 'root'
 })
 export class AssetsService {
-  getAssetsJson$: Observable<any>;
+  nativeAssetId = this.stateService.network === 'liquidtestnet' ? environment.nativeTestAssetId : environment.nativeAssetId;
+
+  getAssetsJson$: Observable<{ array: AssetExtended[]; objects: any}>;
   getAssetsMinimalJson$: Observable<any>;
   getMiningPools$: Observable<any>;
 
@@ -24,6 +28,30 @@ export class AssetsService {
     this.getAssetsJson$ = this.stateService.networkChanged$
       .pipe(
         switchMap(() => this.httpClient.get(`${apiBaseUrl}/resources/assets${this.stateService.network === 'liquidtestnet' ? '-testnet' : ''}.json`)),
+        map((rawAssets) => {
+          const assets: AssetExtended[] = Object.values(rawAssets);
+  
+          if (this.stateService.network === 'liquid') {
+            // @ts-ignore
+            assets.push({
+              name: 'Liquid Bitcoin',
+              ticker: 'L-BTC',
+              asset_id: this.nativeAssetId,
+            });
+          } else if (this.stateService.network === 'liquidtestnet') {
+            // @ts-ignore
+            assets.push({
+              name: 'Test Liquid Bitcoin',
+              ticker: 'tL-BTC',
+              asset_id: this.nativeAssetId,
+            });
+          }
+  
+          return {
+            objects: rawAssets,
+            array: assets.sort((a: any, b: any) => a.name.localeCompare(b.name)),
+          };
+        }),
         shareReplay(1),
       );
     this.getAssetsMinimalJson$ = this.stateService.networkChanged$

frontend/src/app/services/electrs-api.service.ts

@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { Block, Transaction, Address, Outspend, Recent, Asset } from '../interfaces/electrs.interface';
+import { Transaction, Address, Outspend, Recent, Asset } from '../interfaces/electrs.interface';
 import { StateService } from './state.service';
+import { BlockExtended } from '../interfaces/node-api.interface';
 
 @Injectable({
   providedIn: 'root'
@@ -28,12 +29,12 @@ export class ElectrsApiService {
     });
   }
 
-  getBlock$(hash: string): Observable<Block> {
-    return this.httpClient.get<Block>(this.apiBaseUrl + this.apiBasePath + '/api/block/' + hash);
+  getBlock$(hash: string): Observable<BlockExtended> {
+    return this.httpClient.get<BlockExtended>(this.apiBaseUrl + this.apiBasePath + '/api/block/' + hash);
   }
 
-  listBlocks$(height?: number): Observable<Block[]> {
-    return this.httpClient.get<Block[]>(this.apiBaseUrl + this.apiBasePath + '/api/blocks/' + (height || ''));
+  listBlocks$(height?: number): Observable<BlockExtended[]> {
+    return this.httpClient.get<BlockExtended[]>(this.apiBaseUrl + this.apiBasePath + '/api/blocks/' + (height || ''));
   }
 
   getTransaction$(txId: string): Observable<Transaction> {

frontend/src/app/services/state.service.ts

@@ -1,8 +1,8 @@
 import { Inject, Injectable, PLATFORM_ID } from '@angular/core';
 import { ReplaySubject, BehaviorSubject, Subject, fromEvent, Observable } from 'rxjs';
-import { Block, Transaction } from '../interfaces/electrs.interface';
+import { Transaction } from '../interfaces/electrs.interface';
 import { IBackendInfo, MempoolBlock, MempoolInfo, TransactionStripped } from '../interfaces/websocket.interface';
-import { OptimizedMempoolStats } from '../interfaces/node-api.interface';
+import { BlockExtended, OptimizedMempoolStats } from '../interfaces/node-api.interface';
 import { Router, NavigationStart } from '@angular/router';
 import { isPlatformBrowser } from '@angular/common';
 import { map, shareReplay } from 'rxjs/operators';
@@ -74,7 +74,7 @@ export class StateService {
   latestBlockHeight = -1;
 
   networkChanged$ = new ReplaySubject<string>(1);
-  blocks$: ReplaySubject<[Block, boolean]>;
+  blocks$: ReplaySubject<[BlockExtended, boolean]>;
   transactions$ = new ReplaySubject<TransactionStripped>(6);
   conversions$ = new ReplaySubject<any>(1);
   bsqPrice$ = new ReplaySubject<number>(1);
@@ -124,7 +124,7 @@ export class StateService {
       }
     });
 
-    this.blocks$ = new ReplaySubject<[Block, boolean]>(this.env.KEEP_BLOCKS_AMOUNT);
+    this.blocks$ = new ReplaySubject<[BlockExtended, boolean]>(this.env.KEEP_BLOCKS_AMOUNT);
 
     if (this.env.BASE_MODULE === 'bisq') {
       this.network = this.env.BASE_MODULE;

frontend/src/app/services/websocket.service.ts

@@ -2,11 +2,12 @@ import { Injectable } from '@angular/core';
 import { webSocket, WebSocketSubject } from 'rxjs/webSocket';
 import { WebsocketResponse, IBackendInfo } from '../interfaces/websocket.interface';
 import { StateService } from './state.service';
-import { Block, Transaction } from '../interfaces/electrs.interface';
+import { Transaction } from '../interfaces/electrs.interface';
 import { Subscription } from 'rxjs';
 import { ApiService } from './api.service';
 import { take } from 'rxjs/operators';
 import { TransferState, makeStateKey } from '@angular/platform-browser';
+import { BlockExtended } from '../interfaces/node-api.interface';
 
 const OFFLINE_RETRY_AFTER_MS = 10000;
 const OFFLINE_PING_CHECK_AFTER_MS = 30000;
@@ -207,7 +208,7 @@ export class WebsocketService {
   handleResponse(response: WebsocketResponse) {
     if (response.blocks && response.blocks.length) {
       const blocks = response.blocks;
-      blocks.forEach((block: Block) => {
+      blocks.forEach((block: BlockExtended) => {
         if (block.height > this.stateService.latestBlockHeight) {
           this.stateService.latestBlockHeight = block.height;
           this.stateService.blocks$.next([block, false]);