Balance out a and b for BHP and Field::ternary

circuit/algorithms/src/bhp/hasher/hash_uncompressed.rs

@@ -60,8 +60,8 @@ impl<E: Environment, const NUM_WINDOWS: u8, const WINDOW_SIZE: u8> HashUncompres
             let lambda: Field<E> = witness!(|this_x, this_y, that_x, that_y| (that_y - this_y) / (that_x - this_x));
 
             // Ensure `lambda` is correct by enforcing:
-            // `lambda * (that_x - this_x) == (that_y - this_y)`
-            E::enforce(|| (&lambda, that_x - this_x, that_y - this_y));
+            // `(that_x - this_x) * lambda == (that_y - this_y)`
+            E::enforce(|| (that_x - this_x, &lambda, that_y - this_y));
 
             // Construct `sum_x` as a witness defined as:
             // `sum_x := (B * lambda^2) - A - this_x - that_x`
@@ -78,8 +78,8 @@ impl<E: Environment, const NUM_WINDOWS: u8, const WINDOW_SIZE: u8> HashUncompres
             let sum_y: Field<E> = witness!(|lambda, sum_x, this_x, this_y| -(this_y + (lambda * (sum_x - this_x))));
 
             // Ensure `sum_y` is correct by enforcing:
-            // `(lambda * (this_x - sum_x)) == (this_y + sum_y)`
-            E::enforce(|| (&lambda, this_x - &sum_x, this_y + &sum_y));
+            // `(this_x - sum_x) * lambda == (this_y + sum_y)`
+            E::enforce(|| (this_x - &sum_x, &lambda, this_y + &sum_y));
 
             (sum_x, sum_y)
         };
@@ -132,7 +132,7 @@ impl<E: Environment, const NUM_WINDOWS: u8, const WINDOW_SIZE: u8> HashUncompres
                         // which is equivalent to:
                         //     if `bit_2 == 0`, then `montgomery_y = -1/2 * -2 * y = y`
                         //     if `bit_2 == 1`, then `montgomery_y = 1/2 * -2 * y = -y`
-                        E::enforce(|| (bit_2 - &one_half, -y.double(), &montgomery_y)); // 1 constraint
+                        E::enforce(|| (-y.double(), bit_2 - &one_half, &montgomery_y)); // 1 constraint
 
                         montgomery_y
                     };

circuit/types/field/src/ternary.rs

