From a3aa0db0dd4ef95638e34fb34c5c14590bb06b8d Mon Sep 17 00:00:00 2001 From: lza_menace Date: Mon, 22 Aug 2022 16:03:43 -0700 Subject: [PATCH] update seaport sales eval --- src/scraper.js | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/src/scraper.js b/src/scraper.js index c142e33..b110190 100644 --- a/src/scraper.js +++ b/src/scraper.js @@ -178,24 +178,35 @@ class Scrape extends Collection { if (log.topics[0].toLowerCase() === SEAPORT_SALE_TOPIC.toLowerCase()) { // Handle Opensea/Seaport sales const logDescription = seaportInterface.parseLog(log); - // skip if not logs do not match contract address - const matchingOffers = logDescription.args.consideration.filter( + const matchingEthOffer = logDescription.args.offer.filter( o => o.token.toLowerCase() == this.contractAddress.toLowerCase() ); - if (matchingOffers.length === 0) return; - const ethOffer = logDescription.args.offer.map( - o => (o.token.toLowerCase() === this.contractAddress.toLowerCase() && o.amount > 0) ? BigInt(o.amount) : BigInt(0) + const matchingWethOffer = logDescription.args.offer.filter( + o => o.token.toLowerCase() == WETH_ADDRESS.toLowerCase() ); - const wethOffer = logDescription.args.offer.map( - o => (o.token.toLowerCase() === WETH_ADDRESS.toLowerCase() && o.amount > 0) ? BigInt(o.amount) : BigInt(0) - ); - const allOffers = ethOffer.concat(wethOffer); + // skip if logs do not match contract address + if (matchingEthOffer.length === 0 && matchingWethOffer.length === 0) return; sale = true; platform = 'opensea'; fromAddress = logDescription.args.offerer.toLowerCase(); toAddress = logDescription.args.recipient.toLowerCase(); tokenId = logDescription.args.offer.map(o => o.identifier.toString()); - amountWei = allOffers.reduce((prev, curr) => prev + curr, BigInt(0)); + // slightly different logic if wETH offer accepted vs ETH purchase + if (matchingWethOffer.length > 0) { + // wETH accepted bids provide the grand total in the offer + amountWei = BigInt(matchingWethOffer.map( + o => (o.amount > 0) ? o.amount : 0 + )); + } else { + // ETH accepted offers provide the fee amounts to tally up + const allAmounts = logDescription.args.consideration.map( + _f => BigInt(_f.amount) + ); + amountWei = allAmounts.reduce( + (prev, cur) => prev + cur, + BigInt(0) + ); + } } else if (log.topics[0].toLowerCase() === WYVERN_SALE_TOPIC.toLowerCase()) { // Handle Opensea/Wyvern sales const logDescription = wyvernInterface.parseLog(log);