get rid of "deriveSigningKey"

Author: critesjosh

.github/workflows/tests.yaml

@@ -54,7 +54,7 @@ jobs:
       - name: Run tests
         run: script -e -c "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --runInBand --config jest.integration.config.json && aztec test"
 
-      - name: Deploy account and capture SECRET/SALT
+      - name: Deploy account and capture SECRET/SIGNING_KEY/SALT
         run: |
           script -e -c "yarn clear-store"
           # Create a temporary file to store the output
@@ -73,24 +73,27 @@ jobs:
           # Show the full output for debugging
           cat "$TEMP_OUTPUT"
 
-          # Extract SECRET and SALT from the output
+          # Extract SECRET, SIGNING_KEY, and SALT from the 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 "")
 
           # Clean up temp file
           rm "$TEMP_OUTPUT"
 
           # Validate and create .env file
-          if [ -n "$SECRET_KEY" ] && [ -n "$SALT_VALUE" ]; then
+          if [ -n "$SECRET_KEY" ] && [ -n "$SIGNING_KEY" ] && [ -n "$SALT_VALUE" ]; then
             
             # Create .env file with all necessary values
             echo "SECRET=\"$SECRET_KEY\"" >> .env
+            echo "SIGNING_KEY=\"$SIGNING_KEY\"" >> .env
             echo "SALT=\"$SALT_VALUE\"" >> .env
             echo "📋 Current .env file contents:"
             cat .env
           else
-            echo "❌ Failed to extract SECRET and/or SALT from deploy output"
+            echo "❌ Failed to extract SECRET, SIGNING_KEY and/or SALT from deploy output"
             echo "🔍 SECRET_KEY: '$SECRET_KEY'"
+            echo "🔍 SIGNING_KEY: '$SIGNING_KEY'"
             echo "🔍 SALT_VALUE: '$SALT_VALUE'"
             exit 1
           fi

scripts/fees.ts

@@ -14,11 +14,10 @@ import { getDeployedSponsoredFPCAddress, getSponsoredFPCInstance } from "../src/
 import { createEthereumChain, createExtendedL1Client } from "@aztec/ethereum";
 import { deploySchnorrAccount } from "../src/utils/deploy_account.js";
 import { setupPXE } from "../src/utils/setup_pxe.js";
-import { createLogger, FeeJuicePaymentMethod, FeeJuicePaymentMethodWithClaim, Fr, L1FeeJuicePortalManager, Logger, PrivateFeePaymentMethod, PublicFeePaymentMethod, PXE } from '@aztec/aztec.js';
+import { createLogger, FeeJuicePaymentMethod, FeeJuicePaymentMethodWithClaim, Fq, Fr, L1FeeJuicePortalManager, Logger, PrivateFeePaymentMethod, PublicFeePaymentMethod, PXE } from '@aztec/aztec.js';
 import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
 import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
 import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
 
 const MNEMONIC = 'test test test test test test test test test test test junk';
 const FEE_FUNDING_FOR_TESTER_ACCOUNT = 1000000000000000000000n;
@@ -43,8 +42,9 @@ async function main() {
     const wallet1 = await account1.getWallet();
 
     let secretKey = Fr.random();
+    let signingKey = Fq.random();
     let salt = Fr.random();
-    let account2 = await getSchnorrAccount(pxe, secretKey, deriveSigningKey(secretKey), salt);
+    let account2 = await getSchnorrAccount(pxe, secretKey, signingKey, salt);
     const wallet2 = await account2.getWallet();
     const feeJuiceRecipient = account2.getAddress();
 

scripts/multiple_pxe.ts

@@ -1,7 +1,6 @@
-import { waitForPXE, getContractInstanceFromInstantiationParams, Fr, ContractInstanceWithAddress, AztecAddress, SponsoredFeePaymentMethod, createAztecNodeClient } from "@aztec/aztec.js";
+import { waitForPXE, getContractInstanceFromInstantiationParams, Fr, ContractInstanceWithAddress, AztecAddress, SponsoredFeePaymentMethod, createAztecNodeClient, Fq } from "@aztec/aztec.js";
 import { TokenContract } from "@aztec/noir-contracts.js/Token"
 import { getSponsoredFPCInstance } from "../src/utils/sponsored_fpc.js";
-import { deriveSigningKey } from "@aztec/stdlib/keys";
 import { getSchnorrAccount } from "@aztec/accounts/schnorr";
 import { SponsoredFPCContract } from "@aztec/noir-contracts.js/SponsoredFPC";
 import { createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
@@ -25,13 +24,13 @@ const store2 = await createStore('pxe2', {
 });
 
 const setupPxe1 = async () => {
-    const pxe = await createPXEService(node, fullConfig, {store: store1});
+    const pxe = await createPXEService(node, fullConfig, { store: store1 });
     await waitForPXE(pxe);
     return pxe;
 };
 
 const setupPxe2 = async () => {
-    const pxe = await createPXEService(node, fullConfig, {store: store2});
+    const pxe = await createPXEService(node, fullConfig, { store: store2 });
     await waitForPXE(pxe);
     return pxe;
 };
@@ -65,8 +64,9 @@ async function main() {
     // deploy token contract
 
     let secretKey = Fr.random();
+    let signingKey = Fq.random();
     let salt = Fr.random();
-    let schnorrAccount = await getSchnorrAccount(pxe1, secretKey, deriveSigningKey(secretKey), salt);
+    let schnorrAccount = await getSchnorrAccount(pxe1, secretKey, signingKey, salt);
     let tx = await schnorrAccount.deploy({ fee: { paymentMethod } }).wait();
     let ownerWallet = await schnorrAccount.getWallet();
     let ownerAddress = ownerWallet.getAddress();
@@ -81,8 +81,9 @@ async function main() {
     await pxe2.registerSender(ownerAddress)
 
     let secretKey2 = Fr.random();
+    let signingKey2 = Fq.random();
     let salt2 = Fr.random();
-    let schnorrAccount2 = await getSchnorrAccount(pxe2, secretKey2, deriveSigningKey(secretKey2), salt2);
+    let schnorrAccount2 = await getSchnorrAccount(pxe2, secretKey2, signingKey2, salt2);
 
     // deploy account on 2nd pxe
     let tx2 = await schnorrAccount2.deploy({ fee: { paymentMethod } }).wait();

src/test/e2e/accounts.test.ts

@@ -1,16 +1,16 @@
 import { PrivateVotingContractArtifact, PrivateVotingContract } from "../../artifacts/PrivateVoting.js"
-import { AccountManager, AccountWallet, ContractDeployer, createLogger, Fr, PXE, TxStatus, getContractInstanceFromInstantiationParams, Logger } from "@aztec/aztec.js";
+import { AccountManager, AccountWallet, ContractDeployer, createLogger, Fr, PXE, TxStatus, getContractInstanceFromInstantiationParams, Logger, Fq } from "@aztec/aztec.js";
 import { generateSchnorrAccounts } from "@aztec/accounts/testing"
 import { getSchnorrAccount } from '@aztec/accounts/schnorr';
 import { spawn, spawnSync } from 'child_process';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
 
 import { SponsoredFeePaymentMethod } from "@aztec/aztec.js/fee/testing";
 import { getFeeJuiceBalance, type L2AmountClaim, L1FeeJuicePortalManager, FeeJuicePaymentMethodWithClaim, AztecAddress } from "@aztec/aztec.js";
 import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import { getSponsoredFPCInstance } from "../../utils/sponsored_fpc.js";
 import { setupPXE } from "../../utils/setup_pxe.js";
 import { SponsoredFPCContract } from "@aztec/noir-contracts.js/SponsoredFPC";
+import { sign } from "crypto";
 
 const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
 
@@ -73,8 +73,9 @@ describe("Accounts", () => {
         );
 
         let secretKey = Fr.random();
+        let signingKey = Fq.random();
         let salt = Fr.random();
-        let schnorrAccount = await getSchnorrAccount(pxe, secretKey, deriveSigningKey(secretKey), salt)
+        let schnorrAccount = await getSchnorrAccount(pxe, secretKey, signingKey, salt)
         await schnorrAccount.deploy({ fee: { paymentMethod: sponsoredPaymentMethod } }).wait();
         ownerWallet = await schnorrAccount.getWallet();
     })

src/test/e2e/index.test.ts

@@ -1,5 +1,5 @@
 import { PrivateVotingContractArtifact, PrivateVotingContract } from "../../artifacts/PrivateVoting.js"
-import { AccountWallet, ContractDeployer, createLogger, Fr, PXE, TxStatus, getContractInstanceFromInstantiationParams, Logger, ContractInstanceWithAddress } from "@aztec/aztec.js";
+import { AccountWallet, ContractDeployer, createLogger, Fr, PXE, TxStatus, getContractInstanceFromInstantiationParams, Logger, ContractInstanceWithAddress, Fq } from "@aztec/aztec.js";
 import { generateSchnorrAccounts } from "@aztec/accounts/testing"
 import { getSchnorrAccount } from '@aztec/accounts/schnorr';
 import { spawn, spawnSync } from 'child_process';
@@ -9,7 +9,6 @@ import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import { getSponsoredFPCInstance } from "../../utils/sponsored_fpc.js";
 import { setupPXE } from "../../utils/setup_pxe.js";
 import { SponsoredFPCContract } from "@aztec/noir-contracts.js/SponsoredFPC";
-import { deriveSigningKey } from "@aztec/stdlib/keys";
 
 const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
 
@@ -47,8 +46,9 @@ describe("Voting", () => {
 
         // Set up a wallet
         let secretKey = Fr.random();
+        let signingKey = Fq.random();
         let salt = Fr.random();
-        let schnorrAccount = await getSchnorrAccount(pxe, secretKey, deriveSigningKey(secretKey), salt)
+        let schnorrAccount = await getSchnorrAccount(pxe, secretKey, signingKey, salt)
         await schnorrAccount.deploy({ fee: { paymentMethod: sponsoredPaymentMethod } }).wait();
         firstWallet = await schnorrAccount.getWallet();
         const existingSenders = await pxe.getSenders();

src/utils/create_account_from_env.ts

@@ -1,6 +1,5 @@
-import { createLogger, Fr, PXE, Logger, AccountManager } from "@aztec/aztec.js";
+import { createLogger, Fr, PXE, Logger, AccountManager, Fq } from "@aztec/aztec.js";
 import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
 import * as dotenv from 'dotenv';
 
 // Load environment variables
@@ -14,22 +13,29 @@ export async function createAccountFromEnv(pxe: PXE): Promise<AccountManager> {
 
     // Read SECRET and SALT from environment variables
     const secretEnv = process.env.SECRET;
+    const signingKeyEnv = process.env.SIGNING_KEY;
     const saltEnv = process.env.SALT;
 
     if (!secretEnv) {
         throw new Error('SECRET environment variable is required. Please set it in your .env file.');
     }
 
+    if (!signingKeyEnv) {
+        throw new Error('SIGNING_KEY environment variable is required. Please set it in your .env file.');
+    }
+
     if (!saltEnv) {
         throw new Error('SALT environment variable is required. Please set it in your .env file.');
     }
 
     // Convert hex strings to Fr values
     let secretKey: Fr;
+    let signingKey: Fq;
     let salt: Fr;
 
     try {
         secretKey = Fr.fromString(secretEnv);
+        signingKey = Fq.fromString(signingKeyEnv);
         salt = Fr.fromString(saltEnv);
         logger.info('✅ Successfully parsed SECRET and SALT values');
     } catch (error) {
@@ -39,7 +45,7 @@ export async function createAccountFromEnv(pxe: PXE): Promise<AccountManager> {
 
     // Create Schnorr account with specified values
     logger.info('🏗️  Creating Schnorr account instance with environment values...');
-    let schnorrAccount = await getSchnorrAccount(pxe, secretKey, deriveSigningKey(secretKey), salt);
+    let schnorrAccount = await getSchnorrAccount(pxe, secretKey, signingKey, salt);
     const accountAddress = schnorrAccount.getAddress();
     logger.info(`📍 Account address: ${accountAddress}`);
 
@@ -48,7 +54,7 @@ export async function createAccountFromEnv(pxe: PXE): Promise<AccountManager> {
     try {
         const registeredAccounts = await pxe.getRegisteredAccounts();
         const isRegistered = registeredAccounts.some(acc => acc.address.equals(accountAddress));
-        
+
         if (isRegistered) {
             logger.info('✅ Account is already registered with PXE');
         } else {

src/utils/deploy_account.ts

@@ -1,21 +1,20 @@
-import { createLogger, Fr, PXE, Logger, AccountManager } from "@aztec/aztec.js";
+import { createLogger, Fr, PXE, Logger, AccountManager, Fq } from "@aztec/aztec.js";
 import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
 import { SponsoredFeePaymentMethod } from "@aztec/aztec.js/fee/testing";
 import { getSponsoredFPCInstance } from "./sponsored_fpc.js";
 import { SponsoredFPCContract } from "@aztec/noir-contracts.js/SponsoredFPC";
 
 export async function deploySchnorrAccount(pxe: PXE): Promise<AccountManager> {
     let logger: Logger;
     logger = createLogger('aztec:aztec-starter');
-    
+
     logger.info('👤 Starting Schnorr account deployment...');
 
     // Setup sponsored FPC
     logger.info('💰 Setting up sponsored fee payment for account deployment...');
     const sponsoredFPC = await getSponsoredFPCInstance();
     logger.info(`💰 Sponsored FPC instance obtained at: ${sponsoredFPC.address}`);
-    
+
     logger.info('📝 Registering sponsored FPC contract with PXE...');
     await pxe.registerContract({ instance: sponsoredFPC, artifact: SponsoredFPCContract.artifact });
     const sponsoredPaymentMethod = new SponsoredFeePaymentMethod(sponsoredFPC.address);
@@ -24,24 +23,26 @@ export async function deploySchnorrAccount(pxe: PXE): Promise<AccountManager> {
     // Generate account keys
     logger.info('🔐 Generating account keys...');
     let secretKey = Fr.random();
+    let signingKey = Fq.random();
     let salt = Fr.random();
     logger.info(`Save the following SECRET and SALT in .env for future use.`);
     logger.info(`🔑 Secret key generated: ${secretKey.toString()}`);
+    logger.info(`🖊️ Signing key generated: ${signingKey.toString()}`);
     logger.info(`🧂 Salt generated: ${salt.toString()}`);
 
     // Create Schnorr account
     logger.info('🏗️  Creating Schnorr account instance...');
-    let schnorrAccount = await getSchnorrAccount(pxe, secretKey, deriveSigningKey(secretKey), salt);
+    let schnorrAccount = await getSchnorrAccount(pxe, secretKey, signingKey, salt);
     const accountAddress = schnorrAccount.getAddress();
     logger.info(`📍 Account address will be: ${accountAddress}`);
 
     // Deploy the account
     logger.info('🚀 Deploying account to the network...');
     logger.info('⏳ Waiting for account deployment transaction to be mined...');
-    let tx = await schnorrAccount.deploy({ 
-        fee: { paymentMethod: sponsoredPaymentMethod } 
+    let tx = await schnorrAccount.deploy({
+        fee: { paymentMethod: sponsoredPaymentMethod }
     }).wait({ timeout: 120000 });
-    
+
     logger.info(`✅ Account deployment transaction successful!`);
     logger.info(`📋 Transaction hash: ${tx.txHash}`);
 
@@ -56,7 +57,7 @@ export async function deploySchnorrAccount(pxe: PXE): Promise<AccountManager> {
     try {
         const registeredAccounts = await pxe.getRegisteredAccounts();
         const isRegistered = registeredAccounts.some(acc => acc.address.equals(deployedAddress));
-        
+
         if (isRegistered) {
             logger.info('✅ Account successfully registered with PXE');
         } else {