Merge branch 'mainnet' into update/from-testnet3

.circleci/token/run.sh

@@ -18,7 +18,7 @@ fi
 
 # Swap in the private key of Alice.
 echo "
-NETWORK=testnet3
+NETWORK=mainnet
 PRIVATE_KEY=APrivateKey1zkp1w8PTxrRgGfAtfKUSq43iQyVbdQHfhGbiNPEg2LVSEXR
 " > .env
 
@@ -52,7 +52,7 @@ leo run mint_public aleo13ssze66adjjkt795z9u5wpq8h6kn0y2657726h4h3e3wfnez4vqsm30
 
 # Swap in the private key of Bob.
 echo "
-NETWORK=testnet3
+NETWORK=mainnet
 PRIVATE_KEY=APrivateKey1zkpFo72g7N9iFt3JzzeG8CqsS5doAiXyFvNCgk2oHvjRCzF
 " > .env
 
@@ -86,7 +86,7 @@ leo run mint_private aleo17vy26rpdhqx4598y5gp7nvaa9rk7tnvl6ufhvvf4calsrrqdaqyshd
 
 # Swap in the private key of Alice.
 echo "
-NETWORK=testnet3
+NETWORK=mainnet
 PRIVATE_KEY=APrivateKey1zkp1w8PTxrRgGfAtfKUSq43iQyVbdQHfhGbiNPEg2LVSEXR
 " > .env
 
@@ -120,7 +120,7 @@ leo run transfer_public aleo17vy26rpdhqx4598y5gp7nvaa9rk7tnvl6ufhvvf4calsrrqdaqy
 
 # Swap in the private key of Bob.
 echo "
-NETWORK=testnet3
+NETWORK=mainnet
 PRIVATE_KEY=APrivateKey1zkpFo72g7N9iFt3JzzeG8CqsS5doAiXyFvNCgk2oHvjRCzF
 " > .env
 
@@ -158,7 +158,7 @@ leo run transfer_private "{
 
 # Swap in the private key of Alice.
 echo "
-NETWORK=testnet3
+NETWORK=mainnet
 PRIVATE_KEY=APrivateKey1zkp1w8PTxrRgGfAtfKUSq43iQyVbdQHfhGbiNPEg2LVSEXR
 " > .env
 
@@ -193,7 +193,7 @@ leo run transfer_public_to_private aleo17vy26rpdhqx4598y5gp7nvaa9rk7tnvl6ufhvvf4
 
 # Swap in the private key of Bob.
 echo "
-NETWORK=testnet3
+NETWORK=mainnet
 PRIVATE_KEY=APrivateKey1zkpFo72g7N9iFt3JzzeG8CqsS5doAiXyFvNCgk2oHvjRCzF
 " > .env
 
@@ -234,6 +234,6 @@ leo run transfer_private_to_public "{
 # Swap in the private key of Alice.
 # This is done to ensure that program.json is the same after every execution of ./run.sh.
 echo "
-NETWORK=testnet3
+NETWORK=mainnet
 PRIVATE_KEY=APrivateKey1zkp1w8PTxrRgGfAtfKUSq43iQyVbdQHfhGbiNPEg2LVSEXR
 " > .env

.github/dependabot.yml

@@ -5,7 +5,7 @@ updates:
     schedule:
       interval: daily
       time: "10:00"
-    target-branch: "testnet3"
+    target-branch: "mainnet"
     open-pull-requests-limit: 20
     ignore:
       - dependency-name: snarkvm-curves
@@ -89,4 +89,4 @@ updates:
           - 0.8.3
       - dependency-name: rand_xorshift
         versions:
-          - 0.3.0
+          - 0.3.0

.github/workflows/acl2.yml

@@ -21,7 +21,7 @@ jobs:
 
       - name: Generate asts
         run: |
-          # This currently has to be on testnet3 to work:
+          # This currently has to be on mainnet to work:
           cd compiler/parser
           cargo -q install --path . --example parser
           # To ensure full file tests,

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ on:
   pull_request:
     push:
       branches:
