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

fix: verify payment #892

Merged
merged 2 commits into from
Jan 14, 2025
Merged

fix: verify payment #892

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
991c577
fix IsPaymentDone verification - verify signer address
volodymyr-basiuk Jan 13, 2025
cc3f54c
rn handlePaymentTransaction
volodymyr-basiuk Jan 14, 2025
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
80 changes: 39 additions & 41 deletions internal/core/services/payment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/signer/core/apitypes"
"github.com/google/uuid"
Expand Down Expand Up @@ -227,12 +226,6 @@ func (p *payment) VerifyPayment(ctx context.Context, issuerDID w3c.DID, nonce *b
return ports.BlockchainPaymentStatusPending, fmt.Errorf("payment Option <%d> not found in payment configuration", paymentReqItem.PaymentOptionID)
}

payOptConfItem, err := p.paymentOptionConfigItem(ctx, issuerDID, paymentReqItem)
if err != nil {
log.Error(ctx, "failed to get payment option config", "err", err)
return ports.BlockchainPaymentStatusPending, fmt.Errorf("failed to get payment option config: %w", err)
}

client, err := p.networkResolver.GetEthClientByChainID(core.ChainID(setting.ChainID))
if err != nil {
log.Error(ctx, "failed to get ethereum client from resolvers", "err", err, "key", paymentReqItem.SigningKeyID)
Expand All @@ -244,7 +237,12 @@ func (p *payment) VerifyPayment(ctx context.Context, issuerDID w3c.DID, nonce *b
return ports.BlockchainPaymentStatusPending, err
}

status, err := p.verifyPaymentOnBlockchain(ctx, client, instance, payOptConfItem.Recipient, nonce, txHash)
signerAddress, err := p.getSignerAddress(ctx, paymentReqItem.SigningKeyID)
if err != nil {
return ports.BlockchainPaymentStatusPending, err
}

status, err := p.verifyPaymentOnBlockchain(ctx, client, instance, signerAddress, nonce, txHash)
if err != nil {
log.Error(ctx, "failed to verify payment on blockchain", "err", err, "txHash", txHash, "nonce", nonce)
return ports.BlockchainPaymentStatusPending, err
Expand All @@ -256,58 +254,58 @@ func (p *payment) verifyPaymentOnBlockchain(
ctx context.Context,
client *eth.Client,
contract *eth.PaymentContract,
recipient common.Address,
signerAddress common.Address,
nonce *big.Int,
txID *string,
) (ports.BlockchainPaymentStatus, error) {
txIdProvided := txID != nil && *txID != ""
var receipt *types.Receipt

if txIdProvided {
_, isPending, err := client.GetTransactionByID(ctx, *txID)
if err != nil {
if err.Error() == "not found" {
return ports.BlockchainPaymentStatusCancelled, nil
}
return ports.BlockchainPaymentStatusUnknown, err
}
if isPending {
return ports.BlockchainPaymentStatusPending, nil
}
receipt, err = client.GetTransactionReceiptByID(ctx, *txID)
if err != nil {
return ports.BlockchainPaymentStatusUnknown, err
status, err := handleTransaction(ctx, client, *txID)
if err != nil || status != ports.BlockchainPaymentStatusSuccess {
return status, err
}
}
if !txIdProvided || receipt.Status == 1 {
isPaid, err := contract.IsPaymentDone(&bind.CallOpts{Context: ctx}, recipient, nonce)
if err != nil {
return ports.BlockchainPaymentStatusPending, nil
}
if isPaid {
return ports.BlockchainPaymentStatusSuccess, nil
}

isPaid, err := contract.IsPaymentDone(&bind.CallOpts{Context: ctx}, signerAddress, nonce)
if err != nil {
return ports.BlockchainPaymentStatusPending, nil
}

if isPaid {
return ports.BlockchainPaymentStatusSuccess, nil
}

return ports.BlockchainPaymentStatusFailed, nil
}

// paymentOptionConfigItem finds the payment option config item used to pay using the payment id stored in PaymentRequest database
func (p *payment) paymentOptionConfigItem(ctx context.Context, issuerDID w3c.DID, item *domain.PaymentRequestItem) (*domain.PaymentOptionConfigItem, error) {
paymentReq, err := p.paymentsStore.GetPaymentRequestByID(ctx, issuerDID, item.PaymentRequestID)
func handleTransaction(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would rename this function to something like handlePaymentTransaction or handleSomethingTransaction to avoid future collisions with other similar functions in package.

But we could postpone this renaming while we don't have this problem,

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, renamed

ctx context.Context,
client *eth.Client,
txID string,
) (ports.BlockchainPaymentStatus, error) {
_, isPending, err := client.GetTransactionByID(ctx, txID)
if err != nil {
return nil, fmt.Errorf("failed to get payment request: %w", err)
if err.Error() == "not found" {
return ports.BlockchainPaymentStatusCancelled, nil
}
return ports.BlockchainPaymentStatusUnknown, err
}

if isPending {
return ports.BlockchainPaymentStatusPending, nil
}

option, err := p.paymentsStore.GetPaymentOptionByID(ctx, &issuerDID, paymentReq.PaymentOptionID)
receipt, err := client.GetTransactionReceiptByID(ctx, txID)
if err != nil {
return nil, fmt.Errorf("failed to get payment option: %w", err)
return ports.BlockchainPaymentStatusUnknown, err
}

configItem := option.Config.GetByID(item.PaymentOptionID)
if configItem == nil {
return nil, fmt.Errorf("payment option config item for id <%d> not found", item.PaymentOptionID)
if receipt.Status == 1 {
return ports.BlockchainPaymentStatusSuccess, nil
}
return configItem, nil

return ports.BlockchainPaymentStatusFailed, nil
}

func (p *payment) paymentInfo(ctx context.Context, setting payments.ChainConfig, chainConfig *domain.PaymentOptionConfigItem, nonce *big.Int) (protocol.PaymentRequestInfoDataItem, error) {
Expand Down
Loading