From 36ec95db8843dc593c29066fca2560d7bdac1930 Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Tue, 9 Jan 2024 18:58:34 +0100 Subject: [PATCH 1/2] Bump Go, Rust and Core dependencies --- .github/workflows/soroban-rpc.yml | 2 +- Cargo.lock | 80 ++++++++++++------- Cargo.toml | 16 ++-- .../internal/test/docker-compose.yml | 2 +- go.mod | 2 +- go.sum | 4 +- 6 files changed, 66 insertions(+), 40 deletions(-) diff --git a/.github/workflows/soroban-rpc.yml b/.github/workflows/soroban-rpc.yml index 5cfd48147..ae5eff188 100644 --- 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: 20.0.3-1648.7c7dcefd3.focal + PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 20.0.3-1655.114b833e7.focal steps: - uses: actions/checkout@v3 with: diff --git a/Cargo.lock b/Cargo.lock index b82c6d9d1..5bb334ead 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2481,8 +2481,8 @@ dependencies = [ [[package]] name = "soroban-builtin-sdk-macros" -version = "20.0.2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=81f6eb1eefd299af3e03fa0db7b20eb355b2b55f#81f6eb1eefd299af3e03fa0db7b20eb355b2b55f" +version = "20.1.0" +source = "git+https://github.com/stellar/rs-soroban-env?rev=c1b238b65bfd13666be4ac14e0e390c31b549caf#c1b238b65bfd13666be4ac14e0e390c31b549caf" dependencies = [ "itertools 0.11.0", "proc-macro2", @@ -2533,9 +2533,9 @@ dependencies = [ "soroban-env-host", "soroban-ledger-snapshot", "soroban-sdk", - "soroban-spec", + "soroban-spec 20.0.3", "soroban-spec-json", - "soroban-spec-rust", + "soroban-spec-rust 20.0.3", "soroban-spec-tools", "soroban-spec-typescript", "stellar-strkey 0.0.7", @@ -2556,8 +2556,8 @@ dependencies = [ [[package]] name = "soroban-env-common" -version = "20.0.2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=81f6eb1eefd299af3e03fa0db7b20eb355b2b55f#81f6eb1eefd299af3e03fa0db7b20eb355b2b55f" +version = "20.1.0" +source = "git+https://github.com/stellar/rs-soroban-env?rev=c1b238b65bfd13666be4ac14e0e390c31b549caf#c1b238b65bfd13666be4ac14e0e390c31b549caf" dependencies = [ "arbitrary", "crate-git-revision 0.0.6", @@ -2573,8 +2573,8 @@ dependencies = [ [[package]] name = "soroban-env-guest" -version = "20.0.2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=81f6eb1eefd299af3e03fa0db7b20eb355b2b55f#81f6eb1eefd299af3e03fa0db7b20eb355b2b55f" +version = "20.1.0" +source = "git+https://github.com/stellar/rs-soroban-env?rev=c1b238b65bfd13666be4ac14e0e390c31b549caf#c1b238b65bfd13666be4ac14e0e390c31b549caf" dependencies = [ "soroban-env-common", "static_assertions", @@ -2582,8 +2582,8 @@ dependencies = [ [[package]] name = "soroban-env-host" -version = "20.0.2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=81f6eb1eefd299af3e03fa0db7b20eb355b2b55f#81f6eb1eefd299af3e03fa0db7b20eb355b2b55f" +version = "20.1.0" +source = "git+https://github.com/stellar/rs-soroban-env?rev=c1b238b65bfd13666be4ac14e0e390c31b549caf#c1b238b65bfd13666be4ac14e0e390c31b549caf" dependencies = [ "backtrace", "curve25519-dalek 4.1.1", @@ -2608,8 +2608,8 @@ dependencies = [ [[package]] name = "soroban-env-macros" -version = "20.0.2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=81f6eb1eefd299af3e03fa0db7b20eb355b2b55f#81f6eb1eefd299af3e03fa0db7b20eb355b2b55f" +version = "20.1.0" +source = "git+https://github.com/stellar/rs-soroban-env?rev=c1b238b65bfd13666be4ac14e0e390c31b549caf#c1b238b65bfd13666be4ac14e0e390c31b549caf" dependencies = [ "itertools 0.11.0", "proc-macro2", @@ -2626,8 +2626,8 @@ version = "20.1.1" [[package]] name = "soroban-ledger-snapshot" -version = "20.0.3" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=93b09e42e4efa841cbd034c0bff0dc362765086c#93b09e42e4efa841cbd034c0bff0dc362765086c" +version = "20.1.0" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=811ce3da801c03a21d5fa80fda187c0f1012240f#811ce3da801c03a21d5fa80fda187c0f1012240f" dependencies = [ "serde", "serde_json", @@ -2639,8 +2639,8 @@ dependencies = [ [[package]] name = "soroban-sdk" -version = "20.0.3" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=93b09e42e4efa841cbd034c0bff0dc362765086c#93b09e42e4efa841cbd034c0bff0dc362765086c" +version = "20.1.0" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=811ce3da801c03a21d5fa80fda187c0f1012240f#811ce3da801c03a21d5fa80fda187c0f1012240f" dependencies = [ "arbitrary", "bytes-lit", @@ -2658,8 +2658,8 @@ dependencies = [ [[package]] name = "soroban-sdk-macros" -version = "20.0.3" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=93b09e42e4efa841cbd034c0bff0dc362765086c#93b09e42e4efa841cbd034c0bff0dc362765086c" +version = "20.1.0" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=811ce3da801c03a21d5fa80fda187c0f1012240f#811ce3da801c03a21d5fa80fda187c0f1012240f" dependencies = [ "crate-git-revision 0.0.6", "darling", @@ -2669,8 +2669,8 @@ dependencies = [ "rustc_version", "sha2 0.10.8", "soroban-env-common", - "soroban-spec", - "soroban-spec-rust", + "soroban-spec 20.1.0", + "soroban-spec-rust 20.1.0", "stellar-xdr", "syn 2.0.39", ] @@ -2686,6 +2686,17 @@ dependencies = [ "wasmparser 0.88.0", ] +[[package]] +name = "soroban-spec" +version = "20.1.0" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=811ce3da801c03a21d5fa80fda187c0f1012240f#811ce3da801c03a21d5fa80fda187c0f1012240f" +dependencies = [ + "base64 0.13.1", + "stellar-xdr", + "thiserror", + "wasmparser 0.88.0", +] + [[package]] name = "soroban-spec-json" version = "20.1.1" @@ -2695,7 +2706,7 @@ dependencies = [ "serde_derive", "serde_json", "sha2 0.9.9", - "soroban-spec", + "soroban-spec 20.0.3", "stellar-xdr", "thiserror", ] @@ -2709,7 +2720,22 @@ dependencies = [ "proc-macro2", "quote", "sha2 0.10.8", - "soroban-spec", + "soroban-spec 20.0.3", + "stellar-xdr", + "syn 2.0.39", + "thiserror", +] + +[[package]] +name = "soroban-spec-rust" +version = "20.1.0" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=811ce3da801c03a21d5fa80fda187c0f1012240f#811ce3da801c03a21d5fa80fda187c0f1012240f" +dependencies = [ + "prettyplease", + "proc-macro2", + "quote", + "sha2 0.10.8", + "soroban-spec 20.1.0", "stellar-xdr", "syn 2.0.39", "thiserror", @@ -2724,7 +2750,7 @@ dependencies = [ "hex", "itertools 0.10.5", "serde_json", - "soroban-spec", + "soroban-spec 20.0.3", "stellar-strkey 0.0.7", "stellar-xdr", "thiserror", @@ -2747,7 +2773,7 @@ dependencies = [ "serde_derive", "serde_json", "sha2 0.9.9", - "soroban-spec", + "soroban-spec 20.0.3", "stellar-xdr", "temp-dir", "thiserror", @@ -2769,7 +2795,7 @@ dependencies = [ "soroban-env-host", "soroban-ledger-snapshot", "soroban-sdk", - "soroban-spec", + "soroban-spec 20.0.3", "soroban-spec-tools", "stellar-strkey 0.0.7", "thiserror", @@ -2779,8 +2805,8 @@ dependencies = [ [[package]] name = "soroban-token-sdk" -version = "20.0.3" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=93b09e42e4efa841cbd034c0bff0dc362765086c#93b09e42e4efa841cbd034c0bff0dc362765086c" +version = "20.1.0" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=811ce3da801c03a21d5fa80fda187c0f1012240f#811ce3da801c03a21d5fa80fda187c0f1012240f" dependencies = [ "soroban-sdk", ] diff --git a/Cargo.toml b/Cargo.toml index e0a4ee2a2..22683a62b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,9 +14,9 @@ exclude = ["cmd/crates/soroban-test/tests/fixtures/hello"] version = "20.1.1" [workspace.dependencies.soroban-env-host] -version = "=20.0.2" +version = "=20.1.0" git = "https://github.com/stellar/rs-soroban-env" -rev = "81f6eb1eefd299af3e03fa0db7b20eb355b2b55f" +rev = "c1b238b65bfd13666be4ac14e0e390c31b549caf" [workspace.dependencies.soroban-spec] version = "=20.0.3" @@ -43,19 +43,19 @@ version = "20.1.1" path = "./cmd/crates/soroban-spec-tools" [workspace.dependencies.soroban-sdk] -version = "=20.0.3" +version = "=20.1.0" git = "https://github.com/stellar/rs-soroban-sdk" -rev = "93b09e42e4efa841cbd034c0bff0dc362765086c" +rev = "811ce3da801c03a21d5fa80fda187c0f1012240f" [workspace.dependencies.soroban-token-sdk] -version = "=20.0.3" +version = "=20.1.0" git = "https://github.com/stellar/rs-soroban-sdk" -rev = "93b09e42e4efa841cbd034c0bff0dc362765086c" +rev = "811ce3da801c03a21d5fa80fda187c0f1012240f" [workspace.dependencies.soroban-ledger-snapshot] -version = "=20.0.3" +version = "=20.1.0" git = "https://github.com/stellar/rs-soroban-sdk" -rev = "93b09e42e4efa841cbd034c0bff0dc362765086c" +rev = "811ce3da801c03a21d5fa80fda187c0f1012240f" [workspace.dependencies.soroban-cli] version = "20.1.1" diff --git a/cmd/soroban-rpc/internal/test/docker-compose.yml b/cmd/soroban-rpc/internal/test/docker-compose.yml index 087794b95..2d6236afc 100644 --- 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:20.0.3-1648.7c7dcefd3.focal} + image: ${CORE_IMAGE:-stellar/unsafe-stellar-core:20.0.3-1655.114b833e7.focal} depends_on: - core-postgres restart: on-failure diff --git a/go.mod b/go.mod index 6560eb580..a8bd3bf45 100644 --- 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-20240102161234-51c1b1571944 + github.com/stellar/go v0.0.0-20240109175136-3ca501f09055 github.com/stretchr/testify v1.8.4 golang.org/x/mod v0.13.0 gotest.tools/v3 v3.5.0 diff --git a/go.sum b/go.sum index 08cc5dd7f..ed68c0094 100644 --- a/go.sum +++ b/go.sum @@ -334,8 +334,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= 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-20240102161234-51c1b1571944 h1:zuaWX3KC9z7zVAmnX4nIrlnKMGUpNEQOsWAD7m+Bjl8= -github.com/stellar/go v0.0.0-20240102161234-51c1b1571944/go.mod h1:PAWie4LYyDzJXqDVG4Qcj1Nt+uNk7sjzgSCXndQYsBA= +github.com/stellar/go v0.0.0-20240109175136-3ca501f09055 h1:6/i5f/4CsoArb9eNe+Pr+ATQkBvWNK31at6qaw9zMH4= +github.com/stellar/go v0.0.0-20240109175136-3ca501f09055/go.mod h1:PAWie4LYyDzJXqDVG4Qcj1Nt+uNk7sjzgSCXndQYsBA= 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= From db00161d905c25b60c14b9389f7c41a11b99ab22 Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Tue, 9 Jan 2024 20:57:13 +0100 Subject: [PATCH 2/2] Bump system test's core git ref --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index a355ff487..2c1900e0a 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -22,7 +22,7 @@ jobs: # core git ref should be latest commit for stable soroban functionality # the core bin can either be compiled in-line here as part of ci, - SYSTEM_TEST_CORE_GIT_REF: https://github.com/stellar/stellar-core.git#v20.0.2 + SYSTEM_TEST_CORE_GIT_REF: https://github.com/stellar/stellar-core.git#114b833e755400178a57142f45b7fb892ddb034f SYSTEM_TEST_CORE_COMPILE_CONFIGURE_FLAGS: "--disable-tests" # or set SYSTEM_TEST_CORE_GIT_REF to empty, and set SYSTEM_TEST_CORE_IMAGE # to pull a pre-compiled image from dockerhub instead