From 12373c67ad9b61699fab9adf83dab39f2bb41488 Mon Sep 17 00:00:00 2001
From: Xavier D'Mello <xaviermdmello@gmail.com>
Date: Mon, 19 Aug 2024 17:12:04 -0700
Subject: [PATCH] revert

---
 Cargo.lock | 71 +++++++++++++++++++++++++++++++++++-------------------
 Cargo.toml |  7 +++++-
 2 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5fc98b63..e86e1022 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -489,6 +489,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -573,6 +582,22 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "bls12_381"
+version = "0.8.0"
+source = "git+https://github.com/succinctlabs/bls12_381#0d32fdeb01fe829dd47169c79519bb2e5c0bde7f"
+dependencies = [
+ "digest 0.9.0",
+ "eyre",
+ "ff",
+ "group",
+ "pairing",
+ "rand_core 0.6.4",
+ "sha2 0.9.9",
+ "sp1-lib",
+ "subtle",
+]
+
 [[package]]
 name = "blst"
 version = "0.3.12"
@@ -940,13 +965,13 @@ checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 name = "common"
 version = "0.5.5"
 dependencies = [
+ "bls12_381 0.8.0 (git+https://github.com/succinctlabs/bls12_381)",
  "bytes",
  "ethers-core",
  "eyre",
  "hex",
  "serde",
  "serde_json",
- "snowbridge-milagro-bls",
  "ssz_rs",
  "superstruct",
  "thiserror",
@@ -981,6 +1006,7 @@ name = "consensus"
 version = "0.5.5"
 dependencies = [
  "async-trait",
+ "bls12_381 0.8.0 (git+https://github.com/succinctlabs/bls12_381)",
  "bytes",
  "chrono",
  "common",
@@ -997,7 +1023,6 @@ dependencies = [
  "retri",
  "serde",
  "serde_json",
- "snowbridge-milagro-bls",
  "ssz_rs",
  "superstruct",
  "thiserror",
@@ -1011,6 +1036,7 @@ dependencies = [
 name = "consensus-core"
 version = "0.1.0"
 dependencies = [
+ "bls12_381 0.8.0 (git+https://github.com/succinctlabs/bls12_381)",
  "bytes",
  "common",
  "ethers-core",
@@ -1018,7 +1044,6 @@ dependencies = [
  "hex",
  "serde",
  "serde_json",
- "snowbridge-milagro-bls",
  "ssz_rs",
  "superstruct",
  "thiserror",
@@ -3192,7 +3217,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd9920cd4460ce3cbca19c62f3bb9a9611562478a4dc9d2c556f4a7d049c5b6b"
 dependencies = [
- "bls12_381",
+ "bls12_381 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "glob",
  "hex",
  "once_cell",
@@ -4755,7 +4780,6 @@ version = "2.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024"
 dependencies = [
- "bitvec 1.0.1",
  "cfg-if",
  "derive_more",
  "parity-scale-codec 3.6.12",
@@ -5016,8 +5040,7 @@ dependencies = [
 [[package]]
 name = "sha2"
 version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
+source = "git+https://github.com/sp1-patches/RustCrypto-hashes?branch=patch-sha2-v0.9.9#db82a4848f8d033eab544255e1efa036cc06f054"
 dependencies = [
  "block-buffer 0.9.0",
  "cfg-if",
@@ -5029,8 +5052,7 @@ dependencies = [
 [[package]]
 name = "sha2"
 version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+source = "git+https://github.com/sp1-patches/RustCrypto-hashes?branch=patch-sha2-v0.10.8#1f224388fdede7cef649bce0d63876d1a9e3f515"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -5134,20 +5156,6 @@ dependencies = [
  "scale-info",
 ]
 
-[[package]]
-name = "snowbridge-milagro-bls"
-version = "1.5.2"
-source = "git+https://github.com/Snowfork/milagro_bls?rev=6a95c9e33c6a41d9137761e593d53742ebb964de#6a95c9e33c6a41d9137761e593d53742ebb964de"
-dependencies = [
- "hex",
- "lazy_static",
- "parity-scale-codec 3.6.12",
- "rand 0.8.5",
- "scale-info",
- "snowbridge-amcl",
- "zeroize",
-]
-
 [[package]]
 name = "socket2"
 version = "0.5.7"
@@ -5188,6 +5196,19 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "sp1-lib"
+version = "1.0.1"
+source = "git+https://github.com/succinctlabs/sp1.git?tag=v1.0.1#dd032eb23949828d244d1ad1f1569aa78155837c"
+dependencies = [
+ "anyhow",
+ "bincode",
+ "cfg-if",
+ "hex",
+ "serde",
+ "snowbridge-amcl",
+]
+
 [[package]]
 name = "spin"
 version = "0.5.2"
@@ -5507,9 +5528,9 @@ dependencies = [
 [[package]]
 name = "tiny-keccak"
 version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+source = "git+https://github.com/sp1-patches/tiny-keccak?branch=patch-v2.0.2#bf0b28f63510a90c7b6c21ac6ff461c93ecd2331"
 dependencies = [
+ "cfg-if",
  "crunchy",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 97e8f274..19818da0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,7 @@ default-members = ["cli"]
 [workspace.dependencies]
 # consensus
 ssz-rs = { package = "ssz_rs", version = "0.9.0" }
-milagro_bls = { package = "snowbridge-milagro-bls", git = "https://github.com/Snowfork/milagro_bls", rev = "6a95c9e33c6a41d9137761e593d53742ebb964de" }
+milagro_bls = { package = "bls12_381", git = "https://github.com/succinctlabs/bls12_381"}
 
 # execution
 ethers-core = { git = "https://github.com/gakonst/ethers-rs", rev = "3bf1a9e0d698e9fdfc91d0353878901af5a5c5ef" }
@@ -58,6 +58,11 @@ hyper = "1.3.1"
 zduny-wasm-timer = "0.2.8"
 retri = "0.1.0"
 
+[patch.crates-io]
+sha2-v0-9-9 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.9.9" }
+sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.8" }
+tiny-keccak = { git = "https://github.com/sp1-patches/tiny-keccak", branch = "patch-v2.0.2" }
+
 ######################################
 # Top Level Dependencies
 ######################################