@aztec/aztec 0.0.1-commit.733c4a3 → 0.0.1-commit.7689c7f

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (124) hide show
  1. package/dest/bin/index.js +2 -2
  2. package/dest/cli/aztec_start_action.d.ts +1 -1
  3. package/dest/cli/aztec_start_action.d.ts.map +1 -1
  4. package/dest/cli/aztec_start_action.js +31 -14
  5. package/dest/cli/aztec_start_options.d.ts +2 -2
  6. package/dest/cli/aztec_start_options.d.ts.map +1 -1
  7. package/dest/cli/aztec_start_options.js +16 -17
  8. package/dest/cli/cli.js +3 -3
  9. package/dest/cli/cmds/compile.d.ts +1 -1
  10. package/dest/cli/cmds/compile.d.ts.map +1 -1
  11. package/dest/cli/cmds/compile.js +15 -9
  12. package/dest/cli/cmds/profile.d.ts +1 -1
  13. package/dest/cli/cmds/profile.d.ts.map +1 -1
  14. package/dest/cli/cmds/profile.js +1 -1
  15. package/dest/cli/cmds/profile_flamegraph.d.ts +1 -1
  16. package/dest/cli/cmds/profile_flamegraph.d.ts.map +1 -1
  17. package/dest/cli/cmds/profile_flamegraph.js +2 -1
  18. package/dest/cli/cmds/profile_gates.d.ts +2 -2
  19. package/dest/cli/cmds/profile_gates.d.ts.map +1 -1
  20. package/dest/cli/cmds/profile_gates.js +23 -4
  21. package/dest/cli/cmds/standby.d.ts +30 -0
  22. package/dest/cli/cmds/standby.d.ts.map +1 -0
  23. package/dest/cli/cmds/standby.js +97 -0
  24. package/dest/cli/cmds/start_bot.d.ts +1 -1
  25. package/dest/cli/cmds/start_bot.d.ts.map +1 -1
  26. package/dest/cli/cmds/start_bot.js +3 -3
  27. package/dest/cli/cmds/start_node.d.ts +3 -2
  28. package/dest/cli/cmds/start_node.d.ts.map +1 -1
  29. package/dest/cli/cmds/start_node.js +28 -40
  30. package/dest/cli/cmds/start_prover_agent.d.ts +1 -1
  31. package/dest/cli/cmds/start_prover_agent.d.ts.map +1 -1
  32. package/dest/cli/cmds/start_prover_agent.js +5 -17
  33. package/dest/cli/cmds/start_prover_broker.d.ts +1 -1
  34. package/dest/cli/cmds/start_prover_broker.d.ts.map +1 -1
  35. package/dest/cli/cmds/start_prover_broker.js +22 -13
  36. package/dest/cli/cmds/start_txe.d.ts +2 -2
  37. package/dest/cli/cmds/start_txe.d.ts.map +1 -1
  38. package/dest/cli/cmds/start_txe.js +6 -5
  39. package/dest/cli/cmds/utils/collect_crate_dirs.d.ts +21 -0
  40. package/dest/cli/cmds/utils/collect_crate_dirs.d.ts.map +1 -0
  41. package/dest/cli/cmds/utils/collect_crate_dirs.js +114 -0
  42. package/dest/cli/cmds/utils/needs_recompile.d.ts +10 -0
  43. package/dest/cli/cmds/utils/needs_recompile.d.ts.map +1 -0
  44. package/dest/cli/cmds/utils/needs_recompile.js +90 -0
  45. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts +4 -0
  46. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts.map +1 -0
  47. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.js +61 -0
  48. package/dest/cli/util.d.ts +3 -5
  49. package/dest/cli/util.d.ts.map +1 -1
  50. package/dest/cli/util.js +46 -85
  51. package/dest/examples/token.js +4 -4
  52. package/dest/local-network/auth_registry.d.ts +4 -0
  53. package/dest/local-network/auth_registry.d.ts.map +1 -0
  54. package/dest/local-network/auth_registry.js +15 -0
  55. package/dest/local-network/banana_fpc.d.ts +1 -1
  56. package/dest/local-network/banana_fpc.d.ts.map +1 -1
  57. package/dest/local-network/banana_fpc.js +9 -7
  58. package/dest/local-network/local-network.d.ts +5 -28
  59. package/dest/local-network/local-network.d.ts.map +1 -1
  60. package/dest/local-network/local-network.js +44 -17
  61. package/dest/testing/anvil_test_watcher.d.ts +15 -3
  62. package/dest/testing/anvil_test_watcher.d.ts.map +1 -1
  63. package/dest/testing/anvil_test_watcher.js +68 -14
  64. package/dest/testing/cheat_codes.d.ts +18 -17
  65. package/dest/testing/cheat_codes.d.ts.map +1 -1
  66. package/dest/testing/cheat_codes.js +72 -36
  67. package/dest/testing/epoch_test_settler.d.ts +1 -1
  68. package/dest/testing/epoch_test_settler.d.ts.map +1 -1
  69. package/dest/testing/epoch_test_settler.js +9 -8
  70. package/dest/testing/index.d.ts +3 -2
  71. package/dest/testing/index.d.ts.map +1 -1
  72. package/dest/testing/index.js +1 -0
  73. package/dest/testing/token_allowed_setup.d.ts +7 -0
  74. package/dest/testing/token_allowed_setup.d.ts.map +1 -0
  75. package/dest/testing/token_allowed_setup.js +20 -0
  76. package/package.json +35 -34
  77. package/scripts/add_crate.sh +53 -0
  78. package/scripts/aztec.sh +10 -3
  79. package/scripts/init.sh +18 -24
  80. package/scripts/new.sh +45 -22
  81. package/scripts/setup_workspace.sh +12 -67
  82. package/scripts/templates/blank/contract/Nargo.toml +6 -0
  83. package/scripts/templates/blank/contract/src/main.nr +10 -0
  84. package/scripts/templates/blank/test/Nargo.toml +7 -0
  85. package/scripts/templates/blank/test/src/lib.nr +11 -0
  86. package/scripts/templates/counter/contract/Nargo.toml +7 -0
  87. package/scripts/templates/counter/contract/src/main.nr +48 -0
  88. package/scripts/templates/counter/test/Nargo.toml +7 -0
  89. package/scripts/templates/counter/test/src/lib.nr +32 -0
  90. package/src/bin/index.ts +2 -2
  91. package/src/cli/aztec_start_action.ts +20 -14
  92. package/src/cli/aztec_start_options.ts +23 -25
  93. package/src/cli/cli.ts +3 -3
  94. package/src/cli/cmds/compile.ts +18 -10
  95. package/src/cli/cmds/profile.ts +2 -1
  96. package/src/cli/cmds/profile_flamegraph.ts +2 -1
  97. package/src/cli/cmds/profile_gates.ts +22 -5
  98. package/src/cli/cmds/standby.ts +132 -0
  99. package/src/cli/cmds/start_bot.ts +3 -5
  100. package/src/cli/cmds/start_node.ts +43 -39
  101. package/src/cli/cmds/start_prover_agent.ts +5 -8
  102. package/src/cli/cmds/start_prover_broker.ts +23 -24
  103. package/src/cli/cmds/start_txe.ts +7 -5
  104. package/src/cli/cmds/utils/collect_crate_dirs.ts +118 -0
  105. package/src/cli/cmds/utils/needs_recompile.ts +98 -0
  106. package/src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts +76 -0
  107. package/src/cli/util.ts +49 -82
  108. package/src/examples/token.ts +6 -4
  109. package/src/local-network/auth_registry.ts +14 -0
  110. package/src/local-network/banana_fpc.ts +5 -8
  111. package/src/local-network/local-network.ts +43 -14
  112. package/src/testing/anvil_test_watcher.ts +76 -13
  113. package/src/testing/cheat_codes.ts +92 -39
  114. package/src/testing/epoch_test_settler.ts +6 -8
  115. package/src/testing/index.ts +2 -1
  116. package/src/testing/token_allowed_setup.ts +19 -0
  117. package/dest/cli/cmds/start_archiver.d.ts +0 -9
  118. package/dest/cli/cmds/start_archiver.d.ts.map +0 -1
  119. package/dest/cli/cmds/start_archiver.js +0 -48
  120. package/dest/cli/release_version.d.ts +0 -2
  121. package/dest/cli/release_version.d.ts.map +0 -1
  122. package/dest/cli/release_version.js +0 -14
  123. package/src/cli/cmds/start_archiver.ts +0 -50
  124. package/src/cli/release_version.ts +0 -21
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/aztec",
3
- "version": "0.0.1-commit.733c4a3",
3
+ "version": "0.0.1-commit.7689c7f",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -28,39 +28,40 @@
28
28
  "../package.common.json"
