@fhevm/sdk 0.14.4-0 → 0.14.5

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 (78) hide show
  1. package/_cjs/core/_version.js +1 -1
  2. package/_cjs/core/_version.js.map +1 -1
  3. package/_cjs/core/chains/definitions/bscTestnet.js +36 -0
  4. package/_cjs/core/chains/definitions/bscTestnet.js.map +1 -0
  5. package/_cjs/core/chains/index.js +3 -1
  6. package/_cjs/core/chains/index.js.map +1 -1
  7. package/_cjs/core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.js +40 -47
  8. package/_cjs/core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.js.map +1 -1
  9. package/_cjs/core/modules/relayer/cleartext/fetchPublicDecrypt.js +13 -7
  10. package/_cjs/core/modules/relayer/cleartext/fetchPublicDecrypt.js.map +1 -1
  11. package/_cjs/core/modules/relayer/cleartext/fetchUserDecryptV1.js +38 -45
  12. package/_cjs/core/modules/relayer/cleartext/fetchUserDecryptV1.js.map +1 -1
  13. package/_cjs/core/modules/relayer/cleartext/fetchUserDecryptV2.js +104 -2
  14. package/_cjs/core/modules/relayer/cleartext/fetchUserDecryptV2.js.map +1 -1
  15. package/_cjs/core/modules/relayer/cleartext/signers.js +35 -0
  16. package/_cjs/core/modules/relayer/cleartext/signers.js.map +1 -1
  17. package/_cjs/core/modules/relayer/module/RelayerAsyncRequest.js +12 -2
  18. package/_cjs/core/modules/relayer/module/RelayerAsyncRequest.js.map +1 -1
  19. package/_cjs/core/modules/relayer/module/fetchFheEncryptionKeySource.js +5 -3
  20. package/_cjs/core/modules/relayer/module/fetchFheEncryptionKeySource.js.map +1 -1
  21. package/_cjs/core/modules/relayer/module/relayerUrl.js +37 -0
  22. package/_cjs/core/modules/relayer/module/relayerUrl.js.map +1 -1
  23. package/_cjs/wasm/tfhe/loadTfheLib.js.map +1 -1
  24. package/_cjs/wasm/tkms/loadKmsLib.js.map +1 -1
  25. package/_esm/core/_version.js +1 -1
  26. package/_esm/core/_version.js.map +1 -1
  27. package/_esm/core/chains/definitions/bscTestnet.js +33 -0
  28. package/_esm/core/chains/definitions/bscTestnet.js.map +1 -0
  29. package/_esm/core/chains/index.js +1 -0
  30. package/_esm/core/chains/index.js.map +1 -1
  31. package/_esm/core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.js +43 -51
  32. package/_esm/core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.js.map +1 -1
  33. package/_esm/core/modules/relayer/cleartext/fetchPublicDecrypt.js +15 -9
  34. package/_esm/core/modules/relayer/cleartext/fetchPublicDecrypt.js.map +1 -1
  35. package/_esm/core/modules/relayer/cleartext/fetchUserDecryptV1.js +42 -49
  36. package/_esm/core/modules/relayer/cleartext/fetchUserDecryptV1.js.map +1 -1
  37. package/_esm/core/modules/relayer/cleartext/fetchUserDecryptV2.js +111 -3
  38. package/_esm/core/modules/relayer/cleartext/fetchUserDecryptV2.js.map +1 -1
  39. package/_esm/core/modules/relayer/cleartext/signers.js +41 -0
  40. package/_esm/core/modules/relayer/cleartext/signers.js.map +1 -1
  41. package/_esm/core/modules/relayer/module/RelayerAsyncRequest.js +14 -2
  42. package/_esm/core/modules/relayer/module/RelayerAsyncRequest.js.map +1 -1
  43. package/_esm/core/modules/relayer/module/fetchFheEncryptionKeySource.js +7 -4
  44. package/_esm/core/modules/relayer/module/fetchFheEncryptionKeySource.js.map +1 -1
  45. package/_esm/core/modules/relayer/module/relayerUrl.js +48 -1
  46. package/_esm/core/modules/relayer/module/relayerUrl.js.map +1 -1
  47. package/_types/core/_version.d.ts.map +1 -1
  48. package/_types/core/chains/definitions/bscTestnet.d.ts +3 -0
  49. package/_types/core/chains/definitions/bscTestnet.d.ts.map +1 -0
  50. package/_types/core/chains/index.d.ts +1 -0
  51. package/_types/core/chains/index.d.ts.map +1 -1
  52. package/_types/core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.d.ts.map +1 -1
  53. package/_types/core/modules/relayer/cleartext/fetchPublicDecrypt.d.ts.map +1 -1
  54. package/_types/core/modules/relayer/cleartext/fetchUserDecryptV1.d.ts.map +1 -1
  55. package/_types/core/modules/relayer/cleartext/fetchUserDecryptV2.d.ts +1 -1
  56. package/_types/core/modules/relayer/cleartext/fetchUserDecryptV2.d.ts.map +1 -1
  57. package/_types/core/modules/relayer/cleartext/signers.d.ts +13 -0
  58. package/_types/core/modules/relayer/cleartext/signers.d.ts.map +1 -1
  59. package/_types/core/modules/relayer/module/RelayerAsyncRequest.d.ts +1 -0
  60. package/_types/core/modules/relayer/module/RelayerAsyncRequest.d.ts.map +1 -1
  61. package/_types/core/modules/relayer/module/fetchFheEncryptionKeySource.d.ts.map +1 -1
  62. package/_types/core/modules/relayer/module/relayerUrl.d.ts +12 -1
  63. package/_types/core/modules/relayer/module/relayerUrl.d.ts.map +1 -1
  64. package/_types/core/types/relayer.d.ts +6 -0
  65. package/_types/core/types/relayer.d.ts.map +1 -1
  66. package/core/_version.ts +1 -1
  67. package/core/chains/definitions/bscTestnet.ts +34 -0
  68. package/core/chains/index.ts +1 -0
  69. package/core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.ts +49 -60
  70. package/core/modules/relayer/cleartext/fetchPublicDecrypt.ts +19 -9
  71. package/core/modules/relayer/cleartext/fetchUserDecryptV1.ts +48 -58
  72. package/core/modules/relayer/cleartext/fetchUserDecryptV2.ts +133 -4
  73. package/core/modules/relayer/cleartext/signers.ts +61 -0
  74. package/core/modules/relayer/module/RelayerAsyncRequest.ts +11 -2
  75. package/core/modules/relayer/module/fetchFheEncryptionKeySource.ts +12 -4
  76. package/core/modules/relayer/module/relayerUrl.ts +52 -1
  77. package/core/types/relayer.ts +6 -0
  78. package/package.json +1 -1
@@ -1,8 +1,6 @@
1
- import { remove0x } from '../../../base/string.js';
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 { userDecryptResultToKmsSigncryptedShares } from '../utils.js';
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 delegatedUserDecryptAbi = [
40
+ const delegatedUserDecryptV1Abi = [
43
41
  {
44
42
  type: 'function',
45
- name: 'delegatedUserDecrypt',
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: 'contractAddresses',
65
- type: 'address[]',
66
- internalType: 'address[]',
67
- },
68
- {
69
- name: 'startTimestamp',
70
- type: 'uint256',
71
- internalType: 'uint256',
72
- },
73
- {
74
- name: 'durationDays',
75
- type: 'uint256',
76
- internalType: 'uint256',
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: 'delegateSignature', type: 'bytes', internalType: 'bytes' },
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: 'extraData', type: 'bytes', internalType: 'bytes' },
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: delegatedUserDecryptAbi,
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
- kmsDecryptEip712Message.delegatorAddress,
102
- kmsDecryptEip712Signer,
103
- kmsDecryptEip712Message.publicKey,
104
- kmsDecryptEip712Message.contractAddresses,
105
- _parseUintBigIntString('kmsDecryptEip712Message.startTimestamp', kmsDecryptEip712Message.startTimestamp),
106
- _parseUintBigIntString('kmsDecryptEip712Message.durationDays', kmsDecryptEip712Message.durationDays),
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: delegatedUserDecryptAbi[0].name,
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
- const commonKmsSigncryptedSharePayload = res.commonKmsSigncryptedSharePayload;
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":"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"}
1
+ {"version":3,"file":"fetchDelegatedUserDecryptV1.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchDelegatedUserDecryptV1.ts"],"names":[],"mappings":"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"}
@@ -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: [{ name: 'handles', type: 'bytes32[]', internalType: 'bytes32[]' }],
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: 'extraData', type: 'bytes', internalType: 'bytes' },
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 (let i = 0; i < signersAddress.length; ++i) {
112
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
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('Unable to find kms signer');
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":"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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,8 +1,6 @@
1
- import { remove0x } from '../../../base/string.js';
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 { userDecryptResultToKmsSigncryptedShares } from '../utils.js';
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 userDecryptAbi = [
40
+ const userDecryptV1Abi = [
43
41
  {
44
42
  type: 'function',
45
- name: 'userDecrypt',
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: 'contractAddresses',
64
- type: 'address[]',
65
- internalType: 'address[]',
66
- },
67
- {
68
- name: 'startTimestamp',
69
- type: 'uint256',
70
- internalType: 'uint256',
71
- },
72
- {
73
- name: 'durationDays',
74
- type: 'uint256',
75
- internalType: 'uint256',
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: 'userSignature', type: 'bytes', internalType: 'bytes' },
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: 'extraData', type: 'bytes', internalType: 'bytes' },
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: userDecryptAbi,
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
- kmsDecryptEip712Signer,
101
- kmsDecryptEip712Message.publicKey,
102
- kmsDecryptEip712Message.contractAddresses,
103
- _parseUintBigIntString('kmsDecryptEip712Message.startTimestamp', kmsDecryptEip712Message.startTimestamp),
104
- _parseUintBigIntString('kmsDecryptEip712Message.durationDays', kmsDecryptEip712Message.durationDays),
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: userDecryptAbi[0].name,
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
- const commonKmsSigncryptedSharePayload = res.commonKmsSigncryptedSharePayload;
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":"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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,6 +1,114 @@
1
+ import { asUint32BigInt, tryParseUintBigIntString } from '../../../base/uint.js';
2
+ import { getTrustedClient } from '../../../runtime/CoreFhevm-p.js';
3
+ import { signKmsSigncryptedShares } from './signers.js';
1
4
  ////////////////////////////////////////////////////////////////////////////////
2
- // eslint-disable-next-line @typescript-eslint/require-await
3
- export async function fetchUserDecryptV2(_relayerClient, _parameters) {
4
- throw new Error('Not yet implemented');
5
+ // runUserDecryptV2OnChain
6
+ ////////////////////////////////////////////////////////////////////////////////
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 = getTrustedClient(relayerClient);
70
+ // The signed permit fields are passed verbatim, extraData included: the host runs the gateway's and the
71
+ // kms-worker's checks against them and returns the signers of the KMS context the extraData names.
72
+ const res = (await relayerClient.runtime.ethereum.readContract(trustedClient, {
73
+ abi: userDecryptV2Abi,
74
+ address: relayerClient.chain.fhevm.contracts.kmsVerifier.address,
75
+ args: [
76
+ pairs.map((p) => ({
77
+ handle: p.handle.bytes32Hex,
78
+ contractAddress: p.contractAddress,
79
+ ownerAddress: p.ownerAddress,
80
+ })),
81
+ {
82
+ userAddress: kmsDecryptEip712Message.userAddress,
83
+ publicKey: kmsDecryptEip712Message.publicKey,
84
+ allowedContracts: kmsDecryptEip712Message.allowedContracts,
85
+ startTimestamp: _parseUintBigIntString('kmsDecryptEip712Message.startTimestamp', kmsDecryptEip712Message.startTimestamp),
86
+ durationSeconds: _parseUintBigIntString('kmsDecryptEip712Message.durationSeconds', kmsDecryptEip712Message.durationSeconds),
87
+ extraData: kmsDecryptEip712Message.extraData,
88
+ },
89
+ kmsDecryptEip712Signature,
90
+ ],
91
+ functionName: userDecryptV2Abi[0].name,
92
+ }));
93
+ return {
94
+ commonKmsSigncryptedSharePayload: res[0],
95
+ signersAddress: res[1],
96
+ threshold: asUint32BigInt(res[2]),
97
+ extraData: res[3],
98
+ };
99
+ }
100
+ ////////////////////////////////////////////////////////////////////////////////
101
+ export async function fetchUserDecryptV2(relayerClient, parameters) {
102
+ // On chain only: forge-fhevm v1 has no unified (V2) decryption permit path.
103
+ const res = await runUserDecryptV2OnChain(relayerClient, parameters.payload);
104
+ return signKmsSigncryptedShares(relayerClient, { ...res, threshold: Number(res.threshold) });
105
+ }
106
+ ////////////////////////////////////////////////////////////////////////////////
107
+ function _parseUintBigIntString(label, value) {
108
+ const bn = tryParseUintBigIntString(value);
109
+ if (bn === undefined) {
110
+ throw new Error(`${label} is not a valid uint string, got ${JSON.stringify(value)}`);
111
+ }
112
+ return bn;
5
113
  }
6
114
  //# sourceMappingURL=fetchUserDecryptV2.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"fetchUserDecryptV2.js","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/fetchUserDecryptV2.ts"],"names":[],"mappings":"AAEA,gFAAgF;AAEhF,4DAA4D;AAC5D,MAAM,CAAC,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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"}