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

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,13 @@
-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 create(config: SafeConfig, safeProvider: SafeProvider): Promise<ContractManager>;
+    init(config: SafeConfig, safeProvider: SafeProvider): Promise<void>;
     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

@@ -23,14 +23,14 @@ class ContractManager {
         _ContractManager_multiSendContract.set(this, void 0);
         _ContractManager_multiSendCallOnlyContract.set(this, void 0);
     }
-    static async create(config) {
+    static async create(config, safeProvider) {
         const contractManager = new ContractManager();
-        await contractManager.init(config);
+        await contractManager.init(config, safeProvider);
         return contractManager;
     }
-    async init(config) {
-        const { ethAdapter, isL1SafeSingleton, contractNetworks, predictedSafe, safeAddress } = config;
-        const chainId = await ethAdapter.getChainId();
+    async init(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");
@@ -41,7 +41,7 @@ class ContractManager {
         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,
+                safeProvider,
                 safeVersion: config_1.DEFAULT_SAFE_VERSION,
                 isL1SafeSingleton,
                 customSafeAddress: safeAddress,
@@ -54,7 +54,7 @@ class ContractManager {
             __classPrivateFieldSet(this, _ContractManager_safeContract, isTheDefaultSafeVersion
                 ? defaultSafeContractInstance
                 : await (0, safeDeploymentContracts_1.getSafeContract)({
-                    ethAdapter,
+                    safeProvider,
                     safeVersion,
                     isL1SafeSingleton,
                     customSafeAddress: safeAddress,
@@ -62,12 +62,12 @@ class ContractManager {
                 }), "f");
         }
         __classPrivateFieldSet(this, _ContractManager_multiSendContract, await (0, safeDeploymentContracts_1.getMultiSendContract)({
-            ethAdapter,
+            safeProvider,
             safeVersion,
             customContracts
         }), "f");
         __classPrivateFieldSet(this, _ContractManager_multiSendCallOnlyContract, await (0, safeDeploymentContracts_1.getMultiSendCallOnlyContract)({
-            ethAdapter,
+            safeProvider,
             safeVersion,
             customContracts
         }), "f");

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,MAAM,CAAC,MAAkB,EAAE,YAA0B;QAChE,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC7C,MAAM,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;QAChD,OAAO,eAAe,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAkB,EAAE,YAA0B;QACvD,MAAM,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,MAAM,CAAA;QAElF,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,CAAA;QAC/C,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,YAAY;gBACZ,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,YAAY;oBACZ,WAAW;oBACX,iBAAiB;oBACjB,iBAAiB,EAAE,WAAW;oBAC9B,eAAe;iBAChB,CAAC,MAAA,CAAA;QACR,CAAC;QAED,uBAAA,IAAI,sCAAsB,MAAM,IAAA,8CAAoB,EAAC;YACnD,YAAY;YACZ,WAAW;YACX,eAAe;SAChB,CAAC,MAAA,CAAA;QAEF,uBAAA,IAAI,8CAA8B,MAAM,IAAA,sDAA4B,EAAC;YACnE,YAAY;YACZ,WAAW;YACX,eAAe;SAChB,CAAC,MAAA,CAAA;IACJ,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,uBAAA,IAAI,yCAAkB,CAAA;IAC/B,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,uBAAA,IAAI,0CAAmB,CAAA;IAChC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,uBAAA,IAAI,qCAAc,CAAA;IAC3B,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,uBAAA,IAAI,0CAAmB,CAAA;IAChC,CAAC;IAED,IAAI,yBAAyB;QAC3B,OAAO,uBAAA,IAAI,kDAA2B,CAAA;IACxC,CAAC;CACF;;AAED,kBAAe,eAAe,CAAA"}

package/dist/src/managers/fallbackHandlerManager.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

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

@@ -1 +1 @@
-{"version":3,"file":"fallbackHandlerManager.js","sourceRoot":"","sources":["../../../src/managers/fallbackHandlerManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2DAKwC;AACxC,yEAAwE;AAGxE,MAAM,sBAAsB;IAM1B,YAAY,UAAsB,EAAE,YAA2B;QAL/D,qDAAuB;QACvB,uDAA4B;QAC5B,gDAAgD;QAChD,uCAAQ,oEAAoE,EAAA;QAG1E,uBAAA,IAAI,sCAAe,UAAU,MAAA,CAAA;QAC7B,uBAAA,IAAI,wCAAiB,YAAY,MAAA,CAAA;IACnC,CAAC;IAEO,8BAA8B,CAAC,sBAA8B;QACnE,MAAM,cAAc,GAAG,uBAAA,IAAI,0CAAY,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAA;QACzE,IAAI,CAAC,cAAc,IAAI,IAAA,qBAAa,EAAC,sBAAsB,CAAC,EAAE,CAAC;YAC7D,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;QAC9D,CAAC;IACH,CAAC;IAEO,mCAAmC,CACzC,sBAA8B,EAC9B,yBAAiC;QAEjC,IAAI,IAAA,kBAAU,EAAC,sBAAsB,EAAE,yBAAyB,CAAC,EAAE,CAAC;YAClE,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;QACjE,CAAC;IACH,CAAC;IAEO,gCAAgC,CAAC,sBAA8B;QACrE,IAAI,IAAA,qBAAa,EAAC,sBAAsB,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;QAC7D,CAAC;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,IAAI,CAAC,uBAAA,IAAI,4CAAc,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;QACzC,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,4CAAc,CAAC,UAAU,EAAE,CAAA;QACzD,IAAI,IAAA,sBAAc,EAAC,qBAAa,CAAC,qBAAqB,EAAE,WAAW,CAAC,EAAE,CAAC;YACrE,OAAO,uBAAA,IAAI,0CAAY,CAAC,YAAY,CAAC,MAAM,uBAAA,IAAI,4CAAc,CAAC,UAAU,EAAE,EAAE,uBAAA,IAAI,oCAAM,CAAC,CAAA;QACzF,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CACb,iFAAiF,CAClF,CAAA;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,+BAA+B,CAAC,sBAA8B;QAClE,IAAI,CAAC,uBAAA,IAAI,4CAAc,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;QACzC,CAAC;QACD,IAAI,CAAC,8BAA8B,CAAC,sBAAsB,CAAC,CAAA;QAC3D,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAC9D,IAAI,CAAC,mCAAmC,CAAC,sBAAsB,EAAE,sBAAsB,CAAC,CAAA;QACxF,OAAO,uBAAA,IAAI,4CAAc,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAA;IAClF,CAAC;IAED,KAAK,CAAC,gCAAgC;QACpC,IAAI,CAAC,uBAAA,IAAI,4CAAc,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;QACzC,CAAC;QACD,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAC9D,IAAI,CAAC,gCAAgC,CAAC,sBAAsB,CAAC,CAAA;QAC7D,OAAO,uBAAA,IAAI,4CAAc,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC,wBAAY,CAAC,CAAC,CAAA;IACxE,CAAC;CACF;;AAED,kBAAe,sBAAsB,CAAA"}
+{"version":3,"file":"fallbackHandlerManager.js","sourceRoot":"","sources":["../../../src/managers/fallbackHandlerManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2DAMwC;AACxC,yEAAwE;AAIxE,MAAM,sBAAsB;IAM1B,YAAY,YAA0B,EAAE,YAA6C;QALrF,uDAA2B;QAC3B,uDAA8C;QAC9C,gDAAgD;QAChD,uCAAQ,oEAAoE,EAAA;QAG1E,uBAAA,IAAI,wCAAiB,YAAY,MAAA,CAAA;QACjC,uBAAA,IAAI,wCAAiB,YAAY,MAAA,CAAA;IACnC,CAAC;IAEO,8BAA8B,CAAC,sBAA8B;QACnE,MAAM,cAAc,GAAG,uBAAA,IAAI,4CAAc,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAA;QAC3E,IAAI,CAAC,cAAc,IAAI,IAAA,qBAAa,EAAC,sBAAsB,CAAC,EAAE,CAAC;YAC7D,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;QAC9D,CAAC;IACH,CAAC;IAEO,mCAAmC,CACzC,sBAA8B,EAC9B,yBAAiC;QAEjC,IAAI,IAAA,kBAAU,EAAC,sBAAsB,EAAE,yBAAyB,CAAC,EAAE,CAAC;YAClE,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;QACjE,CAAC;IACH,CAAC;IAEO,gCAAgC,CAAC,sBAA8B;QACrE,IAAI,IAAA,qBAAa,EAAC,sBAAsB,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;QAC7D,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,2BAA2B;QACvC,IAAI,CAAC,uBAAA,IAAI,4CAAc,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;QACzC,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,4CAAc,CAAC,UAAU,EAAE,CAAA;QACzD,IAAI,CAAC,IAAA,sBAAc,EAAC,qBAAa,CAAC,qBAAqB,EAAE,WAAW,CAAC,EAAE,CAAC;YACtE,MAAM,IAAI,KAAK,CACb,iFAAiF,CAClF,CAAA;QACH,CAAC;QAED,OAAO,uBAAA,IAAI,4CAA2D,CAAA;IACxE,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAA;QAE7D,OAAO,uBAAA,IAAI,4CAAc,CAAC,YAAY,CAAC,MAAM,YAAY,CAAC,UAAU,EAAE,EAAE,uBAAA,IAAI,oCAAM,CAAC,CAAA;IACrF,CAAC;IAED,KAAK,CAAC,+BAA+B,CAAC,sBAA8B;QAClE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAA;QAE7D,IAAI,CAAC,8BAA8B,CAAC,sBAAsB,CAAC,CAAA;QAC3D,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAC9D,IAAI,CAAC,mCAAmC,CAAC,sBAAsB,EAAE,sBAAsB,CAAC,CAAA;QAExF,OAAO,YAAY,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAA;IAC5E,CAAC;IAED,KAAK,CAAC,gCAAgC;QACpC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAA;QAE7D,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAC9D,IAAI,CAAC,gCAAgC,CAAC,sBAAsB,CAAC,CAAA;QAE7D,OAAO,YAAY,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC,wBAAY,CAAC,CAAC,CAAA;IAClE,CAAC;CACF;;AAED,kBAAe,sBAAsB,CAAA"}

package/dist/src/managers/guardManager.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 GuardManager {
     #private;
-    constructor(ethAdapter: EthAdapter, safeContract?: SafeContract);
+    constructor(safeProvider: SafeProvider, safeContract?: SafeContractImplementationType);
     private validateGuardAddress;
     private validateGuardIsNotEnabled;
     private validateGuardIsEnabled;
+    private isGuardCompatible;
     getGuard(): Promise<string>;
     encodeEnableGuardData(guardAddress: string): Promise<string>;
     encodeDisableGuardData(): Promise<string>;

package/dist/src/managers/guardManager.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 _GuardManager_ethAdapter, _GuardManager_safeContract, _GuardManager_slot;
+var _GuardManager_safeProvider, _GuardManager_safeContract, _GuardManager_slot;
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../utils");
 const constants_1 = require("../utils/constants");
 class GuardManager {
-    constructor(ethAdapter, safeContract) {
-        _GuardManager_ethAdapter.set(this, void 0);
+    constructor(safeProvider, safeContract) {
+        _GuardManager_safeProvider.set(this, void 0);
         _GuardManager_safeContract.set(this, void 0);
         // keccak256("guard_manager.guard.address")
         _GuardManager_slot.set(this, '0x4a204f620c8c5ccdca3fd54d003badd85ba500436a431f0cbda4f558c93c34c8');
-        __classPrivateFieldSet(this, _GuardManager_ethAdapter, ethAdapter, "f");
+        __classPrivateFieldSet(this, _GuardManager_safeProvider, safeProvider, "f");
         __classPrivateFieldSet(this, _GuardManager_safeContract, safeContract, "f");
     }
     validateGuardAddress(guardAddress) {
-        const isValidAddress = __classPrivateFieldGet(this, _GuardManager_ethAdapter, "f").isAddress(guardAddress);
+        const isValidAddress = __classPrivateFieldGet(this, _GuardManager_safeProvider, "f").isAddress(guardAddress);
         if (!isValidAddress || (0, utils_1.isZeroAddress)(guardAddress)) {
             throw new Error('Invalid guard address provided');
         }
@@ -39,36 +39,34 @@ class GuardManager {
             throw new Error('There is no guard enabled yet');
         }
     }
-    async getGuard() {
+    async isGuardCompatible() {
         if (!__classPrivateFieldGet(this, _GuardManager_safeContract, "f")) {
             throw new Error('Safe is not deployed');
         }
         const safeVersion = await __classPrivateFieldGet(this, _GuardManager_safeContract, "f").getVersion();
-        if ((0, utils_1.hasSafeFeature)(utils_1.SAFE_FEATURES.SAFE_TX_GUARDS, safeVersion)) {
-            return __classPrivateFieldGet(this, _GuardManager_ethAdapter, "f").getStorageAt(await __classPrivateFieldGet(this, _GuardManager_safeContract, "f").getAddress(), __classPrivateFieldGet(this, _GuardManager_slot, "f"));
-        }
-        else {
+        if (!(0, utils_1.hasSafeFeature)(utils_1.SAFE_FEATURES.SAFE_TX_GUARDS, safeVersion)) {
             throw new Error('Current version of the Safe does not support Safe transaction guards functionality');
         }
+        return __classPrivateFieldGet(this, _GuardManager_safeContract, "f");
+    }
+    async getGuard() {
+        const safeContract = await this.isGuardCompatible();
+        return __classPrivateFieldGet(this, _GuardManager_safeProvider, "f").getStorageAt(await safeContract.getAddress(), __classPrivateFieldGet(this, _GuardManager_slot, "f"));
     }
     async encodeEnableGuardData(guardAddress) {
-        if (!__classPrivateFieldGet(this, _GuardManager_safeContract, "f")) {
-            throw new Error('Safe is not deployed');
-        }
+        const safeContract = await this.isGuardCompatible();
         this.validateGuardAddress(guardAddress);
         const currentGuard = await this.getGuard();
         this.validateGuardIsNotEnabled(currentGuard, guardAddress);
-        return __classPrivateFieldGet(this, _GuardManager_safeContract, "f").encode('setGuard', [guardAddress]);
+        return safeContract.encode('setGuard', [guardAddress]);
     }
     async encodeDisableGuardData() {
-        if (!__classPrivateFieldGet(this, _GuardManager_safeContract, "f")) {
-            throw new Error('Safe is not deployed');
-        }
+        const safeContract = await this.isGuardCompatible();
         const currentGuard = await this.getGuard();
         this.validateGuardIsEnabled(currentGuard);
-        return __classPrivateFieldGet(this, _GuardManager_safeContract, "f").encode('setGuard', [constants_1.ZERO_ADDRESS]);
+        return safeContract.encode('setGuard', [constants_1.ZERO_ADDRESS]);
     }
 }
-_GuardManager_ethAdapter = new WeakMap(), _GuardManager_safeContract = new WeakMap(), _GuardManager_slot = new WeakMap();
+_GuardManager_safeProvider = new WeakMap(), _GuardManager_safeContract = new WeakMap(), _GuardManager_slot = new WeakMap();
 exports.default = GuardManager;
 //# sourceMappingURL=guardManager.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"guardManager.js","sourceRoot":"","sources":["../../../src/managers/guardManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2DAKwC;AACxC,yEAAwE;AAGxE,MAAM,YAAY;IAMhB,YAAY,UAAsB,EAAE,YAA2B;QAL/D,2CAAuB;QACvB,6CAA4B;QAC5B,2CAA2C;QAC3C,6BAAQ,oEAAoE,EAAA;QAG1E,uBAAA,IAAI,4BAAe,UAAU,MAAA,CAAA;QAC7B,uBAAA,IAAI,8BAAiB,YAAY,MAAA,CAAA;IACnC,CAAC;IAEO,oBAAoB,CAAC,YAAoB;QAC/C,MAAM,cAAc,GAAG,uBAAA,IAAI,gCAAY,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QAC/D,IAAI,CAAC,cAAc,IAAI,IAAA,qBAAa,EAAC,YAAY,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;QACnD,CAAC;IACH,CAAC;IAEO,yBAAyB,CAAC,YAAoB,EAAE,eAAuB;QAC7E,IAAI,IAAA,kBAAU,EAAC,YAAY,EAAE,eAAe,CAAC,EAAE,CAAC;YAC9C,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;QACtD,CAAC;IACH,CAAC;IAEO,sBAAsB,CAAC,YAAoB;QACjD,IAAI,IAAA,qBAAa,EAAC,YAAY,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;QAClD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,IAAI,CAAC,uBAAA,IAAI,kCAAc,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;QACzC,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,kCAAc,CAAC,UAAU,EAAE,CAAA;QACzD,IAAI,IAAA,sBAAc,EAAC,qBAAa,CAAC,cAAc,EAAE,WAAW,CAAC,EAAE,CAAC;YAC9D,OAAO,uBAAA,IAAI,gCAAY,CAAC,YAAY,CAAC,MAAM,uBAAA,IAAI,kCAAc,CAAC,UAAU,EAAE,EAAE,uBAAA,IAAI,0BAAM,CAAC,CAAA;QACzF,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CACb,oFAAoF,CACrF,CAAA;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,YAAoB;QAC9C,IAAI,CAAC,uBAAA,IAAI,kCAAc,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;QACzC,CAAC;QACD,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAA;QACvC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;QAC1C,IAAI,CAAC,yBAAyB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;QAC1D,OAAO,uBAAA,IAAI,kCAAc,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;IAC9D,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B,IAAI,CAAC,uBAAA,IAAI,kCAAc,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;QACzC,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;QAC1C,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAA;QACzC,OAAO,uBAAA,IAAI,kCAAc,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,wBAAY,CAAC,CAAC,CAAA;IAC9D,CAAC;CACF;;AAED,kBAAe,YAAY,CAAA"}
+{"version":3,"file":"guardManager.js","sourceRoot":"","sources":["../../../src/managers/guardManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2DAMwC;AACxC,yEAAwE;AAIxE,MAAM,YAAY;IAMhB,YAAY,YAA0B,EAAE,YAA6C;QALrF,6CAA2B;QAC3B,6CAA8C;QAC9C,2CAA2C;QAC3C,6BAAQ,oEAAoE,EAAA;QAG1E,uBAAA,IAAI,8BAAiB,YAAY,MAAA,CAAA;QACjC,uBAAA,IAAI,8BAAiB,YAAY,MAAA,CAAA;IACnC,CAAC;IAEO,oBAAoB,CAAC,YAAoB;QAC/C,MAAM,cAAc,GAAG,uBAAA,IAAI,kCAAc,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QACjE,IAAI,CAAC,cAAc,IAAI,IAAA,qBAAa,EAAC,YAAY,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;QACnD,CAAC;IACH,CAAC;IAEO,yBAAyB,CAAC,YAAoB,EAAE,eAAuB;QAC7E,IAAI,IAAA,kBAAU,EAAC,YAAY,EAAE,eAAe,CAAC,EAAE,CAAC;YAC9C,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;QACtD,CAAC;IACH,CAAC;IAEO,sBAAsB,CAAC,YAAoB;QACjD,IAAI,IAAA,qBAAa,EAAC,YAAY,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;QAClD,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,iBAAiB;QAC7B,IAAI,CAAC,uBAAA,IAAI,kCAAc,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;QACzC,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,kCAAc,CAAC,UAAU,EAAE,CAAA;QACzD,IAAI,CAAC,IAAA,sBAAc,EAAC,qBAAa,CAAC,cAAc,EAAE,WAAW,CAAC,EAAE,CAAC;YAC/D,MAAM,IAAI,KAAK,CACb,oFAAoF,CACrF,CAAA;QACH,CAAC;QAED,OAAO,uBAAA,IAAI,kCAAwD,CAAA;IACrE,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAA;QAEnD,OAAO,uBAAA,IAAI,kCAAc,CAAC,YAAY,CAAC,MAAM,YAAY,CAAC,UAAU,EAAE,EAAE,uBAAA,IAAI,0BAAM,CAAC,CAAA;IACrF,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,YAAoB;QAC9C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAA;QAEnD,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAA;QACvC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;QAC1C,IAAI,CAAC,yBAAyB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;QAC1D,OAAO,YAAY,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;IACxD,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAA;QAEnD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;QAC1C,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAA;QACzC,OAAO,YAAY,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,wBAAY,CAAC,CAAC,CAAA;IACxD,CAAC;CACF;;AAED,kBAAe,YAAY,CAAA"}

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

@@ -1,12 +1,13 @@
-import { EthAdapter, SafeContract } from '@safe-global/safe-core-sdk-types';
+import { SafeContractImplementationType, SafeModulesPaginated } from '../types';
+import SafeProvider from '../SafeProvider';
 declare class ModuleManager {
     #private;
-    constructor(ethAdapter: EthAdapter, safeContract?: SafeContract);
+    constructor(safeProvider: SafeProvider, safeContract?: SafeContractImplementationType);
     private validateModuleAddress;
     private validateModuleIsNotEnabled;
     private validateModuleIsEnabled;
     getModules(): Promise<string[]>;
-    getModulesPaginated(start: string, pageSize: number): Promise<string[]>;
+    getModulesPaginated(start: string, pageSize: number): Promise<SafeModulesPaginated>;
     isModuleEnabled(moduleAddress: string): Promise<boolean>;
     encodeEnableModuleData(moduleAddress: string): Promise<string>;
     encodeDisableModuleData(moduleAddress: string): Promise<string>;

package/dist/src/managers/moduleManager.js

@@ -10,19 +10,19 @@ 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 _ModuleManager_ethAdapter, _ModuleManager_safeContract;
+var _ModuleManager_safeProvider, _ModuleManager_safeContract;
 Object.defineProperty(exports, "__esModule", { value: true });
 const address_1 = require("../utils/address");
 const constants_1 = require("../utils/constants");
 class ModuleManager {
-    constructor(ethAdapter, safeContract) {
-        _ModuleManager_ethAdapter.set(this, void 0);
+    constructor(safeProvider, safeContract) {
+        _ModuleManager_safeProvider.set(this, void 0);
         _ModuleManager_safeContract.set(this, void 0);
-        __classPrivateFieldSet(this, _ModuleManager_ethAdapter, ethAdapter, "f");
+        __classPrivateFieldSet(this, _ModuleManager_safeProvider, safeProvider, "f");
         __classPrivateFieldSet(this, _ModuleManager_safeContract, safeContract, "f");
     }
     validateModuleAddress(moduleAddress) {
-        const isValidAddress = __classPrivateFieldGet(this, _ModuleManager_ethAdapter, "f").isAddress(moduleAddress);
+        const isValidAddress = __classPrivateFieldGet(this, _ModuleManager_safeProvider, "f").isAddress(moduleAddress);
         if (!isValidAddress || (0, address_1.isRestrictedAddress)(moduleAddress)) {
             throw new Error('Invalid module address provided');
         }
@@ -46,19 +46,22 @@ class ModuleManager {
         if (!__classPrivateFieldGet(this, _ModuleManager_safeContract, "f")) {
             throw new Error('Safe is not deployed');
         }
-        return __classPrivateFieldGet(this, _ModuleManager_safeContract, "f").getModules();
+        const [modules] = await __classPrivateFieldGet(this, _ModuleManager_safeContract, "f").getModules();
+        return [...modules];
     }
     async getModulesPaginated(start, pageSize) {
         if (!__classPrivateFieldGet(this, _ModuleManager_safeContract, "f")) {
             throw new Error('Safe is not deployed');
         }
-        return __classPrivateFieldGet(this, _ModuleManager_safeContract, "f").getModulesPaginated(start, pageSize);
+        const [modules, next] = await __classPrivateFieldGet(this, _ModuleManager_safeContract, "f").getModulesPaginated([start, BigInt(pageSize)]);
+        return { modules: modules, next };
     }
     async isModuleEnabled(moduleAddress) {
         if (!__classPrivateFieldGet(this, _ModuleManager_safeContract, "f")) {
             throw new Error('Safe is not deployed');
         }
-        return __classPrivateFieldGet(this, _ModuleManager_safeContract, "f").isModuleEnabled(moduleAddress);
+        const [isModuleEnabled] = await __classPrivateFieldGet(this, _ModuleManager_safeContract, "f").isModuleEnabled([moduleAddress]);
+        return isModuleEnabled;
     }
     async encodeEnableModuleData(moduleAddress) {
         if (!__classPrivateFieldGet(this, _ModuleManager_safeContract, "f")) {
@@ -80,6 +83,6 @@ class ModuleManager {
         return __classPrivateFieldGet(this, _ModuleManager_safeContract, "f").encode('disableModule', [prevModuleAddress, moduleAddress]);
     }
 }
-_ModuleManager_ethAdapter = new WeakMap(), _ModuleManager_safeContract = new WeakMap();
+_ModuleManager_safeProvider = new WeakMap(), _ModuleManager_safeContract = new WeakMap();
 exports.default = ModuleManager;
 //# sourceMappingURL=moduleManager.js.map

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

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

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

@@ -1,7 +1,8 @@
-import { EthAdapter, SafeContract } from '@safe-global/safe-core-sdk-types';
+import { SafeContractImplementationType } from '../types';
+import SafeProvider from '../SafeProvider';
 declare class OwnerManager {
     #private;
-    constructor(ethAdapter: EthAdapter, safeContract?: SafeContract);
+    constructor(safeProvider: SafeProvider, safeContract?: SafeContractImplementationType);
     private validateOwnerAddress;
     private validateThreshold;
     private validateAddressIsNotOwner;

package/dist/src/managers/ownerManager.js

@@ -10,19 +10,19 @@ 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 _OwnerManager_ethAdapter, _OwnerManager_safeContract;
+var _OwnerManager_safeProvider, _OwnerManager_safeContract;
 Object.defineProperty(exports, "__esModule", { value: true });
 const address_1 = require("../utils/address");
 const constants_1 = require("../utils/constants");
 class OwnerManager {
-    constructor(ethAdapter, safeContract) {
-        _OwnerManager_ethAdapter.set(this, void 0);
+    constructor(safeProvider, safeContract) {
+        _OwnerManager_safeProvider.set(this, void 0);
         _OwnerManager_safeContract.set(this, void 0);
-        __classPrivateFieldSet(this, _OwnerManager_ethAdapter, ethAdapter, "f");
+        __classPrivateFieldSet(this, _OwnerManager_safeProvider, safeProvider, "f");
         __classPrivateFieldSet(this, _OwnerManager_safeContract, safeContract, "f");
     }
     validateOwnerAddress(ownerAddress, errorMessage) {
-        const isValidAddress = __classPrivateFieldGet(this, _OwnerManager_ethAdapter, "f").isAddress(ownerAddress);
+        const isValidAddress = __classPrivateFieldGet(this, _OwnerManager_safeProvider, "f").isAddress(ownerAddress);
         if (!isValidAddress || (0, address_1.isRestrictedAddress)(ownerAddress)) {
             throw new Error(errorMessage || 'Invalid owner address provided');
         }
@@ -54,20 +54,22 @@ class OwnerManager {
         if (!__classPrivateFieldGet(this, _OwnerManager_safeContract, "f")) {
             throw new Error('Safe is not deployed');
         }
-        const owners = await __classPrivateFieldGet(this, _OwnerManager_safeContract, "f").getOwners();
+        const [owners] = await __classPrivateFieldGet(this, _OwnerManager_safeContract, "f").getOwners();
         return [...owners];
     }
     async getThreshold() {
         if (!__classPrivateFieldGet(this, _OwnerManager_safeContract, "f")) {
             throw new Error('Safe is not deployed');
         }
-        return __classPrivateFieldGet(this, _OwnerManager_safeContract, "f").getThreshold();
+        const [threshold] = await __classPrivateFieldGet(this, _OwnerManager_safeContract, "f").getThreshold();
+        return Number(threshold);
     }
     async isOwner(ownerAddress) {
         if (!__classPrivateFieldGet(this, _OwnerManager_safeContract, "f")) {
             throw new Error('Safe is not deployed');
         }
-        return __classPrivateFieldGet(this, _OwnerManager_safeContract, "f").isOwner(ownerAddress);
+        const [isOwner] = await __classPrivateFieldGet(this, _OwnerManager_safeContract, "f").isOwner([ownerAddress]);
+        return isOwner;
     }
     async encodeAddOwnerWithThresholdData(ownerAddress, threshold) {
         if (!__classPrivateFieldGet(this, _OwnerManager_safeContract, "f")) {
@@ -117,6 +119,6 @@ class OwnerManager {
         return __classPrivateFieldGet(this, _OwnerManager_safeContract, "f").encode('changeThreshold', [threshold]);
     }
 }
-_OwnerManager_ethAdapter = new WeakMap(), _OwnerManager_safeContract = new WeakMap();
+_OwnerManager_safeProvider = new WeakMap(), _OwnerManager_safeContract = new WeakMap();
 exports.default = OwnerManager;
 //# sourceMappingURL=ownerManager.js.map

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

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