feat: Use actual tx fee in gas token when charging fee

noir-projects/aztec-nr/aztec/src/context/avm_context.nr

@@ -78,6 +78,11 @@ impl PublicContextInterface for AvmContext {
         0
     }
 
+    fn transaction_fee(self) -> Field {
+        assert(false, "'transaction_fee' not implemented!");
+        0
+    }
+
     fn nullifier_exists(self, unsiloed_nullifier: Field, address: AztecAddress) -> bool {
         nullifier_exists(unsiloed_nullifier, address.to_field()) == 1
     }

noir-projects/aztec-nr/aztec/src/context/interface.nr

@@ -54,6 +54,7 @@ trait PublicContextInterface {
         args: [Field]
     ) -> FunctionReturns<RETURNS_COUNT>;
     fn nullifier_exists(self, unsiloed_nullifier: Field, address: AztecAddress) -> bool;
+    fn transaction_fee(self) -> Field;
 }
 
 struct PrivateCallInterface<T> {

noir-projects/aztec-nr/aztec/src/context/public_context.nr

@@ -239,6 +239,10 @@ impl PublicContextInterface for PublicContext {
         self.inputs.public_global_variables.gas_fees.fee_per_l2_gas
     }
 
+    fn transaction_fee(self) -> Field {
+        self.inputs.transaction_fee
+    }
+
     fn nullifier_exists(self, unsiloed_nullifier: Field, address: AztecAddress) -> bool {
         // Current public can only check for settled nullifiers, so we always silo.
         let siloed_nullifier = silo_nullifier(address, unsiloed_nullifier);

noir-projects/noir-contracts/contracts/app_subscription_contract/src/main.nr

@@ -31,6 +31,7 @@ contract AppSubscription {
         subscription_price: SharedImmutable<Field>,
         subscriptions: Map<AztecAddress, PrivateMutable<SubscriptionNote>>,
         gas_token_address: SharedImmutable<AztecAddress>,
+        gas_token_limit_per_tx: SharedImmutable<Field>,
     }
 
     global SUBSCRIPTION_DURATION_IN_BLOCKS = 5;
@@ -47,7 +48,8 @@ contract AppSubscription {
         note.remaining_txs -= 1;
         storage.subscriptions.at(user_address).replace(&mut note, true);
 
-        GasToken::at(storage.gas_token_address.read_private()).pay_fee(42).enqueue(&mut context);
+        let gas_limit = storage.gas_token_limit_per_tx.read_private();
+        GasToken::at(storage.gas_token_address.read_private()).pay_fee(gas_limit).enqueue(&mut context);
 
         context.end_setup();
 
@@ -63,14 +65,15 @@ contract AppSubscription {
         subscription_recipient_address: AztecAddress,
         subscription_token_address: AztecAddress,
         subscription_price: Field,
-        gas_token_address: AztecAddress
+        gas_token_address: AztecAddress,
+        gas_token_limit_per_tx: Field
     ) {
         storage.target_address.initialize(target_address);
         storage.subscription_token_address.initialize(subscription_token_address);
         storage.subscription_recipient_address.initialize(subscription_recipient_address);
         storage.subscription_price.initialize(subscription_price);
-
         storage.gas_token_address.initialize(gas_token_address);
+        storage.gas_token_limit_per_tx.initialize(gas_token_limit_per_tx);
     }
 
     #[aztec(public)]

noir-projects/noir-contracts/contracts/gas_token_contract/src/lib.nr

@@ -2,8 +2,8 @@ use dep::aztec::prelude::{AztecAddress, EthAddress};
 use dep::aztec::context::interface::PublicContextInterface;
 use dep::aztec::protocol_types::hash::sha256_to_field;
 
-pub fn calculate_fee<TPublicContext>(_context: TPublicContext) -> U128 where TPublicContext: PublicContextInterface {
-    U128::from_integer(1)
+pub fn calculate_fee<TPublicContext>(context: TPublicContext) -> Field where TPublicContext: PublicContextInterface {
+    context.transaction_fee()
 }
 
 pub fn get_bridge_gas_msg_hash(owner: AztecAddress, amount: Field) -> Field {

noir-projects/noir-contracts/contracts/gas_token_contract/src/main.nr

@@ -54,7 +54,11 @@ contract GasToken {
     #[aztec(public)]
     fn pay_fee(fee_limit: Field) -> Field {
         let fee_limit_u128 = U128::from_integer(fee_limit);
-        let fee = calculate_fee(context);
+        let fee = U128::from_integer(calculate_fee(context));
+        dep::aztec::oracle::debug_log::debug_log_format(
+            "Gas token: paying fee {0} (limit {1})",
+            [fee.to_field(), fee_limit]
+        );
         assert(fee <= fee_limit_u128, "Fee too high");
 
         let sender_new_balance = storage.balances.at(context.msg_sender()).read() - fee;

yarn-project/aztec-node/src/aztec-node/server.ts

@@ -676,7 +676,7 @@ export class AztecNodeService implements AztecNode {
       this.log.warn(`Simulated tx ${tx.getTxHash()} reverts: ${reverted[0].revertReason}`);
       throw reverted[0].revertReason;
     }
-    this.log.info(`Simulated tx ${tx.getTxHash()} succeeds`);
+    this.log.debug(`Simulated tx ${tx.getTxHash()} succeeds`);
     const [processedTx] = processedTxs;
     return {
       constants: processedTx.data.constants,

yarn-project/circuit-types/src/interfaces/configs.ts

@@ -33,10 +33,8 @@ export interface SequencerConfig {
   acvmWorkingDirectory?: string;
   /** The path to the ACVM binary */
   acvmBinaryPath?: string;
-
   /** The list of functions calls allowed to run in setup */
   allowedFunctionsInSetup?: AllowedFunction[];
-
   /** The list of functions calls allowed to run teardown */
   allowedFunctionsInTeardown?: AllowedFunction[];
 }

yarn-project/end-to-end/src/client_prover_integration/client_prover_test.ts

@@ -19,9 +19,10 @@ import * as fs from 'fs/promises';
 
 import { waitRegisteredAccountSynced } from '../benchmarks/utils.js';
 import {
-  SnapshotManager,
+  type ISnapshotManager,
   type SubsystemsContext,
   addAccounts,
+  createSnapshotManager,
   publicDeployAccounts,
 } from '../fixtures/snapshot_manager.js';
 import { getBBConfig, setupPXEService } from '../fixtures/utils.js';
@@ -42,7 +43,7 @@ export class ClientProverTest {
   static TOKEN_NAME = 'Aztec Token';
   static TOKEN_SYMBOL = 'AZT';
   static TOKEN_DECIMALS = 18n;
-  private snapshotManager: SnapshotManager;
+  private snapshotManager: ISnapshotManager;
   logger: DebugLogger;
   keys: Array<[Fr, Fq]> = [];
   wallets: AccountWalletWithSecretKey[] = [];
@@ -59,7 +60,7 @@ export class ClientProverTest {
 
   constructor(testName: string) {
     this.logger = createDebugLogger(`aztec:client_prover_test:${testName}`);
-    this.snapshotManager = new SnapshotManager(`client_prover_integration/${testName}`, dataPath);
+    this.snapshotManager = createSnapshotManager(`client_prover_integration/${testName}`, dataPath);
   }
 
   /**

yarn-project/end-to-end/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts

@@ -13,9 +13,10 @@ import {
 import { DocsExampleContract, TokenBlacklistContract, type TokenContract } from '@aztec/noir-contracts.js';
 
 import {
-  SnapshotManager,
+  type ISnapshotManager,
   type SubsystemsContext,
   addAccounts,
+  createSnapshotManager,
   publicDeployAccounts,
 } from '../fixtures/snapshot_manager.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
@@ -54,7 +55,7 @@ export class BlacklistTokenContractTest {
   // This value MUST match the same value that we have in the contract
   static DELAY = 2;
 
-  private snapshotManager: SnapshotManager;
+  private snapshotManager: ISnapshotManager;
   logger: DebugLogger;
   wallets: AccountWallet[] = [];
   accounts: CompleteAddress[] = [];
@@ -68,7 +69,7 @@ export class BlacklistTokenContractTest {
 
   constructor(testName: string) {
     this.logger = createDebugLogger(`aztec:e2e_blacklist_token_contract:${testName}`);
-    this.snapshotManager = new SnapshotManager(`e2e_blacklist_token_contract/${testName}`, dataPath);
+    this.snapshotManager = createSnapshotManager(`e2e_blacklist_token_contract/${testName}`, dataPath);
   }
 
   async mineBlocks(amount: number = BlacklistTokenContractTest.DELAY) {

yarn-project/end-to-end/src/e2e_blacklist_token_contract/minting.test.ts

@@ -14,7 +14,7 @@ describe('e2e_blacklist_token_contract mint', () => {
     await t.setup();
     // Have to destructure again to ensure we have latest refs.
     ({ asset, tokenSim, wallets, blacklisted } = t);
-  }, 200_000);
+  }, 300_000);
 
   afterAll(async () => {
     await t.teardown();