@polymarket/relayer-client 1.0.18 → 2.0.0

package/dist/client.js

@@ -2,8 +2,9 @@
 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 = tslib_1.__importDefault(require("browser-or-node"));
+const viem_1 = require("viem");
+const abstract_signer_1 = require("@polymarket/abstract-signer");
 const http_helpers_1 = require("./http-helpers");
 const types_1 = require("./types");
 const endpoints_1 = require("./endpoints");
@@ -13,116 +14,107 @@ const auth_1 = require("./auth");
 const utils_1 = require("./utils");
 const manual_1 = require("./manual");
 const response_1 = require("./response");
+const config_1 = require("./config");
 class RelayClient {
+    relayerUrl;
+    chainId;
+    contractConfig;
+    httpClient;
+    signer;
+    authHandler;
     constructor(relayerUrl, chainId, signer, authArgs) {
         this.relayerUrl = relayerUrl.endsWith("/") ? relayerUrl.slice(0, -1) : relayerUrl;
         this.chainId = chainId;
+        this.contractConfig = (0, config_1.getContractConfig)(chainId);
         this.httpClient = new http_helpers_1.HttpClient();
         if (signer != undefined) {
-            this.signer = signer;
+            this.signer = (0, abstract_signer_1.createAbstractSigner)(chainId, signer);
         }
         if (authArgs !== undefined) {
             this.authHandler = new auth_1.AuthHandler(this.httpClient, authArgs);
         }
     }
-    getRelayAddress() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return this.send(`${this.relayerUrl}${endpoints_1.GET_ADDRESS}`, http_helpers_1.GET);
-        });
+    async getRelayAddress() {
+        return this.send(`${this.relayerUrl}${endpoints_1.GET_ADDRESS}`, http_helpers_1.GET);
     }
-    getNonce(signerAddress, signerType) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return this.send(`${this.relayerUrl}${endpoints_1.GET_NONCE}?address=${signerAddress}&type=${signerType}`, http_helpers_1.GET);
-        });
+    async getNonce(signerAddress, signerType) {
+        return this.send(`${this.relayerUrl}${endpoints_1.GET_NONCE}?address=${signerAddress}&type=${signerType}`, http_helpers_1.GET);
     }
-    getRelayPayload(signerAddress, signerType) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return this.send(`${this.relayerUrl}${endpoints_1.GET_RELAY_PAYLOAD}?address=${signerAddress}&type=${signerType}`, http_helpers_1.GET);
-        });
+    async getRelayPayload(signerAddress, signerType) {
+        return this.send(`${this.relayerUrl}${endpoints_1.GET_RELAY_PAYLOAD}?address=${signerAddress}&type=${signerType}`, http_helpers_1.GET);
     }
-    getTransaction(transactionId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return this.send(`${this.relayerUrl}${endpoints_1.GET_TRANSACTION}?id=${transactionId}`, http_helpers_1.GET);
-        });
+    async getTransaction(transactionId) {
+        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);
-        });
+    async getTransactions() {
+        return this.send(`${this.relayerUrl}${endpoints_1.GET_TRANSACTION}s`, http_helpers_1.GET);
     }
