diff --git a/templates/slot/blobs.html b/templates/slot/blobs.html index f913dc26d..337623d85 100644 --- a/templates/slot/blobs.html +++ b/templates/slot/blobs.html @@ -32,7 +32,7 @@
- Load Blob Data + Load Blob Data
diff --git a/templates/slot/block_access_list.html b/templates/slot/block_access_list.html index fc632d825..91e5bf264 100644 --- a/templates/slot/block_access_list.html +++ b/templates/slot/block_access_list.html @@ -1828,18 +1828,18 @@
Hash: - 0x${bytesToHex(tx.hash)} - + 0x${balBytesToHex(tx.hash)} +
From: - 0x${bytesToHex(tx.from)} - + 0x${balBytesToHex(tx.from)} +
To: - ${tx.to ? `0x${bytesToHex(tx.to)}` : 'Contract Creation'} - ${tx.to ? `` : ''} + ${tx.to ? `0x${balBytesToHex(tx.to)}` : 'Contract Creation'} + ${tx.to ? `` : ''}
Value: @@ -1908,7 +1908,7 @@
} } - function bytesToHex(bytes) { + function balBytesToHex(bytes) { if (typeof bytes === 'string') { // Check if it's a base64 string if (bytes.match(/^[A-Za-z0-9+/]+=*$/)) { diff --git a/templates/slot/slot.html b/templates/slot/slot.html index 8360d5101..0cbf7e7f6 100644 --- a/templates/slot/slot.html +++ b/templates/slot/slot.html @@ -38,7 +38,7 @@

Overview {{ if .Block }} - {{ if gt .Block.TransactionsCount 0 }} + {{ if or (gt .Block.TransactionsCount 0) (and .Block.ExecutionData .Block.ExecutionData.BlockAccessList) }}
  • Transactions {{ .Block.TransactionsCount }}
    • @@ -51,69 +51,49 @@

  • Attestations {{ .Block.AttestationsCount }}
    • - {{ if gt .Block.PtcVotesCount 0 }} + {{ if or (gt .Block.DepositsCount 0) (gt .Block.DepositRequestsCount 0) }}
  • - PTC Votes {{ .Block.PtcVotesCount }} + Deposits {{ addUI64 .Block.DepositsCount .Block.DepositRequestsCount }}
    • {{ end }} - {{ if gt .Block.DepositsCount 0 }} + {{ if gt .Block.ConsolidationRequestsCount 0 }}
  • - Deposits {{ .Block.DepositsCount }} + Consolidations {{ .Block.ConsolidationRequestsCount }}
    • {{ end }} {{ if gt .Block.VoluntaryExitsCount 0 }}
  • - Voluntary Exits {{ .Block.VoluntaryExitsCount }} + Exits {{ .Block.VoluntaryExitsCount }}
    • {{ end }} - {{ if gt .Block.AttesterSlashingsCount 0 }} + {{ if or (gt .Block.WithdrawalsCount 0) (gt .Block.WithdrawalRequestsCount 0) }}
  • - Attester Slashings {{ .Block.AttesterSlashingsCount }} + Withdrawals {{ addUI64 .Block.WithdrawalsCount .Block.WithdrawalRequestsCount }}
    • {{ end }} - {{ if gt .Block.ProposerSlashingsCount 0 }} + {{ if or (gt .Block.AttesterSlashingsCount 0) (gt .Block.ProposerSlashingsCount 0) }}
  • - Proposer Slashings {{ .Block.ProposerSlashingsCount }} + Slashings {{ addUI64 .Block.AttesterSlashingsCount .Block.ProposerSlashingsCount }}
    • {{ end }} - {{ if gt .Block.WithdrawalsCount 0 }} + {{ if gt .Block.PtcVotesCount 0 }}
  • - Withdrawals {{ .Block.WithdrawalsCount }} + PTC Votes {{ .Block.PtcVotesCount }}
    • {{ end }} {{ if gt .Block.BLSChangesCount 0 }}
  • - BLS Change {{ .Block.BLSChangesCount }} + BLS Changes {{ .Block.BLSChangesCount }}
    • {{ end }} {{ if gt .Block.BlobsCount 0 }}
  • - Blob Sidecars {{ .Block.BlobsCount }} -
    • - {{ end }} - {{ if gt .Block.DepositRequestsCount 0 }} -
  • - Deposit Requests {{ .Block.DepositRequestsCount }} -
    • - {{ end }} - {{ if gt .Block.WithdrawalRequestsCount 0 }} -
  • - Withdrawal Requests {{ .Block.WithdrawalRequestsCount }} -
    • - {{ end }} - {{ if gt .Block.ConsolidationRequestsCount 0 }} -
  • - Consolidation Requests {{ .Block.ConsolidationRequestsCount }} -
    • - {{ end }} - {{ if and .Block.ExecutionData .Block.ExecutionData.BlockAccessList }} -
  • - Access List {{ len .Block.ExecutionData.BlockAccessList }} + Blobs {{ .Block.BlobsCount }}
    • {{ end }} {{ if gt .Block.InclusionListsCount 0 }}
  • - Inclusion Lists {{ .Block.InclusionListsCount }} + FOCILs {{ .Block.InclusionListsCount }}
    • {{ end }} {{ if gt .Block.ExecutionProofsCount 0 }} @@ -123,7 +103,7 @@

    {{ end }} {{ if .Block }}
  • - +
    • @@ -138,19 +118,75 @@

    {{ if .Block }} - {{ if gt .Block.TransactionsCount 0 }} -
    + {{ if or (gt .Block.TransactionsCount 0) (and .Block.ExecutionData .Block.ExecutionData.BlockAccessList) }} + {{ $hasBal := and .Block.ExecutionData .Block.ExecutionData.BlockAccessList }} + {{ $hasTxs := gt .Block.TransactionsCount 0 }} +
    + {{ if and $hasTxs $hasBal }} + +
    +
    +
    +
    +
    +

    Showing {{ .Block.TransactionsCount }} Transactions

    +
    +
    + {{ template "block_transactions" . }} +
    +
    +
    +
    +
    +
    +

    Block Access List (EIP-7928)

    +
    +
    + {{ template "block_access_list" . }} +
    +
    +
    + {{ else if $hasTxs }} +
    +
    +
    +

    Showing {{ .Block.TransactionsCount }} Transactions

    +
    +
    + {{ template "block_transactions" . }} +
    + {{ else if $hasBal }} +
    +
    +
    +

    Block Access List (EIP-7928)

    +
    +
    + {{ template "block_access_list" . }} +
    + {{ end }} +
    + {{ end }} + {{ if gt .Block.BidsCount 0 }} +
    -

    Showing {{ .Block.TransactionsCount }} Transactions

    +

    Showing {{ .Block.BidsCount }} Execution Payload Bids

    - {{ template "block_transactions" . }} + {{ template "block_bids" . }}
    {{ end }} -
    +
    @@ -163,164 +199,140 @@

    {{ template "block_attestations" . }}
    - {{ if gt .Block.DepositsCount 0 }} -
    -
    -
    -
    -

    Showing {{ .Block.DepositsCount }} Deposits

    -
    -
    - {{ template "block_deposits" . }} -
    -
    - {{ end }} - {{ if gt .Block.VoluntaryExitsCount 0 }} -
    -
    -
    -
    -

    Showing {{ .Block.VoluntaryExitsCount }} Exits

    -
    -
    - {{ template "block_voluntary_exits" . }} -
    -
    - {{ end }} - {{ if gt .Block.AttesterSlashingsCount 0 }} -
    -
    -
    -
    -

    Showing {{ .Block.AttesterSlashingsCount }} Attester Slashing(s)

    + {{ if or (gt .Block.DepositsCount 0) (gt .Block.DepositRequestsCount 0) }} +
    + {{ if gt .Block.DepositRequestsCount 0 }} +
    +
    +
    +

    Showing {{ .Block.DepositRequestsCount }} Deposit Requests

    +
    + {{ template "block_deposit_requests" . }}
    -
    - {{ template "block_attesterSlashing" . }} -
    - {{ end }} - {{ if gt .Block.ProposerSlashingsCount 0 }} -
    -
    -
    -
    -

    Showing {{ .Block.ProposerSlashingsCount }} Proposer Slashing(s)

    + {{ end }} + {{ if gt .Block.DepositsCount 0 }} +
    +
    +
    +

    Showing {{ .Block.DepositsCount }} Legacy Deposits

    +
    + {{ template "block_deposits" . }}
    -
    - {{ template "block_proposerSlashing" . }} + {{ end }}
    {{ end }} - {{ if gt .Block.WithdrawalsCount 0 }} -
    + {{ if gt .Block.ConsolidationRequestsCount 0 }} +
    -

    Showing {{ .Block.WithdrawalsCount }} Withdrawals

    +

    Showing {{ .Block.ConsolidationRequestsCount }} Consolidation Requests

    - {{ template "block_withdrawals" . }} + {{ template "block_consolidation_requests" . }}
    {{ end }} - {{ if gt .Block.BLSChangesCount 0 }} -
    + {{ if gt .Block.VoluntaryExitsCount 0 }} +
    -

    Showing {{ .Block.BLSChangesCount }} BLS changes

    +

    Showing {{ .Block.VoluntaryExitsCount }} Voluntary Exits

    - {{ template "block_blsChange" . }} + {{ template "block_voluntary_exits" . }}
    {{ end }} - {{ if gt .Block.BlobsCount 0 }} -
    -
    -
    -
    -

    Showing {{ .Block.BlobsCount }} Blob sidecars

    + {{ if or (gt .Block.WithdrawalsCount 0) (gt .Block.WithdrawalRequestsCount 0) }} +
    + {{ if gt .Block.WithdrawalRequestsCount 0 }} +
    +
    +
    +

    Showing {{ .Block.WithdrawalRequestsCount }} Withdrawal Requests

    +
    + {{ template "block_withdrawal_requests" . }}
    -
    - {{ template "block_blobSidecar" . }} -
    - {{ end }} - {{ if gt .Block.DepositRequestsCount 0 }} -
    -
    -
    -
    -

    Showing {{ .Block.DepositRequestsCount }} Deposit Requests

    + {{ end }} + {{ if gt .Block.WithdrawalsCount 0 }} +
    +
    +
    +

    Showing {{ .Block.WithdrawalsCount }} Executed Withdrawals

    +
    + {{ template "block_withdrawals" . }}
    -
    - {{ template "block_deposit_requests" . }} + {{ end }}
    {{ end }} - {{ if gt .Block.WithdrawalRequestsCount 0 }} -
    -
    -
    -
    -

    Showing {{ .Block.WithdrawalRequestsCount }} Withdrawal Requests

    + {{ if or (gt .Block.AttesterSlashingsCount 0) (gt .Block.ProposerSlashingsCount 0) }} +
    + {{ if gt .Block.AttesterSlashingsCount 0 }} +
    +
    +
    +

    Showing {{ .Block.AttesterSlashingsCount }} Attester Slashing(s)

    +
    -
    - {{ template "block_withdrawal_requests" . }} -
    - {{ end }} - {{ if gt .Block.ConsolidationRequestsCount 0 }} -
    -
    -
    -
    -

    Showing {{ .Block.ConsolidationRequestsCount }} Consolidation Requests

    + {{ template "block_attesterSlashing" . }} + {{ end }} + {{ if gt .Block.ProposerSlashingsCount 0 }} +
    +
    +
    +

    Showing {{ .Block.ProposerSlashingsCount }} Proposer Slashing(s)

    +
    -
    - {{ template "block_consolidation_requests" . }} + {{ template "block_proposerSlashing" . }} + {{ end }}
    {{ end }} - {{ if and .Block.ExecutionData .Block.ExecutionData.BlockAccessList }} -
    + {{ if gt .Block.PtcVotesCount 0 }} +
    -

    Block Access List (EIP-7928)

    +

    Showing {{ .Block.PtcVotesCount }} PTC Votes (for slot {{ .Block.PtcVotes.VotedSlot }})

    - {{ template "block_access_list" . }} + {{ template "block_ptc_votes" . }}
    {{ end }} - {{ if gt .Block.BidsCount 0 }} -
    + {{ if gt .Block.BLSChangesCount 0 }} +
    -

    Showing {{ .Block.BidsCount }} Execution Payload Bids

    +

    Showing {{ .Block.BLSChangesCount }} BLS Changes

    - {{ template "block_bids" . }} + {{ template "block_blsChange" . }}
    {{ end }} - {{ if gt .Block.PtcVotesCount 0 }} -
    + {{ if gt .Block.BlobsCount 0 }} +
    -

    Showing {{ .Block.PtcVotesCount }} PTC Votes (for slot {{ .Block.PtcVotes.VotedSlot }})

    +

    Showing {{ .Block.BlobsCount }} Blob Sidecars

    - {{ template "block_ptc_votes" . }}
    + {{ template "block_blobSidecar" . }}
    {{ end }} {{ if gt .Block.InclusionListsCount 0 }} -
    +
    @@ -332,7 +344,7 @@

    Showing {{ .Block.InclusionListsCount }}

    {{ end }} {{ if gt .Block.ExecutionProofsCount 0 }} -
    +
    @@ -439,15 +451,6 @@
    Tracoor Traces
    {{ end }}