near-safe 0.7.0 → 0.7.2

package/dist/cjs/index.d.ts

@@ -2,4 +2,4 @@ export * from "./near-safe";
 export * from "./types";
 export * from "./util";
 export * from "./constants";
-export { Network, BaseTx, SignRequestData, populateTx } from "near-ca";
+export { Network, BaseTx, SignRequestData, populateTx, NetworkFields, } from "near-ca";

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

@@ -1,5 +1,5 @@
 import { Address, Hash, PublicClient, Transport } from "viem";
-import { GasPrices, PaymasterData, UnsignedUserOperation, UserOperation, UserOperationReceipt } from "../types";
+import { GasPrices, PaymasterData, SponsorshipPolicyData, UnsignedUserOperation, UserOperation, UserOperationReceipt } from "../types";
 type SponsorshipPolicy = {
     sponsorshipPolicyId: string;
 };
@@ -36,6 +36,7 @@ export declare class Erc4337Bundler {
     getGasPrice(): Promise<GasPrices>;
     getUserOpReceipt(userOpHash: Hash): Promise<UserOperationReceipt>;
     private _getUserOpReceiptInner;
+    getSponsorshipPolicies(): Promise<SponsorshipPolicyData[]>;
 }
 export declare function stripApiKey(error: unknown): string;
 export {};

package/dist/cjs/lib/bundler.js