-    executeProxyTransactions(txns, metadata) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.signer == undefined) {
-                throw new Error("missing signer");
-            }
-            const start = Date.now();
-            const from = yield this.signer.getAddress();
-            const rp = yield this.getRelayPayload(from, types_1.TransactionType.PROXY);
-            const args = {
-                from: from,
-                gasPrice: "0",
-                data: (0, encode_1.encodeProxyTransactionData)(txns),
-                relay: rp.address,
-                nonce: rp.nonce,
-            };
-            const request = yield (0, builder_1.buildProxyTransactionRequest)(this.signer, args, metadata);
-            console.log(`Client side proxy request creation took: ${(Date.now() - start) / 1000} seconds`);
-            const resp = yield this.submitTransaction(request);
-            return new response_1.ClientRelayerTransactionResponse(resp.transactionID, resp.state, resp.transactionHash, this);
-        });
+    async executeProxyTransactions(txns, metadata) {
+        if (this.signer == undefined) {
+            throw new Error("missing signer");
+        }
+        const start = Date.now();
+        const from = await this.signer.getAddress();
+        const rp = await this.getRelayPayload(from, types_1.TransactionType.PROXY);
+        const args = {
+            from: from,
+            gasPrice: "0",
+            data: (0, encode_1.encodeProxyTransactionData)(txns),
+            relay: rp.address,
+            nonce: rp.nonce,
+        };
+        const proxyContractConfig = this.contractConfig.ProxyContracts;
+        const request = await (0, builder_1.buildProxyTransactionRequest)(this.signer, args, proxyContractConfig, metadata);
+        console.log(`Client side proxy request creation took: ${(Date.now() - start) / 1000} seconds`);
+        const resp = await this.submitTransaction(request);
+        return new response_1.ClientRelayerTransactionResponse(resp.transactionID, resp.state, resp.transactionHash, this);
     }
-    executeSafeTransactions(txns, metadata) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.signer == undefined) {
-                throw new Error("missing signer");
-            }
-            const start = Date.now();
-            const from = yield this.signer.getAddress();
-            // Note: goes over the network
-            const noncePayload = yield this.getNonce(from, types_1.TransactionType.SAFE);
-            const args = {
-                transactions: txns,
-                from,
-                nonce: noncePayload.nonce,
-                chainId: this.chainId,
-            };
-            const request = yield (0, builder_1.buildSafeTransactionRequest)(this.signer, args, metadata);
-            console.log(`Client side safe request creation took: ${(Date.now() - start) / 1000} seconds`);
-            const resp = yield this.submitTransaction(request);
-            return new response_1.ClientRelayerTransactionResponse(resp.transactionID, resp.state, resp.transactionHash, this);
-        });
+    async executeSafeTransactions(txns, metadata) {
+        if (this.signer == undefined) {
+            throw new Error("missing signer");
+        }
+        const start = Date.now();
+        const from = await this.signer.getAddress();
+        const noncePayload = await this.getNonce(from, types_1.TransactionType.SAFE);
+        const args = {
+            transactions: txns,
+            from,
+            nonce: noncePayload.nonce,
+            chainId: this.chainId,
+        };
+        const safeContractConfig = this.contractConfig.SafeContracts;
+        const request = await (0, builder_1.buildSafeTransactionRequest)(this.signer, args, safeContractConfig, metadata);
+        console.log(`Client side safe request creation took: ${(Date.now() - start) / 1000} seconds`);
+        const resp = await this.submitTransaction(request);
+        return new response_1.ClientRelayerTransactionResponse(resp.transactionID, resp.state, resp.transactionHash, this);
     }
-    executeManualTransactions(txns, overrides) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (overrides == undefined) {
-                overrides = {};
-            }
-            if (this.signer == undefined) {
-                throw new Error("missing signer");
-            }
-            return (0, manual_1.executeManualTransactions)(this.signer, txns, overrides);
-        });
+    async executeManualTransactions(txns, overrides) {
+        if (overrides == undefined) {
+            overrides = {};
+        }
+        if (this.signer == undefined) {
+            throw new Error("missing signer");
+        }
+        return (0, manual_1.executeManualTransactions)(this.signer, this.contractConfig.SafeContracts, txns, overrides);
     }
