Skip to content
Snippets Groups Projects
Commit f2e75f04 authored by Cédric Moreau's avatar Cédric Moreau
Browse files

Merge branch 'dev' into loki

parents 618d995d cfc6c9d7
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
app/lib/computation/QuickSync.ts
+ 2
− 4
View file @ f2e75f04
...@@ -154,18 +154,16 @@ export class QuickSynchronizer { ...@@ -154,18 +154,16 @@ export class QuickSynchronizer {
|| block.certifications.length || block.certifications.length
|| block.transactions.length || block.transactions.length
|| block.medianTime >= sync_nextExpiring) { || block.medianTime >= sync_nextExpiring) {
// logger.warn('>> Block#%s', block.number) const nextExpiringChanged = block.medianTime >= sync_nextExpiring
for (let i = 0; i < sync_expires.length; i++) { for (let i = 0; i < sync_expires.length; i++) {
let expire = sync_expires[i]; let expire = sync_expires[i];
if (block.medianTime > expire) { if (block.medianTime >= expire) {
sync_expires.splice(i, 1); sync_expires.splice(i, 1);
i--; i--;
} }
} }
const currentNextExpiring = sync_nextExpiring
sync_nextExpiring = sync_expires.reduce((max, value) => max ? Math.min(max, value) : value, 9007199254740991); // Far far away date sync_nextExpiring = sync_expires.reduce((max, value) => max ? Math.min(max, value) : value, 9007199254740991); // Far far away date
const nextExpiringChanged = currentNextExpiring !== sync_nextExpiring
// Fills in correctly the SINDEX // Fills in correctly the SINDEX
await Promise.all(Underscore.where(sync_sindex.concat(local_sindex), { op: 'UPDATE' }).map(async (entry: any) => { await Promise.all(Underscore.where(sync_sindex.concat(local_sindex), { op: 'UPDATE' }).map(async (entry: any) => {
......
gui/index.html
+ 1
− 1
View file @ f2e75f04
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Duniter 1.6.23</title> <title>Duniter 1.6.25</title>
<style> <style>
html { html {
font-family: "Courier New", Courier, monospace; font-family: "Courier New", Courier, monospace;
......
package.json
+ 2
− 2
View file @ f2e75f04
{ {
"name": "duniter", "name": "duniter",
"version": "1.6.23", "version": "1.6.25",
"engines": { "engines": {
"node": ">=8.2.1 <10", "node": ">=8.2.1 <10",
"npm": ">=3.10" "npm": ">=3.10"
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
"node-main": "./bin/duniter", "node-main": "./bin/duniter",
"window": { "window": {
"icon": "duniter.png", "icon": "duniter.png",
"title": "v1.6.23", "title": "v1.6.25",
"width": 800, "width": 800,
"height": 800, "height": 800,
"min_width": 750, "min_width": 750,
......
release/arch/windows/duniter.iss
+ 1
− 1
View file @ f2e75f04
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#error "Unable to find MyAppExe" #error "Unable to find MyAppExe"
#endif #endif
#define MyAppVerStr "v1.6.23" #define MyAppVerStr "v1.6.25"
[Setup] [Setup]
AppName={#MyAppName} AppName={#MyAppName}
......
release/extra/debian/package/DEBIAN/control
+ 1
− 1
View file @ f2e75f04
Package: duniter Package: duniter
Version: 1.6.23 Version: 1.6.25
Depends: unzip Depends: unzip
Section: misc Section: misc
Priority: optional Priority: optional
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment