Merge pull request #204 from AztecProtocol/jc/devnet-update

update to use 3.0.0-devnet.2

Author: critesjosh

.env.example

@@ -2,3 +2,11 @@ VOTING_CONTRACT_ADDRESS="0x2320c9938b3e87feb4e475413456d028572f3367e18d61e7d198d
 SECRET="0x29aa7f43021f964fe46527ff4df0e9211de94274f54eff12ec81070ee3e16300"
 SALT="0x23c46f2dd4450fb881f0b0e70c3974f84dfa9d199493001b3fe8eb136dc612cd"
 AZTEC_ENV=sandbox
+VOTING_CONTRACT_ADDRESS="0x0407e827124a8ce742a4e63250f4f508a8b5043746dcedae8312bd32ea24154d"
+CONTRACT_SALT="0x2d7e8a973f9039f0e2c7771376e131f8ca1c18bd337ee8fa5c6d89db0198645e"
+CONTRACT_DEPLOYER="0x2e34557bae428d3c489f67e9aa326b41a09faf03f619969b883e413cbec7bc1c"
+CONTRACT_PK_NULLIFIER="0x01498945581e0eb9f8427ad6021184c700ef091d570892c437d12c7d90364bbd170ae506787c5c43d6ca9255d571c10fa9ffa9d141666e290c347c5c9ab7e344"
+CONTRACT_PK_INCOMING="0x00c044b05b6ca83b9c2dbae79cc1135155956a64e136819136e9947fe5e5866c1c1f0ca244c7cd46b682552bff8ae77dea40b966a71de076ec3b7678f2bdb151"
+CONTRACT_PK_OUTGOING="0x1b00316144359e9a3ec8e49c1cdb7eeb0cedd190dfd9dc90eea5115aa779e287080ffc74d7a8b0bccb88ac11f45874172f3847eb8b92654aaa58a3d2b8dc7833"
+CONTRACT_PK_TAGGING="0x019c111f36ad3fc1d9b7a7a14344314d2864b94f030594cd67f753ef774a1efb2039907fe37f08d10739255141bb066c506a12f7d1e8dfec21abc58494705b6f"
+CONTRACT_CONSTRUCTOR_ARGS='["0x2e34557bae428d3c489f67e9aa326b41a09faf03f619969b883e413cbec7bc1c"]'

.github/workflows/testnet.yaml .github/workflows/devnet.yaml.github/workflows/testnet.yaml renamed to .github/workflows/devnet.yaml

@@ -1,8 +1,8 @@
-name: Testnet Tests
+name: Devnet Tests
 
 on:
   schedule:
-    - cron: '0 2 * * *'
+    - cron: "0 2 * * *"
   workflow_dispatch:
     inputs:
       skip_deployment:
@@ -12,11 +12,12 @@ on:
         default: false
 
 jobs:
-  testnet-tests:
-    name: Testnet Tests
+  devnet-tests:
+    name: Devnet Tests
     runs-on: ubuntu-latest
     env:
-      AZTEC_ENV: testnet
+      AZTEC_ENV: devnet
+      VERSION: 3.0.0-devnet.2
 
     steps:
       - name: Checkout repository
@@ -36,32 +37,36 @@ jobs:
       - name: Update path
         run: echo "/home/runner/.aztec/bin" >> $GITHUB_PATH
 
+      - name: Set Aztec version
+        run: |
+          aztec-up ${{ env.VERSION }}
+
       - name: Install project dependencies
         run: yarn
 
       - name: Compile contracts
-        run: script -e -c "${AZTEC_NARGO:-aztec-nargo} compile"
+        run: script -e -c "${AZTEC_NARGO:-aztec-nargo} compile && aztec-postprocess-contract"
 
       - name: Generate contract artifacts
-        run: script -e -c "aztec codegen target --outdir src/artifacts && aztec-postprocess-contract"
+        run: script -e -c "aztec codegen target --outdir src/artifacts"
 
-      - name: Setup testnet environment
+      - name: Setup devnet environment
         run: |
-          echo "📋 Using testnet configuration from config/testnet.json"
-          cat config/testnet.json
+          echo "📋 Using devnet configuration from config/devnet.json"
+          cat config/devnet.json
 
-      - name: Test testnet connectivity
+      - name: Test devnet connectivity
         run: |
-          echo "Testing testnet connectivity..."
-          curl -s https://aztec-testnet-fullnode.zkv.xyz/status || echo "Warning: Could not connect to testnet"
+          echo "Testing devnet connectivity..."
+          curl -s https://devnet.aztec-labs.com/status || echo "Warning: Could not connect to devnet"
 
