@polymarket/relayer-client 1.0.18 → 2.0.0

package/dist/response/index.d.ts

@@ -1,2 +1,21 @@
-export * from "./relayer";
-export * from "./viem";
+import { RelayClient } from "../client";
+import { IManualTransactionResponse, RelayerTransaction, RelayerTransactionResponse } from "../types";
+export declare class ClientRelayerTransactionResponse implements RelayerTransactionResponse {
+    readonly client: RelayClient;
+    readonly transactionID: string;
+    readonly transactionHash: string;
+    readonly hash: string;
+    readonly state: string;
+    constructor(transactionID: string, state: string, transactionHash: string, client: RelayClient);
+    getTransaction(): Promise<RelayerTransaction[]>;
+    wait(): Promise<RelayerTransaction | undefined>;
+}
+type WaitUntilMinedFunction = (transactionHash: string) => Promise<any>;
+export declare class ManualTransactionResponse implements IManualTransactionResponse {
+    readonly hash: string;
+    readonly transactionHash: string;
+    private waitTillMined;
+    constructor(transactionHash: string, waitTillMinedFunc: WaitUntilMinedFunction);
+    wait(): Promise<any>;
+}
+export {};

package/dist/response/index.js

@@ -1,5 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./relayer"), exports);
-tslib_1.__exportStar(require("./viem"), exports);
+exports.ManualTransactionResponse = exports.ClientRelayerTransactionResponse = void 0;
+const types_1 = require("../types");
+class ClientRelayerTransactionResponse {
+    client;
+    transactionID;
+    transactionHash;
+    hash;
+    state;
+    constructor(transactionID, state, transactionHash, client) {
+        this.transactionID = transactionID;
+        this.state = state;
+        this.transactionHash = transactionHash;
+        this.hash = transactionHash;
+        this.client = client;
+    }
+    async getTransaction() {
+        return this.client.getTransaction(this.transactionID);
+    }
+    async wait() {
+        return this.client.pollUntilState(this.transactionID, [
+            types_1.RelayerTransactionState.STATE_MINED,
+            types_1.RelayerTransactionState.STATE_CONFIRMED,
+            types_1.RelayerTransactionState.STATE_FAILED,
+        ], 30);
+    }
+}
+exports.ClientRelayerTransactionResponse = ClientRelayerTransactionResponse;
+class ManualTransactionResponse {
+    hash;
+    transactionHash;
+    waitTillMined;
+    constructor(transactionHash, waitTillMinedFunc) {
+        this.transactionHash = transactionHash;
+        this.hash = transactionHash;
+        this.waitTillMined = waitTillMinedFunc;
+    }
+    async wait() {
+        return this.waitTillMined(this.hash);
+    }
+}
+exports.ManualTransactionResponse = ManualTransactionResponse;

package/dist/types.d.ts

