Generate statistics always for the current and previous day

Author: Peter Pratscher

db/db.go

@@ -582,13 +582,6 @@ func GenerateAndSaveStatistics(date time.Time) error {
 		return fmt.Errorf("error executing %s statistics query for day %v: %w", indicator, startDate, err)
 	}
 
-	// Total number of active staked coda per day
-	indicator = "TOTAL_STAKED"
-	_, err = tx.Exec(`INSERT INTO statistics (indicator, ts, value) SELECT $1, $2, COALESCE(sum(balance), 0) from accounts where publickey in (select distinct creator from blocks where ts >= $2 AND ts <= $3) ON CONFLICT (indicator, ts) DO UPDATE SET value = EXCLUDED.value;`, indicator, startDate, endDate)
-	if err != nil {
-		return fmt.Errorf("error executing %s statistics query for day %v: %w", indicator, startDate, err)
-	}
-
 	err = tx.Commit()
 	if err != nil {
 		return fmt.Errorf("error committing statistics transaction for day %v: %w", startDate, err)

indexer/indexer.go

@@ -56,6 +56,10 @@ func updateStatistics(intv time.Duration) {
 			if err != nil {
 				logger.Errorf("error generating statistics: %w", err)
 			}
+			err = db.GenerateAndSaveStatistics(time.Now())
+			if err != nil {
+				logger.Errorf("error generating statistics: %w", err)
+			}
 		}
 	}
 }

services/services.go

@@ -120,11 +120,6 @@ func getIndexPageData() (*types.IndexPageData, error) {
 		return nil, fmt.Errorf("error retrieving active validators data: %w", err)
 	}
 
-	err = db.DB.Get(&data.TotalStaked, "select COALESCE(sum(balance), 0) from accounts where publickey in (select distinct creator from blocks where ts > now() - interval '1 day');")
-	if err != nil {
-		return nil, fmt.Errorf("error retrieving total staked data: %w", err)
-	}
-
 	err = db.DB.Get(&data.Peers, "select peerscount from daemonstatus order by ts desc limit 1;")
 	if err != nil {
 		return nil, fmt.Errorf("error retrieving peerscount data: %w", err)

templates/accounts.html

@@ -61,8 +61,8 @@ <h1 class="h4 mb-1 mb-md-0"><i class="fas fa-user mr-2"></i>Accounts</h1>
 					<tr>
 						<th>Address</th>
 						<th>Balance</th>
-						<th>First Seen</th>
-						<th>Last Seen</th>
+						<th>Added to Ledger</th>
+						<th>Most Recent Activity</th>
 						<th>Block proposed</th>
 						<th>Snark Jobs</th>
 						<th>Tx Sent</th>

templates/charts.html

@@ -50,11 +50,7 @@
             return numbro(val).format({thousandSeparated: true});
         }))
 
-        charts.push(drawChart([{name: "Total Staked", data: chartData["TOTAL_STAKED"]}], "Total Staked", "#chart-total-staked", function (val) {
-            return numbro(val).format({thousandSeparated: true});
-        }))
-
-        charts.push(drawChart([{name: "Peers Seen", data: chartData["PEERS"]}], "Peers Seen", "#chart-peers", function (val) {
+        charts.push(drawChart([{name: "Daily Peers Seen", data: chartData["PEERS"]}], "Daily Peers Seen", "#chart-peers", function (val) {
             return val;
         }))
 
@@ -137,10 +133,10 @@ <h1 class="h4 mb-1 mb-md-0">
 			<div id="chart-new-accounts" class="border-bottom mb-2"></div>
 			<div id="chart-snark-workers" class="border-bottom mb-2"></div>
 			<div id="chart-snark-fees" class="border-bottom mb-2"></div>
-			<div id="chart-total-staked" class="border-bottom mb-2"></div>
 			<div id="chart-peers" class="border-bottom mb-2"></div>
 			<span class="ml-2" style="font-size: 14px; font-weight: 900; font-family: Helvetica, Arial, sans-serif; opacity: 1;">Peer Map</span>
 			<div id="map-peers" class="border-bottom mb-2" style="position: relative; margin: 0 auto; width: 750px; height: 500px;"></div>
+			<small class="text-muted">This site includes IP2Location LITE data available from <a href="https://lite.ip2location.com">https://lite.ip2location.com</a>.</small>
 		</div>
 	</div>
 {{end}}

templates/index.html

@@ -183,12 +183,6 @@ <h5 class="font-weight-normal mb-0">
 									<span data-toggle="tooltip" data-placement="top" title="The number of currently active validators">${ page.active_validators }</span>
 								</h5>
 							</div>
-							<div class="text-center p-2">
-								<div class="text-secondary mb-0">Peers</div>
-								<h5 class="font-weight-normal mb-0">
-									<span data-toggle="tooltip" data-placement="top" title="The most recent slot">${ page.peers }</span>
-								</h5>
-							</div>
 							<div class="text-right p-2">
 								<div class="text-secondary mb-0">Active Snark Workers</div>
 								<h5 class="font-weight-normal mb-0">
@@ -200,9 +194,9 @@ <h5 class="font-weight-normal mb-0">
 					<div class="col-md-4">
 						<div class="d-flex justify-content-between">
 							<div class="p-2">
-								<div class="text-secondary mb-0">Staked Coda</div>
+								<div class="text-secondary mb-0">Peers</div>
 								<h5 class="font-weight-normal mb-0">
-									<span data-toggle="tooltip" data-placement="top" title="Lower bound of the amount of coda currently staking">${ page.total_staked | formatCurrency }</span>
+									<span data-toggle="tooltip" data-placement="top" title="The most recent slot">${ page.peers }</span>
 								</h5>
 							</div>
 							<div class="text-right p-2">

types/templates.go

@@ -49,7 +49,6 @@ type IndexPageData struct {
 	CurrentHeight    int      `json:"current_height"`
 	ActiveValidators int      `json:"active_validators"`
 	ActiveWorkers    int      `json:"active_workers"`
-	TotalStaked      int      `json:"total_staked"`
 	TotalSupply      int      `json:"total_supply"`
 	Peers            int      `json:"peers"`
 	Blocks           []*Block `json:"blocks"`