Merge pull request #535 from ethpandaops/bbusa/change-default-blob-view

chore: change the calculator time frame to 18d

Author: barnabasbusa

handlers/blobs.go

@@ -93,7 +93,7 @@ func buildBlobsPageData() (*models.BlobsPageData, time.Duration) {
 		pageData.BlobsLast1h = stats.BlobsLast1h
 		pageData.BlobsLast24h = stats.BlobsLast24h
 		pageData.BlobsLast7d = stats.BlobsLast7d
-		pageData.BlobsLast30d = stats.BlobsLast18d
+		pageData.BlobsLast18d = stats.BlobsLast18d
 		pageData.BlocksWithBlobsLast1h = stats.BlocksWithBlobsLast1h
 		pageData.BlocksWithBlobsLast24h = stats.BlocksWithBlobsLast24h
 		pageData.BlocksWithBlobsLast7d = stats.BlocksWithBlobsLast7d

templates/blobs/blobs.html

@@ -115,7 +115,7 @@ <h5 class="mb-0"><i class="fas fa-calculator"></i> Blob Storage Calculator (Peer
           <div class="alert alert-success p-4 text-center border-2">
             <h4 class="mb-2 text-success">Current Storage Required</h4>
             <h1 class="mb-0 display-4 fw-bold text-success" id="storageResult">Loading...</h1>
-            <small class="text-muted d-block mt-2" id="storageDescription">Based on {{ formatAddCommas .BlobsLast30d }} blobs in last 1d</small>
+            <small class="text-muted d-block mt-2" id="storageDescription">Based on {{ formatAddCommas .BlobsLast18d }} blobs in last 18d</small>
           </div>
 
           <div class="mt-3">
@@ -210,10 +210,10 @@ <h5 class="mb-0"><i class="fas fa-list"></i> Latest Blob Transactions</h5>
 const FREE_THRESHOLD_ETH = VALIDATOR_CUSTODY_REQUIREMENT * MAX_EFFECTIVE_BALANCE_ETH;
 const MAX_ETH = {{ .StorageCalculator.MaxEth }};
 
-const blobsInRetentionWindow = {{ .BlobsLast30d }};
+const blobsInRetentionWindow = {{ .BlobsLast18d }};
 const blobsLast24h = {{ .BlobsLast24h }};
 const blobsLast7d = {{ .BlobsLast7d }};
-const blobsLast18d = {{ .BlobsLast30d }};
+const blobsLast18d = {{ .BlobsLast18d }};
 
 const timeStats = {
   '1h': {
@@ -235,7 +235,7 @@ <h5 class="mb-0"><i class="fas fa-list"></i> Latest Blob Transactions</h5>
     label: '7d'
   },
   '18d': {
-    blobs: {{ .BlobsLast30d }},
+    blobs: {{ .BlobsLast18d }},
     blocksWithBlobs: {{ .BlocksWithBlobsLast18d }},
     blobGas: {{ .BlobGasLast18d }},
     label: '18d'
@@ -244,6 +244,7 @@ <h5 class="mb-0"><i class="fas fa-list"></i> Latest Blob Transactions</h5>
 
 let currentPeriod = '1d';
 let currentBlobCount = {{ .BlobsLast24h }};
+const calculatorBlobCount = {{ .BlobsLast18d }};
 
 function updateTimeStats(period) {
   const stats = timeStats[period];
@@ -262,9 +263,6 @@ <h5 class="mb-0"><i class="fas fa-list"></i> Latest Blob Transactions</h5>
 
   const avgGas = blocks > 0 ? Math.round(gas / blocks).toLocaleString() : '0';
   document.getElementById('timeAvgGas').textContent = avgGas;
-
-  const ethValue = parseInt(document.getElementById('ethSlider').value);
-  updateCalculator(ethValue, false);
 }
 
 function calculateCustodyColumns(eth) {
@@ -286,7 +284,7 @@ <h5 class="mb-0"><i class="fas fa-list"></i> Latest Blob Transactions</h5>
   const columns = calculateCustodyColumns(eth);
   const custodyPercent = ((columns / TOTAL_COLUMNS) * 100).toFixed(2);
 
-  const blobsToStore = currentBlobCount > 0 ? currentBlobCount : 0;
+  const blobsToStore = calculatorBlobCount > 0 ? calculatorBlobCount : 0;
 
   const storageBytes = blobsToStore * columns * COLUMN_SIZE_BYTES;
   const storageKiB = storageBytes / 1024;
@@ -337,7 +335,7 @@ <h5 class="mb-0"><i class="fas fa-list"></i> Latest Blob Transactions</h5>
 
   document.getElementById('storageResult').textContent = storageText;
 
-  const descText = 'Based on ' + currentBlobCount.toLocaleString() + ' blobs in last ' + currentPeriod;
+  const descText = 'Based on ' + calculatorBlobCount.toLocaleString() + ' blobs in last 18d';
   document.getElementById('storageDescription').textContent = descText;
 }
 

types/models/blobs.go

@@ -8,7 +8,7 @@ type BlobsPageData struct {
 	BlobsLast1h            uint64                 `json:"blobs_last_1h"`
 	BlobsLast24h           uint64                 `json:"blobs_last_24h"`
 	BlobsLast7d            uint64                 `json:"blobs_last_7d"`
-	BlobsLast30d           uint64                 `json:"blobs_last_30d"`
+	BlobsLast18d           uint64                 `json:"blobs_last_18d"`
 	BlocksWithBlobsLast1h  uint64                 `json:"blocks_with_blobs_last_1h"`
 	BlocksWithBlobsLast24h uint64                 `json:"blocks_with_blobs_last_24h"`
 	BlocksWithBlobsLast7d  uint64                 `json:"blocks_with_blobs_last_7d"`