@safe-global/protocol-kit 3.1.1 → 4.0.0

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.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,29 @@ function zkSyncEraCreate2Address(from, safeVersion, salt, input) {
     return addressBytes;
 }
 exports.zkSyncEraCreate2Address = zkSyncEraCreate2Address;
+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;

package/dist/src/index.js

@@ -1,27 +1,33 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEip712MessageTypes = exports.getEip712TxTypes = exports.preimageSafeMessageHash = exports.preimageSafeTransactionHash = exports.buildSignatureBytes = exports.buildContractSignature = exports.generateEIP712Signature = exports.generateSignature = exports.validateEthereumAddress = exports.validateEip3770Address = exports.standardizeSafeTransactionData = exports.getPredictedSafeAddressInitCode = 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.SigningMethod = 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.generateTypedData = exports.hashSafeMessage = void 0;
+exports.SafeProvider = exports.generateTypedData = exports.hashSafeMessage = exports.getEip712MessageTypes = exports.getEip712TxTypes = exports.preimageSafeMessageHash = exports.preimageSafeTransactionHash = exports.buildSignatureBytes = exports.buildContractSignature = exports.generateEIP712Signature = exports.generateSignature = exports.validateEthereumAddress = exports.validateEip3770Address = exports.standardizeSafeTransactionData = exports.getPredictedSafeAddressInitCode = 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.SignMessageLibBaseContract = exports.SafeProxyFactoryBaseContract = exports.SafeFactory = exports.SafeBaseContract = exports.PREDETERMINED_SALT_NONCE = exports.MultiSendBaseContract = exports.MultiSendCallOnlyBaseContract = exports.EthSafeSignature = exports.DEFAULT_SAFE_VERSION = exports.createERC20TokenTransferTransaction = exports.CreateCallBaseContract = 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; } });
-Object.defineProperty(exports, "EthersAdapter", { enumerable: true, get: function () { return ethers_1.EthersAdapter; } });
-Object.defineProperty(exports, "MultiSendCallOnlyEthersContract", { enumerable: true, get: function () { return ethers_1.MultiSendCallOnlyEthersContract; } });
-Object.defineProperty(exports, "MultiSendEthersContract", { enumerable: true, get: function () { return ethers_1.MultiSendEthersContract; } });
-Object.defineProperty(exports, "SafeContractEthers", { enumerable: true, get: function () { return ethers_1.SafeContractEthers; } });
-Object.defineProperty(exports, "SafeProxyFactoryEthersContract", { enumerable: true, get: function () { return ethers_1.SafeProxyFactoryEthersContract; } });
-Object.defineProperty(exports, "SignMessageLibEthersContract", { enumerable: true, get: function () { return ethers_1.SignMessageLibEthersContract; } });
-const web3_1 = require("./adapters/web3");
-Object.defineProperty(exports, "CreateCallWeb3Contract", { enumerable: true, get: function () { return web3_1.CreateCallWeb3Contract; } });
-Object.defineProperty(exports, "MultiSendCallOnlyWeb3Contract", { enumerable: true, get: function () { return web3_1.MultiSendCallOnlyWeb3Contract; } });
-Object.defineProperty(exports, "MultiSendWeb3Contract", { enumerable: true, get: function () { return web3_1.MultiSendWeb3Contract; } });
-Object.defineProperty(exports, "SafeContractWeb3", { enumerable: true, get: function () { return web3_1.SafeContractWeb3; } });
-Object.defineProperty(exports, "SafeProxyFactoryWeb3Contract", { enumerable: true, get: function () { return web3_1.SafeProxyFactoryWeb3Contract; } });
-Object.defineProperty(exports, "SignMessageLibWeb3Contract", { enumerable: true, get: function () { return web3_1.SignMessageLibWeb3Contract; } });
-Object.defineProperty(exports, "Web3Adapter", { enumerable: true, get: function () { return web3_1.Web3Adapter; } });
+const SafeProvider_1 = __importDefault(require("./SafeProvider"));
+exports.SafeProvider = SafeProvider_1.default;
+const contracts_1 = require("./contracts");
+Object.defineProperty(exports, "CreateCallBaseContract", { enumerable: true, get: function () { return contracts_1.CreateCallBaseContract; } });
+Object.defineProperty(exports, "MultiSendBaseContract", { enumerable: true, get: function () { return contracts_1.MultiSendBaseContract; } });
+Object.defineProperty(exports, "MultiSendCallOnlyBaseContract", { enumerable: true, get: function () { return contracts_1.MultiSendCallOnlyBaseContract; } });
+Object.defineProperty(exports, "SafeBaseContract", { enumerable: true, get: function () { return contracts_1.SafeBaseContract; } });
+Object.defineProperty(exports, "SafeProxyFactoryBaseContract", { enumerable: true, get: function () { return contracts_1.SafeProxyFactoryBaseContract; } });
+Object.defineProperty(exports, "SignMessageLibBaseContract", { enumerable: true, get: function () { return contracts_1.SignMessageLibBaseContract; } });
 const config_1 = require("./contracts/config");
 Object.defineProperty(exports, "DEFAULT_SAFE_VERSION", { enumerable: true, get: function () { return config_1.DEFAULT_SAFE_VERSION; } });
 const safeDeploymentContracts_1 = require("./contracts/safeDeploymentContracts");
