From 79875540911123491f59ec142392e93f24d9b9d6 Mon Sep 17 00:00:00 2001 From: George Date: Wed, 25 Mar 2026 11:08:27 -0700 Subject: [PATCH 1/4] Bump Core to p26 release candidate --- .github/workflows/stellar-rpc.yml | 4 ++-- scripts/check-dependencies.bash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/stellar-rpc.yml b/.github/workflows/stellar-rpc.yml index 3610124be..adff24fd6 100644 --- a/.github/workflows/stellar-rpc.yml +++ b/.github/workflows/stellar-rpc.yml @@ -97,8 +97,8 @@ jobs: uses: ./.github/workflows/integration-tests.yml with: protocol_version: '26' - core_deb_version: '25.2.1-3066.1bedb04d1.jammy~vnext' - core_docker_img: 'stellar/unsafe-stellar-core:25.2.1-3066.1bedb04d1.jammy-vnext' + core_deb_version: '26.0.0-3089.8e43a2d3b.jammy' + core_docker_img: 'stellar/unsafe-stellar-core:26.0.0-3089.8e43a2d3b.jammy' # integration-p25-src: # name: Integration tests (p25, core from source) diff --git a/scripts/check-dependencies.bash b/scripts/check-dependencies.bash index 8089e2499..af460a5c3 100755 --- a/scripts/check-dependencies.bash +++ b/scripts/check-dependencies.bash @@ -95,7 +95,7 @@ fi PROTO_VERSION_PAIRS=$(awk " /^[[:space:]]*#/ { next } /protocol_version:/ { p = \$NF; gsub(/'/, \"\", p) } - /core_version:/ { c = \$NF; gsub(/'/, \"\", c); if (c != \"\") print p, c } + /core_deb_version:/ { c = \$NF; gsub(/'/, \"\", c); if (c != \"\") print p, c } " .github/workflows/stellar-rpc.yml) if [ -z "$PROTO_VERSION_PAIRS" ]; then From e30f88db900319b5c30dda0b2b059c9dce580f58 Mon Sep 17 00:00:00 2001 From: George Date: Wed, 25 Mar 2026 11:18:01 -0700 Subject: [PATCH 2/4] Bump Go SDK version to latest --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7d7eb1cc8..4c808e358 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,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-stellar-sdk v0.3.1-0.20260323224849-cbd446204cd3 + github.com/stellar/go-stellar-sdk v0.3.1-0.20260325174035-031e5bfdc4bd github.com/stretchr/testify v1.11.1 ) diff --git a/go.sum b/go.sum index 783db0198..ebd3b0ddc 100644 --- a/go.sum +++ b/go.sum @@ -429,8 +429,8 @@ 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/spiffe/go-spiffe/v2 v2.6.0 h1:l+DolpxNWYgruGQVV0xsfeya3CsC7m8iBzDnMpsbLuo= github.com/spiffe/go-spiffe/v2 v2.6.0/go.mod h1:gm2SeUoMZEtpnzPNs2Csc0D/gX33k1xIx7lEzqblHEs= -github.com/stellar/go-stellar-sdk v0.3.1-0.20260323224849-cbd446204cd3 h1:3epoJ2ws1v13McELdbhwGxzkBwlLTKrAtOWbIXij8nE= -github.com/stellar/go-stellar-sdk v0.3.1-0.20260323224849-cbd446204cd3/go.mod h1:tLKAQPxa2I5UvGMabBbUXcY3fmgYnfDudrMeK7CDX4w= +github.com/stellar/go-stellar-sdk v0.3.1-0.20260325174035-031e5bfdc4bd h1:riEMBHcXZ+QHBa271TEc8Z99Wdg7PFw2p425iM1thXI= +github.com/stellar/go-stellar-sdk v0.3.1-0.20260325174035-031e5bfdc4bd/go.mod h1:tLKAQPxa2I5UvGMabBbUXcY3fmgYnfDudrMeK7CDX4w= github.com/stellar/go-xdr v0.0.0-20260312225820-cc2b0611aabf h1:GY1RVbX3Hg7poPXEf6yojjP0hyypvgUgZmCqQU9D0xg= github.com/stellar/go-xdr v0.0.0-20260312225820-cc2b0611aabf/go.mod h1:If+U9Z1W5xU97VrOgJandQT+2dN7/iOpkCrxBJEyF80= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= From bc20bfa35ff6f79381cdb4b52864013a6e6382f4 Mon Sep 17 00:00:00 2001 From: George Date: Wed, 25 Mar 2026 18:38:54 -0700 Subject: [PATCH 3/4] Trying out sidd's fix --- Cargo.lock | 55 +++++++++++++------ Cargo.toml | 4 ++ .../integrationtest/infrastructure/test.go | 2 +- 3 files changed, 44 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7ebbd9b43..e3cf107be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1362,8 +1362,7 @@ dependencies = [ [[package]] name = "soroban-builtin-sdk-macros" version = "26.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32f3c9e4e1456db99f29daf7f9bd2738aa94500696a17d9f529276a3ceba510" +source = "git+https://github.com/sisuresh/rs-soroban-env.git?rev=8c8a71a83a2459474b587a9a4622274cf8e8c56e#8c8a71a83a2459474b587a9a4622274cf8e8c56e" dependencies = [ "itertools 0.13.0", "proc-macro2", @@ -1383,7 +1382,7 @@ dependencies = [ "num-derive", "num-traits", "soroban-env-macros 25.2.1", - "soroban-wasmi", + "soroban-wasmi 0.31.1-soroban.20.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "static_assertions", "stellar-xdr 25.0.0", "wasmparser", @@ -1392,8 +1391,7 @@ dependencies = [ [[package]] name = "soroban-env-common" version = "26.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2c52555e9a98c97bcba47bec8f9cdc863c63ae4266abb749fdd7b06d012691" +source = "git+https://github.com/sisuresh/rs-soroban-env.git?rev=8c8a71a83a2459474b587a9a4622274cf8e8c56e#8c8a71a83a2459474b587a9a4622274cf8e8c56e" dependencies = [ "arbitrary", "crate-git-revision", @@ -1401,7 +1399,7 @@ dependencies = [ "num-derive", "num-traits", "soroban-env-macros 26.0.0", - "soroban-wasmi", + "soroban-wasmi 0.31.1-soroban.20.0.1 (git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0)", "static_assertions", "stellar-xdr 26.0.0", "wasmparser", @@ -1438,7 +1436,7 @@ dependencies = [ "sha3", "soroban-builtin-sdk-macros 25.2.1", "soroban-env-common 25.2.1", - "soroban-wasmi", + "soroban-wasmi 0.31.1-soroban.20.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "static_assertions", "stellar-strkey", "wasmparser", @@ -1447,8 +1445,7 @@ dependencies = [ [[package]] name = "soroban-env-host" version = "26.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e79a448f576e268a9440b1bcbef76ce36580edb6d7efd302f2536f49cbde9d8" +source = "git+https://github.com/sisuresh/rs-soroban-env.git?rev=8c8a71a83a2459474b587a9a4622274cf8e8c56e#8c8a71a83a2459474b587a9a4622274cf8e8c56e" dependencies = [ "ark-bls12-381 0.5.0", "ark-bn254 0.5.0", @@ -1475,7 +1472,7 @@ dependencies = [ "sha3", "soroban-builtin-sdk-macros 26.0.0", "soroban-env-common 26.0.0", - "soroban-wasmi", + "soroban-wasmi 0.31.1-soroban.20.0.1 (git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0)", "static_assertions", "stellar-strkey", "wasmparser", @@ -1499,8 +1496,7 @@ dependencies = [ [[package]] name = "soroban-env-macros" version = "26.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8919ab9519abe94bc40150efcb6daebf22527bd6ef869972b0362733770feb90" +source = "git+https://github.com/sisuresh/rs-soroban-env.git?rev=8c8a71a83a2459474b587a9a4622274cf8e8c56e#8c8a71a83a2459474b587a9a4622274cf8e8c56e" dependencies = [ "itertools 0.13.0", "proc-macro2", @@ -1527,8 +1523,7 @@ dependencies = [ [[package]] name = "soroban-simulation" version = "26.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d69132016b4bb803c9c6d0f0e3e6fe1fc543df6837ae79fa61a199ad66acdf" +source = "git+https://github.com/sisuresh/rs-soroban-env.git?rev=8c8a71a83a2459474b587a9a4622274cf8e8c56e#8c8a71a83a2459474b587a9a4622274cf8e8c56e" dependencies = [ "anyhow", "rand", @@ -1545,8 +1540,20 @@ checksum = "710403de32d0e0c35375518cb995d4fc056d0d48966f2e56ea471b8cb8fc9719" dependencies = [ "smallvec", "spin", - "wasmi_arena", - "wasmi_core", + "wasmi_arena 0.4.1", + "wasmi_core 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmparser-nostd", +] + +[[package]] +name = "soroban-wasmi" +version = "0.31.1-soroban.20.0.1" +source = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0" +dependencies = [ + "smallvec", + "spin", + "wasmi_arena 0.4.0", + "wasmi_core 0.13.0 (git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0)", "wasmparser-nostd", ] @@ -1786,6 +1793,11 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "wasmi_arena" +version = "0.4.0" +source = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0" + [[package]] name = "wasmi_arena" version = "0.4.1" @@ -1804,6 +1816,17 @@ dependencies = [ "paste", ] +[[package]] +name = "wasmi_core" +version = "0.13.0" +source = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0" +dependencies = [ + "downcast-rs", + "libm", + "num-traits", + "paste", +] + [[package]] name = "wasmparser" version = "0.116.1" diff --git a/Cargo.toml b/Cargo.toml index cde7de82f..7a2f6e9ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,6 +16,8 @@ version = "=25.2.1" [workspace.dependencies.soroban-env-host-curr] package = "soroban-env-host" version = "=26.0.0" +git = "https://github.com/sisuresh/rs-soroban-env.git" +rev = "8c8a71a83a2459474b587a9a4622274cf8e8c56e" [workspace.dependencies.soroban-simulation-prev] package = "soroban-simulation" @@ -25,6 +27,8 @@ version = "=25.2.1" package = "soroban-simulation" version = "=26.0.0" features = [ "unstable-next-api" ] +git = "https://github.com/sisuresh/rs-soroban-env.git" +rev = "8c8a71a83a2459474b587a9a4622274cf8e8c56e" [workspace.dependencies.stellar-xdr] version = "=26.0.0" diff --git a/cmd/stellar-rpc/internal/integrationtest/infrastructure/test.go b/cmd/stellar-rpc/internal/integrationtest/infrastructure/test.go index bbdf733a0..d81bdff20 100644 --- a/cmd/stellar-rpc/internal/integrationtest/infrastructure/test.go +++ b/cmd/stellar-rpc/internal/integrationtest/infrastructure/test.go @@ -433,7 +433,7 @@ func (i *Test) waitForRPC() { i.t.Logf("getHealth: %+v; err: %v", result, err) return err == nil && result.Status == "healthy" }, - 30*time.Second, + 60*time.Second, time.Second, fmt.Sprintf("RPC never got healthy: %+v", err), ) From 42befcbde854554f7179daf29e4537c6e55ba6b5 Mon Sep 17 00:00:00 2001 From: George Date: Fri, 27 Mar 2026 12:25:13 -0700 Subject: [PATCH 4/4] Bump to official patched env --- Cargo.lock | 77 +++++++++++++++++++----------------------------------- Cargo.toml | 8 ++---- 2 files changed, 29 insertions(+), 56 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e3cf107be..e27fd9717 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1061,9 +1061,9 @@ dependencies = [ "serde_json", "sha2", "soroban-env-host 25.2.1", - "soroban-env-host 26.0.0", + "soroban-env-host 26.0.1", "soroban-simulation 25.2.1", - "soroban-simulation 26.0.0", + "soroban-simulation 26.0.1", ] [[package]] @@ -1361,8 +1361,9 @@ dependencies = [ [[package]] name = "soroban-builtin-sdk-macros" -version = "26.0.0" -source = "git+https://github.com/sisuresh/rs-soroban-env.git?rev=8c8a71a83a2459474b587a9a4622274cf8e8c56e#8c8a71a83a2459474b587a9a4622274cf8e8c56e" +version = "26.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e38f0269c20b3c4c3aa2198b5460c72837e0361295a46b914adbcad67fa83d48" dependencies = [ "itertools 0.13.0", "proc-macro2", @@ -1382,7 +1383,7 @@ dependencies = [ "num-derive", "num-traits", "soroban-env-macros 25.2.1", - "soroban-wasmi 0.31.1-soroban.20.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "soroban-wasmi", "static_assertions", "stellar-xdr 25.0.0", "wasmparser", @@ -1390,16 +1391,17 @@ dependencies = [ [[package]] name = "soroban-env-common" -version = "26.0.0" -source = "git+https://github.com/sisuresh/rs-soroban-env.git?rev=8c8a71a83a2459474b587a9a4622274cf8e8c56e#8c8a71a83a2459474b587a9a4622274cf8e8c56e" +version = "26.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77b15a125a4ec51eeee94cfa58ac3e4f29e7f5426e7f4692a1b119ee60d83a06" dependencies = [ "arbitrary", "crate-git-revision", "ethnum", "num-derive", "num-traits", - "soroban-env-macros 26.0.0", - "soroban-wasmi 0.31.1-soroban.20.0.1 (git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0)", + "soroban-env-macros 26.0.1", + "soroban-wasmi", "static_assertions", "stellar-xdr 26.0.0", "wasmparser", @@ -1436,7 +1438,7 @@ dependencies = [ "sha3", "soroban-builtin-sdk-macros 25.2.1", "soroban-env-common 25.2.1", - "soroban-wasmi 0.31.1-soroban.20.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "soroban-wasmi", "static_assertions", "stellar-strkey", "wasmparser", @@ -1444,8 +1446,9 @@ dependencies = [ [[package]] name = "soroban-env-host" -version = "26.0.0" -source = "git+https://github.com/sisuresh/rs-soroban-env.git?rev=8c8a71a83a2459474b587a9a4622274cf8e8c56e#8c8a71a83a2459474b587a9a4622274cf8e8c56e" +version = "26.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb9c9c66b62af1179dc6265000bb4356caf0b67225568f64f39bd4194925917a" dependencies = [ "ark-bls12-381 0.5.0", "ark-bn254 0.5.0", @@ -1470,9 +1473,9 @@ dependencies = [ "sec1", "sha2", "sha3", - "soroban-builtin-sdk-macros 26.0.0", - "soroban-env-common 26.0.0", - "soroban-wasmi 0.31.1-soroban.20.0.1 (git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0)", + "soroban-builtin-sdk-macros 26.0.1", + "soroban-env-common 26.0.1", + "soroban-wasmi", "static_assertions", "stellar-strkey", "wasmparser", @@ -1495,8 +1498,9 @@ dependencies = [ [[package]] name = "soroban-env-macros" -version = "26.0.0" -source = "git+https://github.com/sisuresh/rs-soroban-env.git?rev=8c8a71a83a2459474b587a9a4622274cf8e8c56e#8c8a71a83a2459474b587a9a4622274cf8e8c56e" +version = "26.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d075b3654119b6dac81abd0f8c2f29cdba36edbda102b3c8c3d5f029f099790" dependencies = [ "itertools 0.13.0", "proc-macro2", @@ -1522,12 +1526,13 @@ dependencies = [ [[package]] name = "soroban-simulation" -version = "26.0.0" -source = "git+https://github.com/sisuresh/rs-soroban-env.git?rev=8c8a71a83a2459474b587a9a4622274cf8e8c56e#8c8a71a83a2459474b587a9a4622274cf8e8c56e" +version = "26.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1c41d175319195b42d89d63d5eecf6c4dd223ba77e9c01c7c6e932e48bdd81b" dependencies = [ "anyhow", "rand", - "soroban-env-host 26.0.0", + "soroban-env-host 26.0.1", "static_assertions", "thiserror", ] @@ -1540,20 +1545,8 @@ checksum = "710403de32d0e0c35375518cb995d4fc056d0d48966f2e56ea471b8cb8fc9719" dependencies = [ "smallvec", "spin", - "wasmi_arena 0.4.1", - "wasmi_core 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmparser-nostd", -] - -[[package]] -name = "soroban-wasmi" -version = "0.31.1-soroban.20.0.1" -source = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0" -dependencies = [ - "smallvec", - "spin", - "wasmi_arena 0.4.0", - "wasmi_core 0.13.0 (git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0)", + "wasmi_arena", + "wasmi_core", "wasmparser-nostd", ] @@ -1793,11 +1786,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "wasmi_arena" -version = "0.4.0" -source = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0" - [[package]] name = "wasmi_arena" version = "0.4.1" @@ -1816,17 +1804,6 @@ dependencies = [ "paste", ] -[[package]] -name = "wasmi_core" -version = "0.13.0" -source = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0" -dependencies = [ - "downcast-rs", - "libm", - "num-traits", - "paste", -] - [[package]] name = "wasmparser" version = "0.116.1" diff --git a/Cargo.toml b/Cargo.toml index 7a2f6e9ea..d57a5182e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,9 +15,7 @@ version = "=25.2.1" [workspace.dependencies.soroban-env-host-curr] package = "soroban-env-host" -version = "=26.0.0" -git = "https://github.com/sisuresh/rs-soroban-env.git" -rev = "8c8a71a83a2459474b587a9a4622274cf8e8c56e" +version = "=26.0.1" [workspace.dependencies.soroban-simulation-prev] package = "soroban-simulation" @@ -25,10 +23,8 @@ version = "=25.2.1" [workspace.dependencies.soroban-simulation-curr] package = "soroban-simulation" -version = "=26.0.0" +version = "=26.0.1" features = [ "unstable-next-api" ] -git = "https://github.com/sisuresh/rs-soroban-env.git" -rev = "8c8a71a83a2459474b587a9a4622274cf8e8c56e" [workspace.dependencies.stellar-xdr] version = "=26.0.0"