@polymarket/clob-client-v2 1.0.1 → 1.0.3-canary.0

package/dist/index.d.cts

@@ -191,6 +191,7 @@ interface OrderBookSummary {
     tick_size: string;
     neg_risk: boolean;
     hash: string;
+    last_trade_price: string;
 }
 interface OrderSummary {
     price: string;
@@ -867,6 +868,8 @@ declare class ClobClient {
     private readonly tokenConditionMap;
     readonly useServerTime?: boolean;
     readonly builderConfig?: BuilderConfig;
+    readonly signatureType: SignatureTypeV2;
+    readonly funderAddress?: string;
     private cachedVersion?;
     readonly retryOnError?: boolean;
     readonly throwOnError?: boolean;
@@ -994,7 +997,7 @@ declare class ApiError extends Error {
     constructor(message: string, status?: number, data?: unknown);
 }
 
-declare const createL1Headers: (signer: ClobSigner, chainId: Chain, nonce?: number, timestamp?: number) => Promise<L1PolyHeader>;
+declare const createL1Headers: (signer: ClobSigner, chainId: Chain, nonce?: number, timestamp?: number, address?: string) => Promise<L1PolyHeader>;
 declare const createL2Headers: (signer: ClobSigner, creds: ApiKeyCreds, l2HeaderArgs: L2HeaderArgs, timestamp?: number) => Promise<L2PolyHeader>;
 
 export { ApiError, type ApiKeyCreds, type ApiKeyRaw, type ApiKeysResponse, AssetType, type BalanceAllowanceParams, type BalanceAllowanceResponse, type BanStatus, type BookParams, type BuilderApiKey, type BuilderApiKeyResponse, type BuilderConfig, type BuilderFeeRates, type BuilderTrade, type BuilderTradeParams, type BuilderTradesResponse, COLLATERAL_TOKEN_DECIMALS, CONDITIONAL_TOKEN_DECIMALS, Chain, ClobClient, type ClobClientOptions, type ClobErrorResponseBody, type ClobToken, type ContractConfig, type CreateOrderOptions, type DropNotificationParams, type Earning, type FeeDetails, type FeeInfo, type FeeInfos, type FeeRates, type L1PolyHeader, L1_AUTH_UNAVAILABLE_ERROR, type L2HeaderArgs, type L2PolyHeader, L2_AUTH_NOT_AVAILABLE, type MakerOrder, type MarketDetails, type MarketPrice, type MarketReward, type MarketTradeEvent, type NegRisk, type NewOrderV1, type NewOrderV2, type Notification, type OpenOrder, type OpenOrderParams, type OpenOrdersResponse, type OrderBookSummary, OrderBuilder, type OrderMarketCancelParams, type OrderPayload, type OrderResponse, type OrderScoring, type OrderScoringParams, type OrderSummary, OrderType, type OrdersScoring, type OrdersScoringParams, type PaginationPayload, type PostOrdersArgs, type PostOrdersV1Args, type PostOrdersV2Args, type PreMigrationOrder, type PreMigrationOrdersResponse, type PriceHistoryFilterParams, PriceHistoryInterval, type ReadonlyApiKeyResponse, type RewardsConfig, type RewardsPercentages, type RoundConfig, Side, SignatureTypeV1, SignatureTypeV2, type SignedOrder, type SimpleHeaders, type TickSize, type TickSizes, type Token, type TokenConditionMap, type TotalUserEarning, type Trade, type TradeParams, type TradesPaginatedResponse, type UserEarning, type UserMarketOrderV1, type UserMarketOrderV2, type UserOrderV1, type UserOrderV2, type UserRewardsEarning, type VersionedPostOrdersArgs, type VersionedSignedOrder, type VersionedUserMarketOrder, type VersionedUserOrder, adjustBuyAmountForFees, createL1Headers, createL2Headers, getContractConfig, isV2Order, orderToJsonV1, orderToJsonV2 };

package/dist/index.d.ts

@@ -191,6 +191,7 @@ interface OrderBookSummary {
     tick_size: string;
     neg_risk: boolean;
     hash: string;
+    last_trade_price: string;
 }
 interface OrderSummary {
     price: string;
@@ -867,6 +868,8 @@ declare class ClobClient {
     private readonly tokenConditionMap;
     readonly useServerTime?: boolean;
     readonly builderConfig?: BuilderConfig;
+    readonly signatureType: SignatureTypeV2;
+    readonly funderAddress?: string;
     private cachedVersion?;
     readonly retryOnError?: boolean;
     readonly throwOnError?: boolean;
@@ -994,7 +997,7 @@ declare class ApiError extends Error {
     constructor(message: string, status?: number, data?: unknown);
 }
 
-declare const createL1Headers: (signer: ClobSigner, chainId: Chain, nonce?: number, timestamp?: number) => Promise<L1PolyHeader>;
+declare const createL1Headers: (signer: ClobSigner, chainId: Chain, nonce?: number, timestamp?: number, address?: string) => Promise<L1PolyHeader>;
 declare const createL2Headers: (signer: ClobSigner, creds: ApiKeyCreds, l2HeaderArgs: L2HeaderArgs, timestamp?: number) => Promise<L2PolyHeader>;
 
 export { ApiError, type ApiKeyCreds, type ApiKeyRaw, type ApiKeysResponse, AssetType, type BalanceAllowanceParams, type BalanceAllowanceResponse, type BanStatus, type BookParams, type BuilderApiKey, type BuilderApiKeyResponse, type BuilderConfig, type BuilderFeeRates, type BuilderTrade, type BuilderTradeParams, type BuilderTradesResponse, COLLATERAL_TOKEN_DECIMALS, CONDITIONAL_TOKEN_DECIMALS, Chain, ClobClient, type ClobClientOptions, type ClobErrorResponseBody, type ClobToken, type ContractConfig, type CreateOrderOptions, type DropNotificationParams, type Earning, type FeeDetails, type FeeInfo, type FeeInfos, type FeeRates, type L1PolyHeader, L1_AUTH_UNAVAILABLE_ERROR, type L2HeaderArgs, type L2PolyHeader, L2_AUTH_NOT_AVAILABLE, type MakerOrder, type MarketDetails, type MarketPrice, type MarketReward, type MarketTradeEvent, type NegRisk, type NewOrderV1, type NewOrderV2, type Notification, type OpenOrder, type OpenOrderParams, type OpenOrdersResponse, type OrderBookSummary, OrderBuilder, type OrderMarketCancelParams, type OrderPayload, type OrderResponse, type OrderScoring, type OrderScoringParams, type OrderSummary, OrderType, type OrdersScoring, type OrdersScoringParams, type PaginationPayload, type PostOrdersArgs, type PostOrdersV1Args, type PostOrdersV2Args, type PreMigrationOrder, type PreMigrationOrdersResponse, type PriceHistoryFilterParams, PriceHistoryInterval, type ReadonlyApiKeyResponse, type RewardsConfig, type RewardsPercentages, type RoundConfig, Side, SignatureTypeV1, SignatureTypeV2, type SignedOrder, type SimpleHeaders, type TickSize, type TickSizes, type Token, type TokenConditionMap, type TotalUserEarning, type Trade, type TradeParams, type TradesPaginatedResponse, type UserEarning, type UserMarketOrderV1, type UserMarketOrderV2, type UserOrderV1, type UserOrderV2, type UserRewardsEarning, type VersionedPostOrdersArgs, type VersionedSignedOrder, type VersionedUserMarketOrder, type VersionedUserOrder, adjustBuyAmountForFees, createL1Headers, createL2Headers, getContractConfig, isV2Order, orderToJsonV1, orderToJsonV2 };

package/dist/index.js

@@ -146,8 +146,8 @@ var signTypedDataWithSigner = async ({
 };
 
 // src/signing/eip712.ts
-var buildClobEip712Signature = async (signer, chainId, timestamp, nonce) => {
-  const address = await getSignerAddress(signer);
+var buildClobEip712Signature = async (signer, chainId, timestamp, nonce, address) => {
+  const resolvedAddress = address ?? await getSignerAddress(signer);
   const ts = timestamp.toString();
   const domain = {
     name: "ClobAuthDomain",
@@ -163,7 +163,7 @@ var buildClobEip712Signature = async (signer, chainId, timestamp, nonce) => {
     ]
   };
   const value = {
-    address,
+    address: resolvedAddress,
     timestamp: ts,
     nonce,
     message: MSG_TO_SIGN
@@ -196,7 +196,7 @@ var buildPolyHmacSignature = (secret, timestamp, method, requestPath, body) => {
 };
 
 // src/headers/index.ts
-var createL1Headers = async (signer, chainId, nonce, timestamp) => {
+var createL1Headers = async (signer, chainId, nonce, timestamp, address) => {
   let ts = Math.floor(Date.now() / 1e3);
   if (timestamp !== void 0) {
     ts = timestamp;
@@ -205,10 +205,10 @@ var createL1Headers = async (signer, chainId, nonce, timestamp) => {
   if (nonce !== void 0) {
     n = nonce;
   }
-  const sig = await buildClobEip712Signature(signer, chainId, ts, n);
-  const address = await getSignerAddress(signer);
+  const sig = await buildClobEip712Signature(signer, chainId, ts, n, address);
+  const resolvedAddress = address ?? await getSignerAddress(signer);
   const headers = {
-    POLY_ADDRESS: address,
+    POLY_ADDRESS: resolvedAddress,
     POLY_SIGNATURE: sig,
     POLY_TIMESTAMP: `${ts}`,
     POLY_NONCE: `${n}`
@@ -634,7 +634,7 @@ var ExchangeOrderBuilderV1 = class {
 };
 
 // src/order-utils/exchangeOrderBuilderV2.ts
-import { hashTypedData as hashTypedData2 } from "viem";
+import { encodeAbiParameters, hashTypedData as hashTypedData2, keccak256, toHex } from "viem";
 
 // src/order-utils/model/ctfExchangeV2TypedData.ts
 var CTF_EXCHANGE_V2_DOMAIN_NAME = "Polymarket CTF Exchange";
@@ -663,22 +663,51 @@ var SignatureTypeV2 = /* @__PURE__ */ ((SignatureTypeV22) => {
 })(SignatureTypeV2 || {});
 
 // src/order-utils/exchangeOrderBuilderV2.ts
+var ORDER_TYPE_STRING = "Order(uint256 salt,address maker,address signer,uint256 tokenId,uint256 makerAmount,uint256 takerAmount,uint8 side,uint8 signatureType,uint256 timestamp,bytes32 metadata,bytes32 builder)";
+var ORDER_TYPE_HASH = keccak256(toHex(ORDER_TYPE_STRING));
+var DOMAIN_TYPE_HASH = keccak256(
+  toHex("EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)")
+);
+var TYPED_DATA_SIGN_STRUCT = [
+  { name: "contents", type: "Order" },
+  { name: "name", type: "string" },
+  { name: "version", type: "string" },
+  { name: "chainId", type: "uint256" },
+  { name: "verifyingContract", type: "address" },
+  { name: "salt", type: "bytes32" }
+];
+var CTF_EXCHANGE_NAME_HASH = keccak256(toHex(CTF_EXCHANGE_V2_DOMAIN_NAME));
+var CTF_EXCHANGE_VERSION_HASH = keccak256(toHex(CTF_EXCHANGE_V2_DOMAIN_VERSION));
 var ExchangeOrderBuilderV2 = class {
   constructor(contractAddress, chainId, signer, generateSalt = generateOrderSalt) {
     this.contractAddress = contractAddress;
     this.chainId = chainId;
     this.signer = signer;
     this.generateSalt = generateSalt;
+    this.appDomainSep = keccak256(
+      encodeAbiParameters(
+        [
+          { type: "bytes32" },
+          { type: "bytes32" },
+          { type: "bytes32" },
+          { type: "uint256" },
+          { type: "address" }
+        ],
+        [
+          DOMAIN_TYPE_HASH,
+          CTF_EXCHANGE_NAME_HASH,
+          CTF_EXCHANGE_VERSION_HASH,
+          BigInt(chainId),
+          contractAddress
+        ]
+      )
+    );
   }
   contractAddress;
   chainId;
   signer;
   generateSalt;
-  /**
-   * build an order object including the signature.
-   * @param orderData
-   * @returns a SignedOrder object (order + signature)
-   */
+  appDomainSep;
   async buildSignedOrder(orderData) {
     const order = await this.buildOrder(orderData);
     const orderTypedData = this.buildOrderTypedData(order);
@@ -688,11 +717,6 @@ var ExchangeOrderBuilderV2 = class {
       signature: orderSignature
     };
   }
-  /**
-   * Creates an Order object from order data.
-   * @param OrderData
-   * @returns a Order object (not signed)
-   */
   async buildOrder({
     maker,
     tokenId,
@@ -709,9 +733,11 @@ var ExchangeOrderBuilderV2 = class {
     if (!signer) {
       signer = maker;
     }
-    const signerAddress = await getSignerAddress(this.signer);
-    if (signer !== signerAddress) {
-      throw new Error("signer does not match");
+    if (signatureType !== 3 /* POLY_1271 */) {
+      const signerAddress = await getSignerAddress(this.signer);
+      if (signer !== signerAddress) {
+        throw new Error("signer does not match");
+      }
     }
     return {
       salt: this.generateSalt(),
@@ -728,11 +754,6 @@ var ExchangeOrderBuilderV2 = class {
       expiration: expiration ?? "0"
     };
   }
-  /**
-   * Parses an Order object to EIP712 typed data
-   * @param order
-   * @returns a EIP712TypedData object
-   */
   buildOrderTypedData(order) {
     return {
       primaryType: "Order",
@@ -761,29 +782,78 @@ var ExchangeOrderBuilderV2 = class {
       }
     };
   }
-  /**
-   * Generates order's signature from a EIP712TypedData object + the signer address
-   * @param typedData
-   * @returns a OrderSignature that is an string
-   */
-  buildOrderSignature(typedData) {
+  async buildOrderSignature(typedData) {
     delete typedData.types.EIP712Domain;
-    return signTypedDataWithSigner({
+    const msg = typedData.message;
+    if (msg.signatureType !== 3 /* POLY_1271 */) {
+      return signTypedDataWithSigner({
+        signer: this.signer,
+        domain: typedData.domain,
+        types: typedData.types,
+        value: typedData.message,
+        primaryType: typedData.primaryType
+      });
+    }
+    const contentsHash = keccak256(
+      encodeAbiParameters(
+        [
+          { type: "bytes32" },
+          { type: "uint256" },
+          { type: "address" },
+          { type: "address" },
+          { type: "uint256" },
+          { type: "uint256" },
+          { type: "uint256" },
+          { type: "uint8" },
+          { type: "uint8" },
+          { type: "uint256" },
+          { type: "bytes32" },
+          { type: "bytes32" }
+        ],
+        [
+          ORDER_TYPE_HASH,
+          BigInt(msg.salt),
+          msg.maker,
+          msg.signer,
+          BigInt(msg.tokenId),
+          BigInt(msg.makerAmount),
+          BigInt(msg.takerAmount),
+          msg.side,
+          msg.signatureType,
+          BigInt(msg.timestamp),
+          msg.metadata,
+          msg.builder
+        ]
+      )
+    );
+    const innerSig = await signTypedDataWithSigner({
       signer: this.signer,
-      domain: typedData.domain,
-      types: typedData.types,
-      value: typedData.message,
-      primaryType: typedData.primaryType
+      domain: {
+        name: CTF_EXCHANGE_V2_DOMAIN_NAME,
+        version: CTF_EXCHANGE_V2_DOMAIN_VERSION,
+        chainId: this.chainId,
+        verifyingContract: this.contractAddress
+      },
+      types: {
+        TypedDataSign: TYPED_DATA_SIGN_STRUCT,
+        Order: CTF_EXCHANGE_V2_ORDER_STRUCT
+      },
+      primaryType: "TypedDataSign",
+      value: {
+        contents: typedData.message,
+        name: "DepositWallet",
+        version: "1",
+        chainId: this.chainId,
+        verifyingContract: msg.signer,
+        salt: bytes32Zero
+      }
     });
+    const ctLen = ORDER_TYPE_STRING.length;
+    const lenHex = ctLen.toString(16).padStart(4, "0");
+    return `0x${innerSig.slice(2)}${this.appDomainSep.slice(2)}${contentsHash.slice(2)}${toHex(ORDER_TYPE_STRING).slice(2)}${lenHex}`;
   }
-  /**
-   * Generates the hash of the order from a EIP712TypedData object.
-   * @param orderTypedData
-   * @returns a OrderHash that is an string
-   */
   buildOrderHash(orderTypedData) {
-    const digest = hashTypedData2(orderTypedData);
-    return digest;
+    return hashTypedData2(orderTypedData);
   }
 };
 
@@ -1087,9 +1157,10 @@ var ROUNDING_CONFIG = {
 var createMarketOrder = async (eoaSigner, chainId, signatureType, funderAddress, userMarketOrder, options, version) => {
   const eoaSignerAddress = await getSignerAddress(eoaSigner);
   const maker = funderAddress === void 0 ? eoaSignerAddress : funderAddress;
+  const signerForOrder = signatureType === 3 /* POLY_1271 */ ? maker : eoaSignerAddress;
   const contractConfig = getContractConfig(chainId);
   const orderData = await buildMarketOrderCreationArgs(
-    eoaSignerAddress,
+    signerForOrder,
     maker,
     signatureType,
     userMarketOrder,
@@ -1117,9 +1188,10 @@ var createMarketOrder = async (eoaSigner, chainId, signatureType, funderAddress,
 var createOrder = async (eoaSigner, chainId, signatureType, funderAddress, userOrder, options, version) => {
   const eoaSignerAddress = await getSignerAddress(eoaSigner);
   const maker = funderAddress === void 0 ? eoaSignerAddress : funderAddress;
+  const signerForOrder = signatureType === 3 /* POLY_1271 */ ? maker : eoaSignerAddress;
   const contractConfig = getContractConfig(chainId);
   const orderData = await buildOrderCreationArgs(
-    eoaSignerAddress,
+    signerForOrder,
     maker,
     signatureType,
     userOrder,
@@ -1270,6 +1342,8 @@ var ClobClient = class {
   tokenConditionMap;
   useServerTime;
   builderConfig;
+  signatureType;
+  funderAddress;
   cachedVersion;
   retryOnError;
   throwOnError;
@@ -1301,6 +1375,8 @@ var ClobClient = class {
       funderAddress,
       getSigner
     );
+    this.signatureType = signatureType ?? 0 /* EOA */;
+    this.funderAddress = funderAddress;
     this.tickSizes = {};
     this.negRisk = {};
     this.feeRates = {};
@@ -1712,24 +1788,11 @@ var ClobClient = class {
     if (!params.builder_code || params.builder_code === bytes32Zero) {
       throw new Error("builderCode is required and cannot be zero");
     }
-    this.canL2Auth();
-    const endpoint = GET_BUILDER_TRADES;
-    const headerArgs = {
-      method: GET,
-      requestPath: endpoint
-    };
-    const headers = await createL2Headers(
-      this.signer,
-      this.creds,
-      headerArgs,
-      this.useServerTime ? await this.getServerTime() : void 0
-    );
-    next_cursor = next_cursor || INITIAL_CURSOR;
-    const _params = { ...params, next_cursor };
+    const _params = { ...params, next_cursor: next_cursor || INITIAL_CURSOR };
     const {
       data,
       ...rest
-    } = await this.get(`${this.host}${endpoint}`, { headers, params: _params });
+    } = await this.get(`${this.host}${GET_BUILDER_TRADES}`, { params: _params });
     return { trades: Array.isArray(data) ? [...data] : [], ...rest };
   }
   async getNotifications() {