Feat: add contract address to orders

README.md

@@ -120,6 +120,7 @@ type Item = {
 type Order = {
   id: string
   nftId: string
+  marketplaceAddress: string
   contractAddress: string
   tokenId: string
   owner: string
@@ -139,6 +140,7 @@ type Order = {
 - `first`: Limit the number of results. Type: `number`.
 - `skip`: Skip results. Type: `number`.
 - `sortBy`: Sort results. Possible values: `recently_listed`, `recently_updated`, `cheapest`.
+- `marketplaceAddress`: Filter results by marketplace contract address. It supports multiple values by adding the query param multiple times. Type: `address`.
 - `owner`: Filter by owner. Type: `address`.
 - `buyer`: Filter by buyer. Type: `address`.
 - `contractAddress`: Filter results by contract address. It supports multiple values by adding the query param multiple times. Type: `address`.
@@ -155,6 +157,7 @@ type Order = {
 ```ts
 type Bid = {
   id: string
+  bidAddress: string
   bidder: string
   seller: string
   price: string
@@ -177,6 +180,7 @@ type Bid = {
 - `first`: Limit the number of results. Type: `number`.
 - `skip`: Skip results. Type: `number`.
 - `sortBy`: Sort results. Possible values: `recently_offered`, `recently_updated`, `most_expensive`.
+- `bidAddress`: Filter results by bid contract address. It supports multiple values by adding the query param multiple times. Type: `address`.
 - `bidder`: Filter by bidder. Type: `address`.
 - `seller`: Filter by seller. Type: `address`.
 - `contractAddress`: Filter results by contract address. It supports multiple values by adding the query param multiple times. Type: `address`.

package.json

@@ -26,7 +26,7 @@
     "printWidth": 80
   },
   "dependencies": {
-    "@dcl/schemas": "^2.2.0",
+    "@dcl/schemas": "^3.0.0",
     "@types/sqlite3": "^3.1.7",
     "@well-known-components/env-config-provider": "^1.0.0",
     "@well-known-components/http-server": "^1.0.0",

src/adapters/handlers/bids.ts

@@ -17,6 +17,7 @@ export function createBidsHandler(
     const sortBy = params.getValue<BidSortBy>('sortBy', BidSortBy)
     const bidder = params.getAddress('bidder')
     const seller = params.getAddress('seller')
+    const bidAddress = params.getAddress('bidAddress')
     const contractAddress = params.getAddress('contractAddress')
     const tokenId = params.getString('tokenId')
     const status = params.getValue<ListingStatus>('status', ListingStatus)
@@ -29,6 +30,7 @@ export function createBidsHandler(
         sortBy,
         bidder,
         seller,
+        bidAddress,
         contractAddress,
         tokenId,
         status,

src/adapters/handlers/orders.ts

@@ -16,6 +16,7 @@ export function createOrdersHandler(
     const sortBy = params.getValue<OrderSortBy>('sortBy', OrderSortBy)
     const owner = params.getAddress('owner')
     const buyer = params.getAddress('buyer')
+    const marketplaceAddress = params.getAddress('marketplaceAddress')
     const contractAddress = params.getAddress('contractAddress')
     const tokenId = params.getString('tokenId')
     const status = params.getValue<ListingStatus>('status', ListingStatus)
@@ -28,6 +29,7 @@ export function createOrdersHandler(
         sortBy,
         owner,
         buyer,
+        marketplaceAddress,
         contractAddress,
         tokenId,
         status,

src/index.ts

@@ -182,8 +182,18 @@ async function initComponents(): Promise<AppComponents> {
     chainId: marketplaceChainId,
   })
 
+  const collectionsBids = createBidsComponent({
+    subgraph: collectionsSubgraph,
+    network: Network.MATIC,
+    chainId: collectionsChainId,
+  })
+
+
   const bids = createMergerComponent<Bid, BidFilters, BidSortBy>({
-    sources: [createBidsSource(marketplaceBids)],
+    sources: [
+      createBidsSource(marketplaceBids),
+      createBidsSource(collectionsBids)
+    ],
     defaultSortBy: BID_DEFAULT_SORT_BY,
     directions: {
       [BidSortBy.RECENTLY_OFFERED]: SortDirection.DESC,

src/ports/bids/types.ts

@@ -7,10 +7,11 @@ export interface IBidsComponent {
 
 export type BidFragment = {
   id: string
+  bidAddress: string
   bidder: string
   seller: string
   price: string
-  fingerprint: string
+  fingerprint?: string
   status: ListingStatus
   blockchainId: string
   blockNumber: string

src/ports/bids/utils.ts

@@ -17,10 +17,11 @@ export function fromBidFragment(
 ): Bid {
   const bid: Bid = {
     id: fragment.id,
+    bidAddress: fragment.bidAddress,
     bidder: fragment.bidder,
     seller: fragment.seller,
     price: fragment.price,
-    fingerprint: fragment.fingerprint,
+    fingerprint: fragment.fingerprint || '0x',
     status: fragment.status,
     blockchainId: fragment.blockchainId,
     blockNumber: fragment.blockNumber,
@@ -36,14 +37,15 @@ export function fromBidFragment(
   return bid
 }
 
-export const getBidFields = () => `
+export const getBidFields = (withFingerprint: boolean) => `
   fragment bidFields on Bid {
     id
+    bidAddress
     blockchainId
     bidder
     seller
     price
-    fingerprint
+    ${withFingerprint ? 'fingerprint' : ''}
     status
     blockNumber
     expiresAt
@@ -52,31 +54,37 @@ export const getBidFields = () => `
   }
 `
 
-export const getBidFragment = () => `
+export const getBidFragment = (withFingerprint: boolean) => `
   fragment bidFragment on Bid {
     ...bidFields
     nft {
       contractAddress
       tokenId
     }
   }
-  ${getBidFields()}
+  ${getBidFields(withFingerprint)}
 `
 
 export function getBidsQuery(filters: BidFilters, isCount = false) {
   const {
     first,
     skip,
     sortBy,
+    bidAddress,
     contractAddress,
     tokenId,
     bidder,
     seller,
     status,
+    network,
   } = filters
 
   const where: string[] = []
 
+  if (bidAddress) {
+    where.push(`bidAddress: "${bidAddress}""`)
+  }
+
   if (contractAddress) {
     where.push(`nftAddress: "${contractAddress}"`)
   }
@@ -132,14 +140,14 @@ export function getBidsQuery(filters: BidFilters, isCount = false) {
   return `
     query Bids {
       bids(
-        first: ${total}, 
-        orderBy: ${orderBy}, 
-        orderDirection: ${orderDirection}, 
+        first: ${total},
+        orderBy: ${orderBy},
+        orderDirection: ${orderDirection},
         where: {
           ${where.join('\n')}
-        }) 
+        })
         { ${isCount ? 'id' : `...bidFragment`} }
     }
-    ${isCount ? '' : getBidFragment()}
+    ${isCount ? '' : getBidFragment(network === Network.ETHEREUM)}
   `
 }

src/ports/orders/types.ts

@@ -7,6 +7,7 @@ export interface IOrdersComponent {
 
 export type OrderFragment = {
   id: string
+  marketplaceAddress: string
   nftAddress: string
   owner: string
   buyer: string | null

src/ports/orders/utils.ts

@@ -13,6 +13,7 @@ export const ORDER_DEFAULT_SORT_BY = OrderSortBy.RECENTLY_LISTED
 export const getOrderFields = () => `
   fragment orderFields on Order {
     id
+    marketplaceAddress
     nftAddress
     owner
     buyer
@@ -38,6 +39,7 @@ export const getOrdersQuery = (filters: OrderFilters, isCount = false) => {
     first,
     skip,
     sortBy,
+    marketplaceAddress,
     contractAddress,
     tokenId,
     buyer,
@@ -47,6 +49,10 @@ export const getOrdersQuery = (filters: OrderFilters, isCount = false) => {
 
   const where: string[] = []
 
+  if (marketplaceAddress) {
+    where.push(`marketplaceAddress : "${marketplaceAddress}"`)
+  }
+
   if (contractAddress) {
     where.push(`nftAddress: "${contractAddress}"`)
   }
@@ -74,10 +80,10 @@ export const getOrdersQuery = (filters: OrderFilters, isCount = false) => {
   const total = isCount
     ? max
     : typeof first !== 'undefined'
-    ? typeof skip !== 'undefined'
-      ? skip + first
-      : first
-    : max
+      ? typeof skip !== 'undefined'
+        ? skip + first
+        : first
+      : max
 
   let orderBy: string
   let orderDirection: string
@@ -102,12 +108,12 @@ export const getOrdersQuery = (filters: OrderFilters, isCount = false) => {
   return `
     query Orders {
       orders(
-        first: ${total}, 
-        orderBy: ${orderBy}, 
-        orderDirection: ${orderDirection}, 
+        first: ${total},
+        orderBy: ${orderBy},
+        orderDirection: ${orderDirection},
         where: {
           ${where.join('\n')}
-        }) 
+        })
       { ${isCount ? 'id' : `...orderFragment`} }
     }
     ${isCount ? '' : getOrderFragment()}
@@ -121,6 +127,7 @@ export function fromOrderFragment(
 ): Order {
   const order: Order = {
     id: fragment.id,
+    marketplaceAddress: fragment.marketplaceAddress,
     contractAddress: fragment.nftAddress,
     tokenId: fragment.nft.tokenId,
     owner: fragment.owner,