Merge pull request #2 from cardano-scaling/perturbing/fix-full-set-proving

update the rust accumulator dep and remove check on empty lists

Author: perturbing

flake.lock

@@ -16,7 +16,7 @@ import Foreign.Ptr (Ptr, plusPtr)
 
 -- [General notes on this file]
 -- This file contains the FFI bindings to the Rust library 'rust-accumulator' with
--- source location https://github.com/input-output-hk/rust-accumulator
+-- source location https://github.com/cardano-scaling/rust-accumulator
 -- This rust lib is compiled to C and then linked using haskell.nix to Haskell.
 -- This FFI below uses two functions from the Rust library:
 --
@@ -56,33 +56,26 @@ getPolyCommitmentG2_ frs pts = do
             withForeignPtr ptPtr $ \pt ->
                 get_poly_commitment_g2 out fr (fromIntegral $ length frs) pt (fromIntegral $ length pts)
 
--- | Safe version of getPolyCommitmentG1 that performs bounds checking.
+-- | Safe version of getPolyCommitmentG1_ that performs bounds checking.
 getPolyCommitmentG1 :: [Fr] -> [Point1] -> IO (Either String Point1)
 getPolyCommitmentG1 frs pts = do
-    if null frs
-        then return $ Left "The scalar list cannot be empty."
+    let ptsExpectedSize = length frs + 1
+    if length pts < ptsExpectedSize
+        then return $ Left "The G1 points list must be at least one element larger than the scalar list."
         else do
-            let ptsExpectedSize = length frs + 1
-            if length pts < ptsExpectedSize
-                then return $ Left "The G1 points list must be at least one element larger than the scalar list."
-                else do
-                    result <- getPolyCommitmentG1_ frs (take ptsExpectedSize pts)
-                    return $ Right result
-
--- | Safe version of getPolyCommitmentG2 that performs bounds checking.
+            result <- getPolyCommitmentG1_ frs (take ptsExpectedSize pts)
+            return $ Right result
+
+-- | Safe version of getPolyCommitmentG2_ that performs bounds checking.
 getPolyCommitmentG2 :: [Fr] -> [Point2] -> IO (Either String Point2)
 getPolyCommitmentG2 frs pts = do
-    -- Check if the list of Fr elements is empty
-    if null frs
-        then return $ Left "The scalar list cannot be empty."
+    -- Check if the list of Point2 is at least one element larger than Fr
+    let ptsExpectedSize = length frs + 1
+    if length pts < ptsExpectedSize
+        then return $ Left "The G2 points list must be at least one element larger than the scalar list."
         else do
-            -- Check if the list of Point2 is at least one element larger than Fr
-            let ptsExpectedSize = length frs + 1
-            if length pts < ptsExpectedSize
-                then return $ Left "The G2 points list must be at least one element larger than the scalar list."
-                else do
-                    result <- getPolyCommitmentG2_ frs (take ptsExpectedSize pts)
-                    return $ Right result
+            result <- getPolyCommitmentG2_ frs (take ptsExpectedSize pts)
+            return $ Right result
 
 -- [Helper functions]
 

haskell-accumulator/lib/Bindings/Internal.hs

@@ -129,7 +129,7 @@ runE2EExample = do
     accCommit <- getPolyCommitOverG2 [] myAcc crsG2
 
     -- Say we want to proof the subset of the set
-    let mySubset = ["element3", "element9"] :: [Element]
+    let mySubset = mySet -- ["element3", "element9"] :: [Element]
 
     -- then the proof can be calculated via
     proof <- getPolyCommitOverG2 mySubset myAcc crsG2
@@ -155,10 +155,8 @@ runE2EExample = do
                     print $ "With proof: " ++ show (byteStringAsHex proofBS)
                     print $ "Set: " ++ show mySet
                     print $ "With accumulator commitment: " ++ show (byteStringAsHex accBS)
-                    print $ "The proof is: " ++ show pairingCheck
-
-    -- Verify the proof onchain (but doing it with offchain code)
-    print "E2E run complete"
+                    print $ "The proof is evaluated as: " ++ show pairingCheck
+                    print "E2E run complete"
 
 -- Main function with benchmarking and an E2E example
 main :: IO ()