Merge branch 'feature/c-accounts' into philip/sdp-1863-sep45-handler

Conflicts:
  internal/services/sep45_service.go

Author: philipliu

go.list

@@ -3,21 +3,16 @@ cloud.google.com/go v0.114.0
 cloud.google.com/go/auth v0.5.1
 cloud.google.com/go/auth/oauth2adapt v0.2.2
 cloud.google.com/go/compute/metadata v0.3.0
-cloud.google.com/go/firestore v1.15.0
 cloud.google.com/go/iam v1.1.8
-cloud.google.com/go/longrunning v0.5.7
 cloud.google.com/go/pubsub v1.38.0
 cloud.google.com/go/storage v1.42.0
 filippo.io/edwards25519 v1.1.0
-firebase.google.com/go v3.12.0+incompatible
-github.com/2opremio/pretty v0.2.2-0.20230601220618-e1d5758b2a95
 github.com/BurntSushi/toml v1.3.2
 github.com/Masterminds/goutils v1.1.1
 github.com/Masterminds/semver/v3 v3.2.0
 github.com/Masterminds/sprig/v3 v3.2.3
 github.com/Masterminds/squirrel v1.5.4
 github.com/Microsoft/go-winio v0.6.1
-github.com/adjust/goautoneg v0.0.0-20150426214442-d788f35a0315
 github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f
 github.com/alecthomas/kingpin/v2 v2.4.0
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137
@@ -53,12 +48,10 @@ github.com/beorn7/perks v1.0.1
 github.com/bgentry/speakeasy v0.1.0
 github.com/buger/goreplay v1.3.2
 github.com/cenkalti/backoff/v4 v4.3.0
-github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d
 github.com/cespare/xxhash/v2 v2.3.0
 github.com/chzyer/logex v1.2.1
 github.com/chzyer/readline v1.5.1
 github.com/chzyer/test v1.0.0
-github.com/containerd/log v0.1.0
 github.com/cpuguy83/go-md2man/v2 v2.0.6
 github.com/creachadair/jrpc2 v1.3.1
 github.com/creachadair/mds v0.23.0
@@ -68,13 +61,8 @@ github.com/denisenkom/go-mssqldb v0.9.0
 github.com/dgraph-io/ristretto v0.2.0
 github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da
 github.com/dimchansky/utfbom v1.1.1
-github.com/distribution/reference v0.6.0
 github.com/djherbis/fscache v0.10.1
-github.com/docker/docker v27.0.3+incompatible
-github.com/docker/go-connections v0.5.0
-github.com/docker/go-units v0.5.0
 github.com/dustin/go-humanize v1.0.1
-github.com/elazarl/go-bindata-assetfs v1.0.1
 github.com/fatih/color v1.13.0
 github.com/fatih/structs v1.0.0
 github.com/felixge/httpsnoop v1.0.4
@@ -84,7 +72,6 @@ github.com/fsnotify/fsnotify v1.9.0
 github.com/fsouza/fake-gcs-server v1.49.2
 github.com/fxamacker/cbor/v2 v2.9.0
 github.com/gavv/monotime v0.0.0-20161010190848-47d58efa6955
-github.com/getsentry/raven-go v0.2.0
 github.com/getsentry/sentry-go v0.39.0
 github.com/go-chi/chi v4.1.2+incompatible
 github.com/go-chi/chi/v5 v5.2.3
@@ -102,8 +89,6 @@ github.com/gobuffalo/packd v1.0.2
 github.com/gocarina/gocsv v0.0.0-20230616125104-99d496ca653d
 github.com/godror/godror v0.40.4
 github.com/godror/knownpb v0.1.1
-github.com/gogo/protobuf v1.3.2
-github.com/golang-jwt/jwt v3.2.2+incompatible
 github.com/golang-jwt/jwt/v4 v4.5.2
 github.com/golang-jwt/jwt/v5 v5.3.0
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe
@@ -123,7 +108,6 @@ github.com/googleapis/gax-go/v2 v2.12.4
 github.com/gorilla/handlers v1.5.2
 github.com/gorilla/mux v1.8.1
 github.com/gorilla/schema v1.4.1
-github.com/graph-gophers/graphql-go v1.3.0
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0
 github.com/guregu/null v4.0.0+incompatible
 github.com/hashicorp/errwrap v1.1.0
@@ -162,19 +146,14 @@ github.com/mattn/go-isatty v0.0.17
 github.com/mattn/go-oci8 v0.1.1
 github.com/mattn/go-runewidth v0.0.9
 github.com/mattn/go-sqlite3 v1.14.22
