@safe-global/protocol-kit 2.0.1-alpha.0 → 3.0.0

package/dist/src/utils/eip-712/index.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateTypedData = exports.getEip712MessageTypes = exports.EIP712_DOMAIN = exports.EIP712_DOMAIN_BEFORE_V130 = void 0;
+exports.generateTypedData = exports.hashSafeMessage = exports.hashTypedData = exports.getEip712MessageTypes = exports.getEip712TxTypes = exports.EIP712_DOMAIN = exports.EIP712_DOMAIN_BEFORE_V130 = void 0;
+const ethers_1 = require("ethers");
 const satisfies_1 = __importDefault(require("semver/functions/satisfies"));
 const EQ_OR_GT_1_3_0 = '>=1.3.0';
 exports.EIP712_DOMAIN_BEFORE_V130 = [
@@ -23,7 +24,7 @@ exports.EIP712_DOMAIN = [
     }
 ];
 // This function returns the types structure for signing off-chain messages according to EIP-712
-function getEip712MessageTypes(safeVersion) {
+function getEip712TxTypes(safeVersion) {
     const eip712WithChainId = (0, satisfies_1.default)(safeVersion, EQ_OR_GT_1_3_0);
     return {
         EIP712Domain: eip712WithChainId ? exports.EIP712_DOMAIN : exports.EIP712_DOMAIN_BEFORE_V130,
@@ -41,24 +42,62 @@ function getEip712MessageTypes(safeVersion) {
         ]
     };
 }
-exports.getEip712MessageTypes = getEip712MessageTypes;
-function generateTypedData({ safeAddress, safeVersion, chainId, safeTransactionData }) {
+exports.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 ? exports.EIP712_DOMAIN : exports.EIP712_DOMAIN_BEFORE_V130,
+        SafeMessage: [{ type: 'bytes', name: 'message' }]
     };
+}
+exports.getEip712MessageTypes = getEip712MessageTypes;
+const hashTypedData = (typedData) => {
+    // `ethers` doesn't require `EIP712Domain` and otherwise throws
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { EIP712Domain: _, ...types } = typedData.types;
+    return ethers_1.ethers.TypedDataEncoder.hash(typedData.domain, types, typedData.message);
+};
+exports.hashTypedData = hashTypedData;
+const hashMessage = (message) => {
+    return ethers_1.ethers.hashMessage(message);
+};
+const hashSafeMessage = (message) => {
+    return typeof message === 'string' ? hashMessage(message) : (0, exports.hashTypedData)(message);
+};
+exports.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, exports.hashSafeMessage)(message) }
+        };
+    }
     if (eip712WithChainId) {
         typedData.domain.chainId = chainId.toString();
     }

