@enclave-e3/sdk 0.1.11 → 0.1.13

package/dist/index.d.cts

@@ -91,7 +91,6 @@ interface ContractInstances {
 }
 declare enum EnclaveEventType {
     E3_REQUESTED = "E3Requested",
-    E3_ACTIVATED = "E3Activated",
     CIPHERTEXT_OUTPUT_PUBLISHED = "CiphertextOutputPublished",
     PLAINTEXT_OUTPUT_PUBLISHED = "PlaintextOutputPublished",
     E3_PROGRAM_ENABLED = "E3ProgramEnabled",
@@ -117,9 +116,7 @@ interface E3 {
     seed: bigint;
     threshold: readonly [number, number];
     requestBlock: bigint;
-    startWindow: readonly [bigint, bigint];
-    duration: bigint;
-    expiration: bigint;
+    inputWindow: readonly [bigint, bigint];
     encryptionSchemeId: string;
     e3Program: string;
     e3ProgramParams: string;
@@ -164,10 +161,11 @@ interface CommitteeRequestedData {
     seed: bigint;
     threshold: [bigint, bigint];
     requestBlock: bigint;
-    submissionDeadline: bigint;
+    committeeDeadline: bigint;
 }
 interface CommitteePublishedData {
     e3Id: bigint;
+    nodes: string[];
     publicKey: string;
 }
 interface CommitteeFinalizedData {
@@ -176,7 +174,6 @@ interface CommitteeFinalizedData {
 }
 interface EnclaveEventData {
     [EnclaveEventType.E3_REQUESTED]: E3RequestedData;
-    [EnclaveEventType.E3_ACTIVATED]: E3ActivatedData;
     [EnclaveEventType.CIPHERTEXT_OUTPUT_PUBLISHED]: CiphertextOutputPublishedData;
     [EnclaveEventType.PLAINTEXT_OUTPUT_PUBLISHED]: PlaintextOutputPublishedData;
     [EnclaveEventType.E3_PROGRAM_ENABLED]: {
@@ -535,8 +532,7 @@ declare class EnclaveSDK {
      */
     requestE3(params: {
         threshold: [number, number];
-        startWindow: [bigint, bigint];
-        duration: bigint;
+        inputWindow: [bigint, bigint];
         e3Program: `0x${string}`;
         e3ProgramParams: `0x${string}`;
         computeProviderParams: `0x${string}`;
@@ -549,14 +545,6 @@ declare class EnclaveSDK {
      * @returns The public key
      */
     getE3PublicKey(e3Id: bigint): Promise<`0x${string}`>;
-    /**
-     * Activate an E3 computation
-     */
-    activateE3(e3Id: bigint, gasLimit?: bigint): Promise<Hash>;
-    /**
-     * Publish input for an E3 computation
-     */
-    publishInput(e3Id: bigint, data: `0x${string}`, gasLimit?: bigint): Promise<Hash>;
     /**
      * Publish ciphertext output for an E3 computation
      */
@@ -683,19 +671,9 @@ declare class ContractClient {
     approveFeeToken(amount: bigint): Promise<Hash>;
     /**
      * Request a new E3 computation
-     * request(address filter, uint32[2] threshold, uint256[2] startWindow, uint256 duration, IE3Program e3Program, bytes e3ProgramParams, bytes computeProviderParams, bytes customParams)
-     */
-    requestE3(threshold: [number, number], startWindow: [bigint, bigint], duration: bigint, e3Program: `0x${string}`, e3ProgramParams: `0x${string}`, computeProviderParams: `0x${string}`, customParams?: `0x${string}`, gasLimit?: bigint): Promise<Hash>;
-    /**
-     * Activate an E3 computation
-     * activate(uint256 e3Id)
-     */
-    activateE3(e3Id: bigint, gasLimit?: bigint): Promise<Hash>;
-    /**
-     * Publish input for an E3 computation
-     * publishInput(uint256 e3Id, bytes memory data)
+     * request(uint32[2] threshold, uint256[2] inputWindow, IE3Program e3Program, bytes e3ProgramParams, bytes computeProviderParams, bytes customParams)
      */
-    publishInput(e3Id: bigint, data: `0x${string}`, gasLimit?: bigint): Promise<Hash>;
+    requestE3(threshold: [number, number], inputWindow: [bigint, bigint], e3Program: `0x${string}`, e3ProgramParams: `0x${string}`, computeProviderParams: `0x${string}`, customParams?: `0x${string}`, gasLimit?: bigint): Promise<Hash>;
     /**
      * Publish ciphertext output for an E3 computation
      * publishCiphertextOutput(uint256 e3Id, bytes memory ciphertextOutput, bytes memory proof)
@@ -740,8 +718,10 @@ declare function parseBigInt(value: string): bigint;
 declare function generateEventId(log: Log): string;
 /**
  * Get the current timestamp in seconds
+ * from onchain
+ * @param publicClient - The public client to use
  */
-declare function getCurrentTimestamp(): number;
+declare function getCurrentTimestamp(publicClient: PublicClient): Promise<bigint>;
 interface ComputeProviderParams {
     name: string;
     parallel: boolean;
@@ -751,7 +731,6 @@ declare const DEFAULT_COMPUTE_PROVIDER_PARAMS: ComputeProviderParams;
 declare const DEFAULT_E3_CONFIG: {
     readonly threshold_min: 2;
     readonly threshold_max: 5;
-    readonly window_size: 120;
     readonly duration: 1800;
     readonly payment_amount: "0";
 };
@@ -771,11 +750,15 @@ declare function encodeComputeProviderParams(params: ComputeProviderParams, mock
 declare function encodeCustomParams(params: Record<string, unknown>): `0x${string}`;
 /**
  * Calculate start window for E3 request
+ * @dev This function can be used for testing purposes, or for E3s which need to start as soon as possible.
+ * @param publicClient - The public client to use
+ * @param duration - The duration of the input window in seconds
+ * @param startBuffer - Buffer in seconds added to current timestamp for input window start
  */
-declare function calculateStartWindow(windowSize?: number): [bigint, bigint];
+declare function calculateInputWindow(publicClient: PublicClient, duration?: number, startBuffer?: bigint): Promise<[bigint, bigint]>;
 /**
  * Decode plaintextOutput bytes to get the actual result number
  */
 declare function decodePlaintextOutput(plaintextOutput: string): number | null;
 
-export { type AllEventTypes, type BfvParams, type CiphernodeAddedData, type CiphernodeRemovedData, type CiphertextOutputPublishedData, type CommitteeFinalizedData, type CommitteePublishedData, type CommitteeRequestedData, type ComputeProviderParams, ContractClient, type ContractInstances, DEFAULT_COMPUTE_PROVIDER_PARAMS, DEFAULT_E3_CONFIG, type E3, type E3ActivatedData, type E3RequestedData, type EnclaveEvent, type EnclaveEventData, EnclaveEventType, EnclaveSDK, type EncryptedValueAndPublicInputs, type EventCallback, type EventFilter, EventListener, type EventListenerConfig, type PlaintextOutputPublishedData, type Polynomial, type RegistryEventData, RegistryEventType, type SDKConfig, SDKError, type SDKEventEmitter, type ThresholdBfvParamsPresetName, ThresholdBfvParamsPresetNames, type VerifiableEncryptionResult, calculateStartWindow, decodePlaintextOutput, encodeBfvParams, encodeComputeProviderParams, encodeCustomParams, formatBigInt, formatEventName, generateEventId, generateProof, getCurrentTimestamp, isValidAddress, isValidHash, parseBigInt, parseEventData, sleep };
+export { type AllEventTypes, type BfvParams, type CiphernodeAddedData, type CiphernodeRemovedData, type CiphertextOutputPublishedData, type CommitteeFinalizedData, type CommitteePublishedData, type CommitteeRequestedData, type ComputeProviderParams, ContractClient, type ContractInstances, DEFAULT_COMPUTE_PROVIDER_PARAMS, DEFAULT_E3_CONFIG, type E3, type E3ActivatedData, type E3RequestedData, type EnclaveEvent, type EnclaveEventData, EnclaveEventType, EnclaveSDK, type EncryptedValueAndPublicInputs, type EventCallback, type EventFilter, EventListener, type EventListenerConfig, type PlaintextOutputPublishedData, type Polynomial, type RegistryEventData, RegistryEventType, type SDKConfig, SDKError, type SDKEventEmitter, type ThresholdBfvParamsPresetName, ThresholdBfvParamsPresetNames, type VerifiableEncryptionResult, calculateInputWindow, decodePlaintextOutput, encodeBfvParams, encodeComputeProviderParams, encodeCustomParams, formatBigInt, formatEventName, generateEventId, generateProof, getCurrentTimestamp, isValidAddress, isValidHash, parseBigInt, parseEventData, sleep };

package/dist/index.d.ts

@@ -91,7 +91,6 @@ interface ContractInstances {
 }
 declare enum EnclaveEventType {
     E3_REQUESTED = "E3Requested",
-    E3_ACTIVATED = "E3Activated",
     CIPHERTEXT_OUTPUT_PUBLISHED = "CiphertextOutputPublished",
     PLAINTEXT_OUTPUT_PUBLISHED = "PlaintextOutputPublished",
     E3_PROGRAM_ENABLED = "E3ProgramEnabled",
@@ -117,9 +116,7 @@ interface E3 {
     seed: bigint;
     threshold: readonly [number, number];
     requestBlock: bigint;
-    startWindow: readonly [bigint, bigint];
-    duration: bigint;
-    expiration: bigint;
+    inputWindow: readonly [bigint, bigint];
     encryptionSchemeId: string;
     e3Program: string;
     e3ProgramParams: string;
@@ -164,10 +161,11 @@ interface CommitteeRequestedData {
     seed: bigint;
     threshold: [bigint, bigint];
     requestBlock: bigint;
-    submissionDeadline: bigint;
+    committeeDeadline: bigint;
 }
 interface CommitteePublishedData {
     e3Id: bigint;
+    nodes: string[];
     publicKey: string;
 }
 interface CommitteeFinalizedData {
@@ -176,7 +174,6 @@ interface CommitteeFinalizedData {
 }
 interface EnclaveEventData {
     [EnclaveEventType.E3_REQUESTED]: E3RequestedData;
-    [EnclaveEventType.E3_ACTIVATED]: E3ActivatedData;
     [EnclaveEventType.CIPHERTEXT_OUTPUT_PUBLISHED]: CiphertextOutputPublishedData;
     [EnclaveEventType.PLAINTEXT_OUTPUT_PUBLISHED]: PlaintextOutputPublishedData;
     [EnclaveEventType.E3_PROGRAM_ENABLED]: {
@@ -535,8 +532,7 @@ declare class EnclaveSDK {
      */
     requestE3(params: {
         threshold: [number, number];
-        startWindow: [bigint, bigint];
-        duration: bigint;
+        inputWindow: [bigint, bigint];
         e3Program: `0x${string}`;
         e3ProgramParams: `0x${string}`;
         computeProviderParams: `0x${string}`;
@@ -549,14 +545,6 @@ declare class EnclaveSDK {
      * @returns The public key
      */
     getE3PublicKey(e3Id: bigint): Promise<`0x${string}`>;
-    /**
-     * Activate an E3 computation
-     */
-    activateE3(e3Id: bigint, gasLimit?: bigint): Promise<Hash>;
-    /**
-     * Publish input for an E3 computation
-     */
-    publishInput(e3Id: bigint, data: `0x${string}`, gasLimit?: bigint): Promise<Hash>;
     /**
      * Publish ciphertext output for an E3 computation
      */
@@ -683,19 +671,9 @@ declare class ContractClient {
     approveFeeToken(amount: bigint): Promise<Hash>;
     /**
      * Request a new E3 computation
-     * request(address filter, uint32[2] threshold, uint256[2] startWindow, uint256 duration, IE3Program e3Program, bytes e3ProgramParams, bytes computeProviderParams, bytes customParams)
-     */
-    requestE3(threshold: [number, number], startWindow: [bigint, bigint], duration: bigint, e3Program: `0x${string}`, e3ProgramParams: `0x${string}`, computeProviderParams: `0x${string}`, customParams?: `0x${string}`, gasLimit?: bigint): Promise<Hash>;
-    /**
-     * Activate an E3 computation
-     * activate(uint256 e3Id)
-     */
-    activateE3(e3Id: bigint, gasLimit?: bigint): Promise<Hash>;
-    /**
-     * Publish input for an E3 computation
-     * publishInput(uint256 e3Id, bytes memory data)
+     * request(uint32[2] threshold, uint256[2] inputWindow, IE3Program e3Program, bytes e3ProgramParams, bytes computeProviderParams, bytes customParams)
      */
-    publishInput(e3Id: bigint, data: `0x${string}`, gasLimit?: bigint): Promise<Hash>;
+    requestE3(threshold: [number, number], inputWindow: [bigint, bigint], e3Program: `0x${string}`, e3ProgramParams: `0x${string}`, computeProviderParams: `0x${string}`, customParams?: `0x${string}`, gasLimit?: bigint): Promise<Hash>;
     /**
      * Publish ciphertext output for an E3 computation
      * publishCiphertextOutput(uint256 e3Id, bytes memory ciphertextOutput, bytes memory proof)
@@ -740,8 +718,10 @@ declare function parseBigInt(value: string): bigint;
 declare function generateEventId(log: Log): string;
 /**
  * Get the current timestamp in seconds
+ * from onchain
+ * @param publicClient - The public client to use
  */
-declare function getCurrentTimestamp(): number;
+declare function getCurrentTimestamp(publicClient: PublicClient): Promise<bigint>;
 interface ComputeProviderParams {
     name: string;
     parallel: boolean;
@@ -751,7 +731,6 @@ declare const DEFAULT_COMPUTE_PROVIDER_PARAMS: ComputeProviderParams;
 declare const DEFAULT_E3_CONFIG: {
     readonly threshold_min: 2;
     readonly threshold_max: 5;
-    readonly window_size: 120;
     readonly duration: 1800;
     readonly payment_amount: "0";
 };
@@ -771,11 +750,15 @@ declare function encodeComputeProviderParams(params: ComputeProviderParams, mock
 declare function encodeCustomParams(params: Record<string, unknown>): `0x${string}`;
 /**
  * Calculate start window for E3 request
+ * @dev This function can be used for testing purposes, or for E3s which need to start as soon as possible.
+ * @param publicClient - The public client to use
+ * @param duration - The duration of the input window in seconds
+ * @param startBuffer - Buffer in seconds added to current timestamp for input window start
  */
-declare function calculateStartWindow(windowSize?: number): [bigint, bigint];
+declare function calculateInputWindow(publicClient: PublicClient, duration?: number, startBuffer?: bigint): Promise<[bigint, bigint]>;
 /**
  * Decode plaintextOutput bytes to get the actual result number
  */
 declare function decodePlaintextOutput(plaintextOutput: string): number | null;
 
-export { type AllEventTypes, type BfvParams, type CiphernodeAddedData, type CiphernodeRemovedData, type CiphertextOutputPublishedData, type CommitteeFinalizedData, type CommitteePublishedData, type CommitteeRequestedData, type ComputeProviderParams, ContractClient, type ContractInstances, DEFAULT_COMPUTE_PROVIDER_PARAMS, DEFAULT_E3_CONFIG, type E3, type E3ActivatedData, type E3RequestedData, type EnclaveEvent, type EnclaveEventData, EnclaveEventType, EnclaveSDK, type EncryptedValueAndPublicInputs, type EventCallback, type EventFilter, EventListener, type EventListenerConfig, type PlaintextOutputPublishedData, type Polynomial, type RegistryEventData, RegistryEventType, type SDKConfig, SDKError, type SDKEventEmitter, type ThresholdBfvParamsPresetName, ThresholdBfvParamsPresetNames, type VerifiableEncryptionResult, calculateStartWindow, decodePlaintextOutput, encodeBfvParams, encodeComputeProviderParams, encodeCustomParams, formatBigInt, formatEventName, generateEventId, generateProof, getCurrentTimestamp, isValidAddress, isValidHash, parseBigInt, parseEventData, sleep };
+export { type AllEventTypes, type BfvParams, type CiphernodeAddedData, type CiphernodeRemovedData, type CiphertextOutputPublishedData, type CommitteeFinalizedData, type CommitteePublishedData, type CommitteeRequestedData, type ComputeProviderParams, ContractClient, type ContractInstances, DEFAULT_COMPUTE_PROVIDER_PARAMS, DEFAULT_E3_CONFIG, type E3, type E3ActivatedData, type E3RequestedData, type EnclaveEvent, type EnclaveEventData, EnclaveEventType, EnclaveSDK, type EncryptedValueAndPublicInputs, type EventCallback, type EventFilter, EventListener, type EventListenerConfig, type PlaintextOutputPublishedData, type Polynomial, type RegistryEventData, RegistryEventType, type SDKConfig, SDKError, type SDKEventEmitter, type ThresholdBfvParamsPresetName, ThresholdBfvParamsPresetNames, type VerifiableEncryptionResult, calculateInputWindow, decodePlaintextOutput, encodeBfvParams, encodeComputeProviderParams, encodeCustomParams, formatBigInt, formatEventName, generateEventId, generateProof, getCurrentTimestamp, isValidAddress, isValidHash, parseBigInt, parseEventData, sleep };

package/dist/index.js

@@ -41,8 +41,9 @@ function parseBigInt(value) {
 function generateEventId(log) {
   return `${log.blockHash}-${log.logIndex}`;
 }
-function getCurrentTimestamp() {
-  return Math.floor(Date.now() / 1e3);
+async function getCurrentTimestamp(publicClient) {
+  const block = await publicClient.getBlock();
+  return block.timestamp;
 }
 var DEFAULT_COMPUTE_PROVIDER_PARAMS = {
   name: "risc0",
@@ -52,8 +53,6 @@ var DEFAULT_COMPUTE_PROVIDER_PARAMS = {
 var DEFAULT_E3_CONFIG = {
   threshold_min: 2,
   threshold_max: 5,
-  window_size: 120,
-  // 2 minutes in seconds
   duration: 1800,
   // 30 minutes in seconds
   payment_amount: "0"
@@ -105,9 +104,10 @@ function encodeCustomParams(params) {
   const bytes = encoder.encode(jsonString);
   return `0x${Array.from(bytes, (byte) => byte.toString(16).padStart(2, "0")).join("")}`;
 }
-function calculateStartWindow(windowSize = DEFAULT_E3_CONFIG.window_size) {
-  const now = getCurrentTimestamp();
-  return [BigInt(now), BigInt(now + windowSize)];
+var inputWindowStartBuffer = 15n;
+async function calculateInputWindow(publicClient, duration = DEFAULT_E3_CONFIG.duration, startBuffer = inputWindowStartBuffer) {
+  const now = await getCurrentTimestamp(publicClient);
+  return [BigInt(now) + startBuffer, BigInt(now) + startBuffer + BigInt(duration)];
 }
 function decodePlaintextOutput(plaintextOutput) {
   try {
@@ -201,9 +201,9 @@ var ContractClient = class {
   }
   /**
    * Request a new E3 computation
-   * request(address filter, uint32[2] threshold, uint256[2] startWindow, uint256 duration, IE3Program e3Program, bytes e3ProgramParams, bytes computeProviderParams, bytes customParams)
+   * request(uint32[2] threshold, uint256[2] inputWindow, IE3Program e3Program, bytes e3ProgramParams, bytes computeProviderParams, bytes customParams)
    */
-  async requestE3(threshold, startWindow, duration, e3Program, e3ProgramParams, computeProviderParams, customParams, gasLimit) {
+  async requestE3(threshold, inputWindow, e3Program, e3ProgramParams, computeProviderParams, customParams, gasLimit) {
     if (!this.walletClient) {
       throw new SDKError("Wallet client required for write operations", "NO_WALLET");
     }
@@ -222,8 +222,7 @@ var ContractClient = class {
         args: [
           {
             threshold,
-            startWindow,
-            duration,
+            inputWindow,
             e3Program,
             e3ProgramParams,
             computeProviderParams,
@@ -239,66 +238,6 @@ var ContractClient = class {
       throw new SDKError(`Failed to request E3: ${error}`, "REQUEST_E3_FAILED");
     }
   }
-  /**
-   * Activate an E3 computation
-   * activate(uint256 e3Id)
-   */
-  async activateE3(e3Id, gasLimit) {
-    if (!this.walletClient) {
-      throw new SDKError("Wallet client required for write operations", "NO_WALLET");
-    }
-    if (!this.contractInfo) {
-      await this.initialize();
-    }
-    try {
-      const account = this.walletClient.account;
-      if (!account) {
-        throw new SDKError("No account connected", "NO_ACCOUNT");
-      }
-      const { request } = await this.publicClient.simulateContract({
-        address: this.addresses.enclave,
-        abi: Enclave__factory.abi,
-        functionName: "activate",
-        args: [e3Id],
-        account,
-        gas: gasLimit
-      });
-      const hash = await this.walletClient.writeContract(request);
-      return hash;
-    } catch (error) {
-      throw new SDKError(`Failed to activate E3: ${error}`, "ACTIVATE_E3_FAILED");
-    }
-  }
-  /**
-   * Publish input for an E3 computation
-   * publishInput(uint256 e3Id, bytes memory data)
-   */
-  async publishInput(e3Id, data, gasLimit) {
-    if (!this.walletClient) {
-      throw new SDKError("Wallet client required for write operations", "NO_WALLET");
-    }
-    if (!this.contractInfo) {
-      await this.initialize();
-    }
-    try {
-      const account = this.walletClient.account;
-      if (!account) {
-        throw new SDKError("No account connected", "NO_ACCOUNT");
-      }
-      const { request } = await this.publicClient.simulateContract({
-        address: this.addresses.enclave,
-        abi: Enclave__factory.abi,
-        functionName: "publishInput",
-        args: [e3Id, data],
-        account,
-        gas: gasLimit
-      });
-      const hash = await this.walletClient.writeContract(request);
-      return hash;
-    } catch (error) {
-      throw new SDKError(`Failed to publish input: ${error}`, "PUBLISH_INPUT_FAILED");
-    }
-  }
   /**
    * Publish ciphertext output for an E3 computation
    * publishCiphertextOutput(uint256 e3Id, bytes memory ciphertextOutput, bytes memory proof)
@@ -607,7 +546,6 @@ var EventListener = class {
 // src/types.ts
 var EnclaveEventType = /* @__PURE__ */ ((EnclaveEventType2) => {
   EnclaveEventType2["E3_REQUESTED"] = "E3Requested";
-  EnclaveEventType2["E3_ACTIVATED"] = "E3Activated";
   EnclaveEventType2["CIPHERTEXT_OUTPUT_PUBLISHED"] = "CiphertextOutputPublished";
   EnclaveEventType2["PLAINTEXT_OUTPUT_PUBLISHED"] = "PlaintextOutputPublished";
   EnclaveEventType2["E3_PROGRAM_ENABLED"] = "E3ProgramEnabled";
@@ -873,8 +811,7 @@ var EnclaveSDK = class _EnclaveSDK {
     }
     return this.contractClient.requestE3(
       params.threshold,
-      params.startWindow,
-      params.duration,
+      params.inputWindow,
       params.e3Program,
       params.e3ProgramParams,
       params.computeProviderParams,
@@ -893,24 +830,6 @@ var EnclaveSDK = class _EnclaveSDK {
     }
     return this.contractClient.getE3PublicKey(e3Id);
   }
-  /**
-   * Activate an E3 computation
-   */
-  async activateE3(e3Id, gasLimit) {
-    if (!this.initialized) {
-      await this.initialize();
-    }
-    return this.contractClient.activateE3(e3Id, gasLimit);
-  }
-  /**
-   * Publish input for an E3 computation
-   */
-  async publishInput(e3Id, data, gasLimit) {
-    if (!this.initialized) {
-      await this.initialize();
-    }
-    return this.contractClient.publishInput(e3Id, data, gasLimit);
-  }
   /**
    * Publish ciphertext output for an E3 computation
    */
@@ -1062,7 +981,7 @@ export {
   RegistryEventType,
   SDKError,
   ThresholdBfvParamsPresetNames,
-  calculateStartWindow,
+  calculateInputWindow,
   decodePlaintextOutput,
   encodeBfvParams,
   encodeComputeProviderParams,