@@ -1,4 +1,3 @@
-import { BigNumberish } from "ethers";
 export declare enum TransactionType {
     PROXY = "PROXY",
     SAFE = "SAFE",
@@ -65,6 +64,7 @@ export interface ProxyTransactionArgs {
     from: string;
     nonce: string;
     gasPrice: string;
+    gasLimit?: string;
     data: string;
     relay: string;
 }
@@ -113,6 +113,11 @@ export interface RelayerTransaction {
     createdAt: Date;
     updatedAt: Date;
 }
+export interface IManualTransactionResponse {
+    hash: string;
+    transactionHash: string;
+    wait: () => Promise<any>;
+}
 export interface RelayerTransactionResponse {
     transactionID: string;
     state: string;
@@ -122,6 +127,6 @@ export interface RelayerTransactionResponse {
     wait: () => Promise<RelayerTransaction | undefined>;
 }
 export interface ManualOverrides {
-    gasLimit?: BigNumberish;
-    gasPrice?: BigNumberish;
+    gasLimit?: bigint;
+    gasPrice?: bigint;
 }

package/dist/utils/index.d.ts

@@ -1 +1,7 @@
+export interface SplitSig {
+    r: string;
+    s: string;
+    v: string;
+}
+export declare function splitAndPackSig(sig: string): string;
 export declare function sleep(ms: number): Promise<unknown>;

package/dist/utils/index.js

@@ -1,6 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.splitAndPackSig = splitAndPackSig;
 exports.sleep = sleep;
+const viem_1 = require("viem");
+function splitAndPackSig(sig) {
+    const splitSig = splitSignature(sig);
+    const packedSig = (0, viem_1.encodePacked)(["uint256", "uint256", "uint8"], [BigInt(splitSig.r), BigInt(splitSig.s), parseInt(splitSig.v)]);
+    return packedSig;
+}
+function splitSignature(sig) {
+    let sigV = parseInt(sig.slice(-2), 16);
+    switch (sigV) {
+        case 0:
+        case 1:
+            sigV += 31;
+            break;
+        case 27:
+        case 28:
+            sigV += 4;
+            break;
+        default:
+            throw new Error("Invalid signature");
+    }
+    sig = sig.slice(0, -2) + sigV.toString(16);
+    return {
+        r: (0, viem_1.hexToBigInt)('0x' + sig.slice(2, 66)).toString(),
+        s: (0, viem_1.hexToBigInt)('0x' + sig.slice(66, 130)).toString(),
+        v: (0, viem_1.hexToBigInt)('0x' + sig.slice(130, 132)).toString(),
+    };
+}
 function sleep(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
 }

package/package.json

@@ -1,49 +1,42 @@
 {
     "name": "@polymarket/relayer-client",
     "description": "Client for Polymarket relayers",
-    "version": "1.0.18",
+    "version": "2.0.0",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "files": [
         "/dist"
     ],
     "scripts": {
-        "build": "yarn clean && tsc --project tsconfig.production.json",
-        "clean": "rm -rf ./dist"
-    },
-    "dependencies": {
-        "@walletconnect/encoding": "^1.0.2",
-        "axios": "^0.27.2",
-        "browser-or-node": "^3.0.0",
-        "ethers": "^5.7.1",
-        "viem": "1.9.2"
+        "build": "make build",
+        "clean": "rm -rf ./dist",
+        "test": "make test"
     },
     "devDependencies": {
-        "@types/chai": "^4.3.3",
-        "@types/mocha": "^9.1.1",
+        "@types/chai": "5.2.2",
+        "@types/mocha": "10.0.10",
         "@types/node": "^18.7.18",
         "@types/ws": "^8.5.3",
-        "@typescript-eslint/eslint-plugin": "^5.37.0",
-        "@typescript-eslint/parser": "^5.37.0",
-        "chai": "^4.3.6",
+        "chai": "5.2.0",
         "dotenv": "^16.0.2",
-        "eslint": "^8.23.1",
-        "eslint-config-prettier": "^8.5.0",
-        "eslint-config-standard-with-typescript": "^23.0.0",
-        "eslint-plugin-import": "^2.26.0",
-        "eslint-plugin-n": "^15.2.5",
-        "eslint-plugin-node": "^11.1.0",
-        "eslint-plugin-promise": "^6.0.1",
-        "eslint-plugin-unused-imports": "^2.0.0",
         "esm": "^3.2.25",
-        "mocha": "^10.0.0",
-        "nyc": "^15.1.0",
+        "jsdom": "^20.0.0",
+        "jsdom-global": "^3.0.2",
+        "mocha": "9.2.2",
         "path": "^0.12.7",
         "prettier": "^2.7.1",
-        "ts-mocha": "^10.0.0",
         "ts-node": "^9.1.1",
-        "typescript": "^5.6.2",
-        "web3-utils": "^1.3.5",
+        "tsconfig-paths": "^4.2.0",
+        "tslib": "^2.8.1",
         "ws": "^8.11.0"
+    },
+    "dependencies": {
+        "@polymarket/abstract-signer": "0.0.5",
+        "axios": "^0.27.2",
+        "browser-or-node": "^3.0.0",
+        "ethers": "5.7.2",
+        "tsx": "^4.20.3",
+        "typescript": "^5.8.3",
+        "viem": "^2.31.4"
     }
 }

package/dist/builder/utils.d.ts

@@ -1,2 +0,0 @@
-export declare const deriveProxyWallet: (address: string) => string;
-export declare const deriveSafe: (address: string) => string;

package/dist/builder/utils.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deriveSafe = exports.deriveProxyWallet = void 0;
-const ethers_1 = require("ethers");
-const constants_1 = require("../constants");
-const deriveProxyWallet = (address) => {
-    return ethers_1.ethers.utils.getCreate2Address(constants_1.PROXY_WALLET_FACTORY_ADDRESS, ethers_1.ethers.utils.solidityKeccak256(["address"], [address]), constants_1.PROXY_INIT_CODE_HASH);
-};
-exports.deriveProxyWallet = deriveProxyWallet;
-const deriveSafe = (address) => {
-    return ethers_1.ethers.utils.getCreate2Address(constants_1.SAFE_FACTORY_ADDRESS, ethers_1.ethers.utils.keccak256(ethers_1.ethers.utils.defaultAbiCoder.encode(["address"], [address])), constants_1.SAFE_INIT_CODE_HASH);
-};
-exports.deriveSafe = deriveSafe;

package/dist/encode/utils.d.ts

@@ -1,6 +0,0 @@
-export declare function joinHexData(hexData: string[]): string;
-export declare function abiEncodePacked(...params: {
-    type: string;
-    value: any;
-}[]): string;
-export declare function getHexDataLength(hexData: string): number;

package/dist/encode/utils.js

@@ -1,46 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.joinHexData = joinHexData;
-exports.abiEncodePacked = abiEncodePacked;
-exports.getHexDataLength = getHexDataLength;
-const abi_1 = require("@ethersproject/abi");
-function joinHexData(hexData) {
-    return `0x${hexData
-        .map((hex) => {
-        const stripped = hex.replace(/^0x/, '');
-        return stripped.length % 2 === 0 ? stripped : '0' + stripped;
-    })
-        .join('')}`;
-}
-function abiEncodePacked(...params) {
-    return joinHexData(params.map(({ type, value }) => {
-        const encoded = abi_1.defaultAbiCoder.encode([type], [value]);
-        if (type === 'bytes' || type === 'string') {
-            const bytesLength = parseInt(encoded.slice(66, 130), 16);
-            return encoded.slice(130, 130 + 2 * bytesLength);
-        }
-        let typeMatch = type.match(/^(?:u?int\d*|bytes\d+|address)\[\]$/);
-        if (typeMatch) {
-            return encoded.slice(130);
-        }
-        if (type.startsWith('bytes')) {
-            const bytesLength = parseInt(type.slice(5));
-            return encoded.slice(2, 2 + 2 * bytesLength);
-        }
-        typeMatch = type.match(/^u?int(\d*)$/);
-        if (typeMatch) {
-            if (typeMatch[1] !== '') {
-                const bytesLength = parseInt(typeMatch[1]) / 8;
-                return encoded.slice(-2 * bytesLength);
-            }
-            return encoded.slice(-64);
-        }
-        if (type === 'address') {
-            return encoded.slice(-40);
-        }
-        throw new Error(`unsupported type ${type}`);
-    }));
-}
-function getHexDataLength(hexData) {
-    return Math.ceil((hexData.startsWith("0x") ? hexData.length - 2 : hexData.length) / 2);
-}

package/dist/response/relayer.d.ts

@@ -1,12 +0,0 @@
-import { RelayClient } from "../client";
-import { RelayerTransaction, RelayerTransactionResponse } from "../types";
-export declare class ClientRelayerTransactionResponse implements RelayerTransactionResponse {
-    readonly client: RelayClient;
-    readonly transactionID: string;
-    readonly transactionHash: string;
-    readonly hash: string;
-    readonly state: string;
-    constructor(transactionID: string, state: string, transactionHash: string, client: RelayClient);
-    getTransaction(): Promise<RelayerTransaction[]>;
-    wait(): Promise<RelayerTransaction | undefined>;
-}

package/dist/response/relayer.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClientRelayerTransactionResponse = void 0;
-const tslib_1 = require("tslib");
-const types_1 = require("../types");
-class ClientRelayerTransactionResponse {
-    constructor(transactionID, state, transactionHash, client) {
-        this.transactionID = transactionID;
-        this.state = state;
-        this.transactionHash = transactionHash;
-        this.hash = transactionHash;
-        this.client = client;
-    }
-    getTransaction() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return this.client.getTransaction(this.transactionID);
-        });
-    }
-    wait() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return this.client.pollUntilState(this.transactionID, [
-                types_1.RelayerTransactionState.STATE_MINED,
-                types_1.RelayerTransactionState.STATE_CONFIRMED,
-            ], 30);
-        });
-    }
-}
-exports.ClientRelayerTransactionResponse = ClientRelayerTransactionResponse;