29
29
  ],
30
30
  "dependencies": {
31
- "@aztec/accounts": "0.0.1-commit.733c4a3",
32
- "@aztec/archiver": "0.0.1-commit.733c4a3",
33
- "@aztec/aztec-faucet": "0.0.1-commit.733c4a3",
34
- "@aztec/aztec-node": "0.0.1-commit.733c4a3",
35
- "@aztec/aztec.js": "0.0.1-commit.733c4a3",
36
- "@aztec/bb-prover": "0.0.1-commit.733c4a3",
37
- "@aztec/bb.js": "0.0.1-commit.733c4a3",
38
- "@aztec/blob-client": "0.0.1-commit.733c4a3",
39
- "@aztec/bot": "0.0.1-commit.733c4a3",
40
- "@aztec/builder": "0.0.1-commit.733c4a3",
41
- "@aztec/cli": "0.0.1-commit.733c4a3",
42
- "@aztec/constants": "0.0.1-commit.733c4a3",
43
- "@aztec/entrypoints": "0.0.1-commit.733c4a3",
44
- "@aztec/ethereum": "0.0.1-commit.733c4a3",
45
- "@aztec/foundation": "0.0.1-commit.733c4a3",
46
- "@aztec/kv-store": "0.0.1-commit.733c4a3",
47
- "@aztec/l1-artifacts": "0.0.1-commit.733c4a3",
48
- "@aztec/node-lib": "0.0.1-commit.733c4a3",
49
- "@aztec/noir-contracts.js": "0.0.1-commit.733c4a3",
50
- "@aztec/noir-protocol-circuits-types": "0.0.1-commit.733c4a3",
51
- "@aztec/p2p": "0.0.1-commit.733c4a3",
52
- "@aztec/p2p-bootstrap": "0.0.1-commit.733c4a3",
53
- "@aztec/protocol-contracts": "0.0.1-commit.733c4a3",
54
- "@aztec/prover-client": "0.0.1-commit.733c4a3",
55
- "@aztec/prover-node": "0.0.1-commit.733c4a3",
56
- "@aztec/pxe": "0.0.1-commit.733c4a3",
57
- "@aztec/sequencer-client": "0.0.1-commit.733c4a3",
58
- "@aztec/stdlib": "0.0.1-commit.733c4a3",
59
- "@aztec/telemetry-client": "0.0.1-commit.733c4a3",
60
- "@aztec/txe": "0.0.1-commit.733c4a3",
61
- "@aztec/validator-ha-signer": "0.0.1-commit.733c4a3",
62
- "@aztec/wallets": "0.0.1-commit.733c4a3",
63
- "@aztec/world-state": "0.0.1-commit.733c4a3",
31
+ "@aztec/accounts": "0.0.1-commit.7689c7f",
32
+ "@aztec/archiver": "0.0.1-commit.7689c7f",
33
+ "@aztec/aztec-node": "0.0.1-commit.7689c7f",
34
+ "@aztec/aztec.js": "0.0.1-commit.7689c7f",
35
+ "@aztec/bb-prover": "0.0.1-commit.7689c7f",
36
+ "@aztec/bb.js": "0.0.1-commit.7689c7f",
37
+ "@aztec/blob-client": "0.0.1-commit.7689c7f",
38
+ "@aztec/bot": "0.0.1-commit.7689c7f",
39
+ "@aztec/builder": "0.0.1-commit.7689c7f",
40
+ "@aztec/cli": "0.0.1-commit.7689c7f",
41
+ "@aztec/constants": "0.0.1-commit.7689c7f",
42
+ "@aztec/entrypoints": "0.0.1-commit.7689c7f",
43
+ "@aztec/ethereum": "0.0.1-commit.7689c7f",
44
+ "@aztec/foundation": "0.0.1-commit.7689c7f",
45
+ "@aztec/kv-store": "0.0.1-commit.7689c7f",
46
+ "@aztec/l1-artifacts": "0.0.1-commit.7689c7f",
47
+ "@aztec/node-lib": "0.0.1-commit.7689c7f",
48
+ "@aztec/noir-contracts.js": "0.0.1-commit.7689c7f",
49
+ "@aztec/noir-protocol-circuits-types": "0.0.1-commit.7689c7f",
50
+ "@aztec/p2p": "0.0.1-commit.7689c7f",
51
+ "@aztec/p2p-bootstrap": "0.0.1-commit.7689c7f",
52
+ "@aztec/protocol-contracts": "0.0.1-commit.7689c7f",
53
+ "@aztec/prover-client": "0.0.1-commit.7689c7f",
54
+ "@aztec/prover-node": "0.0.1-commit.7689c7f",
55
+ "@aztec/pxe": "0.0.1-commit.7689c7f",
56
+ "@aztec/sequencer-client": "0.0.1-commit.7689c7f",
57
+ "@aztec/standard-contracts": "0.0.1-commit.7689c7f",
58
+ "@aztec/stdlib": "0.0.1-commit.7689c7f",
59
+ "@aztec/telemetry-client": "0.0.1-commit.7689c7f",
60
+ "@aztec/txe": "0.0.1-commit.7689c7f",
61
+ "@aztec/validator-ha-signer": "0.0.1-commit.7689c7f",
62
+ "@aztec/wallets": "0.0.1-commit.7689c7f",
63
+ "@aztec/world-state": "0.0.1-commit.7689c7f",
64
+ "@iarna/toml": "^2.2.5",
64
65
  "@types/chalk": "^2.2.0",
65
66
  "abitype": "^0.8.11",
66
67
  "chalk": "^5.3.0",
@@ -0,0 +1,53 @@
1
+ #!/usr/bin/env bash
2
+ set -euo pipefail
3
+
4
+ # Creates a contract+test crate pair and adds them to an existing workspace.
5
+ # Usage: add_crate.sh <crate_name> <template>
6
+ # Must be called from a workspace root that already has Nargo.toml with [workspace].
7
+
8
+ crate_name=$1
9
+ template=$2
10
+
11
+ if [ -z "$crate_name" ]; then
12
+ echo "Error: crate name is required"
13
+ exit 1
14
+ fi
15
+
16
+ if [[ "$crate_name" == *"/"* ]] || [[ "$crate_name" == *"\\"* ]]; then
17
+ echo "Error: crate name must not contain path separators"
18
+ exit 1
19
+ fi
20
+
21
+ contract_dir="${crate_name}_contract"
22
+ test_dir="${crate_name}_test"
23
+
24
+ if [ -d "$contract_dir" ]; then
25
+ echo "Error: directory '$contract_dir' already exists"
26
+ exit 1
27
+ fi
28
+ if [ -d "$test_dir" ]; then
29
+ echo "Error: directory '$test_dir' already exists"
30
+ exit 1
31
+ fi
32
+
33
+ # Get the actual aztec version for the git tag.
34
+ AZTEC_VERSION=$(jq -r '.version' $(dirname $0)/../package.json)
35
+ TEMPLATE_DIR="$(dirname $0)/templates/$template"
36
+
37
+ # Copy template crates and substitute placeholders
38
+ cp -r "$TEMPLATE_DIR/contract" "$contract_dir"
39
+ cp -r "$TEMPLATE_DIR/test" "$test_dir"
40
+ # Use perl -i for portability across os.
41
+ find "$contract_dir" "$test_dir" -type f -exec \
42
+ perl -i -pe "s/__CRATE_NAME__/${crate_name}/g; s/__AZTEC_VERSION__/${AZTEC_VERSION}/g" {} +
43
+
44
+ # Add members to workspace Nargo.toml
45
+ if grep -q 'members\s*=\s*\[\s*\]' Nargo.toml; then
46
+ # Empty array: members = []
47
+ perl -i -pe "s|members\s*=\s*\[\s*\]|members = [\"${contract_dir}\", \"${test_dir}\"]|" Nargo.toml
48
+ else
49
+ # Non-empty array: add before closing ]
50
+ perl -i -pe "s|(members\s*=\s*\[.*)\]|\1, \"${contract_dir}\", \"${test_dir}\"]|" Nargo.toml
51
+ fi
52
+
53
+ echo "Created crates '${contract_dir}' and '${test_dir}'"
package/scripts/aztec.sh CHANGED
@@ -20,13 +20,20 @@ function aztec {
20
20
 
21
21
  case $cmd in
22
22
  test)
23
- export LOG_LEVEL="${LOG_LEVEL:-"error;trace:contract_log"}"
23
+ # Attempt to compile, no-op if there are no changes
24
+ node --no-warnings "$script_dir/../dest/bin/index.js" compile
25
+
26
+ export LOG_LEVEL="${LOG_LEVEL:-"error;trace:^contract:"}"
24
27
  aztec start --txe --port 8081 &
25
28
  server_pid=$!
26
29
  trap 'kill $server_pid &>/dev/null || true' EXIT
30
+ if ! command -v nc &>/dev/null; then
31
+ echo "Error: 'nc' (netcat) is required but not installed." >&2
32
+ exit 1
33
+ fi
27
34
  while ! nc -z 127.0.0.1 8081 &>/dev/null; do sleep 0.2; done
28
35
  export NARGO_FOREIGN_CALL_TIMEOUT=300000
29
- nargo test --silence-warnings --oracle-resolver http://127.0.0.1:8081 --test-threads 16 "$@"
36
+ nargo test --silence-warnings --oracle-resolver http://127.0.0.1:8081 "$@"
30
37
  ;;
31
38
  start)
