github/scroll
1
1
Fork 0
mirror of https://github.com/scroll-tech/scroll.git synced 2026-04-23 03:00:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Lawliet-Chan
2023-08-15 11:23:42 +08:00
parent e7d4b10451
commit 497fd783a3
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coordinator/Makefile
View File

@@ -21,15 +21,15 @@ OLD_ZK_VERSION=${OLD_ZKEVM_VERSION}-${OLD_HALO2_VERSION}
pre-upgrade-zk:
cd ../common/libzkp/impl && cp Cargo.lock.old Cargo.lock && cargo clean && cargo build --release && cp ./target/release/libzkp.so ../interface/liboldzkp.so
cp -r ../common/libzkp/interface ./internal/logic/verifier/lib
find ../common | grep libzktrie.so | xargs -I{} cp {} ./internal/logic/verifier/lib/liboldzktrie.so
cp -r ../common/libzkp/interface ./internal/logic/old_verifier/lib && rm ../common/libzkp/interface/liboldzkp.so
find ../common | grep libzktrie.so | xargs -I{} cp {} ./internal/logic/old_verifier/lib/liboldzktrie.so
test:
go test -v -race -coverprofile=coverage.txt -covermode=atomic -p 1 $(PWD)/...
libzkp: pre-upgrade-zk
cd ../common/libzkp/impl && cp Cargo.lock.new Cargo.lock && cargo clean && cargo build --release && cp ./target/release/libzkp.so ../interface/
cp -r ../common/libzkp/interface/*.so ./internal/logic/verifier/lib
cp -r ../common/libzkp/interface ./internal/logic/verifier/lib
find ../common | grep libzktrie.so | xargs -I{} cp {} ./internal/logic/verifier/lib
coordinator: libzkp ## Builds the Coordinator instance.

7
coordinator/internal/logic/verifier/old_verifier.go → coordinator/internal/logic/old_verifier/old_verifier.go
View File

@@ -1,6 +1,6 @@
//go:build !mock_verifier
package verifier
package old_verifier
/*
#cgo LDFLAGS: -loldzkp -lm -ldl -loldzktrie -L${SRCDIR}/lib/ -Wl,-rpath=${SRCDIR}/lib
@@ -13,6 +13,7 @@ import "C" //nolint:typecheck
import (
"encoding/json"
"scroll-tech/common/types/message"
"scroll-tech/coordinator/internal/logic/verifier"
"unsafe"
"github.com/scroll-tech/go-ethereum/log"
@@ -49,7 +50,7 @@ func NewOldVerifier(cfg *config.VerifierConfig) (*OldVerifier, error) {
func (v *OldVerifier) VerifyBatchProof(proof *message.BatchProof) (bool, error) {
if v.cfg.MockMode {
log.Info("Mock mode, batch verifier disabled")
if string(proof.Proof) == InvalidTestProof {
if string(proof.Proof) == verifier.InvalidTestProof {
return false, nil
}
return true, nil
@@ -74,7 +75,7 @@ func (v *OldVerifier) VerifyBatchProof(proof *message.BatchProof) (bool, error)
func (v *OldVerifier) VerifyChunkProof(proof *message.ChunkProof) (bool, error) {
if v.cfg.MockMode {
log.Info("Mock mode, verifier disabled")
if string(proof.Proof) == InvalidTestProof {
if string(proof.Proof) == verifier.InvalidTestProof {
return false, nil
}
return true, nil

5
coordinator/internal/logic/submitproof/proof_receiver.go
View File

@@ -6,6 +6,7 @@ import (
"errors"
"fmt"
"scroll-tech/common/version"
"scroll-tech/coordinator/internal/logic/old_verifier"
"time"
jwt "github.com/appleboy/gin-jwt/v2"
@@ -50,7 +51,7 @@ type ProofReceiverLogic struct {
cfg *config.ProverManager
verifier *verifier.Verifier
oldVerifier *verifier.OldVerifier
oldVerifier *old_verifier.OldVerifier
proofReceivedTotal prometheus.Counter
proofSubmitFailure prometheus.Counter
@@ -70,7 +71,7 @@ func NewSubmitProofReceiverLogic(cfg *config.ProverManager, db *gorm.DB, reg pro
if err != nil {
panic("proof receiver new verifier failure")
}
oldVf, err := verifier.NewOldVerifier(cfg.OldVerifier)
oldVf, err := old_verifier.NewOldVerifier(cfg.OldVerifier)
if err != nil {
panic("proof receiver new OldVerifier failure")
}