Feat/execution time warning

README.md

@@ -75,6 +75,7 @@ The acurast.json file is generated by running acurast init. Here is an example c
       "fileUrl": "dist/bundle.js",
       "network": "mainnet",
       "onlyAttestedDevices": true,
+      "enableDevtools": false,
       "assignmentStrategy": {
         "type": "Single"
       },
@@ -120,6 +121,7 @@ ACURAST_MNEMONIC=abandon abandon about ...
 - `fileUrl`: The path to the bundled file, including all dependencies (e.g., `dist/bundle.js`).
 - `network`: The network on which the project will be deployed. (e.g. `mainnet`)
 - `onlyAttestedDevices`: A boolean to specify if only attested devices are allowed to run the app.
+- `enableDevtools`: A boolean to enable [DevTools](#devtools) for the deployment. When enabled, console logs from processor executions are forwarded to the DevTools dashboard. Defaults to `false`.
 - `startAt`: The start time of the deployment.
   - `msFromNow`: The deployment will start the specified number of milliseconds from now.
   - `timestamp`: The deployment will start at the specified timestamp.
@@ -134,6 +136,7 @@ ACURAST_MNEMONIC=abandon abandon about ...
   - `type`: 'interval'`: Multiple executions for the deployment.
     - `intervalInMs`: Interval in milliseconds between each execution start.
     - `numberOfExecutions`: The number of executions.
+    - `maxExecutionTimeInMs`: Maximum execution time for each execution in milliseconds. If not specified, the full duration of the interval will be used (minus a 10s buffer). It is recommended to set this to at least 10s less than `intervalInMs`.
     - `maxAllowedStartDelayInMs`: Specifies the maximum allowed start delay (relative to the starting time) of the deployment in milliseconds.
 - `usageLimit`: The usage limits for the deployment:
   - `maxMemory`: Maximum memory usage in bytes.
@@ -277,10 +280,10 @@ Logs are only accessible with a valid view key. The key is scoped to the specifi
 
 ### Environment variables
 
-| Variable | Default | Description |
-|---|---|---|
-| `ACURAST_DEVTOOLS_URL` | `https://devtools.acurast.com` | DevTools frontend URL |
-| `ACURAST_DEVTOOLS_API_URL` | `https://api.devtools.acurast.com` | DevTools API URL |
+| Variable                   | Default                            | Description           |
+| -------------------------- | ---------------------------------- | --------------------- |
+| `ACURAST_DEVTOOLS_URL`     | `https://devtools.acurast.com`     | DevTools frontend URL |
+| `ACURAST_DEVTOOLS_API_URL` | `https://api.devtools.acurast.com` | DevTools API URL      |
 
 ## Deployment Management
 

acurast.json

@@ -224,7 +224,7 @@
         "maxNetworkRequests": 0,
         "maxStorage": 0
       },
