Skip to content

update swap usd price issue #199

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

Open
wants to merge 3 commits into
base: 04-12-add_price_tracking_token_field
Choose a base branch
from
Open

update swap usd price issue #199

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4671d93
update swap usd price issue
robert-seitz-uniswap Sep 19, 2025
cbc05a5
fix logic
robert-seitz-uniswap Sep 22, 2025
0a92bdd
fix logic
robert-seitz-uniswap Sep 22, 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
51 changes: 38 additions & 13 deletions src/mappings/core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import { updatePairDayData, updatePairHourData, updateTokenDayData, updateUniswa
import { ADDRESS_ZERO, BI_18, convertTokenToDecimal, createUser, FACTORY_ADDRESS, ONE_BI, ZERO_BD } from './helpers'
import { findEthPerToken, getEthPriceInUSD, getTrackedLiquidityUSD, getTrackedVolumeUSD } from './pricing'

const ALMOST_ZERO_BD = BigDecimal.fromString('0.000001')

function isCompleteMint(mintId: string): boolean {
return MintEvent.load(mintId)!.sender !== null // sufficient checks
}
Expand Down Expand Up @@ -66,7 +68,10 @@ export function handleTransfer(event: Transfer): void {
// this is to make sure all the mints are under the same transaction
if (mints.length === 0 || isCompleteMint(mints[mints.length - 1])) {
let mint = new MintEvent(
event.transaction.hash.toHexString().concat('-').concat(BigInt.fromI32(mints.length).toString()),
event.transaction.hash
.toHexString()
.concat('-')
.concat(BigInt.fromI32(mints.length).toString())
)
mint.transaction = transaction.id
mint.pair = pair.id
Expand All @@ -92,7 +97,10 @@ export function handleTransfer(event: Transfer): void {
if (event.params.to.toHexString() == pair.id) {
let burns = transaction.burns
let burn = new BurnEvent(
event.transaction.hash.toHexString().concat('-').concat(BigInt.fromI32(burns.length).toString()),
event.transaction.hash
.toHexString()
.concat('-')
.concat(BigInt.fromI32(burns.length).toString())
)
burn.transaction = transaction.id
burn.pair = pair.id
Expand Down Expand Up @@ -128,7 +136,10 @@ export function handleTransfer(event: Transfer): void {
burn = currentBurn as BurnEvent
} else {
burn = new BurnEvent(
event.transaction.hash.toHexString().concat('-').concat(BigInt.fromI32(burns.length).toString()),
event.transaction.hash
.toHexString()
.concat('-')
.concat(BigInt.fromI32(burns.length).toString())
)
burn.transaction = transaction.id
burn.needsComplete = false
Expand All @@ -139,7 +150,10 @@ export function handleTransfer(event: Transfer): void {
}
} else {
burn = new BurnEvent(
event.transaction.hash.toHexString().concat('-').concat(BigInt.fromI32(burns.length).toString()),
event.transaction.hash
.toHexString()
.concat('-')
.concat(BigInt.fromI32(burns.length).toString())
)
burn.transaction = transaction.id
burn.needsComplete = false
Expand Down Expand Up @@ -230,7 +244,7 @@ export function handleSync(event: Sync): void {
let trackedLiquidityETH: BigDecimal
if (bundle.ethPrice.notEqual(ZERO_BD)) {
trackedLiquidityETH = getTrackedLiquidityUSD(pair.reserve0, token0 as Token, pair.reserve1, token1 as Token).div(
bundle.ethPrice,
bundle.ethPrice
)
} else {
trackedLiquidityETH = ZERO_BD
Expand Down Expand Up @@ -407,11 +421,19 @@ export function handleSwap(event: Swap): void {
// ETH/USD prices
let bundle = Bundle.load('1')!

// get total amounts of derived USD and ETH for tracking
let derivedAmountETH = token1.derivedETH
.times(amount1Total)
.plus(token0.derivedETH.times(amount0Total))
.div(BigDecimal.fromString('2'))
const derivedEthToken1 = token1.derivedETH.times(amount1Total)
const derivedEthToken0 = token0.derivedETH.times(amount0Total)

// default to legacy calculation
let derivedAmountETH = derivedEthToken1.plus(derivedEthToken0).div(BigDecimal.fromString('2'))

// Only divide by 2 if both derivedETH values are non-zero
if (derivedEthToken0.le(ALMOST_ZERO_BD) || derivedEthToken1.le(ALMOST_ZERO_BD)) {
derivedAmountETH = derivedEthToken0.plus(derivedEthToken1)
} else {
derivedAmountETH = derivedEthToken0.plus(derivedEthToken1).div(BigDecimal.fromString('2'))
}

let derivedAmountUSD = derivedAmountETH.times(bundle.ethPrice)

// only accounts for volume through price tracking tokens
Expand Down Expand Up @@ -470,7 +492,10 @@ export function handleSwap(event: Swap): void {
}
let swaps = transaction.swaps
let swap = new SwapEvent(
event.transaction.hash.toHexString().concat('-').concat(BigInt.fromI32(swaps.length).toString()),
event.transaction.hash
.toHexString()
.concat('-')
.concat(BigInt.fromI32(swaps.length).toString())
)

// update swap event
Expand Down Expand Up @@ -527,15 +552,15 @@ export function handleSwap(event: Swap): void {
token0DayData.dailyVolumeToken = token0DayData.dailyVolumeToken.plus(amount0Total)
token0DayData.dailyVolumeETH = token0DayData.dailyVolumeETH.plus(amount0Total.times(token0.derivedETH as BigDecimal))
token0DayData.dailyVolumeUSD = token0DayData.dailyVolumeUSD.plus(
amount0Total.times(token0.derivedETH as BigDecimal).times(bundle.ethPrice),
amount0Total.times(token0.derivedETH as BigDecimal).times(bundle.ethPrice)
)
token0DayData.save()

// swap specific updating
token1DayData.dailyVolumeToken = token1DayData.dailyVolumeToken.plus(amount1Total)
token1DayData.dailyVolumeETH = token1DayData.dailyVolumeETH.plus(amount1Total.times(token1.derivedETH as BigDecimal))
token1DayData.dailyVolumeUSD = token1DayData.dailyVolumeUSD.plus(
amount1Total.times(token1.derivedETH as BigDecimal).times(bundle.ethPrice),
amount1Total.times(token1.derivedETH as BigDecimal).times(bundle.ethPrice)
)
token1DayData.save()
}
Loading