Skip to content

Commit b6a2a8f

Browse files
committed
Update dependencies to version 3.0.0-devnet.2 and adjust scripts for devnet environment. Introduce new devnet workflow in GitHub Actions and refactor account deployment logic to utilize the new setup_wallet utility.
1 parent 48a7514 commit b6a2a8f

22 files changed

+1707
-606
lines changed
Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: Testnet Tests
1+
name: Devnet Tests
22

33
on:
44
schedule:
5-
- cron: '0 2 * * *'
5+
- cron: "0 2 * * *"
66
workflow_dispatch:
77
inputs:
88
skip_deployment:
@@ -12,11 +12,11 @@ on:
1212
default: false
1313

1414
jobs:
15-
testnet-tests:
16-
name: Testnet Tests
15+
devnet-tests:
16+
name: Devnet Tests
1717
runs-on: ubuntu-latest
1818
env:
19-
AZTEC_ENV: testnet
19+
AZTEC_ENV: devnet
2020

2121
steps:
2222
- name: Checkout repository
@@ -45,23 +45,23 @@ jobs:
4545
- name: Generate contract artifacts
4646
run: script -e -c "aztec codegen target --outdir src/artifacts && aztec-postprocess-contract"
4747

48-
- name: Setup testnet environment
48+
- name: Setup devnet environment
4949
run: |
50-
echo "📋 Using testnet configuration from config/testnet.json"
51-
cat config/testnet.json
50+
echo "📋 Using devnet configuration from config/devnet.json"
51+
cat config/devnet.json
5252
53-
- name: Test testnet connectivity
53+
- name: Test devnet connectivity
5454
run: |
55-
echo "Testing testnet connectivity..."
56-
curl -s https://aztec-testnet-fullnode.zkv.xyz/status || echo "Warning: Could not connect to testnet"
55+
echo "Testing devnet connectivity..."
56+
curl -s https://devnet.aztec-labs.com/status || echo "Warning: Could not connect to devnet"
5757
58-
- name: Deploy account to testnet
58+
- name: Deploy account to devnet
5959
if: ${{ !inputs.skip_deployment }}
6060
run: |
6161
TEMP_OUTPUT=$(mktemp)
6262
63-
if script -e -c "yarn deploy-account::testnet" > "$TEMP_OUTPUT" 2>&1; then
64-
echo "✅ Deploy account to testnet completed successfully"
63+
if script -e -c "yarn deploy-account::devnet" > "$TEMP_OUTPUT" 2>&1; then
64+
echo "✅ Deploy account to devnet completed successfully"
6565
else
6666
echo "❌ Deploy account script failed"
6767
cat "$TEMP_OUTPUT"
@@ -87,13 +87,13 @@ jobs:
8787
exit 1
8888
fi
8989
90-
- name: Deploy contract to testnet
90+
- name: Deploy contract to devnet
9191
if: ${{ !inputs.skip_deployment }}
9292
run: |
9393
TEMP_OUTPUT=$(mktemp)
9494
95-
if script -e -c "yarn deploy::testnet" > "$TEMP_OUTPUT" 2>&1; then
96-
echo "✅ Deploy contract to testnet completed successfully"
95+
if script -e -c "yarn deploy::devnet" > "$TEMP_OUTPUT" 2>&1; then
96+
echo "✅ Deploy contract to devnet completed successfully"
9797
else
9898
echo "❌ Deploy contract script failed"
9999
cat "$TEMP_OUTPUT"
@@ -114,24 +114,24 @@ jobs:
114114
echo "⚠️ Warning: Could not extract contract address"
115115
fi
116116
117-
- name: Run testnet scripts
117+
- name: Run devnet scripts
118118
run: |
119-
echo "Running testnet scripts..."
120-
script -e -c "yarn get-block::testnet"
121-
119+
echo "Running devnet scripts..."
120+
script -e -c "yarn get-block::devnet"
121+
122122
- name: Run interaction test with existing contract
123123
if: ${{ inputs.skip_deployment }}
124124
run: |
125-
echo "Running interaction with existing contract on testnet..."
126-
script -e -c "yarn interaction-existing-contract::testnet"
125+
echo "Running interaction with existing contract on devnet..."
126+
script -e -c "yarn interaction-existing-contract::devnet"
127127
128-
- name: Run JavaScript tests on testnet
128+
- name: Run JavaScript tests on devnet
129129
run: |
130-
echo "Running JavaScript tests against testnet..."
130+
echo "Running JavaScript tests against devnet..."
131131
script -e -c "rm -rf store/pxe"
132-
script -e -c "ENV=testnet NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --runInBand --config jest.integration.config.json"
132+
script -e -c "ENV=devnet NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --runInBand --config jest.integration.config.json"
133133
134-
- name: Profile deployment on testnet
134+
- name: Profile deployment on devnet
135135
if: ${{ !inputs.skip_deployment }}
136136
run: |
137-
script -e -c "yarn profile::testnet"
137+
script -e -c "yarn profile::devnet"

