Merge remote-tracking branch 'upstream/main' into keep_e2e_current

stellar · Sep 13, 2023 · e88b1bc · e88b1bc
2 parents b5672ea + 06bf51f
commit e88b1bc
Show file tree

Hide file tree

Showing 25 changed files with 149 additions and 122 deletions.
diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml
@@ -20,6 +20,7 @@ jobs:
           go-version: 1.20.1
       - run: scripts/check-dependencies.bash
   validate-rust-git-rev-deps:
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: stellar/actions/rust-check-git-rev-deps@main
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,55 +11,55 @@ default-members = ["cmd/soroban-cli", "cmd/crates/soroban-test"]
 exclude = ["cmd/crates/soroban-test/tests/fixtures/hello"]
 
 [workspace.package]
-version = "0.9.4"
+version = "20.0.0-rc1"
 
 [workspace.dependencies.soroban-env-host]
-version = "0.0.17"
+version = "20.0.0-rc1"
 git = "https://github.com/stellar/rs-soroban-env"
-rev = "3d6c35d1308fc36a05d30d257756e42fc928b537"
+rev = "f19ef13363a1e0cbff7b100c0599a1d63dea88a6"
 
 [workspace.dependencies.soroban-spec]
-version = "0.9.1"
+version = "20.0.0-rc1"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "ee44e420b9badeb16cab870ed25bef397c058f64"
+rev = "f743d6f9e49caa08924318907cd0588b60d7f187"
 # path = "../rs-soroban-sdk/soroban-spec"
 
 [workspace.dependencies.soroban-spec-rust]
-version = "0.9.1"
+version = "20.0.0-rc1"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "ee44e420b9badeb16cab870ed25bef397c058f64"
+rev = "f743d6f9e49caa08924318907cd0588b60d7f187"
 # path = "../rs-soroban-sdk/soroban-spec-rust"
 
 [workspace.dependencies.soroban-spec-json]
-version = "0.9.4"
+version = "20.0.0-rc1"
 path = "./cmd/crates/soroban-spec-json"
 
 [workspace.dependencies.soroban-spec-typescript]
-version = "0.9.4"
+version = "20.0.0-rc1"
 path = "./cmd/crates/soroban-spec-typescript"
 
 [workspace.dependencies.soroban-spec-tools]
-version = "0.9.4"
+version = "20.0.0-rc1"
 path = "./cmd/crates/soroban-spec-tools"
 
 [workspace.dependencies.soroban-sdk]
-version = "0.9.1"
+version = "20.0.0-rc1"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "ee44e420b9badeb16cab870ed25bef397c058f64"
+rev = "f743d6f9e49caa08924318907cd0588b60d7f187"
 
 [workspace.dependencies.soroban-ledger-snapshot]
-version = "0.9.1"
+version = "20.0.0-rc1"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "ee44e420b9badeb16cab870ed25bef397c058f64"
+rev = "f743d6f9e49caa08924318907cd0588b60d7f187"
 
 [workspace.dependencies.soroban-cli]
-version = "0.9.4"
+version = "20.0.0-rc1"
 path = "cmd/soroban-cli"
 
 [workspace.dependencies.stellar-xdr]
-version = "0.0.17"
+version = "20.0.0-rc1"
 git = "https://github.com/stellar/rs-stellar-xdr"
-rev = "39904e09941046dab61e6e35fc89e31bf2dea1cd"
+rev = "d5ce0c9e7aa83461773a6e81662067f35d39e4c1"
 default-features = false
 
 [workspace.dependencies]

diff --git a/cmd/crates/soroban-spec-json/Cargo.toml b/cmd/crates/soroban-spec-json/Cargo.toml
@@ -20,7 +20,7 @@ sha2 = "0.9.9"
 
 [dependencies.stellar-xdr]
 workspace = true
-features = ["next", "std", "serde"]
+features = ["curr", "std", "serde"]
 
 [dev_dependencies]
 pretty_assertions = "1.2.1"
diff --git a/cmd/crates/soroban-spec-tools/Cargo.toml b/cmd/crates/soroban-spec-tools/Cargo.toml
@@ -19,7 +19,7 @@ crate-type = ["rlib"]
 [dependencies]
 soroban-spec = { workspace = true }
 stellar-strkey = { workspace = true }
-stellar-xdr = { workspace = true, features = ["next", "std", "serde"] }
+stellar-xdr = { workspace = true, features = ["curr", "std", "serde"] }
 serde_json = { workspace = true }
 itertools = { workspace = true }
 ethnum = { workspace = true }

diff --git a/cmd/crates/soroban-spec-typescript/Cargo.toml b/cmd/crates/soroban-spec-typescript/Cargo.toml
@@ -25,7 +25,7 @@ base64 = { workspace = true }
 
 [dependencies.stellar-xdr]
 workspace = true
-features = ["next", "std", "serde", "base64"]
+features = ["curr", "std", "serde", "base64"]
 
 [dev_dependencies]
 temp-dir = "0.1.11"

diff --git a/cmd/crates/soroban-test/Cargo.toml b/cmd/crates/soroban-test/Cargo.toml
@@ -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 = "0.9.4"
+version = "20.0.0-rc1"
 edition = "2021"
 rust-version = "1.70"
 autobins = false

diff --git a/cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "soroban-hello"
-version = "0.9.4"
+version = "20.0.0-rc1"
 edition = "2021"
 publish = false
 

diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "test_custom_types"
-version = "0.9.4"
+version = "20.0.0-rc1"
 authors = ["Stellar Development Foundation <[email protected]>"]
 license = "Apache-2.0"
 edition = "2021"

diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "test_hello_world"
-version = "0.9.4"
+version = "20.0.0-rc1"
 authors = ["Stellar Development Foundation <[email protected]>"]
 license = "Apache-2.0"
 edition = "2021"

diff --git a/cmd/soroban-cli/Cargo.toml b/cmd/soroban-cli/Cargo.toml
@@ -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 = "0.9.4"
+version = "20.0.0-rc1"
 edition = "2021"
 rust-version = "1.72"
 autobins = false