Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jc/yarn project path #168

Merged
merged 8 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/scripts/update_aztec_contracts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ base_dirs=("./tutorials" "./workshops")

# Repository details
repo_url="https://github.com/AztecProtocol/aztec-packages.git"
contracts_path="yarn-project/noir-contracts/contracts"
contracts_path="noir-projects/noir-contracts/contracts"

# Dynamic Temporary Directory Based on Environment
if [ "$GITHUB_ACTIONS" == "true" ]; then
Expand Down Expand Up @@ -104,5 +104,3 @@ for base_dir in "${base_dirs[@]}"; do
fi
done < <(find "$base_dir" -name "Nargo.toml")
done


8 changes: 4 additions & 4 deletions hackathons/INSPIRATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ The lack of privacy is consistently brought up as one of the main reasons we are

These projects would be implemented as, or in conjunction with, Aztec contracts:

- **ZK UniSwap frontend -** develop a frontend for our uniswap smart contract found [here](https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/noir-contracts/contracts/uniswap_contract)
- **ZK UniSwap frontend -** develop a frontend for our uniswap smart contract found [here](https://github.com/AztecProtocol/aztec-packages/tree/master/noir-projects/noir-contracts/contracts/uniswap_contract)
- **Shielding** - an app that allows users to convert public tokens into a private form, perform an action, and then unshield back into original token. This could build on the existing token contract implementation, see the [tutorial here](https://docs.aztec.network/dev_docs/tutorials/writing_token_contract).
- **ZK stablecoin** - build a stablecoin that allows you to wrap a stablecoin so it can be privately transferred
- **Private lending front end** - you can see an example [here](https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/noir-contracts/contracts/lending_contract)
- **ZK stablecoin** - build a stablecoin that allows you to wrap a stablecoin so it can be privately transferred
- **Private lending front end** - you can see an example [here](https://github.com/AztecProtocol/aztec-packages/tree/master/noir-projects/noir-contracts/contracts/lending_contract)
- **ZKollateral** - privately prove assets for collateral or creditworthiness for a loan
- **Proof of Liquidity** - privately prove solvency and/or compliance without exposing the underlying assets or trades
- **Private DEX** - allow users to trade assets without revealing the accounts that the assets originate from.
Expand All @@ -36,7 +36,7 @@ These projects would be implemented for Noir, but could be used for Aztec contra

These projects could be done for Noir or Aztec contracts:

- **Boilerplates for more frameworks** - there are [Noir boilerplates](https://github.com/noir-lang/awesome-noir#boilerplates) and [Aztec boilerplates](https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/boxes) for a number of popular frameworks already. Consider creating one for your favorite framework if there isn't one yet.
- **Boilerplates for more frameworks** - there are [Noir boilerplates](https://github.com/noir-lang/awesome-noir#boilerplates) and [Aztec boilerplates](https://github.com/AztecProtocol/aztec-packages/tree/master/boxes) for a number of popular frameworks already. Consider creating one for your favorite framework if there isn't one yet.

These projects would be specific to Noir:

Expand Down
2 changes: 1 addition & 1 deletion hackathons/TOOLS.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Many of the plugins and libraries listed above are also useful for writing Aztec

#### Aztec Boilerplate

🧰 Aztec boxes - Example full stack Aztec dapps out of the box. See the [private token example](https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/boxes/private-token) for a functioning reference and the full list [here](https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/boxes).
🧰 Aztec boxes - Example full stack Aztec dapps out of the box. See the full list [here](https://github.com/AztecProtocol/aztec-packages/tree/master/boxes).

#### Support

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "easy_private_token_contract"
type = "contract"
authors = [""]
compiler_version = "0.11.1"
compiler_version = ">=0.23.0"

[dependencies]
aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.23.0", directory="yarn-project/aztec-nr/aztec-noir" }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "token_bridge"
name = "token_bridge_contract"
authors = [""]
compiler_version = ">=0.18.0"
type = "contract"

[dependencies]
aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.23.0", directory="yarn-project/aztec-nr/aztec" }
token_portal_content_hash_lib = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.23.0", directory="yarn-project/noir-contracts/contracts/token_portal_content_hash_lib" }
protocol_types = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.23.0", directory="yarn-project/noir-protocol-circuits/src/crates/types"}
protocol_types = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.23.0", directory="yarn-project/noir-protocol-circuits/src/crates/types"}
157 changes: 0 additions & 157 deletions tutorials/token-bridge/contracts/token_bridge_contract/main.nr

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion tutorials/token-bridge/update_contract.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version="aztec-packages-v0.16.9"
nargo_file_path="$copy_to_file_path/Nargo.toml"

repo_url="https://github.com/AztecProtocol/aztec-packages.git"
contracts_path="yarn-project/noir-contracts/src/contracts"
contracts_path="noir-projects/noir-contracts/src/contracts"

# Check if the file exists
if [ ! -f "$nargo_file_path" ]; then
Expand Down
2 changes: 1 addition & 1 deletion tutorials/token-contract/contracts/Nargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-pac
value_note = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.23.0", directory="yarn-project/aztec-nr/value-note" }
safe_math = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.23.0", directory="yarn-project/aztec-nr/safe-math" }
authwit = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.23.0", directory="yarn-project/aztec-nr/authwit" }
protocol_types = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.23.0", directory="yarn-project/noir-protocol-circuits/src/crates/types"}
protocol_types = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.23.0", directory="yarn-project/noir-protocol-circuits/src/crates/types"}
54 changes: 0 additions & 54 deletions tutorials/token-contract/update_contract.sh

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "token_bridge"
name = "token_bridge_contract"
type = "contract"
authors = [""]
compiler_version = "0.16.0"
compiler_version = ">=0.23.0"

[dependencies]
aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.23.0", directory="yarn-project/aztec-nr/aztec" }
value_note = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.23.0", directory="yarn-project/aztec-nr/value-note"}
safe_math = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.23.0", directory="yarn-project/aztec-nr/safe-math"}
safe_math = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.23.0", directory="yarn-project/aztec-nr/safe-math"}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "uniswap"
name = "uniswap_contract"
type = "contract"
authors = [""]
compiler_version = "0.16.0"
compiler_version = ">=0.23.0"

[dependencies]
aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.23.0", directory="yarn-project/aztec-nr/aztec" }
value_note = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.23.0", directory="yarn-project/aztec-nr/value-note"}
safe_math = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.23.0", directory="yarn-project/aztec-nr/safe-math"}
authwit = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.23.0", directory="yarn-project/aztec-nr/authwit"}
authwit = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.23.0", directory="yarn-project/aztec-nr/authwit"}
4 changes: 2 additions & 2 deletions workshops/devconnect-2023/build-account-contract/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,5 @@ This function is required by the protocol to know how to handle private notes.
## Future work

- Implement signature verification
- Discuss [Authentication witnesses](https://docs.aztec.network/concepts/foundation/accounts/authwit)
- Review the existing Schnorr signer [implementation](https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/noir-contracts/src/contracts/schnorr_account_contract)
- Discuss [Authentication witnesses](https://docs.aztec.network/learn/concepts/accounts/authwit)
- Review the existing Schnorr signer [implementation](https://github.com/AztecProtocol/aztec-packages/tree/master/noir-projects/noir-contracts/src/contracts/schnorr_account_contract)
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ compiler_version = ">=0.18.0"
type = "contract"

[dependencies]
# path should be updated to "noir-projects/..." if the version tag is updated to >=0.24
aztec = { git = 'https://github.com/AztecProtocol/aztec-packages/', tag = 'aztec-packages-v0.14.2', directory = 'yarn-project/aztec-nr/aztec' }
value_note = { git = 'https://github.com/AztecProtocol/aztec-packages/', tag = 'aztec-packages-v0.14.2', directory = 'yarn-project/aztec-nr/value-note' }
easy_private_state = { git = 'https://github.com/AztecProtocol/aztec-packages/', tag = 'aztec-packages-v0.14.2', directory = 'yarn-project/aztec-nr/easy-private-state' }
Expand Down