near-safe 0.9.7 → 0.9.9

package/dist/cjs/lib/bundler.d.ts

@@ -1,5 +1,6 @@
 import { Address, Hash, PublicClient, Transport } from "viem";
 import { GasPrices, PaymasterData, SponsorshipPolicyData, UnsignedUserOperation, UserOperation, UserOperationGas, UserOperationReceipt } from "../types";
+import { Pimlico } from "./pimlico";
 type SponsorshipPolicy = {
     sponsorshipPolicyId: string;
 };
@@ -33,15 +34,14 @@ type BundlerRpcSchema = [
 export declare class Erc4337Bundler {
     client: PublicClient<Transport, undefined, undefined, BundlerRpcSchema>;
     entryPointAddress: Address;
-    apiKey: string;
+    pimlico: Pimlico;
     chainId: number;
     constructor(entryPointAddress: Address, apiKey: string, chainId: number);
     getPaymasterData(rawUserOp: UnsignedUserOperation, sponsorshipPolicy?: string): Promise<PaymasterData>;
     sendUserOperation(userOp: UserOperation): Promise<Hash>;
     getGasPrice(): Promise<GasPrices>;
     getUserOpReceipt(userOpHash: Hash): Promise<UserOperationReceipt>;
-    private _getUserOpReceiptInner;
     getSponsorshipPolicies(): Promise<SponsorshipPolicyData[]>;
+    private _getUserOpReceiptInner;
 }
-export declare function stripApiKey(error: unknown): string;
 export {};

package/dist/cjs/lib/bundler.js

@@ -1,19 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Erc4337Bundler = void 0;
-exports.stripApiKey = stripApiKey;
 const viem_1 = require("viem");
 const util_1 = require("../util");
-function bundlerUrl(chainId, apikey) {
-    return `https://api.pimlico.io/v2/${chainId}/rpc?apikey=${apikey}`;
-}
+const pimlico_1 = require("./pimlico");
 class Erc4337Bundler {
     constructor(entryPointAddress, apiKey, chainId) {
         this.entryPointAddress = entryPointAddress;
-        this.apiKey = apiKey;
+        this.pimlico = new pimlico_1.Pimlico(apiKey);
         this.chainId = chainId;
         this.client = (0, viem_1.createPublicClient)({
-            transport: (0, viem_1.http)(bundlerUrl(chainId, this.apiKey)),
+            transport: (0, viem_1.http)(this.pimlico.bundlerUrl(chainId)),
             rpcSchema: (0, viem_1.rpcSchema)(),
         });
     }
@@ -21,7 +18,7 @@ class Erc4337Bundler {
         const userOp = { ...rawUserOp, signature: util_1.PLACEHOLDER_SIG };
         if (sponsorshipPolicy) {
             console.log("Requesting paymaster data...");
-            return handleRequest(() => this.client.request({
+            return this.pimlico.handleRequest(() => this.client.request({
                 method: "pm_sponsorUserOperation",
                 params: [
                     userOp,
@@ -31,20 +28,20 @@ class Erc4337Bundler {
             }));
         }
         console.log("Estimating user operation gas...");
-        return handleRequest(() => this.client.request({
+        return this.pimlico.handleRequest(() => this.client.request({
             method: "eth_estimateUserOperationGas",
             params: [userOp, this.entryPointAddress],
         }));
     }
     async sendUserOperation(userOp) {
-        return handleRequest(() => this.client.request({
+        return this.pimlico.handleRequest(() => this.client.request({
             method: "eth_sendUserOperation",
             params: [userOp, this.entryPointAddress],
         }));
         // throw new Error(`Failed to send user op with: ${error.message}`);
     }
     async getGasPrice() {
-        return handleRequest(() => this.client.request({
+        return this.pimlico.handleRequest(() => this.client.request({
             method: "pimlico_getUserOperationGasPrice",
             params: [],
         }));
@@ -58,52 +55,16 @@ class Erc4337Bundler {
         }
         return userOpReceipt;
     }
+    async getSponsorshipPolicies() {
+        // Chain ID doesn't matter for this bundler endpoint.
+        const allPolicies = await this.pimlico.getSponsorshipPolicies();
+        return allPolicies.filter((p) => p.chain_ids.allowlist.includes(this.chainId));
+    }
     async _getUserOpReceiptInner(userOpHash) {
-        return handleRequest(() => this.client.request({
+        return this.pimlico.handleRequest(() => this.client.request({
             method: "eth_getUserOperationReceipt",
             params: [userOpHash],
         }));
     }
-    // New method to query sponsorship policies
-    async getSponsorshipPolicies() {
-        const url = `https://api.pimlico.io/v2/account/sponsorship_policies?apikey=${this.apiKey}`;
-        const allPolocies = await handleRequest(async () => {
-            const response = await fetch(url);
-            if (!response.ok) {
-                throw new Error(`HTTP error! status: ${response.status}: ${response.statusText}`);
-            }
-            return response.json();
-        });
-        return allPolocies.data.filter((p) => p.chain_ids.allowlist.includes(this.chainId));
-    }
 }
 exports.Erc4337Bundler = Erc4337Bundler;
-async function handleRequest(clientMethod) {
-    try {
-        return await clientMethod();
-    }
-    catch (error) {
-        const message = stripApiKey(error);
-        if (error instanceof viem_1.HttpRequestError) {
-            if (error.status === 401) {
-                throw new Error("Unauthorized request. Please check your Pimlico API key.");
-            }
-            else {
-                throw new Error(`Pimlico: ${message}`);
-            }
-        }
-        else if (error instanceof viem_1.RpcError) {
-            throw new Error(`Failed to send user op with: ${message}`);
-        }
-        throw new Error(`Bundler Request: ${message}`);
-    }
-}
-function stripApiKey(error) {
-    const message = error instanceof Error ? error.message : String(error);
-    return message.replace(/(apikey=)[^\s&]+/, "$1***");
-    // Could also do this with slicing.
-    // const keyStart = message.indexOf("apikey=") + 7;
-    // // If no apikey in the message, return it as is.
-    // if (keyStart === -1) return message;
-    // return `${message.slice(0, keyStart)}***${message.slice(keyStart + 36)}`;
-}

package/dist/cjs/lib/pimlico.d.ts

@@ -0,0 +1,11 @@
+import { SponsorshipPolicyData } from "../types";
+export declare class Pimlico {
+    private apiKey;
+    constructor(apiKey: string);
+    bundlerUrl(chainId: number): string;
+    getSponsorshipPolicies(): Promise<SponsorshipPolicyData[]>;
+    getSponsorshipPolicyByName(name: string): Promise<SponsorshipPolicyData>;
+    getSponsorshipPolicyById(id: string): Promise<SponsorshipPolicyData>;
+    handleRequest<T>(clientMethod: () => Promise<T>): Promise<T>;
+}
+export declare function stripApiKey(error: unknown): string;

package/dist/cjs/lib/pimlico.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Pimlico = void 0;
+exports.stripApiKey = stripApiKey;
+const viem_1 = require("viem");
+class Pimlico {
+    constructor(apiKey) {
+        this.apiKey = apiKey;
+    }
+    bundlerUrl(chainId) {
+        return `https://api.pimlico.io/v2/${chainId}/rpc?apikey=${this.apiKey}`;
+    }
+    // New method to query sponsorship policies
+    async getSponsorshipPolicies() {
+        const url = `https://api.pimlico.io/v2/account/sponsorship_policies?apikey=${this.apiKey}`;
+        const allPolicies = await this.handleRequest(async () => {
+            const response = await fetch(url);
+            if (!response.ok) {
+                throw new Error(`HTTP error! status: ${response.status}: ${response.statusText}`);
+            }
+            return response.json();
+        });
+        return allPolicies.data;
+    }
+    async getSponsorshipPolicyByName(name) {
+        const allPolicies = await this.getSponsorshipPolicies();
+        const result = allPolicies.filter((t) => t.policy_name === name);
+        if (result.length === 0) {
+            throw new Error(`No policy found with policy_name=${name}: try ${allPolicies.map((t) => t.policy_name)}`);
+        }
+        else if (result.length > 1) {
+            throw new Error(`Multiple Policies with same policy_name=${name}: ${JSON.stringify(result)}`);
+        }
+        return result[0];
+    }
+    async getSponsorshipPolicyById(id) {
+        const allPolicies = await this.getSponsorshipPolicies();
+        const result = allPolicies.filter((t) => t.id === id);
+        if (result.length === 0) {
+            throw new Error(`No policy found with id=${id}: try ${allPolicies.map((t) => t.id)}`);
+        }
+        // We assume that ids are unique so that result.length > 1 need not be handled.
+        return result[0];
+    }
+    async handleRequest(clientMethod) {
+        try {
+            return await clientMethod();
+        }
+        catch (error) {
+            const message = stripApiKey(error);
+            if (error instanceof viem_1.HttpRequestError) {
+                if (error.status === 401) {
+                    throw new Error("Unauthorized request. Please check your Pimlico API key.");
+                }
+                else {
+                    throw new Error(`Pimlico: ${message}`);
+                }
+            }
+            else if (error instanceof viem_1.RpcError) {
+                throw new Error(`Failed to send user op with: ${message}`);
+            }
+            throw new Error(`Bundler Request: ${message}`);
+        }
+    }
+}
+exports.Pimlico = Pimlico;
+function stripApiKey(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return message.replace(/(apikey=)[^\s&]+/, "$1***");
+    // Could also do this with slicing.
+    // const keyStart = message.indexOf("apikey=") + 7;
+    // // If no apikey in the message, return it as is.
+    // if (keyStart === -1) return message;
+    // return `${message.slice(0, keyStart)}***${message.slice(keyStart + 36)}`;
+}

package/dist/cjs/near-safe.d.ts

@@ -169,7 +169,7 @@ export declare class NearSafe {
      */
     requestRouter({ method, chainId, params }: SignRequestData, sponsorshipPolicy?: string): Promise<EncodedSignRequest>;
     encodeForSafe(from: string): boolean;
-    policyForChainId(chainId: number): Promise<SponsorshipPolicyData[]>;
+    policiesForChainId(chainId: number): Promise<SponsorshipPolicyData[]>;
     deploymentRequest(chainId: number): SignRequestData;
     addOwnerRequest(chainId: number, recoveryAddress: Address): SignRequestData;
 }

package/dist/cjs/near-safe.js

@@ -346,9 +346,8 @@ class NearSafe {
         }
         return [this.address.toLowerCase(), lowerZero].includes(lowerFrom);
     }
-    async policyForChainId(chainId) {
-        const bundler = this.bundlerForChainId(chainId);
-        return bundler.getSponsorshipPolicies();
+    async policiesForChainId(chainId) {
+        return this.bundlerForChainId(chainId).getSponsorshipPolicies();
     }
     deploymentRequest(chainId) {
         return {

package/dist/esm/lib/bundler.d.ts

@@ -1,5 +1,6 @@
 import { Address, Hash, PublicClient, Transport } from "viem";
 import { GasPrices, PaymasterData, SponsorshipPolicyData, UnsignedUserOperation, UserOperation, UserOperationGas, UserOperationReceipt } from "../types";
+import { Pimlico } from "./pimlico";
 type SponsorshipPolicy = {
     sponsorshipPolicyId: string;
 };
@@ -33,15 +34,14 @@ type BundlerRpcSchema = [
 export declare class Erc4337Bundler {
     client: PublicClient<Transport, undefined, undefined, BundlerRpcSchema>;
     entryPointAddress: Address;
-    apiKey: string;
+    pimlico: Pimlico;
     chainId: number;
     constructor(entryPointAddress: Address, apiKey: string, chainId: number);
     getPaymasterData(rawUserOp: UnsignedUserOperation, sponsorshipPolicy?: string): Promise<PaymasterData>;
     sendUserOperation(userOp: UserOperation): Promise<Hash>;
     getGasPrice(): Promise<GasPrices>;
     getUserOpReceipt(userOpHash: Hash): Promise<UserOperationReceipt>;
-    private _getUserOpReceiptInner;
     getSponsorshipPolicies(): Promise<SponsorshipPolicyData[]>;
+    private _getUserOpReceiptInner;
 }
-export declare function stripApiKey(error: unknown): string;
 export {};

package/dist/esm/lib/bundler.js

@@ -1,19 +1,17 @@
-import { createPublicClient, http, rpcSchema, RpcError, HttpRequestError, } from "viem";
+import { createPublicClient, http, rpcSchema, } from "viem";
 import { PLACEHOLDER_SIG } from "../util";
-function bundlerUrl(chainId, apikey) {
-    return `https://api.pimlico.io/v2/${chainId}/rpc?apikey=${apikey}`;
-}
+import { Pimlico } from "./pimlico";
 export class Erc4337Bundler {
     client;
     entryPointAddress;
-    apiKey;
+    pimlico;
     chainId;
     constructor(entryPointAddress, apiKey, chainId) {
         this.entryPointAddress = entryPointAddress;
-        this.apiKey = apiKey;
+        this.pimlico = new Pimlico(apiKey);
         this.chainId = chainId;
         this.client = createPublicClient({
-            transport: http(bundlerUrl(chainId, this.apiKey)),
+            transport: http(this.pimlico.bundlerUrl(chainId)),
             rpcSchema: rpcSchema(),
         });
     }
@@ -21,7 +19,7 @@ export class Erc4337Bundler {
         const userOp = { ...rawUserOp, signature: PLACEHOLDER_SIG };
         if (sponsorshipPolicy) {
             console.log("Requesting paymaster data...");
-            return handleRequest(() => this.client.request({
+            return this.pimlico.handleRequest(() => this.client.request({
                 method: "pm_sponsorUserOperation",
                 params: [
                     userOp,
@@ -31,20 +29,20 @@ export class Erc4337Bundler {
             }));
         }
         console.log("Estimating user operation gas...");
-        return handleRequest(() => this.client.request({
+        return this.pimlico.handleRequest(() => this.client.request({
             method: "eth_estimateUserOperationGas",
             params: [userOp, this.entryPointAddress],
         }));
     }
     async sendUserOperation(userOp) {
-        return handleRequest(() => this.client.request({
+        return this.pimlico.handleRequest(() => this.client.request({
             method: "eth_sendUserOperation",
             params: [userOp, this.entryPointAddress],
         }));
         // throw new Error(`Failed to send user op with: ${error.message}`);
     }
     async getGasPrice() {
-        return handleRequest(() => this.client.request({
+        return this.pimlico.handleRequest(() => this.client.request({
             method: "pimlico_getUserOperationGasPrice",
             params: [],
         }));
@@ -58,51 +56,15 @@ export class Erc4337Bundler {
         }
         return userOpReceipt;
     }
+    async getSponsorshipPolicies() {
+        // Chain ID doesn't matter for this bundler endpoint.
+        const allPolicies = await this.pimlico.getSponsorshipPolicies();
+        return allPolicies.filter((p) => p.chain_ids.allowlist.includes(this.chainId));
+    }
     async _getUserOpReceiptInner(userOpHash) {
-        return handleRequest(() => this.client.request({
+        return this.pimlico.handleRequest(() => this.client.request({
             method: "eth_getUserOperationReceipt",
             params: [userOpHash],
         }));
     }
-    // New method to query sponsorship policies
-    async getSponsorshipPolicies() {
-        const url = `https://api.pimlico.io/v2/account/sponsorship_policies?apikey=${this.apiKey}`;
-        const allPolocies = await handleRequest(async () => {
-            const response = await fetch(url);
-            if (!response.ok) {
-                throw new Error(`HTTP error! status: ${response.status}: ${response.statusText}`);
-            }
-            return response.json();
-        });
-        return allPolocies.data.filter((p) => p.chain_ids.allowlist.includes(this.chainId));
-    }
-}
-async function handleRequest(clientMethod) {
-    try {
-        return await clientMethod();
-    }
-    catch (error) {
-        const message = stripApiKey(error);
-        if (error instanceof HttpRequestError) {
-            if (error.status === 401) {
-                throw new Error("Unauthorized request. Please check your Pimlico API key.");
-            }
-            else {
-                throw new Error(`Pimlico: ${message}`);
-            }
-        }
-        else if (error instanceof RpcError) {
-            throw new Error(`Failed to send user op with: ${message}`);
-        }
-        throw new Error(`Bundler Request: ${message}`);
-    }
-}
-export function stripApiKey(error) {
-    const message = error instanceof Error ? error.message : String(error);
-    return message.replace(/(apikey=)[^\s&]+/, "$1***");
-    // Could also do this with slicing.
-    // const keyStart = message.indexOf("apikey=") + 7;
-    // // If no apikey in the message, return it as is.
-    // if (keyStart === -1) return message;
-    // return `${message.slice(0, keyStart)}***${message.slice(keyStart + 36)}`;
 }

package/dist/esm/lib/pimlico.d.ts

@@ -0,0 +1,11 @@
+import { SponsorshipPolicyData } from "../types";
+export declare class Pimlico {
+    private apiKey;
+    constructor(apiKey: string);
+    bundlerUrl(chainId: number): string;
+    getSponsorshipPolicies(): Promise<SponsorshipPolicyData[]>;
+    getSponsorshipPolicyByName(name: string): Promise<SponsorshipPolicyData>;
+    getSponsorshipPolicyById(id: string): Promise<SponsorshipPolicyData>;
+    handleRequest<T>(clientMethod: () => Promise<T>): Promise<T>;
+}
+export declare function stripApiKey(error: unknown): string;

package/dist/esm/lib/pimlico.js

@@ -0,0 +1,71 @@
+import { HttpRequestError, RpcError } from "viem";
+export class Pimlico {
+    apiKey;
+    constructor(apiKey) {
+        this.apiKey = apiKey;
+    }
+    bundlerUrl(chainId) {
+        return `https://api.pimlico.io/v2/${chainId}/rpc?apikey=${this.apiKey}`;
+    }
+    // New method to query sponsorship policies
+    async getSponsorshipPolicies() {
+        const url = `https://api.pimlico.io/v2/account/sponsorship_policies?apikey=${this.apiKey}`;
+        const allPolicies = await this.handleRequest(async () => {
+            const response = await fetch(url);
+            if (!response.ok) {
+                throw new Error(`HTTP error! status: ${response.status}: ${response.statusText}`);
+            }
+            return response.json();
+        });
+        return allPolicies.data;
+    }
+    async getSponsorshipPolicyByName(name) {
+        const allPolicies = await this.getSponsorshipPolicies();
+        const result = allPolicies.filter((t) => t.policy_name === name);
+        if (result.length === 0) {
+            throw new Error(`No policy found with policy_name=${name}: try ${allPolicies.map((t) => t.policy_name)}`);
+        }
+        else if (result.length > 1) {
+            throw new Error(`Multiple Policies with same policy_name=${name}: ${JSON.stringify(result)}`);
+        }
+        return result[0];
+    }
+    async getSponsorshipPolicyById(id) {
+        const allPolicies = await this.getSponsorshipPolicies();
+        const result = allPolicies.filter((t) => t.id === id);
+        if (result.length === 0) {
+            throw new Error(`No policy found with id=${id}: try ${allPolicies.map((t) => t.id)}`);
+        }
+        // We assume that ids are unique so that result.length > 1 need not be handled.
+        return result[0];
+    }
+    async handleRequest(clientMethod) {
+        try {
+            return await clientMethod();
+        }
+        catch (error) {
+            const message = stripApiKey(error);
+            if (error instanceof HttpRequestError) {
+                if (error.status === 401) {
+                    throw new Error("Unauthorized request. Please check your Pimlico API key.");
+                }
+                else {
+                    throw new Error(`Pimlico: ${message}`);
+                }
+            }
+            else if (error instanceof RpcError) {
+                throw new Error(`Failed to send user op with: ${message}`);
+            }
+            throw new Error(`Bundler Request: ${message}`);
+        }
+    }
+}
+export function stripApiKey(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return message.replace(/(apikey=)[^\s&]+/, "$1***");
+    // Could also do this with slicing.
+    // const keyStart = message.indexOf("apikey=") + 7;
+    // // If no apikey in the message, return it as is.
+    // if (keyStart === -1) return message;
+    // return `${message.slice(0, keyStart)}***${message.slice(keyStart + 36)}`;
+}

package/dist/esm/near-safe.d.ts

@@ -169,7 +169,7 @@ export declare class NearSafe {
      */
     requestRouter({ method, chainId, params }: SignRequestData, sponsorshipPolicy?: string): Promise<EncodedSignRequest>;
     encodeForSafe(from: string): boolean;
-    policyForChainId(chainId: number): Promise<SponsorshipPolicyData[]>;
+    policiesForChainId(chainId: number): Promise<SponsorshipPolicyData[]>;
     deploymentRequest(chainId: number): SignRequestData;
     addOwnerRequest(chainId: number, recoveryAddress: Address): SignRequestData;
 }

package/dist/esm/near-safe.js

@@ -349,9 +349,8 @@ export class NearSafe {
         }
         return [this.address.toLowerCase(), lowerZero].includes(lowerFrom);
     }
-    async policyForChainId(chainId) {
-        const bundler = this.bundlerForChainId(chainId);
-        return bundler.getSponsorshipPolicies();
+    async policiesForChainId(chainId) {
+        return this.bundlerForChainId(chainId).getSponsorshipPolicies();
     }
     deploymentRequest(chainId) {
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "near-safe",
-  "version": "0.9.7",
+  "version": "0.9.9",
   "license": "MIT",
   "description": "An SDK for controlling Ethereum Smart Accounts via ERC4337 from a Near Account.",
   "author": "bh2smith",
@@ -43,7 +43,7 @@
   "dependencies": {
     "@safe-global/safe-gateway-typescript-sdk": "^3.22.6",
     "near-api-js": "^5.0.1",
-    "near-ca": "^0.8.2",
+    "near-ca": "^0.8.3",
     "semver": "^7.6.3",
     "viem": "^2.22.8"
   },