@safe-global/protocol-kit 3.1.0 → 4.0.0-alpha.0

package/dist/src/contracts/safeDeploymentContracts.js

@@ -1,178 +1,105 @@
 "use strict";
 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, isL1SafeSingleton = false) {
-    const version = config_1.safeDeploymentsVersions[safeVersion].safeSingletonVersion;
-    const filters = { version, network: chainId.toString(), released: true };
-    if (config_1.safeDeploymentsL1ChainIds.includes(chainId) || isL1SafeSingleton) {
-        return (0, safe_deployments_1.getSafeSingletonDeployment)(filters);
-    }
-    return (0, safe_deployments_1.getSafeL2SingletonDeployment)(filters);
-}
-exports.getSafeContractDeployment = getSafeContractDeployment;
-function getCompatibilityFallbackHandlerContractDeployment(safeVersion, chainId) {
-    const version = config_1.safeDeploymentsVersions[safeVersion].compatibilityFallbackHandler;
-    return (0, safe_deployments_1.getCompatibilityFallbackHandlerDeployment)({
-        version,
-        network: chainId.toString(),
-        released: true
-    });
-}
-exports.getCompatibilityFallbackHandlerContractDeployment = getCompatibilityFallbackHandlerContractDeployment;
-function getMultiSendCallOnlyContractDeployment(safeVersion, chainId) {
-    const version = config_1.safeDeploymentsVersions[safeVersion].multiSendCallOnlyVersion;
-    return (0, safe_deployments_1.getMultiSendCallOnlyDeployment)({ version, network: chainId.toString(), released: true });
-}
-exports.getMultiSendCallOnlyContractDeployment = getMultiSendCallOnlyContractDeployment;
-function getMultiSendContractDeployment(safeVersion, chainId) {
-    const version = config_1.safeDeploymentsVersions[safeVersion].multiSendVersion;
-    return (0, safe_deployments_1.getMultiSendDeployment)({ version, network: chainId.toString(), released: true });
-}
-exports.getMultiSendContractDeployment = getMultiSendContractDeployment;
-function getSafeProxyFactoryContractDeployment(safeVersion, chainId) {
-    const version = config_1.safeDeploymentsVersions[safeVersion].safeProxyFactoryVersion;
-    return (0, safe_deployments_1.getProxyFactoryDeployment)({ version, network: chainId.toString(), released: true });
-}
-exports.getSafeProxyFactoryContractDeployment = getSafeProxyFactoryContractDeployment;
-function getSignMessageLibContractDeployment(safeVersion, chainId) {
-    const version = config_1.safeDeploymentsVersions[safeVersion].signMessageLibVersion;
-    return (0, safe_deployments_1.getSignMessageLibDeployment)({ version, network: chainId.toString(), released: true });
-}
-exports.getSignMessageLibContractDeployment = getSignMessageLibContractDeployment;
-function getCreateCallContractDeployment(safeVersion, chainId) {
-    const version = config_1.safeDeploymentsVersions[safeVersion].createCallVersion;
-    return (0, safe_deployments_1.getCreateCallDeployment)({ version, network: chainId.toString(), released: true });
-}
-exports.getCreateCallContractDeployment = getCreateCallContractDeployment;
-function getSimulateTxAccessorContractDeployment(safeVersion, chainId) {
-    const version = config_1.safeDeploymentsVersions[safeVersion].createCallVersion;
-    return (0, safe_deployments_1.getSimulateTxAccessorDeployment)({ version, network: chainId.toString(), released: true });
-}
-exports.getSimulateTxAccessorContractDeployment = getSimulateTxAccessorContractDeployment;
-async function getSafeContract({ ethAdapter, safeVersion, customSafeAddress, isL1SafeSingleton, customContracts }) {
-    const chainId = await ethAdapter.getChainId();
-    const singletonDeployment = getSafeContractDeployment(safeVersion, chainId, isL1SafeSingleton);
-    const safeContract = await ethAdapter.getSafeContract({
+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,
-        singletonDeployment,
         customContractAddress: customSafeAddress ?? customContracts?.safeSingletonAddress,
-        customContractAbi: customContracts?.safeSingletonAbi
+        customContractAbi: customContracts?.safeSingletonAbi,
+        isL1SafeSingleton
     });
-    const isContractDeployed = await ethAdapter.isContractDeployed(await safeContract.getAddress());
+    const isContractDeployed = await safeProvider.isContractDeployed(await safeContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('SafeProxy contract is not deployed on the current network');
     }
     return safeContract;
 }
 exports.getSafeContract = getSafeContract;