.github/workflows/sandbox.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
- name: Set Aztec version and start sandbox
4343
run: |
44-
VERSION=2.0.2 aztec-up
44+
VERSION=3.0.0-devnet.2 aztec-up
4545
aztec start --sandbox &
4646
4747
- name: Wait for sandbox to be ready
@@ -139,4 +139,4 @@ jobs:
139139
script -e -c "yarn fees"
140140
script -e -c "yarn multiple-pxe"
141141
script -e -c "yarn profile"
142-
script -e -c "yarn interaction-existing-contract"
142+
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 = "v2.0.2", directory = "noir-projects/aztec-nr/aztec" }
8+
aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-devnet.2", directory = "noir-projects/aztec-nr/aztec" }

README.md

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

4747
```bash
48-
aztec-up 2.0.2
48+
aztec-up 3.0.0-devnet.2
4949
```
5050

5151
### Environment Configuration

config/config.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export interface TimeoutConfig {
1919

2020
export interface EnvironmentConfig {
2121
name: string;
22-
environment: 'local' | 'testnet' | 'mainnet';
22+
environment: 'local' | 'testnet' | 'devnet' | 'mainnet';
2323
network: NetworkConfig;
2424
settings: {
2525
skipSandbox: boolean;
@@ -66,7 +66,7 @@ export class ConfigManager {
6666
}
6767

6868
public isTestnet(): boolean {
69-
return this.config.environment === 'testnet';
69+
return this.config.environment === 'devnet';
7070
}
7171

7272
public isSandbox(): boolean {
@@ -89,7 +89,7 @@ export class ConfigManager {
8989
if (this.config.timeouts) {
9090
return this.config.timeouts;
9191
}
92-
92+
9393
// Otherwise, use defaults based on environment
9494
if (this.isTestnet()) {
9595
return {
@@ -98,7 +98,7 @@ export class ConfigManager {
9898
waitTimeout: 60000 // 1 minute
9999
};
100100
}
101-
101+
102102
return {
103103
deployTimeout: 120000, // 2 minutes
104104
txTimeout: 60000, // 1 minute
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
2-
"name": "testnet",
3-
"environment": "testnet",
2+
"name": "devnet",
3+
"environment": "devnet",
44
"network": {
5-
"nodeUrl": "https://aztec-testnet-fullnode.zkv.xyz",
5+
"nodeUrl": "https://devnet.aztec-labs.com/",
66
"l1RpcUrl": "https://ethereum-sepolia-rpc.publicnode.com",
77
"l1ChainId": 11155111
88
},
99
"settings": {
1010
"skipSandbox": true,
11-
"version": "2.0.2"
11+
"version": "3.0.0-devnet.2"
1212
},
1313
"timeouts": {
1414
"deployTimeout": 1200000,
1515
"txTimeout": 180000,
1616
"waitTimeout": 60000
1717
}
18-
}
18+
}

package.json

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,38 @@
99
"type": "module",
1010
"scripts": {
1111
"fees": "node --loader ts-node/esm scripts/fees.ts",
12-
"fees::testnet": "AZTEC_ENV=testnet node --loader ts-node/esm scripts/fees.ts",
12+
"fees::devnet": "AZTEC_ENV=devnet node --loader ts-node/esm scripts/fees.ts",
1313
"clean": "rm -rf ./src/artifacts ./target",
1414
"clear-store": "rm -rf ./store",
1515
"codegen": "aztec codegen target --outdir src/artifacts",
1616
"compile": "${AZTEC_NARGO:-aztec-nargo} compile && aztec-postprocess-contract",
1717
"deploy": "node --loader ts-node/esm scripts/deploy_contract.ts",
18-
"deploy::testnet": "AZTEC_ENV=testnet node --loader ts-node/esm scripts/deploy_contract.ts",
18+
"deploy::devnet": "AZTEC_ENV=devnet node --loader ts-node/esm scripts/deploy_contract.ts",
1919
"deploy-account": "node --loader ts-node/esm scripts/deploy_account.ts",
20-
"deploy-account::testnet": "AZTEC_ENV=testnet node --loader ts-node/esm scripts/deploy_account.ts",
20+
"deploy-account::devnet": "AZTEC_ENV=devnet node --loader ts-node/esm scripts/deploy_account.ts",
2121
"interaction-existing-contract": "node --loader ts-node/esm scripts/interaction_existing_contract.ts",
22-
"interaction-existing-contract::testnet": "AZTEC_ENV=testnet node --loader ts-node/esm scripts/interaction_existing_contract.ts",
22+
"interaction-existing-contract::devnet": "AZTEC_ENV=devnet node --loader ts-node/esm scripts/interaction_existing_contract.ts",
2323
"multiple-pxe": "node --loader ts-node/esm scripts/multiple_pxe.ts",
24-
"multiple-pxe::testnet": "AZTEC_ENV=testnet node --loader ts-node/esm scripts/multiple_pxe.ts",
24+
"multiple-pxe::devnet": "AZTEC_ENV=devnet node --loader ts-node/esm scripts/multiple_pxe.ts",
2525
"get-block": "node --loader ts-node/esm scripts/get_block.ts",
26-
"get-block::testnet": "AZTEC_ENV=testnet node --loader ts-node/esm scripts/get_block.ts",
26+
"get-block::devnet": "AZTEC_ENV=devnet node --loader ts-node/esm scripts/get_block.ts",
2727
"profile": "node --loader ts-node/esm scripts/profile_deploy.ts",
28-
"profile::testnet": "AZTEC_ENV=testnet node --loader ts-node/esm scripts/profile_deploy.ts",
28+
"profile::devnet": "AZTEC_ENV=devnet node --loader ts-node/esm scripts/profile_deploy.ts",
2929
"test": "yarn test:js && yarn test:nr",
30-
"test::testnet": "AZTEC_ENV=testnet yarn test:js",
30+
"test::devnet": "AZTEC_ENV=devnet yarn test:js",
3131
"test:js": "rm -rf store/pxe && NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --runInBand --config jest.integration.config.json",
3232
"test:nr": "aztec test",
33-
"update": "aztec update --contract . && ./.github/scripts/update_contract.sh $(grep -oP 'tag\\s*=\\s*\"\\K[^\"]+' \"Nargo.toml\" | head -1) && yarn && yarn update-readme-version",
33+
"update": "./.github/scripts/update_contract.sh $(grep -oP 'tag\\s*=\\s*\"\\K[^\"]+' \"Nargo.toml\" | head -1) && yarn && yarn update-readme-version",
3434
"update-readme-version": "node ./.github/scripts/update-readme-version.js"
3535
},
3636
"dependencies": {
37-
"@aztec/accounts": "2.0.2",
38-
"@aztec/aztec.js": "2.0.2",
39-
"@aztec/noir-contracts.js": "2.0.2",
40-
"@aztec/protocol-contracts": "2.0.2",
41-
"@aztec/pxe": "2.0.2",
42-
"@aztec/stdlib": "2.0.2",
37+
"@aztec/accounts": "3.0.0-devnet.2",
38+
"@aztec/aztec.js": "3.0.0-devnet.2",
39+
"@aztec/noir-contracts.js": "3.0.0-devnet.2",
40+
"@aztec/protocol-contracts": "3.0.0-devnet.2",
41+
"@aztec/pxe": "3.0.0-devnet.2",
42+
"@aztec/stdlib": "3.0.0-devnet.2",
43+
"@aztec/test-wallet": "3.0.0-devnet.2",
4344
"dotenv": "^17.2.2"
4445
},
4546
"devDependencies": {

scripts/deploy_account.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { createLogger, Logger } from "@aztec/aztec.js";
2-
import { setupPXE } from "../src/utils/setup_pxe.js";
2+
import { setupPXE } from "../src/utils/setup_wallet.js";
33
import { deploySchnorrAccount } from "../src/utils/deploy_account.js";
44

55
export async function deployAccount() {

scripts/deploy_contract.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { PrivateVotingContract } from "../src/artifacts/PrivateVoting.js"
22
import { createLogger, PXE, Logger, SponsoredFeePaymentMethod, Fr } from "@aztec/aztec.js";
33
import { TokenContract } from "@aztec/noir-contracts.js/Token"
4-
import { setupPXE } from "../src/utils/setup_pxe.js";
4+
import { setupPXE } from "../src/utils/setup_wallet.js";
55
import { getSponsoredFPCInstance } from "../src/utils/sponsored_fpc.js";
66
import { SponsoredFPCContract } from "@aztec/noir-contracts.js/SponsoredFPC";
77
import { deploySchnorrAccount } from "../src/utils/deploy_account.js";
@@ -13,7 +13,7 @@ async function main() {
1313

1414
logger = createLogger('aztec:aztec-starter');
1515
logger.info(`🚀 Starting contract deployment process...`);
16-
16+
1717
const timeouts = getTimeouts();
1818

1919
// Setup PXE
@@ -50,7 +50,7 @@ async function main() {
5050

5151
logger.info('⏳ Waiting for deployment transaction to be mined...');
5252
const votingContract = await deployTx.deployed({ timeout: timeouts.deployTimeout });
53-
53+
5454
logger.info(`🎉 Voting Contract deployed successfully!`);
5555
logger.info(`📍 Contract address: ${votingContract.address}`);
5656
logger.info(`👤 Admin address: ${address}`);

scripts/fees.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { SponsoredFeePaymentMethod } from '@aztec/aztec.js/fee/testing'
1313
import { getDeployedSponsoredFPCAddress, getSponsoredFPCInstance } from "../src/utils/sponsored_fpc.js";
1414
import { createEthereumChain, createExtendedL1Client } from "@aztec/ethereum";
1515
import { deploySchnorrAccount } from "../src/utils/deploy_account.js";
16-
import { setupPXE } from "../src/utils/setup_pxe.js";
16+
import { setupPXE } from "../src/utils/setup_wallet.js";
1717
import { createLogger, FeeJuicePaymentMethod, FeeJuicePaymentMethodWithClaim, Fq, Fr, L1FeeJuicePortalManager, Logger, PrivateFeePaymentMethod, PublicFeePaymentMethod, PXE } from '@aztec/aztec.js';
1818
import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
1919
import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';

0 commit comments

Comments
 (0)