From 0db13e04e9c812694e689fc132f265d35ef754ba Mon Sep 17 00:00:00 2001
From: Jamie Hewitt <jamie.hewitt15@gmail.com>
Date: Thu, 4 May 2023 12:16:11 +0100
Subject: [PATCH] removing all hard coded decimals from fixedRateExchange

---
 src/mappings/fixedRateExchange.ts | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/mappings/fixedRateExchange.ts b/src/mappings/fixedRateExchange.ts
index 1f0cf77..41f3e32 100644
--- a/src/mappings/fixedRateExchange.ts
+++ b/src/mappings/fixedRateExchange.ts
@@ -72,10 +72,14 @@ export function handleRateChange(event: ExchangeRateChanged): void {
   newExchangeUpdate.tx = event.transaction.hash.toHex()
   newExchangeUpdate.block = event.block.number.toI32()
   newExchangeUpdate.exchangeId = fixedRateId
+  const baseToken = getToken(
+    Address.fromString(fixedRateExchange.baseToken),
+    false
+  )
 
   fixedRateExchange.price = weiToDecimal(
     event.params.newRate.toBigDecimal(),
-    BigInt.fromI32(18).toI32()
+    BigInt.fromI32(baseToken.decimals).toI32()
   )
   newExchangeUpdate.newPrice = fixedRateExchange.price
 
@@ -182,6 +186,10 @@ export function handleSwap(event: Swapped): void {
     Address.fromString(fixedRateExchange.baseToken),
     false
   )
+  const dataToken = getToken(
+    Address.fromString(fixedRateExchange.datatoken),
+    false
+  )
 
   swap.baseTokenAmount = weiToDecimal(
     event.params.baseTokenSwappedAmount.toBigDecimal(),
@@ -189,7 +197,7 @@ export function handleSwap(event: Swapped): void {
   )
   swap.dataTokenAmount = weiToDecimal(
     event.params.datatokenSwappedAmount.toBigDecimal(),
-    BigInt.fromI32(18).toI32()
+    BigInt.fromI32(dataToken.decimals).toI32()
   )
 
   // Track fees
@@ -238,12 +246,16 @@ export function handlePublishMarketFeeChanged(
     event.address
   )
   const fixedRateExchange = getFixedRateExchange(fixedRateId)
+  const baseToken = getToken(
+    Address.fromString(fixedRateExchange.baseToken),
+    false
+  )
   if (fixedRateExchange) {
     fixedRateExchange.publishMarketFeeAddress =
       event.params.newMarketCollector.toHexString()
     fixedRateExchange.publishMarketSwapFee = weiToDecimal(
       event.params.swapFee.toBigDecimal(),
-      BigInt.fromI32(18).toI32()
+      BigInt.fromI32(baseToken.decimals).toI32()
     )
     fixedRateExchange.save()
   }