Skip to content

Commit

Permalink
address every occurence to zkevm-monorepo
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexandreBelling committed Sep 13, 2024
1 parent 0f6c4d6 commit 685991e
Show file tree
Hide file tree
Showing 12 changed files with 5 additions and 20 deletions.
2 changes: 1 addition & 1 deletion prover/circuits/blobdecompression/v0/compress/io.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func ChecksumPaddedBytes(b []byte, validLength int, hsh hash.Hash, fieldNbBits i

// UnpackIntoBytes construes every element in packed as consisting of bytesPerElem bytes, returning those bytes
// it DOES NOT prove that the elements in unpacked are actually bytes
// nbBytes is the number of "valid" bytes according to the padding scheme in https://github.com/Consensys/zkevm-monorepo/blob/main/prover/lib/compressor/blob/blob_maker.go#L299
// nbBytes is the number of "valid" bytes according to the padding scheme in https://github.com/Consensys/linea-monorepo/blob/main/prover/lib/compressor/blob/blob_maker.go#L299
// TODO @tabaie @gbotrel move the padding/packing code to gnark or compress
// the very last non-zero byte in the unpacked stream is meant to encode the number of unused bytes in the last field element used.
// though UnpackIntoBytes includes that last byte in unpacked, it is not counted in nbBytes
Expand Down
2 changes: 0 additions & 2 deletions prover/circuits/execution/pi_wizard_extraction.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ func checkPublicInputs(
// functional input (the txnrlp is incorrect). It should be converted into
// an [api.AssertIsEqual] once this is resolved.
//
// https://github.com/Consensys/zkevm-monorepo/issues/3801
//
shouldBeEqual(api, execDataHash, gnarkFuncInp.DataChecksum)

api.AssertIsEqual(
Expand Down
2 changes: 1 addition & 1 deletion prover/lib/compressor/blob/blob.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func GetRepoRootPath() (string, error) {
if err != nil {
return "", err
}
const repoName = "zkevm-monorepo"
const repoName = "linea-monorepo"
i := strings.LastIndex(wd, repoName)
if i == -1 {
return "", errors.New("could not find repo root")
Expand Down
1 change: 0 additions & 1 deletion prover/lib/compressor/blob/v0/blob_maker.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ func (bm *BlobMaker) Write(rlpBlock []byte, forceReset bool) (ok bool, err error

if blockLen > bm.limit {
// we should panic but logging / alerting is handled by the caller.
// see https://github.com/Consensys/zkevm-monorepo/issues/2326#issuecomment-1923573005
logrus.Warn("block size is larger than the blob limit. This should be checked by the coordinator, keeping the log for sanity", "block size", blockLen, "limit", bm.limit)
}

Expand Down
1 change: 0 additions & 1 deletion prover/lib/compressor/blob/v1/blob_maker.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ func (bm *BlobMaker) Write(rlpBlock []byte, forceReset bool) (ok bool, err error

if blockLen > bm.Limit {
// we should panic but logging / alerting is handled by the caller.
// see https://github.com/Consensys/zkevm-monorepo/issues/2326#issuecomment-1923573005
logrus.Warn("block size is larger than the blob Limit. This should be checked by the coordinator, keeping the log for sanity", "block size", blockLen, "Limit", bm.Limit)
}

Expand Down
1 change: 0 additions & 1 deletion prover/protocol/compiler/vortex/compiler.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ type Ctx struct {
OpenedColumns []ifaces.Column
// MerkleProof (only used with the MerkleProof version)
// We represents all the Merkle proof as specfied here:
// https://github.com/ConsenSys/zkevm-monorepo/issues/67
MerkleProofs ifaces.Column
// The Merkle roots are represented by a size 1 column
// in the wizard.
Expand Down
1 change: 0 additions & 1 deletion prover/protocol/compiler/vortex/gnark_verifier.go
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,6 @@ func (ctx *Ctx) gnarkExplicitPublicEvaluation(api frontend.API, vr *wizard.Wizar
}

// unpack a list of merkle proofs from a vector as in
// https://github.com/ConsenSys/zkevm-monorepo/issues/67
func (ctx *Ctx) unpackMerkleProofsGnark(sv []frontend.Variable, entryList []frontend.Variable) (proofs [][]smt.GnarkProof) {

depth := utils.Log2Ceil(ctx.NumEncodedCols()) // depth of the Merkle-tree
Expand Down
2 changes: 0 additions & 2 deletions prover/protocol/compiler/vortex/prover.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ func (ctx *Ctx) getPols(run *wizard.ProverRuntime, round int) (pols []smartvecto
}

// pack a list of merkle-proofs in a vector as in
// https://github.com/ConsenSys/zkevm-monorepo/issues/67
func (ctx *Ctx) packMerkleProofs(proofs [][]smt.Proof) smartvectors.SmartVector {

depth := len(proofs[0][0].Siblings) // depth of the Merkle-tree
Expand Down Expand Up @@ -210,7 +209,6 @@ func (ctx *Ctx) packMerkleProofs(proofs [][]smt.Proof) smartvectors.SmartVector
}

// unpack a list of merkle proofs from a vector as in
// https://github.com/ConsenSys/zkevm-monorepo/issues/67
func (ctx *Ctx) unpackMerkleProofs(sv smartvectors.SmartVector, entryList []int) (proofs [][]smt.Proof) {

depth := utils.Log2Ceil(ctx.NumEncodedCols()) // depth of the Merkle-tree
Expand Down
2 changes: 0 additions & 2 deletions prover/protocol/dedicated/mimc/linear_hash.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ Check a linear hashby chunk of columns
- period : 4 // indicates that we should hash chunks of 4 entries
- expectedhash : (Hash(a, b, c, d) || Hash(e, f, g, h))
See : https://github.com/ConsenSys/zkevm-monorepo/issues/662
*/
func CheckLinearHash(
comp *wizard.CompiledIOP,
Expand Down
5 changes: 2 additions & 3 deletions prover/protocol/dedicated/plonk/rangechecker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,8 @@ func (c *rangeCheckWithPublic) Define(api frontend.API) error {
return nil
}

// This is a simple test for testing regression
// https://github.com/Consensys/zkevm-monorepo/issues/3157. Here, we use public
// inputs which shifts the witness trace.
// This is a simple test for testing regression.
// Here, we use public inputs which shifts the witness trace.
func TestErrorCase(t *testing.T) {
circuit := &rangeCheckWithPublic{}

Expand Down
2 changes: 0 additions & 2 deletions prover/zkevm/prover/ecdsa/adress.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ func newAddress(comp *wizard.CompiledIOP, size int, ecRec *EcRecover, ac *antich

// Waiting for the resolution of:
//
// https://github.com/Consensys/zkevm-monorepo/issues/3801
//
// // projection from txn-data to address columns
// projection.InsertProjection(comp, ifaces.QueryIDf("Project_AddressHi_TxnData"),
// []ifaces.Column{td.fromHi}, []ifaces.Column{addr.addressHi},
Expand Down
4 changes: 1 addition & 3 deletions prover/zkevm/prover/statemanager/state_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,7 @@ func NewStateManagerNoHub(comp *wizard.CompiledIOP, settings Settings) *StateMan
sm.accumulatorSummaryConnector.ConnectToStateSummary(comp, &sm.StateSummary)
sm.mimcCodeHash.ConnectToRom(comp, rom(comp), romLex(comp))

// Waiting for the resolution of #
//
// https://github.com/Consensys/zkevm-monorepo/issues/3798
// Waiting for the resolution of the mimc code hash issue
//
// lookupStateSummaryCodeHash(comp, &sm.StateSummary.Account, &sm.mimcCodeHash)

Expand Down

0 comments on commit 685991e

Please sign in to comment.