Skip to content
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

Jump to bottom

Improvements to payment request SubmitIntent validation #4

Merged
merged 1 commit into from
Dec 1, 2023
Merged

Improvements to payment request SubmitIntent validation #4

Show file tree
Hide file tree
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
50 changes: 30 additions & 20 deletions pkg/code/server/grpc/transaction/v2/intent_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ func (h *SendPrivatePaymentIntentHandler) validateActions(
paymentRequestRecord, err := h.data.GetPaymentRequest(ctx, intentRecord.IntentId)
if err == nil && paymentRequestRecord.DestinationTokenAccount != destination.PublicKey().ToBase58() {
return newIntentValidationErrorf("payment has a request to destination %s", paymentRequestRecord.DestinationTokenAccount)
} else if err != paymentrequest.ErrPaymentRequestNotFound {
} else if err != paymentrequest.ErrPaymentRequestNotFound && err != nil {
return err
}

Expand Down Expand Up @@ -834,12 +834,20 @@ func (h *SendPrivatePaymentIntentHandler) validateActions(
case commonpb.AccountType_TEMPORARY_INCOMING:
return newActionValidationError(simulation.Transfers[0].Action, "temporary incoming account cannot send/receive kin")
case commonpb.AccountType_TEMPORARY_OUTGOING:
if simulation.CountPublicTransfers() != 1 || simulation.CountWithdrawals() != 1 {
expectedPublicTransfers := 1
if intentRecord.SendPrivatePaymentMetadata.IsMicroPayment {
expectedPublicTransfers = 2
}
if simulation.CountPublicTransfers() != expectedPublicTransfers {
return newIntentValidationErrorf("temporary outgoing account can only have %d public transfers", expectedPublicTransfers)
}

if simulation.CountWithdrawals() != 1 {
return newIntentValidationError("temporary outgoing account can only have one public withdraw")
}

if simulation.CountOutgoingTransfers() != 1 {
return newIntentValidationError("temporary outgoing account can only send kin once")
if simulation.CountOutgoingTransfers() != expectedPublicTransfers {
return newIntentValidationErrorf("temporary outgoing account can only send kin %d times", expectedPublicTransfers)
}
case commonpb.AccountType_BUCKET_1_KIN,
commonpb.AccountType_BUCKET_10_KIN,
Expand Down Expand Up @@ -1787,10 +1795,6 @@ func (h *SendPublicPaymentIntentHandler) validateActions(

// Part 1: Check the destination account itself is valid

//
// Part 1.1: Check against allowed destination account types
//

destinationAccountInfo, err := h.data.GetAccountInfoByTokenAddress(ctx, destination.PublicKey().ToBase58())
switch err {
case nil:
Expand All @@ -1816,17 +1820,6 @@ func (h *SendPublicPaymentIntentHandler) validateActions(
return err
}

//
// Part 1.2: Validate destination account matches payment request, if it exists
//

paymentRequestRecord, err := h.data.GetPaymentRequest(ctx, intentRecord.IntentId)
if err == nil && paymentRequestRecord.DestinationTokenAccount != destination.PublicKey().ToBase58() {
return newIntentValidationErrorf("payment has a request to destination %s", paymentRequestRecord.DestinationTokenAccount)
} else if err != paymentrequest.ErrPaymentRequestNotFound {
return err
}

//
// Part 2: Validate actions match intent metadata
//
Expand Down Expand Up @@ -2488,7 +2481,7 @@ func validateMoneyMovementActionUserAccounts(

sourceAccountInfo, ok := initiatorAccountsByVault[source.PublicKey().ToBase58()]
if !ok || sourceAccountInfo.General.AccountType != commonpb.AccountType_PRIMARY {
return newActionValidationErrorf(action, "source account must be the primary account %s", sourceAccountInfo.General.TokenAccount)
return newActionValidationError(action, "source account must be the primary account")
}
case *transactionpb.Action_NoPrivacyWithdraw:
// No privacy withdraws are used in two ways depending on the intent:
Expand Down Expand Up @@ -2595,6 +2588,23 @@ func validateMoneyMovementActionUserAccounts(
if !ok || !destinationAccountInfo.General.IsBucket() {
return newActionValidationError(action, "destination account must be an owned bucket account")
}
case *transactionpb.Action_FeePayment:
// Fee payments always come from the latest temporary outgoing account

authority, err = common.NewAccountFromProto(typedAction.FeePayment.Authority)
if err != nil {
return err
}

source, err = common.NewAccountFromProto(typedAction.FeePayment.Source)
if err != nil {
return err
}

sourceAccountInfo, ok := initiatorAccountsByVault[source.PublicKey().ToBase58()]
if !ok || sourceAccountInfo.General.AccountType != commonpb.AccountType_TEMPORARY_OUTGOING {
return newActionValidationError(action, "source account must be the latest temporary outgoing account")
}
default:
continue
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/code/server/grpc/transaction/v2/intent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ func TestSubmitIntent_SendPrivatePayment_Validation_Actions(t *testing.T) {
sendingPhone.resetConfig()
sendingPhone.conf.simulateSendPrivatePaymentWithMoreTempOutgoingOutboundTransfers = true
submitIntentCall = sendingPhone.send42KinToCodeUser(t, receivingPhone)
submitIntentCall.assertInvalidIntentResponse(t, "temporary outgoing account can only send kin once")
submitIntentCall.assertInvalidIntentResponse(t, "temporary outgoing account can only send kin 1 time")
server.assertIntentNotSubmitted(t, submitIntentCall.intentId)

sendingPhone.resetConfig()
Expand Down
Loading