-    deploySafe() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (this.signer == undefined) {
-                throw new Error("missing signer");
-            }
-            const start = Date.now();
-            const from = yield ((_a = this.signer) === null || _a === void 0 ? void 0 : _a.getAddress());
-            const args = {
-                from: from,
-                chainId: this.chainId,
-                paymentToken: ethers_1.ethers.constants.AddressZero,
-                payment: "0",
-                paymentReceiver: ethers_1.ethers.constants.AddressZero,
-            };
-            const request = yield (0, builder_1.buildSafeCreateTransactionRequest)(this.signer, args);
-            console.log(`Client side deploy request creation took: ${(Date.now() - start) / 1000} seconds`);
-            const resp = yield this.submitTransaction(request);
-            return new response_1.ClientRelayerTransactionResponse(resp.transactionID, resp.state, resp.transactionHash, this);
-        });
+    async deploySafe() {
+        if (this.signer == undefined) {
+            throw new Error("missing signer");
+        }
+        const start = Date.now();
+        const from = await this.signer?.getAddress();
+        const args = {
+            from: from,
+            chainId: this.chainId,
+            paymentToken: viem_1.zeroAddress,
+            payment: "0",
+            paymentReceiver: viem_1.zeroAddress,
+        };
+        const safeContractConfig = this.contractConfig.SafeContracts;
+        const request = await (0, builder_1.buildSafeCreateTransactionRequest)(this.signer, safeContractConfig, args);
+        console.log(`Client side deploy request creation took: ${(Date.now() - start) / 1000} seconds`);
+        const resp = await this.submitTransaction(request);
+        return new response_1.ClientRelayerTransactionResponse(resp.transactionID, resp.state, resp.transactionHash, this);
     }
     /**
      * Periodically polls the transaction id until it reaches a desired state
@@ -134,53 +126,47 @@ class RelayClient {
      * @param pollFrequency
      * @returns
      */
-    pollUntilState(transactionId, states, maxPolls, pollFrequency) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            console.log(`Waiting for transaction ${transactionId} matching states: ${states}...`);
-            const maxPollCount = maxPolls != undefined ? maxPolls : 10;
-            let pollFreq = 2000; // Default to polling every 2 seconds
-            if (pollFrequency != undefined) {
-                if (pollFrequency >= 1000) {
-                    pollFreq = pollFrequency;
-                }
+    async pollUntilState(transactionId, states, maxPolls, pollFrequency) {
+        console.log(`Waiting for transaction ${transactionId} matching states: ${states}...`);
+        const maxPollCount = maxPolls != undefined ? maxPolls : 10;
+        let pollFreq = 2000; // Default to polling every 2 seconds
+        if (pollFrequency != undefined) {
+            if (pollFrequency >= 1000) {
+                pollFreq = pollFrequency;
             }
-            let pollCount = 0;
-            while (pollCount < maxPollCount) {
-                const txns = yield this.getTransaction(transactionId);
-                if (txns.length > 0) {
-                    const txn = txns[0];
-                    if (states.includes(txn.state)) {
-                        return txn;
-                    }
+        }
+        let pollCount = 0;
+        while (pollCount < maxPollCount) {
+            const txns = await this.getTransaction(transactionId);
+            if (txns.length > 0) {
+                const txn = txns[0];
+                if (states.includes(txn.state)) {
+                    return txn;
                 }
-                pollCount++;
-                yield (0, utils_1.sleep)(pollFreq);
             }
-            console.log(`Transaction not found or not in given states, timing out`);
-        });
+            pollCount++;
+            await (0, utils_1.sleep)(pollFreq);
+        }
+        console.log(`Transaction not found or not in given states, timing out`);
     }
-    submitTransaction(req) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return this.send(`${this.relayerUrl}${endpoints_1.SUBMIT_TRANSACTION}`, http_helpers_1.POST, undefined, req);
-        });
+    async submitTransaction(req) {
+        return this.send(`${this.relayerUrl}${endpoints_1.SUBMIT_TRANSACTION}`, http_helpers_1.POST, undefined, req);
     }