-      "numberOfReplicas": 20,
+      "numberOfReplicas": 1,
       "requiredModules": [],
       "minProcessorReputation": 0,
       "maxCostPerExecution": 3000000000,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acurast/cli",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "A cli to interact with the Acurast Cloud.",
   "main": "dist/index.js",
   "bin": {

src/acurast/createJob.ts

@@ -48,7 +48,12 @@ export const createJob = async (
 
   if (config.fileUrl.startsWith('ipfs://')) {
     ipfsHash = config.fileUrl
-    filelogger.debug(`config.fileUrl is an IPFS hash, so we this: ${ipfsHash}`)
+    if (config.enableDevtools) {
+      filelogger.warn(
+        'enableDevtools is ignored when fileUrl is an IPFS hash — the devtools snippet can only be injected into local bundles.'
+      )
+    }
+    filelogger.debug(`config.fileUrl is an IPFS hash, so we use this: ${ipfsHash}`)
   } else {
     filelogger.debug(
       `config.fileUrl is not an IPFS hash, so we zip it: ${config.fileUrl}`
@@ -84,7 +89,6 @@ export const createJob = async (
         zipPath,
         config.entrypoint ?? basename(config.fileUrl),
         devtoolsApiUrl,
-        wallet.address,
         snippetDir
       )
       filelogger.debug('Devtools snippet injected into bundle')

src/devtools/devtools-snippet.ts

@@ -2,12 +2,10 @@
 // of user scripts when enableDevtools is true. It overrides console methods to
 // forward logs to the Acurast DevTools API.
 //
-// Placeholders __DEVTOOLS_API_URL__ and __DEVTOOLS_DEPLOYER__ are replaced at
-// injection time by the CLI.
+// Placeholder __DEVTOOLS_API_URL__ is replaced at injection time by the CLI.
 
 ;(() => {
   const DEVTOOLS_API_URL = '__DEVTOOLS_API_URL__'
-  const DEVTOOLS_DEPLOYER = '__DEVTOOLS_DEPLOYER__'
 
   const originalConsole = {
     log: console.log,

src/devtools/injectDevtoolsSnippet.ts

@@ -10,7 +10,6 @@ export async function injectDevtoolsSnippet(
   zipPath: string,
   entrypoint: string,
   devtoolsApiUrl: string,
-  deployerAddress: string,
   snippetDir: string
 ): Promise<string> {
   const snippetPath = join(snippetDir, 'devtools-snippet.js')
@@ -23,7 +22,6 @@ export async function injectDevtoolsSnippet(
     .trim()
 
   snippet = snippet.replace(/__DEVTOOLS_API_URL__/g, devtoolsApiUrl)
-  snippet = snippet.replace(/__DEVTOOLS_DEPLOYER__/g, deployerAddress)
 
   const zip = new AdmZip(zipPath)
   const entry = zip.getEntry(entrypoint)

src/util/validateConfig.ts

@@ -236,6 +236,19 @@ const acurastProjectConfigSchemaWithNotes =
       }
     }
 
+    if (
+      data.execution.type === 'interval' &&
+      data.execution.maxExecutionTimeInMs !== undefined &&
+      data.execution.maxExecutionTimeInMs > data.execution.intervalInMs - 10_000
+    ) {
+      context.addIssue({
+        code: z.ZodIssueCode.custom,
+        message:
+          'Warning: maxExecutionTimeInMs should be at least 10s shorter than intervalInMs to allow enough time between executions.',
+        path: ['execution', 'maxExecutionTimeInMs'],
+      })
+    }
+
     // TODO: Add check for competing strategy and intervals
   })
 

test/devtools.test.ts

@@ -44,7 +44,6 @@ describe('devtools snippet injection', () => {
       zipPath,
       'index.js',
       'https://api.devtools.acurast.com',
-      '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY',
       SNIPPET_DIR
     )
 
@@ -68,7 +67,6 @@ describe('devtools snippet injection', () => {
       zipPath,
       'index.js',
       apiUrl,
-      '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY',
       SNIPPET_DIR
     )
 
@@ -79,23 +77,19 @@ describe('devtools snippet injection', () => {
     expect(content).not.toContain('__DEVTOOLS_API_URL__')
   })
 
-  it('should replace the deployer placeholder', async () => {
+  it('should not contain any unreplaced placeholders', async () => {
     const zipPath = createTestZip('index.js', '// user code')
-    const deployer = '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY'
-
     await injectDevtoolsSnippet(
       zipPath,
       'index.js',
       'https://api.devtools.acurast.com',
-      deployer,
       SNIPPET_DIR
     )
 
     const zip = new AdmZip(zipPath)
     const content = zip.getEntry('index.js')!.getData().toString('utf-8')
 
-    expect(content).toContain(deployer)
-    expect(content).not.toContain('__DEVTOOLS_DEPLOYER__')
+    expect(content).not.toContain('__DEVTOOLS_API_URL__')
   })
 
   it('should strip TSC artifacts (export {}, sourcemap comment)', async () => {
@@ -105,7 +99,6 @@ describe('devtools snippet injection', () => {
       zipPath,
       'index.js',
       'https://api.devtools.acurast.com',
-      '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY',
       SNIPPET_DIR
     )
 
@@ -124,7 +117,6 @@ describe('devtools snippet injection', () => {
         zipPath,
         'nonexistent.js',
         'https://api.devtools.acurast.com',
-        '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY',
         SNIPPET_DIR
       )
     ).rejects.toThrow('Could not find entrypoint')
@@ -142,7 +134,6 @@ describe('devtools snippet injection', () => {
       zipPath,
       'index.js',
       'https://api.devtools.acurast.com',
-      '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY',
       SNIPPET_DIR
     )
 
@@ -163,7 +154,6 @@ describe('devtools snippet injection', () => {
       zipPath,
       'index.js',
       'https://api.devtools.acurast.com',
-      '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY',
       SNIPPET_DIR
     )