@@ -46,7 +46,7 @@ impl<E: Environment> Ternary for Field<E> {
             // -------------------------------------------------------
             //    witness = condition * a + (1 - condition) * b
             // => witness = b + condition * (a - b)
-            // => condition * (a - b) = witness - b
+            // => (a - b) * condition = witness - b
             //
             //
             // Assumption
@@ -58,32 +58,32 @@ impl<E: Environment> Ternary for Field<E> {
             //
             // Case 1: condition = 0 AND witness = a (dishonest)
             // -------------------------------------------------------
-            // 0 * (a - b) = a - b
+            // (a - b) * 0 = a - b
             //           0 = a - b
             // => if a != b, as LHS != RHS, the witness is incorrect.
             //
             //
             // Case 2: condition = 0 AND witness = b (honest)
             // -------------------------------------------------------
-            // 0 * (a - b) = b - b
+            // (a - b) * 0 = b - b
             //           0 = 0
             // => as LHS == RHS, the witness is correct.
             //
             //
             // Case 3: condition = 1 AND witness = a (honest)
             // -------------------------------------------------------
-            // 1 * (a - b) = a - b
+            // (a - b) * 1 = a - b
             //       a - b = a - b
             // => as LHS == RHS, the witness is correct.
             //
             //
             // Case 4: condition = 1 AND witness = b (dishonest)
             // -------------------------------------------------------
-            // 1 * (a - b) = b - b
+            // (a - b) * 1 = b - b
             //       a - b = 0
             // => if a != b, as LHS != RHS, the witness is incorrect.
             //
-            E::enforce(|| (condition, (first - second), (&witness - second)));
+            E::enforce(|| ((first - second), condition, (&witness - second)));
 
             witness
         }

parameters/src/testnet3/resources/bond_public.metadata

@@ -1,6 +1,6 @@
 {
-  "prover_checksum": "9abdcbc5a4964d25c2f0dc85f49b9577ad8d253eb0eb907651ce7f1e40148b6e",
+  "prover_checksum": "cb623c2a490b60bdbf238cc9d672ea8b24649fed2113955d6eaeed1af78a0a3b",
   "prover_size": 28804418,
-  "verifier_checksum": "fdd144eb792f948cea06480a4a46d8f475147d11a97ff23e6293a22a75863550",
+  "verifier_checksum": "260be0ae33b443fdc043ae6f356d96fb652a34b517cd00d6c32fa6c84fc98466",
   "verifier_size": 665
 }

parameters/src/testnet3/resources/claim_unbond_public.metadata

@@ -1,6 +1,6 @@
 {
-  "prover_checksum": "3c238b5406093889f71b00c70b1b33e6addbd84c40db698f227a8ee18d57452c",
+  "prover_checksum": "92eab92c9ed823938c48cd20471940cbf1019037394c636fef3995026c0486dc",
   "prover_size": 16735412,
-  "verifier_checksum": "a33a12daa4c2a1c70c3c7d250c7897cfc8f8b81c570f24b8822b827661d5a904",
+  "verifier_checksum": "37dff00b3427c828e936cef62288287517f625c0dd79fa1cb41a2ea9b76c4c76",
   "verifier_size": 665
 }

parameters/src/testnet3/resources/fee_private.metadata

@@ -1,6 +1,6 @@
 {
-  "prover_checksum": "25d61da468ced55b7ef91c76f69a46d55657e772ae9af5348ea5154f1ab4cb6d",
-  "prover_size": 59390468,
-  "verifier_checksum": "e5d9991384116a7d5a85341707650ee1203d0c1e49753e28441cdf582afc5e4b",
+  "prover_checksum": "8228db5ab37174efb78e9a4d7ecf1508d4a342355b92cdf9cd88d3f3002c641b",
+  "prover_size": 65681924,
+  "verifier_checksum": "5e83837551156c0984064affdc5d93dbfa906fbf4c98b171fee26bb51030a086",
   "verifier_size": 665
 }

parameters/src/testnet3/resources/fee_public.metadata

@@ -1,6 +1,6 @@
 {
-  "prover_checksum": "e8ba6c228f0a854482959ac878905fd8959798be5983c278d43397c85480d45c",
+  "prover_checksum": "fbeee4789cb8b6f013aedbc5dd8ba2d18f1dbef650e8513728f8cbee36e132c3",
   "prover_size": 28763210,
-  "verifier_checksum": "d99e95c339011345bd6b809c456f4021965ae84b8148fc31fa51f7c050462a80",
+  "verifier_checksum": "a7972d498e1cfbebed585383636cab7ffd57be34ee97dc74fff2ad88d492cfa2",
   "verifier_size": 665
 }

parameters/src/testnet3/resources/inclusion.metadata

@@ -1,6 +1,6 @@
 {
-  "prover_checksum": "b46b2876470c1f0ee17a3c44dd2f42f1ff4dad28bfd8b2d9cc4f49a09bae6b63",
-  "prover_size": 156031076,
-  "verifier_checksum": "2fae1055a8be6ca8fad6daea79c15d16697eb7b1ff9b2a6e0cadd23fa3352e7c",
+  "prover_checksum": "a3a637c366a885d281b8ce67fae6bf9d800687fc48481ebe6ad22674e7cc6e94",
+  "prover_size": 232053042,
+  "verifier_checksum": "202c861bebdc98afebcc7ec7ab03b3db30c9c8a32ac6b9fdd903b3a41b4290eb",
   "verifier_size": 665
 }

parameters/src/testnet3/resources/join.metadata

@@ -1,6 +1,6 @@
 {
-  "prover_checksum": "18a230697c7e0308c446ab350df12a39b606cfaaedc10d46719a42d425e5955c",
+  "prover_checksum": "6090219e59ae98403000ed5af8e5ac8e4a04b293cd8d74276f0720b83610e257",
   "prover_size": 74188540,
-  "verifier_checksum": "f05c8bd410f8a0346a37293b941a0e482b23175728de25f1cd97263c5500b0aa",
+  "verifier_checksum": "9788c2814bcb237c54f84c19b35c20fe189c79ae1a901930a9f011ca136bb0ab",
   "verifier_size": 665
 }

parameters/src/testnet3/resources/set_validator_state.metadata

@@ -1,6 +1,6 @@
 {
-  "prover_checksum": "ac2757b0cba31a61d5920dc93709ec4b830d7684f5e7d06efba40e2f09011611",
+  "prover_checksum": "f6dee462f9e8c32c22742063131fc84007327cfc10a95b91526aff20ed8311ae",
   "prover_size": 16991532,
-  "verifier_checksum": "197d3bc085376ad7e3eccccf67c4081272eb10b2fbf9c4e995c578f34a060135",
+  "verifier_checksum": "6a51c490ef1efa59828d45fe6dc5277fcc016b8e4e6fd9f14350d5733a347c75",
   "verifier_size": 665
 }

parameters/src/testnet3/resources/split.metadata

@@ -1,6 +1,6 @@
 {
-  "prover_checksum": "21e904f4e06e0f6d3e045ccf43a7c1c256b98247eb79e2c31dc5e8ac208d621b",
+  "prover_checksum": "b3bab11e36e3ac9c18f667136d644841bd03b51288789cc9f714bd0a410535ba",
   "prover_size": 74832596,
-  "verifier_checksum": "494a3174b286354dbf3db5d488be4a964c22f5199114c27fa5cb8bc90bcb5a87",
+  "verifier_checksum": "ba8bb5769cc7c93b7c1b482c8d80c794f5907d117790d4d1726b04162f2977c0",
   "verifier_size": 665
 }

parameters/src/testnet3/resources/transfer_private.metadata

@@ -1,6 +1,6 @@
 {
-  "prover_checksum": "449848b285b703a31414bf72b5d2a8900c3a956c6ccad642a5cde5eb5c709edf",
+  "prover_checksum": "a6f31751c45338562f283012c69120c6bdd7b8ee98cd157d23ead9a48aebdbf1",
   "prover_size": 75620484,
-  "verifier_checksum": "9bcfbcea172a85da52f455b1059085b6019e83feb73c9d5369be158bd3ab0afa",
+  "verifier_checksum": "8121679ef9554d99a82d938bdf8dd7b687b0fad477d30628409ad3a4b24a575a",
   "verifier_size": 665
 }

parameters/src/testnet3/resources/transfer_private_to_public.metadata

@@ -1,6 +1,6 @@
 {
-  "prover_checksum": "c204350c9ce6ba36a6538e9fc34a09f00ea1d80954cdb1be5711c12ee362ed60",
-  "prover_size": 59679332,
-  "verifier_checksum": "cb20263e75a8990336e5d1131f29c8dc03b34e8190e49358444b1034ac2e1eb6",
+  "prover_checksum": "14d632646bcc3698d851fd4a25dd86bf301a442d897e285b37014dc168328b28",
+  "prover_size": 65970788,
+  "verifier_checksum": "55b029f16a544fb38bd41a207774ff8e27c0312ff030d1c982201f405f76af77",
   "verifier_size": 665
 }

parameters/src/testnet3/resources/transfer_public.metadata

@@ -1,6 +1,6 @@
 {
-  "prover_checksum": "08bf8c128b09d9ed0bc2e095e8d156a76a97b9ff8ae7f4c0b8a7c933a09b1cde",
+  "prover_checksum": "7c4c79322f81eb9cf485b616e84a12329871ef9ef3412babb95989427a78cd0f",
   "prover_size": 28789650,
-  "verifier_checksum": "0c8cdf86de85cb0af855ecbdd8844e41c4d9f1e8b7af83fbcbddf33a0c0d71b1",
+  "verifier_checksum": "1882ad23eb69ea9c9b06b10fe6a3fbcc65a21106c345040d4c6cd4f61926240d",
   "verifier_size": 665
 }

parameters/src/testnet3/resources/transfer_public_to_private.metadata

@@ -1,6 +1,6 @@
 {
-  "prover_checksum": "4d3cb96b4c5ece7e449266bd215fb3c73745c38054f26dd936419acfe1afdaa6",
-  "prover_size": 57295130,
-  "verifier_checksum": "b10db5b85a2603bb7717c34bfb242fb9dd526098396f0ffc5051bdef24afdfc0",
+  "prover_checksum": "c01add3f4edee6e27bba53be9b4890819eb88e2e5793c617cd0da087f1509e63",
+  "prover_size": 38289484,
+  "verifier_checksum": "f4f8c99b8181e8776e48dcaeb5f9b3966d18b4b43e992cd8786a37cec7ee80ee",
   "verifier_size": 665
 }

parameters/src/testnet3/resources/unbond_delegator_as_validator.metadata

@@ -1,6 +1,6 @@
 {
-  "prover_checksum": "0649cde7b53afbfed6581d42f2ad90cc5f2f91701b341f3b20a0162877553a85",
+  "prover_checksum": "7c6f099693937897b4a4c1418c6237502d2a3709311e83391c53adc71933f4e7",
   "prover_size": 17160668,
-  "verifier_checksum": "c692bf417c85febf9ec9babf9c304adae3d67f55a31b53c59695f6b8aed63429",
+  "verifier_checksum": "b281c0c4ddb9203fa5042fe11ebde988339d04073e3662ffe4a7c31faa6a8d0d",
   "verifier_size": 665
 }

parameters/src/testnet3/resources/unbond_public.metadata

@@ -1,6 +1,6 @@
 {
-  "prover_checksum": "37d5e1c2a6422b22a81e986614e693b1729fd0493f647a98fed98cc2c69f0d6e",
+  "prover_checksum": "bec373cea90c2d047da9e5ab4cc3dd7e25e403670f241e2b9516ffd5bbc4eee9",
   "prover_size": 17015724,
-  "verifier_checksum": "4399ea9b0272444e2b33d8d6cffb4b18f9e596b570f4ebdb9cfd401ad3dabb37",
+  "verifier_checksum": "da26ddf912142b65059db036be5f67cd064a64ec8b71e743cf59283421468054",
   "verifier_size": 665
 }

synthesizer/process/src/tests/test_credits.rs

@@ -1538,7 +1538,7 @@ mod sanity_checks {
         assert_eq!(15, assignment.num_public());
         assert_eq!(49675, assignment.num_private());
         assert_eq!(49730, assignment.num_constraints());
-        assert_eq!((82610, 122551, 76009), assignment.num_nonzeros());
+        assert_eq!((96721, 108440, 76009), assignment.num_nonzeros());
     }
 
     #[test]
@@ -1566,7 +1566,7 @@ mod sanity_checks {
         assert_eq!(10, assignment.num_public());
         assert_eq!(12047, assignment.num_private());
         assert_eq!(12062, assignment.num_constraints());
-        assert_eq!((25765, 37816, 16409), assignment.num_nonzeros());
+        assert_eq!((27268, 36313, 16409), assignment.num_nonzeros());
     }
 
     #[test]
@@ -1599,7 +1599,7 @@ mod sanity_checks {
         assert_eq!(13, assignment.num_public());
         assert_eq!(36223, assignment.num_private());
         assert_eq!(36269, assignment.num_constraints());
-        assert_eq!((58543, 84781, 54745), assignment.num_nonzeros());
+        assert_eq!((67863, 75461, 54745), assignment.num_nonzeros());
     }
 
     #[test]
@@ -1626,6 +1626,6 @@ mod sanity_checks {
         assert_eq!(10, assignment.num_public());
         assert_eq!(12038, assignment.num_private());
         assert_eq!(12057, assignment.num_constraints());
-        assert_eq!((25635, 37300, 16397), assignment.num_nonzeros());
+        assert_eq!((27138, 35797, 16397), assignment.num_nonzeros());
     }
 }