From bea3ee31f6b17bf569fb7492d1cff34bebb923e7 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 18:16:13 -0800
Subject: [PATCH 01/35] Rename update command 'Sub' to 'Automatic'

---
 leo/commands/mod.rs    | 2 +-
 leo/commands/update.rs | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/leo/commands/mod.rs b/leo/commands/mod.rs
index f59db22864..44b9e9945c 100644
--- a/leo/commands/mod.rs
+++ b/leo/commands/mod.rs
@@ -52,7 +52,7 @@ pub mod test;
 pub use test::Test;
 
 pub mod update;
-pub use update::{Sub as UpdateAutomatic, Update};
+pub use update::{Automatic as UpdateAutomatic, Update};
 
 pub mod watch;
 pub use watch::Watch;
diff --git a/leo/commands/update.rs b/leo/commands/update.rs
index 09e0ca640a..3179a37b99 100644
--- a/leo/commands/update.rs
+++ b/leo/commands/update.rs
@@ -22,7 +22,7 @@ use tracing::span::Span;
 
 /// Setting for automatic updates of Leo
 #[derive(Debug, StructOpt, PartialEq)]
-pub enum Sub {
+pub enum Automatic {
     Automatic {
         #[structopt(name = "bool", help = "Boolean value: true or false", parse(try_from_str))]
         value: bool,
@@ -43,11 +43,11 @@ pub struct Update {
 
     /// Setting for automatic updates of Leo
     #[structopt(subcommand)]
-    automatic: Option<Sub>,
+    automatic: Option<Automatic>,
 }
 
 impl Update {
-    pub fn new(list: bool, studio: bool, automatic: Option<Sub>) -> Update {
+    pub fn new(list: bool, studio: bool, automatic: Option<Automatic>) -> Update {
         Update {
             list,
             studio,
@@ -75,7 +75,7 @@ impl Command for Update {
         }
 
         // in case automatic subcommand was called
-        if let Some(Sub::Automatic { value }) = self.automatic {
+        if let Some(Automatic::Automatic { value }) = self.automatic {
             Config::set_update_automatic(value)?;
 
             match value {

From a74a141e337796ef379547abe13cca3468a5e07c Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 18:18:13 -0800
Subject: [PATCH 02/35] Clean up comments

---
 leo/commands/update.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/leo/commands/update.rs b/leo/commands/update.rs
index 3179a37b99..0fa4b5d970 100644
--- a/leo/commands/update.rs
+++ b/leo/commands/update.rs
@@ -69,12 +69,12 @@ impl Command for Update {
     }
 
     fn apply(self, _: Context, _: Self::Input) -> Result<Self::Output> {
-        // if --list is passed - simply list everything and exit
+        // If --list is passed, list all available versions and return.
         if self.list {
             return Updater::show_available_releases().map_err(|e| anyhow!("Could not fetch versions: {}", e));
         }
 
-        // in case automatic subcommand was called
+        // Handles enabling and disabling automatic updates in the config file.
         if let Some(Automatic::Automatic { value }) = self.automatic {
             Config::set_update_automatic(value)?;
 

From c61cd3459a9716068ac3f76b6b3518ad17aa3691 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 18:41:36 -0800
Subject: [PATCH 03/35] Removes use of 'Default' in CLI

---
 leo/commands/build.rs           |  8 +------
 leo/commands/clean.rs           |  8 +------
 leo/commands/deploy.rs          |  8 +------
 leo/commands/init.rs            |  8 +------
 leo/commands/lint.rs            |  8 +------
 leo/commands/mod.rs             | 42 ++++++++++++++++-----------------
 leo/commands/new.rs             |  6 -----
 leo/commands/package/logout.rs  |  8 +------
 leo/commands/package/publish.rs | 10 ++------
 leo/commands/package/remove.rs  |  8 +------
 leo/commands/prove.rs           | 13 ++++------
 leo/commands/run.rs             | 11 +++------
 leo/commands/setup.rs           | 12 +++-------
 leo/commands/test.rs            |  8 +------
 leo/commands/update.rs          | 12 +---------
 leo/commands/watch.rs           | 10 ++------
 16 files changed, 43 insertions(+), 137 deletions(-)

diff --git a/leo/commands/build.rs b/leo/commands/build.rs
index 1c2662f203..c826157696 100644
--- a/leo/commands/build.rs
+++ b/leo/commands/build.rs
@@ -36,16 +36,10 @@ use structopt::StructOpt;
 use tracing::span::Span;
 
 /// Compile and build program command
-#[derive(StructOpt, Debug, Default)]
+#[derive(StructOpt, Debug)]
 #[structopt(setting = structopt::clap::AppSettings::ColoredHelp)]
 pub struct Build {}
 
-impl Build {
-    pub fn new() -> Build {
-        Build {}
-    }
-}
-
 impl Command for Build {
     type Input = ();
     type Output = Option<(Compiler<'static, Fq, EdwardsGroupType>, bool)>;
diff --git a/leo/commands/clean.rs b/leo/commands/clean.rs
index ecb13ea5a0..0b39661f07 100644
--- a/leo/commands/clean.rs
+++ b/leo/commands/clean.rs
@@ -23,16 +23,10 @@ use structopt::StructOpt;
 use tracing::span::Span;
 
 /// Clean outputs folder command
-#[derive(StructOpt, Debug, Default)]
+#[derive(StructOpt, Debug)]
 #[structopt(setting = structopt::clap::AppSettings::ColoredHelp)]
 pub struct Clean {}
 
-impl Clean {
-    pub fn new() -> Clean {
-        Clean {}
-    }
-}
-
 impl Command for Clean {
     type Input = ();
     type Output = ();
diff --git a/leo/commands/deploy.rs b/leo/commands/deploy.rs
index f27da1dae5..06eff0c2e6 100644
--- a/leo/commands/deploy.rs
+++ b/leo/commands/deploy.rs
@@ -21,16 +21,10 @@ use structopt::StructOpt;
 use tracing::span::Span;
 
 /// Deploy Leo program to the network
-#[derive(StructOpt, Debug, Default)]
+#[derive(StructOpt, Debug)]
 #[structopt(setting = structopt::clap::AppSettings::ColoredHelp)]
 pub struct Deploy {}
 
-impl Deploy {
-    pub fn new() -> Deploy {
-        Deploy {}
-    }
-}
-
 impl Command for Deploy {
     type Input = ();
     type Output = ();
diff --git a/leo/commands/init.rs b/leo/commands/init.rs
index 7ebe2a3214..dac0109369 100644
--- a/leo/commands/init.rs
+++ b/leo/commands/init.rs
@@ -23,16 +23,10 @@ use structopt::StructOpt;
 use tracing::span::Span;
 
 /// Init Leo project command within current directory
-#[derive(StructOpt, Debug, Default)]
+#[derive(StructOpt, Debug)]
 #[structopt(setting = structopt::clap::AppSettings::ColoredHelp)]
 pub struct Init {}
 
-impl Init {
-    pub fn new() -> Init {
-        Init {}
-    }
-}
-
 impl Command for Init {
     type Input = ();
     type Output = ();
diff --git a/leo/commands/lint.rs b/leo/commands/lint.rs
index 0aeda51844..3e60d7ec6e 100644
--- a/leo/commands/lint.rs
+++ b/leo/commands/lint.rs
@@ -21,16 +21,10 @@ use structopt::StructOpt;
 use tracing::span::Span;
 
 /// Lint Leo code command
-#[derive(StructOpt, Debug, Default)]
+#[derive(StructOpt, Debug)]
 #[structopt(setting = structopt::clap::AppSettings::ColoredHelp)]
 pub struct Lint {}
 
-impl Lint {
-    pub fn new() -> Lint {
-        Lint {}
-    }
-}
-
 impl Command for Lint {
     type Input = ();
     type Output = ();
diff --git a/leo/commands/mod.rs b/leo/commands/mod.rs
index 44b9e9945c..47d5994575 100644
--- a/leo/commands/mod.rs
+++ b/leo/commands/mod.rs
@@ -60,57 +60,55 @@ pub use watch::Watch;
 // Aleo PM related commands
 pub mod package;
 
-/// Base trait for Leo CLI, see methods and their documentation for details
+/// Base trait for the Leo CLI, see methods and their documentation for details.
 pub trait Command {
-    /// If current command requires running another command before
-    /// and needs its output results, this is the place to set.
+    /// If the current command requires running another command beforehand
+    /// and needs its output result, this is where the result type is defined.
     /// Example: type Input: <CommandA as Command>::Out
     type Input;
 
-    /// Define output of the command to be reused as an Input for another
-    /// command. If this command is not used as a prelude for another, keep empty
+    /// Defines the output of this command, which may be used as `Input` for another
+    /// command. If this command is not used as a prelude for another command,
+    /// this field may be left empty.
     type Output;
 
-    /// Returns project context, currently keeping it simple but it is possible
-    /// that in the future leo will not depend on current directory, and we're keeping
-    /// option for extending current core
+    /// Returns the project context, which is defined as the current directory.
     fn context(&self) -> Result<Context> {
         get_context()
     }
 
-    /// Add span to the logger tracing::span.
-    /// Due to specifics of macro implementation it is impossible to set
-    /// span name with non-literal i.e. dynamic variable even if this
-    /// variable is &'static str
+    /// Adds a span to the logger via `tracing::span`.
+    /// Because of the specifics of the macro implementation, it is not possible
+    /// to set the span name with a non-literal i.e. a dynamic variable even if this
+    /// variable is a &'static str.
     fn log_span(&self) -> Span {
         tracing::span!(tracing::Level::INFO, "Leo")
     }
 
-    /// Run prelude and get Input for current command. As simple as that.
-    /// But due to inability to pass default implementation of a type, this
-    /// method must be present in every trait implementation.
+    /// Runs the prelude and returns the Input of the current command.
     fn prelude(&self) -> Result<Self::Input>
     where
         Self: std::marker::Sized;
 
-    /// Core of the execution - do what is necessary. This function is run within
-    /// context of 'execute' function, which sets logging and timers
+    /// Runs the main operation of this command. This function is run within
+    /// context of 'execute' function, which sets logging and timers.
     fn apply(self, context: Context, input: Self::Input) -> Result<Self::Output>
     where
         Self: std::marker::Sized;
 
-    /// Wrapper around apply function, sets up tracing, time tracking and context
+    /// A wrapper around the `apply` method.
+    /// This function sets up tracing, timing, and the context.
     fn execute(self) -> Result<Self::Output>
     where
         Self: std::marker::Sized,
     {
         let input = self.prelude()?;
 
-        // create span for this command
+        // Create the span for this command.
         let span = self.log_span();
         let span = span.enter();
 
-        // calculate execution time for each run
+        // Calculate the execution time for this command.
         let timer = Instant::now();
 
         let context = self.context()?;
@@ -118,7 +116,7 @@ pub trait Command {
 
         drop(span);
 
-        // use done context to print time
+        // Use the done context to print the execution time for this command.
         tracing::span!(tracing::Level::INFO, "Done").in_scope(|| {
             tracing::info!("Finished in {} milliseconds \n", timer.elapsed().as_millis());
         });
@@ -126,7 +124,7 @@ pub trait Command {
         out
     }
 
-    /// Execute command but empty the result. Comes in handy where there's a
+    /// Executes command but empty the result. Comes in handy where there's a
     /// need to make match arms compatible while keeping implementation-specific
     /// output possible. Errors however are all of the type Error
     fn try_execute(self) -> Result<()>
diff --git a/leo/commands/new.rs b/leo/commands/new.rs
index 2509e7563e..91c67c57f5 100644
--- a/leo/commands/new.rs
+++ b/leo/commands/new.rs
@@ -30,12 +30,6 @@ pub struct New {
     name: String,
 }
 
-impl New {
-    pub fn new(name: String) -> New {
-        New { name }
-    }
-}
-
 impl Command for New {
     type Input = ();
     type Output = ();
diff --git a/leo/commands/package/logout.rs b/leo/commands/package/logout.rs
index 56497d8b23..6bd76a2575 100644
--- a/leo/commands/package/logout.rs
+++ b/leo/commands/package/logout.rs
@@ -22,16 +22,10 @@ use structopt::StructOpt;
 use tracing::Span;
 
 /// Remove credentials for Aleo PM from .leo directory
-#[derive(StructOpt, Debug, Default)]
+#[derive(StructOpt, Debug)]
 #[structopt(setting = structopt::clap::AppSettings::ColoredHelp)]
 pub struct Logout {}
 
-impl Logout {
-    pub fn new() -> Logout {
-        Logout {}
-    }
-}
-
 impl Command for Logout {
     type Input = ();
     type Output = ();
diff --git a/leo/commands/package/publish.rs b/leo/commands/package/publish.rs
index 6fb949046f..ffcc1725e2 100644
--- a/leo/commands/package/publish.rs
+++ b/leo/commands/package/publish.rs
@@ -37,23 +37,17 @@ struct ResponseJson {
 }
 
 /// Publish package to Aleo Package Manager
-#[derive(StructOpt, Debug, Default)]
+#[derive(StructOpt, Debug)]
 #[structopt(setting = structopt::clap::AppSettings::ColoredHelp)]
 pub struct Publish {}
 
-impl Publish {
-    pub fn new() -> Publish {
-        Publish {}
-    }
-}
-
 impl Command for Publish {
     type Input = <Build as Command>::Output;
     type Output = Option<String>;
 
     /// Build program before publishing
     fn prelude(&self) -> Result<Self::Input> {
-        Build::new().execute()
+        (Build {}).execute()
     }
 
     fn apply(self, context: Context, _input: Self::Input) -> Result<Self::Output> {
diff --git a/leo/commands/package/remove.rs b/leo/commands/package/remove.rs
index 83de4a6ce8..f0df722146 100644
--- a/leo/commands/package/remove.rs
+++ b/leo/commands/package/remove.rs
@@ -22,19 +22,13 @@ use structopt::StructOpt;
 use tracing::span::Span;
 
 /// Remove imported package
-#[derive(StructOpt, Debug, Default)]
+#[derive(StructOpt, Debug)]
 #[structopt(setting = structopt::clap::AppSettings::ColoredHelp)]
 pub struct Remove {
     #[structopt(name = "PACKAGE")]
     name: String,
 }
 
-impl Remove {
-    pub fn new(name: String) -> Remove {
-        Remove { name }
-    }
-}
-
 impl Command for Remove {
     type Input = ();
     type Output = ();
diff --git a/leo/commands/prove.rs b/leo/commands/prove.rs
index 202cb688d3..62e1627b42 100644
--- a/leo/commands/prove.rs
+++ b/leo/commands/prove.rs
@@ -28,17 +28,11 @@ use structopt::StructOpt;
 use tracing::span::Span;
 
 /// Run the program and produce a proof
-#[derive(StructOpt, Debug, Default)]
+#[derive(StructOpt, Debug)]
 #[structopt(setting = structopt::clap::AppSettings::ColoredHelp)]
 pub struct Prove {
     #[structopt(long = "skip-key-check", help = "Skip key verification on Setup stage")]
-    skip_key_check: bool,
-}
-
-impl Prove {
-    pub fn new(skip_key_check: bool) -> Prove {
-        Prove { skip_key_check }
-    }
+    pub(super) skip_key_check: bool,
 }
 
 impl Command for Prove {
@@ -50,7 +44,8 @@ impl Command for Prove {
     }
 
     fn prelude(&self) -> Result<Self::Input> {
-        Setup::new(self.skip_key_check).execute()
+        let skip_key_check = self.skip_key_check;
+        (Setup { skip_key_check }).execute()
     }
 
     fn apply(self, context: Context, input: Self::Input) -> Result<Self::Output> {
diff --git a/leo/commands/run.rs b/leo/commands/run.rs
index c9973dfd6b..3b88e165f4 100644
--- a/leo/commands/run.rs
+++ b/leo/commands/run.rs
@@ -26,19 +26,13 @@ use structopt::StructOpt;
 use tracing::span::Span;
 
 /// Build, Prove and Run Leo program with inputs
-#[derive(StructOpt, Debug, Default)]
+#[derive(StructOpt, Debug)]
 #[structopt(setting = structopt::clap::AppSettings::ColoredHelp)]
 pub struct Run {
     #[structopt(long = "skip-key-check", help = "Skip key verification on Setup stage")]
     skip_key_check: bool,
 }
 
-impl Run {
-    pub fn new(skip_key_check: bool) -> Run {
-        Run { skip_key_check }
-    }
-}
-
 impl Command for Run {
     type Input = <Prove as Command>::Output;
     type Output = ();
@@ -48,7 +42,8 @@ impl Command for Run {
     }
 
     fn prelude(&self) -> Result<Self::Input> {
-        Prove::new(self.skip_key_check).execute()
+        let skip_key_check = self.skip_key_check;
+        (Prove { skip_key_check }).execute()
     }
 
     fn apply(self, _context: Context, input: Self::Input) -> Result<Self::Output> {
diff --git a/leo/commands/setup.rs b/leo/commands/setup.rs
index a2b3fb9388..086483887a 100644
--- a/leo/commands/setup.rs
+++ b/leo/commands/setup.rs
@@ -31,17 +31,11 @@ use structopt::StructOpt;
 use tracing::span::Span;
 
 /// Executes the setup command for a Leo program
-#[derive(StructOpt, Debug, Default)]
+#[derive(StructOpt, Debug)]
 #[structopt(setting = structopt::clap::AppSettings::ColoredHelp)]
 pub struct Setup {
     #[structopt(long = "skip-key-check", help = "Skip key verification")]
-    skip_key_check: bool,
-}
-
-impl Setup {
-    pub fn new(skip_key_check: bool) -> Setup {
-        Setup { skip_key_check }
-    }
+    pub(super) skip_key_check: bool,
 }
 
 impl Command for Setup {
@@ -57,7 +51,7 @@ impl Command for Setup {
     }
 
     fn prelude(&self) -> Result<Self::Input> {
-        Build::new().execute()
+        (Build {}).execute()
     }
 
     fn apply(self, context: Context, input: Self::Input) -> Result<Self::Output> {
diff --git a/leo/commands/test.rs b/leo/commands/test.rs
index d6a3a30840..53a6803e6a 100644
--- a/leo/commands/test.rs
+++ b/leo/commands/test.rs
@@ -32,19 +32,13 @@ use structopt::StructOpt;
 use tracing::span::Span;
 
 /// Build program and run tests command
-#[derive(StructOpt, Debug, Default)]
+#[derive(StructOpt, Debug)]
 #[structopt(setting = structopt::clap::AppSettings::ColoredHelp)]
 pub struct Test {
     #[structopt(short = "f", long = "file", name = "file")]
     files: Vec<PathBuf>,
 }
 
-impl Test {
-    pub fn new(files: Vec<PathBuf>) -> Test {
-        Test { files }
-    }
-}
-
 impl Command for Test {
     type Input = ();
     type Output = ();
diff --git a/leo/commands/update.rs b/leo/commands/update.rs
index 0fa4b5d970..d50395650c 100644
--- a/leo/commands/update.rs
+++ b/leo/commands/update.rs
@@ -30,7 +30,7 @@ pub enum Automatic {
 }
 
 /// Update Leo to the latest version
-#[derive(StructOpt, Debug, Default)]
+#[derive(StructOpt, Debug)]
 #[structopt(setting = structopt::clap::AppSettings::ColoredHelp)]
 pub struct Update {
     /// List all available versions of Leo
@@ -46,16 +46,6 @@ pub struct Update {
     automatic: Option<Automatic>,
 }
 
-impl Update {
-    pub fn new(list: bool, studio: bool, automatic: Option<Automatic>) -> Update {
-        Update {
-            list,
-            studio,
-            automatic,
-        }
-    }
-}
-
 impl Command for Update {
     type Input = ();
     type Output = ();
diff --git a/leo/commands/watch.rs b/leo/commands/watch.rs
index 529dd0ce84..7a98b9604f 100644
--- a/leo/commands/watch.rs
+++ b/leo/commands/watch.rs
@@ -27,7 +27,7 @@ use tracing::span::Span;
 const LEO_SOURCE_DIR: &str = "src/";
 
 /// Watch file changes in src/ directory and run Build Command
-#[derive(StructOpt, Debug, Default)]
+#[derive(StructOpt, Debug)]
 #[structopt(setting = structopt::clap::AppSettings::ColoredHelp)]
 pub struct Watch {
     /// Set up watch interval
@@ -35,12 +35,6 @@ pub struct Watch {
     interval: u64,
 }
 
-impl Watch {
-    pub fn new(interval: u64) -> Watch {
-        Watch { interval }
-    }
-}
-
 impl Command for Watch {
     type Input = ();
     type Output = ();
@@ -70,7 +64,7 @@ impl Command for Watch {
             match rx.recv() {
                 // See changes on the write event
                 Ok(DebouncedEvent::Write(_write)) => {
-                    match Build::new().execute() {
+                    match (Build {}).execute() {
                         Ok(_output) => {
                             tracing::info!("Built successfully");
                         }

From 73b550011e2543152ab53bd2a69509e95b367baa Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 19:25:41 -0800
Subject: [PATCH 04/35] Adds safety check for valid package names

---
 leo/commands/init.rs                   |  9 +++-
 leo/commands/new.rs                    | 10 ++--
 leo/commands/prove.rs                  |  2 +-
 leo/commands/run.rs                    |  2 +-
 leo/commands/setup.rs                  |  2 +-
 leo/commands/test.rs                   |  2 +-
 leo/commands/update.rs                 |  6 +--
 leo/tests/mod.rs                       | 70 ++++++++++++++++++--------
 package/src/errors/package.rs          |  3 ++
 package/src/errors/root/manifest.rs    |  9 ++++
 package/src/lib.rs                     |  5 ++
 package/src/package.rs                 | 47 +++++++++++++++--
 package/src/root/manifest.rs           |  8 +--
 package/tests/initialize/initialize.rs |  5 +-
 14 files changed, 139 insertions(+), 41 deletions(-)

diff --git a/leo/commands/init.rs b/leo/commands/init.rs
index dac0109369..f2703046c8 100644
--- a/leo/commands/init.rs
+++ b/leo/commands/init.rs
@@ -40,13 +40,20 @@ impl Command for Init {
     }
 
     fn apply(self, _: Context, _: Self::Input) -> Result<Self::Output> {
-        let path = current_dir()?;
+        // Derive the package directory path.
+        let mut path = current_dir()?;
+
+        // Check that the given package name is valid.
         let package_name = path
             .file_stem()
             .ok_or_else(|| anyhow!("Project name invalid"))?
             .to_string_lossy()
             .to_string();
+        if !LeoPackage::is_package_name_valid(&package_name) {
+            return Err(anyhow!("Invalid Leo project name"));
+        }
 
+        // Check that the current package directory path exists.
         if !path.exists() {
             return Err(anyhow!("Directory does not exist"));
         }
diff --git a/leo/commands/new.rs b/leo/commands/new.rs
index 91c67c57f5..a4da67c309 100644
--- a/leo/commands/new.rs
+++ b/leo/commands/new.rs
@@ -43,13 +43,17 @@ impl Command for New {
     }
 
     fn apply(self, _: Context, _: Self::Input) -> Result<Self::Output> {
-        let mut path = current_dir()?;
+        // Check that the given package name is valid.
         let package_name = self.name;
+        if !LeoPackage::is_package_name_valid(&package_name) {
+            return Err(anyhow!("Invalid Leo project name"));
+        }
 
-        // Derive the package directory path
+        // Derive the package directory path.
+        let mut path = current_dir()?;
         path.push(&package_name);
 
-        // Verify the package directory path does not exist yet
+        // Verify the package directory path does not exist yet.
         if path.exists() {
             return Err(anyhow!("Directory already exists {:?}", path));
         }
diff --git a/leo/commands/prove.rs b/leo/commands/prove.rs
index 62e1627b42..dbe19b5777 100644
--- a/leo/commands/prove.rs
+++ b/leo/commands/prove.rs
@@ -32,7 +32,7 @@ use tracing::span::Span;
 #[structopt(setting = structopt::clap::AppSettings::ColoredHelp)]
 pub struct Prove {
     #[structopt(long = "skip-key-check", help = "Skip key verification on Setup stage")]
-    pub(super) skip_key_check: bool,
+    pub(crate) skip_key_check: bool,
 }
 
 impl Command for Prove {
diff --git a/leo/commands/run.rs b/leo/commands/run.rs
index 3b88e165f4..b1bf652ed7 100644
--- a/leo/commands/run.rs
+++ b/leo/commands/run.rs
@@ -30,7 +30,7 @@ use tracing::span::Span;
 #[structopt(setting = structopt::clap::AppSettings::ColoredHelp)]
 pub struct Run {
     #[structopt(long = "skip-key-check", help = "Skip key verification on Setup stage")]
-    skip_key_check: bool,
+    pub(crate) skip_key_check: bool,
 }
 
 impl Command for Run {
diff --git a/leo/commands/setup.rs b/leo/commands/setup.rs
index 086483887a..557c368766 100644
--- a/leo/commands/setup.rs
+++ b/leo/commands/setup.rs
@@ -35,7 +35,7 @@ use tracing::span::Span;
 #[structopt(setting = structopt::clap::AppSettings::ColoredHelp)]
 pub struct Setup {
     #[structopt(long = "skip-key-check", help = "Skip key verification")]
-    pub(super) skip_key_check: bool,
+    pub(crate) skip_key_check: bool,
 }
 
 impl Command for Setup {
diff --git a/leo/commands/test.rs b/leo/commands/test.rs
index 53a6803e6a..f5de8672f2 100644
--- a/leo/commands/test.rs
+++ b/leo/commands/test.rs
@@ -36,7 +36,7 @@ use tracing::span::Span;
 #[structopt(setting = structopt::clap::AppSettings::ColoredHelp)]
 pub struct Test {
     #[structopt(short = "f", long = "file", name = "file")]
-    files: Vec<PathBuf>,
+    pub(crate) files: Vec<PathBuf>,
 }
 
 impl Command for Test {
diff --git a/leo/commands/update.rs b/leo/commands/update.rs
index d50395650c..f3027e5907 100644
--- a/leo/commands/update.rs
+++ b/leo/commands/update.rs
@@ -35,15 +35,15 @@ pub enum Automatic {
 pub struct Update {
     /// List all available versions of Leo
     #[structopt(short, long)]
-    list: bool,
+    pub(crate) list: bool,
 
     /// For Aleo Studio only
     #[structopt(short, long)]
-    studio: bool,
+    pub(crate) studio: bool,
 
     /// Setting for automatic updates of Leo
     #[structopt(subcommand)]
-    automatic: Option<Automatic>,
+    pub(crate) automatic: Option<Automatic>,
 }
 
 impl Command for Update {
diff --git a/leo/tests/mod.rs b/leo/tests/mod.rs
index 0ebc7b26ee..7bc611f49d 100644
--- a/leo/tests/mod.rs
+++ b/leo/tests/mod.rs
@@ -39,34 +39,34 @@ const PEDERSEN_HASH_PATH: &str = "./examples/pedersen-hash/";
 
 #[test]
 pub fn build_pedersen_hash() -> Result<()> {
-    Build::new().apply(context()?, ())?;
+    (Build {}).apply(context()?, ())?;
     Ok(())
 }
 
 #[test]
 pub fn setup_pedersen_hash() -> Result<()> {
-    let build = Build::new().apply(context()?, ())?;
-    Setup::new(false).apply(context()?, build.clone())?;
-    Setup::new(true).apply(context()?, build)?;
+    let build = (Build {}).apply(context()?, ())?;
+    (Setup { skip_key_check: false }).apply(context()?, build.clone())?;
+    (Setup { skip_key_check: true }).apply(context()?, build)?;
     Ok(())
 }
 
 #[test]
 pub fn prove_pedersen_hash() -> Result<()> {
-    let build = Build::new().apply(context()?, ())?;
-    let setup = Setup::new(false).apply(context()?, build)?;
-    Prove::new(false).apply(context()?, setup.clone())?;
-    Prove::new(true).apply(context()?, setup)?;
+    let build = (Build {}).apply(context()?, ())?;
+    let setup = (Setup { skip_key_check: false }).apply(context()?, build)?;
+    (Prove { skip_key_check: false }).apply(context()?, setup.clone())?;
+    (Prove { skip_key_check: true }).apply(context()?, setup)?;
     Ok(())
 }
 
 #[test]
 pub fn run_pedersen_hash() -> Result<()> {
-    let build = Build::new().apply(context()?, ())?;
-    let setup = Setup::new(false).apply(context()?, build)?;
-    let prove = Prove::new(false).apply(context()?, setup)?;
-    Run::new(false).apply(context()?, prove.clone())?;
-    Run::new(true).apply(context()?, prove)?;
+    let build = (Build {}).apply(context()?, ())?;
+    let setup = (Setup { skip_key_check: false }).apply(context()?, build)?;
+    let prove = (Prove { skip_key_check: false }).apply(context()?, setup)?;
+    (Run { skip_key_check: false }).apply(context()?, prove.clone())?;
+    (Run { skip_key_check: true }).apply(context()?, prove)?;
     Ok(())
 }
 
@@ -75,14 +75,14 @@ pub fn test_pedersen_hash() -> Result<()> {
     let mut main_file = PathBuf::from(PEDERSEN_HASH_PATH);
     main_file.push("src/main.leo");
 
-    Test::new(Vec::new()).apply(context()?, ())?;
-    Test::new(vec![main_file]).apply(context()?, ())?;
+    (Test { files: vec![] }).apply(context()?, ())?;
+    (Test { files: vec![main_file] }).apply(context()?, ())?;
     Ok(())
 }
 
 #[test]
 pub fn test_logout() -> Result<()> {
-    Logout::new().apply(context()?, ())?;
+    (Logout {}).apply(context()?, ())?;
     Ok(())
 }
 
@@ -111,12 +111,40 @@ pub fn login_incorrect_credentials_or_token() -> Result<()> {
 
 #[test]
 pub fn leo_update_and_update_automatic() -> Result<()> {
-    Update::new(true, true, None).apply(context()?, ())?;
-    Update::new(false, true, None).apply(context()?, ())?;
-    Update::new(false, false, None).apply(context()?, ())?;
+    let update = Update {
+        list: true,
+        studio: true,
+        automatic: None,
+    };
+    update.apply(context()?, ())?;
 
-    Update::new(false, false, Some(UpdateAutomatic::Automatic { value: true })).apply(context()?, ())?;
-    Update::new(false, false, Some(UpdateAutomatic::Automatic { value: false })).apply(context()?, ())?;
+    let update = Update {
+        list: false,
+        studio: true,
+        automatic: None,
+    };
+    update.apply(context()?, ())?;
+
+    let update = Update {
+        list: false,
+        studio: false,
+        automatic: None,
+    };
+    update.apply(context()?, ())?;
+
+    let update = Update {
+        list: false,
+        studio: false,
+        automatic: Some(UpdateAutomatic::Automatic { value: true }),
+    };
+    update.apply(context()?, ())?;
+
+    let update = Update {
+        list: false,
+        studio: false,
+        automatic: Some(UpdateAutomatic::Automatic { value: false }),
+    };
+    update.apply(context()?, ())?;
 
     Ok(())
 }
diff --git a/package/src/errors/package.rs b/package/src/errors/package.rs
index 63bab79fd8..f0a07ea1ee 100644
--- a/package/src/errors/package.rs
+++ b/package/src/errors/package.rs
@@ -26,6 +26,9 @@ pub enum PackageError {
     #[error("Failed to initialize package {:?} ({:?})", _0, _1)]
     FailedToInitialize(String, OsString),
 
+    #[error("Invalid project name: {:?}", _0)]
+    InvalidPackageName(String),
+
     #[error("`{}` metadata: {}", _0, _1)]
     Removing(&'static str, io::Error),
 }
diff --git a/package/src/errors/root/manifest.rs b/package/src/errors/root/manifest.rs
index b9645830d3..1e732a817f 100644
--- a/package/src/errors/root/manifest.rs
+++ b/package/src/errors/root/manifest.rs
@@ -18,6 +18,9 @@ use std::io;
 
 #[derive(Debug, Error)]
 pub enum ManifestError {
+    #[error("{}: {}", _0, _1)]
+    Crate(&'static str, String),
+
     #[error("`{}` creating: {}", _0, _1)]
     Creating(&'static str, io::Error),
 
@@ -36,3 +39,9 @@ pub enum ManifestError {
     #[error("`{}` writing: {}", _0, _1)]
     Writing(&'static str, io::Error),
 }
+
+impl From<crate::errors::PackageError> for ManifestError {
+    fn from(error: crate::errors::PackageError) -> Self {
+        ManifestError::Crate("leo-package", error.to_string())
+    }
+}
diff --git a/package/src/lib.rs b/package/src/lib.rs
index fb3d000893..eb7cf4bb00 100644
--- a/package/src/lib.rs
+++ b/package/src/lib.rs
@@ -37,6 +37,11 @@ impl LeoPackage {
         package::Package::initialize(package_name, is_lib, path)
     }
 
+    /// Returns `true` if the given Leo package name is valid.
+    pub fn is_package_name_valid(package_name: &str) -> bool {
+        package::Package::is_package_name_valid(package_name)
+    }
+
     /// Removes an imported Leo package
     pub fn remove_imported_package(package_name: &str, path: &Path) -> Result<(), PackageError> {
         package::Package::remove_imported_package(package_name, path)
diff --git a/package/src/package.rs b/package/src/package.rs
index f149c4ddf1..ff15564f48 100644
--- a/package/src/package.rs
+++ b/package/src/package.rs
@@ -34,17 +34,51 @@ pub struct Package {
 }
 
 impl Package {
-    pub fn new(package_name: &str) -> Self {
-        Self {
+    pub fn new(package_name: &str) -> Result<Self, PackageError> {
+        // Check that the package name is valid.
+        if !Self::is_package_name_valid(package_name) {
+            return Err(PackageError::InvalidPackageName(package_name.to_string()));
+        }
+
+        Ok(Self {
             name: package_name.to_owned(),
             version: "0.1.0".to_owned(),
             description: None,
             license: None,
-        }
+        })
+    }
+
+    /// Returns `true` if the package name is valid.
+    ///
+    /// Package names must be lowercase and composed solely
+    /// of ASCII alphanumeric characters, and may be word-separated
+    /// by a single dash '-'.
+    pub fn is_package_name_valid(package_name: &str) -> bool {
+        // Check that the package name:
+        // 1. is lowercase,
+        // 2. is ASCII alphanumeric or a dash.
+        package_name.chars().all(|x| {
+            if !x.is_lowercase() {
+                tracing::error!("Project names must be all lowercase");
+                return false;
+            }
+
+            if x.is_ascii_alphanumeric() || x == '-' {
+                tracing::error!("Project names must be ASCII alphanumeric, and may be word-separated with a dash");
+                return false;
+            }
+
+            true
+        })
     }
 
     /// Returns `true` if a package is can be initialized at a given path.
     pub fn can_initialize(package_name: &str, is_lib: bool, path: &Path) -> bool {
+        // Check that the package name is valid.
+        if !Self::is_package_name_valid(package_name) {
+            return false;
+        }
+
         let mut result = true;
         let mut existing_files = vec![];
 
@@ -91,6 +125,11 @@ impl Package {
 
     /// Returns `true` if a package is initialized at the given path
     pub fn is_initialized(package_name: &str, is_lib: bool, path: &Path) -> bool {
+        // Check that the package name is valid.
+        if !Self::is_package_name_valid(package_name) {
+            return false;
+        }
+
         // Check if the manifest file exists.
         if !Manifest::exists_at(&path) {
             return false;
@@ -137,7 +176,7 @@ impl Package {
         // Next, initialize this directory as a Leo package.
         {
             // Create the manifest file.
-            Manifest::new(&package_name).write_to(&path)?;
+            Manifest::new(&package_name)?.write_to(&path)?;
 
             // Verify that the .gitignore file does not exist.
             if !Gitignore::exists_at(&path) {
diff --git a/package/src/root/manifest.rs b/package/src/root/manifest.rs
index 3a85f60447..540749fcdc 100644
--- a/package/src/root/manifest.rs
+++ b/package/src/root/manifest.rs
@@ -39,11 +39,11 @@ pub struct Manifest {
 }
 
 impl Manifest {
-    pub fn new(package_name: &str) -> Self {
-        Self {
-            project: Package::new(package_name),
+    pub fn new(package_name: &str) -> Result<Self, ManifestError> {
+        Ok(Self {
+            project: Package::new(package_name)?,
             remote: None,
-        }
+        })
     }
 
     pub fn filename() -> String {
diff --git a/package/tests/initialize/initialize.rs b/package/tests/initialize/initialize.rs
index e3cffcfd8c..5e1b98bde8 100644
--- a/package/tests/initialize/initialize.rs
+++ b/package/tests/initialize/initialize.rs
@@ -52,7 +52,10 @@ fn initialize_fails_with_existing_manifest() {
     assert!(Package::can_initialize(TEST_PACKAGE_NAME, false, &test_directory));
 
     // Manually add a manifest file to the `test_directory`
-    Manifest::new(TEST_PACKAGE_NAME).write_to(&test_directory).unwrap();
+    Manifest::new(TEST_PACKAGE_NAME)
+        .unwrap()
+        .write_to(&test_directory)
+        .unwrap();
 
     // Attempt to initialize a package at the `test_directory`
     assert!(Package::initialize(TEST_PACKAGE_NAME, false, &test_directory).is_err());

From c76cb0b086b609a99f68a52b415ed00d84a10883 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 19:41:52 -0800
Subject: [PATCH 05/35] Add unit test for package name checking

---
 package/src/package.rs | 68 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 60 insertions(+), 8 deletions(-)

diff --git a/package/src/package.rs b/package/src/package.rs
index ff15564f48..b559c7ac90 100644
--- a/package/src/package.rs
+++ b/package/src/package.rs
@@ -54,22 +54,50 @@ impl Package {
     /// of ASCII alphanumeric characters, and may be word-separated
     /// by a single dash '-'.
     pub fn is_package_name_valid(package_name: &str) -> bool {
-        // Check that the package name:
-        // 1. is lowercase,
-        // 2. is ASCII alphanumeric or a dash.
-        package_name.chars().all(|x| {
-            if !x.is_lowercase() {
+        // Check that the package name is nonempty.
+        if package_name.len() == 0 {
+            tracing::error!("Project names must be nonempty");
+            return false;
+        }
+
+        let mut previous = package_name.chars().nth(0).unwrap();
+
+        // Check that the first character is not a dash.
+        if previous == '-' {
+            tracing::error!("Project names cannot begin with a dash");
+            return false;
+        }
+
+        // Iterate and check that the package name is valid.
+        for current in package_name.chars() {
+            // Check that the package name is lowercase.
+            if !current.is_ascii_lowercase() && current != '-' {
                 tracing::error!("Project names must be all lowercase");
                 return false;
             }
 
-            if x.is_ascii_alphanumeric() || x == '-' {
+            // Check that the package name is only ASCII alphanumeric or a dash.
+            if !current.is_ascii_alphanumeric() && current != '-' {
                 tracing::error!("Project names must be ASCII alphanumeric, and may be word-separated with a dash");
                 return false;
             }
 
-            true
-        })
+            // If the previous character was a dash, check that the current character is not a dash.
+            if previous == '-' && current == '-' {
+                tracing::error!("Project names may only be word-separated by one dash");
+                return false;
+            }
+
+            previous = current;
+        }
+
+        // Check that the last character is not a dash.
+        if previous == '-' {
+            tracing::error!("Project names cannot end with a dash");
+            return false;
+        }
+
+        true
     }
 
     /// Returns `true` if a package is can be initialized at a given path.
@@ -229,3 +257,27 @@ impl Package {
         Ok(ImportsDirectory::remove_import(path, package_name)?)
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_is_package_name_valid() {
+        assert!(Package::is_package_name_valid("foo"));
+        assert!(Package::is_package_name_valid("foo-bar"));
+        assert!(Package::is_package_name_valid("foo-bar-baz"));
+
+        assert!(!Package::is_package_name_valid(""));
+        assert!(!Package::is_package_name_valid("-"));
+        assert!(!Package::is_package_name_valid("-foo"));
+        assert!(!Package::is_package_name_valid("-foo-"));
+        assert!(!Package::is_package_name_valid("foo--bar"));
+        assert!(!Package::is_package_name_valid("foo---bar"));
+        assert!(!Package::is_package_name_valid("foo--bar--baz"));
+        assert!(!Package::is_package_name_valid("foo---bar---baz"));
+        assert!(!Package::is_package_name_valid("foo*bar"));
+        assert!(!Package::is_package_name_valid("foo,bar"));
+        assert!(!Package::is_package_name_valid("foo_bar"));
+    }
+}

From 9206d55408c0357a9553392e53cab8056605c73a Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 19:43:03 -0800
Subject: [PATCH 06/35] Clippy

---
 leo/commands/init.rs   | 2 +-
 package/src/package.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/leo/commands/init.rs b/leo/commands/init.rs
index f2703046c8..7c6b3e7745 100644
--- a/leo/commands/init.rs
+++ b/leo/commands/init.rs
@@ -41,7 +41,7 @@ impl Command for Init {
 
     fn apply(self, _: Context, _: Self::Input) -> Result<Self::Output> {
         // Derive the package directory path.
-        let mut path = current_dir()?;
+        let path = current_dir()?;
 
         // Check that the given package name is valid.
         let package_name = path
diff --git a/package/src/package.rs b/package/src/package.rs
index b559c7ac90..f5c46e2696 100644
--- a/package/src/package.rs
+++ b/package/src/package.rs
@@ -55,12 +55,12 @@ impl Package {
     /// by a single dash '-'.
     pub fn is_package_name_valid(package_name: &str) -> bool {
         // Check that the package name is nonempty.
-        if package_name.len() == 0 {
+        if package_name.is_empty() {
             tracing::error!("Project names must be nonempty");
             return false;
         }
 
-        let mut previous = package_name.chars().nth(0).unwrap();
+        let mut previous = package_name.chars().next().unwrap();
 
         // Check that the first character is not a dash.
         if previous == '-' {

From 34f5e8105df062f1ba783a61584d868a9d2984a4 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 19:49:00 -0800
Subject: [PATCH 07/35] Prints out number of constraints from now on

---
 leo/commands/build.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/leo/commands/build.rs b/leo/commands/build.rs
index c826157696..61148e466f 100644
--- a/leo/commands/build.rs
+++ b/leo/commands/build.rs
@@ -134,8 +134,8 @@ impl Command for Build {
                 let temporary_program = program.clone();
                 let output = temporary_program.compile_constraints(&mut cs)?;
 
-                tracing::debug!("Compiled constraints - {:#?}", output);
-                tracing::debug!("Number of constraints - {:#?}", cs.num_constraints());
+                tracing::info!("Compiled constraints - {:#?}", output);
+                tracing::info!("Number of constraints - {:#?}", cs.num_constraints());
 
                 // Serialize the circuit
                 let circuit_object = SerializedCircuit::from(cs);

From 963013f52339a6a601c165dcdb95a1932c97c8de Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 19:51:29 -0800
Subject: [PATCH 08/35] Remove duplicate comment

---
 leo/commands/setup.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/leo/commands/setup.rs b/leo/commands/setup.rs
index 557c368766..fad11bbe20 100644
--- a/leo/commands/setup.rs
+++ b/leo/commands/setup.rs
@@ -64,7 +64,6 @@ impl Command for Setup {
                 let keys_exist = ProvingKeyFile::new(&package_name).exists_at(&path)
                     && VerificationKeyFile::new(&package_name).exists_at(&path);
 
-                // If keys do not exist or the checksum differs, run the program setup
                 // If keys do not exist or the checksum differs, run the program setup
                 let (proving_key, prepared_verifying_key) = if !keys_exist || checksum_differs {
                     tracing::info!("Starting...");

From 97ffabb6ade92d187ebc721e97a7035dc2fc4f15 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 19:59:50 -0800
Subject: [PATCH 09/35] Update README

---
 .resources/{leo.png => banner.png} | Bin
 README.md                          |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename .resources/{leo.png => banner.png} (100%)

diff --git a/.resources/leo.png b/.resources/banner.png
similarity index 100%
rename from .resources/leo.png
rename to .resources/banner.png
diff --git a/README.md b/README.md
index ca19dd7fe9..491a9fd0ea 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-    <img width="1412" src="./.resources/leo.png">
+    <img width="1412" src=".resources/banner.png">
 </p>
 
 <h1 align="center">The Leo Programming Language</h1>

From c6852838f1bce7030d5e72fb88a6f558ea192b97 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 20:03:50 -0800
Subject: [PATCH 10/35] Adds CircleCI

---
 .circleci/config.yml | 82 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000000..8fac8ad1a5
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,82 @@
+version: 2.1
+commands:
+  setup_environment:
+    description: "Setup testing environment"
+    parameters:
+      cache_key:
+        type: string
+        default: leo-stable-cache
+    steps:
+      - run: set -e
+      - setup_remote_docker
+      - run:
+          name: Prepare environment and install dependencies
+          command: |
+            export SCCACHE_CACHE_SIZE=200M
+            export WORK_DIR="$CIRCLE_WORKING_DIRECTORY/.cache/sccache"
+            export SCCACHE_DIR="$CIRCLE_WORKING_DIRECTORY/.cache/sccache"
+            mkdir -p "$CIRCLE_WORKING_DIRECTORY/.bin"
+            wget https://github.com/mozilla/sccache/releases/download/0.2.13/sccache-0.2.13-x86_64-unknown-linux-musl.tar.gz
+            tar -C "$CIRCLE_WORKING_DIRECTORY/.bin" -xvf sccache-0.2.13-x86_64-unknown-linux-musl.tar.gz
+            mv $CIRCLE_WORKING_DIRECTORY/.bin/sccache-0.2.13-x86_64-unknown-linux-musl/sccache $CIRCLE_WORKING_DIRECTORY/.bin/sccache
+            export PATH="$PATH:$CIRCLE_WORKING_DIRECTORY/.bin"
+            export RUSTC_WRAPPER="sccache"
+            rm -rf "$CIRCLE_WORKING_DIRECTORY/.cargo/registry"
+            sudo apt-get update && sudo apt-get install -y clang llvm-dev llvm pkg-config xz-utils make libssl-dev libssl-dev
+      - restore_cache:
+          keys:
+            - << parameters.cache_key >>
+  clear_environment:
+    description: "Clear environment"
+    parameters:
+      cache_key:
+        type: string
+        default: leo-stable-cache
+    steps:
+      - run: (sccache -s||true)
+      - run: set +e
+      - save_cache:
+          key: << parameters.cache_key >>
+          paths:
+            - .cache/sccache
+            - .cargo
+jobs:
+  rust-stable:
+    docker:
+      - image: cimg/rust:1.49.0
+    resource_class: xlarge
+    steps:
+      - checkout
+      - setup_environment:
+          cache_key: leo-stable-cache
+      - run:
+          name: Build and run tests
+          no_output_timeout: 30m
+          command: cargo install --path .
+      - persist_to_workspace:
+          root: ~/
+          paths: project/
+      - clear_environment:
+          cache_key: leo-stable-cache
+  leo-new:
+    docker:
+      - image: cimg/rust:1.49.0
+    resource_class: xlarge
+    steps:
+      - attach_workspace:
+          at: /home/circleci/project/
+      - run:
+          name: leo new
+          command: >
+            echo "hey"
+            leo
+            echo "Hello"
+
+workflows:
+  version: 2
+  main-workflow:
+    jobs:
+      - rust-stable
+      - leo-new:
+          requires:
+            - rust-stable

From 5f3e0683893b6efbd1777a83e9b9012e5bff177b Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 20:06:04 -0800
Subject: [PATCH 11/35] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 491a9fd0ea..e09580624c 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,7 @@ Leo is a functional, statically-typed programming language built for writing pri
 
 
 ## 1. Overview
+
 Welcome to the Leo programming language.
 
 Leo provides a high-level language that abstracts low-level cryptographic concepts and makes it easy to 

From 43931de088c03ae5a5be56a2a666f2457ba91dea Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 20:11:23 -0800
Subject: [PATCH 12/35] Update CircleCI

---
 .circleci/config.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8fac8ad1a5..edb6397936 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -41,6 +41,7 @@ commands:
             - .cache/sccache
             - .cargo
 jobs:
+
   rust-stable:
     docker:
       - image: cimg/rust:1.49.0
@@ -58,6 +59,7 @@ jobs:
           paths: project/
       - clear_environment:
           cache_key: leo-stable-cache
+
   leo-new:
     docker:
       - image: cimg/rust:1.49.0
@@ -69,7 +71,8 @@ jobs:
           name: leo new
           command: >
             echo "hey"
-            leo
+            leo new test
+            ls -la
             echo "Hello"
 
 workflows:

From d9ec234840b3875e9ef3de3319595cfd2d1d7b2a Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 20:20:02 -0800
Subject: [PATCH 13/35] Bump circle test

---
 .circleci/config.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index edb6397936..74c4b9944d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 commands:
   setup_environment:
-    description: "Setup testing environment"
+    description: "Setup environment"
     parameters:
       cache_key:
         type: string
@@ -69,11 +69,7 @@ jobs:
           at: /home/circleci/project/
       - run:
           name: leo new
-          command: >
-            echo "hey"
-            leo new test
-            ls -la
-            echo "Hello"
+          command: leo
 
 workflows:
   version: 2

From 9c96390505aedab89e7adf821c66098992aef428 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 20:28:27 -0800
Subject: [PATCH 14/35] Adds DEVELOPMENT.md

---
 .gitignore     |  1 +
 DEVELOPMENT.md | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 DEVELOPMENT.md

diff --git a/.gitignore b/.gitignore
index 169d72f25d..825854be0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /tmp/
 **.idea/
 *.DS_Store
+**/process.yml
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
new file mode 100644
index 0000000000..357d549c32
--- /dev/null
+++ b/DEVELOPMENT.md
@@ -0,0 +1,31 @@
+# Development Guide
+
+## Running CircleCI locally
+
+### Step 1: Install CircleCI
+
+If you wish to run CircleCI locally, start by installing it:
+
+- macOS
+```
+brew install circleci
+```
+
+- Linux (via Snap)
+```
+sudo snap install docker circleci
+sudo snap connect circleci:docker docker
+```
+
+- Windows (via Chocolatey)
+```
+choco install circleci-cli -y
+```
+
+### Step 2: Run CircleCI
+
+To run a job, export the config to `process.yml`, and specify it when executing:
+```shell
+circleci config process .circleci/config.yml > process.yml
+circleci local execute -c process.yml --job JOB_NAME
+```

From 2ba5b859e18ce116ca977495313620cff6fda598 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 20:30:25 -0800
Subject: [PATCH 15/35] Update circleci

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 74c4b9944d..cc35033ab5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -53,7 +53,7 @@ jobs:
       - run:
           name: Build and run tests
           no_output_timeout: 30m
-          command: cargo install --path .
+          command: cargo install --path . && mv ~/.cargo/bin/leo .
       - persist_to_workspace:
           root: ~/
           paths: project/
@@ -69,7 +69,7 @@ jobs:
           at: /home/circleci/project/
       - run:
           name: leo new
-          command: leo
+          command: ./leo
 
 workflows:
   version: 2

From 1c06ace36ec5ddc16c7439082215a23a91dff532 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 20:37:59 -0800
Subject: [PATCH 16/35] Update circle

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cc35033ab5..310ce4e0fc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -53,7 +53,7 @@ jobs:
       - run:
           name: Build and run tests
           no_output_timeout: 30m
-          command: cargo install --path . && mv ~/.cargo/bin/leo .
+          command: cargo install --path . --root .
       - persist_to_workspace:
           root: ~/
           paths: project/

From c7de72f021c1c2eb85052f136d70cf6327671c06 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 20:40:03 -0800
Subject: [PATCH 17/35] Update circleci

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 310ce4e0fc..98db24ac27 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -69,7 +69,7 @@ jobs:
           at: /home/circleci/project/
       - run:
           name: leo new
-          command: ./leo
+          command: ./bin/leo
 
 workflows:
   version: 2

From 8d58338fe9d78076555962ec835d2c18cdff7220 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 20:46:54 -0800
Subject: [PATCH 18/35] Update .gitignore

---
 .circleci/config.yml | 2 +-
 .gitignore           | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 98db24ac27..5c44b2bd5c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -55,7 +55,7 @@ jobs:
           no_output_timeout: 30m
           command: cargo install --path . --root .
       - persist_to_workspace:
-          root: ~/
+          root: ./
           paths: project/
       - clear_environment:
           cache_key: leo-stable-cache
diff --git a/.gitignore b/.gitignore
index 825854be0c..f9e224d6a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,9 @@
 /tmp/
 **.idea/
 *.DS_Store
+
 **/process.yml
+
+**/.crates.toml
+**/.crates2.json
+**/bin/

From 7653eeea48ab6ed61ff73726a1c10b70c29b89f1 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 20:55:29 -0800
Subject: [PATCH 19/35] Test circle

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5c44b2bd5c..02a9968749 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -55,7 +55,7 @@ jobs:
           no_output_timeout: 30m
           command: cargo install --path . --root .
       - persist_to_workspace:
-          root: ./
+          root: ~/
           paths: project/
       - clear_environment:
           cache_key: leo-stable-cache
@@ -69,7 +69,7 @@ jobs:
           at: /home/circleci/project/
       - run:
           name: leo new
-          command: ./bin/leo
+          command: ls -la
 
 workflows:
   version: 2

From 0a20afad8906c8cc3d40eae3491dfdf6857589cd Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 21:04:38 -0800
Subject: [PATCH 20/35] Bump circle

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 02a9968749..b047a1a381 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -69,7 +69,7 @@ jobs:
           at: /home/circleci/project/
       - run:
           name: leo new
-          command: ls -la
+          command: ls -la project
 
 workflows:
   version: 2

From 4004f7575cd346d7a890017fb3cea5914cf51794 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 21:11:31 -0800
Subject: [PATCH 21/35] Attempt leo new circleci

---
 .circleci/config.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b047a1a381..ca72b1cb24 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -69,7 +69,12 @@ jobs:
           at: /home/circleci/project/
       - run:
           name: leo new
-          command: ls -la project
+          command: |
+            export LEO=./project/bin/leo
+            leo new hello-world
+            ls -la
+            cd hello-world && ls -la
+            leo run
 
 workflows:
   version: 2

From ef642cbe54d7dc72db5a72912e6d44863287ed1c Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 21:18:42 -0800
Subject: [PATCH 22/35] Split leo-new test into shell file

---
 .circleci/config.yml | 5 +----
 .circleci/leo-new.sh | 4 ++++
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100755 .circleci/leo-new.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ca72b1cb24..8c6520f190 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -71,10 +71,7 @@ jobs:
           name: leo new
           command: |
             export LEO=./project/bin/leo
-            leo new hello-world
-            ls -la
-            cd hello-world && ls -la
-            leo run
+            ./home/circleci/project/.circleci/leo-new.sh
 
 workflows:
   version: 2
diff --git a/.circleci/leo-new.sh b/.circleci/leo-new.sh
new file mode 100755
index 0000000000..cb24618546
--- /dev/null
+++ b/.circleci/leo-new.sh
@@ -0,0 +1,4 @@
+$LEO new hello-world
+ls -la
+cd hello-world && ls -la
+$LEO run

From de1d06e9dddc2eb15654605e9b0de192f405db30 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 21:23:47 -0800
Subject: [PATCH 23/35] Add leo init circleci

---
 .circleci/config.yml  | 18 +++++++++++++++++-
 .circleci/leo-init.sh |  4 ++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100755 .circleci/leo-init.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8c6520f190..0249b973ee 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -71,7 +71,20 @@ jobs:
           name: leo new
           command: |
             export LEO=./project/bin/leo
-            ./home/circleci/project/.circleci/leo-new.sh
+            ./project/.circleci/leo-new.sh
+
+  leo-init:
+    docker:
+      - image: cimg/rust:1.49.0
+    resource_class: xlarge
+    steps:
+      - attach_workspace:
+          at: /home/circleci/project/
+      - run:
+          name: leo new
+          command: |
+            export LEO=./project/bin/leo
+            ./project/.circleci/leo-init.sh
 
 workflows:
   version: 2
@@ -81,3 +94,6 @@ workflows:
       - leo-new:
           requires:
             - rust-stable
+      - leo-init:
+          requires:
+            - rust-stable
diff --git a/.circleci/leo-init.sh b/.circleci/leo-init.sh
new file mode 100755
index 0000000000..ab7724cd4a
--- /dev/null
+++ b/.circleci/leo-init.sh
@@ -0,0 +1,4 @@
+mkdir hello-world && cd hello-world || exit 1
+$LEO init
+ls -la
+$LEO run

From 345d09d186561b27a6af1c32bf0f43217e4f02ea Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 21:32:57 -0800
Subject: [PATCH 24/35] Update config

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0249b973ee..b263f49b4a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -70,7 +70,7 @@ jobs:
       - run:
           name: leo new
           command: |
-            export LEO=./project/bin/leo
+            export LEO=/home/circleci/project/project/bin/leo
             ./project/.circleci/leo-new.sh
 
   leo-init:
@@ -83,7 +83,7 @@ jobs:
       - run:
           name: leo new
           command: |
-            export LEO=./project/bin/leo
+            export LEO=/home/circleci/project/project/bin/leo
             ./project/.circleci/leo-init.sh
 
 workflows:

From 808e631014843b61c0d5b37c66c314aa6892092f Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 21:45:06 -0800
Subject: [PATCH 25/35] Add leo clean to circleci

---
 .circleci/config.yml           | 18 ++++++++++++-
 .circleci/leo-clean.sh         | 33 +++++++++++++++++++++++
 .github/workflows/leo-init.yml | 48 ---------------------------------
 .github/workflows/leo-new.yml  | 49 ----------------------------------
 4 files changed, 50 insertions(+), 98 deletions(-)
 create mode 100755 .circleci/leo-clean.sh
 delete mode 100644 .github/workflows/leo-init.yml
 delete mode 100644 .github/workflows/leo-new.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b263f49b4a..90e0dddc0a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -81,11 +81,24 @@ jobs:
       - attach_workspace:
           at: /home/circleci/project/
       - run:
-          name: leo new
+          name: leo init
           command: |
             export LEO=/home/circleci/project/project/bin/leo
             ./project/.circleci/leo-init.sh
 
+  leo-clean:
+    docker:
+      - image: cimg/rust:1.49.0
+    resource_class: xlarge
+    steps:
+      - attach_workspace:
+          at: /home/circleci/project/
+      - run:
+          name: leo clean
+          command: |
+            export LEO=/home/circleci/project/project/bin/leo
+            ./project/.circleci/leo-clean.sh
+
 workflows:
   version: 2
   main-workflow:
@@ -97,3 +110,6 @@ workflows:
       - leo-init:
           requires:
             - rust-stable
+      - leo-clean:
+          requires:
+            - rust-stable
diff --git a/.circleci/leo-clean.sh b/.circleci/leo-clean.sh
new file mode 100755
index 0000000000..661c340de3
--- /dev/null
+++ b/.circleci/leo-clean.sh
@@ -0,0 +1,33 @@
+# leo new hello-world
+
+$LEO new hello-world
+ls -la
+cd hello-world && ls -la
+$LEO run
+
+# Assert that the 'outputs' folder is not empty
+
+cd outputs || exit 1
+if [ "$(ls -A $DIR)" ]; then
+  echo "$DIR is not empty"
+else
+  echo "$DIR is empty"
+  exit 1
+fi
+cd ..
+
+# leo clean
+
+$LEO clean
+cd outputs && ls -la
+
+# Assert that the 'outputs' folder is empty
+
+cd outputs || exit 1
+if [ "$(ls -A $DIR)" ]; then
+  echo "$DIR is not empty"
+  exit 1
+else
+  echo "$DIR is empty"
+  exit 0
+fi
diff --git a/.github/workflows/leo-init.yml b/.github/workflows/leo-init.yml
deleted file mode 100644
index 1821d1de86..0000000000
--- a/.github/workflows/leo-init.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: leo-init
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - 'docs/**'
-      - 'documentation/**'
-env:
-  RUST_BACKTRACE: 1
-
-jobs:
-  init:
-    name: Hello Leo ('leo init')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-          override: true
-          components: rustfmt
-
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: Install Leo
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: --path .
-
-      - name: 'leo init'
-        run: |
-          cd .. && mkdir hello-world && cd hello-world
-          leo init
-          ls -la
-          leo run
diff --git a/.github/workflows/leo-new.yml b/.github/workflows/leo-new.yml
deleted file mode 100644
index 842d553897..0000000000
--- a/.github/workflows/leo-new.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: leo-new
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - 'docs/**'
-      - 'documentation/**'
-env:
-  RUST_BACKTRACE: 1
-
-jobs:
-  new:
-    name: Hello Leo ('leo new hello-world')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-          override: true
-          components: rustfmt
-
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: Install Leo
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: --path .
-
-      - name: 'leo new hello-world'
-        run: |
-          cd ..
-          leo new hello-world
-          ls -la
-          cd hello-world && ls -la
-          leo run

From 0915293e268e8e74e777a37919fc7dd037df2e42 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 21:48:54 -0800
Subject: [PATCH 26/35] Update circleci to rust 1.50.0

---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 90e0dddc0a..17093ba3b9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,7 +44,7 @@ jobs:
 
   rust-stable:
     docker:
-      - image: cimg/rust:1.49.0
+      - image: cimg/rust:1.50.0
     resource_class: xlarge
     steps:
       - checkout
@@ -62,7 +62,7 @@ jobs:
 
   leo-new:
     docker:
-      - image: cimg/rust:1.49.0
+      - image: cimg/rust:1.50.0
     resource_class: xlarge
     steps:
       - attach_workspace:
@@ -75,7 +75,7 @@ jobs:
 
   leo-init:
     docker:
-      - image: cimg/rust:1.49.0
+      - image: cimg/rust:1.50.0
     resource_class: xlarge
     steps:
       - attach_workspace:
@@ -88,7 +88,7 @@ jobs:
 
   leo-clean:
     docker:
-      - image: cimg/rust:1.49.0
+      - image: cimg/rust:1.50.0
     resource_class: xlarge
     steps:
       - attach_workspace:

From a3006764ab62eadbed7a94f96fee22ce5cda6522 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 21:52:51 -0800
Subject: [PATCH 27/35] Fix leo clean CI

---
 .circleci/leo-clean.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/leo-clean.sh b/.circleci/leo-clean.sh
index 661c340de3..46bd90880c 100755
--- a/.circleci/leo-clean.sh
+++ b/.circleci/leo-clean.sh
@@ -20,6 +20,7 @@ cd ..
 
 $LEO clean
 cd outputs && ls -la
+cd ..
 
 # Assert that the 'outputs' folder is empty
 

From e29100c70f6852d17e2270b2081590fd32af3cbf Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 21:55:50 -0800
Subject: [PATCH 28/35] Switch output to debug

---
 leo/commands/build.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/leo/commands/build.rs b/leo/commands/build.rs
index 61148e466f..9f562dd85a 100644
--- a/leo/commands/build.rs
+++ b/leo/commands/build.rs
@@ -134,7 +134,7 @@ impl Command for Build {
                 let temporary_program = program.clone();
                 let output = temporary_program.compile_constraints(&mut cs)?;
 
-                tracing::info!("Compiled constraints - {:#?}", output);
+                tracing::debug!("Compiled output - {:#?}", output);
                 tracing::info!("Number of constraints - {:#?}", cs.num_constraints());
 
                 // Serialize the circuit

From 303c69e863f7a64466982c9f82a65a218900b4c4 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 21:59:06 -0800
Subject: [PATCH 29/35] Add leo add and remove to circleci

---
 .circleci/config.yml            | 16 +++++++
 .circleci/leo-add-remove.sh     |  6 +++
 .github/workflows/leo-clean.yml | 76 ---------------------------------
 3 files changed, 22 insertions(+), 76 deletions(-)
 create mode 100755 .circleci/leo-add-remove.sh
 delete mode 100644 .github/workflows/leo-clean.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 17093ba3b9..1d3127deea 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -99,6 +99,19 @@ jobs:
             export LEO=/home/circleci/project/project/bin/leo
             ./project/.circleci/leo-clean.sh
 
+  leo-add-remove:
+    docker:
+      - image: cimg/rust:1.50.0
+    resource_class: xlarge
+    steps:
+      - attach_workspace:
+          at: /home/circleci/project/
+      - run:
+          name: leo add & remove
+          command: |
+            export LEO=/home/circleci/project/project/bin/leo
+            ./project/.circleci/leo-add-remove.sh
+
 workflows:
   version: 2
   main-workflow:
@@ -113,3 +126,6 @@ workflows:
       - leo-clean:
           requires:
             - rust-stable
+      - leo-add-remove:
+          requires:
+            - rust-stable
diff --git a/.circleci/leo-add-remove.sh b/.circleci/leo-add-remove.sh
new file mode 100755
index 0000000000..e7eb352934
--- /dev/null
+++ b/.circleci/leo-add-remove.sh
@@ -0,0 +1,6 @@
+# leo add (w/o login) & remove
+
+$LEO new my-app && cd my-app
+$LEO add howard/silly-sudoku
+$LEO remove silly-sudoku
+$LEO clean
diff --git a/.github/workflows/leo-clean.yml b/.github/workflows/leo-clean.yml
deleted file mode 100644
index 177ed73fdc..0000000000
--- a/.github/workflows/leo-clean.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-name: leo-clean
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - 'docs/**'
-      - 'documentation/**'
-env:
-  RUST_BACKTRACE: 1
-
-jobs:
-  new:
-    name: Hello Leo ('leo new hello-world')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-          override: true
-          components: rustfmt
-
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: Install Leo
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: --path .
-
-      - name: 'leo new hello-world'
-        run: |
-          cd ..
-          leo new hello-world
-          ls -la
-          cd hello-world && ls -la
-          leo run
-
-      - name: Assert that the 'outputs' folder is not empty
-        run: |
-          cd ../hello-world/outputs
-          if [ "$(ls -A $DIR)" ]; then
-              echo "$DIR is not empty"
-          else
-              echo "$DIR is empty"
-              exit 1
-          fi
-
-      - name: 'leo clean'
-        run: |
-          cd ../hello-world
-          leo clean
-          cd outputs && ls -la
-
-      - name: Assert that the 'outputs' folder is empty
-        run: |
-          cd ../hello-world/outputs
-          if [ "$(ls -A $DIR)" ]; then
-              echo "$DIR is not empty"
-              exit 1
-          else
-              echo "$DIR is empty"
-              exit 0
-          fi

From 4cb03344539cad3aaf311b5d521d6eed2b6ae01a Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 22:04:27 -0800
Subject: [PATCH 30/35] Removes leo add and remove GA

---
 .github/workflows/leo-add-remove.yml | 43 ----------------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 .github/workflows/leo-add-remove.yml

diff --git a/.github/workflows/leo-add-remove.yml b/.github/workflows/leo-add-remove.yml
deleted file mode 100644
index 8a0912ba96..0000000000
--- a/.github/workflows/leo-add-remove.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: leo-add-remove
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - 'docs/**'
-      - 'documentation/**'
-env:
-  RUST_BACKTRACE: 1
-
-jobs:
-  add:
-    name: Add Package ('leo add')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-          override: true
-          components: rustfmt
-
-      - name: Install Leo
-        uses: actions-rs/cargo@v1
-        env:
-          CARGO_NET_GIT_FETCH_WITH_CLI: true
-        with:
-          command: install
-          args: --path .
-
-      - name: 'leo add (w/o login) & remove'
-        run: |
-          cd .. && leo new my-app && cd my-app
-          leo add argus4130/xnor
-          leo remove xnor
-          leo clean
-

From c3d08e9c6c82bfac2a47bf7e1cf64f11aef624a8 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 22:13:55 -0800
Subject: [PATCH 31/35] Add leo setup to circleci

---
 .circleci/config.yml   | 16 ++++++++++++++++
 .circleci/leo-setup.sh |  7 +++++++
 2 files changed, 23 insertions(+)
 create mode 100755 .circleci/leo-setup.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1d3127deea..77b792799c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -112,6 +112,19 @@ jobs:
             export LEO=/home/circleci/project/project/bin/leo
             ./project/.circleci/leo-add-remove.sh
 
+  leo-setup:
+    docker:
+      - image: cimg/rust:1.50.0
+    resource_class: xlarge
+    steps:
+      - attach_workspace:
+          at: /home/circleci/project/
+      - run:
+          name: leo setup
+          command: |
+            export LEO=/home/circleci/project/project/bin/leo
+            ./project/.circleci/leo-setup.sh
+
 workflows:
   version: 2
   main-workflow:
@@ -129,3 +142,6 @@ workflows:
       - leo-add-remove:
           requires:
             - rust-stable
+      - leo-setup:
+          requires:
+            - rust-stable
diff --git a/.circleci/leo-setup.sh b/.circleci/leo-setup.sh
new file mode 100755
index 0000000000..a387a10d1e
--- /dev/null
+++ b/.circleci/leo-setup.sh
@@ -0,0 +1,7 @@
+# leo setup
+
+cd examples/pedersen-hash || exit 1
+$LEO setup
+$LEO setup
+$LEO setup --skip-key-check
+$LEO clean

From 2f0ad62795441f5a8cb0d7be134d9738abf7d3e2 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 22:19:16 -0800
Subject: [PATCH 32/35] Fix leo setup path

---
 .circleci/leo-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/leo-setup.sh b/.circleci/leo-setup.sh
index a387a10d1e..ae6e23803f 100755
--- a/.circleci/leo-setup.sh
+++ b/.circleci/leo-setup.sh
@@ -1,6 +1,6 @@
 # leo setup
 
-cd examples/pedersen-hash || exit 1
+cd ./project/examples/pedersen-hash || exit 1
 $LEO setup
 $LEO setup
 $LEO setup --skip-key-check

From 4a75b8d7fa40af6aba03c1a9fc3bdf544399aa09 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 22:22:29 -0800
Subject: [PATCH 33/35] Add leo login and logout to circleci

---
 .circleci/config.yml          | 28 ++++++++++++++++++++++------
 .circleci/leo-login-logout.sh |  7 +++++++
 2 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100755 .circleci/leo-login-logout.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 77b792799c..d758e2dadd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -99,6 +99,19 @@ jobs:
             export LEO=/home/circleci/project/project/bin/leo
             ./project/.circleci/leo-clean.sh
 
+  leo-setup:
+    docker:
+      - image: cimg/rust:1.50.0
+    resource_class: xlarge
+    steps:
+      - attach_workspace:
+          at: /home/circleci/project/
+      - run:
+          name: leo setup
+          command: |
+            export LEO=/home/circleci/project/project/bin/leo
+            ./project/.circleci/leo-setup.sh
+
   leo-add-remove:
     docker:
       - image: cimg/rust:1.50.0
@@ -112,7 +125,7 @@ jobs:
             export LEO=/home/circleci/project/project/bin/leo
             ./project/.circleci/leo-add-remove.sh
 
-  leo-setup:
+  leo-login-logout:
     docker:
       - image: cimg/rust:1.50.0
     resource_class: xlarge
@@ -120,10 +133,10 @@ jobs:
       - attach_workspace:
           at: /home/circleci/project/
       - run:
-          name: leo setup
+          name: leo login & logout
           command: |
             export LEO=/home/circleci/project/project/bin/leo
-            ./project/.circleci/leo-setup.sh
+            ./project/.circleci/leo-login-logout.sh
 
 workflows:
   version: 2
@@ -139,9 +152,12 @@ workflows:
       - leo-clean:
           requires:
             - rust-stable
-      - leo-add-remove:
-          requires:
-            - rust-stable
       - leo-setup:
           requires:
             - rust-stable
+      - leo-add-remove:
+          requires:
+            - rust-stable
+      - leo-login-logout:
+          requires:
+            - rust-stable
\ No newline at end of file
diff --git a/.circleci/leo-login-logout.sh b/.circleci/leo-login-logout.sh
new file mode 100755
index 0000000000..1353b18d72
--- /dev/null
+++ b/.circleci/leo-login-logout.sh
@@ -0,0 +1,7 @@
+# leo login & logout
+
+$LEO new my-app && cd my-app || exit 1
+$LEO login -u "$ALEO_PM_USERNAME" -p "$ALEO_PM_PASSWORD"
+$LEO add howard/silly-sudoku
+$LEO remove silly-sudoku
+$LEO logout

From 6f1f295ec56999feef83cb07dd0ad8a90a337585 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 22:34:01 -0800
Subject: [PATCH 34/35] Removes leo login and logout GA

---
 .github/workflows/leo-login-logout.yml | 47 --------------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 .github/workflows/leo-login-logout.yml

diff --git a/.github/workflows/leo-login-logout.yml b/.github/workflows/leo-login-logout.yml
deleted file mode 100644
index 95a17e42ed..0000000000
--- a/.github/workflows/leo-login-logout.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: leo-login-logout
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - 'docs/**'
-      - 'documentation/**'
-env:
-  RUST_BACKTRACE: 1
-
-jobs:
-  add:
-    name: Add Package ('leo add')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-          override: true
-          components: rustfmt
-
-      - name: Install Leo
-        uses: actions-rs/cargo@v1
-        env:
-          CARGO_NET_GIT_FETCH_WITH_CLI: true
-        with:
-          command: install
-          args: --path .
-
-      - name: 'leo login & logout'
-        env:
-          USER: ${{ secrets.ALEO_PM_USERNAME }}
-          PASS: ${{ secrets.ALEO_PM_PASSWORD }}
-        run: |
-          cd .. && leo new my-app && cd my-app
-          leo login -u "$USER" -p "$PASS"
-          leo add argus4130/xnor
-          leo remove xnor
-          leo logout
-

From 5b6cfd5c77d1951b7e1d8139a17b9a497a7d63a6 Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Wed, 24 Feb 2021 22:34:19 -0800
Subject: [PATCH 35/35] Removes leo setup from GA

---
 .github/workflows/leo-setup.yml | 47 ---------------------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 .github/workflows/leo-setup.yml

diff --git a/.github/workflows/leo-setup.yml b/.github/workflows/leo-setup.yml
deleted file mode 100644
index 7bad2924c2..0000000000
--- a/.github/workflows/leo-setup.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: leo-setup
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - 'docs/**'
-      - 'documentation/**'
-env:
-  RUST_BACKTRACE: 1
-
-jobs:
-  add:
-    name: Add Package ('leo add')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-          override: true
-          components: rustfmt
-
-      - name: Install Leo
-        uses: actions-rs/cargo@v1
-        env:
-          CARGO_NET_GIT_FETCH_WITH_CLI: true
-        with:
-          command: install
-          args: --path .
-
-      - name: 'leo setup for examples'
-        env:
-          USER: ${{ secrets.ALEO_PM_USERNAME }}
-          PASS: ${{ secrets.ALEO_PM_PASSWORD }}
-        run: |
-          cd examples/pedersen-hash
-          leo setup
-          leo setup
-          leo setup --skip-key-check
-          leo clean
-