fix for proto migration

api/server/go.mod

@@ -85,7 +85,6 @@ require (
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
 	github.com/klauspost/compress v1.18.4 // indirect
 	github.com/lestrrat-go/blackmagic v1.0.4 // indirect
 	github.com/lestrrat-go/httpcc v1.0.1 // indirect
@@ -130,10 +129,12 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
-	go.opentelemetry.io/otel v1.39.0 // indirect
-	go.opentelemetry.io/otel/metric v1.39.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.39.0 // indirect
-	go.opentelemetry.io/otel/trace v1.39.0 // indirect
+	go.opentelemetry.io/otel v1.40.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect
+	go.opentelemetry.io/otel/metric v1.40.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
+	go.opentelemetry.io/otel/trace v1.40.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.9.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	golang.org/x/crypto v0.48.0 // indirect

api/server/go.sum

@@ -169,8 +169,8 @@ github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g
 github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
 github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
 github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
-github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
-github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
+github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0=
+github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
@@ -258,20 +258,20 @@ go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 h1:UP6IpuHFkUgOQL9FFQFrZ+5LiwhhYRbi7VZSIx6Nj5s=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0/go.mod h1:qxuZLtbq5QDtdeSHsS7bcf6EH6uO6jUAgk764zd3rhM=
-go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
-go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 h1:f0cb2XPmrqn4XMy9PNliTgRKJgS5WcL/u0/WRYGz4t0=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0/go.mod h1:vnakAaFckOMiMtOIhFI2MNH4FYrZzXCYxmb1LlhoGz8=
+go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms=
+go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 h1:QKdN8ly8zEMrByybbQgv8cWBcdAarwmIPZ6FThrWXJs=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0/go.mod h1:bTdK1nhqF76qiPoCCdyFIV+N/sRHYXYCTQc+3VCi3MI=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU=
-go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
-go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
-go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=
-go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE=
-go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
-go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
-go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
-go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
+go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g=
+go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc=
+go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8=
+go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE=
+go.opentelemetry.io/otel/sdk/metric v1.40.0 h1:mtmdVqgQkeRxHgRv4qhyJduP3fYJRMX4AtAlbuWdCYw=
+go.opentelemetry.io/otel/sdk/metric v1.40.0/go.mod h1:4Z2bGMf0KSK3uRjlczMOeMhKU2rhUqdWNoKcYrtcBPg=
+go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw=
+go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA=
 go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A=
 go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=

api/server/interface/api/sresponse/payment.go

@@ -10,7 +10,8 @@ import (
 	feesv1 "github.com/tech/sendico/pkg/proto/billing/fees/v1"
 	paginationv1 "github.com/tech/sendico/pkg/proto/common/pagination/v1"
 	oraclev1 "github.com/tech/sendico/pkg/proto/oracle/v1"
-	orchestratorv1 "github.com/tech/sendico/pkg/proto/payments/orchestrator/v1"
+	orchestratorv1 "github.com/tech/sendico/pkg/proto/payments/orchestration/v1"
+	sharedv1 "github.com/tech/sendico/pkg/proto/payments/shared/v1"
 )
 
 type FeeLine struct {
@@ -92,7 +93,7 @@ type paymentResponse struct {
 }
 
 // PaymentQuote wraps a payment quote with refreshed access token.
-func PaymentQuoteResponse(logger mlogger.Logger, idempotencyKey string, quote *orchestratorv1.PaymentQuote, token *TokenData) http.HandlerFunc {
+func PaymentQuoteResponse(logger mlogger.Logger, idempotencyKey string, quote *sharedv1.PaymentQuote, token *TokenData) http.HandlerFunc {
 	return response.Ok(logger, paymentQuoteResponse{
 		Quote:          toPaymentQuote(quote),
 		IdempotencyKey: idempotencyKey,
@@ -101,7 +102,7 @@ func PaymentQuoteResponse(logger mlogger.Logger, idempotencyKey string, quote *o
 }
 
 // PaymentQuotes wraps batch quotes with refreshed access token.
-func PaymentQuotesResponse(logger mlogger.Logger, resp *orchestratorv1.QuotePaymentsResponse, token *TokenData) http.HandlerFunc {
+func PaymentQuotesResponse(logger mlogger.Logger, resp *quotationv1.QuotePaymentsResponse, token *TokenData) http.HandlerFunc {
 	return response.Ok(logger, paymentQuotesResponse{
 		Quote:        toPaymentQuotes(resp),
 		authResponse: authResponse{AccessToken: *token},
@@ -182,7 +183,7 @@ func toFxQuote(q *oraclev1.Quote) *FxQuote {
 	}
 }
 
-func toPaymentQuote(q *orchestratorv1.PaymentQuote) *PaymentQuote {
+func toPaymentQuote(q *sharedv1.PaymentQuote) *PaymentQuote {
 	if q == nil {
 		return nil
 	}
@@ -197,7 +198,7 @@ func toPaymentQuote(q *orchestratorv1.PaymentQuote) *PaymentQuote {
 	}
 }
 
-func toPaymentQuoteAggregate(q *orchestratorv1.PaymentQuoteAggregate) *PaymentQuoteAggregate {
+func toPaymentQuoteAggregate(q *sharedv1.PaymentQuoteAggregate) *PaymentQuoteAggregate {
 	if q == nil {
 		return nil
 	}
@@ -208,7 +209,7 @@ func toPaymentQuoteAggregate(q *orchestratorv1.PaymentQuoteAggregate) *PaymentQu
 	}
 }
 
-func toPaymentQuotes(resp *orchestratorv1.QuotePaymentsResponse) *PaymentQuotes {
+func toPaymentQuotes(resp *quotationv1.QuotePaymentsResponse) *PaymentQuotes {
 	if resp == nil {
 		return nil
 	}

api/server/internal/server/paymentapiimp/list.go

@@ -10,7 +10,8 @@ import (
 	"github.com/tech/sendico/pkg/model"
 	"github.com/tech/sendico/pkg/mutil/mzap"
 	paginationv1 "github.com/tech/sendico/pkg/proto/common/pagination/v1"
-	orchestratorv1 "github.com/tech/sendico/pkg/proto/payments/orchestrator/v1"
+	orchestratorv1 "github.com/tech/sendico/pkg/proto/payments/orchestration/v1"
+	sharedv1 "github.com/tech/sendico/pkg/proto/payments/shared/v1"
 	"github.com/tech/sendico/server/interface/api/sresponse"
 	mutil "github.com/tech/sendico/server/internal/mutil/param"
 	"go.mongodb.org/mongo-driver/v2/bson"
@@ -105,7 +106,7 @@ func listPaymentsPage(r *http.Request) (*paginationv1.CursorPageRequest, error)
 	return page, nil
 }
 
-func parsePaymentStateFilters(r *http.Request) ([]orchestratorv1.PaymentState, error) {
+func parsePaymentStateFilters(r *http.Request) ([]sharedv1.PaymentState, error) {
 	query := r.URL.Query()
 	values := append([]string{}, query["state"]...)
 	values = append(values, query["states"]...)
@@ -114,7 +115,7 @@ func parsePaymentStateFilters(r *http.Request) ([]orchestratorv1.PaymentState, e
 		return nil, nil
 	}
 
-	states := make([]orchestratorv1.PaymentState, 0, len(values))
+	states := make([]sharedv1.PaymentState, 0, len(values))
 	for _, raw := range values {
 		for _, part := range strings.Split(raw, ",") {
 			trimmed := strings.TrimSpace(part)
@@ -135,7 +136,7 @@ func parsePaymentStateFilters(r *http.Request) ([]orchestratorv1.PaymentState, e
 	return states, nil
 }
 
-func paymentStateFromString(value string) (orchestratorv1.PaymentState, bool) {
+func paymentStateFromString(value string) (sharedv1.PaymentState, bool) {
 	upper := strings.ToUpper(strings.TrimSpace(value))
 	if upper == "" {
 		return 0, false
@@ -143,9 +144,9 @@ func paymentStateFromString(value string) (orchestratorv1.PaymentState, bool) {
 	if !strings.HasPrefix(upper, "PAYMENT_STATE_") {
 		upper = "PAYMENT_STATE_" + upper
 	}
-	enumValue, ok := orchestratorv1.PaymentState_value[upper]
+	enumValue, ok := sharedv1.PaymentState_value[upper]
 	if !ok {
 		return 0, false
 	}
-	return orchestratorv1.PaymentState(enumValue), true
+	return sharedv1.PaymentState(enumValue), true
 }

api/server/internal/server/paymentapiimp/mapper.go

@@ -9,11 +9,11 @@ import (
 	fxv1 "github.com/tech/sendico/pkg/proto/common/fx/v1"
 	moneyv1 "github.com/tech/sendico/pkg/proto/common/money/v1"
 	chainv1 "github.com/tech/sendico/pkg/proto/gateway/chain/v1"
-	orchestratorv1 "github.com/tech/sendico/pkg/proto/payments/orchestrator/v1"
+	sharedv1 "github.com/tech/sendico/pkg/proto/payments/shared/v1"
 	"github.com/tech/sendico/server/interface/api/srequest"
 )
 
-func mapPaymentIntent(intent *srequest.PaymentIntent) (*orchestratorv1.PaymentIntent, error) {
+func mapPaymentIntent(intent *srequest.PaymentIntent) (*sharedv1.PaymentIntent, error) {
 	if intent == nil {
 		return nil, merrors.InvalidArgument("intent is required")
 	}
@@ -46,7 +46,7 @@ func mapPaymentIntent(intent *srequest.PaymentIntent) (*orchestratorv1.PaymentIn
 		return nil, err
 	}
 
-	return &orchestratorv1.PaymentIntent{
+	return &sharedv1.PaymentIntent{
 		Ref:                uuid.New().String(),
 		Kind:               kind,
 		Source:             source,
@@ -108,19 +108,19 @@ func resolveSettlementCurrency(intent *srequest.PaymentIntent) string {
 	return ""
 }
 
-func mapPaymentEndpoint(endpoint *srequest.Endpoint, field string) (*orchestratorv1.PaymentEndpoint, error) {
+func mapPaymentEndpoint(endpoint *srequest.Endpoint, field string) (*sharedv1.PaymentEndpoint, error) {
 	if endpoint == nil {
 		return nil, nil
 	}
 
-	var result orchestratorv1.PaymentEndpoint
+	var result sharedv1.PaymentEndpoint
 	switch endpoint.Type {
 	case srequest.EndpointTypeLedger:
 		payload, err := endpoint.DecodeLedger()
 		if err != nil {
 			return nil, merrors.InvalidArgument(field + " endpoint: " + err.Error())
 		}
-		result.Endpoint = &orchestratorv1.PaymentEndpoint_Ledger{
+		result.Endpoint = &sharedv1.PaymentEndpoint_Ledger{
 			Ledger: mapLedgerEndpoint(&payload),
 		}
 	case srequest.EndpointTypeManagedWallet:
@@ -132,7 +132,7 @@ func mapPaymentEndpoint(endpoint *srequest.Endpoint, field string) (*orchestrato
 		if err != nil {
 			return nil, merrors.InvalidArgument(field + " endpoint: " + err.Error())
 		}
-		result.Endpoint = &orchestratorv1.PaymentEndpoint_ManagedWallet{
+		result.Endpoint = &sharedv1.PaymentEndpoint_ManagedWallet{
 			ManagedWallet: mw,
 		}
 	case srequest.EndpointTypeExternalChain:
@@ -144,7 +144,7 @@ func mapPaymentEndpoint(endpoint *srequest.Endpoint, field string) (*orchestrato
 		if err != nil {
 			return nil, merrors.InvalidArgument(field + " endpoint: " + err.Error())
 		}
-		result.Endpoint = &orchestratorv1.PaymentEndpoint_ExternalChain{
+		result.Endpoint = &sharedv1.PaymentEndpoint_ExternalChain{
 			ExternalChain: ext,
 		}
 	case srequest.EndpointTypeCard:
@@ -152,7 +152,7 @@ func mapPaymentEndpoint(endpoint *srequest.Endpoint, field string) (*orchestrato
 		if err != nil {
 			return nil, merrors.InvalidArgument(field + " endpoint: " + err.Error())
 		}
-		result.Endpoint = &orchestratorv1.PaymentEndpoint_Card{
+		result.Endpoint = &sharedv1.PaymentEndpoint_Card{
 			Card: mapCardEndpoint(&payload),
 		}
 	case srequest.EndpointTypeCardToken:
@@ -160,7 +160,7 @@ func mapPaymentEndpoint(endpoint *srequest.Endpoint, field string) (*orchestrato
 		if err != nil {
 			return nil, merrors.InvalidArgument(field + " endpoint: " + err.Error())
 		}
-		result.Endpoint = &orchestratorv1.PaymentEndpoint_Card{
+		result.Endpoint = &sharedv1.PaymentEndpoint_Card{
 			Card: mapCardTokenEndpoint(&payload),
 		}
 	case "":
@@ -173,17 +173,17 @@ func mapPaymentEndpoint(endpoint *srequest.Endpoint, field string) (*orchestrato
 	return &result, nil
 }
 
-func mapLedgerEndpoint(endpoint *srequest.LedgerEndpoint) *orchestratorv1.LedgerEndpoint {
+func mapLedgerEndpoint(endpoint *srequest.LedgerEndpoint) *sharedv1.LedgerEndpoint {
 	if endpoint == nil {
 		return nil
 	}
-	return &orchestratorv1.LedgerEndpoint{
+	return &sharedv1.LedgerEndpoint{
 		LedgerAccountRef:       endpoint.LedgerAccountRef,
 		ContraLedgerAccountRef: endpoint.ContraLedgerAccountRef,
 	}
 }
 
-func mapManagedWalletEndpoint(endpoint *srequest.ManagedWalletEndpoint) (*orchestratorv1.ManagedWalletEndpoint, error) {
+func mapManagedWalletEndpoint(endpoint *srequest.ManagedWalletEndpoint) (*sharedv1.ManagedWalletEndpoint, error) {
 	if endpoint == nil {
 		return nil, nil
 	}
@@ -191,13 +191,13 @@ func mapManagedWalletEndpoint(endpoint *srequest.ManagedWalletEndpoint) (*orches
 	if err != nil {
 		return nil, err
 	}
-	return &orchestratorv1.ManagedWalletEndpoint{
+	return &sharedv1.ManagedWalletEndpoint{
 		ManagedWalletRef: endpoint.ManagedWalletRef,
 		Asset:            asset,
 	}, nil
 }
 
-func mapExternalChainEndpoint(endpoint *srequest.ExternalChainEndpoint) (*orchestratorv1.ExternalChainEndpoint, error) {
+func mapExternalChainEndpoint(endpoint *srequest.ExternalChainEndpoint) (*sharedv1.ExternalChainEndpoint, error) {
 	if endpoint == nil {
 		return nil, nil
 	}
@@ -205,7 +205,7 @@ func mapExternalChainEndpoint(endpoint *srequest.ExternalChainEndpoint) (*orches
 	if err != nil {
 		return nil, err
 	}
-	return &orchestratorv1.ExternalChainEndpoint{
+	return &sharedv1.ExternalChainEndpoint{
 		Asset:   asset,
 		Address: endpoint.Address,
 		Memo:    endpoint.Memo,
@@ -237,7 +237,7 @@ func mapMoney(m *paymenttypes.Money) *moneyv1.Money {
 	}
 }
 
-func mapFXIntent(fx *srequest.FXIntent) (*orchestratorv1.FXIntent, error) {
+func mapFXIntent(fx *srequest.FXIntent) (*sharedv1.FXIntent, error) {
 	if fx == nil {
 		return nil, nil
 	}
@@ -245,7 +245,7 @@ func mapFXIntent(fx *srequest.FXIntent) (*orchestratorv1.FXIntent, error) {
 	if err != nil {
 		return nil, err
 	}
-	return &orchestratorv1.FXIntent{
+	return &sharedv1.FXIntent{
 		Pair:              mapCurrencyPair(fx.Pair),
 		Side:              side,
 		Firm:              fx.Firm,
@@ -255,11 +255,11 @@ func mapFXIntent(fx *srequest.FXIntent) (*orchestratorv1.FXIntent, error) {
 	}, nil
 }
 
-func mapCustomer(customer *srequest.Customer) *orchestratorv1.Customer {
+func mapCustomer(customer *srequest.Customer) *sharedv1.Customer {
 	if customer == nil {
 		return nil
 	}
-	return &orchestratorv1.Customer{
+	return &sharedv1.Customer{
 		Id:         strings.TrimSpace(customer.ID),
 		FirstName:  strings.TrimSpace(customer.FirstName),
 		MiddleName: strings.TrimSpace(customer.MiddleName),
@@ -283,11 +283,11 @@ func mapCurrencyPair(pair *srequest.CurrencyPair) *fxv1.CurrencyPair {
 	}
 }
 
-func mapCardEndpoint(card *srequest.CardEndpoint) *orchestratorv1.CardEndpoint {
+func mapCardEndpoint(card *srequest.CardEndpoint) *sharedv1.CardEndpoint {
 	if card == nil {
 		return nil
 	}
-	result := &orchestratorv1.CardEndpoint{
+	result := &sharedv1.CardEndpoint{
 		CardholderName:    strings.TrimSpace(card.FirstName),
 		CardholderSurname: strings.TrimSpace(card.LastName),
 		ExpMonth:          card.ExpMonth,
@@ -295,46 +295,46 @@ func mapCardEndpoint(card *srequest.CardEndpoint) *orchestratorv1.CardEndpoint {
 		Country:           strings.TrimSpace(card.Country),
 	}
 	if pan := strings.TrimSpace(card.Pan); pan != "" {
-		result.Card = &orchestratorv1.CardEndpoint_Pan{Pan: pan}
+		result.Card = &sharedv1.CardEndpoint_Pan{Pan: pan}
 	}
 	return result
 }
 
-func mapCardTokenEndpoint(card *srequest.CardTokenEndpoint) *orchestratorv1.CardEndpoint {
+func mapCardTokenEndpoint(card *srequest.CardTokenEndpoint) *sharedv1.CardEndpoint {
 	if card == nil {
 		return nil
 	}
-	return &orchestratorv1.CardEndpoint{
-		Card:      &orchestratorv1.CardEndpoint_Token{Token: strings.TrimSpace(card.Token)},
+	return &sharedv1.CardEndpoint{
+		Card:      &sharedv1.CardEndpoint_Token{Token: strings.TrimSpace(card.Token)},
 		MaskedPan: strings.TrimSpace(card.MaskedPan),
 	}
 }
 
-func mapPaymentKind(kind srequest.PaymentKind) (orchestratorv1.PaymentKind, error) {
+func mapPaymentKind(kind srequest.PaymentKind) (sharedv1.PaymentKind, error) {
 	switch strings.TrimSpace(string(kind)) {
 	case "", string(srequest.PaymentKindUnspecified):
-		return orchestratorv1.PaymentKind_PAYMENT_KIND_UNSPECIFIED, nil
+		return sharedv1.PaymentKind_PAYMENT_KIND_UNSPECIFIED, nil
 	case string(srequest.PaymentKindPayout):
-		return orchestratorv1.PaymentKind_PAYMENT_KIND_PAYOUT, nil
+		return sharedv1.PaymentKind_PAYMENT_KIND_PAYOUT, nil
 	case string(srequest.PaymentKindInternalTransfer):
-		return orchestratorv1.PaymentKind_PAYMENT_KIND_INTERNAL_TRANSFER, nil
+		return sharedv1.PaymentKind_PAYMENT_KIND_INTERNAL_TRANSFER, nil
 	case string(srequest.PaymentKindFxConversion):
-		return orchestratorv1.PaymentKind_PAYMENT_KIND_FX_CONVERSION, nil
+		return sharedv1.PaymentKind_PAYMENT_KIND_FX_CONVERSION, nil
 	default:
-		return orchestratorv1.PaymentKind_PAYMENT_KIND_UNSPECIFIED, merrors.InvalidArgument("unsupported payment kind: " + string(kind))
+		return sharedv1.PaymentKind_PAYMENT_KIND_UNSPECIFIED, merrors.InvalidArgument("unsupported payment kind: " + string(kind))
 	}
 }
 
-func mapSettlementMode(mode srequest.SettlementMode) (orchestratorv1.SettlementMode, error) {
+func mapSettlementMode(mode srequest.SettlementMode) (sharedv1.SettlementMode, error) {
 	switch strings.TrimSpace(string(mode)) {
 	case "", string(srequest.SettlementModeUnspecified):
-		return orchestratorv1.SettlementMode_SETTLEMENT_UNSPECIFIED, nil
+		return sharedv1.SettlementMode_SETTLEMENT_UNSPECIFIED, nil
 	case string(srequest.SettlementModeFixSource):
-		return orchestratorv1.SettlementMode_SETTLEMENT_FIX_SOURCE, nil
+		return sharedv1.SettlementMode_SETTLEMENT_FIX_SOURCE, nil
 	case string(srequest.SettlementModeFixReceived):
-		return orchestratorv1.SettlementMode_SETTLEMENT_FIX_RECEIVED, nil
+		return sharedv1.SettlementMode_SETTLEMENT_FIX_RECEIVED, nil
 	default:
-		return orchestratorv1.SettlementMode_SETTLEMENT_UNSPECIFIED, merrors.InvalidArgument("unsupported settlement mode: " + string(mode))
+		return sharedv1.SettlementMode_SETTLEMENT_UNSPECIFIED, merrors.InvalidArgument("unsupported settlement mode: " + string(mode))
 	}
 }
 

api/server/internal/server/paymentapiimp/pay.go

@@ -9,7 +9,8 @@ import (
 	"github.com/tech/sendico/pkg/merrors"
 	"github.com/tech/sendico/pkg/model"
 	"github.com/tech/sendico/pkg/mutil/mzap"
-	orchestratorv1 "github.com/tech/sendico/pkg/proto/payments/orchestrator/v1"
+	orchestratorv1 "github.com/tech/sendico/pkg/proto/payments/orchestration/v1"
+	sharedv1 "github.com/tech/sendico/pkg/proto/payments/shared/v1"
 	"github.com/tech/sendico/server/interface/api/srequest"
 	"github.com/tech/sendico/server/interface/api/sresponse"
 	mutil "github.com/tech/sendico/server/internal/mutil/param"
@@ -57,7 +58,7 @@ func (a *PaymentAPI) initiatePayment(r *http.Request, account *model.Account, to
 		}
 	}
 
-	var intent *orchestratorv1.PaymentIntent
+	var intent *sharedv1.PaymentIntent
 	if payload.Intent != nil {
 		applyCustomerIP(payload.Intent, r.RemoteAddr)
 		intent, err = mapPaymentIntent(payload.Intent)
@@ -67,7 +68,7 @@ func (a *PaymentAPI) initiatePayment(r *http.Request, account *model.Account, to
 	}
 
 	req := &orchestratorv1.InitiatePaymentRequest{
-		Meta: &orchestratorv1.RequestMeta{
+		Meta: &sharedv1.RequestMeta{
 			OrganizationRef: orgRef.Hex(),
 		},
 		IdempotencyKey: strings.TrimSpace(payload.IdempotencyKey),

api/server/internal/server/paymentapiimp/paybatch.go

@@ -8,7 +8,8 @@ import (
 	"github.com/tech/sendico/pkg/api/http/response"
 	"github.com/tech/sendico/pkg/merrors"
 	"github.com/tech/sendico/pkg/model"
-	orchestratorv1 "github.com/tech/sendico/pkg/proto/payments/orchestrator/v1"
+	orchestratorv1 "github.com/tech/sendico/pkg/proto/payments/orchestration/v1"
+	sharedv1 "github.com/tech/sendico/pkg/proto/payments/shared/v1"
 	"github.com/tech/sendico/server/interface/api/srequest"
 	"github.com/tech/sendico/server/interface/api/sresponse"
 	mutil "github.com/tech/sendico/server/internal/mutil/param"
@@ -40,7 +41,7 @@ func (a *PaymentAPI) initiatePaymentsByQuote(r *http.Request, account *model.Acc
 	}
 
 	req := &orchestratorv1.InitiatePaymentsRequest{
-		Meta: &orchestratorv1.RequestMeta{
+		Meta: &sharedv1.RequestMeta{
 			OrganizationRef: orgRef.Hex(),
 		},
 		IdempotencyKey: strings.TrimSpace(payload.IdempotencyKey),

api/server/internal/server/paymentapiimp/quote.go

@@ -8,7 +8,7 @@ import (
 	"github.com/tech/sendico/pkg/api/http/response"
 	"github.com/tech/sendico/pkg/merrors"
 	"github.com/tech/sendico/pkg/model"
-	orchestratorv1 "github.com/tech/sendico/pkg/proto/payments/orchestrator/v1"
+	sharedv1 "github.com/tech/sendico/pkg/proto/payments/shared/v1"
 	"github.com/tech/sendico/server/interface/api/srequest"
 	"github.com/tech/sendico/server/interface/api/sresponse"
 	mutil "github.com/tech/sendico/server/internal/mutil/param"
@@ -51,8 +51,8 @@ func (a *PaymentAPI) quotePayment(r *http.Request, account *model.Account, token
 		return response.BadPayload(a.logger, a.Name(), err)
 	}
 
-	req := &orchestratorv1.QuotePaymentRequest{
-		Meta: &orchestratorv1.RequestMeta{
+	req := &quotationv1.QuotePaymentRequest{
+		Meta: &sharedv1.RequestMeta{
 			OrganizationRef: orgRef.Hex(),
 		},
 		IdempotencyKey: payload.IdempotencyKey,
@@ -96,7 +96,7 @@ func (a *PaymentAPI) quotePayments(r *http.Request, account *model.Account, toke
 		return response.Auto(a.logger, a.Name(), err)
 	}
 
-	intents := make([]*orchestratorv1.PaymentIntent, 0, len(payload.Intents))
+	intents := make([]*sharedv1.PaymentIntent, 0, len(payload.Intents))
 	for i := range payload.Intents {
 		applyCustomerIP(&payload.Intents[i], r.RemoteAddr)
 		intent, err := mapPaymentIntent(&payload.Intents[i])
@@ -107,8 +107,8 @@ func (a *PaymentAPI) quotePayments(r *http.Request, account *model.Account, toke
 		intents = append(intents, intent)
 	}
 
-	req := &orchestratorv1.QuotePaymentsRequest{
-		Meta: &orchestratorv1.RequestMeta{
+	req := &quotationv1.QuotePaymentResponse{
+		Meta: &sharedv1.RequestMeta{
 			OrganizationRef: orgRef.Hex(),
 		},
 		IdempotencyKey: payload.IdempotencyKey,

api/server/internal/server/paymentapiimp/service.go

@@ -17,7 +17,7 @@ import (
 	msgconsumer "github.com/tech/sendico/pkg/messaging/consumer"
 	"github.com/tech/sendico/pkg/mlogger"
 	"github.com/tech/sendico/pkg/mservice"
-	orchestratorv1 "github.com/tech/sendico/pkg/proto/payments/orchestrator/v1"
+	orchestratorv1 "github.com/tech/sendico/pkg/proto/payments/orchestration/v1"
 	eapi "github.com/tech/sendico/server/interface/api"
 	mutil "github.com/tech/sendico/server/internal/mutil/param"
 	"go.mongodb.org/mongo-driver/v2/bson"
@@ -25,8 +25,8 @@ import (
 )
 
 type paymentClient interface {
-	QuotePayment(ctx context.Context, req *orchestratorv1.QuotePaymentRequest) (*orchestratorv1.QuotePaymentResponse, error)
-	QuotePayments(ctx context.Context, req *orchestratorv1.QuotePaymentsRequest) (*orchestratorv1.QuotePaymentsResponse, error)
+	QuotePayment(ctx context.Context, req *quotationv1.QuotePaymentRequest) (*quotationv1.QuotePaymentResponse, error)
+	QuotePayments(ctx context.Context, req *quotationv1.QuotePaymentRequest) (*quotationv1.QuotePaymentsResponse, error)
 	InitiatePayments(ctx context.Context, req *orchestratorv1.InitiatePaymentsRequest) (*orchestratorv1.InitiatePaymentsResponse, error)
 	InitiatePayment(ctx context.Context, req *orchestratorv1.InitiatePaymentRequest) (*orchestratorv1.InitiatePaymentResponse, error)
 	ListPayments(ctx context.Context, req *orchestratorv1.ListPaymentsRequest) (*orchestratorv1.ListPaymentsResponse, error)