package/dist/src/utils/eip-712/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utils/eip-712/index.ts"],"names":[],"mappings":";;;;;;AACA,2EAAwD;AAExD,MAAM,cAAc,GAAG,SAAS,CAAA;AAEnB,QAAA,yBAAyB,GAAG;IACvC;QACE,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,mBAAmB;KAC1B;CACF,CAAA;AAEY,QAAA,aAAa,GAAG;IAC3B;QACE,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS;KAChB;IACD;QACE,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,mBAAmB;KAC1B;CACF,CAAA;AAED,gGAAgG;AAChG,SAAgB,qBAAqB,CAAC,WAAmB;IAIvD,MAAM,iBAAiB,GAAG,IAAA,mBAAe,EAAC,WAAW,EAAE,cAAc,CAAC,CAAA;IACtE,OAAO;QACL,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC,qBAAa,CAAC,CAAC,CAAC,iCAAyB;QAC3E,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE;YAC/B,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE;YAClC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE;YAC/B,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE;YACpC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE;YACtC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;YACpC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE;YACrC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE;YACrC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,gBAAgB,EAAE;YAC3C,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE;SACnC;KACF,CAAA;AACH,CAAC;AApBD,sDAoBC;AAED,SAAgB,iBAAiB,CAAC,EAChC,WAAW,EACX,WAAW,EACX,OAAO,EACP,mBAAmB,EACO;IAC1B,MAAM,iBAAiB,GAAG,IAAA,mBAAe,EAAC,WAAW,EAAE,cAAc,CAAC,CAAA;IACtE,MAAM,SAAS,GAAsB;QACnC,KAAK,EAAE,qBAAqB,CAAC,WAAW,CAAC;QACzC,MAAM,EAAE;YACN,iBAAiB,EAAE,WAAW;SAC/B;QACD,WAAW,EAAE,QAAQ;QACrB,OAAO,EAAE;YACP,GAAG,mBAAmB;YACtB,KAAK,EAAE,mBAAmB,CAAC,KAAK;YAChC,SAAS,EAAE,mBAAmB,CAAC,SAAS;YACxC,OAAO,EAAE,mBAAmB,CAAC,OAAO;YACpC,QAAQ,EAAE,mBAAmB,CAAC,QAAQ;YACtC,KAAK,EAAE,mBAAmB,CAAC,KAAK;SACjC;KACF,CAAA;IACD,IAAI,iBAAiB,EAAE,CAAC;QACtB,SAAS,CAAC,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAA;IAC/C,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AA1BD,8CA0BC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utils/eip-712/index.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/messages/SafeMessage.d.ts

@@ -0,0 +1,10 @@
+import { EIP712TypedData, SafeMessage, SafeSignature } from '@safe-global/safe-core-sdk-types';
+declare class EthSafeMessage implements SafeMessage {
+    data: EIP712TypedData | string;
+    signatures: Map<string, SafeSignature>;
+    constructor(data: EIP712TypedData | string);
+    getSignature(signer: string): SafeSignature | undefined;
+    addSignature(signature: SafeSignature): void;
+    encodedSignatures(): string;
+}
+export default EthSafeMessage;

package/dist/src/utils/messages/SafeMessage.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const signatures_1 = require("../signatures");
+class EthSafeMessage {
+    constructor(data) {
+        this.signatures = 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()));
+    }
+}
+exports.default = EthSafeMessage;
+//# sourceMappingURL=SafeMessage.js.map

package/dist/src/utils/messages/SafeMessage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SafeMessage.js","sourceRoot":"","sources":["../../../../src/utils/messages/SafeMessage.ts"],"names":[],"mappings":";;AACA,8CAAmD;AAEnD,MAAM,cAAc;IAIlB,YAAY,IAA8B;QAF1C,eAAU,GAA+B,IAAI,GAAG,EAAE,CAAA;QAGhD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;IAClD,CAAC;IAED,YAAY,CAAC,SAAwB;QACnC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,SAAS,CAAC,CAAA;IAChE,CAAC;IAED,iBAAiB;QACf,OAAO,IAAA,gCAAmB,EAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;IAClE,CAAC;CACF;AAED,kBAAe,cAAc,CAAA"}

package/dist/src/utils/signatures/SafeSignature.d.ts

