Merge pull request #1 from qvkare/update

update

.eslintrc.js

@@ -40,6 +40,7 @@ module.exports = {
     "@typescript-eslint/explicit-module-boundary-types": "off",
     "@typescript-eslint/no-empty-interface": "off",
     "@typescript-eslint/no-var-requires": "off",
+    "import/no-unused-modules": "off",
     "import/order": [
       "error",
       {
@@ -51,9 +52,7 @@ module.exports = {
         },
       },
     ],
-    "import/no-unused-modules": [1, { unusedExports: true }],
     "no-control-regex": "off",
-
     "object-shorthand": ["error", "always"],
   },
   settings: {

src/api/api.ts

@@ -1,4 +1,33 @@
 import { ethers } from "ethers";
+import { API_BASE_MAINNET, API_BASE_TESTNET } from "../constants";
+import {
+  ProtocolData,
+  OrdersQueryOptions,
+  OrdersQueryResponse,
+  OrderV2,
+  FulfillmentDataResponse,
+  OrderAPIOptions,
+  OrdersPostQueryResponse,
+} from "../orders/types";
+import {
+  getFulfillListingPayload,
+  getFulfillOfferPayload,
+  getFulfillmentDataPath,
+  getBuildCollectionOfferPayload,
+  getPostCollectionOfferPayload,
+  serializeOrdersQueryOptions,
+  deserializeOrder,
+} from "../orders/utils";
+import {
+  Chain,
+  OpenSeaAPIConfig,
+  OpenSeaCollection,
+  OpenSeaCollectionStats,
+  OpenSeaPaymentToken,
+  OpenSeaAccount,
+  OrderSide,
+  OrderProtocol,
+} from "../types";
 import {
   getCollectionPath,
   getCollectionsPath,
@@ -38,35 +67,6 @@ import {
   CancelOrderResponse,
   GetCollectionsArgs,
 } from "./types";
-import { API_BASE_MAINNET, API_BASE_TESTNET } from "../constants";
-import {
-  FulfillmentDataResponse,
-  OrderAPIOptions,
-  OrdersPostQueryResponse,
-  OrdersQueryOptions,
-  OrdersQueryResponse,
-  OrderV2,
-  ProtocolData,
-} from "../orders/types";
-import {
-  serializeOrdersQueryOptions,
-  deserializeOrder,
-  getFulfillmentDataPath,
-  getFulfillListingPayload,
-  getFulfillOfferPayload,
-  getBuildCollectionOfferPayload,
-  getPostCollectionOfferPayload,
-} from "../orders/utils";
-import {
-  Chain,
-  OpenSeaAPIConfig,
-  OpenSeaAccount,
-  OpenSeaCollection,
-  OpenSeaCollectionStats,
-  OpenSeaPaymentToken,
-  OrderSide,
-} from "../types";
-import { OrderProtocol } from "../orders/types";
 import {
   paymentTokenFromJSON,
   collectionFromJSON,
@@ -136,7 +136,7 @@ export class OpenSeaAPI {
    */
   public async getOrder({
     side,
-    protocol = "seaport",
+    protocol = OrderProtocol.SEAPORT,
     orderDirection = "desc",
     orderBy = "created_date",
     ...restOptions
@@ -174,7 +174,7 @@ export class OpenSeaAPI {
    */
   public async getOrders({
     side,
-    protocol = "seaport",
+    protocol = OrderProtocol.SEAPORT,
     orderDirection = "desc",
     orderBy = "created_date",
     ...restOptions
@@ -347,23 +347,38 @@ export class OpenSeaAPI {
     if (!order || !apiOptions) {
       throw new Error("Order and API options are required");
     }
-    
+
     // Protocol validation
     if (apiOptions.protocol && apiOptions.protocol !== OrderProtocol.SEAPORT) {
-      throw new Error(`Invalid protocol specified. Must be ${OrderProtocol.SEAPORT}`);
+      throw new Error(
+        `Invalid protocol specified. Must be ${OrderProtocol.SEAPORT}`,
+      );
     }
 
     // Side validation
-    if (!apiOptions.side || (apiOptions.side !== OrderSide.LISTING && apiOptions.side !== OrderSide.OFFER)) {
-      throw new Error(`Invalid order side specified. Must be either ${OrderSide.LISTING} or ${OrderSide.OFFER}`);
+    if (
+      !apiOptions.side ||
+      (apiOptions.side !== OrderSide.LISTING &&
+        apiOptions.side !== OrderSide.OFFER)
+    ) {
+      throw new Error(
+        `Invalid order side specified. Must be either ${OrderSide.LISTING} or ${OrderSide.OFFER}`,
+      );
     }
 
     // Protocol address validation
-    if (!apiOptions.protocolAddress || !ethers.isAddress(apiOptions.protocolAddress)) {
+    if (
+      !apiOptions.protocolAddress ||
+      !ethers.isAddress(apiOptions.protocolAddress)
+    ) {
       throw new Error("Invalid protocol address provided");
     }
 
-    const { protocol = OrderProtocol.SEAPORT, side, protocolAddress } = apiOptions;
+    const {
+      protocol = OrderProtocol.SEAPORT,
+      side,
+      protocolAddress,
+    } = apiOptions;
     const response = await this.post<OrdersPostQueryResponse>(
       getOrdersAPIPath(this.chain, protocol, side),
       { ...order, protocol_address: protocolAddress },

src/api/apiPaths.ts

@@ -1,5 +1,4 @@
-import { OrderProtocol } from "../orders/types";
-import { Chain, OrderSide } from "../types";
+import { Chain, OrderSide, OrderProtocol } from "../types";
 
 export const getOrdersAPIPath = (
   chain: Chain,

src/api/types.ts

@@ -1,11 +1,11 @@
 import { ConsiderationItem } from "@opensea/seaport-js/lib/types";
-import {
+import type {
   OrderType,
   OrderV2,
   ProtocolData,
   QueryCursors,
 } from "../orders/types";
-import { OpenSeaCollection } from "../types";
+import type { OpenSeaCollection } from "../types";
 
 /**
  * Response from OpenSea API for building an offer.

src/constants.ts

@@ -7,7 +7,6 @@ export const MAX_EXPIRATION_MONTHS = 1;
 export const API_BASE_MAINNET = "https://api.opensea.io";
 export const API_BASE_TESTNET = "https://testnets-api.opensea.io";
 
-// eslint-disable-next-line import/no-unused-modules
 export const SIGNED_ZONE = "0x000056f7000000ece9003ca63978907a00ffd100";
 
 export const ENGLISH_AUCTION_ZONE_MAINNETS =

src/index.ts

@@ -2,7 +2,6 @@ import { OpenSeaSDK } from "./sdk";
 
 /**
  * @example
- * // Example Setup
  * ```ts
  * import { ethers } from 'ethers'
  * import { OpenSeaSDK, Chain } from 'opensea-js'
@@ -12,11 +11,11 @@ import { OpenSeaSDK } from "./sdk";
  * })
  * ```
  */
-export {
-  // Main SDK export
-  OpenSeaSDK,
-};
 
+// Export main SDK
+export { OpenSeaSDK };
+
+// Export types
 export * from "./types";
 export * from "./api/types";
-export * from "./orders/types";
+export type { OrderType, ProtocolData } from "./orders/types";

src/orders/types.ts

@@ -1,29 +1,27 @@
 import { BasicOrderParametersStruct } from "@opensea/seaport-js/lib/typechain-types/seaport/contracts/Seaport";
-import { AdvancedOrder, OrderWithCounter } from "@opensea/seaport-js/lib/types";
-import { OpenSeaAccount, OrderSide } from "../types";
+import {
+  AdvancedOrder,
+  OrderWithCounter,
+  OrderParameters,
+  Order,
+} from "@opensea/seaport-js/lib/types";
+import { BigNumberish } from "ethers";
+import { OpenSeaAccount, OrderSide, OrderProtocol } from "../types";
 
 // Protocol data
-export enum OrderProtocol {
-  SEAPORT = "seaport"
-}
-
-type OrderProtocolToProtocolData = {
-  [OrderProtocol.SEAPORT]: OrderWithCounter;
-};
+type _OrderProtocolToProtocolData = Record<
+  OrderProtocol,
+  OrderWithCounter | AdvancedOrder | BasicOrderParametersStruct
+>;
 
 export type ProtocolData =
-  OrderProtocolToProtocolData[keyof typeof OrderProtocol];
-
-export enum OrderType {
-  BASIC = "basic",
-  ENGLISH = "english",
-  CRITERIA = "criteria",
-}
-
-type OrderFee = {
-  account: OpenSeaAccount;
-  basisPoints: string;
-};
+  | OrderWithCounter
+  | (Order & {
+      numerator: bigint;
+      denominator: bigint;
+      extraData: string;
+      parameters: OrderParameters & { counter: BigNumberish };
+    });
 
 /**
  * The latest OpenSea Order schema.
@@ -69,6 +67,23 @@ export type OrderV2 = {
   remainingQuantity: number;
 };
 
+/**
+ * Represents the type of order in the OpenSea marketplace
+ */
+export enum OrderType {
+  /** Basic order type for simple transactions */
+  BASIC = "basic",
+  /** English auction order type */
+  ENGLISH = "english",
+  /** Criteria-based order type for collection offers */
+  CRITERIA = "criteria",
+}
+
+type OrderFee = {
+  account: OpenSeaAccount;
+  basisPoints: string;
+};
+
 export type FulfillmentDataResponse = {
   protocol: string;
   fulfillment_data: FulfillmentData;

src/sdk.ts

@@ -52,6 +52,7 @@ import {
   TokenStandard,
   AssetWithTokenStandard,
   AssetWithTokenId,
+  OrderProtocol,
 } from "./types";
 import {
   getMaxOrderExpirationTimestamp,
@@ -428,7 +429,7 @@ export class OpenSeaSDK {
     const order = await executeAllActions();
 
     return this.api.postOrder(order, {
-      protocol: "seaport",
+      protocol: OrderProtocol.SEAPORT,
       protocolAddress: DEFAULT_SEAPORT_CONTRACT_ADDRESS,
       side: OrderSide.OFFER,
     });
@@ -552,7 +553,7 @@ export class OpenSeaSDK {
     const order = await executeAllActions();
 
     return this.api.postOrder(order, {
-      protocol: "seaport",
+      protocol: OrderProtocol.SEAPORT,
       protocolAddress: DEFAULT_SEAPORT_CONTRACT_ADDRESS,
       side: OrderSide.LISTING,
     });

src/types.ts

@@ -375,3 +375,10 @@ export interface SocialMediaAccount {
   platform: string;
   username: string;
 }
+
+/**
+ * Order protocol
+ */
+export enum OrderProtocol {
+  SEAPORT = "seaport",
+}

test/api/api.spec.ts

@@ -1,4 +1,4 @@
-import { assert } from "chai";
+import { assert, expect } from "chai";
 import { suite, test } from "mocha";
 import { Chain } from "../../src";
 import { getWETHAddress } from "../../src/utils";
@@ -21,7 +21,9 @@ suite("API", () => {
     const logPromise = new Promise<void>((resolve, reject) => {
       mainAPI.logger = (log) => {
         try {
-          assert.include(log, `"x-api-key":"${MAINNET_API_KEY}"`);
+          if (MAINNET_API_KEY) {
+            assert.include(log, `"x-api-key":"${MAINNET_API_KEY}"`);
+          }
           resolve();
         } catch (e) {
           reject(e);
@@ -37,11 +39,12 @@ suite("API", () => {
   });
 
   test("API handles errors", async () => {
-    // 404 Not found for random token id
     try {
       await mainAPI.getNFT(BAYC_CONTRACT_ADDRESS, "404040");
+      expect.fail("Should have thrown an error");
     } catch (error) {
-      assert.include((error as Error).message, "not found");
+      expect(error).to.be.an.instanceOf(Error);
+      expect((error as Error).message).to.include("not found");
     }
   });
 });