update to go 0.26 and address PR minor comments

Signed-off-by: Pau Escrich <p4u@dabax.net>

Author: p4u

.github/workflows/main.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Set up Go environment
         uses: actions/setup-go@v5
         with:
-          go-version: '1.24'
+          go-version: '1.26'
       - name: Tidy go module
         run: |
           go mod tidy
@@ -40,7 +40,7 @@ jobs:
           fi
       - name: Run gofumpt
         # Run gofumpt first, as it's quick and issues are common.
-        run: diff -u <(echo -n) <(go run mvdan.cc/gofumpt@v0.7.0 -d .)
+        run: diff -u <(echo -n) <(go run mvdan.cc/gofumpt@v0.9.2 -d .)
       - name: Run go vet
         run: go vet ./...
       - name: Run go generate
@@ -81,7 +81,7 @@ jobs:
       - uses: benjlevesque/short-sha@v3.0 # sets env.SHA to the first 7 chars of github.sha
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.24'
+          go-version: '1.26'
       - run: mkdir -p "$PWD/gocoverage-unit/"
       - name: Run Go test -race
         id: go-test-race
@@ -151,7 +151,7 @@ jobs:
       - uses: actions/download-artifact@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.24'
+          go-version: '1.26'
           cache: false
       - name: Convert gocoverage format
         run: |
@@ -190,7 +190,7 @@ jobs:
           name: gocoverage-all-textfmt@${{ env.SHA }}
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.24'
+          go-version: '1.26'
           cache: false
       - name: Send coverage to coveralls.io (unit)
         if: ${{ always() }}

.github/workflows/swagger.yml

@@ -24,7 +24,7 @@ jobs:
           path: developer-portal
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.24'
+          go-version: '1.26'
           cache: false
       - name: Install swag
         run: |

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:experimental
 
-FROM golang:1.24 AS builder
+FROM golang:1.26 AS builder
 
 ARG BUILDARGS
 

api/api_types.go

