Minimal fixes to get tests passing

philipliu · philipliu · commit a6a6b6bffdf2 · 2025-11-27T20:52:48.000-05:00
diff --git a/go.mod b/go.mod
@@ -36,7 +36,6 @@ 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 v0.0.0-20240924182550-69667b25baf4
 	github.com/stellar/go-stellar-sdk v0.0.0-20251125023429-4c8c6f69a699
 	github.com/stellar/stellar-rpc v0.9.6-0.20250130160539-be7702aa01ba
 	github.com/stretchr/testify v1.11.1
@@ -95,6 +94,7 @@ require (
 	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
diff --git a/internal/data/embedded_wallet.go b/internal/data/embedded_wallet.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/lib/pq"
-	"github.com/stellar/go/strkey"
+	"github.com/stellar/go-stellar-sdk/strkey"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/db"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/utils"
diff --git a/internal/dependencyinjection/embedded_wallet_service.go b/internal/dependencyinjection/embedded_wallet_service.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/stellar/go/support/log"
+	"github.com/stellar/go-stellar-sdk/support/log"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/data"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/services"
diff --git a/internal/dependencyinjection/rpc_client.go b/internal/dependencyinjection/rpc_client.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/stellar/go/support/log"
+	"github.com/stellar/go-stellar-sdk/support/log"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/stellar"
 )
