@fhevm/sdk 0.15.0-6 → 0.15.0-7

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.
Files changed (38) hide show
  1. package/_cjs/core/_version.js +1 -1
  2. package/_cjs/core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.js +40 -47
  3. package/_cjs/core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.js.map +1 -1
  4. package/_cjs/core/modules/relayer/cleartext/fetchPublicDecrypt.js +13 -7
  5. package/_cjs/core/modules/relayer/cleartext/fetchPublicDecrypt.js.map +1 -1
  6. package/_cjs/core/modules/relayer/cleartext/fetchUserDecryptV1.js +38 -45
  7. package/_cjs/core/modules/relayer/cleartext/fetchUserDecryptV1.js.map +1 -1
  8. package/_cjs/core/modules/relayer/cleartext/fetchUserDecryptV2.js +104 -2
  9. package/_cjs/core/modules/relayer/cleartext/fetchUserDecryptV2.js.map +1 -1
  10. package/_cjs/core/modules/relayer/cleartext/signers.js +35 -0
  11. package/_cjs/core/modules/relayer/cleartext/signers.js.map +1 -1
  12. package/_cjs/wasm/tfhe/loadTfheLib.js.map +1 -1
  13. package/_cjs/wasm/tkms/loadKmsLib.js.map +1 -1
  14. package/_esm/core/_version.js +1 -1
  15. package/_esm/core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.js +43 -51
  16. package/_esm/core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.js.map +1 -1
  17. package/_esm/core/modules/relayer/cleartext/fetchPublicDecrypt.js +15 -9
  18. package/_esm/core/modules/relayer/cleartext/fetchPublicDecrypt.js.map +1 -1
  19. package/_esm/core/modules/relayer/cleartext/fetchUserDecryptV1.js +42 -49
  20. package/_esm/core/modules/relayer/cleartext/fetchUserDecryptV1.js.map +1 -1
  21. package/_esm/core/modules/relayer/cleartext/fetchUserDecryptV2.js +111 -3
  22. package/_esm/core/modules/relayer/cleartext/fetchUserDecryptV2.js.map +1 -1
  23. package/_esm/core/modules/relayer/cleartext/signers.js +41 -0
  24. package/_esm/core/modules/relayer/cleartext/signers.js.map +1 -1
  25. package/_types/core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.d.ts.map +1 -1
  26. package/_types/core/modules/relayer/cleartext/fetchPublicDecrypt.d.ts.map +1 -1
  27. package/_types/core/modules/relayer/cleartext/fetchUserDecryptV1.d.ts.map +1 -1
  28. package/_types/core/modules/relayer/cleartext/fetchUserDecryptV2.d.ts +1 -1
  29. package/_types/core/modules/relayer/cleartext/fetchUserDecryptV2.d.ts.map +1 -1
  30. package/_types/core/modules/relayer/cleartext/signers.d.ts +13 -0
  31. package/_types/core/modules/relayer/cleartext/signers.d.ts.map +1 -1
  32. package/core/_version.ts +1 -1
  33. package/core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.ts +49 -60
  34. package/core/modules/relayer/cleartext/fetchPublicDecrypt.ts +19 -9
  35. package/core/modules/relayer/cleartext/fetchUserDecryptV1.ts +48 -58
  36. package/core/modules/relayer/cleartext/fetchUserDecryptV2.ts +133 -4
  37. package/core/modules/relayer/cleartext/signers.ts +61 -0
  38. package/package.json +1 -1
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.sdkName = exports.version = void 0;
4
- exports.version = '0.15.0-6';
4
+ exports.version = '0.15.0-7';
5
5
  exports.sdkName = '@fhevm/sdk';
6
6
  //# sourceMappingURL=_version.js.map
@@ -1,10 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.fetchDelegatedUserDecrypt = fetchDelegatedUserDecrypt;
4
- const string_js_1 = require("../../../base/string.js");
5
4
  const uint_js_1 = require("../../../base/uint.js");
6
5
  const CoreFhevm_p_js_1 = require("../../../runtime/CoreFhevm-p.js");
7
- const utils_js_1 = require("../utils.js");
8
6
  const signers_js_1 = require("./signers.js");
9
7
  const forgeFhevmV1_js_1 = require("./forgeFhevmV1.js");
10
8
  const readKmsSignersContext_p_js_1 = require("../../../host-contracts/readKmsSignersContext-p.js");
