Merge branch 'master' into simon/npm-audit-fix-04-28

This commit is contained in:
wiz authored and GitHub committed 2022-05-06 15:11:28 +09:00
commit 5336ba8160
27 files changed
+575 -488

No files matched your search

+1 -1
View File
@@ -56,7 +56,7 @@ class DatabaseMigration {
}
if (DatabaseMigration.currentVersion > databaseSchemaVersion) {
logger.notice('MIGRATIONS: Upgrading datababse schema');
logger.notice('MIGRATIONS: Upgrading database schema');
try {
await this.$migrateTableSchemaFromVersion(databaseSchemaVersion);
logger.notice(`MIGRATIONS: OK. Database schema have been migrated from version ${databaseSchemaVersion} to ${DatabaseMigration.currentVersion} (latest version)`);
+2
View File
@@ -630,6 +630,8 @@ class Routes {
res.json({
hashrates: hashrates,
difficulty: difficulty,
currentHashrate: await bitcoinClient.getNetworkHashPs(),
currentDifficulty: await bitcoinClient.getDifficulty(),
});
} catch (e) {
res.status(500).send(e instanceof Error ? e.message : e);