diff --git a/Cargo.toml b/Cargo.toml index 2f62f22c..19bffa0f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ members = [ "sugondat-chain/pallets/*", "sugondat-chain/runtime", "sugondat-chain/primitives", - "sugondat-da-adapter", + "adapters/sovereign", "sugondat-nmt", "sugondat-shim", "sugondat-shim/common/sovereign", diff --git a/sugondat-da-adapter/.gitignore b/adapters/sovereign/.gitignore similarity index 100% rename from sugondat-da-adapter/.gitignore rename to adapters/sovereign/.gitignore diff --git a/sugondat-da-adapter/Cargo.toml b/adapters/sovereign/Cargo.toml similarity index 85% rename from sugondat-da-adapter/Cargo.toml rename to adapters/sovereign/Cargo.toml index dfd61e41..790d1f02 100644 --- a/sugondat-da-adapter/Cargo.toml +++ b/adapters/sovereign/Cargo.toml @@ -20,10 +20,10 @@ borsh = { version = "0.10.3", features = ["bytes"] } bytes = { version = "1", features = ["serde"] } sha2 = { version = "0.10.6", default-features = false } -sugondat-nmt = { path = "../sugondat-nmt", default-features = false } +sugondat-nmt = { path = "../../sugondat-nmt", default-features = false } jsonrpsee = { version = "0.20.3", optional = true, features = ["ws-client"] } tokio = { version = "1", optional = true } -sugondat-shim-common-sovereign = { path = "../sugondat-shim/common/sovereign", optional = true, default-features = false, features = [ +sugondat-shim-common-sovereign = { path = "../../sugondat-shim/common/sovereign", optional = true, default-features = false, features = [ "client", ] } anyhow = "1.0.68" diff --git a/sugondat-da-adapter/README.md b/adapters/sovereign/README.md similarity index 100% rename from sugondat-da-adapter/README.md rename to adapters/sovereign/README.md diff --git a/sugondat-da-adapter/src/lib.rs b/adapters/sovereign/src/lib.rs similarity index 100% rename from sugondat-da-adapter/src/lib.rs rename to adapters/sovereign/src/lib.rs diff --git a/sugondat-da-adapter/src/service.rs b/adapters/sovereign/src/service.rs similarity index 100% rename from sugondat-da-adapter/src/service.rs rename to adapters/sovereign/src/service.rs diff --git a/sugondat-da-adapter/src/service/client.rs b/adapters/sovereign/src/service/client.rs similarity index 100% rename from sugondat-da-adapter/src/service/client.rs rename to adapters/sovereign/src/service/client.rs diff --git a/sugondat-da-adapter/src/spec.rs b/adapters/sovereign/src/spec.rs similarity index 100% rename from sugondat-da-adapter/src/spec.rs rename to adapters/sovereign/src/spec.rs diff --git a/sugondat-da-adapter/src/types/address.rs b/adapters/sovereign/src/types/address.rs similarity index 100% rename from sugondat-da-adapter/src/types/address.rs rename to adapters/sovereign/src/types/address.rs diff --git a/sugondat-da-adapter/src/types/blob.rs b/adapters/sovereign/src/types/blob.rs similarity index 100% rename from sugondat-da-adapter/src/types/blob.rs rename to adapters/sovereign/src/types/blob.rs diff --git a/sugondat-da-adapter/src/types/block.rs b/adapters/sovereign/src/types/block.rs similarity index 100% rename from sugondat-da-adapter/src/types/block.rs rename to adapters/sovereign/src/types/block.rs diff --git a/sugondat-da-adapter/src/types/hash.rs b/adapters/sovereign/src/types/hash.rs similarity index 100% rename from sugondat-da-adapter/src/types/hash.rs rename to adapters/sovereign/src/types/hash.rs diff --git a/sugondat-da-adapter/src/types/header.rs b/adapters/sovereign/src/types/header.rs similarity index 100% rename from sugondat-da-adapter/src/types/header.rs rename to adapters/sovereign/src/types/header.rs diff --git a/sugondat-da-adapter/src/types/mod.rs b/adapters/sovereign/src/types/mod.rs similarity index 100% rename from sugondat-da-adapter/src/types/mod.rs rename to adapters/sovereign/src/types/mod.rs diff --git a/sugondat-da-adapter/src/verifier.rs b/adapters/sovereign/src/verifier.rs similarity index 100% rename from sugondat-da-adapter/src/verifier.rs rename to adapters/sovereign/src/verifier.rs diff --git a/demo/sovereign/demo-rollup/Cargo.toml b/demo/sovereign/demo-rollup/Cargo.toml index 210687c0..fd1b689f 100644 --- a/demo/sovereign/demo-rollup/Cargo.toml +++ b/demo/sovereign/demo-rollup/Cargo.toml @@ -12,7 +12,7 @@ default-run = "sov-demo-rollup" [dependencies] # non-optional dependencies -sugondat-da-adapter = { path = "../../sugondat-da-adapter" } +sugondat-da-adapter = { path = "../../adapters/sovereign" } const-rollup-config = { path = "../const-rollup-config" } sov-stf-runner = { git = "https://github.com/Sovereign-Labs/sovereign-sdk", features = ["native"], rev = "6058b31" } diff --git a/demo/sovereign/demo-rollup/provers/risc0/guest-sugondat/Cargo.toml b/demo/sovereign/demo-rollup/provers/risc0/guest-sugondat/Cargo.toml index f172b1c7..89a4334b 100644 --- a/demo/sovereign/demo-rollup/provers/risc0/guest-sugondat/Cargo.toml +++ b/demo/sovereign/demo-rollup/provers/risc0/guest-sugondat/Cargo.toml @@ -13,7 +13,7 @@ risc0-zkvm-platform = "0.18" demo-stf = { path = "../../../stf" } sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk", rev = "6058b31" } const-rollup-config = { path = "../../../../const-rollup-config" } -sugondat-da-adapter = { path = "../../../../../sugondat-da-adapter", default-features = false, features = ["verifier"] } +sugondat-da-adapter = { path = "../../../../../adapters/sovereign", default-features = false, features = ["verifier"] } sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk", rev = "6058b31" } sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk", rev = "6058b31" } sov-modules-stf-template = { git = "https://github.com/Sovereign-Labs/sovereign-sdk", rev = "6058b31" } diff --git a/sugondat-submit-blob/Cargo.toml b/sugondat-submit-blob/Cargo.toml index 6dddad39..4a3f853b 100644 --- a/sugondat-submit-blob/Cargo.toml +++ b/sugondat-submit-blob/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -sugondat-da-adapter = { path = "../sugondat-da-adapter" } +sugondat-da-adapter = { path = "../adapters/sovereign" } const-rollup-config = { path = "../demo/sovereign/const-rollup-config" } sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk", features = [ "native",