-github.com/matttproud/golang_protobuf_extensions v1.0.4
 github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0
 github.com/mitchellh/cli v1.1.5
 github.com/mitchellh/copystructure v1.2.0
 github.com/mitchellh/go-homedir v1.1.0
 github.com/mitchellh/mapstructure v1.5.0
 github.com/mitchellh/reflectwalk v1.0.2
-github.com/moby/docker-image-spec v1.3.1
-github.com/moby/term v0.5.0
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
 github.com/modern-go/reflect2 v1.0.2
-github.com/montanaflynn/stats v0.7.1
-github.com/morikuni/aec v1.0.0
 github.com/moul/http2curl v0.0.0-20161031194548-4e24498b31db
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
@@ -185,9 +164,6 @@ github.com/nyaruka/phonenumbers v1.6.7
 github.com/olekukonko/tablewriter v0.0.5
 github.com/onsi/ginkgo v1.16.5
 github.com/onsi/gomega v1.27.10
-github.com/opencontainers/go-digest v1.0.0
-github.com/opencontainers/image-spec v1.1.0
-github.com/opentracing/opentracing-go v1.1.0
 github.com/pelletier/go-toml v1.9.5
 github.com/pelletier/go-toml/v2 v2.2.4
 github.com/pingcap/errors v0.11.4
@@ -211,19 +187,15 @@ github.com/sendgrid/rest v2.6.9+incompatible
 github.com/sendgrid/sendgrid-go v3.16.1+incompatible
 github.com/sergi/go-diff v1.3.1
 github.com/shopspring/decimal v1.4.0
-github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c
 github.com/sirupsen/logrus v1.9.3
 github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8
 github.com/spf13/afero v1.15.0
 github.com/spf13/cast v1.10.0
 github.com/spf13/cobra v1.10.1
 github.com/spf13/pflag v1.0.10
 github.com/spf13/viper v1.21.0
-github.com/stellar/go v0.0.0-20240924182550-69667b25baf4
-github.com/stellar/go-stellar-sdk v0.0.0-20251125023429-4c8c6f69a699
+github.com/stellar/go-stellar-sdk v0.0.0-20251125210943-4134368d57d8
 github.com/stellar/go-xdr v0.0.0-20231122183749-b53fb00bcac2
-github.com/stellar/stellar-rpc v0.9.6-0.20250130160539-be7702aa01ba
-github.com/stellar/throttled v2.2.3-0.20190823235211-89d75816f59d+incompatible
 github.com/stretchr/objx v0.5.2
 github.com/stretchr/testify v1.11.1
 github.com/subosito/gotenv v1.6.0
@@ -275,7 +247,6 @@ golang.org/x/time v0.5.0
 golang.org/x/tools v0.38.0
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
 google.golang.org/api v0.183.0
-google.golang.org/appengine v1.6.8
 google.golang.org/genproto v0.0.0-20240528184218-531527333157
 google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094
@@ -286,10 +257,8 @@ gopkg.in/djherbis/atime.v1 v1.0.0
 gopkg.in/djherbis/stream.v1 v1.3.1
 gopkg.in/gavv/httpexpect.v1 v1.0.0-20170111145843-40724cf1e4a0
 gopkg.in/ini.v1 v1.67.0
-gopkg.in/square/go-jose.v2 v2.4.1
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7
 gopkg.in/tylerb/graceful.v1 v1.2.15
 gopkg.in/yaml.v2 v2.4.0
 gopkg.in/yaml.v3 v3.0.1
-gotest.tools/v3 v3.5.1
 honnef.co/go/tools v0.5.1

go.mod

@@ -36,8 +36,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.10.1
 	github.com/spf13/viper v1.21.0
-	github.com/stellar/go-stellar-sdk v0.0.0-20251125023429-4c8c6f69a699
-	github.com/stellar/stellar-rpc v0.9.6-0.20250130160539-be7702aa01ba
+	github.com/stellar/go-stellar-sdk v0.0.0-20251125210943-4134368d57d8
 	github.com/stretchr/testify v1.11.1
 	github.com/twilio/twilio-go v1.28.7
 	github.com/veraison/go-cose v1.3.0
