@polymarket/relayer-client 0.0.5 → 0.0.7

package/dist/auth/handler.d.ts

@@ -1,12 +1,15 @@
-import { AxiosRequestHeaders } from "axios";
+import { HttpClient } from "../http-helpers";
 import { AuthArgs } from "../types";
 export declare class AuthHandler {
     readonly url: string;
+    readonly httpClient: HttpClient;
     readonly token?: string;
     private cookie?;
-    constructor(args: AuthArgs);
+    constructor(httpClient: HttpClient, args: AuthArgs);
+    /**
+     * Logs in to the auth url
+     * Extracts polymarket session cookies from the auth response header and cache it locally.
+     */
     login(): Promise<void>;
-    isLoggedIn(): boolean;
-    getAuthHeader(): Promise<AxiosRequestHeaders>;
     getPolymarketCookies(): Promise<string>;
 }

package/dist/auth/handler.js

@@ -5,49 +5,40 @@ const tslib_1 = require("tslib");
 const http_helpers_1 = require("../http-helpers");
 const POLYMARKET_COOKIE_NAME = "polymarket";
 class AuthHandler {
-    constructor(args) {
-        if (args.token == undefined && args.cookie == undefined) {
+    constructor(httpClient, args) {
+        if (args.authUrl == undefined || args.authToken == undefined) {
             throw new Error("invalid authorization arguments");
         }
         this.url = args.authUrl.endsWith("/") ? args.authUrl.slice(0, -1) : args.authUrl;
-        ;
-        if (args.token !== undefined) {
-            this.token = args.token;
-        }
-        if (args.cookie !== undefined) {
-            this.cookie = args.cookie;
-        }
+        this.token = args.authToken;
+        this.httpClient = httpClient;
     }
+    /**
+     * Logs in to the auth url
+     * Extracts polymarket session cookies from the auth response header and cache it locally.
+     */
     login() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.token == undefined) {
-                throw new Error("authorization token missing");
-            }
-            const resp = yield http_helpers_1.request(`${this.url}/login`, http_helpers_1.GET, { Authorization: `Bearer ${this.token}` });
-            const cookies = resp.headers['set-cookie'];
-            let aggregatedCookie = "";
-            for (const cookie of cookies) {
-                if (cookie.includes(POLYMARKET_COOKIE_NAME)) {
-                    aggregatedCookie += `${cookie}; `;
+            if (this.cookie == undefined) {
+                // Logging in will set the session cookies on the httpClient
+                const resp = yield this.httpClient.send(`${this.url}/login`, http_helpers_1.GET, { Authorization: `Bearer ${this.token}` });
+                const cookies = resp.headers['set-cookie'];
+                let aggregatedCookie = "";
+                for (const cookie of cookies) {
+                    if (cookie.includes(POLYMARKET_COOKIE_NAME)) {
+                        aggregatedCookie += `${cookie}; `;
+                    }
+                }
+                if (aggregatedCookie != "") {
+                    this.cookie = aggregatedCookie;
                 }
-            }
-            if (aggregatedCookie != "") {
-                this.cookie = aggregatedCookie;
                 console.log(`Successfully logged in!`);
             }
         });
     }
-    isLoggedIn() {
-        return this.cookie != undefined;
-    }
-    getAuthHeader() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return { "Cookie": yield this.getPolymarketCookies() };
-        });
-    }
     getPolymarketCookies() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (!this.isLoggedIn()) {
+            if (this.cookie == undefined) {
                 console.log("Authorization not set, logging in...");
                 yield this.login();
             }

package/dist/builder/index.d.ts

@@ -1,2 +1,3 @@
 export * from "./proxy";
 export * from "./safe";
+export * from "./create";

package/dist/builder/index.js

@@ -3,3 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./proxy"), exports);
 tslib_1.__exportStar(require("./safe"), exports);
+tslib_1.__exportStar(require("./create"), exports);

package/dist/builder/utils.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deriveSafe = exports.deriveProxyWallet = void 0;
-const sdk_1 = require("@polymarket/sdk");
 const ethers_1 = require("ethers");
 const constants_1 = require("../constants");
 exports.deriveProxyWallet = (address) => {
-    return sdk_1.getProxyWalletAddress(constants_1.PROXY_WALLET_FACTORY_ADDRESS, 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.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);

package/dist/client.d.ts

@@ -1,17 +1,19 @@
 import { Wallet } from "@ethersproject/wallet";
 import { JsonRpcSigner } from "@ethersproject/providers";
+import { HttpClient } from "./http-helpers";
 import { AddressPayload, AuthArgs, NoncePayload, ProxyTransaction, RelayPayload, SafeTransaction } from "./types";
 export declare class RelayClient {
     readonly relayerUrl: string;
     readonly chainId: number;
+    readonly httpClient: HttpClient;
+    private authHandler;
     readonly signer?: Wallet | JsonRpcSigner;
-    private authHandler?;
-    constructor(relayerUrl: string, chainId: number, signer?: Wallet | JsonRpcSigner, authArgs?: AuthArgs);
-    getOk(): Promise<any>;
+    constructor(relayerUrl: string, chainId: number, authArgs: AuthArgs, signer?: Wallet | JsonRpcSigner);
     getRelayAddress(): Promise<AddressPayload>;
     getNonce(signerAddress: string, signerType: string): Promise<NoncePayload>;
     getRelayPayload(signerAddress: string, signerType: string): Promise<RelayPayload>;
     getTransaction(transactionId: string): Promise<RelayPayload>;
+    getTransactions(): Promise<RelayPayload>;
     executeProxyTransactions(txns: ProxyTransaction[]): Promise<any>;
     executeSafeTransactions(txns: SafeTransaction[]): Promise<any>;
     deploySafe(): Promise<any>;

package/dist/client.js

@@ -3,31 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RelayClient = void 0;
 const tslib_1 = require("tslib");
 const ethers_1 = require("ethers");
+const browser_or_node_1 = require("browser-or-node");
 const http_helpers_1 = require("./http-helpers");
 const types_1 = require("./types");
 const endpoints_1 = require("./endpoints");
 const builder_1 = require("./builder");
 const encode_1 = require("./encode");
-const create_1 = require("./builder/create");
+const builder_2 = require("./builder");
 const auth_1 = require("./auth");
 class RelayClient {
-    constructor(relayerUrl, chainId, signer, authArgs) {
+    constructor(relayerUrl, chainId, authArgs, signer) {
         this.relayerUrl = relayerUrl.endsWith("/") ? relayerUrl.slice(0, -1) : relayerUrl;
         this.chainId = chainId;
+        this.httpClient = new http_helpers_1.HttpClient();
+        this.authHandler = new auth_1.AuthHandler(this.httpClient, authArgs);
         if (signer !== undefined) {
             this.signer = signer;
             if (signer.provider == undefined) {
                 throw new Error("signer must have provider attached");
             }
         }
-        if (authArgs !== undefined) {
-            this.authHandler = new auth_1.AuthHandler(authArgs);
-        }
-    }
-    getOk() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return this.send(`${this.relayerUrl}/`, http_helpers_1.GET);
-        });
     }
     getRelayAddress() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -49,6 +44,11 @@ class RelayClient {
             return this.send(`${this.relayerUrl}${endpoints_1.GET_TRANSACTION}?id=${transactionId}`, http_helpers_1.GET);
         });
     }
