@gearbox-protocol/deploy-tools 4.1.1-next.1 → 4.1.1

package/dist/index.mjs

@@ -137917,7 +137917,7 @@ var require_httpRequests = __commonJS({
       HttpMethod2["Get"] = "get";
       HttpMethod2["Post"] = "post";
       HttpMethod2["Delete"] = "delete";
-    })(HttpMethod = exports2.HttpMethod || (exports2.HttpMethod = {}));
+    })(HttpMethod || (exports2.HttpMethod = HttpMethod = {}));
     async function sendRequest({ url: url2, method, body }) {
       const response = await (0, node_fetch_1.default)(url2, {
         method,
@@ -171363,8 +171363,11 @@ var require_re = __commonJS({
     createToken("XRANGEPLAINLOOSE", `[v=\\s]*(${src[t.XRANGEIDENTIFIERLOOSE]})(?:\\.(${src[t.XRANGEIDENTIFIERLOOSE]})(?:\\.(${src[t.XRANGEIDENTIFIERLOOSE]})(?:${src[t.PRERELEASELOOSE]})?${src[t.BUILD]}?)?)?`);
     createToken("XRANGE", `^${src[t.GTLT]}\\s*${src[t.XRANGEPLAIN]}$`);
     createToken("XRANGELOOSE", `^${src[t.GTLT]}\\s*${src[t.XRANGEPLAINLOOSE]}$`);
-    createToken("COERCE", `${"(^|[^\\d])(\\d{1,"}${MAX_SAFE_COMPONENT_LENGTH}})(?:\\.(\\d{1,${MAX_SAFE_COMPONENT_LENGTH}}))?(?:\\.(\\d{1,${MAX_SAFE_COMPONENT_LENGTH}}))?(?:$|[^\\d])`);
+    createToken("COERCEPLAIN", `${"(^|[^\\d])(\\d{1,"}${MAX_SAFE_COMPONENT_LENGTH}})(?:\\.(\\d{1,${MAX_SAFE_COMPONENT_LENGTH}}))?(?:\\.(\\d{1,${MAX_SAFE_COMPONENT_LENGTH}}))?`);
+    createToken("COERCE", `${src[t.COERCEPLAIN]}(?:$|[^\\d])`);
+    createToken("COERCEFULL", src[t.COERCEPLAIN] + `(?:${src[t.PRERELEASE]})?(?:${src[t.BUILD]})?(?:$|[^\\d])`);
     createToken("COERCERTL", src[t.COERCE], true);
+    createToken("COERCERTLFULL", src[t.COERCEFULL], true);
     createToken("LONETILDE", "(?:~>?)");
     createToken("TILDETRIM", `(\\s*)${src[t.LONETILDE]}\\s+`, true);
     exports2.tildeTrimReplace = "$1~";
@@ -183394,40 +183397,43 @@ var require_utils14 = __commonJS({
       ]);
     }
     exports2.encodeSetupCallData = encodeSetupCallData;
-    var memoizedGetProxyFactoryContract = (0, memoized_1.createMemoizedFunction)(safeDeploymentContracts_1.getProxyFactoryContract);
-    var memoizedGetSafeContract = (0, memoized_1.createMemoizedFunction)(safeDeploymentContracts_1.getSafeContract);
-    var memoizedGetProxyCreationCode = (0, memoized_1.createMemoizedFunction)(async ({ ethAdapter, safeVersion, customContracts }) => {
+    var memoizedGetProxyFactoryContract = (0, memoized_1.createMemoizedFunction)(({ ethAdapter, safeVersion, customContracts }) => (0, safeDeploymentContracts_1.getProxyFactoryContract)({ ethAdapter, safeVersion, customContracts }));
+    var memoizedGetProxyCreationCode = (0, memoized_1.createMemoizedFunction)(async ({ ethAdapter, safeVersion, customContracts, chainId }) => {
       const safeProxyFactoryContract = await memoizedGetProxyFactoryContract({
         ethAdapter,
         safeVersion,
-        customContracts
+        customContracts,
+        chainId
       });
       return safeProxyFactoryContract.proxyCreationCode();
     });
+    var memoizedGetSafeContract = (0, memoized_1.createMemoizedFunction)(({ ethAdapter, safeVersion, isL1SafeSingleton, customContracts }) => (0, safeDeploymentContracts_1.getSafeContract)({ ethAdapter, safeVersion, isL1SafeSingleton, customContracts }));
     function getChainSpecificDefaultSaltNonce(chainId) {
       return `0x${Buffer.from((0, sha3_1.keccak_256)(exports2.PREDETERMINED_SALT_NONCE + chainId)).toString("hex")}`;
     }
     exports2.getChainSpecificDefaultSaltNonce = getChainSpecificDefaultSaltNonce;
-    async function predictSafeAddress({ ethAdapter, safeAccountConfig, safeDeploymentConfig = {}, isL1SafeSingleton = false, customContracts }) {
+    async function predictSafeAddress({ ethAdapter, chainId, safeAccountConfig, safeDeploymentConfig = {}, isL1SafeSingleton = false, customContracts }) {
       (0, exports2.validateSafeAccountConfig)(safeAccountConfig);
       (0, exports2.validateSafeDeploymentConfig)(safeDeploymentConfig);
-      const chainId = await ethAdapter.getChainId();
       const { safeVersion = config_1.DEFAULT_SAFE_VERSION, saltNonce = getChainSpecificDefaultSaltNonce(chainId) } = safeDeploymentConfig;
       const safeProxyFactoryContract = await memoizedGetProxyFactoryContract({
         ethAdapter,
         safeVersion,
-        customContracts
+        customContracts,
+        chainId: chainId.toString()
       });
       const proxyCreationCode = await memoizedGetProxyCreationCode({
         ethAdapter,
         safeVersion,
-        customContracts
+        customContracts,
+        chainId: chainId.toString()
       });
       const safeContract = await memoizedGetSafeContract({
         ethAdapter,
         safeVersion,
         isL1SafeSingleton,
-        customContracts
+        customContracts,
+        chainId: chainId.toString()
       });
       const initializer = await encodeSetupCallData({
         ethAdapter,
@@ -194855,9 +194861,11 @@ var require_config2 = __commonJS({
       { chainId: 61n, shortName: "etc" },
       { chainId: 63n, shortName: "metc" },
       { chainId: 69n, shortName: "okov" },
+      { chainId: 71n, shortName: "cfxtest" },
       { chainId: 81n, shortName: "joc" },
       { chainId: 82n, shortName: "meter" },
       { chainId: 83n, shortName: "meter-test" },
+      { chainId: 88n, shortName: "tomo" },
       { chainId: 97n, shortName: "bnbt" },
       { chainId: 100n, shortName: "gno" },
       { chainId: 106n, shortName: "vlx" },
@@ -194868,8 +194876,11 @@ var require_config2 = __commonJS({
       { chainId: 137n, shortName: "matic" },
       { chainId: 148n, shortName: "shimmerevm-mainnet" },
       { chainId: 155n, shortName: "tenet-testnet" },
+      { chainId: 169n, shortName: "manta" },
+      { chainId: 204n, shortName: "opbnb" },
       { chainId: 246n, shortName: "ewt" },
       { chainId: 250n, shortName: "ftm" },
+      { chainId: 255n, shortName: "kroma" },
       { chainId: 280n, shortName: "zksync-goerli" },
       { chainId: 288n, shortName: "boba" },
       { chainId: 291n, shortName: "orderly" },
@@ -194880,6 +194891,7 @@ var require_config2 = __commonJS({
       { chainId: 336n, shortName: "sdn" },
       { chainId: 338n, shortName: "tcro" },
       { chainId: 420n, shortName: "ogor" },
+      { chainId: 424n, shortName: "PNG" },
       { chainId: 570n, shortName: "sys-rollux" },
       { chainId: 588n, shortName: "metis-stardust" },
       { chainId: 592n, shortName: "astr" },
@@ -194889,6 +194901,7 @@ var require_config2 = __commonJS({
       { chainId: 787n, shortName: "aca" },
       { chainId: 1001n, shortName: "baobab" },
       { chainId: 1008n, shortName: "eun" },
+      { chainId: 1030n, shortName: "cfx" },
       { chainId: 1088n, shortName: "metis-andromeda" },
       { chainId: 1101n, shortName: "zkevm" },
       { chainId: 1111n, shortName: "wemix" },
@@ -194903,6 +194916,7 @@ var require_config2 = __commonJS({
       { chainId: 1294n, shortName: "bobabeam" },
       { chainId: 1442n, shortName: "testnet-zkEVM-mango" },
       { chainId: 1559n, shortName: "tenet" },
+      { chainId: 1663n, shortName: "Gobi" },
       { chainId: 1807n, shortName: "rana" },
       { chainId: 1890n, shortName: "lightlink_phoenix" },
       { chainId: 1891n, shortName: "lightlink_pegasus" },
@@ -194915,8 +194929,10 @@ var require_config2 = __commonJS({
       { chainId: 2021n, shortName: "edg" },
       { chainId: 2221n, shortName: "tkava" },
       { chainId: 2222n, shortName: "kava" },
+      { chainId: 2358n, shortName: "kroma-sepolia" },
       { chainId: 3737n, shortName: "csb" },
       { chainId: 4002n, shortName: "tftm" },
+      { chainId: 4337n, shortName: "beam" },
       { chainId: 4460n, shortName: "orderlyl2" },
       { chainId: 4689n, shortName: "iotex-mainnet" },
       { chainId: 4918n, shortName: "txvm" },
@@ -194926,8 +194942,11 @@ var require_config2 = __commonJS({
       { chainId: 5700n, shortName: "tsys" },
       { chainId: 6102n, shortName: "cascadia" },
       { chainId: 7001n, shortName: "zetachain-athens" },
+      { chainId: 7332n, shortName: "EON" },
       { chainId: 7341n, shortName: "shyft" },
       { chainId: 7700n, shortName: "canto" },
+      { chainId: 8192n, shortName: "tqf" },
+      { chainId: 8194n, shortName: "ttqf" },
       { chainId: 8217n, shortName: "cypress" },
       { chainId: 8453n, shortName: "base" },
       { chainId: 9000n, shortName: "evmos-testnet" },
@@ -194937,13 +194956,16 @@ var require_config2 = __commonJS({
       { chainId: 10001n, shortName: "smartbchtest" },
       { chainId: 10081n, shortName: "joct" },
       { chainId: 10200n, shortName: "chi" },
+      { chainId: 10243n, shortName: "aa" },
       { chainId: 11235n, shortName: "islm" },
       { chainId: 11437n, shortName: "shyftt" },
       { chainId: 11891n, shortName: "Arianee" },
       { chainId: 12357n, shortName: "rei-testnet" },
+      { chainId: 13337n, shortName: "beam-testnet" },
       { chainId: 17000n, shortName: "holesky" },
       { chainId: 23294n, shortName: "sapphire" },
       { chainId: 23295n, shortName: "sapphire-testnet" },
+      { chainId: 34443n, shortName: "mode" },
       { chainId: 42161n, shortName: "arb1" },
       { chainId: 42170n, shortName: "arb-nova" },
       { chainId: 42220n, shortName: "celo" },
@@ -194956,13 +194978,15 @@ var require_config2 = __commonJS({
       { chainId: 54211n, shortName: "islmt" },
       { chainId: 56288n, shortName: "boba-bnb" },
       { chainId: 57000n, shortName: "tsys-rollux" },
+      { chainId: 58008n, shortName: "sepPNG" },
       { chainId: 59140n, shortName: "linea-testnet" },
       { chainId: 59144n, shortName: "linea" },
       { chainId: 71401n, shortName: "gw-testnet-v1" },
       { chainId: 71402n, shortName: "gw-mainnet-v1" },
       { chainId: 73799n, shortName: "vt" },
       { chainId: 80001n, shortName: "maticmum" },
-      { chainId: 84531n, shortName: "base-gor" },
+      { chainId: 84531n, shortName: "basegor" },
+      { chainId: 84532n, shortName: "basesep" },
       { chainId: 200101n, shortName: "milktada" },
       { chainId: 200202n, shortName: "milktalgo" },
       { chainId: 333999n, shortName: "olympus" },
@@ -194975,8 +194999,10 @@ var require_config2 = __commonJS({
       { chainId: 622277n, shortName: "rth" },
       { chainId: 7777777n, shortName: "zora" },
       { chainId: 11155111n, shortName: "sep" },
+      { chainId: 222000222n, shortName: "kanazawa" },
       { chainId: 245022926n, shortName: "neonevm-devnet" },
       { chainId: 245022934n, shortName: "neonevm-mainnet" },
+      { chainId: 333000333n, shortName: "meld" },
       { chainId: 1313161554n, shortName: "aurora" },
       { chainId: 1313161555n, shortName: "aurora-testnet" },
       { chainId: 1666600000n, shortName: "hmy-s0" },
@@ -195053,7 +195079,8 @@ var require_eip_712 = __commonJS({
       return mod2 && mod2.__esModule ? mod2 : { "default": mod2 };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.generateTypedData = exports2.getEip712MessageTypes = exports2.EIP712_DOMAIN = exports2.EIP712_DOMAIN_BEFORE_V130 = void 0;
+    exports2.generateTypedData = exports2.hashSafeMessage = exports2.hashTypedData = exports2.getEip712MessageTypes = exports2.getEip712TxTypes = exports2.EIP712_DOMAIN = exports2.EIP712_DOMAIN_BEFORE_V130 = void 0;
+    var ethers_1 = require_lib228();
     var satisfies_1 = __importDefault2(require_satisfies());
     var EQ_OR_GT_1_3_0 = ">=1.3.0";
     exports2.EIP712_DOMAIN_BEFORE_V130 = [
@@ -195072,7 +195099,7 @@ var require_eip_712 = __commonJS({
         name: "verifyingContract"
       }
     ];
-    function getEip712MessageTypes(safeVersion) {
+    function getEip712TxTypes(safeVersion) {
       const eip712WithChainId = (0, satisfies_1.default)(safeVersion, EQ_OR_GT_1_3_0);
       return {
         EIP712Domain: eip712WithChainId ? exports2.EIP712_DOMAIN : exports2.EIP712_DOMAIN_BEFORE_V130,
@@ -195090,24 +195117,59 @@ var require_eip_712 = __commonJS({
         ]
       };
     }
-    exports2.getEip712MessageTypes = getEip712MessageTypes;
-    function generateTypedData({ safeAddress, safeVersion, chainId, safeTransactionData }) {
+    exports2.getEip712TxTypes = getEip712TxTypes;
+    function getEip712MessageTypes(safeVersion) {
       const eip712WithChainId = (0, satisfies_1.default)(safeVersion, EQ_OR_GT_1_3_0);
-      const typedData = {
-        types: getEip712MessageTypes(safeVersion),
-        domain: {
-          verifyingContract: safeAddress
-        },
-        primaryType: "SafeTx",
-        message: {
-          ...safeTransactionData,
-          value: safeTransactionData.value,
-          safeTxGas: safeTransactionData.safeTxGas,
-          baseGas: safeTransactionData.baseGas,
-          gasPrice: safeTransactionData.gasPrice,
-          nonce: safeTransactionData.nonce
-        }
+      return {
+        EIP712Domain: eip712WithChainId ? exports2.EIP712_DOMAIN : exports2.EIP712_DOMAIN_BEFORE_V130,
+        SafeMessage: [{ type: "bytes", name: "message" }]
       };
+    }
+    exports2.getEip712MessageTypes = getEip712MessageTypes;
+    var hashTypedData = (typedData) => {
+      const { EIP712Domain: _, ...types2 } = typedData.types;
+      return ethers_1.ethers.TypedDataEncoder.hash(typedData.domain, types2, typedData.message);
+    };
+    exports2.hashTypedData = hashTypedData;
+    var hashMessage2 = (message) => {
+      return ethers_1.ethers.hashMessage(message);
+    };
+    var hashSafeMessage = (message) => {
+      return typeof message === "string" ? hashMessage2(message) : (0, exports2.hashTypedData)(message);
+    };
+    exports2.hashSafeMessage = hashSafeMessage;
+    function generateTypedData({ safeAddress, safeVersion, chainId, data }) {
+      const isSafeTransactionDataType = data.hasOwnProperty("to");
+      const eip712WithChainId = (0, satisfies_1.default)(safeVersion, EQ_OR_GT_1_3_0);
+      let typedData;
+      if (isSafeTransactionDataType) {
+        const txData = data;
+        typedData = {
+          types: getEip712TxTypes(safeVersion),
+          domain: {
+            verifyingContract: safeAddress
+          },
+          primaryType: "SafeTx",
+          message: {
+            ...txData,
+            value: txData.value,
+            safeTxGas: txData.safeTxGas,
+            baseGas: txData.baseGas,
+            gasPrice: txData.gasPrice,
+            nonce: txData.nonce
+          }
+        };
+      } else {
+        const message = data;
+        typedData = {
+          types: getEip712MessageTypes(safeVersion),
+          domain: {
+            verifyingContract: safeAddress
+          },
+          primaryType: "SafeMessage",
+          message: { message: (0, exports2.hashSafeMessage)(message) }
+        };
+      }
       if (eip712WithChainId) {
         typedData.domain.chainId = chainId.toString();
       }
@@ -195134,7 +195196,7 @@ var require_safeVersions = __commonJS({
       SAFE_FEATURES2["SAFE_FALLBACK_HANDLER"] = "SAFE_FALLBACK_HANDLER";
       SAFE_FEATURES2["ETH_SIGN"] = "ETH_SIGN";
       SAFE_FEATURES2["ACCOUNT_ABSTRACTION"] = "ACCOUNT_ABSTRACTION";
-    })(SAFE_FEATURES = exports2.SAFE_FEATURES || (exports2.SAFE_FEATURES = {}));
+    })(SAFE_FEATURES || (exports2.SAFE_FEATURES = SAFE_FEATURES = {}));
     var SAFE_FEATURES_BY_VERSION = {
       [SAFE_FEATURES.SAFE_TX_GAS_OPTIONAL]: ">=1.3.0",
       [SAFE_FEATURES.SAFE_TX_GUARDS]: ">=1.3.0",
@@ -195166,16 +195228,20 @@ var require_SafeSignature = __commonJS({
        * @param signature - The Safe signature
        * @returns The Safe signature instance
        */
-      constructor(signer, signature) {
+      constructor(signer, signature, isContractSignature = false) {
         this.signer = signer;
         this.data = signature;
+        this.isContractSignature = isContractSignature;
       }
       /**
        * Returns the static part of the Safe signature.
        *
        * @returns The static part of the Safe signature
        */
-      staticPart() {
+      staticPart(dynamicOffset) {
+        if (this.isContractSignature) {
+          return `${this.signer.slice(2).padStart(64, "0")}${dynamicOffset || ""}00`;
+        }
         return this.data;
       }
       /**
@@ -195184,6 +195250,10 @@ var require_SafeSignature = __commonJS({
        * @returns The dynamic part of the Safe signature
        */
       dynamicPart() {
+        if (this.isContractSignature) {
+          const dynamicPartLength = (this.data.slice(2).length / 2).toString(16).padStart(64, "0");
+          return `${dynamicPartLength}${this.data.slice(2)}`;
+        }
         return "";
       }
     };
@@ -195191,15 +195261,39 @@ var require_SafeSignature = __commonJS({
   }
 });
 
+// ../../node_modules/@safe-global/protocol-kit/dist/src/types/index.js
+var require_types14 = __commonJS({
+  "../../node_modules/@safe-global/protocol-kit/dist/src/types/index.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.SigningMethod = void 0;
+    var SigningMethod;
+    (function(SigningMethod2) {
+      SigningMethod2["ETH_SIGN"] = "eth_sign";
+      SigningMethod2["ETH_SIGN_TYPED_DATA"] = "eth_signTypedData";
+      SigningMethod2["ETH_SIGN_TYPED_DATA_V3"] = "eth_signTypedData_v3";
+      SigningMethod2["ETH_SIGN_TYPED_DATA_V4"] = "eth_signTypedData_v4";
+      SigningMethod2["SAFE_SIGNATURE"] = "safe_sign";
+    })(SigningMethod || (exports2.SigningMethod = SigningMethod = {}));
+  }
+});
+
 // ../../node_modules/@safe-global/protocol-kit/dist/src/utils/signatures/utils.js
 var require_utils19 = __commonJS({
   "../../node_modules/@safe-global/protocol-kit/dist/src/utils/signatures/utils.js"(exports2) {
     "use strict";
+    var __importDefault2 = exports2 && exports2.__importDefault || function(mod2) {
+      return mod2 && mod2.__esModule ? mod2 : { "default": mod2 };
+    };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.generateEIP712Signature = exports2.generateSignature = exports2.adjustVInSignature = exports2.isTxHashSignedWithPrefix = exports2.generatePreValidatedSignature = void 0;
+    exports2.calculateSafeMessageHash = exports2.calculateSafeTransactionHash = exports2.preimageSafeMessageHash = exports2.preimageSafeTransactionHash = exports2.buildSignatureBytes = exports2.buildContractSignature = exports2.generateEIP712Signature = exports2.generateSignature = exports2.adjustVInSignature = exports2.isTxHashSignedWithPrefix = exports2.generatePreValidatedSignature = void 0;
+    var ethers_1 = require_lib228();
     var ethereumjs_util_1 = require_dist4();
+    var satisfies_1 = __importDefault2(require_satisfies());
     var address_1 = require_address8();
     var SafeSignature_1 = require_SafeSignature();
+    var eip_712_1 = require_eip_712();
+    var types_1 = require_types14();
     function generatePreValidatedSignature(ownerAddress) {
       const signature = "0x000000000000000000000000" + ownerAddress.slice(2) + "000000000000000000000000000000000000000000000000000000000000000001";
       return new SafeSignature_1.EthSafeSignature(ownerAddress, signature);
@@ -195229,7 +195323,7 @@ var require_utils19 = __commonJS({
       if (!ETHEREUM_V_VALUES.includes(signatureV)) {
         throw new Error("Invalid signature");
       }
-      if (signingMethod === "eth_sign") {
+      if (signingMethod === types_1.SigningMethod.ETH_SIGN) {
         if (signatureV < MIN_VALID_V_VALUE_FOR_SAFE_ECDSA) {
           signatureV += MIN_VALID_V_VALUE_FOR_SAFE_ECDSA;
         }
@@ -195239,7 +195333,7 @@ var require_utils19 = __commonJS({
           signatureV += 4;
         }
       }
-      if (signingMethod === "eth_signTypedData") {
+      if (signingMethod === types_1.SigningMethod.ETH_SIGN_TYPED_DATA) {
         if (signatureV < MIN_VALID_V_VALUE_FOR_SAFE_ECDSA) {
           signatureV += MIN_VALID_V_VALUE_FOR_SAFE_ECDSA;
         }
@@ -195254,20 +195348,67 @@ var require_utils19 = __commonJS({
         throw new Error("EthAdapter must be initialized with a signer to use this method");
       }
       let signature = await ethAdapter.signMessage(hash2);
-      signature = (0, exports2.adjustVInSignature)("eth_sign", signature, hash2, signerAddress);
+      signature = (0, exports2.adjustVInSignature)(types_1.SigningMethod.ETH_SIGN, signature, hash2, signerAddress);
       return new SafeSignature_1.EthSafeSignature(signerAddress, signature);
     }
     exports2.generateSignature = generateSignature;
-    async function generateEIP712Signature(ethAdapter, safeTransactionEIP712Args, methodVersion) {
+    async function generateEIP712Signature(ethAdapter, safeEIP712Args, methodVersion) {
       const signerAddress = await ethAdapter.getSignerAddress();
       if (!signerAddress) {
         throw new Error("EthAdapter must be initialized with a signer to use this method");
       }
-      let signature = await ethAdapter.signTypedData(safeTransactionEIP712Args, methodVersion);
-      signature = (0, exports2.adjustVInSignature)("eth_signTypedData", signature);
+      let signature = await ethAdapter.signTypedData(safeEIP712Args, methodVersion);
+      signature = (0, exports2.adjustVInSignature)(types_1.SigningMethod.ETH_SIGN_TYPED_DATA, signature);
       return new SafeSignature_1.EthSafeSignature(signerAddress, signature);
     }
     exports2.generateEIP712Signature = generateEIP712Signature;
+    var buildContractSignature = async (signatures, signerSafeAddress) => {
+      const contractSignature = new SafeSignature_1.EthSafeSignature(signerSafeAddress, (0, exports2.buildSignatureBytes)(signatures), true);
+      return contractSignature;
+    };
+    exports2.buildContractSignature = buildContractSignature;
+    var buildSignatureBytes = (signatures) => {
+      const SIGNATURE_LENGTH_BYTES = 65;
+      signatures.sort((left, right) => left.signer.toLowerCase().localeCompare(right.signer.toLowerCase()));
+      let signatureBytes = "0x";
+      let dynamicBytes = "";
+      for (const signature of signatures) {
+        if (signature.isContractSignature) {
+          const dynamicPartPosition = (signatures.length * SIGNATURE_LENGTH_BYTES + dynamicBytes.length / 2).toString(16).padStart(64, "0");
+          signatureBytes += signature.staticPart(dynamicPartPosition);
+          dynamicBytes += signature.dynamicPart();
+        } else {
+          signatureBytes += signature.data.slice(2);
+        }
+      }
+      return signatureBytes + dynamicBytes;
+    };
+    exports2.buildSignatureBytes = buildSignatureBytes;
+    var preimageSafeTransactionHash = (safeAddress, safeTx, safeVersion, chainId) => {
+      const safeTxTypes = (0, eip_712_1.getEip712TxTypes)(safeVersion);
+      return ethers_1.ethers.TypedDataEncoder.encode({ verifyingContract: safeAddress, chainId }, { SafeTx: safeTxTypes.SafeTx }, safeTx);
+    };
+    exports2.preimageSafeTransactionHash = preimageSafeTransactionHash;
+    var preimageSafeMessageHash = (safeAddress, message, safeVersion, chainId) => {
+      const safeMessageTypes = (0, eip_712_1.getEip712MessageTypes)(safeVersion);
+      return ethers_1.ethers.TypedDataEncoder.encode({ verifyingContract: safeAddress, chainId }, { SafeMessage: safeMessageTypes.SafeMessage }, { message });
+    };
+    exports2.preimageSafeMessageHash = preimageSafeMessageHash;
+    var EQ_OR_GT_1_3_0 = ">=1.3.0";
+    var calculateSafeTransactionHash = (safeAddress, safeTx, safeVersion, chainId) => {
+      const safeTxTypes = (0, eip_712_1.getEip712TxTypes)(safeVersion);
+      const domain = { verifyingContract: safeAddress };
+      if ((0, satisfies_1.default)(safeVersion, EQ_OR_GT_1_3_0)) {
+        domain.chainId = chainId;
+      }
+      return ethers_1.ethers.TypedDataEncoder.hash(domain, { SafeTx: safeTxTypes.SafeTx }, safeTx);
+    };
+    exports2.calculateSafeTransactionHash = calculateSafeTransactionHash;
+    var calculateSafeMessageHash = (safeAddress, message, safeVersion, chainId) => {
+      const safeMessageTypes = (0, eip_712_1.getEip712MessageTypes)(safeVersion);
+      return ethers_1.ethers.TypedDataEncoder.hash({ verifyingContract: safeAddress, chainId }, { SafeMessage: safeMessageTypes.SafeMessage }, { message });
+    };
+    exports2.calculateSafeMessageHash = calculateSafeMessageHash;
   }
 });
 
@@ -195613,27 +195754,20 @@ var require_SafeTransaction = __commonJS({
   "../../node_modules/@safe-global/protocol-kit/dist/src/utils/transactions/SafeTransaction.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
+    var signatures_1 = require_signatures();
     var EthSafeTransaction = class {
       constructor(data) {
         this.signatures = /* @__PURE__ */ new Map();
         this.data = data;
       }
+      getSignature(signer) {
+        return this.signatures.get(signer.toLowerCase());
+      }
       addSignature(signature) {
         this.signatures.set(signature.signer.toLowerCase(), signature);
       }
       encodedSignatures() {
-        const signers = Array.from(this.signatures.keys()).sort();
-        const baseOffset = signers.length * 65;
-        let staticParts = "";
-        let dynamicParts = "";
-        signers.forEach((signerAddress) => {
-          const signature = this.signatures.get(signerAddress);
-          staticParts += signature?.staticPart(
-            /*baseOffset + dynamicParts.length / 2*/
-          ).slice(2);
-          dynamicParts += signature?.dynamicPart();
-        });
-        return "0x" + staticParts + dynamicParts;
+        return (0, signatures_1.buildSignatureBytes)(Array.from(this.signatures.values()));
       }
     };
     exports2.default = EthSafeTransaction;
@@ -195641,7 +195775,7 @@ var require_SafeTransaction = __commonJS({
 });
 
 // ../../node_modules/@safe-global/protocol-kit/dist/src/utils/transactions/types.js
-var require_types14 = __commonJS({
+var require_types15 = __commonJS({
   "../../node_modules/@safe-global/protocol-kit/dist/src/utils/transactions/types.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
@@ -195788,7 +195922,7 @@ var require_transactions = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     __exportStar2(require_gas(), exports2);
     __exportStar2(require_SafeTransaction(), exports2);
-    __exportStar2(require_types14(), exports2);
+    __exportStar2(require_types15(), exports2);
     __exportStar2(require_utils20(), exports2);
   }
 });
@@ -196218,6 +196352,31 @@ var require_ownerManager = __commonJS({
   }
 });
 
+// ../../node_modules/@safe-global/protocol-kit/dist/src/utils/messages/SafeMessage.js
+var require_SafeMessage = __commonJS({
+  "../../node_modules/@safe-global/protocol-kit/dist/src/utils/messages/SafeMessage.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    var signatures_1 = require_signatures();
+    var EthSafeMessage = class {
+      constructor(data) {
+        this.signatures = /* @__PURE__ */ new Map();
+        this.data = data;
+      }
+      getSignature(signer) {
+        return this.signatures.get(signer.toLowerCase());
+      }
+      addSignature(signature) {
+        this.signatures.set(signature.signer.toLowerCase(), signature);
+      }
+      encodedSignatures() {
+        return (0, signatures_1.buildSignatureBytes)(Array.from(this.signatures.values()));
+      }
+    };
+    exports2.default = EthSafeMessage;
+  }
+});
+
 // ../../node_modules/@safe-global/protocol-kit/dist/src/Safe.js
 var require_Safe = __commonJS({
   "../../node_modules/@safe-global/protocol-kit/dist/src/Safe.js"(exports2) {
@@ -196248,6 +196407,8 @@ var require_Safe = __commonJS({
     var _Safe_moduleManager;
     var _Safe_guardManager;
     var _Safe_fallbackHandlerManager;
+    var _Safe_MAGIC_VALUE;
+    var _Safe_MAGIC_VALUE_BYTES;
     Object.defineProperty(exports2, "__esModule", { value: true });
     var safe_core_sdk_types_1 = require_src3();
     var utils_1 = require_utils14();
@@ -196257,12 +196418,16 @@ var require_Safe = __commonJS({
     var guardManager_1 = __importDefault2(require_guardManager());
     var moduleManager_1 = __importDefault2(require_moduleManager());
     var ownerManager_1 = __importDefault2(require_ownerManager());
+    var types_1 = require_types14();
     var utils_2 = require_utils21();
-    var utils_3 = require_utils19();
     var SafeTransaction_1 = __importDefault2(require_SafeTransaction());
-    var utils_4 = require_utils20();
-    var types_1 = require_types12();
+    var utils_3 = require_utils20();
+    var types_2 = require_types12();
     var safeDeploymentContracts_1 = require_safeDeploymentContracts();
+    var SafeMessage_1 = __importDefault2(require_SafeMessage());
+    var satisfies_1 = __importDefault2(require_satisfies());
+    var EQ_OR_GT_1_4_1 = ">=1.4.1";
+    var EQ_OR_GT_1_3_0 = ">=1.3.0";
     var Safe = class _Safe {
       constructor() {
         _Safe_predictedSafe.set(this, void 0);
@@ -196272,6 +196437,56 @@ var require_Safe = __commonJS({
         _Safe_moduleManager.set(this, void 0);
         _Safe_guardManager.set(this, void 0);
         _Safe_fallbackHandlerManager.set(this, void 0);
+        _Safe_MAGIC_VALUE.set(this, "0x1626ba7e");
+        _Safe_MAGIC_VALUE_BYTES.set(
+          this,
+          "0x20c13b0b"
+          /**
+           * Creates an instance of the Safe Core SDK.
+           * @param config - Ethers Safe configuration
+           * @returns The Safe Core SDK instance
+           * @throws "The SDK must be initialized with a safeAddress or a predictedSafe"
+           * @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"
+           */
+        );
+        this.getSafeMessageHash = async (messageHash) => {
+          const safeAddress = await this.getAddress();
+          const safeVersion = await this.getContractVersion();
+          const chainId = await this.getChainId();
+          return (0, utils_2.calculateSafeMessageHash)(safeAddress, messageHash, safeVersion, chainId);
+        };
+        this.isValidSignature = async (messageHash, signature = "0x") => {
+          const safeAddress = await this.getAddress();
+          const fallbackHandler = await this.getFallbackHandlerContract();
+          const signatureToCheck = signature && Array.isArray(signature) ? (0, utils_2.buildSignatureBytes)(signature) : signature;
+          const data = fallbackHandler.encode("isValidSignature(bytes32,bytes)", [
+            messageHash,
+            signatureToCheck
+          ]);
+          const bytesData = fallbackHandler.encode("isValidSignature(bytes,bytes)", [
+            messageHash,
+            signatureToCheck
+          ]);
+          try {
+            const isValidSignatureResponse = await Promise.all([
+              __classPrivateFieldGet2(this, _Safe_ethAdapter, "f").call({
+                from: safeAddress,
+                to: safeAddress,
+                data
+              }),
+              __classPrivateFieldGet2(this, _Safe_ethAdapter, "f").call({
+                from: safeAddress,
+                to: safeAddress,
+                data: bytesData
+              })
+            ]);
+            return !!isValidSignatureResponse.length && (isValidSignatureResponse[0].slice(0, 10).toLowerCase() === __classPrivateFieldGet2(this, _Safe_MAGIC_VALUE, "f") || isValidSignatureResponse[1].slice(0, 10).toLowerCase() === __classPrivateFieldGet2(this, _Safe_MAGIC_VALUE_BYTES, "f"));
+          } catch (error) {
+            return false;
+          }
+        };
       }
       /**
        * Creates an instance of the Safe Core SDK.
@@ -196298,7 +196513,7 @@ var require_Safe = __commonJS({
       async init(config) {
         const { ethAdapter, isL1SafeSingleton, contractNetworks } = config;
         __classPrivateFieldSet2(this, _Safe_ethAdapter, ethAdapter, "f");
-        if ((0, types_1.isSafeConfigWithPredictedSafe)(config)) {
+        if ((0, types_2.isSafeConfigWithPredictedSafe)(config)) {
           __classPrivateFieldSet2(this, _Safe_predictedSafe, config.predictedSafe, "f");
           __classPrivateFieldSet2(this, _Safe_contractManager, await contractManager_1.default.create({
             ethAdapter: __classPrivateFieldGet2(this, _Safe_ethAdapter, "f"),
@@ -196371,6 +196586,7 @@ var require_Safe = __commonJS({
           const chainId = await __classPrivateFieldGet2(this, _Safe_ethAdapter, "f").getChainId();
           return (0, utils_1.predictSafeAddress)({
             ethAdapter: __classPrivateFieldGet2(this, _Safe_ethAdapter, "f"),
+            chainId,
             customContracts: __classPrivateFieldGet2(this, _Safe_contractManager, "f").contractNetworks?.[chainId.toString()],
             ...__classPrivateFieldGet2(this, _Safe_predictedSafe, "f")
           });
@@ -196549,7 +196765,7 @@ var require_Safe = __commonJS({
         let newTransaction;
         if (transactions.length > 1) {
           const multiSendContract = onlyCalls ? __classPrivateFieldGet2(this, _Safe_contractManager, "f").multiSendCallOnlyContract : __classPrivateFieldGet2(this, _Safe_contractManager, "f").multiSendContract;
-          const multiSendData = (0, utils_4.encodeMultiSendData)(transactions.map(utils_4.standardizeMetaTransactionData));
+          const multiSendData = (0, utils_3.encodeMultiSendData)(transactions.map(utils_3.standardizeMetaTransactionData));
           const multiSendTransaction = {
             ...options,
             to: await multiSendContract.getAddress(),
@@ -196562,7 +196778,7 @@ var require_Safe = __commonJS({
           newTransaction = { ...options, ...transactions[0] };
         }
         if (__classPrivateFieldGet2(this, _Safe_predictedSafe, "f")) {
-          return new SafeTransaction_1.default(await (0, utils_4.standardizeSafeTransactionData)({
+          return new SafeTransaction_1.default(await (0, utils_3.standardizeSafeTransactionData)({
             predictedSafe: __classPrivateFieldGet2(this, _Safe_predictedSafe, "f"),
             ethAdapter: __classPrivateFieldGet2(this, _Safe_ethAdapter, "f"),
             tx: newTransaction,
@@ -196572,7 +196788,7 @@ var require_Safe = __commonJS({
         if (!__classPrivateFieldGet2(this, _Safe_contractManager, "f").safeContract) {
           throw new Error("Safe is not deployed");
         }
-        return new SafeTransaction_1.default(await (0, utils_4.standardizeSafeTransactionData)({
+        return new SafeTransaction_1.default(await (0, utils_3.standardizeSafeTransactionData)({
           safeContract: __classPrivateFieldGet2(this, _Safe_contractManager, "f").safeContract,
           ethAdapter: __classPrivateFieldGet2(this, _Safe_ethAdapter, "f"),
           tx: newTransaction,
@@ -196624,15 +196840,13 @@ var require_Safe = __commonJS({
        * Returns the transaction hash of a Safe transaction.
        *
        * @param safeTransaction - The Safe transaction
-       * @returns The transaction hash of the Safe transaction
+       * @returns The hash of the Safe transaction
        */
       async getTransactionHash(safeTransaction) {
-        if (!__classPrivateFieldGet2(this, _Safe_contractManager, "f").safeContract) {
-          throw new Error("Safe is not deployed");
-        }
-        const safeTransactionData = safeTransaction.data;
-        const txHash = await __classPrivateFieldGet2(this, _Safe_contractManager, "f").safeContract.getTransactionHash(safeTransactionData);
-        return txHash;
+        const safeAddress = await this.getAddress();
+        const safeVersion = await this.getContractVersion();
+        const chainId = await this.getChainId();
+        return (0, utils_2.calculateSafeTransactionHash)(safeAddress, safeTransaction.data, safeVersion, chainId);
       }
       /**
        * Signs a hash using the current signer account.
@@ -196640,34 +196854,101 @@ var require_Safe = __commonJS({
        * @param hash - The hash to sign
        * @returns The Safe signature
        */
-      async signTransactionHash(hash2) {
-        return (0, utils_3.generateSignature)(__classPrivateFieldGet2(this, _Safe_ethAdapter, "f"), hash2);
+      async signHash(hash2) {
+        const signature = await (0, utils_2.generateSignature)(__classPrivateFieldGet2(this, _Safe_ethAdapter, "f"), hash2);
+        return signature;
+      }
+      /**
+       * Returns a Safe message ready to be signed by the owners.
+       *
+       * @param message - The message
+       * @returns The Safe message
+       */
+      createMessage(message) {
+        return new SafeMessage_1.default(message);
+      }
+      /**
+       * Returns the Safe message with a new signature
+       *
+       * @param message The message to be signed
+       * @param signingMethod The signature type
+       * @param preimageSafeAddress If the preimage is required, the address of the Safe that will be used to calculate the preimage.
+       * This field is mandatory for 1.4.1 contract versions Because the safe uses the old EIP-1271 interface which uses `bytes` instead of `bytes32` for the message
+       * we need to use the pre-image of the message to calculate the message hash
+       * https://github.com/safe-global/safe-contracts/blob/192c7dc67290940fcbc75165522bb86a37187069/test/core/Safe.Signatures.spec.ts#L229-L233
+       * @returns The signed Safe message
+       */
+      async signMessage(message, signingMethod = types_1.SigningMethod.ETH_SIGN_TYPED_DATA_V4, preimageSafeAddress) {
+        const owners = await this.getOwners();
+        const signerAddress = await __classPrivateFieldGet2(this, _Safe_ethAdapter, "f").getSignerAddress();
+        if (!signerAddress) {
+          throw new Error("EthAdapter 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("Messages can only be signed by Safe owners");
+        }
+        const safeVersion = await this.getContractVersion();
+        if (signingMethod === types_1.SigningMethod.SAFE_SIGNATURE && (0, satisfies_1.default)(safeVersion, EQ_OR_GT_1_4_1) && !preimageSafeAddress) {
+          throw new Error("The parent Safe account address is mandatory for contract signatures");
+        }
+        let signature;
+        if (signingMethod === types_1.SigningMethod.ETH_SIGN_TYPED_DATA_V4) {
+          signature = await this.signTypedData(message, "v4");
+        } else if (signingMethod === types_1.SigningMethod.ETH_SIGN_TYPED_DATA_V3) {
+          signature = await this.signTypedData(message, "v3");
+        } else if (signingMethod === types_1.SigningMethod.ETH_SIGN_TYPED_DATA) {
+          signature = await this.signTypedData(message, void 0);
+        } else {
+          const chainId = await this.getChainId();
+          if (!(0, utils_2.hasSafeFeature)(utils_2.SAFE_FEATURES.ETH_SIGN, safeVersion)) {
+            throw new Error("eth_sign is only supported by Safes >= v1.1.0");
+          }
+          let safeMessageHash;
+          if (signingMethod === types_1.SigningMethod.SAFE_SIGNATURE && preimageSafeAddress && (0, satisfies_1.default)(safeVersion, EQ_OR_GT_1_4_1)) {
+            const messageHashData = (0, utils_2.preimageSafeMessageHash)(preimageSafeAddress, (0, utils_2.hashSafeMessage)(message.data), safeVersion, chainId);
+            safeMessageHash = await this.getSafeMessageHash(messageHashData);
+          } else {
+            safeMessageHash = await this.getSafeMessageHash((0, utils_2.hashSafeMessage)(message.data));
+          }
+          signature = await this.signHash(safeMessageHash);
+        }
+        const signedSafeMessage = this.createMessage(message.data);
+        message.signatures.forEach((signature2) => {
+          signedSafeMessage.addSignature(signature2);
+        });
+        signedSafeMessage.addSignature(signature);
+        return signedSafeMessage;
       }
       /**
        * Signs a transaction according to the EIP-712 using the current signer account.
        *
-       * @param safeTransaction - The Safe transaction to be signed
+       * @param eip712Data - The Safe Transaction or message hash to be signed
        * @param methodVersion - EIP-712 version. Optional
        * @returns The Safe signature
        */
-      async signTypedData(safeTransaction, methodVersion) {
-        const safeTransactionEIP712Args = {
+      async signTypedData(eip712Data, methodVersion) {
+        const safeEIP712Args = {
           safeAddress: await this.getAddress(),
           safeVersion: await this.getContractVersion(),
           chainId: await this.getEthAdapter().getChainId(),
-          safeTransactionData: safeTransaction.data
+          data: eip712Data.data
         };
-        return (0, utils_3.generateEIP712Signature)(__classPrivateFieldGet2(this, _Safe_ethAdapter, "f"), safeTransactionEIP712Args, methodVersion);
+        return (0, utils_2.generateEIP712Signature)(__classPrivateFieldGet2(this, _Safe_ethAdapter, "f"), safeEIP712Args, methodVersion);
       }
       /**
        * Adds the signature of the current signer to the Safe transaction object.
        *
        * @param safeTransaction - The Safe transaction to be signed
        * @param signingMethod - Method followed to sign a transaction. Optional. Default value is "eth_sign"
+       * @param preimageSafeAddress - If the preimage is required, the address of the Safe that will be used to calculate the preimage
+       * This field is mandatory for 1.3.0 and 1.4.1 contract versions Because the safe uses the old EIP-1271 interface which uses `bytes` instead of `bytes32` for the message
+       * we need to use the pre-image of the message to calculate the message hash
+       * https://github.com/safe-global/safe-contracts/blob/192c7dc67290940fcbc75165522bb86a37187069/test/core/Safe.Signatures.spec.ts#L229-L233
        * @returns The signed Safe transaction
        * @throws "Transactions can only be signed by Safe owners"
        */
-      async signTransaction(safeTransaction, signingMethod = "eth_signTypedData_v4") {
+      async signTransaction(safeTransaction, signingMethod = types_1.SigningMethod.ETH_SIGN_TYPED_DATA_V4, preimageSafeAddress) {
         const transaction = (0, utils_2.isSafeMultisigTransactionResponse)(safeTransaction) ? await this.toSafeTransactionType(safeTransaction) : safeTransaction;
         const owners = await this.getOwners();
         const signerAddress = await __classPrivateFieldGet2(this, _Safe_ethAdapter, "f").getSignerAddress();
@@ -196678,20 +196959,31 @@ var require_Safe = __commonJS({
         if (!addressIsOwner) {
           throw new Error("Transactions can only be signed by Safe owners");
         }
+        const safeVersion = await this.getContractVersion();
+        if (signingMethod === types_1.SigningMethod.SAFE_SIGNATURE && (0, satisfies_1.default)(safeVersion, EQ_OR_GT_1_3_0) && !preimageSafeAddress) {
+          throw new Error("The parent Safe account address is mandatory for contract signatures");
+        }
         let signature;
-        if (signingMethod === "eth_signTypedData_v4") {
+        if (signingMethod === types_1.SigningMethod.ETH_SIGN_TYPED_DATA_V4) {
           signature = await this.signTypedData(transaction, "v4");
-        } else if (signingMethod === "eth_signTypedData_v3") {
+        } else if (signingMethod === types_1.SigningMethod.ETH_SIGN_TYPED_DATA_V3) {
           signature = await this.signTypedData(transaction, "v3");
-        } else if (signingMethod === "eth_signTypedData") {
-          signature = await this.signTypedData(transaction);
+        } else if (signingMethod === types_1.SigningMethod.ETH_SIGN_TYPED_DATA) {
+          signature = await this.signTypedData(transaction, void 0);
         } else {
-          const safeVersion = await this.getContractVersion();
-          if (!(0, utils_2.hasSafeFeature)(utils_2.SAFE_FEATURES.ETH_SIGN, safeVersion)) {
+          const safeVersion2 = await this.getContractVersion();
+          const chainId = await this.getChainId();
+          if (!(0, utils_2.hasSafeFeature)(utils_2.SAFE_FEATURES.ETH_SIGN, safeVersion2)) {
             throw new Error("eth_sign is only supported by Safes >= v1.1.0");
           }
-          const txHash = await this.getTransactionHash(transaction);
-          signature = await this.signTransactionHash(txHash);
+          let txHash;
+          if (signingMethod === types_1.SigningMethod.SAFE_SIGNATURE && (0, satisfies_1.default)(safeVersion2, EQ_OR_GT_1_3_0) && preimageSafeAddress) {
+            const txHashData = (0, utils_2.preimageSafeTransactionHash)(preimageSafeAddress, safeTransaction.data, safeVersion2, chainId);
+            txHash = await this.getSafeMessageHash(txHashData);
+          } else {
+            txHash = await this.getTransactionHash(transaction);
+          }
+          signature = await this.signHash(txHash);
         }
         const signedSafeTransaction = await this.copyTransaction(transaction);
         signedSafeTransaction.addSignature(signature);
@@ -197010,7 +197302,7 @@ var require_Safe = __commonJS({
         const txHash = await this.getTransactionHash(signedSafeTransaction);
         const ownersWhoApprovedTx = await this.getOwnersWhoApprovedTx(txHash);
         for (const owner of ownersWhoApprovedTx) {
-          signedSafeTransaction.addSignature((0, utils_3.generatePreValidatedSignature)(owner));
+          signedSafeTransaction.addSignature((0, utils_2.generatePreValidatedSignature)(owner));
         }
         const owners = await this.getOwners();
         const signerAddress = await __classPrivateFieldGet2(this, _Safe_ethAdapter, "f").getSignerAddress();
@@ -197018,7 +197310,7 @@ var require_Safe = __commonJS({
           throw new Error("EthAdapter must be initialized with a signer to use this method");
         }
         if (owners.includes(signerAddress)) {
-          signedSafeTransaction.addSignature((0, utils_3.generatePreValidatedSignature)(signerAddress));
+          signedSafeTransaction.addSignature((0, utils_2.generatePreValidatedSignature)(signerAddress));
         }
         const isTxValid = await __classPrivateFieldGet2(this, _Safe_contractManager, "f").safeContract.isValidTransaction(signedSafeTransaction, {
           from: signerAddress,
@@ -197045,13 +197337,13 @@ var require_Safe = __commonJS({
         const txHash = await this.getTransactionHash(signedSafeTransaction);
         const ownersWhoApprovedTx = await this.getOwnersWhoApprovedTx(txHash);
         for (const owner of ownersWhoApprovedTx) {
-          signedSafeTransaction.addSignature((0, utils_3.generatePreValidatedSignature)(owner));
+          signedSafeTransaction.addSignature((0, utils_2.generatePreValidatedSignature)(owner));
         }
         const owners = await this.getOwners();
         const threshold = await this.getThreshold();
         const signerAddress = await __classPrivateFieldGet2(this, _Safe_ethAdapter, "f").getSignerAddress();
         if (threshold > signedSafeTransaction.signatures.size && signerAddress && owners.includes(signerAddress)) {
-          signedSafeTransaction.addSignature((0, utils_3.generatePreValidatedSignature)(signerAddress));
+          signedSafeTransaction.addSignature((0, utils_2.generatePreValidatedSignature)(signerAddress));
         }
         if (threshold > signedSafeTransaction.signatures.size) {
           const signaturesMissing = threshold - signedSafeTransaction.signatures.size;
@@ -197185,12 +197477,14 @@ var require_Safe = __commonJS({
         const saltNonce = customSaltNonce || safeDeploymentConfig?.saltNonce || (0, utils_1.getChainSpecificDefaultSaltNonce)(chainId);
         const safeDeployTransactionData = {
           ...transactionOptions,
+          // optional transaction options like from, gasLimit, gasPrice...
           to: await safeProxyFactoryContract.getAddress(),
           value: "0",
           // we use the createProxyWithNonce method to create the Safe in a deterministic address, see: https://github.com/safe-global/safe-contracts/blob/main/contracts/proxies/SafeProxyFactory.sol#L52
           data: safeProxyFactoryContract.encode("createProxyWithNonce", [
             await safeSingletonContract.getAddress(),
             initializer,
+            // call to the setup method to set the threshold & owners of the new Safe
             saltNonce
           ])
         };
@@ -197215,19 +197509,38 @@ var require_Safe = __commonJS({
           customContracts: __classPrivateFieldGet2(this, _Safe_contractManager, "f").contractNetworks?.[chainId.toString()]
         });
         const batchData = multiSendCallOnlyContract.encode("multiSend", [
-          (0, utils_4.encodeMultiSendData)(transactions)
+          (0, utils_3.encodeMultiSendData)(transactions)
           // encoded transactions
         ]);
         const transactionBatch = {
           ...transactionOptions,
+          // optional transaction options like from, gasLimit, gasPrice...
           to: await multiSendCallOnlyContract.getAddress(),
           value: "0",
           data: batchData
         };
         return transactionBatch;
       }
+      /**
+       * Get the fallback handler contract
+       *
+       * @returns The fallback Handler contract
+       */
+      async getFallbackHandlerContract() {
+        if (!__classPrivateFieldGet2(this, _Safe_contractManager, "f").safeContract) {
+          throw new Error("Safe is not deployed");
+        }
+        const safeVersion = await __classPrivateFieldGet2(this, _Safe_contractManager, "f").safeContract.getVersion() ?? config_1.DEFAULT_SAFE_VERSION;
+        const chainId = await __classPrivateFieldGet2(this, _Safe_ethAdapter, "f").getChainId();
+        const compatibilityFallbackHandlerContract = await (0, safeDeploymentContracts_1.getCompatibilityFallbackHandlerContract)({
+          ethAdapter: __classPrivateFieldGet2(this, _Safe_ethAdapter, "f"),
+          safeVersion,
+          customContracts: __classPrivateFieldGet2(this, _Safe_contractManager, "f").contractNetworks?.[chainId.toString()]
+        });
+        return compatibilityFallbackHandlerContract;
+      }
     };
-    _Safe_predictedSafe = /* @__PURE__ */ new WeakMap(), _Safe_ethAdapter = /* @__PURE__ */ new WeakMap(), _Safe_contractManager = /* @__PURE__ */ new WeakMap(), _Safe_ownerManager = /* @__PURE__ */ new WeakMap(), _Safe_moduleManager = /* @__PURE__ */ new WeakMap(), _Safe_guardManager = /* @__PURE__ */ new WeakMap(), _Safe_fallbackHandlerManager = /* @__PURE__ */ new WeakMap();
+    _Safe_predictedSafe = /* @__PURE__ */ new WeakMap(), _Safe_ethAdapter = /* @__PURE__ */ new WeakMap(), _Safe_contractManager = /* @__PURE__ */ new WeakMap(), _Safe_ownerManager = /* @__PURE__ */ new WeakMap(), _Safe_moduleManager = /* @__PURE__ */ new WeakMap(), _Safe_guardManager = /* @__PURE__ */ new WeakMap(), _Safe_fallbackHandlerManager = /* @__PURE__ */ new WeakMap(), _Safe_MAGIC_VALUE = /* @__PURE__ */ new WeakMap(), _Safe_MAGIC_VALUE_BYTES = /* @__PURE__ */ new WeakMap();
     exports2.default = Safe;
   }
 });
@@ -205327,13 +205640,13 @@ var require_EthersAdapter = __commonJS({
         const messageArray = __classPrivateFieldGet2(this, _EthersAdapter_ethers, "f").getBytes(message);
         return __classPrivateFieldGet2(this, _EthersAdapter_signer, "f").signMessage(messageArray);
       }
-      async signTypedData(safeTransactionEIP712Args) {
+      async signTypedData(safeEIP712Args) {
         if (!__classPrivateFieldGet2(this, _EthersAdapter_signer, "f")) {
           throw new Error("EthAdapter must be initialized with a signer to use this method");
         }
         if ((0, utils_2.isTypedDataSigner)(__classPrivateFieldGet2(this, _EthersAdapter_signer, "f"))) {
-          const typedData = (0, utils_1.generateTypedData)(safeTransactionEIP712Args);
-          const signature = await __classPrivateFieldGet2(this, _EthersAdapter_signer, "f").signTypedData(typedData.domain, { SafeTx: typedData.types.SafeTx }, typedData.message);
+          const typedData = (0, utils_1.generateTypedData)(safeEIP712Args);
+          const signature = await __classPrivateFieldGet2(this, _EthersAdapter_signer, "f").signTypedData(typedData.domain, typedData.primaryType === "SafeMessage" ? { SafeMessage: typedData.types.SafeMessage } : { SafeTx: typedData.types.SafeTx }, typedData.message);
           return signature;
         }
         throw new Error("The current signer does not implement EIP-712 to sign typed data");
@@ -206392,6 +206705,7 @@ var require_Web3Adapter = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     var utils_1 = require_utils21();
     var contractInstancesWeb3_1 = require_contractInstancesWeb3();
+    var types_1 = require_types14();
     var Web3Adapter = class {
       constructor({ web3, signerAddress }) {
         _Web3Adapter_web3.set(this, void 0);
@@ -206523,16 +206837,16 @@ var require_Web3Adapter = __commonJS({
         }
         return __classPrivateFieldGet2(this, _Web3Adapter_web3, "f").eth.sign(message, __classPrivateFieldGet2(this, _Web3Adapter_signerAddress, "f"));
       }
-      async signTypedData(safeTransactionEIP712Args, methodVersion) {
+      async signTypedData(safeEIP712Args, methodVersion) {
         if (!__classPrivateFieldGet2(this, _Web3Adapter_signerAddress, "f")) {
           throw new Error("This method requires a signer");
         }
-        const typedData = (0, utils_1.generateTypedData)(safeTransactionEIP712Args);
-        let method = "eth_signTypedData_v3";
+        const typedData = (0, utils_1.generateTypedData)(safeEIP712Args);
+        let method = types_1.SigningMethod.ETH_SIGN_TYPED_DATA_V3;
         if (methodVersion === "v4") {
-          method = "eth_signTypedData_v4";
+          method = types_1.SigningMethod.ETH_SIGN_TYPED_DATA_V4;
         } else if (!methodVersion) {
-          method = "eth_signTypedData";
+          method = types_1.SigningMethod.ETH_SIGN_TYPED_DATA;
         }
         const jsonTypedData = JSON.stringify(typedData);
         const signedTypedData = {
@@ -206691,6 +207005,7 @@ var require_safeFactory = __commonJS({
         };
         return (0, utils_1.predictSafeAddress)({
           ethAdapter: __classPrivateFieldGet2(this, _SafeFactory_ethAdapter, "f"),
+          chainId,
           safeAccountConfig,
           safeDeploymentConfig,
           isL1SafeSingleton: __classPrivateFieldGet2(this, _SafeFactory_isL1SafeSingleton, "f"),
@@ -206804,7 +207119,8 @@ var require_src7 = __commonJS({
       return mod2 && mod2.__esModule ? mod2 : { "default": mod2 };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.validateEip3770Address = exports2.standardizeSafeTransactionData = exports2.predictSafeAddress = exports2.isGasTokenCompatibleWithHandlePayment = exports2.getSignMessageLibContract = exports2.getSafeContract = exports2.getProxyFactoryContract = exports2.getMultiSendContract = exports2.getMultiSendCallOnlyContract = exports2.getERC20Decimals = exports2.getCreateCallContract = exports2.getCompatibilityFallbackHandlerContract = exports2.encodeSetupCallData = exports2.encodeMultiSendData = exports2.encodeCreateProxyWithNonce = exports2.Web3Adapter = exports2.SignMessageLibWeb3Contract = exports2.SignMessageLibEthersContract = exports2.SafeProxyFactoryWeb3Contract = exports2.SafeProxyFactoryEthersContract = exports2.SafeFactory = exports2.SafeContractWeb3 = exports2.SafeContractEthers = exports2.PREDETERMINED_SALT_NONCE = exports2.MultiSendWeb3Contract = exports2.MultiSendEthersContract = exports2.MultiSendCallOnlyWeb3Contract = exports2.MultiSendCallOnlyEthersContract = exports2.EthersAdapter = exports2.EthSafeSignature = exports2.DEFAULT_SAFE_VERSION = exports2.createERC20TokenTransferTransaction = exports2.CreateCallWeb3Contract = exports2.CreateCallEthersContract = exports2.ContractManager = exports2.estimateSafeDeploymentGas = exports2.estimateSafeTxGas = exports2.estimateTxGas = exports2.estimateTxBaseGas = void 0;
+    exports2.hashSafeMessage = exports2.getEip712MessageTypes = exports2.getEip712TxTypes = exports2.preimageSafeMessageHash = exports2.preimageSafeTransactionHash = exports2.buildSignatureBytes = exports2.buildContractSignature = exports2.generateEIP712Signature = exports2.generateSignature = exports2.validateEthereumAddress = exports2.validateEip3770Address = exports2.standardizeSafeTransactionData = exports2.predictSafeAddress = exports2.isGasTokenCompatibleWithHandlePayment = exports2.getSignMessageLibContract = exports2.getSafeContract = exports2.getProxyFactoryContract = exports2.getMultiSendContract = exports2.getMultiSendCallOnlyContract = exports2.getERC20Decimals = exports2.getCreateCallContract = exports2.getCompatibilityFallbackHandlerContract = exports2.encodeSetupCallData = exports2.encodeMultiSendData = exports2.encodeCreateProxyWithNonce = exports2.Web3Adapter = exports2.SigningMethod = exports2.SignMessageLibWeb3Contract = exports2.SignMessageLibEthersContract = exports2.SafeProxyFactoryWeb3Contract = exports2.SafeProxyFactoryEthersContract = exports2.SafeFactory = exports2.SafeContractWeb3 = exports2.SafeContractEthers = exports2.PREDETERMINED_SALT_NONCE = exports2.MultiSendWeb3Contract = exports2.MultiSendEthersContract = exports2.MultiSendCallOnlyWeb3Contract = exports2.MultiSendCallOnlyEthersContract = exports2.EthersAdapter = exports2.EthSafeSignature = exports2.DEFAULT_SAFE_VERSION = exports2.createERC20TokenTransferTransaction = exports2.CreateCallWeb3Contract = exports2.CreateCallEthersContract = exports2.ContractManager = exports2.estimateSafeDeploymentGas = exports2.estimateSafeTxGas = exports2.estimateTxGas = exports2.estimateTxBaseGas = void 0;
+    exports2.generateTypedData = void 0;
     var Safe_1 = __importDefault2(require_Safe());
     var ethers_1 = require_ethers3();
     Object.defineProperty(exports2, "CreateCallEthersContract", { enumerable: true, get: function() {
@@ -206893,6 +207209,10 @@ var require_src7 = __commonJS({
     exports2.ContractManager = contractManager_1.default;
     var safeFactory_1 = __importDefault2(require_safeFactory());
     exports2.SafeFactory = safeFactory_1.default;
+    var types_1 = require_types14();
+    Object.defineProperty(exports2, "SigningMethod", { enumerable: true, get: function() {
+      return types_1.SigningMethod;
+    } });
     var utils_2 = require_utils21();
     Object.defineProperty(exports2, "EthSafeSignature", { enumerable: true, get: function() {
       return utils_2.EthSafeSignature;
@@ -206909,6 +207229,9 @@ var require_src7 = __commonJS({
     Object.defineProperty(exports2, "estimateSafeDeploymentGas", { enumerable: true, get: function() {
       return utils_2.estimateSafeDeploymentGas;
     } });
+    Object.defineProperty(exports2, "validateEthereumAddress", { enumerable: true, get: function() {
+      return utils_2.validateEthereumAddress;
+    } });
     Object.defineProperty(exports2, "validateEip3770Address", { enumerable: true, get: function() {
       return utils_2.validateEip3770Address;
     } });
@@ -206929,6 +207252,38 @@ var require_src7 = __commonJS({
     Object.defineProperty(exports2, "createERC20TokenTransferTransaction", { enumerable: true, get: function() {
       return erc_20_1.createERC20TokenTransferTransaction;
     } });
+    var utils_4 = require_utils19();
+    Object.defineProperty(exports2, "generateSignature", { enumerable: true, get: function() {
+      return utils_4.generateSignature;
+    } });
+    Object.defineProperty(exports2, "generateEIP712Signature", { enumerable: true, get: function() {
+      return utils_4.generateEIP712Signature;
+    } });
+    Object.defineProperty(exports2, "buildContractSignature", { enumerable: true, get: function() {
+      return utils_4.buildContractSignature;
+    } });
+    Object.defineProperty(exports2, "buildSignatureBytes", { enumerable: true, get: function() {
+      return utils_4.buildSignatureBytes;
+    } });
+    Object.defineProperty(exports2, "preimageSafeTransactionHash", { enumerable: true, get: function() {
+      return utils_4.preimageSafeTransactionHash;
+    } });
+    Object.defineProperty(exports2, "preimageSafeMessageHash", { enumerable: true, get: function() {
+      return utils_4.preimageSafeMessageHash;
+    } });
+    var eip_712_1 = require_eip_712();
+    Object.defineProperty(exports2, "getEip712TxTypes", { enumerable: true, get: function() {
+      return eip_712_1.getEip712TxTypes;
+    } });
+    Object.defineProperty(exports2, "getEip712MessageTypes", { enumerable: true, get: function() {
+      return eip_712_1.getEip712MessageTypes;
+    } });
+    Object.defineProperty(exports2, "hashSafeMessage", { enumerable: true, get: function() {
+      return eip_712_1.hashSafeMessage;
+    } });
+    Object.defineProperty(exports2, "generateTypedData", { enumerable: true, get: function() {
+      return eip_712_1.generateTypedData;
+    } });
     exports2.default = Safe_1.default;
   }
 });
@@ -206980,6 +207335,7 @@ var require_SafeApiKit = __commonJS({
     var _SafeApiKit_instances;
     var _SafeApiKit_chainId;
     var _SafeApiKit_txServiceBaseUrl;
+    var _SafeApiKit_isValidAddress;
     var _SafeApiKit_getEip3770Address;
     Object.defineProperty(exports2, "__esModule", { value: true });
     var httpRequests_1 = require_httpRequests();
@@ -207490,8 +207846,87 @@ var require_SafeApiKit = __commonJS({
           method: httpRequests_1.HttpMethod.Get
         });
       }
+      /**
+       * Get a message by its safe message hash
+       * @param messageHash The Safe message hash
+       * @returns The message
+       */
+      async getMessage(messageHash) {
+        if (!messageHash) {
+          throw new Error("Invalid messageHash");
+        }
+        return (0, httpRequests_1.sendRequest)({
+          url: `${__classPrivateFieldGet2(this, _SafeApiKit_txServiceBaseUrl, "f")}/v1/messages/${messageHash}/`,
+          method: httpRequests_1.HttpMethod.Get
+        });
+      }
+      /**
+       * Get the list of messages associated to a Safe account
+       * @param safeAddress The safe address
+       * @param options The options to filter the list of messages
+       * @returns The paginated list of messages
+       */
+      async getMessages(safeAddress, { ordering, limit, offset } = {}) {
+        if (!__classPrivateFieldGet2(this, _SafeApiKit_instances, "m", _SafeApiKit_isValidAddress).call(this, safeAddress)) {
+          throw new Error("Invalid safeAddress");
+        }
+        const url2 = new URL(`${__classPrivateFieldGet2(this, _SafeApiKit_txServiceBaseUrl, "f")}/v1/safes/${safeAddress}/messages/`);
+        if (ordering) {
+          url2.searchParams.set("ordering", ordering);
+        }
+        if (limit) {
+          url2.searchParams.set("limit", limit);
+        }
+        if (offset) {
+          url2.searchParams.set("offset", offset);
+        }
+        return (0, httpRequests_1.sendRequest)({
+          url: url2.toString(),
+          method: httpRequests_1.HttpMethod.Get
+        });
+      }
+      /**
+       * Creates a new message with an initial signature
+       * Add more signatures from other owners using addMessageSignature()
+       * @param safeAddress The safe address
+       * @param options The raw message to add, signature and safeAppId if any
+       */
+      async addMessage(safeAddress, addMessageProps) {
+        if (!__classPrivateFieldGet2(this, _SafeApiKit_instances, "m", _SafeApiKit_isValidAddress).call(this, safeAddress)) {
+          throw new Error("Invalid safeAddress");
+        }
+        return (0, httpRequests_1.sendRequest)({
+          url: `${__classPrivateFieldGet2(this, _SafeApiKit_txServiceBaseUrl, "f")}/v1/safes/${safeAddress}/messages/`,
+          method: httpRequests_1.HttpMethod.Post,
+          body: addMessageProps
+        });
+      }
+      /**
+       * Add a signature to an existing message
+       * @param messageHash The safe message hash
+       * @param signature The signature
+       */
+      async addMessageSignature(messageHash, signature) {
+        if (!messageHash || !signature) {
+          throw new Error("Invalid messageHash or signature");
+        }
+        return (0, httpRequests_1.sendRequest)({
+          url: `${__classPrivateFieldGet2(this, _SafeApiKit_txServiceBaseUrl, "f")}/v1/messages/${messageHash}/signatures/`,
+          method: httpRequests_1.HttpMethod.Post,
+          body: {
+            signature
+          }
+        });
+      }
     };
-    _SafeApiKit_chainId = /* @__PURE__ */ new WeakMap(), _SafeApiKit_txServiceBaseUrl = /* @__PURE__ */ new WeakMap(), _SafeApiKit_instances = /* @__PURE__ */ new WeakSet(), _SafeApiKit_getEip3770Address = function _SafeApiKit_getEip3770Address2(fullAddress) {
+    _SafeApiKit_chainId = /* @__PURE__ */ new WeakMap(), _SafeApiKit_txServiceBaseUrl = /* @__PURE__ */ new WeakMap(), _SafeApiKit_instances = /* @__PURE__ */ new WeakSet(), _SafeApiKit_isValidAddress = function _SafeApiKit_isValidAddress2(address) {
+      try {
+        (0, protocol_kit_1.validateEthereumAddress)(address);
+        return true;
+      } catch {
+        return false;
+      }
+    }, _SafeApiKit_getEip3770Address = function _SafeApiKit_getEip3770Address2(fullAddress) {
       return (0, protocol_kit_1.validateEip3770Address)(fullAddress, __classPrivateFieldGet2(this, _SafeApiKit_chainId, "f"));
     };
     exports2.default = SafeApiKit2;
@@ -208069,21 +208504,27 @@ var require_coerce = __commonJS({
       options = options || {};
       let match = null;
       if (!options.rtl) {
-        match = version4.match(re[t.COERCE]);
+        match = version4.match(options.includePrerelease ? re[t.COERCEFULL] : re[t.COERCE]);
       } else {
+        const coerceRtlRegex = options.includePrerelease ? re[t.COERCERTLFULL] : re[t.COERCERTL];
         let next;
-        while ((next = re[t.COERCERTL].exec(version4)) && (!match || match.index + match[0].length !== version4.length)) {
+        while ((next = coerceRtlRegex.exec(version4)) && (!match || match.index + match[0].length !== version4.length)) {
           if (!match || next.index + next[0].length !== match.index + match[0].length) {
             match = next;
           }
-          re[t.COERCERTL].lastIndex = next.index + next[1].length + next[2].length;
+          coerceRtlRegex.lastIndex = next.index + next[1].length + next[2].length;
         }
-        re[t.COERCERTL].lastIndex = -1;
+        coerceRtlRegex.lastIndex = -1;
       }
       if (match === null) {
         return null;
       }
-      return parse2(`${match[2]}.${match[3] || "0"}.${match[4] || "0"}`, options);
+      const major2 = match[2];
+      const minor = match[3] || "0";
+      const patch = match[4] || "0";
+      const prerelease = options.includePrerelease && match[5] ? `-${match[5]}` : "";
+      const build = options.includePrerelease && match[6] ? `+${match[6]}` : "";
+      return parse2(`${major2}.${minor}.${patch}${prerelease}${build}`, options);
     };
     module2.exports = coerce;
   }
@@ -231376,7 +231817,7 @@ var require_SourcifyChain = __commonJS({
 });
 
 // ../../node_modules/@ethereum-sourcify/lib-sourcify/build/main/lib/types.js
-var require_types15 = __commonJS({
+var require_types16 = __commonJS({
   "../../node_modules/@ethereum-sourcify/lib-sourcify/build/main/lib/types.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
@@ -231427,7 +231868,7 @@ var require_main2 = __commonJS({
     Object.defineProperty(exports2, "SourcifyChain", { enumerable: true, get: function() {
       return __importDefault2(SourcifyChain_1).default;
     } });
-    __exportStar2(require_types15(), exports2);
+    __exportStar2(require_types16(), exports2);
     __exportStar2(require_solidityCompiler(), exports2);
     exports2.setLibSourcifyLogger = logger_1.setLogger;
     exports2.setLibSourcifyLoggerLevel = logger_1.setLevel;
@@ -326599,7 +327040,7 @@ function zeroLT() {
 }
 
 // package.json
-var version3 = "4.1.0";
+var version3 = "0.0.0";
 
 // src/index.ts
 var program2 = new Command();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gearbox-protocol/deploy-tools",
   "description": "Gearbox deploy tools",
-  "version": "4.1.1-next.1",
+  "version": "4.1.1",
   "homepage": "https://gearbox.fi",
   "keywords": [
     "gearbox"
@@ -38,9 +38,9 @@
     "@chialab/esbuild-plugin-commonjs": "^0.18.0",
     "@ethereum-sourcify/bytecode-utils": "^1.2.1",
     "@ethereum-sourcify/lib-sourcify": "^1.4.1",
-    "@gearbox-protocol/deploy-tools-node": "4.1.0",
-    "@gearbox-protocol/deploy-tools-shared": "4.1.0",
-    "@gearbox-protocol/deploy-tools-types": "4.1.0",
+    "@gearbox-protocol/deploy-tools-node": "0.0.0",
+    "@gearbox-protocol/deploy-tools-shared": "0.0.0",
+    "@gearbox-protocol/deploy-tools-types": "0.0.0",
     "@gearbox-protocol/sdk-gov": "^1.28.2",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^20.10.8",