@@ -2,6 +2,7 @@ import { SafeSignature } from '@safe-global/safe-core-sdk-types';
 export declare class EthSafeSignature implements SafeSignature {
     signer: string;
     data: string;
+    isContractSignature: boolean;
     /**
      * Creates an instance of a Safe signature.
      *
@@ -9,13 +10,13 @@ export declare class EthSafeSignature implements SafeSignature {
      * @param signature - The Safe signature
      * @returns The Safe signature instance
      */
-    constructor(signer: string, signature: string);
+    constructor(signer: string, signature: string, isContractSignature?: boolean);
     /**
      * Returns the static part of the Safe signature.
      *
      * @returns The static part of the Safe signature
      */
-    staticPart(): string;
+    staticPart(dynamicOffset?: string): string;
     /**
      * Returns the dynamic part of the Safe signature.
      *

package/dist/src/utils/signatures/SafeSignature.js

@@ -9,16 +9,20 @@ class EthSafeSignature {
      * @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( /* dynamicOffset: number */) {
+    staticPart(dynamicOffset) {
+        if (this.isContractSignature) {
+            return `${this.signer.slice(2).padStart(64, '0')}${dynamicOffset || ''}00`;
+        }
         return this.data;
     }
     /**
@@ -27,6 +31,10 @@ class EthSafeSignature {
      * @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 '';
     }
 }

package/dist/src/utils/signatures/SafeSignature.js.map

@@ -1 +1 @@
-{"version":3,"file":"SafeSignature.js","sourceRoot":"","sources":["../../../../src/utils/signatures/SafeSignature.ts"],"names":[],"mappings":";;;AAEA,MAAa,gBAAgB;IAI3B;;;;;;OAMG;IACH,YAAY,MAAc,EAAE,SAAiB;QAC3C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,SAAS,CAAA;IACvB,CAAC;IAED;;;;OAIG;IACH,UAAU,EAAC,2BAA2B;QACpC,OAAO,IAAI,CAAC,IAAI,CAAA;IAClB,CAAC;IAED;;;;OAIG;IACH,WAAW;QACT,OAAO,EAAE,CAAA;IACX,CAAC;CACF;AAjCD,4CAiCC"}
+{"version":3,"file":"SafeSignature.js","sourceRoot":"","sources":["../../../../src/utils/signatures/SafeSignature.ts"],"names":[],"mappings":";;;AAEA,MAAa,gBAAgB;IAK3B;;;;;;OAMG;IACH,YAAY,MAAc,EAAE,SAAiB,EAAE,mBAAmB,GAAG,KAAK;QACxE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,SAAS,CAAA;QACrB,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;IAChD,CAAC;IAED;;;;OAIG;IACH,UAAU,CAAC,aAAsB;QAC/B,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC7B,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,aAAa,IAAI,EAAE,IAAI,CAAA;QAC5E,CAAC;QAED,OAAO,IAAI,CAAC,IAAI,CAAA;IAClB,CAAC;IAED;;;;OAIG;IACH,WAAW;QACT,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC7B,MAAM,iBAAiB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;YACxF,OAAO,GAAG,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;QACpD,CAAC;QAED,OAAO,EAAE,CAAA;IACX,CAAC;CACF;AA5CD,4CA4CC"}

package/dist/src/utils/signatures/utils.d.ts

@@ -1,11 +1,18 @@
-import { EthAdapter, SafeSignature, SafeTransactionEIP712Args } from '@safe-global/safe-core-sdk-types';
+import { EthAdapter, SafeSignature, SafeEIP712Args, SafeTransactionData } from '@safe-global/safe-core-sdk-types';
+import { SigningMethod } from '../../types';
 export declare function generatePreValidatedSignature(ownerAddress: string): SafeSignature;
 export declare function isTxHashSignedWithPrefix(txHash: string, signature: string, ownerAddress: string): boolean;
 type AdjustVOverload = {
-    (signingMethod: 'eth_signTypedData', signature: string): string;
-    (signingMethod: 'eth_sign', signature: string, safeTxHash: string, sender: string): string;
+    (signingMethod: SigningMethod.ETH_SIGN_TYPED_DATA, signature: string): string;
+    (signingMethod: SigningMethod.ETH_SIGN, signature: string, safeTxHash: string, sender: string): string;
 };
 export declare const adjustVInSignature: AdjustVOverload;
 export declare function generateSignature(ethAdapter: EthAdapter, hash: string): Promise<SafeSignature>;
-export declare function generateEIP712Signature(ethAdapter: EthAdapter, safeTransactionEIP712Args: SafeTransactionEIP712Args, methodVersion?: 'v3' | 'v4'): Promise<SafeSignature>;
+export declare function generateEIP712Signature(ethAdapter: EthAdapter, safeEIP712Args: SafeEIP712Args, methodVersion?: 'v3' | 'v4'): Promise<SafeSignature>;
+export declare const buildContractSignature: (signatures: SafeSignature[], signerSafeAddress: string) => Promise<SafeSignature>;
+export declare const buildSignatureBytes: (signatures: SafeSignature[]) => string;
+export declare const preimageSafeTransactionHash: (safeAddress: string, safeTx: SafeTransactionData, safeVersion: string, chainId: bigint) => string;
+export declare const preimageSafeMessageHash: (safeAddress: string, message: string, safeVersion: string, chainId: bigint) => string;
+export declare const calculateSafeTransactionHash: (safeAddress: string, safeTx: SafeTransactionData, safeVersion: string, chainId: bigint) => string;
+export declare const calculateSafeMessageHash: (safeAddress: string, message: string, safeVersion: string, chainId: bigint) => string;
 export {};

package/dist/src/utils/signatures/utils.js

@@ -1,9 +1,16 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateEIP712Signature = exports.generateSignature = exports.adjustVInSignature = exports.isTxHashSignedWithPrefix = exports.generatePreValidatedSignature = void 0;
+exports.calculateSafeMessageHash = exports.calculateSafeTransactionHash = exports.preimageSafeMessageHash = exports.preimageSafeTransactionHash = exports.buildSignatureBytes = exports.buildContractSignature = exports.generateEIP712Signature = exports.generateSignature = exports.adjustVInSignature = exports.isTxHashSignedWithPrefix = exports.generatePreValidatedSignature = void 0;
+const ethers_1 = require("ethers");
 const ethereumjs_util_1 = require("ethereumjs-util");
+const satisfies_1 = __importDefault(require("semver/functions/satisfies"));
 const address_1 = require("../address");
 const SafeSignature_1 = require("./SafeSignature");
+const eip_712_1 = require("../eip-712");
+const types_1 = require("../../types");
 function generatePreValidatedSignature(ownerAddress) {
     const signature = '0x000000000000000000000000' +
         ownerAddress.slice(2) +
@@ -37,7 +44,7 @@ const adjustVInSignature = (signingMethod, signature, safeTxHash, signerAddress)
     if (!ETHEREUM_V_VALUES.includes(signatureV)) {
         throw new Error('Invalid signature');
     }
-    if (signingMethod === 'eth_sign') {
+    if (signingMethod === types_1.SigningMethod.ETH_SIGN) {
         /*
           The Safe's expected V value for ECDSA signature is:
           - 27 or 28
@@ -58,7 +65,7 @@ const adjustVInSignature = (signingMethod, signature, safeTxHash, signerAddress)
             signatureV += 4;
         }
     }
-    if (signingMethod === 'eth_signTypedData') {
+    if (signingMethod === types_1.SigningMethod.ETH_SIGN_TYPED_DATA) {
         // Metamask with ledger returns V=0/1 here too, we need to adjust it to be ethereum's valid value (27 or 28)
         if (signatureV < MIN_VALID_V_VALUE_FOR_SAFE_ECDSA) {
             signatureV += MIN_VALID_V_VALUE_FOR_SAFE_ECDSA;
@@ -74,18 +81,79 @@ async function generateSignature(ethAdapter, hash) {
         throw new Error('EthAdapter must be initialized with a signer to use this method');
     }
     let signature = await ethAdapter.signMessage(hash);
-    signature = (0, exports.adjustVInSignature)('eth_sign', signature, hash, signerAddress);
+    signature = (0, exports.adjustVInSignature)(types_1.SigningMethod.ETH_SIGN, signature, hash, signerAddress);
     return new SafeSignature_1.EthSafeSignature(signerAddress, signature);
 }
 exports.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, exports.adjustVInSignature)('eth_signTypedData', signature);
+    let signature = await ethAdapter.signTypedData(safeEIP712Args, methodVersion);
+    signature = (0, exports.adjustVInSignature)(types_1.SigningMethod.ETH_SIGN_TYPED_DATA, signature);
     return new SafeSignature_1.EthSafeSignature(signerAddress, signature);
 }
 exports.generateEIP712Signature = generateEIP712Signature;
+const buildContractSignature = async (signatures, signerSafeAddress) => {
+    const contractSignature = new SafeSignature_1.EthSafeSignature(signerSafeAddress, (0, exports.buildSignatureBytes)(signatures), true);
+    return contractSignature;
+};
+exports.buildContractSignature = buildContractSignature;
+const 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) {
+            /*
+              A contract signature has a static part of 65 bytes and the dynamic part that needs to be appended
+              at the end of signature bytes.
+              The signature format is
+              Signature type == 0
+              Constant part: 65 bytes
+              {32-bytes signature verifier}{32-bytes dynamic data position}{1-byte signature type}
+              Dynamic part (solidity bytes): 32 bytes + signature data length
+              {32-bytes signature length}{bytes signature data}
+            */
+            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;
+};
+exports.buildSignatureBytes = buildSignatureBytes;
+const 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);
+};
+exports.preimageSafeTransactionHash = preimageSafeTransactionHash;
+const 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 });
+};
+exports.preimageSafeMessageHash = preimageSafeMessageHash;
+const EQ_OR_GT_1_3_0 = '>=1.3.0';
+const 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);
+};
+exports.calculateSafeTransactionHash = calculateSafeTransactionHash;
+const 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 });
+};
+exports.calculateSafeMessageHash = calculateSafeMessageHash;
 //# sourceMappingURL=utils.js.map

