@safe-global/safe-deployments 1.37.1 → 1.37.2

package/dist/handler.js

@@ -1,35 +1,65 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFallbackHandlerDeployment = exports.getCompatibilityFallbackHandlerDeployment = exports.getDefaultCallbackHandlerDeployment = void 0;
-const default_callback_handler_json_1 = __importDefault(require("./assets/v1.1.1/default_callback_handler.json"));
-const compatibility_fallback_handler_json_1 = __importDefault(require("./assets/v1.3.0/compatibility_fallback_handler.json"));
-const compatibility_fallback_handler_json_2 = __importDefault(require("./assets/v1.4.1/compatibility_fallback_handler.json"));
+exports.getFallbackHandlerDeployment = exports.getCompatibilityFallbackHandlerDeployments = exports.getCompatibilityFallbackHandlerDeployment = exports.getDefaultCallbackHandlerDeployments = exports.getDefaultCallbackHandlerDeployment = void 0;
 const utils_1 = require("./utils");
-// This is a sorted array (by preference)
-const defaultCallbackHandlerDeployments = [default_callback_handler_json_1.default];
+const deployments_1 = require("./deployments");
+/**
+ * Get the default callback handler deployment based on the provided filter.
+ * @param {DeploymentFilter} [filter] - Optional filter to apply to the deployment search.
+ * @returns {SingletonDeployment | undefined} - The found deployment or undefined if not found.
+ */
 const getDefaultCallbackHandlerDeployment = (filter) => {
-    return (0, utils_1.findDeployment)(filter, defaultCallbackHandlerDeployments);
+    return (0, utils_1.findDeployment)(filter, deployments_1._DEFAULT_CALLBACK_HANDLER_DEPLOYMENTS);
 };
 exports.getDefaultCallbackHandlerDeployment = getDefaultCallbackHandlerDeployment;
-// This is a sorted array (by preference)
-const compatFallbackHandlerDeployments = [
-    compatibility_fallback_handler_json_2.default,
-    compatibility_fallback_handler_json_1.default,
-];
+/**
+ * Get all default callback handler deployments based on the provided filter.
+ * @param {DeploymentFilter} [filter] - Optional filter to apply to the deployment search.
+ * @returns {SingletonDeploymentV2 | undefined} - The found deployments in version 2 format or undefined if not found.
+ */
+const getDefaultCallbackHandlerDeployments = (filter) => {
+    return (0, utils_1.findDeployment)(filter, deployments_1._DEFAULT_CALLBACK_HANDLER_DEPLOYMENTS, "multiple" /* DeploymentFormats.MULTIPLE */);
+};
+exports.getDefaultCallbackHandlerDeployments = getDefaultCallbackHandlerDeployments;
+/**
+ * Get the compatibility fallback handler deployment based on the provided filter.
+ * @param {DeploymentFilter} [filter] - Optional filter to apply to the deployment search.
+ * @returns {SingletonDeployment | undefined} - The found deployment or undefined if not found.
+ */
 const getCompatibilityFallbackHandlerDeployment = (filter) => {
-    return (0, utils_1.findDeployment)(filter, compatFallbackHandlerDeployments);
+    return (0, utils_1.findDeployment)(filter, deployments_1._COMPAT_FALLBACK_HANDLER_DEPLOYMENTS);
 };
 exports.getCompatibilityFallbackHandlerDeployment = getCompatibilityFallbackHandlerDeployment;
-// This is a sorted array (by preference)
-const fallbackHandlerDeployments = [
-    compatibility_fallback_handler_json_2.default,
-    compatibility_fallback_handler_json_1.default,
-    default_callback_handler_json_1.default,
-];
-const getFallbackHandlerDeployment = (filter) => {
-    return (0, utils_1.findDeployment)(filter, fallbackHandlerDeployments);
+/**
+ * Get all compatibility fallback handler deployments based on the provided filter.
+ * @param {DeploymentFilter} [filter] - Optional filter to apply to the deployment search.
+ * @returns {SingletonDeploymentV2 | undefined} - The found deployments in version 2 format or undefined if not found.
+ */
+const getCompatibilityFallbackHandlerDeployments = (filter) => {
+    return (0, utils_1.findDeployment)(filter, deployments_1._COMPAT_FALLBACK_HANDLER_DEPLOYMENTS, "multiple" /* DeploymentFormats.MULTIPLE */);
 };
-exports.getFallbackHandlerDeployment = getFallbackHandlerDeployment;
+exports.getCompatibilityFallbackHandlerDeployments = getCompatibilityFallbackHandlerDeployments;
+/**
+ * Get the fallback handler deployment based on the provided filter. This method is an alias for `getCompatibilityFallbackHandlerDeployment`.
+ * Kept for backwards compatibility.
+ * @param {DeploymentFilter} [filter] - Optional filter to apply to the deployment search.
+ * @returns {SingletonDeployment | undefined} - The found deployment or undefined if not found.
+ */
+exports.getFallbackHandlerDeployment = exports.getCompatibilityFallbackHandlerDeployment;
+// Leaving the comment here so it's not a part of the JSDoc
+// Previously, the function code was this:
+// // This is a sorted array (by preference)
+// const fallbackHandlerDeployments: SingletonDeploymentJSON[] = [
+//   CompatibilityFallbackHandler141,
+//   CompatibilityFallbackHandler130,
+//   DefaultCallbackHandler130,
+// ];
+// export const getFallbackHandlerDeployment = (filter?: DeploymentFilter): SingletonDeployment | undefined => {
+//   return findDeployment(filter, fallbackHandlerDeployments);
+// };
+// The problem with the function is that there’s no possible filter that would make the function return the last element of the array
+// (DefaultCallbackHandler130 ), since we only allow to filter by version, networks and released flag. The only possible way is to have
+// the default callback handler deployed to a network where the compatibility fallback handler isn’t deployed, but we require the whole
+// suite of the contracts be deployed to a network.
+// Since we didn't want to enforce a preferred fallback handler on the deployments package level,
+// we decided to alias it to getCompatibilityFallbackHandlerDeployment (previously returned value)

package/dist/libs.d.ts

@@ -1,5 +1,49 @@
-import { DeploymentFilter, SingletonDeployment } from './types';
+import { DeploymentFilter, SingletonDeployment, SingletonDeploymentV2 } from './types';
+/**
+ * Get the MultiSend deployment based on the provided filter.
+ * @param {DeploymentFilter} [filter] - The filter criteria for the deployment.
+ * @returns {SingletonDeployment | undefined} - The matched deployment or undefined if not found.
+ */
 export declare const getMultiSendDeployment: (filter?: DeploymentFilter) => SingletonDeployment | undefined;
+/**
+ * Get all MultiSend deployments based on the provided filter.
+ * @param {DeploymentFilter} [filter] - The filter criteria for the deployments.
+ * @returns {SingletonDeploymentV2 | undefined} - The matched deployments or undefined if not found.
+ */
+export declare const getMultiSendDeployments: (filter?: DeploymentFilter) => SingletonDeploymentV2 | undefined;
+/**
+ * Get the MultiSendCallOnly deployment based on the provided filter.
+ * @param {DeploymentFilter} [filter] - The filter criteria for the deployment.
+ * @returns {SingletonDeployment | undefined} - The matched deployment or undefined if not found.
+ */
 export declare const getMultiSendCallOnlyDeployment: (filter?: DeploymentFilter) => SingletonDeployment | undefined;
+/**
+ * Get all MultiSendCallOnly deployments based on the provided filter.
+ * @param {DeploymentFilter} [filter] - The filter criteria for the deployments.
+ * @returns {SingletonDeploymentV2 | undefined} - The matched deployments or undefined if not found.
+ */
+export declare const getMultiSendCallOnlyDeployments: (filter?: DeploymentFilter) => SingletonDeploymentV2 | undefined;
+/**
+ * Get the CreateCall deployment based on the provided filter.
+ * @param {DeploymentFilter} [filter] - The filter criteria for the deployment.
+ * @returns {SingletonDeployment | undefined} - The matched deployment or undefined if not found.
+ */
 export declare const getCreateCallDeployment: (filter?: DeploymentFilter) => SingletonDeployment | undefined;
+/**
+ * Get all CreateCall deployments based on the provided filter.
+ * @param {DeploymentFilter} [filter] - The filter criteria for the deployments.
+ * @returns {SingletonDeploymentV2 | undefined} - The matched deployments or undefined if not found.
+ */
+export declare const getCreateCallDeployments: (filter?: DeploymentFilter) => SingletonDeploymentV2 | undefined;
+/**
+ * Get the SignMessageLib deployment based on the provided filter.
+ * @param {DeploymentFilter} [filter] - The filter criteria for the deployment.
+ * @returns {SingletonDeployment | undefined} - The matched deployment or undefined if not found.
+ */
 export declare const getSignMessageLibDeployment: (filter?: DeploymentFilter) => SingletonDeployment | undefined;
+/**
+ * Get all SignMessageLib deployments based on the provided filter.
+ * @param {DeploymentFilter} [filter] - The filter criteria for the deployments.
+ * @returns {SingletonDeploymentV2 | undefined} - The matched deployments or undefined if not found.
+ */
+export declare const getSignMessageLibDeployments: (filter?: DeploymentFilter) => SingletonDeploymentV2 | undefined;

package/dist/libs.js

@@ -1,39 +1,77 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSignMessageLibDeployment = exports.getCreateCallDeployment = exports.getMultiSendCallOnlyDeployment = exports.getMultiSendDeployment = void 0;
-const create_call_json_1 = __importDefault(require("./assets/v1.3.0/create_call.json"));
-const create_call_json_2 = __importDefault(require("./assets/v1.4.1/create_call.json"));
-const multi_send_json_1 = __importDefault(require("./assets/v1.1.1/multi_send.json"));
-const multi_send_json_2 = __importDefault(require("./assets/v1.3.0/multi_send.json"));
-const multi_send_json_3 = __importDefault(require("./assets/v1.4.1/multi_send.json"));
-const multi_send_call_only_json_1 = __importDefault(require("./assets/v1.3.0/multi_send_call_only.json"));
-const multi_send_call_only_json_2 = __importDefault(require("./assets/v1.4.1/multi_send_call_only.json"));
-const sign_message_lib_json_1 = __importDefault(require("./assets/v1.3.0/sign_message_lib.json"));
-const sign_message_lib_json_2 = __importDefault(require("./assets/v1.4.1/sign_message_lib.json"));
+exports.getSignMessageLibDeployments = exports.getSignMessageLibDeployment = exports.getCreateCallDeployments = exports.getCreateCallDeployment = exports.getMultiSendCallOnlyDeployments = exports.getMultiSendCallOnlyDeployment = exports.getMultiSendDeployments = exports.getMultiSendDeployment = void 0;
+const deployments_1 = require("./deployments");
 const utils_1 = require("./utils");
-// This is a sorted array (by preference, currently we use 111 in most cases)
-const multiSendDeployments = [multi_send_json_3.default, multi_send_json_2.default, multi_send_json_1.default];
+/**
+ * Get the MultiSend deployment based on the provided filter.
+ * @param {DeploymentFilter} [filter] - The filter criteria for the deployment.
+ * @returns {SingletonDeployment | undefined} - The matched deployment or undefined if not found.
+ */
 const getMultiSendDeployment = (filter) => {
-    return (0, utils_1.findDeployment)(filter, multiSendDeployments);
+    return (0, utils_1.findDeployment)(filter, deployments_1._MULTI_SEND_DEPLOYMENTS);
 };
 exports.getMultiSendDeployment = getMultiSendDeployment;
-// This is a sorted array (by preference)
-const multiSendCallOnlyDeployments = [multi_send_call_only_json_2.default, multi_send_call_only_json_1.default];
+/**
+ * Get all MultiSend deployments based on the provided filter.
+ * @param {DeploymentFilter} [filter] - The filter criteria for the deployments.
+ * @returns {SingletonDeploymentV2 | undefined} - The matched deployments or undefined if not found.
+ */
+const getMultiSendDeployments = (filter) => {
+    return (0, utils_1.findDeployment)(filter, deployments_1._MULTI_SEND_DEPLOYMENTS, "multiple" /* DeploymentFormats.MULTIPLE */);
+};
+exports.getMultiSendDeployments = getMultiSendDeployments;
+/**
+ * Get the MultiSendCallOnly deployment based on the provided filter.
+ * @param {DeploymentFilter} [filter] - The filter criteria for the deployment.
+ * @returns {SingletonDeployment | undefined} - The matched deployment or undefined if not found.
+ */
 const getMultiSendCallOnlyDeployment = (filter) => {
-    return (0, utils_1.findDeployment)(filter, multiSendCallOnlyDeployments);
+    return (0, utils_1.findDeployment)(filter, deployments_1._MULTI_SEND_CALL_ONLY_DEPLOYMENTS);
 };
 exports.getMultiSendCallOnlyDeployment = getMultiSendCallOnlyDeployment;
-// This is a sorted array (by preference)
-const createCallDeployments = [create_call_json_2.default, create_call_json_1.default];
+/**
+ * Get all MultiSendCallOnly deployments based on the provided filter.
+ * @param {DeploymentFilter} [filter] - The filter criteria for the deployments.
+ * @returns {SingletonDeploymentV2 | undefined} - The matched deployments or undefined if not found.
+ */
+const getMultiSendCallOnlyDeployments = (filter) => {
+    return (0, utils_1.findDeployment)(filter, deployments_1._MULTI_SEND_CALL_ONLY_DEPLOYMENTS, "multiple" /* DeploymentFormats.MULTIPLE */);
+};
+exports.getMultiSendCallOnlyDeployments = getMultiSendCallOnlyDeployments;
+/**
+ * Get the CreateCall deployment based on the provided filter.
+ * @param {DeploymentFilter} [filter] - The filter criteria for the deployment.
+ * @returns {SingletonDeployment | undefined} - The matched deployment or undefined if not found.
+ */
 const getCreateCallDeployment = (filter) => {
-    return (0, utils_1.findDeployment)(filter, createCallDeployments);
+    return (0, utils_1.findDeployment)(filter, deployments_1._CREATE_CALL_DEPLOYMENTS);
 };
 exports.getCreateCallDeployment = getCreateCallDeployment;
-const signMessageLibDeployments = [sign_message_lib_json_2.default, sign_message_lib_json_1.default];
+/**
+ * Get all CreateCall deployments based on the provided filter.
+ * @param {DeploymentFilter} [filter] - The filter criteria for the deployments.
+ * @returns {SingletonDeploymentV2 | undefined} - The matched deployments or undefined if not found.
+ */
+const getCreateCallDeployments = (filter) => {
+    return (0, utils_1.findDeployment)(filter, deployments_1._CREATE_CALL_DEPLOYMENTS, "multiple" /* DeploymentFormats.MULTIPLE */);
+};
+exports.getCreateCallDeployments = getCreateCallDeployments;
+/**
+ * Get the SignMessageLib deployment based on the provided filter.
+ * @param {DeploymentFilter} [filter] - The filter criteria for the deployment.
+ * @returns {SingletonDeployment | undefined} - The matched deployment or undefined if not found.
+ */
 const getSignMessageLibDeployment = (filter) => {
-    return (0, utils_1.findDeployment)(filter, signMessageLibDeployments);
+    return (0, utils_1.findDeployment)(filter, deployments_1._SIGN_MESSAGE_LIB_DEPLOYMENTS);
 };
 exports.getSignMessageLibDeployment = getSignMessageLibDeployment;
+/**
+ * Get all SignMessageLib deployments based on the provided filter.
+ * @param {DeploymentFilter} [filter] - The filter criteria for the deployments.
+ * @returns {SingletonDeploymentV2 | undefined} - The matched deployments or undefined if not found.
+ */
+const getSignMessageLibDeployments = (filter) => {
+    return (0, utils_1.findDeployment)(filter, deployments_1._SIGN_MESSAGE_LIB_DEPLOYMENTS, "multiple" /* DeploymentFormats.MULTIPLE */);
+};
+exports.getSignMessageLibDeployments = getSignMessageLibDeployments;

package/dist/safes.d.ts

@@ -1,5 +1,25 @@
-import { DeploymentFilter, SingletonDeployment, SingletonDeploymentJSON } from './types';
-export declare const _safeDeployments: SingletonDeploymentJSON[];
+import { DeploymentFilter, SingletonDeployment, SingletonDeploymentV2 } from './types';
+/**
+ * Finds the latest safe singleton deployment that matches the given filter.
+ * @param {DeploymentFilter} [filter] - The filter to apply when searching for the deployment.
+ * @returns {SingletonDeployment | undefined} - The found deployment or undefined if no deployment matches the filter.
+ */
 export declare const getSafeSingletonDeployment: (filter?: DeploymentFilter) => SingletonDeployment | undefined;
-export declare const _safeL2Deployments: SingletonDeploymentJSON[];
+/**
+ * Finds all safe singleton deployments that match the given filter.
+ * @param {DeploymentFilter} [filter] - The filter to apply when searching for the deployments.
+ * @returns {SingletonDeploymentV2 | undefined} - The found deployments or undefined if no deployments match the filter.
+ */
+export declare const getSafeSingletonDeployments: (filter?: DeploymentFilter) => SingletonDeploymentV2 | undefined;
+/**
+ * Finds the latest safe L2 singleton deployment that matches the given filter.
+ * @param {DeploymentFilter} [filter] - The filter to apply when searching for the deployment.
+ * @returns {SingletonDeployment | undefined} - The found deployment or undefined if no deployment matches the filter.
+ */
 export declare const getSafeL2SingletonDeployment: (filter?: DeploymentFilter) => SingletonDeployment | undefined;
+/**
+ * Finds all safe L2 singleton deployments that match the given filter.
+ * @param {DeploymentFilter} [filter] - The filter to apply when searching for the deployments.
+ * @returns {SingletonDeploymentV2 | undefined} - The found deployments or undefined if no deployments match the filter.
+ */
+export declare const getSafeL2SingletonDeployments: (filter?: DeploymentFilter) => SingletonDeploymentV2 | undefined;

package/dist/safes.js

@@ -1,32 +1,41 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSafeL2SingletonDeployment = exports._safeL2Deployments = exports.getSafeSingletonDeployment = exports._safeDeployments = void 0;
-const safe_l2_json_1 = __importDefault(require("./assets/v1.4.1/safe_l2.json"));
-const safe_json_1 = __importDefault(require("./assets/v1.4.1/safe.json"));
-const gnosis_safe_l2_json_1 = __importDefault(require("./assets/v1.3.0/gnosis_safe_l2.json"));
-const gnosis_safe_json_1 = __importDefault(require("./assets/v1.3.0/gnosis_safe.json"));
-const gnosis_safe_json_2 = __importDefault(require("./assets/v1.2.0/gnosis_safe.json"));
-const gnosis_safe_json_3 = __importDefault(require("./assets/v1.1.1/gnosis_safe.json"));
-const gnosis_safe_json_4 = __importDefault(require("./assets/v1.0.0/gnosis_safe.json"));
+exports.getSafeL2SingletonDeployments = exports.getSafeL2SingletonDeployment = exports.getSafeSingletonDeployments = exports.getSafeSingletonDeployment = void 0;
+const deployments_1 = require("./deployments");
 const utils_1 = require("./utils");
-// This is a sorted array (newest to oldest), exported for tests
-exports._safeDeployments = [
-    safe_json_1.default,
-    gnosis_safe_json_1.default,
-    gnosis_safe_json_2.default,
-    gnosis_safe_json_3.default,
-    gnosis_safe_json_4.default,
-];
+/**
+ * Finds the latest safe singleton deployment that matches the given filter.
+ * @param {DeploymentFilter} [filter] - The filter to apply when searching for the deployment.
+ * @returns {SingletonDeployment | undefined} - The found deployment or undefined if no deployment matches the filter.
+ */
 const getSafeSingletonDeployment = (filter) => {
-    return (0, utils_1.findDeployment)(filter, exports._safeDeployments);
+    return (0, utils_1.findDeployment)(filter, deployments_1._SAFE_DEPLOYMENTS);
 };
 exports.getSafeSingletonDeployment = getSafeSingletonDeployment;
-// This is a sorted array (newest to oldest), exported for tests
-exports._safeL2Deployments = [safe_l2_json_1.default, gnosis_safe_l2_json_1.default];
+/**
+ * Finds all safe singleton deployments that match the given filter.
+ * @param {DeploymentFilter} [filter] - The filter to apply when searching for the deployments.
+ * @returns {SingletonDeploymentV2 | undefined} - The found deployments or undefined if no deployments match the filter.
+ */
+const getSafeSingletonDeployments = (filter) => {
+    return (0, utils_1.findDeployment)(filter, deployments_1._SAFE_DEPLOYMENTS, "multiple" /* DeploymentFormats.MULTIPLE */);
+};
+exports.getSafeSingletonDeployments = getSafeSingletonDeployments;
+/**
+ * Finds the latest safe L2 singleton deployment that matches the given filter.
+ * @param {DeploymentFilter} [filter] - The filter to apply when searching for the deployment.
+ * @returns {SingletonDeployment | undefined} - The found deployment or undefined if no deployment matches the filter.
+ */
 const getSafeL2SingletonDeployment = (filter) => {
-    return (0, utils_1.findDeployment)(filter, exports._safeL2Deployments);
+    return (0, utils_1.findDeployment)(filter, deployments_1._SAFE_L2_DEPLOYMENTS);
 };
 exports.getSafeL2SingletonDeployment = getSafeL2SingletonDeployment;
+/**
+ * Finds all safe L2 singleton deployments that match the given filter.
+ * @param {DeploymentFilter} [filter] - The filter to apply when searching for the deployments.
+ * @returns {SingletonDeploymentV2 | undefined} - The found deployments or undefined if no deployments match the filter.
+ */
+const getSafeL2SingletonDeployments = (filter) => {
+    return (0, utils_1.findDeployment)(filter, deployments_1._SAFE_L2_DEPLOYMENTS, "multiple" /* DeploymentFormats.MULTIPLE */);
+};
+exports.getSafeL2SingletonDeployments = getSafeL2SingletonDeployments;

package/dist/types.d.ts

@@ -1,15 +1,20 @@
-declare enum AddressType {
-    CANONICAL = "canonical",
-    EIP155 = "eip155",
-    ZKSYNC = "zksync"
+export type AddressType = 'canonical' | 'eip155' | 'zksync';
+export declare const enum DeploymentFormats {
+    SINGLETON = "singleton",
+    MULTIPLE = "multiple"
 }
+type AtLeastOne<T, U = {
+    [K in keyof T]: Pick<T, K>;
+}> = Partial<T> & U[keyof U];
 export interface SingletonDeploymentJSON {
     released: boolean;
     contractName: string;
     version: string;
-    codeHash: string;
-    networkAddresses: Record<string, string | string[]>;
-    addresses: Record<string, string>;
+    deployments: AtLeastOne<Record<AddressType, {
+        address: string;
+        codeHash: string;
+    }>>;
+    networkAddresses: Record<string, AddressType | AddressType[]>;
     abi: any[];
 }
 export interface SingletonDeployment {
@@ -17,8 +22,10 @@ export interface SingletonDeployment {
     released: boolean;
     contractName: string;
     version: string;
-    codeHash: string;
-    addresses: Record<string, string>;
+    deployments: AtLeastOne<Record<AddressType, {
+        address: string;
+        codeHash: string;
+    }>>;
     networkAddresses: Record<string, string>;
     abi: any[];
 }
@@ -26,10 +33,12 @@ export interface SingletonDeploymentV2 {
     released: boolean;
     contractName: string;
     version: string;
-    codeHash: string;
+    deployments: AtLeastOne<Record<AddressType, {
+        address: string;
+        codeHash: string;
+    }>>;
     abi: any[];
-    networkAddresses: Record<string, AddressType | AddressType[]>;
-    addresses: Partial<Record<AddressType, string>>;
+    networkAddresses: Record<string, string | string[]>;
 }
 export interface DeploymentFilter {
     version?: string;

package/dist/types.js

@@ -1,13 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var AddressType;
-(function (AddressType) {
-    // The original address the contract was deployed on.
-    // Starting with 1.4.1, the contracts are deployed with an EIP155-compatible transaction.
-    AddressType["CANONICAL"] = "canonical";
-    // An address that was deployed with a transaction compatible with the EIP155 standard.
-    // The type is only used for 1.3.0 deployments.
-    AddressType["EIP155"] = "eip155";
-    // An address that is deployed to the ZkSync VM networks.
-    AddressType["ZKSYNC"] = "zksync";
-})(AddressType || (AddressType = {}));

package/dist/utils.d.ts

@@ -1,9 +1,12 @@
-import { DeploymentFilter, SingletonDeployment, SingletonDeploymentJSON } from './types';
+import { DeploymentFilter, SingletonDeployment, SingletonDeploymentJSON, DeploymentFormats, SingletonDeploymentV2 } from './types';
 /**
  * Finds a deployment that matches the given criteria.
+ * This function is implemented as a regular function to allow for overloading: https://github.com/microsoft/TypeScript/issues/33482
  *
  * @param {DeploymentFilter} [criteria=DEFAULT_FILTER] - The filter criteria to match deployments.
  * @param {SingletonDeploymentJSON[]} deployments - The list of deployment JSON objects to search.
  * @returns {SingletonDeployment | undefined} - The found deployment object or undefined if no match is found.
  */
-export declare const findDeployment: (criteria: DeploymentFilter | undefined, deployments: SingletonDeploymentJSON[]) => SingletonDeployment | undefined;
+declare function findDeployment(criteria: DeploymentFilter | undefined, deployments: SingletonDeploymentJSON[], format?: DeploymentFormats.SINGLETON): SingletonDeployment | undefined;
+declare function findDeployment(criteria: DeploymentFilter | undefined, deployments: SingletonDeploymentJSON[], format: DeploymentFormats.MULTIPLE): SingletonDeploymentV2 | undefined;
+export { findDeployment };

package/dist/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findDeployment = void 0;
+exports.findDeployment = findDeployment;
 const satisfies_1 = __importDefault(require("semver/functions/satisfies"));
 const DEFAULT_FILTER = { released: true };
 // The older JSON format had a `defaultAddress` field, which became obsolete due to EIP-155 enforcement and non-EVM compatible chains.
@@ -20,21 +20,38 @@ const mapJsonToDeploymentsFormatV1 = (deployment) => {
     const defaultAddressType = Array.isArray(deployment.networkAddresses[DEFAULT_NETWORK_CHAIN_ID])
         ? deployment.networkAddresses[DEFAULT_NETWORK_CHAIN_ID][0]
         : deployment.networkAddresses[DEFAULT_NETWORK_CHAIN_ID];
-    const defaultAddress = deployment.addresses[defaultAddressType];
+    // The usage of non-null assertion below is safe, because we validate that the asset files are properly formed in tests
+    const defaultAddress = deployment.deployments[defaultAddressType].address;
     const networkAddresses = Object.fromEntries(Object.entries(deployment.networkAddresses).map(([chainId, addressTypes]) => [
         chainId,
-        Array.isArray(addressTypes) ? deployment.addresses[addressTypes[0]] : deployment.addresses[addressTypes],
+        Array.isArray(addressTypes)
+            ? deployment.deployments[addressTypes[0]].address
+            : deployment.deployments[addressTypes].address,
     ]));
     return Object.assign(Object.assign({}, deployment), { defaultAddress, networkAddresses });
 };
 /**
- * Finds a deployment that matches the given criteria.
+ * Maps a SingletonDeploymentJSON object to a SingletonDeploymentV2 object.
+ *
+ * This function transforms the `networkAddresses` field of the deployment JSON object.
+ * It converts each entry in `networkAddresses` to an array of addresses, using the `addresses` field
+ * to resolve each address type.
  *
- * @param {DeploymentFilter} [criteria=DEFAULT_FILTER] - The filter criteria to match deployments.
- * @param {SingletonDeploymentJSON[]} deployments - The list of deployment JSON objects to search.
- * @returns {SingletonDeployment | undefined} - The found deployment object or undefined if no match is found.
+ * @param {SingletonDeploymentJSON} deployment - The deployment JSON object to map.
+ * @returns {SingletonDeploymentV2} - The mapped deployment object in V2 format.
  */
-const findDeployment = (criteria = DEFAULT_FILTER, deployments) => {
+const mapJsonToDeploymentsFormatV2 = (deployment) => {
+    const newJson = Object.assign({}, deployment);
+    newJson.networkAddresses = Object.fromEntries(Object.entries(deployment.networkAddresses).map(([chainId, addressTypes]) => [
+        chainId,
+        (Array.isArray(addressTypes)
+            ? // The usage of non-null assertion below is safe, because we validate that the asset files are properly formed in tests
+                addressTypes.map((addressType) => deployment.deployments[addressType].address)
+            : deployment.deployments[addressTypes].address),
+    ]));
+    return newJson;
+};
+function findDeployment(criteria = DEFAULT_FILTER, deployments, format = "singleton" /* DeploymentFormats.SINGLETON */) {
     const { version, released, network } = Object.assign(Object.assign({}, DEFAULT_FILTER), criteria);
     const deploymentJson = deployments.find((deployment) => {
         if (version && !(0, satisfies_1.default)(deployment.version, version))
@@ -45,6 +62,12 @@ const findDeployment = (criteria = DEFAULT_FILTER, deployments) => {
             return false;
         return true;
     });
-    return deploymentJson ? mapJsonToDeploymentsFormatV1(deploymentJson) : undefined;
-};
-exports.findDeployment = findDeployment;
+    if (!deploymentJson)
+        return undefined;
+    if (format === "multiple" /* DeploymentFormats.MULTIPLE */) {
+        return mapJsonToDeploymentsFormatV2(deploymentJson);
+    }
+    else {
+        return mapJsonToDeploymentsFormatV1(deploymentJson);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@safe-global/safe-deployments",
-  "version": "1.37.1",
+  "version": "1.37.2",
   "description": "Collection of Safe singleton deployments",
   "homepage": "https://github.com/safe-global/safe-deployments/",
   "license": "MIT",
@@ -8,18 +8,17 @@
   "typings": "dist/index.d.ts",
   "files": [
     "dist",
-    "src",
-    "test",
-    "build"
+    "src"
   ],
   "scripts": {
     "build": "rimraf dist && tsc",
     "lint": "npm run lint:ts && npm run lint:json",
-    "lint:ts": "eslint --max-warnings 0 src/",
+    "lint:ts": "eslint --max-warnings 0 src/ scripts/",
     "lint:json": "prettier -c src/assets/*/*.json",
     "lint:fix": "npm run lint:fix:ts && npm run lint:fix:json",
     "lint:fix:ts": "npm run lint:ts -- --fix",
     "lint:fix:json": "prettier -w src/assets/*/*.json",
+    "verify": "ts-node scripts/verify.ts",
     "prepack": "npm run build",
     "test": "jest"
   },
@@ -44,9 +43,11 @@
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
+    "ethers": "^6.13.1",
     "jest": "^29.7.0",
     "prettier": "^3.3.2",
     "ts-jest": "^29.1.5",
+    "ts-node": "^10.9.2",
     "typescript": "^5.5.2",
     "typescript-eslint": "^7.14.1"
   },

package/src/__tests__/assets/v1/v1.0.0/gnosis_safe.json

@@ -3,9 +3,11 @@
   "released": true,
   "contractName": "GnosisSafe",
   "version": "1.0.0",
-  "codeHash": "0xe1f1593df76e69abc2d692792c80f329457551d5e83dde597546a1d58764da80",
-  "addresses": {
-    "canonical": "0xb6029EA3B2c51D09a50B53CA8012FeEB05bDa35A"
+  "deployments": {
+    "canonical": {
+      "address": "0xb6029EA3B2c51D09a50B53CA8012FeEB05bDa35A",
+      "codeHash": "0xe1f1593df76e69abc2d692792c80f329457551d5e83dde597546a1d58764da80"
+    }
   },
   "networkAddresses": {
     "1": "0xb6029EA3B2c51D09a50B53CA8012FeEB05bDa35A",

package/src/__tests__/assets/v1/v1.0.0/proxy_factory.json

@@ -3,9 +3,11 @@
   "released": true,
   "contractName": "ProxyFactory",
   "version": "1.0.0",
-  "codeHash": "0x84a375ad96ab395850d46cd601ed6354d3cf3fb67cec0caf18f34af5c9d1a7f0",
-  "addresses": {
-    "canonical": "0x12302fE9c02ff50939BaAaaf415fc226C078613C"
+  "deployments": {
+    "canonical": {
+      "address": "0x12302fE9c02ff50939BaAaaf415fc226C078613C",
+      "codeHash": "0x84a375ad96ab395850d46cd601ed6354d3cf3fb67cec0caf18f34af5c9d1a7f0"
+    }
   },
   "networkAddresses": {
     "1": "0x12302fE9c02ff50939BaAaaf415fc226C078613C",

package/src/__tests__/assets/v1/v1.1.1/create_and_add_modules.json

@@ -3,9 +3,11 @@
   "released": true,
   "contractName": "CreateAndAddModules",
   "version": "1.1.1",
-  "codeHash": "0x83941bb48a3e3302a6e502e61513981ad02f3870f2d15e6d9cd301d616a0ba38",
-  "addresses": {
-    "canonical": "0xF61A721642B0c0C8b334bA3763BA1326F53798C0"
+  "deployments": {
+    "canonical": {
+      "address": "0xF61A721642B0c0C8b334bA3763BA1326F53798C0",
+      "codeHash": "0x83941bb48a3e3302a6e502e61513981ad02f3870f2d15e6d9cd301d616a0ba38"
+    }
   },
   "networkAddresses": {
     "1": "0xF61A721642B0c0C8b334bA3763BA1326F53798C0",

package/src/__tests__/assets/v1/v1.1.1/create_call.json

@@ -3,9 +3,11 @@
   "released": true,
   "contractName": "CreateCall",
   "version": "1.1.1",
-  "codeHash": "0x9de5afc9afd2bc0e329d9b4fa34955da45bb8e11587c645c5ff5287d7507adeb",
-  "addresses": {
-    "canonical": "0x8538FcBccba7f5303d2C679Fa5d7A629A8c9bf4A"
+  "deployments": {
+    "canonical": {
+      "address": "0x8538FcBccba7f5303d2C679Fa5d7A629A8c9bf4A",
+      "codeHash": "0x9de5afc9afd2bc0e329d9b4fa34955da45bb8e11587c645c5ff5287d7507adeb"
+    }
   },
   "networkAddresses": {
     "1": "0x8538FcBccba7f5303d2C679Fa5d7A629A8c9bf4A",

package/src/__tests__/assets/v1/v1.1.1/default_callback_handler.json

@@ -3,9 +3,11 @@
   "released": true,
   "contractName": "DefaultCallbackHandler",
   "version": "1.1.1",
-  "codeHash": "0x919a9f5dd111a01f7a8e4b1f5c6a972bb2d1441c67bdec71de6a09d0be92f5b9",
-  "addresses": {
-    "canonical": "0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44"
+  "deployments": {
+    "canonical": {
+      "address": "0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44",
+      "codeHash": "0x919a9f5dd111a01f7a8e4b1f5c6a972bb2d1441c67bdec71de6a09d0be92f5b9"
+    }
   },
   "networkAddresses": {
     "1": "0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44",