Fixes for PostHog

.gitignore

@@ -10,4 +10,3 @@ generate_protos.sh
 update_dep.sh
 .vscode/
 .gocache/
-.cache/

api/billing/fees/go.mod

@@ -31,7 +31,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/nats-io/nats.go v1.48.0 // indirect
+	github.com/nats-io/nats.go v1.47.0 // indirect
 	github.com/nats-io/nkeys v0.4.12 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/prometheus/client_golang v1.23.2
@@ -49,6 +49,6 @@ require (
 	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/sys v0.39.0 // indirect
 	golang.org/x/text v0.32.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
-	google.golang.org/protobuf v1.36.11
+	google.golang.org/protobuf v1.36.10
 )

api/billing/fees/go.sum

@@ -95,8 +95,8 @@ 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=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/nats-io/nats.go v1.48.0 h1:pSFyXApG+yWU/TgbKCjmm5K4wrHu86231/w84qRVR+U=
+github.com/nats-io/nats.go v1.47.0 h1:YQdADw6J/UfGUd2Oy6tn4Hq6YHxCaJrVKayxxFqYrgM=
-github.com/nats-io/nats.go v1.48.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
+github.com/nats-io/nats.go v1.47.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
 github.com/nats-io/nkeys v0.4.12 h1:nssm7JKOG9/x4J8II47VWCL1Ds29avyiQDRn0ckMvDc=
 github.com/nats-io/nkeys v0.4.12/go.mod h1:MT59A1HYcjIcyQDJStTfaOY6vhy9XTUjOFo+SVsvpBg=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
@@ -212,12 +212,12 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 h1:2I6GHUeJ/4shcDpoUlLs/2WPnhg7yJwvXtqcMJt9liA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:gRkg/vSppuSQoDjxyiGfN4Upv/h/DQmIR10ZU8dh4Ww=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
 google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

api/billing/fees/internal/service/fees/internal/calculator/impl.go

@@ -90,6 +90,10 @@ func (c *quoteCalculator) Compute(ctx context.Context, plan *model.FeePlan, inte
 		}
 
 		ledgerAccountRef := strings.TrimSpace(rule.LedgerAccountRef)
