Fix aztec treasury.

Author: erkostandyan

js/src/index.ts

@@ -14,10 +14,10 @@ switch (network) {
     case 'Fuel':
         fuelWorker(network);
         break;
-    // case 'Aztec':
-    //     aztecWorker(network);
-    //     break;
+    case 'Aztec':
+        aztecWorker(network);
+        break;
     default:
-        console.error(`Unknown network: ${network}. Supported networks are: Starknet, Fuel.`);
+        console.error(`Unknown network: ${network}. Supported networks are: Starknet, Fuel, Aztec.`);
         process.exit(1);
 }

treasury/.env

@@ -1,4 +1,4 @@
-VAULT_URL=https://vault-dev.lb.layerswap.cloud/
-VAULT_USERNAME=rick
-VAULT_PASSWORD=peaceamongworlds
-AZTEC_STORE_PATH="C:\Users\kosta\OneDrive\Desktop\aztecTr"
+VAULT_URL={KV_URL_HERE}
+VAULT_USERNAME={USERNAME}
+VAULT_PASSWORD={PASSWORD}
+AZTEC_STORE_PATH={AZTEC_STORE_PATH}

treasury/src/treasury/aztec/aztec.service.ts

@@ -24,8 +24,6 @@ import { ContractArtifact, FunctionAbi, getAllFunctionAbis } from '@aztec/aztec.
 import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
 import { getAccountContractAddress } from '@aztec/aztec.js/account';
 
-
-
 @Injectable()
 export class AztecTreasuryService extends TreasuryService {
 
@@ -47,47 +45,45 @@ export class AztecTreasuryService extends TreasuryService {
 
             const fullConfig = { ...getPXEConfig(), l1Contracts, proverEnabled: true };
 
+            const accountContract = new SchnorrAccountContract(deriveSigningKey(Fr.fromString(privateKey)));
+            const solverAddress = (await getAccountContractAddress(accountContract, Fr.fromString(privateKey), Fr.fromString(privateSalt))).toString();
+
             const store = await createStore(request.address, {
                 dataDirectory: this.configService.storePath,
                 dataStoreMapSizeKb: 1e6,
             });
 
-            const wallet = await TestWallet.create(provider, fullConfig, { store });
-
-            const accountManager = await wallet.createSchnorrAccount(
-                Fr.fromString(privateKey),
-                Fr.fromString(privateSalt),
-                deriveSigningKey(Fr.fromString(privateKey)),
-            );
+            const pxe = await TestWallet.create(provider, fullConfig, { store });
 
             const sponsoredFPCInstance = await getContractInstanceFromInstantiationParams(
                 SponsoredFPCContract.artifact,
                 { salt: new Fr(0) },
             );
 
-            await wallet.registerContract(
+            await pxe.registerContract(
                 sponsoredFPCInstance,
                 SponsoredFPCContract.artifact,
             );
 
-            const token = await TokenContract.at(AztecAddress.fromString(request.tokenContract), wallet);
-            const contractInstance = await TrainContract.at(AztecAddress.fromString(request.contractAddress), wallet);
+            await pxe.createSchnorrAccount(
+                Fr.fromString(privateKey),
+                Fr.fromString(privateSalt),
+                deriveSigningKey(Fr.fromString(privateKey)),
+            );
 
             const contractInstanceWithAddress = await provider.getContract(AztecAddress.fromString(request.contractAddress));
-            await wallet.registerContract(contractInstanceWithAddress, TrainContract.artifact);
+            await pxe.registerContract(contractInstanceWithAddress, TrainContract.artifact);
 
             const tokenInstance = await provider.getContract(AztecAddress.fromString(request.tokenContract));
-            await wallet.registerContract(tokenInstance, TokenContract.artifact)
+            await pxe.registerContract(tokenInstance, TokenContract.artifact)
 
             const contractFunctionInteraction: FunctionInteraction = JSON.parse(request.unsignedTxn);
             let authWitnesses: AuthWitness[] = [];
 
             if (contractFunctionInteraction.authwiths) {
-
-                contractFunctionInteraction.authwiths.forEach(async (authWith) => {
-
-                    const requestContractClass = await provider.getContract(AztecAddress.fromString(authWith.interactionAddress))
-                    const contractClassMetadata = await wallet.getContractClassMetadata(requestContractClass.currentContractClassId, true)
+                for (const authWith of contractFunctionInteraction.authwiths) {
+                    const requestContractClass = await provider.getContract(AztecAddress.fromString(authWith.interactionAddress));
+                    const contractClassMetadata = await pxe.getContractClassMetadata(requestContractClass.currentContractClassId, true);
 
                     if (!contractClassMetadata.artifact) {
                         throw new BadRequestException(`Artifact not registered`);
@@ -99,33 +95,31 @@ export class AztecTreasuryService extends TreasuryService {
                         throw new BadRequestException("Unable to get function ABI");
                     }
 
-                    authWith.args.unshift();
+                    authWith.args.unshift(solverAddress);
 
                     const functionInteraction = new ContractFunctionInteraction(
-                        wallet,
+                        pxe,
                         AztecAddress.fromString(authWith.interactionAddress),
                         functionAbi,
-                        [
-                            ...authWith.args
-                        ],
+                        [...authWith.args],
                     );
 
                     const intent: ContractFunctionInteractionCallIntent = {
                         caller: AztecAddress.fromString(authWith.callerAddress),
                         action: functionInteraction,
                     };
 
-                    const witness = await wallet.createAuthWit(
-                        AztecAddress.fromString(authWith.senderAddress),
+                    const witness = await pxe.createAuthWit(
+                        AztecAddress.fromString(solverAddress),
                         intent,
                     );
 
                     authWitnesses.push(witness);
-                });
+                }
             }
 
             const requestcontractClass = await provider.getContract(AztecAddress.fromString(contractFunctionInteraction.interactionAddress))
-            const contractClassMetadata = await wallet.getContractClassMetadata(requestcontractClass.currentContractClassId, true)
+            const contractClassMetadata = await pxe.getContractClassMetadata(requestcontractClass.currentContractClassId, true)
 
             if (!contractClassMetadata.artifact) {
                 throw new BadRequestException(`Artifact not registered`);
@@ -134,7 +128,7 @@ export class AztecTreasuryService extends TreasuryService {
             const functionAbi = getFunctionAbi(contractClassMetadata.artifact, contractFunctionInteraction.functionName);
 
             const functionInteraction = new ContractFunctionInteraction(
-                wallet,
+                pxe,
                 AztecAddress.fromString(contractFunctionInteraction.interactionAddress),
                 functionAbi,
                 [
@@ -156,7 +150,7 @@ export class AztecTreasuryService extends TreasuryService {
                 },
             );
 
-            const provenTx = await wallet.proveTx(executionPayload, sendOptions);
+            const provenTx = await pxe.proveTx(executionPayload, sendOptions);
 
             const tx = new Tx(
                 provenTx.getTxHash(),
@@ -170,7 +164,6 @@ export class AztecTreasuryService extends TreasuryService {
             const signedTxn = JSON.stringify({ signedTx: signedTxHex });
 
             return { signedTxn };
-
         }
         catch (error) {
             throw new BadRequestException(`Invalid unsigned transaction: ${error.message}`);
@@ -206,14 +199,12 @@ export class AztecTreasuryService extends TreasuryService {
 
             const wallet = await TestWallet.create(provider, fullConfig, { store });
 
-
             const sponsoredFPCInstance = await getContractInstanceFromInstantiationParams(
                 SponsoredFPCContract.artifact,
                 { salt: new Fr(0) },
             );
 
             const paymentMethod = new SponsoredFeePaymentMethod(sponsoredFPCInstance.address);
-
             const schnorrAccount = await wallet.createSchnorrAccount(
                 pkKey,
                 salt,
@@ -269,7 +260,6 @@ interface FunctionInteraction {
     functionName: string,
     args: any[],
     callerAddress?: string,
-    senderAddress?: string,
     authwiths?: FunctionInteraction[],
 }