Improve copy button position

rpc/lighthouse.go

@@ -258,6 +258,37 @@ func (lc *LighthouseClient) GetEpochData(epoch uint64) (*types.EpochData, error)
 		return nil, fmt.Errorf("error parsing epoch validators: %v", err)
 	}
 
+	epoch1d := int64(epoch) - 225
+	if epoch1d < 0 {
+		epoch1d = 0
+	}
+	start := time.Now()
+	validatorBalances1d, err := lc.getBalancesForEpoch(epoch1d)
+	if err != nil {
+		return nil, err
+	}
+	logger.Printf("retrieved data for %v validator balances for epoch %v (1d) took %v", len(parsedValidators.Data), epoch1d, time.Since(start))
+	epoch7d := int64(epoch) - 225*7
+	if epoch7d < 0 {
+		epoch7d = 0
+	}
+	start = time.Now()
+	validatorBalances7d, err := lc.getBalancesForEpoch(epoch7d)
+	if err != nil {
+		return nil, err
+	}
+	logger.Printf("retrieved data for %v validator balances for epoch %v (7d) took %v", len(parsedValidators.Data), epoch7d, time.Since(start))
+	start = time.Now()
+	epoch31d := int64(epoch) - 225*31
+	if epoch31d < 0 {
+		epoch31d = 0
+	}
+	validatorBalances31d, err := lc.getBalancesForEpoch(epoch31d)
+	if err != nil {
+		return nil, err
+	}
+	logger.Printf("retrieved data for %v validator balances for epoch %v (31d) took %v", len(parsedValidators.Data), epoch31d, time.Since(start))
+
 	for _, validator := range parsedValidators.Data {
 		data.Validators = append(data.Validators, &types.Validator{
 			Index:                      uint64(validator.Index),
@@ -270,6 +301,9 @@ func (lc *LighthouseClient) GetEpochData(epoch uint64) (*types.EpochData, error)
 			ActivationEpoch:            uint64(validator.Validator.ActivationEpoch),
 			ExitEpoch:                  uint64(validator.Validator.ExitEpoch),
 			WithdrawableEpoch:          uint64(validator.Validator.WithdrawableEpoch),
+			Balance1d:                  validatorBalances1d[uint64(validator.Index)],
+			Balance7d:                  validatorBalances7d[uint64(validator.Index)],
+			Balance31d:                 validatorBalances31d[uint64(validator.Index)],
 		})
 	}
 
@@ -380,6 +414,34 @@ func uint64List(li []uint64Str) []uint64 {
 	return out
 }
 