-    send(endpoint, method, headers, data, params) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            // Explicitly inject the polymarket session cookies
-            // In prod environments, this will be unnecessary as the browser will have the needed cookies
-            // Needed only for local testing
-            if (!browser_or_node_1.default && this.authHandler !== undefined) {
-                const cookie = yield this.authHandler.getPolymarketCookies();
-                if (headers != undefined) {
-                    headers["Cookie"] = cookie;
-                }
-                else {
-                    headers = { "Cookie": cookie };
-                }
+    async send(endpoint, method, headers, data, params) {
+        // Explicitly inject the polymarket session cookies
+        // In prod environments, this will be unnecessary as the browser will have the needed cookies
+        // Needed only for local testing
+        if (!browser_or_node_1.default && this.authHandler !== undefined) {
+            const cookie = await this.authHandler.getPolymarketCookies();
+            if (headers != undefined) {
+                headers["Cookie"] = cookie;
             }
-            const resp = yield this.httpClient.send(endpoint, method, headers, data, params);
-            return resp.data;
-        });
+            else {
+                headers = { "Cookie": cookie };
+            }
+        }
+        const resp = await this.httpClient.send(endpoint, method, headers, data, params);
+        return resp.data;
     }
 }
 exports.RelayClient = RelayClient;

package/dist/config/index.d.ts

@@ -0,0 +1,13 @@
+export interface ProxyContractConfig {
+    RelayHub: string;
+    ProxyFactory: string;
+}
+export interface SafeContractConfig {
+    SafeFactory: string;
+    SafeMultisend: string;
+}
+export interface ContractConfig {
+    ProxyContracts: ProxyContractConfig;
+    SafeContracts: SafeContractConfig;
+}
+export declare const getContractConfig: (chainId: number) => ContractConfig;

package/dist/config/index.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getContractConfig = void 0;
+;
+const AMOY = {
+    ProxyContracts: {
+        ProxyFactory: "",
+        RelayHub: ""
+    },
+    SafeContracts: {
+        SafeFactory: "",
+        SafeMultisend: "",
+    }
+};
+const POL = {
+    ProxyContracts: {
+        ProxyFactory: "0xaB45c5A4B0c941a2F231C04C3f49182e1A254052",
+        RelayHub: "0xD216153c06E857cD7f72665E0aF1d7D82172F494"
+    },
+    SafeContracts: {
+        SafeFactory: "0xaacFeEa03eb1561C4e67d661e40682Bd20E3541b",
+        SafeMultisend: "0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761",
+    }
+};
+const getContractConfig = (chainId) => {
+    switch (chainId) {
+        case 137:
+            return POL;
+        case 80002:
+            return AMOY;
+        default:
+            throw new Error("Invalid network");
+    }
+};
+exports.getContractConfig = getContractConfig;

package/dist/constants/index.d.ts

@@ -1,7 +1,3 @@
-export declare const RELAY_HUB_ADDRESS = "0xD216153c06E857cD7f72665E0aF1d7D82172F494";
-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,10 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.SAFE_FACTORY_NAME = exports.SAFE_INIT_CODE_HASH = exports.PROXY_INIT_CODE_HASH = void 0;
 exports.PROXY_INIT_CODE_HASH = "0xd21df8dc65880a8606f09fe0ce3df9b8869287ab0b058be05aa9e8af6330a00b";
 exports.SAFE_INIT_CODE_HASH = "0x2bce2127ff07fb632d16c8347c4ebf501f4841168bed00d9e6ef715ddb6fcecf";
 exports.SAFE_FACTORY_NAME = "Polymarket Contract Proxy Factory";

package/dist/encode/index.d.ts

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

package/dist/encode/index.js

@@ -3,4 +3,3 @@ 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("./utils"), exports);

package/dist/encode/proxy.d.ts

@@ -1,2 +1,2 @@
 import { ProxyTransaction } from "../types";
-export declare const encodeProxyTransactionData: (txns: ProxyTransaction[]) => string;
+export declare function encodeProxyTransactionData(txns: ProxyTransaction[]): string;

package/dist/encode/proxy.js

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeProxyTransactionData = void 0;
-const utils_1 = require("ethers/lib/utils");
-const abis_1 = require("../abis");
-const factoryInterface = new utils_1.Interface(abis_1.proxyWalletFactory);
-const encodeProxyTransactionData = (txns) => {
-    return factoryInterface.encodeFunctionData("proxy((uint8,address,uint256,bytes)[])", [txns]);
-};
 exports.encodeProxyTransactionData = encodeProxyTransactionData;
