@fhevm/sdk 1.1.0-alpha.6 → 1.1.0-alpha.8

package/_cjs/core/kms/KmsSigncryptedShares-p.js

@@ -12,13 +12,28 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _KmsSigncryptedSharesImpl_metadata, _KmsSigncryptedSharesImpl_shares;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.verifyKmsSigncryptedShare = verifyKmsSigncryptedShare;
 exports.createKmsSigncryptedShares = createKmsSigncryptedShares;
 exports.getShares = getShares;
 exports.getMetadata = getMetadata;
 const KmsSignersContext_p_js_1 = require("../host-contracts/KmsSignersContext-p.js");
 const string_js_1 = require("../base/string.js");
-const kmsExtraData_js_1 = require("./kmsExtraData.js");
 const readKmsSignersContext_p_js_1 = require("../host-contracts/readKmsSignersContext-p.js");
+const recoverSigners_js_1 = require("../utils-p/runtime/recoverSigners.js");
+const kmsUserDecryptResponseEip712Types = {
+    EIP712Domain: [
+        { name: 'name', type: 'string' },
+        { name: 'version', type: 'string' },
+        { name: 'chainId', type: 'uint256' },
+        { name: 'verifyingContract', type: 'address' },
+    ],
+    UserDecryptResponseVerification: [
+        { name: 'publicKey', type: 'bytes' },
+        { name: 'ctHandles', type: 'bytes32[]' },
+        { name: 'userDecryptedShare', type: 'bytes' },
+        { name: 'extraData', type: 'bytes' },
+    ],
+};
 const PRIVATE_KMS_SIGNCRYPTED_SHARES_TOKEN = Symbol('KmsSigncryptedShares.token');
 const GET_METADATA_FUNC = Symbol('KmsSigncryptedShares.getMetadata');
 const GET_SHARES_FUNC = Symbol('KmsSigncryptedShares.getShares');
@@ -73,15 +88,36 @@ function assertUniformExtraData(shares) {
     }
     return firstExtraData;
 }
