Skip to content

Commit

Permalink
Merge branch 'main' into nightly-system-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
stellarsaur authored Feb 7, 2024
2 parents 3dc06e3 + 9bcf8e2 commit 47587cf
Show file tree
Hide file tree
Showing 11 changed files with 603 additions and 500 deletions.
549 changes: 231 additions & 318 deletions Cargo.lock

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,27 @@ version = "20.3.0"
rust-version = "1.74.0"

[workspace.dependencies.soroban-env-host]
version = "=20.2.0"
git = "https://github.com/stellar/rs-soroban-env"
rev = "1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e"
version = "=20.2.1"
# git = "https://github.com/stellar/rs-soroban-env"
# rev = "1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e"
# path = "../rs-soroban-env/soroban-env-host"

[workspace.dependencies.soroban-simulation]
version = "=20.2.0"
git = "https://github.com/stellar/rs-soroban-env"
rev = "1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e"
version = "=20.2.1"
# git = "https://github.com/stellar/rs-soroban-env"
# rev = "1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e"
# path = "../rs-soroban-env/soroban-simulation"

[workspace.dependencies.soroban-spec]
version = "=20.3.0"
git = "https://github.com/stellar/rs-soroban-sdk"
rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"
version = "=20.3.1"
# git = "https://github.com/stellar/rs-soroban-sdk"
# rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"
# path = "../rs-soroban-sdk/soroban-spec"

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

[workspace.dependencies.soroban-spec-json]
Expand All @@ -51,22 +51,22 @@ version = "20.2.0"
path = "./cmd/crates/soroban-spec-tools"

[workspace.dependencies.soroban-sdk]
version = "=20.3.0"
git = "https://github.com/stellar/rs-soroban-sdk"
rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"
version = "=20.3.1"
# git = "https://github.com/stellar/rs-soroban-sdk"
# rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"

[workspace.dependencies.soroban-token-sdk]
version = "=20.3.0"
git = "https://github.com/stellar/rs-soroban-sdk"
rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"
version = "=20.3.1"
# git = "https://github.com/stellar/rs-soroban-sdk"
# rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"

[workspace.dependencies.soroban-ledger-snapshot]
version = "=20.3.0"
git = "https://github.com/stellar/rs-soroban-sdk"
rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"
version = "=20.3.1"
# git = "https://github.com/stellar/rs-soroban-sdk"
# rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"

[workspace.dependencies.soroban-cli]
version = "20.2.0"
version = "20.3.0"
path = "cmd/soroban-cli"

[workspace.dependencies.stellar-xdr]
Expand Down
2 changes: 1 addition & 1 deletion cmd/crates/soroban-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository = "https://github.com/stellar/soroban-test"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
readme = "README.md"
version = "20.2.0"
version = "20.3.0"
edition = "2021"
rust-version.workspace = true
autobins = false
Expand Down
2 changes: 1 addition & 1 deletion cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "soroban-hello"
version = "20.2.0"
version = "20.3.0"
edition = "2021"
publish = false

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test_custom_types"
version = "20.2.0"
version = "20.3.0"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
edition = "2021"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test_hello_world"
version = "20.2.0"
version = "20.3.0"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
edition = "2021"
Expand Down
13 changes: 8 additions & 5 deletions cmd/soroban-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository = "https://github.com/stellar/soroban-cli"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
readme = "README.md"
version = "20.2.0"
version = "20.3.0"
edition = "2021"
rust-version.workspace = true
autobins = false
Expand Down Expand Up @@ -53,9 +53,8 @@ clap = { version = "4.1.8", features = [
] }
base64 = { workspace = true }
thiserror = { workspace = true }
serde = "1.0.82"
serde_derive = "1.0.82"
serde_json = "1.0.82"
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
serde-aux = "4.1.2"
hex = { workspace = true }
num-bigint = "0.4"
Expand Down Expand Up @@ -93,10 +92,14 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
cargo_metadata = "0.15.4"
pathdiff = "0.2.1"
dotenvy = "0.15.7"
gix = { version = "0.55.2", default-features = false, features = [
strum = "0.17.1"
strum_macros = "0.17.1"
gix = { version = "0.58.0", default-features = false, features = [
"blocking-http-transport-reqwest-rust-tls",
"worktree-mutation",
] }
ureq = {version = "2.9.1", features = ["json"]}

tempfile = "3.8.1"
toml_edit = "0.21.0"
# For hyper-tls
Expand Down
Loading

0 comments on commit 47587cf

Please sign in to comment.