diff --git a/Cargo.lock b/Cargo.lock index f06a07b7..a6b44634 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3430,6 +3430,17 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69dde51e8fef5e12c1d65e0929b03d66e4c0c18282bc30ed2ca050ad6f44dd82" +[[package]] +name = "dlmalloc" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f5b01c17f85ee988d832c40e549a64bd89ab2c9f8d8a613bdf5122ae507e294" +dependencies = [ + "cfg-if", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "docker-generate" version = "0.1.3" @@ -13307,6 +13318,15 @@ dependencies = [ "windows 0.62.0", ] +[[package]] +name = "talc" +version = "4.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ae828aa394de34c7de08f522d1b86bd1c182c668d27da69caadda00590f26d" +dependencies = [ + "lock_api", +] + [[package]] name = "tap" version = "1.0.1" @@ -15682,7 +15702,10 @@ dependencies = [ "bincode 1.3.3", "bytes", "cfg-if", + "critical-section", "ctor 0.2.9", + "dlmalloc", + "embedded-alloc", "fields 0.16.0 (git+https://github.com/0xPolygonHermez/pil2-proofman.git?branch=pre-develop-0.16.0)", "getrandom 0.2.16", "lazy_static", @@ -15696,6 +15719,7 @@ dependencies = [ "rand 0.8.5", "serde", "sha2", + "talc", "tiny-keccak", "tokio", "zisk-common", diff --git a/Cargo.toml b/Cargo.toml index 1ccfb996..c9ad90c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -124,9 +124,8 @@ sp1-sdk = "6.0.1" sp1-p3-field = { version = "0.3.2-succinct", package = "p3-field" } sp1-zkvm = { version = "6.0.1", default-features = false } - # ZisK dependencies -ziskos = { git = "https://github.com/han0110/zisk.git", branch = "patch/v0.16.0" } +ziskos = { git = "https://github.com/han0110/zisk.git", branch = "patch/v0.16.0", default-features = false } zisk-rom-setup = { git = "https://github.com/han0110/zisk.git", branch = "patch/v0.16.0", package = "rom-setup" } zisk-sdk = { git = "https://github.com/han0110/zisk.git", branch = "patch/v0.16.0" } zisk-core = { git = "https://github.com/han0110/zisk.git", branch = "patch/v0.16.0" } diff --git a/crates/zkvm/zisk/platform/Cargo.toml b/crates/zkvm/zisk/platform/Cargo.toml index 0400dc50..82473afc 100644 --- a/crates/zkvm/zisk/platform/Cargo.toml +++ b/crates/zkvm/zisk/platform/Cargo.toml @@ -16,7 +16,14 @@ fnv.workspace = true ere-platform-trait.workspace = true [features] -default = [] +default = ["user-hints", "inputcpy"] +user-hints = ["ziskos/user-hints"] +inputcpy = ["ziskos/inputcpy"] +zisk-custom-alloc = ["ziskos/zisk-custom-alloc"] +zisk-embedded-alloc = ["ziskos/zisk-embedded-alloc"] +zisk-embedded-dlmalloc-alloc = ["ziskos/zisk-embedded-dlmalloc-alloc"] +zisk-embedded-talc-alloc = ["ziskos/zisk-embedded-talc-alloc"] +zisk-embedded-tlfs-alloc = ["ziskos/zisk-embedded-tlfs-alloc"] check-cycle-scope = [] [lints]