@safe-global/protocol-kit 4.1.0 → 5.0.0

package/dist/src/utils/passkeys/PasskeyClient.js

@@ -0,0 +1,156 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createPasskeyClient = exports.PASSKEY_CLIENT_NAME = exports.PASSKEY_CLIENT_KEY = void 0;
+const viem_1 = require("viem");
+const extractPasskeyData_1 = require("./extractPasskeyData");
+const types_1 = require("../types");
+const isSharedSigner_1 = __importDefault(require("./isSharedSigner"));
+exports.PASSKEY_CLIENT_KEY = 'passkeyWallet';
+exports.PASSKEY_CLIENT_NAME = 'Passkey Wallet Client';
+const sign = async (passkeyRawId, data) => {
+    const assertion = (await navigator.credentials.get({
+        publicKey: {
+            challenge: data,
+            allowCredentials: [{ type: 'public-key', id: passkeyRawId }],
+            userVerification: 'required'
+        }
+    }));
+    if (!assertion?.response?.authenticatorData) {
+        throw new Error('Failed to sign data with passkey Signer');
+    }
+    const { authenticatorData, signature, clientDataJSON } = assertion.response;
+    return (0, viem_1.encodeAbiParameters)((0, viem_1.parseAbiParameters)('bytes, bytes, uint256[2]'), [
+        (0, viem_1.toHex)(new Uint8Array(authenticatorData)),
+        extractClientDataFields(clientDataJSON),
+        extractSignature(signature)
+    ]);
+};
+const signTransaction = () => {
+    throw new Error('Passkey Signers cannot sign transactions, they can only sign data.');
+};
+const signTypedData = () => {
+    throw new Error('Passkey Signers cannot sign signTypedData, they can only sign data.');
+};
+const createPasskeyClient = async (passkey, safeWebAuthnSignerFactoryContract, safeWebAuthnSharedSignerContract, provider, safeAddress, owners, chainId) => {
+    const { rawId, coordinates, customVerifierAddress } = passkey;
+    const passkeyRawId = (0, viem_1.hexToBytes)((0, types_1.asHex)(rawId));
+    const verifierAddress = customVerifierAddress || (0, extractPasskeyData_1.getDefaultFCLP256VerifierAddress)(chainId);
+    const isPasskeySharedSigner = await (0, isSharedSigner_1.default)(passkey, safeWebAuthnSharedSignerContract, safeAddress, owners, chainId);
+    let signerAddress;
+    if (isPasskeySharedSigner) {
+        signerAddress = safeWebAuthnSharedSignerContract.getAddress();
+    }
+    else {
+        ;
+        [signerAddress] = await safeWebAuthnSignerFactoryContract.getSigner([
+            BigInt(coordinates.x),
+            BigInt(coordinates.y),
+            (0, viem_1.fromHex)((0, types_1.asHex)(verifierAddress), 'bigint')
+        ]);
+    }
+    return (0, viem_1.createClient)({
+        account: signerAddress,
+        name: exports.PASSKEY_CLIENT_NAME,
+        key: exports.PASSKEY_CLIENT_KEY,
+        transport: (0, viem_1.custom)(provider.transport)
+    })
+        .extend(viem_1.walletActions)
+        .extend(() => ({
+        signMessage({ message }) {
+            if (typeof message === 'string') {
+                return sign(passkeyRawId, (0, viem_1.toBytes)(message));
+            }
+            return sign(passkeyRawId, (0, viem_1.isHex)(message.raw) ? (0, viem_1.toBytes)(message.raw) : message.raw);
+        },
+        signTransaction,
+        signTypedData,
+        encodeConfigure() {
+            return (0, viem_1.encodeFunctionData)({
+                abi: (0, viem_1.parseAbi)(['function configure((uint256 x, uint256 y, uint176 verifiers) signer)']),
+                functionName: 'configure',
+                args: [
+                    {
+                        x: BigInt(passkey.coordinates.x),
+                        y: BigInt(passkey.coordinates.y),
+                        verifiers: (0, viem_1.fromHex)((0, types_1.asHex)(verifierAddress), 'bigint')
+                    }
+                ]
+            });
+        },
+        encodeCreateSigner() {
+            return (0, types_1.asHex)(safeWebAuthnSignerFactoryContract.encode('createSigner', [
+                BigInt(coordinates.x),
+                BigInt(coordinates.y),
+                BigInt(verifierAddress)
+            ]));
+        },
+        createDeployTxRequest() {
+            const passkeySignerDeploymentTransaction = {
+                to: safeWebAuthnSignerFactoryContract.getAddress(),
+                value: '0',
+                data: this.encodeCreateSigner()
+            };
+            return passkeySignerDeploymentTransaction;
+        }
+    }));
+};
+exports.createPasskeyClient = createPasskeyClient;
+/**
+ * Compute the additional client data JSON fields. This is the fields other than `type` and
+ * `challenge` (including `origin` and any other additional client data fields that may be
+ * added by the authenticator).
+ *
+ * See <https://w3c.github.io/webauthn/#clientdatajson-serialization>
+ *
+ * @param {ArrayBuffer} clientDataJSON - The client data JSON.
+ * @returns {Hex} A hex string of the additional fields from the client data JSON.
+ * @throws {Error} Throws an error if the client data JSON does not contain the expected 'challenge' field pattern.
+ */
+function extractClientDataFields(clientDataJSON) {
+    const decodedClientDataJSON = new TextDecoder('utf-8').decode(clientDataJSON);
+    const match = decodedClientDataJSON.match(/^\{"type":"webauthn.get","challenge":"[A-Za-z0-9\-_]{43}",(.*)\}$/);
+    if (!match) {
+        throw new Error('challenge not found in client data JSON');
+    }
+    const [, fields] = match;
+    return (0, viem_1.toHex)((0, viem_1.stringToBytes)(fields));
+}
+/**
+ * Extracts the numeric values r and s from a DER-encoded ECDSA signature.
+ * This function decodes the signature based on a specific format and validates the encoding at each step.
+ *
+ * @param {ArrayBuffer} signature - The DER-encoded signature to be decoded.
+ * @returns {[bigint, bigint]} A tuple containing two BigInt values, r and s, which are the numeric values extracted from the signature.
+ * @throws {Error} Throws an error if the signature encoding is invalid or does not meet expected conditions.
+ */
+function extractSignature(signature) {
+    const check = (x) => {
+        if (!x) {
+            throw new Error('invalid signature encoding');
+        }
+    };
+    // Decode the DER signature. Note that we assume that all lengths fit into 8-bit integers,
+    // which is true for the kinds of signatures we are decoding but generally false. I.e. this
+    // code should not be used in any serious application.
+    const view = new DataView(signature);
+    // check that the sequence header is valid
+    check(view.getUint8(0) === 0x30);
+    check(view.getUint8(1) === view.byteLength - 2);
+    // read r and s
+    const readInt = (offset) => {
+        check(view.getUint8(offset) === 0x02);
+        const len = view.getUint8(offset + 1);
+        const start = offset + 2;
+        const end = start + len;
+        const n = (0, viem_1.fromBytes)(new Uint8Array(view.buffer.slice(start, end)), 'bigint');
+        check(n < viem_1.maxUint256);
+        return [n, end];
+    };
+    const [r, sOffset] = readInt(2);
+    const [s] = readInt(sOffset);
+    return [r, s];
+}
+//# sourceMappingURL=PasskeyClient.js.map

