@safe-global/protocol-kit 4.1.0 → 5.0.0

package/dist/src/contracts/safeDeploymentContracts.js

@@ -1,40 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSafeWebAuthnSharedSignerContract = exports.getSafeWebAuthnSignerFactoryContract = exports.getSimulateTxAccessorContract = exports.getCreateCallContract = exports.getSignMessageLibContract = exports.getMultiSendCallOnlyContract = exports.getMultiSendContract = exports.getCompatibilityFallbackHandlerContract = exports.getProxyFactoryContract = exports.getSafeContract = void 0;
-async function getSafeContract({ safeProvider, safeVersion, customSafeAddress, isL1SafeSingleton, customContracts }) {
-    const safeContract = await safeProvider.getSafeContract({
-        safeVersion,
-        customContractAddress: customSafeAddress ?? customContracts?.safeSingletonAddress,
-        customContractAbi: customContracts?.safeSingletonAbi,
-        isL1SafeSingleton
-    });
-    const isContractDeployed = await safeProvider.isContractDeployed(await safeContract.getAddress());
+exports.getSafeWebAuthnSharedSignerContract = exports.getSafeWebAuthnSignerFactoryContract = exports.getSimulateTxAccessorContract = exports.getCreateCallContract = exports.getSignMessageLibContract = exports.getMultiSendCallOnlyContract = exports.getMultiSendContract = exports.getCompatibilityFallbackHandlerContract = exports.getSafeProxyFactoryContract = exports.getSafeContract = void 0;
+const contractInstances_1 = require("../contracts/contractInstances");
+async function getSafeContract({ safeProvider, safeVersion, customSafeAddress, isL1SafeSingleton, customContracts, deploymentType }) {
+    const safeContract = await (0, contractInstances_1.getSafeContractInstance)(safeVersion, safeProvider, customSafeAddress ?? customContracts?.safeSingletonAddress, customContracts?.safeSingletonAbi, isL1SafeSingleton, deploymentType);
+    const isContractDeployed = await safeProvider.isContractDeployed(safeContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('SafeProxy contract is not deployed on the current network');
     }
     return safeContract;
 }
 exports.getSafeContract = getSafeContract;
-async function getProxyFactoryContract({ safeProvider, safeVersion, customContracts }) {
-    const safeProxyFactoryContract = await safeProvider.getSafeProxyFactoryContract({
-        safeVersion,
-        customContractAddress: customContracts?.safeProxyFactoryAddress,
-        customContractAbi: customContracts?.safeProxyFactoryAbi
-    });
-    const isContractDeployed = await safeProvider.isContractDeployed(await safeProxyFactoryContract.getAddress());
+async function getSafeProxyFactoryContract({ safeProvider, safeVersion, customContracts, deploymentType }) {
+    const safeProxyFactoryContract = await (0, contractInstances_1.getSafeProxyFactoryContractInstance)(safeVersion, safeProvider, customContracts?.safeProxyFactoryAddress, customContracts?.safeProxyFactoryAbi, deploymentType);
+    const isContractDeployed = await safeProvider.isContractDeployed(safeProxyFactoryContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('SafeProxyFactory contract is not deployed on the current network');
     }
     return safeProxyFactoryContract;
 }
-exports.getProxyFactoryContract = getProxyFactoryContract;
-async function getCompatibilityFallbackHandlerContract({ safeProvider, safeVersion, customContracts }) {
-    const fallbackHandlerContract = await safeProvider.getCompatibilityFallbackHandlerContract({
-        safeVersion,
-        customContractAddress: customContracts?.fallbackHandlerAddress,
-        customContractAbi: customContracts?.fallbackHandlerAbi
-    });
-    const isContractDeployed = await safeProvider.isContractDeployed(await fallbackHandlerContract.getAddress());
+exports.getSafeProxyFactoryContract = getSafeProxyFactoryContract;
+async function getCompatibilityFallbackHandlerContract({ safeProvider, safeVersion, customContracts, deploymentType }) {
+    const fallbackHandlerContract = await (0, contractInstances_1.getCompatibilityFallbackHandlerContractInstance)(safeVersion, safeProvider, customContracts?.fallbackHandlerAddress, customContracts?.fallbackHandlerAbi, deploymentType);
+    const isContractDeployed = await safeProvider.isContractDeployed(fallbackHandlerContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('CompatibilityFallbackHandler contract is not deployed on the current network');
     }
@@ -42,12 +30,8 @@ async function getCompatibilityFallbackHandlerContract({ safeProvider, safeVersi
 }
 exports.getCompatibilityFallbackHandlerContract = getCompatibilityFallbackHandlerContract;
 async function getMultiSendContract({ safeProvider, safeVersion, customContracts }) {
-    const multiSendContract = await safeProvider.getMultiSendContract({
-        safeVersion,
-        customContractAddress: customContracts?.multiSendAddress,
-        customContractAbi: customContracts?.multiSendAbi
-    });
-    const isContractDeployed = await safeProvider.isContractDeployed(await multiSendContract.getAddress());
+    const multiSendContract = await (0, contractInstances_1.getMultiSendContractInstance)(safeVersion, safeProvider, customContracts?.multiSendAddress, customContracts?.multiSendAbi);
+    const isContractDeployed = await safeProvider.isContractDeployed(multiSendContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('MultiSend contract is not deployed on the current network');
     }
@@ -55,12 +39,8 @@ async function getMultiSendContract({ safeProvider, safeVersion, customContracts
 }
 exports.getMultiSendContract = getMultiSendContract;
 async function getMultiSendCallOnlyContract({ safeProvider, safeVersion, customContracts }) {
-    const multiSendCallOnlyContract = await safeProvider.getMultiSendCallOnlyContract({
-        safeVersion,
-        customContractAddress: customContracts?.multiSendCallOnlyAddress,
-        customContractAbi: customContracts?.multiSendCallOnlyAbi
-    });
-    const isContractDeployed = await safeProvider.isContractDeployed(await multiSendCallOnlyContract.getAddress());
+    const multiSendCallOnlyContract = await (0, contractInstances_1.getMultiSendCallOnlyContractInstance)(safeVersion, safeProvider, customContracts?.multiSendCallOnlyAddress, customContracts?.multiSendCallOnlyAbi);
+    const isContractDeployed = await safeProvider.isContractDeployed(multiSendCallOnlyContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('MultiSendCallOnly contract is not deployed on the current network');
     }
@@ -68,12 +48,8 @@ async function getMultiSendCallOnlyContract({ safeProvider, safeVersion, customC
 }
 exports.getMultiSendCallOnlyContract = getMultiSendCallOnlyContract;
 async function getSignMessageLibContract({ safeProvider, safeVersion, customContracts }) {
-    const signMessageLibContract = await safeProvider.getSignMessageLibContract({
-        safeVersion,
-        customContractAddress: customContracts?.signMessageLibAddress,
-        customContractAbi: customContracts?.signMessageLibAbi
-    });
-    const isContractDeployed = await safeProvider.isContractDeployed(await signMessageLibContract.getAddress());
+    const signMessageLibContract = await (0, contractInstances_1.getSignMessageLibContractInstance)(safeVersion, safeProvider, customContracts?.signMessageLibAddress, customContracts?.signMessageLibAbi);
+    const isContractDeployed = await safeProvider.isContractDeployed(signMessageLibContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('SignMessageLib contract is not deployed on the current network');
     }
@@ -81,12 +57,8 @@ async function getSignMessageLibContract({ safeProvider, safeVersion, customCont
 }
 exports.getSignMessageLibContract = getSignMessageLibContract;
 async function getCreateCallContract({ safeProvider, safeVersion, customContracts }) {
-    const createCallContract = await safeProvider.getCreateCallContract({
-        safeVersion,
-        customContractAddress: customContracts?.createCallAddress,
-        customContractAbi: customContracts?.createCallAbi
-    });
-    const isContractDeployed = await safeProvider.isContractDeployed(await createCallContract.getAddress());
+    const createCallContract = await (0, contractInstances_1.getCreateCallContractInstance)(safeVersion, safeProvider, customContracts?.createCallAddress, customContracts?.createCallAbi);
+    const isContractDeployed = await safeProvider.isContractDeployed(createCallContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('CreateCall contract is not deployed on the current network');
     }
@@ -94,12 +66,8 @@ async function getCreateCallContract({ safeProvider, safeVersion, customContract
 }
 exports.getCreateCallContract = getCreateCallContract;
 async function getSimulateTxAccessorContract({ safeProvider, safeVersion, customContracts }) {
-    const simulateTxAccessorContract = await safeProvider.getSimulateTxAccessorContract({
-        safeVersion,
-        customContractAddress: customContracts?.simulateTxAccessorAddress,
-        customContractAbi: customContracts?.simulateTxAccessorAbi
-    });
-    const isContractDeployed = await safeProvider.isContractDeployed(await simulateTxAccessorContract.getAddress());
+    const simulateTxAccessorContract = await (0, contractInstances_1.getSimulateTxAccessorContractInstance)(safeVersion, safeProvider, customContracts?.simulateTxAccessorAddress, customContracts?.simulateTxAccessorAbi);
+    const isContractDeployed = await safeProvider.isContractDeployed(simulateTxAccessorContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('SimulateTxAccessor contract is not deployed on the current network');
     }
@@ -107,12 +75,8 @@ async function getSimulateTxAccessorContract({ safeProvider, safeVersion, custom
 }
 exports.getSimulateTxAccessorContract = getSimulateTxAccessorContract;
 async function getSafeWebAuthnSignerFactoryContract({ safeProvider, safeVersion, customContracts }) {
-    const safeWebAuthnSignerFactoryContract = await safeProvider.getSafeWebAuthnSignerFactoryContract({
-        safeVersion,
-        customContractAddress: customContracts?.safeWebAuthnSignerFactoryAddress,
-        customContractAbi: customContracts?.safeWebAuthnSignerFactoryAbi
-    });
-    const isContractDeployed = await safeProvider.isContractDeployed(await safeWebAuthnSignerFactoryContract.getAddress());
+    const safeWebAuthnSignerFactoryContract = await (0, contractInstances_1.getSafeWebAuthnSignerFactoryContractInstance)(safeVersion, safeProvider, customContracts?.safeWebAuthnSignerFactoryAddress, customContracts?.safeWebAuthnSignerFactoryAbi);
+    const isContractDeployed = await safeProvider.isContractDeployed(safeWebAuthnSignerFactoryContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('safeWebAuthnSignerFactory contract is not deployed on the current network');
     }
@@ -120,12 +84,8 @@ async function getSafeWebAuthnSignerFactoryContract({ safeProvider, safeVersion,
 }
 exports.getSafeWebAuthnSignerFactoryContract = getSafeWebAuthnSignerFactoryContract;
 async function getSafeWebAuthnSharedSignerContract({ safeProvider, safeVersion, customContracts }) {
-    const safeWebAuthnSharedSignerContract = await safeProvider.getSafeWebAuthnSharedSignerContract({
-        safeVersion,
-        customContractAddress: customContracts?.safeWebAuthnSharedSignerAddress,
-        customContractAbi: customContracts?.safeWebAuthnSharedSignerAbi
-    });
-    const isContractDeployed = await safeProvider.isContractDeployed(await safeWebAuthnSharedSignerContract.getAddress());
+    const safeWebAuthnSharedSignerContract = await (0, contractInstances_1.getSafeWebAuthnSharedSignerContractInstance)(safeVersion, safeProvider, customContracts?.safeWebAuthnSharedSignerAddress, customContracts?.safeWebAuthnSharedSignerAbi);
+    const isContractDeployed = await safeProvider.isContractDeployed(safeWebAuthnSharedSignerContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('safeWebAuthnSharedSigner contract is not deployed on the current network');
     }

package/dist/src/contracts/safeDeploymentContracts.js.map

@@ -1 +1 @@
-{"version":3,"file":"safeDeploymentContracts.js","sourceRoot":"","sources":["../../../src/contracts/safeDeploymentContracts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"safeDeploymentContracts.js","sourceRoot":"","sources":["../../../src/contracts/safeDeploymentContracts.ts"],"names":[],"mappings":"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"}

package/dist/src/contracts/utils.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="node" />
-import { ContractTransactionResponse, Provider, AbstractSigner } from 'ethers';
-import { SafeProxyFactoryContractType, SafeVersion, TransactionOptions, TransactionResult } from '@safe-global/safe-core-sdk-types';
-import { ContractNetworkConfig, SafeAccountConfig, SafeContractImplementationType, SafeDeploymentConfig } from '../types';
+import { Hash, Hex, Client, WalletClient, FormattedTransactionReceipt } from 'viem';
+import { DeploymentType } from '../types';
+import { SafeProxyFactoryContractType, SafeVersion, TransactionOptions, TransactionResult } from '@safe-global/types-kit';
+import { ContractNetworkConfig, ExternalClient, SafeAccountConfig, SafeContractImplementationType, SafeDeploymentConfig } from '../types';
 import SafeProvider from '../SafeProvider';
 export declare const PREDETERMINED_SALT_NONCE = "0xb1073742015cbcf5a3a4d9d1ae33ecf619439710b89475f92e2abd2117e90f90";
 export interface PredictSafeAddressProps {
@@ -18,9 +18,20 @@ export interface encodeSetupCallDataProps {
     safeContract: SafeContractImplementationType;
     customContracts?: ContractNetworkConfig;
     customSafeVersion?: SafeVersion;
+    deploymentType?: DeploymentType;
 }
 export declare function encodeCreateProxyWithNonce(safeProxyFactoryContract: SafeProxyFactoryContractType, safeSingletonAddress: string, initializer: string, salt?: string): string;
-export declare function encodeSetupCallData({ safeProvider, safeAccountConfig, safeContract, customContracts, customSafeVersion }: encodeSetupCallDataProps): Promise<string>;
+export declare function encodeSetupCallData({ safeProvider, safeAccountConfig, safeContract, customContracts, customSafeVersion, deploymentType }: encodeSetupCallDataProps): Promise<string>;
+/**
+ * Retrieves the version of the Safe contract associated with the given Safe address from the blockchain.
+ *
+ * @param {SafeProvider} safeProvider The provider to use when reading the contract.
+ * @param {string} safeAddress The address of the Safe contract for which to retrieve the version.
+ *
+ * @returns {Promise<SafeVersion>} A promise resolving to the version of the Safe contract.
+ * @throws when fetching an address which doesn't have a Safe deployed in it.
+ */
+export declare function getSafeContractVersion(safeProvider: SafeProvider, safeAddress: string): Promise<SafeVersion>;
 /**
  * Provides a chain-specific default salt nonce for generating unique addresses
  * for the same Safe configuration across different chains.
@@ -33,23 +44,34 @@ export declare function getPredictedSafeAddressInitCode({ safeProvider, chainId,
 export declare function predictSafeAddress({ safeProvider, chainId, safeAccountConfig, safeDeploymentConfig, isL1SafeSingleton, customContracts }: PredictSafeAddressProps): Promise<string>;
 export declare const validateSafeAccountConfig: ({ owners, threshold }: SafeAccountConfig) => void;
 export declare const validateSafeDeploymentConfig: ({ saltNonce }: SafeDeploymentConfig) => void;
+/**
+ * Returns the address of a SafeProxy Address from the transaction receipt.
+ *
+ * This function looks for a ProxyCreation event in the transaction receipt logs to get address of the deployed SafeProxy.
+ *
+ * @param {FormattedTransactionReceipt} txReceipt - The transaction receipt containing logs.
+ * @param {safeVersion} safeVersion - The Safe Version.
+ * @returns {string} - The address of the deployed SafeProxy.
+ * @throws {Error} - Throws an error if the SafeProxy was not deployed correctly.
+ */
+export declare function getSafeAddressFromDeploymentTx(txReceipt: FormattedTransactionReceipt, safeVersion: SafeVersion): string;
 /**
  * Generates a zkSync Era address. zkSync Era uses a distinct address derivation method compared to Ethereum
- * see: https://era.zksync.io/docs/reference/architecture/differences-with-ethereum.html#address-derivation
+ * see: https://docs.zksync.io/build/developer-reference/ethereum-differences/evm-instructions/#address-derivation
  *
- * @param {string} from - The sender's address.
+ * @param {`string`} from - The sender's address.
  * @param {SafeVersion} safeVersion - The version of the safe.
- * @param {Buffer} salt - The salt used for address derivation.
- * @param {string} input - Additional input data for the derivation.
+ * @param {`0x${string}`} salt - The salt used for address derivation.
+ * @param {`0x${string}`} input - Additional input data for the derivation.
  *
  * @returns {string} The derived zkSync Era address.
  */
-export declare function zkSyncEraCreate2Address(from: string, safeVersion: SafeVersion, salt: Buffer, input: string): string;
-export declare function toTxResult(transactionResponse: ContractTransactionResponse, options?: TransactionOptions): TransactionResult;
-export declare function isTypedDataSigner(signer: any): signer is AbstractSigner;
+export declare function zkSyncEraCreate2Address(from: string, safeVersion: SafeVersion, salt: Hex, input: Hex): string;
+export declare function toTxResult(runner: ExternalClient, hash: Hash, options?: TransactionOptions): TransactionResult;
+export declare function isTypedDataSigner(signer: any): signer is Client;
 /**
  * Check if the signerOrProvider is compatible with `Signer`
  * @param signerOrProvider - Signer or provider
  * @returns true if the parameter is compatible with `Signer`
  */
-export declare function isSignerCompatible(signerOrProvider: AbstractSigner | Provider): boolean;
+export declare function isSignerCompatible(signerOrProvider: Client | WalletClient): boolean;

package/dist/src/contracts/utils.js

@@ -3,14 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSignerCompatible = exports.isTypedDataSigner = exports.toTxResult = exports.zkSyncEraCreate2Address = exports.validateSafeDeploymentConfig = exports.validateSafeAccountConfig = exports.predictSafeAddress = exports.getPredictedSafeAddressInitCode = exports.getChainSpecificDefaultSaltNonce = exports.encodeSetupCallData = exports.encodeCreateProxyWithNonce = exports.PREDETERMINED_SALT_NONCE = void 0;
-const ethers_1 = require("ethers");
-const sha3_1 = require("@noble/hashes/sha3");
+exports.isSignerCompatible = exports.isTypedDataSigner = exports.toTxResult = exports.zkSyncEraCreate2Address = exports.getSafeAddressFromDeploymentTx = exports.validateSafeDeploymentConfig = exports.validateSafeAccountConfig = exports.predictSafeAddress = exports.getPredictedSafeAddressInitCode = exports.getChainSpecificDefaultSaltNonce = exports.getSafeContractVersion = exports.encodeSetupCallData = exports.encodeCreateProxyWithNonce = exports.PREDETERMINED_SALT_NONCE = void 0;
+const viem_1 = require("viem");
+const actions_1 = require("viem/actions");
 const config_1 = require("../contracts/config");
 const constants_1 = require("../utils/constants");
 const memoized_1 = require("../utils/memoized");
-const ethereumjs_util_1 = require("ethereumjs-util");
 const satisfies_1 = __importDefault(require("semver/functions/satisfies"));
+const types_1 = require("../utils/types");
 const safeDeploymentContracts_1 = require("../contracts/safeDeploymentContracts");
 // keccak256(toUtf8Bytes('Safe Account Abstraction'))
 exports.PREDETERMINED_SALT_NONCE = '0xb1073742015cbcf5a3a4d9d1ae33ecf619439710b89475f92e2abd2117e90f90';
@@ -34,35 +34,36 @@ const ZKSYNC_CREATE2_PREFIX = '0x2020dba91b30cc0006188af794c2fb30dd8520db7e2c088
 function encodeCreateProxyWithNonce(safeProxyFactoryContract, safeSingletonAddress, initializer, salt) {
     return safeProxyFactoryContract.encode('createProxyWithNonce', [
         safeSingletonAddress,
-        initializer,
+        (0, types_1.asHex)(initializer),
         BigInt(salt || exports.PREDETERMINED_SALT_NONCE)
     ]);
 }
 exports.encodeCreateProxyWithNonce = encodeCreateProxyWithNonce;
 const memoizedGetCompatibilityFallbackHandlerContract = (0, memoized_1.createMemoizedFunction)(safeDeploymentContracts_1.getCompatibilityFallbackHandlerContract);
-async function encodeSetupCallData({ safeProvider, safeAccountConfig, safeContract, customContracts, customSafeVersion }) {
+async function encodeSetupCallData({ safeProvider, safeAccountConfig, safeContract, customContracts, customSafeVersion, deploymentType }) {
     const { owners, threshold, to = constants_1.ZERO_ADDRESS, data = constants_1.EMPTY_DATA, fallbackHandler, paymentToken = constants_1.ZERO_ADDRESS, payment = 0, paymentReceiver = constants_1.ZERO_ADDRESS } = safeAccountConfig;
-    const safeVersion = customSafeVersion || (await safeContract.getVersion());
+    const safeVersion = customSafeVersion || safeContract.safeVersion;
     if ((0, satisfies_1.default)(safeVersion, '<=1.0.0')) {
         return safeContract.encode('setup', [
             owners,
             threshold,
             to,
-            data,
+            (0, types_1.asHex)(data),
             paymentToken,
             payment,
             paymentReceiver
         ]);
     }
     let fallbackHandlerAddress = fallbackHandler;
-    const isValidAddress = fallbackHandlerAddress !== undefined && (0, ethers_1.isAddress)(fallbackHandlerAddress);
+    const isValidAddress = fallbackHandlerAddress !== undefined && (0, viem_1.isAddress)(fallbackHandlerAddress);
     if (!isValidAddress) {
         const fallbackHandlerContract = await memoizedGetCompatibilityFallbackHandlerContract({
             safeProvider,
             safeVersion,
-            customContracts
+            customContracts,
+            deploymentType
         });
-        fallbackHandlerAddress = await fallbackHandlerContract.getAddress();
+        fallbackHandlerAddress = fallbackHandlerContract.getAddress();
     }
     return safeContract.encode('setup', [
         owners,
@@ -76,17 +77,41 @@ async function encodeSetupCallData({ safeProvider, safeAccountConfig, safeContra
     ]);
 }
 exports.encodeSetupCallData = encodeSetupCallData;
-const memoizedGetProxyFactoryContract = (0, memoized_1.createMemoizedFunction)(({ safeProvider, safeVersion, customContracts }) => (0, safeDeploymentContracts_1.getProxyFactoryContract)({ safeProvider, safeVersion, customContracts }));
-const memoizedGetProxyCreationCode = (0, memoized_1.createMemoizedFunction)(async ({ safeProvider, safeVersion, customContracts, chainId }) => {
+const memoizedGetProxyFactoryContract = (0, memoized_1.createMemoizedFunction)(({ safeProvider, safeVersion, customContracts, deploymentType }) => (0, safeDeploymentContracts_1.getSafeProxyFactoryContract)({ safeProvider, safeVersion, customContracts, deploymentType }));
+const memoizedGetProxyCreationCode = (0, memoized_1.createMemoizedFunction)(async ({ safeProvider, safeVersion, customContracts, chainId, deploymentType }) => {
     const safeProxyFactoryContract = await memoizedGetProxyFactoryContract({
         safeProvider,
         safeVersion,
         customContracts,
-        chainId
+        chainId,
+        deploymentType
     });
     return safeProxyFactoryContract.proxyCreationCode();
 });
-const memoizedGetSafeContract = (0, memoized_1.createMemoizedFunction)(({ safeProvider, safeVersion, isL1SafeSingleton, customContracts }) => (0, safeDeploymentContracts_1.getSafeContract)({ safeProvider, safeVersion, isL1SafeSingleton, customContracts }));
+const memoizedGetSafeContract = (0, memoized_1.createMemoizedFunction)(({ safeProvider, safeVersion, isL1SafeSingleton, customContracts, deploymentType }) => (0, safeDeploymentContracts_1.getSafeContract)({
+    safeProvider,
+    safeVersion,
+    isL1SafeSingleton,
+    customContracts,
+    deploymentType
+}));
+/**
+ * Retrieves the version of the Safe contract associated with the given Safe address from the blockchain.
+ *
+ * @param {SafeProvider} safeProvider The provider to use when reading the contract.
+ * @param {string} safeAddress The address of the Safe contract for which to retrieve the version.
+ *
+ * @returns {Promise<SafeVersion>} A promise resolving to the version of the Safe contract.
+ * @throws when fetching an address which doesn't have a Safe deployed in it.
+ */
+async function getSafeContractVersion(safeProvider, safeAddress) {
+    return (await safeProvider.readContract({
+        address: safeAddress,
+        abi: (0, viem_1.parseAbi)(['function VERSION() view returns (string)']),
+        functionName: 'VERSION'
+    }));
+}
+exports.getSafeContractVersion = getSafeContractVersion;
 /**
  * Provides a chain-specific default salt nonce for generating unique addresses
  * for the same Safe configuration across different chains.
@@ -95,37 +120,40 @@ const memoizedGetSafeContract = (0, memoized_1.createMemoizedFunction)(({ safePr
  * @returns {string} The chain-specific salt nonce in hexadecimal format.
  */
 function getChainSpecificDefaultSaltNonce(chainId) {
-    return `0x${Buffer.from((0, sha3_1.keccak_256)(exports.PREDETERMINED_SALT_NONCE + chainId)).toString('hex')}`;
+    return (0, viem_1.keccak256)((0, viem_1.toHex)(exports.PREDETERMINED_SALT_NONCE + chainId));
 }
 exports.getChainSpecificDefaultSaltNonce = getChainSpecificDefaultSaltNonce;
 async function getPredictedSafeAddressInitCode({ safeProvider, chainId, safeAccountConfig, safeDeploymentConfig = {}, isL1SafeSingleton = false, customContracts }) {
     (0, exports.validateSafeAccountConfig)(safeAccountConfig);
     (0, exports.validateSafeDeploymentConfig)(safeDeploymentConfig);
-    const { safeVersion = config_1.DEFAULT_SAFE_VERSION, saltNonce = getChainSpecificDefaultSaltNonce(chainId) } = safeDeploymentConfig;
+    const { safeVersion = config_1.DEFAULT_SAFE_VERSION, saltNonce = getChainSpecificDefaultSaltNonce(chainId), deploymentType } = safeDeploymentConfig;
     const safeProxyFactoryContract = await memoizedGetProxyFactoryContract({
         safeProvider,
         safeVersion,
         customContracts,
-        chainId: chainId.toString()
+        chainId: chainId.toString(),
+        deploymentType
     });
     const safeContract = await memoizedGetSafeContract({
         safeProvider,
         safeVersion,
         isL1SafeSingleton,
         customContracts,
-        chainId: chainId.toString()
+        chainId: chainId.toString(),
+        deploymentType
     });
     const initializer = await encodeSetupCallData({
         safeProvider,
         safeAccountConfig,
         safeContract,
         customContracts,
-        customSafeVersion: safeVersion // it is more efficient if we provide the safeVersion manually
+        customSafeVersion: safeVersion, // it is more efficient if we provide the safeVersion manually
+        deploymentType
     });
-    const encodedNonce = (0, ethereumjs_util_1.toBuffer)(safeProvider.encodeParameters(['uint256'], [saltNonce])).toString('hex');
-    const safeSingletonAddress = await safeContract.getAddress();
-    const initCodeCallData = encodeCreateProxyWithNonce(safeProxyFactoryContract, safeSingletonAddress, initializer, '0x' + encodedNonce);
-    const safeProxyFactoryAddress = await safeProxyFactoryContract.getAddress();
+    const encodedNonce = safeProvider.encodeParameters('uint256', [saltNonce]);
+    const safeSingletonAddress = safeContract.getAddress();
+    const initCodeCallData = encodeCreateProxyWithNonce(safeProxyFactoryContract, safeSingletonAddress, initializer, encodedNonce);
+    const safeProxyFactoryAddress = safeProxyFactoryContract.getAddress();
     const initCode = `0x${[safeProxyFactoryAddress, initCodeCallData].reduce((acc, x) => acc + x.replace('0x', ''), '')}`;
     return initCode;
 }
@@ -133,46 +161,55 @@ exports.getPredictedSafeAddressInitCode = getPredictedSafeAddressInitCode;
 async function predictSafeAddress({ safeProvider, chainId, safeAccountConfig, safeDeploymentConfig = {}, isL1SafeSingleton = false, customContracts }) {
     (0, exports.validateSafeAccountConfig)(safeAccountConfig);
     (0, exports.validateSafeDeploymentConfig)(safeDeploymentConfig);
-    const { safeVersion = config_1.DEFAULT_SAFE_VERSION, saltNonce = getChainSpecificDefaultSaltNonce(chainId) } = safeDeploymentConfig;
+    const { safeVersion = config_1.DEFAULT_SAFE_VERSION, saltNonce = getChainSpecificDefaultSaltNonce(chainId), deploymentType } = safeDeploymentConfig;
     const safeProxyFactoryContract = await memoizedGetProxyFactoryContract({
         safeProvider,
         safeVersion,
         customContracts,
-        chainId: chainId.toString()
+        chainId: chainId.toString(),
+        deploymentType
     });
-    const proxyCreationCode = await memoizedGetProxyCreationCode({
+    const [proxyCreationCode] = await memoizedGetProxyCreationCode({
         safeProvider,
         safeVersion,
         customContracts,
-        chainId: chainId.toString()
+        chainId: chainId.toString(),
+        deploymentType
     });
     const safeContract = await memoizedGetSafeContract({
         safeProvider,
         safeVersion,
         isL1SafeSingleton,
         customContracts,
-        chainId: chainId.toString()
+        chainId: chainId.toString(),
+        deploymentType
     });
     const initializer = await encodeSetupCallData({
         safeProvider,
         safeAccountConfig,
         safeContract,
         customContracts,
-        customSafeVersion: safeVersion // it is more efficient if we provide the safeVersion manually
+        customSafeVersion: safeVersion, // it is more efficient if we provide the safeVersion manuall
+        deploymentType
     });
-    const encodedNonce = (0, ethereumjs_util_1.toBuffer)(safeProvider.encodeParameters(['uint256'], [saltNonce])).toString('hex');
-    const salt = (0, ethereumjs_util_1.keccak256)((0, ethereumjs_util_1.toBuffer)('0x' + (0, ethereumjs_util_1.keccak256)((0, ethereumjs_util_1.toBuffer)(initializer)).toString('hex') + encodedNonce));
-    const input = safeProvider.encodeParameters(['address'], [await safeContract.getAddress()]);
-    const from = await safeProxyFactoryContract.getAddress();
+    const initializerHash = (0, viem_1.keccak256)((0, types_1.asHex)(initializer));
+    const encodedNonce = (0, types_1.asHex)(safeProvider.encodeParameters('uint256', [saltNonce]));
+    const salt = (0, viem_1.keccak256)((0, viem_1.concat)([initializerHash, encodedNonce]));
+    const input = safeProvider.encodeParameters('address', [safeContract.getAddress()]);
+    const from = safeProxyFactoryContract.getAddress();
     // On the zkSync Era chain, the counterfactual deployment address is calculated differently
     const isZkSyncEraChain = [ZKSYNC_MAINNET, ZKSYNC_TESTNET].includes(chainId);
     if (isZkSyncEraChain) {
-        const proxyAddress = zkSyncEraCreate2Address(from, safeVersion, salt, input);
+        const proxyAddress = zkSyncEraCreate2Address(from, safeVersion, salt, (0, types_1.asHex)(input));
         return safeProvider.getChecksummedAddress(proxyAddress);
     }
-    const constructorData = (0, ethereumjs_util_1.toBuffer)(input).toString('hex');
-    const initCode = proxyCreationCode + constructorData;
-    const proxyAddress = '0x' + (0, ethereumjs_util_1.generateAddress2)((0, ethereumjs_util_1.toBuffer)(from), (0, ethereumjs_util_1.toBuffer)(salt), (0, ethereumjs_util_1.toBuffer)(initCode)).toString('hex');
+    const initCode = (0, viem_1.concat)([proxyCreationCode, (0, types_1.asHex)(input)]);
+    const proxyAddress = (0, viem_1.getContractAddress)({
+        from,
+        bytecode: initCode,
+        opcode: 'CREATE2',
+        salt
+    });
     return safeProvider.getChecksummedAddress(proxyAddress);
 }
 exports.predictSafeAddress = predictSafeAddress;
@@ -190,35 +227,79 @@ const validateSafeDeploymentConfig = ({ saltNonce }) => {
         throw new Error('saltNonce must be greater than or equal to 0');
 };
 exports.validateSafeDeploymentConfig = validateSafeDeploymentConfig;
+/**
+ * Returns the ProxyCreation Event based on the Safe version
+ *
+ * based on the Safe Version, we have different proxyCreation events
+ *
+ * @param {safeVersion} safeVersion - The Safe Version.
+ * @returns {string} - The ProxyCreation event.
+ */
+function getProxyCreationEvent(safeVersion) {
+    // Events inputs here are left unnamed to deal with the decoding as a list: https://github.com/wevm/viem/blob/632d4b9fa074f4da722e26b28607947d2c14ad2d/src/utils/abi/decodeEventLog.ts#L128
+    const isLegacyProxyCreationEvent = (0, satisfies_1.default)(safeVersion, '<1.3.0');
+    if (isLegacyProxyCreationEvent) {
+        return 'event ProxyCreation(address)'; // v1.0.0, 1.1.1 & v1.2.0
+    }
+    if ((0, satisfies_1.default)(safeVersion, '=1.3.0')) {
+        return 'event ProxyCreation(address, address)'; // v1.3.0
+    }
+    return 'event ProxyCreation(address indexed, address)'; // >= v1.4.1
+}
+/**
+ * Returns the address of a SafeProxy Address from the transaction receipt.
+ *
+ * This function looks for a ProxyCreation event in the transaction receipt logs to get address of the deployed SafeProxy.
+ *
+ * @param {FormattedTransactionReceipt} txReceipt - The transaction receipt containing logs.
+ * @param {safeVersion} safeVersion - The Safe Version.
+ * @returns {string} - The address of the deployed SafeProxy.
+ * @throws {Error} - Throws an error if the SafeProxy was not deployed correctly.
+ */
+function getSafeAddressFromDeploymentTx(txReceipt, safeVersion) {
+    const eventHash = (0, viem_1.toEventHash)(getProxyCreationEvent(safeVersion));
+    const proxyCreationEvent = txReceipt?.logs.find((event) => event.topics[0] === eventHash);
+    if (!proxyCreationEvent) {
+        throw new Error('SafeProxy was not deployed correctly');
+    }
+    const { data, topics } = proxyCreationEvent;
+    const { args } = (0, viem_1.decodeEventLog)({
+        abi: (0, viem_1.parseAbi)([getProxyCreationEvent(safeVersion)]),
+        eventName: 'ProxyCreation',
+        data,
+        topics
+    });
+    if (!args || !args.length) {
+        throw new Error('SafeProxy was not deployed correctly');
+    }
+    return args[0];
+}
+exports.getSafeAddressFromDeploymentTx = getSafeAddressFromDeploymentTx;
 /**
  * Generates a zkSync Era address. zkSync Era uses a distinct address derivation method compared to Ethereum
- * see: https://era.zksync.io/docs/reference/architecture/differences-with-ethereum.html#address-derivation
+ * see: https://docs.zksync.io/build/developer-reference/ethereum-differences/evm-instructions/#address-derivation
  *
- * @param {string} from - The sender's address.
+ * @param {`string`} from - The sender's address.
  * @param {SafeVersion} safeVersion - The version of the safe.
- * @param {Buffer} salt - The salt used for address derivation.
- * @param {string} input - Additional input data for the derivation.
+ * @param {`0x${string}`} salt - The salt used for address derivation.
+ * @param {`0x${string}`} input - Additional input data for the derivation.
  *
  * @returns {string} The derived zkSync Era address.
  */
 function zkSyncEraCreate2Address(from, safeVersion, salt, input) {
     const bytecodeHash = ZKSYNC_SAFE_PROXY_DEPLOYED_BYTECODE[safeVersion].deployedBytecodeHash;
-    const inputHash = (0, ethereumjs_util_1.keccak256)((0, ethereumjs_util_1.toBuffer)(input));
-    const addressBytes = (0, ethereumjs_util_1.keccak256)((0, ethereumjs_util_1.toBuffer)(ZKSYNC_CREATE2_PREFIX +
-        (0, ethers_1.zeroPadValue)(from, 32).slice(2) +
-        salt.toString('hex') +
-        bytecodeHash.slice(2) +
-        inputHash.toString('hex')))
-        .toString('hex')
-        .slice(24);
-    return addressBytes;
+    const inputHash = (0, viem_1.keccak256)(input);
+    const addressBytes = (0, viem_1.keccak256)((0, viem_1.concat)([ZKSYNC_CREATE2_PREFIX, (0, viem_1.pad)((0, types_1.asHex)(from)), salt, bytecodeHash, inputHash])).slice(26);
+    return `0x${addressBytes}`;
 }
 exports.zkSyncEraCreate2Address = zkSyncEraCreate2Address;
-function toTxResult(transactionResponse, options) {
+function toTxResult(runner, hash, options) {
     return {
-        hash: transactionResponse.hash,
+        hash,
         options,
-        transactionResponse
+        transactionResponse: {
+            wait: async () => (0, actions_1.waitForTransactionReceipt)(runner, { hash })
+        }
     };
 }
 exports.toTxResult = toTxResult;
@@ -236,7 +317,7 @@ function isSignerCompatible(signerOrProvider) {
     const candidate = signerOrProvider;
     const isSigntransactionCompatible = typeof candidate.signTransaction === 'function';
     const isSignMessageCompatible = typeof candidate.signMessage === 'function';
-    const isGetAddressCompatible = typeof candidate.getAddress === 'function';
+    const isGetAddressCompatible = typeof candidate.getAddresses === 'function';
     return isSigntransactionCompatible && isSignMessageCompatible && isGetAddressCompatible;
 }
 exports.isSignerCompatible = isSignerCompatible;