package/dist/response/viem.d.ts

@@ -1,8 +0,0 @@
-import { PublicClient, TransactionReceipt } from "viem";
-export declare class ViemTransactionResponse {
-    readonly publicClient: PublicClient;
-    readonly transactionHash: string;
-    readonly hash: string;
-    constructor(transactionHash: string, publicClient: PublicClient);
-    wait(): Promise<TransactionReceipt>;
-}

package/dist/response/viem.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ViemTransactionResponse = void 0;
-const tslib_1 = require("tslib");
-class ViemTransactionResponse {
-    constructor(transactionHash, publicClient) {
-        this.transactionHash = transactionHash;
-        this.hash = transactionHash;
-        this.publicClient = publicClient;
-    }
-    wait() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return this.publicClient.waitForTransactionReceipt({
-                hash: this.hash,
-            });
-        });
-    }
-}
-exports.ViemTransactionResponse = ViemTransactionResponse;

package/dist/signeradapter/adapter.d.ts

@@ -1,20 +0,0 @@
-import { Provider, TransactionResponse as EthersTransactionResponse } from "@ethersproject/providers";
-import { ManualOverrides } from "../types";
-import { EthersSigner, ViemSigner } from "./interfaces";
-import { ViemTransactionResponse } from "../response";
-export declare class SignerAdapter {
-    readonly ethersSigner?: EthersSigner;
-    readonly viemSigner?: ViemSigner;
-    constructor(ethersSigner?: EthersSigner, viemSigner?: ViemSigner);
-    getAddress(): Promise<string>;
-    ethersSignMessage(message: string): Promise<string>;
-    viemSignMessage(message: string): Promise<string>;
-    ethersSignTypedData(domain: any, types: any, values: any): Promise<string>;
-    viemSignTypedData(domain: any, types: any, values: any): Promise<string>;
-    signMessage(message: string): Promise<string>;
-    signTypedData(domain: any, types: any, values: any): Promise<string>;
-    getProvider(): Promise<Provider>;
-    writeContract(address: string, abi: any, overrides: ManualOverrides, functionName: string, ...args: any[]): Promise<EthersTransactionResponse | ViemTransactionResponse>;
-    private ethersWriteContract;
-    private viemWriteContract;
-}

