Skip to content

Commit

Permalink
Merge branch 'main' into feat/txn_hash
Browse files Browse the repository at this point in the history
  • Loading branch information
willemneal authored Jul 9, 2024
2 parents 03702d4 + 40a1f1e commit 972f7a3
Show file tree
Hide file tree
Showing 13 changed files with 653 additions and 802 deletions.
1,079 changes: 543 additions & 536 deletions Cargo.lock

Large diffs are not rendered by default.

39 changes: 15 additions & 24 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,44 +11,44 @@ default-members = ["cmd/soroban-cli", "cmd/crates/soroban-spec-tools", "cmd/crat
exclude = ["cmd/crates/soroban-test/tests/fixtures/hello"]

[workspace.package]
version = "21.0.0"
version = "21.1.0"
rust-version = "1.74.0"

[workspace.dependencies.soroban-env-host]
version = "=21.1.0"
version = "=21.1.2"

[workspace.dependencies.soroban-simulation]
version = "21.1.0"
version = "21.1.2"

[workspace.dependencies.soroban-spec]
version = "=21.1.0-rc.1"
version = "=21.1.1"

[workspace.dependencies.soroban-spec-rust]
version = "=21.1.0-rc.1"
version = "=21.1.1"

[workspace.dependencies.soroban-spec-json]
version = "=21.0.0"
version = "=21.1.0"
path = "./cmd/crates/soroban-spec-json"

[workspace.dependencies.soroban-spec-typescript]
version = "21.0.0"
version = "21.1.0"
path = "./cmd/crates/soroban-spec-typescript"

[workspace.dependencies.soroban-spec-tools]
version = "21.0.0"
version = "21.1.0"
path = "./cmd/crates/soroban-spec-tools"

[workspace.dependencies.soroban-sdk]
version = "=21.1.0-rc.1"
version = "=21.1.1"

[workspace.dependencies.soroban-token-sdk]
version = "=21.1.0-rc.1"
version = "=21.1.1"

[workspace.dependencies.soroban-ledger-snapshot]
version = "=21.1.0-rc.1"
version = "=21.1.1"

[workspace.dependencies.soroban-cli]
version = "=21.0.0"
version = "=21.1.0"
path = "cmd/soroban-cli"

[workspace.dependencies.soroban-rpc]
Expand All @@ -61,7 +61,7 @@ default-features = true

[workspace.dependencies]
stellar-strkey = "0.0.8"
sep5 = "0.0.3"
sep5 = "0.0.4"
base64 = "0.21.2"
thiserror = "1.0.46"
sha2 = "0.10.7"
Expand All @@ -88,26 +88,17 @@ tracing-appender = "0.2.2"
which = "4.4.0"
wasmparser = "0.90.0"
directories = "5.0.1"
ulid = { version = "1.1" }
ulid = "1.1"
termcolor = "1.1.3"
termcolor_output = "1.0.1"
ed25519-dalek = "2.0.0"
ed25519-dalek = ">= 2.1.1"

# 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"
opt-level = "z"
Expand Down
Loading

0 comments on commit 972f7a3

Please sign in to comment.