Revert "[wip] sd: removing txNum field " (#19508)

Reverts #19489

Lets do this in v3.5.0

Co-authored-by: Alexey Sharov <AskAlexSharov@gmail.com>

Author: Giulio2002

db/state/execctx/domain_shared.go

@@ -89,6 +89,8 @@ type SharedDomains struct {
 
 	logger log.Logger
 
+	txNum             uint64
+	currentStep       kv.Step
 	trace             bool //nolint
 	commitmentCapture bool
 	mem               kv.TemporalMemBatch
@@ -166,6 +168,8 @@ func (sd *SharedDomains) Merge(sdTxNum uint64, other *SharedDomains, otherTxNum
 		sd.sdCtx.SetPendingUpdate(otherUpd)
 	}
 
+	sd.txNum = otherTxNum
+	sd.currentStep = kv.Step(otherTxNum / sd.stepSize)
 	return nil
 }
 
@@ -308,6 +312,15 @@ func (sd *SharedDomains) IndexAdd(table kv.InvertedIdx, key []byte, txNum uint64
 
 func (sd *SharedDomains) StepSize() uint64 { return sd.stepSize }
 
+// SetTxNum sets txNum for all domains as well as common txNum for all domains
+// Requires for sd.rwTx because of commitment evaluation in shared domains if stepSize is reached
+func (sd *SharedDomains) SetTxNum(txNum uint64) {
+	sd.txNum = txNum
+	sd.currentStep = kv.Step(txNum / sd.stepSize)
+}
+
+func (sd *SharedDomains) TxNum() uint64 { return sd.txNum }
+
 func (sd *SharedDomains) SetTrace(b, capture bool) []string {
 	sd.trace = b
 	sd.commitmentCapture = capture
@@ -327,6 +340,7 @@ func (sd *SharedDomains) Close() {
 		return
 	}
 
+	sd.SetTxNum(0)
 	sd.ResetPendingUpdates()
 
 	//sd.walLock.Lock()
@@ -612,6 +626,7 @@ func (sd *SharedDomains) SeekCommitment(ctx context.Context, tx kv.TemporalTx) (
 	if err != nil {
 		return 0, 0, err
 	}
+	sd.SetTxNum(txNum)
 	return txNum, blockNum, nil
 }
 

db/state/squeeze.go

@@ -485,6 +485,7 @@ func RebuildCommitmentFiles(ctx context.Context, rwDb kv.TemporalRwDB, txNumsRea
 				return nil, err
 			}
 
+			domains.SetTxNum(lastTxnumInShard - 1)
 			currentTxNum := lastTxnumInShard - 1
 			domains.GetCommitmentCtx().SetLimitedHistoryStateReader(rwTx, lastTxnumInShard) // this helps to read state from correct file during commitment
 

execution/commitment/commitmentdb/commitment_context.go

@@ -32,9 +32,11 @@ var (
 )
 
 type sd interface {
+	SetTxNum(blockNum uint64)
 	AsGetter(tx kv.TemporalTx) kv.TemporalGetter
 	AsPutDel(tx kv.TemporalTx) kv.TemporalPutDel
 	StepSize() uint64
+	TxNum() uint64
 
 	Trace() bool
 	CommitmentCapture() bool

execution/stagedsync/exec3_parallel.go

@@ -282,6 +282,7 @@ func (pe *parallelExecutor) exec(ctx context.Context, execStage *StageState, u U
 
 					if applyResult.BlockNum > lastBlockResult.BlockNum {
 						uncommittedBlocks++
+						pe.doms.SetTxNum(applyResult.lastTxNum)
 						lastBlockResult = *applyResult
 					}
 

execution/stagedsync/exec3_serial.go

@@ -527,6 +527,7 @@ func (se *serialExecutor) executeBlock(ctx context.Context, tasks []exec.Task, i
 			return false, err
 		}
 
+		se.doms.SetTxNum(txTask.TxNum)
 		se.lastBlockResult = &blockResult{
 			BlockNum:  txTask.BlockNumber(),
 			lastTxNum: txTask.TxNum,

execution/stagedsync/stage_execute.go

@@ -351,6 +351,7 @@ func unwindExec3State(ctx context.Context,
 	}
 
 	sd.Unwind(txUnwindTo, changeset)
+	sd.SetTxNum(txUnwindTo)
 	return nil
 }