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

@@ -26,6 +26,7 @@ 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 {
@@ -159,6 +160,7 @@ 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 {

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

@@ -49,6 +49,7 @@ 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)
@@ -58,6 +59,9 @@ 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,6 +11,7 @@ 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.
@@ -131,6 +132,7 @@ 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"`
 }