32
39
  if [ "${1:-}" == "--local-network" ]; then
@@ -46,7 +53,7 @@ case $cmd in
46
53
  export ETHEREUM_HOSTS=${ETHEREUM_HOSTS:-"http://127.0.0.1:${ANVIL_PORT}"}
47
54
 
48
55
  anvil --version
49
- anvil --silent &
56
+ anvil --silent --port "$ANVIL_PORT" &
50
57
  anvil_pid=$!
51
58
  trap 'kill $anvil_pid &>/dev/null' EXIT
52
59
  fi
package/scripts/init.sh CHANGED
@@ -3,43 +3,37 @@ set -euo pipefail
3
3
 
4
4
  script_path=$(realpath $(dirname "$0"))
5
5
 
6
- name_arg=""
7
-
8
- # Check for help first
9
- for arg in "$@"; do
10
- if [ "$arg" == "--help" ] || [ "$arg" == "-h" ]; then
11
- cat << 'EOF'
6
+ # Parse arguments
7
+ while [[ $# -gt 0 ]]; do
8
+ case $1 in
9
+ --help|-h)
10
+ cat << 'EOF'
12
11
  Aztec Init - Create a new Aztec Noir project in the current directory
13
12
 
14
- Usage: aztec init [OPTIONS]
13
+ Usage: aztec init
15
14
 
16
15
  Options:
17
- --name <NAME> Name of the package [default: current directory name]
18
16
  -h, --help Print help
19
17
 
20
18
  This command creates a new Aztec Noir project in the current directory with
21
- a workspace containing a contract crate and a test crate, and automatically
22
- adds the Aztec.nr dependency to both.
23
- EOF
24
- exit 0
25
- fi
26
- done
19
+ a workspace containing a Counter contract example with tests. The Counter
20
+ demonstrates private state, private functions, and utility reads.
27
21
 
28
- # Parse arguments
29
- while [[ $# -gt 0 ]]; do
30
- case $1 in
31
- --name)
32
- name_arg="$2"
33
- shift 2
22
+ Use 'aztec new <name>' to create a blank contract project, or to add another
23
+ contract to an existing workspace.
24
+ EOF
25
+ exit 0
34
26
  ;;
35
27
  *)
36
- shift
28
+ echo "Error: unexpected argument '$1'"
29
+ echo "Usage: aztec init"
30
+ echo "Run 'aztec init --help' for more information"
31
+ exit 1
37
32
  ;;
38
33
  esac
39
34
  done
40
35
 
41
- # Derive package name: use --name if provided, otherwise use current directory name
42
- package_name="${name_arg:-$(basename $(pwd))}"
36
+ package_name="$(basename $(pwd))"
43
37
 
44
38
  echo "Initializing Aztec contract project..."
45
- $script_path/setup_workspace.sh "$package_name"
39
+ $script_path/setup_workspace.sh "$package_name" counter
package/scripts/new.sh CHANGED
@@ -3,58 +3,81 @@ set -euo pipefail
3
3
 
4
4
  script_path=$(realpath $(dirname "$0"))
5
5
 
6
- name_arg=""
7
6
  project_path=""
8
7
 
9
8
  while [[ $# -gt 0 ]]; do
10
9
  case $1 in
11
10
  --help|-h)
12
11
  cat << 'EOF'
13
- Aztec New - Create a new Aztec Noir project in a new directory
12
+ Aztec New - Create a new Aztec Noir project or add a contract to an existing workspace
14
13
 
15
- Usage: aztec new [OPTIONS] <PATH>
14
+ Usage: aztec new <NAME>
16
15
 
17
16
  Arguments:
18
- <PATH> The path to save the new project
17
+ <NAME> The name for the new contract (also used as the directory name when
18
+ creating a new workspace)
19
19
 
20
20
  Options:
21
- --name <NAME> Name of the package [default: package directory name]
22
21
  -h, --help Print help
23
22
 
24
- This command creates a new Aztec Noir project with a workspace containing
25
- a contract crate and a test crate, and automatically adds the Aztec.nr
26
- dependency to both.
23
+ When run outside an existing workspace:
24
+ Creates a new directory with a workspace containing a contract crate and a
25
+ test crate, and automatically adds the Aztec.nr dependency to both.
26
+
27
+ When run inside an existing workspace (Nargo.toml with [workspace] exists):
28
+ Adds a new contract crate and test crate to the existing workspace.
27
29
  EOF
28
30
  exit 0
29
31
  ;;
30
- --name)
31
- name_arg="$2"
32
- shift 2
32
+ -*)
33
+ echo "Error: unknown option '$1'"
34
+ echo "Usage: aztec new <NAME>"
35
+ echo "Run 'aztec new --help' for more information"
36
+ exit 1
33
37
  ;;
