Merge branch 'master' into simon/configurable-main-module

This commit is contained in:
softsimon committed 2021-08-03 18:41:43 +03:00
commit ef7dd6c8fb
42 files changed
+2426 -1760

No files matched your search

+1 -1
View File
@@ -162,7 +162,7 @@ class Bisq {
this.buildIndex();
this.calculateStats();
} catch (e) {
logger.err('loadBisqDumpFile() error.' + e.message || e);
logger.info('loadBisqDumpFile() error.' + e.message || e);
}
}
+5
View File
@@ -56,6 +56,11 @@ class BitcoinApi implements AbstractBitcoinApi {
.then((rpcBlock: IBitcoinApi.Block) => rpcBlock.tx);
}
$getRawBlock(hash: string): Promise<string> {
return this.bitcoindClient.getBlock(hash, 0);
}
$getBlockHash(height: number): Promise<string> {
return this.bitcoindClient.getBlockHash(height);
}
@@ -9,6 +9,7 @@ export namespace IEsploraApi {
vin: Vin[];
vout: Vout[];
status: Status;
hex?: string;
}
export interface Recent {