Unverified Commit aba99eaf authored by Jeremy Bokobza's avatar Jeremy Bokobza Committed by GitHub

Merge pull request #385 from stratisproject/submodule-update

updated StratisBitcoinFullNode submodule
parents 9cecb69a c635332b
...@@ -136,7 +136,7 @@ export class ApiService { ...@@ -136,7 +136,7 @@ export class ApiService {
.map((response: Response) => response); .map((response: Response) => response);
} }
/** /**
* Get general wallet info from the API once. * Get general wallet info from the API once.
*/ */
getGeneralInfoOnce(data: WalletInfo): Observable<any> { getGeneralInfoOnce(data: WalletInfo): Observable<any> {
...@@ -214,7 +214,7 @@ export class ApiService { ...@@ -214,7 +214,7 @@ export class ApiService {
} }
/** /**
* Get unused receive addresses for a certain wallet from the API. * Get an unused receive address for a certain wallet from the API.
*/ */
getUnusedReceiveAddress(data: WalletInfo): Observable<any> { getUnusedReceiveAddress(data: WalletInfo): Observable<any> {
this.getCurrentCoin(); this.getCurrentCoin();
...@@ -222,9 +222,37 @@ export class ApiService { ...@@ -222,9 +222,37 @@ export class ApiService {
let params: URLSearchParams = new URLSearchParams(); let params: URLSearchParams = new URLSearchParams();
params.set('walletName', data.walletName); params.set('walletName', data.walletName);
params.set('accountName', "account 0"); //temporary params.set('accountName', "account 0"); //temporary
return this.http
.get(this.currentApiUrl + '/wallet/unusedaddress', new RequestOptions({headers: this.headers, search: params}))
.map((response: Response) => response);
}
/**
* Get multiple unused receive addresses for a certain wallet from the API.
*/
getUnusedReceiveAddresses(data: WalletInfo, count: string): Observable<any> {
this.getCurrentCoin();
let params: URLSearchParams = new URLSearchParams();
params.set('walletName', data.walletName);
params.set('accountName', "account 0"); //temporary
params.set('count', count);
return this.http return this.http
.get(this.currentApiUrl + '/wallet/address', new RequestOptions({headers: this.headers, search: params})) .get(this.currentApiUrl + '/wallet/unusedaddresses', new RequestOptions({headers: this.headers, search: params}))
.map((response: Response) => response);
}
/**
* Get get all receive addresses for an account of a wallet from the API.
*/
getAllReceiveAddresses(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.currentApiUrl + '/wallet/addresses', new RequestOptions({headers: this.headers, search: params}))
.map((response: Response) => response); .map((response: Response) => response);
} }
...@@ -241,7 +269,7 @@ export class ApiService { ...@@ -241,7 +269,7 @@ export class ApiService {
params.set('amount', data.amount); params.set('amount', data.amount);
params.set('feeType', data.feeType); params.set('feeType', data.feeType);
params.set('allowUnconfirmed', "true"); params.set('allowUnconfirmed', "true");
return this.http return this.http
.get(this.currentApiUrl + '/wallet/estimate-txfee', new RequestOptions({headers: this.headers, search: params})) .get(this.currentApiUrl + '/wallet/estimate-txfee', new RequestOptions({headers: this.headers, search: params}))
.map((response: Response) => response); .map((response: Response) => response);
......
Subproject commit 24df960b94b669c2c7ea32d2fb57bcbb194ecde8 Subproject commit 323562d4a04df281180bd5e9ad4f5c6248fec2e2
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment