Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prover Bug Fix—Total Bytes Counter #169

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+74 −58
Open

Prover Bug Fix—Total Bytes Counter #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe58c27
zeroization and correct value fetching
bogdanbear Oct 9, 2024
a81d211
Update execution_data_collector.go
bogdanbear Oct 11, 2024
533dce3
Merge branch 'main' into prover/fix-bug-totalbytescounter
bogdanbear Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 48 additions & 34 deletions prover/zkevm/prover/publicInput/execution_data_collector/execution_data_collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package execution_data_collector
import (
"github.com/consensys/linea-monorepo/prover/maths/common/smartvectors"
"github.com/consensys/linea-monorepo/prover/maths/field"
"github.com/consensys/linea-monorepo/prover/protocol/accessors"
"github.com/consensys/linea-monorepo/prover/protocol/column"
"github.com/consensys/linea-monorepo/prover/protocol/dedicated"
"github.com/consensys/linea-monorepo/prover/protocol/dedicated/projection"
Expand Down Expand Up @@ -182,7 +183,9 @@ type ExecutionDataCollector struct {
EndOfRlpSegment ifaces.Column
// a counter that computes the total number of bytes in all the previous rows, from the first to the current.
TotalBytesCounter ifaces.Column

// FinalTotalBytesCounter is a size-1 column that stores the last value of TotalBytesCounter for which the isActive filter is active.
// In other words, FinalTotalBytesCounter contains the total number of bytes in the limbs of the ExecutionDataCollector module.
FinalTotalBytesCounter ifaces.Column
// Selector columns
// SelectorBlockDiff[i]=1 if (edc.BlockId[i] = edc.BlockId[i+1]), used to enforce constancies when
// inside a block segment
Expand All @@ -206,28 +209,29 @@ type ExecutionDataCollector struct {
// NewExecutionDataCollector instantiates an ExecutionDataCollector with unconstrained columns.
func NewExecutionDataCollector(comp *wizard.CompiledIOP, name string, size int) ExecutionDataCollector {
res := ExecutionDataCollector{
BlockID: util.CreateCol(name, "BLOCK_ID", size, comp),
AbsTxID: util.CreateCol(name, "ABS_TX_ID", size, comp),
AbsTxIDMax: util.CreateCol(name, "ABS_TX_ID_MAX", size, comp),
FirstAbsTxIDBlock: util.CreateCol(name, "FIRST_ABS_TX_ID_BLOCK", size, comp),
LastAbsTxIDBlock: util.CreateCol(name, "LAST_ABS_TX_ID_BLOCK", size, comp),
Limb: util.CreateCol(name, "LIMB", size, comp),
NoBytes: util.CreateCol(name, "NO_BYTES", size, comp),
UnalignedLimb: util.CreateCol(name, "UNALIGNED_LIMB", size, comp),
AlignedPow: util.CreateCol(name, "ALIGNED_POW", size, comp),
TotalNoTxBlock: util.CreateCol(name, "TOTAL_NO_TX_BLOCK", size, comp),
IsActive: util.CreateCol(name, "IS_ACTIVE", size, comp),
IsNoTx: util.CreateCol(name, "IS_NO_TX", size, comp),
IsBlockHashHi: util.CreateCol(name, "IS_BLOCK_HASH_HI", size, comp),
IsBlockHashLo: util.CreateCol(name, "IS_BLOCK_HASH_LO", size, comp),
IsTimestamp: util.CreateCol(name, "IS_TIMESTAMP", size, comp),
IsTxRLP: util.CreateCol(name, "IS_TX_RLP", size, comp),
IsAddrHi: util.CreateCol(name, "IS_ADDR_HI", size, comp),
IsAddrLo: util.CreateCol(name, "IS_ADDR_LO", size, comp),
Ct: util.CreateCol(name, "CT", size, comp),
HashNum: util.CreateCol(name, "HASH_NUM", size, comp),
EndOfRlpSegment: util.CreateCol(name, "END_OF_RLP_SEGMENT", size, comp),
TotalBytesCounter: util.CreateCol(name, "TOTAL_BYTES_COUNTER", size, comp),
BlockID: util.CreateCol(name, "BLOCK_ID", size, comp),
AbsTxID: util.CreateCol(name, "ABS_TX_ID", size, comp),
AbsTxIDMax: util.CreateCol(name, "ABS_TX_ID_MAX", size, comp),
FirstAbsTxIDBlock: util.CreateCol(name, "FIRST_ABS_TX_ID_BLOCK", size, comp),
LastAbsTxIDBlock: util.CreateCol(name, "LAST_ABS_TX_ID_BLOCK", size, comp),
Limb: util.CreateCol(name, "LIMB", size, comp),
NoBytes: util.CreateCol(name, "NO_BYTES", size, comp),
UnalignedLimb: util.CreateCol(name, "UNALIGNED_LIMB", size, comp),
AlignedPow: util.CreateCol(name, "ALIGNED_POW", size, comp),
TotalNoTxBlock: util.CreateCol(name, "TOTAL_NO_TX_BLOCK", size, comp),
IsActive: util.CreateCol(name, "IS_ACTIVE", size, comp),
IsNoTx: util.CreateCol(name, "IS_NO_TX", size, comp),
IsBlockHashHi: util.CreateCol(name, "IS_BLOCK_HASH_HI", size, comp),
IsBlockHashLo: util.CreateCol(name, "IS_BLOCK_HASH_LO", size, comp),
IsTimestamp: util.CreateCol(name, "IS_TIMESTAMP", size, comp),
IsTxRLP: util.CreateCol(name, "IS_TX_RLP", size, comp),
IsAddrHi: util.CreateCol(name, "IS_ADDR_HI", size, comp),
IsAddrLo: util.CreateCol(name, "IS_ADDR_LO", size, comp),
Ct: util.CreateCol(name, "CT", size, comp),
HashNum: util.CreateCol(name, "HASH_NUM", size, comp),
EndOfRlpSegment: util.CreateCol(name, "END_OF_RLP_SEGMENT", size, comp),
TotalBytesCounter: util.CreateCol(name, "TOTAL_BYTES_COUNTER", size, comp),
FinalTotalBytesCounter: util.CreateCol(name, "FINAL_TOTAL_BYTES_COUNTER", 1, comp),
}
return res
}
Expand Down Expand Up @@ -1022,27 +1026,33 @@ func DefineSelectorConstraints(comp *wizard.CompiledIOP, edc *ExecutionDataColle

// DefineTotalBytesCounterConstraints enforces that edc.TotalBytesCounter[0] = edc.NoBytes[0] and
// edc.TotalBytesCounter[i+1]=edc.TotalBytesCounter[i]+edc.NoBytes[i+1] for i>=0
// It also creates an accessor and constrains the size-1 column edc.FinalTotalBytesCounter to contain
// the last value of TotalBytesCounter for which the filter IsActive = 1.
func DefineTotalBytesCounterConstraints(comp *wizard.CompiledIOP, edc *ExecutionDataCollector, name string) {
comp.InsertLocal(0, ifaces.QueryIDf("%s_%v_TOTAL_BYTES_COUNTER_START_LOCAL_CONSTRAINT", name, edc.TotalBytesCounter.GetColID()),
sym.Mul(
edc.IsActive,
sym.Sub(
edc.TotalBytesCounter,
edc.NoBytes, // blockIDs start from 1
),
sym.Sub(
edc.TotalBytesCounter,
edc.NoBytes, // the first value of the total bytes counter must be the number of bytes on the first row.
),
)

comp.InsertGlobal(0, ifaces.QueryIDf("%s_%v_TOTAL_BYTES_COUNTER_GLOBAL_CONSTRAINT", name, edc.TotalBytesCounter.GetColID()),
sym.Mul(
edc.IsActive,
edc.IsActive, // Here, we only consider the active part. On the inactive part, edc.TotalBytesCounter is forced to be zero in DefineZeroizationConstraints.
sym.Sub(
edc.TotalBytesCounter,
edc.NoBytes,
column.Shift(edc.TotalBytesCounter, -1),
column.Shift(edc.TotalBytesCounter, -1), // the TotalBytes counter increases appropriately.
),
),
)

// set the FinalTotalBytesCounter as public for accessors
comp.Columns.SetStatus(edc.FinalTotalBytesCounter.GetColID(), column.Proof)
// get accessors
accessor := accessors.NewFromPublicColumn(edc.FinalTotalBytesCounter, 0)
// enforce that FinalTotalBytesCounter contains the last value of TotalBytesCounter on the active part.
util.CheckLastELemConsistency(comp, edc.IsActive, edc.TotalBytesCounter, accessor, name)
}

// DefineCounterConstraints enforces counter constraints for BlockId, AbsTxId and Ct.
Expand Down Expand Up @@ -1076,6 +1086,7 @@ func DefineZeroizationConstraints(comp *wizard.CompiledIOP, edc *ExecutionDataCo
edc.NoBytes,
edc.UnalignedLimb,
edc.AlignedPow,
edc.TotalBytesCounter,
bogdanbear marked this conversation as resolved.
Show resolved Hide resolved
// exclude edc.HashNum, as it is a fully constant column
}

Expand Down Expand Up @@ -1341,9 +1352,11 @@ func AssignExecutionDataCollector(run *wizard.ProverRuntime,
}

} else {
// finished processing all the blocks, move to padding
// we do not set the isActive filter to 1
// No more blocks to assign
// finished processing all the blocks, reached the inactive part of the module.
// therefore, we do not set the isActive filter to 1.
// No more blocks to assign.
// before breaking, set FinalTotalBytesCounter to correspond to TotalBytesCounter in the last active row (totalCt-1).
vect.FinalTotalBytesCounter = vect.TotalBytesCounter[totalCt-1]
break
}
} // end of the block for loop
Expand Down Expand Up @@ -1382,4 +1395,5 @@ func AssignExecutionDataColumns(run *wizard.ProverRuntime, edc ExecutionDataColl
run.AssignColumn(edc.FirstAbsTxIDBlock.GetColID(), smartvectors.NewRegular(vect.FirstAbsTxIDBlock))
run.AssignColumn(edc.LastAbsTxIDBlock.GetColID(), smartvectors.NewRegular(vect.LastAbsTxIDBlock))
run.AssignColumn(edc.TotalBytesCounter.GetColID(), smartvectors.NewRegular(vect.TotalBytesCounter))
run.AssignColumn(edc.FinalTotalBytesCounter.GetColID(), smartvectors.NewRegular([]field.Element{vect.FinalTotalBytesCounter}))
}
48 changes: 25 additions & 23 deletions prover/zkevm/prover/publicInput/execution_data_collector/execution_data_collector_vectors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,36 @@ type ExecutionDataCollectorVectors struct {

FirstAbsTxIDBlock, LastAbsTxIDBlock []field.Element

EndOfRlpSegment []field.Element
TotalBytesCounter []field.Element
EndOfRlpSegment []field.Element
TotalBytesCounter []field.Element
FinalTotalBytesCounter field.Element
}

// NewExecutionDataCollectorVectors creates a new ExecutionDataCollectorVectors.
func NewExecutionDataCollectorVectors(size int) *ExecutionDataCollectorVectors {
res := &ExecutionDataCollectorVectors{
BlockID: make([]field.Element, size),
AbsTxID: make([]field.Element, size),
AbsTxIDMax: make([]field.Element, size),
Limb: make([]field.Element, size),
NoBytes: make([]field.Element, size),
UnalignedLimb: make([]field.Element, size),
AlignedPow: make([]field.Element, size),
TotalNoTxBlock: make([]field.Element, size),
IsActive: make([]field.Element, size),
IsNoTx: make([]field.Element, size),
IsBlockHashHi: make([]field.Element, size),
IsBlockHashLo: make([]field.Element, size),
IsTimestamp: make([]field.Element, size),
IsTxRLP: make([]field.Element, size),
IsAddrHi: make([]field.Element, size),
IsAddrLo: make([]field.Element, size),
Ct: make([]field.Element, size),
FirstAbsTxIDBlock: make([]field.Element, size),
LastAbsTxIDBlock: make([]field.Element, size),
EndOfRlpSegment: make([]field.Element, size),
TotalBytesCounter: make([]field.Element, size),
BlockID: make([]field.Element, size),
AbsTxID: make([]field.Element, size),
AbsTxIDMax: make([]field.Element, size),
Limb: make([]field.Element, size),
NoBytes: make([]field.Element, size),
UnalignedLimb: make([]field.Element, size),
AlignedPow: make([]field.Element, size),
TotalNoTxBlock: make([]field.Element, size),
IsActive: make([]field.Element, size),
IsNoTx: make([]field.Element, size),
IsBlockHashHi: make([]field.Element, size),
IsBlockHashLo: make([]field.Element, size),
IsTimestamp: make([]field.Element, size),
IsTxRLP: make([]field.Element, size),
IsAddrHi: make([]field.Element, size),
IsAddrLo: make([]field.Element, size),
Ct: make([]field.Element, size),
FirstAbsTxIDBlock: make([]field.Element, size),
LastAbsTxIDBlock: make([]field.Element, size),
EndOfRlpSegment: make([]field.Element, size),
TotalBytesCounter: make([]field.Element, size),
FinalTotalBytesCounter: field.Zero(),
}
return res
}
Expand Down
2 changes: 1 addition & 1 deletion prover/zkevm/prover/publicInput/public_input.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ func newPublicInput(
RollingHashFetcher: rollingSelector,
LogHasher: logHasherL2l1,
ExecMiMCHasher: *mimcHasher,
DataNbBytes: execDataCollector.TotalBytesCounter,
DataNbBytes: execDataCollector.FinalTotalBytesCounter,
ChainID: rlpFetcher.ChainID,
ChainIDNBytes: rlpFetcher.NBytesChainID,
Inputs: *inp,
Expand Down
Loading