34
38
  *)
39
+ if [ -n "$project_path" ]; then
40
+ echo "Error: unexpected argument '$1'"
41
+ echo "Usage: aztec new <NAME>"
42
+ echo "Run 'aztec new --help' for more information"
43
+ exit 1
44
+ fi
35
45
  project_path=$1
36
46
  shift
37
- break
38
47
  ;;
39
48
  esac
40
49
  done
41
50
 
42
51
  if [ -z "$project_path" ]; then
43
- echo "Error: PATH argument is required"
44
- echo "Usage: aztec new [OPTIONS] <PATH>"
52
+ echo "Error: NAME argument is required"
53
+ echo "Usage: aztec new <NAME>"
45
54
  echo "Run 'aztec new --help' for more information"
46
55
  exit 1
47
56
  fi
48
57
 
49
- if [ -d "$project_path" ] && [ "$(ls -A $project_path 2>/dev/null)" ]; then
50
- echo "Error: $project_path already exists and is not empty"
58
+ package_name="$(basename $project_path)"
59
+
60
+ # Validate that the name contains only valid Noir identifier characters
61
+ if ! [[ "$package_name" =~ ^[a-zA-Z][a-zA-Z0-9_]*$ ]]; then
62
+ echo "Error: '$package_name' is not a valid contract name"
63
+ echo "Name must start with a letter and contain only letters, digits, and underscores"
51
64
  exit 1