-async function getProxyFactoryContract({ ethAdapter, safeVersion, customContracts }) {
-    const chainId = await ethAdapter.getChainId();
-    const proxyFactoryDeployment = getSafeProxyFactoryContractDeployment(safeVersion, chainId);
-    const safeProxyFactoryContract = await ethAdapter.getSafeProxyFactoryContract({
+async function getProxyFactoryContract({ safeProvider, safeVersion, customContracts }) {
+    const safeProxyFactoryContract = await safeProvider.getSafeProxyFactoryContract({
         safeVersion,
-        singletonDeployment: proxyFactoryDeployment,
         customContractAddress: customContracts?.safeProxyFactoryAddress,
         customContractAbi: customContracts?.safeProxyFactoryAbi
     });
-    const isContractDeployed = await ethAdapter.isContractDeployed(await safeProxyFactoryContract.getAddress());
+    const isContractDeployed = await safeProvider.isContractDeployed(await safeProxyFactoryContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('SafeProxyFactory contract is not deployed on the current network');
     }
     return safeProxyFactoryContract;
 }
 exports.getProxyFactoryContract = getProxyFactoryContract;
-async function getCompatibilityFallbackHandlerContract({ ethAdapter, safeVersion, customContracts }) {
-    const chainId = await ethAdapter.getChainId();
-    const fallbackHandlerDeployment = getCompatibilityFallbackHandlerContractDeployment(safeVersion, chainId);
-    const fallbackHandlerContract = await ethAdapter.getCompatibilityFallbackHandlerContract({
+async function getCompatibilityFallbackHandlerContract({ safeProvider, safeVersion, customContracts }) {
+    const fallbackHandlerContract = await safeProvider.getCompatibilityFallbackHandlerContract({
         safeVersion,
-        singletonDeployment: fallbackHandlerDeployment,
         customContractAddress: customContracts?.fallbackHandlerAddress,
         customContractAbi: customContracts?.fallbackHandlerAbi
     });
-    const isContractDeployed = await ethAdapter.isContractDeployed(await fallbackHandlerContract.getAddress());
+    const isContractDeployed = await safeProvider.isContractDeployed(await fallbackHandlerContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('CompatibilityFallbackHandler contract is not deployed on the current network');
     }
     return fallbackHandlerContract;
 }
 exports.getCompatibilityFallbackHandlerContract = getCompatibilityFallbackHandlerContract;
-async function getMultiSendContract({ ethAdapter, safeVersion, customContracts }) {
-    const chainId = await ethAdapter.getChainId();
-    const multiSendDeployment = getMultiSendContractDeployment(safeVersion, chainId);
-    const multiSendContract = await ethAdapter.getMultiSendContract({
+async function getMultiSendContract({ safeProvider, safeVersion, customContracts }) {
+    const multiSendContract = await safeProvider.getMultiSendContract({
         safeVersion,
-        singletonDeployment: multiSendDeployment,
         customContractAddress: customContracts?.multiSendAddress,
         customContractAbi: customContracts?.multiSendAbi
     });
-    const isContractDeployed = await ethAdapter.isContractDeployed(await multiSendContract.getAddress());
+    const isContractDeployed = await safeProvider.isContractDeployed(await multiSendContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('MultiSend contract is not deployed on the current network');
     }
     return multiSendContract;
 }
 exports.getMultiSendContract = getMultiSendContract;
-async function getMultiSendCallOnlyContract({ ethAdapter, safeVersion, customContracts }) {
-    const chainId = await ethAdapter.getChainId();
-    const multiSendCallOnlyDeployment = getMultiSendCallOnlyContractDeployment(safeVersion, chainId);
-    const multiSendCallOnlyContract = await ethAdapter.getMultiSendCallOnlyContract({
+async function getMultiSendCallOnlyContract({ safeProvider, safeVersion, customContracts }) {
+    const multiSendCallOnlyContract = await safeProvider.getMultiSendCallOnlyContract({
         safeVersion,
-        singletonDeployment: multiSendCallOnlyDeployment,
         customContractAddress: customContracts?.multiSendCallOnlyAddress,
         customContractAbi: customContracts?.multiSendCallOnlyAbi
     });
-    const isContractDeployed = await ethAdapter.isContractDeployed(await multiSendCallOnlyContract.getAddress());
+    const isContractDeployed = await safeProvider.isContractDeployed(await multiSendCallOnlyContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('MultiSendCallOnly contract is not deployed on the current network');
     }
     return multiSendCallOnlyContract;
 }
 exports.getMultiSendCallOnlyContract = getMultiSendCallOnlyContract;
-async function getSignMessageLibContract({ ethAdapter, safeVersion, customContracts }) {
-    const chainId = await ethAdapter.getChainId();
-    const signMessageLibDeployment = getSignMessageLibContractDeployment(safeVersion, chainId);
-    const signMessageLibContract = await ethAdapter.getSignMessageLibContract({
+async function getSignMessageLibContract({ safeProvider, safeVersion, customContracts }) {
+    const signMessageLibContract = await safeProvider.getSignMessageLibContract({
         safeVersion,
-        singletonDeployment: signMessageLibDeployment,
         customContractAddress: customContracts?.signMessageLibAddress,
         customContractAbi: customContracts?.signMessageLibAbi
     });
-    const isContractDeployed = await ethAdapter.isContractDeployed(await signMessageLibContract.getAddress());
+    const isContractDeployed = await safeProvider.isContractDeployed(await signMessageLibContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('SignMessageLib contract is not deployed on the current network');
     }
     return signMessageLibContract;
 }
 exports.getSignMessageLibContract = getSignMessageLibContract;
-async function getCreateCallContract({ ethAdapter, safeVersion, customContracts }) {
-    const chainId = await ethAdapter.getChainId();
-    const createCallDeployment = getCreateCallContractDeployment(safeVersion, chainId);
-    const createCallContract = await ethAdapter.getCreateCallContract({
+async function getCreateCallContract({ safeProvider, safeVersion, customContracts }) {
+    const createCallContract = await safeProvider.getCreateCallContract({
         safeVersion,
-        singletonDeployment: createCallDeployment,
         customContractAddress: customContracts?.createCallAddress,
         customContractAbi: customContracts?.createCallAbi
     });
-    const isContractDeployed = await ethAdapter.isContractDeployed(await createCallContract.getAddress());
+    const isContractDeployed = await safeProvider.isContractDeployed(await createCallContract.getAddress());
     if (!isContractDeployed) {
         throw new Error('CreateCall contract is not deployed on the current network');
     }
     return createCallContract;
 }
 exports.getCreateCallContract = getCreateCallContract;
-async function getSimulateTxAccessorContract({ ethAdapter, safeVersion, customContracts }) {
-    const chainId = await ethAdapter.getChainId();
-    const simulateTxAccessorDeployment = getSimulateTxAccessorContractDeployment(safeVersion, chainId);
-    const simulateTxAccessorContract = await ethAdapter.getSimulateTxAccessorContract({
+async function getSimulateTxAccessorContract({ safeProvider, safeVersion, customContracts }) {
+    const simulateTxAccessorContract = await safeProvider.getSimulateTxAccessorContract({
         safeVersion,
-        singletonDeployment: simulateTxAccessorDeployment,
         customContractAddress: customContracts?.simulateTxAccessorAddress,
         customContractAbi: customContracts?.simulateTxAccessorAbi
     });
-    const isContractDeployed = await ethAdapter.isContractDeployed(await simulateTxAccessorContract.getAddress());
+    const isContractDeployed = await safeProvider.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,9 +1,11 @@
 /// <reference types="node" />
-import { EthAdapter, SafeContract, SafeProxyFactoryContract, SafeVersion } from '@safe-global/safe-core-sdk-types';
-import { ContractNetworkConfig, SafeAccountConfig, SafeDeploymentConfig } from '../types';
+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 SafeProvider from '../SafeProvider';
 export declare const PREDETERMINED_SALT_NONCE = "0xb1073742015cbcf5a3a4d9d1ae33ecf619439710b89475f92e2abd2117e90f90";
 export interface PredictSafeAddressProps {
-    ethAdapter: EthAdapter;
+    safeProvider: SafeProvider;
     chainId: bigint;
     safeAccountConfig: SafeAccountConfig;
     safeDeploymentConfig?: SafeDeploymentConfig;
@@ -11,14 +13,14 @@ export interface PredictSafeAddressProps {
     customContracts?: ContractNetworkConfig;
 }
 export interface encodeSetupCallDataProps {
-    ethAdapter: EthAdapter;
+    safeProvider: SafeProvider;
     safeAccountConfig: SafeAccountConfig;
-    safeContract: SafeContract;
+    safeContract: SafeContractImplementationType;
     customContracts?: ContractNetworkConfig;
     customSafeVersion?: SafeVersion;
 }
-export declare function encodeCreateProxyWithNonce(safeProxyFactoryContract: SafeProxyFactoryContract, safeSingletonAddress: string, initializer: string, salt?: string): string;
-export declare function encodeSetupCallData({ ethAdapter, safeAccountConfig, safeContract, customContracts, customSafeVersion }: encodeSetupCallDataProps): Promise<string>;
+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>;
 /**
  * Provides a chain-specific default salt nonce for generating unique addresses
  * for the same Safe configuration across different chains.
@@ -27,8 +29,8 @@ export declare function encodeSetupCallData({ ethAdapter, safeAccountConfig, saf
  * @returns {string} The chain-specific salt nonce in hexadecimal format.
  */
 export declare function getChainSpecificDefaultSaltNonce(chainId: bigint): string;
-export declare function getPredictedSafeAddressInitCode({ ethAdapter, chainId, safeAccountConfig, safeDeploymentConfig, isL1SafeSingleton, customContracts }: PredictSafeAddressProps): Promise<string>;
-export declare function predictSafeAddress({ ethAdapter, chainId, safeAccountConfig, safeDeploymentConfig, isL1SafeSingleton, customContracts }: PredictSafeAddressProps): Promise<string>;
+export declare function getPredictedSafeAddressInitCode({ safeProvider, chainId, safeAccountConfig, safeDeploymentConfig, isL1SafeSingleton, customContracts }: PredictSafeAddressProps): Promise<string>;
+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;
 /**
@@ -43,3 +45,12 @@ export declare const validateSafeDeploymentConfig: ({ saltNonce }: SafeDeploymen
  * @returns {string} The derived zkSync Era address.
  */
 export declare function zkSyncEraCreate2Address(from: string, safeVersion: SafeVersion, salt: Buffer, input: string): string;
+export declare function sameString(str1: string, str2: string): boolean;
+export declare function toTxResult(transactionResponse: ContractTransactionResponse, options?: TransactionOptions): TransactionResult;
+export declare function isTypedDataSigner(signer: any): signer is AbstractSigner;
+/**
+ * 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;

package/dist/src/contracts/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.zkSyncEraCreate2Address = exports.validateSafeDeploymentConfig = exports.validateSafeAccountConfig = exports.predictSafeAddress = exports.getPredictedSafeAddressInitCode = exports.getChainSpecificDefaultSaltNonce = exports.encodeSetupCallData = exports.encodeCreateProxyWithNonce = exports.PREDETERMINED_SALT_NONCE = void 0;
+exports.isSignerCompatible = exports.isTypedDataSigner = exports.toTxResult = exports.sameString = 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");
 const config_1 = require("../contracts/config");
@@ -35,12 +35,12 @@ function encodeCreateProxyWithNonce(safeProxyFactoryContract, safeSingletonAddre
     return safeProxyFactoryContract.encode('createProxyWithNonce', [
         safeSingletonAddress,
         initializer,
-        salt || exports.PREDETERMINED_SALT_NONCE
+        BigInt(salt || exports.PREDETERMINED_SALT_NONCE)
     ]);
 }
 exports.encodeCreateProxyWithNonce = encodeCreateProxyWithNonce;
 const memoizedGetCompatibilityFallbackHandlerContract = (0, memoized_1.createMemoizedFunction)(safeDeploymentContracts_1.getCompatibilityFallbackHandlerContract);
-async function encodeSetupCallData({ ethAdapter, safeAccountConfig, safeContract, customContracts, customSafeVersion }) {
+async function encodeSetupCallData({ safeProvider, safeAccountConfig, safeContract, customContracts, customSafeVersion }) {
     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());
     if ((0, satisfies_1.default)(safeVersion, '<=1.0.0')) {
@@ -58,7 +58,7 @@ async function encodeSetupCallData({ ethAdapter, safeAccountConfig, safeContract
     const isValidAddress = fallbackHandlerAddress !== undefined && (0, ethers_1.isAddress)(fallbackHandlerAddress);
     if (!isValidAddress) {
         const fallbackHandlerContract = await memoizedGetCompatibilityFallbackHandlerContract({
-            ethAdapter,
+            safeProvider,
             safeVersion,
             customContracts
         });
@@ -76,17 +76,17 @@ async function encodeSetupCallData({ ethAdapter, safeAccountConfig, safeContract
     ]);
 }
 exports.encodeSetupCallData = encodeSetupCallData;
-const memoizedGetProxyFactoryContract = (0, memoized_1.createMemoizedFunction)(({ ethAdapter, safeVersion, customContracts }) => (0, safeDeploymentContracts_1.getProxyFactoryContract)({ ethAdapter, safeVersion, customContracts }));
-const memoizedGetProxyCreationCode = (0, memoized_1.createMemoizedFunction)(async ({ ethAdapter, safeVersion, customContracts, chainId }) => {
+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 safeProxyFactoryContract = await memoizedGetProxyFactoryContract({
-        ethAdapter,
+        safeProvider,
         safeVersion,
         customContracts,
         chainId
     });
     return safeProxyFactoryContract.proxyCreationCode();
 });
-const memoizedGetSafeContract = (0, memoized_1.createMemoizedFunction)(({ ethAdapter, safeVersion, isL1SafeSingleton, customContracts }) => (0, safeDeploymentContracts_1.getSafeContract)({ ethAdapter, safeVersion, isL1SafeSingleton, customContracts }));
+const memoizedGetSafeContract = (0, memoized_1.createMemoizedFunction)(({ safeProvider, safeVersion, isL1SafeSingleton, customContracts }) => (0, safeDeploymentContracts_1.getSafeContract)({ safeProvider, safeVersion, isL1SafeSingleton, customContracts }));
 /**
  * Provides a chain-specific default salt nonce for generating unique addresses
  * for the same Safe configuration across different chains.
@@ -98,31 +98,31 @@ function getChainSpecificDefaultSaltNonce(chainId) {
     return `0x${Buffer.from((0, sha3_1.keccak_256)(exports.PREDETERMINED_SALT_NONCE + chainId)).toString('hex')}`;
 }
 exports.getChainSpecificDefaultSaltNonce = getChainSpecificDefaultSaltNonce;
-async function getPredictedSafeAddressInitCode({ ethAdapter, chainId, safeAccountConfig, safeDeploymentConfig = {}, isL1SafeSingleton = false, customContracts }) {
+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 safeProxyFactoryContract = await memoizedGetProxyFactoryContract({
-        ethAdapter,
+        safeProvider,
         safeVersion,
         customContracts,
         chainId: chainId.toString()
     });
     const safeContract = await memoizedGetSafeContract({
-        ethAdapter,
+        safeProvider,
         safeVersion,
         isL1SafeSingleton,
         customContracts,
         chainId: chainId.toString()
     });
     const initializer = await encodeSetupCallData({
-        ethAdapter,
+        safeProvider,
         safeAccountConfig,
         safeContract,
         customContracts,
         customSafeVersion: safeVersion // it is more efficient if we provide the safeVersion manually
     });
-    const encodedNonce = (0, ethereumjs_util_1.toBuffer)(ethAdapter.encodeParameters(['uint256'], [saltNonce])).toString('hex');
+    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();
@@ -130,51 +130,50 @@ async function getPredictedSafeAddressInitCode({ ethAdapter, chainId, safeAccoun
     return initCode;
 }
 exports.getPredictedSafeAddressInitCode = getPredictedSafeAddressInitCode;
-async function predictSafeAddress({ ethAdapter, chainId, safeAccountConfig, safeDeploymentConfig = {}, isL1SafeSingleton = false, customContracts }) {
+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 safeProxyFactoryContract = await memoizedGetProxyFactoryContract({
-        ethAdapter,
+        safeProvider,
         safeVersion,
         customContracts,
         chainId: chainId.toString()
     });
     const proxyCreationCode = await memoizedGetProxyCreationCode({
-        ethAdapter,
+        safeProvider,
         safeVersion,
         customContracts,
         chainId: chainId.toString()
     });
     const safeContract = await memoizedGetSafeContract({
-        ethAdapter,
+        safeProvider,
         safeVersion,
         isL1SafeSingleton,
         customContracts,
         chainId: chainId.toString()
     });
     const initializer = await encodeSetupCallData({
-        ethAdapter,
+        safeProvider,
         safeAccountConfig,
         safeContract,
         customContracts,
         customSafeVersion: safeVersion // it is more efficient if we provide the safeVersion manually
     });
-    const encodedNonce = (0, ethereumjs_util_1.toBuffer)(ethAdapter.encodeParameters(['uint256'], [saltNonce])).toString('hex');
+    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 = ethAdapter.encodeParameters(['address'], [await safeContract.getAddress()]);
+    const input = safeProvider.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);
+        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 predictedAddress = ethAdapter.getChecksummedAddress(proxyAddress);
-    return predictedAddress;
+    return safeProvider.getChecksummedAddress(proxyAddress);
 }
 exports.predictSafeAddress = predictSafeAddress;
 const validateSafeAccountConfig = ({ owners, threshold }) => {
@@ -215,4 +214,33 @@ function zkSyncEraCreate2Address(from, safeVersion, salt, input) {
     return addressBytes;
 }
 exports.zkSyncEraCreate2Address = zkSyncEraCreate2Address;
+function sameString(str1, str2) {
+    return str1.toLowerCase() === str2.toLowerCase();
+}
+exports.sameString = sameString;
+function toTxResult(transactionResponse, options) {
+    return {
+        hash: transactionResponse.hash,
+        options,
+        transactionResponse
+    };
+}
+exports.toTxResult = toTxResult;
+function isTypedDataSigner(signer) {
+    return signer.signTypedData !== undefined;
+}
+exports.isTypedDataSigner = isTypedDataSigner;
+/**
+ * Check if the signerOrProvider is compatible with `Signer`
+ * @param signerOrProvider - Signer or provider
+ * @returns true if the parameter is compatible with `Signer`
+ */
+function isSignerCompatible(signerOrProvider) {
+    const candidate = signerOrProvider;
+    const isSigntransactionCompatible = typeof candidate.signTransaction === 'function';
+    const isSignMessageCompatible = typeof candidate.signMessage === 'function';
+    const isGetAddressCompatible = typeof candidate.getAddress === 'function';
+    return isSigntransactionCompatible && isSignMessageCompatible && isGetAddressCompatible;
+}
+exports.isSignerCompatible = isSignerCompatible;
 //# 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

@@ -1,17 +1,17 @@
 import Safe from './Safe';
-import { CreateCallEthersContract, CreateProxyProps as CreateEthersProxyProps, EthersAdapter, EthersAdapterConfig, EthersTransactionOptions, EthersTransactionResult, MultiSendCallOnlyEthersContract, MultiSendEthersContract, SafeContractEthers, SafeProxyFactoryEthersContract, SignMessageLibEthersContract } from './adapters/ethers';
-import { CreateCallWeb3Contract, CreateProxyProps as CreateWeb3ProxyProps, MultiSendCallOnlyWeb3Contract, MultiSendWeb3Contract, SafeContractWeb3, SafeProxyFactoryWeb3Contract, SignMessageLibWeb3Contract, Web3Adapter, Web3AdapterConfig, Web3TransactionOptions, Web3TransactionResult } from './adapters/web3';
+import SafeProvider from './SafeProvider';
+import { CreateCallBaseContract, MultiSendBaseContract, MultiSendCallOnlyBaseContract, SafeBaseContract, SafeProxyFactoryBaseContract, SignMessageLibBaseContract } from './contracts';
 import { DEFAULT_SAFE_VERSION } from './contracts/config';
 import { getCompatibilityFallbackHandlerContract, getCreateCallContract, getMultiSendCallOnlyContract, getMultiSendContract, getProxyFactoryContract, getSafeContract, getSignMessageLibContract } from './contracts/safeDeploymentContracts';
 import { PREDETERMINED_SALT_NONCE, encodeCreateProxyWithNonce, encodeSetupCallData, predictSafeAddress, getPredictedSafeAddressInitCode } from './contracts/utils';
 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, SigningMethod } from './types';
+import SafeFactory from './SafeFactory';
 import { EthSafeSignature, estimateTxBaseGas, estimateTxGas, estimateSafeTxGas, estimateSafeDeploymentGas, validateEthereumAddress, validateEip3770Address } from './utils';
 import { SafeTransactionOptionalProps } from './utils/transactions/types';
 import { encodeMultiSendData, standardizeSafeTransactionData } from './utils/transactions/utils';
 import { getERC20Decimals, isGasTokenCompatibleWithHandlePayment, createERC20TokenTransferTransaction } from './utils/erc-20';
 import { generateSignature, generateEIP712Signature, buildContractSignature, buildSignatureBytes, preimageSafeTransactionHash, preimageSafeMessageHash } from './utils/signatures/utils';
 import { getEip712TxTypes, getEip712MessageTypes, hashSafeMessage, generateTypedData } from './utils/eip-712';
-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, SigningMethod, Web3Adapter, Web3AdapterConfig, Web3TransactionOptions, Web3TransactionResult, encodeCreateProxyWithNonce, encodeMultiSendData, encodeSetupCallData, getCompatibilityFallbackHandlerContract, getCreateCallContract, getERC20Decimals, getMultiSendCallOnlyContract, getMultiSendContract, getProxyFactoryContract, getSafeContract, getSignMessageLibContract, isGasTokenCompatibleWithHandlePayment, predictSafeAddress, getPredictedSafeAddressInitCode, standardizeSafeTransactionData, validateEip3770Address, validateEthereumAddress, generateSignature, generateEIP712Signature, buildContractSignature, buildSignatureBytes, preimageSafeTransactionHash, preimageSafeMessageHash, getEip712TxTypes, getEip712MessageTypes, hashSafeMessage, generateTypedData };
+export { estimateTxBaseGas, estimateTxGas, estimateSafeTxGas, estimateSafeDeploymentGas, ContractManager, CreateCallBaseContract, createERC20TokenTransferTransaction, DEFAULT_SAFE_VERSION, EthSafeSignature, MultiSendCallOnlyBaseContract, MultiSendBaseContract, PREDETERMINED_SALT_NONCE, SafeBaseContract, SafeFactory, SafeProxyFactoryBaseContract, SafeTransactionOptionalProps, SignMessageLibBaseContract, encodeCreateProxyWithNonce, encodeMultiSendData, encodeSetupCallData, getCompatibilityFallbackHandlerContract, getCreateCallContract, getERC20Decimals, getMultiSendCallOnlyContract, getMultiSendContract, getProxyFactoryContract, getSafeContract, getSignMessageLibContract, isGasTokenCompatibleWithHandlePayment, predictSafeAddress, getPredictedSafeAddressInitCode, standardizeSafeTransactionData, validateEip3770Address, validateEthereumAddress, generateSignature, generateEIP712Signature, buildContractSignature, buildSignatureBytes, preimageSafeTransactionHash, preimageSafeMessageHash, getEip712TxTypes, getEip712MessageTypes, hashSafeMessage, generateTypedData, SafeProvider };
+export * from './types';
 export default Safe;