Merge pull request AleoNet#238 from AleoHQ/feat/parameters-remote

Add remote param safety check, update parameters to new bucket with additional parameters
ProvableHQ · Jul 4, 2021 · b0bd4e4 · b0bd4e4
2 parents 889c967 + 6ed2266
commit b0bd4e4
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,10 @@
 .vscode
 **/*.idea/
 **/target
-**.DS_Store
+**/.DS_Store
 **storage_db
 **inner_snark_pk*.params
 **outer_snark_pk*.params
 **posw_snark_pk*.params
+**universal_srs*.params
+**testnet2_program_vk_crh*.params
diff --git a/parameters/src/global/mod.rs b/parameters/src/global/mod.rs
@@ -80,9 +80,10 @@ impl_params_local!(
     "program_vk_crh",
     1742404
 );
-impl_params_local!(
+impl_params_remote!(
     Testnet2ProgramVKCRHParameters,
     testnet2_program_vk_crh_test,
+    "https://s3-us-west-1.amazonaws.com/aleo.parameters",
     "./",
     "testnet2_program_vk_crh",
     62930948

diff --git a/parameters/src/global/testnet2_program_vk_crh.params b/parameters/src/global/testnet2_program_vk_crh.params
diff --git a/parameters/src/macros.rs b/parameters/src/macros.rs
@@ -62,7 +62,7 @@ macro_rules! impl_params_local {
 
 #[macro_export]
 macro_rules! impl_params_remote {
-    ($name: ident, $remote_url: tt, $local_dir: expr, $fname: tt, $size: tt) => {
+    ($name: ident, $test_name: ident, $remote_url: tt, $local_dir: expr, $fname: tt, $size: tt) => {
 
         pub struct $name;
 
@@ -98,7 +98,7 @@ macro_rules! impl_params_remote {
                 } else {
                     // Downloads the missing parameters and stores it in the local directory for use.
                     eprintln!(
-                        "\nWARNING - \"{}\" does not exist. snarkVM will download this file remotely and store it locally. Please ensure \"{}\" is stored in {:?}.\n",
+                        "\nWARNING - \"{}\" does not exist, downloading this file remotely and storing it locally. Please ensure \"{}\" is stored in {:?}.\n",
                         filename, filename, file_path
                     );
                     let output = Self::load_remote()?;
@@ -203,5 +203,14 @@ macro_rules! impl_params_remote {
                 Ok(transfer.perform()?)
             }
         }
+
+        #[cfg(test)]
+        #[test]
+        fn $test_name() {
+            use crate::traits::Parameter;
+
+            let parameters = $name::load_bytes().expect("failed to load parameters");
+            assert_eq!($name::SIZE, parameters.len() as u64);
+        }
     }
 }
diff --git a/parameters/src/testnet1/mod.rs b/parameters/src/testnet1/mod.rs
@@ -20,10 +20,11 @@ pub use genesis::*;
 // POSW SNARK
 impl_params_remote!(
     PoswSNARKPKParameters,
-    "https://snarkos-testnet.s3-us-west-2.amazonaws.com",
+    posw_snark_pk_test,
+    "https://s3-us-west-1.amazonaws.com/aleo.parameters",
     "./",
     "posw_snark_pk",
-    171163800
+    172512528
 );
 impl_params_local!(PoswSNARKVKParameters, posw_snark_vk_test, "./", "posw_snark_vk", 40807);
 
@@ -46,7 +47,8 @@ impl_params_local!(
 // Inner SNARK
 impl_params_remote!(
     InnerSNARKPKParameters,
-    "https://snarkos-testnet.s3-us-west-2.amazonaws.com",
+    inner_snark_pk_test,
+    "https://s3-us-west-1.amazonaws.com/aleo.parameters",
     "./",
     "inner_snark_pk",
     250108401
@@ -62,7 +64,8 @@ impl_params_local!(
 // Outer SNARK
 impl_params_remote!(
     OuterSNARKPKParameters,
-    "https://snarkos-testnet.s3-us-west-2.amazonaws.com",
+    outer_snark_pk_test,
+    "https://s3-us-west-1.amazonaws.com/aleo.parameters",
     "./",
     "outer_snark_pk",
     502942005

diff --git a/parameters/src/testnet2/mod.rs b/parameters/src/testnet2/mod.rs
@@ -20,10 +20,11 @@ pub use genesis::*;
 // POSW SNARK
 impl_params_remote!(
     PoswSNARKPKParameters,
-    "https://snarkos-testnet.s3-us-west-2.amazonaws.com",
+    posw_snark_pk_test,
+    "https://s3-us-west-1.amazonaws.com/aleo.parameters",
     "./",
     "posw_snark_pk",
-    171163800
+    172512528
 );
 impl_params_local!(PoswSNARKVKParameters, posw_snark_vk_test, "./", "posw_snark_vk", 40807);
 
@@ -46,7 +47,8 @@ impl_params_local!(
 // Inner SNARK
 impl_params_remote!(
     InnerSNARKPKParameters,
-    "https://snarkos-testnet.s3-us-west-2.amazonaws.com",
+    inner_snark_pk_test,
+    "https://s3-us-west-1.amazonaws.com/aleo.parameters",
     "./",
     "inner_snark_pk",
     250108401
@@ -62,7 +64,8 @@ impl_params_local!(
 // Outer SNARK
 impl_params_remote!(
     OuterSNARKPKParameters,
-    "https://snarkos-testnet.s3-us-west-2.amazonaws.com",
+    outer_snark_pk_test,
+    "https://s3-us-west-1.amazonaws.com/aleo.parameters",
     "./",
     "outer_snark_pk",
     502942005
@@ -75,9 +78,10 @@ impl_params_local!(
     4443
 );
 
-impl_params_local!(
+impl_params_remote!(
     UniversalSRSParameters,
     universal_srs_parameters_test,
+    "https://s3-us-west-1.amazonaws.com/aleo.parameters",
     "./",
     "universal_srs",
     5151842

diff --git a/parameters/src/testnet2/universal_srs.params b/parameters/src/testnet2/universal_srs.params