Merge pull request #136 from Acurast/develop

Develop

Author: AndreasGassmann

README.md

@@ -169,10 +169,10 @@ ACURAST_MNEMONIC=abandon abandon about ...
   - Third element: The deployment ID
   - Example: `["Acurast", "5CiPPseXPECbkjWCa6MnjNokrgYjMqmKndv2rSnekmSK2DjL", 123456]`
 - `benchmarkFilters` (optional): Minimum benchmark requirements used to filter eligible processors.
-  - `minMemoryBytes`: Minimum total RAM in bytes.
+  - `minRamTotalBytes`: Minimum total RAM in bytes.
   - `minCpuSingleCoreScore`: Minimum single-core CPU score.
-  - `minStorageBytes`: Minimum total storage in bytes.
-  - `minStorageIoScore`: Minimum storage I/O score.
+  - `minCpuMultiCoreScore`: Minimum multi-core CPU score.
+  - `minStorageAvailBytes`: Minimum available storage in bytes.
   - `poolIds` (advanced): Override compute-pallet benchmark pool IDs.
 
 ### Benchmark Filters
@@ -187,10 +187,10 @@ Config example:
   "projects": {
     "example": {
       "benchmarkFilters": {
-        "minMemoryBytes": 4000000000,
+        "minRamTotalBytes": 4000000000,
         "minCpuSingleCoreScore": 1000,
-        "minStorageBytes": 64000000000,
-        "minStorageIoScore": 500
+        "minCpuMultiCoreScore": 3000,
+        "minStorageAvailBytes": 64000000000
       }
     }
   }
@@ -200,7 +200,7 @@ Config example:
 Deploy flag examples (can be combined):
 
 ```bash
-acurast deploy --min-memory 4GB --min-cpu-score 1000 --min-storage 64GB --min-io-score 500
+acurast deploy --min-memory 4GB --min-cpu-score 1000 --min-storage 64GB --min-cpu-multi-score 3000
 ```
 
 Notes:

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@acurast/cli",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "A cli to interact with the Acurast Cloud.",
   "main": "dist/index.js",
   "bin": {
@@ -33,9 +33,8 @@
   "dependencies": {
     "@acurast/dapp": "^1.0.1",
     "@acurast/devtools": "^1.0.1",
-    "@acurast/sdk": "^1.2.1",
+    "@acurast/sdk": "^1.2.2",
     "@inquirer/prompts": "^5.0.5",
-    "adm-zip": "^0.5.16",
     "@polkadot/api": "^16.1.2",
     "@polkadot/api-augment": "^16.1.2",
     "@polkadot/keyring": "^14.0.0",
@@ -44,6 +43,7 @@
     "@polkadot/util": "^14.0.0",
     "@polkadot/util-crypto": "^14.0.0",
     "@polkadot/wasm-crypto": "^7.3.2",
+    "adm-zip": "^0.5.16",
     "ansis": "^4.1.0",
     "bignumber.js": "^9.3.0",
     "bip39": "^3.1.0",

package.json

@@ -270,17 +270,17 @@ export const addCommandDeploy = (program: Command) => {
     .addOption(
       new Option(
         '--min-storage <size>',
-        'Minimum total storage capacity (e.g. 64GB)'
+        'Minimum available storage capacity (e.g. 64GB)'
       )
     )
     .addOption(
       new Option(
-        '--min-io-score <n>',
-        'Minimum storage I/O benchmark score'
+        '--min-cpu-multi-score <n>',
+        'Minimum CPU multi-core benchmark score'
       ).argParser((v) => {
         const n = Number.parseInt(v, 10)
         if (Number.isNaN(n) || n < 0) {
-          throw new Error(`Invalid --min-io-score: ${v}`)
+          throw new Error(`Invalid --min-cpu-multi-score: ${v}`)
         }
         return n
       })
@@ -298,7 +298,7 @@ export const addCommandDeploy = (program: Command) => {
           minMemory?: string
           minCpuScore?: number
           minStorage?: string
-          minIoScore?: number
+          minCpuMultiScore?: number
         }
       ) => {
         const log = consoleOutput(options.output)
@@ -346,22 +346,22 @@ export const addCommandDeploy = (program: Command) => {
         try {
           const bf = { ...config.benchmarkFilters }
           if (options.minMemory !== undefined) {
-            bf.minMemoryBytes = Number(parseByteSize(options.minMemory))
+            bf.minRamTotalBytes = Number(parseByteSize(options.minMemory))
           }
           if (options.minCpuScore !== undefined) {
             bf.minCpuSingleCoreScore = options.minCpuScore
           }
           if (options.minStorage !== undefined) {
-            bf.minStorageBytes = Number(parseByteSize(options.minStorage))
+            bf.minStorageAvailBytes = Number(parseByteSize(options.minStorage))
           }
-          if (options.minIoScore !== undefined) {
-            bf.minStorageIoScore = options.minIoScore
+          if (options.minCpuMultiScore !== undefined) {
+            bf.minCpuMultiCoreScore = options.minCpuMultiScore
           }
           if (
             options.minMemory !== undefined ||
             options.minCpuScore !== undefined ||
             options.minStorage !== undefined ||
-            options.minIoScore !== undefined
+            options.minCpuMultiScore !== undefined
           ) {
             config.benchmarkFilters = bf
           }