diff --git a/.golangci.yml b/.golangci.yml index d5155295d..dd2cc9455 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -19,6 +19,13 @@ linters: - wrapcheck - wsl settings: + gomoddirectives: + # SPIKE: permit the go-stellar-sdk fork replace while + # github.com/stellar/go-stellar-sdk#5952 (CAP-0083 XDR regen) is unmerged. + # Remove this entry once the SDK lands a tagged release and the replace + # directive is dropped from go.mod. + replace-allow-list: + - github.com/stellar/go-stellar-sdk cyclop: max-complexity: 15 dogsled: diff --git a/Cargo.toml b/Cargo.toml index af9f5cf5e..1dfd8662f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,8 @@ version = "=27.0.0" version = "=27.0.0" # `type_enum` provides the `Type`/`TypeVariant` reflection enums used by # xdr2json. It was enabled by default in stellar-xdr v26 but is opt-in in v27. -features = ["serde", "type_enum"] +# `cap_0083` gates the Protocol 28 EmptyTxSet StellarValueType variant. +features = ["serde", "type_enum", "cap_0083"] [workspace.dependencies.rand] version = "0.8.5" diff --git a/go.mod b/go.mod index b2f97db58..65e7ad123 100644 --- a/go.mod +++ b/go.mod @@ -148,3 +148,5 @@ require ( gopkg.in/tylerb/graceful.v1 v1.2.15 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace github.com/stellar/go-stellar-sdk => github.com/sisuresh/go v0.0.0-20260615224455-9856e203eef4 diff --git a/go.sum b/go.sum index 0315adfb4..4bcbda47a 100644 --- a/go.sum +++ b/go.sum @@ -415,6 +415,8 @@ github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sisuresh/go v0.0.0-20260615224455-9856e203eef4 h1:ujXf2fqqwemcEwSG/i/Z2v5TxG8eaQLNm3HydlJM7HY= +github.com/sisuresh/go v0.0.0-20260615224455-9856e203eef4/go.mod h1:IkcqcrE9UQi7n/1y+MxKB+7qzdjG1T2kGOD7Ss8dqjw= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY= @@ -429,8 +431,6 @@ 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.6.0 h1:NM2oqZJQup0QxnJMq6C8s4iIIhU6rHFX0rlsF3wh/Ho= -github.com/stellar/go-stellar-sdk v0.6.0/go.mod h1:IkcqcrE9UQi7n/1y+MxKB+7qzdjG1T2kGOD7Ss8dqjw= github.com/stellar/go-xdr v0.0.0-20260529210834-0bf8f4956364 h1:gOKrfuWdZ92LFlv0TAwgZ7OsWKeBsOMDlGLyFgduI1w= github.com/stellar/go-xdr v0.0.0-20260529210834-0bf8f4956364/go.mod h1:If+U9Z1W5xU97VrOgJandQT+2dN7/iOpkCrxBJEyF80= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=