Update API to work with Bitcoin and Stratis

Breeze.UI/src/app/shared/services/api.service.ts

@@ -7,6 +7,8 @@ import 'rxjs/add/operator/catch';
 import "rxjs/add/observable/interval";
 import 'rxjs/add/operator/startWith';
 
+import { GlobalService } from './global.service';
+
 import { WalletCreation } from '../classes/wallet-creation';
 import { WalletRecovery } from '../classes/wallet-recovery';
 import { WalletLoad } from '../classes/wallet-load';
@@ -20,19 +22,29 @@ import { TransactionSending } from '../classes/transaction-sending';
  */
 @Injectable()
 export class ApiService {
-    constructor(private http: Http) {};
+    constructor(private http: Http, private globalService: GlobalService) {};
 
-    private mockApiUrl = 'http://localhost:3000/api';
-    private webApiUrl = 'http://localhost:5000/api';
     private headers = new Headers({'Content-Type': 'application/json'});
     private pollingInterval = 3000;
+    private bitcoinApiUrl = 'http://localhost:5000/api';
+    private stratisApiUrl = 'http://localhost:5105/api';
+    private currentApiUrl = 'http://localhost:5000/api';
+
+    private getCurrentCoin() {
+      let currentCoin = this.globalService.getCoinName();
+      if (currentCoin === "Bitcoin") {
+        this.currentApiUrl = this.bitcoinApiUrl;
+      } else if (currentCoin === "Stratis") {
+        this.currentApiUrl = this.stratisApiUrl;
+      }
+    }
 
     /**
      * Gets available wallets at the default path
      */
      getWalletFiles(): Observable<any> {
         return this.http
-          .get(this.webApiUrl + '/wallet/files')
+          .get(this.bitcoinApiUrl + '/wallet/files')
           .map((response: Response) => response);
      }
 
@@ -40,8 +52,10 @@ export class ApiService {
      * Create a new wallet.
      */
     createWallet(data: WalletCreation): Observable<any> {
+      this.getCurrentCoin();
+
       return this.http
-        .post(this.webApiUrl + '/wallet/create/', JSON.stringify(data), {headers: this.headers})
+        .post(this.currentApiUrl + '/wallet/create/', JSON.stringify(data), {headers: this.headers})
         .map((response: Response) => response);
     }
 
@@ -49,17 +63,28 @@ export class ApiService {
      * Recover a wallet.
      */
     recoverWallet(data: WalletRecovery): Observable<any> {
+      this.getCurrentCoin();
+
+      return this.http
+        .post(this.currentApiUrl + '/wallet/recover/', JSON.stringify(data), {headers: this.headers})
+        .map((response: Response) => response);
+    }
+
+    /**
+     * Load a Bitcoin wallet
+     */
+    loadBitcoinWallet(data: WalletLoad): Observable<any> {
       return this.http
-        .post(this.webApiUrl + '/wallet/recover/', JSON.stringify(data), {headers: this.headers})
+        .post(this.bitcoinApiUrl + '/wallet/load/', JSON.stringify(data), {headers: this.headers})
         .map((response: Response) => response);
     }
 
     /**
-     * Load a wallet
+     * Load a Stratis wallet
      */
-    loadWallet(data: WalletLoad): Observable<any> {
+    loadStratisWallet(data: WalletLoad): Observable<any> {
       return this.http
-        .post(this.webApiUrl + '/wallet/load/', JSON.stringify(data), {headers: this.headers})
+        .post(this.stratisApiUrl + '/wallet/load/', JSON.stringify(data), {headers: this.headers})
         .map((response: Response) => response);
     }
 
@@ -67,8 +92,10 @@ export class ApiService {
      * Get wallet status info from the API.
      */
     getWalletStatus(): Observable<any> {
+      this.getCurrentCoin();
+
       return this.http
-        .get(this.webApiUrl + '/wallet/status')
+        .get(this.currentApiUrl + '/wallet/status')
         .map((response: Response) => response);
     }
 
@@ -76,13 +103,15 @@ export class ApiService {
      * Get general wallet info from the API.
      */
     getGeneralInfo(data: WalletInfo): Observable<any> {
+      this.getCurrentCoin();
+
       let params: URLSearchParams = new URLSearchParams();
       params.set('Name', data.walletName);
 
       return Observable
         .interval(this.pollingInterval)
         .startWith(0)
-        .switchMap(() => this.http.get(this.webApiUrl + '/wallet/general-info', new RequestOptions({headers: this.headers, search: params})))
+        .switchMap(() => this.http.get(this.currentApiUrl + '/wallet/general-info', new RequestOptions({headers: this.headers, search: params})))
         .map((response: Response) => response);
     }
 
@@ -90,66 +119,79 @@ export class ApiService {
      * Get wallet balance info from the API.
      */
     getWalletBalance(data: WalletInfo): Observable<any> {
+      this.getCurrentCoin();
+
       let params: URLSearchParams = new URLSearchParams();
       params.set('walletName', data.walletName);
 
       return Observable
         .interval(this.pollingInterval)
         .startWith(0)
-        .switchMap(() => this.http.get(this.webApiUrl + '/wallet/balance', new RequestOptions({headers: this.headers, search: params})))
+        .switchMap(() => this.http.get(this.currentApiUrl + '/wallet/balance', new RequestOptions({headers: this.headers, search: params})))
         .map((response: Response) => response);
-
-      // return this.http
-      //   .get(this.webApiUrl + '/wallet/balance', new RequestOptions({headers: this.headers, search: params}))
-      //   .map((response: Response) => response);
     }
 
     /**
      * Get a wallets transaction history info from the API.
      */
     getWalletHistory(data: WalletInfo): Observable<any> {
+      this.getCurrentCoin();
+
       let params: URLSearchParams = new URLSearchParams();
       params.set('walletName', data.walletName);
 
       return Observable
         .interval(this.pollingInterval)
         .startWith(0)
-        .switchMap(() => this.http.get(this.webApiUrl + '/wallet/history', new RequestOptions({headers: this.headers, search: params})))
+        .switchMap(() => this.http.get(this.currentApiUrl + '/wallet/history', new RequestOptions({headers: this.headers, search: params})))
         .map((response: Response) => response);
-
-      // return this.http
-      //   .get(this.webApiUrl + '/wallet/history', new RequestOptions({headers: this.headers, search: params}))
-      //   .map((response: Response) => response);
     }
 
     /**
      * Get unused receive addresses for a certain wallet from the API.
      */
     getUnusedReceiveAddress(data: WalletInfo): Observable<any> {
+      this.getCurrentCoin();
+
       let params: URLSearchParams = new URLSearchParams();
       params.set('walletName', data.walletName);
       params.set('accountName', "account 0"); //temporary
 
       return this.http
-        .get(this.webApiUrl + '/wallet/address', new RequestOptions({headers: this.headers, search: params}))
+        .get(this.currentApiUrl + '/wallet/address', new RequestOptions({headers: this.headers, search: params}))
         .map((response: Response) => response);
     }
 
+    /**
+     * Build a transaction
+     */
     buildTransaction(data: TransactionBuilding): Observable<any> {
+      this.getCurrentCoin();
+
       return this.http
-        .post(this.webApiUrl + '/wallet/build-transaction/', JSON.stringify(data), {headers: this.headers})
+        .post(this.currentApiUrl + '/wallet/build-transaction/', JSON.stringify(data), {headers: this.headers})
         .map((response: Response) => response);
     }
 
+    /**
+     * Send transaction
+     */
     sendTransaction(data: TransactionSending): Observable<any> {
+      this.getCurrentCoin();
+
       return this.http
-        .post(this.webApiUrl + '/wallet/send-transaction/', JSON.stringify(data), {headers: this.headers})
+        .post(this.currentApiUrl + '/wallet/send-transaction/', JSON.stringify(data), {headers: this.headers})
         .map((response: Response) => response);
     }
 
+    /**
+     * Send shutdown signal to the daemon
+     */
     shutdownNode(): Observable<any> {
+      this.getCurrentCoin();
+
       return this.http
-        .post(this.webApiUrl + '/node/shutdown', '')
+        .post(this.currentApiUrl + '/node/shutdown', '')
         .map((response: Response) => response);
     }
 }

Breeze.UI/src/app/shared/services/global.service.ts

@@ -6,7 +6,8 @@ export class GlobalService {
 
   private walletPath: string;
   private currentWalletName: string;
-  private coinType: number;
+  private coinType: number = 0;
+  private coinName: string = "Bitcoin";
 
   getWalletPath() {
     return this.walletPath;
@@ -35,4 +36,12 @@ export class GlobalService {
   setCoinType (coinType: number) {
     this.coinType = coinType;
   }
+
+  getCoinName () {
+    return this.coinName;
+  }
+
+  setCoinName(coinName: string) {
+    this.coinName = coinName;
+  }
 }