+async function verifyKmsSigncryptedShare(context, parameters) {
+    const { share, metadata, transportPublicKey } = parameters;
+    const message = {
+        publicKey: transportPublicKey,
+        ctHandles: metadata.handles.map((h) => h.bytes32Hex),
+        userDecryptedShare: (0, string_js_1.ensure0x)(share.payload),
+        extraData: share.extraData === '' || share.extraData === '00' ? '0x' : (0, string_js_1.ensure0x)(share.extraData),
+    };
+    const [recoveredAddress] = await (0, recoverSigners_js_1.recoverSigners)(context, {
+        domain: metadata.eip712Domain,
+        types: kmsUserDecryptResponseEip712Types,
+        primaryType: 'UserDecryptResponseVerification',
+        signatures: [(0, string_js_1.ensure0x)(share.signature)],
+        message,
+    });
+    if (recoveredAddress === undefined) {
+        throw new Error('Failed to recover signer from KMS signcrypted share signature.');
+    }
+    if (!metadata.kmsSignersContext.has(recoveredAddress)) {
+        throw new Error(`KMS signcrypted share signature was not signed by a known KMS signer (recovered ${recoveredAddress}).`);
+    }
+}
 async function createKmsSigncryptedShares(context, parameters) {
     const { metadata, shares } = parameters;
     (0, KmsSignersContext_p_js_1.assertIsKmsSignersContext)(metadata.kmsSignersContext, {});
-    const relayerExtraData = (0, string_js_1.ensure0x)(assertUniformExtraData(shares));
-    (0, kmsExtraData_js_1.assertIsKmsExtraData)(relayerExtraData, {});
+    const relayerKmsExtraDataBytesHex = (0, string_js_1.ensure0x)(assertUniformExtraData(shares));
     const reconciledKmsSignersContext = await (0, readKmsSignersContext_p_js_1.reconcileKmsSignersContext)(context, {
         kmsVerifierAddress: context.chain.fhevm.contracts.kmsVerifier.address,
         protocolConfigAddress: context.chain.fhevm.contracts.protocolConfig?.address,
-        relayerExtraData,
+        relayerKmsExtraDataBytesHex,
         requestedKmsSignersContext: metadata.kmsSignersContext,
         mode: 'loose',
     });

package/_cjs/core/kms/KmsSigncryptedShares-p.js.map

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

package/_cjs/core/kms/PublicDecryptionProof-p.js

@@ -19,6 +19,7 @@ const ClearValue_js_1 = require("../handle/ClearValue.js");
 const FheType_js_1 = require("../handle/FheType.js");
 const KmsSignersContext_p_js_1 = require("../host-contracts/KmsSignersContext-p.js");
 const verifyKmsPublicDecryptEip712_p_js_1 = require("./verifyKmsPublicDecryptEip712-p.js");
+const kmsExtraData_p_js_1 = require("./kmsExtraData-p.js");
 const PRIVATE_TOKEN = Symbol('PublicDecryptionProof.token');
 class PublicDecryptionProofImpl {
     constructor(privateToken, parameters) {
@@ -56,18 +57,18 @@ Object.freeze(PublicDecryptionProofImpl);
 Object.freeze(PublicDecryptionProofImpl.prototype);
 async function createPublicDecryptionProof(context, parameters) {
     await (0, verifyKmsPublicDecryptEip712_p_js_1.verifyKmsPublicDecryptEip712)(context, parameters);
-    const { orderedHandles: orderedEncryptedValues, orderedAbiEncodedClearValues, kmsPublicDecryptEIP712Signatures, kmsSignersContext, originToken, } = parameters;
+    const { orderedHandles: orderedEncryptedValues, orderedAbiEncodedClearValues, kmsPublicDecryptEip712Signatures, kmsSignersContext, originToken, } = parameters;
     const extraData = (0, KmsSignersContext_p_js_1.kmsSignersContextToExtraData)(kmsSignersContext);
-    const signedExtraData = extraData === '0x00' ? '0x' : extraData;
+    const signedExtraDataBytesHex = extraData.version === kmsExtraData_p_js_1.EXTRA_DATA_V0 ? '0x' : extraData.toBytesHex();
     const packedNumSigners = context.runtime.ethereum.encodePacked({
         types: ['uint8'],
-        values: [kmsPublicDecryptEIP712Signatures.length],
+        values: [kmsPublicDecryptEip712Signatures.length],
     });
     const packedSignatures = context.runtime.ethereum.encodePacked({
-        types: Array(kmsPublicDecryptEIP712Signatures.length).fill('bytes'),
-        values: kmsPublicDecryptEIP712Signatures,
+        types: Array(kmsPublicDecryptEip712Signatures.length).fill('bytes'),
+        values: kmsPublicDecryptEip712Signatures,
     });
-    const decryptionProof = (0, bytes_js_1.concatBytesHex)([packedNumSigners, packedSignatures, signedExtraData]);
+    const decryptionProof = (0, bytes_js_1.concatBytesHex)([packedNumSigners, packedSignatures, signedExtraDataBytesHex]);
     const orderedAbiTypes = orderedEncryptedValues.map((h) => h.solidityPrimitiveTypeName);
     const decoded = context.runtime.ethereum.decode({
         types: orderedAbiTypes,
@@ -89,7 +90,7 @@ async function createPublicDecryptionProof(context, parameters) {
         decryptionProof: decryptionProof,
         orderedClearValues: orderedDecryptedFhevmHandles,
         orderedAbiEncodedClearValues: orderedAbiEncodedDecryptedFhevmHandles.abiEncodedClearValues,
-        extraData: signedExtraData,
+        extraData: signedExtraDataBytesHex,
     });
 }
 //# sourceMappingURL=PublicDecryptionProof-p.js.map

package/_cjs/core/kms/PublicDecryptionProof-p.js.map

@@ -1 +1 @@
-{"version":3,"file":"PublicDecryptionProof-p.js","sourceRoot":"","sources":["../../../core/kms/PublicDecryptionProof-p.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAoGA,kEAgFC;AA5KD,+CAAkD;AAClD,2DAAsF;AACtF,qDAAwD;AACxD,qFAAwF;AACxF,2FAAmF;AAInF,MAAM,aAAa,GAAG,MAAM,CAAC,6BAA6B,CAAC,CAAC;AAS5D,MAAa,yBAAyB;IAQpC,YACE,YAAoB,EACpB,UAKC;QAbM,6DAA2B;QAC3B,gEAAuD;QACvD,0EAAwC;QAExC,uDAAqB;QAW5B,IAAI,YAAY,KAAK,aAAa,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,UAAU,CAAC,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/C,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;QAC7E,CAAC;QACD,uBAAA,IAAI,8CAAoB,UAAU,CAAC,eAAe,MAAA,CAAC;QACnD,uBAAA,IAAI,iDAAuB,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,CAAC,kBAAkB,CAAC,CAAsC,MAAA,CAAC;QAClH,uBAAA,IAAI,wCAAc,UAAU,CAAC,SAAS,MAAA,CAAC;QACvC,uBAAA,IAAI,2DAAiC,UAAU,CAAC,4BAA4B,MAAA,CAAC;IAC/E,CAAC;IAMD,IAAW,eAAe;QACxB,OAAO,uBAAA,IAAI,kDAAiB,CAAC;IAC/B,CAAC;IAED,IAAW,kBAAkB;QAC3B,OAAO,uBAAA,IAAI,qDAAoB,CAAC;IAClC,CAAC;IAED,IAAW,4BAA4B;QACrC,OAAO,uBAAA,IAAI,+DAA8B,CAAC;IAC5C,CAAC;IAED,IAAW,SAAS;QAClB,OAAO,uBAAA,IAAI,4CAAW,CAAC;IACzB,CAAC;CACF;AAhDD,8DAgDC;;AAED,MAAM,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC;AACzC,MAAM,CAAC,MAAM,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;AAwB5C,KAAK,UAAU,2BAA2B,CAC/C,OAAgB,EAChB,UAAsB;IAGtB,MAAM,IAAA,gEAA4B,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAExD,MAAM,EACJ,cAAc,EAAE,sBAAsB,EACtC,4BAA4B,EAC5B,gCAAgC,EAChC,iBAAiB,EACjB,WAAW,GACZ,GAAG,UAAU,CAAC;IAMf,MAAM,SAAS,GAAG,IAAA,qDAA4B,EAAC,iBAAiB,CAAC,CAAC;IAQlE,MAAM,eAAe,GAAG,SAAS,KAAM,MAAmB,CAAC,CAAC,CAAE,IAAiB,CAAC,CAAC,CAAC,SAAS,CAAC;IAM5F,MAAM,gBAAgB,GAAa,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;QACvE,KAAK,EAAE,CAAC,OAAO,CAAC;QAChB,MAAM,EAAE,CAAC,gCAAgC,CAAC,MAAM,CAAC;KAClD,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;QAC7D,KAAK,EAAE,KAAK,CAAC,gCAAgC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,CAAa;QAC/E,MAAM,EAAE,gCAAgC;KACzC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAa,IAAA,yBAAc,EAAC,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,eAAe,CAAC,CAAC,CAAC;IAMxG,MAAM,eAAe,GAAgC,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC;IAEpH,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC9C,KAAK,EAAE,eAAe;QACtB,WAAW,EAAE,4BAA4B;KAC1C,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,MAAM,KAAK,sBAAsB,CAAC,MAAM,EAAE,CAAC;QACrD,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,aAAa,GAAqB,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAC9E,IAAA,6BAAgB,EAAC,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAC5C,CAAC;IAEF,MAAM,4BAA4B,GAAG,IAAA,qCAAqB,EAAC;QACzD,cAAc,EAAE,sBAAsB;QACtC,aAAa;QACb,WAAW;KACZ,CAAC,CAAC;IAEH,MAAM,sCAAsC,GAAG,IAAA,oCAAoB,EAAC,OAAO,EAAE;QAC3E,kBAAkB,EAAE,4BAA4B;KACjD,CAAC,CAAC;IAEH,OAAO,IAAI,yBAAyB,CAAC,aAAa,EAAE;QAClD,eAAe,EAAE,eAAe;QAChC,kBAAkB,EAAE,4BAA4B;QAChD,4BAA4B,EAAE,sCAAsC,CAAC,qBAAqB;QAC1F,SAAS,EAAE,eAAe;KAC3B,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"PublicDecryptionProof-p.js","sourceRoot":"","sources":["../../../core/kms/PublicDecryptionProof-p.ts"],"names":[],"mappings":"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"}

package/_cjs/core/kms/SignedDecryptionPermit-p.js

@@ -1,119 +1,39 @@
 "use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SignedDecryptionPermitBaseImpl_eip712, _SignedDecryptionPermitBaseImpl_signature, _SignedDecryptionPermitBaseImpl_signerAddress;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serializeSignedDecryptionPermitToJSON = serializeSignedDecryptionPermitToJSON;
 exports.isSignedDecryptionPermit = isSignedDecryptionPermit;
 exports.assertIsSignedDecryptionPermit = assertIsSignedDecryptionPermit;
-exports.assertPermitIncludesContractAddresses = assertPermitIncludesContractAddresses;
 exports.signDecryptionPermit = signDecryptionPermit;
 exports.parseSignedDecryptionPermit = parseSignedDecryptionPermit;
-const verifyKmsUserDecryptEip712_js_1 = require("../utils-p/decrypt/verifyKmsUserDecryptEip712.js");
-const verifyKmsDelegatedUserDecryptEip712_js_1 = require("../utils-p/decrypt/verifyKmsDelegatedUserDecryptEip712.js");
-const record_js_1 = require("../base/record.js");
-const bytes_js_1 = require("../base/bytes.js");
 const InvalidTypeError_js_1 = require("../base/errors/InvalidTypeError.js");
-const address_js_1 = require("../base/address.js");
-const createKmsUserDecryptEip712_js_1 = require("./createKmsUserDecryptEip712.js");
-const createKmsDelegatedUserDecryptEip712_js_1 = require("./createKmsDelegatedUserDecryptEip712.js");
-const string_js_1 = require("../base/string.js");
-const TransportKeyPair_p_js_1 = require("./TransportKeyPair-p.js");
-const utils_js_1 = require("./utils.js");
-const readKmsSignersContext_p_js_1 = require("../host-contracts/readKmsSignersContext-p.js");
-const KmsSignersContext_p_js_1 = require("../host-contracts/KmsSignersContext-p.js");
-const kmsExtraData_js_1 = require("./kmsExtraData.js");
-const PRIVATE_TOKEN = Symbol('SignedDecryptionPermit.token');
-const MAX_USER_DECRYPT_DURATION_DAYS = 365;
-const MAX_USER_DECRYPT_CONTRACT_ADDRESSES = 10;
-class SignedDecryptionPermitBaseImpl {
-    constructor(privateToken, parameters) {
-        _SignedDecryptionPermitBaseImpl_eip712.set(this, void 0);
-        _SignedDecryptionPermitBaseImpl_signature.set(this, void 0);
-        _SignedDecryptionPermitBaseImpl_signerAddress.set(this, void 0);
-        if (privateToken !== PRIVATE_TOKEN) {
-            throw new Error('Unauthorized');
-        }
-        __classPrivateFieldSet(this, _SignedDecryptionPermitBaseImpl_eip712, parameters.eip712, "f");
-        __classPrivateFieldSet(this, _SignedDecryptionPermitBaseImpl_signature, parameters.signature, "f");
-        __classPrivateFieldSet(this, _SignedDecryptionPermitBaseImpl_signerAddress, parameters.signerAddress, "f");
-    }
-    get eip712() {
-        return __classPrivateFieldGet(this, _SignedDecryptionPermitBaseImpl_eip712, "f");
-    }
-    get signature() {
-        return __classPrivateFieldGet(this, _SignedDecryptionPermitBaseImpl_signature, "f");
-    }
-    get signerAddress() {
-        return __classPrivateFieldGet(this, _SignedDecryptionPermitBaseImpl_signerAddress, "f");
-    }
-    assertNotExpired() {
-        (0, utils_js_1.assertKmsEIP712DeadlineValidity)(__classPrivateFieldGet(this, _SignedDecryptionPermitBaseImpl_eip712, "f").message, MAX_USER_DECRYPT_DURATION_DAYS);
-    }
-    assertMatchesKmsContext(kmsSignersContext) {
-        const expectedExtraData = (0, KmsSignersContext_p_js_1.kmsSignersContextToExtraData)(kmsSignersContext);
-        if (expectedExtraData !== __classPrivateFieldGet(this, _SignedDecryptionPermitBaseImpl_eip712, "f").message.extraData) {
-            throw new Error(`Invalid permit: extraData "${__classPrivateFieldGet(this, _SignedDecryptionPermitBaseImpl_eip712, "f").message.extraData}" does not match expected "${expectedExtraData}" from KmsSignersContext.`);
-        }
-    }
-    get transportPublicKey() {
-        return __classPrivateFieldGet(this, _SignedDecryptionPermitBaseImpl_eip712, "f").message.publicKey;
-    }
-    get kmsContextId() {
-        return (0, kmsExtraData_js_1.fromKmsExtraData)(__classPrivateFieldGet(this, _SignedDecryptionPermitBaseImpl_eip712, "f").message.extraData).kmsContextId;
-    }
-    get kmsEpochId() {
-        return (0, kmsExtraData_js_1.fromKmsExtraData)(__classPrivateFieldGet(this, _SignedDecryptionPermitBaseImpl_eip712, "f").message.extraData).kmsEpochId;
-    }
-}
-_SignedDecryptionPermitBaseImpl_eip712 = new WeakMap(), _SignedDecryptionPermitBaseImpl_signature = new WeakMap(), _SignedDecryptionPermitBaseImpl_signerAddress = new WeakMap();
+const CoreFhevm_p_js_1 = require("../runtime/CoreFhevm-p.js");
+const semver_js_1 = require("../base/semver.js");
+const SignedDecryptionPermitV1_p_js_1 = require("./SignedDecryptionPermitV1-p.js");
+const SignedDecryptionPermitV2_p_js_1 = require("./SignedDecryptionPermitV2-p.js");
+const uint_js_1 = require("../base/uint.js");
 function serializeSignedDecryptionPermitToJSON(permit) {
     assertIsSignedDecryptionPermit(permit, {});
+    const version = permit.version;
+    if (version !== 1 && version !== 2) {
+        throw new Error(`Unsupported permit version: ${version}. Supported versions are 1 and 2.`);
+    }
+    if (permit.version === 1) {
+        return {
+            version: 1,
+            eip712: permit.eip712,
+            signature: permit.signature,
+            signerAddress: permit.signerAddress,
+        };
+    }
     return {
+        version: 2,
         eip712: permit.eip712,
         signature: permit.signature,
         signerAddress: permit.signerAddress,
     };
 }
-class SignedSelfDecryptionPermitImpl extends SignedDecryptionPermitBaseImpl {
-    get eip712() {
-        return super.eip712;
-    }
-    get encryptedDataOwnerAddress() {
-        return this.signerAddress;
-    }
-    get isDelegated() {
-        return false;
-    }
-}
-class SignedDelegatedDecryptionPermitImpl extends SignedDecryptionPermitBaseImpl {
-    get eip712() {
-        return super.eip712;
-    }
-    get encryptedDataOwnerAddress() {
-        return this.eip712.message.delegatorAddress;
-    }
-    get isDelegated() {
-        return true;
-    }
-}
-Object.freeze(SignedDecryptionPermitBaseImpl);
-Object.freeze(SignedDecryptionPermitBaseImpl.prototype);
-Object.freeze(SignedSelfDecryptionPermitImpl);
-Object.freeze(SignedSelfDecryptionPermitImpl.prototype);
-Object.freeze(SignedDelegatedDecryptionPermitImpl);
-Object.freeze(SignedDelegatedDecryptionPermitImpl.prototype);
 function isSignedDecryptionPermit(value) {
-    return value instanceof SignedDecryptionPermitBaseImpl;
+    return (0, SignedDecryptionPermitV1_p_js_1.isSignedDecryptionPermitV1)(value) || (0, SignedDecryptionPermitV2_p_js_1.isSignedDecryptionPermitV2)(value);
 }
 function assertIsSignedDecryptionPermit(value, options) {
     if (!isSignedDecryptionPermit(value)) {
@@ -124,111 +44,25 @@ function assertIsSignedDecryptionPermit(value, options) {
         }, options);
     }
 }
-function assertPermitIncludesContractAddresses(permit, contractAddresses) {
-    const permitAddresses = permit.eip712.message.contractAddresses;
-    for (const address of contractAddresses) {
-        if (!permitAddresses.some((a) => a.toLowerCase() === address.toLowerCase())) {
-            throw Error(`contract address ${address} is not listed in the permit's contractAddresses`);
-        }
-    }
-}
-async function _createSignedDecryptionPermit(context, parameters) {
-    const { signerAddress, eip712, signature } = parameters;
-    if (eip712.message.contractAddresses.length === 0) {
-        throw Error('contractAddresses is empty');
-    }
-    if (eip712.message.contractAddresses.length > MAX_USER_DECRYPT_CONTRACT_ADDRESSES) {
-        throw Error(`contractAddresses max length of ${MAX_USER_DECRYPT_CONTRACT_ADDRESSES} exceeded`);
-    }
-    if (Number(eip712.message.durationDays) > MAX_USER_DECRYPT_DURATION_DAYS) {
-        throw Error(`durationDays is above max duration of ${MAX_USER_DECRYPT_DURATION_DAYS}`);
-    }
-    if (eip712.primaryType === 'UserDecryptRequestVerification') {
-        await (0, verifyKmsUserDecryptEip712_js_1.verifyKmsUserDecryptEip712)(context, {
-            signer: signerAddress,
-            message: eip712.message,
-            signature,
-        });
-        return new SignedSelfDecryptionPermitImpl(PRIVATE_TOKEN, parameters);
-    }
-    else {
-        await (0, verifyKmsDelegatedUserDecryptEip712_js_1.verifyKmsDelegatedUserDecryptEip712)(context, {
-            signer: signerAddress,
-            message: eip712.message,
-            signature,
-        });
-        return new SignedDelegatedDecryptionPermitImpl(PRIVATE_TOKEN, parameters);
-    }
-}
 async function signDecryptionPermit(context, parameters) {
-    const kmsSignersContext = await (0, readKmsSignersContext_p_js_1.readKmsSignersContext)(context, {
-        kmsVerifierAddress: context.chain.fhevm.contracts.kmsVerifier.address,
-        protocolConfigAddress: context.chain.fhevm.contracts.protocolConfig?.address,
-    });
-    const extraData = (0, KmsSignersContext_p_js_1.kmsSignersContextToExtraData)(kmsSignersContext);
-    const { contractAddresses, startTimestamp, durationDays, signerAddress: signerAddressArg, transportKeyPair: transportKeyPair, signer, delegatorAddress, } = parameters;
-    (0, TransportKeyPair_p_js_1.assertIsTransportKeyPair)(transportKeyPair, {});
-    (0, address_js_1.assertIsAddress)(signerAddressArg, {});
-    if (delegatorAddress !== undefined) {
-        (0, address_js_1.assertIsAddress)(delegatorAddress, {});
-        if (signerAddressArg.toLowerCase() === delegatorAddress.toLowerCase()) {
-            throw new Error('signerAddress and delegatorAddress must be different. ' +
-                'Use a non-delegated permit to decrypt your own values.');
-        }
+    const protocolVersion = (0, CoreFhevm_p_js_1.getResolvedProtocolVersion)(context);
+    if (protocolVersion === undefined) {
+        throw new Error('Unable to resolve protocol version from context, ensure proper initialization of the FhevmRuntime and FhevmChain.');
     }
-    const signerAddress = (0, address_js_1.addressToChecksummedAddress)(signerAddressArg);
-    const commonMessage = {
-        verifyingContractAddressDecryption: context.chain.fhevm.gateway.contracts.decryption.address,
-        chainId: context.chain.id,
-        contractAddresses,
-        durationDays,
-        startTimestamp,
-        extraData,
-        publicKey: transportKeyPair.publicKey,
-    };
-    const eip712 = delegatorAddress !== undefined
-        ? (0, createKmsDelegatedUserDecryptEip712_js_1.createKmsDelegatedUserDecryptEip712)({
-            ...commonMessage,
-            delegatorAddress,
-        })
-        : (0, createKmsUserDecryptEip712_js_1.createKmsUserDecryptEip712)(commonMessage);
-    const signature = await context.runtime.ethereum.signTypedData(signer, {
-        account: signerAddress,
-        ...eip712,
-    });
-    return await _createSignedDecryptionPermit(context, {
-        signature,
-        signerAddress,
-        eip712,
-    });
+    if ((0, semver_js_1.isSemverStrictlyBefore)(protocolVersion.version, '0.14.0')) {
+        return await (0, SignedDecryptionPermitV1_p_js_1.signDecryptionPermitV1)(context, parameters);
+    }
+    return await (0, SignedDecryptionPermitV2_p_js_1.signDecryptionPermitV2)(context, parameters);
 }
 async function parseSignedDecryptionPermit(context, transportKeyPair, permit) {
-    (0, TransportKeyPair_p_js_1.assertIsTransportKeyPair)(transportKeyPair, {});
-    const permitName = 'permit';
-    const options = {};
-    (0, record_js_1.assertRecordNonNullableProperty)(permit, 'eip712', permitName, options);
-    (0, bytes_js_1.assertRecordBytes65HexProperty)(permit, 'signature', permitName, options);
-    (0, address_js_1.assertRecordAddressProperty)(permit, 'signerAddress', permitName, options);
-    const eip712 = permit.eip712;
-    (0, string_js_1.assertRecordStringProperty)(eip712, 'primaryType', `${permitName}.eip712`, options);
-    const primaryType = eip712.primaryType;
-    if (primaryType === 'UserDecryptRequestVerification') {
-        (0, createKmsUserDecryptEip712_js_1.assertIsKmsUserDecryptEip712)(eip712, `${permitName}.eip712`, options);
-    }
-    else if (primaryType === 'DelegatedUserDecryptRequestVerification') {
-        (0, createKmsDelegatedUserDecryptEip712_js_1.assertIsKmsDelegatedUserDecryptEip712)(eip712, `${permitName}.eip712`, options);
+    const hasVersion = (0, uint_js_1.isRecordUintNumberProperty)(permit, 'version');
+    const version = hasVersion ? permit.version : 1;
+    if (version === 1) {
+        return await (0, SignedDecryptionPermitV1_p_js_1.parseSignedDecryptionPermitV1)(context, transportKeyPair, permit);
     }
-    else {
-        throw new Error(`Unknown permit primaryType: ${primaryType}`);
+    if (version === 2) {
+        return await (0, SignedDecryptionPermitV2_p_js_1.parseSignedDecryptionPermitV2)(context, transportKeyPair, permit);
     }
-    if (eip712.message.publicKey.toLowerCase() !== transportKeyPair.publicKey.toLowerCase()) {
-        throw new Error("The permit's publicKey does not match the TransportKeyPairKeyPair's publicKey. " +
-            'Ensure the permit was signed with the same key pair.');
-    }
-    return await _createSignedDecryptionPermit(context, {
-        signature: permit.signature,
-        eip712,
-        signerAddress: (0, address_js_1.addressToChecksummedAddress)(permit.signerAddress),
-    });
+    throw new Error(`Unsupported permit version: ${version}. Supported versions are 1 and 2.`);
 }
 //# sourceMappingURL=SignedDecryptionPermit-p.js.map

package/_cjs/core/kms/SignedDecryptionPermit-p.js.map

@@ -1 +1 @@
-{"version":3,"file":"SignedDecryptionPermit-p.js","sourceRoot":"","sources":["../../../core/kms/SignedDecryptionPermit-p.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SignedDecryptionPermit-p.js","sourceRoot":"","sources":["../../../core/kms/SignedDecryptionPermit-p.ts"],"names":[],"mappings":";;AA+BA,sFAqCC;AAMD,4DAEC;AAGD,wEAcC;AAiCD,oDAgBC;AAMD,kEAmBC;AAhKD,4EAAsE;AACtE,8DAAuE;AACvE,iDAA2D;AAC3D,mFAIyC;AACzC,mFAIyC;AACzC,6CAA6D;AAW7D,SAAgB,qCAAqC,CAAC,MAA8B;IAalF,8BAA8B,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAG3C,MAAM,OAAO,GAAG,MAAM,CAAC,OAA4B,CAAC;IACpD,IAAI,OAAO,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CAAC,+BAA+B,OAAO,mCAAmC,CAAC,CAAC;IAC7F,CAAC;IAGD,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO;YACL,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,aAAa,EAAE,MAAM,CAAC,aAAa;SACpC,CAAC;IACJ,CAAC;IAED,OAAO;QACL,OAAO,EAAE,CAAC;QACV,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,aAAa,EAAE,MAAM,CAAC,aAAa;KACpC,CAAC;AACJ,CAAC;AAMD,SAAgB,wBAAwB,CAAC,KAAc;IACrD,OAAO,IAAA,0DAA0B,EAAC,KAAK,CAAC,IAAI,IAAA,0DAA0B,EAAC,KAAK,CAAC,CAAC;AAChF,CAAC;AAGD,SAAgB,8BAA8B,CAC5C,KAAc,EACd,OAAmD;IAEnD,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,MAAM,IAAI,sCAAgB,CACxB;YACE,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,IAAI,EAAE,OAAO,KAAK;YAClB,YAAY,EAAE,wBAAwB;SACvC,EACD,OAAO,CACR,CAAC;IACJ,CAAC;AACH,CAAC;AAiCM,KAAK,UAAU,oBAAoB,CACxC,OAAoC,EACpC,UAA0C;IAE1C,MAAM,eAAe,GAAG,IAAA,2CAA0B,EAAC,OAAO,CAAC,CAAC;IAC5D,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CACb,mHAAmH,CACpH,CAAC;IACJ,CAAC;IAED,IAAI,IAAA,kCAAsB,EAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC9D,OAAO,MAAM,IAAA,sDAAsB,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO,MAAM,IAAA,sDAAsB,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;AAC3D,CAAC;AAMM,KAAK,UAAU,2BAA2B,CAC/C,OAAoC,EACpC,gBAAkC,EAClC,MAAe;IAEf,MAAM,UAAU,GAAG,IAAA,oCAA0B,EAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAGjE,MAAM,OAAO,GAAW,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAExD,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;QAClB,OAAO,MAAM,IAAA,6DAA6B,EAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;IAChF,CAAC;IAED,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;QAClB,OAAO,MAAM,IAAA,6DAA6B,EAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;IAChF,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,+BAA+B,OAAO,mCAAmC,CAAC,CAAC;AAC7F,CAAC"}