From e9c1f6f1a72bf763be16d65fd89e391bdb690d68 Mon Sep 17 00:00:00 2001 From: Filippo Costa Date: Tue, 16 Jan 2024 15:55:55 +0100 Subject: [PATCH 1/4] Upgrade sovereign-sdk dep hash Signed-off-by: Filippo Costa --- Cargo.lock | 46 +++++++++---------- Cargo.toml | 36 +++++++-------- .../provers/risc0/guest-celestia/Cargo.lock | 32 ++++++------- .../provers/risc0/guest-celestia/Cargo.toml | 12 ++--- crates/provers/risc0/guest-mock/Cargo.lock | 30 ++++++------ crates/provers/risc0/guest-mock/Cargo.toml | 12 ++--- 6 files changed, 84 insertions(+), 84 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ec1a04c..2d6f4e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3714,7 +3714,7 @@ dependencies = [ [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -3731,7 +3731,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -3748,7 +3748,7 @@ dependencies = [ [[package]] name = "sov-blob-storage" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "bincode", @@ -3769,7 +3769,7 @@ dependencies = [ [[package]] name = "sov-celestia-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "async-trait", @@ -3799,7 +3799,7 @@ dependencies = [ [[package]] name = "sov-chain-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -3813,7 +3813,7 @@ dependencies = [ [[package]] name = "sov-cli" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -3830,7 +3830,7 @@ dependencies = [ [[package]] name = "sov-db" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "bincode", @@ -3847,7 +3847,7 @@ dependencies = [ [[package]] name = "sov-ledger-rpc" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "futures", @@ -3860,7 +3860,7 @@ dependencies = [ [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "async-trait", @@ -3880,7 +3880,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "bech32", @@ -3907,7 +3907,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "bech32", @@ -3926,7 +3926,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -3942,7 +3942,7 @@ dependencies = [ [[package]] name = "sov-modules-rollup-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "async-trait", @@ -3965,7 +3965,7 @@ dependencies = [ [[package]] name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -3986,7 +3986,7 @@ dependencies = [ [[package]] name = "sov-prover-storage-manager" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "sov-db", @@ -3999,7 +3999,7 @@ dependencies = [ [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "bincode", @@ -4016,7 +4016,7 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "async-trait", @@ -4071,7 +4071,7 @@ dependencies = [ [[package]] name = "sov-schema-db" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "once_cell", @@ -4084,7 +4084,7 @@ dependencies = [ [[package]] name = "sov-sequencer" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -4100,7 +4100,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -4117,7 +4117,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "bcs", @@ -4136,7 +4136,7 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "async-trait", @@ -4159,7 +4159,7 @@ dependencies = [ [[package]] name = "sov-zk-cycle-utils" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "bytes", "risc0-zkvm", diff --git a/Cargo.toml b/Cargo.toml index b020815..0dfa7af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,24 +16,24 @@ publish = false rust-version = "1.73" [workspace.dependencies] -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-accounts = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-bank = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-ledger-rpc = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-sequencer-registry = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-modules-rollup-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-stf-runner = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-db = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-sequencer = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-first-read-last-write-cache = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-cli = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-celestia-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-prover-storage-manager = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } +sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-accounts = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-bank = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-ledger-rpc = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-sequencer-registry = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-modules-rollup-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-stf-runner = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-db = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-sequencer = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-first-read-last-write-cache = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-cli = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-celestia-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-prover-storage-manager = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } stf-starter = { path = "./crates/stf" } diff --git a/crates/provers/risc0/guest-celestia/Cargo.lock b/crates/provers/risc0/guest-celestia/Cargo.lock index ac85224..d4a198e 100644 --- a/crates/provers/risc0/guest-celestia/Cargo.lock +++ b/crates/provers/risc0/guest-celestia/Cargo.lock @@ -2005,7 +2005,7 @@ dependencies = [ [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -2018,7 +2018,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -2031,7 +2031,7 @@ dependencies = [ [[package]] name = "sov-blob-storage" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "bincode", @@ -2047,7 +2047,7 @@ dependencies = [ [[package]] name = "sov-celestia-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "async-trait", @@ -2071,7 +2071,7 @@ dependencies = [ [[package]] name = "sov-chain-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -2099,7 +2099,7 @@ dependencies = [ [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "async-trait", @@ -2115,7 +2115,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "bech32", @@ -2136,7 +2136,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "bech32", @@ -2155,7 +2155,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -2170,7 +2170,7 @@ dependencies = [ [[package]] name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -2190,7 +2190,7 @@ dependencies = [ [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "bincode", @@ -2205,7 +2205,7 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "async-trait", @@ -2222,7 +2222,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -2235,7 +2235,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "bcs", @@ -2253,7 +2253,7 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -2267,7 +2267,7 @@ dependencies = [ [[package]] name = "sov-zk-cycle-utils" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "bytes", "risc0-zkvm", diff --git a/crates/provers/risc0/guest-celestia/Cargo.toml b/crates/provers/risc0/guest-celestia/Cargo.toml index 648033c..f6f9e6c 100644 --- a/crates/provers/risc0/guest-celestia/Cargo.toml +++ b/crates/provers/risc0/guest-celestia/Cargo.toml @@ -13,12 +13,12 @@ risc0-zkvm-platform = "0.19" stf-starter = { path = "../../../stf" } -sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-celestia-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } +sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-celestia-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } [patch.crates-io] sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2/v0.10.6-risc0" } diff --git a/crates/provers/risc0/guest-mock/Cargo.lock b/crates/provers/risc0/guest-mock/Cargo.lock index 806d064..f153c97 100644 --- a/crates/provers/risc0/guest-mock/Cargo.lock +++ b/crates/provers/risc0/guest-mock/Cargo.lock @@ -993,7 +993,7 @@ checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -1006,7 +1006,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -1019,7 +1019,7 @@ dependencies = [ [[package]] name = "sov-blob-storage" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "bincode", @@ -1035,7 +1035,7 @@ dependencies = [ [[package]] name = "sov-chain-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -1047,7 +1047,7 @@ dependencies = [ [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "async-trait", @@ -1063,7 +1063,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "bech32", @@ -1084,7 +1084,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "bech32", @@ -1103,7 +1103,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -1118,7 +1118,7 @@ dependencies = [ [[package]] name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -1138,7 +1138,7 @@ dependencies = [ [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "bincode", @@ -1153,7 +1153,7 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "async-trait", @@ -1170,7 +1170,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -1183,7 +1183,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "bcs", @@ -1201,7 +1201,7 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "anyhow", "borsh", @@ -1215,7 +1215,7 @@ dependencies = [ [[package]] name = "sov-zk-cycle-utils" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8a234c0d1a6e2b45f5e2852d0846a97c6a00133#a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=13e4077c329ff14954b32e3180d43a6d86fa3172#13e4077c329ff14954b32e3180d43a6d86fa3172" dependencies = [ "bytes", "risc0-zkvm", diff --git a/crates/provers/risc0/guest-mock/Cargo.toml b/crates/provers/risc0/guest-mock/Cargo.toml index cc680da..9379e6b 100644 --- a/crates/provers/risc0/guest-mock/Cargo.toml +++ b/crates/provers/risc0/guest-mock/Cargo.toml @@ -14,12 +14,12 @@ risc0-zkvm-platform = "0.19" serde = { version = "1.0.188", features = ["derive", "rc"] } -sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8a234c0d1a6e2b45f5e2852d0846a97c6a00133" } +sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } +sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "13e4077c329ff14954b32e3180d43a6d86fa3172" } stf-starter = { path = "../../../stf" } From 99d6b537cd2f699bf0ddee2a615d8d77740964e7 Mon Sep 17 00:00:00 2001 From: Filippo Costa Date: Tue, 16 Jan 2024 15:57:54 +0100 Subject: [PATCH 2/4] Apply hotfixes --- crates/provers/risc0/guest-celestia/Cargo.toml | 6 ++++++ crates/provers/risc0/guest-mock/Cargo.toml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/crates/provers/risc0/guest-celestia/Cargo.toml b/crates/provers/risc0/guest-celestia/Cargo.toml index f6f9e6c..c9b6049 100644 --- a/crates/provers/risc0/guest-celestia/Cargo.toml +++ b/crates/provers/risc0/guest-celestia/Cargo.toml @@ -23,6 +23,12 @@ sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = [patch.crates-io] sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2/v0.10.6-risc0" } +# Uncomment to apply the v0.19 build script downlaod issue hotfix. +risc0-circuit-recursion = { git = "https://github.com/neysofu/risc0-hotfixes", rev = "v0.19.2-hotfix" } +risc0-zkvm = { git = "https://github.com/neysofu/risc0-hotfixes", rev = "v0.19.2-hotfix" } +risc0-zkvm-platform = { git = "https://github.com/neysofu/risc0-hotfixes", rev = "v0.19.2-hotfix" } +risc0-circuit-rv32im = { git = "https://github.com/neysofu/risc0-hotfixes", rev = "v0.19.2-hotfix" } + [profile.dev] opt-level = 3 diff --git a/crates/provers/risc0/guest-mock/Cargo.toml b/crates/provers/risc0/guest-mock/Cargo.toml index 9379e6b..82904b0 100644 --- a/crates/provers/risc0/guest-mock/Cargo.toml +++ b/crates/provers/risc0/guest-mock/Cargo.toml @@ -26,6 +26,12 @@ stf-starter = { path = "../../../stf" } [patch.crates-io] sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2/v0.10.6-risc0" } +# Uncomment to apply the v0.19 build script downlaod issue hotfix. +risc0-circuit-recursion = { git = "https://github.com/neysofu/risc0-hotfixes", rev = "v0.19.2-hotfix" } +risc0-zkvm = { git = "https://github.com/neysofu/risc0-hotfixes", rev = "v0.19.2-hotfix" } +risc0-zkvm-platform = { git = "https://github.com/neysofu/risc0-hotfixes", rev = "v0.19.2-hotfix" } +risc0-circuit-rv32im = { git = "https://github.com/neysofu/risc0-hotfixes", rev = "v0.19.2-hotfix" } + [profile.dev] opt-level = 3 From 3dd0f95f962ee5038990725c4e1c6d42538b43a3 Mon Sep 17 00:00:00 2001 From: Filippo Costa Date: Tue, 16 Jan 2024 16:00:08 +0100 Subject: [PATCH 3/4] Update Cargo.lock --- .../provers/risc0/guest-celestia/Cargo.lock | 21 +++++++------------ crates/provers/risc0/guest-mock/Cargo.lock | 21 +++++++------------ 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/crates/provers/risc0/guest-celestia/Cargo.lock b/crates/provers/risc0/guest-celestia/Cargo.lock index d4a198e..f49f811 100644 --- a/crates/provers/risc0/guest-celestia/Cargo.lock +++ b/crates/provers/risc0/guest-celestia/Cargo.lock @@ -1626,8 +1626,7 @@ dependencies = [ [[package]] name = "risc0-binfmt" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923c85a23cb9a9475b8cd4479ad3a06252604a361626e9ae7dc0dc635af22c22" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "anyhow", "elf", @@ -1640,8 +1639,7 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97547e10e9fdaaab8b64ffb45dc158b31f023b1a68015c6ce9f12fe3e403012a" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "anyhow", "bytemuck", @@ -1654,8 +1652,7 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a269d01b18cba24ee1a08f68726fc3623e8705ed79d158377d12e9129dcde2e" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "anyhow", "log", @@ -1668,8 +1665,7 @@ dependencies = [ [[package]] name = "risc0-core" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "477e0bb8d2ec0b7955088b521eb596901e652d0faa2ea73bda0b77e05af5c07d" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "bytemuck", "rand_core", @@ -1678,8 +1674,7 @@ dependencies = [ [[package]] name = "risc0-zkp" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5abb1a0cf847d3f9aed1e563b76c358107e7ba66dbfab28f7144252c990bd82" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "anyhow", "blake2", @@ -1699,8 +1694,7 @@ dependencies = [ [[package]] name = "risc0-zkvm" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf80df202c038efc2199be34fda8114b38bfc5b2b51c60cbbdf1f425b07b384" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "anyhow", "bytemuck", @@ -1725,8 +1719,7 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dcd6b66f7a4972001db0acf3f06d99b7851c8d9f0de1f7e0fb4496c66c5cd02" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "bytemuck", "getrandom", diff --git a/crates/provers/risc0/guest-mock/Cargo.lock b/crates/provers/risc0/guest-mock/Cargo.lock index f153c97..83d8879 100644 --- a/crates/provers/risc0/guest-mock/Cargo.lock +++ b/crates/provers/risc0/guest-mock/Cargo.lock @@ -735,8 +735,7 @@ dependencies = [ [[package]] name = "risc0-binfmt" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923c85a23cb9a9475b8cd4479ad3a06252604a361626e9ae7dc0dc635af22c22" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "anyhow", "elf", @@ -749,8 +748,7 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97547e10e9fdaaab8b64ffb45dc158b31f023b1a68015c6ce9f12fe3e403012a" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "anyhow", "bytemuck", @@ -763,8 +761,7 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a269d01b18cba24ee1a08f68726fc3623e8705ed79d158377d12e9129dcde2e" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "anyhow", "log", @@ -777,8 +774,7 @@ dependencies = [ [[package]] name = "risc0-core" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "477e0bb8d2ec0b7955088b521eb596901e652d0faa2ea73bda0b77e05af5c07d" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "bytemuck", "rand_core", @@ -787,8 +783,7 @@ dependencies = [ [[package]] name = "risc0-zkp" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5abb1a0cf847d3f9aed1e563b76c358107e7ba66dbfab28f7144252c990bd82" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "anyhow", "blake2", @@ -808,8 +803,7 @@ dependencies = [ [[package]] name = "risc0-zkvm" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf80df202c038efc2199be34fda8114b38bfc5b2b51c60cbbdf1f425b07b384" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "anyhow", "bytemuck", @@ -834,8 +828,7 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dcd6b66f7a4972001db0acf3f06d99b7851c8d9f0de1f7e0fb4496c66c5cd02" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "bytemuck", "getrandom", From 3b6ef031c551549b6381273fe185d942a5e5f544 Mon Sep 17 00:00:00 2001 From: Filippo Costa Date: Tue, 16 Jan 2024 16:10:02 +0100 Subject: [PATCH 4/4] Apply hotfix to workspace root as well --- Cargo.lock | 97 ++++++++++++++++++++++++++++++++++++------------------ Cargo.toml | 7 ++++ 2 files changed, 72 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2d6f4e1..09750a7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -459,8 +459,7 @@ dependencies = [ [[package]] name = "bonsai-sdk" version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "441d1092e11977985946b6564251df91d80ae36982128e53be52a32548ad8762" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "reqwest", "serde", @@ -3011,7 +3010,20 @@ dependencies = [ "anyhow", "elf", "log", - "risc0-zkp", + "risc0-zkp 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)", + "risc0-zkvm-platform", + "serde", +] + +[[package]] +name = "risc0-binfmt" +version = "0.19.1" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" +dependencies = [ + "anyhow", + "elf", + "log", + "risc0-zkp 0.19.1 (git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix)", "risc0-zkvm-platform", "serde", ] @@ -3025,8 +3037,8 @@ dependencies = [ "anyhow", "cargo_metadata", "docker-generate", - "risc0-binfmt", - "risc0-zkp", + "risc0-binfmt 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)", + "risc0-zkp 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)", "risc0-zkvm-platform", "serde", "serde_json", @@ -3036,8 +3048,7 @@ dependencies = [ [[package]] name = "risc0-build-kernel" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9061315fc75f1e8573e1aaca32b856b01a325f756c8482a63547b796cfbe7940" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "cc", "directories", @@ -3049,8 +3060,7 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97547e10e9fdaaab8b64ffb45dc158b31f023b1a68015c6ce9f12fe3e403012a" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "anyhow", "bytemuck", @@ -3059,8 +3069,8 @@ dependencies = [ "rand", "rayon", "risc0-circuit-recursion-sys", - "risc0-core", - "risc0-zkp", + "risc0-core 0.19.1 (git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix)", + "risc0-zkp 0.19.1 (git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix)", "sha2 0.10.8", "tracing", "zip", @@ -3069,27 +3079,25 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion-sys" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c61bb8d8021f0a96bae24b305ea64169d6f36637bb2717ae24de77abfc30760" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "glob", "risc0-build-kernel", - "risc0-core", + "risc0-core 0.19.1 (git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix)", ] [[package]] name = "risc0-circuit-rv32im" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a269d01b18cba24ee1a08f68726fc3623e8705ed79d158377d12e9129dcde2e" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "anyhow", "log", "rand", "rayon", "risc0-circuit-rv32im-sys", - "risc0-core", - "risc0-zkp", + "risc0-core 0.19.1 (git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix)", + "risc0-zkp 0.19.1 (git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix)", "risc0-zkvm-platform", "tracing", ] @@ -3097,12 +3105,11 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im-sys" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "344208fab2ea159915c4c747aca9037c74e3cc4b10692389aa1f8d712e3b552d" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "glob", "risc0-build-kernel", - "risc0-core", + "risc0-core 0.19.1 (git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix)", ] [[package]] @@ -3115,6 +3122,15 @@ dependencies = [ "rand_core", ] +[[package]] +name = "risc0-core" +version = "0.19.1" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" +dependencies = [ + "bytemuck", + "rand_core", +] + [[package]] name = "risc0-starter" version = "0.3.0" @@ -3125,8 +3141,7 @@ dependencies = [ [[package]] name = "risc0-sys" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a0523c55e53a860f4a8fb3d2ca7c2bf3ce4b8aa3feddb42d08648bdcc458ac" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "risc0-build-kernel", ] @@ -3136,6 +3151,26 @@ name = "risc0-zkp" version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5abb1a0cf847d3f9aed1e563b76c358107e7ba66dbfab28f7144252c990bd82" +dependencies = [ + "anyhow", + "blake2", + "bytemuck", + "digest 0.10.7", + "hex", + "log", + "paste", + "rand_core", + "risc0-core 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)", + "risc0-zkvm-platform", + "serde", + "sha2 0.10.8", + "tracing", +] + +[[package]] +name = "risc0-zkp" +version = "0.19.1" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "anyhow", "blake2", @@ -3150,7 +3185,7 @@ dependencies = [ "rand", "rand_core", "rayon", - "risc0-core", + "risc0-core 0.19.1 (git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix)", "risc0-sys", "risc0-zkvm-platform", "serde", @@ -3161,8 +3196,7 @@ dependencies = [ [[package]] name = "risc0-zkvm" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf80df202c038efc2199be34fda8114b38bfc5b2b51c60cbbdf1f425b07b384" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "addr2line", "anyhow", @@ -3183,11 +3217,11 @@ dependencies = [ "prost-build", "protobuf-src", "rayon", - "risc0-binfmt", + "risc0-binfmt 0.19.1 (git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix)", "risc0-circuit-recursion", "risc0-circuit-rv32im", - "risc0-core", - "risc0-zkp", + "risc0-core 0.19.1 (git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix)", + "risc0-zkp 0.19.1 (git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix)", "risc0-zkvm-platform", "rrs-lib", "semver 1.0.21", @@ -3201,8 +3235,7 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dcd6b66f7a4972001db0acf3f06d99b7851c8d9f0de1f7e0fb4496c66c5cd02" +source = "git+https://github.com/neysofu/risc0-hotfixes?rev=v0.19.2-hotfix#d091294b5cf7eebb8aafb115b22f9531259afc71" dependencies = [ "bytemuck", "getrandom", @@ -4005,7 +4038,7 @@ dependencies = [ "bincode", "bytemuck", "risc0-circuit-rv32im", - "risc0-zkp", + "risc0-zkp 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)", "risc0-zkvm", "risc0-zkvm-platform", "serde", diff --git a/Cargo.toml b/Cargo.toml index 0dfa7af..ca736c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,3 +51,10 @@ tempfile = "3.5" jsonrpsee = { version = "0.20.1", features = ["jsonrpsee-types"] } risc0-build = "0.19" + +[patch.crates-io] +# To apply the v0.19 build script downlaod issue hotfix. +risc0-circuit-recursion = { git = "https://github.com/neysofu/risc0-hotfixes", rev = "v0.19.2-hotfix" } +risc0-zkvm = { git = "https://github.com/neysofu/risc0-hotfixes", rev = "v0.19.2-hotfix" } +risc0-zkvm-platform = { git = "https://github.com/neysofu/risc0-hotfixes", rev = "v0.19.2-hotfix" } +risc0-circuit-rv32im = { git = "https://github.com/neysofu/risc0-hotfixes", rev = "v0.19.2-hotfix" }