52
65
  fi
53
66
 
54
- # Derive package name: use --name if provided, otherwise use directory basename
55
- package_name="${name_arg:-$(basename $project_path)}"
67
+ # Check if we're inside an existing workspace
68
+ if [ -f "Nargo.toml" ] && grep -q '\[workspace\]' Nargo.toml; then
69
+ # Add crate pair to existing workspace
70
+ echo "Adding contract '$package_name' to existing workspace..."
71
+ $script_path/add_crate.sh "$package_name" blank
72
+ else
73
+ # Create new workspace
74
+ if [ -d "$project_path" ] && [ "$(ls -A $project_path 2>/dev/null)" ]; then
75
+ echo "Error: $project_path already exists and is not empty"
76
+ exit 1
77
+ fi
56
78
 
57
- echo "Creating new Aztec contract project at $project_path..."
58
- mkdir -p "$project_path"
59
- cd "$project_path"
60
- $script_path/setup_workspace.sh "$package_name"
79
+ echo "Creating new Aztec contract project at $project_path..."
80
+ mkdir -p "$project_path"
81
+ cd "$project_path"
82
+ $script_path/setup_workspace.sh "$package_name" blank
83
+ fi
@@ -2,10 +2,12 @@
2
2
  set -euo pipefail
3
3
 