package/dist/src/utils/passkeys/PasskeyClient.js.map

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

package/dist/src/utils/passkeys/createPasskeyDeploymentTransaction.d.ts

@@ -1,3 +1,4 @@
+import { Hex } from 'viem';
 import Safe from '../../Safe';
 import { PasskeyArgType } from '../../types';
 /**
@@ -10,6 +11,6 @@ import { PasskeyArgType } from '../../types';
 declare function createPasskeyDeploymentTransaction(safe: Safe, passkey: PasskeyArgType): Promise<{
     to: string;
     value: string;
-    data: string;
+    data: Hex;
 }>;
 export default createPasskeyDeploymentTransaction;

package/dist/src/utils/passkeys/createPasskeyDeploymentTransaction.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const constants_1 = require("../constants");
 const SafeProvider_1 = __importDefault(require("../../SafeProvider"));
 /**
  * Creates the deployment transaction to create a passkey signer.
@@ -13,23 +12,24 @@ const SafeProvider_1 = __importDefault(require("../../SafeProvider"));
  * @returns {Promise<{ to: string; value: string; data: string; }>} The deployment transaction to create a passkey signer.
  */
 async function createPasskeyDeploymentTransaction(safe, passkey) {
-    const safeVersion = await safe.getContractVersion();
+    const safeVersion = safe.getContractVersion();
     const safeAddress = await safe.getAddress();
     const owners = await safe.getOwners();
-    const safePasskeyProvider = await SafeProvider_1.default.init(safe.getSafeProvider().provider, passkey, safeVersion, safe.getContractManager().contractNetworks, safeAddress, owners);
+    const safePasskeyProvider = await SafeProvider_1.default.init({
+        provider: safe.getSafeProvider().provider,
+        signer: passkey,
+        safeVersion,
+        contractNetworks: safe.getContractManager().contractNetworks,
+        safeAddress,
+        owners
+    });
     const passkeySigner = (await safePasskeyProvider.getExternalSigner());
-    const passkeyAddress = await passkeySigner.getAddress();
-    const provider = safe.getSafeProvider().getExternalProvider();
-    const isPasskeyDeployed = (await provider.getCode(passkeyAddress)) !== constants_1.EMPTY_DATA;
+    const passkeyAddress = passkeySigner.account.address;
+    const isPasskeyDeployed = await safe.getSafeProvider().isContractDeployed(passkeyAddress);
     if (isPasskeyDeployed) {
         throw new Error('Passkey Signer contract already deployed');
     }
-    const passkeySignerDeploymentTransaction = {
-        to: await passkeySigner.safeWebAuthnSignerFactoryContract.getAddress(),
-        value: '0',
-        data: passkeySigner.encodeCreateSigner()
-    };
-    return passkeySignerDeploymentTransaction;
+    return passkeySigner.createDeployTxRequest();
 }
 exports.default = createPasskeyDeploymentTransaction;
 //# sourceMappingURL=createPasskeyDeploymentTransaction.js.map

package/dist/src/utils/passkeys/createPasskeyDeploymentTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"createPasskeyDeploymentTransaction.js","sourceRoot":"","sources":["../../../../src/utils/passkeys/createPasskeyDeploymentTransaction.ts"],"names":[],"mappings":";;;;;AAEA,4CAAyC;AACzC,sEAA6C;AAG7C;;;;;;GAMG;AACH,KAAK,UAAU,kCAAkC,CAC/C,IAAU,EACV,OAAuB;IAEvB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAA;IACnD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;IAC3C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;IAErC,MAAM,mBAAmB,GAAG,MAAM,sBAAY,CAAC,IAAI,CACjD,IAAI,CAAC,eAAe,EAAE,CAAC,QAAQ,EAC/B,OAAO,EACP,WAAW,EACX,IAAI,CAAC,kBAAkB,EAAE,CAAC,gBAAgB,EAC1C,WAAW,EACX,MAAM,CACP,CAAA;IAED,MAAM,aAAa,GAAG,CAAC,MAAM,mBAAmB,CAAC,iBAAiB,EAAE,CAAkB,CAAA;IACtF,MAAM,cAAc,GAAG,MAAM,aAAc,CAAC,UAAU,EAAE,CAAA;IACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC,mBAAmB,EAAE,CAAA;IAE7D,MAAM,iBAAiB,GAAG,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,KAAK,sBAAU,CAAA;IAEjF,IAAI,iBAAiB,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;IAC7D,CAAC;IAED,MAAM,kCAAkC,GAAG;QACzC,EAAE,EAAE,MAAM,aAAa,CAAC,iCAAiC,CAAC,UAAU,EAAE;QACtE,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,aAAa,CAAC,kBAAkB,EAAE;KACzC,CAAA;IAED,OAAO,kCAAkC,CAAA;AAC3C,CAAC;AAED,kBAAe,kCAAkC,CAAA"}
+{"version":3,"file":"createPasskeyDeploymentTransaction.js","sourceRoot":"","sources":["../../../../src/utils/passkeys/createPasskeyDeploymentTransaction.ts"],"names":[],"mappings":";;;;;AAGA,0FAAiE;AAGjE;;;;;;GAMG;AACH,KAAK,UAAU,kCAAkC,CAC/C,IAAU,EACV,OAAuB;IAEvB,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAA;IAC7C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;IAC3C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;IAErC,MAAM,mBAAmB,GAAG,MAAM,sBAAY,CAAC,IAAI,CAAC;QAClD,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,QAAQ;QACzC,MAAM,EAAE,OAAO;QACf,WAAW;QACX,gBAAgB,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC,gBAAgB;QAC5D,WAAW;QACX,MAAM;KACP,CAAC,CAAA;IAEF,MAAM,aAAa,GAAG,CAAC,MAAM,mBAAmB,CAAC,iBAAiB,EAAE,CAAkB,CAAA;IACtF,MAAM,cAAc,GAAG,aAAc,CAAC,OAAO,CAAC,OAAO,CAAA;IAErD,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAA;IAEzF,IAAI,iBAAiB,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;IAC7D,CAAC;IAED,OAAO,aAAa,CAAC,qBAAqB,EAAE,CAAA;AAC9C,CAAC;AAED,kBAAe,kCAAkC,CAAA"}

