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

Fix: synchronization issues

parent f96109e2
No related branches found
No related tags found
No related merge requests found
...@@ -45,7 +45,8 @@ function Block(json) { ...@@ -45,7 +45,8 @@ function Block(json) {
"time", "time",
"medianTime", "medianTime",
"membersCount", "membersCount",
"monetaryMass" "monetaryMass",
"unitbase"
].forEach(function(field){ ].forEach(function(field){
json[field] = parseInt(that[field], 10); json[field] = parseInt(that[field], 10);
}); });
...@@ -66,8 +67,7 @@ function Block(json) { ...@@ -66,8 +67,7 @@ function Block(json) {
json[field] = that[field] || null; json[field] = that[field] || null;
}); });
[ [
"dividend", "dividend"
"unitbase"
].forEach(function(field){ ].forEach(function(field){
json[field] = parseInt(that[field]) || null; json[field] = parseInt(that[field]) || null;
}); });
......
...@@ -452,17 +452,13 @@ function BlockchainService () { ...@@ -452,17 +452,13 @@ function BlockchainService () {
}; };
// Insert a bunch of blocks // Insert a bunch of blocks
let lastPrevious = blocks[0].number == 0 ? null : yield dal.getBlock(blocks[0].number - 1); let lastPrevious = blocks[0].number == 0 ? null : yield dal.getBlock(blocks[0].number - 1);
let rootBlock = (blocks[0].number == 0 ? blocks[0] : null) || (yield dal.getBlockOrNull(0));
let rootConf = getParameters(rootBlock);
let maxBlock = getMaxBlocksToStoreAsFile(rootConf);
let lastBlockToSave = blocks[blocks.length - 1];
for (let i = 0; i < blocks.length; i++) { for (let i = 0; i < blocks.length; i++) {
let previous = i > 0 ? blocks[i - 1] : lastPrevious; let previous = i > 0 ? blocks[i - 1] : lastPrevious;
let block = blocks[i]; let block = blocks[i];
block.fork = false; block.fork = false;
//console.log('Block #%s', block.number);
// Monetary mass & UD Time recording before inserting elements // Monetary mass & UD Time recording before inserting elements
block.monetaryMass = (previous && previous.monetaryMass) || 0; block.monetaryMass = (previous && previous.monetaryMass) || 0;
block.unitbase = block.unitbase || 0;
block.dividend = block.dividend || 0; block.dividend = block.dividend || 0;
// UD Time update // UD Time update
let previousBlock = i > 0 ? blocks[i - 1] : lastPrevious; let previousBlock = i > 0 ? blocks[i - 1] : lastPrevious;
...@@ -493,7 +489,7 @@ function BlockchainService () { ...@@ -493,7 +489,7 @@ function BlockchainService () {
yield mainContext.updateCertificationsForBlocks(blocks); yield mainContext.updateCertificationsForBlocks(blocks);
// Create / Update sources // Create / Update sources
yield mainContext.updateTransactionSourcesForBlocks(blocks); yield mainContext.updateTransactionSourcesForBlocks(blocks);
yield dal.blockDAL.saveBunch(blocks, (targetLastNumber - lastBlockToSave.number) > maxBlock); yield dal.blockDAL.saveBunch(blocks);
yield pushStatsForBlocks(blocks); yield pushStatsForBlocks(blocks);
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment