all: Bump core, Rust dependencies

stellar · Dec 5, 2023 · 6808a3b · 6808a3b
1 parent d5acaf4
commit 6808a3b
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 58 deletions.
diff --git a/.github/workflows/soroban-rpc.yml b/.github/workflows/soroban-rpc.yml
@@ -112,7 +112,7 @@ jobs:
     env:
       SOROBAN_RPC_INTEGRATION_TESTS_ENABLED: true
       SOROBAN_RPC_INTEGRATION_TESTS_CAPTIVE_CORE_BIN: /usr/bin/stellar-core
-      PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 19.14.1-1590.b6b730a0c.focal
+      PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 20.0.0-1615.617729910.focal
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,20 +14,20 @@ exclude = ["cmd/crates/soroban-test/tests/fixtures/hello"]
 version = "20.0.0-rc4"
 
 [workspace.dependencies.soroban-env-host]
-version = "20.0.0-rc2"
+version = "20.0.0"
 git = "https://github.com/stellar/rs-soroban-env"
-rev = "be04cf31e925ba5bacd9b22db7caf7b4f6dd8372"
+rev = "9c5394083725bacf32a56107d7fa2adf643dc7b5"
 
 [workspace.dependencies.soroban-spec]
-version = "20.0.0-rc2"
+version = "20.0.0"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "e35bace9de5addae7c32f405cdc11bb459cb1d61"
+rev = "822ce6cc3e461ccc925275b472d77b6ca35b2cd9"
 # path = "../rs-soroban-sdk/soroban-spec"
 
 [workspace.dependencies.soroban-spec-rust]
-version = "20.0.0-rc2"
+version = "20.0.0"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "e35bace9de5addae7c32f405cdc11bb459cb1d61"
+rev = "822ce6cc3e461ccc925275b472d77b6ca35b2cd9"
 # path = "../rs-soroban-sdk/soroban-spec-rust"
 
 [workspace.dependencies.soroban-spec-json]
@@ -43,23 +43,21 @@ version = "20.0.0-rc4"
 path = "./cmd/crates/soroban-spec-tools"
 
 [workspace.dependencies.soroban-sdk]
-version = "20.0.0-rc2"
+version = "20.0.0"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "e35bace9de5addae7c32f405cdc11bb459cb1d61"
+rev = "822ce6cc3e461ccc925275b472d77b6ca35b2cd9"
 
 [workspace.dependencies.soroban-ledger-snapshot]
-version = "20.0.0-rc2"
+version = "20.0.0"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "e35bace9de5addae7c32f405cdc11bb459cb1d61"
+rev = "822ce6cc3e461ccc925275b472d77b6ca35b2cd9"
 
 [workspace.dependencies.soroban-cli]
 version = "20.0.0-rc4"
 path = "cmd/soroban-cli"
 
 [workspace.dependencies.stellar-xdr]
-version = "20.0.0-rc1"
-git = "https://github.com/stellar/rs-stellar-xdr"
-rev = "d6f8ece2c89809d5e2800b9df64ae60787ee492b"
+version = "20.0.0"
 default-features = true
 
 [workspace.dependencies]

diff --git a/cmd/soroban-cli/Cargo.toml b/cmd/soroban-cli/Cargo.toml
@@ -66,7 +66,7 @@ rand = "0.8.5"
 wasmparser = { workspace = true }
 sha2 = { workspace = true }
 csv = "1.1.6"
-ed25519-dalek = "2.0.0"
+ed25519-dalek = "=2.0.0"
 jsonrpsee-http-client = "0.20.1"
 jsonrpsee-core = "0.20.1"
 hyper   = "0.14.27"

diff --git a/cmd/soroban-rpc/internal/test/docker-compose.yml b/cmd/soroban-rpc/internal/test/docker-compose.yml
@@ -15,7 +15,7 @@ services:
     # Note: Please keep the image pinned to an immutable tag matching the Captive Core version.
     #       This avoids implicit updates which break compatibility between
     #       the Core container and captive core.
-    image: ${CORE_IMAGE:-stellar/unsafe-stellar-core:19.14.1-1590.b6b730a0c.focal}
+    image: ${CORE_IMAGE:-stellar/stellar-core:20.0.0-1615.617729910.focal}
     depends_on:
       - core-postgres
     restart: on-failure

diff --git a/go.mod b/go.mod
@@ -18,7 +18,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
-	github.com/stellar/go v0.0.0-20231114175958-eb2984b58392
+	github.com/stellar/go v0.0.0-20231204183605-af6f4ebad728
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/mod v0.13.0
 	gotest.tools/v3 v3.5.0
@@ -83,7 +83,7 @@ require (
 	github.com/spf13/afero v1.10.0 // indirect
 	github.com/spf13/cast v1.5.1 // indirect
 	github.com/spf13/viper v1.17.0 // indirect
-	github.com/stellar/go-xdr v0.0.0-20230919160922-6c7b68458206 // indirect
+	github.com/stellar/go-xdr v0.0.0-20231122183749-b53fb00bcac2 // indirect
 	github.com/stretchr/objx v0.5.1 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	golang.org/x/crypto v0.14.0 // indirect

diff --git a/go.sum b/go.sum
@@ -335,8 +335,12 @@ github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI=
 github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI=
 github.com/stellar/go v0.0.0-20231114175958-eb2984b58392 h1:sYxHgLDT3z6cJrWuf0O9Fbs/E2UNGh3PPoOlM8DJ2vk=
 github.com/stellar/go v0.0.0-20231114175958-eb2984b58392/go.mod h1:g78pyZyDFnKMJUaBIXxH7xyQ7PdDrvrJTFCxdGMMb3c=
+github.com/stellar/go v0.0.0-20231204183605-af6f4ebad728 h1:lyATpWxLxhZSZIGP3MfCs+C5bVJWvX/FcvQCslknK4E=
+github.com/stellar/go v0.0.0-20231204183605-af6f4ebad728/go.mod h1:3wMphjCZGi42wsrrKknendsozw7g9FVBm4YSlI1LpA4=
 github.com/stellar/go-xdr v0.0.0-20230919160922-6c7b68458206 h1:UFuvvpbWL8+jqO1QmKYWSVhiMp4MRiIFd8/zQlUINH0=
 github.com/stellar/go-xdr v0.0.0-20230919160922-6c7b68458206/go.mod h1:yoxyU/M8nl9LKeWIoBrbDPQ7Cy+4jxRcWcOayZ4BMps=
+github.com/stellar/go-xdr v0.0.0-20231122183749-b53fb00bcac2 h1:OzCVd0SV5qE3ZcDeSFCmOWLZfEWZ3Oe8KtmSOYKEVWE=
+github.com/stellar/go-xdr v0.0.0-20231122183749-b53fb00bcac2/go.mod h1:yoxyU/M8nl9LKeWIoBrbDPQ7Cy+4jxRcWcOayZ4BMps=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=