package/dist/src/utils/passkeys/extractPasskeyData.d.ts

@@ -1,4 +1,4 @@
-import { PasskeyCoordinates, PasskeyArgType } from '../../types/passkeys';
+import { PasskeyCoordinates, PasskeyArgType } from '../../types';
 /**
  * Extracts and returns the passkey data (coordinates and rawId) from a given passkey Credential.
  *
@@ -15,5 +15,4 @@ export declare function extractPasskeyData(passkeyCredential: Credential): Promi
  * @throws {Error} Throws an error if the coordinates could not be extracted via `crypto.subtle.exportKey()`
  */
 export declare function extractPasskeyCoordinates(publicKey: ArrayBuffer): Promise<PasskeyCoordinates>;
-export declare function hexStringToUint8Array(hexString: string): Uint8Array;
 export declare function getDefaultFCLP256VerifierAddress(chainId: string): string;

package/dist/src/utils/passkeys/extractPasskeyData.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultFCLP256VerifierAddress = exports.hexStringToUint8Array = exports.extractPasskeyCoordinates = exports.extractPasskeyData = void 0;
+exports.getDefaultFCLP256VerifierAddress = exports.extractPasskeyCoordinates = exports.extractPasskeyData = void 0;
 const safe_modules_deployments_1 = require("@safe-global/safe-modules-deployments");
 const buffer_1 = require("buffer");
 /**
@@ -50,25 +50,18 @@ async function extractPasskeyCoordinates(publicKey) {
     };
 }
 exports.extractPasskeyCoordinates = extractPasskeyCoordinates;
-// FIXME use Viem `hexToBytes`
-function hexStringToUint8Array(hexString) {
-    const arr = [];
-    for (let i = 0; i < hexString.length; i += 2) {
-        arr.push(parseInt(hexString.substr(i, 2), 16));
-    }
-    return new Uint8Array(arr);
-}
-exports.hexStringToUint8Array = hexStringToUint8Array;
 function getDefaultFCLP256VerifierAddress(chainId) {
-    const network = BigInt(chainId).toString();
     const FCLP256VerifierDeployment = (0, safe_modules_deployments_1.getFCLP256VerifierDeployment)({
-        version: '0.2.0',
+        version: '0.2.1',
         released: true,
-        network
+        network: chainId
     });
-    const verifierAddress = FCLP256VerifierDeployment?.networkAddresses[network];
+    if (!FCLP256VerifierDeployment) {
+        throw new Error(`Failed to load FCLP256Verifier deployment for chain ID ${chainId}`);
+    }
+    const verifierAddress = FCLP256VerifierDeployment.networkAddresses[chainId];
     if (!verifierAddress) {
-        throw new Error('FCLP256Verifier address not found');
+        throw new Error(`FCLP256Verifier address not found for chain ID ${chainId}`);
     }
     return verifierAddress;
 }

package/dist/src/utils/passkeys/extractPasskeyData.js.map

@@ -1 +1 @@
-{"version":3,"file":"extractPasskeyData.js","sourceRoot":"","sources":["../../../../src/utils/passkeys/extractPasskeyData.ts"],"names":[],"mappings":";;;AAAA,oFAAoF;AACpF,mCAA+B;AAG/B;;;;;;GAMG;AACI,KAAK,UAAU,kBAAkB,CAAC,iBAA6B;IACpE,MAAM,OAAO,GAAG,iBAAwC,CAAA;IACxD,MAAM,mBAAmB,GAAG,OAAO,CAAC,QAA4C,CAAA;IAEhF,MAAM,SAAS,GAAG,mBAAmB,CAAC,YAAY,EAAE,CAAA;IAEpD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAA;IAClF,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,yBAAyB,CAAC,SAAS,CAAC,CAAA;IAC9D,MAAM,KAAK,GAAG,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAExD,OAAO;QACL,KAAK;QACL,WAAW;KACZ,CAAA;AACH,CAAC;AAjBD,gDAiBC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,yBAAyB,CAC7C,SAAsB;IAEtB,MAAM,SAAS,GAAG;QAChB,IAAI,EAAE,OAAO;QACb,UAAU,EAAE,OAAO;QACnB,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;KAC1B,CAAA;IAED,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEzF,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IAE1D,MAAM,kBAAkB,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAErC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,0EAA0E,CAAC,CAAA;IAC7F,CAAC;IAED,OAAO;QACL,CAAC,EAAE,IAAI,GAAG,eAAM,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;QAClD,CAAC,EAAE,IAAI,GAAG,eAAM,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;KACnD,CAAA;AACH,CAAC;AAvBD,8DAuBC;AAED,8BAA8B;AAC9B,SAAgB,qBAAqB,CAAC,SAAiB;IACrD,MAAM,GAAG,GAAG,EAAE,CAAA;IACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7C,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;IAChD,CAAC;IACD,OAAO,IAAI,UAAU,CAAC,GAAG,CAAC,CAAA;AAC5B,CAAC;AAND,sDAMC;AAED,SAAgB,gCAAgC,CAAC,OAAe;IAC9D,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAA;IAE1C,MAAM,yBAAyB,GAAG,IAAA,uDAA4B,EAAC;QAC7D,OAAO,EAAE,OAAO;QAChB,QAAQ,EAAE,IAAI;QACd,OAAO;KACR,CAAC,CAAA;IAEF,MAAM,eAAe,GAAG,yBAAyB,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAE5E,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;IACtD,CAAC;IAED,OAAO,eAAe,CAAA;AACxB,CAAC;AAhBD,4EAgBC"}
+{"version":3,"file":"extractPasskeyData.js","sourceRoot":"","sources":["../../../../src/utils/passkeys/extractPasskeyData.ts"],"names":[],"mappings":";;;AAAA,oFAAoF;AACpF,mCAA+B;AAG/B;;;;;;GAMG;AACI,KAAK,UAAU,kBAAkB,CAAC,iBAA6B;IACpE,MAAM,OAAO,GAAG,iBAAwC,CAAA;IACxD,MAAM,mBAAmB,GAAG,OAAO,CAAC,QAA4C,CAAA;IAEhF,MAAM,SAAS,GAAG,mBAAmB,CAAC,YAAY,EAAE,CAAA;IAEpD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAA;IAClF,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,yBAAyB,CAAC,SAAS,CAAC,CAAA;IAC9D,MAAM,KAAK,GAAG,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAExD,OAAO;QACL,KAAK;QACL,WAAW;KACZ,CAAA;AACH,CAAC;AAjBD,gDAiBC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,yBAAyB,CAC7C,SAAsB;IAEtB,MAAM,SAAS,GAAG;QAChB,IAAI,EAAE,OAAO;QACb,UAAU,EAAE,OAAO;QACnB,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;KAC1B,CAAA;IAED,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEzF,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IAE1D,MAAM,kBAAkB,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAErC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,0EAA0E,CAAC,CAAA;IAC7F,CAAC;IAED,OAAO;QACL,CAAC,EAAE,IAAI,GAAG,eAAM,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;QAClD,CAAC,EAAE,IAAI,GAAG,eAAM,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;KACnD,CAAA;AACH,CAAC;AAvBD,8DAuBC;AAED,SAAgB,gCAAgC,CAAC,OAAe;IAC9D,MAAM,yBAAyB,GAAG,IAAA,uDAA4B,EAAC;QAC7D,OAAO,EAAE,OAAO;QAChB,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,OAAO;KACjB,CAAC,CAAA;IAEF,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,0DAA0D,OAAO,EAAE,CAAC,CAAA;IACtF,CAAC;IAED,MAAM,eAAe,GAAG,yBAAyB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAE3E,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,kDAAkD,OAAO,EAAE,CAAC,CAAA;IAC9E,CAAC;IAED,OAAO,eAAe,CAAA;AACxB,CAAC;AAlBD,4EAkBC"}

package/dist/src/utils/passkeys/getPasskeyOwnerAddress.js

@@ -12,12 +12,19 @@ const SafeProvider_1 = __importDefault(require("../../SafeProvider"));
  * @returns {Promise<string>} Returns the passkey owner address associated with the passkey
  */
 async function getPasskeyOwnerAddress(safe, passkey) {
-    const safeVersion = await safe.getContractVersion();
+    const safeVersion = safe.getContractVersion();
     const safeAddress = await safe.getAddress();
     const owners = await safe.getOwners();
-    const safePasskeyProvider = await SafeProvider_1.default.init(safe.getSafeProvider().provider, passkey, safeVersion, safe.getContractManager().contractNetworks, safeAddress, owners);
+    const safePasskeyProvider = await SafeProvider_1.default.init({
+        provider: safe.getSafeProvider().provider,
+        signer: passkey,
+        safeVersion,
+        contractNetworks: safe.getContractManager().contractNetworks,
+        safeAddress,
+        owners
+    });
     const passkeySigner = await safePasskeyProvider.getExternalSigner();
-    const passkeyOwnerAddress = await passkeySigner.getAddress();
+    const passkeyOwnerAddress = passkeySigner.account.address;
     return passkeyOwnerAddress;
 }
 exports.default = getPasskeyOwnerAddress;

