@inco/js 0.7.1 → 0.7.2

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 (46) hide show
  1. package/dist/cjs/advancedacl/session-key.d.ts +9 -3
  2. package/dist/cjs/advancedacl/session-key.js +18 -7
  3. package/dist/cjs/attestedcompute/attested-compute.d.ts +32 -4
  4. package/dist/cjs/attestedcompute/attested-compute.js +13 -13
  5. package/dist/cjs/attesteddecrypt/attested-decrypt.d.ts +12 -6
  6. package/dist/cjs/attesteddecrypt/attested-decrypt.js +40 -7
  7. package/dist/cjs/attesteddecrypt/types.d.ts +1 -0
  8. package/dist/cjs/generated/es/inco/kms/lite/v1/kms_service_pb.d.ts +28 -14
  9. package/dist/cjs/generated/es/inco/kms/lite/v1/kms_service_pb.js +2 -2
  10. package/dist/cjs/kms/quorumClient.d.ts +1 -1
  11. package/dist/cjs/kms/quorumClient.js +118 -17
  12. package/dist/cjs/lite/attested-compute.d.ts +2 -2
  13. package/dist/cjs/lite/attested-compute.js +3 -3
  14. package/dist/cjs/lite/attested-decrypt.d.ts +2 -2
  15. package/dist/cjs/lite/attested-decrypt.js +3 -3
  16. package/dist/cjs/lite/lightning.d.ts +67 -7
  17. package/dist/cjs/lite/lightning.js +105 -40
  18. package/dist/cjs/test/mocks.js +4 -2
  19. package/dist/esm/advancedacl/session-key.d.ts +9 -3
  20. package/dist/esm/advancedacl/session-key.js +20 -9
  21. package/dist/esm/attestedcompute/attested-compute.d.ts +32 -4
  22. package/dist/esm/attestedcompute/attested-compute.js +14 -14
  23. package/dist/esm/attesteddecrypt/attested-decrypt.d.ts +12 -6
  24. package/dist/esm/attesteddecrypt/attested-decrypt.js +39 -7
  25. package/dist/esm/attesteddecrypt/types.d.ts +1 -0
  26. package/dist/esm/generated/es/inco/kms/lite/v1/kms_service_pb.d.ts +28 -14
  27. package/dist/esm/generated/es/inco/kms/lite/v1/kms_service_pb.js +2 -2
  28. package/dist/esm/kms/quorumClient.d.ts +1 -1
  29. package/dist/esm/kms/quorumClient.js +118 -17
  30. package/dist/esm/lite/attested-compute.d.ts +2 -2
  31. package/dist/esm/lite/attested-compute.js +3 -3
  32. package/dist/esm/lite/attested-decrypt.d.ts +2 -2
  33. package/dist/esm/lite/attested-decrypt.js +3 -3
  34. package/dist/esm/lite/lightning.d.ts +67 -7
  35. package/dist/esm/lite/lightning.js +105 -40
  36. package/dist/esm/test/mocks.js +4 -2
  37. package/dist/types/advancedacl/session-key.d.ts +9 -3
  38. package/dist/types/attestedcompute/attested-compute.d.ts +32 -4
  39. package/dist/types/attesteddecrypt/attested-decrypt.d.ts +12 -6
  40. package/dist/types/attesteddecrypt/types.d.ts +1 -0
  41. package/dist/types/generated/es/inco/kms/lite/v1/kms_service_pb.d.ts +28 -14
  42. package/dist/types/kms/quorumClient.d.ts +1 -1
  43. package/dist/types/lite/attested-compute.d.ts +2 -2
  44. package/dist/types/lite/attested-decrypt.d.ts +2 -2
  45. package/dist/types/lite/lightning.d.ts +67 -7
  46. package/package.json +1 -1
@@ -292,11 +292,13 @@ export class Lightning {
292
292
  chainId: Number(this.chainId),
293
293
  walletClient,
294
294
  kmsQuorumClient: this.kmsQuorumClient,
295
+ executorAddress: this.executorAddress,
295
296
  reencryptPubKey,
296
297
  reencryptKeypair,
297
298
  });
298
299
  }
299
300
  return attestedDecrypt({
301
+ executorAddress: this.executorAddress,
300
302
  handles,
301
303
  backoffConfig,
302
304
  chainId: Number(this.chainId),
@@ -312,9 +314,10 @@ export class Lightning {
312
314
  chainId: Number(this.chainId),
313
315
  walletClient,
314
316
  kmsQuorumClient: this.kmsQuorumClient,
317
+ executorAddress: this.executorAddress,
315
318
  });
316
319
  }
317
- attestedDecryptWithVoucher(ephemeralKeypair, allowanceVoucherWithSig, handles, arg4, arg5, arg6) {
320
+ attestedDecryptWithVoucher(ephemeralKeypair, allowanceVoucherWithSig, ethClient, handles, arg4, arg5, arg6) {
318
321
  if (arg4 instanceof Uint8Array) {
319
322
  const reencryptPubKey = arg4;
320
323
  let reencryptKeypair;
@@ -336,6 +339,8 @@ export class Lightning {
336
339
  handles,
337
340
  reencryptPubKey,
338
341
  reencryptKeypair,
342
+ ethClient,
343
+ executorAddress: this.executorAddress,
339
344
  });
340
345
  }
341
346
  return sessionKeyAttestedDecrypt({
@@ -346,6 +351,8 @@ export class Lightning {
346
351
  allowanceVoucherWithSig,
347
352
  handles,
348
353
  reencryptPubKey,
354
+ ethClient,
355
+ executorAddress: this.executorAddress,
349
356
  });
350
357
  }
351
358
  const backoffConfig = arg4;
@@ -356,30 +363,53 @@ export class Lightning {
356
363
  ephemeralKeypair,
357
364
  allowanceVoucherWithSig,
358
365
  handles,
366
+ ethClient,
367
+ executorAddress: this.executorAddress,
359
368
  });
