Skip to content

Commit a102526

Browse files
ivokubivokub
committed
feat: precise bls source getters
1 parent d312c3d commit a102526

File tree

6 files changed

+57
-41
lines changed

6 files changed

+57
-41
lines changed

‎prover/zkevm/prover/bls/bls.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
package bls
22

33
import (
4+
"fmt"
5+
46
"github.com/consensys/linea-monorepo/prover/protocol/ifaces"
57
"github.com/consensys/linea-monorepo/prover/protocol/wizard"
68
)
79

10+
const (
11+
moduleName = "blsdata"
12+
)
13+
814
type group int
915

1016
const (
@@ -59,3 +65,7 @@ func createColFn(comp *wizard.CompiledIOP, rootName string, size int) func(name
5965
return comp.InsertCommit(ROUND_NR, ifaces.ColIDf("%s_%s", rootName, name), size)
6066
}
6167
}
68+
69+
func colNameFn(colName string) ifaces.ColID {
70+
return ifaces.ColID(fmt.Sprintf("%s.%s", moduleName, colName))
71+
}

‎prover/zkevm/prover/bls/module_add.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ type blsAddDataSource struct {
2626

2727
func newAddDataSource(comp *wizard.CompiledIOP, g group) *blsAddDataSource {
2828
return &blsAddDataSource{
29-
ID: comp.Columns.GetHandle("bls.ID"),
30-
CsAdd: comp.Columns.GetHandle(ifaces.ColIDf("bls.CIRCUIT_SELECTOR_BLS_%s_ADD", g.String())),
31-
CsCurveMembership: comp.Columns.GetHandle(ifaces.ColIDf("bls.CURVE_MEMBERSHIP_%s_ADD", g.StringCurve())),
32-
Limb: comp.Columns.GetHandle("bls.LIMB"),
33-
Index: comp.Columns.GetHandle("bls.INDEX"),
34-
Counter: comp.Columns.GetHandle("bls.CT"),
35-
IsData: comp.Columns.GetHandle(ifaces.ColIDf("bls.DATA_%s_ADD", g.String())),
36-
IsRes: comp.Columns.GetHandle(ifaces.ColIDf("bls.RSLT_%s_ADD", g.String())),
29+
ID: comp.Columns.GetHandle(colNameFn("ID")),
30+
CsAdd: comp.Columns.GetHandle(colNameFn("CIRCUIT_SELECTOR_BLS_" + g.String() + "_ADD")),
31+
Limb: comp.Columns.GetHandle(colNameFn("LIMB")),
32+
Index: comp.Columns.GetHandle(colNameFn("INDEX")),
33+
Counter: comp.Columns.GetHandle(colNameFn("CT")),
34+
CsCurveMembership: comp.Columns.GetHandle(colNameFn("CIRCUIT_SELECTOR_" + g.StringCurve() + "_MEMBERSHIP")),
35+
IsData: comp.Columns.GetHandle(colNameFn("DATA_BLS_" + g.String() + "_ADD_FLAG")),
36+
IsRes: comp.Columns.GetHandle(colNameFn("RSLT_BLS_" + g.String() + "_ADD_FLAG")),
3737
}
3838
}
3939

‎prover/zkevm/prover/bls/module_map.go‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,20 @@ type blsMapDataSource struct {
2424
}
2525

2626
func newMapDataSource(comp *wizard.CompiledIOP, g group) *blsMapDataSource {
27+
var mapString string
28+
if g == G1 {
29+
mapString = "MAP_FP_TO_G1"
30+
} else {
31+
mapString = "MAP_FP2_TO_G2"
32+
}
2733
return &blsMapDataSource{
28-
ID: comp.Columns.GetHandle("bls.ID"),
29-
CsMap: comp.Columns.GetHandle(ifaces.ColIDf("bls.CIRCUIT_SELECTOR_BLS_MAP_%s_TO_%s", g.StringMap(), g.String())),
30-
Limb: comp.Columns.GetHandle("bls.LIMB"),
31-
Index: comp.Columns.GetHandle("bls.INDEX"),
32-
Counter: comp.Columns.GetHandle("bls.CT"),
33-
IsData: comp.Columns.GetHandle(ifaces.ColIDf("bls.DATA_BLS_MAP_%s_TO_%s", g.StringMap(), g.String())),
34-
IsRes: comp.Columns.GetHandle(ifaces.ColIDf("bls.RSLT_BLS_MAP_%s_TO_%s", g.StringMap(), g.String())),
34+
ID: comp.Columns.GetHandle(colNameFn("ID")),
35+
CsMap: comp.Columns.GetHandle(colNameFn("CIRCUIT_SELECTOR_BLS_" + mapString)),
36+
Index: comp.Columns.GetHandle(colNameFn("INDEX")),
37+
Counter: comp.Columns.GetHandle(colNameFn("CT")),
38+
Limb: comp.Columns.GetHandle(colNameFn("LIMB")),
39+
IsData: comp.Columns.GetHandle(colNameFn("DATA_BLS_" + mapString + "_FLAG")),
40+
IsRes: comp.Columns.GetHandle(colNameFn("RSLT_BLS_" + mapString + "_FLAG")),
3541
}
3642
}
3743

‎prover/zkevm/prover/bls/module_msm.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ type blsMsmDataSource struct {
3232

3333
func newMsmDataSource(comp *wizard.CompiledIOP, g group) *blsMsmDataSource {
3434
return &blsMsmDataSource{
35-
ID: comp.Columns.GetHandle("bls.ID"),
36-
CsMul: comp.Columns.GetHandle(ifaces.ColIDf("bls.CIRCUIT_SELECTOR_%s_MSM", g.String())),
37-
CsMembership: comp.Columns.GetHandle(ifaces.ColIDf("bls.CIRCUIT_SELECTOR_%s_MEMBERSHIP", g.String())),
38-
Limb: comp.Columns.GetHandle("bls.LIMB"),
39-
Index: comp.Columns.GetHandle("bls.INDEX"),
40-
Counter: comp.Columns.GetHandle("bls.CT"),
41-
IsData: comp.Columns.GetHandle(ifaces.ColIDf("bls.DATA_BLS_%s_MSM", g.String())),
42-
IsRes: comp.Columns.GetHandle(ifaces.ColIDf("bls.RSLT_BLS_%s_MSM", g.String())),
35+
ID: comp.Columns.GetHandle(colNameFn("ID")),
36+
CsMul: comp.Columns.GetHandle(colNameFn("CIRCUIT_SELECTOR_BLS_" + g.String() + "_MSM")),
37+
CsMembership: comp.Columns.GetHandle(colNameFn("CIRCUIT_SELECTOR_" + g.String() + "_MEMBERSHIP")),
38+
Limb: comp.Columns.GetHandle(colNameFn("LIMB")),
39+
Index: comp.Columns.GetHandle(colNameFn("INDEX")),
40+
Counter: comp.Columns.GetHandle(colNameFn("CT")),
41+
IsData: comp.Columns.GetHandle(colNameFn("DATA_BLS_" + g.String() + "_MSM_FLAG")),
42+
IsRes: comp.Columns.GetHandle(colNameFn("RSLT_BLS_" + g.String() + "_MSM_FLAG")),
4343
}
4444
}
4545

‎prover/zkevm/prover/bls/module_pair.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@ type blsPairDataSource struct {
3434

3535
func newPairDataSource(comp *wizard.CompiledIOP) *blsPairDataSource {
3636
return &blsPairDataSource{
37-
ID: comp.Columns.GetHandle("bls.ID"),
38-
CsPair: comp.Columns.GetHandle("bls.CIRCUIT_SELECTOR_BLS_PAIRING_CHECK"),
39-
CsG1Membership: comp.Columns.GetHandle("bls.CIRCUIT_SELECTOR_G1_MEMBERSHIP"),
40-
CsG2Membership: comp.Columns.GetHandle("bls.CIRCUIT_SELECTOR_G2_MEMBERSHIP"),
41-
IsData: comp.Columns.GetHandle("bls.DATA_BLS_PAIRING_CHECK"),
42-
IsRes: comp.Columns.GetHandle("bls.RSLT_BLS_PAIRING_CHECK"),
43-
Index: comp.Columns.GetHandle("bls.INDEX"),
44-
Counter: comp.Columns.GetHandle("bls.CT"),
45-
Limb: comp.Columns.GetHandle("bls.LIMB"),
46-
SuccessBit: comp.Columns.GetHandle("bls.SUCCESS_BIT"),
37+
ID: comp.Columns.GetHandle(colNameFn("ID")),
38+
CsPair: comp.Columns.GetHandle(colNameFn("CIRCUIT_SELECTOR_BLS_PAIRING_CHECK")),
39+
CsG1Membership: comp.Columns.GetHandle(colNameFn("CIRCUIT_SELECTOR_G1_MEMBERSHIP")),
40+
CsG2Membership: comp.Columns.GetHandle(colNameFn("CIRCUIT_SELECTOR_G2_MEMBERSHIP")),
41+
Limb: comp.Columns.GetHandle(colNameFn("LIMB")),
42+
Index: comp.Columns.GetHandle(colNameFn("INDEX")),
43+
Counter: comp.Columns.GetHandle(colNameFn("CT")),
44+
IsData: comp.Columns.GetHandle(colNameFn("DATA_BLS_PAIRING_CHECK_FLAG")),
45+
IsRes: comp.Columns.GetHandle(colNameFn("RSLT_BLS_PAIRING_CHECK_FLAG")),
46+
SuccessBit: comp.Columns.GetHandle(colNameFn("SUCCESS_BIT")),
4747
}
4848
}
4949

‎prover/zkevm/prover/bls/module_pointeval.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ type blsPointEvalDataSource struct {
2424

2525
func newPointEvalDataSource(comp *wizard.CompiledIOP) *blsPointEvalDataSource {
2626
return &blsPointEvalDataSource{
27-
ID: comp.Columns.GetHandle("bls.ID"),
28-
CsPointEval: comp.Columns.GetHandle("bls.CIRCUIT_SELECTOR_POINT_EVALUATION"),
29-
CsPointEvalInvalid: comp.Columns.GetHandle("bls.CIRCUIT_SELECTOR_POINT_EVALUATION_FAILURE"),
30-
Limb: comp.Columns.GetHandle("bls.LIMB"),
31-
Index: comp.Columns.GetHandle("bls.INDEX"),
32-
Counter: comp.Columns.GetHandle("bls.CT"),
33-
IsData: comp.Columns.GetHandle("bls.DATA_POINT_EVALUATION"),
34-
IsRes: comp.Columns.GetHandle("bls.RSLT_POINT_EVALUATION"),
27+
ID: comp.Columns.GetHandle(colNameFn("ID")),
28+
CsPointEval: comp.Columns.GetHandle(colNameFn("CIRCUIT_SELECTOR_POINT_EVALUATION")),
29+
CsPointEvalInvalid: comp.Columns.GetHandle(colNameFn("CIRCUIT_SELECTOR_POINT_EVALUATION_FAILURE")),
30+
Limb: comp.Columns.GetHandle(colNameFn("LIMB")),
31+
Index: comp.Columns.GetHandle(colNameFn("INDEX")),
32+
Counter: comp.Columns.GetHandle(colNameFn("CT")),
33+
IsData: comp.Columns.GetHandle(colNameFn("DATA_POINT_EVALUATION_FLAG")),
34+
IsRes: comp.Columns.GetHandle(colNameFn("RSLT_POINT_EVALUATION_FLAG")),
3535
}
3636
}
3737

0 commit comments

Comments
 (0)