From f88f0b96d110d3f92d1068af68af404c8cc1c677 Mon Sep 17 00:00:00 2001 From: Ho Date: Tue, 17 Jun 2025 16:09:41 +0900 Subject: [PATCH 01/11] update coordinator for universal task prover --- common/libzkp/go.mod | 3 + common/libzkp/impl/Cargo.lock | 1 - common/libzkp/impl/Cargo.toml | 1 - common/libzkp/impl/Makefile | 5 + common/libzkp/impl/src/lib.rs | 65 +++++++- common/libzkp/impl/src/utils.rs | 3 +- common/libzkp/interface/libzkp.h | 44 +++++- common/libzkp/lib.go | 143 ++++++++++++++++++ coordinator/.gitignore | 1 + coordinator/Makefile | 18 ++- coordinator/internal/config/config.go | 8 +- .../internal/controller/api/controller.go | 15 +- .../internal/controller/api/get_task.go | 4 + .../internal/controller/api/submit_proof.go | 10 +- .../logic/provertask/batch_prover_task.go | 17 +++ .../logic/provertask/bundle_prover_task.go | 17 +++ .../logic/provertask/chunk_prover_task.go | 17 +++ .../internal/logic/provertask/prover_task.go | 24 +++ .../internal/logic/provertask/task_cache.go | 56 +++++++ .../logic/submitproof/proof_receiver.go | 26 ++++ .../internal/logic/verifier/verifier.go | 72 ++------- .../internal/logic/verifier/verifier_test.go | 10 +- coordinator/internal/types/get_task.go | 2 + coordinator/internal/types/submit_proof.go | 1 + go.work | 1 + 25 files changed, 480 insertions(+), 84 deletions(-) create mode 100644 common/libzkp/go.mod create mode 100644 common/libzkp/lib.go create mode 100644 coordinator/internal/logic/provertask/task_cache.go diff --git a/common/libzkp/go.mod b/common/libzkp/go.mod new file mode 100644 index 0000000000..5cd5035687 --- /dev/null +++ b/common/libzkp/go.mod @@ -0,0 +1,3 @@ +module scroll-tech/common/libzkp + +go 1.22 diff --git a/common/libzkp/impl/Cargo.lock b/common/libzkp/impl/Cargo.lock index 7586c197f8..a04d979e50 100644 --- a/common/libzkp/impl/Cargo.lock +++ b/common/libzkp/impl/Cargo.lock @@ -8281,7 +8281,6 @@ dependencies = [ "anyhow", "base64 0.13.1", "env_logger", - "libc", "log", "once_cell", "scroll-zkvm-prover", diff --git a/common/libzkp/impl/Cargo.toml b/common/libzkp/impl/Cargo.toml index 880330ec7e..aeb74f4baa 100644 --- a/common/libzkp/impl/Cargo.toml +++ b/common/libzkp/impl/Cargo.toml @@ -19,7 +19,6 @@ euclid_verifier = { git = "https://github.com/scroll-tech/zkvm-prover.git", tag base64 = "0.13.0" env_logger = "0.9.0" -libc = "0.2" log = "0.4" once_cell = "1.19" serde = "1.0" diff --git a/common/libzkp/impl/Makefile b/common/libzkp/impl/Makefile index e7432282e2..93516869cd 100644 --- a/common/libzkp/impl/Makefile +++ b/common/libzkp/impl/Makefile @@ -2,10 +2,15 @@ build: @cargo build --release + @mkdir -p ../lib + @cp -f target/release/libzkp.so ../lib/ fmt: @cargo fmt --all -- --check +clean: + @rm -f ../lib/libzkp.so + clippy: @cargo check --all-features @cargo clippy --release -- -D warnings diff --git a/common/libzkp/impl/src/lib.rs b/common/libzkp/impl/src/lib.rs index 0bab2012bf..b285edbce1 100644 --- a/common/libzkp/impl/src/lib.rs +++ b/common/libzkp/impl/src/lib.rs @@ -1,15 +1,17 @@ mod utils; mod verifier; -use std::path::Path; +use std::{ + ffi::{c_char, c_int, CString}, + path::Path, +}; use crate::utils::{c_char_to_str, c_char_to_vec}; -use libc::c_char; use verifier::{TaskType, VerifierConfig}; /// # Safety #[no_mangle] -pub unsafe extern "C" fn init(config: *const c_char) { +pub unsafe extern "C" fn init_verifier(config: *const c_char) { let config_str = c_char_to_str(config); let verifier_config = serde_json::from_str::(config_str).unwrap(); verifier::init(verifier_config); @@ -74,3 +76,60 @@ fn _dump_vk(fork_name: *const c_char, file: *const c_char) { verifier.as_ref().dump_vk(Path::new(c_char_to_str(file))); } } + +/// Represents the result of generating a universal task +#[repr(C)] +pub struct HandlingResult { + ok: c_char, + universal_task: *mut c_char, + metadata: *mut c_char, + expected_pi_hash: [c_char; 32], +} + +/// # Safety +#[no_mangle] +pub unsafe extern "C" fn gen_universal_task( + _task_type: c_int, + _task: *const c_char, + _fork_name: *const c_char, +) -> HandlingResult { + unimplemented!("next phase"); +} + +/// # Safety +#[no_mangle] +pub unsafe extern "C" fn release_task_result(result: HandlingResult) { + // Free the allocated strings + if !result.universal_task.is_null() { + let _ = CString::from_raw(result.universal_task); + } + + if !result.metadata.is_null() { + let _ = CString::from_raw(result.metadata); + } +} + +/// # Safety +#[no_mangle] +pub unsafe extern "C" fn gen_wrapped_proof( + _proof_json: *const c_char, + _metadata: *const c_char, + _vk: *const c_char, + _vk_len: usize, +) -> *mut c_char { + unimplemented!("next phase"); +} + +/// # Safety +#[no_mangle] +pub unsafe extern "C" fn release_string(string_ptr: *mut c_char) { + if !string_ptr.is_null() { + let _ = CString::from_raw(string_ptr); + } +} + +/// # Safety +#[no_mangle] +pub unsafe extern "C" fn init_l2geth(_config: *const c_char) { + unimplemented!("next phase"); +} diff --git a/common/libzkp/impl/src/utils.rs b/common/libzkp/impl/src/utils.rs index 3091fa316a..38eb9db6bb 100644 --- a/common/libzkp/impl/src/utils.rs +++ b/common/libzkp/impl/src/utils.rs @@ -1,6 +1,5 @@ use std::{ - ffi::CStr, - os::raw::c_char, + ffi::{c_char, CStr}, panic::{catch_unwind, AssertUnwindSafe}, }; diff --git a/common/libzkp/interface/libzkp.h b/common/libzkp/interface/libzkp.h index 14714e2864..39c0b52b7b 100644 --- a/common/libzkp/interface/libzkp.h +++ b/common/libzkp/interface/libzkp.h @@ -1,12 +1,48 @@ -// BatchVerifier is used to: +// Verifier is used to: // - Verify a batch proof // - Verify a bundle proof -void init(char* config); +// - Verify a chunk proof -char verify_batch_proof(char* proof, char* fork_name); +#ifndef LIBZKP_H +#define LIBZKP_H -char verify_bundle_proof(char* proof, char* fork_name); +#include // For size_t + +// Initialize the verifier with configuration +void init_verifier(char* config); +// Initialize the l2geth with configuration +void init_l2geth(char* config); + +// Verify proofs - returns non-zero for success, zero for failure +char verify_batch_proof(char* proof, char* fork_name); +char verify_bundle_proof(char* proof, char* fork_name); char verify_chunk_proof(char* proof, char* fork_name); +// Dump verification key to file void dump_vk(char* fork_name, char* file); + +// The result struct to hold data from handling a proving task +typedef struct { + char ok; + char* universal_task; + char* metadata; + char expected_pi_hash[32]; +} HandlingResult; + +// Generate a universal task based on task type and input JSON +// Returns a struct containing task data, metadata, and expected proof hash +HandlingResult gen_universal_task(int task_type, char* task, char* fork_name); + +// Release memory allocated for a HandlingResult returned by gen_universal_task +void release_task_result(HandlingResult result); + +// Generate a wrapped proof from the universal prover output and metadata +// Returns a JSON string containing the wrapped proof, or NULL on error +// The caller must call release_string on the returned pointer when done +char* gen_wrapped_proof(char* proof_json, char* metadata, char* vk, size_t vk_len); + +// Release memory allocated for a string returned by gen_wrapped_proof +void release_string(char* string_ptr); + +#endif /* LIBZKP_H */ diff --git a/common/libzkp/lib.go b/common/libzkp/lib.go new file mode 100644 index 0000000000..83a3ed5e9f --- /dev/null +++ b/common/libzkp/lib.go @@ -0,0 +1,143 @@ +package libzkp + +/* +#cgo LDFLAGS: -lzkp -lm -ldl -L${SRCDIR}/lib -Wl,-rpath=${SRCDIR}/lib +#cgo gpu LDFLAGS: -lzkp -lm -ldl -lgmp -lstdc++ -lprocps -L/usr/local/cuda/lib64/ -lcudart -L${SRCDIR}/lib/ -Wl,-rpath=${SRCDIR}/lib +#include +#include "interface/libzkp.h" +*/ +import "C" //nolint:typecheck + +import ( + "fmt" + "os" + "unsafe" +) + +// Helper function to convert Go string to C string and handle cleanup +func goToCString(s string) *C.char { + return C.CString(s) +} + +// Helper function to free C string +func freeCString(s *C.char) { + C.free(unsafe.Pointer(s)) +} + +// Initialize the verifier +func InitVerifier(configJSON string) { + cConfig := goToCString(configJSON) + defer freeCString(cConfig) + + C.init_verifier(cConfig) +} + +// Initialize the verifier +func InitL2geth(configJSON string) { + cConfig := goToCString(configJSON) + defer freeCString(cConfig) + + C.init_l2geth(cConfig) +} + +// Verify a chunk proof +func VerifyChunkProof(proofData, forkName string) bool { + cProof := goToCString(proofData) + cForkName := goToCString(forkName) + defer freeCString(cProof) + defer freeCString(cForkName) + + result := C.verify_chunk_proof(cProof, cForkName) + return result != 0 +} + +// Verify a batch proof +func VerifyBatchProof(proofData, forkName string) bool { + cProof := goToCString(proofData) + cForkName := goToCString(forkName) + defer freeCString(cProof) + defer freeCString(cForkName) + + result := C.verify_batch_proof(cProof, cForkName) + return result != 0 +} + +// Verify a bundle proof +func VerifyBundleProof(proofData, forkName string) bool { + cProof := goToCString(proofData) + cForkName := goToCString(forkName) + defer freeCString(cProof) + defer freeCString(cForkName) + + result := C.verify_bundle_proof(cProof, cForkName) + return result != 0 +} + +// Generate a universal task +func GenerateUniversalTask(taskType int, taskJSON, forkName string) (bool, string, string, []byte) { + cTask := goToCString(taskJSON) + cForkName := goToCString(forkName) + defer freeCString(cTask) + defer freeCString(cForkName) + + result := C.gen_universal_task(C.int(taskType), cTask, cForkName) + defer C.release_task_result(result) + + // Check if the operation was successful + if result.ok == 0 { + return false, "", "", nil + } + + // Convert C strings to Go strings + universalTask := C.GoString(result.universal_task) + metadata := C.GoString(result.metadata) + + // Convert C array to Go slice + piHash := make([]byte, 32) + for i := 0; i < 32; i++ { + piHash[i] = byte(result.expected_pi_hash[i]) + } + + return true, universalTask, metadata, piHash +} + +// Generate wrapped proof +func GenerateWrappedProof(proofJSON, metadata string, vkData []byte) string { + cProofJSON := goToCString(proofJSON) + cMetadata := goToCString(metadata) + defer freeCString(cProofJSON) + defer freeCString(cMetadata) + + // Create a C array from Go slice + cVkData := (*C.char)(unsafe.Pointer(&vkData[0])) + + resultPtr := C.gen_wrapped_proof(cProofJSON, cMetadata, cVkData, C.size_t(len(vkData))) + if resultPtr == nil { + return "" + } + + // Convert result to Go string and free C memory + result := C.GoString(resultPtr) + C.release_string(resultPtr) + + return result +} + +// Dumps a verification key to a file +func DumpVk(forkName, filePath string) error { + cForkName := goToCString(forkName) + cFilePath := goToCString(filePath) + defer freeCString(cForkName) + defer freeCString(cFilePath) + + // Call the C function to dump the verification key + C.dump_vk(cForkName, cFilePath) + + // Check if the file was created successfully + // Note: The C function doesn't return an error code, so we check if the file exists + if _, err := os.Stat(filePath); os.IsNotExist(err) { + return fmt.Errorf("failed to dump verification key: file %s was not created", filePath) + } + + return nil +} diff --git a/coordinator/.gitignore b/coordinator/.gitignore index 04127ffcce..0aad0c9874 100644 --- a/coordinator/.gitignore +++ b/coordinator/.gitignore @@ -1,3 +1,4 @@ /build/bin .idea internal/logic/verifier/lib +internal/libzkp/lib/libzkp.so diff --git a/coordinator/Makefile b/coordinator/Makefile index 5980f40e4c..91ed9adc47 100644 --- a/coordinator/Makefile +++ b/coordinator/Makefile @@ -16,11 +16,15 @@ ZK_VERSION=${ZKEVM_VERSION}-${HALO2_VERSION} test: go test -v -race -coverprofile=coverage.txt -covermode=atomic -p 1 $(PWD)/... -libzkp: - cd ../common/libzkp/impl && cargo clean && cargo build --release && cp ./target/release/libzkp.so ../interface/ - rm -rf ./internal/logic/verifier/lib && cp -r ../common/libzkp/interface ./internal/logic/verifier/lib +../common/libzkp/lib/libzkp.so: + $(MAKE) -C ../common/libzkp/impl build -coordinator_api: libzkp ## Builds the Coordinator api instance. +clean_libzkp: + $(MAKE) -C ../common/libzkp/impl clean + +libzkp: clean_libzkp ../common/libzkp/lib/libzkp.so + +coordinator_api: ../common/libzkp/lib/libzkp.so ## Builds the Coordinator api instance. go build -ldflags "-X scroll-tech/common/version.ZkVersion=${ZK_VERSION}" -o $(PWD)/build/bin/coordinator_api ./cmd/api coordinator_cron: @@ -38,14 +42,14 @@ mock_coordinator_api: ## Builds the mocked Coordinator instance. mock_coordinator_cron: ## Builds the mocked Coordinator instance. go build -tags="mock_prover mock_verifier" -o $(PWD)/build/bin/coordinator_cron ./cmd/cron -test-verifier: libzkp +test-verifier: ../common/libzkp/lib/libzkp.so go test -tags ffi -timeout 0 -v ./internal/logic/verifier -test-gpu-verifier: libzkp +test-gpu-verifier: ../common/libzkp/lib/libzkp.so go test -tags="gpu ffi" -timeout 0 -v ./internal/logic/verifier lint: ## Lint the files - used for CI - cp -r ../common/libzkp/interface ./internal/logic/verifier/lib +# cp -r ../common/libzkp/interface ./internal/logic/verifier/lib GOBIN=$(PWD)/build/bin go run ../build/lint.go clean: ## Empty out the bin folder diff --git a/coordinator/internal/config/config.go b/coordinator/internal/config/config.go index 110405fb00..851bac49d3 100644 --- a/coordinator/internal/config/config.go +++ b/coordinator/internal/config/config.go @@ -28,10 +28,16 @@ type ProverManager struct { BundleCollectionTimeSec int `json:"bundle_collection_time_sec"` } +// l2geth client configuration items +type L2Endpoint struct { + Url string `json:"endpoint"` +} + // L2 loads l2geth configuration items. type L2 struct { // l2geth chain_id. - ChainID uint64 `json:"chain_id"` + ChainID uint64 `json:"chain_id"` + Endpoint *L2Endpoint `json:"l2geth"` } // Auth provides the auth coordinator diff --git a/coordinator/internal/controller/api/controller.go b/coordinator/internal/controller/api/controller.go index 3e7a569617..60ffa8a7bd 100644 --- a/coordinator/internal/controller/api/controller.go +++ b/coordinator/internal/controller/api/controller.go @@ -1,11 +1,14 @@ package api import ( + "encoding/json" + "github.com/prometheus/client_golang/prometheus" "github.com/scroll-tech/go-ethereum/log" "github.com/scroll-tech/go-ethereum/params" "gorm.io/gorm" + "scroll-tech/common/libzkp" "scroll-tech/coordinator/internal/config" "scroll-tech/coordinator/internal/logic/verifier" ) @@ -28,7 +31,17 @@ func InitController(cfg *config.Config, chainCfg *params.ChainConfig, db *gorm.D log.Info("verifier created", "openVmVerifier", vf.OpenVMVkMap) + l2cfg := cfg.L2.Endpoint + if l2cfg == nil { + panic("l2geth is not specified") + } + l2cfgBytes, err := json.Marshal(l2cfg) + if err != nil { + panic(err) + } + libzkp.InitL2geth(string(l2cfgBytes)) + Auth = NewAuthController(db, cfg, vf) GetTask = NewGetTaskController(cfg, chainCfg, db, reg) - SubmitProof = NewSubmitProofController(cfg, chainCfg, db, vf, reg) + SubmitProof = NewSubmitProofController(cfg, chainCfg, db, vf, reg, GetTask) } diff --git a/coordinator/internal/controller/api/get_task.go b/coordinator/internal/controller/api/get_task.go index a2e0290042..1ed73340b0 100644 --- a/coordinator/internal/controller/api/get_task.go +++ b/coordinator/internal/controller/api/get_task.go @@ -47,6 +47,10 @@ func NewGetTaskController(cfg *config.Config, chainCfg *params.ChainConfig, db * return ptc } +func (ptc *GetTaskController) ProverTasks() map[message.ProofType]provertask.ProverTask { + return ptc.proverTasks +} + func (ptc *GetTaskController) incGetTaskAccessCounter(ctx *gin.Context) error { publicKey, publicKeyExist := ctx.Get(coordinatorType.PublicKey) if !publicKeyExist { diff --git a/coordinator/internal/controller/api/submit_proof.go b/coordinator/internal/controller/api/submit_proof.go index e746cc256c..9884683565 100644 --- a/coordinator/internal/controller/api/submit_proof.go +++ b/coordinator/internal/controller/api/submit_proof.go @@ -9,6 +9,7 @@ import ( "gorm.io/gorm" "scroll-tech/common/types" + "scroll-tech/common/types/message" "scroll-tech/coordinator/internal/config" "scroll-tech/coordinator/internal/logic/submitproof" @@ -22,10 +23,15 @@ type SubmitProofController struct { } // NewSubmitProofController create the submit proof api controller instance -func NewSubmitProofController(cfg *config.Config, chainCfg *params.ChainConfig, db *gorm.DB, vf *verifier.Verifier, reg prometheus.Registerer) *SubmitProofController { - return &SubmitProofController{ +func NewSubmitProofController(cfg *config.Config, chainCfg *params.ChainConfig, db *gorm.DB, vf *verifier.Verifier, reg prometheus.Registerer, getTaskController *GetTaskController) *SubmitProofController { + controller := SubmitProofController{ submitProofReceiverLogic: submitproof.NewSubmitProofReceiverLogic(cfg.ProverManager, chainCfg, db, vf, reg), } + proverTaskIf := getTaskController.ProverTasks() + controller.submitProofReceiverLogic.ChunkTask = proverTaskIf[message.ProofTypeChunk] + controller.submitProofReceiverLogic.BatchTask = proverTaskIf[message.ProofTypeBatch] + controller.submitProofReceiverLogic.BundleTask = proverTaskIf[message.ProofTypeBundle] + return &controller } // SubmitProof prover submit the proof to coordinator diff --git a/coordinator/internal/logic/provertask/batch_prover_task.go b/coordinator/internal/logic/provertask/batch_prover_task.go index b598f3bc39..d71451a134 100644 --- a/coordinator/internal/logic/provertask/batch_prover_task.go +++ b/coordinator/internal/logic/provertask/batch_prover_task.go @@ -47,6 +47,7 @@ func NewBatchProverTask(cfg *config.Config, chainCfg *params.ChainConfig, db *go batchOrm: orm.NewBatch(db), proverTaskOrm: orm.NewProverTask(db), proverBlockListOrm: orm.NewProverBlockList(db), + taskCache: newCache(128), }, batchTaskGetTaskTotal: promauto.With(reg).NewCounterVec(prometheus.CounterOpts{ Name: "coordinator_batch_get_task_total", @@ -174,6 +175,14 @@ func (bp *BatchProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato log.Error("format prover task failure", "task_id", batchTask.Hash, "err", err) return nil, ErrCoordinatorInternalFailure } + if getTaskParameter.Universal { + taskMsg, err = bp.applyUniversal(taskMsg) + if err != nil { + bp.recoverActiveAttempts(ctx, batchTask) + log.Error("Generate universal prover task failure", "task_id", batchTask.Hash, "type", "batch") + return nil, ErrCoordinatorInternalFailure + } + } bp.batchTaskGetTaskTotal.WithLabelValues(hardForkName).Inc() bp.batchTaskGetTaskProver.With(prometheus.Labels{ @@ -185,6 +194,14 @@ func (bp *BatchProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato return taskMsg, nil } +func (bp *BatchProverTask) GetTaskMetaData(taskID string) (string, error) { + if cached := bp.taskCache.Query(taskID); cached != nil { + return cached.MetaData, nil + } + + return "", fmt.Errorf("can not re-acquire the metadata for specified task, see coordinator log for the reason") +} + func (bp *BatchProverTask) formatProverTask(ctx context.Context, task *orm.ProverTask, batch *orm.Batch, hardForkName string) (*coordinatorType.GetTaskSchema, error) { // get chunk from db chunks, err := bp.chunkOrm.GetChunksByBatchHash(ctx, task.TaskID) diff --git a/coordinator/internal/logic/provertask/bundle_prover_task.go b/coordinator/internal/logic/provertask/bundle_prover_task.go index 93a46df0c1..e614db7392 100644 --- a/coordinator/internal/logic/provertask/bundle_prover_task.go +++ b/coordinator/internal/logic/provertask/bundle_prover_task.go @@ -45,6 +45,7 @@ func NewBundleProverTask(cfg *config.Config, chainCfg *params.ChainConfig, db *g bundleOrm: orm.NewBundle(db), proverTaskOrm: orm.NewProverTask(db), proverBlockListOrm: orm.NewProverBlockList(db), + taskCache: newCache(128), }, bundleTaskGetTaskTotal: promauto.With(reg).NewCounterVec(prometheus.CounterOpts{ Name: "coordinator_bundle_get_task_total", @@ -172,6 +173,14 @@ func (bp *BundleProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinat log.Error("format bundle prover task failure", "task_id", bundleTask.Hash, "err", err) return nil, ErrCoordinatorInternalFailure } + if getTaskParameter.Universal { + taskMsg, err = bp.applyUniversal(taskMsg) + if err != nil { + bp.recoverActiveAttempts(ctx, bundleTask) + log.Error("Generate universal prover task failure", "task_id", bundleTask.Hash, "type", "bundle") + return nil, ErrCoordinatorInternalFailure + } + } bp.bundleTaskGetTaskTotal.WithLabelValues(hardForkName).Inc() bp.bundleTaskGetTaskProver.With(prometheus.Labels{ @@ -183,6 +192,14 @@ func (bp *BundleProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinat return taskMsg, nil } +func (bp *BundleProverTask) GetTaskMetaData(taskID string) (string, error) { + if cached := bp.taskCache.Query(taskID); cached != nil { + return cached.MetaData, nil + } + + return "", fmt.Errorf("can not re-acquire the metadata for specified task, see coordinator log for the reason") +} + func (bp *BundleProverTask) formatProverTask(ctx context.Context, task *orm.ProverTask, hardForkName string) (*coordinatorType.GetTaskSchema, error) { // get bundle from db batches, err := bp.batchOrm.GetBatchesByBundleHash(ctx, task.TaskID) diff --git a/coordinator/internal/logic/provertask/chunk_prover_task.go b/coordinator/internal/logic/provertask/chunk_prover_task.go index 0915f3538c..050ced1946 100644 --- a/coordinator/internal/logic/provertask/chunk_prover_task.go +++ b/coordinator/internal/logic/provertask/chunk_prover_task.go @@ -43,6 +43,7 @@ func NewChunkProverTask(cfg *config.Config, chainCfg *params.ChainConfig, db *go blockOrm: orm.NewL2Block(db), proverTaskOrm: orm.NewProverTask(db), proverBlockListOrm: orm.NewProverBlockList(db), + taskCache: newCache(1024), }, chunkTaskGetTaskTotal: promauto.With(reg).NewCounterVec(prometheus.CounterOpts{ Name: "coordinator_chunk_get_task_total", @@ -169,6 +170,14 @@ func (cp *ChunkProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato log.Error("format prover task failure", "task_id", chunkTask.Hash, "err", err) return nil, ErrCoordinatorInternalFailure } + if getTaskParameter.Universal { + taskMsg, err = cp.applyUniversal(taskMsg) + if err != nil { + cp.recoverActiveAttempts(ctx, chunkTask) + log.Error("Generate universal prover task failure", "task_id", chunkTask.Hash, "type", "chunk") + return nil, ErrCoordinatorInternalFailure + } + } cp.chunkTaskGetTaskTotal.WithLabelValues(hardForkName).Inc() cp.chunkTaskGetTaskProver.With(prometheus.Labels{ @@ -180,6 +189,14 @@ func (cp *ChunkProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato return taskMsg, nil } +func (cp *ChunkProverTask) GetTaskMetaData(taskID string) (string, error) { + if cached := cp.taskCache.Query(taskID); cached != nil { + return cached.MetaData, nil + } + + return "", fmt.Errorf("can not re-acquire the metadata for specified task, see coordinator log for the reason") +} + func (cp *ChunkProverTask) formatProverTask(ctx context.Context, task *orm.ProverTask, chunk *orm.Chunk, hardForkName string) (*coordinatorType.GetTaskSchema, error) { // Get block hashes. blockHashes, dbErr := cp.blockOrm.GetL2BlockHashesByChunkHash(ctx, task.TaskID) diff --git a/coordinator/internal/logic/provertask/prover_task.go b/coordinator/internal/logic/provertask/prover_task.go index 1c4f2fd3e6..f036aed3bd 100644 --- a/coordinator/internal/logic/provertask/prover_task.go +++ b/coordinator/internal/logic/provertask/prover_task.go @@ -13,6 +13,7 @@ import ( "github.com/scroll-tech/go-ethereum/params" "gorm.io/gorm" + "scroll-tech/common/libzkp" "scroll-tech/common/types/message" "scroll-tech/coordinator/internal/config" @@ -33,6 +34,7 @@ var ( // ProverTask the interface of a collector who send data to prover type ProverTask interface { Assign(ctx *gin.Context, getTaskParameter *coordinatorType.GetTaskParameter) (*coordinatorType.GetTaskSchema, error) + GetTaskMetaData(taskID string) (string, error) } // BaseProverTask a base prover task which contain series functions @@ -47,6 +49,8 @@ type BaseProverTask struct { blockOrm *orm.L2Block proverTaskOrm *orm.ProverTask proverBlockListOrm *orm.ProverBlockList + + taskCache *TaskCache } type proverTaskContext struct { @@ -185,6 +189,26 @@ func (b *BaseProverTask) checkParameter(ctx *gin.Context) (*proverTaskContext, e return &ptc, nil } +func (b *BaseProverTask) applyUniversal(schema *coordinatorType.GetTaskSchema) (*coordinatorType.GetTaskSchema, error) { + if cached := b.taskCache.Query(schema.TaskID); cached != nil { + schema.TaskData = cached.UTaskData + return schema, nil + } + + ok, metadata, uTaskData, _ := libzkp.GenerateUniversalTask(schema.TaskType, schema.TaskData, schema.HardForkName) + if !ok { + return nil, fmt.Errorf("can not generate universal task, see coordinator log for the reason") + } + + cacheData := CachedTaskData{ + MetaData: metadata, + UTaskData: uTaskData, + } + b.taskCache.Add(schema.TaskID, &cacheData) + schema.TaskData = uTaskData + return schema, nil +} + func newGetTaskCounterVec(factory promauto.Factory, taskType string) *prometheus.CounterVec { getTaskCounterInitOnce.Do(func() { getTaskCounterVec = factory.NewCounterVec(prometheus.CounterOpts{ diff --git a/coordinator/internal/logic/provertask/task_cache.go b/coordinator/internal/logic/provertask/task_cache.go new file mode 100644 index 0000000000..a6ae3ec372 --- /dev/null +++ b/coordinator/internal/logic/provertask/task_cache.go @@ -0,0 +1,56 @@ +package provertask + +import ( + "sync" +) + +type CachedTaskData struct { + MetaData string + UTaskData string +} + +// very simple size limited lru caching for task +type TaskCache struct { + sync.RWMutex + cache map[string]*CachedTaskData + dropping_cache map[string]*CachedTaskData + limit int +} + +func newCache(limit int) *TaskCache { + t := TaskCache{ + cache: make(map[string]*CachedTaskData), + dropping_cache: make(map[string]*CachedTaskData), + limit: limit, + } + + return &t +} + +func (c *TaskCache) Add(k string, itm *CachedTaskData) { + c.Lock() + defer c.Unlock() + + if len(c.cache) >= c.limit { + c.dropping_cache = c.cache + c.cache = make(map[string]*CachedTaskData) + } + c.cache[k] = itm +} + +func (c *TaskCache) Query(key string) *CachedTaskData { + c.RLock() + if v, ok := c.cache[key]; ok { + c.RUnlock() + return v + } + + if v, ok := c.dropping_cache[key]; ok { + c.RUnlock() + c.Add(key, v) + return v + } + + c.RUnlock() + return nil +} diff --git a/coordinator/internal/logic/submitproof/proof_receiver.go b/coordinator/internal/logic/submitproof/proof_receiver.go index 444670ffe4..9a5a4ad8f0 100644 --- a/coordinator/internal/logic/submitproof/proof_receiver.go +++ b/coordinator/internal/logic/submitproof/proof_receiver.go @@ -15,10 +15,12 @@ import ( "github.com/scroll-tech/go-ethereum/params" "gorm.io/gorm" + "scroll-tech/common/libzkp" "scroll-tech/common/types" "scroll-tech/common/types/message" "scroll-tech/coordinator/internal/config" + "scroll-tech/coordinator/internal/logic/provertask" "scroll-tech/coordinator/internal/logic/verifier" "scroll-tech/coordinator/internal/orm" coordinatorType "scroll-tech/coordinator/internal/types" @@ -69,6 +71,10 @@ type ProofReceiverLogic struct { validateFailureProverTaskStatusNotOk prometheus.Counter validateFailureProverTaskTimeout prometheus.Counter validateFailureProverTaskHaveVerifier prometheus.Counter + + ChunkTask provertask.ProverTask + BundleTask provertask.ProverTask + BatchTask provertask.ProverTask } // NewSubmitProofReceiverLogic create a proof receiver logic @@ -168,6 +174,26 @@ func (m *ProofReceiverLogic) HandleZkProof(ctx *gin.Context, proofParameter coor if getHardForkErr != nil { return ErrGetHardForkNameFailed } + if proofParameter.Universal { + var metadata string + var err error + switch message.ProofType(proofParameter.TaskType) { + case message.ProofTypeChunk: + metadata, err = m.ChunkTask.GetTaskMetaData(proofParameter.TaskID) + case message.ProofTypeBatch: + metadata, err = m.BatchTask.GetTaskMetaData(proofParameter.TaskID) + case message.ProofTypeBundle: + metadata, err = m.BundleTask.GetTaskMetaData(proofParameter.TaskID) + } + + if err != nil { + return err + } + proofParameter.Proof = libzkp.GenerateWrappedProof(proofParameter.Proof, metadata, []byte{}) + if proofParameter.Proof == "" { + return errors.New("can not re-wrapping proof, see coordinator log for reason") + } + } switch message.ProofType(proofParameter.TaskType) { case message.ProofTypeChunk: diff --git a/coordinator/internal/logic/verifier/verifier.go b/coordinator/internal/logic/verifier/verifier.go index 2b1f5b31ca..999bad9032 100644 --- a/coordinator/internal/logic/verifier/verifier.go +++ b/coordinator/internal/logic/verifier/verifier.go @@ -2,24 +2,17 @@ package verifier -/* -#cgo LDFLAGS: -lzkp -lm -ldl -L${SRCDIR}/lib/ -Wl,-rpath=${SRCDIR}/lib -#cgo gpu LDFLAGS: -lzkp -lm -ldl -lgmp -lstdc++ -lprocps -L/usr/local/cuda/lib64/ -lcudart -L${SRCDIR}/lib/ -Wl,-rpath=${SRCDIR}/lib -#include -#include "./lib/libzkp.h" -*/ -import "C" //nolint:typecheck - import ( "encoding/base64" "encoding/json" "io" "os" "path" - "unsafe" + "path/filepath" "github.com/scroll-tech/go-ethereum/log" + "scroll-tech/common/libzkp" "scroll-tech/common/types/message" "scroll-tech/coordinator/internal/config" @@ -67,12 +60,7 @@ func NewVerifier(cfg *config.VerifierConfig) (*Verifier, error) { return nil, err } - configStr := C.CString(string(configBytes)) - defer func() { - C.free(unsafe.Pointer(configStr)) - }() - - C.init(configStr) + libzkp.InitVerifier(string(configBytes)) v := &Verifier{ cfg: cfg, @@ -94,15 +82,7 @@ func (v *Verifier) VerifyBatchProof(proof *message.OpenVMBatchProof, forkName st } log.Info("Start to verify batch proof", "forkName", forkName) - proofStr := C.CString(string(buf)) - forkNameStr := C.CString(forkName) - defer func() { - C.free(unsafe.Pointer(proofStr)) - C.free(unsafe.Pointer(forkNameStr)) - }() - - verified := C.verify_batch_proof(proofStr, forkNameStr) - return verified != 0, nil + return libzkp.VerifyBatchProof(string(buf), forkName), nil } // VerifyChunkProof Verify a ZkProof by marshaling it and sending it to the Verifier. @@ -113,15 +93,8 @@ func (v *Verifier) VerifyChunkProof(proof *message.OpenVMChunkProof, forkName st } log.Info("Start to verify chunk proof", "forkName", forkName) - proofStr := C.CString(string(buf)) - forkNameStr := C.CString(forkName) - defer func() { - C.free(unsafe.Pointer(proofStr)) - C.free(unsafe.Pointer(forkNameStr)) - }() - - verified := C.verify_chunk_proof(proofStr, forkNameStr) - return verified != 0, nil + + return libzkp.VerifyChunkProof(string(buf), forkName), nil } // VerifyBundleProof Verify a ZkProof for a bundle of batches, by marshaling it and verifying it via the EVM verifier. @@ -131,20 +104,13 @@ func (v *Verifier) VerifyBundleProof(proof *message.OpenVMBundleProof, forkName return false, err } - proofStr := C.CString(string(buf)) - forkNameStr := C.CString(forkName) - defer func() { - C.free(unsafe.Pointer(proofStr)) - C.free(unsafe.Pointer(forkNameStr)) - }() - log.Info("Start to verify bundle proof ...") - verified := C.verify_bundle_proof(proofStr, forkNameStr) - return verified != 0, nil + return libzkp.VerifyBundleProof(string(buf), forkName), nil } -func (v *Verifier) readVK(filePat string) (string, error) { - f, err := os.Open(filePat) +func (v *Verifier) ReadVK(filePat string) (string, error) { + + f, err := os.Open(filepath.Clean(filePat)) if err != nil { return "", err } @@ -157,20 +123,12 @@ func (v *Verifier) readVK(filePat string) (string, error) { func (v *Verifier) loadOpenVMVks(forkName string) error { tempFile := path.Join(os.TempDir(), "openVmVk.json") - defer func() { - if err := os.Remove(tempFile); err != nil { - log.Error("failed to remove temp file", "err", err) - } - }() - - forkNameCStr := C.CString(forkName) - defer C.free(unsafe.Pointer(forkNameCStr)) - tempFileCStr := C.CString(tempFile) - defer C.free(unsafe.Pointer(tempFileCStr)) - - C.dump_vk(forkNameCStr, tempFileCStr) + err := libzkp.DumpVk(forkName, tempFile) + if err != nil { + return err + } - f, err := os.Open(tempFile) + f, err := os.Open(filepath.Clean(tempFile)) if err != nil { return err } diff --git a/coordinator/internal/logic/verifier/verifier_test.go b/coordinator/internal/logic/verifier/verifier_test.go index d23790597a..696ff40d40 100644 --- a/coordinator/internal/logic/verifier/verifier_test.go +++ b/coordinator/internal/logic/verifier/verifier_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" - "scroll-tech/common/types" + "scroll-tech/common/types/message" "scroll-tech/coordinator/internal/config" ) @@ -58,25 +58,25 @@ func TestFFI(t *testing.T) { t.Log("Verified batch proof") } -func readBatchProof(filePat string, as *assert.Assertions) *types.OpenVMBatchProof { +func readBatchProof(filePat string, as *assert.Assertions) *message.OpenVMBatchProof { f, err := os.Open(filePat) as.NoError(err) byt, err := io.ReadAll(f) as.NoError(err) - proof := &types.OpenVMBatchProof{} + proof := &message.OpenVMBatchProof{} as.NoError(json.Unmarshal(byt, proof)) return proof } -func readChunkProof(filePat string, as *assert.Assertions) *types.OpenVMChunkProof { +func readChunkProof(filePat string, as *assert.Assertions) *message.OpenVMChunkProof { f, err := os.Open(filePat) as.NoError(err) byt, err := io.ReadAll(f) as.NoError(err) - proof := &types.OpenVMChunkProof{} + proof := &message.OpenVMChunkProof{} as.NoError(json.Unmarshal(byt, proof)) return proof diff --git a/coordinator/internal/types/get_task.go b/coordinator/internal/types/get_task.go index 7dd5083736..b9383974fa 100644 --- a/coordinator/internal/types/get_task.go +++ b/coordinator/internal/types/get_task.go @@ -4,6 +4,8 @@ package types type GetTaskParameter struct { ProverHeight uint64 `form:"prover_height" json:"prover_height"` TaskTypes []int `form:"task_types" json:"task_types"` + TaskID string `form:"task_id,omitempty" json:"task_id,omitempty"` + Universal bool `form:"universal,omitempty" json:"universal,omitempty"` } // GetTaskSchema the schema data return to prover for get prover task diff --git a/coordinator/internal/types/submit_proof.go b/coordinator/internal/types/submit_proof.go index cbf325e225..5bf6200a0d 100644 --- a/coordinator/internal/types/submit_proof.go +++ b/coordinator/internal/types/submit_proof.go @@ -7,6 +7,7 @@ type SubmitProofParameter struct { TaskType int `form:"task_type" json:"task_type" binding:"required"` Status int `form:"status" json:"status"` Proof string `form:"proof" json:"proof"` + Universal bool `form:"universal,omitempty" json:"universal,omitempty"` FailureType int `form:"failure_type" json:"failure_type"` FailureMsg string `form:"failure_msg" json:"failure_msg"` } diff --git a/go.work b/go.work index 4cbfe753ee..53e0310311 100644 --- a/go.work +++ b/go.work @@ -3,6 +3,7 @@ go 1.22.4 use ( ./bridge-history-api ./common + ./common/libzkp ./coordinator ./database ./rollup From 9d47f2e49c7fc59bd3d775bd31e8852906d0515b Mon Sep 17 00:00:00 2001 From: Ho Date: Tue, 17 Jun 2025 16:50:34 +0900 Subject: [PATCH 02/11] complete the getmetadata method --- .../logic/provertask/batch_prover_task.go | 29 +++++++++++++++++-- .../logic/provertask/bundle_prover_task.go | 24 +++++++++++++-- .../logic/provertask/chunk_prover_task.go | 29 +++++++++++++++++-- .../internal/logic/provertask/prover_task.go | 2 +- .../logic/submitproof/proof_receiver.go | 6 ++-- 5 files changed, 80 insertions(+), 10 deletions(-) diff --git a/coordinator/internal/logic/provertask/batch_prover_task.go b/coordinator/internal/logic/provertask/batch_prover_task.go index d71451a134..5756ec4264 100644 --- a/coordinator/internal/logic/provertask/batch_prover_task.go +++ b/coordinator/internal/logic/provertask/batch_prover_task.go @@ -194,12 +194,37 @@ func (bp *BatchProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato return taskMsg, nil } -func (bp *BatchProverTask) GetTaskMetaData(taskID string) (string, error) { +func (bp *BatchProverTask) GetTaskMetaData(ctx *gin.Context, proverTask *orm.ProverTask, hardForkName string) (string, error) { + taskID := proverTask.TaskID if cached := bp.taskCache.Query(taskID); cached != nil { return cached.MetaData, nil } - return "", fmt.Errorf("can not re-acquire the metadata for specified task, see coordinator log for the reason") + // for most case we simply query metadata from cache, but if the task is not in cache, we need quite a few + // effort to resume the cached universal task + batchTask, err := bp.batchOrm.GetBatchByHash(ctx.Copy(), taskID) + if err != nil { + log.Error("failed to get chunk by hash", "task_id", taskID, "err", err) + return "", ErrCoordinatorInternalFailure + } + taskMsg, err := bp.formatProverTask(ctx.Copy(), proverTask, batchTask, hardForkName) + if err != nil { + log.Error("re-format prover task failure", "task_id", taskID, "err", err) + return "", ErrCoordinatorInternalFailure + } + + taskMsg, err = bp.applyUniversal(taskMsg) + if err != nil { + log.Error("Generate universal prover task failure", "task_id", taskID, "type", "chunk") + return "", ErrCoordinatorInternalFailure + } + + if cached := bp.taskCache.Query(taskID); cached == nil { + log.Error("Still can not obtain metadata, something wrong?", "task_id", taskID, "type", "chunk") + return "", ErrCoordinatorInternalFailure + } else { + return cached.MetaData, nil + } } func (bp *BatchProverTask) formatProverTask(ctx context.Context, task *orm.ProverTask, batch *orm.Batch, hardForkName string) (*coordinatorType.GetTaskSchema, error) { diff --git a/coordinator/internal/logic/provertask/bundle_prover_task.go b/coordinator/internal/logic/provertask/bundle_prover_task.go index e614db7392..22e6586bc0 100644 --- a/coordinator/internal/logic/provertask/bundle_prover_task.go +++ b/coordinator/internal/logic/provertask/bundle_prover_task.go @@ -192,12 +192,32 @@ func (bp *BundleProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinat return taskMsg, nil } -func (bp *BundleProverTask) GetTaskMetaData(taskID string) (string, error) { +func (bp *BundleProverTask) GetTaskMetaData(ctx *gin.Context, proverTask *orm.ProverTask, hardForkName string) (string, error) { + taskID := proverTask.TaskID if cached := bp.taskCache.Query(taskID); cached != nil { return cached.MetaData, nil } - return "", fmt.Errorf("can not re-acquire the metadata for specified task, see coordinator log for the reason") + // for most case we simply query metadata from cache, but if the task is not in cache, we need quite a few + // effort to resume the cached universal task + taskMsg, err := bp.formatProverTask(ctx.Copy(), proverTask, hardForkName) + if err != nil { + log.Error("re-format prover task failure", "task_id", taskID, "err", err) + return "", ErrCoordinatorInternalFailure + } + + taskMsg, err = bp.applyUniversal(taskMsg) + if err != nil { + log.Error("Generate universal prover task failure", "task_id", taskID, "type", "chunk") + return "", ErrCoordinatorInternalFailure + } + + if cached := bp.taskCache.Query(taskID); cached == nil { + log.Error("Still can not obtain metadata, something wrong?", "task_id", taskID, "type", "chunk") + return "", ErrCoordinatorInternalFailure + } else { + return cached.MetaData, nil + } } func (bp *BundleProverTask) formatProverTask(ctx context.Context, task *orm.ProverTask, hardForkName string) (*coordinatorType.GetTaskSchema, error) { diff --git a/coordinator/internal/logic/provertask/chunk_prover_task.go b/coordinator/internal/logic/provertask/chunk_prover_task.go index 050ced1946..d3519a5790 100644 --- a/coordinator/internal/logic/provertask/chunk_prover_task.go +++ b/coordinator/internal/logic/provertask/chunk_prover_task.go @@ -189,12 +189,37 @@ func (cp *ChunkProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato return taskMsg, nil } -func (cp *ChunkProverTask) GetTaskMetaData(taskID string) (string, error) { +func (cp *ChunkProverTask) GetTaskMetaData(ctx *gin.Context, proverTask *orm.ProverTask, hardForkName string) (string, error) { + taskID := proverTask.TaskID if cached := cp.taskCache.Query(taskID); cached != nil { return cached.MetaData, nil } - return "", fmt.Errorf("can not re-acquire the metadata for specified task, see coordinator log for the reason") + // for most case we simply query metadata from cache, but if the task is not in cache, we need quite a few + // effort to resume the cached universal task + chunkTask, err := cp.chunkOrm.GetChunkByHash(ctx.Copy(), taskID) + if err != nil { + log.Error("failed to get chunk by hash", "task_id", taskID, "err", err) + return "", ErrCoordinatorInternalFailure + } + taskMsg, err := cp.formatProverTask(ctx.Copy(), proverTask, chunkTask, hardForkName) + if err != nil { + log.Error("re-format prover task failure", "task_id", taskID, "err", err) + return "", ErrCoordinatorInternalFailure + } + + taskMsg, err = cp.applyUniversal(taskMsg) + if err != nil { + log.Error("Generate universal prover task failure", "task_id", taskID, "type", "chunk") + return "", ErrCoordinatorInternalFailure + } + + if cached := cp.taskCache.Query(taskID); cached == nil { + log.Error("Still can not obtain metadata, something wrong?", "task_id", taskID, "type", "chunk") + return "", ErrCoordinatorInternalFailure + } else { + return cached.MetaData, nil + } } func (cp *ChunkProverTask) formatProverTask(ctx context.Context, task *orm.ProverTask, chunk *orm.Chunk, hardForkName string) (*coordinatorType.GetTaskSchema, error) { diff --git a/coordinator/internal/logic/provertask/prover_task.go b/coordinator/internal/logic/provertask/prover_task.go index f036aed3bd..7450d92d58 100644 --- a/coordinator/internal/logic/provertask/prover_task.go +++ b/coordinator/internal/logic/provertask/prover_task.go @@ -34,7 +34,7 @@ var ( // ProverTask the interface of a collector who send data to prover type ProverTask interface { Assign(ctx *gin.Context, getTaskParameter *coordinatorType.GetTaskParameter) (*coordinatorType.GetTaskSchema, error) - GetTaskMetaData(taskID string) (string, error) + GetTaskMetaData(ctx *gin.Context, task *orm.ProverTask, HardForkName string) (string, error) } // BaseProverTask a base prover task which contain series functions diff --git a/coordinator/internal/logic/submitproof/proof_receiver.go b/coordinator/internal/logic/submitproof/proof_receiver.go index 9a5a4ad8f0..a91d2a1b5a 100644 --- a/coordinator/internal/logic/submitproof/proof_receiver.go +++ b/coordinator/internal/logic/submitproof/proof_receiver.go @@ -179,11 +179,11 @@ func (m *ProofReceiverLogic) HandleZkProof(ctx *gin.Context, proofParameter coor var err error switch message.ProofType(proofParameter.TaskType) { case message.ProofTypeChunk: - metadata, err = m.ChunkTask.GetTaskMetaData(proofParameter.TaskID) + metadata, err = m.ChunkTask.GetTaskMetaData(ctx.Copy(), proverTask, hardForkName) case message.ProofTypeBatch: - metadata, err = m.BatchTask.GetTaskMetaData(proofParameter.TaskID) + metadata, err = m.BatchTask.GetTaskMetaData(ctx.Copy(), proverTask, hardForkName) case message.ProofTypeBundle: - metadata, err = m.BundleTask.GetTaskMetaData(proofParameter.TaskID) + metadata, err = m.BundleTask.GetTaskMetaData(ctx.Copy(), proverTask, hardForkName) } if err != nil { From e1ce63150095181fca555a245066361d7e27d4bf Mon Sep 17 00:00:00 2001 From: Ho Date: Tue, 17 Jun 2025 17:02:44 +0900 Subject: [PATCH 03/11] fix lints --- coordinator/internal/logic/provertask/batch_prover_task.go | 2 +- coordinator/internal/logic/provertask/bundle_prover_task.go | 2 +- coordinator/internal/logic/provertask/chunk_prover_task.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coordinator/internal/logic/provertask/batch_prover_task.go b/coordinator/internal/logic/provertask/batch_prover_task.go index 5756ec4264..62b81e8189 100644 --- a/coordinator/internal/logic/provertask/batch_prover_task.go +++ b/coordinator/internal/logic/provertask/batch_prover_task.go @@ -213,7 +213,7 @@ func (bp *BatchProverTask) GetTaskMetaData(ctx *gin.Context, proverTask *orm.Pro return "", ErrCoordinatorInternalFailure } - taskMsg, err = bp.applyUniversal(taskMsg) + _, err = bp.applyUniversal(taskMsg) if err != nil { log.Error("Generate universal prover task failure", "task_id", taskID, "type", "chunk") return "", ErrCoordinatorInternalFailure diff --git a/coordinator/internal/logic/provertask/bundle_prover_task.go b/coordinator/internal/logic/provertask/bundle_prover_task.go index 22e6586bc0..b827ddcce5 100644 --- a/coordinator/internal/logic/provertask/bundle_prover_task.go +++ b/coordinator/internal/logic/provertask/bundle_prover_task.go @@ -206,7 +206,7 @@ func (bp *BundleProverTask) GetTaskMetaData(ctx *gin.Context, proverTask *orm.Pr return "", ErrCoordinatorInternalFailure } - taskMsg, err = bp.applyUniversal(taskMsg) + _, err = bp.applyUniversal(taskMsg) if err != nil { log.Error("Generate universal prover task failure", "task_id", taskID, "type", "chunk") return "", ErrCoordinatorInternalFailure diff --git a/coordinator/internal/logic/provertask/chunk_prover_task.go b/coordinator/internal/logic/provertask/chunk_prover_task.go index d3519a5790..2da74870b1 100644 --- a/coordinator/internal/logic/provertask/chunk_prover_task.go +++ b/coordinator/internal/logic/provertask/chunk_prover_task.go @@ -208,7 +208,7 @@ func (cp *ChunkProverTask) GetTaskMetaData(ctx *gin.Context, proverTask *orm.Pro return "", ErrCoordinatorInternalFailure } - taskMsg, err = cp.applyUniversal(taskMsg) + _, err = cp.applyUniversal(taskMsg) if err != nil { log.Error("Generate universal prover task failure", "task_id", taskID, "type", "chunk") return "", ErrCoordinatorInternalFailure From dc6d3affd00428128d8e7035e1204d08740ea413 Mon Sep 17 00:00:00 2001 From: Ho Date: Tue, 17 Jun 2025 17:21:32 +0900 Subject: [PATCH 04/11] fix test failure --- .github/workflows/coordinator.yml | 2 +- coordinator/internal/controller/api/controller.go | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/coordinator.yml b/.github/workflows/coordinator.yml index 602dd210a5..19163601b1 100644 --- a/.github/workflows/coordinator.yml +++ b/.github/workflows/coordinator.yml @@ -112,7 +112,7 @@ jobs: - name: Test coordinator packages working-directory: 'coordinator' run: | - # go test -exec "env LD_LIBRARY_PATH=${PWD}/verifier/lib" -v -race -gcflags="-l" -ldflags="-s=false" -coverpkg="scroll-tech/coordinator" -coverprofile=coverage.txt -covermode=atomic ./... + # go test -exec "env LD_LIBRARY_PATH=${PWD}/../common/libzkp/lib" -v -race -gcflags="-l" -ldflags="-s=false" -coverpkg="scroll-tech/coordinator" -coverprofile=coverage.txt -covermode=atomic ./... go test -v -race -gcflags="-l" -ldflags="-s=false" -coverprofile=coverage.txt -covermode=atomic -tags mock_verifier ./... - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v3 diff --git a/coordinator/internal/controller/api/controller.go b/coordinator/internal/controller/api/controller.go index 60ffa8a7bd..f72e3474f9 100644 --- a/coordinator/internal/controller/api/controller.go +++ b/coordinator/internal/controller/api/controller.go @@ -1,14 +1,11 @@ package api import ( - "encoding/json" - "github.com/prometheus/client_golang/prometheus" "github.com/scroll-tech/go-ethereum/log" "github.com/scroll-tech/go-ethereum/params" "gorm.io/gorm" - "scroll-tech/common/libzkp" "scroll-tech/coordinator/internal/config" "scroll-tech/coordinator/internal/logic/verifier" ) @@ -31,7 +28,8 @@ func InitController(cfg *config.Config, chainCfg *params.ChainConfig, db *gorm.D log.Info("verifier created", "openVmVerifier", vf.OpenVMVkMap) - l2cfg := cfg.L2.Endpoint + // TODO: enable this when the libzkp has been updated + /*l2cfg := cfg.L2.Endpoint if l2cfg == nil { panic("l2geth is not specified") } @@ -39,7 +37,7 @@ func InitController(cfg *config.Config, chainCfg *params.ChainConfig, db *gorm.D if err != nil { panic(err) } - libzkp.InitL2geth(string(l2cfgBytes)) + libzkp.InitL2geth(string(l2cfgBytes))*/ Auth = NewAuthController(db, cfg, vf) GetTask = NewGetTaskController(cfg, chainCfg, db, reg) From 7b01c4a53703a24e1b48757f6da01d6ce224559f Mon Sep 17 00:00:00 2001 From: Ho Date: Tue, 17 Jun 2025 22:17:21 +0900 Subject: [PATCH 05/11] fixing according to reviews --- common/libzkp/impl/src/lib.rs | 14 +++++++------- .../internal/logic/provertask/prover_task.go | 2 +- coordinator/internal/types/get_task.go | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/common/libzkp/impl/src/lib.rs b/common/libzkp/impl/src/lib.rs index b285edbce1..b9be01013e 100644 --- a/common/libzkp/impl/src/lib.rs +++ b/common/libzkp/impl/src/lib.rs @@ -80,10 +80,10 @@ fn _dump_vk(fork_name: *const c_char, file: *const c_char) { /// Represents the result of generating a universal task #[repr(C)] pub struct HandlingResult { - ok: c_char, - universal_task: *mut c_char, - metadata: *mut c_char, - expected_pi_hash: [c_char; 32], + pub ok: bool, + pub universal_task: *mut c_char, + pub metadata: *mut c_char, + pub expected_pi_hash: [u8; 32], } /// # Safety @@ -93,7 +93,7 @@ pub unsafe extern "C" fn gen_universal_task( _task: *const c_char, _fork_name: *const c_char, ) -> HandlingResult { - unimplemented!("next phase"); + unimplemented!("implementation will be added in later PRs"); } /// # Safety @@ -117,7 +117,7 @@ pub unsafe extern "C" fn gen_wrapped_proof( _vk: *const c_char, _vk_len: usize, ) -> *mut c_char { - unimplemented!("next phase"); + unimplemented!("implementation will be added in later PRs"); } /// # Safety @@ -131,5 +131,5 @@ pub unsafe extern "C" fn release_string(string_ptr: *mut c_char) { /// # Safety #[no_mangle] pub unsafe extern "C" fn init_l2geth(_config: *const c_char) { - unimplemented!("next phase"); + unimplemented!("implementation will be added in later PRs"); } diff --git a/coordinator/internal/logic/provertask/prover_task.go b/coordinator/internal/logic/provertask/prover_task.go index 7450d92d58..c702d2da44 100644 --- a/coordinator/internal/logic/provertask/prover_task.go +++ b/coordinator/internal/logic/provertask/prover_task.go @@ -195,7 +195,7 @@ func (b *BaseProverTask) applyUniversal(schema *coordinatorType.GetTaskSchema) ( return schema, nil } - ok, metadata, uTaskData, _ := libzkp.GenerateUniversalTask(schema.TaskType, schema.TaskData, schema.HardForkName) + ok, uTaskData, metadata, _ := libzkp.GenerateUniversalTask(schema.TaskType, schema.TaskData, schema.HardForkName) if !ok { return nil, fmt.Errorf("can not generate universal task, see coordinator log for the reason") } diff --git a/coordinator/internal/types/get_task.go b/coordinator/internal/types/get_task.go index b9383974fa..71b973402d 100644 --- a/coordinator/internal/types/get_task.go +++ b/coordinator/internal/types/get_task.go @@ -13,6 +13,7 @@ type GetTaskSchema struct { UUID string `json:"uuid"` TaskID string `json:"task_id"` TaskType int `json:"task_type"` + UseSnark bool `json:"use_snark,omitempty"` TaskData string `json:"task_data"` HardForkName string `json:"hard_fork_name"` } From 1ff82ab7f54c4bcf0dedba59435a3adee37e9d38 Mon Sep 17 00:00:00 2001 From: Ho Date: Wed, 18 Jun 2025 10:03:47 +0900 Subject: [PATCH 06/11] rewrite metadata caching by persist into db --- .../internal/controller/api/controller.go | 2 +- .../internal/controller/api/submit_proof.go | 10 +--- .../logic/provertask/batch_prover_task.go | 52 ++++------------- .../logic/provertask/bundle_prover_task.go | 47 ++++------------ .../logic/provertask/chunk_prover_task.go | 50 +++-------------- .../internal/logic/provertask/prover_task.go | 18 +----- .../internal/logic/provertask/task_cache.go | 56 ------------------- .../logic/submitproof/proof_receiver.go | 17 +----- coordinator/internal/orm/prover_task.go | 1 + .../00028_add_metadata_to_prover_task.sql | 15 +++++ 10 files changed, 54 insertions(+), 214 deletions(-) delete mode 100644 coordinator/internal/logic/provertask/task_cache.go create mode 100644 database/migrate/migrations/00028_add_metadata_to_prover_task.sql diff --git a/coordinator/internal/controller/api/controller.go b/coordinator/internal/controller/api/controller.go index f72e3474f9..105b39fc4d 100644 --- a/coordinator/internal/controller/api/controller.go +++ b/coordinator/internal/controller/api/controller.go @@ -41,5 +41,5 @@ func InitController(cfg *config.Config, chainCfg *params.ChainConfig, db *gorm.D Auth = NewAuthController(db, cfg, vf) GetTask = NewGetTaskController(cfg, chainCfg, db, reg) - SubmitProof = NewSubmitProofController(cfg, chainCfg, db, vf, reg, GetTask) + SubmitProof = NewSubmitProofController(cfg, chainCfg, db, vf, reg) } diff --git a/coordinator/internal/controller/api/submit_proof.go b/coordinator/internal/controller/api/submit_proof.go index 9884683565..e746cc256c 100644 --- a/coordinator/internal/controller/api/submit_proof.go +++ b/coordinator/internal/controller/api/submit_proof.go @@ -9,7 +9,6 @@ import ( "gorm.io/gorm" "scroll-tech/common/types" - "scroll-tech/common/types/message" "scroll-tech/coordinator/internal/config" "scroll-tech/coordinator/internal/logic/submitproof" @@ -23,15 +22,10 @@ type SubmitProofController struct { } // NewSubmitProofController create the submit proof api controller instance -func NewSubmitProofController(cfg *config.Config, chainCfg *params.ChainConfig, db *gorm.DB, vf *verifier.Verifier, reg prometheus.Registerer, getTaskController *GetTaskController) *SubmitProofController { - controller := SubmitProofController{ +func NewSubmitProofController(cfg *config.Config, chainCfg *params.ChainConfig, db *gorm.DB, vf *verifier.Verifier, reg prometheus.Registerer) *SubmitProofController { + return &SubmitProofController{ submitProofReceiverLogic: submitproof.NewSubmitProofReceiverLogic(cfg.ProverManager, chainCfg, db, vf, reg), } - proverTaskIf := getTaskController.ProverTasks() - controller.submitProofReceiverLogic.ChunkTask = proverTaskIf[message.ProofTypeChunk] - controller.submitProofReceiverLogic.BatchTask = proverTaskIf[message.ProofTypeBatch] - controller.submitProofReceiverLogic.BundleTask = proverTaskIf[message.ProofTypeBundle] - return &controller } // SubmitProof prover submit the proof to coordinator diff --git a/coordinator/internal/logic/provertask/batch_prover_task.go b/coordinator/internal/logic/provertask/batch_prover_task.go index 62b81e8189..9528802958 100644 --- a/coordinator/internal/logic/provertask/batch_prover_task.go +++ b/coordinator/internal/logic/provertask/batch_prover_task.go @@ -47,7 +47,6 @@ func NewBatchProverTask(cfg *config.Config, chainCfg *params.ChainConfig, db *go batchOrm: orm.NewBatch(db), proverTaskOrm: orm.NewProverTask(db), proverBlockListOrm: orm.NewProverBlockList(db), - taskCache: newCache(128), }, batchTaskGetTaskTotal: promauto.With(reg).NewCounterVec(prometheus.CounterOpts{ Name: "coordinator_batch_get_task_total", @@ -162,13 +161,6 @@ func (bp *BatchProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato AssignedAt: utils.NowUTC(), } - // Store session info. - if err = bp.proverTaskOrm.InsertProverTask(ctx.Copy(), &proverTask); err != nil { - bp.recoverActiveAttempts(ctx, batchTask) - log.Error("insert batch prover task info fail", "task_id", batchTask.Hash, "publicKey", taskCtx.PublicKey, "err", err) - return nil, ErrCoordinatorInternalFailure - } - taskMsg, err := bp.formatProverTask(ctx.Copy(), &proverTask, batchTask, hardForkName) if err != nil { bp.recoverActiveAttempts(ctx, batchTask) @@ -176,12 +168,21 @@ func (bp *BatchProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato return nil, ErrCoordinatorInternalFailure } if getTaskParameter.Universal { - taskMsg, err = bp.applyUniversal(taskMsg) + var metadata []byte + taskMsg, metadata, err = bp.applyUniversal(taskMsg) if err != nil { bp.recoverActiveAttempts(ctx, batchTask) log.Error("Generate universal prover task failure", "task_id", batchTask.Hash, "type", "batch") return nil, ErrCoordinatorInternalFailure } + proverTask.Metadata = metadata + } + + // Store session info. + if err = bp.proverTaskOrm.InsertProverTask(ctx.Copy(), &proverTask); err != nil { + bp.recoverActiveAttempts(ctx, batchTask) + log.Error("insert batch prover task info fail", "task_id", batchTask.Hash, "publicKey", taskCtx.PublicKey, "err", err) + return nil, ErrCoordinatorInternalFailure } bp.batchTaskGetTaskTotal.WithLabelValues(hardForkName).Inc() @@ -194,39 +195,6 @@ func (bp *BatchProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato return taskMsg, nil } -func (bp *BatchProverTask) GetTaskMetaData(ctx *gin.Context, proverTask *orm.ProverTask, hardForkName string) (string, error) { - taskID := proverTask.TaskID - if cached := bp.taskCache.Query(taskID); cached != nil { - return cached.MetaData, nil - } - - // for most case we simply query metadata from cache, but if the task is not in cache, we need quite a few - // effort to resume the cached universal task - batchTask, err := bp.batchOrm.GetBatchByHash(ctx.Copy(), taskID) - if err != nil { - log.Error("failed to get chunk by hash", "task_id", taskID, "err", err) - return "", ErrCoordinatorInternalFailure - } - taskMsg, err := bp.formatProverTask(ctx.Copy(), proverTask, batchTask, hardForkName) - if err != nil { - log.Error("re-format prover task failure", "task_id", taskID, "err", err) - return "", ErrCoordinatorInternalFailure - } - - _, err = bp.applyUniversal(taskMsg) - if err != nil { - log.Error("Generate universal prover task failure", "task_id", taskID, "type", "chunk") - return "", ErrCoordinatorInternalFailure - } - - if cached := bp.taskCache.Query(taskID); cached == nil { - log.Error("Still can not obtain metadata, something wrong?", "task_id", taskID, "type", "chunk") - return "", ErrCoordinatorInternalFailure - } else { - return cached.MetaData, nil - } -} - func (bp *BatchProverTask) formatProverTask(ctx context.Context, task *orm.ProverTask, batch *orm.Batch, hardForkName string) (*coordinatorType.GetTaskSchema, error) { // get chunk from db chunks, err := bp.chunkOrm.GetChunksByBatchHash(ctx, task.TaskID) diff --git a/coordinator/internal/logic/provertask/bundle_prover_task.go b/coordinator/internal/logic/provertask/bundle_prover_task.go index b827ddcce5..c7821b5006 100644 --- a/coordinator/internal/logic/provertask/bundle_prover_task.go +++ b/coordinator/internal/logic/provertask/bundle_prover_task.go @@ -45,7 +45,6 @@ func NewBundleProverTask(cfg *config.Config, chainCfg *params.ChainConfig, db *g bundleOrm: orm.NewBundle(db), proverTaskOrm: orm.NewProverTask(db), proverBlockListOrm: orm.NewProverBlockList(db), - taskCache: newCache(128), }, bundleTaskGetTaskTotal: promauto.With(reg).NewCounterVec(prometheus.CounterOpts{ Name: "coordinator_bundle_get_task_total", @@ -160,13 +159,6 @@ func (bp *BundleProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinat AssignedAt: utils.NowUTC(), } - // Store session info. - if err = bp.proverTaskOrm.InsertProverTask(ctx.Copy(), &proverTask); err != nil { - bp.recoverActiveAttempts(ctx, bundleTask) - log.Error("insert bundle prover task info fail", "task_id", bundleTask.Hash, "publicKey", taskCtx.PublicKey, "err", err) - return nil, ErrCoordinatorInternalFailure - } - taskMsg, err := bp.formatProverTask(ctx.Copy(), &proverTask, hardForkName) if err != nil { bp.recoverActiveAttempts(ctx, bundleTask) @@ -174,12 +166,21 @@ func (bp *BundleProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinat return nil, ErrCoordinatorInternalFailure } if getTaskParameter.Universal { - taskMsg, err = bp.applyUniversal(taskMsg) + var metadata []byte + taskMsg, metadata, err = bp.applyUniversal(taskMsg) if err != nil { bp.recoverActiveAttempts(ctx, bundleTask) log.Error("Generate universal prover task failure", "task_id", bundleTask.Hash, "type", "bundle") return nil, ErrCoordinatorInternalFailure } + proverTask.Metadata = metadata + } + + // Store session info. + if err = bp.proverTaskOrm.InsertProverTask(ctx.Copy(), &proverTask); err != nil { + bp.recoverActiveAttempts(ctx, bundleTask) + log.Error("insert bundle prover task info fail", "task_id", bundleTask.Hash, "publicKey", taskCtx.PublicKey, "err", err) + return nil, ErrCoordinatorInternalFailure } bp.bundleTaskGetTaskTotal.WithLabelValues(hardForkName).Inc() @@ -192,34 +193,6 @@ func (bp *BundleProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinat return taskMsg, nil } -func (bp *BundleProverTask) GetTaskMetaData(ctx *gin.Context, proverTask *orm.ProverTask, hardForkName string) (string, error) { - taskID := proverTask.TaskID - if cached := bp.taskCache.Query(taskID); cached != nil { - return cached.MetaData, nil - } - - // for most case we simply query metadata from cache, but if the task is not in cache, we need quite a few - // effort to resume the cached universal task - taskMsg, err := bp.formatProverTask(ctx.Copy(), proverTask, hardForkName) - if err != nil { - log.Error("re-format prover task failure", "task_id", taskID, "err", err) - return "", ErrCoordinatorInternalFailure - } - - _, err = bp.applyUniversal(taskMsg) - if err != nil { - log.Error("Generate universal prover task failure", "task_id", taskID, "type", "chunk") - return "", ErrCoordinatorInternalFailure - } - - if cached := bp.taskCache.Query(taskID); cached == nil { - log.Error("Still can not obtain metadata, something wrong?", "task_id", taskID, "type", "chunk") - return "", ErrCoordinatorInternalFailure - } else { - return cached.MetaData, nil - } -} - func (bp *BundleProverTask) formatProverTask(ctx context.Context, task *orm.ProverTask, hardForkName string) (*coordinatorType.GetTaskSchema, error) { // get bundle from db batches, err := bp.batchOrm.GetBatchesByBundleHash(ctx, task.TaskID) diff --git a/coordinator/internal/logic/provertask/chunk_prover_task.go b/coordinator/internal/logic/provertask/chunk_prover_task.go index 2da74870b1..7f3198335f 100644 --- a/coordinator/internal/logic/provertask/chunk_prover_task.go +++ b/coordinator/internal/logic/provertask/chunk_prover_task.go @@ -43,7 +43,6 @@ func NewChunkProverTask(cfg *config.Config, chainCfg *params.ChainConfig, db *go blockOrm: orm.NewL2Block(db), proverTaskOrm: orm.NewProverTask(db), proverBlockListOrm: orm.NewProverBlockList(db), - taskCache: newCache(1024), }, chunkTaskGetTaskTotal: promauto.With(reg).NewCounterVec(prometheus.CounterOpts{ Name: "coordinator_chunk_get_task_total", @@ -158,12 +157,6 @@ func (cp *ChunkProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato AssignedAt: utils.NowUTC(), } - if err = cp.proverTaskOrm.InsertProverTask(ctx.Copy(), &proverTask); err != nil { - cp.recoverActiveAttempts(ctx, chunkTask) - log.Error("insert chunk prover task fail", "task_id", chunkTask.Hash, "publicKey", taskCtx.PublicKey, "err", err) - return nil, ErrCoordinatorInternalFailure - } - taskMsg, err := cp.formatProverTask(ctx.Copy(), &proverTask, chunkTask, hardForkName) if err != nil { cp.recoverActiveAttempts(ctx, chunkTask) @@ -171,12 +164,20 @@ func (cp *ChunkProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato return nil, ErrCoordinatorInternalFailure } if getTaskParameter.Universal { - taskMsg, err = cp.applyUniversal(taskMsg) + var metadata []byte + taskMsg, metadata, err = cp.applyUniversal(taskMsg) if err != nil { cp.recoverActiveAttempts(ctx, chunkTask) log.Error("Generate universal prover task failure", "task_id", chunkTask.Hash, "type", "chunk") return nil, ErrCoordinatorInternalFailure } + proverTask.Metadata = metadata + } + + if err = cp.proverTaskOrm.InsertProverTask(ctx.Copy(), &proverTask); err != nil { + cp.recoverActiveAttempts(ctx, chunkTask) + log.Error("insert chunk prover task fail", "task_id", chunkTask.Hash, "publicKey", taskCtx.PublicKey, "err", err) + return nil, ErrCoordinatorInternalFailure } cp.chunkTaskGetTaskTotal.WithLabelValues(hardForkName).Inc() @@ -189,39 +190,6 @@ func (cp *ChunkProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato return taskMsg, nil } -func (cp *ChunkProverTask) GetTaskMetaData(ctx *gin.Context, proverTask *orm.ProverTask, hardForkName string) (string, error) { - taskID := proverTask.TaskID - if cached := cp.taskCache.Query(taskID); cached != nil { - return cached.MetaData, nil - } - - // for most case we simply query metadata from cache, but if the task is not in cache, we need quite a few - // effort to resume the cached universal task - chunkTask, err := cp.chunkOrm.GetChunkByHash(ctx.Copy(), taskID) - if err != nil { - log.Error("failed to get chunk by hash", "task_id", taskID, "err", err) - return "", ErrCoordinatorInternalFailure - } - taskMsg, err := cp.formatProverTask(ctx.Copy(), proverTask, chunkTask, hardForkName) - if err != nil { - log.Error("re-format prover task failure", "task_id", taskID, "err", err) - return "", ErrCoordinatorInternalFailure - } - - _, err = cp.applyUniversal(taskMsg) - if err != nil { - log.Error("Generate universal prover task failure", "task_id", taskID, "type", "chunk") - return "", ErrCoordinatorInternalFailure - } - - if cached := cp.taskCache.Query(taskID); cached == nil { - log.Error("Still can not obtain metadata, something wrong?", "task_id", taskID, "type", "chunk") - return "", ErrCoordinatorInternalFailure - } else { - return cached.MetaData, nil - } -} - func (cp *ChunkProverTask) formatProverTask(ctx context.Context, task *orm.ProverTask, chunk *orm.Chunk, hardForkName string) (*coordinatorType.GetTaskSchema, error) { // Get block hashes. blockHashes, dbErr := cp.blockOrm.GetL2BlockHashesByChunkHash(ctx, task.TaskID) diff --git a/coordinator/internal/logic/provertask/prover_task.go b/coordinator/internal/logic/provertask/prover_task.go index c702d2da44..75175dfbf8 100644 --- a/coordinator/internal/logic/provertask/prover_task.go +++ b/coordinator/internal/logic/provertask/prover_task.go @@ -34,7 +34,6 @@ var ( // ProverTask the interface of a collector who send data to prover type ProverTask interface { Assign(ctx *gin.Context, getTaskParameter *coordinatorType.GetTaskParameter) (*coordinatorType.GetTaskSchema, error) - GetTaskMetaData(ctx *gin.Context, task *orm.ProverTask, HardForkName string) (string, error) } // BaseProverTask a base prover task which contain series functions @@ -49,8 +48,6 @@ type BaseProverTask struct { blockOrm *orm.L2Block proverTaskOrm *orm.ProverTask proverBlockListOrm *orm.ProverBlockList - - taskCache *TaskCache } type proverTaskContext struct { @@ -189,24 +186,15 @@ func (b *BaseProverTask) checkParameter(ctx *gin.Context) (*proverTaskContext, e return &ptc, nil } -func (b *BaseProverTask) applyUniversal(schema *coordinatorType.GetTaskSchema) (*coordinatorType.GetTaskSchema, error) { - if cached := b.taskCache.Query(schema.TaskID); cached != nil { - schema.TaskData = cached.UTaskData - return schema, nil - } +func (b *BaseProverTask) applyUniversal(schema *coordinatorType.GetTaskSchema) (*coordinatorType.GetTaskSchema, []byte, error) { ok, uTaskData, metadata, _ := libzkp.GenerateUniversalTask(schema.TaskType, schema.TaskData, schema.HardForkName) if !ok { - return nil, fmt.Errorf("can not generate universal task, see coordinator log for the reason") + return nil, nil, fmt.Errorf("can not generate universal task, see coordinator log for the reason") } - cacheData := CachedTaskData{ - MetaData: metadata, - UTaskData: uTaskData, - } - b.taskCache.Add(schema.TaskID, &cacheData) schema.TaskData = uTaskData - return schema, nil + return schema, []byte(metadata), nil } func newGetTaskCounterVec(factory promauto.Factory, taskType string) *prometheus.CounterVec { diff --git a/coordinator/internal/logic/provertask/task_cache.go b/coordinator/internal/logic/provertask/task_cache.go deleted file mode 100644 index a6ae3ec372..0000000000 --- a/coordinator/internal/logic/provertask/task_cache.go +++ /dev/null @@ -1,56 +0,0 @@ -package provertask - -import ( - "sync" -) - -type CachedTaskData struct { - MetaData string - UTaskData string -} - -// very simple size limited lru caching for task -type TaskCache struct { - sync.RWMutex - cache map[string]*CachedTaskData - dropping_cache map[string]*CachedTaskData - limit int -} - -func newCache(limit int) *TaskCache { - t := TaskCache{ - cache: make(map[string]*CachedTaskData), - dropping_cache: make(map[string]*CachedTaskData), - limit: limit, - } - - return &t -} - -func (c *TaskCache) Add(k string, itm *CachedTaskData) { - c.Lock() - defer c.Unlock() - - if len(c.cache) >= c.limit { - c.dropping_cache = c.cache - c.cache = make(map[string]*CachedTaskData) - } - c.cache[k] = itm -} - -func (c *TaskCache) Query(key string) *CachedTaskData { - c.RLock() - if v, ok := c.cache[key]; ok { - c.RUnlock() - return v - } - - if v, ok := c.dropping_cache[key]; ok { - c.RUnlock() - c.Add(key, v) - return v - } - - c.RUnlock() - return nil -} diff --git a/coordinator/internal/logic/submitproof/proof_receiver.go b/coordinator/internal/logic/submitproof/proof_receiver.go index a91d2a1b5a..1ed9a25f7b 100644 --- a/coordinator/internal/logic/submitproof/proof_receiver.go +++ b/coordinator/internal/logic/submitproof/proof_receiver.go @@ -175,21 +175,10 @@ func (m *ProofReceiverLogic) HandleZkProof(ctx *gin.Context, proofParameter coor return ErrGetHardForkNameFailed } if proofParameter.Universal { - var metadata string - var err error - switch message.ProofType(proofParameter.TaskType) { - case message.ProofTypeChunk: - metadata, err = m.ChunkTask.GetTaskMetaData(ctx.Copy(), proverTask, hardForkName) - case message.ProofTypeBatch: - metadata, err = m.BatchTask.GetTaskMetaData(ctx.Copy(), proverTask, hardForkName) - case message.ProofTypeBundle: - metadata, err = m.BundleTask.GetTaskMetaData(ctx.Copy(), proverTask, hardForkName) - } - - if err != nil { - return err + if len(proverTask.Metadata) == 0 { + return errors.New("can not re-wrapping proof: no metadata has been recorded in advance") } - proofParameter.Proof = libzkp.GenerateWrappedProof(proofParameter.Proof, metadata, []byte{}) + proofParameter.Proof = libzkp.GenerateWrappedProof(proofParameter.Proof, string(proverTask.Metadata), []byte{}) if proofParameter.Proof == "" { return errors.New("can not re-wrapping proof, see coordinator log for reason") } diff --git a/coordinator/internal/orm/prover_task.go b/coordinator/internal/orm/prover_task.go index 408592d2c0..ee7424a72b 100644 --- a/coordinator/internal/orm/prover_task.go +++ b/coordinator/internal/orm/prover_task.go @@ -37,6 +37,7 @@ type ProverTask struct { FailureType int16 `json:"failure_type" gorm:"column:failure_type;default:0"` Reward decimal.Decimal `json:"reward" gorm:"column:reward;default:0;type:decimal(78)"` Proof []byte `json:"proof" gorm:"column:proof;default:NULL"` + Metadata []byte `json:"metadata" gorm:"column:metadata;default:NULL"` AssignedAt time.Time `json:"assigned_at" gorm:"assigned_at"` // metadata diff --git a/database/migrate/migrations/00028_add_metadata_to_prover_task.sql b/database/migrate/migrations/00028_add_metadata_to_prover_task.sql new file mode 100644 index 0000000000..e292c6c579 --- /dev/null +++ b/database/migrate/migrations/00028_add_metadata_to_prover_task.sql @@ -0,0 +1,15 @@ +-- +goose Up +-- +goose StatementBegin + +ALTER TABLE prover_task +ADD COLUMN metadata BYTEA; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin + +ALTER TABLE IF EXISTS prover_task +DROP COLUMN IF EXISTS metadata; + +-- +goose StatementEnd \ No newline at end of file From e7db39387713399eaeb8d88689c812d0aba55fd5 Mon Sep 17 00:00:00 2001 From: Ho Date: Wed, 18 Jun 2025 11:10:12 +0900 Subject: [PATCH 07/11] try fix CI --- .github/workflows/coordinator.yml | 1 + .github/workflows/integration.yml | 1 + coordinator/internal/logic/provertask/batch_prover_task.go | 5 +++-- coordinator/internal/logic/provertask/bundle_prover_task.go | 3 ++- coordinator/internal/logic/provertask/chunk_prover_task.go | 4 +++- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/coordinator.yml b/.github/workflows/coordinator.yml index 19163601b1..af47829ece 100644 --- a/.github/workflows/coordinator.yml +++ b/.github/workflows/coordinator.yml @@ -112,6 +112,7 @@ jobs: - name: Test coordinator packages working-directory: 'coordinator' run: | + make libzkp # go test -exec "env LD_LIBRARY_PATH=${PWD}/../common/libzkp/lib" -v -race -gcflags="-l" -ldflags="-s=false" -coverpkg="scroll-tech/coordinator" -coverprofile=coverage.txt -covermode=atomic ./... go test -v -race -gcflags="-l" -ldflags="-s=false" -coverprofile=coverage.txt -covermode=atomic -tags mock_verifier ./... - name: Upload coverage reports to Codecov diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 4a8d11d72c..c706aa9421 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -38,6 +38,7 @@ jobs: make dev_docker make -C rollup mock_abi make -C common/bytecode all + make -C common/libzkp/impl build - name: Run integration tests run: | go test -v -tags="mock_prover mock_verifier" -p 1 -coverprofile=coverage.txt scroll-tech/integration-test/... diff --git a/coordinator/internal/logic/provertask/batch_prover_task.go b/coordinator/internal/logic/provertask/batch_prover_task.go index 9528802958..772462b10a 100644 --- a/coordinator/internal/logic/provertask/batch_prover_task.go +++ b/coordinator/internal/logic/provertask/batch_prover_task.go @@ -184,6 +184,8 @@ func (bp *BatchProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato log.Error("insert batch prover task info fail", "task_id", batchTask.Hash, "publicKey", taskCtx.PublicKey, "err", err) return nil, ErrCoordinatorInternalFailure } + // notice uuid is set as a side effect of InsertProverTask + taskMsg.UUID = proverTask.UUID.String() bp.batchTaskGetTaskTotal.WithLabelValues(hardForkName).Inc() bp.batchTaskGetTaskProver.With(prometheus.Labels{ @@ -212,7 +214,7 @@ func (bp *BatchProverTask) formatProverTask(ctx context.Context, task *orm.Prove for _, chunk := range chunks { var proof message.OpenVMChunkProof if encodeErr := json.Unmarshal(chunk.Proof, &proof); encodeErr != nil { - return nil, fmt.Errorf("Chunk.GetProofsByBatchHash unmarshal proof error: %w, batch hash: %v, chunk hash: %v", encodeErr, task.TaskID, chunk.Hash) + return nil, fmt.Errorf("Chunk.GetProofsByBatchHash unmarshal proof error: %w, batch hash: %v, chunk hash: %v, (%s)", encodeErr, task.TaskID, chunk.Hash, chunk.Proof) } chunkProofs = append(chunkProofs, &proof) @@ -243,7 +245,6 @@ func (bp *BatchProverTask) formatProverTask(ctx context.Context, task *orm.Prove } taskMsg := &coordinatorType.GetTaskSchema{ - UUID: task.UUID.String(), TaskID: task.TaskID, TaskType: int(message.ProofTypeBatch), TaskData: string(chunkProofsBytes), diff --git a/coordinator/internal/logic/provertask/bundle_prover_task.go b/coordinator/internal/logic/provertask/bundle_prover_task.go index c7821b5006..b58b6035bb 100644 --- a/coordinator/internal/logic/provertask/bundle_prover_task.go +++ b/coordinator/internal/logic/provertask/bundle_prover_task.go @@ -182,6 +182,8 @@ func (bp *BundleProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinat log.Error("insert bundle prover task info fail", "task_id", bundleTask.Hash, "publicKey", taskCtx.PublicKey, "err", err) return nil, ErrCoordinatorInternalFailure } + // notice uuid is set as a side effect of InsertProverTask + taskMsg.UUID = proverTask.UUID.String() bp.bundleTaskGetTaskTotal.WithLabelValues(hardForkName).Inc() bp.bundleTaskGetTaskProver.With(prometheus.Labels{ @@ -247,7 +249,6 @@ func (bp *BundleProverTask) formatProverTask(ctx context.Context, task *orm.Prov } taskMsg := &coordinatorType.GetTaskSchema{ - UUID: task.UUID.String(), TaskID: task.TaskID, TaskType: int(message.ProofTypeBundle), TaskData: string(batchProofsBytes), diff --git a/coordinator/internal/logic/provertask/chunk_prover_task.go b/coordinator/internal/logic/provertask/chunk_prover_task.go index 7f3198335f..b7622a5b52 100644 --- a/coordinator/internal/logic/provertask/chunk_prover_task.go +++ b/coordinator/internal/logic/provertask/chunk_prover_task.go @@ -163,6 +163,7 @@ func (cp *ChunkProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato log.Error("format prover task failure", "task_id", chunkTask.Hash, "err", err) return nil, ErrCoordinatorInternalFailure } + if getTaskParameter.Universal { var metadata []byte taskMsg, metadata, err = cp.applyUniversal(taskMsg) @@ -179,6 +180,8 @@ func (cp *ChunkProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato log.Error("insert chunk prover task fail", "task_id", chunkTask.Hash, "publicKey", taskCtx.PublicKey, "err", err) return nil, ErrCoordinatorInternalFailure } + // notice uuid is set as a side effect of InsertProverTask + taskMsg.UUID = proverTask.UUID.String() cp.chunkTaskGetTaskTotal.WithLabelValues(hardForkName).Inc() cp.chunkTaskGetTaskProver.With(prometheus.Labels{ @@ -217,7 +220,6 @@ func (cp *ChunkProverTask) formatProverTask(ctx context.Context, task *orm.Prove } proverTaskSchema := &coordinatorType.GetTaskSchema{ - UUID: task.UUID.String(), TaskID: task.TaskID, TaskType: int(message.ProofTypeChunk), TaskData: string(taskDetailBytes), From b046f99a3435f073af4fde9dfb1b55aab0de1e3e Mon Sep 17 00:00:00 2001 From: Ho Date: Wed, 18 Jun 2025 11:29:30 +0900 Subject: [PATCH 08/11] temporary swich libzkp to depend master branch of zkvm-prover for CI building --- common/libzkp/impl/Cargo.lock | 2827 +++++++------------ common/libzkp/impl/Cargo.toml | 69 +- common/libzkp/impl/src/verifier/euclidv2.rs | 4 +- 3 files changed, 980 insertions(+), 1920 deletions(-) diff --git a/common/libzkp/impl/Cargo.lock b/common/libzkp/impl/Cargo.lock index a04d979e50..f31deb3c31 100644 --- a/common/libzkp/impl/Cargo.lock +++ b/common/libzkp/impl/Cargo.lock @@ -24,15 +24,15 @@ dependencies = [ [[package]] name = "adler2" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "ahash" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", "once_cell", @@ -51,9 +51,9 @@ dependencies = [ [[package]] name = "alloy-chains" -version = "0.1.63" +version = "0.1.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "996564c1782285d4e0299c29b318bc74f24b1d7f456cef3e040810b061ee3256" +checksum = "28e2652684758b0d9b389d248b209ed9fd9989ef489a550265fe4bb8454fe7eb" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -104,7 +104,7 @@ dependencies = [ "alloy-rlp", "crc", "serde", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -129,7 +129,7 @@ dependencies = [ "k256", "serde", "serde_with", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -167,9 +167,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "0.8.21" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4012581681b186ba0882007ed873987cc37f86b1b488fe6b91d5efd0b585dc41" +checksum = "731ea743b3d843bc657e120fb1d1e9cc94f5dab8107e35a82125a63e6420a102" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -187,7 +187,7 @@ dependencies = [ "alloy-sol-types", "serde", "serde_json", - "thiserror 2.0.11", + "thiserror 2.0.12", "tracing", ] @@ -213,7 +213,7 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -231,8 +231,8 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.21" -source = "git+https://github.com/scroll-tech/alloy-core?branch=v0.8.21#6d28bdb643f36da7b580ed0f252df6d8117f2fdd" +version = "0.8.18" +source = "git+https://github.com/scroll-tech/alloy-core?branch=v0.8.18-euclid-upgrade#f24c99b657d19444b3f4e1150d5543a3667e7cdb" dependencies = [ "alloy-rlp", "bytes", @@ -240,14 +240,14 @@ dependencies = [ "const-hex", "derive_more 1.0.0", "foldhash", - "hashbrown 0.15.2", - "indexmap 2.7.1", + "hashbrown 0.15.4", + "indexmap 2.9.0", "itoa", "k256", "keccak-asm", "paste", "proptest", - "rand", + "rand 0.8.5", "rkyv", "ruint", "rustc-hash 2.1.1", @@ -258,9 +258,9 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6c1d995bff8d011f7cd6c81820d51825e6e06d6db73914c1630ecf544d83d6" +checksum = "5f70d83b765fdc080dbcd4f4db70d8d23fe4761f2f02ebfa9146b833900634b4" dependencies = [ "alloy-rlp-derive", "arrayvec", @@ -269,13 +269,13 @@ dependencies = [ [[package]] name = "alloy-rlp-derive" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a40e1ef334153322fd878d07e86af7a529bcb86b2439525920a88eba87bcf943" +checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -321,7 +321,7 @@ dependencies = [ "itertools 0.14.0", "serde", "serde_json", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -358,61 +358,62 @@ dependencies = [ "either", "elliptic-curve", "k256", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] name = "alloy-sol-macro" -version = "0.8.22" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f9c3c7bc1f4e334e5c5fc59ec8dac894973a71b11da09065affc6094025049" +checksum = "e10ae8e9a91d328ae954c22542415303919aabe976fe7a92eb06db1b68fd59f2" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "alloy-sol-macro-expander" -version = "0.8.22" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46ff7aa715eb2404cb87fa94390d2c5d5addd70d9617e20b2398ee6f48cb21f0" +checksum = "83ad5da86c127751bc607c174d6c9fe9b85ef0889a9ca0c641735d77d4f98f26" dependencies = [ "alloy-sol-macro-input", "const-hex", "heck 0.5.0", - "indexmap 2.7.1", + "indexmap 2.9.0", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", "syn-solidity", "tiny-keccak", ] [[package]] name = "alloy-sol-macro-input" -version = "0.8.22" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f105fa700140c0cc6e2c3377adef650c389ac57b8ead8318a2e6bd52f1ae841" +checksum = "ba3d30f0d3f9ba3b7686f3ff1de9ee312647aac705604417a2f40c604f409a9e" dependencies = [ "const-hex", "dunce", "heck 0.5.0", + "macro-string", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", "syn-solidity", ] [[package]] name = "alloy-sol-type-parser" -version = "0.8.22" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c649acc6c9d3893e392c737faeadce30b4a1751eed148ae43bc2f27f29c4480c" +checksum = "6d162f8524adfdfb0e4bd0505c734c985f3e2474eb022af32eef0d52a4f3935c" dependencies = [ "serde", "winnow", @@ -420,9 +421,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "0.8.21" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6044800da35c38118fd4b98e18306bd3b91af5dedeb54c1b768cf1b4fb68f549" +checksum = "e3b478bc9c0c4737a04cd976accde4df7eba0bdc0d90ad6ff43d58bc93cf79c1" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -473,9 +474,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.18" +version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" dependencies = [ "anstyle", "anstyle-parse", @@ -488,53 +489,44 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" +checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" [[package]] name = "anstyle-parse" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" dependencies = [ - "windows-sys 0.59.0", + "windows-sys", ] [[package]] name = "anstyle-wincon" -version = "3.0.7" +version = "3.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" +checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" dependencies = [ "anstyle", - "once_cell", - "windows-sys 0.59.0", + "once_cell_polyfill", + "windows-sys", ] [[package]] name = "anyhow" -version = "1.0.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b964d184e89d9b6b67dd2715bc8e74cf3107fb2b529990c90cf517326150bf4" - -[[package]] -name = "approx" -version = "0.5.1" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -dependencies = [ - "num-traits", -] +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" [[package]] name = "ark-ff" @@ -648,7 +640,7 @@ checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" dependencies = [ "colored", "num-traits", - "rand", + "rand 0.8.5", ] [[package]] @@ -658,7 +650,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand", + "rand 0.8.5", ] [[package]] @@ -678,21 +670,15 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.86" +version = "0.1.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d" +checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - [[package]] name = "atty" version = "0.2.14" @@ -716,37 +702,26 @@ dependencies = [ [[package]] name = "auto_impl" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12882f59de5360c748c4cbf569a042d5fb0eb515f7bea9c1f470b47f6ffbd73" +checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "autocfg" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" - -[[package]] -name = "backon" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0b50b1b78dbadd44ab18b3c794e496f3a139abb9fbc27d9c94c4eebbb96496" -dependencies = [ - "fastrand", - "gloo-timers", - "tokio", -] +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "backtrace" -version = "0.3.74" +version = "0.3.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" dependencies = [ "addr2line", "cfg-if", @@ -755,7 +730,7 @@ dependencies = [ "object", "rustc-demangle", "serde", - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -778,9 +753,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" [[package]] name = "bincode" @@ -808,14 +783,14 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitcode" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18c1406a27371b2f76232a2259df6ab607b91b5a0a7476a7729ff590df5a969a" +checksum = "cf300f4aa6e66f3bdff11f1236a88c622fe47ea814524792240b4d554d9858ee" dependencies = [ "arrayvec", "bitcode_derive", "bytemuck", - "glam 0.30.1", + "glam", "serde", ] @@ -827,20 +802,14 @@ checksum = "42b6b4cb608b8282dc3b53d0f4c9ab404655d562674c682db7e6c0458cc83c23" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.8.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" dependencies = [ "serde", ] @@ -886,9 +855,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.6.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675f87afced0413c9bb02843499dbbd3882a237645883f71a2b59644a6d2f753" +checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0" dependencies = [ "arrayref", "arrayvec", @@ -915,15 +884,15 @@ dependencies = [ "ff 0.12.1", "group 0.12.1", "pairing 0.22.0", - "rand_core", + "rand_core 0.6.4", "subtle", ] [[package]] name = "blst" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47c79a94619fade3c0b887670333513a67ac28a6a7e653eb260bf0d4103db38d" +checksum = "4fd49896f12ac9b6dcd7a5998466b9b58263a695a3dd1ecc1aaca2e12a90b080" dependencies = [ "cc", "glob", @@ -933,9 +902,9 @@ dependencies = [ [[package]] name = "bon" -version = "3.3.2" +version = "3.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe7acc34ff59877422326db7d6f2d845a582b16396b6b08194942bf34c6528ab" +checksum = "f61138465baf186c63e8d9b6b613b508cd832cba4ce93cf37ce5f096f91ac1a6" dependencies = [ "bon-macros", "rustversion", @@ -943,9 +912,9 @@ dependencies = [ [[package]] name = "bon-macros" -version = "3.3.2" +version = "3.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4159dd617a7fbc9be6a692fe69dc2954f8e6bb6bb5e4d7578467441390d77fd0" +checksum = "40d1dad34aa19bf02295382f08d9bc40651585bd497266831d40ee6296fb49ca" dependencies = [ "darling", "ident_case", @@ -953,20 +922,20 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "bumpalo" -version = "3.17.0" +version = "3.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" +checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee" [[package]] name = "byte-slice-cast" -version = "1.2.2" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" +checksum = "7575182f7272186991736b70173b0ea045398f984bf5ebbb3804736ce1330c9d" [[package]] name = "bytecheck" @@ -988,28 +957,14 @@ checksum = "efb7846e0cb180355c2dec69e721edafa36919850f1a9f52ffba4ebc0393cb71" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "bytemuck" -version = "1.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.9.3" +version = "1.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ecc273b49b3205b83d648f0690daa588925572cc5063745bfe547fe7ec8e1a1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.98", -] +checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422" [[package]] name = "byteorder" @@ -1019,9 +974,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" dependencies = [ "serde", ] @@ -1043,9 +998,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab" dependencies = [ "serde", ] @@ -1067,7 +1022,7 @@ checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "thiserror 1.0.69", @@ -1075,26 +1030,24 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.15" +version = "1.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c736e259eea577f443d5c86c304f9f4ae0295c43f3ba05c21f1d66b5f06001af" +checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc" dependencies = [ - "jobserver", - "libc", "shlex", ] [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" [[package]] name = "chrono" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1107,9 +1060,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.31" +version = "4.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767" +checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f" dependencies = [ "clap_builder", "clap_derive", @@ -1117,9 +1070,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.31" +version = "4.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863" +checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e" dependencies = [ "anstream", "anstyle", @@ -1129,27 +1082,27 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.28" +version = "4.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" +checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "clap_lex" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" +checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" [[package]] name = "colorchoice" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" [[package]] name = "colored" @@ -1158,14 +1111,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ "lazy_static", - "windows-sys 0.59.0", + "windows-sys", ] [[package]] name = "const-hex" -version = "1.14.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0485bab839b018a8f1723fc5391819fea5f8f0f32288ef8a735fd096b6160c" +checksum = "83e22e0ed40b96a48d3db274f72fd365bd78f67af39b6bbd47e8a15e1c6207ff" dependencies = [ "cfg-if", "cpufeatures", @@ -1221,16 +1174,6 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -1248,9 +1191,9 @@ dependencies = [ [[package]] name = "crc" -version = "3.2.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675" dependencies = [ "crc-catalog", ] @@ -1282,9 +1225,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.14" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" dependencies = [ "crossbeam-utils", ] @@ -1336,7 +1279,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", - "rand_core", + "rand_core 0.6.4", "subtle", "zeroize", ] @@ -1351,57 +1294,11 @@ dependencies = [ "typenum", ] -[[package]] -name = "cust" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6cc71911e179f12483b9734120b45bd00bf64fab085cc4818428523eedd469" -dependencies = [ - "bitflags 1.3.2", - "bytemuck", - "cust_core", - "cust_derive", - "cust_raw", - "find_cuda_helper", -] - -[[package]] -name = "cust_core" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039f79662cb8f890cbf335e818cd522d6e3a53fe63f61d1aaaf859cd3d975f06" -dependencies = [ - "cust_derive", - "glam 0.20.5", - "mint", - "vek", -] - -[[package]] -name = "cust_derive" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3bc95fe629aed92b2423de6ccff9e40174b21d19cb6ee6281a4d04ac72f66" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "cust_raw" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf40d6ade12cb9828bbc844b9875c7b93d25e67a3c9bf61c7aa3ae09e402bf8" -dependencies = [ - "find_cuda_helper", -] - [[package]] name = "darling" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ "darling_core", "darling_macro", @@ -1409,34 +1306,34 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "darling_macro" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "der" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ "const-oid", "zeroize", @@ -1444,9 +1341,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.11" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" dependencies = [ "powerfmt", "serde", @@ -1471,7 +1368,7 @@ checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -1482,20 +1379,20 @@ checksum = "2cdc8d50f426189eef89dac62fabfa0abb27d5cc008f25bf4156a0203325becc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "derive_more" -version = "0.99.19" +version = "0.99.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da29a38df43d6f156149c9b43ded5e018ddff2a855cf2cfd62e8cd7d079c69f" +checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f" dependencies = [ "convert_case 0.4.0", "proc-macro2", "quote", "rustc_version 0.4.1", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -1516,7 +1413,7 @@ dependencies = [ "convert_case 0.6.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", "unicode-xid", ] @@ -1541,27 +1438,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "directories" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - [[package]] name = "displaydoc" version = "0.2.5" @@ -1570,7 +1446,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -1587,9 +1463,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "dyn-clone" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feeef44e73baff3a26d371801df019877a9866a8c493d315ab00177843314f35" +checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005" [[package]] name = "ecdsa" @@ -1608,9 +1484,9 @@ dependencies = [ [[package]] name = "either" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "elf" @@ -1627,26 +1503,17 @@ dependencies = [ "base16ct", "crypto-bigint", "digest 0.10.7", - "ff 0.13.0", + "ff 0.13.1", "generic-array", "group 0.13.0", "pkcs8", - "rand_core", + "rand_core 0.6.4", "sec1", "serdect", "subtle", "zeroize", ] -[[package]] -name = "encoding_rs" -version = "0.8.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" -dependencies = [ - "cfg-if", -] - [[package]] name = "endian-type" version = "0.1.2" @@ -1662,7 +1529,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -1673,7 +1540,7 @@ checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -1697,12 +1564,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.10" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys", ] [[package]] @@ -1762,31 +1629,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" dependencies = [ "bitvec", - "rand_core", + "rand_core 0.6.4", "subtle", ] [[package]] name = "ff" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" dependencies = [ "bitvec", "byteorder", "ff_derive", - "rand_core", + "rand_core 0.6.4", "subtle", ] [[package]] name = "ff_derive" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f54704be45ed286151c5e11531316eaef5b8f5af7d597b806fdb8af108d84a" +checksum = "f10d12652036b0e99197587c6ba87a8fc3031986499973c030d8b44fcc151b60" dependencies = [ "addchain", - "cfg-if", "num-bigint 0.3.3", "num-integer", "num-traits", @@ -1795,15 +1661,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "find_cuda_helper" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f9e65c593dd01ac77daad909ea4ad17f0d6d1776193fc8ea766356177abdad" -dependencies = [ - "glob", -] - [[package]] name = "fixed-hash" version = "0.8.0" @@ -1811,7 +1668,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand", + "rand 0.8.5", "rustc-hex", "static_assertions", ] @@ -1824,24 +1681,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "foldhash" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] name = "form_urlencoded" @@ -1858,28 +1700,12 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" -[[package]] -name = "futures-channel" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" -dependencies = [ - "futures-core", - "futures-sink", -] - [[package]] name = "futures-core" version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" -[[package]] -name = "futures-io" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" - [[package]] name = "futures-macro" version = "0.3.31" @@ -1888,15 +1714,9 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] -[[package]] -name = "futures-sink" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" - [[package]] name = "futures-task" version = "0.3.31" @@ -1910,11 +1730,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-core", - "futures-io", "futures-macro", - "futures-sink", "futures-task", - "memchr", "pin-project-lite", "pin-utils", "slab", @@ -1945,37 +1762,37 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi 0.11.1+wasi-snapshot-preview1", ] [[package]] name = "getrandom" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ "cfg-if", "libc", - "wasi 0.13.3+wasi-0.2.2", - "windows-targets 0.52.6", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", ] [[package]] name = "getset" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3586f256131df87204eb733da72e3d3eb4f343c639f4b7be279ac7c48baeafe" +checksum = "9cf0fc11e47561d47397154977bc219f4cf809b2974facc3ccb3b89e2436f912" dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -2001,23 +1818,14 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", -] - -[[package]] -name = "glam" -version = "0.20.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43e957e744be03f5801a55472f593d43fabdebf25a4585db250f04d86b1675f" -dependencies = [ - "num-traits", + "syn 2.0.103", ] [[package]] name = "glam" -version = "0.30.1" +version = "0.30.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3aa70d918d2b234126ff4f850f628f172542bf0603ded26b8ee36e5e22d5f9" +checksum = "50a99dbe56b72736564cfa4b85bf9a33079f16ae8b74983ab06af3b1a3696b11" [[package]] name = "glob" @@ -2025,18 +1833,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" -[[package]] -name = "gloo-timers" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - [[package]] name = "group" version = "0.12.1" @@ -2045,7 +1841,7 @@ checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ "ff 0.12.1", "memuse", - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -2055,30 +1851,11 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "ff 0.13.0", - "rand_core", + "ff 0.13.1", + "rand_core 0.6.4", "subtle", ] -[[package]] -name = "h2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http", - "indexmap 2.7.1", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "halo2" version = "0.1.0-beta.2" @@ -2096,14 +1873,14 @@ checksum = "62f0ca78d12ac5c893f286d7cdfe3869290305ab8cac376e2592cdc8396da102" dependencies = [ "blake2b_simd", "crossbeam", - "ff 0.13.0", + "ff 0.13.1", "group 0.13.0", "halo2curves-axiom", "itertools 0.11.0", "maybe-rayon", "pairing 0.23.0", - "rand", - "rand_core", + "rand 0.8.5", + "rand_core 0.6.4", "rayon", "rustc-hash 1.1.0", "sha3", @@ -2124,7 +1901,7 @@ dependencies = [ "num-integer", "num-traits", "poseidon-primitives", - "rand_chacha", + "rand_chacha 0.3.1", "rayon", "rustc-hash 1.1.0", "serde", @@ -2142,9 +1919,9 @@ dependencies = [ "num-bigint 0.4.6", "num-integer", "num-traits", - "rand", - "rand_chacha", - "rand_core", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rand_core 0.6.4", "rayon", "serde", "serde_json", @@ -2161,7 +1938,7 @@ dependencies = [ "ff 0.12.1", "group 0.12.1", "pasta_curves 0.4.1", - "rand_core", + "rand_core 0.6.4", "rayon", ] @@ -2173,7 +1950,7 @@ checksum = "b756596082144af6e57105a20403b7b80fe9dccd085700b74fae3af523b74dba" dependencies = [ "blake2", "digest 0.10.7", - "ff 0.13.0", + "ff 0.13.1", "group 0.13.0", "halo2derive", "hex", @@ -2183,8 +1960,8 @@ dependencies = [ "num-traits", "pairing 0.23.0", "paste", - "rand", - "rand_core", + "rand 0.8.5", + "rand_core 0.6.4", "rayon", "serde", "serde_arrays", @@ -2202,7 +1979,7 @@ checksum = "dd8309e4638b4f1bcf6613d72265a84074d26034c35edc5d605b5688e580b8b8" dependencies = [ "blake2b_simd", "digest 0.10.7", - "ff 0.13.0", + "ff 0.13.1", "group 0.13.0", "hex", "lazy_static", @@ -2211,8 +1988,8 @@ dependencies = [ "pairing 0.23.0", "pasta_curves 0.5.1", "paste", - "rand", - "rand_core", + "rand 0.8.5", + "rand_core 0.6.4", "rayon", "serde", "serde_arrays", @@ -2253,9 +2030,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.2" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" dependencies = [ "foldhash", "rayon", @@ -2285,9 +2062,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.9" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" [[package]] name = "hex" @@ -2314,273 +2091,121 @@ dependencies = [ ] [[package]] -name = "home" -version = "0.5.11" +name = "humantime" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" -dependencies = [ - "windows-sys 0.59.0", -] +checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" [[package]] -name = "http" -version = "1.3.1" +name = "iana-time-zone" +version = "0.1.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" dependencies = [ - "bytes", - "fnv", - "itoa", + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core 0.61.2", ] [[package]] -name = "http-body" -version = "1.0.1" +name = "iana-time-zone-haiku" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "bytes", - "http", + "cc", ] [[package]] -name = "http-body-util" -version = "0.1.3" +name = "icu_collections" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "pin-project-lite", + "displaydoc", + "potential_utf", + "yoke", + "zerofrom", + "zerovec", ] [[package]] -name = "httparse" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" - -[[package]] -name = "humantime" -version = "2.1.0" +name = "icu_locale_core" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] [[package]] -name = "hyper" -version = "1.6.0" +name = "icu_normalizer" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" +checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "itoa", - "pin-project-lite", + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", "smallvec", - "tokio", - "want", + "zerovec", ] [[package]] -name = "hyper-rustls" -version = "0.27.5" +name = "icu_normalizer_data" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" -dependencies = [ - "futures-util", - "http", - "hyper", - "hyper-util", - "rustls", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tower-service", -] +checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" [[package]] -name = "hyper-tls" -version = "0.6.0" +name = "icu_properties" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core 0.52.0", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - -[[package]] -name = "icu_normalizer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "utf16_iter", - "utf8_iter", - "write16", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" - -[[package]] -name = "icu_properties" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" dependencies = [ "displaydoc", "icu_collections", - "icu_locid_transform", + "icu_locale_core", "icu_properties_data", "icu_provider", - "tinystr", + "potential_utf", + "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.5.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" +checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" dependencies = [ "displaydoc", - "icu_locid", - "icu_provider_macros", + "icu_locale_core", "stable_deref_trait", "tinystr", "writeable", "yoke", "zerofrom", + "zerotrie", "zerovec", ] -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.98", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -2600,9 +2225,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" dependencies = [ "icu_normalizer", "icu_properties", @@ -2625,7 +2250,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -2647,21 +2272,15 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.7.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" +checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", - "hashbrown 0.15.2", + "hashbrown 0.15.4", "serde", ] -[[package]] -name = "ipnet" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" - [[package]] name = "is_terminal_polyfill" version = "1.70.1" @@ -2706,18 +2325,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" - -[[package]] -name = "jobserver" -version = "0.1.32" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -dependencies = [ - "libc", -] +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "js-sys" @@ -2739,7 +2349,7 @@ dependencies = [ "bls12_381", "ff 0.12.1", "group 0.12.1", - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -2787,47 +2397,27 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.170" +version = "0.2.174" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828" +checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" [[package]] name = "libm" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" - -[[package]] -name = "libredox" -version = "0.1.3" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.8.0", - "libc", -] +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "linux-raw-sys" -version = "0.4.15" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" [[package]] name = "litemap" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" - -[[package]] -name = "lock_api" -version = "0.4.12" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] +checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" [[package]] name = "lockfree-object-pool" @@ -2837,33 +2427,34 @@ checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" [[package]] name = "log" -version = "0.4.26" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "lz4_flex" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" +checksum = "2c592ad9fbc1b7838633b3ae55ce69b17d01150c72fcef229fbb819d39ee51ee" [[package]] -name = "matchers" -version = "0.1.0" +name = "macro-string" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3" dependencies = [ - "regex-automata 0.1.10", + "proc-macro2", + "quote", + "syn 2.0.103", ] [[package]] -name = "matrixmultiply" -version = "0.3.10" +name = "matchers" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06de3016e9fae57a36fd14dba131fccf49f74b40b7fbdb472f96e361ec71a08" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "autocfg", - "rawpointer", + "regex-automata 0.1.10", ] [[package]] @@ -2878,9 +2469,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.4" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" [[package]] name = "memmap2" @@ -2899,9 +2490,9 @@ checksum = "3d97bbf43eb4f088f8ca469930cde17fa036207c9a5e02ccc5107c4e8b17c964" [[package]] name = "metrics" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261" +checksum = "3045b4193fbdc5b5681f32f11070da9be3609f189a79f3390706d42587f46bb5" dependencies = [ "ahash", "portable-atomic", @@ -2909,9 +2500,9 @@ dependencies = [ [[package]] name = "metrics" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7deb012b3b2767169ff203fadb4c6b0b82b947512e5eb9e0b78c2e186ad9e3" +checksum = "25dea7ac8057892855ec285c440160265225438c3c45072613c25a4b26e98ef5" dependencies = [ "ahash", "portable-atomic", @@ -2926,7 +2517,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -2935,10 +2526,10 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62a6a1f7141f1d9bc7a886b87536bbfc97752e08b369e1e0453a9acfab5f5da4" dependencies = [ - "indexmap 2.7.1", + "indexmap 2.9.0", "itoa", "lockfree-object-pool", - "metrics 0.23.0", + "metrics 0.23.1", "metrics-util", "once_cell", "tracing", @@ -2956,8 +2547,8 @@ dependencies = [ "crossbeam-epoch", "crossbeam-utils", "hashbrown 0.14.5", - "indexmap 2.7.1", - "metrics 0.23.0", + "indexmap 2.9.0", + "metrics 0.23.1", "num_cpus", "ordered-float", "quanta", @@ -2965,38 +2556,15 @@ dependencies = [ "sketches-ddsketch", ] -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - [[package]] name = "miniz_oxide" -version = "0.8.5" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", ] -[[package]] -name = "mint" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" - -[[package]] -name = "mio" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" -dependencies = [ - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.52.0", -] - [[package]] name = "modular-bitfield" version = "0.11.2" @@ -3035,38 +2603,7 @@ checksum = "1bb5c1d8184f13f7d0ccbeeca0def2f9a181bce2624302793005f5ca8aa62e5e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", -] - -[[package]] -name = "native-tls" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ndarray" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" -dependencies = [ - "matrixmultiply", - "num-complex", - "num-integer", - "num-traits", - "rawpointer", - "rayon", + "syn 2.0.103", ] [[package]] @@ -3130,7 +2667,7 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", - "rand", + "rand 0.8.5", "serde", ] @@ -3187,16 +2724,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", - "libm", ] [[package]] name = "num_cpus" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi 0.5.2", "libc", ] @@ -3217,7 +2753,7 @@ checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -3229,7 +2765,7 @@ dependencies = [ "num-bigint 0.4.6", "num-integer", "num-traits", - "rand", + "rand 0.8.5", ] [[package]] @@ -3256,19 +2792,25 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.3" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" dependencies = [ "critical-section", "portable-atomic", ] +[[package]] +name = "once_cell_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" + [[package]] name = "op-alloy-consensus" -version = "0.10.7" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed6cad421e41d400667a06df8bd306dd316c3e1fed803df065b1c65d7de6795" +checksum = "a9ddc5e1dcd2967e8325ab06ed52a2c7cfa562a6dd31ffc9f64e7075bba9f221" dependencies = [ "alloy-consensus", "alloy-eips", @@ -3278,70 +2820,39 @@ dependencies = [ "derive_more 1.0.0", "serde", "serde_with", - "thiserror 2.0.11", -] - -[[package]] -name = "openssl" -version = "0.10.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da" -dependencies = [ - "bitflags 2.8.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", + "thiserror 2.0.12", ] [[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.98", -] - -[[package]] -name = "openssl-probe" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" - -[[package]] -name = "openssl-sys" -version = "0.9.108" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847" +name = "openvm" +version = "1.1.1" +source = "git+https://github.com/openvm-org/openvm.git?rev=a0ae88f#a0ae88f2c4d98b651c653a1e9b7598d3ad15455e" dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", + "bytemuck", + "num-bigint 0.4.6", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=a0ae88f)", + "openvm-platform 1.1.1", + "openvm-rv32im-guest 1.1.1", + "serde", ] [[package]] name = "openvm" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "bytemuck", "num-bigint 0.4.6", - "openvm-custom-insn", - "openvm-platform", - "openvm-rv32im-guest", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=bdb4831)", + "openvm-platform 1.2.0", + "openvm-rv32im-guest 1.2.0", "serde", ] [[package]] name = "openvm-algebra-circuit" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -3359,7 +2870,7 @@ dependencies = [ "openvm-rv32im-circuit", "openvm-stark-backend", "openvm-stark-sdk", - "rand", + "rand 0.8.5", "serde", "serde-big-array", "serde_with", @@ -3369,17 +2880,17 @@ dependencies = [ [[package]] name = "openvm-algebra-complex-macros" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "openvm-macros-common", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "openvm-algebra-guest" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "halo2curves-axiom", "num-bigint 0.4.6", @@ -3392,17 +2903,17 @@ dependencies = [ [[package]] name = "openvm-algebra-moduli-macros" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "openvm-macros-common", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "openvm-algebra-transpiler" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "openvm-algebra-guest", "openvm-instructions", @@ -3416,7 +2927,7 @@ dependencies = [ [[package]] name = "openvm-bigint-circuit" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -3431,19 +2942,19 @@ dependencies = [ "openvm-rv32im-transpiler", "openvm-stark-backend", "openvm-stark-sdk", - "rand", + "rand 0.8.5", "serde", ] [[package]] name = "openvm-bigint-guest" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "num-bigint 0.4.6", "num-traits", - "openvm", - "openvm-platform", + "openvm 1.2.0", + "openvm-platform 1.2.0", "serde", "serde-big-array", "strum_macros 0.26.4", @@ -3452,7 +2963,7 @@ dependencies = [ [[package]] name = "openvm-bigint-transpiler" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "openvm-bigint-guest", "openvm-instructions", @@ -3467,11 +2978,11 @@ dependencies = [ [[package]] name = "openvm-build" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "cargo_metadata", "eyre", - "openvm-platform", + "openvm-platform 1.2.0", "serde", "serde_json", ] @@ -3479,7 +2990,7 @@ dependencies = [ [[package]] name = "openvm-circuit" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "backtrace", "cfg-if", @@ -3490,7 +3001,7 @@ dependencies = [ "eyre", "getset", "itertools 0.14.0", - "metrics 0.23.0", + "metrics 0.23.1", "openvm-circuit-derive", "openvm-circuit-primitives", "openvm-circuit-primitives-derive", @@ -3498,7 +3009,7 @@ dependencies = [ "openvm-poseidon2-air", "openvm-stark-backend", "p3-baby-bear", - "rand", + "rand 0.8.5", "rustc-hash 2.1.1", "serde", "serde-big-array", @@ -3510,17 +3021,17 @@ dependencies = [ [[package]] name = "openvm-circuit-derive" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "itertools 0.14.0", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "openvm-circuit-primitives" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "derive-new 0.6.0", "itertools 0.14.0", @@ -3528,24 +3039,24 @@ dependencies = [ "num-traits", "openvm-circuit-primitives-derive", "openvm-stark-backend", - "rand", + "rand 0.8.5", "tracing", ] [[package]] name = "openvm-circuit-primitives-derive" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "itertools 0.14.0", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "openvm-continuations" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "derivative", "openvm-circuit", @@ -3560,17 +3071,27 @@ dependencies = [ [[package]] name = "openvm-custom-insn" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=a0ae88f#a0ae88f2c4d98b651c653a1e9b7598d3ad15455e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.103", +] + +[[package]] +name = "openvm-custom-insn" +version = "0.1.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "openvm-ecc-circuit" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -3592,7 +3113,7 @@ dependencies = [ "openvm-rv32-adapters", "openvm-rv32im-circuit", "openvm-stark-backend", - "rand", + "rand 0.8.5", "serde", "serde_with", "strum 0.26.3", @@ -3601,7 +3122,7 @@ dependencies = [ [[package]] name = "openvm-ecc-guest" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "ecdsa", "elliptic-curve", @@ -3612,12 +3133,12 @@ dependencies = [ "lazy_static", "num-bigint 0.4.6", "once_cell", - "openvm", + "openvm 1.2.0", "openvm-algebra-guest", "openvm-algebra-moduli-macros", - "openvm-custom-insn", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=bdb4831)", "openvm-ecc-sw-macros", - "openvm-rv32im-guest", + "openvm-rv32im-guest 1.2.0", "p256", "serde", "strum_macros 0.26.4", @@ -3626,17 +3147,17 @@ dependencies = [ [[package]] name = "openvm-ecc-sw-macros" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "openvm-macros-common", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "openvm-ecc-transpiler" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "openvm-ecc-guest", "openvm-instructions", @@ -3650,7 +3171,7 @@ dependencies = [ [[package]] name = "openvm-instructions" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "backtrace", "derive-new 0.6.0", @@ -3667,16 +3188,16 @@ dependencies = [ [[package]] name = "openvm-instructions-derive" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "openvm-keccak256-circuit" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -3691,7 +3212,7 @@ dependencies = [ "openvm-stark-backend", "openvm-stark-sdk", "p3-keccak-air", - "rand", + "rand 0.8.5", "serde", "serde-big-array", "strum 0.26.3", @@ -3702,16 +3223,16 @@ dependencies = [ [[package]] name = "openvm-keccak256-guest" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ - "openvm-platform", + "openvm-platform 1.2.0", "tiny-keccak", ] [[package]] name = "openvm-keccak256-transpiler" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "openvm-instructions", "openvm-instructions-derive", @@ -3725,15 +3246,15 @@ dependencies = [ [[package]] name = "openvm-macros-common" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "openvm-mod-circuit-builder" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "itertools 0.14.0", "num-bigint 0.4.6", @@ -3743,7 +3264,7 @@ dependencies = [ "openvm-instructions", "openvm-stark-backend", "openvm-stark-sdk", - "rand", + "rand 0.8.5", "serde", "serde_with", "tracing", @@ -3752,7 +3273,7 @@ dependencies = [ [[package]] name = "openvm-native-circuit" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -3768,7 +3289,7 @@ dependencies = [ "openvm-rv32im-circuit", "openvm-stark-backend", "openvm-stark-sdk", - "rand", + "rand 0.8.5", "serde", "serde-big-array", "static_assertions", @@ -3779,11 +3300,11 @@ dependencies = [ [[package]] name = "openvm-native-compiler" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "backtrace", "itertools 0.14.0", - "metrics 0.23.0", + "metrics 0.23.1", "num-bigint 0.4.6", "num-integer", "openvm-circuit", @@ -3803,21 +3324,21 @@ dependencies = [ [[package]] name = "openvm-native-compiler-derive" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "openvm-native-recursion" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "cfg-if", "itertools 0.14.0", "lazy_static", - "metrics 0.23.0", + "metrics 0.23.1", "once_cell", "openvm-circuit", "openvm-native-circuit", @@ -3829,7 +3350,7 @@ dependencies = [ "p3-fri", "p3-merkle-tree", "p3-symmetric", - "rand", + "rand 0.8.5", "serde", "serde_json", "serde_with", @@ -3840,7 +3361,7 @@ dependencies = [ [[package]] name = "openvm-pairing-circuit" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -3862,7 +3383,7 @@ dependencies = [ "openvm-rv32-adapters", "openvm-rv32im-circuit", "openvm-stark-backend", - "rand", + "rand 0.8.5", "serde", "strum 0.26.3", ] @@ -3870,7 +3391,7 @@ dependencies = [ [[package]] name = "openvm-pairing-guest" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "group 0.13.0", "halo2curves-axiom", @@ -3879,16 +3400,16 @@ dependencies = [ "lazy_static", "num-bigint 0.4.6", "num-traits", - "openvm", + "openvm 1.2.0", "openvm-algebra-complex-macros", "openvm-algebra-guest", "openvm-algebra-moduli-macros", - "openvm-custom-insn", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=bdb4831)", "openvm-ecc-guest", "openvm-ecc-sw-macros", - "openvm-platform", - "openvm-rv32im-guest", - "rand", + "openvm-platform 1.2.0", + "openvm-rv32im-guest 1.2.0", + "rand 0.8.5", "serde", "strum_macros 0.26.4", ] @@ -3896,7 +3417,7 @@ dependencies = [ [[package]] name = "openvm-pairing-transpiler" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "openvm-instructions", "openvm-instructions-derive", @@ -3907,21 +3428,32 @@ dependencies = [ "strum 0.26.3", ] +[[package]] +name = "openvm-platform" +version = "1.1.1" +source = "git+https://github.com/openvm-org/openvm.git?rev=a0ae88f#a0ae88f2c4d98b651c653a1e9b7598d3ad15455e" +dependencies = [ + "getrandom 0.2.16", + "libm", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=a0ae88f)", + "openvm-rv32im-guest 1.1.1", +] + [[package]] name = "openvm-platform" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.16", "libm", - "openvm-custom-insn", - "openvm-rv32im-guest", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=bdb4831)", + "openvm-rv32im-guest 1.2.0", ] [[package]] name = "openvm-poseidon2-air" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "derivative", "lazy_static", @@ -3931,14 +3463,14 @@ dependencies = [ "p3-poseidon2", "p3-poseidon2-air", "p3-symmetric", - "rand", + "rand 0.8.5", "zkhash", ] [[package]] name = "openvm-rv32-adapters" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "derive-new 0.6.0", "itertools 0.14.0", @@ -3949,7 +3481,7 @@ dependencies = [ "openvm-rv32im-circuit", "openvm-stark-backend", "openvm-stark-sdk", - "rand", + "rand 0.8.5", "serde", "serde-big-array", "serde_with", @@ -3958,7 +3490,7 @@ dependencies = [ [[package]] name = "openvm-rv32im-circuit" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -3972,29 +3504,38 @@ dependencies = [ "openvm-instructions", "openvm-rv32im-transpiler", "openvm-stark-backend", - "rand", + "rand 0.8.5", "serde", "serde-big-array", "strum 0.26.3", ] +[[package]] +name = "openvm-rv32im-guest" +version = "1.1.1" +source = "git+https://github.com/openvm-org/openvm.git?rev=a0ae88f#a0ae88f2c4d98b651c653a1e9b7598d3ad15455e" +dependencies = [ + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=a0ae88f)", + "strum_macros 0.26.4", +] + [[package]] name = "openvm-rv32im-guest" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ - "openvm-custom-insn", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=bdb4831)", "strum_macros 0.26.4", ] [[package]] name = "openvm-rv32im-transpiler" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "openvm-instructions", "openvm-instructions-derive", - "openvm-rv32im-guest", + "openvm-rv32im-guest 1.2.0", "openvm-stark-backend", "openvm-transpiler", "rrs-lib", @@ -4006,7 +3547,7 @@ dependencies = [ [[package]] name = "openvm-sdk" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "async-trait", "bitcode", @@ -4018,8 +3559,8 @@ dependencies = [ "getset", "hex", "itertools 0.14.0", - "metrics 0.23.0", - "openvm", + "metrics 0.23.1", + "openvm 1.2.0", "openvm-algebra-circuit", "openvm-algebra-transpiler", "openvm-bigint-circuit", @@ -4057,18 +3598,18 @@ dependencies = [ [[package]] name = "openvm-sha256-air" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "openvm-circuit-primitives", "openvm-stark-backend", - "rand", + "rand 0.8.5", "sha2", ] [[package]] name = "openvm-sha256-circuit" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -4082,7 +3623,7 @@ dependencies = [ "openvm-sha256-transpiler", "openvm-stark-backend", "openvm-stark-sdk", - "rand", + "rand 0.8.5", "serde", "sha2", "strum 0.26.3", @@ -4091,16 +3632,16 @@ dependencies = [ [[package]] name = "openvm-sha256-guest" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ - "openvm-platform", + "openvm-platform 1.2.0", "sha2", ] [[package]] name = "openvm-sha256-transpiler" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "openvm-instructions", "openvm-instructions-derive", @@ -4114,21 +3655,18 @@ dependencies = [ [[package]] name = "openvm-stark-backend" version = "1.1.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-stark-gpu.git?branch=main#308223401cab827f931cb5939be0620a8ba83875" +source = "git+https://github.com/openvm-org/stark-backend.git?tag=v1.1.0#7f79ce233683ec8ca63a32cc4723ef920b23a6c5" dependencies = [ "bitcode", "cfg-if", "derivative", "derive-new 0.7.0", "itertools 0.14.0", - "metrics 0.23.0", + "metrics 0.23.1", "p3-air", "p3-challenger", "p3-commit", "p3-field", - "p3-gpu-backend", - "p3-gpu-base", - "p3-gpu-module", "p3-matrix", "p3-maybe-rayon", "p3-uni-stark", @@ -4143,13 +3681,13 @@ dependencies = [ [[package]] name = "openvm-stark-sdk" version = "1.1.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-stark-gpu.git?branch=main#308223401cab827f931cb5939be0620a8ba83875" +source = "git+https://github.com/openvm-org/stark-backend.git?tag=v1.1.0#7f79ce233683ec8ca63a32cc4723ef920b23a6c5" dependencies = [ "derivative", - "derive_more 0.99.19", - "ff 0.13.0", + "derive_more 0.99.20", + "ff 0.13.1", "itertools 0.14.0", - "metrics 0.23.0", + "metrics 0.23.1", "metrics-tracing-context", "metrics-util", "openvm-stark-backend", @@ -4159,14 +3697,13 @@ dependencies = [ "p3-dft", "p3-fri", "p3-goldilocks", - "p3-gpu-backend", "p3-keccak", "p3-koala-bear", "p3-merkle-tree", "p3-poseidon", "p3-poseidon2", "p3-symmetric", - "rand", + "rand 0.8.5", "serde", "serde_json", "static_assertions", @@ -4180,23 +3717,17 @@ dependencies = [ [[package]] name = "openvm-transpiler" version = "1.2.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?branch=patch-v1.2.0#8094b4f5a4000f0d75d93cfcd6690fd3174325af" +source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" dependencies = [ "elf", "eyre", "openvm-instructions", - "openvm-platform", + "openvm-platform 1.2.0", "openvm-stark-backend", "rrs-lib", "thiserror 1.0.69", ] -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - [[package]] name = "ordered-float" version = "4.6.0" @@ -4227,7 +3758,7 @@ dependencies = [ [[package]] name = "p3-air" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "p3-field", "p3-matrix", @@ -4236,21 +3767,21 @@ dependencies = [ [[package]] name = "p3-baby-bear" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "p3-field", "p3-mds", "p3-monty-31", "p3-poseidon2", "p3-symmetric", - "rand", + "rand 0.8.5", "serde", ] [[package]] name = "p3-blake3" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "blake3", "p3-symmetric", @@ -4260,22 +3791,22 @@ dependencies = [ [[package]] name = "p3-bn254-fr" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ - "ff 0.13.0", + "ff 0.13.1", "halo2curves", "num-bigint 0.4.6", "p3-field", "p3-poseidon2", "p3-symmetric", - "rand", + "rand 0.8.5", "serde", ] [[package]] name = "p3-challenger" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "p3-field", "p3-maybe-rayon", @@ -4287,14 +3818,12 @@ dependencies = [ [[package]] name = "p3-commit" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ - "anyhow", "itertools 0.14.0", "p3-challenger", "p3-dft", "p3-field", - "p3-gpu-base", "p3-matrix", "p3-util", "serde", @@ -4303,7 +3832,7 @@ dependencies = [ [[package]] name = "p3-dft" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "itertools 0.14.0", "p3-field", @@ -4316,7 +3845,7 @@ dependencies = [ [[package]] name = "p3-field" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "itertools 0.14.0", "num-bigint 0.4.6", @@ -4325,7 +3854,7 @@ dependencies = [ "nums", "p3-maybe-rayon", "p3-util", - "rand", + "rand 0.8.5", "serde", "tracing", ] @@ -4333,31 +3862,26 @@ dependencies = [ [[package]] name = "p3-fri" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ - "anyhow", "itertools 0.14.0", "p3-challenger", "p3-commit", "p3-dft", "p3-field", - "p3-gpu-backend", - "p3-gpu-base", "p3-interpolation", "p3-matrix", "p3-maybe-rayon", - "p3-merkle-tree", "p3-util", - "rand", + "rand 0.8.5", "serde", "tracing", - "zkhash", ] [[package]] name = "p3-goldilocks" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "num-bigint 0.4.6", "p3-dft", @@ -4367,99 +3891,14 @@ dependencies = [ "p3-poseidon2", "p3-symmetric", "p3-util", - "rand", + "rand 0.8.5", "serde", ] [[package]] -name = "p3-gpu-backend" +name = "p3-interpolation" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" -dependencies = [ - "anyhow", - "bytemuck", - "cc", - "cust", - "cust_raw", - "ff 0.13.0", - "itertools 0.13.0", - "lazy_static", - "ndarray", - "once_cell", - "p3-baby-bear", - "p3-commit", - "p3-dft", - "p3-field", - "p3-gpu-base", - "p3-gpu-build", - "p3-interpolation", - "p3-matrix", - "p3-maybe-rayon", - "p3-poseidon2", - "p3-util", - "parking_lot", - "paste", - "rand", - "rand_core", - "rayon", - "serde", - "sppark", - "tracing", - "transpose", -] - -[[package]] -name = "p3-gpu-base" -version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" -dependencies = [ - "anyhow", - "bytemuck", - "cust", - "cust_raw", - "hex", - "lazy_static", - "p3-field", - "p3-matrix", - "parking_lot", - "tracing", -] - -[[package]] -name = "p3-gpu-build" -version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" -dependencies = [ - "cc", - "directories", - "hex", - "p3-gpu-field", - "sha2", - "tempfile", -] - -[[package]] -name = "p3-gpu-field" -version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" - -[[package]] -name = "p3-gpu-module" -version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" -dependencies = [ - "itertools 0.14.0", - "p3-field", - "p3-gpu-base", - "p3-matrix", - "p3-util", - "tracing", -] - -[[package]] -name = "p3-interpolation" -version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "p3-field", "p3-matrix", @@ -4470,7 +3909,7 @@ dependencies = [ [[package]] name = "p3-keccak" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "itertools 0.14.0", "p3-field", @@ -4482,43 +3921,41 @@ dependencies = [ [[package]] name = "p3-keccak-air" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "p3-air", "p3-field", - "p3-gpu-backend", "p3-matrix", "p3-maybe-rayon", "p3-util", - "rand", + "rand 0.8.5", "tracing", - "zkhash", ] [[package]] name = "p3-koala-bear" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "p3-field", "p3-mds", "p3-monty-31", "p3-poseidon2", "p3-symmetric", - "rand", + "rand 0.8.5", "serde", ] [[package]] name = "p3-matrix" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "itertools 0.14.0", "p3-field", "p3-maybe-rayon", "p3-util", - "rand", + "rand 0.8.5", "serde", "tracing", "transpose", @@ -4527,7 +3964,7 @@ dependencies = [ [[package]] name = "p3-maybe-rayon" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "rayon", ] @@ -4535,7 +3972,7 @@ dependencies = [ [[package]] name = "p3-mds" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "itertools 0.14.0", "p3-dft", @@ -4543,24 +3980,22 @@ dependencies = [ "p3-matrix", "p3-symmetric", "p3-util", - "rand", + "rand 0.8.5", ] [[package]] name = "p3-merkle-tree" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ - "anyhow", "itertools 0.14.0", "p3-commit", "p3-field", - "p3-gpu-base", "p3-matrix", "p3-maybe-rayon", "p3-symmetric", "p3-util", - "rand", + "rand 0.8.5", "serde", "tracing", ] @@ -4568,7 +4003,7 @@ dependencies = [ [[package]] name = "p3-monty-31" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "itertools 0.14.0", "num-bigint 0.4.6", @@ -4580,7 +4015,7 @@ dependencies = [ "p3-poseidon2", "p3-symmetric", "p3-util", - "rand", + "rand 0.8.5", "serde", "tracing", "transpose", @@ -4589,30 +4024,30 @@ dependencies = [ [[package]] name = "p3-poseidon" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "p3-field", "p3-mds", "p3-symmetric", - "rand", + "rand 0.8.5", ] [[package]] name = "p3-poseidon2" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "gcd", "p3-field", "p3-mds", "p3-symmetric", - "rand", + "rand 0.8.5", ] [[package]] name = "p3-poseidon2-air" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "p3-air", "p3-field", @@ -4620,7 +4055,7 @@ dependencies = [ "p3-maybe-rayon", "p3-poseidon2", "p3-util", - "rand", + "rand 0.8.5", "tikv-jemallocator", "tracing", ] @@ -4628,7 +4063,7 @@ dependencies = [ [[package]] name = "p3-symmetric" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "itertools 0.14.0", "p3-field", @@ -4638,7 +4073,7 @@ dependencies = [ [[package]] name = "p3-uni-stark" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "itertools 0.14.0", "p3-air", @@ -4656,7 +4091,7 @@ dependencies = [ [[package]] name = "p3-util" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.2.0#261b322c885fdc3e340fc91db12f96c11cc3b00e" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" dependencies = [ "serde", ] @@ -4681,9 +4116,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.7.4" +version = "3.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fde3d0718baf5bc92f577d652001da0f8d54cd03a7974e118d04fc888dc23d" +checksum = "799781ae679d79a948e13d4824a40970bfa500058d245760dd857301059810fa" dependencies = [ "arrayvec", "bitvec", @@ -4698,37 +4133,14 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.7.4" +version = "3.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581c837bb6b9541ce7faa9377c20616e4fb7650f6b0f68bc93c827ee504fb7b3" +checksum = "34b4653168b563151153c9e4c08ebed57fb8262bebfa79711552fa983c623e7a" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.98", -] - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.52.6", + "syn 2.0.103", ] [[package]] @@ -4741,7 +4153,7 @@ dependencies = [ "ff 0.12.1", "group 0.12.1", "lazy_static", - "rand", + "rand 0.8.5", "static_assertions", "subtle", ] @@ -4753,10 +4165,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3e57598f73cc7e1b2ac63c79c517b31a0877cd7c402cdcaa311b5208de7a095" dependencies = [ "blake2b_simd", - "ff 0.13.0", + "ff 0.13.1", "group 0.13.0", "lazy_static", - "rand", + "rand 0.8.5", "static_assertions", "subtle", ] @@ -4775,12 +4187,12 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.15" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" +checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323" dependencies = [ "memchr", - "thiserror 2.0.11", + "thiserror 2.0.12", "ucd-trie", ] @@ -4806,17 +4218,11 @@ dependencies = [ "spki", ] -[[package]] -name = "pkg-config" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" - [[package]] name = "portable-atomic" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "poseidon-primitives" @@ -4825,14 +4231,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e4aaeda7a092e21165cc5f0cbc738e72a46f31c03c3cbd87b71ceae9d2d93bc" dependencies = [ "bitvec", - "ff 0.13.0", + "ff 0.13.1", "lazy_static", "log", - "rand", - "rand_xorshift", + "rand 0.8.5", + "rand_xorshift 0.3.0", "thiserror 1.0.69", ] +[[package]] +name = "potential_utf" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +dependencies = [ + "zerovec", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -4841,21 +4256,21 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ "zerocopy", ] [[package]] name = "prettyplease" -version = "0.2.29" +version = "0.2.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac" +checksum = "6837b9e10d61f45f987d50808f83d1ee3d206c66acf650c3e4ae2e1f6ddedf55" dependencies = [ "proc-macro2", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -4880,9 +4295,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" dependencies = [ "toml_edit", ] @@ -4906,32 +4321,32 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "proc-macro2" -version = "1.0.93" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] [[package]] name = "proptest" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50" +checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.8.0", + "bitflags", "lazy_static", "num-traits", - "rand", - "rand_chacha", - "rand_xorshift", + "rand 0.9.1", + "rand_chacha 0.9.0", + "rand_xorshift 0.4.0", "regex-syntax 0.8.5", "rusty-fork", "tempfile", @@ -4940,9 +4355,9 @@ dependencies = [ [[package]] name = "psm" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58e5423e24c18cc840e1c98370b3993c6649cd1678b4d24318bcf0a083cbe88" +checksum = "6e944464ec8536cd1beb0bbfd96987eb5e3b72f2ecdafdc5c769a37f1fa2ae1f" dependencies = [ "cc", ] @@ -4964,20 +4379,20 @@ checksum = "ca414edb151b4c8d125c12566ab0d74dc9cdba36fb80eb7b848c15f495fd32d1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "quanta" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bd1fe6824cea6538803de3ff1bc0cf3949024db3d43c9643024bfb33a807c0e" +checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7" dependencies = [ "crossbeam-utils", "libc", "once_cell", "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi 0.11.1+wasi-snapshot-preview1", "web-sys", "winapi", ] @@ -4990,13 +4405,19 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "radium" version = "0.7.0" @@ -5029,11 +4450,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", "serde", ] +[[package]] +name = "rand" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.3", +] + [[package]] name = "rand_chacha" version = "0.3.1" @@ -5041,7 +4472,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.3", ] [[package]] @@ -5050,7 +4491,16 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.16", +] + +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +dependencies = [ + "getrandom 0.3.3", ] [[package]] @@ -5059,23 +4509,26 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core", + "rand_core 0.6.4", ] [[package]] -name = "raw-cpuid" -version = "11.4.0" +name = "rand_xorshift" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "529468c1335c1c03919960dfefdb1b3648858c20d7ec2d0663e728e4a717efbc" +checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a" dependencies = [ - "bitflags 2.8.0", + "rand_core 0.9.3", ] [[package]] -name = "rawpointer" -version = "0.2.1" +name = "raw-cpuid" +version = "11.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" +checksum = "c6df7ab838ed27997ba19a4664507e6f82b41fe6e20be42929332156e5e85146" +dependencies = [ + "bitflags", +] [[package]] name = "rayon" @@ -5098,23 +4551,23 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.5.12" +name = "ref-cast" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af" +checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf" dependencies = [ - "bitflags 2.8.0", + "ref-cast-impl", ] [[package]] -name = "redox_users" -version = "0.4.6" +name = "ref-cast-impl" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" dependencies = [ - "getrandom 0.2.15", - "libredox", - "thiserror 1.0.69", + "proc-macro2", + "quote", + "syn 2.0.103", ] [[package]] @@ -5170,51 +4623,6 @@ dependencies = [ "bytecheck", ] -[[package]] -name = "reqwest" -version = "0.12.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb" -dependencies = [ - "base64 0.22.1", - "bytes", - "encoding_rs", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-tls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-native-tls", - "tower", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows-registry", -] - [[package]] name = "reth-chainspec" version = "1.1.5" @@ -5259,7 +4667,7 @@ dependencies = [ "convert_case 0.6.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -5309,7 +4717,7 @@ dependencies = [ "reth-trie-common", "serde", "sysinfo", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -5322,7 +4730,7 @@ dependencies = [ "alloy-primitives", "bytes", "derive_more 1.0.0", - "metrics 0.24.1", + "metrics 0.24.2", "modular-bitfield", "parity-scale-codec", "reth-codecs", @@ -5412,7 +4820,7 @@ dependencies = [ "alloy-primitives", "auto_impl", "futures-util", - "metrics 0.24.1", + "metrics 0.24.2", "reth-chainspec", "reth-consensus", "reth-consensus-common", @@ -5459,7 +4867,7 @@ dependencies = [ "nybbles", "reth-consensus", "reth-storage-errors", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -5487,7 +4895,7 @@ source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6 dependencies = [ "serde", "serde_json", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -5495,7 +4903,7 @@ name = "reth-metrics" version = "1.1.5" source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ - "metrics 0.24.1", + "metrics 0.24.2", "metrics-derive", ] @@ -5508,7 +4916,7 @@ dependencies = [ "alloy-rlp", "secp256k1", "serde_with", - "thiserror 2.0.11", + "thiserror 2.0.12", "url", ] @@ -5524,7 +4932,7 @@ dependencies = [ "memmap2", "reth-fs-util", "serde", - "thiserror 2.0.11", + "thiserror 2.0.12", "tracing", "zstd", ] @@ -5568,7 +4976,7 @@ dependencies = [ "secp256k1", "serde", "serde_with", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -5581,7 +4989,7 @@ dependencies = [ "modular-bitfield", "reth-codecs", "serde", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -5652,7 +5060,7 @@ dependencies = [ "revm 19.4.0", "revm-primitives 15.1.0", "scroll-alloy-consensus", - "thiserror 2.0.11", + "thiserror 2.0.12", "tracing", ] @@ -5682,7 +5090,7 @@ dependencies = [ "modular-bitfield", "once_cell", "proptest", - "rand", + "rand 0.8.5", "reth-codecs", "reth-primitives-traits", "reth-zstd-compressors", @@ -5753,7 +5161,7 @@ dependencies = [ "reth-primitives-traits", "reth-prune-types", "reth-static-file-types", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -5846,7 +5254,7 @@ dependencies = [ "reth-tracing", "reth-trie-common", "smallvec", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -5873,15 +5281,15 @@ dependencies = [ [[package]] name = "revm" -version = "19.5.0" +version = "19.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc5bef3c95fadf3b6a24a253600348380c169ef285f9780a793bb7090c8990d" +checksum = "c175ecec83bba464aa8406502fe5bf670491c2ace81a153264891d43bc7fa332" dependencies = [ "auto_impl", "cfg-if", "dyn-clone", "revm-interpreter 15.2.0", - "revm-precompile 16.1.0", + "revm-precompile 16.2.0", "serde", "serde_json", ] @@ -5925,9 +5333,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "16.1.0" +version = "16.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6caa1a7ff2cc4a09a263fcf9de99151706f323d30f33d519ed329f017a02b046" +checksum = "99743c3a2cac341084cc15ac74286c4bf34a0941ebf60aa420cfdb9f81f72f9f" dependencies = [ "aurora-engine-modexp", "blst", @@ -5951,7 +5359,7 @@ dependencies = [ "alloy-eip7702", "alloy-primitives", "auto_impl", - "bitflags 2.8.0", + "bitflags", "bitvec", "c-kzg", "cfg-if", @@ -5971,7 +5379,7 @@ dependencies = [ "alloy-eip7702", "alloy-primitives", "auto_impl", - "bitflags 2.8.0", + "bitflags", "bitvec", "c-kzg", "cfg-if", @@ -5991,20 +5399,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ring" -version = "0.17.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" -dependencies = [ - "cc", - "cfg-if", - "getrandom 0.2.15", - "libc", - "untrusted", - "windows-sys 0.52.0", -] - [[package]] name = "ripemd" version = "0.1.3" @@ -6022,8 +5416,8 @@ checksum = "1e147371c75553e1e2fcdb483944a8540b8438c31426279553b9a8182a9b7b65" dependencies = [ "bytecheck", "bytes", - "hashbrown 0.15.2", - "indexmap 2.7.1", + "hashbrown 0.15.4", + "indexmap 2.9.0", "munge", "ptr_meta", "rancor", @@ -6041,7 +5435,7 @@ checksum = "246b40ac189af6c675d124b802e8ef6d5246c53e17367ce9501f8f66a81abb7a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -6056,9 +5450,9 @@ dependencies = [ [[package]] name = "roaring" -version = "0.10.10" +version = "0.10.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a652edd001c53df0b3f96a36a8dc93fce6866988efc16808235653c6bcac8bf2" +checksum = "19e8d2cfa184d94d0726d650a9f4a1be7f9b76ac9fdb954219878dc00c1c1e7b" dependencies = [ "bytemuck", "byteorder", @@ -6098,7 +5492,7 @@ dependencies = [ "parity-scale-codec", "primitive-types", "proptest", - "rand", + "rand 0.8.5", "rkyv", "rlp", "ruint-macro", @@ -6114,9 +5508,9 @@ source = "git+https://github.com/scroll-tech/uint.git?branch=v1.12.3#d26b1f2a441 [[package]] name = "rustc-demangle" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f" [[package]] name = "rustc-hash" @@ -6151,69 +5545,27 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ - "semver 1.0.25", + "semver 1.0.26", ] [[package]] name = "rustix" -version = "0.38.44" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" dependencies = [ - "bitflags 2.8.0", + "bitflags", "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", -] - -[[package]] -name = "rustls" -version = "0.23.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321" -dependencies = [ - "once_cell", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-pemfile" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" -dependencies = [ - "zeroize", -] - -[[package]] -name = "rustls-webpki" -version = "0.103.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", + "windows-sys", ] [[package]] name = "rustversion" -version = "1.0.19" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" +checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" [[package]] name = "rusty-fork" @@ -6229,14 +5581,14 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "sbv-core" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#052946504cce1bfefd0f512c71513fbbf486830e" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#2c46ab68c4d77bf27aa6c27bf7763bede4dab968" dependencies = [ "reth-evm", "reth-evm-ethereum", @@ -6253,7 +5605,7 @@ dependencies = [ [[package]] name = "sbv-helpers" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#052946504cce1bfefd0f512c71513fbbf486830e" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#2c46ab68c4d77bf27aa6c27bf7763bede4dab968" dependencies = [ "revm 19.4.0", ] @@ -6261,17 +5613,17 @@ dependencies = [ [[package]] name = "sbv-kv" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#052946504cce1bfefd0f512c71513fbbf486830e" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#2c46ab68c4d77bf27aa6c27bf7763bede4dab968" dependencies = [ "auto_impl", - "hashbrown 0.15.2", + "hashbrown 0.15.4", "rustc-hash 2.1.1", ] [[package]] name = "sbv-primitives" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#052946504cce1bfefd0f512c71513fbbf486830e" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#2c46ab68c4d77bf27aa6c27bf7763bede4dab968" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6302,7 +5654,7 @@ dependencies = [ [[package]] name = "sbv-trie" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#052946504cce1bfefd0f512c71513fbbf486830e" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#2c46ab68c4d77bf27aa6c27bf7763bede4dab968" dependencies = [ "alloy-rlp", "alloy-trie", @@ -6315,20 +5667,17 @@ dependencies = [ ] [[package]] -name = "schannel" -version = "0.1.27" +name = "schemars" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" +checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" dependencies = [ - "windows-sys 0.59.0", + "dyn-clone", + "ref-cast", + "serde", + "serde_json", ] -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - [[package]] name = "scroll-alloy-consensus" version = "1.1.5" @@ -6378,42 +5727,18 @@ dependencies = [ "serde_json", ] -[[package]] -name = "scroll-zkvm-circuit-input-types" -version = "0.4.0" -source = "git+https://github.com/scroll-tech/zkvm-prover.git?tag=v0.4.2#6ad5d8ce6e002f2a8958110c55075ab2dcfdda69" -dependencies = [ - "alloy-primitives", - "alloy-serde 0.8.3", - "itertools 0.14.0", - "openvm", - "openvm-custom-insn", - "openvm-rv32im-guest", - "rkyv", - "sbv-core", - "sbv-kv", - "sbv-primitives", - "sbv-trie", - "serde", - "sha2", - "sha3", - "tiny-keccak", - "vm-zstd", -] - [[package]] name = "scroll-zkvm-prover" version = "0.4.0" -source = "git+https://github.com/scroll-tech/zkvm-prover.git?tag=v0.4.2#6ad5d8ce6e002f2a8958110c55075ab2dcfdda69" +source = "git+https://github.com/scroll-tech/zkvm-prover.git#f6d5a59c1c41e010c51e0d8b554ccd2a5a171209" dependencies = [ "alloy-primitives", - "backon", "base64 0.22.1", "bincode", "c-kzg", "git-version", "hex", - "metrics 0.23.0", + "metrics 0.23.1", "metrics-tracing-context", "metrics-util", "munge", @@ -6424,26 +5749,104 @@ dependencies = [ "openvm-native-recursion", "openvm-sdk", "openvm-stark-sdk", - "regex", - "reqwest", - "revm 19.5.0", + "revm 19.7.0", "rkyv", "sbv-primitives", - "scroll-zkvm-circuit-input-types", + "scroll-zkvm-types", "scroll-zkvm-verifier", "serde", "serde_json", "serde_stacker", "snark-verifier-sdk", - "thiserror 2.0.11", + "thiserror 2.0.12", "toml", "tracing", ] +[[package]] +name = "scroll-zkvm-types" +version = "0.4.0" +source = "git+https://github.com/scroll-tech/zkvm-prover.git#f6d5a59c1c41e010c51e0d8b554ccd2a5a171209" +dependencies = [ + "base64 0.22.1", + "bincode", + "openvm-continuations", + "openvm-native-recursion", + "openvm-sdk", + "openvm-stark-sdk", + "rkyv", + "scroll-zkvm-types-base", + "scroll-zkvm-types-batch", + "scroll-zkvm-types-bundle", + "scroll-zkvm-types-chunk", + "serde", + "snark-verifier-sdk", +] + +[[package]] +name = "scroll-zkvm-types-base" +version = "0.4.0" +source = "git+https://github.com/scroll-tech/zkvm-prover.git#f6d5a59c1c41e010c51e0d8b554ccd2a5a171209" +dependencies = [ + "alloy-primitives", + "alloy-serde 0.8.3", + "itertools 0.14.0", + "rkyv", + "serde", + "sha2", + "sha3", + "tiny-keccak", +] + +[[package]] +name = "scroll-zkvm-types-batch" +version = "0.4.0" +source = "git+https://github.com/scroll-tech/zkvm-prover.git#f6d5a59c1c41e010c51e0d8b554ccd2a5a171209" +dependencies = [ + "alloy-primitives", + "itertools 0.14.0", + "rkyv", + "scroll-zkvm-types-base", + "serde", + "vm-zstd", +] + +[[package]] +name = "scroll-zkvm-types-bundle" +version = "0.4.0" +source = "git+https://github.com/scroll-tech/zkvm-prover.git#f6d5a59c1c41e010c51e0d8b554ccd2a5a171209" +dependencies = [ + "alloy-primitives", + "itertools 0.14.0", + "rkyv", + "scroll-zkvm-types-base", + "serde", + "vm-zstd", +] + +[[package]] +name = "scroll-zkvm-types-chunk" +version = "0.4.0" +source = "git+https://github.com/scroll-tech/zkvm-prover.git#f6d5a59c1c41e010c51e0d8b554ccd2a5a171209" +dependencies = [ + "alloy-primitives", + "itertools 0.14.0", + "openvm 1.1.1", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=a0ae88f)", + "openvm-rv32im-guest 1.1.1", + "rkyv", + "sbv-core", + "sbv-kv", + "sbv-primitives", + "sbv-trie", + "scroll-zkvm-types-base", + "serde", +] + [[package]] name = "scroll-zkvm-verifier" version = "0.4.0" -source = "git+https://github.com/scroll-tech/zkvm-prover.git?tag=v0.4.2#6ad5d8ce6e002f2a8958110c55075ab2dcfdda69" +source = "git+https://github.com/scroll-tech/zkvm-prover.git#f6d5a59c1c41e010c51e0d8b554ccd2a5a171209" dependencies = [ "bincode", "eyre", @@ -6454,8 +5857,8 @@ dependencies = [ "openvm-native-recursion", "openvm-sdk", "openvm-stark-sdk", - "revm 19.5.0", - "scroll-zkvm-circuit-input-types", + "revm 19.7.0", + "scroll-zkvm-types", "serde", "snark-verifier-sdk", ] @@ -6481,7 +5884,7 @@ version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ - "rand", + "rand 0.8.5", "secp256k1-sys", "serde", ] @@ -6496,42 +5899,19 @@ dependencies = [ ] [[package]] -name = "security-framework" -version = "2.11.1" +name = "semver" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -dependencies = [ - "bitflags 2.8.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" dependencies = [ "semver-parser", ] [[package]] name = "semver" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" +checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" dependencies = [ "serde", ] @@ -6547,9 +5927,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] @@ -6574,22 +5954,22 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "serde_json" -version = "1.0.139" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ - "indexmap 2.7.1", + "indexmap 2.9.0", "itoa", "memchr", "ryu", @@ -6598,46 +5978,35 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" dependencies = [ "serde", ] [[package]] name = "serde_stacker" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "babfccff5773ff80657f0ecf553c7c516bdc2eb16389c0918b36b73e7015276e" +checksum = "69c8defe6c780725cce4ec6ad3bd91e321baf6fa4e255df1f31e345d507ef01a" dependencies = [ "serde", "stacker", ] -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - [[package]] name = "serde_with" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" +checksum = "bf65a400f8f66fb7b0552869ad70157166676db75ed8181f8104ea91cf9d0b42" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.7.1", + "indexmap 2.9.0", + "schemars", "serde", "serde_derive", "serde_json", @@ -6647,14 +6016,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" +checksum = "81679d9ed988d5e9a5e6531dc3f2c28efbd639cbd1dfb628df08edea6004da77" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -6669,9 +6038,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", @@ -6720,7 +6089,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -6737,18 +6106,15 @@ checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" [[package]] name = "slab" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] +checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" [[package]] name = "smallvec" -version = "1.14.0" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" dependencies = [ "serde", ] @@ -6768,7 +6134,7 @@ dependencies = [ "num-integer", "num-traits", "pairing 0.23.0", - "rand", + "rand 0.8.5", "ruint", "serde", "sha3", @@ -6791,23 +6157,13 @@ dependencies = [ "num-bigint 0.4.6", "num-integer", "num-traits", - "rand", - "rand_chacha", + "rand 0.8.5", + "rand_chacha 0.3.1", "serde", "serde_json", "snark-verifier", ] -[[package]] -name = "socket2" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "spin" version = "0.9.8" @@ -6824,15 +6180,6 @@ dependencies = [ "der", ] -[[package]] -name = "sppark" -version = "0.1.8" -source = "git+https://github.com/scroll-tech/sppark.git?branch=sp1-v3.0#07fe0de43a745a395dd718c735cdfe0cfc457b0a" -dependencies = [ - "cc", - "which", -] - [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -6841,15 +6188,15 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stacker" -version = "0.1.19" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9156ebd5870ef293bfb43f91c7a74528d363ec0d424afe24160ed5a4343d08a" +checksum = "cddb07e32ddb770749da91081d8d0ac3a16f1a569a18b20348cd371f5dead06b" dependencies = [ "cc", "cfg-if", "libc", "psm", - "windows-sys 0.59.0", + "windows-sys", ] [[package]] @@ -6904,7 +6251,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -6917,7 +6264,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -6930,7 +6277,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -6942,7 +6289,7 @@ dependencies = [ "byteorder", "crunchy", "lazy_static", - "rand", + "rand 0.8.5", "rustc-hex", ] @@ -6965,9 +6312,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.98" +version = "2.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" +checksum = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8" dependencies = [ "proc-macro2", "quote", @@ -6976,34 +6323,25 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.22" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac9f9798a84bca5cd4d1760db691075fda8f2c3a5d9647e8bfd29eb9b3fabb87" +checksum = "4560533fbd6914b94a8fb5cc803ed6801c3455668db3b810702c57612bac9412" dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.98", -] - -[[package]] -name = "sync_wrapper" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" -dependencies = [ - "futures-core", + "syn 2.0.103", ] [[package]] name = "synstructure" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -7019,27 +6357,6 @@ dependencies = [ "windows", ] -[[package]] -name = "system-configuration" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" -dependencies = [ - "bitflags 2.8.0", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "tap" version = "1.0.1" @@ -7048,16 +6365,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.17.1" +version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230" +checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" dependencies = [ - "cfg-if", "fastrand", - "getrandom 0.3.1", + "getrandom 0.3.3", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys", ] [[package]] @@ -7087,7 +6403,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -7098,7 +6414,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", "test-case-core", ] @@ -7113,11 +6429,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" dependencies = [ - "thiserror-impl 2.0.11", + "thiserror-impl 2.0.12", ] [[package]] @@ -7128,28 +6444,27 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "thiserror-impl" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "thread_local" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" dependencies = [ "cfg-if", - "once_cell", ] [[package]] @@ -7183,9 +6498,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.37" +version = "0.3.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" +checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" dependencies = [ "deranged", "itoa", @@ -7198,15 +6513,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" [[package]] name = "time-macros" -version = "0.2.19" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" +checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" dependencies = [ "num-conv", "time-core", @@ -7215,7 +6530,7 @@ dependencies = [ [[package]] name = "tiny-keccak" version = "2.0.2" -source = "git+https://github.com/scroll-tech/tiny-keccak?branch=scroll-patch-v2.0.2-openvm-v1.0.0-rc.1#bfab37175b16c645419e77a77ffb796b6e5459be" +source = "git+https://github.com/scroll-tech/tiny-keccak?branch=scroll-patch-v2.0.2-euclid-upgrade#acbfc077b8bc3516ee85e17c0b31949e8647fcc7" dependencies = [ "cfg-if", "crunchy", @@ -7223,9 +6538,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" dependencies = [ "displaydoc", "zerovec", @@ -7233,9 +6548,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8" +checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71" dependencies = [ "tinyvec_macros", ] @@ -7246,59 +6561,11 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -[[package]] -name = "tokio" -version = "1.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "pin-project-lite", - "socket2", - "windows-sys 0.52.0", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" -dependencies = [ - "rustls", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - [[package]] name = "toml" -version = "0.8.20" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" +checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" dependencies = [ "serde", "serde_spanned", @@ -7308,52 +6575,32 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.8" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.24" +version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" +checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.7.1", + "indexmap 2.9.0", "serde", "serde_spanned", "toml_datetime", + "toml_write", "winnow", ] [[package]] -name = "tower" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" -dependencies = [ - "futures-core", - "futures-util", - "pin-project-lite", - "sync_wrapper", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[package]] -name = "tower-service" -version = "0.3.3" +name = "toml_write" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" +checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" [[package]] name = "tracing" @@ -7380,20 +6627,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.28" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" +checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] name = "tracing-core" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" +checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" dependencies = [ "once_cell", "valuable", @@ -7487,12 +6734,6 @@ dependencies = [ "strength_reduce", ] -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - [[package]] name = "typenum" version = "1.18.0" @@ -7525,9 +6766,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-ident" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "unicode-segmentation" @@ -7551,12 +6792,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - [[package]] name = "url" version = "2.5.4" @@ -7568,12 +6803,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - [[package]] name = "utf8_iter" version = "1.0.4" @@ -7588,9 +6817,13 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.15.1" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587" +checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d" +dependencies = [ + "js-sys", + "wasm-bindgen", +] [[package]] name = "valuable" @@ -7598,24 +6831,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vek" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8085882662f9bc47fc8b0cdafa5e19df8f592f650c02b9083da8d45ac9eebd17" -dependencies = [ - "approx", - "num-integer", - "num-traits", - "rustc_version 0.4.1", -] - [[package]] name = "version_check" version = "0.9.5" @@ -7644,26 +6859,17 @@ dependencies = [ "libc", ] -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasi" -version = "0.13.3+wasi-0.2.2" +version = "0.14.2+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" dependencies = [ "wit-bindgen-rt", ] @@ -7690,23 +6896,10 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" -dependencies = [ - "cfg-if", - "js-sys", - "once_cell", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "wasm-bindgen-macro" version = "0.2.100" @@ -7725,7 +6918,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7749,18 +6942,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - [[package]] name = "winapi" version = "0.3.9" @@ -7783,7 +6964,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys", ] [[package]] @@ -7799,28 +6980,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ "windows-core 0.57.0", - "windows-targets 0.52.6", + "windows-targets", ] [[package]] name = "windows-core" -version = "0.52.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" dependencies = [ - "windows-targets 0.52.6", + "windows-implement 0.57.0", + "windows-interface 0.57.0", + "windows-result 0.1.2", + "windows-targets", ] [[package]] name = "windows-core" -version = "0.57.0" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ - "windows-implement", - "windows-interface", - "windows-result 0.1.2", - "windows-targets 0.52.6", + "windows-implement 0.60.0", + "windows-interface 0.59.1", + "windows-link", + "windows-result 0.3.4", + "windows-strings", ] [[package]] @@ -7831,7 +7016,18 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", +] + +[[package]] +name = "windows-implement" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.103", ] [[package]] @@ -7842,25 +7038,25 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] -name = "windows-link" -version = "0.1.0" +name = "windows-interface" +version = "0.59.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.103", +] [[package]] -name = "windows-registry" -version = "0.4.0" +name = "windows-link" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" -dependencies = [ - "windows-result 0.3.1", - "windows-strings", - "windows-targets 0.53.0", -] +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" [[package]] name = "windows-result" @@ -7868,67 +7064,34 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] name = "windows-result" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06374efe858fab7e4f881500e6e86ec8bc28f9462c47e5a9941a0142ad86b189" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" dependencies = [ "windows-link", ] [[package]] name = "windows-strings" -version = "0.3.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" dependencies = [ "windows-link", ] -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - [[package]] name = "windows-sys" version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", + "windows-targets", ] [[package]] @@ -7937,199 +7100,87 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b" -dependencies = [ - "windows_aarch64_gnullvm 0.53.0", - "windows_aarch64_msvc 0.53.0", - "windows_i686_gnu 0.53.0", - "windows_i686_gnullvm 0.53.0", - "windows_i686_msvc 0.53.0", - "windows_x86_64_gnu 0.53.0", - "windows_x86_64_gnullvm 0.53.0", - "windows_x86_64_msvc 0.53.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -[[package]] -name = "windows_i686_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" - [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_i686_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" - [[package]] name = "winnow" -version = "0.7.3" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1" +checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd" dependencies = [ "memchr", ] [[package]] name = "wit-bindgen-rt" -version = "0.33.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" dependencies = [ - "bitflags 2.8.0", + "bitflags", ] -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" +checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" [[package]] name = "wyz" @@ -8142,9 +7193,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" dependencies = [ "serde", "stable_deref_trait", @@ -8154,35 +7205,34 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", "synstructure", ] [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" dependencies = [ - "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -8202,7 +7252,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", "synstructure", ] @@ -8223,14 +7273,25 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", +] + +[[package]] +name = "zerotrie" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", ] [[package]] name = "zerovec" -version = "0.10.4" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" dependencies = [ "yoke", "zerofrom", @@ -8239,13 +7300,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.103", ] [[package]] @@ -8267,7 +7328,7 @@ dependencies = [ "jubjub", "lazy_static", "pasta_curves 0.5.1", - "rand", + "rand 0.8.5", "serde", "sha2", "sha3", diff --git a/common/libzkp/impl/Cargo.toml b/common/libzkp/impl/Cargo.toml index aeb74f4baa..717de0be7c 100644 --- a/common/libzkp/impl/Cargo.toml +++ b/common/libzkp/impl/Cargo.toml @@ -8,14 +8,13 @@ edition = "2021" crate-type = ["cdylib"] [patch.crates-io] -# patched add rkyv support & MSRV 1.77 -alloy-primitives = { git = "https://github.com/scroll-tech/alloy-core", branch = "v0.8.21" } +alloy-primitives = { git = "https://github.com/scroll-tech/alloy-core", branch = "v0.8.18-euclid-upgrade" } ruint = { git = "https://github.com/scroll-tech/uint.git", branch = "v1.12.3" } -tiny-keccak = { git = "https://github.com/scroll-tech/tiny-keccak", branch = "scroll-patch-v2.0.2-openvm-v1.0.0-rc.1" } +tiny-keccak = { git = "https://github.com/scroll-tech/tiny-keccak", branch = "scroll-patch-v2.0.2-euclid-upgrade" } [dependencies] -euclid_prover = { git = "https://github.com/scroll-tech/zkvm-prover.git", tag = "v0.4.2", package = "scroll-zkvm-prover" } -euclid_verifier = { git = "https://github.com/scroll-tech/zkvm-prover.git", tag = "v0.4.2", package = "scroll-zkvm-verifier" } +euclid_prover = { git = "https://github.com/scroll-tech/zkvm-prover.git", package = "scroll-zkvm-prover" } +euclid_verifier = { git = "https://github.com/scroll-tech/zkvm-prover.git", package = "scroll-zkvm-verifier" } base64 = "0.13.0" env_logger = "0.9.0" @@ -32,34 +31,34 @@ opt-level = 3 [profile.release] opt-level = 3 -[patch."https://github.com/openvm-org/stark-backend.git"] -openvm-stark-backend = { git = "ssh://git@github.com/scroll-tech/openvm-stark-gpu.git", branch = "main", features = ["gpu"] } -openvm-stark-sdk = { git = "ssh://git@github.com/scroll-tech/openvm-stark-gpu.git", branch = "main", features = ["gpu"] } +# [patch."https://github.com/openvm-org/stark-backend.git"] +# openvm-stark-backend = { git = "ssh://git@github.com/scroll-tech/openvm-stark-gpu.git", branch = "main", features = ["gpu"] } +# openvm-stark-sdk = { git = "ssh://git@github.com/scroll-tech/openvm-stark-gpu.git", branch = "main", features = ["gpu"] } -[patch."https://github.com/Plonky3/Plonky3.git"] -p3-air = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-field = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-commit = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-matrix = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-baby-bear = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", features = [ - "nightly-features", -], tag = "v0.2.0" } -p3-koala-bear = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-util = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-challenger = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-dft = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-fri = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-goldilocks = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-keccak = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-keccak-air = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-blake3 = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-mds = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-merkle-tree = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-monty-31 = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-poseidon = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-poseidon2 = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-poseidon2-air = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-symmetric = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-uni-stark = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } -p3-maybe-rayon = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } # the "parallel" feature is NOT on by default to allow single-threaded benchmarking -p3-bn254-fr = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# [patch."https://github.com/Plonky3/Plonky3.git"] +# p3-air = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-field = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-commit = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-matrix = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-baby-bear = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", features = [ +# "nightly-features", +# ], tag = "v0.2.0" } +# p3-koala-bear = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-util = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-challenger = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-dft = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-fri = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-goldilocks = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-keccak = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-keccak-air = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-blake3 = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-mds = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-merkle-tree = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-monty-31 = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-poseidon = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-poseidon2 = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-poseidon2-air = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-symmetric = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-uni-stark = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } +# p3-maybe-rayon = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } # the "parallel" feature is NOT on by default to allow single-threaded benchmarking +# p3-bn254-fr = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } diff --git a/common/libzkp/impl/src/verifier/euclidv2.rs b/common/libzkp/impl/src/verifier/euclidv2.rs index 7f4cb9d433..8f188b6290 100644 --- a/common/libzkp/impl/src/verifier/euclidv2.rs +++ b/common/libzkp/impl/src/verifier/euclidv2.rs @@ -3,7 +3,7 @@ use super::{ProofVerifier, TaskType, VKDump}; use anyhow::Result; use crate::utils::panic_catch; -use euclid_prover::{BatchProof, BundleProof, ChunkProof}; +use euclid_prover::{BatchProof, BundleProof, ChunkProof, IntoEvmProof}; use euclid_verifier::verifier::{BatchVerifier, BundleVerifierEuclidV2, ChunkVerifier}; use std::{fs::File, path::Path}; @@ -46,7 +46,7 @@ impl ProofVerifier for EuclidV2Verifier { TaskType::Bundle => { let proof = serde_json::from_slice::(proof.as_slice()).unwrap(); self.bundle_verifier - .verify_proof_evm(&proof.proof.as_evm_proof().unwrap()) + .verify_proof_evm(&proof.into_evm_proof()) } }) .map_err(|err_str: String| anyhow::anyhow!(err_str)) From 3bb4ccf9e018662538664ae56c1bab2a2f5627e6 Mon Sep 17 00:00:00 2001 From: georgehao Date: Wed, 18 Jun 2025 02:58:37 +0000 Subject: [PATCH 09/11] =?UTF-8?q?chore:=20auto=20version=20bump=E2=80=89[b?= =?UTF-8?q?ot]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/version/version.go b/common/version/version.go index 3ab70685f6..1061e5cd0c 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -5,7 +5,7 @@ import ( "runtime/debug" ) -var tag = "v4.5.23" +var tag = "v4.5.24" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok { From 745a7d3455b3d69bd136ba8e723a250591d2738a Mon Sep 17 00:00:00 2001 From: Ho Date: Wed, 18 Jun 2025 13:40:48 +0900 Subject: [PATCH 10/11] fix more CI and update according to reviews --- coordinator/internal/controller/api/get_task.go | 4 ---- coordinator/internal/logic/provertask/bundle_prover_task.go | 2 ++ coordinator/internal/logic/provertask/prover_task.go | 1 - database/migrate/migrate_test.go | 6 +++--- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/coordinator/internal/controller/api/get_task.go b/coordinator/internal/controller/api/get_task.go index 1ed73340b0..a2e0290042 100644 --- a/coordinator/internal/controller/api/get_task.go +++ b/coordinator/internal/controller/api/get_task.go @@ -47,10 +47,6 @@ func NewGetTaskController(cfg *config.Config, chainCfg *params.ChainConfig, db * return ptc } -func (ptc *GetTaskController) ProverTasks() map[message.ProofType]provertask.ProverTask { - return ptc.proverTasks -} - func (ptc *GetTaskController) incGetTaskAccessCounter(ctx *gin.Context) error { publicKey, publicKeyExist := ctx.Get(coordinatorType.PublicKey) if !publicKeyExist { diff --git a/coordinator/internal/logic/provertask/bundle_prover_task.go b/coordinator/internal/logic/provertask/bundle_prover_task.go index b58b6035bb..99090e98b6 100644 --- a/coordinator/internal/logic/provertask/bundle_prover_task.go +++ b/coordinator/internal/logic/provertask/bundle_prover_task.go @@ -173,6 +173,8 @@ func (bp *BundleProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinat log.Error("Generate universal prover task failure", "task_id", bundleTask.Hash, "type", "bundle") return nil, ErrCoordinatorInternalFailure } + // bundle proof require snark + taskMsg.UseSnark = true proverTask.Metadata = metadata } diff --git a/coordinator/internal/logic/provertask/prover_task.go b/coordinator/internal/logic/provertask/prover_task.go index 75175dfbf8..91bc526ac1 100644 --- a/coordinator/internal/logic/provertask/prover_task.go +++ b/coordinator/internal/logic/provertask/prover_task.go @@ -187,7 +187,6 @@ func (b *BaseProverTask) checkParameter(ctx *gin.Context) (*proverTaskContext, e } func (b *BaseProverTask) applyUniversal(schema *coordinatorType.GetTaskSchema) (*coordinatorType.GetTaskSchema, []byte, error) { - ok, uTaskData, metadata, _ := libzkp.GenerateUniversalTask(schema.TaskType, schema.TaskData, schema.HardForkName) if !ok { return nil, nil, fmt.Errorf("can not generate universal task, see coordinator log for the reason") diff --git a/database/migrate/migrate_test.go b/database/migrate/migrate_test.go index 8ab457bc48..90cc005c8d 100644 --- a/database/migrate/migrate_test.go +++ b/database/migrate/migrate_test.go @@ -59,20 +59,20 @@ func testResetDB(t *testing.T) { cur, err := Current(pgDB) assert.NoError(t, err) // total number of tables. - assert.Equal(t, int64(27), cur) + assert.Equal(t, int64(28), cur) } func testMigrate(t *testing.T) { assert.NoError(t, Migrate(pgDB)) cur, err := Current(pgDB) assert.NoError(t, err) - assert.Equal(t, int64(27), cur) + assert.Equal(t, int64(28), cur) } func testRollback(t *testing.T) { version, err := Current(pgDB) assert.NoError(t, err) - assert.Equal(t, int64(27), version) + assert.Equal(t, int64(28), version) assert.NoError(t, Rollback(pgDB, nil)) From d844890ca8e9464ab87b5edfaf1ba6cbb397fef3 Mon Sep 17 00:00:00 2001 From: Ho Date: Thu, 19 Jun 2025 10:30:38 +0900 Subject: [PATCH 11/11] resume log format --- coordinator/internal/logic/provertask/batch_prover_task.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coordinator/internal/logic/provertask/batch_prover_task.go b/coordinator/internal/logic/provertask/batch_prover_task.go index 772462b10a..e355abde44 100644 --- a/coordinator/internal/logic/provertask/batch_prover_task.go +++ b/coordinator/internal/logic/provertask/batch_prover_task.go @@ -214,7 +214,7 @@ func (bp *BatchProverTask) formatProverTask(ctx context.Context, task *orm.Prove for _, chunk := range chunks { var proof message.OpenVMChunkProof if encodeErr := json.Unmarshal(chunk.Proof, &proof); encodeErr != nil { - return nil, fmt.Errorf("Chunk.GetProofsByBatchHash unmarshal proof error: %w, batch hash: %v, chunk hash: %v, (%s)", encodeErr, task.TaskID, chunk.Hash, chunk.Proof) + return nil, fmt.Errorf("Chunk.GetProofsByBatchHash unmarshal proof error: %w, batch hash: %v, chunk hash: %v", encodeErr, task.TaskID, chunk.Hash) } chunkProofs = append(chunkProofs, &proof)