+    getTransactions() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return this.send(`${this.relayerUrl}${endpoints_1.GET_TRANSACTION}s`, http_helpers_1.GET);
+        });
+    }
     executeProxyTransactions(txns) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.signer == undefined) {
@@ -104,7 +104,7 @@ class RelayClient {
                 payment: "0",
                 paymentReceiver: ethers_1.ethers.constants.AddressZero,
             };
-            const request = yield create_1.buildSafeCreateTransactionRequest(this.signer, args);
+            const request = yield builder_2.buildSafeCreateTransactionRequest(this.signer, args);
             console.log(`Client side request creation took: ${(Date.now() - start) / 1000} seconds`);
             return this.postTransactionRequest(request);
         });
@@ -116,9 +116,10 @@ class RelayClient {
     }
     send(endpoint, method, headers, data, params) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            // If client is instantiated locally/not on the browser, inject authorization cookies
+            yield this.authHandler.login();
+            // If client is instantiated locally/not on the browser, explicitly inject the polymarket session cookies
             // this is to ensure examples still run locally
-            if (this.authHandler != undefined) {
+            if (!browser_or_node_1.isBrowser) {
                 const cookie = yield this.authHandler.getPolymarketCookies();
                 if (headers != undefined) {
                     headers["Cookie"] = cookie;
@@ -126,11 +127,9 @@ class RelayClient {
                 else {
                     headers = { "Cookie": cookie };
                 }
-                const resp = yield http_helpers_1.request(endpoint, method, headers, data, params);
-                return resp.data;
             }
             // If the client is instantiated on the browser, do not inject cookies
-            const resp = yield http_helpers_1.request(endpoint, method, headers, data, params);
+            const resp = yield this.httpClient.send(endpoint, method, headers, data, params);
             return resp.data;
         });
     }

package/dist/constants/index.d.ts

