@enclave-e3/contracts 0.1.11 → 0.1.13

package/dist/tasks/enclave.js

@@ -28,21 +28,15 @@ export const requestCommittee = task("committee:new", "Request a new ciphernode
     type: ArgumentType.INT,
 })
     .addOption({
-    name: "windowStart",
-    description: "timestamp start of window for the E3 (default: now)",
-    defaultValue: Math.floor(Date.now() / 1000),
+    name: "inputWindowStart",
+    description: "start of input submission window (default: now + 300)",
+    defaultValue: Math.floor(Date.now() / 1000) + 300,
     type: ArgumentType.INT,
 })
     .addOption({
-    name: "windowEnd",
-    description: "timestamp end of window for the E3 (default: now + 1 day)",
-    defaultValue: Math.floor(Date.now() / 1000) + 86400,
-    type: ArgumentType.INT,
-})
-    .addOption({
-    name: "duration",
-    description: "duration in seconds of the E3 (default: 1 day)",
-    defaultValue: 86400,
+    name: "inputWindowEnd",
+    description: "deadline for input submission (default: now + 2 days)",
+    defaultValue: Math.floor(Date.now() / 1000) + 86400 * 2,
     type: ArgumentType.INT,
 })
     .addOption({
@@ -70,7 +64,7 @@ export const requestCommittee = task("committee:new", "Request a new ciphernode
     type: ArgumentType.STRING,
 })
     .setAction(async () => ({
-    default: async ({ thresholdQuorum, thresholdTotal, windowStart, windowEnd, duration, e3Address, e3Params, computeParams, customParams, }, hre) => {
+    default: async ({ thresholdQuorum, thresholdTotal, inputWindowStart, inputWindowEnd, e3Address, e3Params, computeParams, customParams, }, hre) => {
         const connection = await hre.network.connect();
         const { ethers } = connection;
         const { deployAndSaveEnclave } = await import("../scripts/deployAndSave/enclave");
@@ -111,8 +105,7 @@ export const requestCommittee = task("committee:new", "Request a new ciphernode
         });
         const requestParams = {
             threshold: [thresholdQuorum, thresholdTotal],
-            startWindow: [windowStart, windowEnd],
-            duration: duration,
+            inputWindow: [inputWindowStart, inputWindowEnd],
             e3Program: e3Address === ZeroAddress ? mockE3ProgramArgs.address : e3Address,
             e3ProgramParams,
             computeProviderParams,
@@ -212,63 +205,6 @@ export const publishCommittee = task("committee:publish", "Publish the publickey
     },
 }))
     .build();
-export const activateE3 = task("e3:activate", "Activate an E3 program")
-    .addOption({
-    name: "e3Id",
-    description: "Id of the E3 program",
-    defaultValue: 0,
-    type: ArgumentType.INT,
-})
-    .setAction(async () => ({
-    default: async ({ e3Id }, hre) => {
-        const { deployAndSaveEnclave } = await import("../scripts/deployAndSave/enclave");
-        const { enclave } = await deployAndSaveEnclave({
-            hre,
-        });
-        const tx = await enclave.activate(e3Id);
-        console.log("Activating E3 program... ", tx.hash);
-        await tx.wait();
-        console.log(`E3 program activated`);
-    },
-}))
-    .build();
-export const publishInput = task("e3:publishInput", "Publish input for an E3 program")
-    .addOption({
-    name: "e3Id",
-    description: "Id of the E3 program",
-    defaultValue: 0,
-    type: ArgumentType.INT,
-})
-    .addOption({
-    name: "data",
-    description: "data to publish",
-    defaultValue: "",
-    type: ArgumentType.STRING,
-})
-    .addOption({
-    name: "dataFile",
-    description: "file containing data to publish",
-    defaultValue: "",
-    type: ArgumentType.STRING,
-})
-    .setAction(async () => ({
-    default: async ({ e3Id, data, dataFile }, hre) => {
-        const { deployAndSaveEnclave } = await import("../scripts/deployAndSave/enclave");
-        const { enclave } = await deployAndSaveEnclave({
-            hre,
-        });
-        let dataToSend = data;
-        if (dataFile) {
-            const file = fs.readFileSync(dataFile);
-            dataToSend = file.toString();
-        }
-        const tx = await enclave.publishInput(e3Id, dataToSend);
-        console.log("Publishing input... ", tx.hash);
-        await tx.wait();
-        console.log(`Input published`);
-    },
-}))
-    .build();
 export const publishCiphertext = task("e3:publishCiphertext", "Publish ciphertext output for an E3 program")
     .addOption({
     name: "e3Id",

package/dist/tasks/program.d.ts

@@ -0,0 +1,2 @@
+export declare const publishInput: import("hardhat/types/tasks").NewTaskDefinition;
+//# sourceMappingURL=program.d.ts.map

package/dist/tasks/program.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"program.d.ts","sourceRoot":"","sources":["../../tasks/program.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,YAAY,iDA+Df,CAAC"}

package/dist/tasks/program.js

@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: LGPL-3.0-only
+//
+// This file is provided WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE.
+import fs from "fs";
+import { task } from "hardhat/config";
+import { ArgumentType } from "hardhat/types/arguments";
+export const publishInput = task("e3-program:publishInput", "Publish input for an E3 program")
+    .addOption({
+    name: "e3Id",
+    description: "Id of the E3 program",
+    defaultValue: 0,
+    type: ArgumentType.INT,
+})
+    .addOption({
+    name: "data",
+    description: "data to publish",
+    defaultValue: "",
+    type: ArgumentType.STRING,
+})
+    .addOption({
+    name: "dataFile",
+    description: "file containing data to publish",
+    defaultValue: "",
+    type: ArgumentType.STRING,
+})
+    // MockProgram
+    .addOption({
+    name: "programAddress",
+    description: "Address of the E3 program",
+    defaultValue: "0x7a2088a1bFc9d81c55368AE168C2C02570cB814F",
+    type: ArgumentType.STRING,
+})
+    .setAction(async () => ({
+    default: async ({ e3Id, data, dataFile, programAddress }, hre) => {
+        const { deployAndSaveMockProgram } = await import("../scripts/deployAndSave/mockProgram");
+        const { MockE3Program__factory } = await import("../types");
+        const { ethers } = await hre.network.connect();
+        const [signer] = await ethers.getSigners();
+        let actualProgramAddress = programAddress;
+        if (programAddress === "") {
+            actualProgramAddress = await deployAndSaveMockProgram({ hre }).then(({ e3Program }) => e3Program.getAddress());
+        }
+        const program = MockE3Program__factory.connect(actualProgramAddress, signer);
+        let dataToSend = data;
+        if (dataFile) {
+            const file = fs.readFileSync(dataFile);
+            dataToSend = file.toString();
+        }
+        await program.publishInput(e3Id, dataToSend);
+        console.log(`Input published`);
+    },
+}))
+    .build();

package/dist/test/E3Lifecycle/E3Integration.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=E3Integration.spec.d.ts.map

package/dist/test/E3Lifecycle/E3Integration.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"E3Integration.spec.d.ts","sourceRoot":"","sources":["../../../test/E3Lifecycle/E3Integration.spec.ts"],"names":[],"mappings":""}