@safe-global/protocol-kit 4.1.1 → 5.0.1

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

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

@@ -1,4 +1,4 @@
-import { SafeSignature, SafeTransaction, SafeTransactionData } from '@safe-global/safe-core-sdk-types';
+import { SafeSignature, SafeTransaction, SafeTransactionData } from '@safe-global/types-kit';
 declare class EthSafeTransaction implements SafeTransaction {
     data: SafeTransactionData;
     signatures: Map<string, SafeSignature>;

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

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

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

@@ -1,4 +1,4 @@
-import { OperationType, SafeVersion, SafeTransaction } from '@safe-global/safe-core-sdk-types';
+import { OperationType, SafeVersion, SafeTransaction } from '@safe-global/types-kit';
 import Safe from '../../Safe';
 import SafeProvider from '../../SafeProvider';
 import { ContractNetworksConfig, SafeContractImplementationType } from '../../types';

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

@@ -4,11 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.estimateSafeDeploymentGas = exports.estimateSafeTxGas = exports.estimateTxBaseGas = exports.estimateTxGas = exports.estimateGas = void 0;
-const safe_core_sdk_types_1 = require("@safe-global/safe-core-sdk-types");
+const viem_1 = require("viem");
+const types_kit_1 = require("@safe-global/types-kit");
 const satisfies_1 = __importDefault(require("semver/functions/satisfies"));
 const constants_1 = require("../constants");
 const safeDeploymentContracts_1 = require("../../contracts/safeDeploymentContracts");
 const safeVersions_1 = require("../safeVersions");
+const types_1 = require("../types");
 // Every byte == 00 -> 4  Gas cost
 const CALL_DATA_ZERO_BYTE_GAS_COST = 4;
 // Every byte != 00 -> 16 Gas cost (68 before Istanbul)
@@ -50,12 +52,12 @@ async function estimateGas(safeVersion, safeContract, safeProvider, to, valueInW
     const transactionDataToEstimate = simulateTxAccessorContract.encode('simulate', [
         to,
         BigInt(valueInWei),
-        data,
+        (0, types_1.asHex)(data),
         operation
     ]);
     const safeContractContractCompatibleWithSimulateAndRevert = await (0, safeVersions_1.isSafeContractCompatibleWithSimulateAndRevert)(safeContract);
-    const safeFunctionToEstimate = safeContractContractCompatibleWithSimulateAndRevert.encode('simulateAndRevert', [await simulateTxAccessorContract.getAddress(), transactionDataToEstimate]);
-    const safeAddress = await safeContract.getAddress();
+    const safeFunctionToEstimate = safeContractContractCompatibleWithSimulateAndRevert.encode('simulateAndRevert', [simulateTxAccessorContract.getAddress(), (0, types_1.asHex)(transactionDataToEstimate)]);
+    const safeAddress = safeContract.getAddress();
     const transactionToEstimateGas = {
         to: safeAddress,
         value: '0',
@@ -72,46 +74,7 @@ async function estimateGas(safeVersion, safeContract, safeProvider, to, valueInW
 }
 exports.estimateGas = estimateGas;
 async function estimateTxGas(safeContract, safeProvider, to, valueInWei, data, operation) {
-    let txGasEstimation = 0;
-    const safeAddress = await safeContract.getAddress();
-    const safeContractCompatibleWithRequiredTxGas = await (0, safeVersions_1.isSafeContractCompatibleWithRequiredTxGas)(safeContract);
-    const estimateData = safeContractCompatibleWithRequiredTxGas.encode('requiredTxGas', [
-        to,
-        BigInt(valueInWei),
-        data,
-        operation
-    ]);
-    try {
-        const estimateResponse = await safeProvider.estimateGas({
-            to: safeAddress,
-            from: safeAddress,
-            data: estimateData
-        });
-        txGasEstimation = Number('0x' + estimateResponse.substring(138)) + 10000;
-    }
-    catch (error) { }
-    if (txGasEstimation > 0) {
-        const dataGasEstimation = estimateDataGasCosts(estimateData);
-        let additionalGas = 10000;
-        for (let i = 0; i < 10; i++) {
-            try {
-                const estimateResponse = await safeProvider.call({
-                    to: safeAddress,
-                    from: safeAddress,
-                    data: estimateData,
-                    gasPrice: '0',
-                    gasLimit: (txGasEstimation + dataGasEstimation + additionalGas).toString()
-                });
-                if (estimateResponse !== '0x') {
-                    break;
-                }
-            }
-            catch (error) { }
-            txGasEstimation = txGasEstimation + additionalGas;
-            additionalGas *= 2;
-        }
-        return (txGasEstimation + additionalGas).toString();
-    }
+    const safeAddress = safeContract.getAddress();
     try {
         const estimateGas = await safeProvider.estimateGas({
             to,
@@ -122,7 +85,7 @@ async function estimateTxGas(safeContract, safeProvider, to, valueInWei, data, o
         return estimateGas;
     }
     catch (error) {
-        if (operation === safe_core_sdk_types_1.OperationType.DelegateCall) {
+        if (operation === types_kit_1.OperationType.DelegateCall) {
             return '0';
         }
         return Promise.reject(error);
@@ -158,7 +121,7 @@ async function estimateTxBaseGas(safe, safeTransaction) {
     const encodeGasToken = gasToken || constants_1.ZERO_ADDRESS;
     const encodeRefundReceiver = refundReceiver || constants_1.ZERO_ADDRESS;
     const signatures = '0x';
-    const safeVersion = await safe.getContractVersion();
+    const safeVersion = safe.getContractVersion();
     const safeProvider = safe.getSafeProvider();
     const isL1SafeSingleton = safe.getContractManager().isL1SafeSingleton;
     const chainId = await safe.getChainId();
@@ -214,7 +177,7 @@ exports.estimateTxBaseGas = estimateTxBaseGas;
  *
  */
 async function estimateSafeTxGas(safe, safeTransaction) {
-    const safeVersion = await safe.getContractVersion();
+    const safeVersion = safe.getContractVersion();
     if ((0, satisfies_1.default)(safeVersion, '>=1.3.0')) {
         const safeTxGas = await estimateSafeTxGasWithSimulate(safe, safeTransaction);
         return addExtraGasForSafety(safeTxGas);
@@ -250,7 +213,7 @@ function addExtraGasForSafety(safeTxGas) {
 async function estimateSafeTxGasWithRequiredTxGas(safe, safeTransaction) {
     const isSafeDeployed = await safe.isSafeDeployed();
     const safeAddress = await safe.getAddress();
-    const safeVersion = await safe.getContractVersion();
+    const safeVersion = safe.getContractVersion();
     const safeProvider = safe.getSafeProvider();
     const isL1SafeSingleton = safe.getContractManager().isL1SafeSingleton;
     const chainId = await safe.getChainId();
@@ -265,10 +228,10 @@ async function estimateSafeTxGasWithRequiredTxGas(safe, safeTransaction) {
     const transactionDataToEstimate = safeContractCompatibleWithRequiredTxGas.encode('requiredTxGas', [
         safeTransaction.data.to,
         BigInt(safeTransaction.data.value),
-        safeTransaction.data.data,
+        (0, types_1.asHex)(safeTransaction.data.data),
         safeTransaction.data.operation
     ]);
-    const to = isSafeDeployed ? safeAddress : await safeSingletonContract.getAddress();
+    const to = isSafeDeployed ? safeAddress : safeSingletonContract.getAddress();
     const transactionToEstimateGas = {
         to,
         value: '0',
@@ -308,6 +271,15 @@ function decodeSafeTxGas(encodedDataResponse) {
     const data = '0x' + encodedSafeTxGas;
     return Number('0x' + data.slice(184).slice(0, 10)).toString();
 }
+function isEthersError(error) {
+    return error.data != null;
+}
+function isViemError(error) {
+    return error instanceof viem_1.BaseError;
+}
+function isGnosisChainEstimationError(error) {
+    return error.info.error.data != null;
+}
 /**
  * Parses the SafeTxGas estimation response from different providers.
  * It extracts and decodes the SafeTxGas value from the Error object.
@@ -318,26 +290,27 @@ function decodeSafeTxGas(encodedDataResponse) {
  */
 function parseSafeTxGasErrorResponse(error) {
     // Ethers v6
-    const ethersData = error?.data;
-    if (ethersData) {
-        return decodeSafeTxGas(ethersData);
+    if (isEthersError(error)) {
+        return decodeSafeTxGas(error.data);
     }
     // viem
-    const viemError = error?.info?.error?.message;
-    if (viemError) {
-        return decodeSafeTxGas(viemError);
+    if (isViemError(error)) {
+        const cause = error.walk();
+        if (typeof cause?.data === 'string') {
+            return decodeSafeTxGas(cause?.data);
+        }
     }
     // gnosis-chain
-    const gnosisChainProviderData = error?.info?.error?.data;
-    if (gnosisChainProviderData) {
+    if (isGnosisChainEstimationError(error)) {
+        const gnosisChainProviderData = error.info.error.data;
         const isString = typeof gnosisChainProviderData === 'string';
         const encodedDataResponse = isString ? gnosisChainProviderData : gnosisChainProviderData.data;
         return decodeSafeTxGas(encodedDataResponse);
     }
     // Error message
-    const isEncodedDataPresent = error?.message?.includes('0x');
+    const isEncodedDataPresent = error.message.includes('0x');
     if (isEncodedDataPresent) {
-        return decodeSafeTxGas(error?.message);
+        return decodeSafeTxGas(error.message);
     }
     throw new Error('Could not parse SafeTxGas from Estimation response, Details: ' + error?.message);
 }
@@ -355,7 +328,7 @@ function parseSafeTxGasErrorResponse(error) {
 async function estimateSafeTxGasWithSimulate(safe, safeTransaction) {
     const isSafeDeployed = await safe.isSafeDeployed();
     const safeAddress = await safe.getAddress();
-    const safeVersion = await safe.getContractVersion();
+    const safeVersion = safe.getContractVersion();
     const safeProvider = safe.getSafeProvider();
     const chainId = await safe.getChainId();
     const customContracts = safe.getContractManager().contractNetworks?.[chainId.toString()];
@@ -375,13 +348,13 @@ async function estimateSafeTxGasWithSimulate(safe, safeTransaction) {
     const transactionDataToEstimate = simulateTxAccessorContract.encode('simulate', [
         safeTransaction.data.to,
         BigInt(safeTransaction.data.value),
-        safeTransaction.data.data,
+        (0, types_1.asHex)(safeTransaction.data.data),
         safeTransaction.data.operation
     ]);
     // if the Safe is not deployed we can use the singleton address to simulate
-    const to = isSafeDeployed ? safeAddress : await safeSingletonContract.getAddress();
+    const to = isSafeDeployed ? safeAddress : safeSingletonContract.getAddress();
     const SafeContractCompatibleWithSimulateAndRevert = await (0, safeVersions_1.isSafeContractCompatibleWithSimulateAndRevert)(safeSingletonContract);
-    const safeFunctionToEstimate = SafeContractCompatibleWithSimulateAndRevert.encode('simulateAndRevert', [await simulateTxAccessorContract.getAddress(), transactionDataToEstimate]);
+    const safeFunctionToEstimate = SafeContractCompatibleWithSimulateAndRevert.encode('simulateAndRevert', [simulateTxAccessorContract.getAddress(), (0, types_1.asHex)(transactionDataToEstimate)]);
     const transactionToEstimateGas = {
         to,
         value: '0',

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

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