Skip to content

Commit 2c7a185

Browse files
authored
Merge pull request #135 from AztecProtocol/jc/v1.1.0
update to 1.1.0
2 parents 8b94ab7 + c52ee27 commit 2c7a185

File tree

7 files changed

+285
-324
lines changed

7 files changed

+285
-324
lines changed

.github/workflows/tests.yaml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
- name: Set up Node.js
2121
uses: actions/setup-node@v4
2222
with:
23-
node-version: '22'
24-
cache: 'yarn' # Optional: cache dependencies for faster builds
23+
node-version: "22"
24+
cache: "yarn" # Optional: cache dependencies for faster builds
2525

2626
- name: Set up Docker
2727
uses: docker/setup-buildx-action@v2
@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: Set Aztec version and start sandbox
3838
run: |
39-
VERSION=0.87.9 aztec-up
39+
VERSION=1.1.0 aztec-up
4040
aztec start --sandbox &
4141
4242
- name: Install project dependencies
@@ -56,9 +56,10 @@ jobs:
5656

5757
- name: Deploy account and capture SECRET/SALT
5858
run: |
59+
script -e -c "yarn clear-store"
5960
# Create a temporary file to store the output
6061
TEMP_OUTPUT=$(mktemp)
61-
62+
6263
# Run deploy-account script and capture both stdout and stderr
6364
if script -e -c "yarn deploy-account" > "$TEMP_OUTPUT" 2>&1; then
6465
echo "✅ Deploy account script completed successfully"
@@ -68,17 +69,17 @@ jobs:
6869
rm "$TEMP_OUTPUT"
6970
exit 1
7071
fi
71-
72+
7273
# Show the full output for debugging
7374
cat "$TEMP_OUTPUT"
74-
75+
7576
# Extract SECRET and SALT from the output
7677
SECRET_KEY=$(grep -o "🔑 Secret key generated: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/🔑 Secret key generated: //' || echo "")
7778
SALT_VALUE=$(grep -o "🧂 Salt generated: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/🧂 Salt generated: //' || echo "")
78-
79+
7980
# Clean up temp file
8081
rm "$TEMP_OUTPUT"
81-
82+
8283
# Validate and create .env file
8384
if [ -n "$SECRET_KEY" ] && [ -n "$SALT_VALUE" ]; then
8485
@@ -98,7 +99,7 @@ jobs:
9899
run: |
99100
# Create a temporary file to store the output
100101
TEMP_OUTPUT=$(mktemp)
101-
102+
102103
# Run deploy script and capture both stdout and stderr
103104
if script -e -c "yarn deploy" > "$TEMP_OUTPUT" 2>&1; then
104105
echo "✅ Deploy script completed successfully"
@@ -107,21 +108,21 @@ jobs:
107108
rm "$TEMP_OUTPUT"
108109
exit 1
109110
fi
110-
111+
111112
# Show the full output for debugging
112113
cat "$TEMP_OUTPUT"
113-
114+
114115
# Try multiple extraction patterns in order of preference
115116
VOTING_CONTRACT_ADDRESS=""
116-
117+
117118
# Look for "Contract address:" pattern
118119
if [ -z "$VOTING_CONTRACT_ADDRESS" ]; then
119120
VOTING_CONTRACT_ADDRESS=$(grep -o "Contract address: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/Contract address: //' || echo "")
120121
fi
121-
122+
122123
# Clean up temp file
123124
rm "$TEMP_OUTPUT"
124-
125+
125126
# Validate and save the address
126127
if [ -n "$VOTING_CONTRACT_ADDRESS" ]; then
127128
echo "VOTING_CONTRACT_ADDRESS=\"$VOTING_CONTRACT_ADDRESS\"" >> .env
@@ -132,4 +133,4 @@ jobs:
132133
script -e -c "yarn fees"
133134
script -e -c "yarn multiple-pxe"
134135
script -e -c "yarn profile"
135-
script -e -c "yarn interaction"
136+
script -e -c "yarn interaction-existing-contract"

Nargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ authors = [ "" ]
55
compiler_version = ">=0.18.0"
66

77
[dependencies]
8-
aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v0.87.9", directory = "noir-projects/aztec-nr/aztec" }
8+
aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v1.1.0", directory = "noir-projects/aztec-nr/aztec" }

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ bash -i <(curl -s https://install.aztec.network)
4747
Install the correct version of the toolkit with:
4848

4949
```bash
50-
aztec-up 0.87.9
50+
aztec-up 1.1.0
5151
```
5252

5353
Start the sandbox with:

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"compile": "${AZTEC_NARGO:-aztec-nargo} compile",
1616
"deploy": "node --loader ts-node/esm scripts/deploy_contract.ts",
1717
"deploy-account": "node --loader ts-node/esm scripts/deploy_account.ts",
18-
"interaction": "node --loader ts-node/esm scripts/interaction_existing_contract.ts",
18+
"interaction-existing-contract": "node --loader ts-node/esm scripts/interaction_existing_contract.ts",
1919
"multiple-pxe": "node --loader ts-node/esm scripts/multiple_pxe.ts",
2020
"get-block": "node --loader ts-node/esm scripts/get_block.ts",
2121
"profile": "node --loader ts-node/esm scripts/profile_deploy.ts",
@@ -26,12 +26,12 @@
2626
"update-readme-version": "node ./.github/scripts/update-readme-version.js"
2727
},
2828
"dependencies": {
29-
"@aztec/accounts": "0.87.9",
30-
"@aztec/aztec.js": "0.87.9",
31-
"@aztec/noir-contracts.js": "0.87.9",
32-
"@aztec/protocol-contracts": "0.87.9",
33-
"@aztec/pxe": "0.87.9",
34-
"@aztec/stdlib": "0.87.9"
29+
"@aztec/accounts": "1.1.0",
30+
"@aztec/aztec.js": "1.1.0",
31+
"@aztec/noir-contracts.js": "1.1.0",
32+
"@aztec/protocol-contracts": "1.1.0",
33+
"@aztec/pxe": "1.1.0",
34+
"@aztec/stdlib": "1.1.0"
3535
},
3636
"devDependencies": {
3737
"@types/jest": "^29.5.11",

scripts/interaction_existing.ts

Lines changed: 0 additions & 63 deletions
This file was deleted.

src/main.nr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub contract EasyPrivateVoting {
2424
fn constructor(admin: AztecAddress) {
2525
storage.admin.write(admin);
2626
storage.vote_ended.write(false);
27-
storage.active_at_block.initialize(context.block_number() as u32);
27+
storage.active_at_block.initialize(context.block_number());
2828
}
2929

3030
#[private]

0 commit comments

Comments
 (0)