-      - name: Deploy account to testnet
+      - name: Deploy account to devnet
         if: ${{ !inputs.skip_deployment }}
         run: |
           TEMP_OUTPUT=$(mktemp)
 
-          if script -e -c "yarn deploy-account::testnet" > "$TEMP_OUTPUT" 2>&1; then
-            echo "✅ Deploy account to testnet completed successfully"
+          if script -e -c "yarn deploy-account::devnet" > "$TEMP_OUTPUT" 2>&1; then
+            echo "✅ Deploy account to devnet completed successfully"
           else
             echo "❌ Deploy account script failed"
             cat "$TEMP_OUTPUT"
@@ -87,13 +92,13 @@ jobs:
             exit 1
           fi
 
-      - name: Deploy contract to testnet
+      - name: Deploy contract to devnet
         if: ${{ !inputs.skip_deployment }}
         run: |
           TEMP_OUTPUT=$(mktemp)
 
-          if script -e -c "yarn deploy::testnet" > "$TEMP_OUTPUT" 2>&1; then
-            echo "✅ Deploy contract to testnet completed successfully"
+          if script -e -c "yarn deploy::devnet" > "$TEMP_OUTPUT" 2>&1; then
+            echo "✅ Deploy contract to devnet completed successfully"
           else
             echo "❌ Deploy contract script failed"
             cat "$TEMP_OUTPUT"
@@ -114,24 +119,24 @@ jobs:
             echo "⚠️ Warning: Could not extract contract address"
           fi
 
-      - name: Run testnet scripts
+      - name: Run devnet scripts
         run: |
-          echo "Running testnet scripts..."
-          script -e -c "yarn get-block::testnet"
-          
+          echo "Running devnet scripts..."
+          script -e -c "yarn get-block::devnet"
+
       - name: Run interaction test with existing contract
         if: ${{ inputs.skip_deployment }}
         run: |
-          echo "Running interaction with existing contract on testnet..."
-          script -e -c "yarn interaction-existing-contract::testnet"
+          echo "Running interaction with existing contract on devnet..."
+          script -e -c "yarn interaction-existing-contract::devnet"
 
-      - name: Run JavaScript tests on testnet
+      - name: Run JavaScript tests on devnet
         run: |
-          echo "Running JavaScript tests against testnet..."
+          echo "Running JavaScript tests against devnet..."
           script -e -c "rm -rf store/pxe"
-          script -e -c "ENV=testnet NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --runInBand --config jest.integration.config.json"
+          script -e -c "ENV=devnet NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --runInBand --config jest.integration.config.json"
 
-      - name: Profile deployment on testnet
+      - name: Profile deployment on devnet
         if: ${{ !inputs.skip_deployment }}
         run: |
-          script -e -c "yarn profile::testnet"
+          script -e -c "yarn profile::devnet"

.github/workflows/sandbox.yaml

@@ -17,6 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       AZTEC_ENV: sandbox
+      VERSION: 3.0.0-devnet.2
 
     steps:
       - name: Checkout repository
@@ -41,7 +42,7 @@ jobs:
 
       - name: Set Aztec version and start sandbox
         run: |
-          VERSION=2.0.2 aztec-up
+          VERSION=${{ env.VERSION }} aztec-up
           aztec start --sandbox &
 
       - name: Wait for sandbox to be ready
@@ -60,10 +61,10 @@ jobs:
         run: yarn
 
       - name: Compile contracts
-        run: script -e -c "${AZTEC_NARGO:-aztec-nargo} compile"
+        run: script -e -c "${AZTEC_NARGO:-aztec-nargo} compile && aztec-postprocess-contract"
 
       - name: Generate contract artifacts
-        run: script -e -c "aztec codegen target --outdir src/artifacts && aztec-postprocess-contract"
+        run: script -e -c "aztec codegen target --outdir src/artifacts"
 
       - name: Change ownership for nargo files
         run: sudo chown -R $(whoami) ~/nargo && sudo chown -R $(whoami) ~/nargo/github.com
@@ -92,9 +93,9 @@ jobs:
 
           cat "$TEMP_OUTPUT"
 
