@safe-global/protocol-kit 3.1.1 → 4.0.0

package/dist/src/Safe.d.ts

@@ -1,8 +1,9 @@
-import { EthAdapter, SafeMultisigTransactionResponse, SafeSignature, SafeTransaction, SafeVersion, TransactionOptions, TransactionResult, MetaTransactionData, Transaction, EIP712TypedData } from '@safe-global/safe-core-sdk-types';
+import { SafeMultisigTransactionResponse, SafeSignature, SafeTransaction, SafeVersion, TransactionOptions, TransactionResult, MetaTransactionData, Transaction, EIP712TypedData } from '@safe-global/safe-core-sdk-types';
 import ContractManager from './managers/contractManager';
-import { AddOwnerTxParams, ConnectSafeConfig, CreateTransactionProps, RemoveOwnerTxParams, SafeConfig, SigningMethodType, SwapOwnerTxParams } from './types';
+import { AddOwnerTxParams, ConnectSafeConfig, CreateTransactionProps, RemoveOwnerTxParams, SafeConfig, SigningMethodType, SwapOwnerTxParams, SafeModulesPaginated } from './types';
 import { SafeTransactionOptionalProps } from './utils/transactions/types';
 import SafeMessage from './utils/messages/SafeMessage';
+import SafeProvider from './SafeProvider';
 declare class Safe {
     #private;
     /**
@@ -14,16 +15,7 @@ declare class Safe {
      * @throws "MultiSend contract is not deployed on the current network"
      * @throws "MultiSendCallOnly contract is not deployed on the current network"
      */
-    static create(config: SafeConfig): Promise<Safe>;
-    /**
-     * Initializes the Safe Core SDK instance.
-     * @param config - Safe configuration
-     * @throws "Signer must be connected to a provider"
-     * @throws "SafeProxy contract is not deployed on the current network"
-     * @throws "MultiSend contract is not deployed on the current network"
-     * @throws "MultiSendCallOnly contract is not deployed on the current network"
-     */
-    private init;
+    static init(config: SafeConfig): Promise<Safe>;
     /**
      * Returns a new instance of the Safe Core SDK.
      * @param config - Connect Safe configuration
@@ -52,11 +44,11 @@ declare class Safe {
      * */
     getContractManager(): ContractManager;
     /**
-     * Returns the current EthAdapter.
+     * Returns the current SafeProvider.
      *
-     * @returns The current EthAdapter
+     * @returns The current SafeProvider
      */
-    getEthAdapter(): EthAdapter;
+    getSafeProvider(): SafeProvider;
     /**
      * Returns the address of the MultiSend contract.
      *
@@ -137,7 +129,7 @@ declare class Safe {
      * @param pageSize - The size of the page. It will be the max length of the returning array. Must be greater then 0.
      * @returns The list of addresses of all the enabled Safe modules
      */
-    getModulesPaginated(start: string, pageSize?: number): Promise<string[]>;
+    getModulesPaginated(start: string, pageSize?: number): Promise<SafeModulesPaginated>;
     /**
      * Checks if a specific Safe module is enabled for the current Safe.
      *
@@ -427,12 +419,6 @@ declare class Safe {
      *
      */
     createTransactionBatch(transactions: MetaTransactionData[], transactionOptions?: TransactionOptions): Promise<Transaction>;
-    /**
-     * Get the fallback handler contract
-     *
-     * @returns The fallback Handler contract
-     */
-    private getFallbackHandlerContract;
     /**
      * Call the CompatibilityFallbackHandler getMessageHash method
      *

package/dist/src/Safe.js

@@ -1,19 +1,19 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _Safe_predictedSafe, _Safe_ethAdapter, _Safe_contractManager, _Safe_ownerManager, _Safe_moduleManager, _Safe_guardManager, _Safe_fallbackHandlerManager, _Safe_MAGIC_VALUE, _Safe_MAGIC_VALUE_BYTES;
+var _Safe_instances, _Safe_predictedSafe, _Safe_safeProvider, _Safe_contractManager, _Safe_ownerManager, _Safe_moduleManager, _Safe_guardManager, _Safe_fallbackHandlerManager, _Safe_MAGIC_VALUE, _Safe_MAGIC_VALUE_BYTES, _Safe_initializeProtocolKit, _Safe_getFallbackHandlerContract;
 Object.defineProperty(exports, "__esModule", { value: true });
 const safe_core_sdk_types_1 = require("@safe-global/safe-core-sdk-types");
 const utils_1 = require("./contracts/utils");
@@ -31,12 +31,14 @@ const types_2 = require("./utils/types");
 const safeDeploymentContracts_1 = require("./contracts/safeDeploymentContracts");
 const SafeMessage_1 = __importDefault(require("./utils/messages/SafeMessage"));
 const satisfies_1 = __importDefault(require("semver/functions/satisfies"));
+const SafeProvider_1 = __importDefault(require("./SafeProvider"));
 const EQ_OR_GT_1_4_1 = '>=1.4.1';
 const EQ_OR_GT_1_3_0 = '>=1.3.0';
 class Safe {
     constructor() {
+        _Safe_instances.add(this);
         _Safe_predictedSafe.set(this, void 0);
-        _Safe_ethAdapter.set(this, void 0);
+        _Safe_safeProvider.set(this, void 0);
         _Safe_contractManager.set(this, void 0);
         _Safe_ownerManager.set(this, void 0);
         _Safe_moduleManager.set(this, void 0);
@@ -80,24 +82,26 @@ class Safe {
          */
         this.isValidSignature = async (messageHash, signature = '0x') => {
             const safeAddress = await this.getAddress();
-            const fallbackHandler = await this.getFallbackHandlerContract();
+            const fallbackHandler = await __classPrivateFieldGet(this, _Safe_instances, "m", _Safe_getFallbackHandlerContract).call(this);
             const signatureToCheck = signature && Array.isArray(signature) ? (0, utils_2.buildSignatureBytes)(signature) : signature;
+            // @ts-expect-error Argument of type isValidSignature(bytes32,bytes) is not assignable to parameter of type isValidSignature
             const data = fallbackHandler.encode('isValidSignature(bytes32,bytes)', [
                 messageHash,
                 signatureToCheck
             ]);
+            // @ts-expect-error Argument of type isValidSignature(bytes32,bytes) is not assignable to parameter of type isValidSignature
             const bytesData = fallbackHandler.encode('isValidSignature(bytes,bytes)', [
                 messageHash,
                 signatureToCheck
             ]);
             try {
                 const isValidSignatureResponse = await Promise.all([
-                    __classPrivateFieldGet(this, _Safe_ethAdapter, "f").call({
+                    __classPrivateFieldGet(this, _Safe_safeProvider, "f").call({
                         from: safeAddress,
                         to: safeAddress,
                         data: data
                     }),
-                    __classPrivateFieldGet(this, _Safe_ethAdapter, "f").call({
+                    __classPrivateFieldGet(this, _Safe_safeProvider, "f").call({
                         from: safeAddress,
                         to: safeAddress,
                         data: bytesData
@@ -121,43 +125,10 @@ class Safe {
      * @throws "MultiSend contract is not deployed on the current network"
      * @throws "MultiSendCallOnly contract is not deployed on the current network"
      */
-    static async create(config) {
-        const safeSdk = new Safe();
-        await safeSdk.init(config);
-        return safeSdk;
-    }
-    /**
-     * Initializes the Safe Core SDK instance.
-     * @param config - Safe configuration
-     * @throws "Signer must be connected to a provider"
-     * @throws "SafeProxy contract is not deployed on the current network"
-     * @throws "MultiSend contract is not deployed on the current network"
-     * @throws "MultiSendCallOnly contract is not deployed on the current network"
-     */
-    async init(config) {
-        const { ethAdapter, isL1SafeSingleton, contractNetworks } = config;
-        __classPrivateFieldSet(this, _Safe_ethAdapter, ethAdapter, "f");
-        if ((0, types_2.isSafeConfigWithPredictedSafe)(config)) {
-            __classPrivateFieldSet(this, _Safe_predictedSafe, config.predictedSafe, "f");
-            __classPrivateFieldSet(this, _Safe_contractManager, await contractManager_1.default.create({
-                ethAdapter: __classPrivateFieldGet(this, _Safe_ethAdapter, "f"),
-                predictedSafe: __classPrivateFieldGet(this, _Safe_predictedSafe, "f"),
-                isL1SafeSingleton,
-                contractNetworks
-            }), "f");
-        }
-        else {
-            __classPrivateFieldSet(this, _Safe_contractManager, await contractManager_1.default.create({
-                ethAdapter: __classPrivateFieldGet(this, _Safe_ethAdapter, "f"),
-                safeAddress: config.safeAddress,
-                isL1SafeSingleton,
-                contractNetworks
-            }), "f");
-        }
-        __classPrivateFieldSet(this, _Safe_ownerManager, new ownerManager_1.default(__classPrivateFieldGet(this, _Safe_ethAdapter, "f"), __classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract), "f");
-        __classPrivateFieldSet(this, _Safe_moduleManager, new moduleManager_1.default(__classPrivateFieldGet(this, _Safe_ethAdapter, "f"), __classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract), "f");
-        __classPrivateFieldSet(this, _Safe_guardManager, new guardManager_1.default(__classPrivateFieldGet(this, _Safe_ethAdapter, "f"), __classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract), "f");
-        __classPrivateFieldSet(this, _Safe_fallbackHandlerManager, new fallbackHandlerManager_1.default(__classPrivateFieldGet(this, _Safe_ethAdapter, "f"), __classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract), "f");
+    static async init(config) {
+        const protocolKit = new Safe();
+        await __classPrivateFieldGet(protocolKit, _Safe_instances, "m", _Safe_initializeProtocolKit).call(protocolKit, config);
+        return protocolKit;
     }
     /**
      * Returns a new instance of the Safe Core SDK.
@@ -168,35 +139,36 @@ class Safe {
      * @throws "MultiSendCallOnly contract is not deployed on the current network"
      */
     async connect(config) {
-        const { ethAdapter, safeAddress, predictedSafe, isL1SafeSingleton, contractNetworks } = config;
+        const { provider, signer, safeAddress, predictedSafe, isL1SafeSingleton, contractNetworks } = config;
         const configProps = {
-            ethAdapter: ethAdapter || __classPrivateFieldGet(this, _Safe_ethAdapter, "f"),
+            provider: provider || __classPrivateFieldGet(this, _Safe_safeProvider, "f").provider,
+            signer,
             isL1SafeSingleton: isL1SafeSingleton || __classPrivateFieldGet(this, _Safe_contractManager, "f").isL1SafeSingleton,
             contractNetworks: contractNetworks || __classPrivateFieldGet(this, _Safe_contractManager, "f").contractNetworks
         };
         // A new existing Safe is connected to the Signer
         if (safeAddress) {
-            return await Safe.create({
+            return await Safe.init({
                 safeAddress,
                 ...configProps
             });
         }
         // A new predicted Safe is connected to the Signer
         if (predictedSafe) {
-            return await Safe.create({
+            return await Safe.init({
                 predictedSafe,
                 ...configProps
             });
         }
         // The previous predicted Safe is connected to a new Signer
         if (__classPrivateFieldGet(this, _Safe_predictedSafe, "f")) {
-            return await Safe.create({
+            return await Safe.init({
                 predictedSafe: __classPrivateFieldGet(this, _Safe_predictedSafe, "f"),
                 ...configProps
             });
         }
         // The previous existing Safe is connected to a new Signer
-        return await Safe.create({
+        return await Safe.init({
             safeAddress: await this.getAddress(),
             ...configProps
         });
@@ -210,9 +182,9 @@ class Safe {
         if (!__classPrivateFieldGet(this, _Safe_predictedSafe, "f")) {
             throw new Error('The Safe already exists');
         }
-        const chainId = await __classPrivateFieldGet(this, _Safe_ethAdapter, "f").getChainId();
+        const chainId = await __classPrivateFieldGet(this, _Safe_safeProvider, "f").getChainId();
         return (0, utils_1.getPredictedSafeAddressInitCode)({
-            ethAdapter: __classPrivateFieldGet(this, _Safe_ethAdapter, "f"),
+            safeProvider: __classPrivateFieldGet(this, _Safe_safeProvider, "f"),
             chainId,
             customContracts: __classPrivateFieldGet(this, _Safe_contractManager, "f").contractNetworks?.[chainId.toString()],
             ...__classPrivateFieldGet(this, _Safe_predictedSafe, "f")
@@ -229,9 +201,9 @@ class Safe {
             if (!(0, utils_2.hasSafeFeature)(utils_2.SAFE_FEATURES.ACCOUNT_ABSTRACTION, safeVersion)) {
                 throw new Error('Account Abstraction functionality is not available for Safes with version lower than v1.3.0');
             }
-            const chainId = await __classPrivateFieldGet(this, _Safe_ethAdapter, "f").getChainId();
+            const chainId = await __classPrivateFieldGet(this, _Safe_safeProvider, "f").getChainId();
             return (0, utils_1.predictSafeAddress)({
-                ethAdapter: __classPrivateFieldGet(this, _Safe_ethAdapter, "f"),
+                safeProvider: __classPrivateFieldGet(this, _Safe_safeProvider, "f"),
                 chainId,
                 customContracts: __classPrivateFieldGet(this, _Safe_contractManager, "f").contractNetworks?.[chainId.toString()],
                 ...__classPrivateFieldGet(this, _Safe_predictedSafe, "f")
@@ -251,12 +223,12 @@ class Safe {
         return __classPrivateFieldGet(this, _Safe_contractManager, "f");
     }
     /**
-     * Returns the current EthAdapter.
+     * Returns the current SafeProvider.
      *
-     * @returns The current EthAdapter
+     * @returns The current SafeProvider
      */
-    getEthAdapter() {
-        return __classPrivateFieldGet(this, _Safe_ethAdapter, "f");
+    getSafeProvider() {
+        return __classPrivateFieldGet(this, _Safe_safeProvider, "f");
     }
     /**
      * Returns the address of the MultiSend contract.
@@ -281,7 +253,7 @@ class Safe {
      */
     async isSafeDeployed() {
         const safeAddress = await this.getAddress();
-        const isSafeDeployed = await __classPrivateFieldGet(this, _Safe_ethAdapter, "f").isContractDeployed(safeAddress);
+        const isSafeDeployed = await __classPrivateFieldGet(this, _Safe_safeProvider, "f").isContractDeployed(safeAddress);
         return isSafeDeployed;
     }
     /**
@@ -318,7 +290,8 @@ class Safe {
         if (!__classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract) {
             return Promise.resolve(0);
         }
-        return __classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract.getNonce();
+        const nonce = await __classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract.getNonce();
+        return Number(nonce);
     }
     /**
      * Returns the Safe threshold.
@@ -337,7 +310,7 @@ class Safe {
      * @returns The chainId of the connected network
      */
     async getChainId() {
-        return __classPrivateFieldGet(this, _Safe_ethAdapter, "f").getChainId();
+        return __classPrivateFieldGet(this, _Safe_safeProvider, "f").getChainId();
     }
     /**
      * Returns the ETH balance of the Safe.
@@ -345,7 +318,7 @@ class Safe {
      * @returns The ETH balance of the Safe
      */
     async getBalance() {
-        return __classPrivateFieldGet(this, _Safe_ethAdapter, "f").getBalance(await this.getAddress());
+        return __classPrivateFieldGet(this, _Safe_safeProvider, "f").getBalance(await this.getAddress());
     }
     /**
      * Returns the address of the FallbackHandler contract.
@@ -439,7 +412,7 @@ class Safe {
         if (__classPrivateFieldGet(this, _Safe_predictedSafe, "f")) {
             return new SafeTransaction_1.default(await (0, utils_3.standardizeSafeTransactionData)({
                 predictedSafe: __classPrivateFieldGet(this, _Safe_predictedSafe, "f"),
-                ethAdapter: __classPrivateFieldGet(this, _Safe_ethAdapter, "f"),
+                provider: __classPrivateFieldGet(this, _Safe_safeProvider, "f").provider,
                 tx: newTransaction,
                 contractNetworks: __classPrivateFieldGet(this, _Safe_contractManager, "f").contractNetworks
             }));
@@ -449,7 +422,7 @@ class Safe {
         }
         return new SafeTransaction_1.default(await (0, utils_3.standardizeSafeTransactionData)({
             safeContract: __classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract,
-            ethAdapter: __classPrivateFieldGet(this, _Safe_ethAdapter, "f"),
+            provider: __classPrivateFieldGet(this, _Safe_safeProvider, "f").provider,
             tx: newTransaction,
             contractNetworks: __classPrivateFieldGet(this, _Safe_contractManager, "f").contractNetworks
         }));
@@ -514,7 +487,7 @@ class Safe {
      * @returns The Safe signature
      */
     async signHash(hash) {
-        const signature = await (0, utils_2.generateSignature)(__classPrivateFieldGet(this, _Safe_ethAdapter, "f"), hash);
+        const signature = await (0, utils_2.generateSignature)(__classPrivateFieldGet(this, _Safe_safeProvider, "f"), hash);
         return signature;
     }
     /**
@@ -539,9 +512,9 @@ class Safe {
      */
     async signMessage(message, signingMethod = types_1.SigningMethod.ETH_SIGN_TYPED_DATA_V4, preimageSafeAddress) {
         const owners = await this.getOwners();
-        const signerAddress = await __classPrivateFieldGet(this, _Safe_ethAdapter, "f").getSignerAddress();
+        const signerAddress = await __classPrivateFieldGet(this, _Safe_safeProvider, "f").getSignerAddress();
         if (!signerAddress) {
-            throw new Error('EthAdapter must be initialized with a signer to use this method');
+            throw new Error('SafeProvider must be initialized with a signer to use this method');
         }
         const addressIsOwner = owners.some((owner) => signerAddress && (0, utils_2.sameString)(owner, signerAddress));
         if (!addressIsOwner) {
@@ -598,10 +571,10 @@ class Safe {
         const safeEIP712Args = {
             safeAddress: await this.getAddress(),
             safeVersion: await this.getContractVersion(),
-            chainId: await this.getEthAdapter().getChainId(),
+            chainId: await __classPrivateFieldGet(this, _Safe_safeProvider, "f").getChainId(),
             data: eip712Data.data
         };
-        return (0, utils_2.generateEIP712Signature)(__classPrivateFieldGet(this, _Safe_ethAdapter, "f"), safeEIP712Args, methodVersion);
+        return (0, utils_2.generateEIP712Signature)(__classPrivateFieldGet(this, _Safe_safeProvider, "f"), safeEIP712Args, methodVersion);
     }
     /**
      * Adds the signature of the current signer to the Safe transaction object.
@@ -620,9 +593,9 @@ class Safe {
             ? await this.toSafeTransactionType(safeTransaction)
             : safeTransaction;
         const owners = await this.getOwners();
-        const signerAddress = await __classPrivateFieldGet(this, _Safe_ethAdapter, "f").getSignerAddress();
+        const signerAddress = await __classPrivateFieldGet(this, _Safe_safeProvider, "f").getSignerAddress();
         if (!signerAddress) {
-            throw new Error('EthAdapter must be initialized with a signer to use this method');
+            throw new Error('SafeProvider must be initialized with a signer to use this method');
         }
         const addressIsOwner = owners.some((owner) => signerAddress && (0, utils_2.sameString)(owner, signerAddress));
         if (!addressIsOwner) {
@@ -683,17 +656,15 @@ class Safe {
             throw new Error('Safe is not deployed');
         }
         const owners = await this.getOwners();
-        const signerAddress = await __classPrivateFieldGet(this, _Safe_ethAdapter, "f").getSignerAddress();
+        const signerAddress = await __classPrivateFieldGet(this, _Safe_safeProvider, "f").getSignerAddress();
         if (!signerAddress) {
-            throw new Error('EthAdapter must be initialized with a signer to use this method');
+            throw new Error('SafeProvider must be initialized with a signer to use this method');
         }
         const addressIsOwner = owners.some((owner) => signerAddress && (0, utils_2.sameString)(owner, signerAddress));
         if (!addressIsOwner) {
             throw new Error('Transaction hashes can only be approved by Safe owners');
         }
-        if (options?.gas && options?.gasLimit) {
-            throw new Error('Cannot specify gas and gasLimit together in transaction options');
-        }
+        // TODO: fix this
         return __classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract.approveHash(hash, {
             from: signerAddress,
             ...options
@@ -712,7 +683,7 @@ class Safe {
         const owners = await this.getOwners();
         const ownersWhoApproved = [];
         for (const owner of owners) {
-            const approved = await __classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract.approvedHashes(owner, txHash);
+            const [approved] = await __classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract.approvedHashes([owner, txHash]);
             if (approved > 0) {
                 ownersWhoApproved.push(owner);
             }
@@ -987,9 +958,9 @@ class Safe {
             signedSafeTransaction.addSignature((0, utils_2.generatePreValidatedSignature)(owner));
         }
         const owners = await this.getOwners();
-        const signerAddress = await __classPrivateFieldGet(this, _Safe_ethAdapter, "f").getSignerAddress();
+        const signerAddress = await __classPrivateFieldGet(this, _Safe_safeProvider, "f").getSignerAddress();
         if (!signerAddress) {
-            throw new Error('EthAdapter must be initialized with a signer to use this method');
+            throw new Error('SafeProvider must be initialized with a signer to use this method');
         }
         if (owners.includes(signerAddress)) {
             signedSafeTransaction.addSignature((0, utils_2.generatePreValidatedSignature)(signerAddress));
@@ -1025,7 +996,7 @@ class Safe {
         }
         const owners = await this.getOwners();
         const threshold = await this.getThreshold();
-        const signerAddress = await __classPrivateFieldGet(this, _Safe_ethAdapter, "f").getSignerAddress();
+        const signerAddress = await __classPrivateFieldGet(this, _Safe_safeProvider, "f").getSignerAddress();
         if (threshold > signedSafeTransaction.signatures.size &&
             signerAddress &&
             owners.includes(signerAddress)) {
@@ -1042,9 +1013,6 @@ class Safe {
                 throw new Error('Not enough Ether funds');
             }
         }
-        if (options?.gas && options?.gasLimit) {
-            throw new Error('Cannot specify gas and gasLimit together in transaction options');
-        }
         const txResponse = await __classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract.execTransaction(signedSafeTransaction, {
             from: signerAddress,
             ...options
@@ -1064,11 +1032,11 @@ class Safe {
         const chainId = await this.getChainId();
         const customContracts = __classPrivateFieldGet(this, _Safe_contractManager, "f").contractNetworks?.[chainId.toString()];
         const isL1SafeSingleton = __classPrivateFieldGet(this, _Safe_contractManager, "f").isL1SafeSingleton;
-        const safeSingletonContract = await (0, safeDeploymentContracts_1.getSafeContract)({
-            ethAdapter: __classPrivateFieldGet(this, _Safe_ethAdapter, "f"),
-            safeVersion: safeVersion,
+        const safeSingletonContract = await __classPrivateFieldGet(this, _Safe_safeProvider, "f").getSafeContract({
+            safeVersion,
             isL1SafeSingleton,
-            customContracts
+            customContractAbi: customContracts?.safeSingletonAbi,
+            customContractAddress: customContracts?.safeSingletonAddress
         });
         const encodedTransaction = safeSingletonContract.encode('execTransaction', [
             safeTransaction.data.to,
@@ -1145,25 +1113,25 @@ class Safe {
         }
         const { safeAccountConfig, safeDeploymentConfig } = __classPrivateFieldGet(this, _Safe_predictedSafe, "f");
         const safeVersion = await this.getContractVersion();
-        const ethAdapter = __classPrivateFieldGet(this, _Safe_ethAdapter, "f");
-        const chainId = await ethAdapter.getChainId();
+        const safeProvider = __classPrivateFieldGet(this, _Safe_safeProvider, "f");
+        const chainId = await safeProvider.getChainId();
         const isL1SafeSingleton = __classPrivateFieldGet(this, _Safe_contractManager, "f").isL1SafeSingleton;
         const customContracts = __classPrivateFieldGet(this, _Safe_contractManager, "f").contractNetworks?.[chainId.toString()];
-        const safeSingletonContract = await (0, safeDeploymentContracts_1.getSafeContract)({
-            ethAdapter: __classPrivateFieldGet(this, _Safe_ethAdapter, "f"),
+        const safeSingletonContract = await safeProvider.getSafeContract({
             safeVersion,
             isL1SafeSingleton,
-            customContracts
+            customContractAddress: customContracts?.safeSingletonAddress,
+            customContractAbi: customContracts?.safeSingletonAbi
         });
         // we use the SafeProxyFactory.sol contract, see: https://github.com/safe-global/safe-contracts/blob/main/contracts/proxies/SafeProxyFactory.sol
         const safeProxyFactoryContract = await (0, safeDeploymentContracts_1.getProxyFactoryContract)({
-            ethAdapter,
+            safeProvider,
             safeVersion,
             customContracts
         });
         // this is the call to the setup method that sets the threshold & owners of the new Safe, see: https://github.com/safe-global/safe-contracts/blob/main/contracts/Safe.sol#L95
         const initializer = await (0, utils_1.encodeSetupCallData)({
-            ethAdapter,
+            safeProvider,
             safeContract: safeSingletonContract,
             safeAccountConfig: safeAccountConfig,
             customContracts
@@ -1179,7 +1147,7 @@ class Safe {
             data: safeProxyFactoryContract.encode('createProxyWithNonce', [
                 await safeSingletonContract.getAddress(),
                 initializer, // call to the setup method to set the threshold & owners of the new Safe
-                saltNonce
+                BigInt(saltNonce)
             ])
         };
         return safeDeployTransactionData;
@@ -1196,10 +1164,10 @@ class Safe {
      *
      */
     async createTransactionBatch(transactions, transactionOptions) {
-        const chainId = await __classPrivateFieldGet(this, _Safe_ethAdapter, "f").getChainId();
+        const chainId = await __classPrivateFieldGet(this, _Safe_safeProvider, "f").getChainId();
         // we use the MultiSend contract to create the batch, see: https://github.com/safe-global/safe-contracts/blob/main/contracts/libraries/MultiSendCallOnly.sol
         const multiSendCallOnlyContract = await (0, safeDeploymentContracts_1.getMultiSendCallOnlyContract)({
-            ethAdapter: __classPrivateFieldGet(this, _Safe_ethAdapter, "f"),
+            safeProvider: __classPrivateFieldGet(this, _Safe_safeProvider, "f"),
             safeVersion: await this.getContractVersion(),
             customContracts: __classPrivateFieldGet(this, _Safe_contractManager, "f").contractNetworks?.[chainId.toString()]
         });
@@ -1215,25 +1183,61 @@ class Safe {
         };
         return transactionBatch;
     }
-    /**
-     * Get the fallback handler contract
-     *
-     * @returns The fallback Handler contract
-     */
-    async getFallbackHandlerContract() {
-        if (!__classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract) {
-            throw new Error('Safe is not deployed');
-        }
-        const safeVersion = (await __classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract.getVersion()) ?? config_1.DEFAULT_SAFE_VERSION;
-        const chainId = await __classPrivateFieldGet(this, _Safe_ethAdapter, "f").getChainId();
-        const compatibilityFallbackHandlerContract = await (0, safeDeploymentContracts_1.getCompatibilityFallbackHandlerContract)({
-            ethAdapter: __classPrivateFieldGet(this, _Safe_ethAdapter, "f"),
-            safeVersion,
-            customContracts: __classPrivateFieldGet(this, _Safe_contractManager, "f").contractNetworks?.[chainId.toString()]
-        });
-        return compatibilityFallbackHandlerContract;
-    }
 }
-_Safe_predictedSafe = new WeakMap(), _Safe_ethAdapter = new WeakMap(), _Safe_contractManager = new WeakMap(), _Safe_ownerManager = new WeakMap(), _Safe_moduleManager = new WeakMap(), _Safe_guardManager = new WeakMap(), _Safe_fallbackHandlerManager = new WeakMap(), _Safe_MAGIC_VALUE = new WeakMap(), _Safe_MAGIC_VALUE_BYTES = new WeakMap();
+_Safe_predictedSafe = new WeakMap(), _Safe_safeProvider = new WeakMap(), _Safe_contractManager = new WeakMap(), _Safe_ownerManager = new WeakMap(), _Safe_moduleManager = new WeakMap(), _Safe_guardManager = new WeakMap(), _Safe_fallbackHandlerManager = new WeakMap(), _Safe_MAGIC_VALUE = new WeakMap(), _Safe_MAGIC_VALUE_BYTES = new WeakMap(), _Safe_instances = new WeakSet(), _Safe_initializeProtocolKit = 
+/**
+ * Initializes the Safe Core SDK instance.
+ * @param config - Safe configuration
+ * @throws "Signer must be connected to a provider"
+ * @throws "SafeProxy contract is not deployed on the current network"
+ * @throws "MultiSend contract is not deployed on the current network"
+ * @throws "MultiSendCallOnly contract is not deployed on the current network"
+ */
+async function _Safe_initializeProtocolKit(config) {
+    const { provider, signer, isL1SafeSingleton, contractNetworks } = config;
+    __classPrivateFieldSet(this, _Safe_safeProvider, new SafeProvider_1.default({
+        provider,
+        signer
+    }), "f");
+    if ((0, types_2.isSafeConfigWithPredictedSafe)(config)) {
+        __classPrivateFieldSet(this, _Safe_predictedSafe, config.predictedSafe, "f");
+        __classPrivateFieldSet(this, _Safe_contractManager, await contractManager_1.default.init({
+            provider,
+            predictedSafe: __classPrivateFieldGet(this, _Safe_predictedSafe, "f"),
+            isL1SafeSingleton,
+            contractNetworks
+        }, __classPrivateFieldGet(this, _Safe_safeProvider, "f")), "f");
+    }
+    else {
+        __classPrivateFieldSet(this, _Safe_contractManager, await contractManager_1.default.init({
+            provider,
+            safeAddress: config.safeAddress,
+            isL1SafeSingleton,
+            contractNetworks
+        }, __classPrivateFieldGet(this, _Safe_safeProvider, "f")), "f");
+    }
+    __classPrivateFieldSet(this, _Safe_ownerManager, new ownerManager_1.default(__classPrivateFieldGet(this, _Safe_safeProvider, "f"), __classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract), "f");
+    __classPrivateFieldSet(this, _Safe_moduleManager, new moduleManager_1.default(__classPrivateFieldGet(this, _Safe_safeProvider, "f"), __classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract), "f");
+    __classPrivateFieldSet(this, _Safe_guardManager, new guardManager_1.default(__classPrivateFieldGet(this, _Safe_safeProvider, "f"), __classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract), "f");
+    __classPrivateFieldSet(this, _Safe_fallbackHandlerManager, new fallbackHandlerManager_1.default(__classPrivateFieldGet(this, _Safe_safeProvider, "f"), __classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract), "f");
+}, _Safe_getFallbackHandlerContract = 
+/**
+ * Get the fallback handler contract
+ *
+ * @returns The fallback Handler contract
+ */
+async function _Safe_getFallbackHandlerContract() {
+    if (!__classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract) {
+        throw new Error('Safe is not deployed');
+    }
+    const safeVersion = (await __classPrivateFieldGet(this, _Safe_contractManager, "f").safeContract.getVersion()) ?? config_1.DEFAULT_SAFE_VERSION;
+    const chainId = await __classPrivateFieldGet(this, _Safe_safeProvider, "f").getChainId();
+    const compatibilityFallbackHandlerContract = await (0, safeDeploymentContracts_1.getCompatibilityFallbackHandlerContract)({
+        safeProvider: __classPrivateFieldGet(this, _Safe_safeProvider, "f"),
+        safeVersion,
+        customContracts: __classPrivateFieldGet(this, _Safe_contractManager, "f").contractNetworks?.[chainId.toString()]
+    });
+    return compatibilityFallbackHandlerContract;
+};
 exports.default = Safe;
 //# sourceMappingURL=Safe.js.map