@@ -33,10 +31,10 @@ async function runDelegatedUserDecryptOffChain(relayerClient, payload, fhevmCont
33
31
  extraData,
34
32
  };
35
33
  }
36
- const delegatedUserDecryptAbi = [
34
+ const delegatedUserDecryptV1Abi = [
37
35
  {
38
36
  type: 'function',
39
- name: 'delegatedUserDecrypt',
37
+ name: 'delegatedUserDecryptV1',
40
38
  inputs: [
41
39
  {
42
40
  name: 'pairs',
@@ -51,31 +49,39 @@ const delegatedUserDecryptAbi = [
51
49
  },
52
50
  ],
53
51
  },
54
- { name: 'delegator', type: 'address', internalType: 'address' },
55
- { name: 'delegate', type: 'address', internalType: 'address' },
56
- { name: 'publicKey', type: 'bytes', internalType: 'bytes' },
57
52
  {
58
- name: 'contractAddresses',
59
- type: 'address[]',
60
- internalType: 'address[]',
61
- },
62
- {
63
- name: 'startTimestamp',
64
- type: 'uint256',
65
- internalType: 'uint256',
66
- },
67
- {
68
- name: 'durationDays',
69
- type: 'uint256',
70
- internalType: 'uint256',
53
+ name: 'permit',
54
+ type: 'tuple',
55
+ internalType: 'struct DelegatedUserDecryptPermitV1',
56
+ components: [
57
+ { name: 'delegateAddress', type: 'address', internalType: 'address' },
58
+ { name: 'publicKey', type: 'bytes', internalType: 'bytes' },
59
+ {
60
+ name: 'contractAddresses',
61
+ type: 'address[]',
62
+ internalType: 'address[]',
63
+ },
64
+ { name: 'delegatorAddress', type: 'address', internalType: 'address' },
65
+ {
66
+ name: 'startTimestamp',
67
+ type: 'uint256',
68
+ internalType: 'uint256',
69
+ },
70
+ {
71
+ name: 'durationDays',
72
+ type: 'uint256',
73
+ internalType: 'uint256',
74
+ },
75
+ { name: 'extraData', type: 'bytes', internalType: 'bytes' },
76
+ ],
71
77
  },
72
- { name: 'delegateSignature', type: 'bytes', internalType: 'bytes' },
78
+ { name: 'signature', type: 'bytes', internalType: 'bytes' },
73
79
  ],
74
80
  outputs: [
75
81
  { name: 'payload', type: 'bytes', internalType: 'bytes' },
76
82
  { name: 'signers', type: 'address[]', internalType: 'address[]' },
77
83
  { name: 'threshold', type: 'uint256', internalType: 'uint256' },
78
- { name: 'extraData', type: 'bytes', internalType: 'bytes' },
84
+ { name: 'signedExtraData', type: 'bytes', internalType: 'bytes' },
79
85
  ],
80
86
  stateMutability: 'view',
81
87
  },
@@ -85,22 +91,25 @@ async function runDelegatedUserDecryptOnChain(relayerClient, payload) {
85
91
  const pairs = payload.handleContractPairs;
86
92
  const trustedClient = (0, CoreFhevm_p_js_1.getTrustedClient)(relayerClient);
87
93
  const res = (await relayerClient.runtime.ethereum.readContract(trustedClient, {
88
- abi: delegatedUserDecryptAbi,
94
+ abi: delegatedUserDecryptV1Abi,
89
95
  address: relayerClient.chain.fhevm.contracts.kmsVerifier.address,
90
96
  args: [
91
97
  pairs.map((p) => ({
92
98
  handle: p.handle.bytes32Hex,
93
99
  contractAddress: p.contractAddress,
94
100
  })),
95
- kmsDecryptEip712Message.delegatorAddress,
96
- kmsDecryptEip712Signer,
97
- kmsDecryptEip712Message.publicKey,
98
- kmsDecryptEip712Message.contractAddresses,
99
- _parseUintBigIntString('kmsDecryptEip712Message.startTimestamp', kmsDecryptEip712Message.startTimestamp),
100
- _parseUintBigIntString('kmsDecryptEip712Message.durationDays', kmsDecryptEip712Message.durationDays),
101
+ {
102
+ delegateAddress: kmsDecryptEip712Signer,
103
+ publicKey: kmsDecryptEip712Message.publicKey,
104
+ contractAddresses: kmsDecryptEip712Message.contractAddresses,
105
+ delegatorAddress: kmsDecryptEip712Message.delegatorAddress,
106
+ startTimestamp: _parseUintBigIntString('kmsDecryptEip712Message.startTimestamp', kmsDecryptEip712Message.startTimestamp),
107
+ durationDays: _parseUintBigIntString('kmsDecryptEip712Message.durationDays', kmsDecryptEip712Message.durationDays),
108
+ extraData: kmsDecryptEip712Message.extraData,
109
+ },
101
110
  kmsDecryptEip712Signature,
102
111
  ],
103
- functionName: delegatedUserDecryptAbi[0].name,
112
+ functionName: delegatedUserDecryptV1Abi[0].name,
104
113
  }));
105
114
  const commonKmsSigncryptedSharePayload = res[0];
106
115
  const signersAddress = res[1];
@@ -114,7 +123,6 @@ async function runDelegatedUserDecryptOnChain(relayerClient, payload) {
114
123
  };
115
124
  }
116
125
  async function fetchDelegatedUserDecrypt(relayerClient, parameters) {
117
- const cleartextEthereumModule = relayerClient.runtime.ethereum;
118
126
  const { payload, fhevmContext } = parameters;
119
127
  const pairs = payload.handleContractPairs;
120
128
  const contractAddresses = payload.kmsDecryptEip712Message.contractAddresses;
@@ -139,22 +147,7 @@ async function fetchDelegatedUserDecrypt(relayerClient, parameters) {
139
147
  else {
140
148
  res = await runDelegatedUserDecryptOnChain(relayerClient, payload);
141
149
  }
142
- const commonKmsSigncryptedSharePayload = res.commonKmsSigncryptedSharePayload;
143
- const extraData = res.extraData;
144
- const threshold = res.threshold;
145
- const signersAddress = res.signersAddress;
146
- const signers = (0, signers_js_1.getKmsSignersPrivateKeyMap)(relayerClient);
147
- const randomSignersAddress = (0, uint_js_1.randomUniqueUints)(signersAddress.length, Number(threshold)).map((i) => signersAddress[i]);
148
- const result = [];
149
- for (const signerAddress of randomSignersAddress) {
150
- const privateKey = signers.get(signerAddress);
151
- if (privateKey === undefined) {
152
- throw new Error(`Unable to find KMS signer for address ${signerAddress}`);
153
- }
154
- const signature = await cleartextEthereumModule.sign({ hash: commonKmsSigncryptedSharePayload, privateKey });
155
- result.push({ signature: (0, string_js_1.remove0x)(signature), payload: (0, string_js_1.remove0x)(commonKmsSigncryptedSharePayload), extraData });
156
- }
157
- return (0, utils_js_1.userDecryptResultToKmsSigncryptedShares)(result);
150
+ return (0, signers_js_1.signKmsSigncryptedShares)(relayerClient, { ...res, threshold: Number(res.threshold) });
158
151
  }
159
152
  function _parseUintBigIntString(label, value) {
160
153
  const bn = (0, uint_js_1.tryParseUintBigIntString)(value);
@@ -1 +1 @@
1
- {"version":3,"file":"fetchDelegatedUserDecryptV1.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fetchDelegatedUserDecryptV1.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.ts"],"names":[],"mappings":"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"}
@@ -11,7 +11,10 @@ const publicDecryptAbi = [
11
11
  {
12
12
  type: 'function',
13
13
  name: 'publicDecrypt',
14
- inputs: [{ name: 'handles', type: 'bytes32[]', internalType: 'bytes32[]' }],
14
+ inputs: [
15
+ { name: 'handles', type: 'bytes32[]', internalType: 'bytes32[]' },
16
+ { name: 'extraData', type: 'bytes', internalType: 'bytes' },
17
+ ],
15
18
  outputs: [
16
19
  {
17
20
  name: 'abiEncodedCleartexts',
@@ -21,7 +24,7 @@ const publicDecryptAbi = [
21
24
  { name: 'digest', type: 'bytes32', internalType: 'bytes32' },
22
25
  { name: 'signers', type: 'address[]', internalType: 'address[]' },
23
26
  { name: 'threshold', type: 'uint256', internalType: 'uint256' },
24
- { name: 'extraData', type: 'bytes', internalType: 'bytes' },
27
+ { name: 'signedExtraData', type: 'bytes', internalType: 'bytes' },
25
28
  ],
26
29
  stateMutability: 'view',
27
30
  },
@@ -57,6 +60,7 @@ async function runPublicDecryptOffChain(relayerClient, payload, fhevmContext) {
57
60
  orderedAbiEncodedClearValues,
58
61
  digest,
59
62
  signersAddress: currentKmsSignersContext.signers,
63
+ threshold: currentKmsSignersContext.threshold,
60
64
  extraData,
61
65
  };
62
66
  }
@@ -65,17 +69,19 @@ async function runPublicDecryptOnChain(relayerClient, payload) {
65
69
  const res = (await relayerClient.runtime.ethereum.readContract(trustedClient, {
66
70
  abi: publicDecryptAbi,
67
71
  address: relayerClient.chain.fhevm.contracts.kmsVerifier.address,
68
- args: [payload.orderedHandles.map((h) => h.bytes32Hex)],
72
+ args: [payload.orderedHandles.map((h) => h.bytes32Hex), payload.extraData],
69
73
  functionName: publicDecryptAbi[0].name,
70
74
  }));
71
75
  const orderedAbiEncodedClearValues = res[0];
72
76
  const digest = res[1];
73
77
  const signersAddress = res[2];
78
+ const threshold = Number(res[3]);
74
79
  const extraData = res[4];
75
80
  return {
76
81
  orderedAbiEncodedClearValues,
77
82
  digest,
78
83
  signersAddress,
84
+ threshold,
79
85
  extraData,
80
86
  };
81
87
  }
@@ -90,13 +96,13 @@ async function fetchPublicDecrypt(relayerClient, parameters) {
90
96
  res = await runPublicDecryptOnChain(relayerClient, parameters.payload);
91
97
  }
92
98
  const digest = res.digest;
93
- const signersAddress = res.signersAddress;
94
99
  const signers = (0, signers_js_1.getKmsSignersPrivateKeyMap)(relayerClient);
100
+ const responders = (0, signers_js_1.pickRespondingKmsSigners)(res.signersAddress, res.threshold);
95
101
  const kmsPublicDecryptEip712Signatures = [];
96
- for (let i = 0; i < signersAddress.length; ++i) {
97
- const privateKey = signers.get(signersAddress[i]);
102
+ for (const signerAddress of responders) {
103
+ const privateKey = signers.get(signerAddress);
98
104
  if (privateKey === undefined) {
99
- throw new Error('Unable to find kms signer');
105
+ throw new Error(`Unable to find KMS signer for address ${signerAddress} (${responders.length} of ${res.signersAddress.length} responding)`);
100
106
  }
101
107
  const signature = await cleartextEthereumModule.sign({ hash: digest, privateKey });
102
108
  kmsPublicDecryptEip712Signatures.push(signature);
@@ -1 +1 @@
1
- {"version":3,"file":"fetchPublicDecrypt.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchPublicDecrypt.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fetchPublicDecrypt.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchPublicDecrypt.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.fetchUserDecryptV1 = fetchUserDecryptV1;
4
- const string_js_1 = require("../../../base/string.js");
5
4
  const uint_js_1 = require("../../../base/uint.js");
6
5
  const CoreFhevm_p_js_1 = require("../../../runtime/CoreFhevm-p.js");
7
- const utils_js_1 = require("../utils.js");
8
6
  const signers_js_1 = require("./signers.js");
9
7
  const readKmsSignersContext_p_js_1 = require("../../../host-contracts/readKmsSignersContext-p.js");
10
8
  const forgeFhevmV1_js_1 = require("./forgeFhevmV1.js");
@@ -33,10 +31,10 @@ async function runUserDecryptOffChain(relayerClient, payload, fhevmContext) {
33
31
  extraData,
34
32
  };
35
33
  }
36
- const userDecryptAbi = [
34
+ const userDecryptV1Abi = [
37
35
  {
38
36
  type: 'function',
39
- name: 'userDecrypt',
37
+ name: 'userDecryptV1',
40
38
  inputs: [
41
39
  {
42
40
  name: 'pairs',
@@ -51,30 +49,38 @@ const userDecryptAbi = [
51
49
  },
52
50
  ],
53
51
  },
54
- { name: 'userAddress', type: 'address', internalType: 'address' },
55
- { name: 'publicKey', type: 'bytes', internalType: 'bytes' },
56
52
  {
57
- name: 'contractAddresses',
58
- type: 'address[]',
59
- internalType: 'address[]',
60
- },
61
- {
62
- name: 'startTimestamp',
63
- type: 'uint256',
64
- internalType: 'uint256',
65
- },
66
- {
67
- name: 'durationDays',
68
- type: 'uint256',
69
- internalType: 'uint256',
53
+ name: 'permit',
54
+ type: 'tuple',
55
+ internalType: 'struct UserDecryptPermitV1',
56
+ components: [
57
+ { name: 'userAddress', type: 'address', internalType: 'address' },
58
+ { name: 'publicKey', type: 'bytes', internalType: 'bytes' },
59
+ {
60
+ name: 'contractAddresses',
61
+ type: 'address[]',
62
+ internalType: 'address[]',
63
+ },
64
+ {
65
+ name: 'startTimestamp',
66
+ type: 'uint256',
67
+ internalType: 'uint256',
68
+ },
69
+ {
70
+ name: 'durationDays',
71
+ type: 'uint256',
72
+ internalType: 'uint256',
73
+ },
74
+ { name: 'extraData', type: 'bytes', internalType: 'bytes' },
75
+ ],
70
76
  },
71
- { name: 'userSignature', type: 'bytes', internalType: 'bytes' },
77
+ { name: 'signature', type: 'bytes', internalType: 'bytes' },
72
78
  ],
73
79
  outputs: [
74
80
  { name: 'payload', type: 'bytes', internalType: 'bytes' },
75
81
  { name: 'signers', type: 'address[]', internalType: 'address[]' },
76
82
  { name: 'threshold', type: 'uint256', internalType: 'uint256' },
77
- { name: 'extraData', type: 'bytes', internalType: 'bytes' },
83
+ { name: 'signedExtraData', type: 'bytes', internalType: 'bytes' },
78
84
  ],
79
85
  stateMutability: 'view',
80
86
  },
@@ -84,21 +90,24 @@ async function runUserDecryptOnChain(relayerClient, payload) {
84
90
  const pairs = payload.handleContractPairs;
85
91
  const trustedClient = (0, CoreFhevm_p_js_1.getTrustedClient)(relayerClient);
86
92
  const res = (await relayerClient.runtime.ethereum.readContract(trustedClient, {
87
- abi: userDecryptAbi,
93
+ abi: userDecryptV1Abi,
88
94
  address: relayerClient.chain.fhevm.contracts.kmsVerifier.address,
89
95
  args: [
90
96
  pairs.map((p) => ({
91
97
  handle: p.handle.bytes32Hex,
92
98
  contractAddress: p.contractAddress,
93
99
  })),
94
- kmsDecryptEip712Signer,
95
- kmsDecryptEip712Message.publicKey,
96
- kmsDecryptEip712Message.contractAddresses,
97
- _parseUintBigIntString('kmsDecryptEip712Message.startTimestamp', kmsDecryptEip712Message.startTimestamp),
98
- _parseUintBigIntString('kmsDecryptEip712Message.durationDays', kmsDecryptEip712Message.durationDays),
100
+ {
101
+ userAddress: kmsDecryptEip712Signer,
102
+ publicKey: kmsDecryptEip712Message.publicKey,
103
+ contractAddresses: kmsDecryptEip712Message.contractAddresses,
104
+ startTimestamp: _parseUintBigIntString('kmsDecryptEip712Message.startTimestamp', kmsDecryptEip712Message.startTimestamp),
105
+ durationDays: _parseUintBigIntString('kmsDecryptEip712Message.durationDays', kmsDecryptEip712Message.durationDays),
106
+ extraData: kmsDecryptEip712Message.extraData,
107
+ },
99
108
  kmsDecryptEip712Signature,
100
109
  ],
101
- functionName: userDecryptAbi[0].name,
110
+ functionName: userDecryptV1Abi[0].name,
102
111
  }));
103
112
  const commonKmsSigncryptedSharePayload = res[0];
104
113
  const signersAddress = res[1];
@@ -112,7 +121,6 @@ async function runUserDecryptOnChain(relayerClient, payload) {
112
121
  };
113
122
  }
114
123
  async function fetchUserDecryptV1(relayerClient, parameters) {
115
- const cleartextEthereumModule = relayerClient.runtime.ethereum;
116
124
  const { payload, fhevmContext } = parameters;
117
125
  const pairs = payload.handleContractPairs;
118
126
  const contractAddresses = payload.kmsDecryptEip712Message.contractAddresses;
@@ -137,22 +145,7 @@ async function fetchUserDecryptV1(relayerClient, parameters) {
137
145
  else {
138
146
  res = await runUserDecryptOnChain(relayerClient, payload);
139
147
  }
140
- const commonKmsSigncryptedSharePayload = res.commonKmsSigncryptedSharePayload;
141
- const extraData = res.extraData;
142
- const threshold = res.threshold;
143
- const signersAddress = res.signersAddress;
144
- const signers = (0, signers_js_1.getKmsSignersPrivateKeyMap)(relayerClient);
145
- const randomSignersAddress = (0, uint_js_1.randomUniqueUints)(signersAddress.length, Number(threshold)).map((i) => signersAddress[i]);
146
- const result = [];
147
- for (const signerAddress of randomSignersAddress) {
148
- const privateKey = signers.get(signerAddress);
149
- if (privateKey === undefined) {
150
- throw new Error(`Unable to find KMS signer for address ${signerAddress}`);
151
- }
152
- const signature = await cleartextEthereumModule.sign({ hash: commonKmsSigncryptedSharePayload, privateKey });
153
- result.push({ signature: (0, string_js_1.remove0x)(signature), payload: (0, string_js_1.remove0x)(commonKmsSigncryptedSharePayload), extraData });
154
- }
155
- return (0, utils_js_1.userDecryptResultToKmsSigncryptedShares)(result);
148
+ return (0, signers_js_1.signKmsSigncryptedShares)(relayerClient, { ...res, threshold: Number(res.threshold) });
156
149
  }
157
150
  function _parseUintBigIntString(label, value) {
158
151
  const bn = (0, uint_js_1.tryParseUintBigIntString)(value);
@@ -1 +1 @@
1
- {"version":3,"file":"fetchUserDecryptV1.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchUserDecryptV1.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fetchUserDecryptV1.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchUserDecryptV1.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,109 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.fetchUserDecryptV2 = fetchUserDecryptV2;
4
- async function fetchUserDecryptV2(_relayerClient, _parameters) {
5
- throw new Error('Not yet implemented');
4
+ const uint_js_1 = require("../../../base/uint.js");
5
+ const CoreFhevm_p_js_1 = require("../../../runtime/CoreFhevm-p.js");
6
+ const signers_js_1 = require("./signers.js");
7
+ const userDecryptV2Abi = [
8
+ {
9
+ type: 'function',
10
+ name: 'userDecryptV2',
11
+ inputs: [
12
+ {
13
+ name: 'handles',
14
+ type: 'tuple[]',
15
+ internalType: 'struct HandleEntry[]',
16
+ components: [
17
+ { name: 'handle', type: 'bytes32', internalType: 'bytes32' },
18
+ {
19
+ name: 'contractAddress',
20
+ type: 'address',
21
+ internalType: 'address',
22
+ },
23
+ {
24
+ name: 'ownerAddress',
25
+ type: 'address',
26
+ internalType: 'address',
27
+ },
28
+ ],
29
+ },
30
+ {
31
+ name: 'permit',
32
+ type: 'tuple',
33
+ internalType: 'struct UserDecryptPermitV2',
34
+ components: [
35
+ { name: 'userAddress', type: 'address', internalType: 'address' },
36
+ { name: 'publicKey', type: 'bytes', internalType: 'bytes' },
37
+ {
38
+ name: 'allowedContracts',
39
+ type: 'address[]',
40
+ internalType: 'address[]',
41
+ },
42
+ {
43
+ name: 'startTimestamp',
44
+ type: 'uint256',
45
+ internalType: 'uint256',
46
+ },
47
+ {
48
+ name: 'durationSeconds',
49
+ type: 'uint256',
50
+ internalType: 'uint256',
51
+ },
52
+ { name: 'extraData', type: 'bytes', internalType: 'bytes' },
53
+ ],
54
+ },
55
+ { name: 'signature', type: 'bytes', internalType: 'bytes' },
56
+ ],
57
+ outputs: [
58
+ { name: 'payload', type: 'bytes', internalType: 'bytes' },
59
+ { name: 'signers', type: 'address[]', internalType: 'address[]' },
60
+ { name: 'threshold', type: 'uint256', internalType: 'uint256' },
61
+ { name: 'signedExtraData', type: 'bytes', internalType: 'bytes' },
62
+ ],
63
+ stateMutability: 'view',
64
+ },
65
+ ];
66
+ async function runUserDecryptV2OnChain(relayerClient, payload) {
67
+ const { kmsDecryptEip712Message, kmsDecryptEip712Signature } = payload;
68
+ const pairs = payload.handleContractPairs;
69
+ const trustedClient = (0, CoreFhevm_p_js_1.getTrustedClient)(relayerClient);
70
+ const res = (await relayerClient.runtime.ethereum.readContract(trustedClient, {
71
+ abi: userDecryptV2Abi,
72
+ address: relayerClient.chain.fhevm.contracts.kmsVerifier.address,
73
+ args: [
74
+ pairs.map((p) => ({
75
+ handle: p.handle.bytes32Hex,
76
+ contractAddress: p.contractAddress,
77
+ ownerAddress: p.ownerAddress,
78
+ })),
79
+ {
80
+ userAddress: kmsDecryptEip712Message.userAddress,
81
+ publicKey: kmsDecryptEip712Message.publicKey,
82
+ allowedContracts: kmsDecryptEip712Message.allowedContracts,
83
+ startTimestamp: _parseUintBigIntString('kmsDecryptEip712Message.startTimestamp', kmsDecryptEip712Message.startTimestamp),
84
+ durationSeconds: _parseUintBigIntString('kmsDecryptEip712Message.durationSeconds', kmsDecryptEip712Message.durationSeconds),
85
+ extraData: kmsDecryptEip712Message.extraData,
86
+ },
87
+ kmsDecryptEip712Signature,
88
+ ],
89
+ functionName: userDecryptV2Abi[0].name,
90
+ }));
91
+ return {
92
+ commonKmsSigncryptedSharePayload: res[0],
93
+ signersAddress: res[1],
94
+ threshold: (0, uint_js_1.asUint32BigInt)(res[2]),
95
+ extraData: res[3],
96
+ };
97
+ }
98
+ async function fetchUserDecryptV2(relayerClient, parameters) {
99
+ const res = await runUserDecryptV2OnChain(relayerClient, parameters.payload);
100
+ return (0, signers_js_1.signKmsSigncryptedShares)(relayerClient, { ...res, threshold: Number(res.threshold) });
101
+ }
102
+ function _parseUintBigIntString(label, value) {
103
+ const bn = (0, uint_js_1.tryParseUintBigIntString)(value);
104
+ if (bn === undefined) {
105
+ throw new Error(`${label} is not a valid uint string, got ${JSON.stringify(value)}`);
106
+ }
107
+ return bn;
6
108
  }
7
109
  //# sourceMappingURL=fetchUserDecryptV2.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"fetchUserDecryptV2.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchUserDecryptV2.ts"],"names":[],"mappings":";;AAKA,gDAKC;AALM,KAAK,UAAU,kBAAkB,CACtC,cAAwC,EACxC,WAAyC;IAEzC,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;AACzC,CAAC"}
1
+ {"version":3,"file":"fetchUserDecryptV2.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchUserDecryptV2.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.isForgeFhevmV1KmsSigner = isForgeFhevmV1KmsSigner;
4
4
  exports.getCoprocessorSignersPrivateKeyMap = getCoprocessorSignersPrivateKeyMap;
5
5
  exports.getKmsSignersPrivateKeyMap = getKmsSignersPrivateKeyMap;
6
+ exports.pickRespondingKmsSigners = pickRespondingKmsSigners;
7
+ exports.signKmsSigncryptedShares = signKmsSigncryptedShares;
8
+ const string_js_1 = require("../../../base/string.js");
9
+ const uint_js_1 = require("../../../base/uint.js");
10
+ const utils_js_1 = require("../utils.js");
6
11
  const FHEVM_TEST_MNEMONIC = 'test test test test test test test future home engine virtual motion';
7
12
  const COPROCESSOR_PATH = "0'/2/";
8
13
  const KMS_PATH = "0'/3/";
@@ -35,6 +40,36 @@ function getKmsSignersPrivateKeyMap(relayerClient) {
35
40
  }
36
41
  return signersPrivateKeyMap.kms;
37
42
  }
43
+ function pickRespondingKmsSigners(signersAddress, threshold) {
44
+ const n = signersAddress.length;
45
+ if (!Number.isInteger(threshold) || threshold < 1 || threshold > n) {
46
+ throw new Error(`Invalid KMS threshold ${threshold} for ${n} signers`);
47
+ }
48
+ let count = threshold + Math.floor(Math.random() * (n - threshold + 1));
49
+ if (count < 1) {
50
+ count = 1;
51
+ }
52
+ if (count > n) {
53
+ count = n;
54
+ }
55
+ return (0, uint_js_1.randomUniqueUints)(n, count).map((i) => signersAddress[i]);
56
+ }
57
+ async function signKmsSigncryptedShares(relayerClient, parameters) {
58
+ const cleartextEthereumModule = relayerClient.runtime.ethereum;
59
+ const { commonKmsSigncryptedSharePayload: payload, extraData, signersAddress, threshold } = parameters;
60
+ const privateKeys = getKmsSignersPrivateKeyMap(relayerClient);
61
+ const responders = pickRespondingKmsSigners(signersAddress, threshold);
62
+ const result = [];
63
+ for (const signerAddress of responders) {
64
+ const privateKey = privateKeys.get(signerAddress);
65
+ if (privateKey === undefined) {
66
+ throw new Error(`Unable to find KMS signer for address ${signerAddress} (${responders.length} of ${signersAddress.length} responding)`);
67
+ }
68
+ const signature = await cleartextEthereumModule.sign({ hash: payload, privateKey });
69
+ result.push({ signature: (0, string_js_1.remove0x)(signature), payload: (0, string_js_1.remove0x)(payload), extraData });
70
+ }
71
+ return (0, utils_js_1.userDecryptResultToKmsSigncryptedShares)(result);
72
+ }
38
73
  function _fillSignersPrivateKey(relayerClient, hdPathSuffix, count, map) {
39
74
  const cleartextEthereumModule = relayerClient.runtime.ethereum;
40
75
  for (let i = 0; i < count; ++i) {
@@ -1 +1 @@
1
- {"version":3,"file":"signers.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/signers.ts"],"names":[],"mappings":";;AAkCA,0DAEC;AAaD,gFASC;AAID,gEAMC;AA9DD,MAAM,mBAAmB,GAAG,sEAAsE,CAAC;AACnG,MAAM,gBAAgB,GAAG,OAAO,CAAC;AACjC,MAAM,QAAQ,GAAG,OAAO,CAAC;AAgBzB,MAAM,iCAAiC,GAA4E;IACjH,OAAO,EAAE,4CAAkE;IAC3E,UAAU,EAAE,oEAAgF;CAC7F,CAAC;AAEF,MAAM,yBAAyB,GAA4E;IACzG,OAAO,EAAE,4CAAkE;IAC3E,UAAU,EAAE,oEAAgF;CAC7F,CAAC;AAEF,SAAgB,uBAAuB,CAAC,aAAiC;IACvE,OAAO,aAAa,EAAE,WAAW,EAAE,KAAK,yBAAyB,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;AAC1F,CAAC;AAMD,MAAM,oBAAoB,GAAyE;IACjG,WAAW,EAAE,IAAI,GAAG,EAAgC;IACpD,GAAG,EAAE,IAAI,GAAG,EAAgC;CAC7C,CAAC;AAIF,SAAgB,kCAAkC,CAAC,aAAuC;IACxF,IAAI,oBAAoB,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QAChD,sBAAsB,CAAC,aAAa,EAAE,gBAAgB,EAAE,EAAE,EAAE,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAC9F,oBAAoB,CAAC,WAAW,CAAC,GAAG,CAClC,iCAAiC,CAAC,OAAO,EACzC,iCAAiC,CAAC,UAAU,CAC7C,CAAC;IACJ,CAAC;IACD,OAAO,oBAAoB,CAAC,WAAW,CAAC;AAC1C,CAAC;AAID,SAAgB,0BAA0B,CAAC,aAAuC;IAChF,IAAI,oBAAoB,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACxC,sBAAsB,CAAC,aAAa,EAAE,QAAQ,EAAE,EAAE,EAAE,oBAAoB,CAAC,GAAG,CAAC,CAAC;QAC9E,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,yBAAyB,CAAC,OAAO,EAAE,yBAAyB,CAAC,UAAU,CAAC,CAAC;IACxG,CAAC;IACD,OAAO,oBAAoB,CAAC,GAAG,CAAC;AAClC,CAAC;AAID,SAAS,sBAAsB,CAC7B,aAAuC,EACvC,YAAoB,EACpB,KAAa,EACb,GAAkB;IAElB,MAAM,uBAAuB,GAAG,aAAa,CAAC,OAAO,CAAC,QAAmC,CAAC;IAC1F,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,uBAAuB,CAAC,iBAAiB,CAAC;YACxD,QAAQ,EAAE,mBAAmB;YAC7B,IAAI,EAAE,aAAa,YAAY,GAAG,CAAC,EAAE;SACtC,CAAC,CAAC;QACH,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"signers.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/signers.ts"],"names":[],"mappings":"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"}