diff --git a/internal/dependencyinjection/webauthn_service.go b/internal/dependencyinjection/webauthn_service.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/stellar/go/support/log"
+	"github.com/stellar/go-stellar-sdk/support/log"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/db"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/data"
diff --git a/internal/scheduler/jobs/sponsored_transaction_from_submitter_job.go b/internal/scheduler/jobs/sponsored_transaction_from_submitter_job.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/stellar/go/support/log"
+	"github.com/stellar/go-stellar-sdk/support/log"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/db"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/data"
diff --git a/internal/scheduler/jobs/sponsored_transactions_to_submitter_job.go b/internal/scheduler/jobs/sponsored_transactions_to_submitter_job.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/stellar/go/support/log"
+	"github.com/stellar/go-stellar-sdk/support/log"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/db"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/data"
diff --git a/internal/scheduler/jobs/wallet_creation_from_submitter_job.go b/internal/scheduler/jobs/wallet_creation_from_submitter_job.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/stellar/go/support/log"
+	"github.com/stellar/go-stellar-sdk/support/log"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/db"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/data"
diff --git a/internal/scheduler/jobs/wallet_creation_to_submitter_job.go b/internal/scheduler/jobs/wallet_creation_to_submitter_job.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/stellar/go/support/log"
+	"github.com/stellar/go-stellar-sdk/support/log"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/db"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/data"
diff --git a/internal/serve/httphandler/passkey_handler.go b/internal/serve/httphandler/passkey_handler.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/go-webauthn/webauthn/protocol"
-	"github.com/stellar/go/support/http/httpdecode"
-	"github.com/stellar/go/support/render/httpjson"
+	"github.com/stellar/go-stellar-sdk/support/http/httpdecode"
+	"github.com/stellar/go-stellar-sdk/support/render/httpjson"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/data"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/serve/httperror"
diff --git a/internal/serve/httphandler/receiver_wallets_handler.go b/internal/serve/httphandler/receiver_wallets_handler.go
@@ -20,6 +20,7 @@ import (
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/serve/httperror"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/serve/validators"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/utils"
+	"github.com/stellar/stellar-disbursement-platform-backend/pkg/schema"
 )
 
 type RetryInvitationMessageResponse struct {
diff --git a/internal/serve/httphandler/rpc_proxy_handler.go b/internal/serve/httphandler/rpc_proxy_handler.go
@@ -7,7 +7,7 @@ import (
 	"net/http/httputil"
 	"net/url"
 
-	"github.com/stellar/go/support/log"
+	"github.com/stellar/go-stellar-sdk/support/log"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/serve/httperror"
 )
diff --git a/internal/serve/httphandler/sponsored_transaction_handler.go b/internal/serve/httphandler/sponsored_transaction_handler.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 
 	"github.com/go-chi/chi/v5"
-	"github.com/stellar/go/support/http/httpdecode"
-	"github.com/stellar/go/support/render/httpjson"
-	"github.com/stellar/go/xdr"
+	"github.com/stellar/go-stellar-sdk/support/http/httpdecode"
+	"github.com/stellar/go-stellar-sdk/support/render/httpjson"
+	"github.com/stellar/go-stellar-sdk/xdr"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/data"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/sdpcontext"
diff --git a/internal/serve/httphandler/wallet_creation_handler.go b/internal/serve/httphandler/wallet_creation_handler.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	"github.com/go-chi/chi/v5"
-	"github.com/stellar/go/support/http/httpdecode"
-	"github.com/stellar/go/support/render/httpjson"
+	"github.com/stellar/go-stellar-sdk/support/http/httpdecode"
+	"github.com/stellar/go-stellar-sdk/support/render/httpjson"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/data"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/serve/httperror"
diff --git a/internal/serve/middleware/wallet_auth_middleware.go b/internal/serve/middleware/wallet_auth_middleware.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/stellar/go/support/log"
+	"github.com/stellar/go-stellar-sdk/support/log"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/sdpcontext"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/serve/httperror"
diff --git a/internal/serve/serve.go b/internal/serve/serve.go
@@ -31,6 +31,7 @@ import (
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/serve/sep24frontend"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/serve/validators"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/services"
+	"github.com/stellar/stellar-disbursement-platform-backend/internal/stellar"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/transactionsubmission/engine"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/utils"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/wallet"
diff --git a/internal/services/sep45_service.go b/internal/services/sep45_service.go
@@ -11,11 +11,11 @@ import (
 	"slices"
 	"strings"
 
-	"github.com/stellar/go/clients/stellartoml"
-	"github.com/stellar/go/keypair"
-	"github.com/stellar/go/strkey"
-	"github.com/stellar/go/txnbuild"
-	"github.com/stellar/go/xdr"
+	"github.com/stellar/go-stellar-sdk/clients/stellartoml"
+	"github.com/stellar/go-stellar-sdk/keypair"
+	"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"
diff --git a/internal/services/sep45_service_test.go b/internal/services/sep45_service_test.go
@@ -6,11 +6,11 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/stellar/go/clients/stellartoml"
-	"github.com/stellar/go/keypair"
-	"github.com/stellar/go/network"
-	"github.com/stellar/go/strkey"
-	"github.com/stellar/go/xdr"
+	"github.com/stellar/go-stellar-sdk/clients/stellartoml"
+	"github.com/stellar/go-stellar-sdk/keypair"
+	"github.com/stellar/go-stellar-sdk/network"
+	"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"
diff --git a/internal/services/sponsored_transaction_from_submitter_service.go b/internal/services/sponsored_transaction_from_submitter_service.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/stellar/go/support/log"
+	"github.com/stellar/go-stellar-sdk/support/log"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/db"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/data"
diff --git a/internal/services/sponsored_transaction_from_submitter_service_test.go b/internal/services/sponsored_transaction_from_submitter_service_test.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/lib/pq"
+	"github.com/shopspring/decimal"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -183,7 +184,7 @@ func Test_SponsoredTransactionFromSubmitterService_SyncBatchTransactions(t *test
 			Payment: txSubStore.Payment{
 				AssetCode:   "USDC",
 				AssetIssuer: "GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-				Amount:      100,
+				Amount:      decimal.NewFromInt(100),
 				Destination: "GCLWGQPMKXQSPF776IU33AH4PZNOOWNAWGGKVTBQMIC5IMKUNP3E6NVU",
 			},
 			TenantID: testCtx.tenantID,
diff --git a/internal/services/sponsored_transactions_to_submitter_service.go b/internal/services/sponsored_transactions_to_submitter_service.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/stellar/go/support/log"
+	"github.com/stellar/go-stellar-sdk/support/log"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/db"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/data"
diff --git a/internal/services/sponsored_transactions_to_submitter_service_test.go b/internal/services/sponsored_transactions_to_submitter_service_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/stellar/go/strkey"
+	"github.com/stellar/go-stellar-sdk/strkey"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/db"
 	"github.com/stellar/stellar-disbursement-platform-backend/db/dbtest"
diff --git a/internal/services/wallet_creation_from_submitter_service.go b/internal/services/wallet_creation_from_submitter_service.go
@@ -8,10 +8,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/stellar/go/hash"
-	"github.com/stellar/go/strkey"
-	"github.com/stellar/go/support/log"
-	"github.com/stellar/go/xdr"
+	"github.com/stellar/go-stellar-sdk/hash"
+	"github.com/stellar/go-stellar-sdk/strkey"
+	"github.com/stellar/go-stellar-sdk/support/log"
+	"github.com/stellar/go-stellar-sdk/xdr"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/db"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/data"
diff --git a/internal/services/wallet_creation_from_submitter_service_test.go b/internal/services/wallet_creation_from_submitter_service_test.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/lib/pq"
-	"github.com/stellar/go/strkey"
+	"github.com/shopspring/decimal"
+	"github.com/stellar/go-stellar-sdk/strkey"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -186,7 +187,7 @@ func Test_WalletCreationFromSubmitterService_SyncBatchTransactions(t *testing.T)
 			Payment: txSubStore.Payment{
 				AssetCode:   "USDC",
 				AssetIssuer: "GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-				Amount:      100,
+				Amount:      decimal.NewFromInt(100),
 				Destination: "GCLWGQPMKXQSPF776IU33AH4PZNOOWNAWGGKVTBQMIC5IMKUNP3E6NVU",
 			},
 			TenantID: testCtx.tenantID,
diff --git a/internal/services/wallet_creation_to_submitter_service.go b/internal/services/wallet_creation_to_submitter_service.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/stellar/go/support/log"
+	"github.com/stellar/go-stellar-sdk/support/log"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/db"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/data"
diff --git a/internal/transactionsubmission/payment_transaction_handler.go b/internal/transactionsubmission/payment_transaction_handler.go
@@ -3,11 +3,10 @@ package transactionsubmission
 import (
 	"context"
 	"fmt"
-	"strconv"
 	"strings"
 
-	"github.com/stellar/go/strkey"
-	"github.com/stellar/go/txnbuild"
+	"github.com/stellar/go-stellar-sdk/strkey"
+	"github.com/stellar/go-stellar-sdk/txnbuild"
 
 	sdpMonitor "github.com/stellar/stellar-disbursement-platform-backend/internal/monitor"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/transactionsubmission/engine"
@@ -58,7 +57,7 @@ func (h *PaymentTransactionHandler) BuildInnerTransaction(ctx context.Context, t
 
 	var operation txnbuild.Operation
 	var txMemo txnbuild.Memo
-	amount := strconv.FormatFloat(txJob.Transaction.Amount, 'f', 6, 32)
+	amount := txJob.Transaction.Amount.StringFixed(6)
 
 	if strkey.IsValidEd25519PublicKey(txJob.Transaction.Destination) {
 		memo, err := txJob.Transaction.BuildMemo()
diff --git a/internal/transactionsubmission/payment_transaction_handler_test.go b/internal/transactionsubmission/payment_transaction_handler_test.go
@@ -3,16 +3,15 @@ package transactionsubmission
 import (
 	"context"
 	"database/sql"
-	"strconv"
 	"strings"
 	"testing"
 	"time"
 
-	"github.com/stellar/go/clients/horizonclient"
-	"github.com/stellar/go/keypair"
-	"github.com/stellar/go/network"
-	"github.com/stellar/go/strkey"
-	"github.com/stellar/go/txnbuild"
+	"github.com/stellar/go-stellar-sdk/clients/horizonclient"
+	"github.com/stellar/go-stellar-sdk/keypair"
+	"github.com/stellar/go-stellar-sdk/network"
+	"github.com/stellar/go-stellar-sdk/strkey"
+	"github.com/stellar/go-stellar-sdk/txnbuild"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
@@ -262,7 +261,7 @@ func Test_PaymentHandler_BuildInnerTransaction(t *testing.T) {
 				}
 
 				var operation txnbuild.Operation
-				amount := strconv.FormatFloat(txJob.Transaction.Amount, 'f', 6, 32)
+				amount := txJob.Transaction.Amount.StringFixed(6)
 				if strkey.IsValidEd25519PublicKey(tc.destinationAddress) {
 					operation = &txnbuild.Payment{
 						SourceAccount: distributionKP.Address(),
diff --git a/internal/transactionsubmission/scripts/tss_loadtest.go b/internal/transactionsubmission/scripts/tss_loadtest.go
@@ -10,9 +10,10 @@ import (
 	"sort"
 	"time"
 
-	"github.com/stellar/go/clients/horizonclient"
-	"github.com/stellar/go/protocols/horizon"
-	"github.com/stellar/go/support/log"
+	"github.com/shopspring/decimal"
+	"github.com/stellar/go-stellar-sdk/clients/horizonclient"
+	"github.com/stellar/go-stellar-sdk/protocols/horizon"
+	"github.com/stellar/go-stellar-sdk/support/log"
 
 	"github.com/stellar/stellar-disbursement-platform-backend/db"
 	"github.com/stellar/stellar-disbursement-platform-backend/internal/serve/httpclient"
@@ -195,7 +196,7 @@ func createPaymentTransactions(ctx context.Context, txModel *store.TransactionMo
 			Payment: store.Payment{
 				AssetCode:   assetCode,
 				AssetIssuer: assetIssuer,
-				Amount:      0.1,
+				Amount:      decimal.NewFromFloat(0.1),
 				Destination: destination,
 			},
 			TenantID: tenantID,
diff --git a/internal/transactionsubmission/sponsored_transaction_handler.go b/internal/transactionsubmission/sponsored_transaction_handler.go
@@ -5,9 +5,9 @@ import (
 	"encoding/base64"
 	"fmt"
 
-	"github.com/stellar/go/strkey"
-	"github.com/stellar/go/txnbuild"
-	"github.com/stellar/go/xdr"
+	"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"
 
 	sdpMonitor "github.com/stellar/stellar-disbursement-platform-backend/internal/monitor"
diff --git a/internal/transactionsubmission/sponsored_transaction_handler_test.go b/internal/transactionsubmission/sponsored_transaction_handler_test.go
@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stellar/go/strkey"
-	"github.com/stellar/go/txnbuild"
-	"github.com/stellar/go/xdr"
+	"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/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
diff --git a/internal/transactionsubmission/store/transactions.go b/internal/transactionsubmission/store/transactions.go
@@ -173,7 +173,7 @@ func (p *Payment) validate() error {
 			return fmt.Errorf("asset issuer %q is not a valid ed25519 public key", p.AssetIssuer)
 		}
 	}
-	if tx.Amount.LessThanOrEqual(decimal.Zero) {
+	if p.Amount.LessThanOrEqual(decimal.Zero) {
 		return fmt.Errorf("amount must be positive")
 	}
 	if !strkey.IsValidEd25519PublicKey(p.Destination) && !strkey.IsValidContractAddress(p.Destination) {
@@ -284,7 +284,7 @@ func (t *TransactionModel) BulkInsert(ctx context.Context, sqlExec db.SQLExecute
 			transaction.ExternalID,
 			sdpUtils.SQLNullString(transaction.AssetCode),
 			sdpUtils.SQLNullString(transaction.AssetIssuer),
-			sdpUtils.SQLNullFloat64(transaction.Amount),
+			sdpUtils.SQLNullNumeric(transaction.Amount),
 			sdpUtils.SQLNullString(transaction.Destination),
 			sdpUtils.SQLNullString(transaction.PublicKey),
 			sdpUtils.SQLNullString(transaction.WasmHash),
diff --git a/internal/transactionsubmission/transaction_handler.go b/internal/transactionsubmission/transaction_handler.go
diff --git a/internal/transactionsubmission/transaction_handler_mock.go b/internal/transactionsubmission/transaction_handler_mock.go
diff --git a/internal/transactionsubmission/transaction_worker.go b/internal/transactionsubmission/transaction_worker.go
diff --git a/internal/transactionsubmission/transaction_worker_test.go b/internal/transactionsubmission/transaction_worker_test.go
diff --git a/internal/transactionsubmission/wallet_creation_transaction_handler.go b/internal/transactionsubmission/wallet_creation_transaction_handler.go
diff --git a/internal/transactionsubmission/wallet_creation_transaction_handler_test.go b/internal/transactionsubmission/wallet_creation_transaction_handler_test.go
diff --git a/internal/utils/sql.go b/internal/utils/sql.go
diff --git a/internal/utils/xdr.go b/internal/utils/xdr.go
diff --git a/internal/utils/xdr_test.go b/internal/utils/xdr_test.go

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"fmt"`
`6`	`6`
`7`		`- "github.com/stellar/go/support/log"`
	`7`	`+ "github.com/stellar/go-stellar-sdk/support/log"`
`8`	`8`
`9`	`9`	`"github.com/stellar/stellar-disbursement-platform-backend/internal/stellar"`
`10`	`10`	`)`