Skip to content

Fix USD market values for sells to consider fees #71

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
Jan 26, 2026
Merged

Fix USD market values for sells to consider fees #71

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
4 changes: 4 additions & 0 deletions ocp/rpc/transaction/swap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ func (s *transactionServer) StatefulSwap(streamer transactionpb.Transaction_Stat
return handleStatefulSwapError(streamer, NewSwapValidationError("owner cannot be swap authority"))
}

if !common.IsCoreMint(fromMint) && !common.IsCoreMint(toMint) {
return handleStatefulSwapError(streamer, NewSwapDeniedError("swap must involve core mint"))
}

if bytes.Equal(fromMint.PublicKey().ToBytes(), toMint.PublicKey().ToBytes()) {
return handleStatefulSwapError(streamer, NewSwapValidationError("must swap between two different mints"))
}
Expand Down
20 changes: 16 additions & 4 deletions ocp/worker/swap/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"crypto/sha256"
"database/sql"
"fmt"
"math/big"
"slices"
"time"

Expand Down Expand Up @@ -170,7 +171,7 @@ func (p *runtime) updateBalancesForFinalizedSwap(ctx context.Context, swapRecord
return 0, errors.New("delta quarks into destination vm omnibus is not positive")
}

var usdMarketValue float64
var usdMarketValueWithoutFees float64
switch swapRecord.FundingSource {
case swap.FundingSourceSubmitIntent:
fundingIntentRecord, err := p.data.GetIntent(ctx, swapRecord.FundingId)
Expand All @@ -182,7 +183,7 @@ func (p *runtime) updateBalancesForFinalizedSwap(ctx context.Context, swapRecord
return 0, errors.New("unexpected intent type")
}

usdMarketValue = fundingIntentRecord.SendPublicPaymentMetadata.UsdMarketValue
usdMarketValueWithoutFees = fundingIntentRecord.SendPublicPaymentMetadata.UsdMarketValue
case swap.FundingSourceExternalWallet:
if !common.IsCoreMint(fromMint) {
return 0, errors.New("unexpected source mint")
Expand All @@ -192,14 +193,22 @@ func (p *runtime) updateBalancesForFinalizedSwap(ctx context.Context, swapRecord
return 0, errors.New("core mint is not a usd stable coin")
}

usdMarketValue, err = currency_util.CalculateUsdMarketValueFromTokenAmount(ctx, p.data, common.CoreMintAccount, swapRecord.Amount, time.Now())
usdMarketValueWithoutFees, err = currency_util.CalculateUsdMarketValueFromTokenAmount(ctx, p.data, common.CoreMintAccount, swapRecord.Amount, time.Now())
if err != nil {
return 0, err
}
default:
return 0, errors.New("unsupported funding source")
}

usdMarketValue := usdMarketValueWithoutFees
if !common.IsCoreMint(fromMint) {
usdMarketValue, _ = new(big.Float).Mul(
big.NewFloat(0.99).SetPrec(128),
big.NewFloat(usdMarketValue).SetPrec(128),
).Float64()
}

err = p.data.ExecuteInTx(ctx, sql.LevelDefault, func(ctx context.Context) error {
// For transaction history
intentRecord := &intent.Record{
Expand Down Expand Up @@ -304,7 +313,10 @@ func (p *runtime) notifySwapFinalized(ctx context.Context, swapRecord *swap.Reco

valueReceived := nativeAmount
if !common.IsCoreMint(fromMint) {
valueReceived = 0.99 * valueReceived
valueReceived, _ = new(big.Float).Mul(
big.NewFloat(0.99).SetPrec(128),
big.NewFloat(valueReceived).SetPrec(128),
).Float64()
}

return p.integration.OnSwapFinalized(ctx, owner, isBuy, targetCurrencyMetadataRecord.Name, currencyCode, valueReceived)
Expand Down