feat: Simpler authdb

arbnode/espresso_batcher_addr_monitor.go

@@ -261,17 +261,17 @@ func (b *BatcherAddrMonitor) Store() error {
 		return fmt.Errorf("failed to encode events: %w", err)
 	}
 
-	err = b.db.AuthWriteInitAddresses(newBatch, b.initAddresses)
+	err = authdb.WriteInitAddresses(newBatch, b.initAddresses)
 	if err != nil {
 		return fmt.Errorf("failed to put init addresses: %w", err)
 	}
 
-	err = b.db.AuthWriteEvents(newBatch, eventsBytes)
+	err = authdb.WriteEvents(newBatch, eventsBytes)
 	if err != nil {
 		return fmt.Errorf("failed to put events: %w", err)
 	}
 
-	err = b.db.AuthWriteLastProcessedHeight(newBatch, b.lastProcessedParentHeight)
+	err = authdb.WriteLastProcessedHeight(newBatch, b.lastProcessedParentHeight)
 	if err != nil {
 		return fmt.Errorf("failed to put last processed height: %w", err)
 	}
@@ -281,21 +281,21 @@ func (b *BatcherAddrMonitor) Store() error {
 
 func (b *BatcherAddrMonitor) Restore() error {
 
-	initAddresses, err := b.db.AuthReadInitAddresses()
+	initAddresses, err := authdb.ReadInitAddresses(&b.db)
 	if err != nil {
 		return fmt.Errorf("failed to get init addresses: %w, init addresses: %v", err, initAddresses)
 	}
 	if initAddresses != nil {
 		b.initAddresses = initAddresses
 	}
 
-	lastProcessedHeight, err := b.db.AuthReadLastProcessedHeight()
+	lastProcessedHeight, err := authdb.ReadLastProcessedHeight(&b.db)
 	if err != nil {
 		return fmt.Errorf("failed to get last processed height: %w", err)
 	}
 	b.lastProcessedParentHeight = lastProcessedHeight
 
-	eventsBytes, err := b.db.AuthReadEvents()
+	eventsBytes, err := authdb.ReadEvents(&b.db)
 	if err != nil {
 		return fmt.Errorf("failed to get events: %w", err)
 	}
@@ -421,7 +421,7 @@ func (b *BatcherAddrMonitor) Process(ctx context.Context) error {
 	if len(events) == 0 {
 		// If no events are found, we still need to update the last processed height
 		batch := b.db.NewBatch()
-		err = b.db.AuthWriteLastProcessedHeight(batch, newHeight)
+		err = authdb.WriteLastProcessedHeight(batch, newHeight)
 		if err != nil {
 			return fmt.Errorf("failed to store last processed height: %w", err)
 		}

arbnode/espresso_caff_node.go

@@ -204,7 +204,7 @@ func NewEspressoCaffNode(
 	fromBlock := configFetcher().FromBlock
 
 	if !configFetcher().Dangerous.IgnoreDatabaseFromBlock {
-		fromBlock, err = db.AuthReadFromBlock()
+		fromBlock, err = authdb.ReadFromBlock(&db)
 		if err != nil {
 			return nil, fmt.Errorf("failed to read l1 block from db: %w", err)
 		}
@@ -336,15 +336,15 @@ func (n *EspressoCaffNode) createBlock(ctx context.Context) (returnValue bool) {
 	batch := n.db.NewBatch()
 
 	// Store hotshot block num with auth tag
-	if err := n.db.AuthWriteNextHotshotBlockNum(batch, hotshotBlockNumber); err != nil {
+	if err := authdb.WriteNextHotshotBlockNum(batch, hotshotBlockNumber); err != nil {
 		log.Error("Failed to store NextHotshotBlockNum and its auth tag: %w", err)
 		return false
 	}
 
 	// Store from block with signature if snapshot signer is configured
 	// fromBlock will only be stored when we process a delayed message
 	if fromBlock != 0 {
-		if err := n.db.AuthWriteFromBlock(batch, fromBlock); err != nil {
+		if err := authdb.WriteFromBlock(batch, fromBlock); err != nil {
 			log.Error("failed to store delayedMessageFetcherFromBlock and its auth tag", "err", err)
 			return false
 		}
@@ -414,7 +414,7 @@ func (n *EspressoCaffNode) Start(ctx context.Context) error {
 	var nextHotshotBlock uint64
 
 	if !n.configFetcher().Dangerous.IgnoreDatabaseHotshotBlock {
-		nextHotshotBlock, err = n.db.AuthReadNextHotshotBlockNum()
+		nextHotshotBlock, err = authdb.ReadNextHotshotBlockNum(&n.db)
 		if err != nil {
 			return fmt.Errorf("failed to read next hotshot block: %w", err)
 		}

espresso/authdb/.gitignore

@@ -5,3 +5,4 @@ tmp/
 
 # tmp ancient store for test
 authdbancient
+testancient