@@ -2,5 +2,6 @@ export declare const RELAY_HUB_ADDRESS = "0xD216153c06E857cD7f72665E0aF1d7D82172
 export declare const PROXY_WALLET_FACTORY_ADDRESS = "0xaB45c5A4B0c941a2F231C04C3f49182e1A254052";
 export declare const SAFE_FACTORY_ADDRESS = "0xaacFeEa03eb1561C4e67d661e40682Bd20E3541b";
 export declare const SAFE_MULTISEND_ADDRESS = "0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761";
+export declare const PROXY_INIT_CODE_HASH = "0xd21df8dc65880a8606f09fe0ce3df9b8869287ab0b058be05aa9e8af6330a00b";
 export declare const SAFE_INIT_CODE_HASH = "0x2bce2127ff07fb632d16c8347c4ebf501f4841168bed00d9e6ef715ddb6fcecf";
 export declare const SAFE_FACTORY_NAME = "Polymarket Contract Proxy Factory";

package/dist/constants/index.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SAFE_FACTORY_NAME = exports.SAFE_INIT_CODE_HASH = exports.SAFE_MULTISEND_ADDRESS = exports.SAFE_FACTORY_ADDRESS = exports.PROXY_WALLET_FACTORY_ADDRESS = exports.RELAY_HUB_ADDRESS = void 0;
+exports.SAFE_FACTORY_NAME = exports.SAFE_INIT_CODE_HASH = exports.PROXY_INIT_CODE_HASH = exports.SAFE_MULTISEND_ADDRESS = exports.SAFE_FACTORY_ADDRESS = exports.PROXY_WALLET_FACTORY_ADDRESS = exports.RELAY_HUB_ADDRESS = void 0;
 exports.RELAY_HUB_ADDRESS = "0xD216153c06E857cD7f72665E0aF1d7D82172F494";
 exports.PROXY_WALLET_FACTORY_ADDRESS = "0xaB45c5A4B0c941a2F231C04C3f49182e1A254052";
 exports.SAFE_FACTORY_ADDRESS = "0xaacFeEa03eb1561C4e67d661e40682Bd20E3541b";
 exports.SAFE_MULTISEND_ADDRESS = "0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761";
+exports.PROXY_INIT_CODE_HASH = "0xd21df8dc65880a8606f09fe0ce3df9b8869287ab0b058be05aa9e8af6330a00b";
 exports.SAFE_INIT_CODE_HASH = "0x2bce2127ff07fb632d16c8347c4ebf501f4841168bed00d9e6ef715ddb6fcecf";
 exports.SAFE_FACTORY_NAME = "Polymarket Contract Proxy Factory";

package/dist/http-helpers/index.d.ts

@@ -1,16 +1,10 @@
-import { AxiosRequestHeaders, Method } from "axios";
+import { AxiosInstance, Method } from "axios";
 export declare const GET = "GET";
 export declare const POST = "POST";
 export declare const DELETE = "DELETE";
 export declare const PUT = "PUT";