package/dist/src/utils/passkeys/getPasskeyOwnerAddress.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPasskeyOwnerAddress.js","sourceRoot":"","sources":["../../../../src/utils/passkeys/getPasskeyOwnerAddress.ts"],"names":[],"mappings":";;;;;AAAA,sEAA6C;AAI7C;;;;;;GAMG;AACH,KAAK,UAAU,sBAAsB,CAAC,IAAU,EAAE,OAAuB;IACvE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAA;IACnD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;IAC3C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;IAErC,MAAM,mBAAmB,GAAG,MAAM,sBAAY,CAAC,IAAI,CACjD,IAAI,CAAC,eAAe,EAAE,CAAC,QAAQ,EAC/B,OAAO,EACP,WAAW,EACX,IAAI,CAAC,kBAAkB,EAAE,CAAC,gBAAgB,EAC1C,WAAW,EACX,MAAM,CACP,CAAA;IAED,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,iBAAiB,EAAE,CAAA;IAEnE,MAAM,mBAAmB,GAAG,MAAM,aAAc,CAAC,UAAU,EAAE,CAAA;IAE7D,OAAO,mBAAmB,CAAA;AAC5B,CAAC;AAED,kBAAe,sBAAsB,CAAA"}
+{"version":3,"file":"getPasskeyOwnerAddress.js","sourceRoot":"","sources":["../../../../src/utils/passkeys/getPasskeyOwnerAddress.ts"],"names":[],"mappings":";;;;;AACA,0FAAiE;AAGjE;;;;;;GAMG;AACH,KAAK,UAAU,sBAAsB,CAAC,IAAU,EAAE,OAAuB;IACvE,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAA;IAC7C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;IAC3C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;IAErC,MAAM,mBAAmB,GAAG,MAAM,sBAAY,CAAC,IAAI,CAAC;QAClD,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,QAAQ;QACzC,MAAM,EAAE,OAAO;QACf,WAAW;QACX,gBAAgB,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC,gBAAgB;QAC5D,WAAW;QACX,MAAM;KACP,CAAC,CAAA;IAEF,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,iBAAiB,EAAE,CAAA;IAEnE,MAAM,mBAAmB,GAAG,aAAc,CAAC,OAAO,CAAC,OAAO,CAAA;IAE1D,OAAO,mBAAmB,CAAA;AAC5B,CAAC;AAED,kBAAe,sBAAsB,CAAA"}

