Skip to content

Commit

Permalink
Update testnet3 to mainnet
Browse files Browse the repository at this point in the history
  • Loading branch information
d0cd committed May 14, 2024
1 parent 100aca0 commit b0ef7a8
Show file tree
Hide file tree
Showing 48 changed files with 106 additions and 106 deletions.
14 changes: 7 additions & 7 deletions .circleci/token/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fi

# Swap in the private key of Alice.
echo "
NETWORK=testnet3
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkp1w8PTxrRgGfAtfKUSq43iQyVbdQHfhGbiNPEg2LVSEXR
" > .env

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -158,7 +158,7 @@ leo run transfer_private "{

# Swap in the private key of Alice.
echo "
NETWORK=testnet3
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkp1w8PTxrRgGfAtfKUSq43iQyVbdQHfhGbiNPEg2LVSEXR
" > .env

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -89,4 +89,4 @@ updates:
- 0.8.3
- dependency-name: rand_xorshift
versions:
- 0.3.0
- 0.3.0
2 changes: 1 addition & 1 deletion .github/workflows/acl2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
pull_request:
push:
branches:
- testnet3
- mainnet
paths-ignore:
- 'docs/**'
- 'documentation/**'
Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
ref: testnet3
ref: mainnet

- name: Install sccache
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Code Coverage
on:
push:
branches:
- testnet3
- mainnet
paths-ignore:
- 'docs/**'
- 'documentation/**'
Expand Down Expand Up @@ -100,4 +100,4 @@ jobs:
run: sccache --show-stats

- name: Stop sccache server
run: sccache --stop-server || true
run: sccache --stop-server || true
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
ref: testnet3
ref: mainnet

- name: Install sccache
env:
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion compiler/passes/src/type_checking/check_expressions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -998,7 +998,7 @@ impl<'a, N: Network> ExpressionVisitor<'a> for TypeChecker<'a, N> {

Some(Type::Tuple(expected_types.clone()))
} else {
// Tuples must be explicitly typed in testnet3.
// Tuples must be explicitly typed.
self.emit_err(TypeCheckerError::invalid_tuple(input.span()));

None
Expand Down
4 changes: 2 additions & 2 deletions docs/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ You will know that the download has failed if you see the following error messag
```bash
ATTENTION - "genesis.prover.1c9bbe9" does not exist, downloading this file remotely and storing it locally. Please ensure "genesis.prover.1c9bbe9" is stored in "/Users/xxx/.aleo/resources/genesis.prover.1c9bbe9".

snarkvm_parameters::testnet3 - Downloading parameters...
snarkvm_parameters::testnet3 - thread `main` panicked at 'Failed to load proving key: Crate("curl::error", "Error { description: \"Transferred a partial file\", code: 18, extra: Some(\"transfer closed with 92197356 bytes remaining to read\") }")', /Users/xxx/.cargo/git/checkouts/snarkvm-f1160780ffe17de8/ea14990/parameters/src/testnet3/symbol_table_creation:95:9
snarkvm_parameters::mainnet - Downloading parameters...
snarkvm_parameters::mainnet - thread `main` panicked at 'Failed to load proving key: Crate("curl::error", "Error { description: \"Transferred a partial file\", code: 18, extra: Some(\"transfer closed with 92197356 bytes remaining to read\") }")', /Users/xxx/.cargo/git/checkouts/snarkvm-f1160780ffe17de8/ea14990/parameters/src/mainnet/symbol_table_creation:95:9
stack backtrace:
0: backtrace::capture::Backtrace::new
1: leo::set_panic_hook::{{closure}}
Expand Down
2 changes: 1 addition & 1 deletion errors/src/errors/parser/parser_errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ create_messages!(
invalid_associated_access {
args: (name: impl Display),
msg: format!("Invalid associated access call to struct {name}."),
help: Some("Double colon `::` syntax is only supported for core functions in Leo for testnet3.".to_string()),
help: Some("Double colon `::` syntax is only supported for core functions in Leo for mainnet.".to_string()),
}

@formatted
Expand Down
2 changes: 1 addition & 1 deletion errors/src/errors/utils/util_errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ create_messages!(
missing_network_error {
args: (dependency: impl Display),
msg: format!("Dependency {dependency} is missing a network specification"),
help: Some("Add a network specification to the dependency in the `program.json` file. Example: `network: \"testnet3\"`".to_string()),
help: Some("Add a network specification to the dependency in the `program.json` file. Example: `network: \"mainnet\"`".to_string()),
}

@formatted
Expand Down
2 changes: 1 addition & 1 deletion examples/auction/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

NETWORK=testnet3
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkp5wvamYgK3WCAdpBQxZqQX8XnuN2u11Y6QprZTriVwZVc

4 changes: 2 additions & 2 deletions examples/auction/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ When executing programs as different parties, be sure to set the `PRIVATE_KEY` f
See `./run.sh` for an example of how to run the program as different parties.


