simplify slices

berachain · Dec 19, 2024 · cee7735 · cee7735
1 parent 7743f7c
commit cee7735
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 21 deletions.
diff --git a/beacon/validator/block_builder.go b/beacon/validator/block_builder.go
@@ -311,34 +311,23 @@ func (s *Service[
 		return ErrNilDepositIndexStart
 	}
 
-	blkDeposits, err := s.sb.DepositStore().GetDepositsByIndex(
-		depositIndex, s.chainSpec.MaxDepositsPerBlock(),
+	// Grab all previous deposits from genesis up to the current index + max deposits per block.
+	deposits, err := s.sb.DepositStore().GetDepositsByIndex(
+		0, depositIndex+s.chainSpec.MaxDepositsPerBlock(),
 	)
 	if err != nil {
 		return err
 	}
 
-	// Set the deposits on the block body.
+	var eth1Data *ctypes.Eth1Data
+	body.SetEth1Data(eth1Data.New(deposits.HashTreeRoot(), 0, common.ExecutionHash{}))
+
+	// Set the just the block deposits (after current index) on the block body.
 	s.logger.Info(
 		"Building block body with local deposits",
-		"start_index", depositIndex, "num_deposits", len(blkDeposits),
+		"start_index", depositIndex, "num_deposits", uint64(len(deposits))-depositIndex,
 	)
-	body.SetDeposits(blkDeposits)
-
-	// Grab all previous deposits from genesis up to the current index
-	// to calculate deposit root.
-	deposits, err := s.sb.DepositStore().GetDepositsByIndex(0, depositIndex)
-	if err != nil {
-		return err
-	}
-	deposits = append(deposits, blkDeposits...)
-
-	var eth1Data *ctypes.Eth1Data
-	body.SetEth1Data(eth1Data.New(
-		deposits.HashTreeRoot(),
-		0,
-		common.ExecutionHash{},
-	))
+	body.SetDeposits(deposits[depositIndex:])
 
 	// Set the graffiti on the block body.
 	sizedGraffiti := bytes.ExtendToSize([]byte(s.cfg.Graffiti), bytes.B32Size)

diff --git a/consensus-types/types/deposits.go b/consensus-types/types/deposits.go
@@ -53,5 +53,6 @@ func (ds Deposits) DefineSSZ(c *ssz.Codec) {
 
 // HashTreeRoot returns the hash tree root of the Deposits.
 func (ds Deposits) HashTreeRoot() common.Root {
+	// TODO: determine if using HashConcurrent optimizes performance.
 	return ssz.HashSequential(ds)
 }
diff --git a/storage/deposit/store.go b/storage/deposit/store.go
@@ -79,7 +79,7 @@ func (kv *KVStore) GetDepositsByIndex(
 	kv.mu.RLock()
 	defer kv.mu.RUnlock()
 	var (
-		deposits = ctypes.Deposits{}
+		deposits = make(ctypes.Deposits, 0, depRange)
 		endIdx   = startIndex + depRange
 	)