Updated Average Block Time

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## [UNRELEASED]
 * [#523] Implemented readable messages for IBC messages
+* [#542] Removed `startHeight` value from average block time and updated calculations to get the average block time within `averageBlockTimeWindow` instead of calculating it from genesis time.
 
 ## [v0.41.x-14.2]
 * Fixes Ledger WebUSB + Chrome 91.x issue (https://github.com/LedgerHQ/ledgerjs/issues/607)

both/i18n/en-us.i18n.yml

@@ -101,6 +101,7 @@ chainStatus:
     outOfValidators: 'out of {$totalValidators} validators'
     onlineVotingPower: 'Online Voting Power'
     fromTotalStakes: '{$percent} from {$totalStakes} {$denomPlural}'
+    averageBlockTimeWindow: '{$avgBlockTimeWindow} Blocks'
 analytics:
     blockTimeHistory: 'Block Time History'
     averageBlockTime: 'Average Block Time'

imports/api/blocks/server/methods.js

@@ -434,20 +434,29 @@ Meteor.methods({
                     let chainStatus = Chain.findOne({chainId:block.block.header.chain_id});
                     let lastSyncedTime = chainStatus?chainStatus.lastSyncedTime:0;
                     let timeDiff;
-                    let blockTime = Meteor.settings.params.defaultBlockTime;
+                    let blockTime = 0;
+                    let res;
                     if (lastSyncedTime){
+                        let blockDiff = Meteor.settings.public.averageBlockTimeWindow;
+                        let pastBlockHeight = (height - blockDiff > 0) ? (height - blockDiff) : (height - 1);
+                        let getPastBlock = `${API}/blocks/${pastBlockHeight}`;
+                        try{
+                            res = HTTP.get(getPastBlock);
+                        }
+                        catch(e){
+                            console.log(e)
+                        }
+                        let pastBlockTime = new Date(JSON.parse(res?.content)?.block?.header?.time);
                         let dateLatest = new Date(blockData.time);
                         let dateLast = new Date(lastSyncedTime);
-                        let genesisTime = new Date(Meteor.settings.public.genesisTime);
                         timeDiff = Math.abs(dateLatest.getTime() - dateLast.getTime());
-                        // blockTime = (chainStatus.blockTime * (blockData.height - 1) + timeDiff) / blockData.height;
-                        blockTime = (dateLatest.getTime() - genesisTime.getTime()) / blockData.height;
+                        blockTime = (height - blockDiff > 0) ? ((dateLatest.getTime() - pastBlockTime.getTime()) / blockDiff) : (dateLatest.getTime() - pastBlockTime.getTime());
                     }
 
                     let endGetValidatorsTime = new Date();
                     console.log("Get height validators time: "+((endGetValidatorsTime-startGetValidatorsTime)/1000)+"seconds.");
 
-                    Chain.update({chainId:block.block.header.chainId}, {$set:{lastSyncedTime:blockData.time, blockTime:blockTime}});
+                    Chain.update({ chainId: block.block.header.chain_id}, {$set:{lastSyncedTime:blockData.time, blockTime:blockTime}});
 
                     analyticsData.averageBlockTime = blockTime;
                     analyticsData.timeDiff = timeDiff;

imports/ui/home/ChainStatus.jsx

@@ -20,7 +20,7 @@ export default class ChainStatus extends React.Component {
             totalNumValidators: 0,
             avgBlockTimeType: "",
             avgVotingPowerType: "",
-            blockTimeText: <T>chainStatus.all</T>,
+            blockTimeText: <T _purify={false} avgBlockTimeWindow={numbro(Meteor.settings.public.averageBlockTimeWindow).format({ thousandSeparated: true })}>chainStatus.averageBlockTimeWindow</T>,
             votingPowerText: <T>chainStatus.now</T>
         }
     }