refactor(database): use point in block nonce operations (#996)

Signed-off-by: Chris Gianelloni <wolf31o2@blinklabs.io>

Author: wolf31o2

database/block_nonce.go

@@ -14,16 +14,19 @@
 
 package database
 
-// GetBlockNonce fetches the block nonce for a given slot/hash
+import (
+	ocommon "github.com/blinklabs-io/gouroboros/protocol/common"
+)
+
+// GetBlockNonce fetches the block nonce for a given chain point
 func (d *Database) GetBlockNonce(
-	blockHash []byte,
-	slotNumber uint64,
+	point ocommon.Point,
 	txn *Txn,
 ) ([]byte, error) {
 	if txn == nil {
-		return d.metadata.GetBlockNonce(blockHash, slotNumber, nil)
+		return d.metadata.GetBlockNonce(point, nil)
 	}
-	return d.metadata.GetBlockNonce(blockHash, slotNumber, txn.Metadata())
+	return d.metadata.GetBlockNonce(point, txn.Metadata())
 }
 
 // DeleteBlockNoncesBeforeSlot removes all block_nonces older than the given slot number

database/plugin/metadata/sqlite/block_nonce.go

@@ -18,6 +18,7 @@ import (
 	"errors"
 
 	"github.com/blinklabs-io/dingo/database/models"
+	ocommon "github.com/blinklabs-io/gouroboros/protocol/common"
 	"gorm.io/gorm"
 )
 
@@ -52,25 +53,18 @@ func (d *MetadataStoreSqlite) SetBlockNonce(
 
 // GetBlockNonce retrieves the block nonce for a specific block
 func (d *MetadataStoreSqlite) GetBlockNonce(
-	blockHash []byte,
-	slotNumber uint64,
+	point ocommon.Point,
 	txn *gorm.DB,
 ) ([]byte, error) {
 	ret := models.BlockNonce{}
-	if txn != nil {
-		result := txn.Where("hash = ? AND slot = ?", blockHash, slotNumber).
-			First(&ret)
-		if result.Error != nil {
-			if !errors.Is(result.Error, gorm.ErrRecordNotFound) {
-				return nil, result.Error
-			}
-		}
-	} else {
-		result := d.DB().Where("hash = ? AND slot = ?", blockHash, slotNumber).First(&ret)
-		if result.Error != nil {
-			if !errors.Is(result.Error, gorm.ErrRecordNotFound) {
-				return nil, result.Error
-			}
+	if txn == nil {
+		txn = d.DB()
+	}
+	result := txn.Where("hash = ? AND slot = ?", point.Hash, point.Slot).
+		First(&ret)
+	if result.Error != nil {
+		if !errors.Is(result.Error, gorm.ErrRecordNotFound) {
+			return nil, result.Error
 		}
 	}
 	return ret.Nonce, nil

database/plugin/metadata/store.go

@@ -59,8 +59,7 @@ type MetadataStore interface {
 		*gorm.DB,
 	) (*models.Account, error)
 	GetBlockNonce(
-		[]byte, // blockHash
-		uint64, // slotNumber
+		ocommon.Point,
 		*gorm.DB,
 	) ([]byte, error)
 	GetDatum(

database/pool.go

@@ -15,8 +15,8 @@
 package database
 
 import (
-	"github.com/blinklabs-io/dingo/database/models"
 	lcommon "github.com/blinklabs-io/gouroboros/ledger/common"
+	"github.com/blinklabs-io/dingo/database/models"
 )
 
 // GetPool returns a pool by its key hash

ledger/chainsync.go

@@ -286,8 +286,10 @@ func (ls *LedgerState) calculateEpochNonce(
 		return nil, fmt.Errorf("lookup block before slot: %w", err)
 	}
 	blockBeforeStabilityWindowNonce, err := ls.db.GetBlockNonce(
-		blockBeforeStabilityWindow.Hash,
-		blockBeforeStabilityWindow.Slot,
+		ocommon.Point{
+			Hash: blockBeforeStabilityWindow.Hash,
+			Slot: blockBeforeStabilityWindow.Slot,
+		},
 		txn,
 	)
 	if err != nil {

ledger/state.go

@@ -969,8 +969,7 @@ func (ls *LedgerState) loadTip() error {
 	// Load tip block and set cached block nonce
 	if ls.currentTip.Point.Slot > 0 {
 		tipNonce, err := ls.db.GetBlockNonce(
-			tmpTip.Point.Hash,
-			tmpTip.Point.Slot,
+			tmpTip.Point,
 			nil,
 		)
 		if err != nil {

ledger/view.go

@@ -64,10 +64,9 @@ func (lv *LedgerView) UtxoById(
 }
 
 func (lv *LedgerView) PoolRegistration(
-	pkh []byte,
+	pkh lcommon.PoolKeyHash,
 ) ([]lcommon.PoolRegistrationCertificate, error) {
-	poolKeyHash := lcommon.PoolKeyHash(lcommon.NewBlake2b224(pkh))
-	return lv.ls.db.GetPoolRegistrations(poolKeyHash, lv.txn)
+	return lv.ls.db.GetPoolRegistrations(pkh, lv.txn)
 }
 
 func (lv *LedgerView) StakeRegistration(