@@ -88,13 +87,13 @@ require (
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.66.1 // indirect
 	github.com/prometheus/procfs v0.16.1 // indirect
+	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/sagikazarmark/locafero v0.11.0 // indirect
 	github.com/segmentio/go-loggly v0.5.1-0.20171222203950-eb91657e62b2 // indirect
 	github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
 	github.com/spf13/afero v1.15.0 // indirect
 	github.com/spf13/cast v1.10.0 // indirect
 	github.com/spf13/pflag v1.0.10 // indirect
-	github.com/stellar/go v0.0.0-20240924182550-69667b25baf4 // indirect
 	github.com/stellar/go-xdr v0.0.0-20231122183749-b53fb00bcac2 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect

go.sum

@@ -227,14 +227,10 @@ github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
 github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU=
 github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY=
-github.com/stellar/go v0.0.0-20240924182550-69667b25baf4 h1:Kd4ivg3hCG8AfFQpxjUjhEXKc40Ux+piUWL03dBB/sw=
-github.com/stellar/go v0.0.0-20240924182550-69667b25baf4/go.mod h1:rrFK7a8i2h9xad9HTfnSN/dTNEqXVHKAbkFeR7UxAgs=
-github.com/stellar/go-stellar-sdk v0.0.0-20251125023429-4c8c6f69a699 h1:PDtrI3oIER3Nm13LxPRknkQbbRp6Gt8nqD49hq53mOE=
-github.com/stellar/go-stellar-sdk v0.0.0-20251125023429-4c8c6f69a699/go.mod h1:fZPcxQZw1I0zZ+X76uFcVPqmQCaYbWc87lDFW/kQJaY=
+github.com/stellar/go-stellar-sdk v0.0.0-20251125210943-4134368d57d8 h1:veTRtwYVr3262XvqBVZeHRUCJXKptIg0U7BOJjHN7Gw=
+github.com/stellar/go-stellar-sdk v0.0.0-20251125210943-4134368d57d8/go.mod h1:fZPcxQZw1I0zZ+X76uFcVPqmQCaYbWc87lDFW/kQJaY=
 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/stellar/stellar-rpc v0.9.6-0.20250130160539-be7702aa01ba h1:fCKETMnEBI2CDo2cUDoZsJUpTnpK5H2aDFoCfozyzIM=
-github.com/stellar/stellar-rpc v0.9.6-0.20250130160539-be7702aa01ba/go.mod h1:V5NPV4kvf2VGU8iRm8l6cAP3kWA/9B2NGKRkrbKBmpA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=

internal/services/sep45_service.go

@@ -18,10 +18,10 @@ import (
 	"github.com/stellar/go-stellar-sdk/clients/stellartoml"
 	"github.com/stellar/go-stellar-sdk/keypair"
 	"github.com/stellar/go-stellar-sdk/network"
+	protocol "github.com/stellar/go-stellar-sdk/protocols/rpc"
 	"github.com/stellar/go-stellar-sdk/strkey"
 	"github.com/stellar/go-stellar-sdk/txnbuild"
 	"github.com/stellar/go-stellar-sdk/xdr"
-	"github.com/stellar/stellar-rpc/protocol"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/sdpcontext"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/sepauth"

internal/services/sep45_service_test.go

@@ -9,9 +9,9 @@ import (
 	"github.com/stellar/go-stellar-sdk/clients/stellartoml"
 	"github.com/stellar/go-stellar-sdk/keypair"
 	"github.com/stellar/go-stellar-sdk/network"
+	protocol "github.com/stellar/go-stellar-sdk/protocols/rpc"
 	"github.com/stellar/go-stellar-sdk/strkey"
 	"github.com/stellar/go-stellar-sdk/xdr"
-	"github.com/stellar/stellar-rpc/protocol"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"

internal/stellar/mocks/rpc_client.go

@@ -6,7 +6,7 @@ import (
 	"slices"
 	"strings"
 
-	"github.com/stellar/stellar-rpc/protocol"
+	protocol "github.com/stellar/go-stellar-sdk/protocols/rpc"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/utils"
 )

internal/stellar/rpc.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/stellar/stellar-rpc/client"
-	"github.com/stellar/stellar-rpc/protocol"
+	client "github.com/stellar/go-stellar-sdk/clients/rpcclient"
+	protocol "github.com/stellar/go-stellar-sdk/protocols/rpc"
 )
 
 type RPCClientWrapper struct {

internal/stellar/rpc_client.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/stellar/stellar-rpc/protocol"
+	protocol "github.com/stellar/go-stellar-sdk/protocols/rpc"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

internal/stellar/rpc_client_test.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/stellar/stellar-rpc/protocol"
+	protocol "github.com/stellar/go-stellar-sdk/protocols/rpc"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )