@fhevm/sdk 0.14.5 → 0.14.6
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/actions/chain/fetchFheEncryptionKeyBytes.js +2 -1
- package/_cjs/core/actions/chain/fetchFheEncryptionKeyBytes.js.map +1 -1
- package/_cjs/core/chains/definitions/mainnet.js +3 -0
- package/_cjs/core/chains/definitions/mainnet.js.map +1 -1
- package/_cjs/core/chains/definitions/sepolia.js +3 -0
- package/_cjs/core/chains/definitions/sepolia.js.map +1 -1
- package/_cjs/core/clients/decorators/base.js.map +1 -1
- package/_cjs/core/clients/decorators/encrypt.js +4 -0
- package/_cjs/core/clients/decorators/encrypt.js.map +1 -1
- package/_cjs/core/coprocessor/ZkProofBuilder-p.js.map +1 -1
- package/_cjs/core/coprocessor/encrypt.js +5 -1
- package/_cjs/core/coprocessor/encrypt.js.map +1 -1
- package/_cjs/core/errors/FheEncryptionKeyVerificationError.js +14 -0
- package/_cjs/core/errors/FheEncryptionKeyVerificationError.js.map +1 -0
- package/_cjs/core/errors/FhevmErrorBase.js +0 -1
- package/_cjs/core/errors/FhevmErrorBase.js.map +1 -1
- package/_cjs/core/errors/RelayerErrorBase.js +0 -1
- package/_cjs/core/errors/RelayerErrorBase.js.map +1 -1
- package/_cjs/core/host-contracts/HostContractVersion-p.js +2 -0
- package/_cjs/core/host-contracts/HostContractVersion-p.js.map +1 -1
- package/_cjs/core/host-contracts/abi-fragments/fragments.js +50 -1
- package/_cjs/core/host-contracts/abi-fragments/fragments.js.map +1 -1
- package/_cjs/core/key/FheEncryptionKeyCache-p.js +50 -56
- package/_cjs/core/key/FheEncryptionKeyCache-p.js.map +1 -1
- package/_cjs/core/key/copyFheEncryptionKeyBytes-p.js +17 -0
- package/_cjs/core/key/copyFheEncryptionKeyBytes-p.js.map +1 -0
- package/_cjs/core/key/ensureFheEncryptionKeyDownload.js +134 -0
- package/_cjs/core/key/ensureFheEncryptionKeyDownload.js.map +1 -0
- package/_cjs/core/key/fetchFheEncryptionKey.js +4 -24
- package/_cjs/core/key/fetchFheEncryptionKey.js.map +1 -1
- package/_cjs/core/key/fetchFheEncryptionKeyBytes.js +2 -32
- package/_cjs/core/key/fetchFheEncryptionKeyBytes.js.map +1 -1
- package/_cjs/core/key/verifyFheEncryptionKeyBytes-p.js +245 -0
- package/_cjs/core/key/verifyFheEncryptionKeyBytes-p.js.map +1 -0
- package/_cjs/core/modules/encrypt/mock.js +7 -90
- package/_cjs/core/modules/encrypt/mock.js.map +1 -1
- package/_cjs/core/modules/encrypt/module/api-p.js +0 -65
- package/_cjs/core/modules/encrypt/module/api-p.js.map +1 -1
- package/_cjs/core/modules/encrypt/module/index.js +0 -3
- package/_cjs/core/modules/encrypt/module/index.js.map +1 -1
- package/_cjs/core/modules/relayer/cleartext/mock.js +1 -0
- package/_cjs/core/modules/relayer/cleartext/mock.js.map +1 -1
- package/_cjs/core/runtime/CoreFhevm-p.js +88 -11
- package/_cjs/core/runtime/CoreFhevm-p.js.map +1 -1
- package/_cjs/core/types/index.js.map +1 -1
- package/_cjs/ethers/clients/createFhevmDecryptClient.js +4 -1
- package/_cjs/ethers/clients/createFhevmDecryptClient.js.map +1 -1
- package/_cjs/viem/clients/createFhevmDecryptClient.js +4 -1
- package/_cjs/viem/clients/createFhevmDecryptClient.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/actions/chain/fetchFheEncryptionKeyBytes.js +7 -1
- package/_esm/core/actions/chain/fetchFheEncryptionKeyBytes.js.map +1 -1
- package/_esm/core/chains/definitions/mainnet.js +3 -0
- package/_esm/core/chains/definitions/mainnet.js.map +1 -1
- package/_esm/core/chains/definitions/sepolia.js +3 -0
- package/_esm/core/chains/definitions/sepolia.js.map +1 -1
- package/_esm/core/clients/decorators/base.js.map +1 -1
- package/_esm/core/clients/decorators/encrypt-p.js +1 -1
- package/_esm/core/clients/decorators/encrypt-p.js.map +1 -1
- package/_esm/core/clients/decorators/encrypt.js +6 -0
- package/_esm/core/clients/decorators/encrypt.js.map +1 -1
- package/_esm/core/coprocessor/ZkProofBuilder-p.js +1 -1
- package/_esm/core/coprocessor/ZkProofBuilder-p.js.map +1 -1
- package/_esm/core/coprocessor/encrypt.js +5 -1
- package/_esm/core/coprocessor/encrypt.js.map +1 -1
- package/_esm/core/errors/FheEncryptionKeyVerificationError.js +15 -0
- package/_esm/core/errors/FheEncryptionKeyVerificationError.js.map +1 -0
- package/_esm/core/errors/FhevmErrorBase.js +0 -1
- package/_esm/core/errors/FhevmErrorBase.js.map +1 -1
- package/_esm/core/errors/RelayerErrorBase.js +0 -1
- package/_esm/core/errors/RelayerErrorBase.js.map +1 -1
- package/_esm/core/host-contracts/HostContractVersion-p.js +2 -1
- package/_esm/core/host-contracts/HostContractVersion-p.js.map +1 -1
- package/_esm/core/host-contracts/abi-fragments/fragments.js +61 -0
- package/_esm/core/host-contracts/abi-fragments/fragments.js.map +1 -1
- package/_esm/core/key/FheEncryptionKeyCache-p.js +91 -75
- package/_esm/core/key/FheEncryptionKeyCache-p.js.map +1 -1
- package/_esm/core/key/copyFheEncryptionKeyBytes-p.js +21 -0
- package/_esm/core/key/copyFheEncryptionKeyBytes-p.js.map +1 -0
- package/_esm/core/key/ensureFheEncryptionKeyDownload.js +213 -0
- package/_esm/core/key/ensureFheEncryptionKeyDownload.js.map +1 -0
- package/_esm/core/key/fetchFheEncryptionKey.js +6 -26
- package/_esm/core/key/fetchFheEncryptionKey.js.map +1 -1
- package/_esm/core/key/fetchFheEncryptionKeyBytes.js +4 -41
- package/_esm/core/key/fetchFheEncryptionKeyBytes.js.map +1 -1
- package/_esm/core/key/verifyFheEncryptionKeyBytes-p.js +345 -0
- package/_esm/core/key/verifyFheEncryptionKeyBytes-p.js.map +1 -0
- package/_esm/core/modules/encrypt/mock.js +7 -96
- package/_esm/core/modules/encrypt/mock.js.map +1 -1
- package/_esm/core/modules/encrypt/module/api-p.js +0 -71
- package/_esm/core/modules/encrypt/module/api-p.js.map +1 -1
- package/_esm/core/modules/encrypt/module/index.js +1 -4
- package/_esm/core/modules/encrypt/module/index.js.map +1 -1
- package/_esm/core/modules/relayer/cleartext/mock.js +1 -0
- package/_esm/core/modules/relayer/cleartext/mock.js.map +1 -1
- package/_esm/core/runtime/CoreFhevm-p.js +128 -15
- package/_esm/core/runtime/CoreFhevm-p.js.map +1 -1
- package/_esm/core/types/index.js.map +1 -1
- package/_esm/ethers/clients/createFhevmDecryptClient.js +5 -1
- package/_esm/ethers/clients/createFhevmDecryptClient.js.map +1 -1
- package/_esm/viem/clients/createFhevmDecryptClient.js +5 -1
- package/_esm/viem/clients/createFhevmDecryptClient.js.map +1 -1
- package/_types/core/actions/chain/fetchFheEncryptionKeyBytes.d.ts +5 -0
- package/_types/core/actions/chain/fetchFheEncryptionKeyBytes.d.ts.map +1 -1
- package/_types/core/chains/definitions/mainnet.d.ts +3 -0
- package/_types/core/chains/definitions/mainnet.d.ts.map +1 -1
- package/_types/core/chains/definitions/sepolia.d.ts.map +1 -1
- package/_types/core/clients/decorators/base.d.ts +4 -1
- package/_types/core/clients/decorators/base.d.ts.map +1 -1
- package/_types/core/clients/decorators/encrypt.d.ts.map +1 -1
- package/_types/core/coprocessor/ZkProofBuilder-p.d.ts +2 -4
- package/_types/core/coprocessor/ZkProofBuilder-p.d.ts.map +1 -1
- package/_types/core/coprocessor/encrypt.d.ts +2 -8
- package/_types/core/coprocessor/encrypt.d.ts.map +1 -1
- package/_types/core/errors/FheEncryptionKeyVerificationError.d.ts +16 -0
- package/_types/core/errors/FheEncryptionKeyVerificationError.d.ts.map +1 -0
- package/_types/core/errors/FhevmErrorBase.d.ts.map +1 -1
- package/_types/core/errors/RelayerErrorBase.d.ts.map +1 -1
- package/_types/core/errors/TfheError.d.ts +1 -1
- package/_types/core/host-contracts/HostContractVersion-p.d.ts +4 -0
- package/_types/core/host-contracts/HostContractVersion-p.d.ts.map +1 -1
- package/_types/core/host-contracts/abi-fragments/fragments.d.ts +12 -0
- package/_types/core/host-contracts/abi-fragments/fragments.d.ts.map +1 -1
- package/_types/core/key/FheEncryptionKeyCache-p.d.ts +45 -21
- package/_types/core/key/FheEncryptionKeyCache-p.d.ts.map +1 -1
- package/_types/core/key/copyFheEncryptionKeyBytes-p.d.ts +9 -0
- package/_types/core/key/copyFheEncryptionKeyBytes-p.d.ts.map +1 -0
- package/_types/core/key/ensureFheEncryptionKeyDownload.d.ts +73 -0
- package/_types/core/key/ensureFheEncryptionKeyDownload.d.ts.map +1 -0
- package/_types/core/key/fetchFheEncryptionKey.d.ts +2 -4
- package/_types/core/key/fetchFheEncryptionKey.d.ts.map +1 -1
- package/_types/core/key/fetchFheEncryptionKeyBytes.d.ts +2 -4
- package/_types/core/key/fetchFheEncryptionKeyBytes.d.ts.map +1 -1
- package/_types/core/key/verifyFheEncryptionKeyBytes-p.d.ts +61 -0
- package/_types/core/key/verifyFheEncryptionKeyBytes-p.d.ts.map +1 -0
- package/_types/core/modules/encrypt/mock.d.ts +1 -4
- package/_types/core/modules/encrypt/mock.d.ts.map +1 -1
- package/_types/core/modules/encrypt/module/api-p.d.ts +1 -4
- package/_types/core/modules/encrypt/module/api-p.d.ts.map +1 -1
- package/_types/core/modules/encrypt/module/index.d.ts.map +1 -1
- package/_types/core/modules/encrypt/types.d.ts +2 -26
- package/_types/core/modules/encrypt/types.d.ts.map +1 -1
- package/_types/core/modules/relayer/cleartext/mock.d.ts.map +1 -1
- package/_types/core/modules/relayer/types.d.ts +9 -1
- package/_types/core/modules/relayer/types.d.ts.map +1 -1
- package/_types/core/runtime/CoreFhevm-p.d.ts +23 -1
- package/_types/core/runtime/CoreFhevm-p.d.ts.map +1 -1
- package/_types/core/types/coreFhevmClient.d.ts +31 -4
- package/_types/core/types/coreFhevmClient.d.ts.map +1 -1
- package/_types/core/types/fhevmChain.d.ts +7 -0
- package/_types/core/types/fhevmChain.d.ts.map +1 -1
- package/_types/core/types/hostContract.d.ts +1 -0
- package/_types/core/types/hostContract.d.ts.map +1 -1
- package/_types/core/types/index.d.ts +1 -0
- package/_types/core/types/index.d.ts.map +1 -1
- package/_types/core/types/zkProofBuilder-p.d.ts +2 -4
- package/_types/core/types/zkProofBuilder-p.d.ts.map +1 -1
- package/_types/ethers/cleartext/createFhevmCleartextBaseClient.d.ts +1 -1
- package/_types/ethers/cleartext/createFhevmCleartextBaseClient.d.ts.map +1 -1
- package/_types/ethers/cleartext/createFhevmCleartextClient.d.ts +1 -1
- package/_types/ethers/cleartext/createFhevmCleartextClient.d.ts.map +1 -1
- package/_types/ethers/cleartext/createFhevmCleartextDecryptClient.d.ts +1 -1
- package/_types/ethers/cleartext/createFhevmCleartextDecryptClient.d.ts.map +1 -1
- package/_types/ethers/cleartext/createFhevmCleartextEncryptClient.d.ts +1 -1
- package/_types/ethers/cleartext/createFhevmCleartextEncryptClient.d.ts.map +1 -1
- package/_types/ethers/clients/createFhevmBaseClient.d.ts +1 -1
- package/_types/ethers/clients/createFhevmBaseClient.d.ts.map +1 -1
- package/_types/ethers/clients/createFhevmClient.d.ts +2 -2
- package/_types/ethers/clients/createFhevmClient.d.ts.map +1 -1
- package/_types/ethers/clients/createFhevmDecryptClient.d.ts +2 -2
- package/_types/ethers/clients/createFhevmDecryptClient.d.ts.map +1 -1
- package/_types/ethers/clients/createFhevmEncryptClient.d.ts +2 -2
- package/_types/ethers/clients/createFhevmEncryptClient.d.ts.map +1 -1
- package/_types/viem/cleartext/createFhevmCleartextBaseClient.d.ts +1 -1
- package/_types/viem/cleartext/createFhevmCleartextBaseClient.d.ts.map +1 -1
- package/_types/viem/cleartext/createFhevmCleartextClient.d.ts +1 -1
- package/_types/viem/cleartext/createFhevmCleartextClient.d.ts.map +1 -1
- package/_types/viem/cleartext/createFhevmCleartextDecryptClient.d.ts +1 -1
- package/_types/viem/cleartext/createFhevmCleartextDecryptClient.d.ts.map +1 -1
- package/_types/viem/cleartext/createFhevmCleartextEncryptClient.d.ts +1 -1
- package/_types/viem/cleartext/createFhevmCleartextEncryptClient.d.ts.map +1 -1
- package/_types/viem/clients/createFhevmBaseClient.d.ts +1 -1
- package/_types/viem/clients/createFhevmBaseClient.d.ts.map +1 -1
- package/_types/viem/clients/createFhevmClient.d.ts +2 -2
- package/_types/viem/clients/createFhevmClient.d.ts.map +1 -1
- package/_types/viem/clients/createFhevmDecryptClient.d.ts +2 -2
- package/_types/viem/clients/createFhevmDecryptClient.d.ts.map +1 -1
- package/_types/viem/clients/createFhevmEncryptClient.d.ts +2 -2
- package/_types/viem/clients/createFhevmEncryptClient.d.ts.map +1 -1
- package/core/_version.ts +1 -1
- package/core/actions/chain/fetchFheEncryptionKeyBytes.ts +7 -1
- package/core/chains/definitions/mainnet.ts +3 -0
- package/core/chains/definitions/sepolia.ts +3 -0
- package/core/clients/decorators/base.ts +4 -1
- package/core/clients/decorators/encrypt-p.ts +1 -1
- package/core/clients/decorators/encrypt.ts +6 -0
- package/core/coprocessor/ZkProofBuilder-p.ts +3 -5
- package/core/coprocessor/encrypt.ts +10 -10
- package/core/errors/FheEncryptionKeyVerificationError.ts +27 -0
- package/core/errors/FhevmErrorBase.ts +0 -1
- package/core/errors/RelayerErrorBase.ts +0 -1
- package/core/errors/TfheError.ts +1 -1
- package/core/host-contracts/HostContractVersion-p.ts +2 -1
- package/core/host-contracts/abi-fragments/fragments.ts +69 -0
- package/core/key/FheEncryptionKeyCache-p.ts +92 -91
- package/core/key/copyFheEncryptionKeyBytes-p.ts +23 -0
- package/core/key/ensureFheEncryptionKeyDownload.ts +293 -0
- package/core/key/fetchFheEncryptionKey.ts +8 -35
- package/core/key/fetchFheEncryptionKeyBytes.ts +7 -56
- package/core/key/verifyFheEncryptionKeyBytes-p.ts +452 -0
- package/core/modules/encrypt/mock.ts +4 -149
- package/core/modules/encrypt/module/api-p.ts +1 -126
- package/core/modules/encrypt/module/index.ts +0 -12
- package/core/modules/encrypt/types.ts +2 -57
- package/core/modules/relayer/cleartext/mock.ts +1 -0
- package/core/modules/relayer/types.ts +9 -1
- package/core/runtime/CoreFhevm-p.ts +159 -21
- package/core/types/coreFhevmClient.ts +33 -4
- package/core/types/fhevmChain.ts +7 -0
- package/core/types/hostContract.ts +2 -0
- package/core/types/index.ts +1 -0
- package/core/types/zkProofBuilder-p.ts +2 -1
- package/ethers/cleartext/createFhevmCleartextBaseClient.ts +1 -1
- package/ethers/cleartext/createFhevmCleartextClient.ts +1 -1
- package/ethers/cleartext/createFhevmCleartextDecryptClient.ts +1 -1
- package/ethers/cleartext/createFhevmCleartextEncryptClient.ts +1 -1
- package/ethers/clients/createFhevmBaseClient.ts +1 -1
- package/ethers/clients/createFhevmClient.ts +2 -2
- package/ethers/clients/createFhevmDecryptClient.ts +7 -3
- package/ethers/clients/createFhevmEncryptClient.ts +2 -2
- package/package.json +1 -1
- package/viem/cleartext/createFhevmCleartextBaseClient.ts +1 -1
- package/viem/cleartext/createFhevmCleartextClient.ts +1 -1
- package/viem/cleartext/createFhevmCleartextDecryptClient.ts +1 -1
- package/viem/cleartext/createFhevmCleartextEncryptClient.ts +1 -1
- package/viem/clients/createFhevmBaseClient.ts +1 -1
- package/viem/clients/createFhevmClient.ts +2 -2
- package/viem/clients/createFhevmDecryptClient.ts +7 -3
- package/viem/clients/createFhevmEncryptClient.ts +2 -2
- package/_cjs/core/key/serializeFheEncryptionKey.js +0 -25
- package/_cjs/core/key/serializeFheEncryptionKey.js.map +0 -1
- package/_esm/core/key/serializeFheEncryptionKey.js +0 -24
- package/_esm/core/key/serializeFheEncryptionKey.js.map +0 -1
- package/_types/core/key/serializeFheEncryptionKey.d.ts +0 -6
- package/_types/core/key/serializeFheEncryptionKey.d.ts.map +0 -1
- package/core/key/serializeFheEncryptionKey.ts +0 -42
|
@@ -55,6 +55,13 @@ export class CacheEntryImpl {
|
|
|
55
55
|
writable: true,
|
|
56
56
|
value: void 0
|
|
57
57
|
});
|
|
58
|
+
/** @internal promise on the bytes as fetched, kept after conversion to wasm. Do not use externally. */
|
|
59
|
+
Object.defineProperty(this, "_bytes", {
|
|
60
|
+
enumerable: true,
|
|
61
|
+
configurable: true,
|
|
62
|
+
writable: true,
|
|
63
|
+
value: void 0
|
|
64
|
+
});
|
|
58
65
|
/** @internal debug: true if `_pending` has been chained from (e.g. by ensureWasm). */
|
|
59
66
|
Object.defineProperty(this, "_pendingChained", {
|
|
60
67
|
enumerable: true,
|
|
@@ -92,8 +99,11 @@ function _assertWasmIsTerminal(entry) {
|
|
|
92
99
|
/**
|
|
93
100
|
* Global cache for FHE public key parameters.
|
|
94
101
|
*
|
|
95
|
-
* Keyed by relayer URL
|
|
96
|
-
*
|
|
102
|
+
* Keyed by slot: the relayer URL, then the KMSGeneration contract the key
|
|
103
|
+
* is checked against, or `unverified` for never-verified keys (see
|
|
104
|
+
* {@link getFheEncryptionKeySlot}). Each entry is a
|
|
105
|
+
* live mutable placeholder that callers hold a reference to and observe state
|
|
106
|
+
* changes across awaits.
|
|
97
107
|
*/
|
|
98
108
|
export class FheEncryptionKeyCache {
|
|
99
109
|
constructor() {
|
|
@@ -101,18 +111,18 @@ export class FheEncryptionKeyCache {
|
|
|
101
111
|
_FheEncryptionKeyCache_cache.set(this, new Map());
|
|
102
112
|
}
|
|
103
113
|
////////////////////////////////////////////////////////////////////////////////
|
|
104
|
-
get(
|
|
105
|
-
return __classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").get(
|
|
114
|
+
get(slot) {
|
|
115
|
+
return __classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").get(slot);
|
|
106
116
|
}
|
|
107
|
-
has(
|
|
108
|
-
return __classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").has(
|
|
117
|
+
has(slot) {
|
|
118
|
+
return __classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").has(slot);
|
|
109
119
|
}
|
|
110
|
-
remove(
|
|
111
|
-
const entry = __classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").get(
|
|
120
|
+
remove(slot) {
|
|
121
|
+
const entry = __classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").get(slot);
|
|
112
122
|
if (entry !== undefined) {
|
|
113
123
|
__classPrivateFieldGet(this, _FheEncryptionKeyCache_instances, "m", _FheEncryptionKeyCache_invalidate).call(this, entry);
|
|
114
124
|
}
|
|
115
|
-
return __classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").delete(
|
|
125
|
+
return __classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").delete(slot);
|
|
116
126
|
}
|
|
117
127
|
clear() {
|
|
118
128
|
for (const entry of __classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").values()) {
|
|
@@ -120,46 +130,82 @@ export class FheEncryptionKeyCache {
|
|
|
120
130
|
}
|
|
121
131
|
__classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").clear();
|
|
122
132
|
}
|
|
133
|
+
/**
|
|
134
|
+
* Empties the slot if it still holds `entry`. Unlike `remove`, the entry is
|
|
135
|
+
* not invalidated: callers holding it finish with it.
|
|
136
|
+
*/
|
|
137
|
+
evict(slot, entry) {
|
|
138
|
+
if (__classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").get(slot) === entry) {
|
|
139
|
+
__classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").delete(slot);
|
|
140
|
+
}
|
|
141
|
+
}
|
|
123
142
|
////////////////////////////////////////////////////////////////////////////////
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
143
|
+
/**
|
|
144
|
+
* Stores bytes in an empty slot, unchecked: callers check them first.
|
|
145
|
+
* First write wins: an existing entry (resolved or in-flight) is kept.
|
|
146
|
+
* For tests only (e.g. the browser smoke harness).
|
|
147
|
+
*/
|
|
148
|
+
setBytes(owner, slot, relayerUrl, bytes) {
|
|
149
|
+
// Skip to avoid creating a closure over the key bytes unnecessarily.
|
|
150
|
+
if (__classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").has(slot)) {
|
|
128
151
|
return;
|
|
129
152
|
}
|
|
130
153
|
_assertRelayerUrlMatch(bytes.metadata.relayerUrl, relayerUrl);
|
|
131
154
|
// The closure over `bytes` is ephemeral: ensureBytes calls the fetcher
|
|
132
155
|
// immediately, the promise resolves synchronously, and the closure becomes
|
|
133
|
-
// unreachable.
|
|
156
|
+
// unreachable. The entry keeps `bytes` itself (not a copy), as served.
|
|
134
157
|
this.ensureBytes({
|
|
135
158
|
owner,
|
|
136
|
-
|
|
159
|
+
slot,
|
|
160
|
+
fetcher: () => Promise.resolve(bytes),
|
|
161
|
+
metadata: bytes.metadata,
|
|
162
|
+
});
|
|
163
|
+
}
|
|
164
|
+
/**
|
|
165
|
+
* Stores bytes in the slot, replacing any entry, unchecked: callers check
|
|
166
|
+
* them first. A new entry object takes the slot, so callers holding the old
|
|
167
|
+
* entry finish with the old key.
|
|
168
|
+
*
|
|
169
|
+
* @returns the new entry.
|
|
170
|
+
*/
|
|
171
|
+
replaceBytes(owner, slot, relayerUrl, bytes) {
|
|
172
|
+
// Before emptying the slot: a mismatch leaves the cache as is.
|
|
173
|
+
_assertRelayerUrlMatch(bytes.metadata.relayerUrl, relayerUrl);
|
|
174
|
+
__classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").delete(slot);
|
|
175
|
+
return this.ensureBytes({
|
|
176
|
+
owner,
|
|
177
|
+
slot,
|
|
137
178
|
fetcher: () => Promise.resolve(bytes),
|
|
138
179
|
metadata: bytes.metadata,
|
|
139
180
|
});
|
|
140
181
|
}
|
|
141
182
|
////////////////////////////////////////////////////////////////////////////////
|
|
142
183
|
/**
|
|
143
|
-
* Ensures the cache has an entry for the given
|
|
184
|
+
* Ensures the cache has an entry for the given slot.
|
|
144
185
|
*
|
|
145
186
|
* **First write wins**: if an entry already exists (resolved or in-flight,
|
|
146
187
|
* bytes or wasm), it is kept as-is and the fetcher is never called.
|
|
147
188
|
* Only when no entry exists is the fetcher invoked to start a new fetch.
|
|
148
189
|
*
|
|
149
|
-
* To force a re-fetch, call `remove(
|
|
190
|
+
* To force a re-fetch, call `remove(slot)` before `ensureBytes`.
|
|
191
|
+
*
|
|
192
|
+
* @returns the slot's entry, kept or new.
|
|
150
193
|
*/
|
|
151
194
|
ensureBytes(parameters) {
|
|
152
|
-
const { owner,
|
|
153
|
-
|
|
154
|
-
|
|
195
|
+
const { owner, slot, fetcher, metadata } = parameters;
|
|
196
|
+
const existing = __classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").get(slot);
|
|
197
|
+
if (existing !== undefined) {
|
|
198
|
+
return existing;
|
|
155
199
|
}
|
|
156
200
|
const entry = new CacheEntryImpl(owner, metadata);
|
|
157
201
|
const pendingValue = fetcher();
|
|
158
202
|
entry.pendingKind = 'bytes';
|
|
159
203
|
entry.pendingOp = 'fetching';
|
|
160
204
|
entry._pending = pendingValue;
|
|
161
|
-
entry.
|
|
162
|
-
__classPrivateFieldGet(this,
|
|
205
|
+
entry._bytes = pendingValue;
|
|
206
|
+
entry.ready = __classPrivateFieldGet(this, _FheEncryptionKeyCache_instances, "m", _FheEncryptionKeyCache_makeReady).call(this, slot, entry, 'bytes', pendingValue);
|
|
207
|
+
__classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").set(slot, entry);
|
|
208
|
+
return entry;
|
|
163
209
|
}
|
|
164
210
|
////////////////////////////////////////////////////////////////////////////////
|
|
165
211
|
/**
|
|
@@ -167,13 +213,14 @@ export class FheEncryptionKeyCache {
|
|
|
167
213
|
* If already wasm (pending or resolved), returns the existing entry.
|
|
168
214
|
* Chains from `_pending` so it works whether bytes are resolved or still pending.
|
|
169
215
|
* Idempotent: repeated calls return the same entry.
|
|
216
|
+
*
|
|
217
|
+
* Upgrades `entry`, the one the caller checked, even if another entry has
|
|
218
|
+
* taken the `slot` since.
|
|
170
219
|
*/
|
|
171
220
|
ensureWasm(parameters) {
|
|
172
|
-
const {
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
return;
|
|
176
|
-
}
|
|
221
|
+
const { slot, deserializeFn } = parameters;
|
|
222
|
+
// Entries only come from this cache.
|
|
223
|
+
const entry = parameters.entry;
|
|
177
224
|
if (entry.resolvedKind === 'wasm' || entry.pendingKind === 'wasm') {
|
|
178
225
|
return;
|
|
179
226
|
}
|
|
@@ -189,59 +236,25 @@ export class FheEncryptionKeyCache {
|
|
|
189
236
|
entry.pendingKind = 'wasm';
|
|
190
237
|
entry.pendingOp = 'converting';
|
|
191
238
|
entry._pending = pendingValue;
|
|
192
|
-
entry.ready = __classPrivateFieldGet(this, _FheEncryptionKeyCache_instances, "m", _FheEncryptionKeyCache_makeReady).call(this,
|
|
239
|
+
entry.ready = __classPrivateFieldGet(this, _FheEncryptionKeyCache_instances, "m", _FheEncryptionKeyCache_makeReady).call(this, slot, entry, 'wasm', pendingValue);
|
|
193
240
|
}
|
|
194
241
|
/**
|
|
195
|
-
*
|
|
242
|
+
* The bytes of `entry`, as fetched, whether or not it still holds its slot.
|
|
196
243
|
*
|
|
197
|
-
*
|
|
198
|
-
*
|
|
199
|
-
*
|
|
200
|
-
* - Pending bytes → await, return resolved bytes
|
|
201
|
-
* - Pending wasm → await, serialize to bytes and return
|
|
244
|
+
* Never serializes the wasm value back to bytes: tfhe upgrades older
|
|
245
|
+
* serialization versions on load, so the result could differ from the
|
|
246
|
+
* bytes the relayer served.
|
|
202
247
|
*/
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
if (entry === undefined) {
|
|
207
|
-
return undefined;
|
|
208
|
-
}
|
|
209
|
-
// Bytes already available — return immediately, don't wait for pending wasm
|
|
210
|
-
if (entry.resolvedKind === 'bytes') {
|
|
211
|
-
return entry.value;
|
|
212
|
-
}
|
|
213
|
-
// Wasm already available — serialize to bytes
|
|
214
|
-
if (entry.resolvedKind === 'wasm') {
|
|
215
|
-
if (serializeFn === undefined) {
|
|
216
|
-
throw new Error('Cannot convert wasm to bytes: serialize function not provided');
|
|
217
|
-
}
|
|
218
|
-
return serializeFn(entry.value);
|
|
219
|
-
}
|
|
220
|
-
if (entry.pendingKind === undefined) {
|
|
221
|
-
return undefined;
|
|
222
|
-
}
|
|
223
|
-
await entry.ready;
|
|
224
|
-
// Re-read after potential await — entry is mutable across await boundaries.
|
|
225
|
-
// Cast needed: TS narrows out "bytes" from the early return above,
|
|
226
|
-
// but the entry can become "bytes" during the await.
|
|
227
|
-
const kind = entry.resolvedKind;
|
|
228
|
-
if (kind === 'bytes') {
|
|
229
|
-
return entry.value;
|
|
230
|
-
}
|
|
231
|
-
if (kind === 'wasm') {
|
|
232
|
-
if (serializeFn === undefined) {
|
|
233
|
-
throw new Error('Cannot convert wasm to bytes: serialize function not provided');
|
|
234
|
-
}
|
|
235
|
-
return serializeFn(entry.value);
|
|
236
|
-
}
|
|
237
|
-
return undefined;
|
|
248
|
+
entryBytes(entry) {
|
|
249
|
+
// Entries only come from this cache.
|
|
250
|
+
return entry._bytes;
|
|
238
251
|
}
|
|
239
252
|
}
|
|
240
253
|
_FheEncryptionKeyCache_cache = new WeakMap(), _FheEncryptionKeyCache_instances = new WeakSet(), _FheEncryptionKeyCache_invalidate = function _FheEncryptionKeyCache_invalidate(entry) {
|
|
241
254
|
entry.ready = Promise.resolve();
|
|
242
255
|
entry.pendingKind = undefined;
|
|
243
256
|
entry.pendingOp = undefined;
|
|
244
|
-
}, _FheEncryptionKeyCache_makeReady = function _FheEncryptionKeyCache_makeReady(
|
|
257
|
+
}, _FheEncryptionKeyCache_makeReady = function _FheEncryptionKeyCache_makeReady(slot, entry, resolvedKind, pendingValue) {
|
|
245
258
|
// `ready` is referenced inside the callbacks before this assignment completes,
|
|
246
259
|
// but callbacks are closures that capture the variable binding, not the value.
|
|
247
260
|
// Promise callbacks always run as microtasks (asynchronously), so `ready`
|
|
@@ -250,9 +263,9 @@ _FheEncryptionKeyCache_cache = new WeakMap(), _FheEncryptionKeyCache_instances =
|
|
|
250
263
|
if (entry.ready !== ready) {
|
|
251
264
|
return; // stale: a newer operation replaced us
|
|
252
265
|
}
|
|
253
|
-
// Verify the resolved value's metadata matches the
|
|
266
|
+
// Verify the resolved value's metadata matches the entry's relayer.
|
|
254
267
|
// Catches bugs where a fetcher/deserializer returns data for a different relayer.
|
|
255
|
-
_assertRelayerUrlMatch(resolved.metadata.relayerUrl, relayerUrl);
|
|
268
|
+
_assertRelayerUrlMatch(resolved.metadata.relayerUrl, entry.metadata.relayerUrl);
|
|
256
269
|
entry.resolvedKind = resolvedKind;
|
|
257
270
|
entry.value = resolved;
|
|
258
271
|
entry.pendingKind = undefined;
|
|
@@ -266,14 +279,17 @@ _FheEncryptionKeyCache_cache = new WeakMap(), _FheEncryptionKeyCache_instances =
|
|
|
266
279
|
entry.pendingKind = undefined;
|
|
267
280
|
entry.pendingOp = undefined;
|
|
268
281
|
// Self-evict
|
|
269
|
-
if (__classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").get(
|
|
270
|
-
__classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").delete(
|
|
282
|
+
if (__classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").get(slot) === entry) {
|
|
283
|
+
__classPrivateFieldGet(this, _FheEncryptionKeyCache_cache, "f").delete(slot);
|
|
271
284
|
}
|
|
272
285
|
entry.owner
|
|
273
286
|
.deref()
|
|
274
|
-
?.config.logger?.error?.(`FheEncryptionKeyCache: ${resolvedKind === 'bytes' ? 'fetch' : 'conversion to wasm'} failed for
|
|
287
|
+
?.config.logger?.error?.(`FheEncryptionKeyCache: ${resolvedKind === 'bytes' ? 'fetch' : 'conversion to wasm'} failed for slot="${slot}". Evicting cache entry; the next call will re-fetch.`, err);
|
|
275
288
|
throw err;
|
|
276
289
|
});
|
|
290
|
+
// Callers get the error through `_bytes` or by awaiting `ready`: never
|
|
291
|
+
// leave `ready` unhandled when no one awaits it.
|
|
292
|
+
ready.catch(() => undefined);
|
|
277
293
|
return ready;
|
|
278
294
|
};
|
|
279
295
|
////////////////////////////////////////////////////////////////////////////////
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FheEncryptionKeyCache-p.js","sourceRoot":"","sources":["../../../core/key/FheEncryptionKeyCache-p.ts"],"names":[],"mappings":";;;;;;AAgCA,MAAM,OAAO,cAAc;
|
|
1
|
+
{"version":3,"file":"FheEncryptionKeyCache-p.js","sourceRoot":"","sources":["../../../core/key/FheEncryptionKeyCache-p.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
////////////////////////////////////////////////////////////////////////////////
|
|
2
|
+
/**
|
|
3
|
+
* A copy of the key and CRS bytes, so the verified bytes and the caller's
|
|
4
|
+
* arrays never share a buffer: changing one never changes the other.
|
|
5
|
+
* `new Uint8Array(…)` always copies, even a Node.js `Buffer` (whose `slice`
|
|
6
|
+
* is a view).
|
|
7
|
+
*/
|
|
8
|
+
export function copyFheEncryptionKeyBytes(fheEncryptionKey) {
|
|
9
|
+
return {
|
|
10
|
+
publicKeyBytes: {
|
|
11
|
+
...fheEncryptionKey.publicKeyBytes,
|
|
12
|
+
bytes: new Uint8Array(fheEncryptionKey.publicKeyBytes.bytes),
|
|
13
|
+
},
|
|
14
|
+
crsBytes: {
|
|
15
|
+
...fheEncryptionKey.crsBytes,
|
|
16
|
+
bytes: new Uint8Array(fheEncryptionKey.crsBytes.bytes),
|
|
17
|
+
},
|
|
18
|
+
metadata: { ...fheEncryptionKey.metadata },
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=copyFheEncryptionKeyBytes-p.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"copyFheEncryptionKeyBytes-p.js","sourceRoot":"","sources":["../../../core/key/copyFheEncryptionKeyBytes-p.ts"],"names":[],"mappings":"AAEA,gFAAgF;AAEhF;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CAAC,gBAAuC;IAC/E,OAAO;QACL,cAAc,EAAE;YACd,GAAG,gBAAgB,CAAC,cAAc;YAClC,KAAK,EAAE,IAAI,UAAU,CAAC,gBAAgB,CAAC,cAAc,CAAC,KAAK,CAAC;SAC7D;QACD,QAAQ,EAAE;YACR,GAAG,gBAAgB,CAAC,QAAQ;YAC5B,KAAK,EAAE,IAAI,UAAU,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC;SACvD;QACD,QAAQ,EAAE,EAAE,GAAG,gBAAgB,CAAC,QAAQ,EAAE;KAC3C,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,213 @@
|
|
|
1
|
+
import { unsafeBytesEquals } from '../base/bytes.js';
|
|
2
|
+
import { FheEncryptionKeyVerificationError } from '../errors/FheEncryptionKeyVerificationError.js';
|
|
3
|
+
import { getProvidedFheEncryptionKey, getProvidedFheEncryptionKeyError, releaseProvidedFheEncryptionKey, } from '../runtime/CoreFhevm-p.js';
|
|
4
|
+
import { globalFheEncryptionKeyCache } from './FheEncryptionKeyCache-p.js';
|
|
5
|
+
import { requiresKeyVerification, resolveKmsGeneration, verifyFheEncryptionKeyBytes, } from './verifyFheEncryptionKeyBytes-p.js';
|
|
6
|
+
////////////////////////////////////////////////////////////////////////////////
|
|
7
|
+
/**
|
|
8
|
+
* The client's slot in the global key cache: the relayer URL, then what the
|
|
9
|
+
* key is checked against:
|
|
10
|
+
* - `<relayer URL>|kmsgen:<chain id>:<address>`: the KMSGeneration contract;
|
|
11
|
+
* - `<relayer URL>|unverified`: nothing (see
|
|
12
|
+
* `skipsFheEncryptionKeyVerification`); clients that check keys never
|
|
13
|
+
* read it.
|
|
14
|
+
*
|
|
15
|
+
* Clients share a slot only when they name the same relayer and
|
|
16
|
+
* KMSGeneration, so a wrong setting evicts only its own slot. A client
|
|
17
|
+
* whose RPC returns other state for that same contract (e.g. a fork)
|
|
18
|
+
* still shares the slot and can evict it. Neither suffix contains `|`, so
|
|
19
|
+
* two different slots never give the same string.
|
|
20
|
+
*
|
|
21
|
+
* @throws {FhevmConfigError} when the client cannot check key material.
|
|
22
|
+
* @internal
|
|
23
|
+
*/
|
|
24
|
+
export function getFheEncryptionKeySlot(context) {
|
|
25
|
+
const relayerUrl = context.chain.fhevm.relayerUrl;
|
|
26
|
+
if (!requiresKeyVerification(context.runtime)) {
|
|
27
|
+
return `${relayerUrl}|unverified`;
|
|
28
|
+
}
|
|
29
|
+
const { chainId, address } = resolveKmsGeneration(context);
|
|
30
|
+
return `${relayerUrl}|kmsgen:${chainId}:${address}`;
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* Starts the FHE encryption key download into the global cache, or joins the
|
|
34
|
+
* one in flight, then checks the key against `KMSGeneration` for this client,
|
|
35
|
+
* with its own settings (once per client and key). Builds the relayer request
|
|
36
|
+
* (e.g. auth) for both the bytes and the encryption paths. Does not convert
|
|
37
|
+
* the key.
|
|
38
|
+
*
|
|
39
|
+
* A caller-provided key (`options.fheEncryptionKey`) replaces the download:
|
|
40
|
+
* - equal to the cached key, once downloaded: the cached key is used, checked
|
|
41
|
+
* for this client;
|
|
42
|
+
* - otherwise (including while a download is in flight): checked, then cached,
|
|
43
|
+
* replacing a cached key, which is stale (only one key is active at a time),
|
|
44
|
+
* unless the cache holds the same key by then: that one is used, as above.
|
|
45
|
+
*
|
|
46
|
+
* Outcomes of the check:
|
|
47
|
+
* - pass: a provided key is cached and the client releases it;
|
|
48
|
+
* - {@link FheEncryptionKeyVerificationError}: a downloaded key leaves the
|
|
49
|
+
* cache, the next call downloads again; the client drops a provided key and
|
|
50
|
+
* keeps only the error: later calls throw it, with no RPC call and no
|
|
51
|
+
* download;
|
|
52
|
+
* - any other error (e.g. network): the key stays as is, the next call checks
|
|
53
|
+
* it again.
|
|
54
|
+
*
|
|
55
|
+
* Callers use the returned entry, the one checked, never the slot's current
|
|
56
|
+
* one: another entry may have taken the slot since.
|
|
57
|
+
*
|
|
58
|
+
* @throws {FhevmConfigError} when the client cannot check key material.
|
|
59
|
+
* @throws {FheEncryptionKeyVerificationError} when the key fails the check.
|
|
60
|
+
* @internal
|
|
61
|
+
*/
|
|
62
|
+
export async function ensureFheEncryptionKeyDownload(context, parameters) {
|
|
63
|
+
const relayerUrl = context.chain.fhevm.relayerUrl;
|
|
64
|
+
const runtime = context.runtime;
|
|
65
|
+
const logger = runtime.config.logger;
|
|
66
|
+
// A provided key that failed the check: only its error is left.
|
|
67
|
+
const providedError = getProvidedFheEncryptionKeyError(context);
|
|
68
|
+
if (providedError !== undefined) {
|
|
69
|
+
throw providedError;
|
|
70
|
+
}
|
|
71
|
+
// Checks the client's own setup, even when another client filled the cache.
|
|
72
|
+
const slot = getFheEncryptionKeySlot(context);
|
|
73
|
+
const provided = getProvidedFheEncryptionKey(context);
|
|
74
|
+
if (provided !== undefined) {
|
|
75
|
+
return _useProvidedFheEncryptionKey(context, provided, slot);
|
|
76
|
+
}
|
|
77
|
+
// Caller-provided options override runtime config defaults (e.g. auth)
|
|
78
|
+
const relayerParameters = {
|
|
79
|
+
...parameters,
|
|
80
|
+
options: { auth: context.runtime.config.auth, ...parameters.options },
|
|
81
|
+
};
|
|
82
|
+
// Shared by every client on the slot: a download in flight is joined, and
|
|
83
|
+
// runs with the request options (e.g. auth, abort signal, retries) of the
|
|
84
|
+
// client that started it.
|
|
85
|
+
const entry = globalFheEncryptionKeyCache.ensureBytes({
|
|
86
|
+
owner: runtime,
|
|
87
|
+
slot,
|
|
88
|
+
fetcher: async () => {
|
|
89
|
+
logger?.debug?.(`Fetching FHE encryption key/CRS bytes from relayer "${relayerUrl}" (chainId=${context.chain.id}).`);
|
|
90
|
+
try {
|
|
91
|
+
const bytes = await runtime.relayer.fetchFheEncryptionKeyBytes({ relayerUrl, chainId: context.chain.id }, relayerParameters);
|
|
92
|
+
logger?.debug?.(`Fetched FHE encryption key/CRS bytes from relayer "${relayerUrl}".`);
|
|
93
|
+
return bytes;
|
|
94
|
+
}
|
|
95
|
+
catch (e) {
|
|
96
|
+
logger?.error?.(`Failed to fetch FHE encryption key/CRS bytes from relayer "${relayerUrl}".`, e);
|
|
97
|
+
throw e;
|
|
98
|
+
}
|
|
99
|
+
},
|
|
100
|
+
metadata: { chainId: context.chain.id, relayerUrl },
|
|
101
|
+
});
|
|
102
|
+
return _verifyCachedFheEncryptionKey(context, slot, entry);
|
|
103
|
+
}
|
|
104
|
+
////////////////////////////////////////////////////////////////////////////////
|
|
105
|
+
// Each client's check of each key (bytes object): concurrent calls on a
|
|
106
|
+
// client share one set of KMSGeneration reads. A key that fails the check stays
|
|
107
|
+
// failed; any other error (e.g. network) is retried by the next call.
|
|
108
|
+
const clientVerifications = new WeakMap();
|
|
109
|
+
function _verifyFheEncryptionKeyBytesForClient(context, bytes) {
|
|
110
|
+
if (!requiresKeyVerification(context.runtime)) {
|
|
111
|
+
return Promise.resolve();
|
|
112
|
+
}
|
|
113
|
+
const checks = clientVerifications.get(bytes) ?? new WeakMap();
|
|
114
|
+
clientVerifications.set(bytes, checks);
|
|
115
|
+
return _memoize(checks, context, () => verifyFheEncryptionKeyBytes(context, bytes).then(() => undefined), true);
|
|
116
|
+
}
|
|
117
|
+
async function _verifyCachedFheEncryptionKey(context, slot, entry) {
|
|
118
|
+
const bytes = await globalFheEncryptionKeyCache.entryBytes(entry);
|
|
119
|
+
try {
|
|
120
|
+
await _verifyFheEncryptionKeyBytesForClient(context, bytes);
|
|
121
|
+
}
|
|
122
|
+
catch (e) {
|
|
123
|
+
if (e instanceof FheEncryptionKeyVerificationError) {
|
|
124
|
+
// Clients on this slot check against the same KMSGeneration, so they
|
|
125
|
+
// reject these bytes too (unless their RPC serves other chain state).
|
|
126
|
+
globalFheEncryptionKeyCache.evict(slot, entry);
|
|
127
|
+
}
|
|
128
|
+
throw e;
|
|
129
|
+
}
|
|
130
|
+
return { slot, entry, bytes };
|
|
131
|
+
}
|
|
132
|
+
////////////////////////////////////////////////////////////////////////////////
|
|
133
|
+
// The use of each client's provided key (its own copy): concurrent calls on a
|
|
134
|
+
// client share the one in flight. A failed use is forgotten: the client keeps
|
|
135
|
+
// the error of a key that fails the check (see ensureFheEncryptionKeyDownload),
|
|
136
|
+
// any other error is retried by the next call.
|
|
137
|
+
const providedKeyUses = new WeakMap();
|
|
138
|
+
function _useProvidedFheEncryptionKey(context, provided, slot) {
|
|
139
|
+
return _memoize(providedKeyUses, provided, async () => {
|
|
140
|
+
try {
|
|
141
|
+
const cachedEntry = await _getSameCachedEntry(slot, provided);
|
|
142
|
+
let checked;
|
|
143
|
+
if (cachedEntry !== undefined) {
|
|
144
|
+
checked = await _verifyCachedFheEncryptionKey(context, slot, cachedEntry);
|
|
145
|
+
}
|
|
146
|
+
else {
|
|
147
|
+
await _verifyFheEncryptionKeyBytesForClient(context, provided);
|
|
148
|
+
// Another client may have cached the same key during the check: use
|
|
149
|
+
// its entry rather than orphan it.
|
|
150
|
+
const sameEntry = await _getSameCachedEntry(slot, provided);
|
|
151
|
+
if (sameEntry !== undefined) {
|
|
152
|
+
checked = await _verifyCachedFheEncryptionKey(context, slot, sameEntry);
|
|
153
|
+
}
|
|
154
|
+
else {
|
|
155
|
+
const entry = globalFheEncryptionKeyCache.replaceBytes(context.runtime, slot, context.chain.fhevm.relayerUrl, provided);
|
|
156
|
+
checked = { slot, entry, bytes: provided };
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
// The cache holds the key from now on.
|
|
160
|
+
releaseProvidedFheEncryptionKey(context, provided);
|
|
161
|
+
return checked;
|
|
162
|
+
}
|
|
163
|
+
catch (e) {
|
|
164
|
+
if (e instanceof FheEncryptionKeyVerificationError) {
|
|
165
|
+
// The client keeps only the error, not the bytes.
|
|
166
|
+
releaseProvidedFheEncryptionKey(context, provided, e);
|
|
167
|
+
}
|
|
168
|
+
throw e;
|
|
169
|
+
}
|
|
170
|
+
}, false);
|
|
171
|
+
}
|
|
172
|
+
/**
|
|
173
|
+
* The slot's entry if it holds `provided`'s bytes. Compared only with a cached
|
|
174
|
+
* key already downloaded: never waits for another client's download.
|
|
175
|
+
*/
|
|
176
|
+
async function _getSameCachedEntry(slot, provided) {
|
|
177
|
+
const entry = globalFheEncryptionKeyCache.get(slot);
|
|
178
|
+
if (entry?.resolvedKind === undefined) {
|
|
179
|
+
return undefined;
|
|
180
|
+
}
|
|
181
|
+
const cached = await globalFheEncryptionKeyCache.entryBytes(entry);
|
|
182
|
+
return _sameFheEncryptionKeyBytes(provided, cached) ? entry : undefined;
|
|
183
|
+
}
|
|
184
|
+
/**
|
|
185
|
+
* Memoizes `start()` under `key`: concurrent and later calls share it. A
|
|
186
|
+
* rejection is forgotten, so the next call starts again, except a
|
|
187
|
+
* {@link FheEncryptionKeyVerificationError} when `keepVerificationError`.
|
|
188
|
+
*/
|
|
189
|
+
function _memoize(memo, key, start, keepVerificationError) {
|
|
190
|
+
const memoized = memo.get(key);
|
|
191
|
+
if (memoized !== undefined) {
|
|
192
|
+
return memoized;
|
|
193
|
+
}
|
|
194
|
+
const check = start();
|
|
195
|
+
memo.set(key, check);
|
|
196
|
+
check.catch((e) => {
|
|
197
|
+
if (!(keepVerificationError && e instanceof FheEncryptionKeyVerificationError) && memo.get(key) === check) {
|
|
198
|
+
memo.delete(key);
|
|
199
|
+
}
|
|
200
|
+
});
|
|
201
|
+
return check;
|
|
202
|
+
}
|
|
203
|
+
/**
|
|
204
|
+
* Ids aside: a label id and a 32-byte hex id can name the same bytes. The
|
|
205
|
+
* check against the active ids decides (a relayer serving the right bytes under
|
|
206
|
+
* a wrong id fails the check for clients reusing that entry).
|
|
207
|
+
*/
|
|
208
|
+
function _sameFheEncryptionKeyBytes(a, b) {
|
|
209
|
+
return (a === b ||
|
|
210
|
+
(unsafeBytesEquals(a.publicKeyBytes.bytes, b.publicKeyBytes.bytes) &&
|
|
211
|
+
unsafeBytesEquals(a.crsBytes.bytes, b.crsBytes.bytes)));
|
|
212
|
+
}
|
|
213
|
+
//# sourceMappingURL=ensureFheEncryptionKeyDownload.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ensureFheEncryptionKeyDownload.js","sourceRoot":"","sources":["../../../core/key/ensureFheEncryptionKeyDownload.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,iCAAiC,EAAE,MAAM,gDAAgD,CAAC;AACnG,OAAO,EACL,2BAA2B,EAC3B,gCAAgC,EAChC,+BAA+B,GAChC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EACL,uBAAuB,EACvB,oBAAoB,EACpB,2BAA2B,GAC5B,MAAM,oCAAoC,CAAC;AAa5C,gFAAgF;AAEhF;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,uBAAuB,CAAC,OAIvC;IACC,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC;IAClD,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9C,OAAO,GAAG,UAAU,aAAa,CAAC;IACpC,CAAC;IACD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC3D,OAAO,GAAG,UAAU,WAAW,OAAO,IAAI,OAAO,EAAE,CAAC;AACtD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,OAAgB,EAChB,UAIC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC;IAClD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAChC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;IACrC,gEAAgE;IAChE,MAAM,aAAa,GAAG,gCAAgC,CAAC,OAAO,CAAC,CAAC;IAChE,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAChC,MAAM,aAAa,CAAC;IACtB,CAAC;IAED,4EAA4E;IAC5E,MAAM,IAAI,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAE9C,MAAM,QAAQ,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC;IACtD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,4BAA4B,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC/D,CAAC;IAED,uEAAuE;IACvE,MAAM,iBAAiB,GAAyC;QAC9D,GAAG,UAAU;QACb,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE;KACtE,CAAC;IAEF,0EAA0E;IAC1E,0EAA0E;IAC1E,0BAA0B;IAC1B,MAAM,KAAK,GAAG,2BAA2B,CAAC,WAAW,CAAC;QACpD,KAAK,EAAE,OAAO;QACd,IAAI;QACJ,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,MAAM,EAAE,KAAK,EAAE,CACb,uDAAuD,UAAU,cAAc,OAAO,CAAC,KAAK,CAAC,EAAE,IAAI,CACpG,CAAC;YACF,IAAI,CAAC;gBACH,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,0BAA0B,CAC5D,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,EACzC,iBAAiB,CAClB,CAAC;gBACF,MAAM,EAAE,KAAK,EAAE,CAAC,sDAAsD,UAAU,IAAI,CAAC,CAAC;gBACtF,OAAO,KAAK,CAAC;YACf,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,EAAE,KAAK,EAAE,CAAC,8DAA8D,UAAU,IAAI,EAAE,CAAC,CAAC,CAAC;gBACjG,MAAM,CAAC,CAAC;YACV,CAAC;QACH,CAAC;QACD,QAAQ,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,UAAU,EAAE;KACpD,CAAC,CAAC;IAEH,OAAO,6BAA6B,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;AAC7D,CAAC;AAED,gFAAgF;AAEhF,wEAAwE;AACxE,gFAAgF;AAChF,sEAAsE;AACtE,MAAM,mBAAmB,GAAG,IAAI,OAAO,EAA0D,CAAC;AAElG,SAAS,qCAAqC,CAAC,OAAgB,EAAE,KAA4B;IAC3F,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9C,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IACD,MAAM,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,OAAO,EAA0B,CAAC;IACvF,mBAAmB,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACvC,OAAO,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,2BAA2B,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;AAClH,CAAC;AAED,KAAK,UAAU,6BAA6B,CAC1C,OAAgB,EAChB,IAAY,EACZ,KAAiB;IAEjB,MAAM,KAAK,GAAG,MAAM,2BAA2B,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAClE,IAAI,CAAC;QACH,MAAM,qCAAqC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9D,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,YAAY,iCAAiC,EAAE,CAAC;YACnD,qEAAqE;YACrE,sEAAsE;YACtE,2BAA2B,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACjD,CAAC;QACD,MAAM,CAAC,CAAC;IACV,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AAChC,CAAC;AAED,gFAAgF;AAEhF,8EAA8E;AAC9E,8EAA8E;AAC9E,gFAAgF;AAChF,+CAA+C;AAC/C,MAAM,eAAe,GAAG,IAAI,OAAO,EAA0D,CAAC;AAE9F,SAAS,4BAA4B,CACnC,OAAgB,EAChB,QAA+B,EAC/B,IAAY;IAEZ,OAAO,QAAQ,CACb,eAAe,EACf,QAAQ,EACR,KAAK,IAAqC,EAAE;QAC1C,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,mBAAmB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC9D,IAAI,OAA+B,CAAC;YACpC,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBAC9B,OAAO,GAAG,MAAM,6BAA6B,CAAC,OAAO,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;YAC5E,CAAC;iBAAM,CAAC;gBACN,MAAM,qCAAqC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAC/D,oEAAoE;gBACpE,mCAAmC;gBACnC,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;gBAC5D,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;oBAC5B,OAAO,GAAG,MAAM,6BAA6B,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;gBAC1E,CAAC;qBAAM,CAAC;oBACN,MAAM,KAAK,GAAG,2BAA2B,CAAC,YAAY,CACpD,OAAO,CAAC,OAAO,EACf,IAAI,EACJ,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAC9B,QAAQ,CACT,CAAC;oBACF,OAAO,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;gBAC7C,CAAC;YACH,CAAC;YACD,uCAAuC;YACvC,+BAA+B,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YACnD,OAAO,OAAO,CAAC;QACjB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,YAAY,iCAAiC,EAAE,CAAC;gBACnD,kDAAkD;gBAClD,+BAA+B,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;YACxD,CAAC;YACD,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC,EACD,KAAK,CACN,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,mBAAmB,CAAC,IAAY,EAAE,QAA+B;IAC9E,MAAM,KAAK,GAAG,2BAA2B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACpD,IAAI,KAAK,EAAE,YAAY,KAAK,SAAS,EAAE,CAAC;QACtC,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACnE,OAAO,0BAA0B,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC1E,CAAC;AAED;;;;GAIG;AACH,SAAS,QAAQ,CACf,IAA4B,EAC5B,GAAM,EACN,KAAuB,EACvB,qBAA8B;IAE9B,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC/B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,KAAK,GAAG,KAAK,EAAE,CAAC;IACtB,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACrB,KAAK,CAAC,KAAK,CAAC,CAAC,CAAU,EAAE,EAAE;QACzB,IAAI,CAAC,CAAC,qBAAqB,IAAI,CAAC,YAAY,iCAAiC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE,CAAC;YAC1G,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,SAAS,0BAA0B,CAAC,CAAwB,EAAE,CAAwB;IACpF,OAAO,CACL,CAAC,KAAK,CAAC;QACP,CAAC,iBAAiB,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC;YAChE,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CACzD,CAAC;AACJ,CAAC"}
|
|
@@ -1,37 +1,17 @@
|
|
|
1
1
|
import { deserializeFheEncryptionKey } from './deserializeFheEncryptionKey.js';
|
|
2
2
|
import { globalFheEncryptionKeyCache } from './FheEncryptionKeyCache-p.js';
|
|
3
|
+
import { ensureFheEncryptionKeyDownload } from './ensureFheEncryptionKeyDownload.js';
|
|
3
4
|
export async function fetchFheEncryptionKeyWasm(context, parameters) {
|
|
4
|
-
const relayerUrl = context.chain.fhevm.relayerUrl;
|
|
5
5
|
const runtime = context.runtime;
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
owner: runtime,
|
|
10
|
-
relayerUrl,
|
|
11
|
-
fetcher: async () => {
|
|
12
|
-
logger?.debug?.(`Fetching FHE encryption key/CRS bytes from relayer "${relayerUrl}" (chainId=${context.chain.id}).`);
|
|
13
|
-
try {
|
|
14
|
-
const bytes = await runtime.relayer.fetchFheEncryptionKeyBytes({ relayerUrl, chainId: context.chain.id }, parameters);
|
|
15
|
-
logger?.debug?.(`Fetched FHE encryption key/CRS bytes from relayer "${relayerUrl}".`);
|
|
16
|
-
return bytes;
|
|
17
|
-
}
|
|
18
|
-
catch (e) {
|
|
19
|
-
logger?.error?.(`Failed to fetch FHE encryption key/CRS bytes from relayer "${relayerUrl}".`, e);
|
|
20
|
-
throw e;
|
|
21
|
-
}
|
|
22
|
-
},
|
|
23
|
-
metadata: { chainId: context.chain.id, relayerUrl },
|
|
24
|
-
});
|
|
25
|
-
// Upgrade bytes → wasm (chains from pending bytes if still in-flight)
|
|
6
|
+
// Download (or join the download), then check the key for this client
|
|
7
|
+
const { slot, entry } = await ensureFheEncryptionKeyDownload(context, parameters);
|
|
8
|
+
// Upgrade bytes → wasm, on the entry checked (not the slot's current one)
|
|
26
9
|
globalFheEncryptionKeyCache.ensureWasm({
|
|
27
10
|
owner: runtime,
|
|
28
|
-
|
|
11
|
+
slot,
|
|
12
|
+
entry,
|
|
29
13
|
deserializeFn: (bytes) => deserializeFheEncryptionKey(context, { keyBytes: bytes, fhevmContext: parameters.fhevmContext }),
|
|
30
14
|
});
|
|
31
|
-
const entry = globalFheEncryptionKeyCache.get(relayerUrl);
|
|
32
|
-
if (entry === undefined) {
|
|
33
|
-
throw new Error('Failed to fetch global FHE PKE params');
|
|
34
|
-
}
|
|
35
15
|
await entry.ready;
|
|
36
16
|
if (entry.resolvedKind !== 'wasm') {
|
|
37
17
|
throw new Error('Expected wasm params but got ' + JSON.stringify(entry.resolvedKind));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchFheEncryptionKey.js","sourceRoot":"","sources":["../../../core/key/fetchFheEncryptionKey.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fetchFheEncryptionKey.js","sourceRoot":"","sources":["../../../core/key/fetchFheEncryptionKey.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AAErF,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,OAAiE,EACjE,UAIC;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAEhC,sEAAsE;IACtE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,8BAA8B,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAElF,0EAA0E;IAC1E,2BAA2B,CAAC,UAAU,CAAC;QACrC,KAAK,EAAE,OAAO;QACd,IAAI;QACJ,KAAK;QACL,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE,CACvB,2BAA2B,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC;KACnG,CAAC,CAAC;IAEH,MAAM,KAAK,CAAC,KAAK,CAAC;IAElB,IAAI,KAAK,CAAC,YAAY,KAAK,MAAM,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;IACxF,CAAC;IAED,OAAO,KAAK,CAAC,KAA6B,CAAC;AAC7C,CAAC"}
|