4
4
  # Creates an Aztec contract workspace with a contract crate and a test crate.
5
- # Usage: setup_workspace.sh <package_name>
5
+ # Usage: setup_workspace.sh <package_name> <template>
6
6
  # Must be called from the workspace root directory.
7
7
 
8
8
  package_name=$1
9
+ template=$2
10
+ script_path=$(realpath $(dirname "$0"))
9
11
 
10
12
  if [ -z "$package_name" ]; then
11
13
  echo "Error: package name is required"
@@ -13,76 +15,19 @@ if [ -z "$package_name" ]; then
13
15
  fi
14
16
 
15
17
  if [ -f "Nargo.toml" ]; then
16
- echo "Error: Nargo.toml already exists in the current directory"
18
+ echo "Error: Nargo.toml already exists in the current directory."
19
+ echo "To add another contract crate to this workspace, use 'aztec new <name>' instead."
17
20
  exit 1
18
21
  fi
19
22
 
20
- # Get the actual aztec version for the git tag.
21
- AZTEC_VERSION=$(jq -r '.version' $(dirname $0)/../package.json)
22
-
23
- # Create workspace root Nargo.toml
23
+ # Create workspace root Nargo.toml with empty members (add_crate.sh will populate)
24
24
  cat > Nargo.toml << 'EOF'
25
25
  [workspace]
26
- members = ["contract", "test"]
27
- EOF
28
-
29
- # Create contract crate
30
- mkdir -p contract/src
31
- cat > contract/Nargo.toml << CEOF
32
- [package]
33
- name = "${package_name}"
34
- type = "contract"
35
-
36
- [dependencies]
37
- aztec = { git="https://github.com/AztecProtocol/aztec-nr", tag="v${AZTEC_VERSION}", directory="aztec" }
38
- CEOF
39
-
40
- cat > contract/src/main.nr << 'EOF'
41
- use aztec::macros::aztec;
42
-
43
- #[aztec]
44
- pub contract Main {
45
- use aztec::macros::functions::{external, initializer};
46
-
47
- #[initializer]
48
- #[external("private")]
49
- fn constructor() {}
50
- }
26
+ members = []
51
27
  EOF
52
28
 