package/dist/src/utils/passkeys/index.d.ts

@@ -1,3 +1,3 @@
 export * from './extractPasskeyData';
-export * from './PasskeySigner';
+export * from './PasskeyClient';
 export * from './getPasskeyOwnerAddress';

package/dist/src/utils/passkeys/index.js

@@ -15,6 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./extractPasskeyData"), exports);
-__exportStar(require("./PasskeySigner"), exports);
+__exportStar(require("./PasskeyClient"), exports);
 __exportStar(require("./getPasskeyOwnerAddress"), exports);
 //# sourceMappingURL=index.js.map

package/dist/src/utils/passkeys/isSharedSigner.d.ts

@@ -1,8 +1,7 @@
-import { PasskeyArgType } from '../../types/passkeys';
-import { SafeWebAuthnSharedSignerContractImplementationType } from '../../types/contracts';
+import { PasskeyArgType, SafeWebAuthnSharedSignerContractImplementationType } from '../../types';
 /**
  * Returns true if the passkey signer is a shared signer
- * @returns {Promise<string>} A promise that resolves to the signer's address.
+ * @returns {Promise<boolean>} A promise that resolves to the signer's address.
  */
 declare function isSharedSigner(passkey: PasskeyArgType, safeWebAuthnSharedSignerContract: SafeWebAuthnSharedSignerContractImplementationType, safeAddress: string, owners: string[], chainId: string): Promise<boolean>;
 export default isSharedSigner;

package/dist/src/utils/passkeys/isSharedSigner.js