package/dist/signeradapter/adapter.js

@@ -1,188 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SignerAdapter = void 0;
-const tslib_1 = require("tslib");
-const providers_1 = require("@ethersproject/providers");
-const ethers_1 = require("ethers");
-const encoding = tslib_1.__importStar(require("@walletconnect/encoding"));
-const response_1 = require("../response");
-class SignerAdapter {
-    constructor(ethersSigner, viemSigner) {
-        if (ethersSigner == undefined && viemSigner == undefined) {
-            throw new Error("must provide an ethers signer OR viem WalletClient");
-        }
-        if (ethersSigner != undefined && viemSigner != undefined) {
-            throw new Error("must provide an ethers signer OR viem WalletClient");
-        }
-        if (ethersSigner != undefined) {
-            if (ethersSigner.provider == undefined) {
-                throw new Error("signer must have provider attached");
-            }
-            this.ethersSigner = ethersSigner;
-        }
-        if (viemSigner != undefined) {
-            if (viemSigner.publicClient == undefined) {
-                throw new Error("viem signer must have public client");
-            }
-            if (viemSigner.walletClient == undefined) {
-                throw new Error("viem signer must have wallet client");
-            }
-            this.viemSigner = viemSigner;
-        }
-    }
-    getAddress() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            if (this.ethersSigner != undefined) {
-                return this.ethersSigner.getAddress();
-            }
-            else {
-                return ((_b = (_a = this.viemSigner) === null || _a === void 0 ? void 0 : _a.walletClient.account) === null || _b === void 0 ? void 0 : _b.address) || "";
-            }
-        });
-    }
-    ethersSignMessage(message) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.ethersSigner == undefined) {
-                throw new Error("must provide an ethers Wallet or Signer");
-            }
-            return this.ethersSigner.signMessage(ethers_1.ethers.utils.arrayify(message));
-        });
-    }
-    viemSignMessage(message) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            if (this.viemSigner == undefined) {
-                throw new Error("must provide viem WalletClient");
-            }
-            console.log(`StructHash: `);
-            console.log(message);
-            // force to walletconnect signable hex
-            const msg = encoding.utf8ToHex(message);
-            console.log(`Struct Hash after wc specific encoding:`);
-            console.log(msg);
-            const account = (_b = (_a = this.viemSigner) === null || _a === void 0 ? void 0 : _a.walletClient.account) === null || _b === void 0 ? void 0 : _b.address;
-            return (_c = this.viemSigner) === null || _c === void 0 ? void 0 : _c.walletClient.signMessage({
-                account: account,
-                message: msg.slice(0, 2) == "0x" ? { raw: msg } : msg,
-            });
-        });
-    }
-    ethersSignTypedData(domain, types, values) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.ethersSigner == undefined) {
-                throw new Error("ethers signer must be present");
-            }
-            return this.ethersSigner._signTypedData(domain, types, values);
-        });
-    }
-    viemSignTypedData(domain, types, values) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            if (this.viemSigner == undefined) {
-                throw new Error("viem signer must be present");
-            }
-            const account = (_b = (_a = this.viemSigner) === null || _a === void 0 ? void 0 : _a.walletClient.account) === null || _b === void 0 ? void 0 : _b.address;
-            const keys = Object.keys(types);
-            if (keys.length > 1) {
-                throw new Error("multiple types in types array");
-            }
-            const primaryType = keys[0];
-            return this.viemSigner.walletClient.signTypedData({ account, domain, types, primaryType, message: values });
-        });
-    }
-    signMessage(message) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.ethersSigner != undefined) {
-                return this.ethersSignMessage(message);
-            }
-            else {
-                return this.viemSignMessage(message);
-            }
-        });
-    }
-    signTypedData(domain, types, values) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.ethersSigner != undefined) {
-                return this.ethersSignTypedData(domain, types, values);
-            }
-            else {
-                return this.viemSignTypedData(domain, types, values);
-            }
-        });
-    }
-    getProvider() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            if (this.ethersSigner != undefined) {
-                return this.ethersSigner.provider;
-            }
-            const chain = (_a = this.viemSigner) === null || _a === void 0 ? void 0 : _a.publicClient.chain;
-            const transport = (_b = this.viemSigner) === null || _b === void 0 ? void 0 : _b.publicClient.transport;
-            const network = {
-                chainId: (chain === null || chain === void 0 ? void 0 : chain.id) || 137,
-                name: (chain === null || chain === void 0 ? void 0 : chain.name) || "",
-            };
-            return new providers_1.JsonRpcProvider(transport === null || transport === void 0 ? void 0 : transport.url, network);
-        });
-    }
-    writeContract(address, abi, overrides, functionName, ...args) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.ethersSigner != undefined) {
-                return this.ethersWriteContract(address, abi, overrides, functionName, args);
-            }
-            else {
-                return this.viemWriteContract(address, abi, overrides, functionName, args);
-            }
-        });
-    }
-    ethersWriteContract(address, abi, overrides, functionName, ...args) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.ethersSigner != undefined) {
-                throw new Error("ethers signer must be defined");
-            }
-            const contract = new ethers_1.Contract(address, abi, this.ethersSigner);
-            if (overrides.gasLimit == undefined) {
-                const gasLimit = yield contract.estimateGas[functionName](...args);
-                console.log(`Estimated gas Limit: ${gasLimit}`);
-                overrides.gasLimit = gasLimit;
-            }
-            const argsWithOverrides = args.map(a => a);
-            argsWithOverrides.push(overrides);
-            return contract.functions[functionName](...argsWithOverrides);
-        });
-    }
-    viemWriteContract(address, abi, overrides, functionName, ...args) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            if (this.viemSigner == undefined) {
-                throw new Error("viem signer must be defined");
-            }
-            let addr = address;
-            const account = (_b = (_a = this.viemSigner) === null || _a === void 0 ? void 0 : _a.walletClient.account) === null || _b === void 0 ? void 0 : _b.address;
-            const chain = (_c = this.viemSigner) === null || _c === void 0 ? void 0 : _c.publicClient.chain;
-            let gas = undefined;
-            let gasPrice = undefined;
-            if (overrides.gasLimit != undefined) {
-                let gasLimit = ethers_1.ethers.BigNumber.from(overrides.gasLimit).toBigInt();
-                gas = gasLimit;
-            }
-            if (overrides.gasPrice != undefined) {
-                let gasPrice = ethers_1.ethers.BigNumber.from(overrides.gasPrice).toBigInt();
-                gasPrice = gasPrice;
-            }
-            const txnHash = yield this.viemSigner.walletClient.writeContract({
-                account: account,
-                address: addr,
-                abi: abi,
-                functionName: functionName,
-                args: args,
-                gas,
-                gasPrice,
-                chain,
-            });
-            return new response_1.ViemTransactionResponse(txnHash, this.viemSigner.publicClient);
-        });
-    }
-}
-exports.SignerAdapter = SignerAdapter;

package/dist/signeradapter/index.d.ts

@@ -1,2 +0,0 @@
-export * from "./adapter";
-export * from "./interfaces";

package/dist/signeradapter/index.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./adapter"), exports);
-tslib_1.__exportStar(require("./interfaces"), exports);

package/dist/signeradapter/interfaces.d.ts

@@ -1,8 +0,0 @@
-import { JsonRpcSigner } from "@ethersproject/providers";
-import { Wallet } from "ethers";
-import { PublicClient, WalletClient } from "viem";
-export interface ViemSigner {
-    walletClient: WalletClient;
-    publicClient: PublicClient;
-}
-export type EthersSigner = Wallet | JsonRpcSigner;

package/dist/signeradapter/interfaces.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });