Skip to content

Commit c7da2aa

Browse files
committed
Revert "adjusted size for corset columns"
This reverts commit b1a7319.
1 parent b1a7319 commit c7da2aa

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

prover/protocol/column/store.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"github.com/consensys/linea-monorepo/prover/protocol/ifaces"
55
"github.com/consensys/linea-monorepo/prover/utils"
66
"github.com/consensys/linea-monorepo/prover/utils/collection"
7+
"github.com/sirupsen/logrus"
78
)
89

910
// Store registers [Natural] for structs that can return the infos given a name
@@ -63,7 +64,9 @@ func (s *Store) AddToRound(round int, name ifaces.ColID, size int, status Status
6364
}
6465

6566
if !utils.IsPowerOfTwo(size) {
66-
utils.Panic("can't register %v because it has a non-power of two size (%v)", name, size)
67+
adjustedSize := utils.NextPowerOfTwo(size)
68+
logrus.Infof("Can't register %v because it has a non-power of two size (%v). Adjusted size to next power of two: %v", name, size, adjustedSize)
69+
size = adjustedSize
6770
}
6871

6972
// Compute the location of the commitment in the store

prover/zkevm/arithmetization/definition.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,14 @@ func (s *schemaScanner) scanColumns() {
6969
module = s.Modules[ctx.Module()]
7070
moduleLimit = s.LimitMap[module.Name]
7171
mult = ctx.LengthMultiplier()
72-
size = int(mult) * moduleLimit
7372
)
7473

75-
// adjust the size , this adjusts the size for interleaved columns and their permuted version.
76-
// Since these are the only columns from corset with non-power of two.
77-
if !utils.IsPowerOfTwo(size) {
78-
size = utils.NextPowerOfTwo(int(mult) * moduleLimit)
79-
}
74+
/*if _, isIL := s.InterleavedColumns[name]; isIL {
75+
continue
76+
}*/
8077

8178
// #nosec G115 -- this bound will not overflow
82-
s.Comp.InsertCommit(0, ifaces.ColID(name), size)
79+
s.Comp.InsertCommit(0, ifaces.ColID(name), int(mult)*moduleLimit)
8380
}
8481
}
8582

0 commit comments

Comments
 (0)