+const abis_1 = require("../abis");
+const viem_1 = require("viem");
+const proxy = (0, viem_1.prepareEncodeFunctionData)({
+    abi: abis_1.proxyWalletFactory,
+    functionName: 'proxy',
+});
+function encodeProxyTransactionData(txns) {
+    return (0, viem_1.encodeFunctionData)({
+        ...proxy,
+        args: [txns],
+    });
+}

package/dist/encode/safe.d.ts

@@ -1,2 +1,2 @@
 import { SafeTransaction } from "../types";
-export declare const createSafeMultisendTransaction: (txns: SafeTransaction[]) => SafeTransaction;
+export declare const createSafeMultisendTransaction: (txns: SafeTransaction[], safeMultisendAddress: string) => SafeTransaction;

package/dist/encode/safe.js

@@ -1,18 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSafeMultisendTransaction = void 0;
-const utils_1 = require("ethers/lib/utils");
-const constants_1 = require("../constants");
+const viem_1 = require("viem");
 const abis_1 = require("../abis");
 const types_1 = require("../types");
-const utils_2 = require("./utils");
-const multisendInterface = new utils_1.Interface(abis_1.multisendAbi);
-const createSafeMultisendTransaction = (txns) => {
-    const data = multisendInterface.encodeFunctionData("multiSend", [
-        (0, utils_2.joinHexData)(txns.map(tx => (0, utils_2.abiEncodePacked)({ type: "uint8", value: tx.operation }, { type: "address", value: tx.to }, { type: "uint256", value: tx.value }, { type: "uint256", value: (0, utils_2.getHexDataLength)(tx.data) }, { type: "bytes", value: tx.data }))),
-    ]);
+const multisend = (0, viem_1.prepareEncodeFunctionData)({
+    abi: abis_1.multisendAbi,
+    functionName: "multiSend",
+});
+const createSafeMultisendTransaction = (txns, safeMultisendAddress) => {
+    const args = [
+        (0, viem_1.concatHex)(txns.map(tx => (0, viem_1.encodePacked)(["uint8", "address", "uint256", "uint256", "bytes"], [tx.operation, tx.to, BigInt(tx.value), BigInt((0, viem_1.size)(tx.data)), tx.data]))),
+    ];
+    const data = (0, viem_1.encodeFunctionData)({ ...multisend, args: args });
     return {
-        to: constants_1.SAFE_MULTISEND_ADDRESS,
+        to: safeMultisendAddress,
         value: "0",
         data: data,
         operation: types_1.OperationType.DelegateCall,

package/dist/http-helpers/index.js

@@ -8,46 +8,44 @@ exports.POST = "POST";
 exports.DELETE = "DELETE";
 exports.PUT = "PUT";
 class HttpClient {
+    instance;
     constructor() {
         this.instance = axios_1.default.create({ withCredentials: true });
     }
-    send(endpoint, method, headers, data, params) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            if (headers != undefined) {
-                headers["Access-Control-Allow-Credentials"] = true;
-            }
-            try {
-                const resp = yield this.instance.request({
-                    method,
-                    url: endpoint,
-                    headers,
-                    data,
-                    params
-                });
-                return 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));
-                    }
+    async send(endpoint, method, headers, data, params) {
+        if (headers != undefined) {
+            headers["Access-Control-Allow-Credentials"] = true;
+        }
+        try {
+            const resp = await this.instance.request({
+                method,
+                url: endpoint,
+                headers,
+                data,
+                params
+            });
+            return resp;
+        }
+        catch (err) {
+            if (axios_1.default.isAxiosError(err)) {
+                if (err.response) {
+                    const errPayload = {
+                        error: "request error",
+                        status: err.response?.status,
+                        statusText: err.response?.statusText,
+                        data: err.response?.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 }));
             }
-        });
+            throw new Error(JSON.stringify({ error: err }));
+        }
     }
 }
 exports.HttpClient = HttpClient;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 export * from "./client";
+export * from "./encode";
 export * from "./types";
-export * from "./signeradapter";
 export * from "./response";

package/dist/index.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./client"), exports);
+tslib_1.__exportStar(require("./encode"), exports);
 tslib_1.__exportStar(require("./types"), exports);
