@safe-global/protocol-kit 1.3.0 → 2.0.0-alpha.0

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

@@ -7,18 +7,18 @@ interface GetContractInstanceProps {
     customContracts?: ContractNetworkConfig;
 }
 interface GetSafeContractInstanceProps extends GetContractInstanceProps {
-    isL1SafeMasterCopy?: boolean;
+    isL1SafeSingleton?: boolean;
     customSafeAddress?: string;
 }
-export declare function getSafeContractDeployment(safeVersion: SafeVersion, chainId: number, isL1SafeMasterCopy?: boolean): SingletonDeployment | undefined;
-export declare function getCompatibilityFallbackHandlerContractDeployment(safeVersion: SafeVersion, chainId: number): SingletonDeployment | undefined;
-export declare function getMultiSendCallOnlyContractDeployment(safeVersion: SafeVersion, chainId: number): SingletonDeployment | undefined;
-export declare function getMultiSendContractDeployment(safeVersion: SafeVersion, chainId: number): SingletonDeployment | undefined;
-export declare function getSafeProxyFactoryContractDeployment(safeVersion: SafeVersion, chainId: number): SingletonDeployment | undefined;
-export declare function getSignMessageLibContractDeployment(safeVersion: SafeVersion, chainId: number): SingletonDeployment | undefined;
-export declare function getCreateCallContractDeployment(safeVersion: SafeVersion, chainId: number): SingletonDeployment | undefined;
-export declare function getSimulateTxAccessorContractDeployment(safeVersion: SafeVersion, chainId: number): SingletonDeployment | undefined;
-export declare function getSafeContract({ ethAdapter, safeVersion, customSafeAddress, isL1SafeMasterCopy, customContracts }: GetSafeContractInstanceProps): Promise<SafeContract>;
+export declare function getSafeContractDeployment(safeVersion: SafeVersion, chainId: bigint, isL1SafeSingleton?: boolean): SingletonDeployment | undefined;
+export declare function getCompatibilityFallbackHandlerContractDeployment(safeVersion: SafeVersion, chainId: bigint): SingletonDeployment | undefined;
+export declare function getMultiSendCallOnlyContractDeployment(safeVersion: SafeVersion, chainId: bigint): SingletonDeployment | undefined;
+export declare function getMultiSendContractDeployment(safeVersion: SafeVersion, chainId: bigint): SingletonDeployment | undefined;
+export declare function getSafeProxyFactoryContractDeployment(safeVersion: SafeVersion, chainId: bigint): SingletonDeployment | undefined;
+export declare function getSignMessageLibContractDeployment(safeVersion: SafeVersion, chainId: bigint): SingletonDeployment | undefined;
+export declare function getCreateCallContractDeployment(safeVersion: SafeVersion, chainId: bigint): SingletonDeployment | undefined;
+export declare function getSimulateTxAccessorContractDeployment(safeVersion: SafeVersion, chainId: bigint): SingletonDeployment | undefined;
+export declare function getSafeContract({ ethAdapter, safeVersion, customSafeAddress, isL1SafeSingleton, customContracts }: GetSafeContractInstanceProps): Promise<SafeContract>;
 export declare function getProxyFactoryContract({ ethAdapter, safeVersion, customContracts }: GetContractInstanceProps): Promise<SafeProxyFactoryContract>;
 export declare function getCompatibilityFallbackHandlerContract({ ethAdapter, safeVersion, customContracts }: GetContractInstanceProps): Promise<CompatibilityFallbackHandlerContract>;
 export declare function getMultiSendContract({ ethAdapter, safeVersion, customContracts }: GetContractInstanceProps): Promise<MultiSendContract>;

package/dist/src/contracts/safeDeploymentContracts.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSimulateTxAccessorContract = exports.getCreateCallContract = exports.getSignMessageLibContract = exports.getMultiSendCallOnlyContract = exports.getMultiSendContract = exports.getCompatibilityFallbackHandlerContract = exports.getProxyFactoryContract = exports.getSafeContract = exports.getSimulateTxAccessorContractDeployment = exports.getCreateCallContractDeployment = exports.getSignMessageLibContractDeployment = exports.getSafeProxyFactoryContractDeployment = exports.getMultiSendContractDeployment = exports.getMultiSendCallOnlyContractDeployment = exports.getCompatibilityFallbackHandlerContractDeployment = exports.getSafeContractDeployment = void 0;
 const safe_deployments_1 = require("@safe-global/safe-deployments");
 const config_1 = require("./config");