-        - testnet3
+        - mainnet
       paths-ignore:
         - 'docs/**'
         - 'documentation/**'
@@ -189,7 +189,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
         with:
-          ref: testnet3
+          ref: mainnet
 
       - name: Install sccache
         env:

.github/workflows/codecov.yml

@@ -2,7 +2,7 @@ name: Code Coverage
 on:
   push:
     branches:
-      - testnet3
+      - mainnet
     paths-ignore:
       - 'docs/**'
       - 'documentation/**'
@@ -100,4 +100,4 @@ jobs:
         run: sccache --show-stats
 
       - name: Stop sccache server
-        run: sccache --stop-server || true
+        run: sccache --stop-server || true

.github/workflows/docs.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
         with:
-          ref: testnet3
+          ref: mainnet
 
       - name: Install sccache
         env:

CONTRIBUTING.md

@@ -6,9 +6,9 @@ Thank you for your interest in contributing to Leo! Below you can find some guid
 
 Please follow the instructions below when filing pull requests:
 
-- Ensure that your branch is forked from the current [testnet3](https://github.com/AleoHQ/leo/tree/testnet3) branch.
+- Ensure that your branch is forked from the current [mainnet](https://github.com/AleoHQ/leo/tree/mainnet) branch.
 - Fill out the provided markdown template for the feature or proposal. Be sure to link the pull request to any issues by using keywords. Example: "closes #130".
-- Run `cargo fmt` before you commit; we use the `nightly` version of `rustfmt` to format the code, so you'll need to have the `nightly` toolchain installed on your machine; there's a [git hook](https://git-scm.com/docs/githooks) that ensures proper formatting before any commits can be made, and [`.rustfmt.toml`](https://github.com/AleoHQ/Leo/blob/testnet3/.rustfmt.toml) specifies some of the formatting conventions.
+- Run `cargo fmt` before you commit; we use the `nightly` version of `rustfmt` to format the code, so you'll need to have the `nightly` toolchain installed on your machine; there's a [git hook](https://git-scm.com/docs/githooks) that ensures proper formatting before any commits can be made, and [`.rustfmt.toml`](https://github.com/AleoHQ/Leo/blob/mainnet/.rustfmt.toml) specifies some of the formatting conventions.
 - Run `cargo clippy` to ensure that popular correctness and performance pitfalls are avoided.
 
 ## Style

Cargo.toml

@@ -64,6 +64,9 @@ default = [ ]
 ci_skip = [ "leo-compiler/ci_skip" ]
 noconfig = [ ]
 
+[dependencies]
+ureq = "2.9.7"
+
 [dependencies.leo-ast]
 path = "./compiler/ast"
 version = "=1.12.0"

README.md

@@ -6,9 +6,9 @@
 
 <p align="center">
     <a href="https://circleci.com/gh/AleoHQ/leo"><img src="https://circleci.com/gh/AleoHQ/leo.svg?style=svg&circle-token=00960191919c40be0774e00ce8f7fa1fcaa20c00"></a>
-    <a href="https://codecov.io/gh/AleoHQ/leo"><img src="https://codecov.io/gh/AleoHQ/leo/branch/testnet3/graph/badge.svg?token=S6MWO60SYL"/></a>
+    <a href="https://codecov.io/gh/AleoHQ/leo"><img src="https://codecov.io/gh/AleoHQ/leo/branch/mainnet/graph/badge.svg?token=S6MWO60SYL"/></a>
     <a href="https://discord.gg/aleo"><img src="https://img.shields.io/discord/700454073459015690?logo=discord"/></a>
-    <a href="https://github.com/AleoHQ/leo/blob/testnet3/CONTRIBUTORS.md"><img src="https://img.shields.io/badge/contributors-393-ee8449"/></a>
+    <a href="https://github.com/AleoHQ/leo/blob/mainnet/CONTRIBUTORS.md"><img src="https://img.shields.io/badge/contributors-393-ee8449"/></a>
      <a href="https://twitter.com/AleoHQ"><img src="https://img.shields.io/twitter/follow/AleoHQ?style=social"/></a>
 </p>
 <div id="top"></div>

compiler/compiler/Cargo.toml

@@ -41,6 +41,9 @@ version = "=1.12.0"
 [dependencies.sha2]
 version = "0.10"
 
+[dependencies.snarkvm]
+workspace = true
+
 [dependencies.indexmap]
 version = "1.9"
 features = [ ]

compiler/compiler/src/compiler.rs

@@ -17,22 +17,25 @@
 //! The compiler for Leo programs.
 //!
 //! The [`Compiler`] type compiles Leo programs into R1CS circuits.
+
+use crate::CompilerOptions;
+
 pub use leo_ast::Ast;
 use leo_ast::{NodeBuilder, Program, Stub};
 use leo_errors::{emitter::Handler, CompilerError, Result};
 pub use leo_passes::SymbolTable;
 use leo_passes::*;
 use leo_span::{source_map::FileName, symbol::with_session_globals, Symbol};
 
-use sha2::{Digest, Sha256};
-use std::{fs, path::PathBuf};
+use snarkvm::prelude::Network;
 
-use crate::CompilerOptions;
 use indexmap::{IndexMap, IndexSet};
+use sha2::{Digest, Sha256};
+use std::{fs, path::PathBuf};
 
 /// The primary entry point of the Leo compiler.
 #[derive(Clone)]
-pub struct Compiler<'a> {
+pub struct Compiler<'a, N: Network> {
     /// The handler is used for error and warning emissions.
     handler: &'a Handler,
     /// The path to the main leo file.
@@ -55,9 +58,11 @@ pub struct Compiler<'a> {
     type_table: TypeTable,
     /// The stubs for imported programs. Produced by `Retriever` module.
     import_stubs: IndexMap<Symbol, Stub>,
+    // Allows the compiler to be generic over the network.
+    phantom: std::marker::PhantomData<N>,
 }
 
-impl<'a> Compiler<'a> {
+impl<'a, N: Network> Compiler<'a, N> {
     /// Returns a new Leo compiler.
     pub fn new(
         program_name: String,
@@ -83,6 +88,7 @@ impl<'a> Compiler<'a> {
             assigner,
             import_stubs,
             type_table,
+            phantom: Default::default(),
         }
     }
 
@@ -106,7 +112,7 @@ impl<'a> Compiler<'a> {
         let prg_sf = with_session_globals(|s| s.source_map.new_source(program_string, name));
 
         // Use the parser to construct the abstract syntax tree (ast).
-        self.ast = leo_parser::parse_ast(self.handler, &self.node_builder, &prg_sf.src, prg_sf.start_pos)?;
+        self.ast = leo_parser::parse_ast::<N>(self.handler, &self.node_builder, &prg_sf.src, prg_sf.start_pos)?;
 
         // If the program is imported, then check that the name of its program scope matches the file name.
         // Note that parsing enforces that there is exactly one program scope in a file.
@@ -149,7 +155,7 @@ impl<'a> Compiler<'a> {
 
     /// Runs the type checker pass.
     pub fn type_checker_pass(&'a self, symbol_table: SymbolTable) -> Result<(SymbolTable, StructGraph, CallGraph)> {
-        let (symbol_table, struct_graph, call_graph) = TypeChecker::do_pass((
+        let (symbol_table, struct_graph, call_graph) = TypeChecker::<N>::do_pass((
             &self.ast,
             self.handler,
             symbol_table,

compiler/compiler/tests/compile.rs

@@ -140,7 +140,8 @@ fn run_test(test: Test, handler: &Handler, buf: &BufferEmitter) -> Result<Value,
             handler.extend_if_error(process.add_program(&aleo_program).map_err(LeoError::Anyhow))?;
 
             // Add the bytecode to the import stubs.
-            let stub = handler.extend_if_error(disassemble_from_str(&bytecode).map_err(|err| err.into()))?;
+            let stub =
+                handler.extend_if_error(disassemble_from_str::<CurrentNetwork>(&bytecode).map_err(|err| err.into()))?;
             import_stubs.insert(Symbol::intern(&program_name), stub);
 
             // Hash the ast files.

compiler/compiler/tests/execute.rs

@@ -184,7 +184,8 @@ fn run_test(test: Test, handler: &Handler, buf: &BufferEmitter) -> Result<Value,
             }
 
             // Add the bytecode to the import stubs.
-            let stub = handler.extend_if_error(disassemble_from_str(&bytecode).map_err(|err| err.into()))?;
+            let stub =
+                handler.extend_if_error(disassemble_from_str::<CurrentNetwork>(&bytecode).map_err(|err| err.into()))?;
             import_stubs.insert(Symbol::intern(&program_name), stub);
 
             // Hash the ast files.

compiler/compiler/tests/utilities/mod.rs

@@ -156,7 +156,7 @@ pub fn new_compiler(
     main_file_path: PathBuf,
     compiler_options: Option<CompilerOptions>,
     import_stubs: IndexMap<Symbol, Stub>,
-) -> Compiler<'_> {
+) -> Compiler<'_, CurrentNetwork> {
     let output_dir = PathBuf::from("/tmp/output/");
     fs::create_dir_all(output_dir.clone()).unwrap();
 
@@ -178,7 +178,7 @@ pub fn parse_program<'a>(
     cwd: Option<PathBuf>,
     compiler_options: Option<CompilerOptions>,
     import_stubs: IndexMap<Symbol, Stub>,
-) -> Result<Compiler<'a>, LeoError> {
+) -> Result<Compiler<'a, CurrentNetwork>, LeoError> {
     let mut compiler = new_compiler(
         program_name,
         handler,
@@ -255,7 +255,7 @@ pub fn temp_dir() -> PathBuf {
     tempfile::tempdir().expect("Failed to open temporary directory").into_path()
 }
 
-pub fn compile_and_process<'a>(parsed: &'a mut Compiler<'a>) -> Result<String, LeoError> {
+pub fn compile_and_process<'a>(parsed: &'a mut Compiler<'a, CurrentNetwork>) -> Result<String, LeoError> {
     parsed.add_import_stubs()?;
 
     let st = parsed.symbol_table_pass()?;

compiler/parser/examples/parser.rs

@@ -26,6 +26,8 @@ use std::{
     path::{Path, PathBuf},
 };
 
+type CurrentNetwork = snarkvm::prelude::MainnetV0;
+
 #[derive(Debug, Parser)]
 #[clap(name = "leo parser", about = "Parse Leo AST and store it as a JSON")]
 struct Opt {
@@ -48,7 +50,7 @@ fn main() -> Result<(), String> {
 
         Handler::with(|h| {
             let node_builder = NodeBuilder::default();
-            let ast = leo_parser::parse_ast(h, &node_builder, &code.src, code.start_pos)?;
+            let ast = leo_parser::parse_ast::<CurrentNetwork>(h, &node_builder, &code.src, code.start_pos)?;
             let json = Ast::to_json_string(&ast)?;
             println!("{json}");
             Ok(json)

compiler/parser/src/lib.rs

@@ -34,10 +34,17 @@ pub use parser::*;
 use leo_ast::{Ast, NodeBuilder};
 use leo_errors::{emitter::Handler, Result};
 
+use snarkvm::prelude::Network;
+
 #[cfg(test)]
 mod test;
 
 /// Creates a new AST from a given file path and source code text.
-pub fn parse_ast(handler: &Handler, node_builder: &NodeBuilder, source: &str, start_pos: BytePos) -> Result<Ast> {
-    Ok(Ast::new(parser::parse(handler, node_builder, source, start_pos)?))
+pub fn parse_ast<N: Network>(
+    handler: &Handler,
+    node_builder: &NodeBuilder,
+    source: &str,
+    start_pos: BytePos,
+) -> Result<Ast> {
+    Ok(Ast::new(parse::<N>(handler, node_builder, source, start_pos)?))
 }