Merge branch 'main' into fix-upload-job-workflow

.github/workflows/rust.yml

@@ -118,7 +118,7 @@ jobs:
           cargo-hack-feature-options: --features opt --ignore-unknown-features
     uses: stellar/actions/.github/workflows/rust-publish-dry-run-v2.yml@main
     with:
-      crates: soroban-spec-tools soroban-rpc
+      crates: soroban-rpc
       runs-on: ${{ matrix.os }}
       target: ${{ matrix.target }}
       cargo-hack-feature-options: ${{ matrix.cargo-hack-feature-options }}

Cargo.toml

@@ -2,10 +2,9 @@
 resolver = "2"
 members = [
     "cmd/crates/soroban-rpc",
-    "cmd/crates/soroban-spec-tools",
     "cmd/soroban-rpc/lib/preflight",
 ]
-default-members = ["cmd/crates/soroban-rpc",  "cmd/crates/soroban-spec-tools"]
+default-members = ["cmd/crates/soroban-rpc"]
 #exclude = ["cmd/crates/soroban-test/tests/fixtures/hello"]
 
 [workspace.package]
@@ -46,10 +45,6 @@ version = "20.3.0"
 git = "https://github.com/stellar/soroban-tools"
 rev = "a59f5f421a27bab71472041fc619dd8b0d1cf902"
 
-[workspace.dependencies.soroban-spec-tools]
-version = "20.3.3"
-path = "./cmd/crates/soroban-spec-tools"
-
 [workspace.dependencies.soroban-sdk]
 version = "=20.3.1"
 # git = "https://github.com/stellar/rs-soroban-sdk"

cmd/crates/soroban-rpc/Cargo.toml

@@ -18,7 +18,6 @@ crate-type = ["rlib"]
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-spec-tools = { workspace = true }
 soroban-env-host = { workspace = true }
 stellar-strkey = "0.0.7"
 stellar-xdr = { workspace = true, features = ["curr", "std", "serde"] }

cmd/crates/soroban-rpc/src/lib.rs

@@ -31,8 +31,6 @@ mod txn;
 
 pub use txn::Assembled;
 
-use soroban_spec_tools::contract;
-
 const VERSION: Option<&str> = option_env!("CARGO_PKG_VERSION");
 pub(crate) const DEFAULT_TRANSACTION_FEES: u32 = 100;
 
@@ -92,8 +90,6 @@ pub enum Error {
     UnsupportedOperationType,
     #[error("unexpected contract code data type: {0:?}")]
     UnexpectedContractCodeDataType(LedgerEntryData),
-    #[error(transparent)]
-    CouldNotParseContractSpec(#[from] contract::Error),
     #[error("unexpected contract code got token")]
     UnexpectedToken(ContractDataEntry),
     #[error(transparent)]
@@ -1010,11 +1006,9 @@ soroban config identity fund {address} --helper-url <url>"#
             xdr::ScVal::ContractInstance(xdr::ScContractInstance {
                 executable: xdr::ContractExecutable::Wasm(hash),
                 ..
-            }) => Ok(
-                contract::Spec::new(&self.get_remote_wasm_from_hash(hash).await?)
-                    .map_err(Error::CouldNotParseContractSpec)?
-                    .spec,
-            ),
+            }) => Ok(soroban_spec::read::from_wasm(
+                &self.get_remote_wasm_from_hash(hash).await?,
+            )?),
             xdr::ScVal::ContractInstance(xdr::ScContractInstance {
                 executable: xdr::ContractExecutable::StellarAsset,
                 ..