oceanprotocol/ocean-subgraph
1
0
Fork 0
mirror of https://github.com/oceanprotocol/ocean-subgraph.git synced 2024-12-02 05:57:29 +01:00
Code Issues Projects Releases Wiki Activity

Tracking OPC fees (#593)

Browse Source 
* Tracking OPC fees

* Updating tests

* Updating tests

* Using basetoken decimals when tracking oceanFeeAmount

* Comparing the value of oceanFeeAmount returned from the event to the value stored in the subgraph

* Tracking consumeMarketFeeAmount and marketFeeAmount
This commit is contained in:
Jamie Hewitt 2023-01-17 14:57:52 +03:00 committed by GitHub
parent 957488077b
commit 9c56b00faa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
schema.graphql
View File

@ -257,6 +257,9 @@ type FixedRateExchangeSwap @entity {
block: Int! block: Int!
createdTimestamp: Int! createdTimestamp: Int!
tx: String! tx: String!
oceanFeeAmount: BigDecimal!
marketFeeAmount: BigDecimal!
consumeMarketFeeAmount: BigDecimal!
} }

14
src/mappings/fixedRateExchange.ts
View File

@ -191,6 +191,20 @@ export function handleSwap(event: Swapped): void {
BigInt.fromI32(18).toI32() BigInt.fromI32(18).toI32()
) )
// Track fees
swap.oceanFeeAmount = weiToDecimal(
event.params.oceanFeeAmount.toBigDecimal(),
BigInt.fromI32(baseToken.decimals).toI32()
)
swap.marketFeeAmount = weiToDecimal(
event.params.marketFeeAmount.toBigDecimal(),
BigInt.fromI32(baseToken.decimals).toI32()
)
swap.consumeMarketFeeAmount = weiToDecimal(
event.params.consumeMarketFeeAmount.toBigDecimal(),
BigInt.fromI32(baseToken.decimals).toI32()
)
swap.save() swap.save()
updateFixedRateExchangeSupply(event.params.exchangeId, event.address) updateFixedRateExchangeSupply(event.params.exchangeId, event.address)

25
test/integration/FixedRateExchange.test.ts
View File

@ -584,6 +584,9 @@ describe('Fixed Rate Exchange tests', async () => {
block block
createdTimestamp createdTimestamp
tx tx
oceanFeeAmount
marketFeeAmount
consumeMarketFeeAmount
__typename __typename
} }
}}` }}`
@ -626,6 +629,17 @@ describe('Fixed Rate Exchange tests', async () => {
const tx = ( const tx = (
await fixedRate.buyDatatokens(user1, exchangeId, dtAmount, '100') await fixedRate.buyDatatokens(user1, exchangeId, dtAmount, '100')
).events?.Swapped ).events?.Swapped
const oceanFeeAmount = web3.utils.fromWei(
new BN(tx.returnValues.oceanFeeAmount)
)
const marketFeeAmount = web3.utils.fromWei(
new BN(tx.returnValues.marketFeeAmount)
)
const consumeMarketFeeAmount = web3.utils.fromWei(
new BN(tx.returnValues.consumeMarketFeeAmount)
)
await sleep(sleepMs) await sleep(sleepMs)
user1Balance = await datatoken.balance(datatokenAddress, user1) user1Balance = await datatoken.balance(datatokenAddress, user1)
// user1 has 1 datatoken // user1 has 1 datatoken
@ -648,6 +662,12 @@ describe('Fixed Rate Exchange tests', async () => {
assert(swaps.block === tx.blockNumber, 'incorrect value for: block') assert(swaps.block === tx.blockNumber, 'incorrect value for: block')
assert(swaps.createdTimestamp >= time, 'incorrect: createdTimestamp') assert(swaps.createdTimestamp >= time, 'incorrect: createdTimestamp')
assert(swaps.createdTimestamp < time + 25, 'incorrect: createdTimestamp 2') assert(swaps.createdTimestamp < time + 25, 'incorrect: createdTimestamp 2')
assert(swaps.oceanFeeAmount === oceanFeeAmount, 'incorrect: oceanFeeAmount')
assert(swaps.marketFeeAmount === marketFeeAmount, 'wrong marketFeeAmount')
assert(
swaps.consumeMarketFeeAmount === consumeMarketFeeAmount,
'wrong consumeMarketFeeAmount'
)
assert(swaps.tx === tx.transactionHash, 'incorrect value for: tx') assert(swaps.tx === tx.transactionHash, 'incorrect value for: tx')
assert(swaps.__typename === 'FixedRateExchangeSwap', 'incorrect __typename') assert(swaps.__typename === 'FixedRateExchangeSwap', 'incorrect __typename')
}) })
@ -655,6 +675,9 @@ describe('Fixed Rate Exchange tests', async () => {
await datatoken.approve(datatokenAddress, fixedRateAddress, dtAmount, user1) await datatoken.approve(datatokenAddress, fixedRateAddress, dtAmount, user1)
const tx = (await fixedRate.sellDatatokens(user1, exchangeId, '10', '9')) const tx = (await fixedRate.sellDatatokens(user1, exchangeId, '10', '9'))
.events?.Swapped .events?.Swapped
const oceanFeeAmount = web3.utils.fromWei(
new BN(tx.returnValues.oceanFeeAmount)
)
assert(tx != null) assert(tx != null)
await sleep(sleepMs) await sleep(sleepMs)
const swapsQuery = { const swapsQuery = {
@ -668,6 +691,7 @@ describe('Fixed Rate Exchange tests', async () => {
block block
createdTimestamp createdTimestamp
tx tx
oceanFeeAmount
__typename __typename
} }
}}` }}`
@ -689,6 +713,7 @@ describe('Fixed Rate Exchange tests', async () => {
assert(swaps.block === tx.blockNumber, 'incorrect value for: block') assert(swaps.block === tx.blockNumber, 'incorrect value for: block')
assert(swaps.createdTimestamp >= time, 'incorrect: createdTimestamp') assert(swaps.createdTimestamp >= time, 'incorrect: createdTimestamp')
assert(swaps.createdTimestamp < time + 25, 'incorrect: createdTimestamp 2') assert(swaps.createdTimestamp < time + 25, 'incorrect: createdTimestamp 2')
assert(swaps.oceanFeeAmount === oceanFeeAmount, 'incorrect: oceanFeeAmount')
assert(swaps.tx === tx.transactionHash, 'incorrect value for: tx') assert(swaps.tx === tx.transactionHash, 'incorrect value for: tx')
assert(swaps.__typename === 'FixedRateExchangeSwap', 'incorrect __typename') assert(swaps.__typename === 'FixedRateExchangeSwap', 'incorrect __typename')
}) })