Ensure MAX_DEPLOYMENT_VARIABLES limits the total number of variables …

…in a program
ProvableHQ · Apr 12, 2024 · 07ac80c · 07ac80c
1 parent 614cf9c
commit 07ac80c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/console/network/src/lib.rs b/console/network/src/lib.rs
@@ -117,7 +117,7 @@ pub trait Network:
     /// The maximum number of constraints in a deployment.
     const MAX_DEPLOYMENT_CONSTRAINTS: u64 = 1 << 20; // 1,048,576 constraints
     /// The maximum number of variables in a deployment.
-    const MAX_DEPLOYMENT_VARIABLES: u64 = 1 << 20; // 1,048,576 variables
+    const MAX_DEPLOYMENT_VARIABLES: u64 = 1 << 22; // 4,194,304 variables
     /// The maximum number of microcredits that can be spent as a fee.
     const MAX_FEE: u64 = 1_000_000_000_000_000;
     /// The maximum number of microcredits that can be spent on a finalize block.

diff --git a/synthesizer/process/src/stack/deploy.rs b/synthesizer/process/src/stack/deploy.rs
@@ -132,6 +132,8 @@ impl<N: Network> Stack<N> {
             lap!(timer, "Compute the request for {}", function.name());
             // Initialize the assignments.
             let assignments = Assignments::<N>::default();
+            // Initialize the variable limit.
+            let variable_limit = N::MAX_DEPLOYMENT_VARIABLES / N::MAX_FUNCTIONS as u64;
             // Initialize the constraint limit. Account for the constraint added after synthesis that makes the Varuna zerocheck hiding.
             let Some(constraint_limit) = verifying_key.circuit_info.num_constraints.checked_sub(1) else {
                 // Since a deployment must always pay non-zero fee, it must always have at least one constraint.
@@ -143,7 +145,7 @@ impl<N: Network> Stack<N> {
                 burner_private_key,
                 assignments.clone(),
                 Some(constraint_limit as u64),
-                Some(N::MAX_DEPLOYMENT_VARIABLES),
+                Some(variable_limit),
             );
             // Append the function name, callstack, and assignments.
             call_stacks.push((function.name(), call_stack, assignments));

diff --git a/synthesizer/process/src/stack/execute.rs b/synthesizer/process/src/stack/execute.rs
@@ -417,6 +417,9 @@ impl<N: Network> StackExecute<N> for Stack<N> {
             );
         }
 
+        // Determine the number of variables allocated in the circuit.
+        let num_variables = A::num_variables();
+
         // Eject the circuit assignment and reset the circuit.
         let assignment = A::eject_assignment_and_reset();
 
@@ -445,6 +448,7 @@ impl<N: Network> StackExecute<N> for Stack<N> {
             let metrics = CallMetrics {
                 program_id: *self.program_id(),
                 function_name: *function.name(),
+                num_variables,
                 num_instructions: function.instructions().len(),
                 num_request_constraints,
                 num_function_constraints,
@@ -467,6 +471,7 @@ impl<N: Network> StackExecute<N> for Stack<N> {
             let metrics = CallMetrics {
                 program_id: *self.program_id(),
                 function_name: *function.name(),
+                num_variables,
                 num_instructions: function.instructions().len(),
                 num_request_constraints,
                 num_function_constraints,
@@ -487,6 +492,7 @@ impl<N: Network> StackExecute<N> for Stack<N> {
             let metrics = CallMetrics {
                 program_id: *self.program_id(),
                 function_name: *function.name(),
+                num_variables,
                 num_instructions: function.instructions().len(),
                 num_request_constraints,
                 num_function_constraints,

diff --git a/synthesizer/process/src/trace/call_metrics/mod.rs b/synthesizer/process/src/trace/call_metrics/mod.rs
@@ -22,6 +22,7 @@ pub struct CallMetrics<N: Network> {
     pub program_id: ProgramID<N>,
     pub function_name: Identifier<N>,
     pub num_instructions: usize,
+    pub num_variables: u64,
     pub num_request_constraints: u64,
     pub num_function_constraints: u64,
     pub num_response_constraints: u64,

diff --git a/synthesizer/src/vm/mod.rs b/synthesizer/src/vm/mod.rs
@@ -1343,7 +1343,14 @@ program synthesis_num_constants.aleo;
 function do:
     cast 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 into r0 as [u32; 32u32];
     cast r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 into r1 as [[u32; 32u32]; 32u32];
-    cast r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 into r2 as [[[u32; 32u32]; 32u32]; 16u32];
+    cast r1 r1 r1 r1 r1 into r2 as [[[u32; 32u32]; 32u32]; 5u32];
+    hash.bhp1024 r2 into r3 as u32;
+    output r3 as u32.private;
+
+function do2:
+    cast 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 0u32 into r0 as [u32; 32u32];
+    cast r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 r0 into r1 as [[u32; 32u32]; 32u32];
+    cast r1 r1 r1 r1 r1 into r2 as [[[u32; 32u32]; 32u32]; 5u32];
     hash.bhp1024 r2 into r3 as u32;
     output r3 as u32.private;",
         )