360
369
  }
361
- /**
362
- * Get an attested compute for the given wallet client.
363
- *
364
- * @param walletClient - The wallet client used for signing the attested compute request
365
- * @param lhsHandle - The handle to compute
366
- * @param op - The operation to perform
367
- * @param rhsPlaintext - The plaintext to compute with
368
- * @param backoffConfig - The backoff configuration for the attested compute request
369
- * @returns The decryption attestation
370
- *
371
- * @example
372
- * ```typescript
373
- * import { AttestedComputeSupportedOps } from '../lite/attested-compute.js';
374
- * const lhsHandle = '0x...';
375
- * const rhsPlaintext = 1337n;
376
- * const op = AttestedComputeSupportedOps.Eq;
377
- * const response = await lightning.attestedCompute(walletClient, lhsHandle, op, rhsPlaintext);
378
- * const { plaintext, covalidatorSignature, handle } = response;
379
- * ```
380
- */
381
- attestedCompute(walletClient, lhsHandle, op, rhsPlaintext, backoffConfig) {
370
+ attestedCompute(walletClient, lhsHandle, op, rhsPlaintext, arg5, arg6, arg7) {
371
+ // Reencrypt path (with or without local keypair)
372
+ if (arg5 instanceof Uint8Array) {
373
+ const reencryptPubKey = arg5;
374
+ let reencryptKeypair;
375
+ let backoffConfig;
376
+ if (arg6 && isSecp256k1Keypair(arg6)) {
377
+ reencryptKeypair = arg6;
378
+ backoffConfig = arg7;
379
+ }
380
+ else {
381
+ backoffConfig = arg6;
382
+ }
383
+ if (reencryptKeypair) {
384
+ return performAttestedCompute({
385
+ executorAddress: this.executorAddress,
386
+ walletClient,
387
+ kmsQuorumClient: this.kmsQuorumClient,
388
+ chainId: Number(this.chainId),
389
+ lhsHandle,
390
+ op,
391
+ rhsPlaintext,
392
+ reencryptPubKey,
393
+ reencryptKeypair,
394
+ backoffConfig,
395
+ });
396
+ }
397
+ return performAttestedCompute({
398
+ executorAddress: this.executorAddress,
399
+ walletClient,
400
+ kmsQuorumClient: this.kmsQuorumClient,
401
+ chainId: Number(this.chainId),
402
+ lhsHandle,
403
+ op,
404
+ rhsPlaintext,
405
+ reencryptPubKey,
406
+ backoffConfig,
407
+ });
408
+ }
409
+ // Plaintext path
410
+ const backoffConfig = arg5;
382
411
  return performAttestedCompute({
412
+ executorAddress: this.executorAddress,
383
413
  walletClient,
384
414
  kmsQuorumClient: this.kmsQuorumClient,
385
415
  chainId: Number(this.chainId),
@@ -389,21 +419,51 @@ export class Lightning {
389
419
  backoffConfig,
390
420
  });
391
421
  }
392
- /**
393
- * Performs attested compute via a voucher-backed session key.
394
- *
395
- * @example
396
- * ```ts
397
- * const attestation = await lightning.attestedComputeWithVoucher(
398
- * ephemeralKeypair,
399
- * voucher,
400
- * lhsHandle,
401
- * AttestedComputeSupportedOps.Eq,
402
- * true,
403
- * );
404
- * ```
405
- */
406
- attestedComputeWithVoucher(ephemeralKeypair, allowanceVoucherWithSig, lhsHandle, op, rhsPlaintext, backoffConfig) {
422
+ attestedComputeWithVoucher(ephemeralKeypair, allowanceVoucherWithSig, ethClient, lhsHandle, op, rhsPlaintext, arg6, arg7, arg8) {
423
+ // Reencrypt path (with or without local keypair)
424
+ if (arg6 instanceof Uint8Array) {
425
+ const reencryptPubKey = arg6;
426
+ let reencryptKeypair;
427
+ let backoffConfig;
428
+ if (arg7 && isSecp256k1Keypair(arg7)) {
429
+ reencryptKeypair = arg7;
430
+ backoffConfig = arg8;
431
+ }
432
+ else {
433
+ backoffConfig = arg7;
434
+ }
435
+ if (reencryptKeypair) {
436
+ return sessionKeyAttestedCompute({
437
+ chainId: Number(this.chainId),
438
+ kmsQuorumClient: this.kmsQuorumClient,
439
+ ephemeralKeypair,
440
+ allowanceVoucherWithSig,
441
+ lhsHandle,
442
+ op,
443
+ rhsPlaintext,
444
+ ethClient,
445
+ executorAddress: this.executorAddress,
446
+ reencryptPubKey,
447
+ reencryptKeypair,
448
+ backoffConfig,
449
+ });
450
+ }
451
+ return sessionKeyAttestedCompute({
452
+ chainId: Number(this.chainId),
453
+ kmsQuorumClient: this.kmsQuorumClient,
454
+ ephemeralKeypair,
455
+ allowanceVoucherWithSig,
456
+ lhsHandle,
457
+ op,
458
+ rhsPlaintext,
459
+ ethClient,
460
+ executorAddress: this.executorAddress,
461
+ reencryptPubKey,
462
+ backoffConfig,
463
+ });
464
+ }
465
+ // Plaintext path
466
+ const backoffConfig = arg6;
407
467
  return sessionKeyAttestedCompute({
408
468
  chainId: Number(this.chainId),
409
469
  kmsQuorumClient: this.kmsQuorumClient,
@@ -412,6 +472,8 @@ export class Lightning {
412
472
  lhsHandle,
413
473
  op,
414
474
  rhsPlaintext,
475
+ ethClient,
476
+ executorAddress: this.executorAddress,
415
477
  backoffConfig,
416
478
  });
417
479
  }
@@ -424,12 +486,13 @@ export class Lightning {
424
486
  *
425
487
  * @example
426
488
  * ```typescript
427
- * const response = await lightning.attestedReveal([handle1, handle2]);
489
+ * const response = await lightning.attestedReveal([handle1, handle2], ethClient);
428
490
  * const { plaintext, covalidatorSignature } = response[0];
429
491
  * ```
430
492
  */
431
493
  attestedReveal(handles, backoffConfig) {
432
494
  return attestedDecrypt({
495
+ executorAddress: this.executorAddress,
433
496
  handles,
434
497
  backoffConfig,
435
498
  chainId: Number(this.chainId),
@@ -441,7 +504,9 @@ export class Lightning {
441
504
  */
442
505
  static getCovalidatorUrls(deployment, threshold) {
443
506
  const { executorAddress, chainId, pepper } = deployment;
444
- return Array.from({ length: threshold }, (_, i) => `https://${executorAddress.toLowerCase()}.${chainId}.${pepper}.${i + 1}.inco.org`);
507
+ return Array.from({ length: threshold }, (_, i) =>
508
+ // TODO: add the index to the URL #1276
509
+ `https://${executorAddress.toLowerCase()}.${chainId}.${pepper}.inco.org`);
445
510
  }
446
511
  static isIdByName(id) {
447
512
  return id.name !== undefined;
@@ -530,4 +595,4 @@ export class Lightning {
530
595
  };
531
596
  }
532
597
  }
533
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"lightning.js","sourceRoot":"","sources":["../../../src/lite/lightning.ts"],"names":[],"mappings":"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"}
598
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"lightning.js","sourceRoot":"","sources":["../../../src/lite/lightning.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@ import { createWalletClient, http, } from 'viem';
2
2
  import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
3
3
  import { sepolia } from 'viem/chains';
4
4
  import { vi } from 'vitest';
5
+ import { TEST_RPC_URL } from '../attesteddecrypt/attested-decrypt.js';
5
6
  import { DEFAULT_COVALIDATOR_SIGNER } from '../kms/client.js';
6
7
  import { KmsQuorumClient } from '../kms/quorumClient.js';
7
8
  // Create a mock that satisfies our minimal interface
@@ -32,8 +33,9 @@ export function createTestWalletClient() {
32
33
  const account = privateKeyToAccount(generatePrivateKey());
33
34
  return createWalletClient({
34
35
  chain: sepolia, // Arbitrary chain, not relevant to test
35
- transport: http('UNUSED IN TEST'),
36
+ // CAUTION: TODO: do not rely on this in production, it's only for internal testing use etc.
37
+ transport: http(TEST_RPC_URL),
36
38
  account,
37
39
  });
38
40
  }
39
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdGVzdC9tb2Nrcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBR0wsa0JBQWtCLEVBQ2xCLElBQUksR0FHTCxNQUFNLE1BQU0sQ0FBQztBQUNkLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUN4RSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3RDLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFDNUIsT0FBTyxFQUFFLDBCQUEwQixFQUFhLE1BQU0sa0JBQWtCLENBQUM7QUFDekUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBV3pELHFEQUFxRDtBQUNyRCxNQUFNLFVBQVUsbUJBQW1CO0lBQ2pDLE9BQU87UUFDTCxlQUFlLEVBQUUsRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUN4QixlQUFlLEVBQUUsRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUN4QixHQUFHLEVBQUUsRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUNaLFNBQVMsRUFBRSxFQUFFLENBQUMsRUFBRSxFQUFFO0tBQ2EsQ0FBQztBQUNwQyxDQUFDO0FBRUQsa0VBQWtFO0FBQ2xFLE1BQU0sVUFBVSxzQkFBc0I7SUFDcEMsaUZBQWlGO0lBQ2pGLE1BQU0sUUFBUSxHQUFRLGVBQWUsQ0FBQztJQUN0QyxPQUFPLElBQUksUUFBUSxDQUNqQixDQUFDLEVBQUUsR0FBRyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sRUFBRSwwQkFBMEIsRUFBRSxDQUFDLEVBQ2pFLENBQUMsQ0FDRixDQUFDO0FBQ0osQ0FBQztBQUVELDREQUE0RDtBQUM1RCxNQUFNLFVBQVUsdUJBQXVCLENBQ3JDLFlBQTZCLEVBQzdCLGFBQTJDO0lBRTNDLG1EQUFtRDtJQUNuRCxNQUFNLGVBQWUsR0FBRyxZQUFtQixDQUFDO0lBQzVDLElBQUksZUFBZSxDQUFDLElBQUksSUFBSSxlQUFlLENBQUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUM1RCxlQUFlLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sR0FBRyxhQUFhLENBQUM7SUFDakQsQ0FBQztBQUNILENBQUM7QUFFRCwwQ0FBMEM7QUFDMUMsTUFBTSxVQUFVLHNCQUFzQjtJQUtwQyxNQUFNLE9BQU8sR0FBRyxtQkFBbUIsQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLENBQUM7SUFDMUQsT0FBTyxrQkFBa0IsQ0FBQztRQUN4QixLQUFLLEVBQUUsT0FBTyxFQUFFLHdDQUF3QztRQUN4RCxTQUFTLEVBQUUsSUFBSSxDQUFDLGdCQUFnQixDQUFDO1FBQ2pDLE9BQU87S0FDUixDQUFDLENBQUM7QUFDTCxDQUFDIn0=
41
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdGVzdC9tb2Nrcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBR0wsa0JBQWtCLEVBQ2xCLElBQUksR0FHTCxNQUFNLE1BQU0sQ0FBQztBQUNkLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUN4RSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3RDLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFDNUIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHdDQUF3QyxDQUFDO0FBQ3RFLE9BQU8sRUFBRSwwQkFBMEIsRUFBYSxNQUFNLGtCQUFrQixDQUFDO0FBQ3pFLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQVd6RCxxREFBcUQ7QUFDckQsTUFBTSxVQUFVLG1CQUFtQjtJQUNqQyxPQUFPO1FBQ0wsZUFBZSxFQUFFLEVBQUUsQ0FBQyxFQUFFLEVBQUU7UUFDeEIsZUFBZSxFQUFFLEVBQUUsQ0FBQyxFQUFFLEVBQUU7UUFDeEIsR0FBRyxFQUFFLEVBQUUsQ0FBQyxFQUFFLEVBQUU7UUFDWixTQUFTLEVBQUUsRUFBRSxDQUFDLEVBQUUsRUFBRTtLQUNhLENBQUM7QUFDcEMsQ0FBQztBQUVELGtFQUFrRTtBQUNsRSxNQUFNLFVBQVUsc0JBQXNCO0lBQ3BDLGlGQUFpRjtJQUNqRixNQUFNLFFBQVEsR0FBUSxlQUFlLENBQUM7SUFDdEMsT0FBTyxJQUFJLFFBQVEsQ0FDakIsQ0FBQyxFQUFFLEdBQUcsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLEVBQUUsMEJBQTBCLEVBQUUsQ0FBQyxFQUNqRSxDQUFDLENBQ0YsQ0FBQztBQUNKLENBQUM7QUFFRCw0REFBNEQ7QUFDNUQsTUFBTSxVQUFVLHVCQUF1QixDQUNyQyxZQUE2QixFQUM3QixhQUEyQztJQUUzQyxtREFBbUQ7SUFDbkQsTUFBTSxlQUFlLEdBQUcsWUFBbUIsQ0FBQztJQUM1QyxJQUFJLGVBQWUsQ0FBQyxJQUFJLElBQUksZUFBZSxDQUFDLElBQUksQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDNUQsZUFBZSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLEdBQUcsYUFBYSxDQUFDO0lBQ2pELENBQUM7QUFDSCxDQUFDO0FBRUQsMENBQTBDO0FBQzFDLE1BQU0sVUFBVSxzQkFBc0I7SUFLcEMsTUFBTSxPQUFPLEdBQUcsbUJBQW1CLENBQUMsa0JBQWtCLEVBQUUsQ0FBQyxDQUFDO0lBQzFELE9BQU8sa0JBQWtCLENBQUM7UUFDeEIsS0FBSyxFQUFFLE9BQU8sRUFBRSx3Q0FBd0M7UUFDeEQsNEZBQTRGO1FBQzVGLFNBQVMsRUFBRSxJQUFJLENBQUMsWUFBWSxDQUFDO1FBQzdCLE9BQU87S0FDUixDQUFDLENBQUM7QUFDTCxDQUFDIn0=
@@ -1,4 +1,4 @@
1
- import { type Account, type Address, type Chain, type Hex, type Transport, type WalletClient } from 'viem';
1
+ import { type Account, type Address, type Chain, type Hex, PublicClient, type Transport, type WalletClient } from 'viem';
2
2
  import { DecryptionAttestation, EncryptedDecryptionAttestation } from '../attesteddecrypt/index.js';
3
3
  import { SupportedChainId } from '../chain.js';
4
4
  import { type EciesScheme, SupportedFheType } from '../encryption/encryption.js';
@@ -32,8 +32,12 @@ export interface SessionKeyAttestedComputeArgs {
32
32
  op: AttestedComputeOP;
33
33
  rhsPlaintext: bigint | boolean;
34
34
  backoffConfig?: Partial<BackoffConfig> | undefined;
35
+ ethClient?: PublicClient<Transport, Chain> | WalletClient<Transport, Chain, Account> | undefined;
36
+ executorAddress?: HexString | undefined;
37
+ reencryptPubKey?: Uint8Array | undefined;
38
+ reencryptKeypair?: Secp256k1Keypair | undefined;
35
39
  }
36
- export declare function sessionKeyAttestedCompute<T extends SupportedFheType>({ lhsHandle, op, rhsPlaintext, backoffConfig, chainId, kmsQuorumClient, ephemeralKeypair, allowanceVoucherWithSig, }: SessionKeyAttestedComputeArgs): Promise<DecryptionAttestation<EciesScheme, SupportedFheType>>;
40
+ export declare function sessionKeyAttestedCompute<T extends SupportedFheType>({ lhsHandle, op, rhsPlaintext, backoffConfig, chainId, kmsQuorumClient, ephemeralKeypair, allowanceVoucherWithSig, ethClient, executorAddress, reencryptPubKey, reencryptKeypair, }: SessionKeyAttestedComputeArgs): Promise<DecryptionAttestation<EciesScheme, SupportedFheType> | EncryptedDecryptionAttestation<EciesScheme, SupportedFheType>>;
37
41
  export interface SessionKeyAttestedDecryptArgs {
38
42
  chainId: SupportedChainId;
39
43
  ephemeralKeypair: Secp256k1Keypair;
@@ -43,6 +47,8 @@ export interface SessionKeyAttestedDecryptArgs {
43
47
  backoffConfig?: Partial<BackoffConfig> | undefined;
44
48
  reencryptPubKey?: Uint8Array | undefined;
45
49
  reencryptKeypair?: Secp256k1Keypair | undefined;
50
+ ethClient?: PublicClient<Transport, Chain> | WalletClient<Transport, Chain, Account> | undefined;
51
+ executorAddress?: HexString | undefined;
46
52
  }
47
53
  /**
48
54
  * Performs attested decrypts using a voucher-backed session key.
@@ -74,4 +80,4 @@ export interface SessionKeyAttestedDecryptArgs {
74
80
  * );
75
81
  * ```
76
82
  */
77
- export declare function sessionKeyAttestedDecrypt({ chainId, kmsQuorumClient, handles, ephemeralKeypair, allowanceVoucherWithSig, backoffConfig, reencryptPubKey, reencryptKeypair, }: SessionKeyAttestedDecryptArgs): Promise<Array<DecryptionAttestation<EciesScheme, SupportedFheType> | EncryptedDecryptionAttestation<EciesScheme, SupportedFheType>>>;
83
+ export declare function sessionKeyAttestedDecrypt({ chainId, kmsQuorumClient, handles, ephemeralKeypair, allowanceVoucherWithSig, backoffConfig, reencryptPubKey, reencryptKeypair, ethClient, executorAddress, }: SessionKeyAttestedDecryptArgs): Promise<Array<DecryptionAttestation<EciesScheme, SupportedFheType> | EncryptedDecryptionAttestation<EciesScheme, SupportedFheType>>>;
@@ -1,13 +1,14 @@
1
1
  import type { Account, Chain, Transport, WalletClient } from 'viem';
2
- import { DecryptionAttestation } from '../attesteddecrypt/types.js';
2
+ import { DecryptionAttestation, EncryptedDecryptionAttestation } from '../attesteddecrypt/types.js';
3
3
  import { HexString } from '../binary.js';
4
4
  import { SupportedChainId } from '../chain.js';
5
- import { EciesScheme, SupportedFheType } from '../encryption/encryption.js';
5
+ import type { EciesScheme, SupportedFheType } from '../encryption/encryption.js';
6
6
  import { KmsQuorumClient } from '../kms/quorumClient.js';
7
+ import type { Secp256k1Keypair } from '../lite/ecies.js';
7
8
  import type { BackoffConfig } from '../retry.js';
8
9
  import { AttestedComputeOP } from './types.js';
9
10
  export declare const ATTESTED_COMPUTE_DOMAIN_NAME = "IncoAttestedCompute";
10
- export declare const ATTESTED_COMPUTE_DOMAIN_VERSION = "1";
11
+ export declare const DEFAULT_ATTESTED_COMPUTE_DOMAIN_VERSION = "2";
11
12
  /**
12
13
  * Arguments for creating an attested compute.
13
14
  */
@@ -27,7 +28,8 @@ export interface IncoLiteAttestedComputeArgs {
27
28
  *
28
29
  * @todo Support multiple operations in a single request.
29
30
  */
30
- export declare function attestedCompute<T extends SupportedFheType>({ lhsHandle, op, rhsPlaintext, backoffConfig, walletClient, kmsQuorumClient, chainId, }: {
31
+ export declare function attestedCompute<T extends SupportedFheType>({ executorAddress, lhsHandle, op, rhsPlaintext, backoffConfig, walletClient, kmsQuorumClient, chainId, reencryptPubKey, reencryptKeypair, }: {
32
+ executorAddress: HexString;
31
33
  lhsHandle: HexString;
32
34
  op: AttestedComputeOP;
33
35
  rhsPlaintext: bigint | boolean;
@@ -35,4 +37,30 @@ export declare function attestedCompute<T extends SupportedFheType>({ lhsHandle,
35
37
  walletClient: WalletClient<Transport, Chain, Account>;
36
38
  kmsQuorumClient: KmsQuorumClient;
37
39
  chainId: SupportedChainId;
40
+ reencryptPubKey: Uint8Array;
41
+ reencryptKeypair: Secp256k1Keypair;
42
+ }): Promise<DecryptionAttestation<EciesScheme, T>>;
43
+ export declare function attestedCompute<T extends SupportedFheType>({ executorAddress, lhsHandle, op, rhsPlaintext, backoffConfig, walletClient, kmsQuorumClient, chainId, reencryptPubKey, }: {
44
+ executorAddress: HexString;
45
+ lhsHandle: HexString;
46
+ op: AttestedComputeOP;
47
+ rhsPlaintext: bigint | boolean;
48
+ backoffConfig?: Partial<BackoffConfig> | undefined;
49
+ walletClient: WalletClient<Transport, Chain, Account>;
50
+ kmsQuorumClient: KmsQuorumClient;
51
+ chainId: SupportedChainId;
52
+ reencryptPubKey: Uint8Array;
53
+ reencryptKeypair?: never;
54
+ }): Promise<EncryptedDecryptionAttestation<EciesScheme, T>>;
55
+ export declare function attestedCompute<T extends SupportedFheType>({ executorAddress, lhsHandle, op, rhsPlaintext, backoffConfig, walletClient, kmsQuorumClient, chainId, }: {
56
+ executorAddress: HexString;
57
+ lhsHandle: HexString;
58
+ op: AttestedComputeOP;
59
+ rhsPlaintext: bigint | boolean;
60
+ backoffConfig?: Partial<BackoffConfig> | undefined;
61
+ walletClient: WalletClient<Transport, Chain, Account>;
62
+ kmsQuorumClient: KmsQuorumClient;
63
+ chainId: SupportedChainId;
64
+ reencryptPubKey?: never;
65
+ reencryptKeypair?: never;
38
66
  }): Promise<DecryptionAttestation<EciesScheme, T>>;
@@ -1,4 +1,4 @@
1
- import type { Account, Chain, Transport, WalletClient } from 'viem';
1
+ import type { Account, Chain, PublicClient, Transport, WalletClient } from 'viem';
2
2
  import { type HexString } from '../binary.js';
3
3
  import { type SupportedChainId } from '../chain.js';
4
4
  import { type EciesScheme, type SupportedFheType } from '../encryption/encryption.js';
@@ -7,7 +7,8 @@ import type { Secp256k1Keypair } from '../lite/ecies.js';
7
7
  import type { BackoffConfig } from '../retry.js';
8
8
  import { type DecryptionAttestation, type EncryptedDecryptionAttestation } from './types.js';
9
9
  export declare const ATTESTED_DECRYPT_DOMAIN_NAME = "IncoAttestedDecrypt";
10
- export declare const ATTESTED_DECRYPT_DOMAIN_VERSION = "1";
10
+ export declare const DEFAULT_ATTESTED_DECRYPT_DOMAIN_VERSION = "2";
11
+ export declare const TEST_RPC_URL = "UNUSED IN TEST";
11
12
  /**
12
13
  * Arguments for creating an attested decrypt request.
13
14
  */
@@ -27,11 +28,12 @@ export interface IncoLiteAttestedDecryptorArgs {
27
28
  * @returns A function that can decrypt handles and return an attestation
28
29
  * @throws {AttestedDecryptError} If the creation fails
29
30
  */
30
- export declare function attestedDecrypt({ handles, backoffConfig, chainId, kmsQuorumClient, }: {
31
+ export declare function attestedDecrypt({ handles, backoffConfig, chainId, kmsQuorumClient, executorAddress, }: {
31
32
  handles: HexString[];
32
33
  backoffConfig?: Partial<BackoffConfig> | undefined;
33
34
  chainId: SupportedChainId;
34
35
  kmsQuorumClient: KmsQuorumClient;
36
+ executorAddress: HexString;
35
37
  }): Promise<Array<DecryptionAttestation<EciesScheme, SupportedFheType>>>;
36
38
  /**
37
39
  * Decrypt multiple handles in a single attested request.
@@ -41,7 +43,7 @@ export declare function attestedDecrypt({ handles, backoffConfig, chainId, kmsQu
41
43
  * @returns A function that can decrypt handles and return an attestation
42
44
  * @throws {AttestedDecryptError} If the creation fails
43
45
  */
44
- export declare function attestedDecrypt({ handles, backoffConfig, walletClient, chainId, reencryptPubKey, reencryptKeypair, kmsQuorumClient, }: {
46
+ export declare function attestedDecrypt({ handles, backoffConfig, walletClient, chainId, reencryptPubKey, reencryptKeypair, kmsQuorumClient, executorAddress, }: {
45
47
  handles: HexString[];
46
48
  backoffConfig?: Partial<BackoffConfig> | undefined;
47
49
  walletClient: WalletClient<Transport, Chain, Account>;
@@ -49,6 +51,7 @@ export declare function attestedDecrypt({ handles, backoffConfig, walletClient,
49
51
  reencryptPubKey: Uint8Array;
50
52
  reencryptKeypair: Secp256k1Keypair;
51
53
  kmsQuorumClient: KmsQuorumClient;
54
+ executorAddress: HexString;
52
55
  }): Promise<Array<DecryptionAttestation<EciesScheme, SupportedFheType>>>;
53
56
  /**
54
57
  * Decrypt multiple handles in a single attested request.
@@ -58,7 +61,7 @@ export declare function attestedDecrypt({ handles, backoffConfig, walletClient,
58
61
  * @returns A function that can decrypt handles and return an attestation
59
62
  * @throws {AttestedDecryptError} If the creation fails
60
63
  */
61
- export declare function attestedDecrypt({ handles, backoffConfig, walletClient, chainId, reencryptPubKey, kmsQuorumClient, }: {
64
+ export declare function attestedDecrypt({ handles, backoffConfig, walletClient, chainId, reencryptPubKey, kmsQuorumClient, executorAddress, }: {
62
65
  handles: HexString[];
63
66
  backoffConfig?: Partial<BackoffConfig> | undefined;
64
67
  walletClient: WalletClient<Transport, Chain, Account>;
@@ -66,6 +69,7 @@ export declare function attestedDecrypt({ handles, backoffConfig, walletClient,
66
69
  reencryptPubKey: Uint8Array;
67
70
  reencryptKeypair?: never;
68
71
  kmsQuorumClient: KmsQuorumClient;
72
+ executorAddress: HexString;
69
73
  }): Promise<Array<EncryptedDecryptionAttestation<EciesScheme, SupportedFheType>>>;
70
74
  /**
71
75
  * Decrypt multiple handles in a single attested request.
@@ -75,7 +79,7 @@ export declare function attestedDecrypt({ handles, backoffConfig, walletClient,
75
79
  * @returns A function that can decrypt handles and return an attestation
76
80
  * @throws {AttestedDecryptError} If the creation fails
77
81
  */
78
- export declare function attestedDecrypt({ handles, backoffConfig, walletClient, chainId, kmsQuorumClient, }: {
82
+ export declare function attestedDecrypt({ handles, backoffConfig, walletClient, chainId, kmsQuorumClient, executorAddress, }: {
79
83
  handles: HexString[];
80
84
  backoffConfig?: Partial<BackoffConfig> | undefined;
81
85
  walletClient: WalletClient<Transport, Chain, Account>;
@@ -83,7 +87,9 @@ export declare function attestedDecrypt({ handles, backoffConfig, walletClient,
83
87
  reencryptPubKey?: never;
84
88
  reencryptKeypair?: never;
85
89
  kmsQuorumClient: KmsQuorumClient;
90
+ executorAddress: HexString;
86
91
  }): Promise<Array<DecryptionAttestation<EciesScheme, SupportedFheType>>>;
92
+ export declare function fetchEip712DomainVersion(executorAddress: HexString | undefined, defaultVersion: string, walletClient?: WalletClient<Transport, Chain, Account> | PublicClient<Transport, Chain>): Promise<string>;
87
93
  export declare function decryptEncryptedAttestations(attestations: Array<DecryptionAttestation<EciesScheme, SupportedFheType> | EncryptedDecryptionAttestation<EciesScheme, SupportedFheType>>, reencryptKeypair: Secp256k1Keypair): Promise<Array<DecryptionAttestation<EciesScheme, SupportedFheType>>>;
88
94
  /**
89
95
  * Validates a handle format.
@@ -16,6 +16,7 @@ export type DecryptionAttestation<S extends EncryptionScheme, T extends Supporte
16
16
  export type EncryptedDecryptionAttestation<S extends EncryptionScheme, T extends SupportedFheType> = {
17
17
  handle: HexString;
18
18
  encryptedPlaintext: EncryptResultOf<S, T>;
19
+ encryptedSignatures: Uint8Array[];
19
20
  covalidatorSignatures: Uint8Array[];
20
21
  };
21
22
  export type AttestedDecryptor<S extends EncryptionScheme> = <T extends SupportedFheType>(args: AttestedDecryptFnArgs<S, T>) => Promise<DecryptionAttestation<S, T>>;
@@ -146,10 +146,23 @@ export type AttestedComputeRequest = Message<"inco.kms.lite.v1.AttestedComputeRe
146
146
  * @generated from field: string user_address = 1;
147
147
  */
148
148
  userAddress: string;
149
+ /**
150
+ * reencrypt_pub_key is the encoding of the user's public
151
+ * encryption key (secp256k1) used to reencrypt the result for.
152
+ * It is encoded in its 33-byte compressed format.
153
+ * If empty, the KMS will return plaintext decryption instead of reencryption.
154
+ *
155
+ * @generated from field: bytes reencrypt_pub_key = 2;
156
+ */
157
+ reencryptPubKey: Uint8Array;
149
158
  /**
150
159
  * eip712_signature is an EIP-712 signature of the following EIP-712 typed data by
151
160
  * `user_address` (note that we only give a JSON representation for the sake of
152
- * readability, but the actual signed data is defined in the EIP-712 spec):
161
+ * readability, but the actual signed data is defined in the EIP-712 spec) where:
162
+ * op - operation to perform
163
+ * lhs - handle of the ciphertext to perform computation on
164
+ * rhs - second plaintext scalar operand
165
+ * publicKey - 0x prefixed reencrypt_pub_key (if any). "0x" otherwise if empty.
153
166
  *
154
167
  * ```json
155
168
  * {
@@ -160,9 +173,10 @@ export type AttestedComputeRequest = Message<"inco.kms.lite.v1.AttestedComputeRe
160
173
  * { "name": "chainId", "type": "uint256" }
161
174
  * ],
162
175
  * "AttestedComputeRequest": [
163
- * { "name": "op", "type" "uint8"},
164
- * { "name": "lhs", "type" "bytes32"},
165
- * { "name": "rhs", "type" "bytes32"}
176
+ * { "name": "op", "type": "uint8"},
177
+ * { "name": "lhs", "type": "bytes32"},
178
+ * { "name": "rhs", "type": "bytes32"},
179
+ * { "name": "publicKey", "type": "bytes" },
166
180
  * ]
167
181
  * },
168
182
  * "primaryType": "AttestedComputeRequest",
@@ -174,18 +188,19 @@ export type AttestedComputeRequest = Message<"inco.kms.lite.v1.AttestedComputeRe
174
188
  * "message": {
175
189
  * "op": <operation>,
176
190
  * "lhs": "<handle1>",
177
- * "rhs": <plaintextBytes> // Also add a comment on length & encoding
191
+ * "rhs": <plaintextBytes>, // Also add a comment on length & encoding
192
+ * "publicKey": "0x<reencrypt_pub_key>"
178
193
  * }
179
194
  * }
180
195
  * ```
181
196
  *
182
- * @generated from field: bytes eip712_signature = 2;
197
+ * @generated from field: bytes eip712_signature = 3;
183
198
  */
184
199
  eip712Signature: Uint8Array;
185
200
  /**
186
201
  * Subset of supported binary operations that can be performed on a handle.
187
202
  *
188
- * @generated from field: inco.kms.lite.v1.SupportedScalarBinaryOp op = 3;
203
+ * @generated from field: inco.kms.lite.v1.SupportedScalarBinaryOp op = 4;
189
204
  */
190
205
  op: SupportedScalarBinaryOp;
191
206
  /**
@@ -193,13 +208,13 @@ export type AttestedComputeRequest = Message<"inco.kms.lite.v1.AttestedComputeRe
193
208
  * The user_address must have ACL access to the handle for the attested
194
209
  * compute to succeed.
195
210
  *
196
- * @generated from field: string lhs_handle = 4;
211
+ * @generated from field: string lhs_handle = 5;
197
212
  */
198
213
  lhsHandle: string;
199
214
  /**
200
215
  * Second plaintext scalar operand encoded as a hex string (with or without 0x prefix)
201
216
  *
202
- * @generated from field: string rhs_plaintext = 5;
217
+ * @generated from field: string rhs_plaintext = 6;
203
218
  */
204
219
  rhsPlaintext: string;
205
220
  /**
@@ -207,7 +222,7 @@ export type AttestedComputeRequest = Message<"inco.kms.lite.v1.AttestedComputeRe
207
222
  * Either the user_address or sharer must have ACL access to the handles for the attested
208
223
  * compute to succeed.
209
224
  *
210
- * @generated from field: inco.kms.lite.v1.ACLProof acl_proof = 6;
225
+ * @generated from field: inco.kms.lite.v1.ACLProof acl_proof = 7;
211
226
  */
212
227
  aclProof?: ACLProof;
213
228
  };
@@ -303,12 +318,11 @@ export type Reencryption = Message<"inco.kms.lite.v1.Reencryption"> & {
303
318
  */
304
319
  userCiphertext: Uint8Array;
305
320
  /**
306
- * The handle of the ciphertext, encoded as a 0x-prefixed hex string, any case.
307
- * TODO scalar declaration.
321
+ * Encrypted signature over the plaintext, encrypted to the user's public key. Can only be decrypted by the user.
308
322
  *
309
- * @generated from field: string handle = 2;
323
+ * @generated from field: bytes encrypted_signature = 3;
310
324
  */
311
- handle: string;
325
+ encryptedSignature: Uint8Array;
312
326
  };
313
327
  /**
314
328
  * Describes the message inco.kms.lite.v1.Reencryption.
@@ -29,7 +29,7 @@ export declare class KmsQuorumClient {
29
29
  */
30
30
  static fromKmsClients(kmsClients: KmsClient[], threshold: number): KmsQuorumClient;
31
31
  attestedDecrypt(request: AttestedDecryptRequest, backoffConfig?: Partial<BackoffConfig>): Promise<(DecryptionAttestation<EciesScheme, SupportedFheType> | EncryptedDecryptionAttestation<EciesScheme, SupportedFheType>)[]>;
32
- attestedCompute(request: AttestedComputeRequest, backoffConfig?: Partial<BackoffConfig>): Promise<DecryptionAttestation<EciesScheme, SupportedFheType>>;
32
+ attestedCompute(request: AttestedComputeRequest, backoffConfig?: Partial<BackoffConfig>): Promise<DecryptionAttestation<EciesScheme, SupportedFheType> | EncryptedDecryptionAttestation<EciesScheme, SupportedFheType>>;
33
33
  attestedReveal(request: AttestedRevealRequest, backoffConfig?: Partial<BackoffConfig>): Promise<(DecryptionAttestation<EciesScheme, SupportedFheType> | EncryptedDecryptionAttestation<EciesScheme, SupportedFheType>)[]>;
34
34
  /**
35
35
  * Generic method to execute a KMS operation across all clients with retry and threshold logic.
@@ -1,6 +1,6 @@
1
- import { ATTESTED_COMPUTE_DOMAIN_NAME, ATTESTED_COMPUTE_DOMAIN_VERSION, type IncoLiteAttestedComputeArgs } from '../attestedcompute/attested-compute.js';
1
+ import { ATTESTED_COMPUTE_DOMAIN_NAME, DEFAULT_ATTESTED_COMPUTE_DOMAIN_VERSION, type IncoLiteAttestedComputeArgs } from '../attestedcompute/attested-compute.js';
2
2
  import type { AttestedCompute, AttestedComputeFnArgs } from '../attestedcompute/types.js';
3
3
  import { AttestedComputeSupportedOps } from '../attestedcompute/types.js';
4
4
  import type { AttestedDecryptFnArgs } from '../attesteddecrypt/types.js';
5
- export { ATTESTED_COMPUTE_DOMAIN_NAME, ATTESTED_COMPUTE_DOMAIN_VERSION, AttestedComputeSupportedOps, };
5
+ export { ATTESTED_COMPUTE_DOMAIN_NAME, AttestedComputeSupportedOps, DEFAULT_ATTESTED_COMPUTE_DOMAIN_VERSION, };
6
6
  export type { AttestedCompute, AttestedComputeFnArgs, AttestedDecryptFnArgs, IncoLiteAttestedComputeArgs, };