-tslib_1.__exportStar(require("./signeradapter"), exports);
 tslib_1.__exportStar(require("./response"), exports);

package/dist/manual/index.d.ts

@@ -1,5 +1,5 @@
-import { TransactionResponse } from "@ethersproject/abstract-provider";
+import { IAbstractSigner } from "@polymarket/abstract-signer";
+import { SafeContractConfig } from "../config";
 import { SafeTransaction, ManualOverrides } from "../types";
-import { SignerAdapter } from "../signeradapter";
-import { ViemTransactionResponse } from "../response";
-export declare function executeManualTransactions(signer: SignerAdapter, transactions: SafeTransaction[], overrides: ManualOverrides): Promise<TransactionResponse | ViemTransactionResponse>;
+import { ManualTransactionResponse } from "../response";
+export declare function executeManualTransactions(signer: IAbstractSigner, safeContractConfig: SafeContractConfig, transactions: SafeTransaction[], overrides: ManualOverrides): Promise<ManualTransactionResponse>;

package/dist/manual/index.js

@@ -1,20 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeManualTransactions = executeManualTransactions;
-const tslib_1 = require("tslib");
-const ethers_1 = require("ethers");
-const builder_1 = require("../builder");
-const encode_1 = require("../encode");
+const viem_1 = require("viem");
+const viem_2 = require("viem");
 const abis_1 = require("../abis");
-function executeManualTransactions(signer, transactions, overrides) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const from = yield signer.getAddress();
-        const aggTxn = (0, builder_1.aggregateTransaction)(transactions);
-        const sig = (0, encode_1.abiEncodePacked)({ type: "uint256", value: from }, // r
-        { type: "uint256", value: 0 }, // s
-        { type: "uint8", value: 1 });
-        const safeAddress = (0, builder_1.deriveSafe)(from);
-        const args = [
+const builder_1 = require("../builder");
+const response_1 = require("../response");
+const safeExecTransaction = (0, viem_2.prepareEncodeFunctionData)({
+    abi: abis_1.safeAbi,
+    functionName: 'execTransaction',
+});
+async function executeManualTransactions(signer, safeContractConfig, transactions, overrides) {
+    const from = await signer.getAddress();
+    const aggTxn = (0, builder_1.aggregateTransaction)(transactions, safeContractConfig.SafeMultisend);
+    const sig = (0, viem_1.encodePacked)(["uint256", "uint256", "uint8"], [BigInt((0, viem_1.hexToBigInt)(from)), BigInt(0), 1]);
+    const safeAddress = (0, builder_1.deriveSafe)(from, safeContractConfig.SafeFactory);
+    // calldata
+    const data = (0, viem_2.encodeFunctionData)({ ...safeExecTransaction, args: [
             aggTxn.to,
             aggTxn.value,
             aggTxn.data,
@@ -22,10 +24,27 @@ function executeManualTransactions(signer, transactions, overrides) {
             0,
             0,
             0,
-            ethers_1.ethers.constants.AddressZero,
-            ethers_1.ethers.constants.AddressZero,
+            viem_1.zeroAddress,
+            viem_1.zeroAddress,
             sig,
-        ];
-        return signer.writeContract(safeAddress, abis_1.safeAbi, overrides, "execTransaction", args);
+        ] });
+    if (overrides.gasLimit == undefined) {
+        const gasLimit = await signer.estimateGas({
+            to: safeAddress,
+            data: data,
+            from: from,
+        });
+        console.log(`Estimated gas Limit: ${gasLimit}`);
+        overrides.gasLimit = gasLimit;
+    }
+    const txHash = await signer.sendTransaction({
+        data: data,
+        to: safeAddress,
+        gasPrice: overrides.gasPrice,
+        gasLimit: overrides.gasLimit,
     });
+    const waitFunc = (txHash) => {
+        return signer.waitTillMined(txHash);
+    };
+    return new response_1.ManualTransactionResponse(txHash, waitFunc);
 }