@aztec/aztec 0.0.1-commit.fcb71a6 → 0.0.1-commit.fffb133c
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.
- package/dest/bin/index.js +2 -0
- package/dest/cli/aztec_start_action.d.ts +1 -1
- package/dest/cli/aztec_start_action.d.ts.map +1 -1
- package/dest/cli/aztec_start_action.js +6 -1
- package/dest/cli/aztec_start_options.d.ts +1 -1
- package/dest/cli/aztec_start_options.d.ts.map +1 -1
- package/dest/cli/aztec_start_options.js +4 -2
- package/dest/cli/cli.d.ts +1 -1
- package/dest/cli/cli.d.ts.map +1 -1
- package/dest/cli/cli.js +9 -53
- package/dest/cli/cmds/migrate_ha_db.d.ts +3 -0
- package/dest/cli/cmds/migrate_ha_db.d.ts.map +1 -0
- package/dest/cli/cmds/migrate_ha_db.js +27 -0
- package/dest/cli/cmds/start_archiver.d.ts +1 -1
- package/dest/cli/cmds/start_archiver.d.ts.map +1 -1
- package/dest/cli/cmds/start_archiver.js +5 -7
- package/dest/cli/cmds/start_prover_agent.d.ts +1 -1
- package/dest/cli/cmds/start_prover_agent.d.ts.map +1 -1
- package/dest/cli/cmds/start_prover_agent.js +1 -1
- package/dest/cli/util.js +1 -1
- package/dest/examples/token.js +3 -3
- package/dest/local-network/banana_fpc.d.ts +1 -1
- package/dest/local-network/banana_fpc.d.ts.map +1 -1
- package/dest/local-network/banana_fpc.js +2 -2
- package/dest/local-network/local-network.d.ts +1 -2
- package/dest/local-network/local-network.d.ts.map +1 -1
- package/dest/local-network/local-network.js +19 -7
- package/dest/testing/cheat_codes.d.ts +3 -1
- package/dest/testing/cheat_codes.d.ts.map +1 -1
- package/dest/testing/epoch_test_settler.d.ts +19 -0
- package/dest/testing/epoch_test_settler.d.ts.map +1 -0
- package/dest/testing/epoch_test_settler.js +62 -0
- package/dest/testing/index.d.ts +2 -1
- package/dest/testing/index.d.ts.map +1 -1
- package/dest/testing/index.js +1 -0
- package/package.json +37 -35
- package/scripts/aztec.sh +63 -0
- package/scripts/compile.sh +44 -0
- package/scripts/extract_function.js +47 -0
- package/scripts/flamegraph.sh +59 -0
- package/scripts/init.sh +35 -0
- package/scripts/new.sh +59 -0
- package/scripts/setup_project.sh +31 -0
- package/src/bin/index.ts +2 -0
- package/src/cli/aztec_start_action.ts +5 -0
- package/src/cli/aztec_start_options.ts +3 -1
- package/src/cli/cli.ts +12 -56
- package/src/cli/cmds/migrate_ha_db.ts +43 -0
- package/src/cli/cmds/start_archiver.ts +2 -13
- package/src/cli/cmds/start_prover_agent.ts +1 -9
- package/src/cli/util.ts +1 -1
- package/src/examples/token.ts +3 -5
- package/src/local-network/banana_fpc.ts +10 -6
- package/src/local-network/local-network.ts +31 -13
- package/src/testing/epoch_test_settler.ts +71 -0
- package/src/testing/index.ts +1 -0
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/aztec",
|
|
3
|
-
"version": "0.0.1-commit.
|
|
3
|
+
"version": "0.0.1-commit.fffb133c",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
7
7
|
"./testing": "./dest/testing/index.js"
|
|
8
8
|
},
|
|
9
|
-
"bin": "./
|
|
9
|
+
"bin": "./scripts/aztec.sh",
|
|
10
10
|
"typedocOptions": {
|
|
11
11
|
"entryPoints": [
|
|
12
12
|
"./src/index.ts"
|
|
@@ -28,38 +28,39 @@
|
|
|
28
28
|
"../package.common.json"
|
|
29
29
|
],
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@aztec/accounts": "0.0.1-commit.
|
|
32
|
-
"@aztec/archiver": "0.0.1-commit.
|
|
33
|
-
"@aztec/aztec-faucet": "0.0.1-commit.
|
|
34
|
-
"@aztec/aztec-node": "0.0.1-commit.
|
|
35
|
-
"@aztec/aztec.js": "0.0.1-commit.
|
|
36
|
-
"@aztec/bb-prover": "0.0.1-commit.
|
|
37
|
-
"@aztec/bb.js": "0.0.1-commit.
|
|
38
|
-
"@aztec/blob-client": "0.0.1-commit.
|
|
39
|
-
"@aztec/bot": "0.0.1-commit.
|
|
40
|
-
"@aztec/builder": "0.0.1-commit.
|
|
41
|
-
"@aztec/cli": "0.0.1-commit.
|
|
42
|
-
"@aztec/constants": "0.0.1-commit.
|
|
43
|
-
"@aztec/entrypoints": "0.0.1-commit.
|
|
44
|
-
"@aztec/ethereum": "0.0.1-commit.
|
|
45
|
-
"@aztec/foundation": "0.0.1-commit.
|
|
46
|
-
"@aztec/kv-store": "0.0.1-commit.
|
|
47
|
-
"@aztec/l1-artifacts": "0.0.1-commit.
|
|
48
|
-
"@aztec/node-lib": "0.0.1-commit.
|
|
49
|
-
"@aztec/noir-contracts.js": "0.0.1-commit.
|
|
50
|
-
"@aztec/noir-protocol-circuits-types": "0.0.1-commit.
|
|
51
|
-
"@aztec/p2p": "0.0.1-commit.
|
|
52
|
-
"@aztec/p2p-bootstrap": "0.0.1-commit.
|
|
53
|
-
"@aztec/protocol-contracts": "0.0.1-commit.
|
|
54
|
-
"@aztec/prover-client": "0.0.1-commit.
|
|
55
|
-
"@aztec/prover-node": "0.0.1-commit.
|
|
56
|
-
"@aztec/pxe": "0.0.1-commit.
|
|
57
|
-
"@aztec/sequencer-client": "0.0.1-commit.
|
|
58
|
-
"@aztec/stdlib": "0.0.1-commit.
|
|
59
|
-
"@aztec/telemetry-client": "0.0.1-commit.
|
|
60
|
-
"@aztec/test-wallet": "0.0.1-commit.
|
|
61
|
-
"@aztec/txe": "0.0.1-commit.
|
|
62
|
-
"@aztec/
|
|
31
|
+
"@aztec/accounts": "0.0.1-commit.fffb133c",
|
|
32
|
+
"@aztec/archiver": "0.0.1-commit.fffb133c",
|
|
33
|
+
"@aztec/aztec-faucet": "0.0.1-commit.fffb133c",
|
|
34
|
+
"@aztec/aztec-node": "0.0.1-commit.fffb133c",
|
|
35
|
+
"@aztec/aztec.js": "0.0.1-commit.fffb133c",
|
|
36
|
+
"@aztec/bb-prover": "0.0.1-commit.fffb133c",
|
|
37
|
+
"@aztec/bb.js": "0.0.1-commit.fffb133c",
|
|
38
|
+
"@aztec/blob-client": "0.0.1-commit.fffb133c",
|
|
39
|
+
"@aztec/bot": "0.0.1-commit.fffb133c",
|
|
40
|
+
"@aztec/builder": "0.0.1-commit.fffb133c",
|
|
41
|
+
"@aztec/cli": "0.0.1-commit.fffb133c",
|
|
42
|
+
"@aztec/constants": "0.0.1-commit.fffb133c",
|
|
43
|
+
"@aztec/entrypoints": "0.0.1-commit.fffb133c",
|
|
44
|
+
"@aztec/ethereum": "0.0.1-commit.fffb133c",
|
|
45
|
+
"@aztec/foundation": "0.0.1-commit.fffb133c",
|
|
46
|
+
"@aztec/kv-store": "0.0.1-commit.fffb133c",
|
|
47
|
+
"@aztec/l1-artifacts": "0.0.1-commit.fffb133c",
|
|
48
|
+
"@aztec/node-lib": "0.0.1-commit.fffb133c",
|
|
49
|
+
"@aztec/noir-contracts.js": "0.0.1-commit.fffb133c",
|
|
50
|
+
"@aztec/noir-protocol-circuits-types": "0.0.1-commit.fffb133c",
|
|
51
|
+
"@aztec/p2p": "0.0.1-commit.fffb133c",
|
|
52
|
+
"@aztec/p2p-bootstrap": "0.0.1-commit.fffb133c",
|
|
53
|
+
"@aztec/protocol-contracts": "0.0.1-commit.fffb133c",
|
|
54
|
+
"@aztec/prover-client": "0.0.1-commit.fffb133c",
|
|
55
|
+
"@aztec/prover-node": "0.0.1-commit.fffb133c",
|
|
56
|
+
"@aztec/pxe": "0.0.1-commit.fffb133c",
|
|
57
|
+
"@aztec/sequencer-client": "0.0.1-commit.fffb133c",
|
|
58
|
+
"@aztec/stdlib": "0.0.1-commit.fffb133c",
|
|
59
|
+
"@aztec/telemetry-client": "0.0.1-commit.fffb133c",
|
|
60
|
+
"@aztec/test-wallet": "0.0.1-commit.fffb133c",
|
|
61
|
+
"@aztec/txe": "0.0.1-commit.fffb133c",
|
|
62
|
+
"@aztec/validator-ha-signer": "0.0.1-commit.fffb133c",
|
|
63
|
+
"@aztec/world-state": "0.0.1-commit.fffb133c",
|
|
63
64
|
"@types/chalk": "^2.2.0",
|
|
64
65
|
"abitype": "^0.8.11",
|
|
65
66
|
"chalk": "^5.3.0",
|
|
@@ -70,6 +71,7 @@
|
|
|
70
71
|
},
|
|
71
72
|
"files": [
|
|
72
73
|
"dest",
|
|
74
|
+
"scripts",
|
|
73
75
|
"src",
|
|
74
76
|
"!*.test.*"
|
|
75
77
|
],
|
|
@@ -78,7 +80,7 @@
|
|
|
78
80
|
"@jest/globals": "^30.0.0",
|
|
79
81
|
"@types/jest": "^30.0.0",
|
|
80
82
|
"@types/koa": "^2.15.0",
|
|
81
|
-
"@typescript/native-preview": "7.0.0-dev.
|
|
83
|
+
"@typescript/native-preview": "7.0.0-dev.20260113.1",
|
|
82
84
|
"jest": "^30.0.0",
|
|
83
85
|
"ts-node": "^10.9.1",
|
|
84
86
|
"typescript": "^5.3.3"
|
package/scripts/aztec.sh
ADDED
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
#!/usr/bin/env bash
|
|
2
|
+
set -euo pipefail
|
|
3
|
+
shopt -s inherit_errexit
|
|
4
|
+
|
|
5
|
+
# Re-execute using correct version if we have an .aztecrc file.
|
|
6
|
+
if [ "${AZTEC_VERSIONED:-0}" -eq 0 ] && [ -f .aztecrc ] && command -v aztec-up &>/dev/null; then
|
|
7
|
+
env_setup=$(aztec-up env)
|
|
8
|
+
eval "$env_setup"
|
|
9
|
+
AZTEC_VERSIONED=1 exec aztec "$@"
|
|
10
|
+
fi
|
|
11
|
+
|
|
12
|
+
cmd=${1:-}
|
|
13
|
+
[ -n "$cmd" ] && shift
|
|
14
|
+
|
|
15
|
+
script_dir="$(dirname "$(realpath "$0")")"
|
|
16
|
+
|
|
17
|
+
function aztec {
|
|
18
|
+
export AZTEC_SHELL_WRAPPER=1
|
|
19
|
+
exec node --no-warnings $script_dir/../dest/bin/index.js "$@"
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
case $cmd in
|
|
23
|
+
test)
|
|
24
|
+
export LOG_LEVEL="${LOG_LEVEL:-error}"
|
|
25
|
+
aztec start --txe --port 8081 &
|
|
26
|
+
server_pid=$!
|
|
27
|
+
trap 'kill $server_pid &>/dev/null || true' EXIT
|
|
28
|
+
while ! nc -z 127.0.0.1 8081 &>/dev/null; do sleep 0.2; done
|
|
29
|
+
export NARGO_FOREIGN_CALL_TIMEOUT=300000
|
|
30
|
+
nargo test --silence-warnings --oracle-resolver http://127.0.0.1:8081 "$@"
|
|
31
|
+
;;
|
|
32
|
+
start)
|
|
33
|
+
if [ "${1:-}" == "--local-network" ]; then
|
|
34
|
+
# TODO: Can these just be set in TS?
|
|
35
|
+
export ARCHIVER_POLLING_INTERVAL_MS=500
|
|
36
|
+
export P2P_BLOCK_CHECK_INTERVAL_MS=500
|
|
37
|
+
export SEQ_TX_POLLING_INTERVAL_MS=500
|
|
38
|
+
export WS_BLOCK_CHECK_INTERVAL_MS=500
|
|
39
|
+
export ARCHIVER_VIEM_POLLING_INTERVAL_MS=500
|
|
40
|
+
export TEST_ACCOUNTS=${TEST_ACCOUNTS:-true}
|
|
41
|
+
export LOG_LEVEL=${LOG_LEVEL:-info;silent:sequencer;verbose:debug_log}
|
|
42
|
+
export DEPLOY_AZTEC_CONTRACTS_SALT=${DEPLOY_AZTEC_CONTRACTS_SALT:-$RANDOM}
|
|
43
|
+
|
|
44
|
+
ANVIL_PORT=${ANVIL_PORT:-8545}
|
|
45
|
+
|
|
46
|
+
export L1_CHAIN_ID=${L1_CHAIN_ID:-31337}
|
|
47
|
+
export ETHEREUM_HOSTS=${ETHEREUM_HOSTS:-"http://127.0.0.1:${ANVIL_PORT}"}
|
|
48
|
+
|
|
49
|
+
anvil --version
|
|
50
|
+
anvil --silent &
|
|
51
|
+
anvil_pid=$!
|
|
52
|
+
trap 'kill $anvil_pid &>/dev/null' EXIT
|
|
53
|
+
fi
|
|
54
|
+
|
|
55
|
+
aztec start "$@"
|
|
56
|
+
;;
|
|
57
|
+
compile|new|init|flamegraph)
|
|
58
|
+
$script_dir/${cmd}.sh "$@"
|
|
59
|
+
;;
|
|
60
|
+
*)
|
|
61
|
+
aztec $cmd "$@"
|
|
62
|
+
;;
|
|
63
|
+
esac
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
#!/usr/bin/env bash
|
|
2
|
+
set -euo pipefail
|
|
3
|
+
|
|
4
|
+
NARGO=${NARGO:-nargo}
|
|
5
|
+
BB=${BB:-bb}
|
|
6
|
+
|
|
7
|
+
# If help is requested, show Aztec-specific info then run nargo compile help and then exit in order to not trigger
|
|
8
|
+
# transpilation
|
|
9
|
+
for arg in "$@"; do
|
|
10
|
+
if [ "$arg" == "--help" ] || [ "$arg" == "-h" ]; then
|
|
11
|
+
cat << 'EOF'
|
|
12
|
+
Aztec Compile - Compile Aztec Noir contracts
|
|
13
|
+
|
|
14
|
+
This command compiles Aztec Noir contracts using nargo and then automatically
|
|
15
|
+
postprocesses them to generate Aztec specific artifacts including:
|
|
16
|
+
- Transpiled contract artifacts
|
|
17
|
+
- Verification keys
|
|
18
|
+
|
|
19
|
+
The compiled contracts will be placed in the target/ directory by default.
|
|
20
|
+
|
|
21
|
+
---
|
|
22
|
+
Underlying nargo compile options:
|
|
23
|
+
|
|
24
|
+
EOF
|
|
25
|
+
nargo compile --help
|
|
26
|
+
exit 0
|
|
27
|
+
fi
|
|
28
|
+
done
|
|
29
|
+
|
|
30
|
+
# Run nargo compile.
|
|
31
|
+
$NARGO compile "$@"
|
|
32
|
+
|
|
33
|
+
echo "Postprocessing contract..."
|
|
34
|
+
$BB aztec_process
|
|
35
|
+
|
|
36
|
+
# Strip internal prefixes from all compiled contract JSONs in target directory
|
|
37
|
+
# TODO: This should be part of bb aztec_process!
|
|
38
|
+
for json in target/*.json; do
|
|
39
|
+
temp_file="${json}.tmp"
|
|
40
|
+
jq '.functions |= map(.name |= sub("^__aztec_nr_internals__"; ""))' "$json" > "$temp_file"
|
|
41
|
+
mv "$temp_file" "$json"
|
|
42
|
+
done
|
|
43
|
+
|
|
44
|
+
echo "Compilation complete!"
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
import fs from 'fs/promises';
|
|
3
|
+
import path from 'path';
|
|
4
|
+
|
|
5
|
+
// Simple script to extract a contract function as a separate Noir artifact.
|
|
6
|
+
// We need to use this since the transpiling that we do on public functions make the contract artifacts
|
|
7
|
+
// unreadable by noir tooling, since they are no longer following the noir artifact format.
|
|
8
|
+
async function main() {
|
|
9
|
+
let [contractArtifactPath, functionName] = process.argv.slice(2);
|
|
10
|
+
if (!contractArtifactPath || !functionName) {
|
|
11
|
+
console.log('Usage: node extractFunctionAsNoirArtifact.js <contractArtifactPath> <functionName>');
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
const contractArtifact = JSON.parse(await fs.readFile(contractArtifactPath, 'utf8'));
|
|
16
|
+
const func = contractArtifact.functions.find(f => f.name === functionName);
|
|
17
|
+
if (!func) {
|
|
18
|
+
console.error(`Function ${functionName} not found in ${contractArtifactPath}`);
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
const artifact = {
|
|
23
|
+
noir_version: contractArtifact.noir_version,
|
|
24
|
+
hash: 0,
|
|
25
|
+
abi: func.abi,
|
|
26
|
+
bytecode: func.bytecode,
|
|
27
|
+
debug_symbols: func.debug_symbols,
|
|
28
|
+
file_map: contractArtifact.file_map,
|
|
29
|
+
expression_width: {
|
|
30
|
+
Bounded: {
|
|
31
|
+
width: 4,
|
|
32
|
+
},
|
|
33
|
+
},
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
const outputDir = path.dirname(contractArtifactPath);
|
|
37
|
+
const outputName = path.basename(contractArtifactPath, '.json') + `-${functionName}.json`;
|
|
38
|
+
|
|
39
|
+
const outPath = path.join(outputDir, outputName);
|
|
40
|
+
|
|
41
|
+
await fs.writeFile(outPath, JSON.stringify(artifact, null, 2));
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
main().catch(err => {
|
|
45
|
+
console.error(err);
|
|
46
|
+
process.exit(1);
|
|
47
|
+
});
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
#!/usr/bin/env bash
|
|
2
|
+
set -eu
|
|
3
|
+
|
|
4
|
+
# If first arg is -h or --help, print usage.
|
|
5
|
+
if [ $# -lt 2 ] || [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
|
|
6
|
+
cat << 'EOF'
|
|
7
|
+
Aztec Flamegraph - Generate a gate count flamegraph for an aztec contract function.
|
|
8
|
+
|
|
9
|
+
Usage: aztec flamegraph <contract_artifact> <function>
|
|
10
|
+
|
|
11
|
+
Options:
|
|
12
|
+
-h, --help Print help
|
|
13
|
+
|
|
14
|
+
Will output an svg at <artifact_path>/<contract>-<function>-flamegraph.svg.
|
|
15
|
+
You can open it in your browser to view it.
|
|
16
|
+
|
|
17
|
+
EOF
|
|
18
|
+
exit 0
|
|
19
|
+
fi
|
|
20
|
+
|
|
21
|
+
cleanup() {
|
|
22
|
+
set +e
|
|
23
|
+
if [ -f "$function_artifact" ]; then
|
|
24
|
+
rm -f "$function_artifact"
|
|
25
|
+
fi
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
trap cleanup EXIT
|
|
29
|
+
|
|
30
|
+
# Get the directory of the script
|
|
31
|
+
script_dir=$(realpath $(dirname $0))
|
|
32
|
+
|
|
33
|
+
PROFILER=${PROFILER_PATH:-noir-profiler}
|
|
34
|
+
BB=${BB:-bb}
|
|
35
|
+
|
|
36
|
+
# first console arg is contract name in camel case or path to contract artifact
|
|
37
|
+
contract=$1
|
|
38
|
+
|
|
39
|
+
# second console arg is the contract function
|
|
40
|
+
function=$2
|
|
41
|
+
|
|
42
|
+
if [ ! -f "$contract" ]; then
|
|
43
|
+
echo "Error: Contract artifact not found at: $contract"
|
|
44
|
+
exit 1
|
|
45
|
+
fi
|
|
46
|
+
artifact_path=$contract
|
|
47
|
+
function_artifact="${artifact_path%%.json}-${function}.json"
|
|
48
|
+
output_dir=$(dirname "$artifact_path")
|
|
49
|
+
|
|
50
|
+
# Extract artifact for the specific function.
|
|
51
|
+
node $script_dir/extract_function.js "$artifact_path" $function
|
|
52
|
+
|
|
53
|
+
# Generate the flamegraph
|
|
54
|
+
$PROFILER gates --artifact-path "$function_artifact" --backend-path "$BB" --backend-gates-command "gates" --output "$output_dir" --scheme chonk --include_gates_per_opcode
|
|
55
|
+
|
|
56
|
+
# Save as $artifact_name-$function-flamegraph.svg
|
|
57
|
+
output_file="${function_artifact%%.json}-flamegraph.svg"
|
|
58
|
+
mv "$output_dir/__aztec_nr_internals__${function}_gates.svg" "$output_file"
|
|
59
|
+
echo "Flamegraph generated at: $output_file"
|
package/scripts/init.sh
ADDED
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
#!/usr/bin/env bash
|
|
2
|
+
set -euo pipefail
|
|
3
|
+
|
|
4
|
+
NARGO=${NARGO:-nargo}
|
|
5
|
+
script_path=$(realpath $(dirname "$0"))
|
|
6
|
+
|
|
7
|
+
for arg in "$@"; do
|
|
8
|
+
if [ "$arg" == "--help" ] || [ "$arg" == "-h" ]; then
|
|
9
|
+
cat << 'EOF'
|
|
10
|
+
Aztec Init - Create a new Aztec Noir project in the current directory
|
|
11
|
+
|
|
12
|
+
Usage: aztec init [OPTIONS]
|
|
13
|
+
|
|
14
|
+
Options:
|
|
15
|
+
--name <NAME> Name of the package [default: current directory name]
|
|
16
|
+
--lib Use a library template
|
|
17
|
+
-h, --help Print help
|
|
18
|
+
|
|
19
|
+
This command creates a new Aztec Noir project in the current directory using nargo
|
|
20
|
+
and automatically adds the Aztec.nr dependency to your Nargo.toml file.
|
|
21
|
+
|
|
22
|
+
EOF
|
|
23
|
+
exit 0
|
|
24
|
+
fi
|
|
25
|
+
if [ "$arg" == "--lib" ]; then
|
|
26
|
+
is_contract=0
|
|
27
|
+
fi
|
|
28
|
+
done
|
|
29
|
+
|
|
30
|
+
echo "Initializing Noir project..."
|
|
31
|
+
$NARGO init "$@"
|
|
32
|
+
|
|
33
|
+
if [ "${is_contract:-1}" -eq 1 ]; then
|
|
34
|
+
$script_path/setup_project.sh
|
|
35
|
+
fi
|
package/scripts/new.sh
ADDED
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
#!/usr/bin/env bash
|
|
2
|
+
set -euo pipefail
|
|
3
|
+
|
|
4
|
+
NARGO=${NARGO:-nargo}
|
|
5
|
+
script_path=$(realpath $(dirname "$0"))
|
|
6
|
+
|
|
7
|
+
type_arg="--contract"
|
|
8
|
+
|
|
9
|
+
while [[ $# -gt 0 ]]; do
|
|
10
|
+
case $1 in
|
|
11
|
+
--help|-h)
|
|
12
|
+
cat << 'EOF'
|
|
13
|
+
Aztec New - Create a new Aztec Noir project in a new directory
|
|
14
|
+
|
|
15
|
+
Usage: aztec new [OPTIONS] <PATH>
|
|
16
|
+
|
|
17
|
+
Arguments:
|
|
18
|
+
<PATH> The path to save the new project
|
|
19
|
+
|
|
20
|
+
Options:
|
|
21
|
+
--name <NAME> Name of the package [default: package directory name]
|
|
22
|
+
--lib Create a library template instead of a contract
|
|
23
|
+
-h, --help Print help
|
|
24
|
+
|
|
25
|
+
This command creates a new Aztec Noir project using nargo and automatically
|
|
26
|
+
adds the Aztec.nr dependency to your Nargo.toml file.
|
|
27
|
+
EOF
|
|
28
|
+
exit 0
|
|
29
|
+
;;
|
|
30
|
+
--lib)
|
|
31
|
+
type_arg="--lib"
|
|
32
|
+
shift
|
|
33
|
+
;;
|
|
34
|
+
--name)
|
|
35
|
+
name_arg="--name $2"
|
|
36
|
+
shift 2
|
|
37
|
+
;;
|
|
38
|
+
*)
|
|
39
|
+
project_path=$1
|
|
40
|
+
shift
|
|
41
|
+
break
|
|
42
|
+
;;
|
|
43
|
+
esac
|
|
44
|
+
done
|
|
45
|
+
|
|
46
|
+
if [ -z "$project_path" ]; then
|
|
47
|
+
echo "Error: PATH argument is required"
|
|
48
|
+
echo "Usage: aztec new [OPTIONS] <PATH>"
|
|
49
|
+
echo "Run 'aztec new --help' for more information"
|
|
50
|
+
exit 1
|
|
51
|
+
fi
|
|
52
|
+
|
|
53
|
+
echo "Creating new Noir project at $project_path..."
|
|
54
|
+
$NARGO new $type_arg ${name_arg:-} $project_path
|
|
55
|
+
|
|
56
|
+
if [ "$type_arg" == "--contract" ]; then
|
|
57
|
+
cd $project_path
|
|
58
|
+
$script_path/setup_project.sh
|
|
59
|
+
fi
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
#!/usr/bin/env bash
|
|
2
|
+
set -euo pipefail
|
|
3
|
+
|
|
4
|
+
# Get the actual aztec version for the git tag.
|
|
5
|
+
AZTEC_VERSION=$(jq -r '.version' $(dirname $0)/../package.json)
|
|
6
|
+
NARGO_TOML_PATH="Nargo.toml"
|
|
7
|
+
MAIN_NR_PATH="src/main.nr"
|
|
8
|
+
|
|
9
|
+
if [ ! -f "$NARGO_TOML_PATH" ]; then
|
|
10
|
+
>&2 echo "Warning: Could not find Nargo.toml at $NARGO_TOML_PATH to add aztec dependency"
|
|
11
|
+
exit 1
|
|
12
|
+
fi
|
|
13
|
+
|
|
14
|
+
if [ ! -f "$MAIN_NR_PATH" ]; then
|
|
15
|
+
>&2 echo "Warning: Could not find main.nr at $MAIN_NR_PATH"
|
|
16
|
+
exit 1
|
|
17
|
+
fi
|
|
18
|
+
|
|
19
|
+
# Add aztec dependency to Nargo.toml
|
|
20
|
+
echo "" >> "$NARGO_TOML_PATH"
|
|
21
|
+
echo "aztec = { git=\"https://github.com/AztecProtocol/aztec-nr\", tag=\"v${AZTEC_VERSION}\", directory=\"aztec\" }" >> "$NARGO_TOML_PATH"
|
|
22
|
+
echo "Added aztec dependency (v${AZTEC_VERSION}) to Nargo.toml"
|
|
23
|
+
|
|
24
|
+
# Replace the contents of main.nr with the Aztec contract template
|
|
25
|
+
cat > "$MAIN_NR_PATH" << 'EOF'
|
|
26
|
+
use aztec::macros::aztec;
|
|
27
|
+
|
|
28
|
+
#[aztec]
|
|
29
|
+
contract Main {}
|
|
30
|
+
EOF
|
|
31
|
+
echo "Created main.nr with Aztec contract template"
|
package/src/bin/index.ts
CHANGED
|
@@ -14,6 +14,7 @@ import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
|
|
|
14
14
|
|
|
15
15
|
import { Command } from 'commander';
|
|
16
16
|
|
|
17
|
+
import { injectMigrateCommand } from '../cli/cmds/migrate_ha_db.js';
|
|
17
18
|
import { injectAztecCommands } from '../cli/index.js';
|
|
18
19
|
import { getCliVersion } from '../cli/release_version.js';
|
|
19
20
|
|
|
@@ -55,6 +56,7 @@ async function main() {
|
|
|
55
56
|
program = injectAztecNodeCommands(program, userLog, debugLogger);
|
|
56
57
|
program = injectMiscCommands(program, userLog);
|
|
57
58
|
program = injectValidatorKeysCommands(program, userLog);
|
|
59
|
+
program = injectMigrateCommand(program, userLog);
|
|
58
60
|
|
|
59
61
|
await program.parseAsync(process.argv);
|
|
60
62
|
}
|
|
@@ -35,6 +35,11 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
|
|
|
35
35
|
l1RpcUrls: options.l1RpcUrls,
|
|
36
36
|
testAccounts: localNetwork.testAccounts,
|
|
37
37
|
realProofs: false,
|
|
38
|
+
// Setting the epoch duration to 4 by default for local network. This allows the epoch to be "proven" faster, so
|
|
39
|
+
// the users can consume out hash without having to wait for a long time.
|
|
40
|
+
// Note: We are not proving anything in the local network (realProofs == false). But in `createLocalNetwork`,
|
|
41
|
+
// the EpochTestSettler will set the out hash to the outbox when an epoch is complete.
|
|
42
|
+
aztecEpochDuration: 4,
|
|
38
43
|
},
|
|
39
44
|
userLog,
|
|
40
45
|
);
|
|
@@ -19,7 +19,7 @@ import { proverAgentConfigMappings, proverBrokerConfigMappings } from '@aztec/pr
|
|
|
19
19
|
import { proverNodeConfigMappings } from '@aztec/prover-node/config';
|
|
20
20
|
import { allPxeConfigMappings } from '@aztec/pxe/config';
|
|
21
21
|
import { sequencerClientConfigMappings } from '@aztec/sequencer-client/config';
|
|
22
|
-
import { chainConfigMappings } from '@aztec/stdlib/config';
|
|
22
|
+
import { chainConfigMappings, nodeRpcConfigMappings } from '@aztec/stdlib/config';
|
|
23
23
|
import { telemetryClientConfigMappings } from '@aztec/telemetry-client/config';
|
|
24
24
|
import { worldStateConfigMappings } from '@aztec/world-state/config';
|
|
25
25
|
|
|
@@ -148,6 +148,8 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
148
148
|
defaultValue: '',
|
|
149
149
|
env: 'API_PREFIX',
|
|
150
150
|
},
|
|
151
|
+
configToFlag('--rpcMaxBatchSize', nodeRpcConfigMappings.rpcMaxBatchSize),
|
|
152
|
+
configToFlag('--rpcMaxBodySize', nodeRpcConfigMappings.rpcMaxBodySize),
|
|
151
153
|
],
|
|
152
154
|
ETHEREUM: [
|
|
153
155
|
configToFlag('--l1-chain-id', l1ReaderConfigMappings.l1ChainId),
|
package/src/cli/cli.ts
CHANGED
|
@@ -31,63 +31,19 @@ export function injectAztecCommands(program: Command, userLog: LogFn, debugLogge
|
|
|
31
31
|
|
|
32
32
|
program.configureHelp({ sortSubcommands: true });
|
|
33
33
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
--lib Use a library template
|
|
45
|
-
--bin Use a binary template
|
|
46
|
-
Examples:
|
|
47
|
-
$ aztec init # creates a contract project in current directory
|
|
48
|
-
$ aztec init --lib # creates a library project
|
|
49
|
-
|
|
50
|
-
new <path> [options]: creates a new Noir project in a new directory
|
|
51
|
-
Options:
|
|
52
|
-
--name <name> Name of the package
|
|
53
|
-
--contract Use a contract template (default)
|
|
54
|
-
--lib Use a library template
|
|
55
|
-
--bin Use a binary template
|
|
56
|
-
Examples:
|
|
57
|
-
$ aztec new my-project # creates a contract project in ./my-project
|
|
58
|
-
$ aztec new my-lib --lib # creates a library project in ./my-lib
|
|
59
|
-
|
|
60
|
-
compile [options]: compiles Aztec Noir contracts
|
|
61
|
-
Compiles contracts with nargo compile and then postprocesses them to generate Aztec-specific artifacts including:
|
|
62
|
-
- Transpiled contract artifacts
|
|
63
|
-
- Verification keys
|
|
64
|
-
The compiled contracts will be placed in the target/ directory by default.
|
|
65
|
-
Supports standard nargo compile options.
|
|
66
|
-
|
|
67
|
-
fmt [options]: formats Noir code using nargo fmt
|
|
68
|
-
Example:
|
|
69
|
-
$ aztec fmt # formats all Noir files in the project
|
|
70
|
-
|
|
71
|
-
check [options]: type-checks Noir code without compiling using nargo check
|
|
72
|
-
Example:
|
|
73
|
-
$ aztec check # checks all Noir files in the project
|
|
74
|
-
|
|
75
|
-
test [options]: starts a dockerized TXE node via
|
|
76
|
-
$ aztec start --txe
|
|
77
|
-
then runs
|
|
78
|
-
$ aztec test --silence-warnings --oracle-resolver=<TXE_ADDRESS> [options]
|
|
79
|
-
|
|
80
|
-
lsp: starts the Nargo Language Server Protocol server
|
|
81
|
-
Runs nargo lsp in a Docker container for IDE integration with Noir.
|
|
82
|
-
This command is typically used by IDE extensions and not called directly by users.
|
|
83
|
-
Example:
|
|
84
|
-
$ aztec lsp # starts the LSP server
|
|
85
|
-
|
|
86
|
-
preload-crs: Downloads and caches the Common Reference String (CRS) data required for zero-knowledge proofs.
|
|
87
|
-
Example:
|
|
88
|
-
$ aztec preload-crs # preloads CRS data
|
|
34
|
+
if (process.env.AZTEC_SHELL_WRAPPER) {
|
|
35
|
+
program.addHelpText(
|
|
36
|
+
'after',
|
|
37
|
+
`
|
|
38
|
+
Additional commands:
|
|
39
|
+
|
|
40
|
+
init [folder] [options] creates a new Aztec Noir project.
|
|
41
|
+
new <path> [options] creates a new Aztec Noir project in a new directory.
|
|
42
|
+
compile [options] compiles Aztec Noir contracts.
|
|
43
|
+
test [options] starts a TXE and runs "nargo test" using it as the oracle resolver.
|
|
89
44
|
`,
|
|
90
|
-
|
|
45
|
+
);
|
|
46
|
+
}
|
|
91
47
|
|
|
92
48
|
program
|
|
93
49
|
.command('preload-crs')
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { runMigrations } from '@aztec/validator-ha-signer/migrations';
|
|
2
|
+
|
|
3
|
+
import type { Command } from 'commander';
|
|
4
|
+
|
|
5
|
+
export function injectMigrateCommand(program: Command, log: (msg: string) => void): Command {
|
|
6
|
+
const migrateCommand = program.command('migrate-ha-db').description('Run validator-ha-signer database migrations');
|
|
7
|
+
|
|
8
|
+
migrateCommand
|
|
9
|
+
.command('up')
|
|
10
|
+
.description('Apply pending migrations')
|
|
11
|
+
.requiredOption('--database-url <string>', 'PostgreSQL connection string', process.env.DATABASE_URL)
|
|
12
|
+
.option('--verbose', 'Enable verbose output', false)
|
|
13
|
+
.action(async options => {
|
|
14
|
+
const migrations = await runMigrations(options.databaseUrl, {
|
|
15
|
+
direction: 'up',
|
|
16
|
+
verbose: options.verbose,
|
|
17
|
+
});
|
|
18
|
+
if (migrations.length > 0) {
|
|
19
|
+
log(`Applied migrations: ${migrations.join(', ')}`);
|
|
20
|
+
} else {
|
|
21
|
+
log('No migrations to apply - schema is up to date');
|
|
22
|
+
}
|
|
23
|
+
});
|
|
24
|
+
|
|
25
|
+
migrateCommand
|
|
26
|
+
.command('down')
|
|
27
|
+
.description('Rollback the last migration')
|
|
28
|
+
.requiredOption('--database-url <string>', 'PostgreSQL connection string', process.env.DATABASE_URL)
|
|
29
|
+
.option('--verbose', 'Enable verbose output', false)
|
|
30
|
+
.action(async options => {
|
|
31
|
+
const migrations = await runMigrations(options.databaseUrl, {
|
|
32
|
+
direction: 'down',
|
|
33
|
+
verbose: options.verbose,
|
|
34
|
+
});
|
|
35
|
+
if (migrations.length > 0) {
|
|
36
|
+
log(`Rolled back migrations: ${migrations.join(', ')}`);
|
|
37
|
+
} else {
|
|
38
|
+
log('No migrations to rollback');
|
|
39
|
+
}
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
return program;
|
|
43
|
+
}
|
|
@@ -1,16 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
Archiver,
|
|
3
|
-
type ArchiverConfig,
|
|
4
|
-
KVArchiverDataStore,
|
|
5
|
-
archiverConfigMappings,
|
|
6
|
-
getArchiverConfigFromEnv,
|
|
7
|
-
} from '@aztec/archiver';
|
|
1
|
+
import { type ArchiverConfig, archiverConfigMappings, createArchiver, getArchiverConfigFromEnv } from '@aztec/archiver';
|
|
8
2
|
import { createLogger } from '@aztec/aztec.js/log';
|
|
9
3
|
import { type BlobClientConfig, blobClientConfigMapping, createBlobClient } from '@aztec/blob-client/client';
|
|
10
4
|
import { getL1Config } from '@aztec/cli/config';
|
|
11
5
|
import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
|
|
12
6
|
import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
|
|
13
|
-
import { createStore } from '@aztec/kv-store/lmdb-v2';
|
|
14
7
|
import { ArchiverApiSchema } from '@aztec/stdlib/interfaces/server';
|
|
15
8
|
import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
|
|
16
9
|
|
|
@@ -47,13 +40,9 @@ export async function startArchiver(
|
|
|
47
40
|
archiverConfig.l1Contracts = addresses;
|
|
48
41
|
archiverConfig = { ...archiverConfig, ...l1Config };
|
|
49
42
|
|
|
50
|
-
const storeLog = createLogger('archiver:lmdb');
|
|
51
|
-
const store = await createStore('archiver', KVArchiverDataStore.SCHEMA_VERSION, archiverConfig, storeLog);
|
|
52
|
-
const archiverStore = new KVArchiverDataStore(store, archiverConfig.maxLogs);
|
|
53
|
-
|
|
54
43
|
const telemetry = await initTelemetryClient(getTelemetryClientConfig());
|
|
55
44
|
const blobClient = createBlobClient(archiverConfig, { logger: createLogger('archiver:blob-client:client') });
|
|
56
|
-
const archiver = await
|
|
45
|
+
const archiver = await createArchiver(archiverConfig, { telemetry, blobClient }, { blockUntilSync: true });
|
|
57
46
|
services.archiver = [archiver, ArchiverApiSchema];
|
|
58
47
|
signalHandlers.push(archiver.stop);
|
|
59
48
|
|
|
@@ -58,15 +58,7 @@ export async function startProverAgent(
|
|
|
58
58
|
const proofStore = new InlineProofStore();
|
|
59
59
|
const agents = times(
|
|
60
60
|
config.proverAgentCount,
|
|
61
|
-
() =>
|
|
62
|
-
new ProvingAgent(
|
|
63
|
-
broker,
|
|
64
|
-
proofStore,
|
|
65
|
-
prover,
|
|
66
|
-
config.proverAgentProofTypes,
|
|
67
|
-
config.proverAgentPollIntervalMs,
|
|
68
|
-
telemetry,
|
|
69
|
-
),
|
|
61
|
+
() => new ProvingAgent(broker, proofStore, prover, config.proverAgentProofTypes, config.proverAgentPollIntervalMs),
|
|
70
62
|
);
|
|
71
63
|
|
|
72
64
|
// expose all agents as individual services
|