@@ -40,10 +46,8 @@ Object.defineProperty(exports, "predictSafeAddress", { enumerable: true, get: fu
 Object.defineProperty(exports, "getPredictedSafeAddressInitCode", { enumerable: true, get: function () { return utils_1.getPredictedSafeAddressInitCode; } });
 const contractManager_1 = __importDefault(require("./managers/contractManager"));
 exports.ContractManager = contractManager_1.default;
-const safeFactory_1 = __importDefault(require("./safeFactory"));
-exports.SafeFactory = safeFactory_1.default;
-const types_1 = require("./types");
-Object.defineProperty(exports, "SigningMethod", { enumerable: true, get: function () { return types_1.SigningMethod; } });
+const SafeFactory_1 = __importDefault(require("./SafeFactory"));
+exports.SafeFactory = SafeFactory_1.default;
 const utils_2 = require("./utils");
 Object.defineProperty(exports, "EthSafeSignature", { enumerable: true, get: function () { return utils_2.EthSafeSignature; } });
 Object.defineProperty(exports, "estimateTxBaseGas", { enumerable: true, get: function () { return utils_2.estimateTxBaseGas; } });
@@ -71,5 +75,6 @@ Object.defineProperty(exports, "getEip712TxTypes", { enumerable: true, get: func
 Object.defineProperty(exports, "getEip712MessageTypes", { enumerable: true, get: function () { return eip_712_1.getEip712MessageTypes; } });
 Object.defineProperty(exports, "hashSafeMessage", { enumerable: true, get: function () { return eip_712_1.hashSafeMessage; } });
 Object.defineProperty(exports, "generateTypedData", { enumerable: true, get: function () { return eip_712_1.generateTypedData; } });
+__exportStar(require("./types"), exports);
 exports.default = Safe_1.default;
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;AAAA,kDAAyB;AACzB,8CAY0B;AA+FxB,yGA1GA,iCAAwB,OA0GA;AASxB,8FAjHA,sBAAa,OAiHA;AAIb,gHAjHA,wCAA+B,OAiHA;AAE/B,wGAlHA,gCAAuB,OAkHA;AASvB,mGA1HA,2BAAkB,OA0HA;AAKlB,+GA9HA,uCAA8B,OA8HA;AAG9B,6GAhIA,qCAA4B,OAgIA;AA9H9B,0CAYwB;AAmFtB,uGA9FA,6BAAsB,OA8FA;AAatB,8GAzGA,oCAA6B,OAyGA;AAE7B,sGA1GA,4BAAqB,OA0GA;AASrB,iGAlHA,uBAAgB,OAkHA;AAKhB,6GAtHA,mCAA4B,OAsHA;AAG5B,2GAxHA,iCAA0B,OAwHA;AAI1B,4FA3HA,kBAAW,OA2HA;AAtHb,+CAAyD;AAuFvD,qGAvFO,6BAAoB,OAuFP;AAtFtB,iFAQ4C;AAoH1C,wHA3HA,iEAAuC,OA2HA;AACvC,sGA3HA,+CAAqB,OA2HA;AAErB,6GA5HA,sDAA4B,OA4HA;AAC5B,qGA5HA,8CAAoB,OA4HA;AACpB,wGA5HA,iDAAuB,OA4HA;AACvB,gGA5HA,yCAAe,OA4HA;AACf,0GA5HA,mDAAyB,OA4HA;AA1H3B,6CAM0B;AAkFxB,yGAvFA,gCAAwB,OAuFA;AAwBxB,2GA9GA,kCAA0B,OA8GA;AAE1B,oGA/GA,2BAAmB,OA+GA;AAUnB,mGAxHA,0BAAkB,OAwHA;AAClB,gHAxHA,uCAA+B,OAwHA;AAtHjC,iFAAwD;AA8DtD,0BA9DK,yBAAe,CA8DL;AA7DjB,gEAA+E;AA0F7E,sBA1FK,qBAAW,CA0FL;AAzFb,mCAiBgB;AAiFd,8FAlFA,qBAAa,OAkFA;AAhFf,mCAQgB;AA4Cd,iGAnDA,wBAAgB,OAmDA;AAjBhB,kGAjCA,yBAAiB,OAiCA;AACjB,8FAjCA,qBAAa,OAiCA;AACb,kGAjCA,yBAAiB,OAiCA;AACjB,0GAjCA,iCAAyB,OAiCA;AA+DzB,wGA/FA,+BAAuB,OA+FA;AADvB,uGA7FA,8BAAsB,OA6FA;AA1FxB,sDAAgG;AA4E9F,oGA5EO,2BAAmB,OA4EP;AAanB,+GAzF4B,sCAA8B,OAyF5B;AAxFhC,2CAIuB;AA2ErB,iGA9EA,yBAAgB,OA8EA;AAMhB,sHAnFA,8CAAqC,OAmFA;AAlDrC,oHAhCA,4CAAmC,OAgCA;AA7BrC,oDAOiC;AA8E/B,kGApFA,yBAAiB,OAoFA;AACjB,wGApFA,+BAAuB,OAoFA;AACvB,uGApFA,8BAAsB,OAoFA;AACtB,oGApFA,2BAAmB,OAoFA;AACnB,4GApFA,mCAA2B,OAoFA;AAC3B,wGApFA,+BAAuB,OAoFA;AAjFzB,6CAKwB;AA6EtB,iGAjFA,0BAAgB,OAiFA;AAChB,sGAjFA,+BAAqB,OAiFA;AACrB,gGAjFA,yBAAe,OAiFA;AACf,kGAjFA,2BAAiB,OAiFA;AAGnB,kBAAe,cAAI,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,kEAAyC;AA0GvC,uBA1GK,sBAAY,CA0GL;AAzGd,2CAOoB;AA2DlB,uGAjEA,kCAAsB,OAiEA;AAKtB,sGArEA,iCAAqB,OAqEA;AADrB,8GAnEA,yCAA6B,OAmEA;AAG7B,iGArEA,4BAAgB,OAqEA;AAEhB,6GAtEA,wCAA4B,OAsEA;AAE5B,2GAvEA,sCAA0B,OAuEA;AArE5B,+CAAyD;AA4DvD,qGA5DO,6BAAoB,OA4DP;AA3DtB,iFAQ4C;AAgE1C,wHAvEA,iEAAuC,OAuEA;AACvC,sGAvEA,+CAAqB,OAuEA;AAErB,6GAxEA,sDAA4B,OAwEA;AAC5B,qGAxEA,8CAAoB,OAwEA;AACpB,wGAxEA,iDAAuB,OAwEA;AACvB,gGAxEA,yCAAe,OAwEA;AACf,0GAxEA,mDAAyB,OAwEA;AAtE3B,6CAM0B;AAgDxB,yGArDA,gCAAwB,OAqDA;AAMxB,2GA1DA,kCAA0B,OA0DA;AAE1B,oGA3DA,2BAAmB,OA2DA;AAUnB,mGApEA,0BAAkB,OAoEA;AAClB,gHApEA,uCAA+B,OAoEA;AAlEjC,iFAAwD;AAwCtD,0BAxCK,yBAAe,CAwCL;AAvCjB,gEAAuC;AAgDrC,sBAhDK,qBAAW,CAgDL;AA/Cb,mCAQgB;AAkCd,iGAzCA,wBAAgB,OAyCA;AARhB,kGAhCA,yBAAiB,OAgCA;AACjB,8FAhCA,qBAAa,OAgCA;AACb,kGAhCA,yBAAiB,OAgCA;AACjB,0GAhCA,iCAAyB,OAgCA;AA8BzB,wGA7DA,+BAAuB,OA6DA;AADvB,uGA3DA,8BAAsB,OA2DA;AAxDxB,sDAAgG;AA0C9F,oGA1CO,2BAAmB,OA0CP;AAanB,+GAvD4B,sCAA8B,OAuD5B;AAtDhC,2CAIuB;AAyCrB,iGA5CA,yBAAgB,OA4CA;AAMhB,sHAjDA,8CAAqC,OAiDA;AAtBrC,oHA1BA,4CAAmC,OA0BA;AAvBrC,oDAOiC;AA4C/B,kGAlDA,yBAAiB,OAkDA;AACjB,wGAlDA,+BAAuB,OAkDA;AACvB,uGAlDA,8BAAsB,OAkDA;AACtB,oGAlDA,2BAAmB,OAkDA;AACnB,4GAlDA,mCAA2B,OAkDA;AAC3B,wGAlDA,+BAAuB,OAkDA;AA/CzB,6CAKwB;AA2CtB,iGA/CA,0BAAgB,OA+CA;AAChB,sGA/CA,+BAAqB,OA+CA;AACrB,gGA/CA,yBAAe,OA+CA;AACf,kGA/CA,2BAAiB,OA+CA;AAInB,0CAAuB;AAEvB,kBAAe,cAAI,CAAA"}

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

@@ -1,13 +1,12 @@
-import { ContractNetworksConfig, SafeConfig } from '../types';
-import { MultiSendCallOnlyContract, MultiSendContract, SafeContract } from '@safe-global/safe-core-sdk-types';
+import { ContractNetworksConfig, MultiSendCallOnlyContractImplementationType, MultiSendContractImplementationType, SafeConfig, SafeContractImplementationType } from '../types';
+import SafeProvider from '../SafeProvider';
 declare class ContractManager {
     #private;
-    static create(config: SafeConfig): Promise<ContractManager>;
-    init(config: SafeConfig): Promise<void>;
+    static init(config: SafeConfig, safeProvider: SafeProvider): Promise<ContractManager>;
     get contractNetworks(): ContractNetworksConfig | undefined;
     get isL1SafeSingleton(): boolean | undefined;
-    get safeContract(): SafeContract | undefined;
-    get multiSendContract(): MultiSendContract;
-    get multiSendCallOnlyContract(): MultiSendCallOnlyContract;
+    get safeContract(): SafeContractImplementationType | undefined;
+    get multiSendContract(): MultiSendContractImplementationType;
+    get multiSendCallOnlyContract(): MultiSendCallOnlyContractImplementationType;
 }
 export default ContractManager;

package/dist/src/managers/contractManager.js

@@ -1,77 +1,34 @@
 "use strict";
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
     if (kind === "m") throw new TypeError("Private method is not writable");
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    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_isL1SafeSingleton, _ContractManager_safeContract, _ContractManager_multiSendContract, _ContractManager_multiSendCallOnlyContract;
+var _ContractManager_instances, _ContractManager_contractNetworks, _ContractManager_isL1SafeSingleton, _ContractManager_safeContract, _ContractManager_multiSendContract, _ContractManager_multiSendCallOnlyContract, _ContractManager_initializeContractManager;
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../contracts/config");
 const safeDeploymentContracts_1 = require("../contracts/safeDeploymentContracts");
 const types_1 = require("../utils/types");
 class ContractManager {
     constructor() {
+        _ContractManager_instances.add(this);
         _ContractManager_contractNetworks.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);
     }
-    static async create(config) {
+    static async init(config, safeProvider) {
         const contractManager = new ContractManager();
-        await contractManager.init(config);
+        await __classPrivateFieldGet(contractManager, _ContractManager_instances, "m", _ContractManager_initializeContractManager).call(contractManager, config, safeProvider);
         return contractManager;
     }
-    async init(config) {
-        const { ethAdapter, isL1SafeSingleton, contractNetworks, predictedSafe, safeAddress } = config;
-        const chainId = await ethAdapter.getChainId();
-        const customContracts = contractNetworks?.[chainId.toString()];
-        __classPrivateFieldSet(this, _ContractManager_contractNetworks, contractNetworks, "f");
-        __classPrivateFieldSet(this, _ContractManager_isL1SafeSingleton, isL1SafeSingleton, "f");
-        let safeVersion;
-        if ((0, types_1.isSafeConfigWithPredictedSafe)(config)) {
-            safeVersion = predictedSafe?.safeDeploymentConfig?.safeVersion ?? config_1.DEFAULT_SAFE_VERSION;
-        }
-        else {
-            // We use the default version of the Safe contract to get the correct version of this Safe
-            const defaultSafeContractInstance = await (0, safeDeploymentContracts_1.getSafeContract)({
-                ethAdapter,
-                safeVersion: config_1.DEFAULT_SAFE_VERSION,
-                isL1SafeSingleton,
-                customSafeAddress: safeAddress,
-                customContracts
-            });
-            // We check the correct version of the Safe from the blockchain
-            safeVersion = await defaultSafeContractInstance.getVersion();
-            // We get the correct Safe Contract if the real Safe version is not the lastest
-            const isTheDefaultSafeVersion = safeVersion === config_1.DEFAULT_SAFE_VERSION;
-            __classPrivateFieldSet(this, _ContractManager_safeContract, isTheDefaultSafeVersion
-                ? defaultSafeContractInstance
-                : await (0, safeDeploymentContracts_1.getSafeContract)({
-                    ethAdapter,
-                    safeVersion,
-                    isL1SafeSingleton,
-                    customSafeAddress: safeAddress,
-                    customContracts
-                }), "f");
-        }
-        __classPrivateFieldSet(this, _ContractManager_multiSendContract, await (0, safeDeploymentContracts_1.getMultiSendContract)({
-            ethAdapter,
-            safeVersion,
-            customContracts
-        }), "f");
-        __classPrivateFieldSet(this, _ContractManager_multiSendCallOnlyContract, await (0, safeDeploymentContracts_1.getMultiSendCallOnlyContract)({
-            ethAdapter,
-            safeVersion,
-            customContracts
-        }), "f");
-    }
     get contractNetworks() {
         return __classPrivateFieldGet(this, _ContractManager_contractNetworks, "f");
     }
@@ -88,6 +45,49 @@ class ContractManager {
         return __classPrivateFieldGet(this, _ContractManager_multiSendCallOnlyContract, "f");
     }
 }
-_ContractManager_contractNetworks = new WeakMap(), _ContractManager_isL1SafeSingleton = 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(), _ContractManager_instances = new WeakSet(), _ContractManager_initializeContractManager = async function _ContractManager_initializeContractManager(config, safeProvider) {
+    const { isL1SafeSingleton, contractNetworks, predictedSafe, safeAddress } = config;
+    const chainId = await safeProvider.getChainId();
+    const customContracts = contractNetworks?.[chainId.toString()];
+    __classPrivateFieldSet(this, _ContractManager_contractNetworks, contractNetworks, "f");
+    __classPrivateFieldSet(this, _ContractManager_isL1SafeSingleton, isL1SafeSingleton, "f");
+    let safeVersion;
+    if ((0, types_1.isSafeConfigWithPredictedSafe)(config)) {
+        safeVersion = predictedSafe?.safeDeploymentConfig?.safeVersion ?? config_1.DEFAULT_SAFE_VERSION;
+    }
+    else {
+        // We use the default version of the Safe contract to get the correct version of this Safe
+        const defaultSafeContractInstance = await (0, safeDeploymentContracts_1.getSafeContract)({
+            safeProvider,
+            safeVersion: config_1.DEFAULT_SAFE_VERSION,
+            isL1SafeSingleton,
+            customSafeAddress: safeAddress,
+            customContracts
+        });
+        // We check the correct version of the Safe from the blockchain
+        safeVersion = await defaultSafeContractInstance.getVersion();
+        // We get the correct Safe Contract if the real Safe version is not the lastest
+        const isTheDefaultSafeVersion = safeVersion === config_1.DEFAULT_SAFE_VERSION;
+        __classPrivateFieldSet(this, _ContractManager_safeContract, isTheDefaultSafeVersion
+            ? defaultSafeContractInstance
+            : await (0, safeDeploymentContracts_1.getSafeContract)({
+                safeProvider,
+                safeVersion,
+                isL1SafeSingleton,
+                customSafeAddress: safeAddress,
+                customContracts
+            }), "f");
+    }
+    __classPrivateFieldSet(this, _ContractManager_multiSendContract, await (0, safeDeploymentContracts_1.getMultiSendContract)({
+        safeProvider,
+        safeVersion,
+        customContracts
+    }), "f");
+    __classPrivateFieldSet(this, _ContractManager_multiSendCallOnlyContract, await (0, safeDeploymentContracts_1.getMultiSendCallOnlyContract)({
+        safeProvider,
+        safeVersion,
+        customContracts
+    }), "f");
+};
 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,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,CAAC;YAC1C,WAAW,GAAG,aAAa,EAAE,oBAAoB,EAAE,WAAW,IAAI,6BAAoB,CAAA;QACxF,CAAC;aAAM,CAAC;YACN,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;QACR,CAAC;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"}
+{"version":3,"file":"contractManager.js","sourceRoot":"","sources":["../../../src/managers/contractManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,uEAAiF;AACjF,yGAIoE;AASpE,0CAA8D;AAG9D,MAAM,eAAe;IAArB;;QACE,oDAA0C;QAC1C,qDAA4B;QAC5B,gDAA8C;QAC9C,qDAAwD;QACxD,6DAAwE;IA+E1E,CAAC;IA7EC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAkB,EAAE,YAA0B;QAC9D,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC7C,MAAM,uBAAA,eAAe,8EAA2B,MAA1C,eAAe,EAA4B,MAAM,EAAE,YAAY,CAAC,CAAA;QACtE,OAAO,eAAe,CAAA;IACxB,CAAC;IAsDD,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;+VAvEC,KAAK,qDAA4B,MAAkB,EAAE,YAA0B;IAC7E,MAAM,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,MAAM,CAAA;IAElF,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,CAAA;IAC/C,MAAM,eAAe,GAAG,gBAAgB,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC9D,uBAAA,IAAI,qCAAqB,gBAAgB,MAAA,CAAA;IACzC,uBAAA,IAAI,sCAAsB,iBAAiB,MAAA,CAAA;IAE3C,IAAI,WAAwB,CAAA;IAE5B,IAAI,IAAA,qCAA6B,EAAC,MAAM,CAAC,EAAE,CAAC;QAC1C,WAAW,GAAG,aAAa,EAAE,oBAAoB,EAAE,WAAW,IAAI,6BAAoB,CAAA;IACxF,CAAC;SAAM,CAAC;QACN,0FAA0F;QAC1F,MAAM,2BAA2B,GAAG,MAAM,IAAA,yCAAe,EAAC;YACxD,YAAY;YACZ,WAAW,EAAE,6BAAoB;YACjC,iBAAiB;YACjB,iBAAiB,EAAE,WAAW;YAC9B,eAAe;SAChB,CAAC,CAAA;QAEF,+DAA+D;QAC/D,WAAW,GAAG,MAAM,2BAA2B,CAAC,UAAU,EAAE,CAAA;QAE5D,+EAA+E;QAC/E,MAAM,uBAAuB,GAAG,WAAW,KAAK,6BAAoB,CAAA;QAEpE,uBAAA,IAAI,iCAAiB,uBAAuB;YAC1C,CAAC,CAAC,2BAA2B;YAC7B,CAAC,CAAC,MAAM,IAAA,yCAAe,EAAC;gBACpB,YAAY;gBACZ,WAAW;gBACX,iBAAiB;gBACjB,iBAAiB,EAAE,WAAW;gBAC9B,eAAe;aAChB,CAAC,MAAA,CAAA;IACR,CAAC;IAED,uBAAA,IAAI,sCAAsB,MAAM,IAAA,8CAAoB,EAAC;QACnD,YAAY;QACZ,WAAW;QACX,eAAe;KAChB,CAAC,MAAA,CAAA;IAEF,uBAAA,IAAI,8CAA8B,MAAM,IAAA,sDAA4B,EAAC;QACnE,YAAY;QACZ,WAAW;QACX,eAAe;KAChB,CAAC,MAAA,CAAA;AACJ,CAAC;AAuBH,kBAAe,eAAe,CAAA"}

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

@@ -1,10 +1,12 @@
-import { EthAdapter, SafeContract } from '@safe-global/safe-core-sdk-types';
+import { SafeContractImplementationType } from '../types';
+import SafeProvider from '../SafeProvider';
 declare class FallbackHandlerManager {
     #private;
-    constructor(ethAdapter: EthAdapter, safeContract?: SafeContract);
+    constructor(safeProvider: SafeProvider, safeContract?: SafeContractImplementationType);
     private validateFallbackHandlerAddress;
     private validateFallbackHandlerIsNotEnabled;
     private validateFallbackHandlerIsEnabled;
+    private isFallbackHandlerCompatible;
     getFallbackHandler(): Promise<string>;
     encodeEnableFallbackHandlerData(fallbackHandlerAddress: string): Promise<string>;
     encodeDisableFallbackHandlerData(): Promise<string>;

package/dist/src/managers/fallbackHandlerManager.js

@@ -10,21 +10,21 @@ 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 _FallbackHandlerManager_ethAdapter, _FallbackHandlerManager_safeContract, _FallbackHandlerManager_slot;
+var _FallbackHandlerManager_safeProvider, _FallbackHandlerManager_safeContract, _FallbackHandlerManager_slot;
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../utils");
 const constants_1 = require("../utils/constants");
 class FallbackHandlerManager {
-    constructor(ethAdapter, safeContract) {
-        _FallbackHandlerManager_ethAdapter.set(this, void 0);
+    constructor(safeProvider, safeContract) {
+        _FallbackHandlerManager_safeProvider.set(this, void 0);
         _FallbackHandlerManager_safeContract.set(this, void 0);
         // keccak256("fallback_manager.handler.address")
         _FallbackHandlerManager_slot.set(this, '0x6c9a6c4a39284e37ed1cf53d337577d14212a4870fb976a4366c693b939918d5');
-        __classPrivateFieldSet(this, _FallbackHandlerManager_ethAdapter, ethAdapter, "f");
+        __classPrivateFieldSet(this, _FallbackHandlerManager_safeProvider, safeProvider, "f");
         __classPrivateFieldSet(this, _FallbackHandlerManager_safeContract, safeContract, "f");
     }
     validateFallbackHandlerAddress(fallbackHandlerAddress) {
-        const isValidAddress = __classPrivateFieldGet(this, _FallbackHandlerManager_ethAdapter, "f").isAddress(fallbackHandlerAddress);
+        const isValidAddress = __classPrivateFieldGet(this, _FallbackHandlerManager_safeProvider, "f").isAddress(fallbackHandlerAddress);
         if (!isValidAddress || (0, utils_1.isZeroAddress)(fallbackHandlerAddress)) {
             throw new Error('Invalid fallback handler address provided');
         }
@@ -39,36 +39,34 @@ class FallbackHandlerManager {
             throw new Error('There is no fallback handler enabled yet');
         }
     }
-    async getFallbackHandler() {
+    async isFallbackHandlerCompatible() {
         if (!__classPrivateFieldGet(this, _FallbackHandlerManager_safeContract, "f")) {
             throw new Error('Safe is not deployed');
         }
         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(await __classPrivateFieldGet(this, _FallbackHandlerManager_safeContract, "f").getAddress(), __classPrivateFieldGet(this, _FallbackHandlerManager_slot, "f"));
-        }
-        else {
+        if (!(0, utils_1.hasSafeFeature)(utils_1.SAFE_FEATURES.SAFE_FALLBACK_HANDLER, safeVersion)) {
             throw new Error('Current version of the Safe does not support the fallback handler functionality');
         }
+        return __classPrivateFieldGet(this, _FallbackHandlerManager_safeContract, "f");
+    }
+    async getFallbackHandler() {
+        const safeContract = await this.isFallbackHandlerCompatible();
+        return __classPrivateFieldGet(this, _FallbackHandlerManager_safeProvider, "f").getStorageAt(await safeContract.getAddress(), __classPrivateFieldGet(this, _FallbackHandlerManager_slot, "f"));
     }
     async encodeEnableFallbackHandlerData(fallbackHandlerAddress) {
-        if (!__classPrivateFieldGet(this, _FallbackHandlerManager_safeContract, "f")) {
-            throw new Error('Safe is not deployed');
-        }
+        const safeContract = await this.isFallbackHandlerCompatible();
         this.validateFallbackHandlerAddress(fallbackHandlerAddress);
         const currentFallbackHandler = await this.getFallbackHandler();
         this.validateFallbackHandlerIsNotEnabled(currentFallbackHandler, fallbackHandlerAddress);
-        return __classPrivateFieldGet(this, _FallbackHandlerManager_safeContract, "f").encode('setFallbackHandler', [fallbackHandlerAddress]);
+        return safeContract.encode('setFallbackHandler', [fallbackHandlerAddress]);
     }
     async encodeDisableFallbackHandlerData() {
-        if (!__classPrivateFieldGet(this, _FallbackHandlerManager_safeContract, "f")) {
-            throw new Error('Safe is not deployed');
-        }
+        const safeContract = await this.isFallbackHandlerCompatible();
         const currentFallbackHandler = await this.getFallbackHandler();
         this.validateFallbackHandlerIsEnabled(currentFallbackHandler);
-        return __classPrivateFieldGet(this, _FallbackHandlerManager_safeContract, "f").encode('setFallbackHandler', [constants_1.ZERO_ADDRESS]);
+        return safeContract.encode('setFallbackHandler', [constants_1.ZERO_ADDRESS]);
     }
 }
-_FallbackHandlerManager_ethAdapter = new WeakMap(), _FallbackHandlerManager_safeContract = new WeakMap(), _FallbackHandlerManager_slot = new WeakMap();
+_FallbackHandlerManager_safeProvider = new WeakMap(), _FallbackHandlerManager_safeContract = new WeakMap(), _FallbackHandlerManager_slot = new WeakMap();
 exports.default = FallbackHandlerManager;
 //# sourceMappingURL=fallbackHandlerManager.js.map