-function getSafeContractDeployment(safeVersion, chainId, isL1SafeMasterCopy = false) {
-    const version = config_1.safeDeploymentsVersions[safeVersion].safeMasterCopyVersion;
+function getSafeContractDeployment(safeVersion, chainId, isL1SafeSingleton = false) {
+    const version = config_1.safeDeploymentsVersions[safeVersion].safeSingletonVersion;
     const filters = { version, network: chainId.toString(), released: true };
-    if (config_1.safeDeploymentsL1ChainIds.includes(chainId) || isL1SafeMasterCopy) {
+    if (config_1.safeDeploymentsL1ChainIds.includes(chainId) || isL1SafeSingleton) {
         return (0, safe_deployments_1.getSafeSingletonDeployment)(filters);
     }
     return (0, safe_deployments_1.getSafeL2SingletonDeployment)(filters);
@@ -51,16 +51,16 @@ function getSimulateTxAccessorContractDeployment(safeVersion, chainId) {
     return (0, safe_deployments_1.getSimulateTxAccessorDeployment)({ version, network: chainId.toString(), released: true });
 }
 exports.getSimulateTxAccessorContractDeployment = getSimulateTxAccessorContractDeployment;
-async function getSafeContract({ ethAdapter, safeVersion, customSafeAddress, isL1SafeMasterCopy, customContracts }) {
+async function getSafeContract({ ethAdapter, safeVersion, customSafeAddress, isL1SafeSingleton, customContracts }) {
     const chainId = await ethAdapter.getChainId();
-    const singletonDeployment = getSafeContractDeployment(safeVersion, chainId, isL1SafeMasterCopy);
+    const singletonDeployment = getSafeContractDeployment(safeVersion, chainId, isL1SafeSingleton);
     const safeContract = await ethAdapter.getSafeContract({
         safeVersion,
         singletonDeployment,
-        customContractAddress: customSafeAddress ?? customContracts?.safeMasterCopyAddress,
-        customContractAbi: customContracts?.safeMasterCopyAbi
+        customContractAddress: customSafeAddress ?? customContracts?.safeSingletonAddress,
+        customContractAbi: customContracts?.safeSingletonAbi
     });
-    const isContractDeployed = await ethAdapter.isContractDeployed(safeContract.getAddress());
+    const isContractDeployed = await ethAdapter.isContractDeployed(await safeContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('SafeProxy contract is not deployed on the current network');
     }
@@ -76,7 +76,7 @@ async function getProxyFactoryContract({ ethAdapter, safeVersion, customContract
         customContractAddress: customContracts?.safeProxyFactoryAddress,
         customContractAbi: customContracts?.safeProxyFactoryAbi
     });
-    const isContractDeployed = await ethAdapter.isContractDeployed(safeProxyFactoryContract.getAddress());
+    const isContractDeployed = await ethAdapter.isContractDeployed(await safeProxyFactoryContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('SafeProxyFactory contract is not deployed on the current network');
     }
@@ -92,7 +92,7 @@ async function getCompatibilityFallbackHandlerContract({ ethAdapter, safeVersion
         customContractAddress: customContracts?.fallbackHandlerAddress,
         customContractAbi: customContracts?.fallbackHandlerAbi
     });
-    const isContractDeployed = await ethAdapter.isContractDeployed(fallbackHandlerContract.getAddress());
+    const isContractDeployed = await ethAdapter.isContractDeployed(await fallbackHandlerContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('CompatibilityFallbackHandler contract is not deployed on the current network');
     }
@@ -108,7 +108,7 @@ async function getMultiSendContract({ ethAdapter, safeVersion, customContracts }
         customContractAddress: customContracts?.multiSendAddress,
         customContractAbi: customContracts?.multiSendAbi
     });
-    const isContractDeployed = await ethAdapter.isContractDeployed(multiSendContract.getAddress());
+    const isContractDeployed = await ethAdapter.isContractDeployed(await multiSendContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('MultiSend contract is not deployed on the current network');
     }
@@ -124,7 +124,7 @@ async function getMultiSendCallOnlyContract({ ethAdapter, safeVersion, customCon
         customContractAddress: customContracts?.multiSendCallOnlyAddress,
         customContractAbi: customContracts?.multiSendCallOnlyAbi
     });
-    const isContractDeployed = await ethAdapter.isContractDeployed(multiSendCallOnlyContract.getAddress());
+    const isContractDeployed = await ethAdapter.isContractDeployed(await multiSendCallOnlyContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('MultiSendCallOnly contract is not deployed on the current network');
     }
@@ -140,7 +140,7 @@ async function getSignMessageLibContract({ ethAdapter, safeVersion, customContra
         customContractAddress: customContracts?.signMessageLibAddress,
         customContractAbi: customContracts?.signMessageLibAbi
     });
-    const isContractDeployed = await ethAdapter.isContractDeployed(signMessageLibContract.getAddress());
+    const isContractDeployed = await ethAdapter.isContractDeployed(await signMessageLibContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('SignMessageLib contract is not deployed on the current network');
     }
@@ -156,7 +156,7 @@ async function getCreateCallContract({ ethAdapter, safeVersion, customContracts
         customContractAddress: customContracts?.createCallAddress,
         customContractAbi: customContracts?.createCallAbi
     });
-    const isContractDeployed = await ethAdapter.isContractDeployed(createCallContract.getAddress());
+    const isContractDeployed = await ethAdapter.isContractDeployed(await createCallContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('CreateCall contract is not deployed on the current network');
     }
@@ -172,7 +172,7 @@ async function getSimulateTxAccessorContract({ ethAdapter, safeVersion, customCo
         customContractAddress: customContracts?.simulateTxAccessorAddress,
         customContractAbi: customContracts?.simulateTxAccessorAbi
     });
-    const isContractDeployed = await ethAdapter.isContractDeployed(simulateTxAccessorContract.getAddress());
+    const isContractDeployed = await ethAdapter.isContractDeployed(await simulateTxAccessorContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('SimulateTxAccessor 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,3 +1,4 @@
+/// <reference types="node" />
 import { EthAdapter, SafeContract, SafeProxyFactoryContract, SafeVersion } from '@safe-global/safe-core-sdk-types';
 import { ContractNetworkConfig, SafeAccountConfig, SafeDeploymentConfig } from '../types';
 export declare const PREDETERMINED_SALT_NONCE = "0xb1073742015cbcf5a3a4d9d1ae33ecf619439710b89475f92e2abd2117e90f90";
@@ -5,7 +6,7 @@ export interface PredictSafeAddressProps {
     ethAdapter: EthAdapter;
     safeAccountConfig: SafeAccountConfig;
     safeDeploymentConfig?: SafeDeploymentConfig;
-    isL1SafeMasterCopy?: boolean;
+    isL1SafeSingleton?: boolean;
     customContracts?: ContractNetworkConfig;
 }
 export interface encodeSetupCallDataProps {
@@ -17,6 +18,26 @@ export interface encodeSetupCallDataProps {
 }
 export declare function encodeCreateProxyWithNonce(safeProxyFactoryContract: SafeProxyFactoryContract, safeSingletonAddress: string, initializer: string): string;
 export declare function encodeSetupCallData({ ethAdapter, safeAccountConfig, safeContract, customContracts, customSafeVersion }: encodeSetupCallDataProps): Promise<string>;
-export declare function predictSafeAddress({ ethAdapter, safeAccountConfig, safeDeploymentConfig, isL1SafeMasterCopy, customContracts }: PredictSafeAddressProps): Promise<string>;
+/**
+ * Provides a chain-specific default salt nonce for generating unique addresses
+ * for the same Safe configuration across different chains.
+ *
+ * @param {bigint} chainId - The chain ID associated with the chain.
+ * @returns {string} The chain-specific salt nonce in hexadecimal format.
+ */
+export declare function getChainSpecificDefaultSaltNonce(chainId: bigint): string;
+export declare function predictSafeAddress({ ethAdapter, safeAccountConfig, safeDeploymentConfig, isL1SafeSingleton, customContracts }: PredictSafeAddressProps): Promise<string>;
 export declare const validateSafeAccountConfig: ({ owners, threshold }: SafeAccountConfig) => void;
 export declare const validateSafeDeploymentConfig: ({ saltNonce }: SafeDeploymentConfig) => void;
+/**
+ * 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
+ *
+ * @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.
+ *
+ * @returns {string} The derived zkSync Era address.
+ */
+export declare function zkSyncEraCreate2Address(from: string, safeVersion: SafeVersion, salt: Buffer, input: string): string;

package/dist/src/contracts/utils.js

@@ -3,20 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateSafeDeploymentConfig = exports.validateSafeAccountConfig = exports.predictSafeAddress = exports.encodeSetupCallData = exports.encodeCreateProxyWithNonce = exports.PREDETERMINED_SALT_NONCE = void 0;
-const address_1 = require("@ethersproject/address");
-const bignumber_1 = require("@ethersproject/bignumber");
+exports.zkSyncEraCreate2Address = exports.validateSafeDeploymentConfig = exports.validateSafeAccountConfig = exports.predictSafeAddress = exports.getChainSpecificDefaultSaltNonce = exports.encodeSetupCallData = exports.encodeCreateProxyWithNonce = exports.PREDETERMINED_SALT_NONCE = void 0;
+const ethers_1 = require("ethers");
+const sha3_1 = require("@noble/hashes/sha3");
 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 zksync_web3_1 = require("zksync-web3");
 const safeDeploymentContracts_1 = require("../contracts/safeDeploymentContracts");
 // keccak256(toUtf8Bytes('Safe Account Abstraction'))
 exports.PREDETERMINED_SALT_NONCE = '0xb1073742015cbcf5a3a4d9d1ae33ecf619439710b89475f92e2abd2117e90f90';
-const ZKSYNC_MAINNET = 324;
-const ZKSYNC_TESTNET = 280;
+const ZKSYNC_MAINNET = 324n;
+const ZKSYNC_TESTNET = 280n;
 // For bundle size efficiency we store SafeProxy.sol/GnosisSafeProxy.sol zksync bytecode hash in hex.
 // To get the values below we need to:
 // 1. Compile Safe smart contracts for zksync
@@ -24,12 +23,14 @@ const ZKSYNC_TESTNET = 280;
 // 3. Use zksync-web3 SDK to get the bytecode hash
 //    const bytecodeHash = zkSyncUtils.hashBytecode(${deployedBytecode})
 // 4. Use ethers to convert the array into hex
-//    const deployedBytecodeHash = ethers.utils.hexlify(bytecodeHash)
+//    const deployedBytecodeHash = ethers.hexlify(bytecodeHash)
 const ZKSYNC_SAFE_PROXY_DEPLOYED_BYTECODE = {
     '1.3.0': {
         deployedBytecodeHash: '0x0100004124426fb9ebb25e27d670c068e52f9ba631bd383279a188be47e3f86d'
     }
 };
+// keccak256(toUtf8Bytes('zksyncCreate2'))
+const ZKSYNC_CREATE2_PREFIX = '0x2020dba91b30cc0006188af794c2fb30dd8520db7e2c088b7fc7c103c00ca494';
 function encodeCreateProxyWithNonce(safeProxyFactoryContract, safeSingletonAddress, initializer) {
     return safeProxyFactoryContract.encode('createProxyWithNonce', [
         safeSingletonAddress,
@@ -54,14 +55,14 @@ async function encodeSetupCallData({ ethAdapter, safeAccountConfig, safeContract
         ]);
     }
     let fallbackHandlerAddress = fallbackHandler;
-    const isValidAddress = fallbackHandlerAddress !== undefined && (0, address_1.isAddress)(fallbackHandlerAddress);
+    const isValidAddress = fallbackHandlerAddress !== undefined && (0, ethers_1.isAddress)(fallbackHandlerAddress);
     if (!isValidAddress) {
         const fallbackHandlerContract = await memoizedGetCompatibilityFallbackHandlerContract({
             ethAdapter,
             safeVersion,
             customContracts
         });
-        fallbackHandlerAddress = fallbackHandlerContract.getAddress();
+        fallbackHandlerAddress = await fallbackHandlerContract.getAddress();
     }
     return safeContract.encode('setup', [
         owners,
@@ -85,10 +86,22 @@ const memoizedGetProxyCreationCode = (0, memoized_1.createMemoizedFunction)(asyn
     });
     return safeProxyFactoryContract.proxyCreationCode();
 });
-async function predictSafeAddress({ ethAdapter, safeAccountConfig, safeDeploymentConfig = {}, isL1SafeMasterCopy = false, customContracts }) {
+/**
+ * Provides a chain-specific default salt nonce for generating unique addresses
+ * for the same Safe configuration across different chains.
+ *
+ * @param {bigint} chainId - The chain ID associated with the chain.
+ * @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')}`;
+}
+exports.getChainSpecificDefaultSaltNonce = getChainSpecificDefaultSaltNonce;
+async function predictSafeAddress({ ethAdapter, safeAccountConfig, safeDeploymentConfig = {}, isL1SafeSingleton = false, customContracts }) {
     (0, exports.validateSafeAccountConfig)(safeAccountConfig);
     (0, exports.validateSafeDeploymentConfig)(safeDeploymentConfig);
-    const { safeVersion = config_1.DEFAULT_SAFE_VERSION, saltNonce = exports.PREDETERMINED_SALT_NONCE } = safeDeploymentConfig;
+    const chainId = await ethAdapter.getChainId();
+    const { safeVersion = config_1.DEFAULT_SAFE_VERSION, saltNonce = getChainSpecificDefaultSaltNonce(chainId) } = safeDeploymentConfig;
     const safeProxyFactoryContract = await memoizedGetProxyFactoryContract({
         ethAdapter,
         safeVersion,
@@ -102,7 +115,7 @@ async function predictSafeAddress({ ethAdapter, safeAccountConfig, safeDeploymen
     const safeContract = await memoizedGetSafeContract({
         ethAdapter,
         safeVersion,
-        isL1SafeMasterCopy,
+        isL1SafeSingleton,
         customContracts
     });
     const initializer = await encodeSetupCallData({
@@ -114,18 +127,17 @@ async function predictSafeAddress({ ethAdapter, safeAccountConfig, safeDeploymen
     });
     const encodedNonce = (0, ethereumjs_util_1.toBuffer)(ethAdapter.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 = ethAdapter.encodeParameters(['address'], [safeContract.getAddress()]);
-    const chainId = await ethAdapter.getChainId();
-    // zkSync Era counterfactual deployment is calculated differently
-    // https://era.zksync.io/docs/reference/architecture/differences-with-ethereum.html#create-create2
-    if ([ZKSYNC_MAINNET, ZKSYNC_TESTNET].includes(chainId)) {
-        const bytecodeHash = ZKSYNC_SAFE_PROXY_DEPLOYED_BYTECODE[safeVersion].deployedBytecodeHash;
-        return zksync_web3_1.utils.create2Address(safeProxyFactoryContract.getAddress(), bytecodeHash, salt, input);
+    const input = ethAdapter.encodeParameters(['address'], [await safeContract.getAddress()]);
+    const from = await 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);
+        return ethAdapter.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)(safeProxyFactoryContract.getAddress()), (0, ethereumjs_util_1.toBuffer)(salt), (0, ethereumjs_util_1.toBuffer)(initCode)).toString('hex');
+    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');
     return ethAdapter.getChecksummedAddress(proxyAddress);
 }
 exports.predictSafeAddress = predictSafeAddress;
@@ -139,8 +151,32 @@ const validateSafeAccountConfig = ({ owners, threshold }) => {
 };
 exports.validateSafeAccountConfig = validateSafeAccountConfig;
 const validateSafeDeploymentConfig = ({ saltNonce }) => {
-    if (saltNonce && bignumber_1.BigNumber.from(saltNonce).lt(0))
+    if (saltNonce && BigInt(saltNonce) < 0)
         throw new Error('saltNonce must be greater than or equal to 0');
 };
 exports.validateSafeDeploymentConfig = validateSafeDeploymentConfig;
+/**
+ * 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
+ *
+ * @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.
+ *
+ * @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;
+}
+exports.zkSyncEraCreate2Address = zkSyncEraCreate2Address;
 //# sourceMappingURL=utils.js.map

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

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

package/dist/src/index.d.ts

@@ -7,9 +7,9 @@ import { PREDETERMINED_SALT_NONCE, encodeCreateProxyWithNonce, encodeSetupCallDa
 import ContractManager from './managers/contractManager';
 import SafeFactory, { DeploySafeProps, SafeFactoryConfig } from './safeFactory';
 import { AddOwnerTxParams, ConnectSafeConfig, ConnectSafeConfigWithPredictedSafe, ConnectSafeConfigWithSafeAddress, ContractNetworksConfig, CreateTransactionProps, PredictedSafeProps, RemoveOwnerTxParams, SafeAccountConfig, SafeConfig, SafeConfigWithPredictedSafe, SafeConfigWithSafeAddress, SafeDeploymentConfig, StandardizeSafeTransactionDataProps, SwapOwnerTxParams } from './types';
-import { EthSafeSignature, estimateTxBaseGas, estimateTxGas, estimateSafeTxGas, estimateSafeDeploymentGas } from './utils';
+import { EthSafeSignature, estimateTxBaseGas, estimateTxGas, estimateSafeTxGas, estimateSafeDeploymentGas, validateEip3770Address } from './utils';
 import { SafeTransactionOptionalProps } from './utils/transactions/types';
 import { encodeMultiSendData, standardizeSafeTransactionData } from './utils/transactions/utils';
 import { getERC20Decimals, isGasTokenCompatibleWithHandlePayment, createERC20TokenTransferTransaction } from './utils/erc-20';
-export { AddOwnerTxParams, estimateTxBaseGas, estimateTxGas, estimateSafeTxGas, estimateSafeDeploymentGas, ConnectSafeConfig, ConnectSafeConfigWithPredictedSafe, ConnectSafeConfigWithSafeAddress, ContractManager, ContractNetworksConfig, CreateCallEthersContract, CreateCallWeb3Contract, createERC20TokenTransferTransaction, CreateEthersProxyProps, CreateTransactionProps, CreateWeb3ProxyProps, DEFAULT_SAFE_VERSION, DeploySafeProps, EthSafeSignature, EthersAdapter, EthersAdapterConfig, EthersTransactionOptions, EthersTransactionResult, MultiSendCallOnlyEthersContract, MultiSendCallOnlyWeb3Contract, MultiSendEthersContract, MultiSendWeb3Contract, PREDETERMINED_SALT_NONCE, PredictedSafeProps, RemoveOwnerTxParams, SafeAccountConfig, SafeConfig, SafeConfigWithPredictedSafe, SafeConfigWithSafeAddress, SafeContractEthers, SafeContractWeb3, SafeDeploymentConfig, SafeFactory, SafeFactoryConfig, SafeProxyFactoryEthersContract, SafeProxyFactoryWeb3Contract, SafeTransactionOptionalProps, SignMessageLibEthersContract, SignMessageLibWeb3Contract, StandardizeSafeTransactionDataProps, SwapOwnerTxParams, Web3Adapter, Web3AdapterConfig, Web3TransactionOptions, Web3TransactionResult, encodeCreateProxyWithNonce, encodeMultiSendData, encodeSetupCallData, getCompatibilityFallbackHandlerContract, getCreateCallContract, getERC20Decimals, getMultiSendCallOnlyContract, getMultiSendContract, getProxyFactoryContract, getSafeContract, getSignMessageLibContract, isGasTokenCompatibleWithHandlePayment, predictSafeAddress, standardizeSafeTransactionData };
+export { AddOwnerTxParams, estimateTxBaseGas, estimateTxGas, estimateSafeTxGas, estimateSafeDeploymentGas, ConnectSafeConfig, ConnectSafeConfigWithPredictedSafe, ConnectSafeConfigWithSafeAddress, ContractManager, ContractNetworksConfig, CreateCallEthersContract, CreateCallWeb3Contract, createERC20TokenTransferTransaction, CreateEthersProxyProps, CreateTransactionProps, CreateWeb3ProxyProps, DEFAULT_SAFE_VERSION, DeploySafeProps, EthSafeSignature, EthersAdapter, EthersAdapterConfig, EthersTransactionOptions, EthersTransactionResult, MultiSendCallOnlyEthersContract, MultiSendCallOnlyWeb3Contract, MultiSendEthersContract, MultiSendWeb3Contract, PREDETERMINED_SALT_NONCE, PredictedSafeProps, RemoveOwnerTxParams, SafeAccountConfig, SafeConfig, SafeConfigWithPredictedSafe, SafeConfigWithSafeAddress, SafeContractEthers, SafeContractWeb3, SafeDeploymentConfig, SafeFactory, SafeFactoryConfig, SafeProxyFactoryEthersContract, SafeProxyFactoryWeb3Contract, SafeTransactionOptionalProps, SignMessageLibEthersContract, SignMessageLibWeb3Contract, StandardizeSafeTransactionDataProps, SwapOwnerTxParams, Web3Adapter, Web3AdapterConfig, Web3TransactionOptions, Web3TransactionResult, encodeCreateProxyWithNonce, encodeMultiSendData, encodeSetupCallData, getCompatibilityFallbackHandlerContract, getCreateCallContract, getERC20Decimals, getMultiSendCallOnlyContract, getMultiSendContract, getProxyFactoryContract, getSafeContract, getSignMessageLibContract, isGasTokenCompatibleWithHandlePayment, predictSafeAddress, standardizeSafeTransactionData, validateEip3770Address };
 export default Safe;

package/dist/src/index.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.standardizeSafeTransactionData = exports.predictSafeAddress = exports.isGasTokenCompatibleWithHandlePayment = exports.getSignMessageLibContract = exports.getSafeContract = exports.getProxyFactoryContract = exports.getMultiSendContract = exports.getMultiSendCallOnlyContract = exports.getERC20Decimals = exports.getCreateCallContract = exports.getCompatibilityFallbackHandlerContract = exports.encodeSetupCallData = exports.encodeMultiSendData = exports.encodeCreateProxyWithNonce = exports.Web3Adapter = exports.SignMessageLibWeb3Contract = exports.SignMessageLibEthersContract = exports.SafeProxyFactoryWeb3Contract = exports.SafeProxyFactoryEthersContract = exports.SafeFactory = exports.SafeContractWeb3 = exports.SafeContractEthers = exports.PREDETERMINED_SALT_NONCE = exports.MultiSendWeb3Contract = exports.MultiSendEthersContract = exports.MultiSendCallOnlyWeb3Contract = exports.MultiSendCallOnlyEthersContract = exports.EthersAdapter = exports.EthSafeSignature = exports.DEFAULT_SAFE_VERSION = exports.createERC20TokenTransferTransaction = exports.CreateCallWeb3Contract = exports.CreateCallEthersContract = exports.ContractManager = exports.estimateSafeDeploymentGas = exports.estimateSafeTxGas = exports.estimateTxGas = exports.estimateTxBaseGas = void 0;
+exports.validateEip3770Address = exports.standardizeSafeTransactionData = exports.predictSafeAddress = exports.isGasTokenCompatibleWithHandlePayment = exports.getSignMessageLibContract = exports.getSafeContract = exports.getProxyFactoryContract = exports.getMultiSendContract = exports.getMultiSendCallOnlyContract = exports.getERC20Decimals = exports.getCreateCallContract = exports.getCompatibilityFallbackHandlerContract = exports.encodeSetupCallData = exports.encodeMultiSendData = exports.encodeCreateProxyWithNonce = exports.Web3Adapter = exports.SignMessageLibWeb3Contract = exports.SignMessageLibEthersContract = exports.SafeProxyFactoryWeb3Contract = exports.SafeProxyFactoryEthersContract = exports.SafeFactory = exports.SafeContractWeb3 = exports.SafeContractEthers = exports.PREDETERMINED_SALT_NONCE = exports.MultiSendWeb3Contract = exports.MultiSendEthersContract = exports.MultiSendCallOnlyWeb3Contract = exports.MultiSendCallOnlyEthersContract = exports.EthersAdapter = exports.EthSafeSignature = exports.DEFAULT_SAFE_VERSION = exports.createERC20TokenTransferTransaction = exports.CreateCallWeb3Contract = exports.CreateCallEthersContract = exports.ContractManager = exports.estimateSafeDeploymentGas = exports.estimateSafeTxGas = exports.estimateTxGas = exports.estimateTxBaseGas = void 0;
 const Safe_1 = __importDefault(require("./Safe"));
 const ethers_1 = require("./adapters/ethers");
 Object.defineProperty(exports, "CreateCallEthersContract", { enumerable: true, get: function () { return ethers_1.CreateCallEthersContract; } });
@@ -46,6 +46,7 @@ Object.defineProperty(exports, "estimateTxBaseGas", { enumerable: true, get: fun
 Object.defineProperty(exports, "estimateTxGas", { enumerable: true, get: function () { return utils_2.estimateTxGas; } });
 Object.defineProperty(exports, "estimateSafeTxGas", { enumerable: true, get: function () { return utils_2.estimateSafeTxGas; } });
 Object.defineProperty(exports, "estimateSafeDeploymentGas", { enumerable: true, get: function () { return utils_2.estimateSafeDeploymentGas; } });
+Object.defineProperty(exports, "validateEip3770Address", { enumerable: true, get: function () { return utils_2.validateEip3770Address; } });
 const utils_3 = require("./utils/transactions/utils");
 Object.defineProperty(exports, "encodeMultiSendData", { enumerable: true, get: function () { return utils_3.encodeMultiSendData; } });
 Object.defineProperty(exports, "standardizeSafeTransactionData", { enumerable: true, get: function () { return utils_3.standardizeSafeTransactionData; } });

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AACzB,8CAY0B;AA2ExB,yGAtFA,iCAAwB,OAsFA;AASxB,8FA7FA,sBAAa,OA6FA;AAIb,gHA7FA,wCAA+B,OA6FA;AAE/B,wGA9FA,gCAAuB,OA8FA;AASvB,mGAtGA,2BAAkB,OAsGA;AAKlB,+GA1GA,uCAA8B,OA0GA;AAG9B,6GA5GA,qCAA4B,OA4GA;AA1G9B,0CAYwB;AA+DtB,uGA1EA,6BAAsB,OA0EA;AAatB,8GArFA,oCAA6B,OAqFA;AAE7B,sGAtFA,4BAAqB,OAsFA;AASrB,iGA9FA,uBAAgB,OA8FA;AAKhB,6GAlGA,mCAA4B,OAkGA;AAG5B,2GApGA,iCAA0B,OAoGA;AAG1B,4FAtGA,kBAAW,OAsGA;AAjGb,+CAAyD;AAmEvD,qGAnEO,6BAAoB,OAmEP;AAlEtB,iFAQ4C;AA+F1C,wHAtGA,iEAAuC,OAsGA;AACvC,sGAtGA,+CAAqB,OAsGA;AAErB,6GAvGA,sDAA4B,OAuGA;AAC5B,qGAvGA,8CAAoB,OAuGA;AACpB,wGAvGA,iDAAuB,OAuGA;AACvB,gGAvGA,yCAAe,OAuGA;AACf,0GAvGA,mDAAyB,OAuGA;AArG3B,6CAK0B;AA+DxB,yGAnEA,gCAAwB,OAmEA;AAuBxB,2GAzFA,kCAA0B,OAyFA;AAE1B,oGA1FA,2BAAmB,OA0FA;AAUnB,mGAnGA,0BAAkB,OAmGA;AAjGpB,iFAAwD;AA2CtD,0BA3CK,yBAAe,CA2CL;AA1CjB,gEAA+E;AAuE7E,sBAvEK,qBAAW,CAuEL;AArDb,mCAMgB;AA4Bd,iGAjCA,wBAAgB,OAiCA;AAjBhB,kGAfA,yBAAiB,OAeA;AACjB,8FAfA,qBAAa,OAeA;AACb,kGAfA,yBAAiB,OAeA;AACjB,0GAfA,iCAAyB,OAeA;AAZ3B,sDAAgG;AA2D9F,oGA3DO,2BAAmB,OA2DP;AAYnB,+GAvE4B,sCAA8B,OAuE5B;AAtEhC,2CAIuB;AA0DrB,iGA7DA,yBAAgB,OA6DA;AAMhB,sHAlEA,8CAAqC,OAkEA;AAjDrC,oHAhBA,4CAAmC,OAgBA;AAsDrC,kBAAe,cAAI,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AACzB,8CAY0B;AA4ExB,yGAvFA,iCAAwB,OAuFA;AASxB,8FA9FA,sBAAa,OA8FA;AAIb,gHA9FA,wCAA+B,OA8FA;AAE/B,wGA/FA,gCAAuB,OA+FA;AASvB,mGAvGA,2BAAkB,OAuGA;AAKlB,+GA3GA,uCAA8B,OA2GA;AAG9B,6GA7GA,qCAA4B,OA6GA;AA3G9B,0CAYwB;AAgEtB,uGA3EA,6BAAsB,OA2EA;AAatB,8GAtFA,oCAA6B,OAsFA;AAE7B,sGAvFA,4BAAqB,OAuFA;AASrB,iGA/FA,uBAAgB,OA+FA;AAKhB,6GAnGA,mCAA4B,OAmGA;AAG5B,2GArGA,iCAA0B,OAqGA;AAG1B,4FAvGA,kBAAW,OAuGA;AAlGb,+CAAyD;AAoEvD,qGApEO,6BAAoB,OAoEP;AAnEtB,iFAQ4C;AAgG1C,wHAvGA,iEAAuC,OAuGA;AACvC,sGAvGA,+CAAqB,OAuGA;AAErB,6GAxGA,sDAA4B,OAwGA;AAC5B,qGAxGA,8CAAoB,OAwGA;AACpB,wGAxGA,iDAAuB,OAwGA;AACvB,gGAxGA,yCAAe,OAwGA;AACf,0GAxGA,mDAAyB,OAwGA;AAtG3B,6CAK0B;AAgExB,yGApEA,gCAAwB,OAoEA;AAuBxB,2GA1FA,kCAA0B,OA0FA;AAE1B,oGA3FA,2BAAmB,OA2FA;AAUnB,mGApGA,0BAAkB,OAoGA;AAlGpB,iFAAwD;AA4CtD,0BA5CK,yBAAe,CA4CL;AA3CjB,gEAA+E;AAwE7E,sBAxEK,qBAAW,CAwEL;AAtDb,mCAOgB;AA4Bd,iGAlCA,wBAAgB,OAkCA;AAjBhB,kGAhBA,yBAAiB,OAgBA;AACjB,8FAhBA,qBAAa,OAgBA;AACb,kGAhBA,yBAAiB,OAgBA;AACjB,0GAhBA,iCAAyB,OAgBA;AA4DzB,uGA3EA,8BAAsB,OA2EA;AAxExB,sDAAgG;AA2D9F,oGA3DO,2BAAmB,OA2DP;AAYnB,+GAvE4B,sCAA8B,OAuE5B;AAtEhC,2CAIuB;AA0DrB,iGA7DA,yBAAgB,OA6DA;AAMhB,sHAlEA,8CAAqC,OAkEA;AAjDrC,oHAhBA,4CAAmC,OAgBA;AAuDrC,kBAAe,cAAI,CAAA"}

package/dist/src/managers/contractManager.d.ts

@@ -5,7 +5,7 @@ declare class ContractManager {
     static create(config: SafeConfig): Promise<ContractManager>;
     init(config: SafeConfig): Promise<void>;
     get contractNetworks(): ContractNetworksConfig | undefined;
-    get isL1SafeMasterCopy(): boolean | undefined;
+    get isL1SafeSingleton(): boolean | undefined;
     get safeContract(): SafeContract | undefined;
     get multiSendContract(): MultiSendContract;
     get multiSendCallOnlyContract(): MultiSendCallOnlyContract;

package/dist/src/managers/contractManager.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _ContractManager_contractNetworks, _ContractManager_isL1SafeMasterCopy, _ContractManager_safeContract, _ContractManager_multiSendContract, _ContractManager_multiSendCallOnlyContract;
+var _ContractManager_contractNetworks, _ContractManager_isL1SafeSingleton, _ContractManager_safeContract, _ContractManager_multiSendContract, _ContractManager_multiSendCallOnlyContract;
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../contracts/config");
 const safeDeploymentContracts_1 = require("../contracts/safeDeploymentContracts");
@@ -18,7 +18,7 @@ const types_1 = require("../utils/types");
 class ContractManager {
     constructor() {
         _ContractManager_contractNetworks.set(this, void 0);
-        _ContractManager_isL1SafeMasterCopy.set(this, void 0);
+        _ContractManager_isL1SafeSingleton.set(this, void 0);
         _ContractManager_safeContract.set(this, void 0);
         _ContractManager_multiSendContract.set(this, void 0);
         _ContractManager_multiSendCallOnlyContract.set(this, void 0);
@@ -29,11 +29,11 @@ class ContractManager {
         return contractManager;
     }
     async init(config) {
-        const { ethAdapter, isL1SafeMasterCopy, contractNetworks, predictedSafe, safeAddress } = config;
+        const { ethAdapter, isL1SafeSingleton, contractNetworks, predictedSafe, safeAddress } = config;
         const chainId = await ethAdapter.getChainId();
-        const customContracts = contractNetworks?.[chainId];
+        const customContracts = contractNetworks?.[chainId.toString()];
         __classPrivateFieldSet(this, _ContractManager_contractNetworks, contractNetworks, "f");
-        __classPrivateFieldSet(this, _ContractManager_isL1SafeMasterCopy, isL1SafeMasterCopy, "f");
+        __classPrivateFieldSet(this, _ContractManager_isL1SafeSingleton, isL1SafeSingleton, "f");
         let safeVersion;
         if ((0, types_1.isSafeConfigWithPredictedSafe)(config)) {
             safeVersion = predictedSafe?.safeDeploymentConfig?.safeVersion ?? config_1.DEFAULT_SAFE_VERSION;
@@ -43,7 +43,7 @@ class ContractManager {
             const defaultSafeContractInstance = await (0, safeDeploymentContracts_1.getSafeContract)({
                 ethAdapter,
                 safeVersion: config_1.DEFAULT_SAFE_VERSION,
-                isL1SafeMasterCopy,
+                isL1SafeSingleton,
                 customSafeAddress: safeAddress,
                 customContracts
             });
@@ -56,7 +56,7 @@ class ContractManager {
                 : await (0, safeDeploymentContracts_1.getSafeContract)({
                     ethAdapter,
                     safeVersion,
-                    isL1SafeMasterCopy,
+                    isL1SafeSingleton,
                     customSafeAddress: safeAddress,
                     customContracts
                 }), "f");
@@ -75,8 +75,8 @@ class ContractManager {
     get contractNetworks() {
         return __classPrivateFieldGet(this, _ContractManager_contractNetworks, "f");
     }
-    get isL1SafeMasterCopy() {
-        return __classPrivateFieldGet(this, _ContractManager_isL1SafeMasterCopy, "f");
+    get isL1SafeSingleton() {
+        return __classPrivateFieldGet(this, _ContractManager_isL1SafeSingleton, "f");
     }
     get safeContract() {
         return __classPrivateFieldGet(this, _ContractManager_safeContract, "f");
@@ -88,6 +88,6 @@ class ContractManager {
         return __classPrivateFieldGet(this, _ContractManager_multiSendCallOnlyContract, "f");
     }
 }
-_ContractManager_contractNetworks = new WeakMap(), _ContractManager_isL1SafeMasterCopy = new WeakMap(), _ContractManager_safeContract = new WeakMap(), _ContractManager_multiSendContract = new WeakMap(), _ContractManager_multiSendCallOnlyContract = new WeakMap();
+_ContractManager_contractNetworks = new WeakMap(), _ContractManager_isL1SafeSingleton = new WeakMap(), _ContractManager_safeContract = new WeakMap(), _ContractManager_multiSendContract = new WeakMap(), _ContractManager_multiSendCallOnlyContract = new WeakMap();
 exports.default = ContractManager;
 //# sourceMappingURL=contractManager.js.map

package/dist/src/managers/contractManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"contractManager.js","sourceRoot":"","sources":["../../../src/managers/contractManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,uEAAiF;AACjF,yGAIoE;AAQpE,0CAA8D;AAE9D,MAAM,eAAe;IAArB;QACE,oDAA0C;QAC1C,sDAA6B;QAC7B,gDAA4B;QAC5B,qDAAsC;QACtC,6DAAsD;IA+ExD,CAAC;IA7EC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAkB;QACpC,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC7C,MAAM,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAClC,OAAO,eAAe,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAkB;QAC3B,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,MAAM,CAAA;QAE/F,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,UAAU,EAAE,CAAA;QAC7C,MAAM,eAAe,GAAG,gBAAgB,EAAE,CAAC,OAAO,CAAC,CAAA;QACnD,uBAAA,IAAI,qCAAqB,gBAAgB,MAAA,CAAA;QACzC,uBAAA,IAAI,uCAAuB,kBAAkB,MAAA,CAAA;QAE7C,IAAI,WAAwB,CAAA;QAE5B,IAAI,IAAA,qCAA6B,EAAC,MAAM,CAAC,EAAE;YACzC,WAAW,GAAG,aAAa,EAAE,oBAAoB,EAAE,WAAW,IAAI,6BAAoB,CAAA;SACvF;aAAM;YACL,0FAA0F;YAC1F,MAAM,2BAA2B,GAAG,MAAM,IAAA,yCAAe,EAAC;gBACxD,UAAU;gBACV,WAAW,EAAE,6BAAoB;gBACjC,kBAAkB;gBAClB,iBAAiB,EAAE,WAAW;gBAC9B,eAAe;aAChB,CAAC,CAAA;YAEF,+DAA+D;YAC/D,WAAW,GAAG,MAAM,2BAA2B,CAAC,UAAU,EAAE,CAAA;YAE5D,+EAA+E;YAC/E,MAAM,uBAAuB,GAAG,WAAW,KAAK,6BAAoB,CAAA;YAEpE,uBAAA,IAAI,iCAAiB,uBAAuB;gBAC1C,CAAC,CAAC,2BAA2B;gBAC7B,CAAC,CAAC,MAAM,IAAA,yCAAe,EAAC;oBACpB,UAAU;oBACV,WAAW;oBACX,kBAAkB;oBAClB,iBAAiB,EAAE,WAAW;oBAC9B,eAAe;iBAChB,CAAC,MAAA,CAAA;SACP;QAED,uBAAA,IAAI,sCAAsB,MAAM,IAAA,8CAAoB,EAAC;YACnD,UAAU;YACV,WAAW;YACX,eAAe;SAChB,CAAC,MAAA,CAAA;QAEF,uBAAA,IAAI,8CAA8B,MAAM,IAAA,sDAA4B,EAAC;YACnE,UAAU;YACV,WAAW;YACX,eAAe;SAChB,CAAC,MAAA,CAAA;IACJ,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,uBAAA,IAAI,yCAAkB,CAAA;IAC/B,CAAC;IAED,IAAI,kBAAkB;QACpB,OAAO,uBAAA,IAAI,2CAAoB,CAAA;IACjC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,uBAAA,IAAI,qCAAc,CAAA;IAC3B,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,uBAAA,IAAI,0CAAmB,CAAA;IAChC,CAAC;IAED,IAAI,yBAAyB;QAC3B,OAAO,uBAAA,IAAI,kDAA2B,CAAA;IACxC,CAAC;CACF;;AAED,kBAAe,eAAe,CAAA"}
+{"version":3,"file":"contractManager.js","sourceRoot":"","sources":["../../../src/managers/contractManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,uEAAiF;AACjF,yGAIoE;AAQpE,0CAA8D;AAE9D,MAAM,eAAe;IAArB;QACE,oDAA0C;QAC1C,qDAA4B;QAC5B,gDAA4B;QAC5B,qDAAsC;QACtC,6DAAsD;IA+ExD,CAAC;IA7EC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAkB;QACpC,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC7C,MAAM,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAClC,OAAO,eAAe,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAkB;QAC3B,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,MAAM,CAAA;QAE9F,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,UAAU,EAAE,CAAA;QAC7C,MAAM,eAAe,GAAG,gBAAgB,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC9D,uBAAA,IAAI,qCAAqB,gBAAgB,MAAA,CAAA;QACzC,uBAAA,IAAI,sCAAsB,iBAAiB,MAAA,CAAA;QAE3C,IAAI,WAAwB,CAAA;QAE5B,IAAI,IAAA,qCAA6B,EAAC,MAAM,CAAC,EAAE;YACzC,WAAW,GAAG,aAAa,EAAE,oBAAoB,EAAE,WAAW,IAAI,6BAAoB,CAAA;SACvF;aAAM;YACL,0FAA0F;YAC1F,MAAM,2BAA2B,GAAG,MAAM,IAAA,yCAAe,EAAC;gBACxD,UAAU;gBACV,WAAW,EAAE,6BAAoB;gBACjC,iBAAiB;gBACjB,iBAAiB,EAAE,WAAW;gBAC9B,eAAe;aAChB,CAAC,CAAA;YAEF,+DAA+D;YAC/D,WAAW,GAAG,MAAM,2BAA2B,CAAC,UAAU,EAAE,CAAA;YAE5D,+EAA+E;YAC/E,MAAM,uBAAuB,GAAG,WAAW,KAAK,6BAAoB,CAAA;YAEpE,uBAAA,IAAI,iCAAiB,uBAAuB;gBAC1C,CAAC,CAAC,2BAA2B;gBAC7B,CAAC,CAAC,MAAM,IAAA,yCAAe,EAAC;oBACpB,UAAU;oBACV,WAAW;oBACX,iBAAiB;oBACjB,iBAAiB,EAAE,WAAW;oBAC9B,eAAe;iBAChB,CAAC,MAAA,CAAA;SACP;QAED,uBAAA,IAAI,sCAAsB,MAAM,IAAA,8CAAoB,EAAC;YACnD,UAAU;YACV,WAAW;YACX,eAAe;SAChB,CAAC,MAAA,CAAA;QAEF,uBAAA,IAAI,8CAA8B,MAAM,IAAA,sDAA4B,EAAC;YACnE,UAAU;YACV,WAAW;YACX,eAAe;SAChB,CAAC,MAAA,CAAA;IACJ,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,uBAAA,IAAI,yCAAkB,CAAA;IAC/B,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,uBAAA,IAAI,0CAAmB,CAAA;IAChC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,uBAAA,IAAI,qCAAc,CAAA;IAC3B,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,uBAAA,IAAI,0CAAmB,CAAA;IAChC,CAAC;IAED,IAAI,yBAAyB;QAC3B,OAAO,uBAAA,IAAI,kDAA2B,CAAA;IACxC,CAAC;CACF;;AAED,kBAAe,eAAe,CAAA"}

package/dist/src/managers/fallbackHandlerManager.js

@@ -45,7 +45,7 @@ class FallbackHandlerManager {
         }
         const safeVersion = await __classPrivateFieldGet(this, _FallbackHandlerManager_safeContract, "f").getVersion();
         if ((0, utils_1.hasSafeFeature)(utils_1.SAFE_FEATURES.SAFE_FALLBACK_HANDLER, safeVersion)) {
-            return __classPrivateFieldGet(this, _FallbackHandlerManager_ethAdapter, "f").getStorageAt(__classPrivateFieldGet(this, _FallbackHandlerManager_safeContract, "f").getAddress(), __classPrivateFieldGet(this, _FallbackHandlerManager_slot, "f"));
+            return __classPrivateFieldGet(this, _FallbackHandlerManager_ethAdapter, "f").getStorageAt(await __classPrivateFieldGet(this, _FallbackHandlerManager_safeContract, "f").getAddress(), __classPrivateFieldGet(this, _FallbackHandlerManager_slot, "f"));
         }
         else {
             throw new Error('Current version of the Safe does not support the fallback handler functionality');

package/dist/src/managers/fallbackHandlerManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"fallbackHandlerManager.js","sourceRoot":"","sources":["../../../src/managers/fallbackHandlerManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2DAKwC;AACxC,yEAAwE;AAGxE,MAAM,sBAAsB;IAM1B,YAAY,UAAsB,EAAE,YAA2B;QAL/D,qDAAuB;QACvB,uDAA4B;QAC5B,gDAAgD;QAChD,uCAAQ,oEAAoE,EAAA;QAG1E,uBAAA,IAAI,sCAAe,UAAU,MAAA,CAAA;QAC7B,uBAAA,IAAI,wCAAiB,YAAY,MAAA,CAAA;IACnC,CAAC;IAEO,8BAA8B,CAAC,sBAA8B;QACnE,MAAM,cAAc,GAAG,uBAAA,IAAI,0CAAY,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAA;QACzE,IAAI,CAAC,cAAc,IAAI,IAAA,qBAAa,EAAC,sBAAsB,CAAC,EAAE;YAC5D,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;SAC7D;IACH,CAAC;IAEO,mCAAmC,CACzC,sBAA8B,EAC9B,yBAAiC;QAEjC,IAAI,IAAA,kBAAU,EAAC,sBAAsB,EAAE,yBAAyB,CAAC,EAAE;YACjE,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;SAChE;IACH,CAAC;IAEO,gCAAgC,CAAC,sBAA8B;QACrE,IAAI,IAAA,qBAAa,EAAC,sBAAsB,CAAC,EAAE;YACzC,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;SAC5D;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,IAAI,CAAC,uBAAA,IAAI,4CAAc,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;SACxC;QACD,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,4CAAc,CAAC,UAAU,EAAE,CAAA;QACzD,IAAI,IAAA,sBAAc,EAAC,qBAAa,CAAC,qBAAqB,EAAE,WAAW,CAAC,EAAE;YACpE,OAAO,uBAAA,IAAI,0CAAY,CAAC,YAAY,CAAC,uBAAA,IAAI,4CAAc,CAAC,UAAU,EAAE,EAAE,uBAAA,IAAI,oCAAM,CAAC,CAAA;SAClF;aAAM;YACL,MAAM,IAAI,KAAK,CACb,iFAAiF,CAClF,CAAA;SACF;IACH,CAAC;IAED,KAAK,CAAC,+BAA+B,CAAC,sBAA8B;QAClE,IAAI,CAAC,uBAAA,IAAI,4CAAc,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;SACxC;QACD,IAAI,CAAC,8BAA8B,CAAC,sBAAsB,CAAC,CAAA;QAC3D,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAC9D,IAAI,CAAC,mCAAmC,CAAC,sBAAsB,EAAE,sBAAsB,CAAC,CAAA;QACxF,OAAO,uBAAA,IAAI,4CAAc,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAA;IAClF,CAAC;IAED,KAAK,CAAC,gCAAgC;QACpC,IAAI,CAAC,uBAAA,IAAI,4CAAc,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;SACxC;QACD,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAC9D,IAAI,CAAC,gCAAgC,CAAC,sBAAsB,CAAC,CAAA;QAC7D,OAAO,uBAAA,IAAI,4CAAc,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC,wBAAY,CAAC,CAAC,CAAA;IACxE,CAAC;CACF;;AAED,kBAAe,sBAAsB,CAAA"}
+{"version":3,"file":"fallbackHandlerManager.js","sourceRoot":"","sources":["../../../src/managers/fallbackHandlerManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2DAKwC;AACxC,yEAAwE;AAGxE,MAAM,sBAAsB;IAM1B,YAAY,UAAsB,EAAE,YAA2B;QAL/D,qDAAuB;QACvB,uDAA4B;QAC5B,gDAAgD;QAChD,uCAAQ,oEAAoE,EAAA;QAG1E,uBAAA,IAAI,sCAAe,UAAU,MAAA,CAAA;QAC7B,uBAAA,IAAI,wCAAiB,YAAY,MAAA,CAAA;IACnC,CAAC;IAEO,8BAA8B,CAAC,sBAA8B;QACnE,MAAM,cAAc,GAAG,uBAAA,IAAI,0CAAY,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAA;QACzE,IAAI,CAAC,cAAc,IAAI,IAAA,qBAAa,EAAC,sBAAsB,CAAC,EAAE;YAC5D,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;SAC7D;IACH,CAAC;IAEO,mCAAmC,CACzC,sBAA8B,EAC9B,yBAAiC;QAEjC,IAAI,IAAA,kBAAU,EAAC,sBAAsB,EAAE,yBAAyB,CAAC,EAAE;YACjE,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;SAChE;IACH,CAAC;IAEO,gCAAgC,CAAC,sBAA8B;QACrE,IAAI,IAAA,qBAAa,EAAC,sBAAsB,CAAC,EAAE;YACzC,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;SAC5D;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,IAAI,CAAC,uBAAA,IAAI,4CAAc,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;SACxC;QACD,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,4CAAc,CAAC,UAAU,EAAE,CAAA;QACzD,IAAI,IAAA,sBAAc,EAAC,qBAAa,CAAC,qBAAqB,EAAE,WAAW,CAAC,EAAE;YACpE,OAAO,uBAAA,IAAI,0CAAY,CAAC,YAAY,CAAC,MAAM,uBAAA,IAAI,4CAAc,CAAC,UAAU,EAAE,EAAE,uBAAA,IAAI,oCAAM,CAAC,CAAA;SACxF;aAAM;YACL,MAAM,IAAI,KAAK,CACb,iFAAiF,CAClF,CAAA;SACF;IACH,CAAC;IAED,KAAK,CAAC,+BAA+B,CAAC,sBAA8B;QAClE,IAAI,CAAC,uBAAA,IAAI,4CAAc,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;SACxC;QACD,IAAI,CAAC,8BAA8B,CAAC,sBAAsB,CAAC,CAAA;QAC3D,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAC9D,IAAI,CAAC,mCAAmC,CAAC,sBAAsB,EAAE,sBAAsB,CAAC,CAAA;QACxF,OAAO,uBAAA,IAAI,4CAAc,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAA;IAClF,CAAC;IAED,KAAK,CAAC,gCAAgC;QACpC,IAAI,CAAC,uBAAA,IAAI,4CAAc,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;SACxC;QACD,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAC9D,IAAI,CAAC,gCAAgC,CAAC,sBAAsB,CAAC,CAAA;QAC7D,OAAO,uBAAA,IAAI,4CAAc,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC,wBAAY,CAAC,CAAC,CAAA;IACxE,CAAC;CACF;;AAED,kBAAe,sBAAsB,CAAA"}

package/dist/src/managers/guardManager.js

@@ -45,7 +45,7 @@ class GuardManager {
         }
         const safeVersion = await __classPrivateFieldGet(this, _GuardManager_safeContract, "f").getVersion();
         if ((0, utils_1.hasSafeFeature)(utils_1.SAFE_FEATURES.SAFE_TX_GUARDS, safeVersion)) {
-            return __classPrivateFieldGet(this, _GuardManager_ethAdapter, "f").getStorageAt(__classPrivateFieldGet(this, _GuardManager_safeContract, "f").getAddress(), __classPrivateFieldGet(this, _GuardManager_slot, "f"));
+            return __classPrivateFieldGet(this, _GuardManager_ethAdapter, "f").getStorageAt(await __classPrivateFieldGet(this, _GuardManager_safeContract, "f").getAddress(), __classPrivateFieldGet(this, _GuardManager_slot, "f"));
         }
         else {
             throw new Error('Current version of the Safe does not support Safe transaction guards functionality');

package/dist/src/managers/guardManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"guardManager.js","sourceRoot":"","sources":["../../../src/managers/guardManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2DAKwC;AACxC,yEAAwE;AAGxE,MAAM,YAAY;IAMhB,YAAY,UAAsB,EAAE,YAA2B;QAL/D,2CAAuB;QACvB,6CAA4B;QAC5B,2CAA2C;QAC3C,6BAAQ,oEAAoE,EAAA;QAG1E,uBAAA,IAAI,4BAAe,UAAU,MAAA,CAAA;QAC7B,uBAAA,IAAI,8BAAiB,YAAY,MAAA,CAAA;IACnC,CAAC;IAEO,oBAAoB,CAAC,YAAoB;QAC/C,MAAM,cAAc,GAAG,uBAAA,IAAI,gCAAY,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QAC/D,IAAI,CAAC,cAAc,IAAI,IAAA,qBAAa,EAAC,YAAY,CAAC,EAAE;YAClD,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;SAClD;IACH,CAAC;IAEO,yBAAyB,CAAC,YAAoB,EAAE,eAAuB;QAC7E,IAAI,IAAA,kBAAU,EAAC,YAAY,EAAE,eAAe,CAAC,EAAE;YAC7C,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;SACrD;IACH,CAAC;IAEO,sBAAsB,CAAC,YAAoB;QACjD,IAAI,IAAA,qBAAa,EAAC,YAAY,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;SACjD;IACH,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,IAAI,CAAC,uBAAA,IAAI,kCAAc,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;SACxC;QACD,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,kCAAc,CAAC,UAAU,EAAE,CAAA;QACzD,IAAI,IAAA,sBAAc,EAAC,qBAAa,CAAC,cAAc,EAAE,WAAW,CAAC,EAAE;YAC7D,OAAO,uBAAA,IAAI,gCAAY,CAAC,YAAY,CAAC,uBAAA,IAAI,kCAAc,CAAC,UAAU,EAAE,EAAE,uBAAA,IAAI,0BAAM,CAAC,CAAA;SAClF;aAAM;YACL,MAAM,IAAI,KAAK,CACb,oFAAoF,CACrF,CAAA;SACF;IACH,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,YAAoB;QAC9C,IAAI,CAAC,uBAAA,IAAI,kCAAc,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;SACxC;QACD,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAA;QACvC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;QAC1C,IAAI,CAAC,yBAAyB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;QAC1D,OAAO,uBAAA,IAAI,kCAAc,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;IAC9D,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B,IAAI,CAAC,uBAAA,IAAI,kCAAc,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;SACxC;QACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;QAC1C,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAA;QACzC,OAAO,uBAAA,IAAI,kCAAc,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,wBAAY,CAAC,CAAC,CAAA;IAC9D,CAAC;CACF;;AAED,kBAAe,YAAY,CAAA"}
+{"version":3,"file":"guardManager.js","sourceRoot":"","sources":["../../../src/managers/guardManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2DAKwC;AACxC,yEAAwE;AAGxE,MAAM,YAAY;IAMhB,YAAY,UAAsB,EAAE,YAA2B;QAL/D,2CAAuB;QACvB,6CAA4B;QAC5B,2CAA2C;QAC3C,6BAAQ,oEAAoE,EAAA;QAG1E,uBAAA,IAAI,4BAAe,UAAU,MAAA,CAAA;QAC7B,uBAAA,IAAI,8BAAiB,YAAY,MAAA,CAAA;IACnC,CAAC;IAEO,oBAAoB,CAAC,YAAoB;QAC/C,MAAM,cAAc,GAAG,uBAAA,IAAI,gCAAY,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QAC/D,IAAI,CAAC,cAAc,IAAI,IAAA,qBAAa,EAAC,YAAY,CAAC,EAAE;YAClD,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;SAClD;IACH,CAAC;IAEO,yBAAyB,CAAC,YAAoB,EAAE,eAAuB;QAC7E,IAAI,IAAA,kBAAU,EAAC,YAAY,EAAE,eAAe,CAAC,EAAE;YAC7C,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;SACrD;IACH,CAAC;IAEO,sBAAsB,CAAC,YAAoB;QACjD,IAAI,IAAA,qBAAa,EAAC,YAAY,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;SACjD;IACH,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,IAAI,CAAC,uBAAA,IAAI,kCAAc,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;SACxC;QACD,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,kCAAc,CAAC,UAAU,EAAE,CAAA;QACzD,IAAI,IAAA,sBAAc,EAAC,qBAAa,CAAC,cAAc,EAAE,WAAW,CAAC,EAAE;YAC7D,OAAO,uBAAA,IAAI,gCAAY,CAAC,YAAY,CAAC,MAAM,uBAAA,IAAI,kCAAc,CAAC,UAAU,EAAE,EAAE,uBAAA,IAAI,0BAAM,CAAC,CAAA;SACxF;aAAM;YACL,MAAM,IAAI,KAAK,CACb,oFAAoF,CACrF,CAAA;SACF;IACH,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,YAAoB;QAC9C,IAAI,CAAC,uBAAA,IAAI,kCAAc,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;SACxC;QACD,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAA;QACvC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;QAC1C,IAAI,CAAC,yBAAyB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;QAC1D,OAAO,uBAAA,IAAI,kCAAc,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;IAC9D,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B,IAAI,CAAC,uBAAA,IAAI,kCAAc,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;SACxC;QACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;QAC1C,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAA;QACzC,OAAO,uBAAA,IAAI,kCAAc,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,wBAAY,CAAC,CAAC,CAAA;IAC9D,CAAC;CACF;;AAED,kBAAe,YAAY,CAAA"}

package/dist/src/safeFactory/index.d.ts

@@ -12,19 +12,19 @@ export interface SafeFactoryConfig {
     ethAdapter: EthAdapter;
     /** safeVersion - Versions of the Safe deployed by this Factory contract */
     safeVersion?: SafeVersion;
-    /** isL1SafeMasterCopy - Forces to use the Safe L1 version of the contract instead of the L2 version */
-    isL1SafeMasterCopy?: boolean;
+    /** isL1SafeSingleton - Forces to use the Safe L1 version of the contract instead of the L2 version */
+    isL1SafeSingleton?: boolean;
     /** contractNetworks - Contract network configuration */
     contractNetworks?: ContractNetworksConfig;
 }
 declare class SafeFactory {
     #private;
-    static create({ ethAdapter, safeVersion, isL1SafeMasterCopy, contractNetworks }: SafeFactoryConfig): Promise<SafeFactory>;
+    static create({ ethAdapter, safeVersion, isL1SafeSingleton, contractNetworks }: SafeFactoryConfig): Promise<SafeFactory>;
     private init;
     getEthAdapter(): EthAdapter;
     getSafeVersion(): SafeVersion;
-    getAddress(): string;
-    getChainId(): Promise<number>;
+    getAddress(): Promise<string>;
+    getChainId(): Promise<bigint>;
     predictSafeAddress(safeAccountConfig: SafeAccountConfig, saltNonce?: string): Promise<string>;
     deploySafe({ safeAccountConfig, saltNonce, options, callback }: DeploySafeProps): Promise<Safe>;
 }