@@ -1,22 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const extractPasskeyData_1 = require("./extractPasskeyData");
+const types_1 = require("../../utils/types");
 /**
  * Returns true if the passkey signer is a shared signer
- * @returns {Promise<string>} A promise that resolves to the signer's address.
+ * @returns {Promise<boolean>} A promise that resolves to the signer's address.
  */
 async function isSharedSigner(passkey, safeWebAuthnSharedSignerContract, safeAddress, owners, chainId) {
-    const sharedSignerContractAddress = await safeWebAuthnSharedSignerContract.getAddress();
+    const sharedSignerContractAddress = safeWebAuthnSharedSignerContract.contractAddress;
     // is a shared signer if the shared signer contract address is present in the owners and its configured in the Safe slot
     if (safeAddress && owners.includes(sharedSignerContractAddress)) {
         const [sharedSignerSlot] = await safeWebAuthnSharedSignerContract.getConfiguration([
-            safeAddress
+            (0, types_1.asHex)(safeAddress)
         ]);
         const { x, y, verifiers } = sharedSignerSlot;
-        const passkeyVerifierAddress = passkey.customVerifierAddress || (0, extractPasskeyData_1.getDefaultFCLP256VerifierAddress)(chainId.toString());
+        const verifierAddress = passkey.customVerifierAddress || (0, extractPasskeyData_1.getDefaultFCLP256VerifierAddress)(chainId);
         const isSharedSigner = BigInt(passkey.coordinates.x) === x &&
             BigInt(passkey.coordinates.y) === y &&
-            BigInt(passkeyVerifierAddress) === verifiers;
+            BigInt(verifierAddress) === verifiers;
         return isSharedSigner;
     }
     return false;

package/dist/src/utils/passkeys/isSharedSigner.js.map

@@ -1 +1 @@
-{"version":3,"file":"isSharedSigner.js","sourceRoot":"","sources":["../../../../src/utils/passkeys/isSharedSigner.ts"],"names":[],"mappings":";;AACA,6DAAuE;AAGvE;;;GAGG;AACH,KAAK,UAAU,cAAc,CAC3B,OAAuB,EACvB,gCAAoF,EACpF,WAAmB,EACnB,MAAgB,EAChB,OAAe;IAEf,MAAM,2BAA2B,GAAG,MAAM,gCAAgC,CAAC,UAAU,EAAE,CAAA;IAEvF,wHAAwH;IACxH,IAAI,WAAW,IAAI,MAAM,CAAC,QAAQ,CAAC,2BAA2B,CAAC,EAAE,CAAC;QAChE,MAAM,CAAC,gBAAgB,CAAC,GAAG,MAAM,gCAAgC,CAAC,gBAAgB,CAAC;YACjF,WAAW;SACZ,CAAC,CAAA;QAEF,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,GAAG,gBAAgB,CAAA;QAE5C,MAAM,sBAAsB,GAC1B,OAAO,CAAC,qBAAqB,IAAI,IAAA,qDAAgC,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;QAEvF,MAAM,cAAc,GAClB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC;YACnC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC;YACnC,MAAM,CAAC,sBAAsB,CAAC,KAAK,SAAS,CAAA;QAE9C,OAAO,cAAc,CAAA;IACvB,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC;AAED,kBAAe,cAAc,CAAA"}
+{"version":3,"file":"isSharedSigner.js","sourceRoot":"","sources":["../../../../src/utils/passkeys/isSharedSigner.ts"],"names":[],"mappings":";;AAIA,6DAAuE;AACvE,iEAA6D;AAE7D;;;GAGG;AACH,KAAK,UAAU,cAAc,CAC3B,OAAuB,EACvB,gCAAoF,EACpF,WAAmB,EACnB,MAAgB,EAChB,OAAe;IAEf,MAAM,2BAA2B,GAAG,gCAAgC,CAAC,eAAe,CAAA;IAEpF,wHAAwH;IACxH,IAAI,WAAW,IAAI,MAAM,CAAC,QAAQ,CAAC,2BAA2B,CAAC,EAAE,CAAC;QAChE,MAAM,CAAC,gBAAgB,CAAC,GAAG,MAAM,gCAAgC,CAAC,gBAAgB,CAAC;YACjF,IAAA,aAAK,EAAC,WAAW,CAAC;SACnB,CAAC,CAAA;QAEF,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,GAAG,gBAAgB,CAAA;QAE5C,MAAM,eAAe,GACnB,OAAO,CAAC,qBAAqB,IAAI,IAAA,qDAAgC,EAAC,OAAO,CAAC,CAAA;QAE5E,MAAM,cAAc,GAClB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC;YACnC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC;YACnC,MAAM,CAAC,eAAe,CAAC,KAAK,SAAS,CAAA;QAEvC,OAAO,cAAc,CAAA;IACvB,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC;AAED,kBAAe,cAAc,CAAA"}

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

@@ -0,0 +1,3 @@
+export declare const isEip1193Provider: (provider: any) => boolean;
+export declare const isPrivateKey: (signer?: any) => boolean;
+export declare const isSignerPasskeyClient: (signer?: any) => boolean;

package/dist/src/utils/provider.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isSignerPasskeyClient = exports.isPrivateKey = exports.isEip1193Provider = void 0;
+const viem_1 = require("viem");
+const passkeys_1 = require("./passkeys");
+const isEip1193Provider = (provider) => typeof provider !== 'string';
+exports.isEip1193Provider = isEip1193Provider;
+const isPrivateKey = (signer) => typeof signer === 'string' && !(0, viem_1.isAddress)(signer);
+exports.isPrivateKey = isPrivateKey;
+const isSignerPasskeyClient = (signer) => !!signer && signer.key === passkeys_1.PASSKEY_CLIENT_KEY;
+exports.isSignerPasskeyClient = isSignerPasskeyClient;
+//# sourceMappingURL=provider.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/utils/provider.ts"],"names":[],"mappings":";;;AAAA,+BAAgC;AAChC,yCAA+C;AAExC,MAAM,iBAAiB,GAAG,CAAC,QAAa,EAAW,EAAE,CAAC,OAAO,QAAQ,KAAK,QAAQ,CAAA;AAA5E,QAAA,iBAAiB,qBAA2D;AAClF,MAAM,YAAY,GAAG,CAAC,MAAY,EAAW,EAAE,CACpD,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,IAAA,gBAAS,EAAC,MAAM,CAAC,CAAA;AADrC,QAAA,YAAY,gBACyB;AAC3C,MAAM,qBAAqB,GAAG,CAAC,MAAY,EAAW,EAAE,CAC7D,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,GAAG,KAAK,6BAAkB,CAAA;AADlC,QAAA,qBAAqB,yBACa"}

package/dist/src/utils/safeVersions.js

@@ -36,7 +36,7 @@ const hasSafeFeature = (feature, version) => {
 };
 exports.hasSafeFeature = hasSafeFeature;
 async function isSafeContractCompatibleWithRequiredTxGas(safeContract) {
-    const safeVersion = await safeContract.getVersion();
+    const safeVersion = safeContract.safeVersion;
     if (!(0, exports.hasSafeFeature)(SAFE_FEATURES.REQUIRED_TXGAS, safeVersion)) {
         throw new Error('Current version of the Safe does not support the requiredTxGas functionality');
     }
@@ -44,7 +44,7 @@ async function isSafeContractCompatibleWithRequiredTxGas(safeContract) {
 }
 exports.isSafeContractCompatibleWithRequiredTxGas = isSafeContractCompatibleWithRequiredTxGas;
 async function isSafeContractCompatibleWithSimulateAndRevert(safeContract) {
-    const safeVersion = await safeContract.getVersion();
+    const safeVersion = safeContract.safeVersion;
     if (!(0, exports.hasSafeFeature)(SAFE_FEATURES.SIMULATE_AND_REVERT, safeVersion)) {
         throw new Error('Current version of the Safe does not support the simulateAndRevert functionality');
     }

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

@@ -1 +1 @@
-{"version":3,"file":"safeVersions.js","sourceRoot":"","sources":["../../../src/utils/safeVersions.ts"],"names":[],"mappings":";;;;;;AAAA,2EAAwD;AAQxD,IAAY,aAUX;AAVD,WAAY,aAAa;IACvB,8DAA6C,CAAA;IAC7C,kDAAiC,CAAA;IACjC,gEAA+C,CAAA;IAC/C,sCAAqB,CAAA;IACrB,4DAA2C,CAAA;IAC3C,kDAAiC,CAAA;IACjC,4DAA2C,CAAA;IAC3C,kDAAiC,CAAA;IACjC,wDAAuC,CAAA;AACzC,CAAC,EAVW,aAAa,6BAAb,aAAa,QAUxB;AAED,MAAM,wBAAwB,GAAkC;IAC9D,CAAC,aAAa,CAAC,oBAAoB,CAAC,EAAE,SAAS;IAC/C,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,SAAS;IACzC,CAAC,aAAa,CAAC,qBAAqB,CAAC,EAAE,SAAS;IAChD,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,SAAS;IACnC,CAAC,aAAa,CAAC,mBAAmB,CAAC,EAAE,SAAS;IAC9C,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,SAAS;IACzC,CAAC,aAAa,CAAC,mBAAmB,CAAC,EAAE,SAAS;IAC9C,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,SAAS;IACzC,CAAC,aAAa,CAAC,iBAAiB,CAAC,EAAE,SAAS;CAC7C,CAAA;AAEM,MAAM,cAAc,GAAG,CAAC,OAAsB,EAAE,OAAe,EAAW,EAAE;IACjF,IAAI,CAAC,CAAC,OAAO,IAAI,wBAAwB,CAAC,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAA;IACd,CAAC;IAED,OAAO,IAAA,mBAAe,EAAC,OAAO,EAAE,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAA;AACpE,CAAC,CAAA;AANY,QAAA,cAAc,kBAM1B;AAmBM,KAAK,UAAU,yCAAyC,CAC7D,YAA4C;IAE5C,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,CAAA;IAEnD,IAAI,CAAC,IAAA,sBAAc,EAAC,aAAa,CAAC,cAAc,EAAE,WAAW,CAAC,EAAE,CAAC;QAC/D,MAAM,IAAI,KAAK,CAAC,8EAA8E,CAAC,CAAA;IACjG,CAAC;IAED,OAAO,YAAuD,CAAA;AAChE,CAAC;AAVD,8FAUC;AAEM,KAAK,UAAU,6CAA6C,CACjE,YAA4C;IAE5C,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,CAAA;IAEnD,IAAI,CAAC,IAAA,sBAAc,EAAC,aAAa,CAAC,mBAAmB,EAAE,WAAW,CAAC,EAAE,CAAC;QACpE,MAAM,IAAI,KAAK,CACb,kFAAkF,CACnF,CAAA;IACH,CAAC;IAED,OAAO,YAA2D,CAAA;AACpE,CAAC;AAZD,sGAYC"}
+{"version":3,"file":"safeVersions.js","sourceRoot":"","sources":["../../../src/utils/safeVersions.ts"],"names":[],"mappings":";;;;;;AAAA,2EAAwD;AAQxD,IAAY,aAUX;AAVD,WAAY,aAAa;IACvB,8DAA6C,CAAA;IAC7C,kDAAiC,CAAA;IACjC,gEAA+C,CAAA;IAC/C,sCAAqB,CAAA;IACrB,4DAA2C,CAAA;IAC3C,kDAAiC,CAAA;IACjC,4DAA2C,CAAA;IAC3C,kDAAiC,CAAA;IACjC,wDAAuC,CAAA;AACzC,CAAC,EAVW,aAAa,6BAAb,aAAa,QAUxB;AAED,MAAM,wBAAwB,GAAkC;IAC9D,CAAC,aAAa,CAAC,oBAAoB,CAAC,EAAE,SAAS;IAC/C,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,SAAS;IACzC,CAAC,aAAa,CAAC,qBAAqB,CAAC,EAAE,SAAS;IAChD,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,SAAS;IACnC,CAAC,aAAa,CAAC,mBAAmB,CAAC,EAAE,SAAS;IAC9C,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,SAAS;IACzC,CAAC,aAAa,CAAC,mBAAmB,CAAC,EAAE,SAAS;IAC9C,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,SAAS;IACzC,CAAC,aAAa,CAAC,iBAAiB,CAAC,EAAE,SAAS;CAC7C,CAAA;AAEM,MAAM,cAAc,GAAG,CAAC,OAAsB,EAAE,OAAe,EAAW,EAAE;IACjF,IAAI,CAAC,CAAC,OAAO,IAAI,wBAAwB,CAAC,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAA;IACd,CAAC;IAED,OAAO,IAAA,mBAAe,EAAC,OAAO,EAAE,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAA;AACpE,CAAC,CAAA;AANY,QAAA,cAAc,kBAM1B;AAmBM,KAAK,UAAU,yCAAyC,CAC7D,YAA4C;IAE5C,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,CAAA;IAE5C,IAAI,CAAC,IAAA,sBAAc,EAAC,aAAa,CAAC,cAAc,EAAE,WAAW,CAAC,EAAE,CAAC;QAC/D,MAAM,IAAI,KAAK,CAAC,8EAA8E,CAAC,CAAA;IACjG,CAAC;IAED,OAAO,YAAuD,CAAA;AAChE,CAAC;AAVD,8FAUC;AAEM,KAAK,UAAU,6CAA6C,CACjE,YAA4C;IAE5C,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,CAAA;IAE5C,IAAI,CAAC,IAAA,sBAAc,EAAC,aAAa,CAAC,mBAAmB,EAAE,WAAW,CAAC,EAAE,CAAC;QACpE,MAAM,IAAI,KAAK,CACb,kFAAkF,CACnF,CAAA;IACH,CAAC;IAED,OAAO,YAA2D,CAAA;AACpE,CAAC;AAZD,sGAYC"}

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

@@ -1,4 +1,4 @@
-import { SafeSignature } from '@safe-global/safe-core-sdk-types';
+import { SafeSignature } from '@safe-global/types-kit';
 export declare class EthSafeSignature implements SafeSignature {
     signer: string;
     data: string;

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

@@ -1,11 +1,11 @@
 import SafeProvider from '../../SafeProvider';
-import { SafeSignature, SafeEIP712Args, SafeTransactionData } from '@safe-global/safe-core-sdk-types';
+import { SafeSignature, SafeEIP712Args, SafeTransactionData } from '@safe-global/types-kit';
 import { SigningMethod } from '../../types';
 export declare function generatePreValidatedSignature(ownerAddress: string): SafeSignature;
-export declare function isTxHashSignedWithPrefix(txHash: string, signature: string, ownerAddress: string): boolean;
+export declare function isTxHashSignedWithPrefix(txHash: string, signature: string, ownerAddress: string): Promise<boolean>;
 type AdjustVOverload = {
-    (signingMethod: SigningMethod.ETH_SIGN_TYPED_DATA, signature: string): string;
-    (signingMethod: SigningMethod.ETH_SIGN, signature: string, safeTxHash: string, sender: string): string;
+    (signingMethod: SigningMethod.ETH_SIGN_TYPED_DATA, signature: string): Promise<string>;
+    (signingMethod: SigningMethod.ETH_SIGN, signature: string, safeTxHash: string, sender: string): Promise<string>;
 };
 export declare const adjustVInSignature: AdjustVOverload;
 export declare function generateSignature(safeProvider: SafeProvider, hash: string): Promise<SafeSignature>;

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

@@ -4,13 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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 viem_1 = require("viem");
 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");
+const eip_712_2 = require("../eip-712");
+const encode_1 = require("../eip-712/encode");
+const types_2 = require("../types");
+const constants_1 = require("../constants");
 function generatePreValidatedSignature(ownerAddress) {
     const signature = '0x000000000000000000000000' +
         ownerAddress.slice(2) +
@@ -19,16 +22,13 @@ function generatePreValidatedSignature(ownerAddress) {
     return new SafeSignature_1.EthSafeSignature(ownerAddress, signature);
 }
 exports.generatePreValidatedSignature = generatePreValidatedSignature;
-function isTxHashSignedWithPrefix(txHash, signature, ownerAddress) {
+async function isTxHashSignedWithPrefix(txHash, signature, ownerAddress) {
     let hasPrefix;
     try {
-        const rsvSig = {
-            r: Buffer.from(signature.slice(2, 66), 'hex'),
-            s: Buffer.from(signature.slice(66, 130), 'hex'),
-            v: parseInt(signature.slice(130, 132), 16)
-        };
-        const recoveredData = (0, ethereumjs_util_1.ecrecover)(Buffer.from(txHash.slice(2), 'hex'), rsvSig.v, rsvSig.r, rsvSig.s);
-        const recoveredAddress = (0, ethereumjs_util_1.bufferToHex)((0, ethereumjs_util_1.pubToAddress)(recoveredData));
+        const recoveredAddress = await (0, viem_1.recoverAddress)({
+            hash: (0, types_2.asHash)(txHash),
+            signature: (0, types_2.asHex)(signature)
+        });
         hasPrefix = !(0, address_1.sameString)(recoveredAddress, ownerAddress);
     }
     catch (e) {
@@ -37,7 +37,7 @@ function isTxHashSignedWithPrefix(txHash, signature, ownerAddress) {
     return hasPrefix;
 }
 exports.isTxHashSignedWithPrefix = isTxHashSignedWithPrefix;
-const adjustVInSignature = (signingMethod, signature, safeTxHash, signerAddress) => {
+const adjustVInSignature = async (signingMethod, signature, safeTxHash, signerAddress) => {
     const ETHEREUM_V_VALUES = [0, 1, 27, 28];
     const MIN_VALID_V_VALUE_FOR_SAFE_ECDSA = 27;
     let signatureV = parseInt(signature.slice(-2), 16);
@@ -60,7 +60,7 @@ const adjustVInSignature = (signingMethod, signature, safeTxHash, signerAddress)
             signatureV += MIN_VALID_V_VALUE_FOR_SAFE_ECDSA;
         }
         const adjustedSignature = signature.slice(0, -2) + signatureV.toString(16);
-        const signatureHasPrefix = isTxHashSignedWithPrefix(safeTxHash, adjustedSignature, signerAddress);
+        const signatureHasPrefix = await isTxHashSignedWithPrefix(safeTxHash, adjustedSignature, signerAddress);
         if (signatureHasPrefix) {
             signatureV += 4;
         }
@@ -81,7 +81,7 @@ async function generateSignature(safeProvider, hash) {
         throw new Error('SafeProvider must be initialized with a signer to use this method');
     }
     let signature = await safeProvider.signMessage(hash);
-    signature = (0, exports.adjustVInSignature)(types_1.SigningMethod.ETH_SIGN, signature, hash, signerAddress);
+    signature = await (0, exports.adjustVInSignature)(types_1.SigningMethod.ETH_SIGN, signature, hash, signerAddress);
     return new SafeSignature_1.EthSafeSignature(signerAddress, signature);
 }
 exports.generateSignature = generateSignature;
@@ -92,7 +92,7 @@ async function generateEIP712Signature(safeProvider, safeEIP712Args, methodVersi
     }
     //@ts-expect-error: Evaluate removal of methodVersion and use v4
     let signature = await safeProvider.signTypedData(safeEIP712Args, methodVersion);
-    signature = (0, exports.adjustVInSignature)(types_1.SigningMethod.ETH_SIGN_TYPED_DATA, signature);
+    signature = await (0, exports.adjustVInSignature)(types_1.SigningMethod.ETH_SIGN_TYPED_DATA, signature);
     return new SafeSignature_1.EthSafeSignature(signerAddress, signature);
 }
 exports.generateEIP712Signature = generateEIP712Signature;
@@ -104,7 +104,7 @@ 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 signatureBytes = constants_1.EMPTY_DATA;
     let dynamicBytes = '';
     for (const signature of signatures) {
         if (signature.isContractSignature) {
@@ -134,12 +134,21 @@ const buildSignatureBytes = (signatures) => {
 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);
+    const message = safeTx;
+    return (0, encode_1.encodeTypedData)({
+        domain: { verifyingContract: safeAddress, chainId: Number(chainId) },
+        types: { SafeTx: safeTxTypes.SafeTx },
+        message
+    });
 };
 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 });
+    return (0, encode_1.encodeTypedData)({
+        domain: { verifyingContract: safeAddress, chainId: Number(chainId) },
+        types: { SafeMessage: safeMessageTypes.SafeMessage },
+        message: { message }
+    });
 };
 exports.preimageSafeMessageHash = preimageSafeMessageHash;
 const EQ_OR_GT_1_3_0 = '>=1.3.0';
@@ -147,14 +156,19 @@ 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;
+        domain.chainId = Number(chainId);
     }
-    return ethers_1.ethers.TypedDataEncoder.hash(domain, { SafeTx: safeTxTypes.SafeTx }, safeTx);
+    const message = safeTx;
+    return (0, eip_712_2.hashTypedData)({ domain, types: { SafeTx: safeTxTypes.SafeTx }, message });
 };
 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 });
+    return (0, eip_712_2.hashTypedData)({
+        domain: { verifyingContract: safeAddress, chainId: Number(chainId) },
+        types: { SafeMessage: safeMessageTypes.SafeMessage },
+        message: { message }
+    });
 };
 exports.calculateSafeMessageHash = calculateSafeMessageHash;
 //# sourceMappingURL=utils.js.map