53
- # Create test crate
54
- mkdir -p test/src
55
- cat > test/Nargo.toml << TEOF
56
- [package]
57
- name = "${package_name}_test"
58
- type = "lib"
59
-
60
- [dependencies]
61
- aztec = { git="https://github.com/AztecProtocol/aztec-nr", tag="v${AZTEC_VERSION}", directory="aztec" }
62
- ${package_name} = { path = "../contract" }
63
- TEOF
64
-
65
- cat > test/src/lib.nr << 'NOIR'
66
- use aztec::test::helpers::test_environment::TestEnvironment;
67
- use __PACKAGE_NAME__::Main;
68
-
69
- #[test]
70
- unconstrained fn test_constructor() {
71
- let mut env = TestEnvironment::new();
72
- let deployer = env.create_light_account();
73
-
74
- // Deploy the contract with the default constructor:
75
- let contract_address = env.deploy("@__PACKAGE_NAME__/Main").with_private_initializer(
76
- deployer,
77
- Main::interface().constructor(),
78
- );
79
-
80
- // Deploy without an initializer:
81
- let contract_address = env.deploy("@__PACKAGE_NAME__/Main").without_initializer();
82
- }
83
- NOIR
84
-
85
- sed -i "s/__PACKAGE_NAME__/${package_name}/g" test/src/lib.nr
29
+ # Create the first crate pair
30
+ $script_path/add_crate.sh "$package_name" "$template"
86
31
 
87
32
  # Create README
88
33
  cat > README.md << REOF
@@ -96,7 +41,7 @@ An Aztec Noir contract project.
96
41
  aztec compile
