CRS / protocol setups: rename truted_setups folder to prepare for tra…

…nsparent IPA setup
mratsim · Jun 9, 2024 · 35d9938 · 35d9938
1 parent c93b523
commit 35d9938
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 12 deletions.
diff --git a/benchmarks/bench_eth_eip4844_kzg.nim b/benchmarks/bench_eth_eip4844_kzg.nim
@@ -228,7 +228,7 @@ proc benchVerifyBlobKzgProofBatch(b: BenchSet, ctx: ptr EthereumKZGContext, iter
 const TrustedSetupMainnet =
   currentSourcePath.rsplit(DirSep, 1)[0] /
   ".." / "constantine" /
-  "trusted_setups" /
+  "commitments_setups" /
   "trusted_setup_ethereum_kzg4844_reference.dat"
 
 proc trusted_setup*(): ptr EthereumKZGContext =
@@ -261,4 +261,4 @@ proc main() =
 
 
 when isMainModule:
-  main()
+  main()
diff --git a/bindings/lib_constantine.nim b/bindings/lib_constantine.nim
@@ -22,7 +22,7 @@ import
   # Protocols
   ../constantine/ethereum_bls_signatures,
   ../constantine/ethereum_bls_signatures_parallel,
-  ../constantine/trusted_setups/ethereum_kzg_srs,
+  ../constantine/commitments_setups/ethereum_kzg_srs,
   ../constantine/ethereum_eip4844_kzg,
   ../constantine/ethereum_eip4844_kzg_parallel,
 

diff --git a/constantine-go/constantine_test.go b/constantine-go/constantine_test.go
@@ -42,7 +42,7 @@ func TestThreadpool(t *testing.T) {
 // Source: https://github.com/ethereum/c-kzg-4844
 
 var (
-	trustedSetupFile             = "../constantine/trusted_setups/trusted_setup_ethereum_kzg4844_reference.dat"
+	trustedSetupFile             = "../constantine/commitments_setups/trusted_setup_ethereum_kzg4844_reference.dat"
 	testDir                      = "../tests/protocol_ethereum_eip4844_deneb_kzg"
 	blobToKZGCommitmentTests     = filepath.Join(testDir, "blob_to_kzg_commitment/*/*/*")
 	computeKZGProofTests         = filepath.Join(testDir, "compute_kzg_proof/*/*/*")

diff --git a/constantine-rust/constantine-ethereum-kzg/tests/t_ethereum_kzg_vectors.rs b/constantine-rust/constantine-ethereum-kzg/tests/t_ethereum_kzg_vectors.rs
@@ -20,7 +20,7 @@ use serde_yaml;
 #[test]
 fn t_smoke_load_trusted_setup() {
     let _ctx = EthKzgContext::load_trusted_setup(Path::new(
-        "../../constantine/trusted_setups/trusted_setup_ethereum_kzg4844_reference.dat",
+        "../../constantine/commitments_setups/trusted_setup_ethereum_kzg4844_reference.dat",
     ))
     .expect("Trusted setup should be loaded without error.");
 }
@@ -46,7 +46,7 @@ const VERIFY_BLOB_KZG_PROOF_BATCH_TESTS: &str =
     concat!(test_dir!(), "verify_blob_kzg_proof_batch/*/*/*");
 
 const SRS_PATH: &str =
-    "../../constantine/trusted_setups/trusted_setup_ethereum_kzg4844_reference.dat";
+    "../../constantine/commitments_setups/trusted_setup_ethereum_kzg4844_reference.dat";
 
 struct OptRawBytes<const N: usize>(Option<Box<[u8; N]>>);
 

diff --git a/constantine/trusted_setups/README.md → constantine/commitments_setups/README.md b/constantine/trusted_setups/README.md → constantine/commitments_setups/README.md
@@ -1,6 +1,6 @@
-# Trusted Setups
+# Reference Strings & Trusted Setups
 
-This folder holds code and data related to trusted setups necessary
+This folder holds code and data related to Common Reference Strings, Structured Reference Strings and trusted setups necessary
 for implemented protocols.
 
 It also holds a spec proposal for an efficient trusted setup format,
@@ -13,4 +13,4 @@ to limit memory and deserialization cost for very large trusted setups.
 - The Ethereum KZG EIP-4844 protocol is implemented. \
   As the trusted setup is small, it is stored directly in the repo.\
   The trusted setup is available from the KZG ceremony at https://github.com/CarlBeek/kzg-ceremony-verifier/blob/master/output_setups/trusted_setup_4096.json \
-  To avoid vulnerabilities in json parsers (no formally-verified ones exist), we use the plaintext setup from the audited and fuzzed reference implementation at https://github.com/ethereum/c-kzg-4844/blob/main/src/trusted_setup.txt
+  To avoid vulnerabilities in json parsers (no formally-verified ones exist), we use the plaintext setup from the audited and fuzzed reference implementation at https://github.com/ethereum/c-kzg-4844/blob/main/src/trusted_setup.txt
diff --git a/...ntine/trusted_setups/ethereum_kzg_srs.nim → ...e/commitments_setups/ethereum_kzg_srs.nim b/...ntine/trusted_setups/ethereum_kzg_srs.nim → ...e/commitments_setups/ethereum_kzg_srs.nim
diff --git a/.../spec_trusted_setup_interchange_format.md → .../spec_trusted_setup_interchange_format.md b/.../spec_trusted_setup_interchange_format.md → .../spec_trusted_setup_interchange_format.md
diff --git a/...sted_setup_ethereum_kzg4844_reference.dat → ...sted_setup_ethereum_kzg4844_reference.dat b/...sted_setup_ethereum_kzg4844_reference.dat → ...sted_setup_ethereum_kzg4844_reference.dat
diff --git a/constantine/ethereum_eip4844_kzg.nim b/constantine/ethereum_eip4844_kzg.nim
@@ -19,7 +19,7 @@ import
   ./hashes,
   ./platforms/[abstractions, allocs],
   ./serialization/[codecs_status_codes, codecs_bls12_381, endians],
-  ./trusted_setups/ethereum_kzg_srs
+  ./commitments_setups/ethereum_kzg_srs
 
 export trusted_setup_load, trusted_setup_delete, TrustedSetupFormat, TrustedSetupStatus, EthereumKZGContext
 

diff --git a/tests/t_ethereum_eip4844_deneb_kzg.nim b/tests/t_ethereum_eip4844_deneb_kzg.nim
@@ -30,7 +30,7 @@ import
 const TrustedSetupMainnet =
   currentSourcePath.rsplit(DirSep, 1)[0] /
   ".." / "constantine" /
-  "trusted_setups" /
+  "commitments_setups" /
   "trusted_setup_ethereum_kzg4844_reference.dat"
 
 proc trusted_setup*(): ptr EthereumKZGContext =

diff --git a/tests/t_ethereum_eip4844_deneb_kzg_parallel.nim b/tests/t_ethereum_eip4844_deneb_kzg_parallel.nim
@@ -31,7 +31,7 @@ import
 const TrustedSetupMainnet =
   currentSourcePath.rsplit(DirSep, 1)[0] /
   ".." / "constantine" /
-  "trusted_setups" /
+  "commitments_setups" /
   "trusted_setup_ethereum_kzg4844_reference.dat"
 
 proc trusted_setup*(): ptr EthereumKZGContext =