@safe-global/protocol-kit 0.1.0 → 1.0.0

package/dist/src/managers/contractManager.js

@@ -12,8 +12,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _ContractManager_contractNetworks, _ContractManager_isL1SafeMasterCopy, _ContractManager_safeContract, _ContractManager_multiSendContract, _ContractManager_multiSendCallOnlyContract;
 Object.defineProperty(exports, "__esModule", { value: true });
-const config_1 = require("@safe-global/protocol-kit/contracts/config");
-const safeDeploymentContracts_1 = require("@safe-global/protocol-kit/contracts/safeDeploymentContracts");
+const config_1 = require("../contracts/config");
+const safeDeploymentContracts_1 = require("../contracts/safeDeploymentContracts");
+const types_1 = require("../utils/types");
 class ContractManager {
     constructor() {
         _ContractManager_contractNetworks.set(this, void 0);
@@ -22,43 +23,47 @@ class ContractManager {
         _ContractManager_multiSendContract.set(this, void 0);
         _ContractManager_multiSendCallOnlyContract.set(this, void 0);
     }
-    static async create({ ethAdapter, safeAddress, isL1SafeMasterCopy, contractNetworks }) {
+    static async create(config) {
         const contractManager = new ContractManager();
-        await contractManager.init({ ethAdapter, safeAddress, isL1SafeMasterCopy, contractNetworks });
+        await contractManager.init(config);
         return contractManager;
     }
-    async init({ ethAdapter, safeAddress, isL1SafeMasterCopy, contractNetworks }) {
+    async init(config) {
+        var _a;
+        const { ethAdapter, isL1SafeMasterCopy, contractNetworks } = config;
         const chainId = await ethAdapter.getChainId();
         const customContracts = contractNetworks === null || contractNetworks === void 0 ? void 0 : contractNetworks[chainId];
         __classPrivateFieldSet(this, _ContractManager_contractNetworks, contractNetworks, "f");
         __classPrivateFieldSet(this, _ContractManager_isL1SafeMasterCopy, isL1SafeMasterCopy, "f");
-        const temporarySafeContract = await (0, safeDeploymentContracts_1.getSafeContract)({
-            ethAdapter,
-            safeVersion: config_1.SAFE_LAST_VERSION,
-            chainId,
-            isL1SafeMasterCopy,
-            customSafeAddress: safeAddress,
-            customContracts
-        });
-        const safeVersion = await temporarySafeContract.getVersion();
-        __classPrivateFieldSet(this, _ContractManager_safeContract, await (0, safeDeploymentContracts_1.getSafeContract)({
-            ethAdapter,
-            safeVersion,
-            chainId,
-            isL1SafeMasterCopy,
-            customSafeAddress: safeAddress,
-            customContracts
-        }), "f");
+        let safeVersion;
+        if ((0, types_1.isSafeConfigWithPredictedSafe)(config)) {
+            safeVersion = (_a = config.predictedSafe.safeDeploymentConfig.safeVersion) !== null && _a !== void 0 ? _a : config_1.SAFE_LAST_VERSION;
+        }
+        else {
+            const temporarySafeContract = await (0, safeDeploymentContracts_1.getSafeContract)({
+                ethAdapter,
+                safeVersion: config_1.SAFE_LAST_VERSION,
+                isL1SafeMasterCopy,
+                customSafeAddress: config.safeAddress,
+                customContracts
+            });
+            safeVersion = await temporarySafeContract.getVersion();
+            __classPrivateFieldSet(this, _ContractManager_safeContract, await (0, safeDeploymentContracts_1.getSafeContract)({
+                ethAdapter,
+                safeVersion,
+                isL1SafeMasterCopy,
+                customSafeAddress: config.safeAddress,
+                customContracts
+            }), "f");
+        }
         __classPrivateFieldSet(this, _ContractManager_multiSendContract, await (0, safeDeploymentContracts_1.getMultiSendContract)({
             ethAdapter,
             safeVersion,
-            chainId,
             customContracts
         }), "f");
         __classPrivateFieldSet(this, _ContractManager_multiSendCallOnlyContract, await (0, safeDeploymentContracts_1.getMultiSendCallOnlyContract)({
             ethAdapter,
             safeVersion,
-            chainId,
             customContracts
         }), "f");
     }

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

@@ -1 +1 @@
-{"version":3,"file":"contractManager.js","sourceRoot":"","sources":["../../../src/managers/contractManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAKA,uEAA8E;AAC9E,yGAIoE;AAIpE,MAAM,eAAe;IAArB;QACE,oDAA0C;QAC1C,sDAA6B;QAC7B,gDAAkC;QAClC,qDAAsC;QACtC,6DAAsD;IA0ExD,CAAC;IAxEC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAClB,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,gBAAgB,EACL;QACX,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC7C,MAAM,eAAe,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,CAAC,CAAA;QAC7F,OAAO,eAAe,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EACT,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,gBAAgB,EACL;QACX,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,UAAU,EAAE,CAAA;QAC7C,MAAM,eAAe,GAAG,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAG,OAAO,CAAC,CAAA;QACnD,uBAAA,IAAI,qCAAqB,gBAAgB,MAAA,CAAA;QACzC,uBAAA,IAAI,uCAAuB,kBAAkB,MAAA,CAAA;QAE7C,MAAM,qBAAqB,GAAG,MAAM,IAAA,yCAAe,EAAC;YAClD,UAAU;YACV,WAAW,EAAE,0BAAiB;YAC9B,OAAO;YACP,kBAAkB;YAClB,iBAAiB,EAAE,WAAW;YAC9B,eAAe;SAChB,CAAC,CAAA;QACF,MAAM,WAAW,GAAG,MAAM,qBAAqB,CAAC,UAAU,EAAE,CAAA;QAC5D,uBAAA,IAAI,iCAAiB,MAAM,IAAA,yCAAe,EAAC;YACzC,UAAU;YACV,WAAW;YACX,OAAO;YACP,kBAAkB;YAClB,iBAAiB,EAAE,WAAW;YAC9B,eAAe;SAChB,CAAC,MAAA,CAAA;QACF,uBAAA,IAAI,sCAAsB,MAAM,IAAA,8CAAoB,EAAC;YACnD,UAAU;YACV,WAAW;YACX,OAAO;YACP,eAAe;SAChB,CAAC,MAAA,CAAA;QACF,uBAAA,IAAI,8CAA8B,MAAM,IAAA,sDAA4B,EAAC;YACnE,UAAU;YACV,WAAW;YACX,OAAO;YACP,eAAe;SAChB,CAAC,MAAA,CAAA;IACJ,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,uBAAA,IAAI,yCAAkB,CAAA;IAC/B,CAAC;IAED,IAAI,kBAAkB;QACpB,OAAO,uBAAA,IAAI,2CAAoB,CAAA;IACjC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,uBAAA,IAAI,qCAAc,CAAA;IAC3B,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,uBAAA,IAAI,0CAAmB,CAAA;IAChC,CAAC;IAED,IAAI,yBAAyB;QAC3B,OAAO,uBAAA,IAAI,kDAA2B,CAAA;IACxC,CAAC;CACF;;AAED,kBAAe,eAAe,CAAA"}
+{"version":3,"file":"contractManager.js","sourceRoot":"","sources":["../../../src/managers/contractManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,uEAA8E;AAC9E,yGAIoE;AAQpE,0CAA8D;AAE9D,MAAM,eAAe;IAArB;QACE,oDAA0C;QAC1C,sDAA6B;QAC7B,gDAAkC;QAClC,qDAAsC;QACtC,6DAAsD;IAqExD,CAAC;IAnEC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAkB;QACpC,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC7C,MAAM,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAClC,OAAO,eAAe,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAkB;;QAC3B,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,GAAG,MAAM,CAAA;QAEnE,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,UAAU,EAAE,CAAA;QAC7C,MAAM,eAAe,GAAG,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAG,OAAO,CAAC,CAAA;QACnD,uBAAA,IAAI,qCAAqB,gBAAgB,MAAA,CAAA;QACzC,uBAAA,IAAI,uCAAuB,kBAAkB,MAAA,CAAA;QAE7C,IAAI,WAAwB,CAAA;QAE5B,IAAI,IAAA,qCAA6B,EAAC,MAAM,CAAC,EAAE;YACzC,WAAW,GAAG,MAAA,MAAM,CAAC,aAAa,CAAC,oBAAoB,CAAC,WAAW,mCAAI,0BAAiB,CAAA;SACzF;aAAM;YACL,MAAM,qBAAqB,GAAG,MAAM,IAAA,yCAAe,EAAC;gBAClD,UAAU;gBACV,WAAW,EAAE,0BAAiB;gBAC9B,kBAAkB;gBAClB,iBAAiB,EAAE,MAAM,CAAC,WAAW;gBACrC,eAAe;aAChB,CAAC,CAAA;YACF,WAAW,GAAG,MAAM,qBAAqB,CAAC,UAAU,EAAE,CAAA;YACtD,uBAAA,IAAI,iCAAiB,MAAM,IAAA,yCAAe,EAAC;gBACzC,UAAU;gBACV,WAAW;gBACX,kBAAkB;gBAClB,iBAAiB,EAAE,MAAM,CAAC,WAAW;gBACrC,eAAe;aAChB,CAAC,MAAA,CAAA;SACH;QAED,uBAAA,IAAI,sCAAsB,MAAM,IAAA,8CAAoB,EAAC;YACnD,UAAU;YACV,WAAW;YACX,eAAe;SAChB,CAAC,MAAA,CAAA;QACF,uBAAA,IAAI,8CAA8B,MAAM,IAAA,sDAA4B,EAAC;YACnE,UAAU;YACV,WAAW;YACX,eAAe;SAChB,CAAC,MAAA,CAAA;IACJ,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,uBAAA,IAAI,yCAAkB,CAAA;IAC/B,CAAC;IAED,IAAI,kBAAkB;QACpB,OAAO,uBAAA,IAAI,2CAAoB,CAAA;IACjC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,uBAAA,IAAI,qCAAc,CAAA;IAC3B,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,uBAAA,IAAI,0CAAmB,CAAA;IAChC,CAAC;IAED,IAAI,yBAAyB;QAC3B,OAAO,uBAAA,IAAI,kDAA2B,CAAA;IACxC,CAAC;CACF;;AAED,kBAAe,eAAe,CAAA"}

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

@@ -1,7 +1,7 @@
 import { EthAdapter, GnosisSafeContract } from '@safe-global/safe-core-sdk-types';
 declare class FallbackHandlerManager {
     #private;
-    constructor(ethAdapter: EthAdapter, safeContract: GnosisSafeContract);
+    constructor(ethAdapter: EthAdapter, safeContract?: GnosisSafeContract);
     private validateFallbackHandlerAddress;
     private validateFallbackHandlerIsNotEnabled;
     private validateFallbackHandlerIsEnabled;

package/dist/src/managers/fallbackHandlerManager.js

@@ -12,8 +12,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _FallbackHandlerManager_ethAdapter, _FallbackHandlerManager_safeContract, _FallbackHandlerManager_slot;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("@safe-global/protocol-kit/utils");
-const constants_1 = require("@safe-global/protocol-kit/utils/constants");
+const utils_1 = require("../utils");
+const constants_1 = require("../utils/constants");
 class FallbackHandlerManager {
     constructor(ethAdapter, safeContract) {
         _FallbackHandlerManager_ethAdapter.set(this, void 0);
@@ -40,6 +40,9 @@ class FallbackHandlerManager {
         }
     }
     async getFallbackHandler() {
+        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(__classPrivateFieldGet(this, _FallbackHandlerManager_safeContract, "f").getAddress(), __classPrivateFieldGet(this, _FallbackHandlerManager_slot, "f"));
@@ -49,12 +52,18 @@ class FallbackHandlerManager {
         }
     }
     async encodeEnableFallbackHandlerData(fallbackHandlerAddress) {
+        if (!__classPrivateFieldGet(this, _FallbackHandlerManager_safeContract, "f")) {
+            throw new Error('Safe is not deployed');
+        }
         this.validateFallbackHandlerAddress(fallbackHandlerAddress);
         const currentFallbackHandler = await this.getFallbackHandler();
         this.validateFallbackHandlerIsNotEnabled(currentFallbackHandler, fallbackHandlerAddress);
         return __classPrivateFieldGet(this, _FallbackHandlerManager_safeContract, "f").encode('setFallbackHandler', [fallbackHandlerAddress]);
     }
     async encodeDisableFallbackHandlerData() {
+        if (!__classPrivateFieldGet(this, _FallbackHandlerManager_safeContract, "f")) {
+            throw new Error('Safe is not deployed');
+        }
         const currentFallbackHandler = await this.getFallbackHandler();
         this.validateFallbackHandlerIsEnabled(currentFallbackHandler);
         return __classPrivateFieldGet(this, _FallbackHandlerManager_safeContract, "f").encode('setFallbackHandler', [constants_1.ZERO_ADDRESS]);

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

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

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

@@ -1,7 +1,7 @@
 import { EthAdapter, GnosisSafeContract } from '@safe-global/safe-core-sdk-types';
 declare class GuardManager {
     #private;
-    constructor(ethAdapter: EthAdapter, safeContract: GnosisSafeContract);
+    constructor(ethAdapter: EthAdapter, safeContract?: GnosisSafeContract);
     private validateGuardAddress;
     private validateGuardIsNotEnabled;
     private validateGuardIsEnabled;

package/dist/src/managers/guardManager.js

@@ -12,8 +12,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _GuardManager_ethAdapter, _GuardManager_safeContract, _GuardManager_slot;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("@safe-global/protocol-kit/utils");
-const constants_1 = require("@safe-global/protocol-kit/utils/constants");
+const utils_1 = require("../utils");
+const constants_1 = require("../utils/constants");
 class GuardManager {
     constructor(ethAdapter, safeContract) {
         _GuardManager_ethAdapter.set(this, void 0);
@@ -40,6 +40,9 @@ class GuardManager {
         }
     }
     async getGuard() {
+        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(__classPrivateFieldGet(this, _GuardManager_safeContract, "f").getAddress(), __classPrivateFieldGet(this, _GuardManager_slot, "f"));
@@ -49,12 +52,18 @@ class GuardManager {
         }
     }
     async encodeEnableGuardData(guardAddress) {
+        if (!__classPrivateFieldGet(this, _GuardManager_safeContract, "f")) {
+            throw new Error('Safe is not deployed');
+        }
         this.validateGuardAddress(guardAddress);
         const currentGuard = await this.getGuard();
         this.validateGuardIsNotEnabled(currentGuard, guardAddress);
         return __classPrivateFieldGet(this, _GuardManager_safeContract, "f").encode('setGuard', [guardAddress]);
     }
     async encodeDisableGuardData() {
+        if (!__classPrivateFieldGet(this, _GuardManager_safeContract, "f")) {
+            throw new Error('Safe is not deployed');
+        }
         const currentGuard = await this.getGuard();
         this.validateGuardIsEnabled(currentGuard);
         return __classPrivateFieldGet(this, _GuardManager_safeContract, "f").encode('setGuard', [constants_1.ZERO_ADDRESS]);

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

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

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

@@ -1,7 +1,7 @@
 import { EthAdapter, GnosisSafeContract } from '@safe-global/safe-core-sdk-types';
 declare class ModuleManager {
     #private;
-    constructor(ethAdapter: EthAdapter, safeContract: GnosisSafeContract);
+    constructor(ethAdapter: EthAdapter, safeContract?: GnosisSafeContract);
     private validateModuleAddress;
     private validateModuleIsNotEnabled;
     private validateModuleIsEnabled;

package/dist/src/managers/moduleManager.js

@@ -12,8 +12,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _ModuleManager_ethAdapter, _ModuleManager_safeContract;
 Object.defineProperty(exports, "__esModule", { value: true });
-const address_1 = require("@safe-global/protocol-kit/utils/address");
-const constants_1 = require("@safe-global/protocol-kit/utils/constants");
+const address_1 = require("../utils/address");
+const constants_1 = require("../utils/constants");
 class ModuleManager {
     constructor(ethAdapter, safeContract) {
         _ModuleManager_ethAdapter.set(this, void 0);
@@ -43,18 +43,30 @@ class ModuleManager {
         return moduleIndex;
     }
     async getModules() {
+        if (!__classPrivateFieldGet(this, _ModuleManager_safeContract, "f")) {
+            throw new Error('Safe is not deployed');
+        }
         return __classPrivateFieldGet(this, _ModuleManager_safeContract, "f").getModules();
     }
     async isModuleEnabled(moduleAddress) {
+        if (!__classPrivateFieldGet(this, _ModuleManager_safeContract, "f")) {
+            throw new Error('Safe is not deployed');
+        }
         return __classPrivateFieldGet(this, _ModuleManager_safeContract, "f").isModuleEnabled(moduleAddress);
     }
     async encodeEnableModuleData(moduleAddress) {
+        if (!__classPrivateFieldGet(this, _ModuleManager_safeContract, "f")) {
+            throw new Error('Safe is not deployed');
+        }
         this.validateModuleAddress(moduleAddress);
         const modules = await this.getModules();
         this.validateModuleIsNotEnabled(moduleAddress, modules);
         return __classPrivateFieldGet(this, _ModuleManager_safeContract, "f").encode('enableModule', [moduleAddress]);
     }
     async encodeDisableModuleData(moduleAddress) {
+        if (!__classPrivateFieldGet(this, _ModuleManager_safeContract, "f")) {
+            throw new Error('Safe is not deployed');
+        }
         this.validateModuleAddress(moduleAddress);
         const modules = await this.getModules();
         const moduleIndex = this.validateModuleIsEnabled(moduleAddress, modules);

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

@@ -1 +1 @@
-{"version":3,"file":"moduleManager.js","sourceRoot":"","sources":["../../../src/managers/moduleManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,qEAAyF;AACzF,yEAA4E;AAE5E,MAAM,aAAa;IAIjB,YAAY,UAAsB,EAAE,YAAgC;QAHpE,4CAAuB;QACvB,8CAAiC;QAG/B,uBAAA,IAAI,6BAAe,UAAU,MAAA,CAAA;QAC7B,uBAAA,IAAI,+BAAiB,YAAY,MAAA,CAAA;IACnC,CAAC;IAEO,qBAAqB,CAAC,aAAqB;QACjD,MAAM,cAAc,GAAG,uBAAA,IAAI,iCAAY,CAAC,SAAS,CAAC,aAAa,CAAC,CAAA;QAChE,IAAI,CAAC,cAAc,IAAI,IAAA,6BAAmB,EAAC,aAAa,CAAC,EAAE;YACzD,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;SACnD;IACH,CAAC;IAEO,0BAA0B,CAAC,aAAqB,EAAE,OAAiB;QACzE,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,MAAc,EAAE,EAAE,CAAC,IAAA,oBAAU,EAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAA;QAC5F,MAAM,SAAS,GAAG,WAAW,IAAI,CAAC,CAAA;QAClC,IAAI,SAAS,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;SACtD;IACH,CAAC;IAEO,uBAAuB,CAAC,aAAqB,EAAE,OAAiB;QACtE,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,MAAc,EAAE,EAAE,CAAC,IAAA,oBAAU,EAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAA;QAC5F,MAAM,SAAS,GAAG,WAAW,IAAI,CAAC,CAAA;QAClC,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;SACtD;QACD,OAAO,WAAW,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,uBAAA,IAAI,mCAAc,CAAC,UAAU,EAAE,CAAA;IACxC,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,aAAqB;QACzC,OAAO,uBAAA,IAAI,mCAAc,CAAC,eAAe,CAAC,aAAa,CAAC,CAAA;IAC1D,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,aAAqB;QAChD,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAA;QACzC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;QACvC,IAAI,CAAC,0BAA0B,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;QACvD,OAAO,uBAAA,IAAI,mCAAc,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;IACnE,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,aAAqB;QACjD,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAA;QACzC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;QACvC,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;QACxE,MAAM,iBAAiB,GAAG,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,4BAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,GAAG,CAAC,CAAC,CAAA;QACzF,OAAO,uBAAA,IAAI,mCAAc,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC,CAAA;IACvF,CAAC;CACF;;AAED,kBAAe,aAAa,CAAA"}
+{"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,7 @@
 import { EthAdapter, GnosisSafeContract } from '@safe-global/safe-core-sdk-types';
 declare class OwnerManager {
     #private;
-    constructor(ethAdapter: EthAdapter, safeContract: GnosisSafeContract);
+    constructor(ethAdapter: EthAdapter, safeContract?: GnosisSafeContract);
     private validateOwnerAddress;
     private validateThreshold;
     private validateAddressIsNotOwner;

package/dist/src/managers/ownerManager.js

@@ -12,8 +12,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _OwnerManager_ethAdapter, _OwnerManager_safeContract;
 Object.defineProperty(exports, "__esModule", { value: true });
-const address_1 = require("@safe-global/protocol-kit/utils/address");
-const constants_1 = require("@safe-global/protocol-kit/utils/constants");
+const address_1 = require("../utils/address");
+const constants_1 = require("../utils/constants");
 class OwnerManager {
     constructor(ethAdapter, safeContract) {
         _OwnerManager_ethAdapter.set(this, void 0);
@@ -51,16 +51,28 @@ class OwnerManager {
         return ownerIndex;
     }
     async getOwners() {
+        if (!__classPrivateFieldGet(this, _OwnerManager_safeContract, "f")) {
+            throw new Error('Safe is not deployed');
+        }
         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();
     }
     async isOwner(ownerAddress) {
+        if (!__classPrivateFieldGet(this, _OwnerManager_safeContract, "f")) {
+            throw new Error('Safe is not deployed');
+        }
         return __classPrivateFieldGet(this, _OwnerManager_safeContract, "f").isOwner(ownerAddress);
     }
     async encodeAddOwnerWithThresholdData(ownerAddress, threshold) {
+        if (!__classPrivateFieldGet(this, _OwnerManager_safeContract, "f")) {
+            throw new Error('Safe is not deployed');
+        }
         this.validateOwnerAddress(ownerAddress);
         const owners = await this.getOwners();
         this.validateAddressIsNotOwner(ownerAddress, owners);
@@ -69,6 +81,9 @@ class OwnerManager {
         return __classPrivateFieldGet(this, _OwnerManager_safeContract, "f").encode('addOwnerWithThreshold', [ownerAddress, newThreshold]);
     }
     async encodeRemoveOwnerData(ownerAddress, threshold) {
+        if (!__classPrivateFieldGet(this, _OwnerManager_safeContract, "f")) {
+            throw new Error('Safe is not deployed');
+        }
         this.validateOwnerAddress(ownerAddress);
         const owners = await this.getOwners();
         const ownerIndex = this.validateAddressIsOwner(ownerAddress, owners);
@@ -78,6 +93,9 @@ class OwnerManager {
         return __classPrivateFieldGet(this, _OwnerManager_safeContract, "f").encode('removeOwner', [prevOwnerAddress, ownerAddress, newThreshold]);
     }
     async encodeSwapOwnerData(oldOwnerAddress, newOwnerAddress) {
+        if (!__classPrivateFieldGet(this, _OwnerManager_safeContract, "f")) {
+            throw new Error('Safe is not deployed');
+        }
         this.validateOwnerAddress(newOwnerAddress, 'Invalid new owner address provided');
         this.validateOwnerAddress(oldOwnerAddress, 'Invalid old owner address provided');
         const owners = await this.getOwners();
@@ -91,6 +109,9 @@ class OwnerManager {
         ]);
     }
     async encodeChangeThresholdData(threshold) {
+        if (!__classPrivateFieldGet(this, _OwnerManager_safeContract, "f")) {
+            throw new Error('Safe is not deployed');
+        }
         const owners = await this.getOwners();
         this.validateThreshold(threshold, owners.length);
         return __classPrivateFieldGet(this, _OwnerManager_safeContract, "f").encode('changeThreshold', [threshold]);

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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"}

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

@@ -1,26 +1,9 @@
+import Safe from '../Safe';
+import { ContractNetworksConfig, SafeAccountConfig } from '../types';
 import { EthAdapter, SafeVersion, TransactionOptions } from '@safe-global/safe-core-sdk-types';
-import Safe from '@safe-global/protocol-kit/Safe';
-import { ContractNetworksConfig } from '@safe-global/protocol-kit/types';
-export interface SafeAccountConfig {
-    owners: string[];
-    threshold: number;
-    to?: string;
-    data?: string;
-    fallbackHandler?: string;
-    paymentToken?: string;
-    payment?: number;
-    paymentReceiver?: string;
-}
-export interface SafeDeploymentConfig {
-    saltNonce: string;
-}
-export interface PredictSafeProps {
-    safeAccountConfig: SafeAccountConfig;
-    safeDeploymentConfig: SafeDeploymentConfig;
-}
 export interface DeploySafeProps {
     safeAccountConfig: SafeAccountConfig;
-    safeDeploymentConfig?: SafeDeploymentConfig;
+    saltNonce?: string;
     options?: TransactionOptions;
     callback?: (txHash: string) => void;
 }
@@ -42,8 +25,7 @@ declare class SafeFactory {
     getSafeVersion(): SafeVersion;
     getAddress(): string;
     getChainId(): Promise<number>;
-    private encodeSetupCallData;
-    predictSafeAddress({ safeAccountConfig, safeDeploymentConfig }: PredictSafeProps): Promise<string>;
-    deploySafe({ safeAccountConfig, safeDeploymentConfig, options, callback }: DeploySafeProps): Promise<Safe>;
+    predictSafeAddress(safeAccountConfig: SafeAccountConfig, saltNonce?: string): Promise<string>;
+    deploySafe({ safeAccountConfig, saltNonce, options, callback }: DeploySafeProps): Promise<Safe>;
 }
 export default SafeFactory;

package/dist/src/safeFactory/index.js

@@ -15,13 +15,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _SafeFactory_contractNetworks, _SafeFactory_isL1SafeMasterCopy, _SafeFactory_safeVersion, _SafeFactory_ethAdapter, _SafeFactory_safeProxyFactoryContract, _SafeFactory_gnosisSafeContract;
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethereumjs_util_1 = require("ethereumjs-util");
-const satisfies_1 = __importDefault(require("semver/functions/satisfies"));
-const config_1 = require("@safe-global/protocol-kit/contracts/config");
-const safeDeploymentContracts_1 = require("@safe-global/protocol-kit/contracts/safeDeploymentContracts");
-const Safe_1 = __importDefault(require("@safe-global/protocol-kit/Safe"));
-const constants_1 = require("@safe-global/protocol-kit/utils/constants");
-const utils_1 = require("./utils");
+const config_1 = require("../contracts/config");
+const safeDeploymentContracts_1 = require("../contracts/safeDeploymentContracts");
+const Safe_1 = __importDefault(require("../Safe"));
+const utils_1 = require("../contracts/utils");
 class SafeFactory {
     constructor() {
         _SafeFactory_contractNetworks.set(this, void 0);
@@ -46,13 +43,11 @@ class SafeFactory {
         __classPrivateFieldSet(this, _SafeFactory_safeProxyFactoryContract, await (0, safeDeploymentContracts_1.getProxyFactoryContract)({
             ethAdapter,
             safeVersion,
-            chainId,
             customContracts
         }), "f");
         __classPrivateFieldSet(this, _SafeFactory_gnosisSafeContract, await (0, safeDeploymentContracts_1.getSafeContract)({
             ethAdapter,
             safeVersion,
-            chainId,
             isL1SafeMasterCopy,
             customContracts
         }), "f");
@@ -69,71 +64,36 @@ class SafeFactory {
     async getChainId() {
         return __classPrivateFieldGet(this, _SafeFactory_ethAdapter, "f").getChainId();
     }
-    async encodeSetupCallData({ 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 }) {
+    async predictSafeAddress(safeAccountConfig, saltNonce = utils_1.PREDETERMINED_SALT_NONCE) {
         var _a;
-        if ((0, satisfies_1.default)(__classPrivateFieldGet(this, _SafeFactory_safeVersion, "f"), '<=1.0.0')) {
-            return __classPrivateFieldGet(this, _SafeFactory_gnosisSafeContract, "f").encode('setup', [
-                owners,
-                threshold,
-                to,
-                data,
-                paymentToken,
-                payment,
-                paymentReceiver
-            ]);
-        }
-        let fallbackHandlerAddress;
-        if (fallbackHandler) {
-            fallbackHandlerAddress = fallbackHandler;
-        }
-        else {
-            const chainId = await __classPrivateFieldGet(this, _SafeFactory_ethAdapter, "f").getChainId();
-            const customContracts = (_a = __classPrivateFieldGet(this, _SafeFactory_contractNetworks, "f")) === null || _a === void 0 ? void 0 : _a[chainId];
-            const fallbackHandlerContract = await (0, safeDeploymentContracts_1.getCompatibilityFallbackHandlerContract)({
-                ethAdapter: __classPrivateFieldGet(this, _SafeFactory_ethAdapter, "f"),
-                safeVersion: __classPrivateFieldGet(this, _SafeFactory_safeVersion, "f"),
-                chainId,
-                customContracts
-            });
-            fallbackHandlerAddress = fallbackHandlerContract.getAddress();
-        }
-        return __classPrivateFieldGet(this, _SafeFactory_gnosisSafeContract, "f").encode('setup', [
-            owners,
-            threshold,
-            to,
-            data,
-            fallbackHandlerAddress,
-            paymentToken,
-            payment,
-            paymentReceiver
-        ]);
-    }
-    async predictSafeAddress({ safeAccountConfig, safeDeploymentConfig }) {
-        (0, utils_1.validateSafeAccountConfig)(safeAccountConfig);
-        (0, utils_1.validateSafeDeploymentConfig)(safeDeploymentConfig);
-        const from = __classPrivateFieldGet(this, _SafeFactory_safeProxyFactoryContract, "f").getAddress();
-        const initializer = await this.encodeSetupCallData(safeAccountConfig);
-        const saltNonce = safeDeploymentConfig.saltNonce;
-        const encodedNonce = (0, ethereumjs_util_1.toBuffer)(__classPrivateFieldGet(this, _SafeFactory_ethAdapter, "f").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 proxyCreationCode = await __classPrivateFieldGet(this, _SafeFactory_safeProxyFactoryContract, "f").proxyCreationCode();
-        const constructorData = (0, ethereumjs_util_1.toBuffer)(__classPrivateFieldGet(this, _SafeFactory_ethAdapter, "f").encodeParameters(['address'], [__classPrivateFieldGet(this, _SafeFactory_gnosisSafeContract, "f").getAddress()])).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');
-        return __classPrivateFieldGet(this, _SafeFactory_ethAdapter, "f").getChecksummedAddress(proxyAddress);
+        const chainId = await __classPrivateFieldGet(this, _SafeFactory_ethAdapter, "f").getChainId();
+        const customContracts = (_a = __classPrivateFieldGet(this, _SafeFactory_contractNetworks, "f")) === null || _a === void 0 ? void 0 : _a[chainId];
+        const safeVersion = __classPrivateFieldGet(this, _SafeFactory_safeVersion, "f");
+        const safeDeploymentConfig = { saltNonce, safeVersion };
+        return (0, utils_1.predictSafeAddress)({
+            ethAdapter: __classPrivateFieldGet(this, _SafeFactory_ethAdapter, "f"),
+            safeAccountConfig,
+            safeDeploymentConfig,
+            isL1SafeMasterCopy: __classPrivateFieldGet(this, _SafeFactory_isL1SafeMasterCopy, "f"),
+            customContracts
+        });
     }
-    async deploySafe({ safeAccountConfig, safeDeploymentConfig, options, callback }) {
+    async deploySafe({ safeAccountConfig, saltNonce = utils_1.PREDETERMINED_SALT_NONCE, options, callback }) {
         var _a;
         (0, utils_1.validateSafeAccountConfig)(safeAccountConfig);
-        if (safeDeploymentConfig) {
-            (0, utils_1.validateSafeDeploymentConfig)(safeDeploymentConfig);
-        }
+        (0, utils_1.validateSafeDeploymentConfig)({ saltNonce });
         const signerAddress = await __classPrivateFieldGet(this, _SafeFactory_ethAdapter, "f").getSignerAddress();
         if (!signerAddress) {
             throw new Error('EthAdapter must be initialized with a signer to use this method');
         }
-        const initializer = await this.encodeSetupCallData(safeAccountConfig);
-        const saltNonce = (_a = safeDeploymentConfig === null || safeDeploymentConfig === void 0 ? void 0 : safeDeploymentConfig.saltNonce) !== null && _a !== void 0 ? _a : (Date.now() * 1000 + Math.floor(Math.random() * 1000)).toString();
+        const chainId = await this.getChainId();
+        const customContracts = (_a = __classPrivateFieldGet(this, _SafeFactory_contractNetworks, "f")) === null || _a === void 0 ? void 0 : _a[chainId];
+        const initializer = await (0, utils_1.encodeSetupCallData)({
+            ethAdapter: __classPrivateFieldGet(this, _SafeFactory_ethAdapter, "f"),
+            safeAccountConfig,
+            safeContract: __classPrivateFieldGet(this, _SafeFactory_gnosisSafeContract, "f"),
+            customContracts
+        });
         if ((options === null || options === void 0 ? void 0 : options.gas) && (options === null || options === void 0 ? void 0 : options.gasLimit)) {
             throw new Error('Cannot specify gas and gasLimit together in transaction options');
         }

package/dist/src/safeFactory/index.js.map

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