-export declare const request: (endpoint: string, method: Method, headers?: any, data?: any, params?: any) => Promise<any>;
-export declare type QueryParams = Record<string, any>;
-export interface RequestOptions {
-    headers?: AxiosRequestHeaders;
-    data?: any;
-    params?: QueryParams;
+export declare class HttpClient {
+    readonly instance: AxiosInstance;
+    constructor();
+    send(endpoint: string, method: Method, headers?: any, data?: any, params?: any): Promise<any>;
 }
-export declare const post: (endpoint: string, options?: RequestOptions | undefined) => Promise<any>;
-export declare const raw_get: (endpoint: string, options?: RequestOptions | undefined) => Promise<any>;
-export declare const get: (endpoint: string, options?: RequestOptions | undefined) => Promise<any>;
-export declare const del: (endpoint: string, options?: RequestOptions | undefined) => Promise<any>;

package/dist/http-helpers/index.js

@@ -1,69 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.del = exports.get = exports.raw_get = exports.post = exports.request = exports.PUT = exports.DELETE = exports.POST = exports.GET = void 0;
+exports.HttpClient = exports.PUT = exports.DELETE = exports.POST = exports.GET = void 0;
 const tslib_1 = require("tslib");
 const axios_1 = tslib_1.__importDefault(require("axios"));
 exports.GET = "GET";
 exports.POST = "POST";
 exports.DELETE = "DELETE";
 exports.PUT = "PUT";
-axios_1.default.defaults.withCredentials = true;
-exports.request = (endpoint, method, headers, data, params) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c;
-    try {
-        const resp = yield axios_1.default({
-            withCredentials: true,
-            method,
-            url: endpoint,
-            headers,
-            data,
-            params
-        });
-        return resp;
+class HttpClient {
+    constructor() {
+        this.instance = axios_1.default.create({ withCredentials: true });
     }
-    catch (err) {
-        if (axios_1.default.isAxiosError(err)) {
-            if (err.response) {
-                const errPayload = {
-                    error: "request error",
-                    status: (_a = err.response) === null || _a === void 0 ? void 0 : _a.status,
-                    statusText: (_b = err.response) === null || _b === void 0 ? void 0 : _b.statusText,
-                    data: (_c = err.response) === null || _c === void 0 ? void 0 : _c.data,
-                };
-                console.error("request error", errPayload);
-                throw new Error(JSON.stringify(errPayload));
+    send(endpoint, method, headers, data, params) {
+        var _a, _b, _c;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (headers != undefined) {
+                headers["Access-Control-Allow-Credentials"] = true;
             }
-            else {
-                const errPayload = { error: "connection error" };
-                console.error("connection error", errPayload);
-                throw new Error(JSON.stringify(errPayload));
+            try {
+                const resp = yield this.instance.request({
+                    method,
+                    url: endpoint,
+                    headers,
+                    data,
+                    params
+                });
+                return resp;
             }
-        }
-        throw new Error(JSON.stringify({ error: err }));
-    }
-});
-exports.post = (endpoint, options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    const resp = yield exports.request(endpoint, exports.POST, options === null || options === void 0 ? void 0 : options.headers, options === null || options === void 0 ? void 0 : options.data, options === null || options === void 0 ? void 0 : options.params);
-    if ("error" in resp) {
-        throw new Error(resp);
-    }
-    return resp.data;
-});
-exports.raw_get = (endpoint, options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    const resp = yield exports.request(endpoint, exports.GET, options === null || options === void 0 ? void 0 : options.headers, options === null || options === void 0 ? void 0 : options.data, options === null || options === void 0 ? void 0 : options.params);
-    if ("error" in resp) {
-        throw new Error(resp);
-    }
-    return resp;
-});
-exports.get = (endpoint, options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    const resp = yield exports.raw_get(endpoint, options);
-    return resp.data;
-});
-exports.del = (endpoint, options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    const resp = yield exports.request(endpoint, exports.DELETE, options === null || options === void 0 ? void 0 : options.headers, options === null || options === void 0 ? void 0 : options.data, options === null || options === void 0 ? void 0 : options.params);
-    if ("error" in resp) {
-        throw new Error(resp);
+            catch (err) {
+                if (axios_1.default.isAxiosError(err)) {
+                    if (err.response) {
+                        const errPayload = {
+                            error: "request error",
+                            status: (_a = err.response) === null || _a === void 0 ? void 0 : _a.status,
+                            statusText: (_b = err.response) === null || _b === void 0 ? void 0 : _b.statusText,
+                            data: (_c = err.response) === null || _c === void 0 ? void 0 : _c.data,
+                        };
+                        console.error("request error", errPayload);
+                        throw new Error(JSON.stringify(errPayload));
+                    }
+                    else {
+                        const errPayload = { error: "connection error" };
+                        console.error("connection error", errPayload);
+                        throw new Error(JSON.stringify(errPayload));
+                    }
+                }
+                throw new Error(JSON.stringify({ error: err }));
+            }
+        });
     }
-    return resp.data;
-});
+}
+exports.HttpClient = HttpClient;

package/dist/types.d.ts

@@ -87,6 +87,5 @@ export interface RelayerSubRequest {
 }
 export interface AuthArgs {
     authUrl: string;
-    token?: string;
-    cookie?: string;
+    authToken: string;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@polymarket/relayer-client",
     "description": "Client for Polymarket relayers",
-    "version": "0.0.5",
+    "version": "0.0.7",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "files": [
@@ -12,8 +12,8 @@
         "clean": "rm -rf ./dist"
     },
     "dependencies": {
-        "@polymarket/sdk": "^5.0.3",
         "axios": "^0.27.2",
+        "browser-or-node": "^3.0.0",
         "ethers": "^5.7.1"
     },
     "devDependencies": {
@@ -24,6 +24,7 @@
         "@typescript-eslint/eslint-plugin": "^5.37.0",
         "@typescript-eslint/parser": "^5.37.0",
         "chai": "^4.3.6",
+        "dotenv": "^16.0.2",
         "eslint": "^8.23.1",
         "eslint-config-prettier": "^8.5.0",
         "eslint-config-standard-with-typescript": "^23.0.0",
@@ -33,10 +34,9 @@
         "eslint-plugin-promise": "^6.0.1",
         "eslint-plugin-unused-imports": "^2.0.0",
         "esm": "^3.2.25",
-        "dotenv": "^16.0.2",
-        "path": "^0.12.7",
         "mocha": "^10.0.0",
         "nyc": "^15.1.0",
+        "path": "^0.12.7",
         "prettier": "^2.7.1",
         "ts-mocha": "^10.0.0",
         "ts-node": "^9.1.1",