@polymarket/clob-client-v2 0.0.3 → 0.2.0

package/dist/order-utils/exchangeOrderBuilderV1.js

@@ -1,15 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExchangeOrderBuilderV1 = void 0;
-const tslib_1 = require("tslib");
-const viem_1 = require("viem");
-const ctfExchangeV1TypedData_1 = require("./model/ctfExchangeV1TypedData");
-const eip712_1 = require("./model/eip712");
-const signatureTypeV1_js_1 = require("./model/signatureTypeV1.js");
-const utils_1 = require("./utils");
+import { hashTypedData } from "viem";
+import { getSignerAddress, signTypedDataWithSigner } from "../signing/signer.js";
+import { CTF_EXCHANGE_V1_DOMAIN_NAME, CTF_EXCHANGE_V1_DOMAIN_VERSION, CTF_EXCHANGE_V1_ORDER_STRUCT, } from "./model/ctfExchangeV1TypedData.js";
+import { EIP712_DOMAIN } from "./model/eip712.js";
+import { SignatureTypeV1 } from "./model/signatureTypeV1.js";
+import { generateOrderSalt } from "./utils.js";
 const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
-class ExchangeOrderBuilderV1 {
-    constructor(contractAddress, chainId, signer, generateSalt = utils_1.generateOrderSalt) {
+export class ExchangeOrderBuilderV1 {
+    contractAddress;
+    chainId;
+    signer;
+    generateSalt;
+    constructor(contractAddress, chainId, signer, generateSalt = generateOrderSalt) {
         this.contractAddress = contractAddress;
         this.chainId = chainId;
         this.signer = signer;
@@ -20,71 +21,70 @@ class ExchangeOrderBuilderV1 {
      * @param orderData
      * @returns a SignedOrder object (order + signature)
      */
-    buildSignedOrder(orderData) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const order = yield this.buildOrder(orderData);
-            const orderTypedData = this.buildOrderTypedData(order);
-            const orderSignature = yield this.buildOrderSignature(orderTypedData);
-            return Object.assign(Object.assign({}, order), { signature: orderSignature });
-        });
+    async buildSignedOrder(orderData) {
+        const order = await this.buildOrder(orderData);
+        const orderTypedData = this.buildOrderTypedData(order);
+        const orderSignature = await this.buildOrderSignature(orderTypedData);
+        return {
+            ...order,
+            signature: orderSignature,
+        };
     }
     /**
      * Creates an Order object from order data.
      * @param OrderData
      * @returns a Order object (not signed)
      */
-    buildOrder(_a) {
-        return tslib_1.__awaiter(this, arguments, void 0, function* ({ maker, taker, tokenId, makerAmount, takerAmount, side, feeRateBps, nonce, signer, expiration, signatureType, }) {
-            if (!signer) {
-                signer = maker;
-            }
-            const signerAddress = yield this.signer.getAddress();
-            if (signer !== signerAddress) {
-                throw new Error("signer does not match");
-            }
-            if (!expiration) {
-                expiration = "0";
-            }
-            if (!signatureType) {
-                // Default to EOA 712 sig type
-                signatureType = signatureTypeV1_js_1.SignatureTypeV1.EOA;
-            }
-            let takerAddress;
-            if (typeof taker !== "undefined" && taker) {
-                takerAddress = taker;
-            }
-            else {
-                takerAddress = ZERO_ADDRESS;
-            }
-            let feeRateBpsResolved;
-            if (typeof feeRateBps !== "undefined" && feeRateBps) {
-                feeRateBpsResolved = feeRateBps.toString();
-            }
-            else {
-                feeRateBpsResolved = "0";
-            }
-            let nonceResolved;
-            if (typeof nonce !== "undefined" && nonce) {
-                nonceResolved = nonce.toString();
-            }
-            else {
-                nonceResolved = "0";
-            }
-            return {
-                salt: this.generateSalt(),
-                maker,
-                signer,
-                taker: takerAddress,
-                tokenId,
-                makerAmount,
-                takerAmount,
-                expiration,
-                nonce: nonceResolved,
-                feeRateBps: feeRateBpsResolved,
-                side,
-                signatureType,
-            };
-        });
+    async buildOrder({ maker, taker, tokenId, makerAmount, takerAmount, side, feeRateBps, nonce, signer, expiration, signatureType, }) {
+        if (!signer) {
+            signer = maker;
+        }
+        const signerAddress = await getSignerAddress(this.signer);
+        if (signer !== signerAddress) {
+            throw new Error("signer does not match");
+        }
+        if (!expiration) {
+            expiration = "0";
+        }
+        if (!signatureType) {
+            // Default to EOA 712 sig type
+            signatureType = SignatureTypeV1.EOA;
+        }
+        let takerAddress;
+        if (typeof taker !== "undefined" && taker) {
+            takerAddress = taker;
+        }
+        else {
+            takerAddress = ZERO_ADDRESS;
+        }
+        let feeRateBpsResolved;
+        if (typeof feeRateBps !== "undefined" && feeRateBps) {
+            feeRateBpsResolved = feeRateBps.toString();
+        }
+        else {
+            feeRateBpsResolved = "0";
+        }
+        let nonceResolved;
+        if (typeof nonce !== "undefined" && nonce) {
+            nonceResolved = nonce.toString();
+        }
+        else {
+            nonceResolved = "0";
+        }
+        return {
+            salt: this.generateSalt(),
+            maker,
+            signer,
+            taker: takerAddress,
+            tokenId,
+            makerAmount,
+            takerAmount,
+            expiration,
+            nonce: nonceResolved,
+            feeRateBps: feeRateBpsResolved,
+            side,
+            signatureType,
+        };
     }
     /**
      * Parses an Order object to EIP712 typed data
@@ -95,12 +95,12 @@ class ExchangeOrderBuilderV1 {
         return {
             primaryType: "Order",
             types: {
-                EIP712Domain: eip712_1.EIP712_DOMAIN,
-                Order: ctfExchangeV1TypedData_1.CTF_EXCHANGE_V1_ORDER_STRUCT,
+                EIP712Domain: EIP712_DOMAIN,
+                Order: CTF_EXCHANGE_V1_ORDER_STRUCT,
             },
             domain: {
-                name: ctfExchangeV1TypedData_1.CTF_EXCHANGE_V1_DOMAIN_NAME,
-                version: ctfExchangeV1TypedData_1.CTF_EXCHANGE_V1_DOMAIN_VERSION,
+                name: CTF_EXCHANGE_V1_DOMAIN_NAME,
+                version: CTF_EXCHANGE_V1_DOMAIN_VERSION,
                 chainId: this.chainId,
                 verifyingContract: this.contractAddress,
             },
@@ -127,7 +127,13 @@ class ExchangeOrderBuilderV1 {
      */
     buildOrderSignature(typedData) {
         delete typedData.types.EIP712Domain;
-        return this.signer._signTypedData(typedData.domain, typedData.types, typedData.message);
+        return signTypedDataWithSigner({
+            signer: this.signer,
+            domain: typedData.domain,
+            types: typedData.types,
+            value: typedData.message,
+            primaryType: typedData.primaryType,
+        });
     }
     /**
      * Generates the hash of the order from a EIP712TypedData object.
@@ -135,9 +141,8 @@ class ExchangeOrderBuilderV1 {
      * @returns a OrderHash that is an string
      */
     buildOrderHash(orderTypedData) {
-        const digest = (0, viem_1.hashTypedData)(orderTypedData);
+        const digest = hashTypedData(orderTypedData);
         return digest;
     }
 }
-exports.ExchangeOrderBuilderV1 = ExchangeOrderBuilderV1;
 //# sourceMappingURL=exchangeOrderBuilderV1.js.map

package/dist/order-utils/exchangeOrderBuilderV1.js.map

@@ -1 +1 @@
-{"version":3,"file":"exchangeOrderBuilderV1.js","sourceRoot":"","sources":["../../src/order-utils/exchangeOrderBuilderV1.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"exchangeOrderBuilderV1.js","sourceRoot":"","sources":["../../src/order-utils/exchangeOrderBuilderV1.ts"],"names":[],"mappings":"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"}

package/dist/order-utils/exchangeOrderBuilderV2.d.ts

@@ -1,15 +1,14 @@
-import type { JsonRpcSigner } from "@ethersproject/providers";
-import type { Wallet } from "@ethersproject/wallet";
-import { type EIP712TypedData } from "./model/eip712";
-import type { OrderHash, OrderSignature } from "./model/order";
+import { type ClobSigner } from "../signing/signer.js";
+import { type EIP712TypedData } from "./model/eip712.js";
+import type { OrderHash, OrderSignature } from "./model/order.js";
 import type { OrderDataV2, OrderV2, SignedOrderV2 } from "./model/orderDataV2.js";
-import { generateOrderSalt } from "./utils";
+import { generateOrderSalt } from "./utils.js";
 export declare class ExchangeOrderBuilderV2 {
     private readonly contractAddress;
     private readonly chainId;
     private readonly signer;
     private readonly generateSalt;
-    constructor(contractAddress: string, chainId: number, signer: Wallet | JsonRpcSigner, generateSalt?: typeof generateOrderSalt);
+    constructor(contractAddress: string, chainId: number, signer: ClobSigner, generateSalt?: typeof generateOrderSalt);
     /**
      * build an order object including the signature.
      * @param orderData
@@ -21,7 +20,7 @@ export declare class ExchangeOrderBuilderV2 {
      * @param OrderData
      * @returns a Order object (not signed)
      */
-    buildOrder({ maker, tokenId, makerAmount, takerAmount, side, signer, expiration, signatureType, timestamp, metadata, builder, }: OrderDataV2): Promise<OrderV2>;
+    buildOrder({ maker, tokenId, makerAmount, takerAmount, side, signer, signatureType, timestamp, metadata, builder, expiration, }: OrderDataV2): Promise<OrderV2>;
     /**
      * Parses an Order object to EIP712 typed data
      * @param order

package/dist/order-utils/exchangeOrderBuilderV2.js

@@ -1,15 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExchangeOrderBuilderV2 = void 0;
-const tslib_1 = require("tslib");
-const viem_1 = require("viem");
-const constants_1 = require("../constants");
-const ctfExchangeV2TypedData_1 = require("./model/ctfExchangeV2TypedData");
-const eip712_1 = require("./model/eip712");
-const signatureTypeV2_js_1 = require("./model/signatureTypeV2.js");
-const utils_1 = require("./utils");
-class ExchangeOrderBuilderV2 {
-    constructor(contractAddress, chainId, signer, generateSalt = utils_1.generateOrderSalt) {
+import { hashTypedData } from "viem";
+import { bytes32Zero } from "../constants.js";
+import { getSignerAddress, signTypedDataWithSigner } from "../signing/signer.js";
+import { CTF_EXCHANGE_V2_DOMAIN_NAME, CTF_EXCHANGE_V2_DOMAIN_VERSION, CTF_EXCHANGE_V2_ORDER_STRUCT, } from "./model/ctfExchangeV2TypedData.js";
+import { EIP712_DOMAIN } from "./model/eip712.js";
+import { SignatureTypeV2 } from "./model/signatureTypeV2.js";
+import { generateOrderSalt } from "./utils.js";
+export class ExchangeOrderBuilderV2 {
+    contractAddress;
+    chainId;
+    signer;
+    generateSalt;
+    constructor(contractAddress, chainId, signer, generateSalt = generateOrderSalt) {
         this.contractAddress = contractAddress;
         this.chainId = chainId;
         this.signer = signer;
@@ -20,43 +21,42 @@ class ExchangeOrderBuilderV2 {
      * @param orderData
      * @returns a SignedOrder object (order + signature)
      */
-    buildSignedOrder(orderData) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const order = yield this.buildOrder(orderData);
-            const orderTypedData = this.buildOrderTypedData(order);
-            const orderSignature = yield this.buildOrderSignature(orderTypedData);
-            return Object.assign(Object.assign({}, order), { signature: orderSignature });
-        });
+    async buildSignedOrder(orderData) {
+        const order = await this.buildOrder(orderData);
+        const orderTypedData = this.buildOrderTypedData(order);
+        const orderSignature = await this.buildOrderSignature(orderTypedData);
+        return {
+            ...order,
+            signature: orderSignature,
+        };
     }
     /**
      * Creates an Order object from order data.
      * @param OrderData
      * @returns a Order object (not signed)
      */
-    buildOrder(_a) {
-        return tslib_1.__awaiter(this, arguments, void 0, function* ({ maker, tokenId, makerAmount, takerAmount, side, signer, expiration, signatureType, timestamp, metadata, builder, }) {
-            if (!signer) {
-                signer = maker;
-            }
-            const signerAddress = yield this.signer.getAddress();
-            if (signer !== signerAddress) {
-                throw new Error("signer does not match");
-            }
-            return {
-                salt: this.generateSalt(),
-                maker,
-                signer,
-                tokenId,
-                makerAmount,
-                takerAmount,
-                side,
-                expiration: expiration !== null && expiration !== void 0 ? expiration : "0",
-                signatureType: signatureType !== null && signatureType !== void 0 ? signatureType : signatureTypeV2_js_1.SignatureTypeV2.EOA,
-                metadata: metadata !== null && metadata !== void 0 ? metadata : constants_1.bytes32Zero,
-                builder: builder !== null && builder !== void 0 ? builder : constants_1.bytes32Zero,
-                timestamp: timestamp !== null && timestamp !== void 0 ? timestamp : Math.floor(Date.now() / 1000).toString(),
-            };
-        });
+    async buildOrder({ maker, tokenId, makerAmount, takerAmount, side, signer, signatureType, timestamp, metadata, builder, expiration, }) {
+        if (!signer) {
+            signer = maker;
+        }
+        const signerAddress = await getSignerAddress(this.signer);
+        if (signer !== signerAddress) {
+            throw new Error("signer does not match");
+        }
+        return {
+            salt: this.generateSalt(),
+            maker,
+            signer,
+            tokenId,
+            makerAmount,
+            takerAmount,
+            side,
+            signatureType: signatureType ?? SignatureTypeV2.EOA,
+            metadata: metadata ?? bytes32Zero,
+            builder: builder ?? bytes32Zero,
+            timestamp: timestamp ?? Date.now().toString(),
+            expiration: expiration ?? "0",
+        };
     }
     /**
      * Parses an Order object to EIP712 typed data
@@ -67,12 +67,12 @@ class ExchangeOrderBuilderV2 {
         return {
             primaryType: "Order",
             types: {
-                EIP712Domain: eip712_1.EIP712_DOMAIN,
-                Order: ctfExchangeV2TypedData_1.CTF_EXCHANGE_V2_ORDER_STRUCT,
+                EIP712Domain: EIP712_DOMAIN,
+                Order: CTF_EXCHANGE_V2_ORDER_STRUCT,
             },
             domain: {
-                name: ctfExchangeV2TypedData_1.CTF_EXCHANGE_V2_DOMAIN_NAME,
-                version: ctfExchangeV2TypedData_1.CTF_EXCHANGE_V2_DOMAIN_VERSION,
+                name: CTF_EXCHANGE_V2_DOMAIN_NAME,
+                version: CTF_EXCHANGE_V2_DOMAIN_VERSION,
                 chainId: this.chainId,
                 verifyingContract: this.contractAddress,
             },
@@ -98,7 +98,13 @@ class ExchangeOrderBuilderV2 {
      */
     buildOrderSignature(typedData) {
         delete typedData.types.EIP712Domain;
-        return this.signer._signTypedData(typedData.domain, typedData.types, typedData.message);
+        return signTypedDataWithSigner({
+            signer: this.signer,
+            domain: typedData.domain,
+            types: typedData.types,
+            value: typedData.message,
+            primaryType: typedData.primaryType,
+        });
     }
     /**
      * Generates the hash of the order from a EIP712TypedData object.
@@ -106,9 +112,8 @@ class ExchangeOrderBuilderV2 {
      * @returns a OrderHash that is an string
      */
     buildOrderHash(orderTypedData) {
-        const digest = (0, viem_1.hashTypedData)(orderTypedData);
+        const digest = hashTypedData(orderTypedData);
         return digest;
     }
 }
-exports.ExchangeOrderBuilderV2 = ExchangeOrderBuilderV2;
 //# sourceMappingURL=exchangeOrderBuilderV2.js.map

package/dist/order-utils/exchangeOrderBuilderV2.js.map

@@ -1 +1 @@
-{"version":3,"file":"exchangeOrderBuilderV2.js","sourceRoot":"","sources":["../../src/order-utils/exchangeOrderBuilderV2.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"exchangeOrderBuilderV2.js","sourceRoot":"","sources":["../../src/order-utils/exchangeOrderBuilderV2.ts"],"names":[],"mappings":"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"}