97
42
  \`\`\`
98
43
 
99
- This compiles the contract in \`contract/\` and outputs artifacts to \`target/\`.
44
+ This compiles all contract crates and outputs artifacts to \`target/\`.
100
45
 
101
46
  ## Test
102
47
 
@@ -104,7 +49,7 @@ This compiles the contract in \`contract/\` and outputs artifacts to \`target/\`
104
49
  aztec test
105
50
  \`\`\`
106
51
 
107
- This runs the tests in \`test/\`.
52
+ This runs all tests in the workspace.
108
53
 
109
54
  ## Generate TypeScript bindings
110
55
 
@@ -121,4 +66,4 @@ target/
121
66
  codegenCache.json
122
67
  GEOF
123
68
 
124
- echo "Created Aztec contract workspace with crates '${package_name}' and '${package_name}_test'"
69
+ echo "Created Aztec contract workspace with crates '${package_name}_contract' and '${package_name}_test'"
@@ -0,0 +1,6 @@
1
+ [package]
2
+ name = "__CRATE_NAME___contract"
3
+ type = "contract"
4
+
5
+ [dependencies]
6
+ aztec = { git="https://github.com/AztecProtocol/aztec-nr", tag="v__AZTEC_VERSION__", directory="aztec" }
@@ -0,0 +1,10 @@
1
+ use aztec::macros::aztec;
2
+
3
+ #[aztec]
4
+ pub contract Main {
5
+ use aztec::macros::functions::{external, initializer};
6
+
7
+ #[initializer]
8
+ #[external("private")]
9
+ fn constructor() {}
10
+ }
@@ -0,0 +1,7 @@
1
+ [package]
2
+ name = "__CRATE_NAME___test"
3
+ type = "lib"
4
+
5
+ [dependencies]
6
+ aztec = { git="https://github.com/AztecProtocol/aztec-nr", tag="v__AZTEC_VERSION__", directory="aztec" }
7
+ __CRATE_NAME___contract = { path = "../__CRATE_NAME___contract" }
@@ -0,0 +1,11 @@
1
+ use aztec::test::helpers::test_environment::TestEnvironment;
2
+ use __CRATE_NAME___contract::Main;
3
+
4
+ #[test]
5
+ unconstrained fn test_constructor() {
6
+ let mut env = TestEnvironment::new();
7
+ let deployer = env.create_light_account();
8
+
9
+ let _contract_address = env.deploy("@__CRATE_NAME___contract/Main")
10
+ .with_private_initializer(deployer, Main::interface().constructor());
11
+ }
@@ -0,0 +1,7 @@
1
+ [package]
2
+ name = "__CRATE_NAME___contract"
3
+ type = "contract"
4
+
5
+ [dependencies]
6
+ aztec = { git="https://github.com/AztecProtocol/aztec-nr", tag="v__AZTEC_VERSION__", directory="aztec" }
7
+ balance_set = { git="https://github.com/AztecProtocol/aztec-nr", tag="v__AZTEC_VERSION__", directory="balance-set" }
@@ -0,0 +1,48 @@
1
+ use aztec::macros::aztec;
2
+
3
+ #[aztec]
4
+ pub contract Counter {
5
+ use aztec::{
6
+ macros::{functions::{external, initializer}, storage::storage},
7
+ messages::message_delivery::MessageDelivery,
8
+ protocol::address::AztecAddress,
9
+ state_vars::Owned,
10
+ };
11
+ use balance_set::BalanceSet;
12
+
13
+ #[storage]
14
+ struct Storage<Context> {
15
+ // Each owner has their own counter, stored as private encrypted notes.
16
+ // Owned: dictates who will receive the encrypted notes.
17
+ // BalanceSet: manages the underlying notes, providing add/sub/balance_of.
18
+ counters: Owned<BalanceSet<Context>, Context>,
19
+ }
20
+
21
+ // Sets the owner's counter to an initial value.
22
+ //
23
+ // #[external("private")]: executes on the user's device, inputs are hidden from everyone.
24
+ #[initializer]
25
+ #[external("private")]
26
+ fn constructor(initial_value: u128, owner: AztecAddress) {
27
+ // Delivers the note to the recipient onchain with provable correctness.
28
+ // Without delivery, the recipient can't find or decrypt the note.
29
+ self.storage.counters.at(owner).add(initial_value).deliver(
30
+ MessageDelivery::onchain_constrained(),
31
+ );
32
+ }
33
+
34
+ // Adds 1 to the owner's counter.
35
+ #[external("private")]
36
+ fn increment(owner: AztecAddress) {
37
+ self.storage.counters.at(owner).add(1).deliver(MessageDelivery::onchain_constrained());
38
+ }
39
+
40
+ // Returns the current value of the owner's counter.
41
+ //
42
+ // #[external("utility")]: runs off-chain, no transaction created, no cost.
43
+ // Only the owner can decrypt and read their own counter.
44
+ #[external("utility")]
45
+ unconstrained fn get_counter(owner: AztecAddress) -> u128 {
46
+ self.storage.counters.at(owner).balance_of()
47
+ }
48
+ }
@@ -0,0 +1,7 @@
1
+ [package]
2
+ name = "__CRATE_NAME___test"
3
+ type = "lib"
4
+
5
+ [dependencies]
6
+ aztec = { git="https://github.com/AztecProtocol/aztec-nr", tag="v__AZTEC_VERSION__", directory="aztec" }
7
+ __CRATE_NAME___contract = { path = "../__CRATE_NAME___contract" }
@@ -0,0 +1,32 @@
1
+ use aztec::{protocol::address::AztecAddress, test::helpers::test_environment::TestEnvironment};
2
+ use __CRATE_NAME___contract::Counter;
3
+
4
+ unconstrained fn setup(initial_value: u128) -> (TestEnvironment, AztecAddress, AztecAddress) {
5
+ let mut env = TestEnvironment::new();
6
+ let owner = env.create_light_account();
7
+
8
+ let contract_address = env.deploy("@__CRATE_NAME___contract/Counter")
9
+ .with_private_initializer(owner, Counter::interface().constructor(initial_value, owner));
10
+
11
+ (env, contract_address, owner)
12
+ }
13
+
14
+ #[test]
15
+ unconstrained fn test_constructor() {
16
+ let initial_value = 5;
17
+ let (env, contract_address, owner) = setup(initial_value);
18
+
19
+ let counter = env.execute_utility(Counter::at(contract_address).get_counter(owner));
20
+ assert_eq(counter, initial_value);
21
+ }
22
+
23
+ #[test]
24
+ unconstrained fn test_increment() {
25
+ let initial_value = 5;
26
+ let (mut env, contract_address, owner) = setup(initial_value);
27
+
28
+ env.call_private(owner, Counter::at(contract_address).increment(owner));
29
+
30
+ let counter = env.execute_utility(Counter::at(contract_address).get_counter(owner));
31
+ assert_eq(counter, initial_value + 1);
32
+ }
package/src/bin/index.ts CHANGED
@@ -11,6 +11,7 @@ import { injectCommands as injectMiscCommands } from '@aztec/cli/misc';
11
11
  import { injectCommands as injectValidatorKeysCommands } from '@aztec/cli/validator_keys';
12
12
  import { getActiveNetworkName } from '@aztec/foundation/config';
13
13
  import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
14
+ import { getPackageVersion } from '@aztec/stdlib/update-checker';
14
15
 
15
16
  import { Command } from 'commander';
16
17
 
@@ -18,7 +19,6 @@ import { injectCompileCommand } from '../cli/cmds/compile.js';
18
19
  import { injectMigrateCommand } from '../cli/cmds/migrate_ha_db.js';
19
20
  import { injectProfileCommand } from '../cli/cmds/profile.js';
20
21
  import { injectAztecCommands } from '../cli/index.js';
21
- import { getCliVersion } from '../cli/release_version.js';
22
22
 
23
23
  const NETWORK_FLAG = 'network';
24
24
 
@@ -47,7 +47,7 @@ async function main() {
47
47
  await enrichEnvironmentWithNetworkConfig(networkName);
48
48
  enrichEnvironmentWithChainName(networkName);
49
49
 
50
- const cliVersion = getCliVersion();
50
+ const cliVersion = getPackageVersion();
51
51
  let program = new Command('aztec');
52
52
  program.description('Aztec command line interface').version(cliVersion).enablePositionalOptions();
53
53
  program = injectAztecCommands(program, userLog, debugLogger);