Revert "[Epic] Separating soroban-rpc to prepare for repo change (#1174…

…)" (#1193)

This reverts commit 2581f62.

Cargo.toml

@@ -69,49 +69,27 @@ version = "=20.3.1"
 version = "20.3.0"
 path = "cmd/soroban-cli"
 
-[workspace.dependencies.soroban-rpc]
-version = "20.2.0"
-path = "cmd/crates/soroban-rpc"
-
 [workspace.dependencies.stellar-xdr]
 version = "=20.1.0"
 default-features = true
 
 [workspace.dependencies]
-stellar-strkey = "0.0.7"
-sep5 = "0.0.2"
 base64 = "0.21.2"
 thiserror = "1.0.46"
 sha2 = "0.10.7"
 ethnum = "1.3.2"
 hex = "0.4.3"
 itertools = "0.10.0"
-
-serde-aux = "4.1.2"
+sep5 = "0.0.2"
 serde_json = "1.0.82"
 serde = "1.0.82"
-
-clap = { version = "4.1.8", features = [
-    "derive",
-    "env",
-    "deprecated",
-    "string",
-] }
-clap_complete = "4.1.4"
+stellar-strkey = "0.0.7"
 tracing = "0.1.37"
 tracing-subscriber = "0.3.16"
 tracing-appender = "0.2.2"
 which = "4.4.0"
 wasmparser = "0.90.0"
-termcolor = "1.1.3"
-termcolor_output = "1.0.1"
-ed25519-dalek = "2.0.0"
-
-# networking 
-http = "1.0.0"
-jsonrpsee-http-client = "0.20.1"
-jsonrpsee-core = "0.20.1"
-tokio = "1.28.1"
+
 
 # [patch."https://github.com/stellar/rs-soroban-env"]
 # soroban-env-host = { path = "../rs-soroban-env/soroban-env-host/" }

cmd/crates/soroban-spec-tools/Cargo.toml

@@ -20,8 +20,6 @@ crate-type = ["rlib"]
 soroban-spec = { workspace = true }
 stellar-strkey = { workspace = true }
 stellar-xdr = { workspace = true, features = ["curr", "std", "serde"] }
-soroban-env-host = { workspace = true }
-
 serde_json = { workspace = true }
 itertools = { workspace = true }
 ethnum = { workspace = true }

cmd/crates/soroban-spec-tools/src/lib.rs

@@ -13,7 +13,6 @@ use stellar_xdr::curr::{
     UInt128Parts, UInt256Parts, Uint256, VecM,
 };
 
-pub mod contract;
 pub mod utils;
 
 #[derive(thiserror::Error, Debug)]

cmd/crates/soroban-test/tests/it/help.rs

@@ -1,11 +1,11 @@
 use soroban_cli::commands::contract;
 use soroban_test::TestEnv;
 
-use crate::util::{invoke_custom as invoke, CUSTOM_TYPES, DEFAULT_CONTRACT_ID};
+use crate::util::{invoke_custom as invoke, CUSTOM_TYPES};
 
 async fn invoke_custom(func: &str, args: &str) -> Result<String, contract::invoke::Error> {
     let e = &TestEnv::default();
-    invoke(e, DEFAULT_CONTRACT_ID, func, args, &CUSTOM_TYPES.path()).await
+    invoke(e, "1", func, args, &CUSTOM_TYPES.path()).await
 }
 
 #[tokio::test]

cmd/crates/soroban-test/tests/it/integration/dotenv.rs

