Fix innertx unwind (#200)

Author: zjg555543

eth/stagedsync/stage_execute.go

@@ -979,6 +979,14 @@ func unwindExecutionStage(u *UnwindState, s *StageState, txc wrap.TxContainer, c
 		return fmt.Errorf("delete newer epochs: %w", err)
 	}
 
+	// For X Layer
+	hermezDb := hermez_db.NewHermezDb(txc.Tx)
+	for blk := u.UnwindPoint + 1; blk <= s.BlockNumber; blk++ {
+		if err := hermezDb.TruncateInnerTx(blk); err != nil {
+			return fmt.Errorf("truncate inner tx: %w", err)
+		}
+	}
+
 	// Truncate CallTraceSet
 	keyStart := hexutility.EncodeTs(u.UnwindPoint + 1)
 	c, err := txc.Tx.RwCursorDupSort(kv.CallTraceSet)

test/Makefile

@@ -72,8 +72,6 @@ run: ## Runs a full node
 	$(RUN_DOCKER_AGGREGATOR)
 	$(RUN_DOCKER_POOL_MANAGER)
 	$(RUN_DOCKER_RPC)
-	$(RUN_DOCKER_PROMETHEUS)
-	$(RUN_DOCKER_GRAFANA)
 
 .PHONY: all
 all: ## Runs a full node
@@ -109,6 +107,10 @@ all: ## Runs a full node
 	sleep 3
 	$(RUN_DOCKER_BRIDGE_UI)
 
+	# monitoring services
+	$(RUN_DOCKER_PROMETHEUS)
+	$(RUN_DOCKER_GRAFANA)
+
 .PHONY: stop
 stop: ## Stops all services
 	$(STOP)

zk/hermez_db/db_xlayer.go

@@ -4,6 +4,7 @@ import (
 	"encoding/binary"
 	"fmt"
 
+	"github.com/ledgerwatch/erigon-lib/kv"
 	"github.com/ledgerwatch/erigon-lib/kv/dbutils"
 	"github.com/ledgerwatch/erigon/rlp"
 	"github.com/ledgerwatch/erigon/zk/types"
@@ -41,6 +42,12 @@ func (db *HermezDbReader) GetInnerTxs(blockNum uint64) [][]*types.InnerTx {
 		log.Error("inner txs fetching failed", "err", err)
 		return nil
 	}
+	defer func() {
+		if casted, ok := it.(kv.Closer); ok {
+			casted.Close()
+		}
+	}()
+
 	for it.HasNext() {
 		_, v, err := it.Next()
 		if err != nil {
@@ -59,3 +66,44 @@ func (db *HermezDbReader) GetInnerTxs(blockNum uint64) [][]*types.InnerTx {
 	}
 	return blockInnerTxs
 }
+
+// TruncateInnerTx deletes all inner txs of a block
+func (db *HermezDb) TruncateInnerTx(block uint64) error {
+	prefix := make([]byte, 8)
+	binary.BigEndian.PutUint64(prefix, block)
+
+	it, err := db.tx.Prefix(INNER_TX, prefix)
+	if err != nil {
+		log.Error("inner txs fetching failed", "err", err)
+		return nil
+	}
+	defer func() {
+		if casted, ok := it.(kv.Closer); ok {
+			casted.Close()
+		}
+	}()
+
+	var keyList [][]byte
+	for it.HasNext() {
+		k, _, err := it.Next()
+		if err != nil {
+			log.Error("inner txs fetching failed", "err", err)
+			return nil
+		}
+		keyCopy := make([]byte, len(k))
+		copy(keyCopy, k)
+		keyList = append(keyList, keyCopy)
+	}
+
+	for _, k := range keyList {
+		err = db.tx.Delete(INNER_TX, k)
+		if err != nil {
+			log.Error("inner txs fetching failed", "err", err)
+			return err
+		}
+	}
+
+	remainTxs := db.GetInnerTxs(block)
+	log.Info("Delete inner txs", "block", block, "deleted count", len(keyList), "expect remain count 0:", len(remainTxs))
+	return nil
+}