From 876e1c250e3d6359c6494a5cb697ee5024a4c0f8 Mon Sep 17 00:00:00 2001 From: George Date: Fri, 28 Feb 2025 15:07:12 -0800 Subject: [PATCH] Bump monorepo dependency to latest `protocol-23` branch (#362) * Bump image version to current futurenet * Fetch protocol-23 branch of monorepo It is known and intentional that the Go XDR is different than the Rust XDR (check-dependencies failing), because the Rust side (simulation et al.) is not ready yet, but we need RPC to not break on the new meta format. * Stop running P21 tests because checks fail: The stellar-core binary is 22.x.x but it supports Protocol 23, meaning version validation fails because 22 (core version) < 23 (minProtocolVersionSupported in the monorepo). This is a temporary pause. Once P23 is ready we will have P22 and P23 runs instead of P21 and 22, anyway. --- .github/workflows/stellar-rpc.yml | 5 ++--- cmd/stellar-rpc/internal/methods/send_transaction.go | 2 +- go.mod | 2 +- go.sum | 6 ++++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/stellar-rpc.yml b/.github/workflows/stellar-rpc.yml index f6ca14b3..063871e0 100644 --- a/.github/workflows/stellar-rpc.yml +++ b/.github/workflows/stellar-rpc.yml @@ -98,16 +98,15 @@ jobs: strategy: matrix: os: [ ubuntu-20.04, ubuntu-22.04 ] - protocol-version: [ 21, 22 ] + protocol-version: [ 22 ] runs-on: ${{ matrix.os }} env: STELLAR_RPC_INTEGRATION_TESTS_ENABLED: true STELLAR_RPC_INTEGRATION_TESTS_CORE_MAX_SUPPORTED_PROTOCOL: ${{ matrix.protocol-version }} STELLAR_RPC_INTEGRATION_TESTS_CAPTIVE_CORE_BIN: /usr/bin/stellar-core - PROTOCOL_21_CORE_DEBIAN_PKG_VERSION: 22.1.0-2194.0241e79f7.focal - PROTOCOL_21_CORE_DOCKER_IMG: stellar/stellar-core:22.1.0-2194.0241e79f7.focal PROTOCOL_22_CORE_DEBIAN_PKG_VERSION: 22.1.1-2251.ac9f21ac7.focal~do~not~use~in~prd PROTOCOL_22_CORE_DOCKER_IMG: stellar/unsafe-stellar-core:22.1.1-2251.ac9f21ac7.focal-do-not-use-in-prd + # TODO: Add a protocol 23 run once the builds are ready. steps: - uses: actions/checkout@v4 diff --git a/cmd/stellar-rpc/internal/methods/send_transaction.go b/cmd/stellar-rpc/internal/methods/send_transaction.go index 10bf833f..da3f2483 100644 --- a/cmd/stellar-rpc/internal/methods/send_transaction.go +++ b/cmd/stellar-rpc/internal/methods/send_transaction.go @@ -118,7 +118,7 @@ func NewSendTransactionHandler( } } - diagEvents := xdr.DiagnosticEvents{} + diagEvents := []xdr.DiagnosticEvent{} err = xdr.SafeUnmarshalBase64(resp.DiagnosticEvents, &diagEvents) if err != nil { logger.WithField("tx", request.Transaction). diff --git a/go.mod b/go.mod index fbe97525..f5349c41 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-20250206032706-4e70599a66af + github.com/stellar/go v0.0.0-20250227215244-b7b0b5e2a297 github.com/stretchr/testify v1.9.0 ) diff --git a/go.sum b/go.sum index 93e0484f..9af1482b 100644 --- a/go.sum +++ b/go.sum @@ -342,8 +342,10 @@ 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-20250206032706-4e70599a66af h1:yG64bllyRf+nCOEXgXHZ721pX+D6NgZnNL2e1pQTUCA= -github.com/stellar/go v0.0.0-20250206032706-4e70599a66af/go.mod h1:ewcAL4pit/jqFszQws9C2U6pwGSy4ZKZD3J/vvjCtgQ= +github.com/stellar/go v0.0.0-20250225004107-c5828bcf20c6 h1:tPV4hOYuez6mSAmLj1ErgVckrW3ov7/oXgt53W1VNq8= +github.com/stellar/go v0.0.0-20250225004107-c5828bcf20c6/go.mod h1:pIh0xYFVnaMP9fLnjFT7URY9Zhwy5wuc6tQkYybKkUY= +github.com/stellar/go v0.0.0-20250227215244-b7b0b5e2a297 h1:LdpVXwVgQ+wx0e6SdpVW3J4WkaHiXrhl+0uf0WIq4Lo= +github.com/stellar/go v0.0.0-20250227215244-b7b0b5e2a297/go.mod h1:pIh0xYFVnaMP9fLnjFT7URY9Zhwy5wuc6tQkYybKkUY= 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=