@fhevm/sdk 0.15.0-1 → 0.15.0-10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/_cjs/core/_version.js +1 -1
- package/_cjs/core/_version.js.map +1 -1
- package/_cjs/core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.js +40 -47
- package/_cjs/core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.js.map +1 -1
- package/_cjs/core/modules/relayer/cleartext/fetchPublicDecrypt.js +13 -7
- package/_cjs/core/modules/relayer/cleartext/fetchPublicDecrypt.js.map +1 -1
- package/_cjs/core/modules/relayer/cleartext/fetchUserDecryptV1.js +38 -45
- package/_cjs/core/modules/relayer/cleartext/fetchUserDecryptV1.js.map +1 -1
- package/_cjs/core/modules/relayer/cleartext/fetchUserDecryptV2.js +104 -2
- package/_cjs/core/modules/relayer/cleartext/fetchUserDecryptV2.js.map +1 -1
- package/_cjs/core/modules/relayer/cleartext/signers.js +35 -0
- package/_cjs/core/modules/relayer/cleartext/signers.js.map +1 -1
- package/_cjs/wasm/tfhe/loadTfheLib.js.map +1 -1
- package/_cjs/wasm/tkms/loadKmsLib.js.map +1 -1
- package/_esm/core/_version.js +1 -1
- package/_esm/core/_version.js.map +1 -1
- package/_esm/core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.js +43 -51
- package/_esm/core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.js.map +1 -1
- package/_esm/core/modules/relayer/cleartext/fetchPublicDecrypt.js +15 -9
- package/_esm/core/modules/relayer/cleartext/fetchPublicDecrypt.js.map +1 -1
- package/_esm/core/modules/relayer/cleartext/fetchUserDecryptV1.js +42 -49
- package/_esm/core/modules/relayer/cleartext/fetchUserDecryptV1.js.map +1 -1
- package/_esm/core/modules/relayer/cleartext/fetchUserDecryptV2.js +111 -3
- package/_esm/core/modules/relayer/cleartext/fetchUserDecryptV2.js.map +1 -1
- package/_esm/core/modules/relayer/cleartext/signers.js +41 -0
- package/_esm/core/modules/relayer/cleartext/signers.js.map +1 -1
- package/_types/core/_version.d.ts.map +1 -1
- package/_types/core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.d.ts.map +1 -1
- package/_types/core/modules/relayer/cleartext/fetchPublicDecrypt.d.ts.map +1 -1
- package/_types/core/modules/relayer/cleartext/fetchUserDecryptV1.d.ts.map +1 -1
- package/_types/core/modules/relayer/cleartext/fetchUserDecryptV2.d.ts +1 -1
- package/_types/core/modules/relayer/cleartext/fetchUserDecryptV2.d.ts.map +1 -1
- package/_types/core/modules/relayer/cleartext/signers.d.ts +13 -0
- package/_types/core/modules/relayer/cleartext/signers.d.ts.map +1 -1
- package/core/_version.ts +1 -1
- package/core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.ts +49 -60
- package/core/modules/relayer/cleartext/fetchPublicDecrypt.ts +19 -9
- package/core/modules/relayer/cleartext/fetchUserDecryptV1.ts +48 -58
- package/core/modules/relayer/cleartext/fetchUserDecryptV2.ts +133 -4
- package/core/modules/relayer/cleartext/signers.ts +61 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signers.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/signers.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"signers.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/signers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
|
-
"sources": ["../../../../../../../../../../../tmp/fhevm-loaders-
|
|
3
|
+
"sources": ["../../../../../../../../../../../tmp/fhevm-loaders-4501-1793885201638/tfhe/loadTfheLib.js"],
|
|
4
4
|
"sourcesContent": ["// AUTO-GENERATED FROM versionsManifest.js - DO NOT EDIT.\n// Generator: scripts/build/codegen-loaders.mjs\n//\n// Version-selective TFHE loader. Authored as plain ESM .js (not .ts) so the\n// published artifact is byte-identical to source. Types live in the sibling\n// loadTfheLib.d.ts.\n\n////////////////////////////////////////////////////////////////////////////////\n\nexport const TFHE_VERSIONS = Object.freeze(['1.8.1']);\nexport const DEFAULT_TFHE_VERSION = '1.8.1';\n\nconst _loaders = {\n '1.8.1': () => import('./v1.8.1/tfhe.js'),\n};\n\n////////////////////////////////////////////////////////////////////////////////\n\nconst _wasmBase64Loaders = {\n '1.8.1': () => import('./v1.8.1/tfhe_bg.wasm.base64.js'),\n};\n\n////////////////////////////////////////////////////////////////////////////////\n\nconst _assets = Object.freeze({\n '1.8.1': Object.freeze({\n wasm: Object.freeze({\n filename: 'tfhe_bg.v1.8.1.wasm',\n localRelativePath: './v1.8.1/tfhe_bg.wasm',\n sha256: 'e7811b7a5cd2d3b32dadd1e84addb55882bca0a13df1b7d5f8671bee1d9fc6b6',\n }),\n worker: Object.freeze({\n filename: 'tfhe-worker.v1.8.1.mjs',\n localRelativePath: './v1.8.1/tfhe-worker.mjs',\n sha256: 'd67a2b2c52175bce3d32f0033b3e2fbc8044717728089b90945688c4270aaa6f',\n }),\n }),\n});\n\n////////////////////////////////////////////////////////////////////////////////\n\nexport function tfheAssetsWithVersion(version) {\n const assets = _assets[version];\n if (!assets) throw new Error(`unsupported tfhe version: ${version}`);\n return assets;\n}\n\n////////////////////////////////////////////////////////////////////////////////\n\nexport async function loadTfheLib(version) {\n const loader = _loaders[version];\n if (!loader) throw new Error(`unsupported tfhe version: ${version}`);\n return loader();\n}\n\n////////////////////////////////////////////////////////////////////////////////\n\nexport async function loadTfheWasmBase64(version) {\n const loader = _wasmBase64Loaders[version];\n if (!loader) throw new Error(`unsupported tfhe version: ${version}`);\n return loader();\n}\n"],
|
|
5
5
|
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AASO,MAAM,gBAAgB,OAAO,OAAO,CAAC,OAAO,CAAC;AAC7C,MAAM,uBAAuB;AAEpC,MAAM,WAAW;AAAA,EACf,SAAS,MAAM,OAAO,kBAAkB;AAC1C;AAIA,MAAM,qBAAqB;AAAA,EACzB,SAAS,MAAM,OAAO,iCAAiC;AACzD;AAIA,MAAM,UAAU,OAAO,OAAO;AAAA,EAC5B,SAAS,OAAO,OAAO;AAAA,IACrB,MAAM,OAAO,OAAO;AAAA,MAClB,UAAU;AAAA,MACV,mBAAmB;AAAA,MACnB,QAAQ;AAAA,IACV,CAAC;AAAA,IACD,QAAQ,OAAO,OAAO;AAAA,MACpB,UAAU;AAAA,MACV,mBAAmB;AAAA,MACnB,QAAQ;AAAA,IACV,CAAC;AAAA,EACH,CAAC;AACH,CAAC;AAIM,SAAS,sBAAsB,SAAS;AAC7C,QAAM,SAAS,QAAQ,OAAO;AAC9B,MAAI,CAAC,OAAQ,OAAM,IAAI,MAAM,6BAA6B,OAAO,EAAE;AACnE,SAAO;AACT;AAIA,eAAsB,YAAY,SAAS;AACzC,QAAM,SAAS,SAAS,OAAO;AAC/B,MAAI,CAAC,OAAQ,OAAM,IAAI,MAAM,6BAA6B,OAAO,EAAE;AACnE,SAAO,OAAO;AAChB;AAIA,eAAsB,mBAAmB,SAAS;AAChD,QAAM,SAAS,mBAAmB,OAAO;AACzC,MAAI,CAAC,OAAQ,OAAM,IAAI,MAAM,6BAA6B,OAAO,EAAE;AACnE,SAAO,OAAO;AAChB;",
|
|
6
6
|
"names": []
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
|
-
"sources": ["../../../../../../../../../../../tmp/fhevm-loaders-
|
|
3
|
+
"sources": ["../../../../../../../../../../../tmp/fhevm-loaders-4501-1793885201638/tkms/loadKmsLib.js"],
|
|
4
4
|
"sourcesContent": ["// AUTO-GENERATED FROM versionsManifest.js - DO NOT EDIT.\n// Generator: scripts/build/codegen-loaders.mjs\n//\n// Version-selective TKMS loader. Authored as plain ESM .js (not .ts) so the\n// published artifact is byte-identical to source. Types live in the sibling\n// loadKmsLib.d.ts.\n\n////////////////////////////////////////////////////////////////////////////////\n\nexport const KMS_VERSIONS = Object.freeze(['0.15.0-0']);\nexport const DEFAULT_TKMS_VERSION = '0.15.0-0';\n\nconst _loaders = {\n '0.15.0-0': () => import('./v0.15.0-0/kms_lib.js'),\n};\n\n////////////////////////////////////////////////////////////////////////////////\n\nconst _wasmBase64Loaders = {\n '0.15.0-0': () => import('./v0.15.0-0/kms_lib_bg.wasm.base64.js'),\n};\n\n////////////////////////////////////////////////////////////////////////////////\n\nconst _assets = Object.freeze({\n '0.15.0-0': Object.freeze({\n wasm: Object.freeze({\n filename: 'kms_lib_bg.v0.15.0-0.wasm',\n localRelativePath: './v0.15.0-0/kms_lib_bg.wasm',\n sha256: '0e33f45989dc2bb2350494da8c336eab98a7cbe0c711b820f5aa1bd79a4d8f12',\n }),\n }),\n});\n\n////////////////////////////////////////////////////////////////////////////////\n\nexport function kmsAssetsWithVersion(version) {\n const assets = _assets[version];\n if (!assets) throw new Error(`unsupported tkms version: ${version}`);\n return assets;\n}\n\n////////////////////////////////////////////////////////////////////////////////\n\nexport async function loadKmsLib(version) {\n const loader = _loaders[version];\n if (!loader) throw new Error(`unsupported tkms version: ${version}`);\n return loader();\n}\n\n////////////////////////////////////////////////////////////////////////////////\n\nexport async function loadKmsWasmBase64(version) {\n const loader = _wasmBase64Loaders[version];\n if (!loader) throw new Error(`unsupported tkms version: ${version}`);\n return loader();\n}\n"],
|
|
5
5
|
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AASO,MAAM,eAAe,OAAO,OAAO,CAAC,UAAU,CAAC;AAC/C,MAAM,uBAAuB;AAEpC,MAAM,WAAW;AAAA,EACf,YAAY,MAAM,OAAO,wBAAwB;AACnD;AAIA,MAAM,qBAAqB;AAAA,EACzB,YAAY,MAAM,OAAO,uCAAuC;AAClE;AAIA,MAAM,UAAU,OAAO,OAAO;AAAA,EAC5B,YAAY,OAAO,OAAO;AAAA,IACxB,MAAM,OAAO,OAAO;AAAA,MAClB,UAAU;AAAA,MACV,mBAAmB;AAAA,MACnB,QAAQ;AAAA,IACV,CAAC;AAAA,EACH,CAAC;AACH,CAAC;AAIM,SAAS,qBAAqB,SAAS;AAC5C,QAAM,SAAS,QAAQ,OAAO;AAC9B,MAAI,CAAC,OAAQ,OAAM,IAAI,MAAM,6BAA6B,OAAO,EAAE;AACnE,SAAO;AACT;AAIA,eAAsB,WAAW,SAAS;AACxC,QAAM,SAAS,SAAS,OAAO;AAC/B,MAAI,CAAC,OAAQ,OAAM,IAAI,MAAM,6BAA6B,OAAO,EAAE;AACnE,SAAO,OAAO;AAChB;AAIA,eAAsB,kBAAkB,SAAS;AAC/C,QAAM,SAAS,mBAAmB,OAAO;AACzC,MAAI,CAAC,OAAQ,OAAM,IAAI,MAAM,6BAA6B,OAAO,EAAE;AACnE,SAAO,OAAO;AAChB;",
|
|
6
6
|
"names": []
|
package/_esm/core/_version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_version.js","sourceRoot":"","sources":["../../core/_version.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,MAAM,CAAC,MAAM,OAAO,GAAW,
|
|
1
|
+
{"version":3,"file":"_version.js","sourceRoot":"","sources":["../../core/_version.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,MAAM,CAAC,MAAM,OAAO,GAAW,WAAW,CAAC;AAC3C,MAAM,CAAC,MAAM,OAAO,GAAW,YAAY,CAAC"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { asUint32BigInt, tryParseUintBigIntString, randomUniqueUints } from '../../../base/uint.js';
|
|
1
|
+
import { asUint32BigInt, tryParseUintBigIntString } from '../../../base/uint.js';
|
|
3
2
|
import { getTrustedClient } from '../../../runtime/CoreFhevm-p.js';
|
|
4
|
-
import {
|
|
5
|
-
import { getKmsSignersPrivateKeyMap } from './signers.js';
|
|
3
|
+
import { signKmsSigncryptedShares } from './signers.js';
|
|
6
4
|
import { isForgeFhevmV1, readPlaintexts, xorMaskWithPublicKey } from './forgeFhevmV1.js';
|
|
7
5
|
import { readCurrentKmsSignersContext } from '../../../host-contracts/readKmsSignersContext-p.js';
|
|
8
6
|
////////////////////////////////////////////////////////////////////////////////
|
|
@@ -39,10 +37,10 @@ async function runDelegatedUserDecryptOffChain(relayerClient, payload, fhevmCont
|
|
|
39
37
|
////////////////////////////////////////////////////////////////////////////////
|
|
40
38
|
// runDelegatedUserDecryptOnChain
|
|
41
39
|
////////////////////////////////////////////////////////////////////////////////
|
|
42
|
-
const
|
|
40
|
+
const delegatedUserDecryptV1Abi = [
|
|
43
41
|
{
|
|
44
42
|
type: 'function',
|
|
45
|
-
name: '
|
|
43
|
+
name: 'delegatedUserDecryptV1',
|
|
46
44
|
inputs: [
|
|
47
45
|
{
|
|
48
46
|
name: 'pairs',
|
|
@@ -57,31 +55,39 @@ const delegatedUserDecryptAbi = [
|
|
|
57
55
|
},
|
|
58
56
|
],
|
|
59
57
|
},
|
|
60
|
-
{ name: 'delegator', type: 'address', internalType: 'address' },
|
|
61
|
-
{ name: 'delegate', type: 'address', internalType: 'address' },
|
|
62
|
-
{ name: 'publicKey', type: 'bytes', internalType: 'bytes' },
|
|
63
58
|
{
|
|
64
|
-
name: '
|
|
65
|
-
type: '
|
|
66
|
-
internalType: '
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
59
|
+
name: 'permit',
|
|
60
|
+
type: 'tuple',
|
|
61
|
+
internalType: 'struct DelegatedUserDecryptPermitV1',
|
|
62
|
+
components: [
|
|
63
|
+
{ name: 'delegateAddress', type: 'address', internalType: 'address' },
|
|
64
|
+
{ name: 'publicKey', type: 'bytes', internalType: 'bytes' },
|
|
65
|
+
{
|
|
66
|
+
name: 'contractAddresses',
|
|
67
|
+
type: 'address[]',
|
|
68
|
+
internalType: 'address[]',
|
|
69
|
+
},
|
|
70
|
+
{ name: 'delegatorAddress', type: 'address', internalType: 'address' },
|
|
71
|
+
{
|
|
72
|
+
name: 'startTimestamp',
|
|
73
|
+
type: 'uint256',
|
|
74
|
+
internalType: 'uint256',
|
|
75
|
+
},
|
|
76
|
+
{
|
|
77
|
+
name: 'durationDays',
|
|
78
|
+
type: 'uint256',
|
|
79
|
+
internalType: 'uint256',
|
|
80
|
+
},
|
|
81
|
+
{ name: 'extraData', type: 'bytes', internalType: 'bytes' },
|
|
82
|
+
],
|
|
77
83
|
},
|
|
78
|
-
{ name: '
|
|
84
|
+
{ name: 'signature', type: 'bytes', internalType: 'bytes' },
|
|
79
85
|
],
|
|
80
86
|
outputs: [
|
|
81
87
|
{ name: 'payload', type: 'bytes', internalType: 'bytes' },
|
|
82
88
|
{ name: 'signers', type: 'address[]', internalType: 'address[]' },
|
|
83
89
|
{ name: 'threshold', type: 'uint256', internalType: 'uint256' },
|
|
84
|
-
{ name: '
|
|
90
|
+
{ name: 'signedExtraData', type: 'bytes', internalType: 'bytes' },
|
|
85
91
|
],
|
|
86
92
|
stateMutability: 'view',
|
|
87
93
|
},
|
|
@@ -90,23 +96,27 @@ async function runDelegatedUserDecryptOnChain(relayerClient, payload) {
|
|
|
90
96
|
const { kmsDecryptEip712Message, kmsDecryptEip712Signer, kmsDecryptEip712Signature } = payload;
|
|
91
97
|
const pairs = payload.handleContractPairs;
|
|
92
98
|
const trustedClient = getTrustedClient(relayerClient);
|
|
99
|
+
// The permit's extraData is passed verbatim, as in fetchUserDecryptV1.
|
|
93
100
|
const res = (await relayerClient.runtime.ethereum.readContract(trustedClient, {
|
|
94
|
-
abi:
|
|
101
|
+
abi: delegatedUserDecryptV1Abi,
|
|
95
102
|
address: relayerClient.chain.fhevm.contracts.kmsVerifier.address,
|
|
96
103
|
args: [
|
|
97
104
|
pairs.map((p) => ({
|
|
98
105
|
handle: p.handle.bytes32Hex,
|
|
99
106
|
contractAddress: p.contractAddress,
|
|
100
107
|
})),
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
108
|
+
{
|
|
109
|
+
delegateAddress: kmsDecryptEip712Signer,
|
|
110
|
+
publicKey: kmsDecryptEip712Message.publicKey,
|
|
111
|
+
contractAddresses: kmsDecryptEip712Message.contractAddresses,
|
|
112
|
+
delegatorAddress: kmsDecryptEip712Message.delegatorAddress,
|
|
113
|
+
startTimestamp: _parseUintBigIntString('kmsDecryptEip712Message.startTimestamp', kmsDecryptEip712Message.startTimestamp),
|
|
114
|
+
durationDays: _parseUintBigIntString('kmsDecryptEip712Message.durationDays', kmsDecryptEip712Message.durationDays),
|
|
115
|
+
extraData: kmsDecryptEip712Message.extraData,
|
|
116
|
+
},
|
|
107
117
|
kmsDecryptEip712Signature,
|
|
108
118
|
],
|
|
109
|
-
functionName:
|
|
119
|
+
functionName: delegatedUserDecryptV1Abi[0].name,
|
|
110
120
|
}));
|
|
111
121
|
const commonKmsSigncryptedSharePayload = res[0];
|
|
112
122
|
const signersAddress = res[1];
|
|
@@ -121,7 +131,6 @@ async function runDelegatedUserDecryptOnChain(relayerClient, payload) {
|
|
|
121
131
|
}
|
|
122
132
|
////////////////////////////////////////////////////////////////////////////////
|
|
123
133
|
export async function fetchDelegatedUserDecrypt(relayerClient, parameters) {
|
|
124
|
-
const cleartextEthereumModule = relayerClient.runtime.ethereum;
|
|
125
134
|
const { payload, fhevmContext } = parameters;
|
|
126
135
|
const pairs = payload.handleContractPairs;
|
|
127
136
|
const contractAddresses = payload.kmsDecryptEip712Message.contractAddresses;
|
|
@@ -146,24 +155,7 @@ export async function fetchDelegatedUserDecrypt(relayerClient, parameters) {
|
|
|
146
155
|
else {
|
|
147
156
|
res = await runDelegatedUserDecryptOnChain(relayerClient, payload);
|
|
148
157
|
}
|
|
149
|
-
|
|
150
|
-
const extraData = res.extraData;
|
|
151
|
-
const threshold = res.threshold;
|
|
152
|
-
const signersAddress = res.signersAddress;
|
|
153
|
-
const signers = getKmsSignersPrivateKeyMap(relayerClient);
|
|
154
|
-
const randomSignersAddress = randomUniqueUints(signersAddress.length, Number(threshold)).map(
|
|
155
|
-
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
156
|
-
(i) => signersAddress[i]);
|
|
157
|
-
const result = [];
|
|
158
|
-
for (const signerAddress of randomSignersAddress) {
|
|
159
|
-
const privateKey = signers.get(signerAddress);
|
|
160
|
-
if (privateKey === undefined) {
|
|
161
|
-
throw new Error(`Unable to find KMS signer for address ${signerAddress}`);
|
|
162
|
-
}
|
|
163
|
-
const signature = await cleartextEthereumModule.sign({ hash: commonKmsSigncryptedSharePayload, privateKey });
|
|
164
|
-
result.push({ signature: remove0x(signature), payload: remove0x(commonKmsSigncryptedSharePayload), extraData });
|
|
165
|
-
}
|
|
166
|
-
return userDecryptResultToKmsSigncryptedShares(result);
|
|
158
|
+
return signKmsSigncryptedShares(relayerClient, { ...res, threshold: Number(res.threshold) });
|
|
167
159
|
}
|
|
168
160
|
////////////////////////////////////////////////////////////////////////////////
|
|
169
161
|
function _parseUintBigIntString(label, value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchDelegatedUserDecryptV1.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fetchDelegatedUserDecryptV1.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzF,OAAO,EAAE,4BAA4B,EAAE,MAAM,oDAAoD,CAAC;AAElG,gFAAgF;AAChF,kCAAkC;AAClC,gFAAgF;AAEhF,KAAK,UAAU,+BAA+B,CAC5C,aAAuC,EACvC,OAAuD,EACvD,YAAsC;IAOtC,MAAM,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC;IAC5C,MAAM,KAAK,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAC1C,MAAM,aAAa,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAEtD,MAAM,aAAa,GAAG,MAAM,cAAc,CACxC,aAAa,EACb,aAAa,EACb,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAC3B,CAAC;IAEF,MAAM,wBAAwB,GAAsB,MAAM,4BAA4B,CAAC,aAAa,EAAE;QACpG,kBAAkB,EAAE,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,OAA6B;QACjG,qBAAqB,EAAE,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,cAAc,EAAE,OAE9D;QACb,YAAY;KACb,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,wBAAwB,CAAC,OAAO,CAAC;IACxD,MAAM,SAAS,GAAG,wBAAwB,CAAC,SAAS,CAAC;IAErD,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,uBAAuB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IAEhG,6EAA6E;IAC7E,iFAAiF;IACjF,wEAAwE;IACxE,MAAM,SAAS,GAAG,uBAAuB,CAAC,SAAS,CAAC;IAEpD,MAAM,gCAAgC,GAAG,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC7E,KAAK,EAAE,CAAC,WAAW,EAAE,OAAO,CAAC;QAC7B,MAAM,EAAE,CAAC,gBAAgB,EAAE,SAAS,CAAC;KACtC,CAAC,CAAC;IAEH,OAAO;QACL,cAAc;QACd,SAAS,EAAE,MAAM,CAAC,SAAS,CAAiB;QAC5C,gCAAgC;QAChC,SAAS;KACV,CAAC;AACJ,CAAC;AAED,gFAAgF;AAChF,iCAAiC;AACjC,gFAAgF;AAEhF,MAAM,yBAAyB,GAAG;IAChC;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,wBAAwB;QAC9B,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;gBACE,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,OAAO;gBACb,YAAY,EAAE,qCAAqC;gBACnD,UAAU,EAAE;oBACV,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;oBACrE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE;oBAC3D;wBACE,IAAI,EAAE,mBAAmB;wBACzB,IAAI,EAAE,WAAW;wBACjB,YAAY,EAAE,WAAW;qBAC1B;oBACD,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;oBACtE;wBACE,IAAI,EAAE,gBAAgB;wBACtB,IAAI,EAAE,SAAS;wBACf,YAAY,EAAE,SAAS;qBACxB;oBACD;wBACE,IAAI,EAAE,cAAc;wBACpB,IAAI,EAAE,SAAS;wBACf,YAAY,EAAE,SAAS;qBACxB;oBACD,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE;iBAC5D;aACF;YACD,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE;SAC5D;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,iBAAiB,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE;SAClE;QACD,eAAe,EAAE,MAAM;KACxB;CACO,CAAC;AAEX,KAAK,UAAU,8BAA8B,CAC3C,aAAuC,EACvC,OAAuD;IAOvD,MAAM,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,GAAG,OAAO,CAAC;IAC/F,MAAM,KAAK,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAC1C,MAAM,aAAa,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;IACtD,uEAAuE;IACvE,MAAM,GAAG,GAAG,CAAC,MAAM,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QAC5E,GAAG,EAAE,yBAAyB;QAC9B,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;gBACE,eAAe,EAAE,sBAAsB;gBACvC,SAAS,EAAE,uBAAuB,CAAC,SAAS;gBAC5C,iBAAiB,EAAE,uBAAuB,CAAC,iBAAiB;gBAC5D,gBAAgB,EAAE,uBAAuB,CAAC,gBAAgB;gBAC1D,cAAc,EAAE,sBAAsB,CACpC,wCAAwC,EACxC,uBAAuB,CAAC,cAAc,CACvC;gBACD,YAAY,EAAE,sBAAsB,CAClC,sCAAsC,EACtC,uBAAuB,CAAC,YAAY,CACrC;gBACD,SAAS,EAAE,uBAAuB,CAAC,SAAS;aAC7C;YACD,yBAAyB;SAC1B;QACD,YAAY,EAAE,yBAAyB,CAAC,CAAC,CAAC,CAAC,IAAI;KAChD,CAAC,CAAc,CAAC;IAEjB,MAAM,gCAAgC,GAAG,GAAG,CAAC,CAAC,CAAa,CAAC;IAC5D,MAAM,cAAc,GAAG,GAAG,CAAC,CAAC,CAAkC,CAAC;IAC/D,MAAM,SAAS,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACzC,MAAM,SAAS,GAAG,GAAG,CAAC,CAAC,CAAa,CAAC;IAErC,OAAO;QACL,gCAAgC;QAChC,cAAc;QACd,SAAS;QACT,SAAS;KACV,CAAC;AACJ,CAAC;AAED,gFAAgF;AAEhF,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,aAAuC,EACvC,UAA+C;IAE/C,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC;IAC7C,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,QAAQ,GAAG,MAAM,cAAc,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;IAEnE,IAAI,GAAG,CAAC;IACR,IAAI,QAAQ,EAAE,CAAC;QACb,GAAG,GAAG,MAAM,+BAA+B,CAAC,aAAa,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;IACpF,CAAC;SAAM,CAAC;QACN,GAAG,GAAG,MAAM,8BAA8B,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACrE,CAAC;IAED,OAAO,wBAAwB,CAAC,aAAa,EAAE,EAAE,GAAG,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;AAC/F,CAAC;AAED,gFAAgF;AAEhF,SAAS,sBAAsB,CAAC,KAAa,EAAE,KAAa;IAC1D,MAAM,EAAE,GAAG,wBAAwB,CAAC,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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { getTrustedClient } from '../../../runtime/CoreFhevm-p.js';
|
|
2
|
-
import { getKmsSignersPrivateKeyMap } from './signers.js';
|
|
2
|
+
import { getKmsSignersPrivateKeyMap, pickRespondingKmsSigners } from './signers.js';
|
|
3
3
|
import { encodeTypedCleartexts, isForgeFhevmV1, readPlaintexts } from './forgeFhevmV1.js';
|
|
4
4
|
import { createKmsEip712Domain } from '../../../kms/createKmsEip712Domain.js';
|
|
5
5
|
import { readCurrentKmsSignersContext } from '../../../host-contracts/readKmsSignersContext-p.js';
|
|
@@ -9,7 +9,10 @@ const publicDecryptAbi = [
|
|
|
9
9
|
{
|
|
10
10
|
type: 'function',
|
|
11
11
|
name: 'publicDecrypt',
|
|
12
|
-
inputs: [
|
|
12
|
+
inputs: [
|
|
13
|
+
{ name: 'handles', type: 'bytes32[]', internalType: 'bytes32[]' },
|
|
14
|
+
{ name: 'extraData', type: 'bytes', internalType: 'bytes' },
|
|
15
|
+
],
|
|
13
16
|
outputs: [
|
|
14
17
|
{
|
|
15
18
|
name: 'abiEncodedCleartexts',
|
|
@@ -19,7 +22,7 @@ const publicDecryptAbi = [
|
|
|
19
22
|
{ name: 'digest', type: 'bytes32', internalType: 'bytes32' },
|
|
20
23
|
{ name: 'signers', type: 'address[]', internalType: 'address[]' },
|
|
21
24
|
{ name: 'threshold', type: 'uint256', internalType: 'uint256' },
|
|
22
|
-
{ name: '
|
|
25
|
+
{ name: 'signedExtraData', type: 'bytes', internalType: 'bytes' },
|
|
23
26
|
],
|
|
24
27
|
stateMutability: 'view',
|
|
25
28
|
},
|
|
@@ -68,6 +71,7 @@ async function runPublicDecryptOffChain(relayerClient, payload, fhevmContext) {
|
|
|
68
71
|
orderedAbiEncodedClearValues,
|
|
69
72
|
digest,
|
|
70
73
|
signersAddress: currentKmsSignersContext.signers,
|
|
74
|
+
threshold: currentKmsSignersContext.threshold,
|
|
71
75
|
extraData,
|
|
72
76
|
};
|
|
73
77
|
}
|
|
@@ -76,20 +80,23 @@ async function runPublicDecryptOffChain(relayerClient, payload, fhevmContext) {
|
|
|
76
80
|
////////////////////////////////////////////////////////////////////////////////
|
|
77
81
|
async function runPublicDecryptOnChain(relayerClient, payload) {
|
|
78
82
|
const trustedClient = getTrustedClient(relayerClient);
|
|
83
|
+
// The host signs over exactly the requested extraData and returns the signers of the context it names.
|
|
79
84
|
const res = (await relayerClient.runtime.ethereum.readContract(trustedClient, {
|
|
80
85
|
abi: publicDecryptAbi,
|
|
81
86
|
address: relayerClient.chain.fhevm.contracts.kmsVerifier.address,
|
|
82
|
-
args: [payload.orderedHandles.map((h) => h.bytes32Hex)],
|
|
87
|
+
args: [payload.orderedHandles.map((h) => h.bytes32Hex), payload.extraData],
|
|
83
88
|
functionName: publicDecryptAbi[0].name,
|
|
84
89
|
}));
|
|
85
90
|
const orderedAbiEncodedClearValues = res[0];
|
|
86
91
|
const digest = res[1];
|
|
87
92
|
const signersAddress = res[2];
|
|
93
|
+
const threshold = Number(res[3]);
|
|
88
94
|
const extraData = res[4];
|
|
89
95
|
return {
|
|
90
96
|
orderedAbiEncodedClearValues,
|
|
91
97
|
digest,
|
|
92
98
|
signersAddress,
|
|
99
|
+
threshold,
|
|
93
100
|
extraData,
|
|
94
101
|
};
|
|
95
102
|
}
|
|
@@ -105,14 +112,13 @@ export async function fetchPublicDecrypt(relayerClient, parameters) {
|
|
|
105
112
|
res = await runPublicDecryptOnChain(relayerClient, parameters.payload);
|
|
106
113
|
}
|
|
107
114
|
const digest = res.digest;
|
|
108
|
-
const signersAddress = res.signersAddress;
|
|
109
115
|
const signers = getKmsSignersPrivateKeyMap(relayerClient);
|
|
116
|
+
const responders = pickRespondingKmsSigners(res.signersAddress, res.threshold);
|
|
110
117
|
const kmsPublicDecryptEip712Signatures = [];
|
|
111
|
-
for (
|
|
112
|
-
|
|
113
|
-
const privateKey = signers.get(signersAddress[i]);
|
|
118
|
+
for (const signerAddress of responders) {
|
|
119
|
+
const privateKey = signers.get(signerAddress);
|
|
114
120
|
if (privateKey === undefined) {
|
|
115
|
-
throw new Error(
|
|
121
|
+
throw new Error(`Unable to find KMS signer for address ${signerAddress} (${responders.length} of ${res.signersAddress.length} responding)`);
|
|
116
122
|
}
|
|
117
123
|
const signature = await cleartextEthereumModule.sign({ hash: digest, privateKey });
|
|
118
124
|
kmsPublicDecryptEip712Signatures.push(signature);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchPublicDecrypt.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchPublicDecrypt.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"fetchPublicDecrypt.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchPublicDecrypt.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { asUint32BigInt, tryParseUintBigIntString, randomUniqueUints } from '../../../base/uint.js';
|
|
1
|
+
import { asUint32BigInt, tryParseUintBigIntString } from '../../../base/uint.js';
|
|
3
2
|
import { getTrustedClient } from '../../../runtime/CoreFhevm-p.js';
|
|
4
|
-
import {
|
|
5
|
-
import { getKmsSignersPrivateKeyMap } from './signers.js';
|
|
3
|
+
import { signKmsSigncryptedShares } from './signers.js';
|
|
6
4
|
import { readCurrentKmsSignersContext } from '../../../host-contracts/readKmsSignersContext-p.js';
|
|
7
5
|
import { isForgeFhevmV1, readPlaintexts, xorMaskWithPublicKey } from './forgeFhevmV1.js';
|
|
8
6
|
////////////////////////////////////////////////////////////////////////////////
|
|
@@ -39,10 +37,10 @@ async function runUserDecryptOffChain(relayerClient, payload, fhevmContext) {
|
|
|
39
37
|
////////////////////////////////////////////////////////////////////////////////
|
|
40
38
|
// runUserDecryptOnChain
|
|
41
39
|
////////////////////////////////////////////////////////////////////////////////
|
|
42
|
-
const
|
|
40
|
+
const userDecryptV1Abi = [
|
|
43
41
|
{
|
|
44
42
|
type: 'function',
|
|
45
|
-
name: '
|
|
43
|
+
name: 'userDecryptV1',
|
|
46
44
|
inputs: [
|
|
47
45
|
{
|
|
48
46
|
name: 'pairs',
|
|
@@ -57,30 +55,38 @@ const userDecryptAbi = [
|
|
|
57
55
|
},
|
|
58
56
|
],
|
|
59
57
|
},
|
|
60
|
-
{ name: 'userAddress', type: 'address', internalType: 'address' },
|
|
61
|
-
{ name: 'publicKey', type: 'bytes', internalType: 'bytes' },
|
|
62
58
|
{
|
|
63
|
-
name: '
|
|
64
|
-
type: '
|
|
65
|
-
internalType: '
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
59
|
+
name: 'permit',
|
|
60
|
+
type: 'tuple',
|
|
61
|
+
internalType: 'struct UserDecryptPermitV1',
|
|
62
|
+
components: [
|
|
63
|
+
{ name: 'userAddress', type: 'address', internalType: 'address' },
|
|
64
|
+
{ name: 'publicKey', type: 'bytes', internalType: 'bytes' },
|
|
65
|
+
{
|
|
66
|
+
name: 'contractAddresses',
|
|
67
|
+
type: 'address[]',
|
|
68
|
+
internalType: 'address[]',
|
|
69
|
+
},
|
|
70
|
+
{
|
|
71
|
+
name: 'startTimestamp',
|
|
72
|
+
type: 'uint256',
|
|
73
|
+
internalType: 'uint256',
|
|
74
|
+
},
|
|
75
|
+
{
|
|
76
|
+
name: 'durationDays',
|
|
77
|
+
type: 'uint256',
|
|
78
|
+
internalType: 'uint256',
|
|
79
|
+
},
|
|
80
|
+
{ name: 'extraData', type: 'bytes', internalType: 'bytes' },
|
|
81
|
+
],
|
|
76
82
|
},
|
|
77
|
-
{ name: '
|
|
83
|
+
{ name: 'signature', type: 'bytes', internalType: 'bytes' },
|
|
78
84
|
],
|
|
79
85
|
outputs: [
|
|
80
86
|
{ name: 'payload', type: 'bytes', internalType: 'bytes' },
|
|
81
87
|
{ name: 'signers', type: 'address[]', internalType: 'address[]' },
|
|
82
88
|
{ name: 'threshold', type: 'uint256', internalType: 'uint256' },
|
|
83
|
-
{ name: '
|
|
89
|
+
{ name: 'signedExtraData', type: 'bytes', internalType: 'bytes' },
|
|
84
90
|
],
|
|
85
91
|
stateMutability: 'view',
|
|
86
92
|
},
|
|
@@ -89,22 +95,27 @@ async function runUserDecryptOnChain(relayerClient, payload) {
|
|
|
89
95
|
const { kmsDecryptEip712Message, kmsDecryptEip712Signer, kmsDecryptEip712Signature } = payload;
|
|
90
96
|
const pairs = payload.handleContractPairs;
|
|
91
97
|
const trustedClient = getTrustedClient(relayerClient);
|
|
98
|
+
// The permit's extraData is passed verbatim: the host verifies the signature over it and returns the
|
|
99
|
+
// signers of the KMS context it names, which may no longer be the current one.
|
|
92
100
|
const res = (await relayerClient.runtime.ethereum.readContract(trustedClient, {
|
|
93
|
-
abi:
|
|
101
|
+
abi: userDecryptV1Abi,
|
|
94
102
|
address: relayerClient.chain.fhevm.contracts.kmsVerifier.address,
|
|
95
103
|
args: [
|
|
96
104
|
pairs.map((p) => ({
|
|
97
105
|
handle: p.handle.bytes32Hex,
|
|
98
106
|
contractAddress: p.contractAddress,
|
|
99
107
|
})),
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
108
|
+
{
|
|
109
|
+
userAddress: kmsDecryptEip712Signer,
|
|
110
|
+
publicKey: kmsDecryptEip712Message.publicKey,
|
|
111
|
+
contractAddresses: kmsDecryptEip712Message.contractAddresses,
|
|
112
|
+
startTimestamp: _parseUintBigIntString('kmsDecryptEip712Message.startTimestamp', kmsDecryptEip712Message.startTimestamp),
|
|
113
|
+
durationDays: _parseUintBigIntString('kmsDecryptEip712Message.durationDays', kmsDecryptEip712Message.durationDays),
|
|
114
|
+
extraData: kmsDecryptEip712Message.extraData,
|
|
115
|
+
},
|
|
105
116
|
kmsDecryptEip712Signature,
|
|
106
117
|
],
|
|
107
|
-
functionName:
|
|
118
|
+
functionName: userDecryptV1Abi[0].name,
|
|
108
119
|
}));
|
|
109
120
|
const commonKmsSigncryptedSharePayload = res[0];
|
|
110
121
|
const signersAddress = res[1];
|
|
@@ -119,7 +130,6 @@ async function runUserDecryptOnChain(relayerClient, payload) {
|
|
|
119
130
|
}
|
|
120
131
|
////////////////////////////////////////////////////////////////////////////////
|
|
121
132
|
export async function fetchUserDecryptV1(relayerClient, parameters) {
|
|
122
|
-
const cleartextEthereumModule = relayerClient.runtime.ethereum;
|
|
123
133
|
const { payload, fhevmContext } = parameters;
|
|
124
134
|
const pairs = payload.handleContractPairs;
|
|
125
135
|
const contractAddresses = payload.kmsDecryptEip712Message.contractAddresses;
|
|
@@ -144,24 +154,7 @@ export async function fetchUserDecryptV1(relayerClient, parameters) {
|
|
|
144
154
|
else {
|
|
145
155
|
res = await runUserDecryptOnChain(relayerClient, payload);
|
|
146
156
|
}
|
|
147
|
-
|
|
148
|
-
const extraData = res.extraData;
|
|
149
|
-
const threshold = res.threshold;
|
|
150
|
-
const signersAddress = res.signersAddress;
|
|
151
|
-
const signers = getKmsSignersPrivateKeyMap(relayerClient);
|
|
152
|
-
const randomSignersAddress = randomUniqueUints(signersAddress.length, Number(threshold)).map(
|
|
153
|
-
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
154
|
-
(i) => signersAddress[i]);
|
|
155
|
-
const result = [];
|
|
156
|
-
for (const signerAddress of randomSignersAddress) {
|
|
157
|
-
const privateKey = signers.get(signerAddress);
|
|
158
|
-
if (privateKey === undefined) {
|
|
159
|
-
throw new Error(`Unable to find KMS signer for address ${signerAddress}`);
|
|
160
|
-
}
|
|
161
|
-
const signature = await cleartextEthereumModule.sign({ hash: commonKmsSigncryptedSharePayload, privateKey });
|
|
162
|
-
result.push({ signature: remove0x(signature), payload: remove0x(commonKmsSigncryptedSharePayload), extraData });
|
|
163
|
-
}
|
|
164
|
-
return userDecryptResultToKmsSigncryptedShares(result);
|
|
157
|
+
return signKmsSigncryptedShares(relayerClient, { ...res, threshold: Number(res.threshold) });
|
|
165
158
|
}
|
|
166
159
|
////////////////////////////////////////////////////////////////////////////////
|
|
167
160
|
function _parseUintBigIntString(label, value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchUserDecryptV1.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchUserDecryptV1.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fetchUserDecryptV1.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchUserDecryptV1.ts"],"names":[],"mappings":"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"}
|