Changed CI e2e configuration to work with NOVA_URL and NOVA_COMMIT pa…

…rams. Python script changed to work with any version of nova commit.

PS: Previous test on nova/src/lib.rs can be removed.

.github/workflows/end2end.yml

@@ -34,6 +34,15 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Parse PR comment
+        id: parse-comment
+        run:
+            # Extract NOVA_URL and NOVA_COMMIT from the comment body
+            export NOVA_URL=$(echo "${{ github.event.comment.body }}" | grep -oE 'NOVA_URL=(.*?)[[:space:]]' | cut -d'=' -f2 | xargs)
+            export NOVA_COMMIT=$(echo "${{ github.event.comment.body }}" | grep -oE 'NOVA_COMMIT=(.*?)[[:space:]]' | cut -d'=' -f2 | xargs)
+            echo "::set-env name=NOVA_URL::$NOVA_URL"
+            echo "::set-env name=NOVA_COMMIT::$NOVA_COMMIT"    
+
       - name: Checkout PR branch
         run: gh pr checkout $PR_NUMBER
         env:
@@ -57,7 +66,7 @@ jobs:
 
       - name: Generate proof and public parameters from commit hash
         run: |
-          python ci_pasta_keys_verifier_script.py https://github.com/lurk-lab/Nova.git d5f5fb5e557b99cb111f2d5693aa34fe30722750
+          python ci_pasta_keys_verifier_script.py $NOVA_URL $NOVA_COMMIT
 
       - name: Load proof and public parameters
         run: |

ci_pasta_keys_verifier_script.py

@@ -1,16 +1,90 @@
 import subprocess
 import sys
 import os
+import re
 
-# python3 ci_pasta_keys_verifier_script.py https://github.com/lurk-lab/Nova.git d5f5fb5e557b99cb111f2d5693aa34fe30722750
+file_path = 'rust-reference-info.txt'
+
+solidity_compatibility_e2e_pasta_code = '''
+  #[test]
+  #[ignore]
+  fn solidity_compatibility_e2e() {
+    type G1 = pasta_curves::pallas::Point;
+    type G2 = pasta_curves::vesta::Point;
+    test_ivc_nontrivial_with_compression_with::<G1, G2>(true);
+  }
+'''
+
+
+def parse_variables_from_file(file_path):
+    variables = {}
+    with open(file_path, 'r') as file:
+        content = file.read()
+        # Define regex patterns for matching variables
+        nova_url_pattern = r'\$NOVA_URL\s*=\s*\"(.+?)\"'
+        nova_commit_pattern = r'\$NOVA_COMMIT\s*=\s*\"(.+?)\"'
+
+        # Match variables using regular expressions
+        nova_url_match = re.search(nova_url_pattern, content)
+        nova_commit_match = re.search(nova_commit_pattern, content)
+
+        # Extract matched variables
+        if nova_url_match:
+            variables['NOVA_URL'] = nova_url_match.group(1)
+        if nova_commit_match:
+            variables['NOVA_COMMIT'] = nova_commit_match.group(1)
+
+    return variables
+
+
+def add_function_before_last_brace(file_path, function_definition):
+    # Read the content of the file
+    with open(file_path, 'r') as file:
+        lines = file.readlines()
+
+    # Find the position of the last "}" character
+    last_brace_index = None
+    for i in range(len(lines) - 1, -1, -1):
+        if '}' in lines[i]:
+            last_brace_index = i
+            break
+
+    if last_brace_index is None:
+        raise ValueError("No closing brace found in the file.")
+
+    # Insert the function definition before the last "}" position
+    lines.insert(last_brace_index, f"\n{function_definition}\n")
+
+    # Write the updated content back to the file
+    with open(file_path, 'w') as file:
+        file.writelines(lines)
+
+
+# python3 ci_pasta_keys_verifier_script.py https://github.com/artem-bakuta/Nova.git 3838031868ca3f2783c01299546849860bfd36d2
 if __name__ == "__main__":
+    nova_repo_arg = ""
+    nova_commit_arg = ""
+
+    if len(sys.argv) > 1:
+        nova_repo_arg = sys.argv[1]
+        nova_commit_arg = sys.argv[2]
+
     # Configurations
-    nova_repo_url = sys.argv[1]
-    nova_commit_hash = sys.argv[2]
+    parsed_variables = parse_variables_from_file(file_path)
+    nova_repo_url = nova_repo_arg if nova_repo_arg else parsed_variables['NOVA_URL']
+    nova_commit_hash = nova_commit_arg if nova_commit_arg else parsed_variables['NOVA_COMMIT']
+    print("Pulling project from: " + nova_repo_url + " " + nova_commit_hash)
     target_directory = "verify_cache"
     nova_directory = "nova"
 
     # Main logic
+    print("Deleting generated jsons from solidity-verifier project...")
+    os.system(f"rm -rf neptune-constants-U24-pallas.json")
+    os.system(f"rm -rf neptune-constants-U24-vesta.json")
+    os.system(f"rm -rf pp-compressed-snark.json")
+    os.system(f"rm -rf pp-verifier-key.json")
+    os.system(f"rm -rf verifier-key.json")
+
     if os.path.exists(target_directory):
         subprocess.run(['rm', '-rf', target_directory], check=True)
     os.mkdir(target_directory)
@@ -19,6 +93,10 @@
     os.system(f"git clone {nova_repo_url} {nova_directory}")
     os.chdir(nova_directory)
     os.system(f"git checkout {nova_commit_hash}")
-    os.system(f"cargo +nightly test solidity_compatibility_e2e_pasta --release -- --ignored")
-    print("Copy generated keys form Nova...")
+
+    # Build the Nova project
+    file_path = 'src/lib.rs'
+    add_function_before_last_brace(file_path, solidity_compatibility_e2e_pasta_code)
+    os.system(f"cargo test solidity_compatibility_e2e --release -- --ignored")
+    print("Copy generated keys from Nova...")
     os.system(f"cp vk.json compressed-snark.json ../../.")

rust-reference-info.txt

@@ -0,0 +1,7 @@
+# ci_pasta_keys_verifier_script.py script params
+
+# NOVA_URL variable
+$NOVA_URL = "https://github.com/lurk-lab/Nova.git"
+
+# NOVA_COMMIT variable
+$NOVA_COMMIT = "d5f5fb5e557b99cb111f2d5693aa34fe30722750"