@fhevm/sdk 1.1.0-alpha.7 → 1.1.0-alpha.9

package/_cjs/core/modules/relayer/cleartext/fetchCoprocessorSignatures.js

@@ -4,6 +4,10 @@ exports.fetchCoprocessorSignatures = fetchCoprocessorSignatures;
 const uint_js_1 = require("../../../base/uint.js");
 const CoreFhevm_p_js_1 = require("../../../runtime/CoreFhevm-p.js");
 const signers_js_1 = require("./signers.js");
+const forgeFhevmV1_js_1 = require("./forgeFhevmV1.js");
+const createCoprocessorEip712Domain_js_1 = require("../../../coprocessor/createCoprocessorEip712Domain.js");
+const coprocessorEip712Types_js_1 = require("../../../coprocessor/coprocessorEip712Types.js");
+const readCoprocessorSignersContext_p_js_1 = require("../../../host-contracts/readCoprocessorSignersContext-p.js");
 const inputProofAbi = [
     {
         type: 'function',
@@ -30,9 +34,7 @@ const inputProofAbi = [
         stateMutability: 'view',
     },
 ];
-async function fetchCoprocessorSignatures(relayerClient, parameters) {
-    const cleartextEthereumModule = relayerClient.runtime.ethereum;
-    const { payload } = parameters;
+async function runInputProofOnChain(relayerClient, payload) {
     const trustedClient = (0, CoreFhevm_p_js_1.getTrustedClient)(relayerClient);
     const res = (await relayerClient.runtime.ethereum.readContract(trustedClient, {
         abi: inputProofAbi,
@@ -48,6 +50,54 @@ async function fetchCoprocessorSignatures(relayerClient, parameters) {
     const digest = res[0];
     const signersAddress = res[1];
     const threshold = (0, uint_js_1.asUint32BigInt)(res[2]);
+    return {
+        digest,
+        signersAddress,
+        threshold,
+    };
+}
+async function runInputProofOffChain(relayerClient, payload) {
+    const cleartextEthereumModule = relayerClient.runtime.ethereum;
+    const { zkProof } = payload;
+    const coprocessorSignersContext = await (0, readCoprocessorSignersContext_p_js_1.readCoprocessorSignersContext)(relayerClient, {
+        address: relayerClient.chain.fhevm.contracts.inputVerifier.address,
+    });
+    const domain = (0, createCoprocessorEip712Domain_js_1.createCoprocessorEip712Domain)({
+        gatewayChainId: relayerClient.chain.fhevm.gateway.id,
+        verifyingContractAddressInputVerification: relayerClient.chain.fhevm.gateway.contracts.inputVerification.address,
+    });
+    const digest = cleartextEthereumModule.hashTypedData({
+        domain,
+        types: coprocessorEip712Types_js_1.coprocessorEip712Types,
+        primaryType: coprocessorEip712Types_js_1.coprocessorEip712PrimaryType,
+        message: {
+            ctHandles: zkProof.getInputHandles().map((h) => h.bytes32Hex),
+            userAddress: zkProof.userAddress,
+            contractAddress: zkProof.contractAddress,
+            contractChainId: (0, uint_js_1.asUint64BigInt)(BigInt(relayerClient.chain.id)),
+            extraData: zkProof.getExtraData(),
+        },
+    });
+    return {
+        digest,
+        signersAddress: coprocessorSignersContext.signers,
+        threshold: (0, uint_js_1.asUint32BigInt)(BigInt(coprocessorSignersContext.threshold)),
+    };
+}
+async function fetchCoprocessorSignatures(relayerClient, parameters) {
+    const cleartextEthereumModule = relayerClient.runtime.ethereum;
+    const { payload } = parameters;
+    const offChain = await (0, forgeFhevmV1_js_1.isForgeFhevmV1)(relayerClient);
+    let res;
+    if (offChain) {
+        res = await runInputProofOffChain(relayerClient, payload);
+    }
+    else {
+        res = await runInputProofOnChain(relayerClient, payload);
+    }
+    const digest = res.digest;
+    const signersAddress = res.signersAddress;
+    const threshold = res.threshold;
     const signers = (0, signers_js_1.getCoprocessorSignersPrivateKeyMap)(relayerClient);
     const randomSignersAddress = (0, uint_js_1.randomUniqueUints)(signersAddress.length, Number(threshold)).map((i) => signersAddress[i]);
     const coprocessorEip712Signatures = [];

package/_cjs/core/modules/relayer/cleartext/fetchCoprocessorSignatures.js.map

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

package/_cjs/core/modules/relayer/cleartext/{fetchDelegatedUserDecrypt.js → fetchDelegatedUserDecryptV1.js}

@@ -6,6 +6,32 @@ const uint_js_1 = require("../../../base/uint.js");
 const CoreFhevm_p_js_1 = require("../../../runtime/CoreFhevm-p.js");
 const utils_js_1 = require("../utils.js");
 const signers_js_1 = require("./signers.js");
+const forgeFhevmV1_js_1 = require("./forgeFhevmV1.js");
+const readKmsSignersContext_p_js_1 = require("../../../host-contracts/readKmsSignersContext-p.js");
+async function runDelegatedUserDecryptOffChain(relayerClient, payload) {
+    const { kmsDecryptEip712Message } = payload;
+    const pairs = payload.handleContractPairs;
+    const trustedClient = (0, CoreFhevm_p_js_1.getTrustedClient)(relayerClient);
+    const rawCleartexts = await (0, forgeFhevmV1_js_1.readPlaintexts)(relayerClient, trustedClient, pairs.map((p) => p.handle));
+    const currentKmsSignersContext = await (0, readKmsSignersContext_p_js_1.readCurrentKmsSignersContext)(relayerClient, {
+        kmsVerifierAddress: relayerClient.chain.fhevm.contracts.kmsVerifier.address,
+        protocolConfigAddress: relayerClient.chain.fhevm.contracts.protocolConfig?.address,
+    });
+    const signersAddress = currentKmsSignersContext.signers;
+    const threshold = currentKmsSignersContext.threshold;
+    const maskedCleartexts = (0, forgeFhevmV1_js_1.xorMaskWithPublicKey)(kmsDecryptEip712Message.publicKey, rawCleartexts);
+    const extraData = kmsDecryptEip712Message.extraData;
+    const commonKmsSigncryptedSharePayload = relayerClient.runtime.ethereum.encode({
+        types: ['uint256[]', 'bytes'],
+        values: [maskedCleartexts, extraData],
+    });
+    return {
+        signersAddress,
+        threshold: BigInt(threshold),
+        commonKmsSigncryptedSharePayload,
+        extraData,
+    };
+}
 const delegatedUserDecryptAbi = [
     {
         type: 'function',
@@ -53,25 +79,9 @@ const delegatedUserDecryptAbi = [
         stateMutability: 'view',
     },
 ];
-async function fetchDelegatedUserDecrypt(relayerClient, parameters) {
-    const cleartextEthereumModule = relayerClient.runtime.ethereum;
-    const { payload } = parameters;
-    const pairs = payload.handleContractPairs;
-    const contractAddresses = payload.kmsDecryptEip712Message.contractAddresses;
-    const authCount = contractAddresses.length;
-    for (const { contractAddress: c } of pairs) {
-        let authorized = false;
-        for (let i = 0; i < authCount; ++i) {
-            if (contractAddresses[i] == c) {
-                authorized = true;
-                break;
-            }
-        }
-        if (!authorized) {
-            throw new Error(`ContractAddressNotAuthorized: ${c} is not in the EIP-712 authorized contractAddresses list.`);
-        }
-    }
+async function runDelegatedUserDecryptOnChain(relayerClient, payload) {
     const { kmsDecryptEip712Message, kmsDecryptEip712Signer, kmsDecryptEip712Signature } = payload;
+    const pairs = payload.handleContractPairs;
     const trustedClient = (0, CoreFhevm_p_js_1.getTrustedClient)(relayerClient);
     const res = (await relayerClient.runtime.ethereum.readContract(trustedClient, {
         abi: delegatedUserDecryptAbi,
@@ -92,10 +102,46 @@ async function fetchDelegatedUserDecrypt(relayerClient, parameters) {
         functionName: delegatedUserDecryptAbi[0].name,
     }));
     const commonKmsSigncryptedSharePayload = res[0];
-    const commonKmsSigncryptedSharePayloadNo0x = (0, string_js_1.remove0x)(commonKmsSigncryptedSharePayload);
     const signersAddress = res[1];
     const threshold = (0, uint_js_1.asUint32BigInt)(res[2]);
     const extraData = res[3];
+    return {
+        commonKmsSigncryptedSharePayload,
+        signersAddress,
+        threshold,
+        extraData,
+    };
+}
+async function fetchDelegatedUserDecrypt(relayerClient, parameters) {
+    const cleartextEthereumModule = relayerClient.runtime.ethereum;
+    const { payload } = parameters;
+    const pairs = payload.handleContractPairs;
+    const contractAddresses = payload.kmsDecryptEip712Message.contractAddresses;
+    const authCount = contractAddresses.length;
+    for (const { contractAddress: c } of pairs) {
+        let authorized = false;
+        for (let i = 0; i < authCount; ++i) {
+            if (contractAddresses[i] == c) {
+                authorized = true;
+                break;
+            }
+        }
+        if (!authorized) {
+            throw new Error(`ContractAddressNotAuthorized: ${c} is not in the EIP-712 authorized contractAddresses list.`);
+        }
+    }
+    const offChain = await (0, forgeFhevmV1_js_1.isForgeFhevmV1)(relayerClient);
+    let res;
+    if (offChain) {
+        res = await runDelegatedUserDecryptOffChain(relayerClient, payload);
+    }
+    else {
+        res = await runDelegatedUserDecryptOnChain(relayerClient, payload);
+    }
+    const commonKmsSigncryptedSharePayload = res.commonKmsSigncryptedSharePayload;
+    const extraData = res.extraData;
+    const threshold = res.threshold;
+    const signersAddress = res.signersAddress;
     const signers = (0, signers_js_1.getKmsSignersPrivateKeyMap)(relayerClient);
     const randomSignersAddress = (0, uint_js_1.randomUniqueUints)(signersAddress.length, Number(threshold)).map((i) => signersAddress[i]);
     const result = [];
@@ -105,7 +151,7 @@ async function fetchDelegatedUserDecrypt(relayerClient, parameters) {
             throw new Error(`Unable to find KMS signer for address ${signerAddress}`);
         }
         const signature = await cleartextEthereumModule.sign({ hash: commonKmsSigncryptedSharePayload, privateKey });
-        result.push({ signature: (0, string_js_1.remove0x)(signature), payload: commonKmsSigncryptedSharePayloadNo0x, extraData });
+        result.push({ signature: (0, string_js_1.remove0x)(signature), payload: (0, string_js_1.remove0x)(commonKmsSigncryptedSharePayload), extraData });
     }
     return (0, utils_js_1.userDecryptResultToKmsSigncryptedShares)(result);
 }
@@ -116,4 +162,4 @@ function _parseUintBigIntString(label, value) {
     }
     return bn;
 }
-//# sourceMappingURL=fetchDelegatedUserDecrypt.js.map
+//# sourceMappingURL=fetchDelegatedUserDecryptV1.js.map

package/_cjs/core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetchDelegatedUserDecryptV1.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.ts"],"names":[],"mappings":"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"}

package/_cjs/core/modules/relayer/cleartext/fetchPublicDecrypt.js

@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchPublicDecrypt = fetchPublicDecrypt;
 const CoreFhevm_p_js_1 = require("../../../runtime/CoreFhevm-p.js");
 const signers_js_1 = require("./signers.js");
+const forgeFhevmV1_js_1 = require("./forgeFhevmV1.js");
+const createKmsEip712Domain_js_1 = require("../../../kms/createKmsEip712Domain.js");
+const readKmsSignersContext_p_js_1 = require("../../../host-contracts/readKmsSignersContext-p.js");
+const kmsPublicDecryptEip712Types_js_1 = require("../../../kms/kmsPublicDecryptEip712Types.js");
 const publicDecryptAbi = [
     {
         type: 'function',
@@ -22,17 +26,70 @@ const publicDecryptAbi = [
         stateMutability: 'view',
     },
 ];
-async function fetchPublicDecrypt(relayerClient, parameters) {
+async function runPublicDecryptOffChain(relayerClient, payload) {
     const cleartextEthereumModule = relayerClient.runtime.ethereum;
+    const { orderedHandles } = payload;
+    const trustedClient = (0, CoreFhevm_p_js_1.getTrustedClient)(relayerClient);
+    const cleartexts = await (0, forgeFhevmV1_js_1.readPlaintexts)(relayerClient, trustedClient, orderedHandles);
+    const orderedAbiEncodedClearValues = (0, forgeFhevmV1_js_1.encodeTypedCleartexts)(cleartextEthereumModule, orderedHandles, cleartexts);
+    const extraData = payload.extraData;
+    const signedExtraData = extraData === '0x00' ? '0x' : extraData;
+    const domain = (0, createKmsEip712Domain_js_1.createKmsEip712Domain)({
+        chainId: relayerClient.chain.fhevm.gateway.id,
+        verifyingContractAddressDecryption: relayerClient.chain.fhevm.gateway.contracts.decryption.address,
+    });
+    const currentKmsSignersContext = await (0, readKmsSignersContext_p_js_1.readCurrentKmsSignersContext)(relayerClient, {
+        kmsVerifierAddress: relayerClient.chain.fhevm.contracts.kmsVerifier.address,
+        protocolConfigAddress: relayerClient.chain.fhevm.contracts.protocolConfig?.address,
+    });
+    const digest = cleartextEthereumModule.hashTypedData({
+        domain,
+        types: kmsPublicDecryptEip712Types_js_1.kmsPublicDecryptEip712Types,
+        primaryType: 'PublicDecryptVerification',
+        message: {
+            ctHandles: orderedHandles.map((h) => h.bytes32Hex),
+            decryptedResult: orderedAbiEncodedClearValues,
+            extraData: signedExtraData,
+        },
+    });
+    return {
+        orderedAbiEncodedClearValues,
+        digest,
+        signersAddress: currentKmsSignersContext.signers,
+        extraData,
+    };
+}
+async function runPublicDecryptOnChain(relayerClient, payload) {
     const trustedClient = (0, CoreFhevm_p_js_1.getTrustedClient)(relayerClient);
     const res = (await relayerClient.runtime.ethereum.readContract(trustedClient, {
         abi: publicDecryptAbi,
         address: relayerClient.chain.fhevm.contracts.kmsVerifier.address,
-        args: [parameters.payload.orderedHandles.map((h) => h.bytes32Hex)],
+        args: [payload.orderedHandles.map((h) => h.bytes32Hex)],
         functionName: publicDecryptAbi[0].name,
     }));
+    const orderedAbiEncodedClearValues = res[0];
     const digest = res[1];
     const signersAddress = res[2];
+    const extraData = res[4];
+    return {
+        orderedAbiEncodedClearValues,
+        digest,
+        signersAddress,
+        extraData,
+    };
+}
+async function fetchPublicDecrypt(relayerClient, parameters) {
+    const cleartextEthereumModule = relayerClient.runtime.ethereum;
+    const offChain = await (0, forgeFhevmV1_js_1.isForgeFhevmV1)(relayerClient);
+    let res;
+    if (offChain) {
+        res = await runPublicDecryptOffChain(relayerClient, parameters.payload);
+    }
+    else {
+        res = await runPublicDecryptOnChain(relayerClient, parameters.payload);
+    }
+    const digest = res.digest;
+    const signersAddress = res.signersAddress;
     const signers = (0, signers_js_1.getKmsSignersPrivateKeyMap)(relayerClient);
     const kmsPublicDecryptEip712Signatures = [];
     for (let i = 0; i < signersAddress.length; ++i) {
@@ -44,9 +101,9 @@ async function fetchPublicDecrypt(relayerClient, parameters) {
         kmsPublicDecryptEip712Signatures.push(signature);
     }
     return {
-        orderedAbiEncodedClearValues: res[0],
+        orderedAbiEncodedClearValues: res.orderedAbiEncodedClearValues,
         kmsPublicDecryptEip712Signatures,
-        extraData: res[4],
+        extraData: res.extraData,
     };
 }
 //# sourceMappingURL=fetchPublicDecrypt.js.map

package/_cjs/core/modules/relayer/cleartext/fetchPublicDecrypt.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetchPublicDecrypt.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchPublicDecrypt.ts"],"names":[],"mappings":";;AA8BA,gDAoCC;AA/DD,oEAAmE;AACnE,6CAA0D;AAI1D,MAAM,gBAAgB,GAAG;IACvB;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,eAAe;QACrB,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC;QAC3E,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,sBAAsB;gBAC5B,IAAI,EAAE,OAAO;gBACb,YAAY,EAAE,OAAO;aACtB;YACD,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;YAC5D,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE;YACjE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;YAC/D,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE;SAC5D;QACD,eAAe,EAAE,MAAM;KACxB;CACO,CAAC;AAIJ,KAAK,UAAU,kBAAkB,CACtC,aAAuC,EACvC,UAAwC;IAExC,MAAM,uBAAuB,GAAG,aAAa,CAAC,OAAO,CAAC,QAAmC,CAAC;IAE1F,MAAM,aAAa,GAAG,IAAA,iCAAgB,EAAC,aAAa,CAAC,CAAC;IACtD,MAAM,GAAG,GAAG,CAAC,MAAM,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QAC5E,GAAG,EAAE,gBAAgB;QACrB,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,OAA6B;QACtF,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAClE,YAAY,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI;KACvC,CAAC,CAAc,CAAC;IAEjB,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,CAAe,CAAC;IACpC,MAAM,cAAc,GAAG,GAAG,CAAC,CAAC,CAAkC,CAAC;IAC/D,MAAM,OAAO,GAAG,IAAA,uCAA0B,EAAC,aAAa,CAAC,CAAC;IAE1D,MAAM,gCAAgC,GAAiB,EAAE,CAAC;IAE1D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;QAE/C,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAE,CAAC,CAAC;QACnD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC/C,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,uBAAuB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QACnF,gCAAgC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;IAED,OAAO;QACL,4BAA4B,EAAE,GAAG,CAAC,CAAC,CAAa;QAChD,gCAAgC;QAChC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAa;KAC9B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"fetchPublicDecrypt.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchPublicDecrypt.ts"],"names":[],"mappings":"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"}

package/_cjs/core/modules/relayer/cleartext/fetchUserDecrypt.js

@@ -1,117 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchUserDecrypt = fetchUserDecrypt;
-const string_js_1 = require("../../../base/string.js");
-const uint_js_1 = require("../../../base/uint.js");
 const CoreFhevm_p_js_1 = require("../../../runtime/CoreFhevm-p.js");
-const utils_js_1 = require("../utils.js");
-const signers_js_1 = require("./signers.js");
-const userDecryptAbi = [
-    {
-        type: 'function',
-        name: 'userDecrypt',
-        inputs: [
-            {
-                name: 'pairs',
-                type: 'tuple[]',
-                internalType: 'struct HandleContractPair[]',
-                components: [
-                    { name: 'handle', type: 'bytes32', internalType: 'bytes32' },
-                    {
-                        name: 'contractAddress',
-                        type: 'address',
-                        internalType: 'address',
-                    },
-                ],
-            },
-            { name: 'userAddress', type: 'address', internalType: 'address' },
-            { name: 'publicKey', type: 'bytes', internalType: 'bytes' },
-            {
-                name: 'contractAddresses',
-                type: 'address[]',
-                internalType: 'address[]',
-            },
-            {
-                name: 'startTimestamp',
-                type: 'uint256',
-                internalType: 'uint256',
-            },
-            {
-                name: 'durationDays',
-                type: 'uint256',
-                internalType: 'uint256',
-            },
-            { name: 'userSignature', type: 'bytes', internalType: 'bytes' },
-        ],
-        outputs: [
-            { name: 'payload', type: 'bytes', internalType: 'bytes' },
-            { name: 'signers', type: 'address[]', internalType: 'address[]' },
-            { name: 'threshold', type: 'uint256', internalType: 'uint256' },
-            { name: 'extraData', type: 'bytes', internalType: 'bytes' },
-        ],
-        stateMutability: 'view',
-    },
-];
+const semver_js_1 = require("../../../base/semver.js");
+const fetchUserDecryptV1_js_1 = require("./fetchUserDecryptV1.js");
+const fetchUserDecryptV2_js_1 = require("./fetchUserDecryptV2.js");
 async function fetchUserDecrypt(relayerClient, parameters) {
-    const cleartextEthereumModule = relayerClient.runtime.ethereum;
-    const { payload } = parameters;
-    const pairs = payload.handleContractPairs;
-    const contractAddresses = payload.kmsDecryptEip712Message.contractAddresses;
-    const authCount = contractAddresses.length;
-    for (const { contractAddress: c } of pairs) {
-        let authorized = false;
-        for (let i = 0; i < authCount; ++i) {
-            if (contractAddresses[i] == c) {
-                authorized = true;
-                break;
-            }
-        }
-        if (!authorized) {
-            throw new Error(`ContractAddressNotAuthorized: ${c} is not in the EIP-712 authorized contractAddresses list.`);
-        }
+    const protocolVersion = (0, CoreFhevm_p_js_1.getResolvedProtocolVersion)(relayerClient);
+    if (protocolVersion === undefined) {
+        throw new Error('Unable to resolve protocol version from context, ensure proper initialization of the FhevmRuntime and FhevmChain.');
     }
-    const { kmsDecryptEip712Message, kmsDecryptEip712Signer, kmsDecryptEip712Signature } = payload;
-    const trustedClient = (0, CoreFhevm_p_js_1.getTrustedClient)(relayerClient);
-    const res = (await relayerClient.runtime.ethereum.readContract(trustedClient, {
-        abi: userDecryptAbi,
-        address: relayerClient.chain.fhevm.contracts.kmsVerifier.address,
-        args: [
-            pairs.map((p) => ({
-                handle: p.handle.bytes32Hex,
-                contractAddress: p.contractAddress,
-            })),
-            kmsDecryptEip712Signer,
-            kmsDecryptEip712Message.publicKey,
-            kmsDecryptEip712Message.contractAddresses,
-            _parseUintBigIntString('kmsDecryptEip712Message.startTimestamp', kmsDecryptEip712Message.startTimestamp),
-            _parseUintBigIntString('kmsDecryptEip712Message.durationDays', kmsDecryptEip712Message.durationDays),
-            kmsDecryptEip712Signature,
-        ],
-        functionName: userDecryptAbi[0].name,
-    }));
-    const commonKmsSigncryptedSharePayload = res[0];
-    const commonKmsSigncryptedSharePayloadNo0x = (0, string_js_1.remove0x)(commonKmsSigncryptedSharePayload);
-    const signersAddress = res[1];
-    const threshold = (0, uint_js_1.asUint32BigInt)(res[2]);
-    const extraData = res[3];
-    const signers = (0, signers_js_1.getKmsSignersPrivateKeyMap)(relayerClient);
-    const randomSignersAddress = (0, uint_js_1.randomUniqueUints)(signersAddress.length, Number(threshold)).map((i) => signersAddress[i]);
-    const result = [];
-    for (const signerAddress of randomSignersAddress) {
-        const privateKey = signers.get(signerAddress);
-        if (privateKey === undefined) {
-            throw new Error(`Unable to find KMS signer for address ${signerAddress}`);
-        }
-        const signature = await cleartextEthereumModule.sign({ hash: commonKmsSigncryptedSharePayload, privateKey });
-        result.push({ signature: (0, string_js_1.remove0x)(signature), payload: commonKmsSigncryptedSharePayloadNo0x, extraData });
+    if ((0, semver_js_1.isSemverStrictlyBefore)(protocolVersion.version, '0.14.0')) {
+        return await (0, fetchUserDecryptV1_js_1.fetchUserDecryptV1)(relayerClient, parameters);
     }
-    return (0, utils_js_1.userDecryptResultToKmsSigncryptedShares)(result);
-}
-function _parseUintBigIntString(label, value) {
-    const bn = (0, uint_js_1.tryParseUintBigIntString)(value);
-    if (bn === undefined) {
-        throw new Error(`${label} is not a valid uint string, got ${JSON.stringify(value)}`);
-    }
-    return bn;
+    return await (0, fetchUserDecryptV2_js_1.fetchUserDecryptV2)(relayerClient, parameters);
 }
 //# sourceMappingURL=fetchUserDecrypt.js.map

package/_cjs/core/modules/relayer/cleartext/fetchUserDecrypt.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetchUserDecrypt.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchUserDecrypt.ts"],"names":[],"mappings":";;AA6DA,4CAqEC;AA9HD,uDAAmD;AACnD,mDAAoG;AACpG,oEAAmE;AACnE,0CAAsE;AACtE,6CAA0D;AAI1D,MAAM,cAAc,GAAG;IACrB;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,6BAA6B;gBAC3C,UAAU,EAAE;oBACV,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;oBAC5D;wBACE,IAAI,EAAE,iBAAiB;wBACvB,IAAI,EAAE,SAAS;wBACf,YAAY,EAAE,SAAS;qBACxB;iBACF;aACF;YACD,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;YACjE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE;YAC3D;gBACE,IAAI,EAAE,mBAAmB;gBACzB,IAAI,EAAE,WAAW;gBACjB,YAAY,EAAE,WAAW;aAC1B;YACD;gBACE,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,SAAS;aACxB;YACD;gBACE,IAAI,EAAE,cAAc;gBACpB,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,SAAS;aACxB;YACD,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE;SAChE;QACD,OAAO,EAAE;YACP,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE;YACzD,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE;YACjE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;YAC/D,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE;SAC5D;QACD,eAAe,EAAE,MAAM;KACxB;CACO,CAAC;AAIJ,KAAK,UAAU,gBAAgB,CACpC,aAAuC,EACvC,UAAwC;IAExC,MAAM,uBAAuB,GAAG,aAAa,CAAC,OAAO,CAAC,QAAmC,CAAC;IAC1F,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IAC/B,MAAM,KAAK,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAC1C,MAAM,iBAAiB,GAAG,OAAO,CAAC,uBAAuB,CAAC,iBAAiB,CAAC;IAE5E,MAAM,SAAS,GAAG,iBAAiB,CAAC,MAAM,CAAC;IAC3C,KAAK,MAAM,EAAE,eAAe,EAAE,CAAC,EAAE,IAAI,KAAK,EAAE,CAAC;QAC3C,IAAI,UAAU,GAAY,KAAK,CAAC;QAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC;YACnC,IAAI,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC9B,UAAU,GAAG,IAAI,CAAC;gBAClB,MAAM;YACR,CAAC;QACH,CAAC;QACD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,2DAA2D,CAAC,CAAC;QACjH,CAAC;IACH,CAAC;IAED,MAAM,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,GAAG,OAAO,CAAC;IAC/F,MAAM,aAAa,GAAG,IAAA,iCAAgB,EAAC,aAAa,CAAC,CAAC;IACtD,MAAM,GAAG,GAAG,CAAC,MAAM,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QAC5E,GAAG,EAAE,cAAc;QACnB,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,OAA6B;QACtF,IAAI,EAAE;YACJ,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAChB,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU;gBAC3B,eAAe,EAAE,CAAC,CAAC,eAAe;aACnC,CAAC,CAAC;YACH,sBAAsB;YACtB,uBAAuB,CAAC,SAAS;YACjC,uBAAuB,CAAC,iBAAiB;YACzC,sBAAsB,CAAC,wCAAwC,EAAE,uBAAuB,CAAC,cAAc,CAAC;YACxG,sBAAsB,CAAC,sCAAsC,EAAE,uBAAuB,CAAC,YAAY,CAAC;YACpG,yBAAyB;SAC1B;QACD,YAAY,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI;KACrC,CAAC,CAAc,CAAC;IAEjB,MAAM,gCAAgC,GAAG,GAAG,CAAC,CAAC,CAAa,CAAC;IAC5D,MAAM,oCAAoC,GAAG,IAAA,oBAAQ,EAAC,gCAAgC,CAAC,CAAC;IACxF,MAAM,cAAc,GAAG,GAAG,CAAC,CAAC,CAAkC,CAAC;IAC/D,MAAM,SAAS,GAAG,IAAA,wBAAc,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACzC,MAAM,SAAS,GAAG,GAAG,CAAC,CAAC,CAAa,CAAC;IAErC,MAAM,OAAO,GAAG,IAAA,uCAA0B,EAAC,aAAa,CAAC,CAAC;IAE1D,MAAM,oBAAoB,GAAG,IAAA,2BAAiB,EAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAE1F,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAE,CAC1B,CAAC;IAEF,MAAM,MAAM,GAAiC,EAAE,CAAC;IAEhD,KAAK,MAAM,aAAa,IAAI,oBAAoB,EAAE,CAAC;QACjD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC9C,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,yCAAyC,aAAa,EAAE,CAAC,CAAC;QAC5E,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,uBAAuB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,gCAAgC,EAAE,UAAU,EAAE,CAAC,CAAC;QAC7G,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,IAAA,oBAAQ,EAAC,SAAS,CAAC,EAAE,OAAO,EAAE,oCAAoC,EAAE,SAAS,EAAE,CAAC,CAAC;IAC5G,CAAC;IAED,OAAO,IAAA,kDAAuC,EAAC,MAAM,CAAC,CAAC;AACzD,CAAC;AAID,SAAS,sBAAsB,CAAC,KAAa,EAAE,KAAa;IAC1D,MAAM,EAAE,GAAG,IAAA,kCAAwB,EAAC,KAAK,CAAC,CAAC;IAC3C,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,oCAAoC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACvF,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC"}
+{"version":3,"file":"fetchUserDecrypt.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchUserDecrypt.ts"],"names":[],"mappings":";;AAgBA,4CAgBC;AAzBD,oEAA6E;AAC7E,uDAAiE;AACjE,mEAA6D;AAC7D,mEAA6D;AAMtD,KAAK,UAAU,gBAAgB,CACpC,aAAuC,EACvC,UAAsC;IAEtC,MAAM,eAAe,GAAG,IAAA,2CAA0B,EAAC,aAAa,CAAC,CAAC;IAClE,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,0CAAkB,EAAC,aAAa,EAAE,UAA0C,CAAC,CAAC;IAC7F,CAAC;IAED,OAAO,MAAM,IAAA,0CAAkB,EAAC,aAAa,EAAE,UAA0C,CAAC,CAAC;AAC7F,CAAC"}

package/_cjs/core/modules/relayer/cleartext/fetchUserDecryptV1.js

@@ -0,0 +1,163 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchUserDecryptV1 = fetchUserDecryptV1;
+const string_js_1 = require("../../../base/string.js");
+const uint_js_1 = require("../../../base/uint.js");
+const CoreFhevm_p_js_1 = require("../../../runtime/CoreFhevm-p.js");
+const utils_js_1 = require("../utils.js");
+const signers_js_1 = require("./signers.js");
+const readKmsSignersContext_p_js_1 = require("../../../host-contracts/readKmsSignersContext-p.js");
+const forgeFhevmV1_js_1 = require("./forgeFhevmV1.js");
+async function runUserDecryptOffChain(relayerClient, payload) {
+    const { kmsDecryptEip712Message } = payload;
+    const pairs = payload.handleContractPairs;
+    const trustedClient = (0, CoreFhevm_p_js_1.getTrustedClient)(relayerClient);
+    const rawCleartexts = await (0, forgeFhevmV1_js_1.readPlaintexts)(relayerClient, trustedClient, pairs.map((p) => p.handle));
+    const currentKmsSignersContext = await (0, readKmsSignersContext_p_js_1.readCurrentKmsSignersContext)(relayerClient, {
+        kmsVerifierAddress: relayerClient.chain.fhevm.contracts.kmsVerifier.address,
+        protocolConfigAddress: relayerClient.chain.fhevm.contracts.protocolConfig?.address,
+    });
+    const signersAddress = currentKmsSignersContext.signers;
+    const threshold = currentKmsSignersContext.threshold;
+    const maskedCleartexts = (0, forgeFhevmV1_js_1.xorMaskWithPublicKey)(kmsDecryptEip712Message.publicKey, rawCleartexts);
+    const extraData = kmsDecryptEip712Message.extraData;
+    const commonKmsSigncryptedSharePayload = relayerClient.runtime.ethereum.encode({
+        types: ['uint256[]', 'bytes'],
+        values: [maskedCleartexts, extraData],
+    });
+    return {
+        signersAddress,
+        threshold: BigInt(threshold),
+        commonKmsSigncryptedSharePayload,
+        extraData,
+    };
+}
+const userDecryptAbi = [
+    {
+        type: 'function',
+        name: 'userDecrypt',
+        inputs: [
+            {
+                name: 'pairs',
+                type: 'tuple[]',
+                internalType: 'struct HandleContractPair[]',
+                components: [
+                    { name: 'handle', type: 'bytes32', internalType: 'bytes32' },
+                    {
+                        name: 'contractAddress',
+                        type: 'address',
+                        internalType: 'address',
+                    },
+                ],
+            },
+            { name: 'userAddress', type: 'address', internalType: 'address' },
+            { name: 'publicKey', type: 'bytes', internalType: 'bytes' },
+            {
+                name: 'contractAddresses',
+                type: 'address[]',
+                internalType: 'address[]',
+            },
+            {
+                name: 'startTimestamp',
+                type: 'uint256',
+                internalType: 'uint256',
+            },
+            {
+                name: 'durationDays',
+                type: 'uint256',
+                internalType: 'uint256',
+            },
+            { name: 'userSignature', type: 'bytes', internalType: 'bytes' },
+        ],
+        outputs: [
+            { name: 'payload', type: 'bytes', internalType: 'bytes' },
+            { name: 'signers', type: 'address[]', internalType: 'address[]' },
+            { name: 'threshold', type: 'uint256', internalType: 'uint256' },
+            { name: 'extraData', type: 'bytes', internalType: 'bytes' },
+        ],
+        stateMutability: 'view',
+    },
+];
+async function runUserDecryptOnChain(relayerClient, payload) {
+    const { kmsDecryptEip712Message, kmsDecryptEip712Signer, kmsDecryptEip712Signature } = payload;
+    const pairs = payload.handleContractPairs;
+    const trustedClient = (0, CoreFhevm_p_js_1.getTrustedClient)(relayerClient);
+    const res = (await relayerClient.runtime.ethereum.readContract(trustedClient, {
+        abi: userDecryptAbi,
+        address: relayerClient.chain.fhevm.contracts.kmsVerifier.address,
+        args: [
+            pairs.map((p) => ({
+                handle: p.handle.bytes32Hex,
+                contractAddress: p.contractAddress,
+            })),
+            kmsDecryptEip712Signer,
+            kmsDecryptEip712Message.publicKey,
+            kmsDecryptEip712Message.contractAddresses,
+            _parseUintBigIntString('kmsDecryptEip712Message.startTimestamp', kmsDecryptEip712Message.startTimestamp),
+            _parseUintBigIntString('kmsDecryptEip712Message.durationDays', kmsDecryptEip712Message.durationDays),
+            kmsDecryptEip712Signature,
+        ],
+        functionName: userDecryptAbi[0].name,
+    }));
+    const commonKmsSigncryptedSharePayload = res[0];
+    const signersAddress = res[1];
+    const threshold = (0, uint_js_1.asUint32BigInt)(res[2]);
+    const extraData = res[3];
+    return {
+        commonKmsSigncryptedSharePayload,
+        signersAddress,
+        threshold,
+        extraData,
+    };
+}
+async function fetchUserDecryptV1(relayerClient, parameters) {
+    const cleartextEthereumModule = relayerClient.runtime.ethereum;
+    const { payload } = parameters;
+    const pairs = payload.handleContractPairs;
+    const contractAddresses = payload.kmsDecryptEip712Message.contractAddresses;
+    const authCount = contractAddresses.length;
+    for (const { contractAddress: c } of pairs) {
+        let authorized = false;
+        for (let i = 0; i < authCount; ++i) {
+            if (contractAddresses[i] == c) {
+                authorized = true;
+                break;
+            }
+        }
+        if (!authorized) {
+            throw new Error(`ContractAddressNotAuthorized: ${c} is not in the EIP-712 authorized contractAddresses list.`);
+        }
+    }
+    const offChain = await (0, forgeFhevmV1_js_1.isForgeFhevmV1)(relayerClient);
+    let res;
+    if (offChain) {
+        res = await runUserDecryptOffChain(relayerClient, payload);
+    }
+    else {
+        res = await runUserDecryptOnChain(relayerClient, payload);
+    }
+    const commonKmsSigncryptedSharePayload = res.commonKmsSigncryptedSharePayload;
+    const extraData = res.extraData;
+    const threshold = res.threshold;
+    const signersAddress = res.signersAddress;
+    const signers = (0, signers_js_1.getKmsSignersPrivateKeyMap)(relayerClient);
+    const randomSignersAddress = (0, uint_js_1.randomUniqueUints)(signersAddress.length, Number(threshold)).map((i) => signersAddress[i]);
+    const result = [];
+    for (const signerAddress of randomSignersAddress) {
+        const privateKey = signers.get(signerAddress);
+        if (privateKey === undefined) {
+            throw new Error(`Unable to find KMS signer for address ${signerAddress}`);
+        }
+        const signature = await cleartextEthereumModule.sign({ hash: commonKmsSigncryptedSharePayload, privateKey });
+        result.push({ signature: (0, string_js_1.remove0x)(signature), payload: (0, string_js_1.remove0x)(commonKmsSigncryptedSharePayload), extraData });
+    }
+    return (0, utils_js_1.userDecryptResultToKmsSigncryptedShares)(result);
+}
+function _parseUintBigIntString(label, value) {
+    const bn = (0, uint_js_1.tryParseUintBigIntString)(value);
+    if (bn === undefined) {
+        throw new Error(`${label} is not a valid uint string, got ${JSON.stringify(value)}`);
+    }
+    return bn;
+}
+//# sourceMappingURL=fetchUserDecryptV1.js.map