@@ -35,7 +35,7 @@ fn current_env_not_overwritten() {
         write_env_file(e, &contract_id());
 
         e.new_assert_cmd("contract")
-            .env("SOROBAN_CONTRACT_ID", "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4")
+            .env("SOROBAN_CONTRACT_ID", "2")
             .arg("invoke")
             .arg("--")
             .arg("hello")
@@ -51,10 +51,7 @@ fn cli_args_have_priority() {
         deploy_hello(e);
         write_env_file(e, &contract_id());
         e.new_assert_cmd("contract")
-            .env(
-                "SOROBAN_CONTRACT_ID",
-                "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            )
+            .env("SOROBAN_CONTRACT_ID", "2")
             .arg("invoke")
             .arg("--id")
             .arg(TEST_CONTRACT_ID)

cmd/crates/soroban-test/tests/it/integration/hello_world.rs

@@ -1,4 +1,3 @@
-use predicates::boolean::PredicateBooleanExt;
 use soroban_cli::commands::{
     contract::{self, fetch},
     keys,
@@ -20,23 +19,7 @@ async fn invoke() {
     extend_contract(sandbox, id, HELLO_WORLD).await;
     // Note that all functions tested here have no state
     invoke_hello_world(sandbox, id);
-    sandbox
-        .new_assert_cmd("events")
-        .arg("--start-ledger=20")
-        .arg("--id")
-        .arg(id)
-        .assert()
-        .stdout(predicates::str::contains(id).not())
-        .success();
     invoke_hello_world_with_lib(sandbox, id).await;
-    sandbox
-        .new_assert_cmd("events")
-        .arg("--start-ledger=20")
-        .arg("--id")
-        .arg(id)
-        .assert()
-        .stdout(predicates::str::contains(id))
-        .success();
     invoke_hello_world_with_lib_two(sandbox, id).await;
     invoke_auth(sandbox, id);
     invoke_auth_with_identity(sandbox, id).await;
@@ -56,7 +39,6 @@ fn invoke_hello_world(sandbox: &TestEnv, id: &str) {
     sandbox
         .new_assert_cmd("contract")
         .arg("invoke")
-        .arg("--is-view")
         .arg("--id")
         .arg(id)
         .arg("--")

cmd/crates/soroban-test/tests/it/util.rs

@@ -68,5 +68,3 @@ pub async fn invoke_custom(
     i.invoke(&soroban_cli::commands::global::Args::default())
         .await
 }
-
-pub const DEFAULT_CONTRACT_ID: &str = "CDR6QKTWZQYW6YUJ7UP7XXZRLWQPFRV6SWBLQS4ZQOSAF4BOUD77OO5Z";

cmd/soroban-cli/src/commands/contract/bindings/typescript.rs

@@ -1,15 +1,17 @@
 use std::{ffi::OsString, fmt::Debug, path::PathBuf};
 
 use clap::{command, Parser};
-use soroban_spec_tools::contract as contract_spec;
 use soroban_spec_typescript::{self as typescript, boilerplate::Project};
 
-use crate::commands::{
-    config::locator,
-    contract::{self, fetch},
-    network::{self, Network},
-};
 use crate::wasm;
+use crate::{
+    commands::{
+        config::locator,
+        contract::{self, fetch},
+        network::{self, Network},
+    },
+    utils::contract_spec::{self, ContractSpec},
+};
 
 #[derive(Parser, Debug, Clone)]
 #[group(skip)]
@@ -76,7 +78,7 @@ impl Cmd {
                 network: self.network.clone(),
             };
             let bytes = fetch.get_bytes().await?;
-            contract_spec::Spec::new(&bytes)?.spec
+            ContractSpec::new(&bytes)?.spec
         };
         if self.output_dir.is_file() {
             return Err(Error::IsFile(self.output_dir.clone()));

cmd/soroban-cli/src/commands/contract/extend.rs

@@ -144,18 +144,15 @@ impl Cmd {
             }),
         };
 
-        let res = client
+        let (result, meta, events) = client
             .prepare_and_send_transaction(&tx, &key, &[], &network.network_passphrase, None, None)
             .await?;
 
-        let events = res.events()?;
+        tracing::trace!(?result);
+        tracing::trace!(?meta);
         if !events.is_empty() {
             tracing::info!("Events:\n {events:#?}");
         }
-        let meta = res
-            .result_meta
-            .as_ref()
-            .ok_or(Error::MissingOperationResult)?;
 
         // The transaction from core will succeed regardless of whether it actually found & extended
         // the entry, so we have to inspect the result meta to tell if it worked or not.

cmd/soroban-cli/src/commands/contract/inspect.rs

@@ -1,6 +1,5 @@
 use clap::{command, Parser};
 use soroban_env_host::xdr;
-use soroban_spec_tools::contract;
 use std::{fmt::Debug, path::PathBuf};
 use tracing::debug;
 
@@ -29,7 +28,7 @@ pub enum Error {
     #[error(transparent)]
     Xdr(#[from] xdr::Error),
     #[error(transparent)]
-    Spec(#[from] contract::Error),
+    Spec(#[from] crate::utils::contract_spec::Error),
 }
 
 impl Cmd {

cmd/soroban-cli/src/commands/contract/install.rs

@@ -112,10 +112,14 @@ impl Cmd {
             build_install_contract_code_tx(contract, sequence + 1, self.fee.fee, &key)?;
 
         // Currently internal errors are not returned if the contract code is expired
-        if let Some(TransactionResult {
-            result: TransactionResultResult::TxInternalError,
-            ..
-        }) = client
+        if let (
+            TransactionResult {
+                result: TransactionResultResult::TxInternalError,
+                ..
+            },
+            _,
+            _,
+        ) = client
             .prepare_and_send_transaction(
                 &tx_without_preflight,
                 &key,
@@ -125,8 +129,6 @@ impl Cmd {
                 None,
             )
             .await?
-            .result
-            .as_ref()
         {
             // Now just need to restore it and don't have to install again
             restore::Cmd {
@@ -151,7 +153,7 @@ impl Cmd {
     }
 }
 
-fn get_contract_meta_sdk_version(wasm_spec: &soroban_spec_tools::contract::Spec) -> Option<String> {
+fn get_contract_meta_sdk_version(wasm_spec: &utils::contract_spec::ContractSpec) -> Option<String> {
     let rs_sdk_version_option = if let Some(_meta) = &wasm_spec.meta_base64 {
         wasm_spec.meta.iter().find(|entry| match entry {
             ScMetaEntry::ScMetaV0(ScMetaV0 { key, .. }) => {