The [Aleo SDK](https://github.com/AleoHQ/leo/tree/testnet3) provides an interface for generating new accounts.
To generate a new account, navigate to [aleo.tools](https://aleo.tools).
The [Aleo SDK](https://github.com/AleoHQ/leo/tree/mainnet) provides an interface for generating new accounts.
To generate a new account, navigate to [provable.tools](https://provable.tools).


### Providing inputs via the command line.
Expand Down
6 changes: 3 additions & 3 deletions examples/auction/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ echo "
"
# Swap in the private key and address of the first bidder to .env.
echo "
NETWORK=testnet3
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkpG9Af9z5Ha4ejVyMCqVFXRKknSm8L1ELEwcc4htk9YhVK
" > .env

Expand All @@ -59,7 +59,7 @@ leo run place_bid aleo1yzlta2q5h8t0fqe0v6dyh9mtv4aggd53fgzr068jvplqhvqsnvzq7pj2k

# Swap in the private key and address of the second bidder to .env.
echo "
NETWORK=testnet3
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkpAFshdsj2EqQzXh5zHceDapFWVCwR6wMCJFfkLYRKupug
" > .env

Expand All @@ -81,7 +81,7 @@ leo run place_bid aleo1esqchvevwn7n5p84e735w4dtwt2hdtu4dpguwgwy94tsxm2p7qpqmlrta

# Swap in the private key and address of the auctioneer to .env.
echo "
NETWORK=testnet3
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkp5wvamYgK3WCAdpBQxZqQX8XnuN2u11Y6QprZTriVwZVc
" > .env

Expand Down
2 changes: 1 addition & 1 deletion examples/basic_bank/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

NETWORK=testnet3
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkpHtqVWT6fSHgUMNxsuVf7eaR6id2cj7TieKY1Z8CP5rCD

4 changes: 2 additions & 2 deletions examples/basic_bank/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ When executing programs as different parties, be sure to set the `PRIVATE_KEY` f
See `./run.sh` for an example of how to run the program as different parties.


The [Aleo SDK](https://github.com/AleoHQ/leo/tree/testnet3) provides an interface for generating new accounts.
To generate a new account, navigate to [aleo.tools](https://aleo.tools).
The [Aleo SDK](https://github.com/AleoHQ/leo/tree/mainnet) provides an interface for generating new accounts.
To generate a new account, navigate to [provable.tools](https://provable.tools).

### Providing inputs via the command line.
```bash
Expand Down
6 changes: 3 additions & 3 deletions examples/basic_bank/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fi

# Swap in the private key and address of the bank to .env.
echo "
NETWORK=testnet3
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkpHtqVWT6fSHgUMNxsuVf7eaR6id2cj7TieKY1Z8CP5rCD
" > .env

Expand Down Expand Up @@ -67,7 +67,7 @@ leo run issue aleo1zeklp6dd8e764spe74xez6f8w27dlua3w7hl4z2uln03re52egpsv46ngg 10

# Swap in the private key and address of the user to .env.
echo "
NETWORK=testnet3
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkp75cpr5NNQpVWc5mfsD9Uf2wg6XvHknf82iwB636q3rtc
" > .env

Expand Down Expand Up @@ -161,7 +161,7 @@ echo "

# Swap in the private key and address of the bank to .env.
echo "
NETWORK=testnet3
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkpHtqVWT6fSHgUMNxsuVf7eaR6id2cj7TieKY1Z8CP5rCD
" > .env

Expand Down
2 changes: 1 addition & 1 deletion examples/battleship/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

NETWORK=testnet3
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkp86FNGdKxjgAdgQZ967bqBanjuHkAaoRe19RK24ZCGsHH

12 changes: 6 additions & 6 deletions examples/battleship/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ echo "
"

echo "
NETWORK=testnet3
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkpGKaJY47BXb6knSqmT3JZnBUEGBDFAWz2nMVSsjwYpJmm
" > .env

Expand Down Expand Up @@ -67,7 +67,7 @@ echo "
"
(
echo "
NETWORK=testnet3
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkp86FNGdKxjgAdgQZ967bqBanjuHkAaoRe19RK24ZCGsHH
" > .env

Expand Down Expand Up @@ -115,7 +115,7 @@ echo "
"
(
echo "
NETWORK=testnet3
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkpGKaJY47BXb6knSqmT3JZnBUEGBDFAWz2nMVSsjwYpJmm
" > .env

Expand Down Expand Up @@ -151,7 +151,7 @@ echo "
(

echo "
NETWORK=testnet3
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkp86FNGdKxjgAdgQZ967bqBanjuHkAaoRe19RK24ZCGsHH
" > .env

Expand Down Expand Up @@ -186,7 +186,7 @@ echo "
"
(
echo "
NETWORK=testnet3
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkpGKaJY47BXb6knSqmT3JZnBUEGBDFAWz2nMVSsjwYpJmm
" > .env

Expand Down Expand Up @@ -222,7 +222,7 @@ echo "
(

echo "
NETWORK=testnet3
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkp86FNGdKxjgAdgQZ967bqBanjuHkAaoRe19RK24ZCGsHH
" > .env

Expand Down
4 changes: 2 additions & 2 deletions examples/bubblesort/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
NETWORK=testnet3
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
4 changes: 2 additions & 2 deletions examples/core/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
NETWORK=testnet3
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
4 changes: 2 additions & 2 deletions examples/fibonacci/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
NETWORK=testnet3
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
4 changes: 2 additions & 2 deletions examples/groups/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
NETWORK=testnet3
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
4 changes: 2 additions & 2 deletions examples/hackers-delight/ntzdebruijn/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
NETWORK=testnet3
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
4 changes: 2 additions & 2 deletions examples/hackers-delight/ntzgaudet/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
NETWORK=testnet3
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
4 changes: 2 additions & 2 deletions examples/hackers-delight/ntzloops/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
NETWORK=testnet3
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
4 changes: 2 additions & 2 deletions examples/hackers-delight/ntzmasks/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
NETWORK=testnet3
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
4 changes: 2 additions & 2 deletions examples/hackers-delight/ntzreisers/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
NETWORK=testnet3
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
4 changes: 2 additions & 2 deletions examples/hackers-delight/ntzseals/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
NETWORK=testnet3
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
NETWORK=mainnet
PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx
Loading

0 comments on commit b0ef7a8

Please sign in to comment.