Merge pull request ProjectOpenSea#153 from ProjectOpenSea/roy/private-listings

Remove special order handling for Private Sales

Author: royliu2

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 Full changelog coming soon. For now, here are the most important changes for doing major migrations:
 
+## Migrating to version 1.2
+- `OpenSeaPort::computeFees()` No longer accepts an `isPrivate` parameter.
+
 ## Migrating to version 1.1
 - `OpenSeaPort::computeFees()` No longer accepts a `fees` parameter, relying solely on `asset`.
 

lib/seaport.d.ts

@@ -510,14 +510,12 @@ export declare class OpenSeaPort {
      * @param asset Asset to use for fees. May be blank ONLY for multi-collection bundles.
      * @param side The side of the order (buy or sell)
      * @param accountAddress The account to check fees for (useful if fees differ by account, like transfer fees)
-     * @param isPrivate Whether the order is private or not (known taker)
      * @param extraBountyBasisPoints The basis points to add for the bounty. Will throw if it exceeds the assets' contract's OpenSea fee.
      */
-    computeFees({ asset, side, accountAddress, isPrivate, extraBountyBasisPoints }: {
+    computeFees({ asset, side, accountAddress, extraBountyBasisPoints }: {
         asset?: OpenSeaAsset;
         side: OrderSide;
         accountAddress?: string;
-        isPrivate?: boolean;
         extraBountyBasisPoints?: number;
     }): Promise<ComputedFees>;
     /**

lib/seaport.js

@@ -1,6 +1,6 @@
 {
   "name": "opensea-js",
-  "version": "1.1.13",
+  "version": "1.2.0",
   "description": "JavaScript SDK for the OpenSea marketplace. Let users buy or sell crypto collectibles and other cryptogoods, all on your own site!",
   "files": [
     "lib",

lib/seaport.js.map

@@ -1527,15 +1527,13 @@ export class OpenSeaPort {
    * @param asset Asset to use for fees. May be blank ONLY for multi-collection bundles.
    * @param side The side of the order (buy or sell)
    * @param accountAddress The account to check fees for (useful if fees differ by account, like transfer fees)
-   * @param isPrivate Whether the order is private or not (known taker)
    * @param extraBountyBasisPoints The basis points to add for the bounty. Will throw if it exceeds the assets' contract's OpenSea fee.
    */
   public async computeFees(
-      { asset, side, accountAddress, isPrivate = false, extraBountyBasisPoints = 0 }:
+      { asset, side, accountAddress, extraBountyBasisPoints = 0 }:
       { asset?: OpenSeaAsset;
         side: OrderSide;
         accountAddress?: string;
-        isPrivate?: boolean;
         extraBountyBasisPoints?: number }
     ): Promise<ComputedFees> {
 
@@ -1578,7 +1576,7 @@ export class OpenSeaPort {
     }
 
     // Compute bounty
-    let sellerBountyBasisPoints = side == OrderSide.Sell
+    const sellerBountyBasisPoints = side == OrderSide.Sell
       ? extraBountyBasisPoints
       : 0
 
@@ -1592,15 +1590,6 @@ export class OpenSeaPort {
       throw new Error(errorMessage)
     }
 
-    // Remove fees for private orders
-    if (isPrivate) {
-      openseaBuyerFeeBasisPoints = 0
-      openseaSellerFeeBasisPoints = 0
-      devBuyerFeeBasisPoints = 0
-      devSellerFeeBasisPoints = 0
-      sellerBountyBasisPoints = 0
-    }
-
     return {
       totalBuyerFeeBasisPoints: openseaBuyerFeeBasisPoints + devBuyerFeeBasisPoints,
       totalSellerFeeBasisPoints: openseaSellerFeeBasisPoints + devSellerFeeBasisPoints,
@@ -1942,13 +1931,12 @@ export class OpenSeaPort {
     const schema = this._getSchema(asset.schemaName)
     const quantityBN = WyvernProtocol.toBaseUnitAmount(makeBigNumber(quantity), asset.decimals || 0)
     const wyAsset = getWyvernAsset(schema, asset, quantityBN)
-    const isPrivate = buyerAddress != NULL_ADDRESS
 
     const openSeaAsset = await this.api.getAsset(asset)
 
     const { totalSellerFeeBasisPoints,
             totalBuyerFeeBasisPoints,
-            sellerBountyBasisPoints } = await this.computeFees({ asset: openSeaAsset, side: OrderSide.Sell, isPrivate, extraBountyBasisPoints })
+            sellerBountyBasisPoints } = await this.computeFees({ asset: openSeaAsset, side: OrderSide.Sell, extraBountyBasisPoints })
 
     const { target, calldata, replacementPattern } = encodeSell(schema, wyAsset, accountAddress)
 
@@ -2189,16 +2177,14 @@ export class OpenSeaPort {
     bundle.description = bundleDescription
     bundle.external_link = bundleExternalLink
 
-    const isPrivate = buyerAddress != NULL_ADDRESS
-
     // If all assets are for the same collection, use its fees
     const asset = collection
       ? await this.api.getAsset(assets[0])
       : undefined
     const {
       totalSellerFeeBasisPoints,
       totalBuyerFeeBasisPoints,
-      sellerBountyBasisPoints } = await this.computeFees({ asset, side: OrderSide.Sell, isPrivate, extraBountyBasisPoints })
+      sellerBountyBasisPoints } = await this.computeFees({ asset, side: OrderSide.Sell, extraBountyBasisPoints })
 
     const { calldata, replacementPattern } = encodeAtomicizedSell(orderedSchemas, bundle.assets, accountAddress, this._wyvernProtocol, this._networkName)
 

package-lock.json

@@ -33,7 +33,7 @@ suite('api', () => {
   })
 
   test('API fetches bundles and prefetches sell orders', async () => {
-    const { bundles } = await apiToTest.getBundles({asset_contract_address: CK_RINKEBY_ADDRESS, on_sale: true})
+    const { bundles } = await apiToTest.getBundles({asset_contract_address: CK_RINKEBY_ADDRESS})
     assert.isArray(bundles)
 
     const bundle = bundles[0]
@@ -131,7 +131,7 @@ suite('api', () => {
     if (!order.asset) {
       return
     }
-    const url = `https://rinkeby.opensea.io/assets/${order.asset.assetContract.address}/${order.asset.tokenId}`
+    const url = `https://testnets.opensea.io/assets/${order.asset.assetContract.address}/${order.asset.tokenId}`
     assert.equal(order.asset.openseaLink, url)
   })
 
@@ -209,7 +209,7 @@ suite('api', () => {
   })
 
   test('API excludes cancelledOrFinalized and markedInvalid orders', async () => {
-    const {orders} = await apiToTest.getOrders({limit: 100})
+    const {orders} = await apiToTest.getOrders({limit: 50})
     const finishedOrders = orders.filter(o => o.cancelledOrFinalized)
     assert.isEmpty(finishedOrders)
     const invalidOrders = orders.filter(o => o.markedInvalid)

package.json

@@ -2,8 +2,8 @@ import { OpenSeaAPI } from '../src/api'
 import { Network } from '../src/types'
 import {CK_ADDRESS, CK_RINKEBY_ADDRESS} from '../src/constants'
 
-export const MAINNET_API_KEY = "testKeyMainnet"
-export const RINKEBY_API_KEY = "testKeyRinkeby"
+export const MAINNET_API_KEY = "f657f0172a3b4b61bffec08c376dbaf8"
+export const RINKEBY_API_KEY = "af3f190b8f2d4d98b51499ae40315829"
 
 export const mainApi = new OpenSeaAPI({
   apiKey: MAINNET_API_KEY,