@@ -438,7 +438,7 @@ func CensusTypeToOrigin(ctype CensusTypeDescription) (models.CensusOrigin, []byt
 		origin = models.CensusOrigin_FARCASTER_FRAME
 		root = ctype.RootHash
 	default:
-		return 0, nil, ErrCensusTypeUnknown.Withf("%q", ctype)
+		return 0, nil, ErrCensusTypeUnknown.Withf("%v", ctype)
 	}
 	if root == nil {
 		return 0, nil, ErrCensusRootIsNil

cmd/voconed/voconed.go

@@ -228,7 +228,9 @@ func main() {
 	vc.SetBlockSize(config.blockSize)
 
 	ctx, cancel := context.WithCancel(context.Background())
+	startDone := make(chan struct{})
 	go func() {
+		defer close(startDone)
 		if err := vc.Start(ctx); err != nil {
 			log.Fatal(err)
 		}
@@ -271,6 +273,8 @@ func main() {
 	<-c
 	log.Warnf("received SIGTERM, exiting at %s", time.Now().Format(time.RFC850))
 	cancel()
+	// Wait for the block production loop to exit before closing resources.
+	<-startDone
 	if err := vc.Close(); err != nil {
 		log.Warnw("error closing vocone", "err", err)
 	}

go.mod

@@ -1,6 +1,6 @@
 module go.vocdoni.io/dvote
 
-go 1.24.0
+go 1.26.1
 
 // For testing purposes
 // replace go.vocdoni.io/proto => ../dvote-protobuf

vochain/cometbft.go

@@ -166,7 +166,7 @@ func (app *BaseApplication) InitChain(_ context.Context,
 	for k, v := range genesisAppState.TxCost.AsMap() {
 		err = app.State.SetTxBaseCost(k, v)
 		if err != nil {
-			return nil, fmt.Errorf("could not set tx cost %q to value %q from genesis file to the State", k, v)
+			return nil, fmt.Errorf("could not set tx cost %q to value %d from genesis file to the State", k, v)
 		}
 	}
 

vocone/blockstore.go

@@ -3,11 +3,13 @@ package vocone
 import (
 	"encoding/binary"
 	"encoding/json"
+	"errors"
 	"time"
 
 	comettmhash "github.com/cometbft/cometbft/crypto/tmhash"
 	comettypes "github.com/cometbft/cometbft/types"
 	"go.vocdoni.io/dvote/crypto/ethereum"
+	"go.vocdoni.io/dvote/db"
 	"go.vocdoni.io/dvote/log"
 	"go.vocdoni.io/proto/build/go/models"
 	"google.golang.org/protobuf/proto"
@@ -43,6 +45,18 @@ func (vc *Vocone) storeBlockMeta(height int64, timestamp time.Time, txCount int3
 	}
 	wTx := vc.blockStore.WriteTx()
 	defer wTx.Discard()
+	if prevData, err := vc.blockStore.Get(metaKey(height)); err == nil {
+		var prev blockMeta
+		if jsonErr := json.Unmarshal(prevData, &prev); jsonErr == nil && len(prev.Hash) > 0 {
+			if len(blockHash) == 0 || string(prev.Hash) != string(blockHash) {
+				if err := wTx.Delete(blockHashKey(prev.Hash)); err != nil {
+					return err
+				}
+			}
+		}
+	} else if !errors.Is(err, db.ErrKeyNotFound) {
+		return err
+	}
 	if err := wTx.Set(metaKey(height), data); err != nil {
 		return err
 	}
@@ -154,6 +168,9 @@ func (vc *Vocone) getBlock(height int64) *comettypes.Block {
 
 // getBlockByHash looks up a block by its hash using the reverse index.
 func (vc *Vocone) getBlockByHash(hash []byte) *comettypes.Block {
+	if vc.closed.Load() {
+		return nil
+	}
 	heightBytes, err := vc.blockStore.Get(blockHashKey(hash))
 	if err != nil {
 		return nil

vocone/mempool.go

@@ -1,6 +1,7 @@
 package vocone
 
 import (
+	"bytes"
 	"context"
 	"encoding/binary"
 	"errors"
@@ -24,20 +25,38 @@ func (vc *Vocone) loadMempool() error {
 	if err != nil && !errors.Is(err, db.ErrKeyNotFound) {
 		return fmt.Errorf("could not read mempool sequence: %w", err)
 	}
+	var persistedSeq uint64
 	if len(seqBytes) == 8 {
-		vc.mempoolSeq = binary.BigEndian.Uint64(seqBytes)
+		persistedSeq = binary.BigEndian.Uint64(seqBytes)
 	}
 
 	// Iterate over all pending transactions and rebuild the key list.
 	vc.mempoolKeys = nil
+	var maxObservedSeq uint64
 	if err := vc.mempoolDB.Iterate([]byte(prefixMempool), func(key, _ []byte) bool {
+		switch {
+		case len(key) == 8:
+			// Some db wrappers return prefix-stripped keys.
+			if seq := binary.BigEndian.Uint64(key); seq > maxObservedSeq {
+				maxObservedSeq = seq
+			}
+		case len(key) >= len(prefixMempool)+8 && bytes.HasPrefix(key, []byte(prefixMempool)):
+			if seq := binary.BigEndian.Uint64(key[len(key)-8:]); seq > maxObservedSeq {
+				maxObservedSeq = seq
+			}
+		}
 		keyCopy := make([]byte, len(key))
 		copy(keyCopy, key)
 		vc.mempoolKeys = append(vc.mempoolKeys, keyCopy)
 		return true
 	}); err != nil {
 		return fmt.Errorf("could not iterate mempool: %w", err)
 	}
+	if persistedSeq >= maxObservedSeq {
+		vc.mempoolSeq = persistedSeq
+	} else {
+		vc.mempoolSeq = maxObservedSeq
+	}
 
 	if len(vc.mempoolKeys) > 0 {
 		log.Infow("recovered pending transactions from mempool", "count", len(vc.mempoolKeys))
@@ -139,10 +158,10 @@ func mempoolKey(seq uint64) []byte {
 }
 
 // prepareBlock drains transactions from the mempool, re-validates them,
-// stores valid ones in the block store, and returns the raw tx list.
-func (vc *Vocone) prepareBlock() [][]byte {
-	height := vc.height.Load()
-
+// and returns the raw tx list along with the mempool keys that were consumed.
+// It does NOT modify the mempool or blockstore — the caller is responsible
+// for persisting writes and cleaning up the mempool after a successful commit.
+func (vc *Vocone) prepareBlock() (txs [][]byte, consumedKeys [][]byte) {
 	vc.mempoolMtx.Lock()
 	// Take up to txsPerBlock keys from the front of the queue.
 	count := min(vc.txsPerBlock, len(vc.mempoolKeys))
@@ -151,20 +170,9 @@ func (vc *Vocone) prepareBlock() [][]byte {
 	vc.mempoolMtx.Unlock()
 
 	if len(pendingKeys) == 0 {
-		return nil
+		return nil, nil
 	}
 
-	blockStoreTx := vc.blockStore.WriteTx()
-	defer blockStoreTx.Discard()
-	mempoolWTx := vc.mempoolDB.WriteTx()
-	defer mempoolWTx.Discard()
-
-	var (
-		transactions [][]byte
-		consumedKeys [][]byte
-		txCount      int32
-	)
-
 	for _, key := range pendingKeys {
 		txData, err := vc.mempoolDB.Get(key)
 		if err != nil {
@@ -187,42 +195,53 @@ func (vc *Vocone) prepareBlock() [][]byte {
 			continue
 		}
 
-		// Store in the block store.
-		if err := blockStoreTx.Set(txKey(height, txCount), txData); err != nil {
-			log.Errorw(err, "error storing tx in blockstore")
-			break
-		}
-		transactions = append(transactions, txData)
+		txs = append(txs, txData)
 		consumedKeys = append(consumedKeys, key)
-		txCount++
 	}
 
-	// Commit block store writes.
-	if len(transactions) > 0 {
-		if err := blockStoreTx.Commit(); err != nil {
-			log.Errorw(err, "could not commit block store transaction")
-			return nil
-		}
+	if len(txs) > 0 {
+		log.Infow("prepared block transactions",
+			"count", len(txs), "height", vc.height.Load())
 	}
+	return txs, consumedKeys
+}
 
-	// Remove consumed transactions from the mempool db.
+// commitMempoolCleanup removes consumed keys from the persistent mempool
+// and the in-memory index. Must be called after a successful block commit.
+func (vc *Vocone) commitMempoolCleanup(consumedKeys [][]byte) {
+	if len(consumedKeys) == 0 {
+		return
+	}
+	wTx := vc.mempoolDB.WriteTx()
+	defer wTx.Discard()
 	for _, key := range consumedKeys {
-		if err := mempoolWTx.Delete(key); err != nil {
+		if err := wTx.Delete(key); err != nil {
 			log.Errorw(err, "could not delete mempool entry")
 		}
 	}
-	if err := mempoolWTx.Commit(); err != nil {
+	if err := wTx.Commit(); err != nil {
 		log.Errorw(err, "could not commit mempool cleanup")
 	}
 
-	// Update the in-memory index.
+	// Update the in-memory index by removing exactly the consumed keys.
 	vc.mempoolMtx.Lock()
-	vc.mempoolKeys = vc.mempoolKeys[len(consumedKeys):]
-	vc.mempoolMtx.Unlock()
-
-	if len(transactions) > 0 {
-		log.Infow("prepared block transactions",
-			"count", len(transactions), "height", height)
+	defer vc.mempoolMtx.Unlock()
+	consumed := make(map[string]struct{}, len(consumedKeys))
+	for _, key := range consumedKeys {
+		consumed[string(key)] = struct{}{}
+	}
+	filtered := make([][]byte, 0, len(vc.mempoolKeys))
+	removed := 0
+	for _, key := range vc.mempoolKeys {
+		if _, ok := consumed[string(key)]; ok {
+			removed++
+			continue
+		}
+		filtered = append(filtered, key)
+	}
+	if removed < len(consumed) {
+		log.Warnw("mempool cleanup removed fewer keys than expected",
+			"expectedUnique", len(consumed), "removed", removed)
 	}
-	return transactions
+	vc.mempoolKeys = filtered
 }