Skip to content

Remove counterparty from indirect receive history item #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeffyanta merged 1 commit into from
Aug 20, 2026
Merged

Remove counterparty from indirect receive history item #248

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 14 additions & 22 deletions ocp/history/intent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func BuildRecordsForIntent(ctx context.Context, data ocp_data.DatabaseData, inte
case intent.SendPublicPayment:
return buildRecordsForSendPublicPaymentIntent(ctx, data, intentRecord, protoMetadata, actionRecords, withdrawalFeeQuarks)
case intent.ReceivePaymentsPublicly:
return buildRecordsForReceivePaymentsPubliclyIntent(ctx, data, intentRecord)
return buildRecordsForReceivePaymentsPubliclyIntent(intentRecord)
default:
// todo: Support remaining money movement intent types
return nil, nil
Expand Down Expand Up @@ -249,7 +249,7 @@ func buildRecordsForWithdrawalIntent(ctx context.Context, data ocp_data.Database
return []*history.Record{withdrawn, deposited}, nil
}

func buildRecordsForReceivePaymentsPubliclyIntent(ctx context.Context, data ocp_data.DatabaseData, intentRecord *intent.Record) ([]*history.Record, error) {
func buildRecordsForReceivePaymentsPubliclyIntent(intentRecord *intent.Record) ([]*history.Record, error) {
metadata := intentRecord.ReceivePaymentsPubliclyMetadata

// Voids and auto-returns are server-initiated intents that are reflected
Expand All @@ -258,26 +258,18 @@ func buildRecordsForReceivePaymentsPubliclyIntent(ctx context.Context, data ocp_
return nil, nil
}

// The issuer is the claim's counterparty, and is only discoverable through
// the intent that issued the gift card.
giftCardIssuedIntentRecord, err := data.GetOriginalGiftCardIssuedIntent(ctx, metadata.Source)
if err != nil {
return nil, err
}

return []*history.Record{{
ReferenceId: intentRecord.IntentId,
ReferenceType: history.IntentReference,
Type: history.IndirectlyReceived,
OwnerAccount: intentRecord.InitiatorOwnerAccount,
CounterpartyOwnerAccount: pointer.String(giftCardIssuedIntentRecord.InitiatorOwnerAccount),
ExchangeCurrency: metadata.OriginalExchangeCurrency,
NativeAmount: metadata.OriginalNativeAmount,
MintAccount: intentRecord.MintAccount,
Quantity: metadata.Quantity,
GiftCardVault: pointer.String(metadata.Source),
AppMetadata: intentRecord.AppMetadata,
State: history.StateCompleted,
CreatedAt: intentRecord.CreatedAt,
ReferenceId: intentRecord.IntentId,
ReferenceType: history.IntentReference,
Type: history.IndirectlyReceived,
OwnerAccount: intentRecord.InitiatorOwnerAccount,
ExchangeCurrency: metadata.OriginalExchangeCurrency,
NativeAmount: metadata.OriginalNativeAmount,
MintAccount: intentRecord.MintAccount,
Quantity: metadata.Quantity,
GiftCardVault: pointer.String(metadata.Source),
AppMetadata: intentRecord.AppMetadata,
State: history.StateCompleted,
CreatedAt: intentRecord.CreatedAt,
}}, nil
}
Loading