package/dist/src/utils/signatures/utils.js.map

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

package/dist/src/utils/transactions/SafeTransaction.d.ts

@@ -3,6 +3,7 @@ declare class EthSafeTransaction implements SafeTransaction {
     data: SafeTransactionData;
     signatures: Map<string, SafeSignature>;
     constructor(data: SafeTransactionData);
+    getSignature(signer: string): SafeSignature | undefined;
     addSignature(signature: SafeSignature): void;
     encodedSignatures(): string;
 }

package/dist/src/utils/transactions/SafeTransaction.js

@@ -1,24 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const signatures_1 = require("../signatures");
 class EthSafeTransaction {
     constructor(data) {
         this.signatures = 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()));
     }
 }
 exports.default = EthSafeTransaction;

package/dist/src/utils/transactions/SafeTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"SafeTransaction.js","sourceRoot":"","sources":["../../../../src/utils/transactions/SafeTransaction.ts"],"names":[],"mappings":";;AAMA,MAAM,kBAAkB;IAItB,YAAY,IAAyB;QAFrC,eAAU,GAA+B,IAAI,GAAG,EAAE,CAAA;QAGhD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;IAED,YAAY,CAAC,SAAwB;QACnC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,SAAS,CAAC,CAAA;IAChE,CAAC;IAED,iBAAiB;QACf,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;QACzD,yCAAyC;QACzC,IAAI,WAAW,GAAG,EAAE,CAAA;QACpB,IAAI,YAAY,GAAG,EAAE,CAAA;QACrB,OAAO,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;YAChC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;YACpD,WAAW,IAAI,SAAS,EAAE,UAAU,EAAC,wCAAwC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YACvF,YAAY,IAAI,SAAS,EAAE,WAAW,EAAE,CAAA;QAC1C,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,GAAG,WAAW,GAAG,YAAY,CAAA;IAC1C,CAAC;CACF;AAED,kBAAe,kBAAkB,CAAA"}
+{"version":3,"file":"SafeTransaction.js","sourceRoot":"","sources":["../../../../src/utils/transactions/SafeTransaction.ts"],"names":[],"mappings":";;AAKA,8CAAmD;AAEnD,MAAM,kBAAkB;IAItB,YAAY,IAAyB;QAFrC,eAAU,GAA+B,IAAI,GAAG,EAAE,CAAA;QAGhD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;IAClD,CAAC;IAED,YAAY,CAAC,SAAwB;QACnC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,SAAS,CAAC,CAAA;IAChE,CAAC;IAED,iBAAiB;QACf,OAAO,IAAA,gCAAmB,EAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;IAClE,CAAC;CACF;AAED,kBAAe,kBAAkB,CAAA"}