+func (lc *LighthouseClient) getBalancesForEpoch(epoch int64) (map[uint64]uint64, error) {
+
+	if epoch < 0 {
+		epoch = 0
+	}
+
+	var err error
+
+	validatorBalances := make(map[uint64]uint64)
+
+	resp, err := lc.get(fmt.Sprintf("%s/eth/v1/beacon/states/%d/validator_balances", lc.endpoint, epoch*int64(utils.Config.Chain.SlotsPerEpoch)))
+	if err != nil {
+		return validatorBalances, err
+	}
+
+	var parsedResponse StandardValidatorBalancesResponse
+	err = json.Unmarshal(resp, &parsedResponse)
+	if err != nil {
+		return nil, fmt.Errorf("error parsing response for validator_balances")
+	}
+
+	for _, b := range parsedResponse.Data {
+		validatorBalances[uint64(b.Index)] = uint64(b.Balance)
+	}
+
+	return validatorBalances, nil
+}
+
 // GetBlocksBySlot will get the blocks by slot from Lighthouse RPC api
 func (lc *LighthouseClient) GetBlocksBySlot(slot uint64) ([]*types.Block, error) {
 	respRoot, err := lc.get(fmt.Sprintf("%s/eth/v1/beacon/blocks/%d/root", lc.endpoint, slot))
@@ -604,7 +666,7 @@ func (lc *LighthouseClient) GetFinalityCheckpoints(epoch uint64) (*types.Finalit
 var notFoundErr = errors.New("not found 404")
 
 func (lc *LighthouseClient) get(url string) ([]byte, error) {
-	client := &http.Client{Timeout: time.Second * 60}
+	client := &http.Client{Timeout: time.Second * 120}
 
 	resp, err := client.Get(url)
 	if err != nil {
@@ -891,3 +953,10 @@ type StandardSyncingResponse struct {
 		SyncDistance uint64Str `json:"sync_distance"`
 	} `json:"data"`
 }
+
+type StandardValidatorBalancesResponse struct {
+	Data []struct {
+		Index   uint64Str `json:"index"`
+		Balance uint64Str `json:"balance"`
+	} `json:"data"`
+}

static/js/dashboard.js

@@ -424,6 +424,7 @@ $(document).ready(function() {
         data: '0',
         createdCell: function(td, cellData, rowData, row, col) {
           $(td).css('display', 'flex');
+          $(td).css('align-items', 'center');
           $(td).css('justify-content', 'space-between');
       },
         render: function(data, type, row, meta) {

templates/epoch.html

@@ -250,7 +250,7 @@ <h1 class="h4 mb-1 mb-md-0">
                                     <td aria-ethereum-date="{{.Ts.Unix}}"
                                         aria-ethereum-date-format="FROMNOW">{{.Ts.Format "2006-01-02T15:04:05"}}</td>
                                     <td><a href="/validator/{{.Proposer}}">{{formatAddCommas .Proposer}}</a></td>
-                                    <td class="text-monospace">
+                                    <td class="d-flex align-items-center text-monospace">
                                         {{if eq .Status 1}}
                                             <a href="/block/{{printf "%x" .BlockRoot}}">0x{{printf "%.4x" .BlockRoot}}...</a>
                                             <i style="padding: .25rem;" class="fa fa-copy text-muted" role="button" data-toggle="tooltip" title="Copy to clipboard" data-clipboard-text=0x{{printf "%x" .BlockRoot}}></i>

templates/poap.html

@@ -92,6 +92,7 @@
                 data: '0',
                 createdCell: function(td, cellData, rowData, row, col) {
                     $(td).css('display', 'flex');
+                    $(td).css('align-items', 'center');
                     $(td).css('justify-content', 'space-between');
                 },
                 render: function(data, type, row) {

templates/validators.html

@@ -119,6 +119,7 @@ <h6 class="dropdown-header"><span>Filter state</span> <span><span class="text-su
                         data: '0',
                         createdCell: function(td, cellData, rowData, row, col) {
                             $(td).css('display', 'flex');
+                            $(td).css('align-items', 'center');
                             $(td).css('justify-content', 'space-between');
                         },
                         render: function(data, type, row, meta) {

utils/format.go

@@ -379,9 +379,9 @@ func FormatHash(hash []byte) template.HTML {
 	// }
 	// return template.HTML(fmt.Sprintf("<span class=\"text-monospace\">0x%x</span>", hash))
 	if len(hash) > 3 {
-		return template.HTML(fmt.Sprintf("<div class=\"d-inline mr-4 mr-lg-0\" style=\"position: relative;\"><span style=\"display: inline-block; width: 60px;\" class=\"text-monospace\">%#x…</span><i onclick=\"event.preventDefault()\" style=\"position: relative; left: 25px; padding: .25rem;\" class=\"fa fa-copy text-muted\" role=\"button\" data-toggle=\"tooltip\" title=\"Copy to clipboard\" data-clipboard-text=0x%x></i></div>", hash[:3], hash))
+		return template.HTML(fmt.Sprintf("<div class=\"d-inline mr-4 mr-lg-0\" style=\"position: relative;\"><span style=\"display: inline-block; width: 2.4rem;\" class=\"text-monospace\">%#x…</span><i onclick=\"event.preventDefault()\" style=\"position: relative; left: 2.6rem; padding: .25rem;\" class=\"fa fa-copy text-muted\" role=\"button\" data-toggle=\"tooltip\" title=\"Copy to clipboard\" data-clipboard-text=0x%x></i></div>", hash[:3], hash))
 	}
-	return template.HTML(fmt.Sprintf("<div class=\"d-inline mr-4 mr-lg-0\" style=\"position: relative;\"><span style=\"display: inline-block; width: 60px;\" class=\"text-monospace\">%#x…</span><i onclick=\"event.preventDefault()\" style=\"position: relative; left: 25px; padding: .25rem;\" class=\"fa fa-copy text-muted\" role=\"button\" data-toggle=\"tooltip\" title=\"Copy to clipboard\" data-clipboard-text=0x%x></i></div>", hash, hash))
+	return template.HTML(fmt.Sprintf("<div class=\"d-inline mr-4 mr-lg-0\" style=\"position: relative;\"><span style=\"display: inline-block; width: 2.4rem;\" class=\"text-monospace\">%#x…</span><i onclick=\"event.preventDefault()\" style=\"position: relative; left: 2.6rem; padding: .25rem;\" class=\"fa fa-copy text-muted\" role=\"button\" data-toggle=\"tooltip\" title=\"Copy to clipboard\" data-clipboard-text=0x%x></i></div>", hash, hash))
 }
 
 func FormatBitlist(bits []byte) template.HTML {