unify contract handling

Thunkar · Thunkar · commit 24dd5e32443b · 2026-04-16T06:19:08.000+02:00
diff --git a/src/components/swap/SwapContainer.tsx b/src/components/swap/SwapContainer.tsx
@@ -51,7 +51,7 @@ export function SwapContainer() {
     dismissError: dismissSwapError,
   } = useSwap();
 
-  const subscriptionStatus = useSubscriptionStatus(isSwapping, swapPhase, dripPhase);
+  const subscriptionStatus = useSubscriptionStatus(swapPhase, dripPhase);
   const isBlocked = subscriptionStatus.kind === 'full' || subscriptionStatus.kind === 'depleted';
 
   // Drip success banner
@@ -108,7 +108,8 @@ export function SwapContainer() {
     }
   }, [onboardingStatus, refetchBalances]);
 
-  // Refetch balances when swap succeeds
+  // Batched refresh after swap or drip success — single wallet roundtrip for
+  // exchange rate + balances + subscription status
   useEffect(() => {
     if (swapPhase === 'success') {
       refetchBalances();
diff --git a/src/contexts/contracts/ContractsContext.tsx b/src/contexts/contracts/ContractsContext.tsx
@@ -7,6 +7,7 @@ import { createContext, useContext, useEffect, type ReactNode, useCallback } fro
 import type { AztecAddress } from '@aztec/aztec.js/addresses';
 import type { TxReceipt } from '@aztec/stdlib/tx';
 import type { AMMContract } from '../../../contracts/target/AMM';
+import type { SubscriptionFPC } from '@gregojuice/contracts/subscription-fpc';
 import { useWallet } from '../wallet';
 import { useNetwork } from '../network';
 import * as contractService from '../../services/contractService';
@@ -21,6 +22,7 @@ interface ContractsContextType {
 
   // Utility methods
   getAmm: () => AMMContract | null;
+  getFpc: () => SubscriptionFPC | null;
   getExchangeRate: () => Promise<number>;
   swap: (amountOut: number, amountInMax: number) => Promise<TxReceipt>;
   unsponsoredSwap: (amountOut: number, amountInMax: number) => Promise<TxReceipt>;
@@ -88,6 +90,11 @@ export function ContractsProvider({ children }: ContractsProviderProps) {
     return state.contracts.amm ?? null;
   }, [state.contracts.amm]);
 
+  // Get FPC wrapper instance (for hooks that need it)
+  const getFpc = useCallback((): SubscriptionFPC | null => {
+    return state.contracts.fpc ?? null;
+  }, [state.contracts.fpc]);
+
   // Get exchange rate
   const getExchangeRate = useCallback(async (): Promise<number> => {
     if (
@@ -106,6 +113,7 @@ export function ContractsProvider({ children }: ContractsProviderProps) {
         gregoCoin: state.contracts.gregoCoin,
         gregoCoinPremium: state.contracts.gregoCoinPremium,
         amm: state.contracts.amm,
+        fpc: state.contracts.fpc,
       },
       currentAddress,
     );
@@ -119,17 +127,18 @@ export function ContractsProvider({ children }: ContractsProviderProps) {
         !currentAddress ||
         !state.contracts.amm ||
         !state.contracts.gregoCoin ||
-        !state.contracts.gregoCoinPremium
+        !state.contracts.gregoCoinPremium ||
+        !state.contracts.fpc
       ) {
         throw new Error('Contracts not initialized');
       }
 
       return contractService.executeSponsoredSwap(
-        wallet,
         activeNetwork,
         state.contracts.amm,
         state.contracts.gregoCoin,
         state.contracts.gregoCoinPremium,
+        state.contracts.fpc,
         currentAddress,
         amountOut,
         amountInMax,
@@ -156,6 +165,7 @@ export function ContractsProvider({ children }: ContractsProviderProps) {
           gregoCoin: state.contracts.gregoCoin,
           gregoCoinPremium: state.contracts.gregoCoinPremium,
           amm: state.contracts.amm,
+          fpc: state.contracts.fpc,
         },
         currentAddress,
         amountOut,
@@ -177,6 +187,7 @@ export function ContractsProvider({ children }: ContractsProviderProps) {
         gregoCoin: state.contracts.gregoCoin,
         gregoCoinPremium: state.contracts.gregoCoinPremium,
         amm: state.contracts.amm!,
+        fpc: state.contracts.fpc,
       },
       currentAddress,
     );
@@ -200,6 +211,7 @@ export function ContractsProvider({ children }: ContractsProviderProps) {
         gregoCoin: state.contracts.gregoCoin,
         gregoCoinPremium: state.contracts.gregoCoinPremium,
         amm: state.contracts.amm,
+        fpc: state.contracts.fpc,
       },
       currentAddress,
     );
@@ -210,13 +222,20 @@ export function ContractsProvider({ children }: ContractsProviderProps) {
   // Execute drip
   const drip = useCallback(
     async (password: string, recipient: AztecAddress): Promise<TxReceipt> => {
-      if (!wallet || !node || !state.contracts.pop) {
+      if (!wallet || !node || !state.contracts.pop || !state.contracts.fpc) {
         throw new Error('ProofOfPassword contract not initialized');
       }
 
-      return contractService.executeDrip(wallet, activeNetwork, state.contracts.pop, password, recipient);
+      return contractService.executeDrip(
+        wallet,
+        activeNetwork,
+        state.contracts.pop,
+        state.contracts.fpc,
+        password,
+        recipient,
+      );
     },
-    [wallet, activeNetwork, state.contracts.pop],
+    [wallet, activeNetwork, state.contracts.pop, state.contracts.fpc],
   );
 
   // Initialize contracts for embedded wallet
@@ -247,6 +266,7 @@ export function ContractsProvider({ children }: ContractsProviderProps) {
     registerBaseContracts,
     registerDripContracts,
     getAmm,
+    getFpc,
     getExchangeRate,
     swap,
     unsponsoredSwap,
diff --git a/src/contexts/contracts/reducer.ts b/src/contexts/contracts/reducer.ts
@@ -6,6 +6,7 @@
 import type { TokenContract } from '@aztec/noir-contracts.js/Token';
 import type { AMMContract } from '../../../contracts/target/AMM';
 import type { ProofOfPasswordContract } from '../../../contracts/target/ProofOfPassword';
+import type { SubscriptionFPC } from '@gregojuice/contracts/subscription-fpc';
 import { createReducerHook, type ActionsFrom } from '../utils';
 
 // =============================================================================
@@ -17,6 +18,7 @@ export interface Contracts {
   gregoCoinPremium: TokenContract | null;
   amm: AMMContract | null;
   pop: ProofOfPasswordContract | null;
+  fpc: SubscriptionFPC | null;
 }
 
 export type ContractRegistrationStage = 'base' | 'drip';
@@ -32,6 +34,7 @@ export const initialContractsState: ContractsState = {
     gregoCoinPremium: null,
     amm: null,
     pop: null,
+    fpc: null,
   },
   isLoading: true,
 };
diff --git a/src/contexts/swap/SwapContext.tsx b/src/contexts/swap/SwapContext.tsx
@@ -214,7 +214,7 @@ export function SwapProvider({ children }: SwapProviderProps) {
         }
       }
     },
-    [state.exchangeRate, actions]
+    [state.exchangeRate, actions],
   );
 
   const setToAmount = useCallback(
@@ -230,7 +230,7 @@ export function SwapProvider({ children }: SwapProviderProps) {
         }
       }
     },
-    [state.exchangeRate, actions]
+    [state.exchangeRate, actions],
   );
 
   // Computed values
diff --git a/src/hooks/useSubscriptionStatus.ts b/src/hooks/useSubscriptionStatus.ts
@@ -6,9 +6,9 @@ import { useContracts } from '../contexts/contracts';
 import { useNetwork } from '../contexts/network';
 import { useOnboarding } from '../contexts/onboarding';
 
-export function useSubscriptionStatus(isSwapping: boolean, swapPhase: string, dripPhase: string): SubscriptionStatus {
-  const { wallet, currentAddress } = useWallet();
-  const { getAmm } = useContracts();
+export function useSubscriptionStatus(swapPhase: string, dripPhase: string): SubscriptionStatus {
+  const { currentAddress } = useWallet();
+  const { getAmm, getFpc } = useContracts();
   const { activeNetwork } = useNetwork();
   const { status: onboardingStatus } = useOnboarding();
   const [status, setStatus] = useState<SubscriptionStatus>({ kind: 'no_fpc' });
@@ -25,22 +25,23 @@ export function useSubscriptionStatus(isSwapping: boolean, swapPhase: string, dr
 
   const fetchStatus = useCallback(async () => {
     const amm = getAmm();
-    if (!wallet || !currentAddress || !amm || !isOnboarded) return;
+    const fpc = getFpc();
+    if (!currentAddress || !amm || !isOnboarded) return;
     if (!activeNetwork.subscriptionFPC) {
       setStatus({ kind: 'no_fpc' });
       return;
     }
     if (isFetchingRef.current) return;
     isFetchingRef.current = true;
     try {
-      const result = await querySubscriptionStatus(wallet, activeNetwork, amm, currentAddress);
+      const result = await querySubscriptionStatus(activeNetwork, amm, currentAddress, fpc);
       setStatus(result);
     } catch {
       // Leave previous status on transient error to avoid flicker
     } finally {
       isFetchingRef.current = false;
     }
-  }, [wallet, currentAddress, activeNetwork, getAmm, isOnboarded]);
+  }, [currentAddress, activeNetwork, getAmm, getFpc, isOnboarded]);
 
   // Fetch after onboarding completes
   useEffect(() => {
diff --git a/src/services/contractService.ts b/src/services/contractService.ts
@@ -3,18 +3,22 @@
  * Pure functions for contract-related operations
  */
 
-import type { Wallet } from '@aztec/aztec.js/wallet';
+import type { BatchedMethod, Wallet, TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
 import type { AztecNode } from '@aztec/aztec.js/node';
 import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { AztecAddress as AztecAddressClass } from '@aztec/aztec.js/addresses';
 import { Fr } from '@aztec/aztec.js/fields';
 import { FunctionSelector } from '@aztec/aztec.js/abi';
 import { BatchCall, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
 import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
+import { type FunctionCall, decodeFromAbi } from '@aztec/stdlib/abi';
+import { ExecutionPayload } from '@aztec/stdlib/tx';
+import { UtilityExecutionResult } from '@aztec/stdlib/tx';
 import type { TxReceipt } from '@aztec/stdlib/tx';
 import type { TokenContract } from '@aztec/noir-contracts.js/Token';
 import type { AMMContract } from '../../contracts/target/AMM';
 import type { ProofOfPasswordContract } from '../../contracts/target/ProofOfPassword';
+import { SubscriptionFPC } from '@gregojuice/contracts/subscription-fpc';
 import { BigDecimal } from '../utils/bigDecimal';
 import type { NetworkConfig } from '../config/networks';
 import type { OnboardingResult } from '../contexts/onboarding/reducer';
@@ -26,13 +30,15 @@ export interface SwapContracts {
   gregoCoin: TokenContract;
   gregoCoinPremium: TokenContract;
   amm: AMMContract;
+  fpc: SubscriptionFPC | null;
 }
 
 /**
  * Contracts returned after drip registration
  */
 export interface DripContracts {
   pop: ProofOfPasswordContract;
+  fpc: SubscriptionFPC | null;
 }
 
 /**
@@ -138,7 +144,10 @@ export async function registerSwapContracts(
   const gregoCoinPremium = TokenContract.at(gregoCoinPremiumAddress, wallet);
   const amm = AMMContract.at(ammAddress, wallet);
 
-  return { gregoCoin, gregoCoinPremium, amm };
+  // Instantiate FPC wrapper if configured
+  const fpc = subFPC && fpcAddress ? SubscriptionFPC.at(fpcAddress, wallet) : null;
+
+  return { gregoCoin, gregoCoinPremium, amm, fpc };
 }
 
 /**
@@ -206,7 +215,11 @@ export async function registerDripContracts(
   // Instantiate the ProofOfPassword contract
   const pop = ProofOfPasswordContract.at(popAddress, wallet);
 
-  return { pop };
+  // Instantiate FPC wrapper if configured
+  const fpcAddr = subFPC ? AztecAddressClass.fromString(subFPC.address) : undefined;
+  const fpc = fpcAddr ? SubscriptionFPC.at(fpcAddr, wallet) : null;
+
+  return { pop, fpc };
 }
 
 /**
@@ -339,11 +352,11 @@ function markSubscribed(fpcAddress: string, configIndex: number, userAddress: st
  * Uses subscribe on first call, sponsor on subsequent calls.
  */
 export async function executeSponsoredSwap(
-  wallet: Wallet,
   network: NetworkConfig,
   amm: SwapContracts['amm'],
   gregoCoin: SwapContracts['gregoCoin'],
   gregoCoinPremium: SwapContracts['gregoCoinPremium'],
+  fpc: SubscriptionFPC,
   userAddress: AztecAddress,
   amountOut: number,
   amountInMax: number,
@@ -372,12 +385,6 @@ export async function executeSponsoredSwap(
     );
   }
 
-  const fpcAddress = AztecAddressClass.fromString(subFPC.address);
-  const { SubscriptionFPCContract } = await import('@gregojuice/contracts/artifacts/SubscriptionFPC');
-  const { SubscriptionFPC } = await import('@gregojuice/contracts/subscription-fpc');
-  const rawFPC = SubscriptionFPCContract.at(fpcAddress, wallet);
-  const fpc = new SubscriptionFPC(rawFPC);
-
   const subscribed = hasSubscription(subFPC.address, configIndex, userAddress.toString());
 
   if (subscribed) {
@@ -422,12 +429,12 @@ export async function executeUnsponsoredSwap(
 }
 
 export type SubscriptionStatusKind =
-  | 'loading'    // query in flight
-  | 'no_fpc'     // no FPC configured for this network — hide everything
-  | 'sponsored'  // user not yet subscribed, slots available — first swap will be free
-  | 'active'     // user has subscription with uses remaining — swap is free
-  | 'full'       // no slots left, user never subscribed — must bridge
-  | 'depleted';  // user's uses exhausted — must bridge
+  | 'loading' // query in flight
+  | 'no_fpc' // no FPC configured for this network — hide everything
+  | 'sponsored' // user not yet subscribed, slots available — first swap will be free
+  | 'active' // user has subscription with uses remaining — swap is free
+  | 'full' // no slots left, user never subscribed — must bridge
+  | 'depleted'; // user's uses exhausted — must bridge
 
 export interface SubscriptionStatus {
   kind: SubscriptionStatusKind;
@@ -440,13 +447,13 @@ export interface SubscriptionStatus {
  * Returns the status kind based on available slots and user subscription state.
  */
 export async function querySubscriptionStatus(
-  wallet: Wallet,
   network: NetworkConfig,
   amm: SwapContracts['amm'],
   userAddress: AztecAddress,
+  fpc: SubscriptionFPC | null,
 ): Promise<SubscriptionStatus> {
   const subFPC = network.subscriptionFPC;
-  if (!subFPC) return { kind: 'no_fpc' };
+  if (!subFPC || !fpc) return { kind: 'no_fpc' };
 
   // Derive configIndex + selector from the AMM's function map — take the first entry
   const ammFunctions = subFPC.functions[amm.address.toString()];
@@ -458,15 +465,11 @@ export async function querySubscriptionStatus(
   const selector = FunctionSelector.fromString(selectorHex);
   const configId = await poseidon2Hash([amm.address.toField(), selector.toField(), new Fr(configIndex)]);
 
-  const fpcAddress = AztecAddressClass.fromString(subFPC.address);
-  const { SubscriptionFPCContract } = await import('@gregojuice/contracts/artifacts/SubscriptionFPC');
-  const rawFPC = SubscriptionFPCContract.at(fpcAddress, wallet);
-
   // SlotNote is owned by the FPC — must simulate from fpc.address
   // SubscriptionNote is owned by the user — must simulate from userAddress
   const [{ result: slotsResult }, { result: subInfoResult }] = await Promise.all([
-    rawFPC.methods.count_available_slots(configId).simulate({ from: fpcAddress }),
-    rawFPC.methods.get_subscription_info(userAddress, configId).simulate({ from: userAddress }),
+    fpc.methods.count_available_slots(configId).simulate({ from: fpc.address }),
+    fpc.methods.get_subscription_info(userAddress, configId).simulate({ from: userAddress }),
   ]);
 
   const availableSlots = Number(slotsResult);
@@ -510,6 +513,7 @@ export async function executeDrip(
   wallet: Wallet,
   network: NetworkConfig,
   pop: ProofOfPasswordContract,
+  fpc: SubscriptionFPC,
   password: string,
   recipient: AztecAddress,
 ): Promise<TxReceipt> {
@@ -524,12 +528,6 @@ export async function executeDrip(
     throw new Error(`No subscription config found for ${pop.address.toString()} selector ${call.selector.toString()}`);
   }
 
-  const fpcAddress = AztecAddressClass.fromString(subFPC.address);
-  const { SubscriptionFPCContract } = await import('@gregojuice/contracts/artifacts/SubscriptionFPC');
-  const { SubscriptionFPC } = await import('@gregojuice/contracts/subscription-fpc');
-  const rawFPC = SubscriptionFPCContract.at(fpcAddress, wallet);
-  const fpc = new SubscriptionFPC(rawFPC);
-
   const accounts = await wallet.getAccounts();
   const userAddress = accounts[0]?.item ?? recipient;
 

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ export function SwapProvider({ children }: SwapProviderProps) {`
`214`	`214`	`}`
`215`	`215`	`}`
`216`	`216`	`},`
`217`		`- [state.exchangeRate, actions]`
	`217`	`+ [state.exchangeRate, actions],`
`218`	`218`	`);`
`219`	`219`
`220`	`220`	`const setToAmount = useCallback(`
`@@ -230,7 +230,7 @@ export function SwapProvider({ children }: SwapProviderProps) {`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`	`},`
`233`		`- [state.exchangeRate, actions]`
	`233`	`+ [state.exchangeRate, actions],`
`234`	`234`	`);`
`235`	`235`
`236`	`236`	`// Computed values`