feat: patch sha2 0.9.9 and bump tendermint (#41)

ratankaliani · web-flow · commit ab08be423aec · 2025-01-09T13:05:26.000-08:00
* feat: patch v4 correctly

* fix

* add

* add

* fix

* add

* fix

* fix
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,10 +1,43 @@
 [workspace]
-members = ["primitives", "script", "program"]
+members = [
+    "primitives",
+    "script",
+    "program",
+]
 resolver = "2"
 
 [workspace.dependencies]
-alloy = { version = "0.8", default-features = false }
+# sp1-blobstream
+sp1-blobstream-primitives = { path = "primitives" }
+
+alloy = { version = "0.9", default-features = false }
+tendermint = { version = "0.40.1", default-features = false }
+tendermint-light-client-verifier = { version = "0.40.1", default-features = false, features = [
+    "rust-crypto",
+] }
+
+reqwest = { version = "0.11", features = ["json"] }
+tokio = { version = "^1.38.0", features = ["full"] }
+serde = { version = "1.0", default-features = false, features = ["derive"] }
+serde_cbor = "0.11.2"
+dotenv = "0.15.0"
+subtle-encoding = "0.5.1"
+anyhow = "1.0.82"
+clap = { version = "4.0", features = ["derive", "env"] }
+log = "0.4.21"
+hex = "0.4.3"
+futures = "0.3.30"
+env_logger = "0.11.3"
+serde_json = "1"
+chrono = "0.4.38"
+csv = "1.3.1"
+sha2 = "0.10"
+
+# sp1
+sp1-sdk = "4.0.0-rc.9"
+sp1-zkvm = "4.0.0-rc.9"
 
 [patch.crates-io]
-sha2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", tag = "patch-sha2-0.10.8-sp1-4.0.0-rc.3" }
+sha2-v0-9-9 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", tag = "patch-sha2-0.9.9-sp1-4.0.0-rc.3" }
+sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", tag = "patch-sha2-0.10.8-sp1-4.0.0-rc.3" }
 curve25519-dalek-ng = { git = "https://github.com/sp1-patches/curve25519-dalek-ng", tag = "patch-4.1.1-sp1-4.0.0-rc.3" }
diff --git a/book/reproducible-builds.md b/book/reproducible-builds.md
@@ -6,7 +6,7 @@ When deploying SP1 Blobstream in production, it's important to ensure that the p
 
 ## Prerequisites
 
-You first need to install the [cargo prove](https://docs.succinct.xyz/getting-started/install.html#option-1-prebuilt-binaries-recommended) toolchain.
+You first need to install the [cargo prove](https://docs.succinct.xyz/docs/getting-started/install.html#option-1-prebuilt-binaries-recommended) toolchain.
 
 Ensure that you have the latest version of the toolchain by running:
 
diff --git a/contracts/script/UpdateVkey.s.sol b/contracts/script/UpdateVkey.s.sol
@@ -24,6 +24,6 @@ contract UpdateVkeyScript is BaseScript {
         SP1Blobstream sp1Blobstream = SP1Blobstream(address(existingProxyAddress));
 
         // v4 program vkey
-        sp1Blobstream.updateProgramVkey(0x00a4a07806c0cb9bc8fcc14fed368a161b947d13b4a4fd58eb382d07a3373ef7);
+        sp1Blobstream.updateProgramVkey(0x00e30cadab0b8ad6a5f115c5131a14afce4ec4bbf8acf7c821951778a2d97660);
     }
 }
diff --git a/elf/blobstream-elf b/elf/blobstream-elf
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
@@ -1,14 +1,10 @@
 [package]
-name = "primitives"
+name = "sp1-blobstream-primitives"
 version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-alloy = { version = "0.7.0", default-features = false, features = [
-    "sol-types",
-] }
-tendermint = { version = "0.35.0", default-features = false }
-tendermint-light-client-verifier = { version = "0.35.0", default-features = false, features = [
-    "rust-crypto",
-] }
-serde = { version = "1.0", default-features = false, features = ["derive"] }
+alloy = { workspace = true, default-features = false, features = ["sol-types"] }
+tendermint = { workspace = true, default-features = false }
+tendermint-light-client-verifier = { workspace = true, default-features = false, features = ["rust-crypto"] }
+serde = { workspace = true, default-features = false, features = ["derive"] }
diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs
@@ -1,5 +1,4 @@
 use std::time::Duration;
-
 use tendermint_light_client_verifier::{
     options::Options,
     types::{LightBlock, TrustThreshold},
diff --git a/program/Cargo.toml b/program/Cargo.toml
@@ -1,15 +1,13 @@
 [package]
 version = "0.1.0"
-name = "blobstream-program"
+name = "sp1-blobstream-program"
 edition = "2021"
 
 [dependencies]
-primitives = { path = "../primitives" }
-sp1-zkvm = "4.0.0-rc.8"
-tendermint-light-client-verifier = { version = "0.35.0", default-features = false, features = [
-    "rust-crypto",
-] }
-tendermint = "0.35.0"
-sha2 = "0.10"
-serde_cbor = "0.11.2"
-alloy = { workspace = true, features = ["sol-types"] }
+sp1-blobstream-primitives = { workspace = true }
+sp1-zkvm = { workspace = true }
+tendermint-light-client-verifier = { workspace = true, default-features = false, features = ["rust-crypto"] }
+tendermint = { workspace = true, default-features = false }
+sha2 = { workspace = true }
+serde_cbor = { workspace = true }
+alloy = { workspace = true, default-features = false, features = ["sol-types"] }
diff --git a/program/src/main.rs b/program/src/main.rs
@@ -1,19 +1,15 @@
 #![no_main]
 sp1_zkvm::entrypoint!(main);
 
-use alloy::primitives::B256;
-use alloy::primitives::U256;
-use alloy::sol;
-use alloy::sol_types::SolType;
-use primitives::get_header_update_verdict;
-use primitives::types::ProofInputs;
-use primitives::types::ProofOutputs;
+use alloy::{primitives::B256, primitives::U256, sol, sol_types::SolType};
 use sha2::Sha256;
-use std::collections::HashSet;
-use std::ops::Add;
+use sp1_blobstream_primitives::{
+    get_header_update_verdict,
+    types::{ProofInputs, ProofOutputs},
+};
+use std::{collections::HashSet, ops::Add};
 use tendermint::{block::Header, merkle::simple_hash_from_byte_vectors};
-use tendermint_light_client_verifier::types::LightBlock;
-use tendermint_light_client_verifier::Verdict;
+use tendermint_light_client_verifier::{types::LightBlock, Verdict};
 type DataRootTuple = sol! {
     tuple(uint64, bytes32)
 };
diff --git a/script/Cargo.toml b/script/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 version = "0.1.0"
-name = "blobstream-script"
+name = "sp1-blobstream-script"
 edition = "2021"
 
 [[bin]]
@@ -24,27 +24,28 @@ name = "costs"
 path = "bin/costs.rs"
 
 [dependencies]
-primitives = { path = "../primitives" }
-sp1-sdk = "4.0.0-rc.8"
-reqwest = { version = "0.11", features = ["json"] }
-tokio = { version = "^1.38.0", features = ["full"] }
-serde = { version = "1.0", default-features = false, features = ["derive"] }
-tendermint = { version = "0.35.0", default-features = false }
-tendermint-light-client-verifier = { version = "0.35.0", default-features = false, features = [
+sp1-blobstream-primitives = { workspace = true }
+alloy = { workspace = true, default-features = true, features = ["full"] }
+tendermint = { workspace = true }
+tendermint-light-client-verifier = { workspace = true, features = [
     "rust-crypto",
 ] }
-alloy = { workspace = true, default-features = true, features = ["full"] }
-serde_cbor = "0.11.2"
-dotenv = "0.15.0"
-subtle-encoding = "0.5.1"
-anyhow = "1.0.82"
-clap = { version = "4.0", features = ["derive", "env"] }
-log = "0.4.21"
-hex = "0.4.3"
-futures = "0.3.30"
-env_logger = "0.11.3"
-serde_json = "1"
-chrono = "0.4.38"
-csv = "1.3.1"
+sp1-sdk = { workspace = true }
+reqwest = { workspace = true }
+tokio = { workspace = true }
+serde = { workspace = true }
+serde_cbor = { workspace = true }
+dotenv = { workspace = true }
+subtle-encoding = { workspace = true }
+anyhow = { workspace = true }
+clap = { workspace = true }
+log = { workspace = true }
+hex = { workspace = true }
+futures = { workspace = true }
+env_logger = { workspace = true }
+serde_json = { workspace = true }
+chrono = { workspace = true }
+csv = { workspace = true }
+
 [build-dependencies]
 sp1-build = "4.0.0-rc.8"
diff --git a/script/bin/costs.rs b/script/bin/costs.rs
@@ -1,24 +1,20 @@
-use alloy::eips::BlockId;
-use alloy::network::primitives::HeaderResponse;
-use alloy::rpc::types::{BlockTransactionsKind, Filter};
-use alloy::sol;
-use alloy::sol_types::SolEvent;
 use alloy::{
     consensus::BlockHeader,
-    network::BlockResponse,
+    eips::BlockId,
+    network::{primitives::HeaderResponse, BlockResponse},
     primitives::{Address, B256},
     providers::{Network, Provider, ProviderBuilder},
+    rpc::types::{BlockTransactionsKind, Filter},
+    sol,
+    sol_types::SolEvent,
     transports::Transport,
 };
 use anyhow::Result;
 use chrono::{TimeZone, Utc};
 use clap::Parser;
 use futures::StreamExt;
 use reqwest::Url;
-use std::cmp::Ordering;
-use std::collections::HashMap;
-use std::str::FromStr;
-use std::{env, fs};
+use std::{cmp::Ordering, collections::HashMap, env, fs, str::FromStr};
 
 #[derive(Parser, Debug, Clone)]
 #[command(about = "Get transaction costs for an address in a given month")]
@@ -146,7 +142,7 @@ async fn get_receipts_for_chain(
         .map(|receipt| RelayTransaction {
             chain_id,
             tx_hash: receipt.transaction_hash,
-            tx_fee_wei: receipt.gas_used * receipt.effective_gas_price,
+            tx_fee_wei: receipt.gas_used as u128 * receipt.effective_gas_price,
             from: receipt.from,
             to: receipt.to.unwrap_or_default(),
         })
diff --git a/script/bin/genesis.rs b/script/bin/genesis.rs
@@ -7,12 +7,11 @@
 //!
 //!
 
-use std::env;
-
-use blobstream_script::util::TendermintRPCClient;
 use clap::Parser;
 use log::info;
+use sp1_blobstream_script::util::TendermintRPCClient;
 use sp1_sdk::{HashableKey, Prover, ProverClient};
+use std::env;
 const BLOBSTREAMX_ELF: &[u8] = include_bytes!("../../elf/blobstream-elf");
 
 #[derive(Parser, Debug, Clone)]
diff --git a/script/bin/operator.rs b/script/bin/operator.rs
@@ -6,11 +6,11 @@ use alloy::{
     sol,
 };
 use anyhow::Result;
-use blobstream_script::util::TendermintRPCClient;
-use blobstream_script::{relay, TENDERMINT_ELF};
 use log::{error, info};
-use primitives::get_header_update_verdict;
 use reqwest::Url;
+use sp1_blobstream_primitives::get_header_update_verdict;
+use sp1_blobstream_script::util::TendermintRPCClient;
+use sp1_blobstream_script::{relay, TENDERMINT_ELF};
 use sp1_sdk::{
     network::FulfillmentStrategy, HashableKey, ProverClient, SP1ProofWithPublicValues,
     SP1ProvingKey, SP1Stdin, SP1VerifyingKey,
diff --git a/script/bin/test.rs b/script/bin/test.rs
@@ -1,6 +1,6 @@
-use blobstream_script::{util::TendermintRPCClient, TENDERMINT_ELF};
 use clap::Parser;
 use log::debug;
+use sp1_blobstream_script::{util::TendermintRPCClient, TENDERMINT_ELF};
 use sp1_sdk::{ProverClient, SP1Stdin};
 use tokio::runtime;
 
diff --git a/script/src/relay.rs b/script/src/relay.rs
@@ -1,11 +1,8 @@
-use std::env;
-use std::str::FromStr;
-use std::time::Duration;
-
 use alloy::primitives::B256;
 use anyhow::Result;
 use log::info;
 use serde::{Deserialize, Serialize};
+use std::{env, str::FromStr, time::Duration};
 
 #[derive(Serialize, Deserialize)]
 pub enum KMSRelayStatus {
diff --git a/script/src/util.rs b/script/src/util.rs
@@ -2,8 +2,8 @@
 use crate::types::*;
 use alloy::primitives::B256;
 use log::debug;
-use primitives::types::ProofInputs;
 use reqwest::Client;
+use sp1_blobstream_primitives::types::ProofInputs;
 use std::sync::Arc;
 use std::{collections::HashMap, env, error::Error};
 use subtle_encoding::hex;

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ contract UpdateVkeyScript is BaseScript {`
`24`	`24`	`SP1Blobstream sp1Blobstream = SP1Blobstream(address(existingProxyAddress));`
`25`	`25`
`26`	`26`	`// v4 program vkey`
`27`		`- sp1Blobstream.updateProgramVkey(0x00a4a07806c0cb9bc8fcc14fed368a161b947d13b4a4fd58eb382d07a3373ef7);`
	`27`	`+ sp1Blobstream.updateProgramVkey(0x00e30cadab0b8ad6a5f115c5131a14afce4ec4bbf8acf7c821951778a2d97660);`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`use std::time::Duration;`
`2`		`-`
`3`	`2`	`use tendermint_light_client_verifier::{`
`4`	`3`	`options::Options,`
`5`	`4`	`types::{LightBlock, TrustThreshold},`