+		if ledgerAccountRef == "" {
+			c.logger.Warn("fee rule missing ledger account reference", zap.String("rule_id", rule.RuleID))
+			continue
+		}
 
 		amount, scale, calcErr := c.calculateRuleAmount(baseAmount, baseScale, rule)
 		if calcErr != nil {
@@ -109,8 +113,7 @@ func (c *quoteCalculator) Compute(ctx context.Context, plan *model.FeePlan, inte
 
 		entrySide := mapEntrySide(rule.EntrySide)
 		if entrySide == accountingv1.EntrySide_ENTRY_SIDE_UNSPECIFIED {
-			// Default fees to debit (i.e. charge the customer) when entry side is not specified.
+			entrySide = accountingv1.EntrySide_ENTRY_SIDE_CREDIT
-			entrySide = accountingv1.EntrySide_ENTRY_SIDE_DEBIT
 		}
 
 		meta := map[string]string{

api/billing/fees/internal/service/fees/internal/resolver/impl.go

@@ -38,23 +38,23 @@ func New(plans storage.PlansStore, logger *zap.Logger) *feeResolver {
 	}
 }
 
-func (r *feeResolver) ResolveFeeRule(ctx context.Context, orgRef *primitive.ObjectID, trigger model.Trigger, at time.Time, attrs map[string]string) (*model.FeePlan, *model.FeeRule, error) {
+func (r *feeResolver) ResolveFeeRule(ctx context.Context, orgID *primitive.ObjectID, trigger model.Trigger, at time.Time, attrs map[string]string) (*model.FeePlan, *model.FeeRule, error) {
 	if r.plans == nil {
 		return nil, nil, merrors.InvalidArgument("fees: plans store is required")
 	}
 
 	// Try org-specific first if provided.
-	if orgRef != nil && !orgRef.IsZero() {
+	if orgID != nil && !orgID.IsZero() {
-		if plan, err := r.getOrgPlan(ctx, *orgRef, at); err == nil {
+		if plan, err := r.getOrgPlan(ctx, *orgID, at); err == nil {
 			if rule, selErr := selectRule(plan, trigger, at, attrs); selErr == nil {
 				return plan, rule, nil
 			} else if !errors.Is(selErr, ErrNoFeeRuleFound) {
-				r.logger.Warn("failed selecting rule for org plan", zap.Error(selErr), zap.String("org_ref", orgRef.Hex()))
+				r.logger.Warn("failed selecting rule for org plan", zap.Error(selErr), zap.String("org_ref", orgID.Hex()))
 				return nil, nil, selErr
 			}
-			r.logger.Debug("no matching rule in org plan; falling back to global", zap.String("org_ref", orgRef.Hex()))
+			r.logger.Debug("no matching rule in org plan; falling back to global", zap.String("org_ref", orgID.Hex()))
 		} else if !errors.Is(err, storage.ErrFeePlanNotFound) {
-			r.logger.Warn("failed resolving org fee plan", zap.Error(err), zap.String("org_ref", orgRef.Hex()))
+			r.logger.Warn("failed resolving org fee plan", zap.Error(err), zap.String("org_ref", orgID.Hex()))
 			return nil, nil, err
 		}
 	}

api/billing/fees/internal/service/fees/internal/resolver/resolver_test.go

@@ -32,8 +32,8 @@ func TestResolver_GlobalFallbackWhenOrgMissing(t *testing.T) {
 	if err != nil {
 		t.Fatalf("expected fallback to global, got error: %v", err)
 	}
-	if plan.OrganizationRef != nil && !plan.OrganizationRef.IsZero() {
+	if !plan.GetOrganizationRef().IsZero() {
-		t.Fatalf("expected global plan, got orgRef %s", plan.OrganizationRef.Hex())
+		t.Fatalf("expected global plan, got orgRef %s", plan.GetOrganizationRef().Hex())
 	}
 	if rule.RuleID != "global_capture" {
 		t.Fatalf("unexpected rule selected: %s", rule.RuleID)
@@ -59,7 +59,8 @@ func TestResolver_OrgOverridesGlobal(t *testing.T) {
 			{RuleID: "org_capture", Trigger: model.TriggerCapture, Priority: 10, Percentage: "0.03", EffectiveFrom: now.Add(-time.Hour)},
 		},
 	}
-	orgPlan.OrganizationRef = &org
+	orgPlan.SetOrganizationRef(org)
+
 	store := &memoryPlansStore{plans: []*model.FeePlan{globalPlan, orgPlan}}
 	resolver := New(store, zap.NewNop())
 
@@ -94,7 +95,7 @@ func TestResolver_SelectsHighestPriority(t *testing.T) {
 			{RuleID: "high", Trigger: model.TriggerCapture, Priority: 200, Percentage: "0.03", EffectiveFrom: now.Add(-time.Hour)},
 		},
 	}
-	plan.OrganizationRef = &org
+	plan.SetOrganizationRef(org)
 
 	store := &memoryPlansStore{plans: []*model.FeePlan{plan}}
 	resolver := New(store, zap.NewNop())
@@ -135,7 +136,7 @@ func TestResolver_EffectiveDateFiltering(t *testing.T) {
 			{RuleID: "expired", Trigger: model.TriggerCapture, Priority: 100, Percentage: "0.05", EffectiveFrom: past, EffectiveTo: &past},
 		},
 	}
-	orgPlan.OrganizationRef = &org
+	orgPlan.SetOrganizationRef(org)
 
 	globalPlan := &model.FeePlan{
 		Active:        true,
@@ -220,7 +221,7 @@ func TestResolver_MultipleActivePlansConflict(t *testing.T) {
 			{RuleID: "r1", Trigger: model.TriggerCapture, Priority: 10, Percentage: "0.05", EffectiveFrom: now.Add(-time.Hour)},
 		},
 	}
-	p1.OrganizationRef = &org
+	p1.SetOrganizationRef(org)
 	p2 := &model.FeePlan{
 		Active:        true,
 		EffectiveFrom: now.Add(-30 * time.Minute),
@@ -228,7 +229,7 @@ func TestResolver_MultipleActivePlansConflict(t *testing.T) {
 			{RuleID: "r2", Trigger: model.TriggerCapture, Priority: 20, Percentage: "0.03", EffectiveFrom: now.Add(-time.Hour)},
 		},
 	}
-	p2.OrganizationRef = &org
+	p2.SetOrganizationRef(org)
 
 	store := &memoryPlansStore{plans: []*model.FeePlan{p1, p2}}
 	resolver := New(store, zap.NewNop())
@@ -262,7 +263,7 @@ func (m *memoryPlansStore) GetActivePlan(ctx context.Context, orgRef primitive.O
 func (m *memoryPlansStore) FindActiveOrgPlan(_ context.Context, orgRef primitive.ObjectID, at time.Time) (*model.FeePlan, error) {
 	var matches []*model.FeePlan
 	for _, plan := range m.plans {
-		if plan == nil || plan.OrganizationRef == nil || plan.OrganizationRef.IsZero() || (*plan.OrganizationRef != orgRef) {
+		if plan == nil || plan.GetOrganizationRef() != orgRef {
 			continue
 		}
 		if !plan.Active {
@@ -288,7 +289,7 @@ func (m *memoryPlansStore) FindActiveOrgPlan(_ context.Context, orgRef primitive
 func (m *memoryPlansStore) FindActiveGlobalPlan(_ context.Context, at time.Time) (*model.FeePlan, error) {
 	var matches []*model.FeePlan
 	for _, plan := range m.plans {
-		if plan == nil || ((plan.OrganizationRef != nil) && !plan.OrganizationRef.IsZero()) {
+		if plan == nil || !plan.GetOrganizationRef().IsZero() {
 			continue
 		}
 		if !plan.Active {

api/billing/fees/internal/service/fees/logging.go

@@ -1,88 +0,0 @@
-package fees
-
-import (
-	"strings"
-	"time"
-
-	feesv1 "github.com/tech/sendico/pkg/proto/billing/fees/v1"
-	tracev1 "github.com/tech/sendico/pkg/proto/common/trace/v1"
-	"go.uber.org/zap"
-)
-
-func requestLogFields(meta *feesv1.RequestMeta, intent *feesv1.Intent) []zap.Field {
-	fields := logFieldsFromRequestMeta(meta)
-	fields = append(fields, logFieldsFromIntent(intent)...)
-	return fields
-}
-
-func logFieldsFromRequestMeta(meta *feesv1.RequestMeta) []zap.Field {
-	if meta == nil {
-		return nil
-	}
-	fields := make([]zap.Field, 0, 4)
-	if org := strings.TrimSpace(meta.GetOrganizationRef()); org != "" {
-		fields = append(fields, zap.String("organization_ref", org))
-	}
-	fields = append(fields, logFieldsFromTrace(meta.GetTrace())...)
-	return fields
-}
-
-func logFieldsFromIntent(intent *feesv1.Intent) []zap.Field {
-	if intent == nil {
-		return nil
-	}
-	fields := make([]zap.Field, 0, 5)
-	if trigger := intent.GetTrigger(); trigger != feesv1.Trigger_TRIGGER_UNSPECIFIED {
-		fields = append(fields, zap.String("trigger", trigger.String()))
-	}
-	if base := intent.GetBaseAmount(); base != nil {
-		if amount := strings.TrimSpace(base.GetAmount()); amount != "" {
-			fields = append(fields, zap.String("base_amount", amount))
-		}
-		if currency := strings.TrimSpace(base.GetCurrency()); currency != "" {
-			fields = append(fields, zap.String("base_currency", currency))
-		}
-	}
-	if booked := intent.GetBookedAt(); booked != nil && booked.IsValid() {
-		fields = append(fields, zap.Time("booked_at", booked.AsTime()))
-	}
-	if attrs := intent.GetAttributes(); len(attrs) > 0 {
-		fields = append(fields, zap.Int("attributes_count", len(attrs)))
-	}
-	return fields
-}
-
-func logFieldsFromTrace(trace *tracev1.TraceContext) []zap.Field {
-	if trace == nil {
-		return nil
-	}
-	fields := make([]zap.Field, 0, 3)
-	if reqRef := strings.TrimSpace(trace.GetRequestRef()); reqRef != "" {
-		fields = append(fields, zap.String("request_ref", reqRef))
-	}
-	if idem := strings.TrimSpace(trace.GetIdempotencyKey()); idem != "" {
-		fields = append(fields, zap.String("idempotency_key", idem))
-	}
-	if traceRef := strings.TrimSpace(trace.GetTraceRef()); traceRef != "" {
-		fields = append(fields, zap.String("trace_ref", traceRef))
-	}
-	return fields
-}
-
-func logFieldsFromTokenPayload(payload *feeQuoteTokenPayload) []zap.Field {
-	if payload == nil {
-		return nil
-	}
-	fields := make([]zap.Field, 0, 6)
-	if org := strings.TrimSpace(payload.OrganizationRef); org != "" {
-		fields = append(fields, zap.String("organization_ref", org))
-	}
-	if payload.ExpiresAtUnixMs > 0 {
-		fields = append(fields,
-			zap.Int64("expires_at_unix_ms", payload.ExpiresAtUnixMs),
-			zap.Time("expires_at", time.UnixMilli(payload.ExpiresAtUnixMs)))
-	}
-	fields = append(fields, logFieldsFromIntent(payload.Intent)...)
-	fields = append(fields, logFieldsFromTrace(payload.Trace)...)
-	return fields
-}

api/billing/fees/internal/service/fees/service.go

@@ -72,57 +72,26 @@ func (s *Service) Register(router routers.GRPC) error {
 }
 
 func (s *Service) QuoteFees(ctx context.Context, req *feesv1.QuoteFeesRequest) (resp *feesv1.QuoteFeesResponse, err error) {
-	var (
-		meta   *feesv1.RequestMeta
-		intent *feesv1.Intent
-	)
-	if req != nil {
-		meta = req.GetMeta()
-		intent = req.GetIntent()
-	}
-	logger := s.logger.With(requestLogFields(meta, intent)...)
-
 	start := s.clock.Now()
 	trigger := feesv1.Trigger_TRIGGER_UNSPECIFIED
-	if intent != nil {
+	if req != nil && req.GetIntent() != nil {
-		trigger = intent.GetTrigger()
+		trigger = req.GetIntent().GetTrigger()
 	}
 	var fxUsed bool
 	defer func() {
 		statusLabel := statusFromError(err)
-		linesCount := 0
-		appliedCount := 0
 		if err == nil && resp != nil {
 			fxUsed = resp.GetFxUsed() != nil
-			linesCount = len(resp.GetLines())
-			appliedCount = len(resp.GetApplied())
 		}
 		observeMetrics("quote", trigger, statusLabel, fxUsed, time.Since(start))
-
-		logFields := []zap.Field{
-			zap.String("status", statusLabel),
-			zap.Duration("duration", time.Since(start)),
-			zap.Bool("fx_used", fxUsed),
-			zap.String("trigger", trigger.String()),
-			zap.Int("lines", linesCount),
-			zap.Int("applied_rules", appliedCount),
-		}
-		if err != nil {
-			logger.Warn("QuoteFees finished", append(logFields, zap.Error(err))...)
-			return
-		}
-		logger.Info("QuoteFees finished", logFields...)
 	}()
 
-	logger.Debug("QuoteFees request received")
-
 	if err = s.validateQuoteRequest(req); err != nil {
 		return nil, err
 	}
 
 	orgRef, parseErr := primitive.ObjectIDFromHex(req.GetMeta().GetOrganizationRef())
 	if parseErr != nil {
-		logger.Warn("QuoteFees invalid organization_ref", zap.Error(parseErr))
 		err = status.Error(codes.InvalidArgument, "invalid organization_ref")
 		return nil, err
 	}
@@ -143,59 +112,20 @@ func (s *Service) QuoteFees(ctx context.Context, req *feesv1.QuoteFeesRequest) (
 }
 
 func (s *Service) PrecomputeFees(ctx context.Context, req *feesv1.PrecomputeFeesRequest) (resp *feesv1.PrecomputeFeesResponse, err error) {
-	var (
-		meta   *feesv1.RequestMeta
-		intent *feesv1.Intent
-	)
-	if req != nil {
-		meta = req.GetMeta()
-		intent = req.GetIntent()
-	}
-	logger := s.logger.With(requestLogFields(meta, intent)...)
-
 	start := s.clock.Now()
 	trigger := feesv1.Trigger_TRIGGER_UNSPECIFIED
-	if intent != nil {
+	if req != nil && req.GetIntent() != nil {
-		trigger = intent.GetTrigger()
+		trigger = req.GetIntent().GetTrigger()
 	}
-	var (
+	var fxUsed bool
-		fxUsed    bool
-		expiresAt time.Time
-	)
 	defer func() {
 		statusLabel := statusFromError(err)
-		linesCount := 0
-		appliedCount := 0
 		if err == nil && resp != nil {
 			fxUsed = resp.GetFxUsed() != nil
-			linesCount = len(resp.GetLines())
-			appliedCount = len(resp.GetApplied())
-			if ts := resp.GetExpiresAt(); ts != nil {
-				expiresAt = ts.AsTime()
-			}
 		}
 		observeMetrics("precompute", trigger, statusLabel, fxUsed, time.Since(start))
-
-		logFields := []zap.Field{
-			zap.String("status", statusLabel),
-			zap.Duration("duration", time.Since(start)),
-			zap.Bool("fx_used", fxUsed),
-			zap.String("trigger", trigger.String()),
-			zap.Int("lines", linesCount),
-			zap.Int("applied_rules", appliedCount),
-		}
-		if !expiresAt.IsZero() {
-			logFields = append(logFields, zap.Time("expires_at", expiresAt))
-		}
-		if err != nil {
-			logger.Warn("PrecomputeFees finished", append(logFields, zap.Error(err))...)
-			return
-		}
-		logger.Info("PrecomputeFees finished", logFields...)
 	}()
 
-	logger.Debug("PrecomputeFees request received")
-
 	if err = s.validatePrecomputeRequest(req); err != nil {
 		return nil, err
 	}
@@ -204,7 +134,6 @@ func (s *Service) PrecomputeFees(ctx context.Context, req *feesv1.PrecomputeFees
 
 	orgRef, parseErr := primitive.ObjectIDFromHex(req.GetMeta().GetOrganizationRef())
 	if parseErr != nil {
-		logger.Warn("PrecomputeFees invalid organization_ref", zap.Error(parseErr))
 		err = status.Error(codes.InvalidArgument, "invalid organization_ref")
 		return nil, err
 	}
@@ -219,7 +148,7 @@ func (s *Service) PrecomputeFees(ctx context.Context, req *feesv1.PrecomputeFees
 	if ttl <= 0 {
 		ttl = 60000
 	}
-	expiresAt = now.Add(time.Duration(ttl) * time.Millisecond)
+	expiresAt := now.Add(time.Duration(ttl) * time.Millisecond)
 
 	payload := feeQuoteTokenPayload{
 		OrganizationRef: req.GetMeta().GetOrganizationRef(),
@@ -230,7 +159,7 @@ func (s *Service) PrecomputeFees(ctx context.Context, req *feesv1.PrecomputeFees
 
 	var token string
 	if token, err = encodeTokenPayload(payload); err != nil {
-		logger.Warn("failed to encode fee quote token", zap.Error(err))
+		s.logger.Warn("failed to encode fee quote token", zap.Error(err))
 		err = status.Error(codes.Internal, "failed to encode fee quote token")
 		return nil, err
 	}
@@ -247,18 +176,9 @@ func (s *Service) PrecomputeFees(ctx context.Context, req *feesv1.PrecomputeFees
 }
 
 func (s *Service) ValidateFeeToken(ctx context.Context, req *feesv1.ValidateFeeTokenRequest) (resp *feesv1.ValidateFeeTokenResponse, err error) {
-	tokenLen := 0
-	if req != nil {
-		tokenLen = len(strings.TrimSpace(req.GetFeeQuoteToken()))
-	}
-	logger := s.logger.With(zap.Int("token_length", tokenLen))
-
 	start := s.clock.Now()
 	trigger := feesv1.Trigger_TRIGGER_UNSPECIFIED
-	var (
+	var fxUsed bool
-		fxUsed       bool
-		resultReason string
-	)
 	defer func() {
 		statusLabel := statusFromError(err)
 		if err == nil && resp != nil {
@@ -271,28 +191,9 @@ func (s *Service) ValidateFeeToken(ctx context.Context, req *feesv1.ValidateFeeT
 			}
 		}
 		observeMetrics("validate", trigger, statusLabel, fxUsed, time.Since(start))
-
-		logFields := []zap.Field{
-			zap.String("status", statusLabel),
-			zap.Duration("duration", time.Since(start)),
-			zap.Bool("fx_used", fxUsed),
-			zap.String("trigger", trigger.String()),
-			zap.Bool("valid", resp != nil && resp.GetValid()),
-		}
-		if resultReason != "" {
-			logFields = append(logFields, zap.String("reason", resultReason))
-		}
-		if err != nil {
-			logger.Warn("ValidateFeeToken finished", append(logFields, zap.Error(err))...)
-			return
-		}
-		logger.Info("ValidateFeeToken finished", logFields...)
 	}()
 
-	logger.Debug("ValidateFeeToken request received")
-
 	if req == nil || strings.TrimSpace(req.GetFeeQuoteToken()) == "" {
-		resultReason = "missing_token"
 		err = status.Error(codes.InvalidArgument, "fee_quote_token is required")
 		return nil, err
 	}
@@ -301,29 +202,21 @@ func (s *Service) ValidateFeeToken(ctx context.Context, req *feesv1.ValidateFeeT
 
 	payload, decodeErr := decodeTokenPayload(req.GetFeeQuoteToken())
 	if decodeErr != nil {
-		resultReason = "invalid_token"
+		s.logger.Warn("failed to decode fee quote token", zap.Error(decodeErr))
-		logger.Warn("failed to decode fee quote token", zap.Error(decodeErr))
 		resp = &feesv1.ValidateFeeTokenResponse{Meta: &feesv1.ResponseMeta{}, Valid: false, Reason: "invalid_token"}
 		return resp, nil
 	}
 
-	logger = logger.With(logFieldsFromTokenPayload(&payload)...)
-
-	if payload.Intent != nil {
 	trigger = payload.Intent.GetTrigger()
-	}
 
 	if now.UnixMilli() > payload.ExpiresAtUnixMs {
-		resultReason = "expired"
-		logger.Info("fee quote token expired")
 		resp = &feesv1.ValidateFeeTokenResponse{Meta: &feesv1.ResponseMeta{}, Valid: false, Reason: "expired"}
 		return resp, nil
 	}
 
 	orgRef, parseErr := primitive.ObjectIDFromHex(payload.OrganizationRef)
 	if parseErr != nil {
-		resultReason = "invalid_token"
+		s.logger.Warn("token contained invalid organization reference", zap.Error(parseErr))
-		logger.Warn("token contained invalid organization reference", zap.Error(parseErr))
 		resp = &feesv1.ValidateFeeTokenResponse{Meta: &feesv1.ResponseMeta{}, Valid: false, Reason: "invalid_token"}
 		return resp, nil
 	}
@@ -387,16 +280,6 @@ func (s *Service) computeQuoteWithTime(ctx context.Context, orgRef primitive.Obj
 		bookedAt = intent.GetBookedAt().AsTime()
 	}
 
-	logFields := []zap.Field{
-		zap.Time("booked_at_used", bookedAt),
-	}
-	if !orgRef.IsZero() {
-		logFields = append(logFields, zap.String("organization_ref", orgRef.Hex()))
-	}
-	logFields = append(logFields, logFieldsFromIntent(intent)...)
-	logFields = append(logFields, logFieldsFromTrace(trace)...)
-	logger := s.logger.With(logFields...)
-
 	var orgPtr *primitive.ObjectID
 	if !orgRef.IsZero() {
 		orgPtr = &orgRef
@@ -414,7 +297,7 @@ func (s *Service) computeQuoteWithTime(ctx context.Context, orgRef primitive.Obj
 		case errors.Is(err, storage.ErrFeePlanNotFound):
 			return nil, nil, nil, status.Error(codes.NotFound, "fee plan not found")
 		default:
-			logger.Warn("failed to resolve fee rule", zap.Error(err))
+			s.logger.Warn("failed to resolve fee rule", zap.Error(err))
 			return nil, nil, nil, status.Error(codes.Internal, "failed to resolve fee rule")
 		}
 	}
@@ -430,7 +313,7 @@ func (s *Service) computeQuoteWithTime(ctx context.Context, orgRef primitive.Obj
 		if errors.Is(calcErr, merrors.ErrInvalidArg) {
 			return nil, nil, nil, status.Error(codes.InvalidArgument, calcErr.Error())
 		}
-		logger.Warn("failed to compute fee quote", zap.Error(calcErr))
+		s.logger.Warn("failed to compute fee quote", zap.Error(calcErr))
 		return nil, nil, nil, status.Error(codes.Internal, "failed to compute fee quote")
 	}
 

api/billing/fees/internal/service/fees/service_test.go

@@ -49,7 +49,7 @@ func TestQuoteFees_ComputesDerivedLines(t *testing.T) {
 		},
 	}
 	plan.SetID(primitive.NewObjectID())
-	plan.OrganizationRef = &orgRef
+	plan.SetOrganizationRef(orgRef)
 
 	service := NewService(
 		zap.NewNop(),
@@ -163,7 +163,7 @@ func TestQuoteFees_FiltersByAttributesAndDates(t *testing.T) {
 		},
 	}
 	plan.SetID(primitive.NewObjectID())
-	plan.OrganizationRef = &orgRef
+	plan.SetOrganizationRef(orgRef)
 
 	service := NewService(
 		zap.NewNop(),
@@ -224,7 +224,7 @@ func TestQuoteFees_RoundingDown(t *testing.T) {
 		},
 	}
 	plan.SetID(primitive.NewObjectID())
-	plan.OrganizationRef = &orgRef
+	plan.SetOrganizationRef(orgRef)
 
 	service := NewService(
 		zap.NewNop(),
@@ -277,7 +277,7 @@ func TestQuoteFees_UsesInjectedCalculator(t *testing.T) {
 		},
 	}
 	plan.SetID(primitive.NewObjectID())
-	plan.OrganizationRef = &orgRef
+	plan.SetOrganizationRef(orgRef)
 
 	result := &types.CalculationResult{
 		Lines: []*feesv1.DerivedPostingLine{
@@ -353,7 +353,7 @@ func TestQuoteFees_PopulatesFxUsed(t *testing.T) {
 		},
 	}
 	plan.SetID(primitive.NewObjectID())
-	plan.OrganizationRef = &orgRef
+	plan.SetOrganizationRef(orgRef)
 
 	fakeOracle := &oracleclient.Fake{
 		LatestRateFn: func(ctx context.Context, req oracleclient.LatestRateParams) (*oracleclient.RateSnapshot, error) {
@@ -452,7 +452,7 @@ func (s *stubPlansStore) FindActiveOrgPlan(_ context.Context, orgRef primitive.O
 	if s.plan == nil {
 		return nil, storage.ErrFeePlanNotFound
 	}
-	if (s.plan.OrganizationRef != nil) && (*s.plan.OrganizationRef != orgRef) {
+	if s.plan.GetOrganizationRef() != orgRef {
 		return nil, storage.ErrFeePlanNotFound
 	}
 	if !s.plan.Active {

api/billing/fees/storage/model/plan.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/tech/sendico/pkg/db/storable"
 	"github.com/tech/sendico/pkg/model"
-	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
 const (
@@ -27,8 +26,8 @@ const (
 // FeePlan describes a collection of fee rules for an organisation.
 type FeePlan struct {
 	storable.Base               `bson:",inline" json:",inline"`
+	model.OrganizationBoundBase `bson:",inline" json:",inline"`
 	model.Describable           `bson:",inline" json:",inline"`
-	OrganizationRef   *primitive.ObjectID `bson:"organizationRef,omitempty" json:"organizationRef,omitempty"`
 	Active                      bool              `bson:"active"             json:"active"`
 	EffectiveFrom               time.Time         `bson:"effectiveFrom"      json:"effectiveFrom"`
 	EffectiveTo                 *time.Time        `bson:"effectiveTo,omitempty" json:"effectiveTo,omitempty"`

api/fx/ingestor/config.yml

@@ -11,18 +11,12 @@ market:
     - driver: CBR
       settings:
         base_url: "https://www.cbr.ru"
-        user_agent: "Mozilla/5.0 (compatible; SendicoFX/1.0; +https://app.sendico.io)"
-        accept_header: "application/xml,text/xml;q=0.9,*/*;q=0.8"
   pairs:
     BINANCE:
       - base: "USDT"
         quote: "EUR"
         symbol: "EURUSDT"
         invert: true
-      - base: "USD"
-        quote: "USDT"
-        symbol: "USDTUSD"
-        invert: true
       - base: "UAH"
         quote: "USDT"
         symbol: "USDTUAH"

api/fx/ingestor/go.mod

@@ -32,7 +32,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/nats-io/nats.go v1.48.0 // indirect
+	github.com/nats-io/nats.go v1.47.0 // indirect
 	github.com/nats-io/nkeys v0.4.12 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
@@ -49,7 +49,7 @@ require (
 	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/sys v0.39.0 // indirect
 	golang.org/x/text v0.32.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
 	google.golang.org/grpc v1.77.0 // indirect
-	google.golang.org/protobuf v1.36.11 // indirect
+	google.golang.org/protobuf v1.36.10 // indirect
 )

api/fx/ingestor/go.sum

@@ -95,8 +95,8 @@ 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=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/nats-io/nats.go v1.48.0 h1:pSFyXApG+yWU/TgbKCjmm5K4wrHu86231/w84qRVR+U=
+github.com/nats-io/nats.go v1.47.0 h1:YQdADw6J/UfGUd2Oy6tn4Hq6YHxCaJrVKayxxFqYrgM=
-github.com/nats-io/nats.go v1.48.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
+github.com/nats-io/nats.go v1.47.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
 github.com/nats-io/nkeys v0.4.12 h1:nssm7JKOG9/x4J8II47VWCL1Ds29avyiQDRn0ckMvDc=
 github.com/nats-io/nkeys v0.4.12/go.mod h1:MT59A1HYcjIcyQDJStTfaOY6vhy9XTUjOFo+SVsvpBg=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
@@ -212,12 +212,12 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 h1:2I6GHUeJ/4shcDpoUlLs/2WPnhg7yJwvXtqcMJt9liA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:gRkg/vSppuSQoDjxyiGfN4Upv/h/DQmIR10ZU8dh4Ww=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
 google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

api/fx/ingestor/internal/ingestor/service.go

@@ -85,7 +85,6 @@ func (s *Service) executePoll(ctx context.Context) error {
 
 func (s *Service) pollOnce(ctx context.Context) error {
 	var firstErr error
-	failures := 0
 	for _, pair := range s.pairs {
 		start := time.Now()
 		err := s.upsertPair(ctx, pair)
@@ -97,24 +96,14 @@ func (s *Service) pollOnce(ctx context.Context) error {
 			if firstErr == nil {
 				firstErr = err
 			}
-			failures++
 			s.logger.Warn("Failed to ingest pair",
 				zap.String("symbol", pair.Symbol),
 				zap.String("source", pair.Source.String()),
-				zap.String("provider", pair.Provider),
-				zap.String("base", pair.Base),
-				zap.String("quote", pair.Quote),
-				zap.Bool("invert", pair.Invert),
 				zap.Duration("elapsed", elapsed),
 				zap.Error(err),
 			)
 		}
 	}
-	if failures > 0 {
-		s.logger.Warn("Ingestion poll completed with failures", zap.Int("failures", failures), zap.Int("total", len(s.pairs)))
-	} else {
-		s.logger.Info("Ingestion poll completed", zap.Int("total", len(s.pairs)))
-	}
 	return firstErr
 }
 
@@ -126,7 +115,7 @@ func (s *Service) upsertPair(ctx context.Context, pair config.Pair) error {
 
 	ticker, err := connector.FetchTicker(ctx, pair.Symbol)
 	if err != nil {
-		return merrors.InternalWrap(err, "fetch ticker: "+pair.Symbol)
+		return merrors.InternalWrap(err, "fetch ticker")
 	}
 
 	bid, err := parseDecimal(ticker.BidPrice)
@@ -183,14 +172,9 @@ func (s *Service) upsertPair(ctx context.Context, pair config.Pair) error {
 	s.logger.Debug("Snapshot ingested",
 		zap.String("pair", pair.Base+"/"+pair.Quote),
 		zap.String("provider", pair.Provider),
-		zap.String("source", pair.Source.String()),
-		zap.String("provider_ref", snapshot.ProviderRef),
 		zap.String("bid", snapshot.Bid),
 		zap.String("ask", snapshot.Ask),
 		zap.String("mid", snapshot.Mid),
-		zap.String("spread_bps", snapshot.SpreadBps),
-		zap.Int64("asof_unix_ms", snapshot.AsOfUnixMs),
-		zap.String("rate_ref", snapshot.RateRef),
 	)
 
 	return nil

api/fx/ingestor/internal/market/cbr/connector.go

@@ -23,7 +23,7 @@ import (
 type cbrConnector struct {
 	id            mmodel.Driver
 	provider      string
-	http          *httpClient
+	client        *http.Client
 	base          string
 	dailyPath     string
 	directoryPath string
@@ -60,8 +60,6 @@ func NewConnector(logger mlogger.Logger, settings model.SettingsT) (mmodel.Conne
 	directoryPath := defaultDirectoryPath
 	dailyPath := defaultDailyPath
 	dynamicPath := defaultDynamicPath
-	userAgent := defaultUserAgent
-	acceptHeader := defaultAccept
 
 	if settings != nil {
 		if value, ok := settings["base_url"].(string); ok && strings.TrimSpace(value) != "" {
@@ -79,12 +77,6 @@ func NewConnector(logger mlogger.Logger, settings model.SettingsT) (mmodel.Conne
 		if value, ok := settings["dynamic_path"].(string); ok && strings.TrimSpace(value) != "" {
 			dynamicPath = strings.TrimSpace(value)
 		}
-		if value, ok := settings["user_agent"].(string); ok && strings.TrimSpace(value) != "" {
-			userAgent = strings.TrimSpace(value)
-		}
-		if value, ok := settings["accept_header"].(string); ok && strings.TrimSpace(value) != "" {
-			acceptHeader = strings.TrimSpace(value)
-		}
 		dialTimeout = common.DurationSetting(settings, "dial_timeout_seconds", dialTimeout)
 		dialKeepAlive = common.DurationSetting(settings, "dial_keep_alive_seconds", dialKeepAlive)
 		tlsHandshakeTimeout = common.DurationSetting(settings, "tls_handshake_timeout_seconds", tlsHandshakeTimeout)
@@ -107,24 +99,13 @@ func NewConnector(logger mlogger.Logger, settings model.SettingsT) (mmodel.Conne
 		transport = customTransport
 	}
 
-	client := &http.Client{
-		Timeout:   requestTimeout,
-		Transport: transport,
-	}
-	referer := parsed.String()
-
 	connector := &cbrConnector{
 		id:       mmodel.DriverCBR,
 		provider: provider,
-		http: newHTTPClient(
+		client: &http.Client{
-			logger,
+			Timeout:   requestTimeout,
-			client,
+			Transport: transport,
-			httpClientOptions{
-				userAgent: userAgent,
-				accept:    acceptHeader,
-				referer:   referer,
 		},
-		),
 		base:          strings.TrimRight(parsed.String(), "/"),
 		dailyPath:     dailyPath,
 		directoryPath: directoryPath,
@@ -180,32 +161,20 @@ func (c *cbrConnector) refreshDirectory() error {
 		return err
 	}
 
-	req, err := c.http.NewRequest(context.Background(), http.MethodGet, endpoint)
+	req, err := http.NewRequest(http.MethodGet, endpoint, nil)
 	if err != nil {
 		return merrors.InternalWrap(err, "cbr: build directory request")
 	}
 
-	resp, err := c.http.Do(req)
+	resp, err := c.client.Do(req)
 	if err != nil {
-		c.logger.Warn(
+		c.logger.Warn("CBR directory request failed", zap.Error(err))
-			"CBR directory request failed",
-			zap.Error(err),
-			zap.String("endpoint", endpoint),
-			zap.String("referer", c.http.headerValue("Referer")),
-			zap.String("user_agent", c.http.headerValue("User-Agent")),
-		)
 		return merrors.InternalWrap(err, "cbr: directory request failed")
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-		c.logger.Warn(
+		c.logger.Warn("CBR directory returned non-OK status", zap.Int("status", resp.StatusCode))
-			"CBR directory returned non-OK status",
-			zap.Int("status", resp.StatusCode),
-			zap.String("endpoint", endpoint),
-			zap.String("referer", c.http.headerValue("Referer")),
-			zap.String("user_agent", c.http.headerValue("User-Agent")),
-		)
 		return merrors.Internal("cbr: unexpected status " + strconv.Itoa(resp.StatusCode))
 	}
 
@@ -214,13 +183,12 @@ func (c *cbrConnector) refreshDirectory() error {
 
 	var directory valuteDirectory
 	if err := decoder.Decode(&directory); err != nil {
-		c.logger.Warn("CBR directory decode failed", zap.Error(err), zap.String("endpoint", endpoint))
+		c.logger.Warn("CBR directory decode failed", zap.Error(err))
 		return merrors.InternalWrap(err, "cbr: decode directory")
 	}
 
-	mapping, err := buildValuteMapping(c.logger.Named("mapper"), directory.Items)
+	mapping, err := buildValuteMapping(directory.Items)
 	if err != nil {
-		c.logger.Warn("Failed to build currencies mapping", zap.Error(err), zap.String("endpoint", endpoint))
 		return err
 	}
 
@@ -232,32 +200,23 @@ func (c *cbrConnector) refreshDirectory() error {
 func (c *cbrConnector) fetchDailyRate(ctx context.Context, valute valuteInfo) (string, error) {
 	endpoint, err := c.buildURL(c.dailyPath, nil)
 	if err != nil {
-		c.logger.Warn("Failed to build daily fetch URL", zap.Error(err), zap.String("path", c.dailyPath))
 		return "", err
 	}
 
-	req, err := c.http.NewRequest(ctx, http.MethodGet, endpoint)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint, nil)
 	if err != nil {
-		c.logger.Warn("Failed to request daily rate", zap.Error(err), zap.String("endpoint", endpoint))
 		return "", merrors.InternalWrap(err, "cbr: build daily request")
 	}
 
-	resp, err := c.http.Do(req)
+	resp, err := c.client.Do(req)
 	if err != nil {
-		c.logger.Warn("CBR daily request failed",
+		c.logger.Warn("CBR daily request failed", zap.String("currency", valute.ISOCharCode), zap.Error(err))
-			zap.Error(err), zap.String("currency", valute.ISOCharCode),
-			zap.String("endpoint", endpoint), zap.String("referer", c.http.headerValue("Referer")),
-			zap.String("user_agent", c.http.headerValue("User-Agent")),
-		)
 		return "", merrors.InternalWrap(err, "cbr: daily request failed")
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-		c.logger.Warn(
+		c.logger.Warn("CBR daily returned non-OK status", zap.Int("status", resp.StatusCode))
-			"CBR daily returned non-OK status", zap.Int("status", resp.StatusCode),
-			zap.String("currency", valute.ISOCharCode), zap.String("endpoint", endpoint),
-		)
 		return "", merrors.Internal("cbr: unexpected status " + strconv.Itoa(resp.StatusCode))
 	}
 
@@ -266,9 +225,7 @@ func (c *cbrConnector) fetchDailyRate(ctx context.Context, valute valuteInfo) (s
 
 	var payload dailyRates
 	if err := decoder.Decode(&payload); err != nil {
-		c.logger.Warn("CBR daily decode failed", zap.Error(err),
+		c.logger.Warn("CBR daily decode failed", zap.Error(err))
-			zap.String("currency", valute.ISOCharCode), zap.String("endpoint", endpoint),
-		)
 		return "", merrors.InternalWrap(err, "cbr: decode daily response")
 	}
 
@@ -290,40 +247,25 @@ func (c *cbrConnector) fetchHistoricalRate(ctx context.Context, valute valuteInf
 		"date_req2": date.Format("02/01/2006"),
 		"VAL_NM_RQ": valute.ID,
 	}
-	dateStr := date.Format("2006-01-02")
 	endpoint, err := c.buildURL(c.dynamicPath, query)
 	if err != nil {
 		return "", err
 	}
 
-	req, err := c.http.NewRequest(ctx, http.MethodGet, endpoint)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint, nil)
 	if err != nil {
 		return "", merrors.InternalWrap(err, "cbr: build historical request")
 	}
 
-	resp, err := c.http.Do(req)
+	resp, err := c.client.Do(req)
 	if err != nil {
-		c.logger.Warn(
+		c.logger.Warn("CBR historical request failed", zap.String("currency", valute.ISOCharCode), zap.Error(err))
-			"CBR historical request failed",
-			zap.String("currency", valute.ISOCharCode),
-			zap.String("date", dateStr),
-			zap.String("endpoint", endpoint),
-			zap.String("referer", c.http.headerValue("Referer")),
-			zap.String("user_agent", c.http.headerValue("User-Agent")),
-			zap.Error(err),
-		)
 		return "", merrors.InternalWrap(err, "cbr: historical request failed")
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-		c.logger.Warn(
+		c.logger.Warn("CBR historical returned non-OK status", zap.Int("status", resp.StatusCode))
-			"CBR historical returned non-OK status",
-			zap.Int("status", resp.StatusCode),
-			zap.String("currency", valute.ISOCharCode),
-			zap.String("date", dateStr),
-			zap.String("endpoint", endpoint),
-		)
 		return "", merrors.Internal("cbr: unexpected status " + strconv.Itoa(resp.StatusCode))
 	}
 
@@ -332,13 +274,7 @@ func (c *cbrConnector) fetchHistoricalRate(ctx context.Context, valute valuteInf
 
 	var payload dynamicRates
 	if err := decoder.Decode(&payload); err != nil {
-		c.logger.Warn(
+		c.logger.Warn("CBR historical decode failed", zap.Error(err))
-			"CBR historical decode failed",
-			zap.String("currency", valute.ISOCharCode),
-			zap.String("date", dateStr),
-			zap.String("endpoint", endpoint),
-			zap.Error(err),
-		)
 		return "", merrors.InternalWrap(err, "cbr: decode historical response")
 	}
 
@@ -401,7 +337,7 @@ type valuteMapping struct {
 	byID  map[string]valuteInfo
 }
 
-func buildValuteMapping(logger *zap.Logger, items []valuteItem) (*valuteMapping, error) {
+func buildValuteMapping(items []valuteItem) (*valuteMapping, error) {
 	byISO := make(map[string]valuteInfo, len(items))
 	byID := make(map[string]valuteInfo, len(items))
 	byNum := make(map[string]string, len(items))
@@ -412,19 +348,12 @@ func buildValuteMapping(logger *zap.Logger, items []valuteItem) (*valuteMapping,
 		isoNum := strings.TrimSpace(item.ISONum)
 		name := strings.TrimSpace(item.Name)
 		engName := strings.TrimSpace(item.EngName)
-
 		nominal, err := parseNominal(item.NominalStr)
 		if err != nil {
 			return nil, merrors.InvalidDataType("cbr: parse directory nominal: " + err.Error())
 		}
-
 		if id == "" || isoChar == "" {
-			logger.Info("Skipping invalid currency entry",
+			return nil, merrors.InvalidDataType("cbr: directory contains entry with empty id or iso code")
-				zap.String("id", id),
-				zap.String("iso_char", isoChar),
-				zap.String("name", name),
-			)
-			continue
 		}
 
 		info := valuteInfo{
@@ -436,76 +365,12 @@ func buildValuteMapping(logger *zap.Logger, items []valuteItem) (*valuteMapping,
 			Nominal:     nominal,
 		}
 
-		// Handle duplicate ISO char codes (e.g. DEM with different IDs / nominals).
+		if existing, ok := byISO[isoChar]; ok && existing.ID != id {
-		if existing, ok := byISO[isoChar]; ok {
+			return nil, merrors.InvalidDataType("cbr: duplicate ISO code " + isoChar)
-			// Same ISO + same ID: duplicate entry, just ignore.
-			if existing.ID == id {
-				logger.Debug("Duplicate directory entry for same ISO and ID, ignoring",
-					zap.String("iso_code", isoChar),
-					zap.String("id", id),
-				)
-				continue
 		}
-
-			// Different IDs but same ISO char.
-			// Choose canonical entry:
-			//  1) Prefer nominal == 1
-			//  2) Otherwise prefer smaller nominal
-			keepExisting := true
-
-			if existing.Nominal != 1 && info.Nominal == 1 {
-				keepExisting = false
-			} else if existing.Nominal == 1 && info.Nominal != 1 {
-				keepExisting = true
-			} else if info.Nominal < existing.Nominal {
-				keepExisting = false
-			}
-
-			if keepExisting {
-				logger.Warn("Ignoring duplicate ISO currency entry with less preferred nominal",
-					zap.String("iso_code", isoChar),
-					zap.String("existing_id", existing.ID),
-					zap.Int64("existing_nominal", existing.Nominal),
-					zap.String("new_id", info.ID),
-					zap.Int64("new_nominal", info.Nominal),
-				)
-				// We keep the old one, just skip the new.
-				continue
-			}
-
-			// Replace existing mapping with the new, more canonical one.
-			logger.Warn("Replacing currency mapping due to more canonical nominal",
-				zap.String("iso_code", isoChar),
-				zap.String("old_id", existing.ID),
-				zap.Int64("old_nominal", existing.Nominal),
-				zap.String("new_id", info.ID),
-				zap.Int64("new_nominal", info.Nominal),
-			)
-
-			// Update byID: drop old ID, add new one
-			delete(byID, existing.ID)
-			byID[id] = info
-
-			// Update ISO mapping
-			byISO[isoChar] = info
-
-			// Update numeric-code index if present
-			if isoNum != "" {
-				if existingID, ok := byNum[isoNum]; ok && existingID != id {
-					return nil, merrors.InvalidDataType("cbr: duplicate ISO numeric code " + isoNum)
-				}
-				byNum[isoNum] = id
-			}
-
-			continue
-		}
-
-		// No existing ISO entry, do normal uniqueness checks.
-
 		if existing, ok := byID[id]; ok && existing.ISOCharCode != isoChar {
 			return nil, merrors.InvalidDataType("cbr: duplicate valute id " + id)
 		}
-
 		if isoNum != "" {
 			if existingID, ok := byNum[isoNum]; ok && existingID != id {
 				return nil, merrors.InvalidDataType("cbr: duplicate ISO numeric code " + isoNum)
@@ -513,8 +378,6 @@ func buildValuteMapping(logger *zap.Logger, items []valuteItem) (*valuteMapping,
 			byNum[isoNum] = id
 		}
 
-		logger.Info("Installing currency code", zap.String("iso_code", isoChar), zap.String("id", id), zap.Int64("nominal", nominal))
-
 		byISO[isoChar] = info
 		byID[id] = info
 	}

api/fx/ingestor/internal/market/cbr/http_client.go

@@ -1,85 +0,0 @@
-package cbr
-
-import (
-	"context"
-	"net/http"
-	"strings"
-
-	"go.uber.org/zap"
-)
-
-const (
-	defaultUserAgent = "Mozilla/5.0 (compatible; SendicoFX/1.0; +https://app.sendico.io)"
-	defaultAccept    = "application/xml,text/xml;q=0.9,*/*;q=0.8"
-)
-
-// httpClient wraps http.Client to ensure CBR requests always carry required headers.
-type httpClient struct {
-	client  *http.Client
-	headers http.Header
-	logger  *zap.Logger
-}
-
-type httpClientOptions struct {
-	userAgent string
-	accept    string
-	referer   string
-}
-
-func newHTTPClient(logger *zap.Logger, client *http.Client, opts httpClientOptions) *httpClient {
-	userAgent := opts.userAgent
-	if strings.TrimSpace(userAgent) == "" {
-		userAgent = defaultUserAgent
-	}
-
-	accept := opts.accept
-	if strings.TrimSpace(accept) == "" {
-		accept = defaultAccept
-	}
-
-	referer := opts.referer
-	if strings.TrimSpace(referer) == "" {
-		referer = defaultCBRBaseURL
-	}
-	l := logger.Named("http_client")
-
-	headers := make(http.Header, 3)
-	headers.Set("User-Agent", userAgent)
-	headers.Set("Accept", accept)
-	headers.Set("Referer", referer)
-
-	l.Info("HTTP client initialized", zap.String("user_agent", userAgent),
-		zap.String("accept", accept), zap.String("referrer", referer))
-
-	return &httpClient{
-		client:  client,
-		headers: headers,
-		logger:  l,
-	}
-}
-
-func (h *httpClient) NewRequest(ctx context.Context, method, endpoint string) (*http.Request, error) {
-	return http.NewRequestWithContext(ctx, method, endpoint, nil)
-}
-
-func (h *httpClient) Do(req *http.Request) (*http.Response, error) {
-	enriched := req.Clone(req.Context())
-	for key, values := range h.headers {
-		if enriched.Header.Get(key) != "" {
-			continue
-		}
-		for _, value := range values {
-			enriched.Header.Add(key, value)
-		}
-	}
-	r, err := h.client.Do(enriched)
-	if err != nil {
-		h.logger.Warn("HTTP request failed", zap.Error(err), zap.String("method", req.Method),
-			zap.String("url", req.URL.String()))
-	}
-	return r, err
-}
-
-func (h *httpClient) headerValue(name string) string {
-	return h.headers.Get(name)
-}

api/fx/ingestor/main.go

@@ -40,15 +40,15 @@ func main() {
 
 	application, err := app.New(logger, *configFile)
 	if err != nil {
-		logger.Error("Failed to initialise application", zap.Error(err))
+		logger.Fatal("Failed to initialise application", zap.Error(err))
-	} else {
+	}
+
 	if err := application.Run(ctx); err != nil {
 		if errors.Is(err, context.Canceled) {
 			logger.Info("FX ingestor stopped")
 			return
 		}
-			logger.Error("Ingestor terminated with error", zap.Error(err))
+		logger.Fatal("Ingestor terminated with error", zap.Error(err))
-		}
 	}
 
 	logger.Info("FX ingestor stopped")

api/fx/oracle/go.mod

@@ -14,7 +14,7 @@ require (
 	go.mongodb.org/mongo-driver v1.17.6
 	go.uber.org/zap v1.27.1
 	google.golang.org/grpc v1.77.0
-	google.golang.org/protobuf v1.36.11
+	google.golang.org/protobuf v1.36.10
 	gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -33,7 +33,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/nats-io/nats.go v1.48.0 // indirect
+	github.com/nats-io/nats.go v1.47.0 // indirect
 	github.com/nats-io/nkeys v0.4.12 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
@@ -50,5 +50,5 @@ require (
 	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/sys v0.39.0 // indirect
 	golang.org/x/text v0.32.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
 )

api/fx/oracle/go.sum

@@ -95,8 +95,8 @@ 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=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/nats-io/nats.go v1.48.0 h1:pSFyXApG+yWU/TgbKCjmm5K4wrHu86231/w84qRVR+U=
+github.com/nats-io/nats.go v1.47.0 h1:YQdADw6J/UfGUd2Oy6tn4Hq6YHxCaJrVKayxxFqYrgM=
-github.com/nats-io/nats.go v1.48.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
+github.com/nats-io/nats.go v1.47.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
 github.com/nats-io/nkeys v0.4.12 h1:nssm7JKOG9/x4J8II47VWCL1Ds29avyiQDRn0ckMvDc=
 github.com/nats-io/nkeys v0.4.12/go.mod h1:MT59A1HYcjIcyQDJStTfaOY6vhy9XTUjOFo+SVsvpBg=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
@@ -212,12 +212,12 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 h1:2I6GHUeJ/4shcDpoUlLs/2WPnhg7yJwvXtqcMJt9liA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:gRkg/vSppuSQoDjxyiGfN4Upv/h/DQmIR10ZU8dh4Ww=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
 google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

api/fx/oracle/internal/service/oracle/logging.go

@@ -1,90 +0,0 @@
-package oracle
-
-import (
-	"strings"
-
-	fxv1 "github.com/tech/sendico/pkg/proto/common/fx/v1"
-	moneyv1 "github.com/tech/sendico/pkg/proto/common/money/v1"
-	tracev1 "github.com/tech/sendico/pkg/proto/common/trace/v1"
-	oraclev1 "github.com/tech/sendico/pkg/proto/oracle/v1"
-	"go.uber.org/zap"
-)
-
-func quoteRequestFields(req *oraclev1.GetQuoteRequest) []zap.Field {
-	if req == nil {
-		return nil
-	}
-	fields := requestMetaFields(req.GetMeta())
-	if pair := req.GetPair(); pair != nil {
-		if base := strings.TrimSpace(pair.GetBase()); base != "" {
-			fields = append(fields, zap.String("pair_base", base))
-		}
-		if quote := strings.TrimSpace(pair.GetQuote()); quote != "" {
-			fields = append(fields, zap.String("pair_quote", quote))
-		}
-	}
-	if side := req.GetSide(); side != fxv1.Side_SIDE_UNSPECIFIED {
-		fields = append(fields, zap.String("side", side.String()))
-	}
-	if req.GetFirm() {
-		fields = append(fields, zap.Bool("firm", req.GetFirm()))
-	}
-	if ttl := req.GetTtlMs(); ttl > 0 {
-		fields = append(fields, zap.Int64("ttl_ms", ttl))
-	}
-	if maxAge := req.GetMaxAgeMs(); maxAge > 0 {
-		fields = append(fields, zap.Int32("max_age_ms", maxAge))
-	}
-	if provider := strings.TrimSpace(req.GetPreferredProvider()); provider != "" {
-		fields = append(fields, zap.String("preferred_provider", provider))
-	}
-	fields = append(fields, moneyFields("base_amount", req.GetBaseAmount())...)
-	fields = append(fields, moneyFields("quote_amount", req.GetQuoteAmount())...)
-	return fields
-}
-
-func requestMetaFields(meta *oraclev1.RequestMeta) []zap.Field {
-	if meta == nil {
-		return nil
-	}
-	fields := make([]zap.Field, 0, 4)
-	if org := strings.TrimSpace(meta.GetOrganizationRef()); org != "" {
-		fields = append(fields, zap.String("organization_ref", org))
-	}
-	if tenant := strings.TrimSpace(meta.GetTenantRef()); tenant != "" {
-		fields = append(fields, zap.String("tenant_ref", tenant))
-	}
-	fields = append(fields, traceFields(meta.GetTrace())...)
-	return fields
-}
-
-func moneyFields(prefix string, money *moneyv1.Money) []zap.Field {
-	if money == nil {
-		return nil
-	}
-	fields := make([]zap.Field, 0, 2)
-	if amt := strings.TrimSpace(money.GetAmount()); amt != "" {
-		fields = append(fields, zap.String(prefix, amt))
-	}
-	if ccy := strings.TrimSpace(money.GetCurrency()); ccy != "" {
-		fields = append(fields, zap.String(prefix+"_currency", ccy))
-	}
-	return fields
-}
-
-func traceFields(trace *tracev1.TraceContext) []zap.Field {
-	if trace == nil {
-		return nil
-	}
-	fields := make([]zap.Field, 0, 3)
-	if ref := strings.TrimSpace(trace.GetTraceRef()); ref != "" {
-		fields = append(fields, zap.String("trace_ref", ref))
-	}
-	if idem := strings.TrimSpace(trace.GetIdempotencyKey()); idem != "" {
-		fields = append(fields, zap.String("idempotency_key", idem))
-	}
-	if req := strings.TrimSpace(trace.GetRequestRef()); req != "" {
-		fields = append(fields, zap.String("request_ref", req))
-	}
-	return fields
-}

api/fx/oracle/internal/service/oracle/service.go

@@ -101,27 +101,22 @@ func (s *Service) getQuoteResponder(ctx context.Context, req *oraclev1.GetQuoteR
 	if req == nil {
 		req = &oraclev1.GetQuoteRequest{}
 	}
-	logger := s.logger.With(quoteRequestFields(req)...)
+	s.logger.Debug("Handling GetQuote", zap.String("pair", req.GetPair().GetBase()+"/"+req.GetPair().GetQuote()), zap.Bool("firm", req.GetFirm()))
-	logger.Debug("Handling GetQuote")
 	if req.GetSide() == fxv1.Side_SIDE_UNSPECIFIED {
-		logger.Warn("GetQuote invalid: side missing")
 		return gsresponse.InvalidArgument[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, errSideRequired)
 	}
 	if req.GetBaseAmount() != nil && req.GetQuoteAmount() != nil {
-		logger.Warn("GetQuote invalid: both base_amount and quote_amount provided")
 		return gsresponse.InvalidArgument[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, errAmountsMutuallyExclusive)
 	}
 	if req.GetBaseAmount() == nil && req.GetQuoteAmount() == nil {
-		logger.Warn("GetQuote invalid: amount missing")
 		return gsresponse.InvalidArgument[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, errAmountRequired)
 	}
 	if err := s.pingStorage(ctx); err != nil {
-		logger.Warn("Storage unavailable during GetQuote", zap.Error(err))
+		s.logger.Warn("Storage unavailable during GetQuote", zap.Error(err))
 		return gsresponse.Unavailable[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, err)
 	}
 	pairMsg := req.GetPair()
 	if pairMsg == nil || strings.TrimSpace(pairMsg.GetBase()) == "" || strings.TrimSpace(pairMsg.GetQuote()) == "" {
-		logger.Warn("GetQuote invalid: pair missing")
 		return gsresponse.InvalidArgument[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, errEmptyRequest)
 	}
 	pairKey := model.CurrencyPair{Base: strings.ToUpper(pairMsg.GetBase()), Quote: strings.ToUpper(pairMsg.GetQuote())}
@@ -130,10 +125,8 @@ func (s *Service) getQuoteResponder(ctx context.Context, req *oraclev1.GetQuoteR
 	if err != nil {
 		switch {
 		case errors.Is(err, merrors.ErrNoData):
-			logger.Warn("pair not supported", zap.String("pair", pairKey.Base+"/"+pairKey.Quote))
 			return gsresponse.InvalidArgument[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, merrors.InvalidArgument("pair_not_supported"))
 		default:
-			logger.Warn("GetQuote failed to load pair", zap.Error(err))
 			return gsresponse.Internal[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, err)
 		}
 	}
@@ -150,10 +143,8 @@ func (s *Service) getQuoteResponder(ctx context.Context, req *oraclev1.GetQuoteR
 	if err != nil {
 		switch {
 		case errors.Is(err, merrors.ErrNoData):
-			logger.Warn("rate not found", zap.String("pair", pairKey.Base+"/"+pairKey.Quote), zap.String("provider", provider))
 			return gsresponse.FailedPrecondition[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, "rate_not_found", err)
 		default:
-			logger.Warn("GetQuote failed to load rate", zap.Error(err), zap.String("pair", pairKey.Base+"/"+pairKey.Quote), zap.String("provider", provider))
 			return gsresponse.Internal[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, err)
 		}
 	}
@@ -162,31 +153,27 @@ func (s *Service) getQuoteResponder(ctx context.Context, req *oraclev1.GetQuoteR
 	if maxAge := req.GetMaxAgeMs(); maxAge > 0 {
 		age := now.UnixMilli() - rate.AsOfUnixMs
 		if age > int64(maxAge) {
-			logger.Warn("Rate snapshot stale", zap.Int64("age_ms", age), zap.Int32("max_age_ms", req.GetMaxAgeMs()), zap.String("pair", pairKey.Base+"/"+pairKey.Quote), zap.String("provider", provider))
+			s.logger.Warn("Rate snapshot stale", zap.Int64("age_ms", age), zap.Int32("max_age_ms", req.GetMaxAgeMs()), zap.String("pair", pairKey.Base+"/"+pairKey.Quote), zap.String("provider", provider))
 			return gsresponse.FailedPrecondition[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, "stale_rate", merrors.InvalidArgument("rate older than allowed window"))
 		}
 	}
 
 	comp, err := newQuoteComputation(pair, rate, req.GetSide(), provider)
 	if err != nil {
-		logger.Warn("GetQuote invalid input", zap.Error(err))
 		return gsresponse.InvalidArgument[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, err)
 	}
 
 	if req.GetBaseAmount() != nil {
 		if err := comp.withBaseInput(req.GetBaseAmount()); err != nil {
-			logger.Warn("GetQuote invalid base input", zap.Error(err))
 			return gsresponse.InvalidArgument[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, err)
 		}
 	} else if req.GetQuoteAmount() != nil {
 		if err := comp.withQuoteInput(req.GetQuoteAmount()); err != nil {
-			logger.Warn("GetQuote invalid quote input", zap.Error(err))
 			return gsresponse.InvalidArgument[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, err)
 		}
 	}
 
 	if err := comp.compute(); err != nil {
-		logger.Warn("GetQuote computation failed", zap.Error(err))
 		return gsresponse.Internal[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, err)
 	}
 
@@ -208,14 +195,12 @@ func (s *Service) getQuoteResponder(ctx context.Context, req *oraclev1.GetQuoteR
 		if err := s.storage.Quotes().Issue(ctx, quoteModel); err != nil {
 			switch {
 			case errors.Is(err, merrors.ErrDataConflict):
-				logger.Warn("GetQuote conflict issuing firm quote", zap.Error(err), zap.String("quote_ref", quoteModel.QuoteRef))
 				return gsresponse.Conflict[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, err)
 			default:
-				logger.Warn("GetQuote failed to issue firm quote", zap.Error(err), zap.String("quote_ref", quoteModel.QuoteRef))
 				return gsresponse.Internal[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, err)
 			}
 		}
-		logger.Info("Firm quote stored", zap.String("quote_ref", quoteModel.QuoteRef), zap.String("pair", pairKey.Base+"/"+pairKey.Quote), zap.String("provider", quoteModel.Provider), zap.Int64("expires_at_ms", quoteModel.ExpiresAtUnixMs))
+		s.logger.Info("Firm quote stored", zap.String("quote_ref", quoteModel.QuoteRef), zap.String("pair", pairKey.Base+"/"+pairKey.Quote), zap.String("provider", quoteModel.Provider), zap.Int64("expires_at_ms", quoteModel.ExpiresAtUnixMs))
 	}
 
 	resp := &oraclev1.GetQuoteResponse{
@@ -229,24 +214,18 @@ func (s *Service) validateQuoteResponder(ctx context.Context, req *oraclev1.Vali
 	if req == nil {
 		req = &oraclev1.ValidateQuoteRequest{}
 	}
-	logger := s.logger.With(requestMetaFields(req.GetMeta())...)
+	s.logger.Debug("Handling ValidateQuote", zap.String("quote_ref", req.GetQuoteRef()))
-	if ref := strings.TrimSpace(req.GetQuoteRef()); ref != "" {
-		logger = logger.With(zap.String("quote_ref", ref))
-	}
-	logger.Debug("Handling ValidateQuote")
 	if req.GetQuoteRef() == "" {
-		logger.Warn("ValidateQuote invalid: quote_ref missing")
 		return gsresponse.InvalidArgument[oraclev1.ValidateQuoteResponse](s.logger, mservice.FXOracle, errQuoteRefRequired)
 	}
 	if err := s.pingStorage(ctx); err != nil {
-		logger.Warn("Storage unavailable during ValidateQuote", zap.Error(err))
+		s.logger.Warn("Storage unavailable during ValidateQuote", zap.Error(err))
 		return gsresponse.Unavailable[oraclev1.ValidateQuoteResponse](s.logger, mservice.FXOracle, err)
 	}
 	quote, err := s.storage.Quotes().GetByRef(ctx, req.GetQuoteRef())
 	if err != nil {
 		switch {
 		case errors.Is(err, merrors.ErrNoData):
-			logger.Warn("ValidateQuote: quote not found", zap.String("quote_ref", req.GetQuoteRef()))
 			resp := &oraclev1.ValidateQuoteResponse{
 				Meta:   buildResponseMeta(req.GetMeta()),
 				Quote:  nil,
@@ -255,7 +234,6 @@ func (s *Service) validateQuoteResponder(ctx context.Context, req *oraclev1.Vali
 			}
 			return gsresponse.Success(resp)
 		default:
-			logger.Warn("ValidateQuote failed", zap.Error(err))
 			return gsresponse.Internal[oraclev1.ValidateQuoteResponse](s.logger, mservice.FXOracle, err)
 		}
 	}
@@ -277,11 +255,6 @@ func (s *Service) validateQuoteResponder(ctx context.Context, req *oraclev1.Vali
 		Valid:  valid,
 		Reason: reason,
 	}
-	if !valid {
-		logger.Info("ValidateQuote invalid", zap.String("reason", reason), zap.Bool("firm", quote.Firm))
-	} else {
-		logger.Debug("ValidateQuote valid", zap.Bool("firm", quote.Firm))
-	}
 	return gsresponse.Success(resp)
 }
 
@@ -289,43 +262,29 @@ func (s *Service) consumeQuoteResponder(ctx context.Context, req *oraclev1.Consu
 	if req == nil {
 		req = &oraclev1.ConsumeQuoteRequest{}
 	}
-	logger := s.logger.With(requestMetaFields(req.GetMeta())...)
+	s.logger.Debug("Handling ConsumeQuote", zap.String("quote_ref", req.GetQuoteRef()), zap.String("ledger_txn_ref", req.GetLedgerTxnRef()))
-	if ref := strings.TrimSpace(req.GetQuoteRef()); ref != "" {
-		logger = logger.With(zap.String("quote_ref", ref))
-	}
-	if ledger := strings.TrimSpace(req.GetLedgerTxnRef()); ledger != "" {
-		logger = logger.With(zap.String("ledger_txn_ref", ledger))
-	}
-	logger.Debug("Handling ConsumeQuote")
 	if req.GetQuoteRef() == "" {
-		logger.Warn("ConsumeQuote invalid: quote_ref missing")
 		return gsresponse.InvalidArgument[oraclev1.ConsumeQuoteResponse](s.logger, mservice.FXOracle, errQuoteRefRequired)
 	}
 	if req.GetLedgerTxnRef() == "" {
-		logger.Warn("ConsumeQuote invalid: ledger_txn_ref missing")
 		return gsresponse.InvalidArgument[oraclev1.ConsumeQuoteResponse](s.logger, mservice.FXOracle, errLedgerTxnRefRequired)
 	}
 	if err := s.pingStorage(ctx); err != nil {
-		logger.Warn("Storage unavailable during ConsumeQuote", zap.Error(err))
+		s.logger.Warn("Storage unavailable during ConsumeQuote", zap.Error(err))
 		return gsresponse.Unavailable[oraclev1.ConsumeQuoteResponse](s.logger, mservice.FXOracle, err)
 	}
 	_, err := s.storage.Quotes().Consume(ctx, req.GetQuoteRef(), req.GetLedgerTxnRef(), time.Now())
 	if err != nil {
 		switch {
 		case errors.Is(err, storage.ErrQuoteExpired):
-			logger.Warn("ConsumeQuote failed: expired")
 			return gsresponse.FailedPrecondition[oraclev1.ConsumeQuoteResponse](s.logger, mservice.FXOracle, "expired", err)
 		case errors.Is(err, storage.ErrQuoteConsumed):
-			logger.Warn("ConsumeQuote failed: already consumed")
 			return gsresponse.FailedPrecondition[oraclev1.ConsumeQuoteResponse](s.logger, mservice.FXOracle, "consumed", err)
 		case errors.Is(err, storage.ErrQuoteNotFirm):
-			logger.Warn("ConsumeQuote failed: quote not firm")
 			return gsresponse.FailedPrecondition[oraclev1.ConsumeQuoteResponse](s.logger, mservice.FXOracle, "not_firm", err)
 		case errors.Is(err, merrors.ErrNoData):
-			logger.Warn("ConsumeQuote failed: quote not found")
 			return gsresponse.NotFound[oraclev1.ConsumeQuoteResponse](s.logger, mservice.FXOracle, err)
 		default:
-			logger.Warn("ConsumeQuote failed", zap.Error(err))
 			return gsresponse.Internal[oraclev1.ConsumeQuoteResponse](s.logger, mservice.FXOracle, err)
 		}
 	}
@@ -335,7 +294,7 @@ func (s *Service) consumeQuoteResponder(ctx context.Context, req *oraclev1.Consu
 		Consumed: true,
 		Reason:   "consumed",
 	}
-	logger.Info("Quote consumed")
+	s.logger.Debug("Quote consumed", zap.String("quote_ref", req.GetQuoteRef()), zap.String("ledger_txn_ref", req.GetLedgerTxnRef()))
 	return gsresponse.Success(resp)
 }
 
@@ -343,21 +302,13 @@ func (s *Service) latestRateResponder(ctx context.Context, req *oraclev1.LatestR
 	if req == nil {
 		req = &oraclev1.LatestRateRequest{}
 	}
-	logger := s.logger.With(requestMetaFields(req.GetMeta())...)
+	s.logger.Debug("Handling LatestRate", zap.String("pair", req.GetPair().GetBase()+"/"+req.GetPair().GetQuote()))
-	if pair := req.GetPair(); pair != nil {
-		logger = logger.With(zap.String("pair_base", strings.TrimSpace(pair.GetBase())), zap.String("pair_quote", strings.TrimSpace(pair.GetQuote())))
-	}
-	if provider := strings.TrimSpace(req.GetProvider()); provider != "" {
-		logger = logger.With(zap.String("provider", provider))
-	}
-	logger.Debug("Handling LatestRate")
 	if err := s.pingStorage(ctx); err != nil {
-		logger.Warn("Storage unavailable during LatestRate", zap.Error(err))
+		s.logger.Warn("Storage unavailable during LatestRate", zap.Error(err))
 		return gsresponse.Unavailable[oraclev1.LatestRateResponse](s.logger, mservice.FXOracle, err)
 	}
 	pairMsg := req.GetPair()
 	if pairMsg == nil || strings.TrimSpace(pairMsg.GetBase()) == "" || strings.TrimSpace(pairMsg.GetQuote()) == "" {
-		logger.Warn("LatestRate invalid: pair missing")
 		return gsresponse.InvalidArgument[oraclev1.LatestRateResponse](s.logger, mservice.FXOracle, errEmptyRequest)
 	}
 	pair := model.CurrencyPair{Base: strings.ToUpper(pairMsg.GetBase()), Quote: strings.ToUpper(pairMsg.GetQuote())}
@@ -366,10 +317,8 @@ func (s *Service) latestRateResponder(ctx context.Context, req *oraclev1.LatestR
 	if err != nil {
 		switch {
 		case errors.Is(err, merrors.ErrNoData):
-			logger.Warn("LatestRate pair not found")
 			return gsresponse.NotFound[oraclev1.LatestRateResponse](s.logger, mservice.FXOracle, err)
 		default:
-			logger.Warn("LatestRate failed to load pair", zap.Error(err))
 			return gsresponse.Internal[oraclev1.LatestRateResponse](s.logger, mservice.FXOracle, err)
 		}
 	}
@@ -386,10 +335,8 @@ func (s *Service) latestRateResponder(ctx context.Context, req *oraclev1.LatestR
 	if err != nil {
 		switch {
 		case errors.Is(err, merrors.ErrNoData):
-			logger.Warn("LatestRate not found", zap.String("provider", provider))
 			return gsresponse.NotFound[oraclev1.LatestRateResponse](s.logger, mservice.FXOracle, err)
 		default:
-			logger.Warn("LatestRate failed", zap.Error(err))
 			return gsresponse.Internal[oraclev1.LatestRateResponse](s.logger, mservice.FXOracle, err)
 		}
 	}
@@ -398,7 +345,6 @@ func (s *Service) latestRateResponder(ctx context.Context, req *oraclev1.LatestR
 		Meta: buildResponseMeta(req.GetMeta()),
 		Rate: rateModelToProto(rate),
 	}
-	logger.Debug("LatestRate succeeded", zap.String("provider", provider), zap.Int64("asof_unix_ms", rate.AsOfUnixMs))
 	return gsresponse.Success(resp)
 }
 
@@ -406,15 +352,13 @@ func (s *Service) listPairsResponder(ctx context.Context, req *oraclev1.ListPair
 	if req == nil {
 		req = &oraclev1.ListPairsRequest{}
 	}
-	logger := s.logger.With(requestMetaFields(req.GetMeta())...)
+	s.logger.Debug("Handling ListPairs")
-	logger.Debug("Handling ListPairs")
 	if err := s.pingStorage(ctx); err != nil {
-		logger.Warn("Storage unavailable during ListPairs", zap.Error(err))
+		s.logger.Warn("Storage unavailable during ListPairs", zap.Error(err))
 		return gsresponse.Unavailable[oraclev1.ListPairsResponse](s.logger, mservice.FXOracle, err)
 	}
 	pairs, err := s.storage.Pairs().ListEnabled(ctx)
 	if err != nil {
-		logger.Warn("ListPairs failed", zap.Error(err))
 		return gsresponse.Internal[oraclev1.ListPairsResponse](s.logger, mservice.FXOracle, err)
 	}
 	result := make([]*oraclev1.PairMeta, 0, len(pairs))
@@ -425,7 +369,7 @@ func (s *Service) listPairsResponder(ctx context.Context, req *oraclev1.ListPair
 		Meta:  buildResponseMeta(req.GetMeta()),
 		Pairs: result,
 	}
-	logger.Debug("ListPairs returning metadata", zap.Int("pairs", len(resp.GetPairs())))
+	s.logger.Debug("ListPairs returning metadata", zap.Int("pairs", len(resp.GetPairs())))
 	return gsresponse.Success(resp)
 }
 

api/fx/storage/go.mod

@@ -28,5 +28,5 @@ require (
 	golang.org/x/crypto v0.46.0 // indirect
 	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/text v0.32.0 // indirect
-	google.golang.org/protobuf v1.36.11 // indirect
+	google.golang.org/protobuf v1.36.10 // indirect
 )

api/fx/storage/go.sum

@@ -169,7 +169,7 @@ golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

api/gateway/chain/go.mod

@@ -16,13 +16,13 @@ require (
 	go.mongodb.org/mongo-driver v1.17.6
 	go.uber.org/zap v1.27.1
 	google.golang.org/grpc v1.77.0
-	google.golang.org/protobuf v1.36.11
+	google.golang.org/protobuf v1.36.10
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251222010151-8a13a32a690c // indirect
+	github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251208031133-be43a854e4be // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bits-and-blooms/bitset v1.24.4 // indirect
 	github.com/bmatcuk/doublestar/v4 v4.9.1 // indirect
@@ -60,7 +60,7 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/nats-io/nats.go v1.48.0 // indirect
+	github.com/nats-io/nats.go v1.47.0 // indirect
 	github.com/nats-io/nkeys v0.4.12 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -86,5 +86,5 @@ require (
 	golang.org/x/sys v0.39.0 // indirect
 	golang.org/x/text v0.32.0 // indirect
 	golang.org/x/time v0.14.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
 )

api/gateway/chain/go.sum

@@ -6,8 +6,8 @@ github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ=
 github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
-github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251222010151-8a13a32a690c h1:1HaIKi7tUhYKk05NOy2tgqtDky4aVXjCeTaBU7ziJZE=
+github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251208031133-be43a854e4be h1:1LtMLkGIqE5IQZ7Vdh4zv8A6LECInKF86/fTVxKxYLE=
-github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251222010151-8a13a32a690c/go.mod h1:ioLG6R+5bUSO1oeGSDxOV3FADARuMoytZCSX6MEMQkI=
+github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251208031133-be43a854e4be/go.mod h1:ioLG6R+5bUSO1oeGSDxOV3FADARuMoytZCSX6MEMQkI=
 github.com/VictoriaMetrics/fastcache v1.13.0 h1:AW4mheMR5Vd9FkAPUv+NH6Nhw+fmbTMGMsNAoA/+4G0=
 github.com/VictoriaMetrics/fastcache v1.13.0/go.mod h1:hHXhl4DA2fTL2HTZDJFXWgW0LNjo6B+4aj2Wmng3TjU=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -207,8 +207,8 @@ 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=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/nats-io/nats.go v1.48.0 h1:pSFyXApG+yWU/TgbKCjmm5K4wrHu86231/w84qRVR+U=
+github.com/nats-io/nats.go v1.47.0 h1:YQdADw6J/UfGUd2Oy6tn4Hq6YHxCaJrVKayxxFqYrgM=
-github.com/nats-io/nats.go v1.48.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
+github.com/nats-io/nats.go v1.47.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
 github.com/nats-io/nkeys v0.4.12 h1:nssm7JKOG9/x4J8II47VWCL1Ds29avyiQDRn0ckMvDc=
 github.com/nats-io/nkeys v0.4.12/go.mod h1:MT59A1HYcjIcyQDJStTfaOY6vhy9XTUjOFo+SVsvpBg=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
@@ -362,12 +362,12 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 h1:2I6GHUeJ/4shcDpoUlLs/2WPnhg7yJwvXtqcMJt9liA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:gRkg/vSppuSQoDjxyiGfN4Upv/h/DQmIR10ZU8dh4Ww=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
 google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

api/gateway/chain/internal/service/gateway/commands/wallet/create.go

@@ -9,7 +9,6 @@ import (
 	"github.com/tech/sendico/gateway/chain/storage/model"
 	"github.com/tech/sendico/pkg/api/routers/gsresponse"
 	"github.com/tech/sendico/pkg/merrors"
-	pkgmodel "github.com/tech/sendico/pkg/model"
 	"github.com/tech/sendico/pkg/mservice"
 	chainv1 "github.com/tech/sendico/pkg/proto/gateway/chain/v1"
 	"go.uber.org/zap"
@@ -96,31 +95,7 @@ func (c *createManagedWalletCommand) Execute(ctx context.Context, req *chainv1.C
 		return gsresponse.Internal[chainv1.CreateManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, merrors.Internal("key manager returned empty address"))
 	}
 
-	metadata := shared.CloneMetadata(req.GetMetadata())
-	desc := req.GetDescribable()
-	name := strings.TrimSpace(desc.GetName())
-	if name == "" {
-		name = strings.TrimSpace(metadata["name"])
-	}
-	var description *string
-	if desc != nil && desc.Description != nil {
-		if trimmed := strings.TrimSpace(desc.GetDescription()); trimmed != "" {
-			description = &trimmed
-		}
-	}
-	if description == nil {
-		if trimmed := strings.TrimSpace(metadata["description"]); trimmed != "" {
-			description = &trimmed
-		}
-	}
-	if name == "" {
-		name = walletRef
-	}
-
 	wallet := &model.ManagedWallet{
-		Describable: pkgmodel.Describable{
-			Name: name,
-		},
 		IdempotencyKey:  idempotencyKey,
 		WalletRef:       walletRef,
 		OrganizationRef: organizationRef,
@@ -131,10 +106,7 @@ func (c *createManagedWalletCommand) Execute(ctx context.Context, req *chainv1.C
 		DepositAddress:  strings.ToLower(keyInfo.Address),
 		KeyReference:    keyInfo.KeyID,
 		Status:          model.ManagedWalletStatusActive,
-		Metadata:        metadata,
+		Metadata:        shared.CloneMetadata(req.GetMetadata()),
-	}
-	if description != nil {
-		wallet.Describable.Description = description
 	}
 
 	created, err := c.deps.Storage.Wallets().Create(ctx, wallet)

api/gateway/chain/internal/service/gateway/commands/wallet/proto.go

@@ -1,11 +1,8 @@
 package wallet
 
 import (
-	"strings"
-
 	"github.com/tech/sendico/gateway/chain/internal/service/gateway/shared"
 	"github.com/tech/sendico/gateway/chain/storage/model"
-	describablev1 "github.com/tech/sendico/pkg/proto/common/describable/v1"
 	chainv1 "github.com/tech/sendico/pkg/proto/gateway/chain/v1"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
@@ -19,25 +16,6 @@ func toProtoManagedWallet(wallet *model.ManagedWallet) *chainv1.ManagedWallet {
 		TokenSymbol:     wallet.TokenSymbol,
 		ContractAddress: wallet.ContractAddress,
 	}
-	name := strings.TrimSpace(wallet.Name)
-	if name == "" {
-		name = strings.TrimSpace(wallet.Metadata["name"])
-	}
-	if name == "" {
-		name = wallet.WalletRef
-	}
-	description := ""
-	switch {
-	case wallet.Description != nil:
-		description = strings.TrimSpace(*wallet.Description)
-	default:
-		description = strings.TrimSpace(wallet.Metadata["description"])
-	}
-	desc := &describablev1.Describable{Name: name}
-	if description != "" {
-		desc.Description = &description
-	}
-
 	return &chainv1.ManagedWallet{
 		WalletRef:       wallet.WalletRef,
 		OrganizationRef: wallet.OrganizationRef,
@@ -48,7 +26,6 @@ func toProtoManagedWallet(wallet *model.ManagedWallet) *chainv1.ManagedWallet {
 		Metadata:        shared.CloneMetadata(wallet.Metadata),
 		CreatedAt:       timestamppb.New(wallet.CreatedAt.UTC()),
 		UpdatedAt:       timestamppb.New(wallet.UpdatedAt.UTC()),
-		Describable:     desc,
 	}
 }
 

api/gateway/chain/storage/model/wallet.go

@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/tech/sendico/pkg/db/storable"
-	pkgmodel "github.com/tech/sendico/pkg/model"
 	"github.com/tech/sendico/pkg/mservice"
 	moneyv1 "github.com/tech/sendico/pkg/proto/common/money/v1"
 )
@@ -21,7 +20,6 @@ const (
 // ManagedWallet represents a user-controlled on-chain wallet managed by the service.
 type ManagedWallet struct {
 	storable.Base `bson:",inline" json:",inline"`
-	pkgmodel.Describable `bson:",inline" json:",inline"`
 
 	IdempotencyKey  string              `bson:"idempotencyKey" json:"idempotencyKey"`
 	WalletRef       string              `bson:"walletRef" json:"walletRef"`
@@ -79,15 +77,6 @@ func (m *ManagedWallet) Normalize() {
 	m.WalletRef = strings.TrimSpace(m.WalletRef)
 	m.OrganizationRef = strings.TrimSpace(m.OrganizationRef)
 	m.OwnerRef = strings.TrimSpace(m.OwnerRef)
-	m.Name = strings.TrimSpace(m.Name)
-	if m.Description != nil {
-		desc := strings.TrimSpace(*m.Description)
-		if desc == "" {
-			m.Description = nil
-		} else {
-			m.Description = &desc
-		}
-	}
 	m.Network = strings.TrimSpace(strings.ToLower(m.Network))
 	m.TokenSymbol = strings.TrimSpace(strings.ToUpper(m.TokenSymbol))
 	m.ContractAddress = strings.TrimSpace(strings.ToLower(m.ContractAddress))

api/gateway/mntx/go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/tech/sendico/pkg v0.1.0
 	go.uber.org/zap v1.27.1
 	google.golang.org/grpc v1.77.0
-	google.golang.org/protobuf v1.36.11
+	google.golang.org/protobuf v1.36.10
 	gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -30,7 +30,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/nats-io/nats.go v1.48.0 // indirect
+	github.com/nats-io/nats.go v1.47.0 // indirect
 	github.com/nats-io/nkeys v0.4.12 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
@@ -50,5 +50,5 @@ require (
 	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/sys v0.39.0 // indirect
 	golang.org/x/text v0.32.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
 )

api/gateway/mntx/go.sum

@@ -95,8 +95,8 @@ 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=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/nats-io/nats.go v1.48.0 h1:pSFyXApG+yWU/TgbKCjmm5K4wrHu86231/w84qRVR+U=
+github.com/nats-io/nats.go v1.47.0 h1:YQdADw6J/UfGUd2Oy6tn4Hq6YHxCaJrVKayxxFqYrgM=
-github.com/nats-io/nats.go v1.48.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
+github.com/nats-io/nats.go v1.47.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
 github.com/nats-io/nkeys v0.4.12 h1:nssm7JKOG9/x4J8II47VWCL1Ds29avyiQDRn0ckMvDc=
 github.com/nats-io/nkeys v0.4.12/go.mod h1:MT59A1HYcjIcyQDJStTfaOY6vhy9XTUjOFo+SVsvpBg=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
@@ -214,12 +214,12 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 h1:2I6GHUeJ/4shcDpoUlLs/2WPnhg7yJwvXtqcMJt9liA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:gRkg/vSppuSQoDjxyiGfN4Upv/h/DQmIR10ZU8dh4Ww=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
 google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

api/ledger/go.mod

@@ -12,7 +12,7 @@ require (
 	go.mongodb.org/mongo-driver v1.17.6
 	go.uber.org/zap v1.27.1
 	google.golang.org/grpc v1.77.0
-	google.golang.org/protobuf v1.36.11
+	google.golang.org/protobuf v1.36.10
 	gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -33,7 +33,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/nats-io/nats.go v1.48.0 // indirect
+	github.com/nats-io/nats.go v1.47.0 // indirect
 	github.com/nats-io/nkeys v0.4.12 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -51,5 +51,5 @@ require (
 	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/sys v0.39.0 // indirect
 	golang.org/x/text v0.32.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
 )

api/ledger/go.sum

@@ -95,8 +95,8 @@ 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=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/nats-io/nats.go v1.48.0 h1:pSFyXApG+yWU/TgbKCjmm5K4wrHu86231/w84qRVR+U=
+github.com/nats-io/nats.go v1.47.0 h1:YQdADw6J/UfGUd2Oy6tn4Hq6YHxCaJrVKayxxFqYrgM=
-github.com/nats-io/nats.go v1.48.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
+github.com/nats-io/nats.go v1.47.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
 github.com/nats-io/nkeys v0.4.12 h1:nssm7JKOG9/x4J8II47VWCL1Ds29avyiQDRn0ckMvDc=
 github.com/nats-io/nkeys v0.4.12/go.mod h1:MT59A1HYcjIcyQDJStTfaOY6vhy9XTUjOFo+SVsvpBg=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
@@ -214,12 +214,12 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 h1:2I6GHUeJ/4shcDpoUlLs/2WPnhg7yJwvXtqcMJt9liA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:gRkg/vSppuSQoDjxyiGfN4Upv/h/DQmIR10ZU8dh4Ww=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
 google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

api/notification/go.mod

@@ -33,7 +33,7 @@ require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/nats-io/nats.go v1.48.0 // indirect
+	github.com/nats-io/nats.go v1.47.0 // indirect
 	github.com/nats-io/nkeys v0.4.12 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/prometheus/client_golang v1.23.2 // indirect
@@ -52,7 +52,7 @@ require (
 	golang.org/x/net v0.48.0 // indirect
 	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/sys v0.39.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
 	google.golang.org/grpc v1.77.0 // indirect
-	google.golang.org/protobuf v1.36.11 // indirect
+	google.golang.org/protobuf v1.36.10 // indirect
 )

api/notification/go.sum

@@ -99,8 +99,8 @@ 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=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/nats-io/nats.go v1.48.0 h1:pSFyXApG+yWU/TgbKCjmm5K4wrHu86231/w84qRVR+U=
+github.com/nats-io/nats.go v1.47.0 h1:YQdADw6J/UfGUd2Oy6tn4Hq6YHxCaJrVKayxxFqYrgM=
-github.com/nats-io/nats.go v1.48.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
+github.com/nats-io/nats.go v1.47.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
 github.com/nats-io/nkeys v0.4.12 h1:nssm7JKOG9/x4J8II47VWCL1Ds29avyiQDRn0ckMvDc=
 github.com/nats-io/nkeys v0.4.12/go.mod h1:MT59A1HYcjIcyQDJStTfaOY6vhy9XTUjOFo+SVsvpBg=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
@@ -227,12 +227,12 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 h1:2I6GHUeJ/4shcDpoUlLs/2WPnhg7yJwvXtqcMJt9liA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:gRkg/vSppuSQoDjxyiGfN4Upv/h/DQmIR10ZU8dh4Ww=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
 google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

api/payments/orchestrator/client/client.go

@@ -17,8 +17,6 @@ import (
 // Client exposes typed helpers around the payment orchestrator gRPC API.
 type Client interface {
 	QuotePayment(ctx context.Context, req *orchestratorv1.QuotePaymentRequest) (*orchestratorv1.QuotePaymentResponse, error)
-	QuotePayments(ctx context.Context, req *orchestratorv1.QuotePaymentsRequest) (*orchestratorv1.QuotePaymentsResponse, error)
-	InitiatePayments(ctx context.Context, req *orchestratorv1.InitiatePaymentsRequest) (*orchestratorv1.InitiatePaymentsResponse, error)
 	InitiatePayment(ctx context.Context, req *orchestratorv1.InitiatePaymentRequest) (*orchestratorv1.InitiatePaymentResponse, error)
 	CancelPayment(ctx context.Context, req *orchestratorv1.CancelPaymentRequest) (*orchestratorv1.CancelPaymentResponse, error)
 	GetPayment(ctx context.Context, req *orchestratorv1.GetPaymentRequest) (*orchestratorv1.GetPaymentResponse, error)
@@ -31,8 +29,6 @@ type Client interface {
 
 type grpcOrchestratorClient interface {
 	QuotePayment(ctx context.Context, in *orchestratorv1.QuotePaymentRequest, opts ...grpc.CallOption) (*orchestratorv1.QuotePaymentResponse, error)
-	QuotePayments(ctx context.Context, in *orchestratorv1.QuotePaymentsRequest, opts ...grpc.CallOption) (*orchestratorv1.QuotePaymentsResponse, error)
-	InitiatePayments(ctx context.Context, in *orchestratorv1.InitiatePaymentsRequest, opts ...grpc.CallOption) (*orchestratorv1.InitiatePaymentsResponse, error)
 	InitiatePayment(ctx context.Context, in *orchestratorv1.InitiatePaymentRequest, opts ...grpc.CallOption) (*orchestratorv1.InitiatePaymentResponse, error)
 	CancelPayment(ctx context.Context, in *orchestratorv1.CancelPaymentRequest, opts ...grpc.CallOption) (*orchestratorv1.CancelPaymentResponse, error)
 	GetPayment(ctx context.Context, in *orchestratorv1.GetPaymentRequest, opts ...grpc.CallOption) (*orchestratorv1.GetPaymentResponse, error)
@@ -101,18 +97,6 @@ func (c *orchestratorClient) QuotePayment(ctx context.Context, req *orchestrator
 	return c.client.QuotePayment(ctx, req)
 }
 
-func (c *orchestratorClient) QuotePayments(ctx context.Context, req *orchestratorv1.QuotePaymentsRequest) (*orchestratorv1.QuotePaymentsResponse, error) {
-	ctx, cancel := c.callContext(ctx)
-	defer cancel()
-	return c.client.QuotePayments(ctx, req)
-}
-
-func (c *orchestratorClient) InitiatePayments(ctx context.Context, req *orchestratorv1.InitiatePaymentsRequest) (*orchestratorv1.InitiatePaymentsResponse, error) {
-	ctx, cancel := c.callContext(ctx)
-	defer cancel()
-	return c.client.InitiatePayments(ctx, req)
-}
-
 func (c *orchestratorClient) InitiatePayment(ctx context.Context, req *orchestratorv1.InitiatePaymentRequest) (*orchestratorv1.InitiatePaymentResponse, error) {
 	ctx, cancel := c.callContext(ctx)
 	defer cancel()

api/payments/orchestrator/client/fake.go

@@ -9,8 +9,6 @@ import (
 // Fake implements Client for tests.
 type Fake struct {
 	QuotePaymentFn           func(ctx context.Context, req *orchestratorv1.QuotePaymentRequest) (*orchestratorv1.QuotePaymentResponse, error)
-	QuotePaymentsFn          func(ctx context.Context, req *orchestratorv1.QuotePaymentsRequest) (*orchestratorv1.QuotePaymentsResponse, error)
-	InitiatePaymentsFn       func(ctx context.Context, req *orchestratorv1.InitiatePaymentsRequest) (*orchestratorv1.InitiatePaymentsResponse, error)
 	InitiatePaymentFn        func(ctx context.Context, req *orchestratorv1.InitiatePaymentRequest) (*orchestratorv1.InitiatePaymentResponse, error)
 	CancelPaymentFn          func(ctx context.Context, req *orchestratorv1.CancelPaymentRequest) (*orchestratorv1.CancelPaymentResponse, error)
 	GetPaymentFn             func(ctx context.Context, req *orchestratorv1.GetPaymentRequest) (*orchestratorv1.GetPaymentResponse, error)
@@ -28,20 +26,6 @@ func (f *Fake) QuotePayment(ctx context.Context, req *orchestratorv1.QuotePaymen
 	return &orchestratorv1.QuotePaymentResponse{}, nil
 }
 
-func (f *Fake) QuotePayments(ctx context.Context, req *orchestratorv1.QuotePaymentsRequest) (*orchestratorv1.QuotePaymentsResponse, error) {
-	if f.QuotePaymentsFn != nil {
-		return f.QuotePaymentsFn(ctx, req)
-	}
-	return &orchestratorv1.QuotePaymentsResponse{}, nil
-}
-
-func (f *Fake) InitiatePayments(ctx context.Context, req *orchestratorv1.InitiatePaymentsRequest) (*orchestratorv1.InitiatePaymentsResponse, error) {
-	if f.InitiatePaymentsFn != nil {
-		return f.InitiatePaymentsFn(ctx, req)
-	}
-	return &orchestratorv1.InitiatePaymentsResponse{}, nil
-}
-
 func (f *Fake) InitiatePayment(ctx context.Context, req *orchestratorv1.InitiatePaymentRequest) (*orchestratorv1.InitiatePaymentResponse, error) {
 	if f.InitiatePaymentFn != nil {
 		return f.InitiatePaymentFn(ctx, req)

api/payments/orchestrator/config.yml

@@ -61,6 +61,3 @@ card_gateways:
   monetix:
     funding_address: "wallet_funding_monetix"
     fee_address: "wallet_fee_monetix"
-
-fee_ledger_accounts:
-  monetix: "ledger:fees:monetix"

api/payments/orchestrator/go.mod

@@ -25,7 +25,7 @@ require (
 	go.mongodb.org/mongo-driver v1.17.6
 	go.uber.org/zap v1.27.1
 	google.golang.org/grpc v1.77.0
-	google.golang.org/protobuf v1.36.11
+	google.golang.org/protobuf v1.36.10
 	gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -45,7 +45,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/nats-io/nats.go v1.48.0 // indirect
+	github.com/nats-io/nats.go v1.47.0 // indirect
 	github.com/nats-io/nkeys v0.4.12 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
@@ -62,5 +62,5 @@ require (
 	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/sys v0.39.0 // indirect
 	golang.org/x/text v0.32.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
 )

api/payments/orchestrator/go.sum

@@ -95,8 +95,8 @@ 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=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/nats-io/nats.go v1.48.0 h1:pSFyXApG+yWU/TgbKCjmm5K4wrHu86231/w84qRVR+U=
+github.com/nats-io/nats.go v1.47.0 h1:YQdADw6J/UfGUd2Oy6tn4Hq6YHxCaJrVKayxxFqYrgM=
-github.com/nats-io/nats.go v1.48.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
+github.com/nats-io/nats.go v1.47.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
 github.com/nats-io/nkeys v0.4.12 h1:nssm7JKOG9/x4J8II47VWCL1Ds29avyiQDRn0ckMvDc=
 github.com/nats-io/nkeys v0.4.12/go.mod h1:MT59A1HYcjIcyQDJStTfaOY6vhy9XTUjOFo+SVsvpBg=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
@@ -215,12 +215,12 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 h1:2I6GHUeJ/4shcDpoUlLs/2WPnhg7yJwvXtqcMJt9liA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:gRkg/vSppuSQoDjxyiGfN4Upv/h/DQmIR10ZU8dh4Ww=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
 google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

api/payments/orchestrator/internal/server/internal/serverimp.go

@@ -46,7 +46,6 @@ type config struct {
 	Gateway         clientConfig                      `yaml:"gateway"`
 	Oracle          clientConfig                      `yaml:"oracle"`
 	CardGateways    map[string]cardGatewayRouteConfig `yaml:"card_gateways"`
-	FeeAccounts     map[string]string                 `yaml:"fee_ledger_accounts"`
 }
 
 type clientConfig struct {
@@ -160,9 +159,6 @@ func (i *Imp) Start() error {
 		if routes := buildCardGatewayRoutes(cfg.CardGateways); len(routes) > 0 {
 			opts = append(opts, orchestrator.WithCardGatewayRoutes(routes))
 		}
-		if feeAccounts := buildFeeLedgerAccounts(cfg.FeeAccounts); len(feeAccounts) > 0 {
-			opts = append(opts, orchestrator.WithFeeLedgerAccounts(feeAccounts))
-		}
 		return orchestrator.NewService(logger, repo, opts...), nil
 	}
 
@@ -327,19 +323,3 @@ func buildCardGatewayRoutes(src map[string]cardGatewayRouteConfig) map[string]or
 	}
 	return result
 }
-
-func buildFeeLedgerAccounts(src map[string]string) map[string]string {
-	if len(src) == 0 {
-		return nil
-	}
-	result := make(map[string]string, len(src))
-	for key, account := range src {
-		k := strings.ToLower(strings.TrimSpace(key))
-		v := strings.TrimSpace(account)
-		if k == "" || v == "" {
-			continue
-		}
-		result[k] = v
-	}
-	return result
-}

api/payments/orchestrator/internal/service/orchestrator/command_factory.go

@@ -61,13 +61,6 @@ func (f *paymentCommandFactory) QuotePayment() *quotePaymentCommand {
 	}
 }
 
-func (f *paymentCommandFactory) QuotePayments() *quotePaymentsCommand {
-	return &quotePaymentsCommand{
-		engine: f.engine,
-		logger: f.logger.Named("quote_payments"),
-	}
-}
-
 func (f *paymentCommandFactory) InitiatePayment() *initiatePaymentCommand {
 	return &initiatePaymentCommand{
 		engine: f.engine,
@@ -75,13 +68,6 @@ func (f *paymentCommandFactory) InitiatePayment() *initiatePaymentCommand {
 	}
 }
 
-func (f *paymentCommandFactory) InitiatePayments() *initiatePaymentsCommand {
-	return &initiatePaymentsCommand{
-		engine: f.engine,
-		logger: f.logger.Named("initiate_payments"),
-	}
-}
-
 func (f *paymentCommandFactory) CancelPayment() *cancelPaymentCommand {
 	return &cancelPaymentCommand{
 		engine: f.engine,

api/payments/orchestrator/internal/service/orchestrator/convert.go

@@ -5,7 +5,9 @@ import (
 	"time"
 
 	"github.com/tech/sendico/payments/orchestrator/storage/model"
+	"github.com/tech/sendico/pkg/merrors"
 	fxv1 "github.com/tech/sendico/pkg/proto/common/fx/v1"
+	paginationv1 "github.com/tech/sendico/pkg/proto/common/pagination/v1"
 	chainv1 "github.com/tech/sendico/pkg/proto/gateway/chain/v1"
 	oraclev1 "github.com/tech/sendico/pkg/proto/oracle/v1"
 	orchestratorv1 "github.com/tech/sendico/pkg/proto/payments/orchestrator/v1"
@@ -24,7 +26,6 @@ func intentFromProto(src *orchestratorv1.PaymentIntent) model.PaymentIntent {
 		Amount:      cloneMoney(src.GetAmount()),
 		RequiresFX:  src.GetRequiresFx(),
 		FeePolicy:   src.GetFeePolicy(),
-		SettlementMode: src.GetSettlementMode(),
 		Attributes:  cloneMetadata(src.GetAttributes()),
 	}
 	if src.GetFx() != nil {
@@ -158,7 +159,6 @@ func protoIntentFromModel(src model.PaymentIntent) *orchestratorv1.PaymentIntent
 		Amount:      cloneMoney(src.Amount),
 		RequiresFx:  src.RequiresFX,
 		FeePolicy:   src.FeePolicy,
-		SettlementMode: src.SettlementMode,
 		Attributes:  cloneMetadata(src.Attributes),
 	}
 	if src.FX != nil {
@@ -411,3 +411,74 @@ func cloneNetworkEstimate(resp *chainv1.EstimateTransferFeeResponse) *chainv1.Es
 	}
 	return nil
 }
+
+func protoFailureToModel(code orchestratorv1.PaymentFailureCode) model.PaymentFailureCode {
+	switch code {
+	case orchestratorv1.PaymentFailureCode_PAYMENT_FAILURE_CODE_BALANCE:
+		return model.PaymentFailureCodeBalance
+	case orchestratorv1.PaymentFailureCode_PAYMENT_FAILURE_CODE_LEDGER:
+		return model.PaymentFailureCodeLedger
+	case orchestratorv1.PaymentFailureCode_PAYMENT_FAILURE_CODE_FX:
+		return model.PaymentFailureCodeFX
+	case orchestratorv1.PaymentFailureCode_PAYMENT_FAILURE_CODE_CHAIN:
+		return model.PaymentFailureCodeChain
+	case orchestratorv1.PaymentFailureCode_PAYMENT_FAILURE_CODE_FEES:
+		return model.PaymentFailureCodeFees
+	case orchestratorv1.PaymentFailureCode_PAYMENT_FAILURE_CODE_POLICY:
+		return model.PaymentFailureCodePolicy
+	default:
+		return model.PaymentFailureCodeUnspecified
+	}
+}
+
+func applyProtoPaymentToModel(src *orchestratorv1.Payment, dst *model.Payment) error {
+	if src == nil || dst == nil {
+		return merrors.InvalidArgument("payment payload is required")
+	}
+	dst.PaymentRef = strings.TrimSpace(src.GetPaymentRef())
+	dst.IdempotencyKey = strings.TrimSpace(src.GetIdempotencyKey())
+	dst.Intent = intentFromProto(src.GetIntent())
+	dst.State = modelStateFromProto(src.GetState())
+	dst.FailureCode = protoFailureToModel(src.GetFailureCode())
+	dst.FailureReason = strings.TrimSpace(src.GetFailureReason())
+	dst.Metadata = cloneMetadata(src.GetMetadata())
+	dst.LastQuote = quoteSnapshotToModel(src.GetLastQuote())
+	dst.Execution = executionFromProto(src.GetExecution())
+	if src.GetCardPayout() != nil {
+		dst.CardPayout = &model.CardPayout{
+			PayoutRef:         strings.TrimSpace(src.GetCardPayout().GetPayoutRef()),
+			ProviderPaymentID: strings.TrimSpace(src.GetCardPayout().GetProviderPaymentId()),
+			Status:            strings.TrimSpace(src.GetCardPayout().GetStatus()),
+			FailureReason:     strings.TrimSpace(src.GetCardPayout().GetFailureReason()),
+			CardCountry:       strings.TrimSpace(src.GetCardPayout().GetCardCountry()),
+			MaskedPan:         strings.TrimSpace(src.GetCardPayout().GetMaskedPan()),
+			ProviderCode:      strings.TrimSpace(src.GetCardPayout().GetProviderCode()),
+			GatewayReference:  strings.TrimSpace(src.GetCardPayout().GetGatewayReference()),
+		}
+	}
+	return nil
+}
+
+func executionFromProto(src *orchestratorv1.ExecutionRefs) *model.ExecutionRefs {
+	if src == nil {
+		return nil
+	}
+	return &model.ExecutionRefs{
+		DebitEntryRef:    strings.TrimSpace(src.GetDebitEntryRef()),
+		CreditEntryRef:   strings.TrimSpace(src.GetCreditEntryRef()),
+		FXEntryRef:       strings.TrimSpace(src.GetFxEntryRef()),
+		ChainTransferRef: strings.TrimSpace(src.GetChainTransferRef()),
+		CardPayoutRef:    strings.TrimSpace(src.GetCardPayoutRef()),
+		FeeTransferRef:   strings.TrimSpace(src.GetFeeTransferRef()),
+	}
+}
+
+func ensurePageRequest(req *orchestratorv1.ListPaymentsRequest) *paginationv1.CursorPageRequest {
+	if req == nil {
+		return &paginationv1.CursorPageRequest{}
+	}
+	if req.GetPage() == nil {
+		return &paginationv1.CursorPageRequest{}
+	}
+	return req.GetPage()
+}

api/payments/orchestrator/internal/service/orchestrator/handlers_commands.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"strings"
-	"time"
 
 	"github.com/tech/sendico/payments/orchestrator/storage"
 	"github.com/tech/sendico/payments/orchestrator/storage/model"
@@ -67,177 +66,6 @@ func (h *quotePaymentCommand) Execute(ctx context.Context, req *orchestratorv1.Q
 	return gsresponse.Success(&orchestratorv1.QuotePaymentResponse{Quote: quote})
 }
 
-type quotePaymentsCommand struct {
-	engine paymentEngine
-	logger mlogger.Logger
-}
-
-func (h *quotePaymentsCommand) Execute(ctx context.Context, req *orchestratorv1.QuotePaymentsRequest) gsresponse.Responder[orchestratorv1.QuotePaymentsResponse] {
-	if err := h.engine.EnsureRepository(ctx); err != nil {
-		return gsresponse.Unavailable[orchestratorv1.QuotePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
-	}
-	if req == nil {
-		return gsresponse.InvalidArgument[orchestratorv1.QuotePaymentsResponse](h.logger, mservice.PaymentOrchestrator, merrors.InvalidArgument("nil request"))
-	}
-	orgRef, orgID, err := validateMetaAndOrgRef(req.GetMeta())
-	if err != nil {
-		return gsresponse.InvalidArgument[orchestratorv1.QuotePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
-	}
-	intents := req.GetIntents()
-	if len(intents) == 0 {
-		return gsresponse.InvalidArgument[orchestratorv1.QuotePaymentsResponse](h.logger, mservice.PaymentOrchestrator, merrors.InvalidArgument("intents are required"))
-	}
-
-	baseKey := strings.TrimSpace(req.GetIdempotencyKey())
-	quotes := make([]*orchestratorv1.PaymentQuote, 0, len(intents))
-	expires := make([]time.Time, 0, len(intents))
-	for i, intent := range intents {
-		if err := requireNonNilIntent(intent); err != nil {
-			return gsresponse.InvalidArgument[orchestratorv1.QuotePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
-		}
-		quoteReq := &orchestratorv1.QuotePaymentRequest{
-			Meta:           req.GetMeta(),
-			IdempotencyKey: perIntentIdempotencyKey(baseKey, i, len(intents)),
-			Intent:         intent,
-			PreviewOnly:    req.GetPreviewOnly(),
-		}
-		quote, expiresAt, err := h.engine.BuildPaymentQuote(ctx, orgRef, quoteReq)
-		if err != nil {
-			return gsresponse.Auto[orchestratorv1.QuotePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
-		}
-		quotes = append(quotes, quote)
-		expires = append(expires, expiresAt)
-	}
-
-	aggregate, err := aggregatePaymentQuotes(quotes)
-	if err != nil {
-		return gsresponse.Auto[orchestratorv1.QuotePaymentsResponse](h.logger, mservice.PaymentOrchestrator, merrors.InternalWrap(err, "quote aggregation failed"))
-	}
-	expiresAt, ok := minQuoteExpiry(expires)
-	if !ok {
-		return gsresponse.Auto[orchestratorv1.QuotePaymentsResponse](h.logger, mservice.PaymentOrchestrator, merrors.Internal("quote expiry missing"))
-	}
-
-	quoteRef := ""
-	if !req.GetPreviewOnly() {
-		quotesStore, err := ensureQuotesStore(h.engine.Repository())
-		if err != nil {
-			return gsresponse.Unavailable[orchestratorv1.QuotePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
-		}
-		quoteRef = primitive.NewObjectID().Hex()
-		record := &model.PaymentQuoteRecord{
-			QuoteRef:  quoteRef,
-			Intents:   intentsFromProto(intents),
-			Quotes:    quoteSnapshotsFromProto(quotes),
-			ExpiresAt: expiresAt,
-		}
-		record.SetID(primitive.NewObjectID())
-		record.SetOrganizationRef(orgID)
-		if err := quotesStore.Create(ctx, record); err != nil {
-			return gsresponse.Auto[orchestratorv1.QuotePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
-		}
-		h.logger.Info("stored payment quotes", zap.String("quote_ref", quoteRef), zap.String("org_ref", orgID.Hex()))
-	}
-
-	return gsresponse.Success(&orchestratorv1.QuotePaymentsResponse{
-		QuoteRef:  quoteRef,
-		Aggregate: aggregate,
-		Quotes:    quotes,
-	})
-}
-
-type initiatePaymentsCommand struct {
-	engine paymentEngine
-	logger mlogger.Logger
-}
-
-func (h *initiatePaymentsCommand) Execute(ctx context.Context, req *orchestratorv1.InitiatePaymentsRequest) gsresponse.Responder[orchestratorv1.InitiatePaymentsResponse] {
-	if err := h.engine.EnsureRepository(ctx); err != nil {
-		return gsresponse.Unavailable[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
-	}
-	if req == nil {
-		return gsresponse.InvalidArgument[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, merrors.InvalidArgument("nil request"))
-	}
-	_, orgID, err := validateMetaAndOrgRef(req.GetMeta())
-	if err != nil {
-		return gsresponse.InvalidArgument[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
-	}
-	idempotencyKey, err := requireIdempotencyKey(req.GetIdempotencyKey())
-	if err != nil {
-		return gsresponse.InvalidArgument[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
-	}
-	quoteRef := strings.TrimSpace(req.GetQuoteRef())
-	if quoteRef == "" {
-		return gsresponse.InvalidArgument[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, merrors.InvalidArgument("quote_ref is required"))
-	}
-
-	quotesStore, err := ensureQuotesStore(h.engine.Repository())
-	if err != nil {
-		return gsresponse.Unavailable[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
-	}
-	record, err := quotesStore.GetByRef(ctx, orgID, quoteRef)
-	if err != nil {
-		if errors.Is(err, storage.ErrQuoteNotFound) {
-			return gsresponse.FailedPrecondition[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, "quote_not_found", merrors.InvalidArgument("quote_ref not found or expired"))
-		}
-		return gsresponse.Auto[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
-	}
-
-	intents := record.Intents
-	quotes := record.Quotes
-	if len(intents) == 0 && record.Intent.Kind != "" && record.Intent.Kind != model.PaymentKindUnspecified {
-		intents = []model.PaymentIntent{record.Intent}
-	}
-	if len(quotes) == 0 && record.Quote != nil {
-		quotes = []*model.PaymentQuoteSnapshot{record.Quote}
-	}
-	if len(intents) == 0 || len(quotes) == 0 || len(intents) != len(quotes) {
-		return gsresponse.InvalidArgument[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, merrors.InvalidArgument("stored quote payload is incomplete"))
-	}
-
-	store, err := ensurePaymentsStore(h.engine.Repository())
-	if err != nil {
-		return gsresponse.Unavailable[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
-	}
-
-	payments := make([]*orchestratorv1.Payment, 0, len(intents))
-	for i := range intents {
-		intentProto := protoIntentFromModel(intents[i])
-		if err := requireNonNilIntent(intentProto); err != nil {
-			return gsresponse.InvalidArgument[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
-		}
-		quoteProto := modelQuoteToProto(quotes[i])
-		if quoteProto == nil {
-			return gsresponse.InvalidArgument[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, merrors.InvalidArgument("stored quote is empty"))
-		}
-		quoteProto.QuoteRef = quoteRef
-
-		perKey := perIntentIdempotencyKey(idempotencyKey, i, len(intents))
-		if existing, err := getPaymentByIdempotencyKey(ctx, store, orgID, perKey); err == nil && existing != nil {
-			payments = append(payments, toProtoPayment(existing))
-			continue
-		} else if err != nil && !errors.Is(err, storage.ErrPaymentNotFound) {
-			return gsresponse.Auto[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
-		}
-
-		entity := newPayment(orgID, intentProto, perKey, req.GetMetadata(), quoteProto)
-		if err = store.Create(ctx, entity); err != nil {
-			if errors.Is(err, storage.ErrDuplicatePayment) {
-				return gsresponse.Auto[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, merrors.DataConflict("payment already exists"))
-			}
-			return gsresponse.Auto[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
-		}
-
-		if err := h.engine.ExecutePayment(ctx, store, entity, quoteProto); err != nil {
-			return gsresponse.Auto[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
-		}
-
-		payments = append(payments, toProtoPayment(entity))
-	}
-
-	return gsresponse.Success(&orchestratorv1.InitiatePaymentsResponse{Payments: payments})
-}
-
 type initiatePaymentCommand struct {
 	engine paymentEngine
 	logger mlogger.Logger

api/payments/orchestrator/internal/service/orchestrator/helpers.go

@@ -145,7 +145,7 @@ func resolveTradeAmounts(intentAmount *moneyv1.Money, fxQuote *oraclev1.Quote, s
 	}
 }
 
-func computeAggregates(pay, settlement, fee *moneyv1.Money, network *chainv1.EstimateTransferFeeResponse, fxQuote *oraclev1.Quote, mode orchestratorv1.SettlementMode) (*moneyv1.Money, *moneyv1.Money) {
+func computeAggregates(pay, settlement, fee *moneyv1.Money, network *chainv1.EstimateTransferFeeResponse, fxQuote *oraclev1.Quote) (*moneyv1.Money, *moneyv1.Money) {
 	if pay == nil {
 		return nil, nil
 	}
@@ -166,7 +166,7 @@ func computeAggregates(pay, settlement, fee *moneyv1.Money, network *chainv1.Est
 		}
 	}
 
-	applyChargeToDebit := func(m *moneyv1.Money) {
+	adjustDebit := func(m *moneyv1.Money) {
 		converted, err := ensureCurrency(m, pay.GetCurrency(), fxQuote)
 		if err != nil || converted == nil {
 			return
@@ -176,7 +176,7 @@ func computeAggregates(pay, settlement, fee *moneyv1.Money, network *chainv1.Est
 		}
 	}
 
-	applyChargeToSettlement := func(m *moneyv1.Money) {
+	adjustSettlement := func(m *moneyv1.Money) {
 		converted, err := ensureCurrency(m, settlementCurrency, fxQuote)
 		if err != nil || converted == nil {
 			return
@@ -186,22 +186,12 @@ func computeAggregates(pay, settlement, fee *moneyv1.Money, network *chainv1.Est
 		}
 	}
 
-	switch mode {
+	adjustDebit(fee)
-	case orchestratorv1.SettlementMode_SETTLEMENT_MODE_FIX_RECEIVED:
+	adjustSettlement(fee)
-		// Sender pays the fee: keep settlement fixed, increase debit.
-		applyChargeToDebit(fee)
-	default:
-		// Recipient pays the fee (default): reduce settlement, keep debit fixed.
-		applyChargeToSettlement(fee)
-	}
 
 	if network != nil && network.GetNetworkFee() != nil {
-		switch mode {
+		adjustDebit(network.GetNetworkFee())
-		case orchestratorv1.SettlementMode_SETTLEMENT_MODE_FIX_RECEIVED:
+		adjustSettlement(network.GetNetworkFee())
-			applyChargeToDebit(network.GetNetworkFee())
-		default:
-			applyChargeToSettlement(network.GetNetworkFee())
-		}
 	}
 
 	return makeMoney(pay.GetCurrency(), debitDecimal), makeMoney(settlementCurrency, settlementDecimal)
@@ -214,6 +204,20 @@ func decimalFromMoney(m *moneyv1.Money) (decimal.Decimal, error) {
 	return decimal.NewFromString(m.GetAmount())
 }
 
+func decimalFromMoneyMatching(reference, candidate *moneyv1.Money) (*decimal.Decimal, error) {
+	if reference == nil || candidate == nil {
+		return nil, nil
+	}
+	if !strings.EqualFold(reference.GetCurrency(), candidate.GetCurrency()) {
+		return nil, nil
+	}
+	value, err := decimal.NewFromString(candidate.GetAmount())
+	if err != nil {
+		return nil, err
+	}
+	return &value, nil
+}
+
 func makeMoney(currency string, value decimal.Decimal) *moneyv1.Money {
 	return &moneyv1.Money{
 		Currency: currency,
@@ -379,22 +383,6 @@ func feeBreakdownFromQuote(quote *orchestratorv1.PaymentQuote) []*chainv1.Servic
 	return breakdown
 }
 
-func assignLedgerAccounts(lines []*feesv1.DerivedPostingLine, account string) []*feesv1.DerivedPostingLine {
-	if account == "" || len(lines) == 0 {
-		return lines
-	}
-	for _, line := range lines {
-		if line == nil {
-			continue
-		}
-		if strings.TrimSpace(line.GetLedgerAccountRef()) != "" {
-			continue
-		}
-		line.LedgerAccountRef = account
-	}
-	return lines
-}
-
 func moneyEquals(a, b *moneyv1.Money) bool {
 	if a == nil || b == nil {
 		return false

api/payments/orchestrator/internal/service/orchestrator/helpers_test.go

@@ -7,7 +7,6 @@ import (
 	moneyv1 "github.com/tech/sendico/pkg/proto/common/money/v1"
 	chainv1 "github.com/tech/sendico/pkg/proto/gateway/chain/v1"
 	oraclev1 "github.com/tech/sendico/pkg/proto/oracle/v1"
-	orchestratorv1 "github.com/tech/sendico/pkg/proto/payments/orchestrator/v1"
 )
 
 func TestResolveTradeAmountsBuyBase(t *testing.T) {
@@ -48,32 +47,11 @@ func TestComputeAggregatesConvertsCurrencies(t *testing.T) {
 		},
 	}
 
-	debit, settlement := computeAggregates(pay, settle, fee, network, fxQuote, orchestratorv1.SettlementMode_SETTLEMENT_MODE_FIX_RECEIVED)
+	debit, settlement := computeAggregates(pay, settle, fee, network, fxQuote)
 	if debit.GetCurrency() != "USD" || debit.GetAmount() != "115" {
 		t.Fatalf("expected debit 115 USD, got %s %s", debit.GetCurrency(), debit.GetAmount())
 	}
-	if settlement.GetCurrency() != "EUR" || settlement.GetAmount() != "50" {
+	if settlement.GetCurrency() != "EUR" || settlement.GetAmount() != "42.5" {
-		t.Fatalf("expected settlement 50 EUR, got %s %s", settlement.GetCurrency(), settlement.GetAmount())
+		t.Fatalf("expected settlement 42.5 EUR, got %s %s", settlement.GetCurrency(), settlement.GetAmount())
-	}
-}
-
-func TestComputeAggregatesRecipientPaysFee(t *testing.T) {
-	pay := &moneyv1.Money{Currency: "USDT", Amount: "100"}
-	settle := &moneyv1.Money{Currency: "RUB", Amount: "7932"} // 100 * 79.32
-	fee := &moneyv1.Money{Currency: "USDT", Amount: "7"}      // 7% of 100
-	fxQuote := &oraclev1.Quote{
-		Pair: &fxv1.CurrencyPair{Base: "USDT", Quote: "RUB"},
-		Side: fxv1.Side_SELL_BASE_BUY_QUOTE,
-		Price: &moneyv1.Decimal{
-			Value: "79.32",
-		},
-	}
-
-	debit, settlement := computeAggregates(pay, settle, fee, nil, fxQuote, orchestratorv1.SettlementMode_SETTLEMENT_MODE_FIX_SOURCE)
-	if debit.GetCurrency() != "USDT" || debit.GetAmount() != "100" {
-		t.Fatalf("expected debit 100 USDT, got %s %s", debit.GetCurrency(), debit.GetAmount())
-	}
-	if settlement.GetCurrency() != "RUB" || settlement.GetAmount() != "7376.76" {
-		t.Fatalf("expected settlement 7376.76 RUB, got %s %s", settlement.GetCurrency(), settlement.GetAmount())
 	}
 }

api/payments/orchestrator/internal/service/orchestrator/options.go

@@ -113,24 +113,6 @@ func WithCardGatewayRoutes(routes map[string]CardGatewayRoute) Option {
 	}
 }
 
-// WithFeeLedgerAccounts maps gateway identifiers to ledger accounts used for fees.
-func WithFeeLedgerAccounts(routes map[string]string) Option {
-	return func(s *Service) {
-		if len(routes) == 0 {
-			return
-		}
-		s.deps.feeLedgerAccounts = make(map[string]string, len(routes))
-		for k, v := range routes {
-			key := strings.ToLower(strings.TrimSpace(k))
-			val := strings.TrimSpace(v)
-			if key == "" || val == "" {
-				continue
-			}
-			s.deps.feeLedgerAccounts[key] = val
-		}
-	}
-}
-
 // WithClock overrides the default clock.
 func WithClock(clock clockpkg.Clock) Option {
 	return func(s *Service) {

api/payments/orchestrator/internal/service/orchestrator/quote_batch.go

@@ -1,145 +0,0 @@
-package orchestrator
-
-import (
-	"fmt"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/shopspring/decimal"
-	"github.com/tech/sendico/payments/orchestrator/storage/model"
-	moneyv1 "github.com/tech/sendico/pkg/proto/common/money/v1"
-	orchestratorv1 "github.com/tech/sendico/pkg/proto/payments/orchestrator/v1"
-)
-
-func perIntentIdempotencyKey(base string, index int, total int) string {
-	base = strings.TrimSpace(base)
-	if base == "" {
-		return ""
-	}
-	if total <= 1 {
-		return base
-	}
-	return fmt.Sprintf("%s:%d", base, index+1)
-}
-
-func minQuoteExpiry(expires []time.Time) (time.Time, bool) {
-	var min time.Time
-	for _, exp := range expires {
-		if exp.IsZero() {
-			continue
-		}
-		if min.IsZero() || exp.Before(min) {
-			min = exp
-		}
-	}
-	if min.IsZero() {
-		return time.Time{}, false
-	}
-	return min, true
-}
-
-func aggregatePaymentQuotes(quotes []*orchestratorv1.PaymentQuote) (*orchestratorv1.PaymentQuoteAggregate, error) {
-	if len(quotes) == 0 {
-		return nil, nil
-	}
-	debitTotals := map[string]decimal.Decimal{}
-	settlementTotals := map[string]decimal.Decimal{}
-	feeTotals := map[string]decimal.Decimal{}
-	networkTotals := map[string]decimal.Decimal{}
-
-	for _, quote := range quotes {
-		if quote == nil {
-			continue
-		}
-		if err := accumulateMoney(debitTotals, quote.GetDebitAmount()); err != nil {
-			return nil, err
-		}
-		if err := accumulateMoney(settlementTotals, quote.GetExpectedSettlementAmount()); err != nil {
-			return nil, err
-		}
-		if err := accumulateMoney(feeTotals, quote.GetExpectedFeeTotal()); err != nil {
-			return nil, err
-		}
-		if nf := quote.GetNetworkFee(); nf != nil {
-			if err := accumulateMoney(networkTotals, nf.GetNetworkFee()); err != nil {
-				return nil, err
-			}
-		}
-	}
-
-	return &orchestratorv1.PaymentQuoteAggregate{
-		DebitAmounts:              totalsToMoney(debitTotals),
-		ExpectedSettlementAmounts: totalsToMoney(settlementTotals),
-		ExpectedFeeTotals:         totalsToMoney(feeTotals),
-		NetworkFeeTotals:          totalsToMoney(networkTotals),
-	}, nil
-}
-
-func accumulateMoney(totals map[string]decimal.Decimal, money *moneyv1.Money) error {
-	if money == nil {
-		return nil
-	}
-	currency := strings.TrimSpace(money.GetCurrency())
-	if currency == "" {
-		return nil
-	}
-	amount, err := decimal.NewFromString(money.GetAmount())
-	if err != nil {
-		return err
-	}
-	if current, ok := totals[currency]; ok {
-		totals[currency] = current.Add(amount)
-		return nil
-	}
-	totals[currency] = amount
-	return nil
-}
-
-func totalsToMoney(totals map[string]decimal.Decimal) []*moneyv1.Money {
-	if len(totals) == 0 {
-		return nil
-	}
-	currencies := make([]string, 0, len(totals))
-	for currency := range totals {
-		currencies = append(currencies, currency)
-	}
-	sort.Strings(currencies)
-
-	result := make([]*moneyv1.Money, 0, len(currencies))
-	for _, currency := range currencies {
-		amount := totals[currency]
-		result = append(result, &moneyv1.Money{
-			Amount:   amount.String(),
-			Currency: currency,
-		})
-	}
-	return result
-}
-
-func intentsFromProto(intents []*orchestratorv1.PaymentIntent) []model.PaymentIntent {
-	if len(intents) == 0 {
-		return nil
-	}
-	result := make([]model.PaymentIntent, 0, len(intents))
-	for _, intent := range intents {
-		result = append(result, intentFromProto(intent))
-	}
-	return result
-}
-
-func quoteSnapshotsFromProto(quotes []*orchestratorv1.PaymentQuote) []*model.PaymentQuoteSnapshot {
-	if len(quotes) == 0 {
-		return nil
-	}
-	result := make([]*model.PaymentQuoteSnapshot, 0, len(quotes))
-	for _, quote := range quotes {
-		if quote == nil {
-			continue
-		}
-		if snapshot := quoteSnapshotToModel(quote); snapshot != nil {
-			result = append(result, snapshot)
-		}
-	}
-	return result
-}

api/payments/orchestrator/internal/service/orchestrator/quote_batch_test.go

@@ -1,102 +0,0 @@
-package orchestrator
-
-import (
-	"testing"
-	"time"
-
-	"github.com/shopspring/decimal"
-	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"
-)
-
-func TestAggregatePaymentQuotes(t *testing.T) {
-	quotes := []*orchestratorv1.PaymentQuote{
-		{
-			DebitAmount:              &moneyv1.Money{Amount: "10", Currency: "USD"},
-			ExpectedSettlementAmount: &moneyv1.Money{Amount: "8", Currency: "EUR"},
-			ExpectedFeeTotal:         &moneyv1.Money{Amount: "1", Currency: "USD"},
-			NetworkFee: &chainv1.EstimateTransferFeeResponse{
-				NetworkFee: &moneyv1.Money{Amount: "0.5", Currency: "USD"},
-			},
-		},
-		{
-			DebitAmount:              &moneyv1.Money{Amount: "5", Currency: "USD"},
-			ExpectedSettlementAmount: &moneyv1.Money{Amount: "1000", Currency: "NGN"},
-			ExpectedFeeTotal:         &moneyv1.Money{Amount: "2", Currency: "USD"},
-			NetworkFee: &chainv1.EstimateTransferFeeResponse{
-				NetworkFee: &moneyv1.Money{Amount: "100", Currency: "NGN"},
-			},
-		},
-	}
-
-	agg, err := aggregatePaymentQuotes(quotes)
-	if err != nil {
-		t.Fatalf("aggregatePaymentQuotes returned error: %v", err)
-	}
-
-	assertMoneyTotals(t, agg.GetDebitAmounts(), map[string]string{"USD": "15"})
-	assertMoneyTotals(t, agg.GetExpectedSettlementAmounts(), map[string]string{"EUR": "8", "NGN": "1000"})
-	assertMoneyTotals(t, agg.GetExpectedFeeTotals(), map[string]string{"USD": "3"})
-	assertMoneyTotals(t, agg.GetNetworkFeeTotals(), map[string]string{"USD": "0.5", "NGN": "100"})
-}
-
-func TestAggregatePaymentQuotesInvalidAmount(t *testing.T) {
-	quotes := []*orchestratorv1.PaymentQuote{
-		{
-			DebitAmount: &moneyv1.Money{Amount: "bad", Currency: "USD"},
-		},
-	}
-	if _, err := aggregatePaymentQuotes(quotes); err == nil {
-		t.Fatal("expected error for invalid amount")
-	}
-}
-
-func TestMinQuoteExpiry(t *testing.T) {
-	now := time.Now().UTC()
-	later := now.Add(10 * time.Minute)
-	earliest := now.Add(5 * time.Minute)
-
-	min, ok := minQuoteExpiry([]time.Time{later, {}, earliest})
-	if !ok {
-		t.Fatal("expected min expiry to be set")
-	}
-	if !min.Equal(earliest) {
-		t.Fatalf("expected min expiry %v, got %v", earliest, min)
-	}
-
-	if _, ok := minQuoteExpiry([]time.Time{{}}); ok {
-		t.Fatal("expected min expiry to be unset")
-	}
-}
-
-func assertMoneyTotals(t *testing.T, list []*moneyv1.Money, expected map[string]string) {
-	t.Helper()
-	got := make(map[string]decimal.Decimal, len(list))
-	for _, item := range list {
-		if item == nil {
-			continue
-		}
-		val, err := decimal.NewFromString(item.GetAmount())
-		if err != nil {
-			t.Fatalf("invalid money amount %q: %v", item.GetAmount(), err)
-		}
-		got[item.GetCurrency()] = val
-	}
-	if len(got) != len(expected) {
-		t.Fatalf("expected %d totals, got %d", len(expected), len(got))
-	}
-	for currency, amount := range expected {
-		val, err := decimal.NewFromString(amount)
-		if err != nil {
-			t.Fatalf("invalid expected amount %q: %v", amount, err)
-		}
-		gotVal, ok := got[currency]
-		if !ok {
-			t.Fatalf("missing currency %s", currency)
-		}
-		if !gotVal.Equal(val) {
-			t.Fatalf("expected %s %s, got %s", amount, currency, gotVal.String())
-		}
-	}
-}

api/payments/orchestrator/internal/service/orchestrator/quote_engine.go

@@ -52,9 +52,7 @@ func (s *Service) buildPaymentQuote(ctx context.Context, orgRef string, req *orc
 	} else if amount != nil {
 		feeCurrency = amount.GetCurrency()
 	}
-	feeLines := cloneFeeLines(feeQuote.GetLines())
+	feeTotal := extractFeeTotal(feeQuote.GetLines(), feeCurrency)
-	s.assignFeeLedgerAccounts(intent, feeLines)
-	feeTotal := extractFeeTotal(feeLines, feeCurrency)
 
 	var networkFee *chainv1.EstimateTransferFeeResponse
 	if shouldEstimateNetworkFee(intent) {
@@ -65,13 +63,13 @@ func (s *Service) buildPaymentQuote(ctx context.Context, orgRef string, req *orc
 		s.logger.Debug("network fee estimated", zap.String("org_ref", orgRef))
 	}
 
-	debitAmount, settlementAmount := computeAggregates(payAmount, settlementAmountBeforeFees, feeTotal, networkFee, fxQuote, intent.GetSettlementMode())
+	debitAmount, settlementAmount := computeAggregates(payAmount, settlementAmountBeforeFees, feeTotal, networkFee, fxQuote)
 
 	quote := &orchestratorv1.PaymentQuote{
 		DebitAmount:              debitAmount,
 		ExpectedSettlementAmount: settlementAmount,
 		ExpectedFeeTotal:         feeTotal,
-		FeeLines:                 feeLines,
+		FeeLines:                 cloneFeeLines(feeQuote.GetLines()),
 		FeeRules:                 cloneFeeRules(feeQuote.GetApplied()),
 		FxQuote:                  fxQuote,
 		NetworkFee:               networkFee,
@@ -209,53 +207,3 @@ func (s *Service) requestFXQuote(ctx context.Context, orgRef string, req *orches
 	}
 	return quoteToProto(quote), nil
 }
-
-func (s *Service) feeLedgerAccountForIntent(intent *orchestratorv1.PaymentIntent) string {
-	if intent == nil || len(s.deps.feeLedgerAccounts) == 0 {
-		return ""
-	}
-
-	key := s.gatewayKeyFromIntent(intent)
-	if key == "" {
-		return ""
-	}
-	return strings.TrimSpace(s.deps.feeLedgerAccounts[key])
-}
-
-func (s *Service) assignFeeLedgerAccounts(intent *orchestratorv1.PaymentIntent, lines []*feesv1.DerivedPostingLine) {
-	account := s.feeLedgerAccountForIntent(intent)
-	key := s.gatewayKeyFromIntent(intent)
-
-	missing := 0
-	for _, line := range lines {
-		if line == nil {
-			continue
-		}
-		if strings.TrimSpace(line.GetLedgerAccountRef()) == "" {
-			missing++
-		}
-	}
-	if missing == 0 {
-		return
-	}
-
-	if account == "" {
-		s.logger.Debug("no fee ledger account mapping found", zap.String("gateway", key), zap.Int("missing_lines", missing))
-		return
-	}
-	assignLedgerAccounts(lines, account)
-	s.logger.Debug("applied fee ledger account mapping", zap.String("gateway", key), zap.String("ledger_account", account), zap.Int("lines", missing))
-}
-
-func (s *Service) gatewayKeyFromIntent(intent *orchestratorv1.PaymentIntent) string {
-	if intent == nil {
-		return ""
-	}
-	key := strings.TrimSpace(intent.GetAttributes()["gateway"])
-	if key == "" {
-		if dest := intent.GetDestination(); dest != nil && dest.GetCard() != nil {
-			key = defaultCardGateway
-		}
-	}
-	return strings.ToLower(key)
-}

api/payments/orchestrator/internal/service/orchestrator/service.go

@@ -47,7 +47,6 @@ type serviceDependencies struct {
 	oracle     oracleDependency
 	mntx       mntxDependency
 	cardRoutes map[string]CardGatewayRoute
-	feeLedgerAccounts map[string]string
 }
 
 type handlerSet struct {
@@ -117,24 +116,12 @@ func (s *Service) QuotePayment(ctx context.Context, req *orchestratorv1.QuotePay
 	return executeUnary(ctx, s, "QuotePayment", s.h.commands.QuotePayment().Execute, req)
 }
 
-// QuotePayments aggregates downstream quotes for multiple intents.
-func (s *Service) QuotePayments(ctx context.Context, req *orchestratorv1.QuotePaymentsRequest) (*orchestratorv1.QuotePaymentsResponse, error) {
-	s.ensureHandlers()
-	return executeUnary(ctx, s, "QuotePayments", s.h.commands.QuotePayments().Execute, req)
-}
-
 // InitiatePayment captures a payment intent and reserves funds orchestration.
 func (s *Service) InitiatePayment(ctx context.Context, req *orchestratorv1.InitiatePaymentRequest) (*orchestratorv1.InitiatePaymentResponse, error) {
 	s.ensureHandlers()
 	return executeUnary(ctx, s, "InitiatePayment", s.h.commands.InitiatePayment().Execute, req)
 }
 
-// InitiatePayments executes multiple payments using a stored quote reference.
-func (s *Service) InitiatePayments(ctx context.Context, req *orchestratorv1.InitiatePaymentsRequest) (*orchestratorv1.InitiatePaymentsResponse, error) {
-	s.ensureHandlers()
-	return executeUnary(ctx, s, "InitiatePayments", s.h.commands.InitiatePayments().Execute, req)
-}
-
 // CancelPayment attempts to cancel an in-flight payment.
 func (s *Service) CancelPayment(ctx context.Context, req *orchestratorv1.CancelPaymentRequest) (*orchestratorv1.CancelPaymentResponse, error) {
 	s.ensureHandlers()

api/payments/orchestrator/internal/service/orchestrator/service_helpers_test.go

@@ -49,7 +49,6 @@ func TestNewPayment(t *testing.T) {
 	org := primitive.NewObjectID()
 	intent := &orchestratorv1.PaymentIntent{
 		Amount: &moneyv1.Money{Currency: "USD", Amount: "10"},
-		SettlementMode: orchestratorv1.SettlementMode_SETTLEMENT_MODE_FIX_RECEIVED,
 	}
 	quote := &orchestratorv1.PaymentQuote{QuoteRef: "q1"}
 	p := newPayment(org, intent, "idem", map[string]string{"k": "v"}, quote)
@@ -59,9 +58,6 @@ func TestNewPayment(t *testing.T) {
 	if p.Intent.Amount == nil || p.Intent.Amount.GetAmount() != "10" {
 		t.Fatalf("intent not copied")
 	}
-	if p.Intent.SettlementMode != orchestratorv1.SettlementMode_SETTLEMENT_MODE_FIX_RECEIVED {
-		t.Fatalf("settlement mode not preserved")
-	}
 	if p.LastQuote == nil || p.LastQuote.QuoteRef != "q1" {
 		t.Fatalf("quote not copied")
 	}

api/payments/orchestrator/storage/model/payment.go

@@ -11,7 +11,6 @@ import (
 	moneyv1 "github.com/tech/sendico/pkg/proto/common/money/v1"
 	chainv1 "github.com/tech/sendico/pkg/proto/gateway/chain/v1"
 	oraclev1 "github.com/tech/sendico/pkg/proto/oracle/v1"
-	orchestratorv1 "github.com/tech/sendico/pkg/proto/payments/orchestrator/v1"
 )
 
 // PaymentKind captures the orchestrator intent type.
@@ -132,7 +131,6 @@ type PaymentIntent struct {
 	RequiresFX  bool                    `bson:"requiresFx,omitempty" json:"requiresFx,omitempty"`
 	FX          *FXIntent               `bson:"fx,omitempty" json:"fx,omitempty"`
 	FeePolicy   *feesv1.PolicyOverrides `bson:"feePolicy,omitempty" json:"feePolicy,omitempty"`
-	SettlementMode orchestratorv1.SettlementMode `bson:"settlementMode,omitempty" json:"settlementMode,omitempty"`
 	Attributes  map[string]string       `bson:"attributes,omitempty" json:"attributes,omitempty"`
 }
 

api/payments/orchestrator/storage/model/quote.go

@@ -13,10 +13,8 @@ type PaymentQuoteRecord struct {
 	model.OrganizationBoundBase `bson:",inline" json:",inline"`
 
 	QuoteRef  string                `bson:"quoteRef" json:"quoteRef"`
-	Intent    PaymentIntent           `bson:"intent,omitempty" json:"intent,omitempty"`
+	Intent    PaymentIntent         `bson:"intent" json:"intent"`
-	Intents   []PaymentIntent         `bson:"intents,omitempty" json:"intents,omitempty"`
+	Quote     *PaymentQuoteSnapshot `bson:"quote" json:"quote"`
-	Quote     *PaymentQuoteSnapshot   `bson:"quote,omitempty" json:"quote,omitempty"`
-	Quotes    []*PaymentQuoteSnapshot `bson:"quotes,omitempty" json:"quotes,omitempty"`
 	ExpiresAt time.Time             `bson:"expiresAt" json:"expiresAt"`
 }
 

api/payments/orchestrator/storage/mongo/store/quotes.go

@@ -73,16 +73,6 @@ func (q *Quotes) Create(ctx context.Context, quote *model.PaymentQuoteRecord) er
 			quote.Intent.Attributes[k] = strings.TrimSpace(v)
 		}
 	}
-	if len(quote.Intents) > 0 {
-		for i := range quote.Intents {
-			if quote.Intents[i].Attributes == nil {
-				continue
-			}
-			for k, v := range quote.Intents[i].Attributes {
-				quote.Intents[i].Attributes[k] = strings.TrimSpace(v)
-			}
-		}
-	}
 	quote.Update()
 
 	filter := repository.OrgFilter(quote.OrganizationRef).And(

api/pkg/db/internal/mongo/refreshtokensdb/db.go

@@ -38,8 +38,6 @@ func Create(logger mlogger.Logger, db *mongo.Database) (*RefreshTokenDB, error)
 			{Field: "deviceId", Sort: ri.Asc},
 		},
 		Unique: true,
-		Name:          "unique_active_session",
-		PartialFilter: repository.Filter(IsRevokedField, false),
 	}); err != nil {
 		p.Logger.Error("Failed to create unique account/client/device index", zap.Error(err))
 		return nil, err

api/pkg/db/internal/mongo/refreshtokensdb/refreshtokensdb_test.go

@@ -10,29 +10,23 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"github.com/tech/sendico/pkg/db/internal/mongo/refreshtokensdb"
 	"github.com/tech/sendico/pkg/db/repository"
 	"github.com/tech/sendico/pkg/db/repository/builder"
 	"github.com/tech/sendico/pkg/merrors"
 	factory "github.com/tech/sendico/pkg/mlogger/factory"
 	"github.com/tech/sendico/pkg/model"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/modules/mongodb"
 	"github.com/testcontainers/testcontainers-go/wait"
-	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 )
 
 func setupTestDB(t *testing.T) (*refreshtokensdb.RefreshTokenDB, func()) {
-	db, _, cleanup := setupTestDBWithMongo(t)
-	return db, cleanup
-}
-
-func setupTestDBWithMongo(t *testing.T) (*refreshtokensdb.RefreshTokenDB, *mongo.Database, func()) {
 	// mark as helper for better test failure reporting
 	t.Helper()
 
@@ -68,7 +62,7 @@ func setupTestDBWithMongo(t *testing.T) (*refreshtokensdb.RefreshTokenDB, *mongo
 		_ = mongoContainer.Terminate(termCtx)
 	}
 
-	return db, database, cleanup
+	return db, cleanup
 }
 
 func createTestRefreshToken(accountRef primitive.ObjectID, clientID, deviceID, token string) *model.RefreshToken {
@@ -338,63 +332,6 @@ func TestRefreshTokenDB_SessionReplacement(t *testing.T) {
 		_, err = db.GetByCRT(ctx, secondCRT)
 		require.NoError(t, err)
 	})
-
-	t.Run("Create_After_GlobalRevocation_AllowsNewActive", func(t *testing.T) {
-		userID := primitive.NewObjectID()
-		clientID := "web-app"
-		deviceID := "user-laptop"
-
-		firstToken := createTestRefreshToken(userID, clientID, deviceID, "revoked_token_123")
-		err := db.Create(ctx, firstToken)
-		require.NoError(t, err)
-		require.NotNil(t, firstToken.GetID())
-
-		// Global revoke (deviceID empty) — all tokens should be revoked
-		err = db.RevokeAll(ctx, userID, "")
-		require.NoError(t, err)
-
-		var revoked model.RefreshToken
-		err = db.Get(ctx, *firstToken.GetID(), &revoked)
-		require.NoError(t, err)
-		assert.True(t, revoked.IsRevoked)
-
-		// Creating a new token for the same account/client/device must succeed and produce an active token
-		reissueToken := createTestRefreshToken(userID, clientID, deviceID, "new_token_after_revocation")
-		err = db.Create(ctx, reissueToken)
-		require.NoError(t, err)
-
-		newCRT := &model.ClientRefreshToken{
-			SessionIdentifier: model.SessionIdentifier{
-				ClientID: clientID,
-				DeviceID: deviceID,
-			},
-			RefreshToken: "new_token_after_revocation",
-		}
-		_, err = db.GetByCRT(ctx, newCRT)
-		require.NoError(t, err)
-
-		// Old token must remain unusable
-		oldCRT := &model.ClientRefreshToken{
-			SessionIdentifier: model.SessionIdentifier{
-				ClientID: clientID,
-				DeviceID: deviceID,
-			},
-			RefreshToken: "revoked_token_123",
-		}
-		_, err = db.GetByCRT(ctx, oldCRT)
-		assert.Error(t, err)
-
-		// Both records exist: revoked + new active
-		query := repository.Query().
-			Filter(repository.AccountField(), userID).
-			And(
-				repository.Query().Comparison(repository.Field("clientId"), builder.Eq, clientID),
-				repository.Query().Comparison(repository.Field("deviceId"), builder.Eq, deviceID),
-			)
-		ids, err := db.Repository.ListIDs(ctx, query)
-		require.NoError(t, err)
-		assert.Len(t, ids, 2)
-	})
 }
 
 func TestRefreshTokenDB_ClientManagement(t *testing.T) {
@@ -700,29 +637,3 @@ func TestRefreshTokenDB_DatabaseIndexes(t *testing.T) {
 		assert.Len(t, ids, 5) // Should find 5 non-revoked tokens
 	})
 }
-
-func TestRefreshTokenDB_IndexPartialUniqueActiveSession(t *testing.T) {
-	db, database, cleanup := setupTestDBWithMongo(t)
-	defer cleanup()
-
-	ctx := context.Background()
-
-	cursor, err := database.Collection(db.Repository.Collection()).Indexes().List(ctx)
-	require.NoError(t, err)
-	defer cursor.Close(ctx)
-
-	found := false
-	for cursor.Next(ctx) {
-		var idx bson.M
-		require.NoError(t, cursor.Decode(&idx))
-		if idx["name"] == "unique_active_session" {
-			found = true
-			assert.Equal(t, true, idx["unique"])
-
-			partial, ok := idx["partialFilterExpression"].(bson.M)
-			require.True(t, ok)
-			assert.Equal(t, bson.M{"isRevoked": false}, partial)
-		}
-	}
-	assert.True(t, found, "unique_active_session index not found")
-}

api/pkg/db/internal/mongo/repositoryimp/index.go

@@ -41,9 +41,6 @@ func (r *MongoRepository) CreateIndex(def *ri.Definition) error {
 	if def.Name != "" {
 		opts.SetName(def.Name)
 	}
-	if def.PartialFilter != nil {
-		opts.SetPartialFilterExpression(def.PartialFilter.BuildQuery())
-	}
 
 	_, err := r.collection.Indexes().CreateOne(
 		context.Background(),

api/pkg/db/internal/mongo/repositoryimp/index_integration_test.go

@@ -1,83 +0,0 @@
-//go:build integration
-// +build integration
-
-package repositoryimp_test
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"github.com/tech/sendico/pkg/db/repository"
-	ri "github.com/tech/sendico/pkg/db/repository/index"
-	"github.com/testcontainers/testcontainers-go"
-	"github.com/testcontainers/testcontainers-go/modules/mongodb"
-	"github.com/testcontainers/testcontainers-go/wait"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-)
-
-func TestCreateIndex_WithPartialFilter(t *testing.T) {
-	startCtx, startCancel := context.WithTimeout(context.Background(), 2*time.Minute)
-	defer startCancel()
-
-	mongoContainer, err := mongodb.Run(startCtx,
-		"mongo:latest",
-		mongodb.WithUsername("root"),
-		mongodb.WithPassword("password"),
-		testcontainers.WithWaitStrategy(wait.ForListeningPort("27017/tcp").WithStartupTimeout(2*time.Minute)),
-	)
-	require.NoError(t, err)
-
-	mongoURI, err := mongoContainer.ConnectionString(startCtx)
-	require.NoError(t, err)
-
-	client, err := mongo.Connect(startCtx, options.Client().ApplyURI(mongoURI))
-	require.NoError(t, err)
-	defer client.Disconnect(context.Background())
-
-	database := client.Database("test_partial_index_" + t.Name())
-	defer database.Drop(context.Background())
-
-	repo := repository.CreateMongoRepository(database, "partial_index_items")
-
-	def := &ri.Definition{
-		Keys: []ri.Key{
-			{Field: "field", Sort: ri.Asc},
-		},
-		Unique:        true,
-		Name:          "partial_unique_field_true",
-		PartialFilter: repository.Filter("flag", treu),
-	}
-
-	require.NoError(t, repo.CreateIndex(def))
-
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
-	cursor, err := database.Collection(repo.Collection()).Indexes().List(ctx)
-	require.NoError(t, err)
-	defer cursor.Close(ctx)
-
-	found := false
-	for cursor.Next(ctx) {
-		var idx bson.M
-		require.NoError(t, cursor.Decode(&idx))
-		if idx["name"] == def.Name {
-			found = true
-			assert.Equal(t, true, idx["unique"])
-			assert.Equal(t, bson.M{"field": int32(1)}, idx["key"])
-			partial, ok := idx["partialFilterExpression"].(bson.M)
-			require.True(t, ok)
-			assert.Equal(t, bson.M{"flag": true}, partial)
-		}
-	}
-	assert.True(t, found, "partial unique index was not created")
-
-	termCtx, termCancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer termCancel()
-	_ = mongoContainer.Terminate(termCtx)
-}

api/pkg/db/repository/index/index.go

@@ -1,7 +1,5 @@
 package repository
 
-import "github.com/tech/sendico/pkg/db/repository/builder"
-
 type Sort int8
 
 const (
@@ -20,5 +18,4 @@ type Definition struct {
 	Unique bool   // unique constraint?
 	TTL    *int32 // seconds; nil means “no TTL”
 	Name   string // optional explicit name
-	PartialFilter builder.Query // optional: partialFilterExpression for conditional indexes
 }

api/pkg/go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/mattn/go-colorable v0.1.14
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/nats-io/nats.go v1.48.0
+	github.com/nats-io/nats.go v1.47.0
 	github.com/prometheus/client_golang v1.23.2
 	github.com/stretchr/testify v1.11.1
 	github.com/testcontainers/testcontainers-go v0.33.0
@@ -18,7 +18,7 @@ require (
 	go.uber.org/zap v1.27.1
 	golang.org/x/crypto v0.46.0
 	google.golang.org/grpc v1.77.0
-	google.golang.org/protobuf v1.36.11
+	google.golang.org/protobuf v1.36.10
 )
 
 require (
@@ -93,6 +93,6 @@ require (
 	golang.org/x/sys v0.39.0 // indirect
 	golang.org/x/text v0.32.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

api/pkg/go.sum

@@ -106,8 +106,8 @@ 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=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/nats-io/nats.go v1.48.0 h1:pSFyXApG+yWU/TgbKCjmm5K4wrHu86231/w84qRVR+U=
+github.com/nats-io/nats.go v1.47.0 h1:YQdADw6J/UfGUd2Oy6tn4Hq6YHxCaJrVKayxxFqYrgM=
-github.com/nats-io/nats.go v1.48.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
+github.com/nats-io/nats.go v1.47.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
 github.com/nats-io/nkeys v0.4.12 h1:nssm7JKOG9/x4J8II47VWCL1Ds29avyiQDRn0ckMvDc=
 github.com/nats-io/nkeys v0.4.12/go.mod h1:MT59A1HYcjIcyQDJStTfaOY6vhy9XTUjOFo+SVsvpBg=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
@@ -269,12 +269,12 @@ gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
 google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 h1:mepRgnBZa07I4TRuomDE4sTIYieg/osKmzIf4USdWS4=
 google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8/go.mod h1:fDMmzKV90WSg1NbozdqrE64fkuTv6mlq2zxo9ad+3yo=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 h1:2I6GHUeJ/4shcDpoUlLs/2WPnhg7yJwvXtqcMJt9liA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:gRkg/vSppuSQoDjxyiGfN4Upv/h/DQmIR10ZU8dh4Ww=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
 google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

api/pkg/model/cryptoaddress.go

@@ -8,7 +8,6 @@ import (
 )
 
 type CryptoAddressPaymentData struct {
-	Currency       Currency `bson:"currency" json:"currency"`
 	Address        string  `bson:"address" json:"address"`
 	Network        string  `bson:"network" json:"network"`
 	DestinationTag *string `bson:"destinationTag,omitempty" json:"destinationTag,omitempty"`

api/pkg/model/currency.go

@@ -9,7 +9,6 @@ const (
 	CurrencyUAH Currency = "UAH" // Ukrainian Hryvnia
 	CurrencyPLN Currency = "PLN" // Polish Złoty
 	CurrencyCZK Currency = "CZK" // Czech Koruna
-	CurrencyUSDT Currency = "USDT" // Czech Koruna
 )
 
 // All supported currencies
@@ -20,7 +19,6 @@ var SupportedCurrencies = []Currency{
 	CurrencyUAH,
 	CurrencyPLN,
 	CurrencyCZK,
-	CurrencyUSDT,
 }
 
 type Amount struct {

api/proto/common/describable/v1/describable.proto

@@ -1,11 +0,0 @@
-syntax = "proto3";
-
-package common.describable.v1;
-
-option go_package = "github.com/tech/sendico/pkg/proto/common/describable/v1;describablev1";
-
-// Describable captures a name/description pair reusable across resources.
-message Describable {
-  string name = 1;
-  optional string description = 2;
-}

api/proto/gateway/chain/v1/chain.proto

@@ -7,7 +7,6 @@ option go_package = "github.com/tech/sendico/pkg/proto/gateway/chain/v1;chainv1"
 import "google/protobuf/timestamp.proto";
 import "common/money/v1/money.proto";
 import "common/pagination/v1/cursor.proto";
-import "common/describable/v1/describable.proto";
 
 // Supported blockchain networks for the managed wallets.
 enum ChainNetwork {
@@ -58,7 +57,6 @@ message ManagedWallet {
   map<string, string> metadata = 7;
   google.protobuf.Timestamp created_at = 8;
   google.protobuf.Timestamp updated_at = 9;
-  common.describable.v1.Describable describable = 10;
 }
 
 message CreateManagedWalletRequest {
@@ -67,7 +65,6 @@ message CreateManagedWalletRequest {
   string owner_ref = 3;
   Asset asset = 4;
   map<string, string> metadata = 5;
-  common.describable.v1.Describable describable = 6;
 }
 
 message CreateManagedWalletResponse {

api/proto/payments/orchestrator/v1/orchestrator.proto

@@ -125,13 +125,6 @@ message PaymentQuote {
   string quote_ref = 8;
 }
 
-message PaymentQuoteAggregate {
-  repeated common.money.v1.Money debit_amounts = 1;
-  repeated common.money.v1.Money expected_settlement_amounts = 2;
-  repeated common.money.v1.Money expected_fee_totals = 3;
-  repeated common.money.v1.Money network_fee_totals = 4;
-}
-
 message ExecutionRefs {
   string debit_entry_ref = 1;
   string credit_entry_ref = 2;
@@ -179,30 +172,6 @@ message QuotePaymentResponse {
   PaymentQuote quote = 1;
 }
 
-message QuotePaymentsRequest {
-  RequestMeta meta = 1;
-  string idempotency_key = 2;
-  repeated PaymentIntent intents = 3;
-  bool preview_only = 4;
-}
-
-message QuotePaymentsResponse {
-  string quote_ref = 1;
-  PaymentQuoteAggregate aggregate = 2;
-  repeated PaymentQuote quotes = 3;
-}
-
-message InitiatePaymentsRequest {
-  RequestMeta meta = 1;
-  string idempotency_key = 2;
-  string quote_ref = 3;
-  map<string, string> metadata = 4;
-}
-
-message InitiatePaymentsResponse {
-  repeated Payment payments = 1;
-}
-
 message InitiatePaymentRequest {
   RequestMeta meta = 1;
   string idempotency_key = 2;
@@ -290,8 +259,6 @@ message InitiateConversionResponse {
 
 service PaymentOrchestrator {
   rpc QuotePayment(QuotePaymentRequest) returns (QuotePaymentResponse);
-  rpc QuotePayments(QuotePaymentsRequest) returns (QuotePaymentsResponse);
-  rpc InitiatePayments(InitiatePaymentsRequest) returns (InitiatePaymentsResponse);
   rpc InitiatePayment(InitiatePaymentRequest) returns (InitiatePaymentResponse);
   rpc CancelPayment(CancelPaymentRequest) returns (CancelPaymentResponse);
   rpc GetPayment(GetPaymentRequest) returns (GetPaymentResponse);

api/server/config.yml

@@ -90,8 +90,8 @@ api:
     call_timeout_seconds: 5
     insecure: true
   payment_orchestrator:
-    address: sendico_payments_orchestrator:50062
+    address: sendico_payment_orchestrator:50062
-    address_env: PAYMENTS_ADDRESS
+    address_env: PAYMENT_ORCHESTRATOR_ADDRESS
     dial_timeout_seconds: 5
     call_timeout_seconds: 5
     insecure: true

api/server/go.mod

@@ -12,9 +12,9 @@ replace github.com/tech/sendico/gateway/chain => ../gateway/chain
 
 require (
 	github.com/aws/aws-sdk-go-v2 v1.41.0
-	github.com/aws/aws-sdk-go-v2/config v1.32.6
+	github.com/aws/aws-sdk-go-v2/config v1.32.5
-	github.com/aws/aws-sdk-go-v2/credentials v1.19.6
+	github.com/aws/aws-sdk-go-v2/credentials v1.19.5
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.94.0
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.93.2
 	github.com/go-chi/chi/v5 v5.2.3
 	github.com/go-chi/cors v1.2.2
 	github.com/go-chi/jwtauth/v5 v5.3.3
@@ -32,7 +32,7 @@ require (
 	go.mongodb.org/mongo-driver v1.17.6
 	go.uber.org/zap v1.27.1
 	golang.org/x/net v0.48.0
-	google.golang.org/protobuf v1.36.11
+	google.golang.org/protobuf v1.36.10
 	gopkg.in/yaml.v3 v3.0.1
 	moul.io/chizap v1.0.3
 )
@@ -58,7 +58,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.16 // indirect
 	github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.30.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.30.7 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 // indirect
 	github.com/aws/smithy-go v1.24.0 // indirect
@@ -103,7 +103,7 @@ require (
 	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/nats-io/nats.go v1.48.0 // indirect
+	github.com/nats-io/nats.go v1.47.0 // indirect
 	github.com/nats-io/nkeys v0.4.12 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
@@ -139,6 +139,6 @@ require (
 	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/sys v0.39.0 // indirect
 	golang.org/x/text v0.32.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
 	google.golang.org/grpc v1.77.0 // indirect
 )

api/server/go.sum

@@ -10,10 +10,10 @@ github.com/aws/aws-sdk-go-v2 v1.41.0 h1:tNvqh1s+v0vFYdA1xq0aOJH+Y5cRyZ5upu6roPgP
 github.com/aws/aws-sdk-go-v2 v1.41.0/go.mod h1:MayyLB8y+buD9hZqkCW3kX1AKq07Y5pXxtgB+rRFhz0=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 h1:489krEF9xIGkOaaX3CE/Be2uWjiXrkCH6gUX+bZA/BU=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4/go.mod h1:IOAPF6oT9KCsceNTvvYMNHy0+kMF8akOjeDvPENWxp4=
-github.com/aws/aws-sdk-go-v2/config v1.32.6 h1:hFLBGUKjmLAekvi1evLi5hVvFQtSo3GYwi+Bx4lpJf8=
+github.com/aws/aws-sdk-go-v2/config v1.32.5 h1:pz3duhAfUgnxbtVhIK39PGF/AHYyrzGEyRD9Og0QrE8=
-github.com/aws/aws-sdk-go-v2/config v1.32.6/go.mod h1:lcUL/gcd8WyjCrMnxez5OXkO3/rwcNmvfno62tnXNcI=
+github.com/aws/aws-sdk-go-v2/config v1.32.5/go.mod h1:xmDjzSUs/d0BB7ClzYPAZMmgQdrodNjPPhd6bGASwoE=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.6 h1:F9vWao2TwjV2MyiyVS+duza0NIRtAslgLUM0vTA1ZaE=
+github.com/aws/aws-sdk-go-v2/credentials v1.19.5 h1:xMo63RlqP3ZZydpJDMBsH9uJ10hgHYfQFIk1cHDXrR4=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.6/go.mod h1:SgHzKjEVsdQr6Opor0ihgWtkWdfRAIwxYzSJ8O85VHY=
+github.com/aws/aws-sdk-go-v2/credentials v1.19.5/go.mod h1:hhbH6oRcou+LpXfA/0vPElh/e0M3aFeOblE1sssAAEk=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 h1:80+uETIWS1BqjnN9uJ0dBUaETh+P1XwFy5vwHwK5r9k=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16/go.mod h1:wOOsYuxYuB/7FlnVtzeBYRcjSRtQpAW0hCP7tIULMwo=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 h1:rgGwPzb82iBYSvHMHXc8h9mRoOUBZIGFgKb9qniaZZc=
@@ -32,12 +32,12 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 h1:oHjJHeUy
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16/go.mod h1:iRSNGgOYmiYwSCXxXaKb9HfOEj40+oTKn8pTxMlYkRM=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.16 h1:NSbvS17MlI2lurYgXnCOLvCFX38sBW4eiVER7+kkgsU=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.16/go.mod h1:SwT8Tmqd4sA6G1qaGdzWCJN99bUmPGHfRwwq3G5Qb+A=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.94.0 h1:SWTxh/EcUCDVqi/0s26V6pVUq0BBG7kx0tDTmF/hCgA=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.93.2 h1:U3ygWUhCpiSPYSHOrRhb3gOl9T5Y3kB8k5Vjs//57bE=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.94.0/go.mod h1:79S2BdqCJpScXZA2y+cpZuocWsjGjJINyXnOsf5DTz8=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.93.2/go.mod h1:79S2BdqCJpScXZA2y+cpZuocWsjGjJINyXnOsf5DTz8=
 github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 h1:HpI7aMmJ+mm1wkSHIA2t5EaFFv5EFYXePW30p1EIrbQ=
 github.com/aws/aws-sdk-go-v2/service/signin v1.0.4/go.mod h1:C5RdGMYGlfM0gYq/tifqgn4EbyX99V15P2V3R+VHbQU=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.8 h1:aM/Q24rIlS3bRAhTyFurowU8A0SMyGDtEOY/l/s/1Uw=
+github.com/aws/aws-sdk-go-v2/service/sso v1.30.7 h1:eYnlt6QxnFINKzwxP5/Ucs1vkG7VT3Iezmvfgc2waUw=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.8/go.mod h1:+fWt2UHSb4kS7Pu8y+BMBvJF0EWx+4H0hzNwtDNRTrg=
+github.com/aws/aws-sdk-go-v2/service/sso v1.30.7/go.mod h1:+fWt2UHSb4kS7Pu8y+BMBvJF0EWx+4H0hzNwtDNRTrg=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 h1:AHDr0DaHIAo8c9t1emrzAlVDFp+iMMKnPdYy6XO4MCE=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12/go.mod h1:GQ73XawFFiWxyWXMHWfhiomvP3tXtdNar/fi8z18sx0=
 github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 h1:SciGFVNZ4mHdm7gpD1dgZYnCuVdX1s+lFTg4+4DOy70=
@@ -175,8 +175,8 @@ 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=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/nats-io/nats.go v1.48.0 h1:pSFyXApG+yWU/TgbKCjmm5K4wrHu86231/w84qRVR+U=
+github.com/nats-io/nats.go v1.47.0 h1:YQdADw6J/UfGUd2Oy6tn4Hq6YHxCaJrVKayxxFqYrgM=
-github.com/nats-io/nats.go v1.48.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
+github.com/nats-io/nats.go v1.47.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
 github.com/nats-io/nkeys v0.4.12 h1:nssm7JKOG9/x4J8II47VWCL1Ds29avyiQDRn0ckMvDc=
 github.com/nats-io/nkeys v0.4.12/go.mod h1:MT59A1HYcjIcyQDJStTfaOY6vhy9XTUjOFo+SVsvpBg=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
@@ -361,12 +361,12 @@ gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
 google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 h1:mepRgnBZa07I4TRuomDE4sTIYieg/osKmzIf4USdWS4=
 google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8/go.mod h1:fDMmzKV90WSg1NbozdqrE64fkuTv6mlq2zxo9ad+3yo=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 h1:2I6GHUeJ/4shcDpoUlLs/2WPnhg7yJwvXtqcMJt9liA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:gRkg/vSppuSQoDjxyiGfN4Upv/h/DQmIR10ZU8dh4Ww=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
 google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

api/server/interface/api/srequest/payment.go

@@ -36,27 +36,6 @@ func (r *QuotePayment) Validate() error {
 	return nil
 }
 
-type QuotePayments struct {
-	PaymentBase `json:",inline"`
-	Intents     []PaymentIntent `json:"intents"`
-	PreviewOnly bool            `json:"previewOnly"`
-}
-
-func (r *QuotePayments) Validate() error {
-	if err := r.PaymentBase.Validate(); err != nil {
-		return err
-	}
-	if len(r.Intents) == 0 {
-		return merrors.InvalidArgument("intents are required", "intents")
-	}
-	for i := range r.Intents {
-		if err := r.Intents[i].Validate(); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 type InitiatePayment struct {
 	PaymentBase `json:",inline"`
 	Intent      *PaymentIntent `json:"intent,omitempty"`
@@ -89,18 +68,3 @@ func (r InitiatePayment) Validate() error {
 
 	return nil
 }
-
-type InitiatePayments struct {
-	PaymentBase `json:",inline"`
-	QuoteRef    string `json:"quoteRef,omitempty"`
-}
-
-func (r InitiatePayments) Validate() error {
-	if err := r.PaymentBase.Validate(); err != nil {
-		return err
-	}
-	if r.QuoteRef == "" {
-		return merrors.InvalidArgument("quoteRef is required", "quoteRef")
-	}
-	return nil
-}

api/server/interface/api/srequest/payment_intent.go

@@ -15,12 +15,6 @@ type PaymentIntent struct {
 	Attributes     map[string]string `json:"attributes,omitempty"`
 }
 
-type AssetResolverStub struct{}
-
-func (a *AssetResolverStub) IsSupported(_ string) bool {
-	return true
-}
-
 func (p *PaymentIntent) Validate() error {
 	// Kind must be set (non-zero)
 	var zeroKind PaymentKind
@@ -39,8 +33,7 @@ func (p *PaymentIntent) Validate() error {
 	if p.Amount == nil {
 		return merrors.InvalidArgument("amount is required", "intent.amount")
 	}
-	//TODO: collect supported currencies and validate against them
+	if err := ValidateMoney(p.Amount); err != nil {
-	if err := ValidateMoney(p.Amount, &AssetResolverStub{}); err != nil {
 		return err
 	}
 

api/server/interface/api/srequest/payment_value_objects.go

@@ -1,77 +1,30 @@
 package srequest
 
 import (
-	"regexp"
-	"strings"
-
 	"github.com/shopspring/decimal"
 	"github.com/tech/sendico/pkg/merrors"
 	"github.com/tech/sendico/pkg/model"
 )
 
-// AssetResolver defines environment-specific supported assets.
+func ValidateMoney(m *model.Money) error {
-// Implementations should check:
+	if m.Amount == "" {
-// - fiat assets (ISO-4217)
+		return merrors.InvalidArgument("amount is required", "intent.amount")
-// - crypto assets supported by gateways / FX providers
+	}
-type AssetResolver interface {
+	if m.Currency == "" {
-	IsSupported(ticker string) bool
-}
-
-// Precompile regex for efficiency.
-var currencySyntax = regexp.MustCompile(`^[A-Z0-9]{2,10}$`)
-
-// ValidateCurrency validates currency syntax and checks dictionary via assetResolver.
-func ValidateCurrency(cur string, assetResolver AssetResolver) error {
-	// Basic presence
-	if strings.TrimSpace(cur) == "" {
 		return merrors.InvalidArgument("currency is required", "intent.currency")
 	}
 
-	// Normalize
+	if _, err := decimal.NewFromString(m.Amount); err != nil {
-	cur = strings.ToUpper(strings.TrimSpace(cur))
+		return merrors.InvalidArgument("invalid amount decimal", "intent.amount")
-
-	// Syntax check
-	if !currencySyntax.MatchString(cur) {
-		return merrors.InvalidArgument(
-			"invalid currency format (must be A–Z0–9, length 2–10)",
-			"intent.currency",
-		)
 	}
 
-	// Dictionary validation
+	if len(m.Currency) != 3 {
-	if assetResolver == nil {
+		return merrors.InvalidArgument("currency must be 3 letters", "intent.currency")
-		return merrors.InvalidArgument("asset resolver is not configured", "intent.currency")
 	}
-
+	for _, c := range m.Currency {
-	if !assetResolver.IsSupported(cur) {
+		if c < 'A' || c > 'Z' {
-		return merrors.InvalidArgument("unsupported currency/asset", "intent.currency")
+			return merrors.InvalidArgument("currency must be uppercase A-Z", "intent.currency")
 		}
-
-	return nil
-}
-
-func ValidateMoney(m *model.Money, assetResolver AssetResolver) error {
-	if m == nil {
-		return merrors.InvalidArgument("money is required", "intent.amount")
-	}
-
-	// 1) Basic presence
-	if strings.TrimSpace(m.Amount) == "" {
-		return merrors.InvalidArgument("amount is required", "intent.amount")
-	}
-
-	// 2) Validate decimal amount
-	amount, err := decimal.NewFromString(m.Amount)
-	if err != nil {
-		return merrors.InvalidArgument("invalid decimal amount", "intent.amount")
-	}
-	if amount.IsNegative() {
-		return merrors.InvalidArgument("amount must be >= 0", "intent.amount")
-	}
-
-	// 3) Validate currency via helper
-	if err := ValidateCurrency(m.Currency, assetResolver); err != nil {
-		return err
 	}
 
 	return nil
@@ -83,15 +36,31 @@ type CurrencyPair struct {
 }
 
 func (p *CurrencyPair) Validate() error {
-	if p == nil {
+	if p.Base == "" {
-		return merrors.InvalidArgument("currency pair is required", "currncy_pair")
+		return merrors.InvalidArgument("base currency is required", "intent.fx.pair.base")
 	}
-	if err := ValidateCurrency(p.Base, &AssetResolverStub{}); err != nil {
+	if p.Quote == "" {
-		return merrors.InvalidArgument("invalid base currency in pair: "+err.Error(), "currency_pair.base")
+		return merrors.InvalidArgument("quote currency is required", "intent.fx.pair.quote")
 	}
-	if err := ValidateCurrency(p.Quote, &AssetResolverStub{}); err != nil {
+
-		return merrors.InvalidArgument("invalid quote currency in pair: "+err.Error(), "currency_pair.quote")
+	if len(p.Base) != 3 {
+		return merrors.InvalidArgument("base currency must be 3 letters", "intent.fx.pair.base")
 	}
+	if len(p.Quote) != 3 {
+		return merrors.InvalidArgument("quote currency must be 3 letters", "intent.fx.pair.quote")
+	}
+
+	for _, c := range p.Base {
+		if c < 'A' || c > 'Z' {
+			return merrors.InvalidArgument("base currency must be uppercase A-Z", "intent.fx.pair.base")
+		}
+	}
+	for _, c := range p.Quote {
+		if c < 'A' || c > 'Z' {
+			return merrors.InvalidArgument("quote currency must be uppercase A-Z", "intent.fx.pair.quote")
+		}
+	}
+
 	return nil
 }
 

api/server/interface/api/sresponse/money.go

@@ -14,19 +14,3 @@ func toMoney(m *moneyv1.Money) *model.Money {
 		Currency: m.GetCurrency(),
 	}
 }
-
-func toMoneyList(list []*moneyv1.Money) []*model.Money {
-	if len(list) == 0 {
-		return nil
-	}
-	result := make([]*model.Money, 0, len(list))
-	for _, item := range list {
-		if m := toMoney(item); m != nil {
-			result = append(result, m)
-		}
-	}
-	if len(result) == 0 {
-		return nil
-	}
-	return result
-}

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

@@ -49,19 +49,6 @@ type PaymentQuote struct {
 	FxQuote                  *FxQuote     `json:"fxQuote,omitempty"`
 }
 
-type PaymentQuoteAggregate struct {
-	DebitAmounts              []*model.Money `json:"debitAmounts,omitempty"`
-	ExpectedSettlementAmounts []*model.Money `json:"expectedSettlementAmounts,omitempty"`
-	ExpectedFeeTotals         []*model.Money `json:"expectedFeeTotals,omitempty"`
-	NetworkFeeTotals          []*model.Money `json:"networkFeeTotals,omitempty"`
-}
-
-type PaymentQuotes struct {
-	QuoteRef  string                 `json:"quoteRef,omitempty"`
-	Aggregate *PaymentQuoteAggregate `json:"aggregate,omitempty"`
-	Quotes    []PaymentQuote         `json:"quotes,omitempty"`
-}
-
 type Payment struct {
 	PaymentRef     string        `json:"paymentRef,omitempty"`
 	IdempotencyKey string        `json:"idempotencyKey,omitempty"`
@@ -76,16 +63,6 @@ type paymentQuoteResponse struct {
 	Quote        *PaymentQuote `json:"quote"`
 }
 
-type paymentQuotesResponse struct {
-	authResponse `json:",inline"`
-	Quote        *PaymentQuotes `json:"quote"`
-}
-
-type paymentsResponse struct {
-	authResponse `json:",inline"`
-	Payments     []Payment `json:"payments"`
-}
-
 type paymentResponse struct {
 	authResponse `json:",inline"`
 	Payment      *Payment `json:"payment"`
@@ -99,22 +76,6 @@ func PaymentQuoteResponse(logger mlogger.Logger, quote *orchestratorv1.PaymentQu
 	})
 }
 
-// PaymentQuotes wraps batch quotes with refreshed access token.
-func PaymentQuotesResponse(logger mlogger.Logger, resp *orchestratorv1.QuotePaymentsResponse, token *TokenData) http.HandlerFunc {
-	return response.Ok(logger, paymentQuotesResponse{
-		Quote:        toPaymentQuotes(resp),
-		authResponse: authResponse{AccessToken: *token},
-	})
-}
-
-// Payments wraps a list of payments with refreshed access token.
-func PaymentsResponse(logger mlogger.Logger, payments []*orchestratorv1.Payment, token *TokenData) http.HandlerFunc {
-	return response.Ok(logger, paymentsResponse{
-		Payments:     toPayments(payments),
-		authResponse: authResponse{AccessToken: *token},
-	})
-}
-
 // Payment wraps a payment with refreshed access token.
 func PaymentResponse(logger mlogger.Logger, payment *orchestratorv1.Payment, token *TokenData) http.HandlerFunc {
 	return response.Ok(logger, paymentResponse{
@@ -197,54 +158,6 @@ func toPaymentQuote(q *orchestratorv1.PaymentQuote) *PaymentQuote {
 	}
 }
 
-func toPaymentQuoteAggregate(q *orchestratorv1.PaymentQuoteAggregate) *PaymentQuoteAggregate {
-	if q == nil {
-		return nil
-	}
-	return &PaymentQuoteAggregate{
-		DebitAmounts:              toMoneyList(q.GetDebitAmounts()),
-		ExpectedSettlementAmounts: toMoneyList(q.GetExpectedSettlementAmounts()),
-		ExpectedFeeTotals:         toMoneyList(q.GetExpectedFeeTotals()),
-		NetworkFeeTotals:          toMoneyList(q.GetNetworkFeeTotals()),
-	}
-}
-
-func toPaymentQuotes(resp *orchestratorv1.QuotePaymentsResponse) *PaymentQuotes {
-	if resp == nil {
-		return nil
-	}
-	quotes := make([]PaymentQuote, 0, len(resp.GetQuotes()))
-	for _, quote := range resp.GetQuotes() {
-		if dto := toPaymentQuote(quote); dto != nil {
-			quotes = append(quotes, *dto)
-		}
-	}
-	if len(quotes) == 0 {
-		quotes = nil
-	}
-	return &PaymentQuotes{
-		QuoteRef:  resp.GetQuoteRef(),
-		Aggregate: toPaymentQuoteAggregate(resp.GetAggregate()),
-		Quotes:    quotes,
-	}
-}
-
-func toPayments(items []*orchestratorv1.Payment) []Payment {
-	if len(items) == 0 {
-		return nil
-	}
-	result := make([]Payment, 0, len(items))
-	for _, item := range items {
-		if p := toPayment(item); p != nil {
-			result = append(result, *p)
-		}
-	}
-	if len(result) == 0 {
-		return nil
-	}
-	return result
-}
-
 func toPayment(p *orchestratorv1.Payment) *Payment {
 	if p == nil {
 		return nil

api/server/interface/api/sresponse/wallet.go

@@ -2,7 +2,6 @@ package sresponse
 
 import (
 	"net/http"
-	"strings"
 	"time"
 
 	"github.com/tech/sendico/pkg/api/http/response"
@@ -27,8 +26,6 @@ type wallet struct {
 	DepositAddress  string            `json:"depositAddress"`
 	Status          string            `json:"status"`
 	Metadata        map[string]string `json:"metadata,omitempty"`
-	Name            string            `json:"name"`
-	Description     *string           `json:"description,omitempty"`
 	CreatedAt       string            `json:"createdAt,omitempty"`
 	UpdatedAt       string            `json:"updatedAt,omitempty"`
 }
@@ -83,27 +80,6 @@ func toWallet(w *chainv1.ManagedWallet) wallet {
 		token = asset.GetTokenSymbol()
 		contract = asset.GetContractAddress()
 	}
-	name := ""
-	if d := w.GetDescribable(); d != nil {
-		name = strings.TrimSpace(d.GetName())
-	}
-	if name == "" {
-		name = strings.TrimSpace(w.GetMetadata()["name"])
-	}
-	if name == "" {
-		name = w.GetWalletRef()
-	}
-	var description *string
-	if d := w.GetDescribable(); d != nil && d.Description != nil {
-		if trimmed := strings.TrimSpace(d.GetDescription()); trimmed != "" {
-			description = &trimmed
-		}
-	}
-	if description == nil {
-		if trimmed := strings.TrimSpace(w.GetMetadata()["description"]); trimmed != "" {
-			description = &trimmed
-		}
-	}
 	return wallet{
 		WalletRef:       w.GetWalletRef(),
 		OrganizationRef: w.GetOrganizationRef(),
@@ -116,8 +92,6 @@ func toWallet(w *chainv1.ManagedWallet) wallet {
 		DepositAddress: w.GetDepositAddress(),
 		Status:         w.GetStatus().String(),
 		Metadata:       w.GetMetadata(),
-		Name:           name,
-		Description:    description,
 		CreatedAt:      tsToString(w.GetCreatedAt()),
 		UpdatedAt:      tsToString(w.GetUpdatedAt()),
 	}

api/server/internal/api/routers/public/login.go

@@ -53,7 +53,9 @@ func (pr *PublicRouter) logUserIn(ctx context.Context, _ *http.Request, req *sre
 		pr.logger.Warn("Failed to create login confirmation code", zap.Error(err))
 		return response.Internal(pr.logger, pr.service, err)
 	}
-	pr.logger.Info("Login confirmation code issued", zap.String("destination", pr.maskEmail(account.Login)))
+	pr.logger.Info("Login confirmation code issued",
+		zap.String("destination", pr.maskEmail(account.Login)),
+		zap.String("account", account.Login))
 
 	return sresponse.LoginPending(pr.logger, account, &pendingToken, pr.maskEmail(account.Login), int(time.Until(rec.ExpiresAt).Seconds()))
 }

api/server/internal/server/accountapiimp/signup.go

@@ -248,11 +248,12 @@ func (a *AccountAPI) openOrgWallet(ctx context.Context, org *model.Organization,
 		a.logger.Warn("Chain gateway client not configured, skipping wallet creation", mzap.StorableRef(org))
 		return merrors.Internal("chain gateway client is not configured")
 	}
+	asset := *a.chainAsset
 	req := &chainv1.CreateManagedWalletRequest{
 		IdempotencyKey:  uuid.NewString(),
 		OrganizationRef: org.ID.Hex(),
 		OwnerRef:        org.ID.Hex(),
-		Asset:           a.chainAsset,
+		Asset:           &asset,
 		Metadata: map[string]string{
 			"source": "signup",
 			"login":  sr.Account.Login,

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

@@ -1,74 +0,0 @@
-package paymentapiimp
-
-import (
-	"encoding/json"
-	"net/http"
-	"strings"
-
-	"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"
-	"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"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"go.uber.org/zap"
-)
-
-func (a *PaymentAPI) initiatePaymentsByQuote(r *http.Request, account *model.Account, token *sresponse.TokenData) http.HandlerFunc {
-	orgRef, err := a.oph.GetRef(r)
-	if err != nil {
-		a.logger.Warn("Failed to parse organization reference for batch payment initiation", zap.Error(err), zap.String(a.oph.Name(), a.oph.GetID(r)))
-		return response.BadReference(a.logger, a.Name(), a.oph.Name(), a.oph.GetID(r), err)
-	}
-
-	ctx := r.Context()
-	allowed, err := a.enf.Enforce(ctx, a.permissionRef, account.ID, orgRef, primitive.NilObjectID, model.ActionCreate)
-	if err != nil {
-		a.logger.Warn("Failed to check payments access permissions", zap.Error(err), mutil.PLog(a.oph, r))
-		return response.Auto(a.logger, a.Name(), err)
-	}
-	if !allowed {
-		a.logger.Debug("Access denied when initiating batch payments", mutil.PLog(a.oph, r))
-		return response.AccessDenied(a.logger, a.Name(), "payments write permission denied")
-	}
-
-	payload, err := decodeInitiatePaymentsPayload(r)
-	if err != nil {
-		return response.BadPayload(a.logger, a.Name(), err)
-	}
-
-	req := &orchestratorv1.InitiatePaymentsRequest{
-		Meta: &orchestratorv1.RequestMeta{
-			OrganizationRef: orgRef.Hex(),
-		},
-		IdempotencyKey: strings.TrimSpace(payload.IdempotencyKey),
-		QuoteRef:       strings.TrimSpace(payload.QuoteRef),
-		Metadata:       payload.Metadata,
-	}
-
-	resp, err := a.client.InitiatePayments(ctx, req)
-	if err != nil {
-		a.logger.Warn("Failed to initiate batch payments", zap.Error(err), zap.String("organization_ref", orgRef.Hex()))
-		return response.Auto(a.logger, a.Name(), err)
-	}
-
-	return sresponse.PaymentsResponse(a.logger, resp.GetPayments(), token)
-}
-
-func decodeInitiatePaymentsPayload(r *http.Request) (*srequest.InitiatePayments, error) {
-	defer r.Body.Close()
-
-	payload := &srequest.InitiatePayments{}
-	if err := json.NewDecoder(r.Body).Decode(payload); err != nil {
-		return nil, merrors.InvalidArgument("invalid payload: " + err.Error())
-	}
-	payload.IdempotencyKey = strings.TrimSpace(payload.IdempotencyKey)
-	payload.QuoteRef = strings.TrimSpace(payload.QuoteRef)
-
-	if err := payload.Validate(); err != nil {
-		return nil, err
-	}
-	return payload, nil
-}

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

@@ -67,62 +67,6 @@ func (a *PaymentAPI) quotePayment(r *http.Request, account *model.Account, token
 	return sresponse.PaymentQuoteResponse(a.logger, resp.GetQuote(), token)
 }
 
-func (a *PaymentAPI) quotePayments(r *http.Request, account *model.Account, token *sresponse.TokenData) http.HandlerFunc {
-	orgRef, err := a.oph.GetRef(r)
-	if err != nil {
-		a.logger.Warn("Failed to parse organization reference for quotes", zap.Error(err), zap.String(a.oph.Name(), a.oph.GetID(r)))
-		return response.BadReference(a.logger, a.Name(), a.oph.Name(), a.oph.GetID(r), err)
-	}
-
-	ctx := r.Context()
-	allowed, err := a.enf.Enforce(ctx, a.permissionRef, account.ID, orgRef, primitive.NilObjectID, model.ActionCreate)
-	if err != nil {
-		a.logger.Warn("Failed to check payments access permissions", zap.Error(err), mutil.PLog(a.oph, r))
-		return response.Auto(a.logger, a.Name(), err)
-	}
-	if !allowed {
-		a.logger.Debug("Access denied when quoting payments", mutil.PLog(a.oph, r))
-		return response.AccessDenied(a.logger, a.Name(), "payments write permission denied")
-	}
-
-	payload, err := decodeQuotePaymentsPayload(r)
-	if err != nil {
-		a.logger.Debug("Failed to decode payload", zap.Error(err), mutil.PLog(a.oph, r))
-		return response.BadPayload(a.logger, a.Name(), err)
-	}
-	if err := payload.Validate(); err != nil {
-		a.logger.Debug("Failed to validate payload", zap.Error(err), mutil.PLog(a.oph, r))
-		return response.Auto(a.logger, a.Name(), err)
-	}
-
-	intents := make([]*orchestratorv1.PaymentIntent, 0, len(payload.Intents))
-	for i := range payload.Intents {
-		intent, err := mapPaymentIntent(&payload.Intents[i])
-		if err != nil {
-			a.logger.Debug("Failed to map payment intent", zap.Error(err), mutil.PLog(a.oph, r))
-			return response.BadPayload(a.logger, a.Name(), err)
-		}
-		intents = append(intents, intent)
-	}
-
-	req := &orchestratorv1.QuotePaymentsRequest{
-		Meta: &orchestratorv1.RequestMeta{
-			OrganizationRef: orgRef.Hex(),
-		},
-		IdempotencyKey: payload.IdempotencyKey,
-		Intents:        intents,
-		PreviewOnly:    payload.PreviewOnly,
-	}
-
-	resp, err := a.client.QuotePayments(ctx, req)
-	if err != nil {
-		a.logger.Warn("Failed to quote payments", zap.Error(err), zap.String("organization_ref", orgRef.Hex()))
-		return response.Auto(a.logger, a.Name(), err)
-	}
-
-	return sresponse.PaymentQuotesResponse(a.logger, resp, token)
-}
-
 func decodeQuotePayload(r *http.Request) (*srequest.QuotePayment, error) {
 	defer r.Body.Close()
 
@@ -136,17 +80,3 @@ func decodeQuotePayload(r *http.Request) (*srequest.QuotePayment, error) {
 	}
 	return payload, nil
 }
-
-func decodeQuotePaymentsPayload(r *http.Request) (*srequest.QuotePayments, error) {
-	defer r.Body.Close()
-
-	payload := &srequest.QuotePayments{}
-	if err := json.NewDecoder(r.Body).Decode(payload); err != nil {
-		return nil, merrors.InvalidArgument("invalid payload: "+err.Error(), "payload")
-	}
-	payload.IdempotencyKey = strings.TrimSpace(payload.IdempotencyKey)
-	if err := payload.Validate(); err != nil {
-		return nil, err
-	}
-	return payload, nil
-}

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

@@ -22,8 +22,6 @@ import (
 
 type paymentClient interface {
 	QuotePayment(ctx context.Context, req *orchestratorv1.QuotePaymentRequest) (*orchestratorv1.QuotePaymentResponse, error)
-	QuotePayments(ctx context.Context, req *orchestratorv1.QuotePaymentsRequest) (*orchestratorv1.QuotePaymentsResponse, error)
-	InitiatePayments(ctx context.Context, req *orchestratorv1.InitiatePaymentsRequest) (*orchestratorv1.InitiatePaymentsResponse, error)
 	InitiatePayment(ctx context.Context, req *orchestratorv1.InitiatePaymentRequest) (*orchestratorv1.InitiatePaymentResponse, error)
 	Close() error
 }
@@ -68,10 +66,8 @@ func CreateAPI(apiCtx eapi.API) (*PaymentAPI, error) {
 	}
 
 	apiCtx.Register().AccountHandler(p.Name(), p.oph.AddRef("/quote"), api.Post, p.quotePayment)
-	apiCtx.Register().AccountHandler(p.Name(), p.oph.AddRef("/multiquote"), api.Post, p.quotePayments)
 	apiCtx.Register().AccountHandler(p.Name(), p.oph.AddRef("/immediate"), api.Post, p.initiateImmediate)
 	apiCtx.Register().AccountHandler(p.Name(), p.oph.AddRef("/by-quote"), api.Post, p.initiateByQuote)
-	apiCtx.Register().AccountHandler(p.Name(), p.oph.AddRef("/by-multiquote"), api.Post, p.initiatePaymentsByQuote)
 
 	return p, nil
 }

ci/prod/compose/bff.yml

@@ -31,7 +31,6 @@ services:
       NATS_PASSWORD: ${NATS_PASSWORD}
       CHAIN_GATEWAY_ADDRESS: ${CHAIN_GATEWAY_SERVICE_NAME}:${CHAIN_GATEWAY_GRPC_PORT}
       LEDGER_ADDRESS: ${LEDGER_SERVICE_NAME}:${LEDGER_GRPC_PORT}
-      PAYMENTS_ADDRESS: ${PAYMENTS_SERVICE_NAME}:${PAYMENTS_GRPC_PORT}
       MONGO_HOST: ${MONGO_HOST}
       MONGO_PORT: ${MONGO_PORT}
       MONGO_DATABASE: ${MONGO_DATABASE}

frontend/pshared/lib/api/requests/payment/quotes.dart

@@ -1,25 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-import 'package:pshared/api/requests/payment/base.dart';
-import 'package:pshared/data/dto/payment/intent/payment.dart';
-
-part 'quotes.g.dart';
-
-
-@JsonSerializable()
-class QuotePaymentsRequest extends PaymentBaseRequest {
-  final List<PaymentIntentDTO> intents;
-
-  @JsonKey(defaultValue: false)
-  final bool previewOnly;
-
-  const QuotePaymentsRequest({
-    required super.idempotencyKey,
-    super.metadata,
-    required this.intents,
-    this.previewOnly = false,
-  });
-
-  factory QuotePaymentsRequest.fromJson(Map<String, dynamic> json) => _$QuotePaymentsRequestFromJson(json);
-  @override
-  Map<String, dynamic> toJson() => _$QuotePaymentsRequestToJson(this);
-}

frontend/pshared/lib/api/responses/payment/quotes.dart

@@ -1,20 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-import 'package:pshared/api/responses/base.dart';
-import 'package:pshared/api/responses/token.dart';
-import 'package:pshared/data/dto/payment/quotes.dart';
-
-part 'quotes.g.dart';
-
-
-@JsonSerializable(explicitToJson: true)
-class PaymentQuotesResponse extends BaseAuthorizedResponse {
-
-  final PaymentQuotesDTO quote;
-
-  const PaymentQuotesResponse({required super.accessToken, required this.quote});
-
-  factory PaymentQuotesResponse.fromJson(Map<String, dynamic> json) => _$PaymentQuotesResponseFromJson(json);
-  @override
-  Map<String, dynamic> toJson() => _$PaymentQuotesResponseToJson(this);
-}

frontend/pshared/lib/config/common.dart

@@ -11,7 +11,7 @@ class CommonConstants {
   static String apiEndpoint = '/api/v1';
   static String amplitudeSecret = 'c3d75b3e2520d708440acbb16b923e79';
   static String amplitudeServerZone = 'EU';
-  static String posthogApiKey = 'phc_lVhbruaZpxiQxppHBJpL36ARnPlkqbCewv6cauoceTN';
+  static String posthogApiKey = '';
   static String posthogHost = 'https://eu.i.posthog.com';
   static Locale defaultLocale = const Locale('en');
   static String defaultCurrency = 'EUR';

frontend/pshared/lib/data/dto/payment/quote_aggregate.dart

@@ -1,24 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-import 'package:pshared/data/dto/payment/money.dart';
-
-part 'quote_aggregate.g.dart';
-
-
-@JsonSerializable()
-class PaymentQuoteAggregateDTO {
-  final List<MoneyDTO>? debitAmounts;
-  final List<MoneyDTO>? expectedSettlementAmounts;
-  final List<MoneyDTO>? expectedFeeTotals;
-  final List<MoneyDTO>? networkFeeTotals;
-
-  const PaymentQuoteAggregateDTO({
-    this.debitAmounts,
-    this.expectedSettlementAmounts,
-    this.expectedFeeTotals,
-    this.networkFeeTotals,
-  });
-
-  factory PaymentQuoteAggregateDTO.fromJson(Map<String, dynamic> json) => _$PaymentQuoteAggregateDTOFromJson(json);
-  Map<String, dynamic> toJson() => _$PaymentQuoteAggregateDTOToJson(this);
-}

frontend/pshared/lib/data/dto/payment/quotes.dart

@@ -1,23 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-import 'package:pshared/data/dto/payment/quote_aggregate.dart';
-import 'package:pshared/data/dto/payment/payment_quote.dart';
-
-part 'quotes.g.dart';
-
-
-@JsonSerializable()
-class PaymentQuotesDTO {
-  final String quoteRef;
-  final PaymentQuoteAggregateDTO? aggregate;
-  final List<PaymentQuoteDTO>? quotes;
-
-  const PaymentQuotesDTO({
-    required this.quoteRef,
-    this.aggregate,
-    this.quotes,
-  });
-
-  factory PaymentQuotesDTO.fromJson(Map<String, dynamic> json) => _$PaymentQuotesDTOFromJson(json);
-  Map<String, dynamic> toJson() => _$PaymentQuotesDTOToJson(this);
-}

frontend/pshared/lib/data/dto/wallet/wallet.dart

@@ -13,8 +13,6 @@ class WalletDTO {
   final WalletAssetDTO asset;
   final String depositAddress;
   final String status;
-  final String name;
-  final String? description;
   final Map<String, String>? metadata;
   final String? createdAt;
   final String? updatedAt;
@@ -26,8 +24,6 @@ class WalletDTO {
     required this.asset,
     required this.depositAddress,
     required this.status,
-    required this.name,
-    this.description,
     this.metadata,
     this.createdAt,
     this.updatedAt,

frontend/pshared/lib/data/mapper/payment/quote_aggregate.dart

@@ -1,22 +0,0 @@
-import 'package:pshared/data/dto/payment/quote_aggregate.dart';
-import 'package:pshared/data/mapper/payment/money.dart';
-import 'package:pshared/models/payment/quote_aggregate.dart';
-
-
-extension PaymentQuoteAggregateDTOMapper on PaymentQuoteAggregateDTO {
-  PaymentQuoteAggregate toDomain() => PaymentQuoteAggregate(
-    debitAmounts: debitAmounts?.map((amount) => amount.toDomain()).toList(),
-    expectedSettlementAmounts: expectedSettlementAmounts?.map((amount) => amount.toDomain()).toList(),
-    expectedFeeTotals: expectedFeeTotals?.map((amount) => amount.toDomain()).toList(),
-    networkFeeTotals: networkFeeTotals?.map((amount) => amount.toDomain()).toList(),
-  );
-}
-
-extension PaymentQuoteAggregateMapper on PaymentQuoteAggregate {
-  PaymentQuoteAggregateDTO toDTO() => PaymentQuoteAggregateDTO(
-    debitAmounts: debitAmounts?.map((amount) => amount.toDTO()).toList(),
-    expectedSettlementAmounts: expectedSettlementAmounts?.map((amount) => amount.toDTO()).toList(),
-    expectedFeeTotals: expectedFeeTotals?.map((amount) => amount.toDTO()).toList(),
-    networkFeeTotals: networkFeeTotals?.map((amount) => amount.toDTO()).toList(),
-  );
-}

frontend/pshared/lib/data/mapper/payment/quotes.dart

@@ -1,21 +0,0 @@
-import 'package:pshared/data/dto/payment/quotes.dart';
-import 'package:pshared/data/mapper/payment/payment_quote.dart';
-import 'package:pshared/data/mapper/payment/quote_aggregate.dart';
-import 'package:pshared/models/payment/quotes.dart';
-
-
-extension PaymentQuotesDTOMapper on PaymentQuotesDTO {
-  PaymentQuotes toDomain() => PaymentQuotes(
-    quoteRef: quoteRef,
-    aggregate: aggregate?.toDomain(),
-    quotes: quotes?.map((quote) => quote.toDomain()).toList(),
-  );
-}
-
-extension PaymentQuotesMapper on PaymentQuotes {
-  PaymentQuotesDTO toDTO() => PaymentQuotesDTO(
-    quoteRef: quoteRef,
-    aggregate: aggregate?.toDTO(),
-    quotes: quotes?.map((quote) => quote.toDTO()).toList(),
-  );
-}

frontend/pshared/lib/data/mapper/wallet/wallet.dart

@@ -2,7 +2,6 @@ import 'package:pshared/data/dto/wallet/balance.dart';
 import 'package:pshared/data/dto/wallet/wallet.dart';
 import 'package:pshared/data/mapper/wallet/balance.dart';
 import 'package:pshared/data/mapper/wallet/money.dart';
-import 'package:pshared/models/describable.dart';
 import 'package:pshared/models/wallet/wallet.dart';
 
 
@@ -23,11 +22,5 @@ extension WalletDTOMapper on WalletDTO {
     updatedAt: (updatedAt == null || updatedAt!.isEmpty) ? null : DateTime.tryParse(updatedAt!),
     balance: balance?.toDomain(),
     availableMoney: balance?.available?.toDomain(),
-    describable: newDescribable(
-      name: name.isNotEmpty ? name : (metadata?['name'] ?? 'Crypto Wallet'),
-      description: (description != null && description!.isNotEmpty)
-        ? description
-        : metadata?['description'],
-    ),
   );
 }

frontend/pshared/lib/models/asset.dart

@@ -1,18 +0,0 @@
-import 'package:pshared/models/currency.dart';
-import 'package:pshared/utils/currency.dart';
-
-
-class Asset {
-  final Currency currency;
-  final double amount;
-
-  const Asset({
-    required this.currency,
-    required this.amount,
-  });
-}
-
-Asset createAsset(String currencyCode, String amount) => Asset(
-  currency: currencyStringToCode(currencyCode),
-  amount: double.parse(amount),
-);

frontend/pshared/lib/models/auth/state.dart

@@ -1,7 +0,0 @@
-enum AuthState {
-  idle,
-  checking,
-  ready,
-  empty,
-  error,
-}

frontend/pshared/lib/models/payment/quote_aggregate.dart

@@ -1,16 +0,0 @@
-import 'package:pshared/models/payment/money.dart';
-
-
-class PaymentQuoteAggregate {
-  final List<Money>? debitAmounts;
-  final List<Money>? expectedSettlementAmounts;
-  final List<Money>? expectedFeeTotals;
-  final List<Money>? networkFeeTotals;
-
-  const PaymentQuoteAggregate({
-    required this.debitAmounts,
-    required this.expectedSettlementAmounts,
-    required this.expectedFeeTotals,
-    required this.networkFeeTotals,
-  });
-}

frontend/pshared/lib/models/payment/quotes.dart

@@ -1,15 +0,0 @@
-import 'package:pshared/models/payment/quote.dart';
-import 'package:pshared/models/payment/quote_aggregate.dart';
-
-
-class PaymentQuotes {
-  final String quoteRef;
-  final PaymentQuoteAggregate? aggregate;
-  final List<PaymentQuote>? quotes;
-
-  const PaymentQuotes({
-    required this.quoteRef,
-    required this.aggregate,
-    required this.quotes,
-  });
-}

frontend/pshared/lib/models/wallet/wallet.dart

@@ -1,6 +1,5 @@
 import 'package:pshared/models/wallet/balance.dart';
 import 'package:pshared/models/wallet/money.dart';
-import 'package:pshared/models/describable.dart';
 
 
 class WalletAsset {
@@ -15,7 +14,7 @@ class WalletAsset {
   });
 }
 
-class WalletModel implements Describable {
+class WalletModel {
   final String walletRef;
   final String organizationRef;
   final String ownerRef;
@@ -27,13 +26,6 @@ class WalletModel implements Describable {
   final DateTime? updatedAt;
   final WalletBalance? balance;
   final WalletMoney? availableMoney;
-  final Describable describable;
-
-  @override
-  String get name => describable.name;
-
-  @override
-  String? get description => describable.description;
 
   const WalletModel({
     required this.walletRef,
@@ -47,13 +39,11 @@ class WalletModel implements Describable {
     this.updatedAt,
     this.balance,
     this.availableMoney,
-    required this.describable,
   });
 
   WalletModel copyWith({
     WalletBalance? balance,
     WalletMoney? availableMoney,
-    Describable? describable,
   }) {
     return WalletModel(
       walletRef: walletRef,
@@ -67,7 +57,6 @@ class WalletModel implements Describable {
       updatedAt: updatedAt,
       balance: balance ?? this.balance,
       availableMoney: availableMoney ?? this.availableMoney,
-      describable: describable ?? this.describable,
     );
   }
 }

frontend/pshared/lib/provider/account.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:pshared/models/auth/state.dart';
 
 import 'package:share_plus/share_plus.dart';
 
@@ -23,19 +22,18 @@ import 'package:pshared/utils/exception.dart';
 
 
 class AccountProvider extends ChangeNotifier {
-  AccountProvider();
+  AccountProvider({Future<void> Function(Account?)? onAccountChanged})
+      : _onAccountChanged = onAccountChanged;
 
   static String get currentUserRef => Constants.nilObjectRef;
 
-  /// Auth lifecycle state to avoid multiple ad-hoc flags.
-  AuthState _authState = AuthState.idle;
-  AuthState get authState => _authState;
-
   // The resource now wraps our Account? state along with its loading/error state.
   Resource<Account?> _resource = Resource(data: null);
   Resource<Account?> get resource => _resource;
   late LocaleProvider _localeProvider;
   PendingLogin? _pendingLogin;
+  Future<void>? _restoreFuture;
+  Future<void> Function(Account?)? _onAccountChanged;
 
   Account? get account => _resource.data;
   PendingLogin? get pendingLogin => _pendingLogin;
@@ -61,19 +59,20 @@ class AccountProvider extends ChangeNotifier {
     );
   }
 
-  @protected
+  // Private helper to update the resource and notify listeners.
-  Future<void> onAccountChanged(Account? previous, Account? current) => Future<void>.value();
+  void setAccountChangedListener(Future<void> Function(Account?)? listener) => _onAccountChanged = listener;
 
   void _setResource(Resource<Account?> newResource) {
     final previousAccount = _resource.data;
     _resource = newResource;
-    final currentAccount = newResource.data;
+    _notifyAccountChanged(previousAccount, newResource.data);
-
+    notifyListeners();
-    if (previousAccount != currentAccount) {
-      unawaited(onAccountChanged(previousAccount, currentAccount));
   }
 
-    notifyListeners();
+  void _notifyAccountChanged(Account? previous, Account? current) {
+    if (previous == current) return;
+    final handler = _onAccountChanged;
+    if (handler != null) unawaited(handler(current));
   }
 
   void updateProvider(LocaleProvider localeProvider) => _localeProvider = localeProvider; 
@@ -93,7 +92,6 @@ class AccountProvider extends ChangeNotifier {
         locale: locale,
       ));
       if (outcome.account != null) {
-        _authState = AuthState.ready;
         _setResource(Resource(data: outcome.account, isLoading: false));
         _pickupLocale(outcome.account!.locale);
       } else {
@@ -103,12 +101,10 @@ class AccountProvider extends ChangeNotifier {
         }
         await VerificationService.requestLoginCode(pending);
         _pendingLogin = pending;
-        _authState = AuthState.idle;
         _setResource(_resource.copyWith(isLoading: false));
       }
       return outcome;
     } catch (e) {
-      _authState = AuthState.error;
       _setResource(_resource.copyWith(isLoading: false, error: toException(e)));
       rethrow;
     }
@@ -116,7 +112,6 @@ class AccountProvider extends ChangeNotifier {
 
   void completePendingLogin(Account account) {
     _pendingLogin = null;
-    _authState = AuthState.ready;
     _setResource(Resource(data: account, isLoading: false, error: null));
     _pickupLocale(account.locale);
   }
@@ -124,17 +119,13 @@ class AccountProvider extends ChangeNotifier {
   Future<bool> isAuthorizationStored() async => AuthorizationService.isAuthorizationStored();
 
   Future<Account?> restore() async {
-    _authState = AuthState.checking;
-    notifyListeners();
     _setResource(_resource.copyWith(isLoading: true, error: null));
     try {
       final acc = await AccountService.restore();
-      _authState = AuthState.ready;
       _setResource(Resource(data: acc, isLoading: false));
       _pickupLocale(acc.locale);
       return acc;
     } catch (e) {
-      _authState = AuthState.error;
       _setResource(_resource.copyWith(isLoading: false, error: toException(e)));
       rethrow;
     }
@@ -166,14 +157,11 @@ class AccountProvider extends ChangeNotifier {
   }
 
   Future<void> logout() async {
-    _authState = AuthState.empty;
     _setResource(_resource.copyWith(isLoading: true, error: null));
-    _pendingLogin = null;
     try {
       await AccountService.logout();
       _setResource(Resource(data: null, isLoading: false));
     } catch (e) {
-      _authState = AuthState.error;
       _setResource(_resource.copyWith(isLoading: false, error: toException(e)));
       rethrow;
     }
@@ -250,14 +238,10 @@ class AccountProvider extends ChangeNotifier {
     }
   }
 
-  Future<void> restoreIfPossible() async {
+  Future<void> restoreIfPossible() {
-    if (_authState == AuthState.checking || _authState == AuthState.ready) return;
+    return _restoreFuture ??= AuthorizationService.isAuthorizationStored().then<void>((hasAuth) async {
-    final hasAuth = await AuthorizationService.isAuthorizationStored();
+      if (!hasAuth) return;
-    if (!hasAuth) {
-      _authState = AuthState.empty;
-      notifyListeners();
-      return;
-    }
       await restore();
+    });
   }
 }

frontend/pshared/lib/provider/organizations.dart

@@ -80,12 +80,4 @@ class OrganizationsProvider extends ChangeNotifier {
     notifyListeners();
     return true;
   }
-
-  Future<void> reset() async {
-    _resource = Resource(data: []);
-    _currentOrg = null;
-    notifyListeners();
-    // Best-effort cleanup of stored selection to avoid using stale org on next login.
-    await SecureStorageService.delete(Constants.currentOrgKey);
-  }
 }

frontend/pshared/lib/provider/payment/amount.dart

@@ -1,20 +0,0 @@
-import 'package:flutter/material.dart';
-
-
-class PaymentAmountProvider with ChangeNotifier {
-  double _amount = 10.0;
-  bool _payerCoversFee = true;
-
-  double get amount => _amount;
-  bool get payerCoversFee => _payerCoversFee;
-
-  void setAmount(double value) {
-    _amount = value;
-    notifyListeners();
-  }
-
-  void setPayerCoversFee(bool value) {
-    _payerCoversFee = value;
-    notifyListeners();
-  }
-}

frontend/pshared/lib/provider/payment/quotation.dart

@@ -1,17 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:pshared/models/asset.dart';
 
-import 'package:uuid/uuid.dart';
-
-import 'package:pshared/models/payment/currency_pair.dart';
-import 'package:pshared/models/payment/fx/intent.dart';
-import 'package:pshared/models/payment/fx/side.dart';
-import 'package:pshared/models/payment/kind.dart';
-import 'package:pshared/models/payment/methods/card.dart';
-import 'package:pshared/models/payment/methods/managed_wallet.dart';
-import 'package:pshared/models/payment/money.dart';
-import 'package:pshared/models/payment/settlement_mode.dart';
-import 'package:pshared/provider/payment/amount.dart';
 import 'package:pshared/api/requests/payment/quote.dart';
 import 'package:pshared/data/mapper/payment/intent/payment.dart';
 import 'package:pshared/models/payment/intent.dart';
@@ -19,6 +7,7 @@ import 'package:pshared/models/payment/quote.dart';
 import 'package:pshared/provider/organizations.dart';
 import 'package:pshared/provider/resource.dart';
 import 'package:pshared/service/payment/quotation.dart';
+import 'package:uuid/uuid.dart';
 
 
 class QuotationProvider extends ChangeNotifier {
@@ -26,46 +15,14 @@ class QuotationProvider extends ChangeNotifier {
   late OrganizationsProvider _organizations;
   bool _isLoaded = false;
 
-  void update(OrganizationsProvider venue, PaymentAmountProvider payment) {
+  void update(OrganizationsProvider venue) {
     _organizations = venue;
-    getQuotation(PaymentIntent(
-      kind: PaymentKind.payout,
-      amount: Money(
-        amount: payment.amount.toString(), 
-        currency: 'USDT',
-      ),
-      destination: CardPaymentMethod(
-        pan: '4000000000000077',
-        firstName: 'John',
-        lastName: 'Doe',
-      ),
-      source: ManagedWalletPaymentMethod(
-        managedWalletRef: '',
-      ),
-      fx: FxIntent(
-        pair: CurrencyPair(
-          base: 'USDT', 
-          quote: 'RUB',
-        ),
-        side: FxSide.sellBaseBuyQuote,
-      ),
-      settlementMode: payment.payerCoversFee ? SettlementMode.fixReceived : SettlementMode.fixSource,
-    ));
   }
 
   PaymentQuote? get quotation => _quotation.data;
 
   bool get isReady => _isLoaded && !_quotation.isLoading && _quotation.error == null;
 
-  Asset? get fee => quotation == null ? null : createAsset(quotation!.expectedFeeTotal!.currency, quotation!.expectedFeeTotal!.amount);
-  Asset? get total => quotation == null ? null : createAsset(quotation!.debitAmount!.currency, quotation!.debitAmount!.amount);
-  Asset? get recipientGets => quotation == null ? null : createAsset(quotation!.expectedSettlementAmount!.currency, quotation!.expectedSettlementAmount!.amount);
-
-  void _setResource(Resource<PaymentQuote> quotation) {
-    _quotation = quotation;
-    notifyListeners();
-  }
-
   Future<PaymentQuote?> getQuotation(PaymentIntent intent) async {
     if (!_organizations.isOrganizationSet) throw StateError('Organization is not set');
     try {
@@ -78,20 +35,19 @@ class QuotationProvider extends ChangeNotifier {
         ),
       );
       _isLoaded = true;
-      _setResource(_quotation.copyWith(data: response, isLoading: false, error: null));
+      _quotation = _quotation.copyWith(data: response, isLoading: false);
     } catch (e) {
-      _setResource(_quotation.copyWith(
+      _quotation = _quotation.copyWith(
-        data: null,
         error: e is Exception ? e : Exception(e.toString()),
         isLoading: false,
-      ));
+      );
     }
     notifyListeners();
     return _quotation.data;
   }
 
   void reset() {
-    _setResource(Resource(data: null, isLoading: false, error: null));
+    _quotation = Resource(data: null, isLoading: false, error: null);
     _isLoaded = false;
     notifyListeners();
   }

frontend/pshared/lib/provider/permissions.dart

@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:flutter/material.dart';
 
 import 'package:collection/collection.dart';
@@ -23,17 +21,10 @@ class PermissionsProvider extends ChangeNotifier {
   Resource<UserAccess> _userAccess = Resource(data: null, isLoading: false, error: null);
   late OrganizationsProvider _organizations;
   bool _isLoaded = false;
-  String? _loadedOrgRef;
+  bool _errorHandled = false;
-  //For permissions to auto-load when an organization is set, so the dashboard no longer hangs waiting for permissions to become ready.
 
   void update(OrganizationsProvider venue) {
     _organizations = venue;
-    // Trigger a reload when organization changes or when permissions were never loaded.
-    if (_organizations.isOrganizationSet &&
-        _loadedOrgRef != _organizations.current.id &&
-        !_userAccess.isLoading) {
-      unawaited(load());
-    }
   }
 
   // Generic wrapper to perform service calls and reload state
@@ -53,11 +44,8 @@ class PermissionsProvider extends ChangeNotifier {
 
   /// Load the [UserAccess] for the current venue.
   Future<UserAccess?> load() async {
-    if (!_organizations.isOrganizationSet) {
-      // Organization is not ready yet; skip loading until it becomes available.
-      return _userAccess.data;
-    }
     _userAccess = _userAccess.copyWith(isLoading: true, error: null);
+    _errorHandled = false;
     notifyListeners();
 
     try {
@@ -70,7 +58,6 @@ class PermissionsProvider extends ChangeNotifier {
         _userAccess = _userAccess.copyWith(data: allAccess, isLoading: false);
       }
       _isLoaded = true;
-      _loadedOrgRef = orgRef;
     } catch (e) {
       _userAccess = _userAccess.copyWith(
         error: e is Exception ? e : Exception(e.toString()),
@@ -82,6 +69,12 @@ class PermissionsProvider extends ChangeNotifier {
     return _userAccess.data;
   }
 
+  bool get hasUnhandledError => error != null && !_errorHandled;
+
+  void markErrorHandled() {
+    _errorHandled = true;
+  }
+
   Future<UserAccess?> changeRole(String accountRef, String newRoleDescRef) async {
     final currentRole = roles.firstWhereOrNull((r) => r.accountRef == accountRef);
     final currentDesc = currentRole != null
@@ -179,14 +172,9 @@ class PermissionsProvider extends ChangeNotifier {
   void reset() {
     _userAccess = Resource(data: null, isLoading: false, error: null);
     _isLoaded = false;
-    _loadedOrgRef = null;
     notifyListeners();
   }
 
-  Future<void> resetAsync() async {
-    reset();
-  }
-
   bool canRead(ResourceType r, {Object? objectRef}) => canAccessResource(r, action: perm.Action.read, objectRef: objectRef);
   bool canUpdate(ResourceType r, {Object? objectRef}) => canAccessResource(r, action: perm.Action.update, objectRef: objectRef);
   bool canDelete(ResourceType r, {Object? objectRef}) => canAccessResource(r, action: perm.Action.delete, objectRef: objectRef);