feat: Add filled price to event and fix top collection query for offe…

…rs (#1335) * add filled price to event and fix top collection query for offers * fix * fix
enjin · Oct 7, 2024 · d01a4b6 · d01a4b6
1 parent 4661a8e
commit d01a4b6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/schema.graphql b/schema.graphql
@@ -128,6 +128,7 @@ type MarketplaceListingFilled {
   amountFilled: BigInt!
   amountRemaining: BigInt!
   protocolFee: BigInt!
+  price: BigInt!
   royalty: BigInt!
 }
 

diff --git a/src/mappings/marketplace/events/listing_filled.ts b/src/mappings/marketplace/events/listing_filled.ts
@@ -54,6 +54,7 @@ function getEvent(
             buyer: data.buyer,
             amountFilled: data.amountFilled,
             amountRemaining: data.amountRemaining,
+            price: 'price' in data ? (data.price as bigint) : listing.highestPrice,
             protocolFee: data.protocolFee,
             royalty: data.royalty,
         }),
@@ -162,6 +163,7 @@ export async function listingFilled(
                 token: listing.type === ListingType.Offer ? listing.takeAssetId.id : listing.makeAssetId.id,
                 buyer: { id: data.buyer },
                 amountFilled: data.amountFilled,
+                price: 'price' in data ? (data.price as bigint) : listing.highestPrice,
                 amountRemaining: data.amountRemaining,
                 protocolFee: data.protocolFee,
                 royalty: data.royalty,

diff --git a/src/model/generated/_marketplaceListingFilled.ts b/src/model/generated/_marketplaceListingFilled.ts
@@ -10,6 +10,7 @@ export class MarketplaceListingFilled {
     private _amountFilled!: bigint
     private _amountRemaining!: bigint
     private _protocolFee!: bigint
+    private _price!: bigint
     private _royalty!: bigint
 
     constructor(props?: Partial<Omit<MarketplaceListingFilled, 'toJSON'>>, json?: any) {
@@ -20,6 +21,7 @@ export class MarketplaceListingFilled {
             this._amountFilled = marshal.bigint.fromJSON(json.amountFilled)
             this._amountRemaining = marshal.bigint.fromJSON(json.amountRemaining)
             this._protocolFee = marshal.bigint.fromJSON(json.protocolFee)
+            this._price = marshal.bigint.fromJSON(json.price)
             this._royalty = marshal.bigint.fromJSON(json.royalty)
         }
     }
@@ -69,6 +71,15 @@ export class MarketplaceListingFilled {
         this._protocolFee = value
     }
 
+    get price(): bigint {
+        assert(this._price != null, 'uninitialized access')
+        return this._price
+    }
+
+    set price(value: bigint) {
+        this._price = value
+    }
+
     get royalty(): bigint {
         assert(this._royalty != null, 'uninitialized access')
         return this._royalty
@@ -86,6 +97,7 @@ export class MarketplaceListingFilled {
             amountFilled: marshal.bigint.toJSON(this.amountFilled),
             amountRemaining: marshal.bigint.toJSON(this.amountRemaining),
             protocolFee: marshal.bigint.toJSON(this.protocolFee),
+            price: marshal.bigint.toJSON(this.price),
             royalty: marshal.bigint.toJSON(this.royalty),
         }
     }

diff --git a/src/server-extension/resolvers/top_collections.ts b/src/server-extension/resolvers/top_collections.ts
@@ -196,7 +196,11 @@ export class TopCollectionResolver {
                         inBuilder
                             .from(ListingSale, 'sale')
                             .innerJoin(Listing, 'listing', 'listing.id = sale.listing')
-                            .innerJoin(Token, 'token', 'listing.make_asset_id_id = token.id')
+                            .innerJoin(
+                                Token,
+                                'token',
+                                "listing.make_asset_id_id = token.id AND listing.make_asset_id_id != '0-0'"
+                            )
                             .innerJoin(Collection, 'collection', 'token.collection = collection.id')
                             .leftJoin(ListingStatus, 'status', `listing.id = status.listing AND status.type = 'Finalized'`)
                             .addGroupBy('collection.id')