Prover: Beta-v4.4 Osaka

.gitignore

@@ -107,7 +107,9 @@ __pycache__/
 /jvm-libs/**/darwin-x86-64
 
 /prover/**/*.csv
-/prover/**/testdata/
+# Exclude files in testdata directories, but not the directories themselves to allow
+# add exceptions (gitignore doesn't permit exceptions when root dir is excluded)
+/prover/**/testdata/*
 # Testdata, otherwise that's 400MB of data downloaded
 /prover/**/integration-testing/testdata/prover-requests/
 /prover/**/vendor/
@@ -148,4 +150,6 @@ __pycache__/
 !prover/**/testdata/**/*.csv
 !prover/**/utils/profiling
 !prover/**/verifying_key.bin
-!/sdk/src/lib/compressor/bin
+!/sdk/src/lib/compressor/bin
+# Allow BLS glue testdata generators
+!prover/zkevm/prover/bls/testdata/*.go

prover/Makefile

@@ -40,7 +40,7 @@ go-corset:
 ## Build and bundle the go-corset trace-expander dependency
 ##
 zkevm/arithmetization/zkevm.bin: go-corset
-	cd ../constraints && $(GO_CORSET) make zkevm_prague.bin && mv zkevm_prague.bin ../prover/zkevm/arithmetization/zkevm.bin
+	cd ../constraints && $(GO_CORSET) make zkevm_osaka.bin && mv zkevm_osaka.bin ../prover/zkevm/arithmetization/zkevm.bin
 
 ##
 ## Generate the setup for all provers job for sepolia (to be run with S3 access)

prover/circuits/aggregation/circuit.go

@@ -74,7 +74,7 @@ func (c *Circuit) Define(api frontend.API) error {
 	}
 
 	// create a lookup table of actual public inputs
-	actualPI := make([]*logderivlookup.Table, (emFr{}).NbLimbs())
+	actualPI := make([]logderivlookup.Table, (emFr{}).NbLimbs())
 	for i := range actualPI {
 		actualPI[i] = logderivlookup.New(api)
 	}

prover/circuits/blobdecompression/v0/compress/internal/io.go

@@ -15,11 +15,11 @@ import (
 // TODO Use std/rangecheck instead
 type RangeChecker struct {
 	api    frontend.API
-	tables map[uint]*logderivlookup.Table
+	tables map[uint]logderivlookup.Table
 }
 
 func NewRangeChecker(api frontend.API) *RangeChecker {
-	return &RangeChecker{api: api, tables: make(map[uint]*logderivlookup.Table)}
+	return &RangeChecker{api: api, tables: make(map[uint]logderivlookup.Table)}
 }
 
 func (r *RangeChecker) AssertLessThan(bound uint, c ...frontend.Variable) {
@@ -35,7 +35,8 @@ func (r *RangeChecker) AssertLessThan(bound uint, c ...frontend.Variable) {
 	default:
 		cRangeTable, ok := r.tables[bound]
 		if !ok {
-			cRangeTable := logderivlookup.New(r.api)
+			cRangeTable = logderivlookup.New(r.api)
+			r.tables[bound] = cRangeTable
 			for i := uint(0); i < bound; i++ {
 				cRangeTable.Insert(0)
 			}

prover/circuits/blobdecompression/v0/compress/lzss/snark.go

@@ -126,7 +126,7 @@ func Decompress(api frontend.API, c []frontend.Variable, cLength frontend.Variab
 	return dLength, nil
 }
 
-func initAddrTable(api frontend.API, bytes, c []frontend.Variable, wordNbBits int, backrefs []lzss.BackrefType) *logderivlookup.Table {
+func initAddrTable(api frontend.API, bytes, c []frontend.Variable, wordNbBits int, backrefs []lzss.BackrefType) logderivlookup.Table {
 	for i := range backrefs {
 		if backrefs[i].NbBitsLength != backrefs[0].NbBitsLength {
 			panic("all backref types must have the same length size")

prover/circuits/blobdecompression/v1/snark.go

@@ -180,7 +180,7 @@ func CheckBatchesSums(api frontend.API, hasher snarkHash.FieldHasher, nbBatches
 	}
 
 	var (
-		partialSumsT *logderivlookup.Table
+		partialSumsT logderivlookup.Table
 		partialSums  []frontend.Variable
 	)
 	// create a table of claimed sums and prove their correctness as we go through the payload

prover/circuits/internal/utils.go

@@ -40,7 +40,7 @@ func AssertIsLessIf(api frontend.API, cond, a, b frontend.Variable) {
 	api.AssertIsLessOrEqual(a_, b_)
 }
 
-func SliceToTable(api frontend.API, slice []frontend.Variable) *logderivlookup.Table {
+func SliceToTable(api frontend.API, slice []frontend.Variable) logderivlookup.Table {
 	table := logderivlookup.New(api)
 	for i := range slice {
 		table.Insert(slice[i])
@@ -271,7 +271,7 @@ func (s VarSlice) Range(api frontend.API) *Range {
 func Concat(api frontend.API, maxLinearizedLength int, slices ...VarSlice) Slice[frontend.Variable] {
 
 	res := Slice[frontend.Variable]{make([]frontend.Variable, maxLinearizedLength), 0}
-	var outT *logderivlookup.Table
+	var outT logderivlookup.Table
 	{ // hint
 		inLen := 2 * len(slices)
 		for i := range slices {
@@ -414,7 +414,7 @@ func ChecksumSubSlices(api frontend.API, hsh snarkHash.FieldHasher, slice []fron
 		lastElems[i] =
 			plonk.EvaluateExpression(api, e, endpointsR.InRange[i], 0, -1-len(slice), 1, len(slice))
 	}
-	var lastElemsT *logderivlookup.Table
+	var lastElemsT logderivlookup.Table
 	if len(slice) > 1 {
 		lastElemsT = SliceToTable(api, lastElems)
 		lastElemsT.Insert(len(slice)) // in case subEndPoints is tight
@@ -730,7 +730,7 @@ func PartitionSlice(api frontend.API, s []frontend.Variable, selectors []fronten
 		panic(err)
 	}
 
-	subsT := make([]*logderivlookup.Table, len(subs))
+	subsT := make([]logderivlookup.Table, len(subs))
 	for i := range subs {
 		copy(subs[i], subsGlued[:len(subs[i])])
 		subsGlued = subsGlued[len(subs[i]):]

prover/circuits/prove.go

@@ -86,7 +86,8 @@ func ProveCheck(setup *Setup, assignment frontend.Circuit, opts ...any) (plonk.P
 			assignment,
 			assignment,
 			setup.Circuit.Field(),
-			test.WithBackendProverOptions(proverOpts...),
+			// this test engine prover option was no-op before and it was removed
+			// test.WithBackendProverOptions(proverOpts...),
 		)
 		return nil, fmt.Errorf("while running the plonk prover: %w", errDetail)
 	}

prover/config/config-devnet-full.toml

@@ -1,5 +1,5 @@
 environment = "devnet"
-version = "6.0.8"                              # TODO @gbotrel hunt all version definitions.
+version = "6.1.3"                              # TODO @gbotrel hunt all version definitions.
 assets_dir = "./prover-assets"
 log_level = 4                                  # TODO @gbotrel will be refactored with new logger.
 
@@ -40,7 +40,7 @@ ADD = 262144
 BIN = 262144
 BLAKE_MODEXP_DATA = 16384
 BLOCK_DATA = 4096
-BLOCK_HASH = 2048
+BLOCK_HASH = 4096
 EC_DATA = 65536
 EUC = 65536
 EXP = 65536
@@ -167,34 +167,53 @@ U24 = 262144
 U23 = 262144
 U20 = 262144
 
-PRECOMPILE_BLS_POINT_EVALUATION_EFFECTIVE_CALLS     = 0
-PRECOMPILE_POINT_EVALUATION_FAILURE_EFFECTIVE_CALLS = 0
-PRECOMPILE_BLS_G1_ADD_EFFECTIVE_CALLS               = 0
-PRECOMPILE_BLS_G1_MSM_EFFECTIVE_CALLS               = 0
-PRECOMPILE_BLS_G2_ADD_EFFECTIVE_CALLS               = 0
-PRECOMPILE_BLS_G2_MSM_EFFECTIVE_CALLS               = 0
-PRECOMPILE_BLS_PAIRING_CHECK_MILLER_LOOPS           = 0
-PRECOMPILE_BLS_FINAL_EXPONENTIATIONS                = 0
-PRECOMPILE_BLS_MAP_FP_TO_G1_EFFECTIVE_CALLS         = 0
-PRECOMPILE_BLS_MAP_FP2_TO_G2_EFFECTIVE_CALLS        = 0
-PRECOMPILE_BLS_C1_MEMBERSHIP_CHECKS                 = 0
-PRECOMPILE_BLS_C2_MEMBERSHIP_CALLS                  = 0
-PRECOMPILE_BLS_G1_MEMBERSHIP_CALLS                  = 0
-PRECOMPILE_BLS_G2_MEMBERSHIP_CALLS                  = 0
+PRECOMPILE_BLS_POINT_EVALUATION_EFFECTIVE_CALLS     = 1
+PRECOMPILE_POINT_EVALUATION_FAILURE_EFFECTIVE_CALLS = 2
+PRECOMPILE_BLS_G1_ADD_EFFECTIVE_CALLS               = 8
+PRECOMPILE_BLS_G1_MSM_EFFECTIVE_CALLS               = 4
+PRECOMPILE_BLS_G2_ADD_EFFECTIVE_CALLS               = 8
+PRECOMPILE_BLS_G2_MSM_EFFECTIVE_CALLS               = 4
+PRECOMPILE_BLS_PAIRING_CHECK_MILLER_LOOPS           = 8
+PRECOMPILE_BLS_FINAL_EXPONENTIATIONS                = 2
+PRECOMPILE_BLS_MAP_FP_TO_G1_EFFECTIVE_CALLS         = 4
+PRECOMPILE_BLS_MAP_FP2_TO_G2_EFFECTIVE_CALLS        = 4
+PRECOMPILE_BLS_C1_MEMBERSHIP_CALLS                  = 8
+PRECOMPILE_BLS_C2_MEMBERSHIP_CALLS                  = 8
+PRECOMPILE_BLS_G1_MEMBERSHIP_CALLS                  = 8
+PRECOMPILE_BLS_G2_MEMBERSHIP_CALLS                  = 8
 
-BLS                 = 0
-POINT_EVAL          = 0
 BLS_DATA                = 4096
 RLP_UTILS               = 131072
 POWER_REFERENCE_TABLE   = 32
 BLS_REFERENCE_TABLE     = 512
 
+# Start of new Osaka modules
+PRECOMPILE_P256_VERIFY_EFFECTIVE_CALLS = 128
+
+BIT_XOAN_U2   = 262144
+BIT_XOAN_U4   = 262144
+BIT_XOAN_U8   = 262144
+BIT_XOAN_U16  = 262144
+BIT_XOAN_U32  = 262144
+BIT_XOAN_U64  = 262144
+BIT_XOAN_U128 = 262144
+BIT_XOAN_U256 = 262144
+BYTE_16       = 262144
+BYTE_32       = 262144
+BYTE_64       = 262144
+BYTE_128      = 262144
+BYTE_256      = 262144
+SIGNEXTEND    = 262144
+MAX3_U128     = 262144
+MAXLOG        = 262144
+# End of new Osaka modules
+
 [traces_limits_large]
 ADD = 524288
 BIN = 524288
 BLAKE_MODEXP_DATA = 32768
 BLOCK_DATA = 8192
-BLOCK_HASH = 4096
+BLOCK_HASH = 8192
 EC_DATA = 131072
 EUC = 131072
 EXP = 131072
@@ -239,24 +258,125 @@ BLOCK_TRANSACTIONS = 300
 BIN_REFERENCE_TABLE = 262144
 INSTRUCTION_DECODER = 512
 
-PRECOMPILE_BLS_POINT_EVALUATION_EFFECTIVE_CALLS     = 0
-PRECOMPILE_POINT_EVALUATION_FAILURE_EFFECTIVE_CALLS = 0
-PRECOMPILE_BLS_G1_ADD_EFFECTIVE_CALLS               = 0
-PRECOMPILE_BLS_G1_MSM_EFFECTIVE_CALLS               = 0
-PRECOMPILE_BLS_G2_ADD_EFFECTIVE_CALLS               = 0
-PRECOMPILE_BLS_G2_MSM_EFFECTIVE_CALLS               = 0
-PRECOMPILE_BLS_PAIRING_CHECK_MILLER_LOOPS           = 0
-PRECOMPILE_BLS_FINAL_EXPONENTIATIONS                = 0
-PRECOMPILE_BLS_MAP_FP_TO_G1_EFFECTIVE_CALLS         = 0
-PRECOMPILE_BLS_MAP_FP2_TO_G2_EFFECTIVE_CALLS        = 0
-PRECOMPILE_BLS_C1_MEMBERSHIP_CHECKS                 = 0
-PRECOMPILE_BLS_C2_MEMBERSHIP_CALLS                  = 0
-PRECOMPILE_BLS_G1_MEMBERSHIP_CALLS                  = 0
-PRECOMPILE_BLS_G2_MEMBERSHIP_CALLS                  = 0
+BIT_SHL256 = 524288
+BIT_SHL256_U7 = 524288
+BIT_SHL256_U6 = 524288
+BIT_SHL256_U5 = 524288
+BIT_SHL256_U4 = 524288
+BIT_SHL256_U3 = 524288
+BIT_SHL256_U2 = 524288
+BIT_SHL256_U1 = 524288
+BIT_SHR256 = 524288
+BIT_SHR256_U7 = 524288
+BIT_SHR256_U6 = 524288
+BIT_SHR256_U5 = 524288
+BIT_SHR256_U4 = 524288
+BIT_SHR256_U3 = 524288
+BIT_SHR256_U2 = 524288
+BIT_SHR256_U1 = 524288
+BIT_SAR256 = 524288
+BIT_SAR256_U7 = 524288
+BIT_SAR256_U6 = 524288
+BIT_SAR256_U5 = 524288
+BIT_SAR256_U4 = 524288
+BIT_SAR256_U3 = 524288
+BIT_SAR256_U2 = 524288
+BIT_SAR256_U1 = 524288
+CALL_GAS_EXTRA = 524288
+FILL_BYTES_BETWEEN = 524288
+GAS_OUT_OF_POCKET = 524288
+LOG2 = 524288
+LOG2_U128 = 524288
+LOG2_U64 = 524288
+LOG2_U32 = 524288
+LOG2_U16 = 524288
+LOG2_U8 = 524288
+LOG2_U4 = 524288
+LOG2_U2 = 524288
+LOG256 = 524288
+LOG256_U128 = 524288
+LOG256_U64 = 524288
+LOG256_U32 = 524288
+LOG256_U16 = 524288
+MIN256_64 = 524288
+SET_BYTE256 = 524288
+SET_BYTE128 = 524288
+SET_BYTE64 = 524288
+SET_BYTE32 = 524288
+SET_BYTE16 = 524288
+
+U128 = 524288
+U127 = 524288
+U126 = 524288
+U125 = 524288
+U124 = 524288
+U123 = 524288
+U120 = 524288
+U119 = 524288
+U112 = 524288
+U111 = 524288
+U96 = 524288
+U95 = 524288
+U64 = 524288
+U63 = 524288
+U62 = 524288
+U61 = 524288
+U60 = 524288
+U59 = 524288
+U58 = 524288
+U56 = 524288
+U55 = 524288
+U48 = 524288
+U47 = 524288
+U36 = 524288
+U32 = 524288
+U31 = 524288
+U30 = 524288
+U29 = 524288
+U28 = 524288
+U27 = 524288
+U26 = 524288
+U24 = 524288
+U23 = 524288
+U20 = 524288
+
+PRECOMPILE_BLS_POINT_EVALUATION_EFFECTIVE_CALLS     = 2
+PRECOMPILE_POINT_EVALUATION_FAILURE_EFFECTIVE_CALLS = 4
+PRECOMPILE_BLS_G1_ADD_EFFECTIVE_CALLS               = 16
+PRECOMPILE_BLS_G1_MSM_EFFECTIVE_CALLS               = 8
+PRECOMPILE_BLS_G2_ADD_EFFECTIVE_CALLS               = 16
+PRECOMPILE_BLS_G2_MSM_EFFECTIVE_CALLS               = 8
+PRECOMPILE_BLS_PAIRING_CHECK_MILLER_LOOPS           = 16
+PRECOMPILE_BLS_FINAL_EXPONENTIATIONS                = 4
+PRECOMPILE_BLS_MAP_FP_TO_G1_EFFECTIVE_CALLS         = 8
+PRECOMPILE_BLS_MAP_FP2_TO_G2_EFFECTIVE_CALLS        = 8
+PRECOMPILE_BLS_C1_MEMBERSHIP_CALLS                  = 16
+PRECOMPILE_BLS_C2_MEMBERSHIP_CALLS                  = 16
+PRECOMPILE_BLS_G1_MEMBERSHIP_CALLS                  = 16
+PRECOMPILE_BLS_G2_MEMBERSHIP_CALLS                  = 16
 
-BLS                 = 0
-POINT_EVAL          = 0
 BLS_DATA                = 8192
 RLP_UTILS               = 262144
 POWER_REFERENCE_TABLE   = 32
 BLS_REFERENCE_TABLE     = 512
+
+# Start of new Osaka modules
+PRECOMPILE_P256_VERIFY_EFFECTIVE_CALLS = 256
+
+BIT_XOAN_U2   = 524288
+BIT_XOAN_U4   = 524288
+BIT_XOAN_U8   = 524288
+BIT_XOAN_U16  = 524288
+BIT_XOAN_U32  = 524288
+BIT_XOAN_U64  = 524288
+BIT_XOAN_U128 = 524288
+BIT_XOAN_U256 = 524288
+BYTE_16       = 524288
+BYTE_32       = 524288
+BYTE_64       = 524288
+BYTE_128      = 524288
+BYTE_256      = 524288
+SIGNEXTEND    = 524288
+MAX3_U128     = 524288
+MAXLOG        = 524288
+# End of new Osaka modules