-          SECRET_KEY=$(grep -o "🔑 Secret key generated: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/🔑 Secret key generated: //' || echo "")
-          SIGNING_KEY=$(grep -o "🖊️ Signing key generated: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/🖊️ Signing key generated: //' || echo "")
-          SALT_VALUE=$(grep -o "🧂 Salt generated: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/🧂 Salt generated: //' || echo "")
+          SECRET_KEY=$(grep -o "Secret key generated: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/Secret key generated: //' || echo "")
+          SIGNING_KEY=$(grep -o "Signing key generated: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/Signing key generated: //' || echo "")
+          SALT_VALUE=$(grep -o "Salt generated: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/Salt generated: //' || echo "")
 
           rm "$TEMP_OUTPUT"
 
@@ -122,21 +123,66 @@ jobs:
 
           cat "$TEMP_OUTPUT"
 
-          VOTING_CONTRACT_ADDRESS=""
-          if [ -z "$VOTING_CONTRACT_ADDRESS" ]; then
-            VOTING_CONTRACT_ADDRESS=$(grep -o "Contract address: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/Contract address: //' || echo "")
-          fi
+          # Extract contract address
+          VOTING_CONTRACT_ADDRESS=$(grep -o "Contract address: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/Contract address: //' || echo "")
+
+          # Extract salt
+          CONTRACT_SALT=$(grep -o "Salt: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/Salt: //' || echo "")
+
+          # Extract deployer
+          CONTRACT_DEPLOYER=$(grep -o "Deployer: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/Deployer: //' || echo "")
+
+          # Extract public keys
+          PK_NULLIFIER=$(grep -o "Master Nullifier: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/Master Nullifier: //' || echo "")
+          PK_INCOMING=$(grep -o "Master Incoming Viewing: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/Master Incoming Viewing: //' || echo "")
+          PK_OUTGOING=$(grep -o "Master Outgoing Viewing: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/Master Outgoing Viewing: //' || echo "")
+          PK_TAGGING=$(grep -o "Master Tagging: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/Master Tagging: //' || echo "")
+
+          # Extract constructor args (JSON array), strip ANSI codes, and trim whitespace
+          CONSTRUCTOR_ARGS=$(grep "Constructor args:" "$TEMP_OUTPUT" | sed 's/.*Constructor args: //' | sed 's/\x1b\[[0-9;]*m//g' | tr -d '\n\r' | sed 's/[[:space:]]*$//' || echo "")
 
           rm "$TEMP_OUTPUT"
 
+          # Save all data to .env
           if [ -n "$VOTING_CONTRACT_ADDRESS" ]; then
             echo "VOTING_CONTRACT_ADDRESS=\"$VOTING_CONTRACT_ADDRESS\"" >> .env
             echo "📋 Saved contract address to .env file"
           fi
 
+          if [ -n "$CONTRACT_SALT" ]; then
+            echo "CONTRACT_SALT=\"$CONTRACT_SALT\"" >> .env
+            echo "📋 Saved contract salt to .env file"
+          fi
+
+          if [ -n "$CONTRACT_DEPLOYER" ]; then
+            echo "CONTRACT_DEPLOYER=\"$CONTRACT_DEPLOYER\"" >> .env
+            echo "📋 Saved contract deployer to .env file"
+          fi
+
+          if [ -n "$PK_NULLIFIER" ]; then
+            echo "CONTRACT_PK_NULLIFIER=\"$PK_NULLIFIER\"" >> .env
+          fi
+
+          if [ -n "$PK_INCOMING" ]; then
+            echo "CONTRACT_PK_INCOMING=\"$PK_INCOMING\"" >> .env
+          fi
+
+          if [ -n "$PK_OUTGOING" ]; then
+            echo "CONTRACT_PK_OUTGOING=\"$PK_OUTGOING\"" >> .env
+          fi
+
+          if [ -n "$PK_TAGGING" ]; then
+            echo "CONTRACT_PK_TAGGING=\"$PK_TAGGING\"" >> .env
+          fi
+
+          if [ -n "$CONSTRUCTOR_ARGS" ]; then
+            echo "CONTRACT_CONSTRUCTOR_ARGS=\"$CONSTRUCTOR_ARGS\"" >> .env
+            echo "📋 Saved constructor args to .env file"
+          fi
+
       - name: Run sandbox scripts
         run: |
           script -e -c "yarn fees"
-          script -e -c "yarn multiple-pxe"
+          script -e -c "yarn multiple-wallet"
           script -e -c "yarn profile"
-          script -e -c "yarn interaction-existing-contract"
+          script -e -c "yarn interaction-existing-contract"

.gitignore

@@ -6,4 +6,5 @@ log/
 .DS_Store
 codegenCache.json
 store/
-.tsbuildinfo
+.tsbuildinfo
+.env

Nargo.toml

@@ -5,4 +5,4 @@ authors = [ "" ]
 compiler_version = ">=0.18.0"
 
 [dependencies]
-aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v2.0.2", directory = "noir-projects/aztec-nr/aztec" }
+aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-devnet.2", directory = "noir-projects/aztec-nr/aztec" }

README.md

@@ -12,9 +12,9 @@ This repo is meant to be a starting point for learning to write Aztec contracts
 
 You can find the **Easy Private Voting contract** in `./src/main.nr`. A simple integration test is in `./src/test/e2e/index.test.ts`.
 
-## Testnet
+## Devnet
 
-This repo connects to a locally running Aztec Sandbox by default, but can be configured to connect to the testnet by specifying `AZTEC_ENV=testnet` in a `.env` file or by prefixing a command e.g. `AZTEC_ENV=testnet yarn deploy`.
+This repo connects to a locally running Aztec Sandbox by default, but can be configured to connect to the devnet by specifying `AZTEC_ENV=devnet` in a `.env` file or by prefixing a command e.g. `AZTEC_ENV=devnet yarn deploy`.
 
 <div align="center">
 
@@ -45,15 +45,15 @@ bash -i <(curl -s https://install.aztec.network)
 Install the correct version of the toolkit with:
 
 ```bash
-aztec-up 2.0.2
+aztec-up 3.0.0-devnet.2
 ```
 
 ### Environment Configuration
 
 This project uses JSON configuration files to manage environment-specific settings:
 
 - `config/sandbox.json` - Configuration for local sandbox development
-- `config/testnet.json` - Configuration for testnet deployment
+- `config/devnet.json` - Configuration for devnet deployment
 
 The system automatically loads the appropriate configuration file based on the `ENV` environment variable. If `ENV` is not set, it defaults to `sandbox`.
 
@@ -74,18 +74,18 @@ yarn deploy       # Deploy to sandbox
 yarn test         # Run tests on sandbox
 ```
 
-### Running on Testnet
+### Running on Devnet
 
-All scripts support a `::testnet` suffix to automatically use testnet configuration:
+All scripts support a `::devnet` suffix to automatically use devnet configuration:
 
 ```bash
-yarn deploy::testnet              # Deploy to testnet
-yarn test::testnet                # Run tests on testnet
-yarn deploy-account::testnet      # Deploy account to testnet
-yarn interaction-existing-contract::testnet  # Interact with testnet contracts
+yarn deploy::devnet              # Deploy to devnet
+yarn test::devnet                # Run tests on devnet
+yarn deploy-account::devnet      # Deploy account to devnet
+yarn interaction-existing-contract::devnet  # Interact with devnet contracts
 ```
 
-The `::testnet` suffix automatically sets `ENV=testnet`, loading configuration from `config/testnet.json`.
+The `::devnet` suffix automatically sets `ENV=devnet`, loading configuration from `config/devnet.json`.
 
 ---
 

config/config.ts

@@ -19,7 +19,7 @@ export interface TimeoutConfig {
 
 export interface EnvironmentConfig {
   name: string;
-  environment: 'local' | 'testnet' | 'mainnet';
+  environment: 'local' | 'testnet' | 'devnet' | 'mainnet';
   network: NetworkConfig;
   settings: {
     skipSandbox: boolean;
@@ -65,8 +65,8 @@ export class ConfigManager {
     return this.config.network;
   }
 
-  public isTestnet(): boolean {
-    return this.config.environment === 'testnet';
+  public isDevnet(): boolean {
+    return this.config.environment === 'devnet';
   }
 
   public isSandbox(): boolean {
@@ -89,16 +89,16 @@ export class ConfigManager {
     if (this.config.timeouts) {
       return this.config.timeouts;
     }
-    
+
     // Otherwise, use defaults based on environment
-    if (this.isTestnet()) {
+    if (this.isDevnet()) {
       return {
         deployTimeout: 1200000, // 20 minutes
         txTimeout: 180000,     // 3 minutes
         waitTimeout: 60000     // 1 minute
       };
     }
-    
+
     return {
       deployTimeout: 120000, // 2 minutes
       txTimeout: 60000,      // 1 minute

config/testnet.json config/devnet.jsonconfig/testnet.json renamed to config/devnet.json

@@ -1,18 +1,18 @@
 {
-  "name": "testnet",
-  "environment": "testnet",
+  "name": "devnet",
+  "environment": "devnet",
   "network": {
-    "nodeUrl": "https://aztec-testnet-fullnode.zkv.xyz",
+    "nodeUrl": "https://devnet.aztec-labs.com/",
     "l1RpcUrl": "https://ethereum-sepolia-rpc.publicnode.com",
     "l1ChainId": 11155111
   },
   "settings": {
     "skipSandbox": true,
-    "version": "2.0.2"
+    "version": "3.0.0-devnet.2"
   },
   "timeouts": {
     "deployTimeout": 1200000,
     "txTimeout": 180000,
     "waitTimeout": 60000
   }
-}
+}