Pass previous nft owner to maybeIncreaseChannelCumulativeRevenueAfter…

…Nft to correctly check ownership where owner was updated earlier in the logic flow (#356)
Joystream · Feb 3, 2025 · 45e54fe · 45e54fe
1 parent f1c3793
commit 45e54fe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/mappings/content/nft.ts b/src/mappings/content/nft.ts
@@ -293,7 +293,7 @@ export async function processEnglishAuctionSettledEvent({
   // set last sale
   nft.lastSalePrice = winningBid.amount
   nft.lastSaleDate = new Date(block.timestamp)
-  await maybeIncreaseChannelCumulativeRevenueAfterNft(overlay, nft)
+  await maybeIncreaseChannelCumulativeRevenueAfterNft(overlay, nft, previousNftOwner)
 
   // add new event
   const event = overlay.getRepository(Event).new({
@@ -355,7 +355,7 @@ export async function processBidMadeCompletingAuctionEvent({
   // set last sale
   nft.lastSalePrice = winningBid.amount
   nft.lastSaleDate = new Date(block.timestamp)
-  await maybeIncreaseChannelCumulativeRevenueAfterNft(overlay, nft)
+  await maybeIncreaseChannelCumulativeRevenueAfterNft(overlay, nft, previousNftOwner)
 
   // add new event
   const event = overlay.getRepository(Event).new({
@@ -411,7 +411,7 @@ export async function processOpenAuctionBidAcceptedEvent({
   // set last sale
   nft.lastSalePrice = winningBid.amount
   nft.lastSaleDate = new Date(block.timestamp)
-  await maybeIncreaseChannelCumulativeRevenueAfterNft(overlay, nft)
+  await maybeIncreaseChannelCumulativeRevenueAfterNft(overlay, nft, previousNftOwner)
 
   // add new event
   const event = overlay.getRepository(Event).new({

diff --git a/src/mappings/content/utils.ts b/src/mappings/content/utils.ts
@@ -870,11 +870,14 @@ export function computeRoyalty(royaltyPct: number, price: bigint): bigint {
 
 export async function maybeIncreaseChannelCumulativeRevenueAfterNft(
   overlay: EntityManagerOverlay,
-  nft: Flat<OwnedNft>
+  nft: Flat<OwnedNft>,
+  previousNftOwner?: NftOwner
 ) {
   const video = await overlay.getRepository(Video).getByIdOrFail(nft.videoId)
   const channel = await overlay.getRepository(Channel).getByIdOrFail(assertNotNull(video.channelId))
-  if (nft.owner.isTypeOf === 'NftOwnerChannel') {
+  const nftOwnerType = previousNftOwner ? previousNftOwner.isTypeOf : nft.owner.isTypeOf
+
+  if (nftOwnerType === 'NftOwnerChannel') {
     increaseChannelCumulativeRevenue(channel, assertNotNull(nft.lastSalePrice))
   } else {
     if (nft.creatorRoyalty) {