@@ -60,6 +60,18 @@ class Erc4337Bundler {
             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) {

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

@@ -11,7 +11,7 @@ export declare class SafeContractSuite {
     moduleSetup: Deployment;
     entryPoint: Deployment;
     constructor();
-    addressForSetup(setup: Hex, saltNonce?: string): Promise<Address>;
+    addressForSetup(setup: Hex, saltNonce: string): Promise<Address>;
     getSetup(owners: string[]): Hex;
     addOwnerData(newOwner: Address): Hex;
     getOpHash(chainId: number, unsignedUserOp: UserOperation): Promise<Hash>;

package/dist/cjs/lib/safe.js

@@ -21,7 +21,7 @@ class SafeContractSuite {
     async addressForSetup(setup, saltNonce) {
         // bytes32 salt = keccak256(abi.encodePacked(keccak256(initializer), saltNonce));
         // cf: https://github.com/safe-global/safe-smart-account/blob/499b17ad0191b575fcadc5cb5b8e3faeae5391ae/contracts/proxies/SafeProxyFactory.sol#L58
-        const salt = (0, viem_1.keccak256)((0, viem_1.encodePacked)(["bytes32", "uint256"], [(0, viem_1.keccak256)(setup), BigInt(saltNonce || "0")]));
+        const salt = (0, viem_1.keccak256)((0, viem_1.encodePacked)(["bytes32", "uint256"], [(0, viem_1.keccak256)(setup), BigInt(saltNonce)]));
         // abi.encodePacked(type(SafeProxy).creationCode, uint256(uint160(_singleton)));
         // cf: https://github.com/safe-global/safe-smart-account/blob/499b17ad0191b575fcadc5cb5b8e3faeae5391ae/contracts/proxies/SafeProxyFactory.sol#L29
         const initCode = (0, viem_1.encodePacked)(["bytes", "uint256"], [
@@ -43,18 +43,18 @@ class SafeContractSuite {
             abi: this.singleton.abi,
             functionName: "setup",
             args: [
-                owners,
-                1, // We use sign threshold of 1.
-                this.moduleSetup.address,
+                owners, // _owners
+                1, // _threshold
+                this.moduleSetup.address, // to
                 (0, viem_1.encodeFunctionData)({
                     abi: this.moduleSetup.abi,
                     functionName: "enableModules",
                     args: [[this.m4337.address]],
-                }),
-                this.m4337.address,
-                viem_1.zeroAddress,
-                0,
-                viem_1.zeroAddress,
+                }), // data
+                this.m4337.address, // fallbackHandler
+                viem_1.zeroAddress, // paymentToken
+                0, // payment
+                viem_1.zeroAddress, // paymentReceiver
             ],
         });
     }

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

@@ -3,7 +3,7 @@ import { FinalExecutionOutcome } from "near-api-js/lib/providers";
 import { NearEthAdapter, SignRequestData } from "near-ca";
 import { Address, Hash, Hex } from "viem";
 import { SafeContractSuite } from "./lib/safe";
-import { DecodedMultisend, EncodedTxData, EvmTransactionData, MetaTransaction, UserOperation, UserOperationReceipt } from "./types";
+import { DecodedMultisend, EncodedTxData, EvmTransactionData, MetaTransaction, SponsorshipPolicyData, UserOperation, UserOperationReceipt } from "./types";
 export interface NearSafeConfig {
     accountId: string;
     mpcContractId: string;
@@ -178,4 +178,5 @@ export declare class NearSafe {
         payload: number[];
         hash: Hash;
     }>;
+    policyForChainId(chainId: number): Promise<SponsorshipPolicyData[]>;
 }

package/dist/cjs/near-safe.js

@@ -18,7 +18,8 @@ class NearSafe {
      * @returns {Promise<NearSafe>} - A promise that resolves to a new `NearSafe` instance.
      */
     static async create(config) {
-        const { pimlicoKey, safeSaltNonce } = config;
+        const { pimlicoKey } = config;
+        const safeSaltNonce = config.safeSaltNonce || constants_1.DEFAULT_SAFE_SALT_NONCE;
         // const nearAdapter = await mockAdapter();
         const nearAdapter = await (0, near_ca_1.setupAdapter)({ ...config });
         const safePack = new safe_1.SafeContractSuite();
@@ -30,7 +31,7 @@ class NearSafe {
         MPC EOA: ${nearAdapter.address}
         Safe: ${safeAddress}
     `);
-        return new NearSafe(nearAdapter, safePack, pimlicoKey, setup, safeAddress, safeSaltNonce || constants_1.DEFAULT_SAFE_SALT_NONCE);
+        return new NearSafe(nearAdapter, safePack, pimlicoKey, setup, safeAddress, safeSaltNonce);
     }
     /**
      * Constructs a new `NearSafe` object with the provided parameters.
@@ -91,7 +92,6 @@ class NearSafe {
         if (transactions.length === 0) {
             throw new Error("Empty transaction set!");
         }
-        console.log(`Building UserOp on chainId ${chainId} with ${transactions.length} transaction(s)`);
         const bundler = this.bundlerForChainId(chainId);
         const [gasFees, nonce, safeDeployed] = await Promise.all([
             bundler.getGasPrice(),
@@ -329,5 +329,9 @@ class NearSafe {
             }
         }
     }
+    async policyForChainId(chainId) {
+        const bundler = this.bundlerForChainId(chainId);
+        return bundler.getSponsorshipPolicies();
+    }
 }
 exports.NearSafe = NearSafe;

package/dist/cjs/types.d.ts

@@ -246,4 +246,31 @@ export interface EncodedTxData {
         request: SignArgs;
     }>;
 }
+export interface SponsorshipPoliciesResponse {
+    has_more: boolean;
+    data: SponsorshipPolicyData[];
+}
+export interface SponsorshipPolicyData {
+    id: string;
+    policy_name: string;
+    limits: PolicyLimits;
+    start_time: string;
+    end_time: string;
+    chain_ids: ChainIds;
+    policy_status: string;
+    created_at: string;
+}
+export interface PolicyLimits {
+    global: GlobalLimits;
+}
+export interface GlobalLimits {
+    user_operation_spending: SpendingLimit;
+}
+export interface SpendingLimit {
+    amount: number;
+    currency: string;
+}
+export interface ChainIds {
+    allowlist: number[];
+}
 export {};

package/dist/esm/index.d.ts

@@ -2,4 +2,4 @@ export * from "./near-safe";
 export * from "./types";
 export * from "./util";
 export * from "./constants";
-export { Network, BaseTx, SignRequestData, populateTx } from "near-ca";
+export { Network, BaseTx, SignRequestData, populateTx, NetworkFields, } from "near-ca";

package/dist/esm/index.js

@@ -2,4 +2,4 @@ export * from "./near-safe";
 export * from "./types";
 export * from "./util";
 export * from "./constants";
-export { Network, populateTx } from "near-ca";
+export { Network, populateTx, } from "near-ca";

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

@@ -1,5 +1,5 @@
 import { Address, Hash, PublicClient, Transport } from "viem";
-import { GasPrices, PaymasterData, UnsignedUserOperation, UserOperation, UserOperationReceipt } from "../types";
+import { GasPrices, PaymasterData, SponsorshipPolicyData, UnsignedUserOperation, UserOperation, UserOperationReceipt } from "../types";
 type SponsorshipPolicy = {
     sponsorshipPolicyId: string;
 };
@@ -36,6 +36,7 @@ export declare class Erc4337Bundler {
     getGasPrice(): Promise<GasPrices>;
     getUserOpReceipt(userOpHash: Hash): Promise<UserOperationReceipt>;
     private _getUserOpReceiptInner;
+    getSponsorshipPolicies(): Promise<SponsorshipPolicyData[]>;
 }
 export declare function stripApiKey(error: unknown): string;
 export {};

package/dist/esm/lib/bundler.js

@@ -60,6 +60,18 @@ export class Erc4337Bundler {
             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 {

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

@@ -11,7 +11,7 @@ export declare class SafeContractSuite {
     moduleSetup: Deployment;
     entryPoint: Deployment;
     constructor();
-    addressForSetup(setup: Hex, saltNonce?: string): Promise<Address>;
+    addressForSetup(setup: Hex, saltNonce: string): Promise<Address>;
     getSetup(owners: string[]): Hex;
     addOwnerData(newOwner: Address): Hex;
     getOpHash(chainId: number, unsignedUserOp: UserOperation): Promise<Hash>;

package/dist/esm/lib/safe.js

@@ -25,7 +25,7 @@ export class SafeContractSuite {
     async addressForSetup(setup, saltNonce) {
         // bytes32 salt = keccak256(abi.encodePacked(keccak256(initializer), saltNonce));
         // cf: https://github.com/safe-global/safe-smart-account/blob/499b17ad0191b575fcadc5cb5b8e3faeae5391ae/contracts/proxies/SafeProxyFactory.sol#L58
-        const salt = keccak256(encodePacked(["bytes32", "uint256"], [keccak256(setup), BigInt(saltNonce || "0")]));
+        const salt = keccak256(encodePacked(["bytes32", "uint256"], [keccak256(setup), BigInt(saltNonce)]));
         // abi.encodePacked(type(SafeProxy).creationCode, uint256(uint160(_singleton)));
         // cf: https://github.com/safe-global/safe-smart-account/blob/499b17ad0191b575fcadc5cb5b8e3faeae5391ae/contracts/proxies/SafeProxyFactory.sol#L29
         const initCode = encodePacked(["bytes", "uint256"], [
@@ -47,18 +47,18 @@ export class SafeContractSuite {
             abi: this.singleton.abi,
             functionName: "setup",
             args: [
-                owners,
-                1, // We use sign threshold of 1.
-                this.moduleSetup.address,
+                owners, // _owners
+                1, // _threshold
+                this.moduleSetup.address, // to
                 encodeFunctionData({
                     abi: this.moduleSetup.abi,
                     functionName: "enableModules",
                     args: [[this.m4337.address]],
-                }),
-                this.m4337.address,
-                zeroAddress,
-                0,
-                zeroAddress,
+                }), // data
+                this.m4337.address, // fallbackHandler
+                zeroAddress, // paymentToken
+                0, // payment
+                zeroAddress, // paymentReceiver
             ],
         });
     }

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

@@ -3,7 +3,7 @@ import { FinalExecutionOutcome } from "near-api-js/lib/providers";
 import { NearEthAdapter, SignRequestData } from "near-ca";
 import { Address, Hash, Hex } from "viem";
 import { SafeContractSuite } from "./lib/safe";
-import { DecodedMultisend, EncodedTxData, EvmTransactionData, MetaTransaction, UserOperation, UserOperationReceipt } from "./types";
+import { DecodedMultisend, EncodedTxData, EvmTransactionData, MetaTransaction, SponsorshipPolicyData, UserOperation, UserOperationReceipt } from "./types";
 export interface NearSafeConfig {
     accountId: string;
     mpcContractId: string;
@@ -178,4 +178,5 @@ export declare class NearSafe {
         payload: number[];
         hash: Hash;
     }>;
+    policyForChainId(chainId: number): Promise<SponsorshipPolicyData[]>;
 }

package/dist/esm/near-safe.js

@@ -21,7 +21,8 @@ export class NearSafe {
      * @returns {Promise<NearSafe>} - A promise that resolves to a new `NearSafe` instance.
      */
     static async create(config) {
-        const { pimlicoKey, safeSaltNonce } = config;
+        const { pimlicoKey } = config;
+        const safeSaltNonce = config.safeSaltNonce || DEFAULT_SAFE_SALT_NONCE;
         // const nearAdapter = await mockAdapter();
         const nearAdapter = await setupAdapter({ ...config });
         const safePack = new SafeContractSuite();
@@ -33,7 +34,7 @@ export class NearSafe {
         MPC EOA: ${nearAdapter.address}
         Safe: ${safeAddress}
     `);
-        return new NearSafe(nearAdapter, safePack, pimlicoKey, setup, safeAddress, safeSaltNonce || DEFAULT_SAFE_SALT_NONCE);
+        return new NearSafe(nearAdapter, safePack, pimlicoKey, setup, safeAddress, safeSaltNonce);
     }
     /**
      * Constructs a new `NearSafe` object with the provided parameters.
@@ -94,7 +95,6 @@ export class NearSafe {
         if (transactions.length === 0) {
             throw new Error("Empty transaction set!");
         }
-        console.log(`Building UserOp on chainId ${chainId} with ${transactions.length} transaction(s)`);
         const bundler = this.bundlerForChainId(chainId);
         const [gasFees, nonce, safeDeployed] = await Promise.all([
             bundler.getGasPrice(),
@@ -332,4 +332,8 @@ export class NearSafe {
             }
         }
     }
+    async policyForChainId(chainId) {
+        const bundler = this.bundlerForChainId(chainId);
+        return bundler.getSponsorshipPolicies();
+    }
 }

package/dist/esm/types.d.ts

@@ -246,4 +246,31 @@ export interface EncodedTxData {
         request: SignArgs;
     }>;
 }
+export interface SponsorshipPoliciesResponse {
+    has_more: boolean;
+    data: SponsorshipPolicyData[];
+}
+export interface SponsorshipPolicyData {
+    id: string;
+    policy_name: string;
+    limits: PolicyLimits;
+    start_time: string;
+    end_time: string;
+    chain_ids: ChainIds;
+    policy_status: string;
+    created_at: string;
+}
+export interface PolicyLimits {
+    global: GlobalLimits;
+}
+export interface GlobalLimits {
+    user_operation_spending: SpendingLimit;
+}
+export interface SpendingLimit {
+    amount: number;
+    currency: string;
+}
+export interface ChainIds {
+    allowlist: number[];
+}
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "near-safe",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "license": "MIT",
   "description": "An SDK for controlling Ethereum Smart Accounts via ERC4337 from a Near Account.",
   "author": "bh2smith",