From 2cbf5d20952dc0f457ebbf19ed54b3b6b663b887 Mon Sep 17 00:00:00 2001
From: Soares Chen <soares.chen@maybevoid.com>
Date: Wed, 27 Mar 2024 16:35:27 +0100
Subject: [PATCH] Fix Nix build

---
 Cargo.lock     | 23 ++---------------------
 Cargo.toml     | 14 ++++++++------
 nix/rollup.nix | 10 +++-------
 3 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0c7ebd9..3bc3502 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4977,7 +4977,6 @@ dependencies = [
 [[package]]
 name = "sov-celestia-adapter"
 version = "0.3.0"
-source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=cf048cd59#cf048cd59789209bb9c37effddd20efe19375bca"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -5087,7 +5086,7 @@ dependencies = [
  "sov-celestia-adapter",
  "sov-celestia-client",
  "sov-ibc",
- "sov-mock-da 0.3.0 (git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=cf048cd59)",
+ "sov-mock-da",
  "sov-modules-api",
  "sov-modules-core",
  "sov-rollup-interface",
@@ -5218,24 +5217,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "sov-mock-da"
-version = "0.3.0"
-source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=cf048cd59#cf048cd59789209bb9c37effddd20efe19375bca"
-dependencies = [
- "anyhow",
- "async-trait",
- "borsh",
- "bytes",
- "futures",
- "hex",
- "serde",
- "sha2 0.10.8",
- "sov-rollup-interface",
- "tokio",
- "tracing",
-]
-
 [[package]]
 name = "sov-mock-zkvm"
 version = "0.3.0"
@@ -5548,7 +5529,7 @@ dependencies = [
  "sov-attester-incentives",
  "sov-bank",
  "sov-chain-state",
- "sov-mock-da 0.3.0",
+ "sov-mock-da",
  "sov-mock-zkvm",
  "sov-modules-api",
  "sov-modules-stf-blueprint",
diff --git a/Cargo.toml b/Cargo.toml
index 30866bf..050ed4d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -66,9 +66,11 @@ risc0-build = "0.20"
 crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.2-risc0"}
 
 [patch.'ssh://git@github.com/informalsystems/sovereign-sdk-wip.git']
-sov-modules-api      = { path = "./vendor/sovereign-sdk/module-system/sov-modules-api" }
-sov-state            = { path = "./vendor/sovereign-sdk/module-system/sov-state" }
-sov-bank             = { path = "./vendor/sovereign-sdk/module-system/module-implementations/sov-bank" }
-sov-chain-state      = { path = "./vendor/sovereign-sdk/module-system/module-implementations/sov-chain-state" }
-sov-rollup-interface = { path = "./vendor/sovereign-sdk/rollup-interface" }
-sov-modules-core     = { path = "./vendor/sovereign-sdk/module-system/sov-modules-core" }
\ No newline at end of file
+sov-modules-api         = { path = "./vendor/sovereign-sdk/module-system/sov-modules-api" }
+sov-state               = { path = "./vendor/sovereign-sdk/module-system/sov-state" }
+sov-bank                = { path = "./vendor/sovereign-sdk/module-system/module-implementations/sov-bank" }
+sov-chain-state         = { path = "./vendor/sovereign-sdk/module-system/module-implementations/sov-chain-state" }
+sov-rollup-interface    = { path = "./vendor/sovereign-sdk/rollup-interface" }
+sov-modules-core        = { path = "./vendor/sovereign-sdk/module-system/sov-modules-core" }
+sov-mock-da             = { path = "./vendor/sovereign-sdk/adapters/mock-da" }
+sov-celestia-adapter    = { path = "./vendor/sovereign-sdk/adapters/celestia" }
diff --git a/nix/rollup.nix b/nix/rollup.nix
index 3665047..769e7b8 100644
--- a/nix/rollup.nix
+++ b/nix/rollup.nix
@@ -51,8 +51,7 @@ let
                 "curve25519-dalek-4.1.0" = "sha256-H8YMea3AIcUn9NGRfataNjCTzCK4NAjo4ZhWuPfT6ts=";
                 "sha2-0.10.8" = "sha256-vuFQFlbDXEW+n9+Nx2VeWanggCSd6NZ+GVEDFS9qZ2M=";
                 "risc0-cycle-utils-0.3.0" = "sha256-5dA62v1eqfyZBny4s3YlC2Tty7Yfd/OAVGfTlLBgypk=";
-                "ibc-app-transfer-0.51.0" = "sha256-Z3zgk29JLE+pygKsbmIntVQFvC56Rg35UKKDgZH8AS4=";
-                "sov-celestia-client-0.1.0" = "sha256-PLNKgZ92SqX5q9CXE9Hff5RZ9yU6JiaWpxSTNUvUBkI=";
+                "sov-celestia-client-0.1.0" = "sha256-Z3SvuWKPz+fPwHn1Nsj6cHUdrLzVOx+PkZS6D6558Sc=";
             };
         };
 
@@ -95,9 +94,7 @@ let
                 "sha2-0.10.8" = "sha256-vuFQFlbDXEW+n9+Nx2VeWanggCSd6NZ+GVEDFS9qZ2M=";
                 "tendermint-0.32.0" = "sha256-FtY7a+hBvQryATrs3mykCWFRe8ABTT6cuf5oh9IBElQ=";
                 "risc0-cycle-utils-0.3.0" = "sha256-5dA62v1eqfyZBny4s3YlC2Tty7Yfd/OAVGfTlLBgypk=";
-                "ibc-app-transfer-0.51.0" = "sha256-Z3zgk29JLE+pygKsbmIntVQFvC56Rg35UKKDgZH8AS4=";
-                "sov-celestia-client-0.1.0" = "sha256-PLNKgZ92SqX5q9CXE9Hff5RZ9yU6JiaWpxSTNUvUBkI=";
-                "sov-celestia-adapter-0.3.0" = "";
+                "sov-celestia-client-0.1.0" = "sha256-Z3SvuWKPz+fPwHn1Nsj6cHUdrLzVOx+PkZS6D6558Sc=";
             };
         };
 
@@ -140,8 +137,7 @@ let
                 "curve25519-dalek-4.1.0" = "sha256-H8YMea3AIcUn9NGRfataNjCTzCK4NAjo4ZhWuPfT6ts=";
                 "risc0-cycle-utils-0.3.0" = "sha256-5dA62v1eqfyZBny4s3YlC2Tty7Yfd/OAVGfTlLBgypk=";
                 "rockbound-1.0.0" = "sha256-xTaeBndRb/bYe+tySChDKsh4f9pywAExsdgJExCQiy8=";
-                "ibc-app-transfer-0.51.0" = "sha256-Z3zgk29JLE+pygKsbmIntVQFvC56Rg35UKKDgZH8AS4=";
-                "sov-celestia-client-0.1.0" = "sha256-PLNKgZ92SqX5q9CXE9Hff5RZ9yU6JiaWpxSTNUvUBkI=";
+                "sov-celestia-client-0.1.0" = "sha256-Z3SvuWKPz+fPwHn1Nsj6cHUdrLzVOx+PkZS6D6558Sc=";
             };
         };