Add force_evmla flag

matter-labs · Feb 21, 2024 · 06d263f · 06d263f
1 parent 40b266d
commit 06d263f
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 10 deletions.
diff --git a/core/bin/contract-verifier/src/verifier.rs b/core/bin/contract-verifier/src/verifier.rs
@@ -310,6 +310,7 @@ impl ContractVerifier {
                 let settings = Settings {
                     output_selection: Some(default_output_selection),
                     is_system: request.req.is_system,
+                    force_evmla: request.req.force_evmla,
                     other: serde_json::Value::Object(
                         vec![("optimizer".to_string(), optimizer_value)]
                             .into_iter()

diff --git a/core/bin/contract-verifier/src/zksolc_utils.rs b/core/bin/contract-verifier/src/zksolc_utils.rs
@@ -35,7 +35,7 @@ pub struct Source {
 }
 
 /// Compiler settings.
-/// There are fields like `output_selection` and `is_system` which are accessed by contract verifier explicitly.
+/// There are fields like `output_selection`, `is_system`, `force_evmla` which are accessed by contract verifier explicitly.
 /// Other fields are accumulated in `other`, this way every field that was in the original request will be passed to a compiler.
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -45,6 +45,9 @@ pub struct Settings {
     /// Flag for system compilation mode.
     #[serde(default)]
     pub is_system: bool,
+    /// Flag to force evmla IR.
+    #[serde(default)]
+    pub force_evmla: bool,
     /// Other fields.
     #[serde(flatten)]
     pub other: serde_json::Value,
@@ -103,6 +106,9 @@ impl ZkSolc {
             if input.settings.is_system {
                 command.arg("--system-mode");
             }
+            if input.settings.force_evmla {
+                command.arg("--force-evmla");
+            }
         }
         command
             .arg("--solc")

diff --git a/...f6760cfeac185330d1d9c5cdb5b383ed8ed4.json → ...03def94f4bf4674def1893e2232be80f57a0.json b/...f6760cfeac185330d1d9c5cdb5b383ed8ed4.json → ...03def94f4bf4674def1893e2232be80f57a0.json
diff --git a/...fa6d65c05d8144bdfd143480834ead4bd8d5.json → ...77d57040037da0e07cef2c7b7246851a3703.json b/...fa6d65c05d8144bdfd143480834ead4bd8d5.json → ...77d57040037da0e07cef2c7b7246851a3703.json
diff --git a/...d0bc0e8923a6bae64f22f09242766835ee0c.json → ...094de508af93f4085be7cf3b54b1e8ecdadd.json b/...d0bc0e8923a6bae64f22f09242766835ee0c.json → ...094de508af93f4085be7cf3b54b1e8ecdadd.json
diff --git a/core/lib/dal/migrations/20240221155945_add_force_evmla_to_contract_verification_req.down.sql b/core/lib/dal/migrations/20240221155945_add_force_evmla_to_contract_verification_req.down.sql
@@ -0,0 +1 @@
+ALTER TABLE contract_verification_requests DROP COLUMN force_evmla;
diff --git a/core/lib/dal/migrations/20240221155945_add_force_evmla_to_contract_verification_req.up.sql b/core/lib/dal/migrations/20240221155945_add_force_evmla_to_contract_verification_req.up.sql
@@ -0,0 +1 @@
+ALTER TABLE contract_verification_requests ADD COLUMN IF NOT EXISTS force_evmla BOOLEAN NOT NULL DEFAULT false;
diff --git a/core/lib/dal/src/contract_verification_dal.rs b/core/lib/dal/src/contract_verification_dal.rs
@@ -73,12 +73,13 @@ impl ContractVerificationDal<'_, '_> {
                     optimizer_mode,
                     constructor_arguments,
                     is_system,
+                    force_evmla,
                     status,
                     created_at,
                     updated_at
                 )
             VALUES
-                ($1, $2, $3, $4, $5, $6, $7, $8, $9, 'queued', NOW(), NOW())
+                ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, 'queued', NOW(), NOW())
             RETURNING
                 id
             "#,
@@ -92,6 +93,7 @@ impl ContractVerificationDal<'_, '_> {
             query.optimizer_mode,
             query.constructor_arguments.0,
             query.is_system,
+            query.force_evmla,
         )
         .fetch_one(self.storage.conn())
         .await
@@ -149,7 +151,8 @@ impl ContractVerificationDal<'_, '_> {
                 optimization_used,
                 optimizer_mode,
                 constructor_arguments,
-                is_system
+                is_system,
+                force_evmla
             "#,
             &processing_timeout
         )
@@ -469,7 +472,8 @@ impl ContractVerificationDal<'_, '_> {
                 optimization_used,
                 optimizer_mode,
                 constructor_arguments,
-                is_system
+                is_system,
+                force_evmla
             FROM
                 contract_verification_requests
             WHERE

diff --git a/core/lib/dal/src/models/storage_verification_request.rs b/core/lib/dal/src/models/storage_verification_request.rs
@@ -18,6 +18,7 @@ pub struct StorageVerificationRequest {
     pub optimizer_mode: Option<String>,
     pub constructor_arguments: Vec<u8>,
     pub is_system: bool,
+    pub force_evmla: bool,
 }
 
 impl From<StorageVerificationRequest> for VerificationRequest {
@@ -44,6 +45,7 @@ impl From<StorageVerificationRequest> for VerificationRequest {
                 optimizer_mode: value.optimizer_mode,
                 constructor_arguments: value.constructor_arguments.into(),
                 is_system: value.is_system,
+                force_evmla: value.force_evmla,
             },
         }
     }

diff --git a/core/lib/types/src/contract_verification_api.rs b/core/lib/types/src/contract_verification_api.rs
@@ -142,6 +142,8 @@ pub struct VerificationIncomingRequest {
     pub constructor_arguments: Bytes,
     #[serde(default)]
     pub is_system: bool,
+    #[serde(default)]
+    pub force_evmla: bool,
 }
 
 #[derive(Debug, Eq, PartialEq, Clone, Copy)]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE contract_verification_requests DROP COLUMN force_evmla;