Skip to content

Commit c97d648

Browse files
urvisavlaurvisavla
authored
Merge pull request #79 from stellar/protocol-next
Merge protocol-next back to main for release
2 parents 2456b82 + 6b13b06 commit c97d648

5 files changed

Lines changed: 22 additions & 15 deletions

File tree

‎.github/workflows/galexie.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
matrix:
1919
storage_type: [ GCS, S3, Filesystem ]
2020
env:
21-
CAPTIVE_CORE_DEBIAN_PKG_VERSION: 26.1.0-3210.427aa3978.noble
21+
CAPTIVE_CORE_DEBIAN_PKG_VERSION: 27.0.0-3288.7696c069d.noble
2222
GALEXIE_INTEGRATION_TESTS_ENABLED: "true"
2323
GALEXIE_INTEGRATION_TESTS_CAPTIVE_CORE_BIN: /usr/bin/stellar-core
2424
# this pins to a version of quickstart:testing that has the same version as GALEXIE_INTEGRATION_TESTS_CAPTIVE_CORE_BIN
@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-24.04
5656
env:
5757
# this is the version of core to be bundled with galaxie on image
58-
STELLAR_CORE_VERSION: 26.1.0-3210.427aa3978.noble
58+
STELLAR_CORE_VERSION: 27.0.0-3288.7696c069d.noble
5959
steps:
6060
- uses: actions/checkout@v5
6161
- name: Login to DockerHub

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
All notable changes to this project will be documented in this
44
file. This project adheres to [Semantic Versioning](http://semver.org/).
55

6+
## [v27.0.0]
7+
8+
### Updates
9+
- Bumped stellar-core version to v27.0.0 for Protocol 27 support ([#76](https://github.com/stellar/stellar-galexie/pull/76))
10+
- Bumped `go-stellar-sdk` to pick up Protocol 27 (CAP-0071) XDR ([#78](https://github.com/stellar/stellar-galexie/pull/78))
11+
- Bumped `go-xdr` (transitive) to raise default XDR decode depth from 250 to 1500, required for CAP-0071 delegated Soroban credential chains ([#76](https://github.com/stellar/stellar-galexie/pull/76))
12+
613
## [v26.0.0]
714

815
### Updates

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/spf13/cobra v1.7.0
2323
github.com/spf13/pflag v1.0.5
2424
github.com/spf13/viper v1.17.0
25-
github.com/stellar/go-xdr v0.0.0-20260312225820-cc2b0611aabf // indirect
25+
github.com/stellar/go-xdr v0.0.0-20260529210834-0bf8f4956364 // indirect
2626
github.com/stretchr/testify v1.11.1
2727
github.com/xdrpp/goxdr v0.1.1 // indirect
2828
google.golang.org/api v0.183.0 // indirect
@@ -33,7 +33,7 @@ require (
3333
github.com/docker/docker v28.0.0+incompatible
3434
github.com/docker/go-connections v0.5.0
3535
github.com/fsouza/fake-gcs-server v1.49.2
36-
github.com/stellar/go-stellar-sdk v0.4.0
36+
github.com/stellar/go-stellar-sdk v0.6.0
3737
)
3838

3939
require (

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -389,10 +389,10 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
389389
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
390390
github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI=
391391
github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI=
392-
github.com/stellar/go-stellar-sdk v0.4.0 h1:WBLeJk7EllU7WhwrTH1L5Mu2EhZor/xy5sVi/82JzNQ=
393-
github.com/stellar/go-stellar-sdk v0.4.0/go.mod h1:tLKAQPxa2I5UvGMabBbUXcY3fmgYnfDudrMeK7CDX4w=
394-
github.com/stellar/go-xdr v0.0.0-20260312225820-cc2b0611aabf h1:GY1RVbX3Hg7poPXEf6yojjP0hyypvgUgZmCqQU9D0xg=
395-
github.com/stellar/go-xdr v0.0.0-20260312225820-cc2b0611aabf/go.mod h1:If+U9Z1W5xU97VrOgJandQT+2dN7/iOpkCrxBJEyF80=
392+
github.com/stellar/go-stellar-sdk v0.6.0 h1:NM2oqZJQup0QxnJMq6C8s4iIIhU6rHFX0rlsF3wh/Ho=
393+
github.com/stellar/go-stellar-sdk v0.6.0/go.mod h1:IkcqcrE9UQi7n/1y+MxKB+7qzdjG1T2kGOD7Ss8dqjw=
394+
github.com/stellar/go-xdr v0.0.0-20260529210834-0bf8f4956364 h1:gOKrfuWdZ92LFlv0TAwgZ7OsWKeBsOMDlGLyFgduI1w=
395+
github.com/stellar/go-xdr v0.0.0-20260529210834-0bf8f4956364/go.mod h1:If+U9Z1W5xU97VrOgJandQT+2dN7/iOpkCrxBJEyF80=
396396
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
397397
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
398398
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=

‎test/integration_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ func (s *GalexieTestSuite) TestScanAndFill() {
187187
datastore, err := datastore.NewDataStore(s.ctx, s.config.DataStoreConfig)
188188
require.NoError(err)
189189

190-
_, err = datastore.GetFile(s.ctx, "FFFFFFFF--0-9/FFFFFFFA--5.xdr."+compressxdr.DefaultCompressor.Name())
190+
_, _, err = datastore.GetFile(s.ctx, "FFFFFFFF--0-9/FFFFFFFA--5.xdr."+compressxdr.DefaultCompressor.Name())
191191
require.NoError(err)
192192

193193
lastModified, err := datastore.GetFileLastModified(s.ctx, "FFFFFFFF--0-9/FFFFFFFA--5.xdr."+compressxdr.DefaultCompressor.Name())
@@ -209,7 +209,7 @@ func (s *GalexieTestSuite) TestScanAndFill() {
209209
require.NoError(err)
210210
require.Equal(lastModified, newLastModified)
211211

212-
_, err = datastore.GetFile(s.ctx, "FFFFFFFF--0-9/FFFFFFF6--9.xdr."+compressxdr.DefaultCompressor.Name())
212+
_, _, err = datastore.GetFile(s.ctx, "FFFFFFFF--0-9/FFFFFFF6--9.xdr."+compressxdr.DefaultCompressor.Name())
213213
require.NoError(err)
214214
}
215215

@@ -234,7 +234,7 @@ func (s *GalexieTestSuite) TestReplace() {
234234
datastore, err := datastore.NewDataStore(s.ctx, s.config.DataStoreConfig)
235235
require.NoError(err)
236236

237-
_, err = datastore.GetFile(s.ctx, "FFFFFFFF--0-9/FFFFFFFA--5.xdr."+compressxdr.DefaultCompressor.Name())
237+
_, _, err = datastore.GetFile(s.ctx, "FFFFFFFF--0-9/FFFFFFFA--5.xdr."+compressxdr.DefaultCompressor.Name())
238238
require.NoError(err)
239239

240240
lastModified, err := datastore.GetFileLastModified(s.ctx, "FFFFFFFF--0-9/FFFFFFFA--5.xdr."+compressxdr.DefaultCompressor.Name())
@@ -260,7 +260,7 @@ func (s *GalexieTestSuite) TestReplace() {
260260
require.NoError(err)
261261
require.NotEqual(lastModified, newLastModified)
262262

263-
_, err = datastore.GetFile(s.ctx, "FFFFFFFF--0-9/FFFFFFF6--9.xdr."+compressxdr.DefaultCompressor.Name())
263+
_, _, err = datastore.GetFile(s.ctx, "FFFFFFFF--0-9/FFFFFFF6--9.xdr."+compressxdr.DefaultCompressor.Name())
264264
require.NoError(err)
265265
}
266266

@@ -304,7 +304,7 @@ func (s *GalexieTestSuite) TestAppend() {
304304
require.NoError(err)
305305
require.Equal(lastModified, newLastModified, "file should not be modified on append of overlapping range")
306306

307-
_, err = datastore.GetFile(s.ctx, "FFFFFFFF--0-9/FFFFFFF6--9.xdr."+compressxdr.DefaultCompressor.Name())
307+
_, _, err = datastore.GetFile(s.ctx, "FFFFFFFF--0-9/FFFFFFF6--9.xdr."+compressxdr.DefaultCompressor.Name())
308308
require.NoError(err)
309309
}
310310

@@ -338,7 +338,7 @@ func (s *GalexieTestSuite) TestAppendUnbounded() {
338338
}()
339339

340340
require.EventuallyWithT(func(c *assert.CollectT) {
341-
_, getErr := datastore.GetFile(s.ctx, "FFFFFFF5--10-19/FFFFFFF0--15.xdr."+compressxdr.DefaultCompressor.Name())
341+
_, _, getErr := datastore.GetFile(s.ctx, "FFFFFFF5--10-19/FFFFFFF0--15.xdr."+compressxdr.DefaultCompressor.Name())
342342
assert.NoError(c, getErr)
343343
}, 180*time.Second, 50*time.Millisecond, "append unbounded did not work")
344344

@@ -378,7 +378,7 @@ func (s *GalexieTestSuite) TestAppendUnboundedSequenceNumber2() {
378378

379379
require.Eventually(
380380
func() bool {
381-
_, err := datastore.GetFile(
381+
_, _, err := datastore.GetFile(
382382
ctx,
383383
"FFFFFFFF--0-9/FFFFFFFD--2.xdr."+compressxdr.DefaultCompressor.Name(),
384384
)

0 commit comments

Comments
 (0)