Replace cli xdr command with stellar-xdr cli (#1135)

stellar · Dec 19, 2023 · 6553afb · 6553afb
1 parent 9ea424d
commit 6553afb
Show file tree

Hide file tree

Showing 7 changed files with 172 additions and 154 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,20 +14,20 @@ exclude = ["cmd/crates/soroban-test/tests/fixtures/hello"]
 version = "20.0.2"
 
 [workspace.dependencies.soroban-env-host]
-version = "20.0.0"
+version = "=20.0.1"
 git = "https://github.com/stellar/rs-soroban-env"
-rev = "9c5394083725bacf32a56107d7fa2adf643dc7b5"
+rev = "79df2fd852c05739bc2a85b7feef3510d5aaed81"
 
 [workspace.dependencies.soroban-spec]
-version = "20.0.0"
+version = "=20.0.2"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "822ce6cc3e461ccc925275b472d77b6ca35b2cd9"
+rev = "3fb64df17366511963a875c1bbe239b2b04957d3"
 # path = "../rs-soroban-sdk/soroban-spec"
 
 [workspace.dependencies.soroban-spec-rust]
-version = "20.0.0"
+version = "=20.0.2"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "822ce6cc3e461ccc925275b472d77b6ca35b2cd9"
+rev = "3fb64df17366511963a875c1bbe239b2b04957d3"
 # path = "../rs-soroban-sdk/soroban-spec-rust"
 
 [workspace.dependencies.soroban-spec-json]
@@ -43,26 +43,26 @@ version = "20.0.2"
 path = "./cmd/crates/soroban-spec-tools"
 
 [workspace.dependencies.soroban-sdk]
-version = "20.0.0"
+version = "=20.0.2"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "822ce6cc3e461ccc925275b472d77b6ca35b2cd9"
+rev = "3fb64df17366511963a875c1bbe239b2b04957d3"
 
 [workspace.dependencies.soroban-token-sdk]
-version = "20.0.0-rc2"
+version = "=20.0.2"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "822ce6cc3e461ccc925275b472d77b6ca35b2cd9"
+rev = "3fb64df17366511963a875c1bbe239b2b04957d3"
 
 [workspace.dependencies.soroban-ledger-snapshot]
-version = "20.0.0"
+version = "=20.0.2"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "822ce6cc3e461ccc925275b472d77b6ca35b2cd9"
+rev = "3fb64df17366511963a875c1bbe239b2b04957d3"
 
 [workspace.dependencies.soroban-cli]
 version = "20.0.2"
 path = "cmd/soroban-cli"
 
 [workspace.dependencies.stellar-xdr]
-version = "20.0.0"
+version = "=20.0.2"
 default-features = true
 
 [workspace.dependencies]

diff --git a/cmd/soroban-cli/Cargo.toml b/cmd/soroban-cli/Cargo.toml
@@ -35,6 +35,7 @@ default = []
 opt = ["dep:wasm-opt"]
 
 [dependencies]
+stellar-xdr = { workspace = true, features = ["cli"] }
 soroban-env-host = { workspace = true }
 soroban-spec = { workspace = true }
 soroban-spec-json = { workspace = true }

diff --git a/cmd/soroban-cli/src/commands/lab/mod.rs b/cmd/soroban-cli/src/commands/lab/mod.rs
@@ -1,23 +1,22 @@
 use clap::Subcommand;
 
 pub mod token;
-pub mod xdr;
 
 #[derive(Debug, Subcommand)]
 pub enum Cmd {
     /// Wrap, create, and manage token contracts
     Token(token::Root),
 
     /// Decode xdr
-    Xdr(xdr::Cmd),
+    Xdr(stellar_xdr::cli::Root),
 }
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
     #[error(transparent)]
     Token(#[from] token::Error),
     #[error(transparent)]
-    Xdr(#[from] xdr::Error),
+    Xdr(#[from] stellar_xdr::cli::Error),
 }
 
 impl Cmd {

diff --git a/cmd/soroban-cli/src/commands/lab/xdr.rs b/cmd/soroban-cli/src/commands/lab/xdr.rs
diff --git a/cmd/soroban-cli/src/commands/lab/xdr/decode.rs b/cmd/soroban-cli/src/commands/lab/xdr/decode.rs