fix executor pricing & refactor

iosis-tech · Aug 19, 2024 · 3fdb79c · 3fdb79c
1 parent 7933ee4
commit 3fdb79c
Show file tree

Hide file tree

Showing 8 changed files with 504 additions and 577 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,7 @@ bootloader*.json
 *.swp
 *.swo
 .env
+.resources
 
 # IDE-specific
 .vscode/

diff --git a/crates/executor/src/executor.rs b/crates/executor/src/executor.rs
@@ -62,7 +62,7 @@ impl Executor {
                                                         data: serde_json::to_vec(&MarketMessage::JobBid(JobBid {
                                                             identity,
                                                             job_key,
-                                                            price: (runner_scheduler.len() * prover_scheduler.len()) as u64,
+                                                            price: (runner_scheduler.len() + 2 * prover_scheduler.len()) as u64,
                                                         }))?
                                                     })
                                                     .await?

diff --git a/crates/prover/src/stone_prover/types/params.rs b/crates/prover/src/stone_prover/types/params.rs
@@ -6,7 +6,9 @@ pub enum Hash {
     Pedersen,
     Poseidon3,
     Keccak256,
+    Blake256,
     Keccak256Masked160Lsb,
+    Blake256Masked160Lsb,
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
@@ -58,9 +60,9 @@ impl Default for Params {
         Self {
             field: Field::PrimeField0,
             channel_hash: Hash::Poseidon3,
-            commitment_hash: Hash::Keccak256Masked160Lsb,
+            commitment_hash: Hash::Blake256Masked160Lsb,
             n_verifier_friendly_commitment_layers: 0,
-            pow_hash: Hash::Keccak256,
+            pow_hash: Hash::Blake256,
             statement: Statement::default(),
             stark: Stark::default(),
             use_extension_field: false,

diff --git a/dashboard/cairo_pie_large.zip b/dashboard/cairo_pie_large.zip
diff --git a/dashboard/cairo_pie_medium.zip b/dashboard/cairo_pie_medium.zip
diff --git a/dashboard/cairo_pie_small.zip b/dashboard/cairo_pie_small.zip
diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json
diff --git a/dashboard/package.json b/dashboard/package.json
@@ -19,18 +19,18 @@
     "react-dom": "^18",
     "react-dropzone": "^14.2.3",
     "zod": "^3.23.8",
-    "swiftness-dex-blake2s": "^0.0.7",
-    "swiftness-dex-keccak": "^0.0.7",
-    "swiftness-recursive-blake2s": "^0.0.7",
-    "swiftness-recursive-keccak": "^0.0.7",
-    "swiftness-recursive-with-poseidon-blake2s": "^0.0.7",
-    "swiftness-recursive-with-poseidon-keccak": "^0.0.7",
-    "swiftness-small-blake2s": "^0.0.7",
-    "swiftness-small-keccak": "^0.0.7",
-    "swiftness-starknet-blake2s": "^0.0.7",
-    "swiftness-starknet-keccak": "^0.0.7",
-    "swiftness-starknet-with-keccak-blake2s": "^0.0.7",
-    "swiftness-starknet-with-keccak-keccak": "^0.0.7"
+    "swiftness-dex-blake2s": "^0.0.8",
+    "swiftness-dex-keccak": "^0.0.8",
+    "swiftness-recursive-blake2s": "^0.0.8",
+    "swiftness-recursive-keccak": "^0.0.8",
+    "swiftness-recursive-with-poseidon-blake2s": "^0.0.8",
+    "swiftness-recursive-with-poseidon-keccak": "^0.0.8",
+    "swiftness-small-blake2s": "^0.0.8",
+    "swiftness-small-keccak": "^0.0.8",
+    "swiftness-starknet-blake2s": "^0.0.8",
+    "swiftness-starknet-keccak": "^0.0.8",
+    "swiftness-starknet-with-keccak-blake2s": "^0.0.8",
+    "swiftness-starknet-with-keccak-keccak": "^0.0.8"
   },
   "devDependencies": {
     "@types/node": "^20",