Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unnecessary dependencies #149

Merged
merged 1 commit into from
Apr 21, 2024
Merged

Remove unnecessary dependencies #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 24 additions & 87 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

72 changes: 1 addition & 71 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,40 +29,11 @@ version = "=21.0.0"
# rev = "c30bc769e379bef9b94a3ceb464aa78c1185eeb3"
# path = "../rs-soroban-sdk/soroban-spec"
Comment on lines 29 to 30
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can also remove soroban-spec as a dependency and soroban-sdk further down, which would then mean that soroban-rpc then has zero dependency on the stellar/rs-soroban-sdk repository.

The stellar-rpc-client uses those two crates to lookup the wasm specs from a .wasm file it downloads from the soroban-rpc. Imo it's outside the responsibility of the stellar-rpc-client to do the decoding of the wasm. The client should help an application download the .wasm, and then leave it up to the application to extract the spec. Applications that want to extract the spec, like the soroban-cli, can import soroban-spec and soroban-sdk.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@willemneal could you push out the wasm spec lookup to soroban-cli?


[workspace.dependencies.soroban-spec-rust]
version = "=21.0.0"
# git = "https://github.com/stellar/rs-soroban-sdk"
# rev = "c30bc769e379bef9b94a3ceb464aa78c1185eeb3"
# path = "../rs-soroban-sdk/soroban-spec-rust"

[workspace.dependencies.soroban-spec-json]
version = "20.3.0"
git = "https://github.com/stellar/soroban-cli"
rev = "c30bc769e379bef9b94a3ceb464aa78c1185eeb3"

[workspace.dependencies.soroban-spec-typescript]
version = "20.3.0"
git = "https://github.com/stellar/soroban-cli"
rev = "a59f5f421a27bab71472041fc619dd8b0d1cf902"

[workspace.dependencies.soroban-sdk]
version = "=21.0.0"
# git = "https://github.com/stellar/rs-soroban-sdk"
# rev = "c30bc769e379bef9b94a3ceb464aa78c1185eeb3"

[workspace.dependencies.soroban-token-sdk]
version = "=21.0.0"
# git = "https://github.com/stellar/rs-soroban-sdk"
# rev = "c30bc769e379bef9b94a3ceb464aa78c1185eeb3"

[workspace.dependencies.soroban-ledger-snapshot]
version = "=21.0.0"
# git = "https://github.com/stellar/rs-soroban-sdk"
# rev = "c30bc769e379bef9b94a3ceb464aa78c1185eeb3"

[workspace.dependencies.stellar-rpc-client]
version = "20.3.5"
path = "cmd/crates/stellar-rpc-client"

[workspace.dependencies.stellar-xdr]
version = "=21.0.0"
Expand All @@ -71,49 +42,8 @@ default-features = true
# rev = "a80c899c61e869fd00b7b475a4947ab6aaf9dcac"

[workspace.dependencies]
stellar-strkey = "0.0.7"
sep5 = "0.0.2"
base64 = "0.21.2"
thiserror = "1.0.46"
base64 = "0.22.0"
sha2 = "0.10.7"
ethnum = "1.3.2"
hex = "0.4.3"
itertools = "0.10.0"

serde-aux = "4.1.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"
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/" }
# [patch."https://github.com/stellar/rs-soroban-sdk"]
# soroban-spec = { path = "../rs-soroban-sdk/soroban-spec/" }
# soroban-token-spec = { path = "../rs-soroban-sdk/soroban-token-spec/" }
# soroban-sdk = { path = "../rs-soroban-sdk/soroban-sdk/" }
# [patch."https://github.com/stellar/rs-stellar-xdr"]
# stellar-xdr = { path = "../rs-stellar-xdr/" }

[profile.test-wasms]
inherits = "release"
Expand Down
6 changes: 0 additions & 6 deletions cmd/crates/stellar-rpc-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ clap = { version = "4.1.8", features = ["derive", "env", "deprecated", "string"]
serde_json = "1.0.82"
serde-aux = "4.1.2"
itertools = "0.10.0"
ethnum = "1.3.2"
hex = "0.4.3"
wasmparser = "0.90.0"
base64 = "0.21.2"
thiserror = "1.0.46"
serde = "1.0.82"
tokio = "1.28.1"
Expand All @@ -45,6 +42,3 @@ jsonrpsee-http-client = "0.20.1"
jsonrpsee-core = "0.20.1"
http = "1.0.0"


[dev-dependencies]
which = "4.4.0"
Loading