Tests updated. Empty input file processing updated. #108

NilFoundation · Mar 12, 2024 · 2a0ef5f · 2a0ef5f
1 parent 202fbd0
commit 2a0ef5f
Show file tree

Hide file tree

Showing 39 changed files with 2,456 additions and 1,812 deletions.
diff --git a/contracts/zkllvm/circuit1/commitment.sol b/contracts/zkllvm/circuit1/commitment.sol
diff --git a/contracts/zkllvm/circuit1/modular_verifier.sol b/contracts/zkllvm/circuit1/modular_verifier.sol
@@ -32,7 +32,7 @@ import "../../algebra/field.sol";
 contract modular_verifier_circuit1 is IModularVerifier{
     uint256 constant modulus = 28948022309329048855892746252171976963363056481941560715954676764349967630337;
     bool    constant use_lookups = false;
-    bytes32 constant vk1 = bytes32(0x79e2a887f921eddebb5757d0186b49b8399ce63d0f04458dec59b032ca76a187);
+    bytes32 constant vk1 = bytes32(0x2f5d36dffa0f87838bca40df1ce089a07848c4e5e8d2373b5ffe3db9a4cceadb);
     bytes32 constant vk2 = bytes32(0xcc2d054528ca2282bfe586c5ccd4bba968132bd2615efc9d0a9b25930722ef00);
     bytes32 transcript_state;
     address _gate_argument_address;

diff --git a/contracts/zkllvm/circuit1/params.json b/contracts/zkllvm/circuit1/params.json
@@ -4,7 +4,7 @@
     "rows_amount": "16",
     "usable_rows_amount": "13",
     "omega": "14450201850503471296781915119640920297985789873634237091629829669980153907901",
-    "verification_key": "79e2a887f921eddebb5757d0186b49b8399ce63d0f04458dec59b032ca76a187 cc2d054528ca2282bfe586c5ccd4bba968132bd2615efc9d0a9b25930722ef00",
+    "verification_key": "2f5d36dffa0f87838bca40df1ce089a07848c4e5e8d2373b5ffe3db9a4cceadb cc2d054528ca2282bfe586c5ccd4bba968132bd2615efc9d0a9b25930722ef00",
     "ar_params": [
         "3",
         "1",

diff --git a/contracts/zkllvm/circuit1/proof.bin b/contracts/zkllvm/circuit1/proof.bin
diff --git a/contracts/zkllvm/circuit1/public_input.inp b/contracts/zkllvm/circuit1/public_input.inp
@@ -0,0 +1,8 @@
+15160457270993911686779998987062869310109718498781045018820171487813409782074
+15160457270993911686779998987062869310109718498781045018820171487813409782074
+15160457270993911686779998987062869310109718498781045018820171487813409782074
+15160457270993911686779998987062869310109718498781045018820171487813409782074
+15160457270993911686779998987062869310109718498781045018820171487813409782074
+15160457270993911686779998987062869310109718498781045018820171487813409782074
+15160457270993911686779998987062869310109718498781045018820171487813409782074
+15160457270993911686779998987062869310109718498781045018820171487813409782074
diff --git a/contracts/zkllvm/circuit2/commitment.sol b/contracts/zkllvm/circuit2/commitment.sol
diff --git a/contracts/zkllvm/circuit2/gate_argument.sol b/contracts/zkllvm/circuit2/gate_argument.sol
@@ -42,11 +42,11 @@ contract modular_gate_argument_circuit2 is IGateArgument{
 		gate = 0;
 // constraint 0
 		sum = 0;
+		prod = basic_marshalling.get_uint256_be(blob, 192);
+		sum = addmod(sum, prod, modulus);
 		prod = basic_marshalling.get_uint256_be(blob, 224);
 		prod = mulmod(prod, 52435875175126190479447740508185965837690552500527637822603658699938581184512, modulus);
 		sum = addmod(sum, prod, modulus);
-		prod = basic_marshalling.get_uint256_be(blob, 192);
-		sum = addmod(sum, prod, modulus);
 		prod = basic_marshalling.get_uint256_be(blob, 160);
 		sum = addmod(sum, prod, modulus);
 		sum = mulmod(sum, theta_acc, modulus);

diff --git a/contracts/zkllvm/circuit2/modular_verifier.sol b/contracts/zkllvm/circuit2/modular_verifier.sol
@@ -32,7 +32,7 @@ import "../../algebra/field.sol";
 contract modular_verifier_circuit2 is IModularVerifier{
     uint256 constant modulus = 52435875175126190479447740508185965837690552500527637822603658699938581184513;
     bool    constant use_lookups = false;
-    bytes32 constant vk1 = bytes32(0xdf5209ad8762f94b28a73cd7586cfe3511910263bd427986f73d8df50a5b875b);
+    bytes32 constant vk1 = bytes32(0x707d48912e67a59b2c4db4028104d342ea53c43ef5628377715db5038602d017);
     bytes32 constant vk2 = bytes32(0x467bea5db0ea69781be8939df7bee6936d3f96b624bb189c423b6021ba43c9d6);
     bytes32 transcript_state;
     address _gate_argument_address;

diff --git a/contracts/zkllvm/circuit2/params.json b/contracts/zkllvm/circuit2/params.json
@@ -4,7 +4,7 @@
     "rows_amount": "8",
     "usable_rows_amount": "5",
     "omega": "23674694431658770659612952115660802947967373701506253797663184111817857449850",
-    "verification_key": "df5209ad8762f94b28a73cd7586cfe3511910263bd427986f73d8df50a5b875b 467bea5db0ea69781be8939df7bee6936d3f96b624bb189c423b6021ba43c9d6",
+    "verification_key": "707d48912e67a59b2c4db4028104d342ea53c43ef5628377715db5038602d017 467bea5db0ea69781be8939df7bee6936d3f96b624bb189c423b6021ba43c9d6",
     "ar_params": [
         "3",
         "1",

diff --git a/contracts/zkllvm/circuit2/proof.bin b/contracts/zkllvm/circuit2/proof.bin
diff --git a/contracts/zkllvm/circuit2/public_input.inp b/contracts/zkllvm/circuit2/public_input.inp
@@ -0,0 +1,3 @@
+49052524384703870792430850605823211740010368752655030397570455698676404652716
+0
+1
diff --git a/contracts/zkllvm/circuit2/public_input.json b/contracts/zkllvm/circuit2/public_input.json
diff --git a/contracts/zkllvm/circuit3/commitment.sol b/contracts/zkllvm/circuit3/commitment.sol
diff --git a/contracts/zkllvm/circuit3/modular_verifier.sol b/contracts/zkllvm/circuit3/modular_verifier.sol
@@ -32,7 +32,7 @@ import "../../algebra/field.sol";
 contract modular_verifier_circuit3 is IModularVerifier{
     uint256 constant modulus = 28948022309329048855892746252171976963363056481941560715954676764349967630337;
     bool    constant use_lookups = false;
-    bytes32 constant vk1 = bytes32(0x44eec81acb63d0177338c467f5720df27e77ce1bd2eecc983863cb219660a88e);
+    bytes32 constant vk1 = bytes32(0xba4a3b56642f16371094729538068721e2b042c7fbbedb4550e3d5ed5ffbd86e);
     bytes32 constant vk2 = bytes32(0x6bfdb6e98d14a09f3f9308e42565f3533f47a51047fc94b8cc3484d5d5de2814);
     bytes32 transcript_state;
     address _gate_argument_address;

diff --git a/contracts/zkllvm/circuit3/params.json b/contracts/zkllvm/circuit3/params.json
@@ -4,7 +4,7 @@
     "rows_amount": "8",
     "usable_rows_amount": "4",
     "omega": "199455130043951077247265858823823987229570523056509026484192158816218200659",
-    "verification_key": "44eec81acb63d0177338c467f5720df27e77ce1bd2eecc983863cb219660a88e 6bfdb6e98d14a09f3f9308e42565f3533f47a51047fc94b8cc3484d5d5de2814",
+    "verification_key": "ba4a3b56642f16371094729538068721e2b042c7fbbedb4550e3d5ed5ffbd86e 6bfdb6e98d14a09f3f9308e42565f3533f47a51047fc94b8cc3484d5d5de2814",
     "ar_params": [
         "3",
         "0",

diff --git a/contracts/zkllvm/circuit3/proof.bin b/contracts/zkllvm/circuit3/proof.bin
diff --git a/contracts/zkllvm/circuit3/public_input.inp b/contracts/zkllvm/circuit3/public_input.inp
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		49052524384703870792430850605823211740010368752655030397570455698676404652716
		0
		1