@zkp2p/contracts-v2 0.0.5-rc.3 → 0.0.5

package/{types/contracts/verifiers/ZelleBaseVerifier.ts → _esm/types/contracts/unifiedVerifier/UnifiedPaymentVerifier.js}

@@ -29,36 +29,14 @@ import type {
 
 export declare namespace IPaymentVerifier {
   export type VerifyPaymentDataStruct = {
+    intentHash: PromiseOrValue<BytesLike>;
     paymentProof: PromiseOrValue<BytesLike>;
-    depositToken: PromiseOrValue<string>;
-    intentAmount: PromiseOrValue<BigNumberish>;
-    intentTimestamp: PromiseOrValue<BigNumberish>;
-    payeeDetails: PromiseOrValue<string>;
-    fiatCurrency: PromiseOrValue<BytesLike>;
-    conversionRate: PromiseOrValue<BigNumberish>;
-    depositData: PromiseOrValue<BytesLike>;
     data: PromiseOrValue<BytesLike>;
   };
 
-  export type VerifyPaymentDataStructOutput = [
-    string,
-    string,
-    BigNumber,
-    BigNumber,
-    string,
-    string,
-    BigNumber,
-    string,
-    string
-  ] & {
+  export type VerifyPaymentDataStructOutput = [string, string, string] & {
+    intentHash: string;
     paymentProof: string;
-    depositToken: string;
-    intentAmount: BigNumber;
-    intentTimestamp: BigNumber;
-    payeeDetails: string;
-    fiatCurrency: string;
-    conversionRate: BigNumber;
-    depositData: string;
     data: string;
   };
 
@@ -66,109 +44,96 @@ export declare namespace IPaymentVerifier {
     success: PromiseOrValue<boolean>;
     intentHash: PromiseOrValue<BytesLike>;
     releaseAmount: PromiseOrValue<BigNumberish>;
-    paymentCurrency: PromiseOrValue<BytesLike>;
-    paymentId: PromiseOrValue<string>;
   };
 
   export type PaymentVerificationResultStructOutput = [
     boolean,
     string,
-    BigNumber,
-    string,
-    string
-  ] & {
-    success: boolean;
-    intentHash: string;
-    releaseAmount: BigNumber;
-    paymentCurrency: string;
-    paymentId: string;
-  };
+    BigNumber
+  ] & { success: boolean; intentHash: string; releaseAmount: BigNumber };
 }
 
-export interface ZelleBaseVerifierInterface extends utils.Interface {
+export interface UnifiedPaymentVerifierInterface extends utils.Interface {
   functions: {
-    "addCurrency(bytes32)": FunctionFragment;
-    "escrow()": FunctionFragment;
-    "getCurrencies()": FunctionFragment;
-    "isCurrency(bytes32)": FunctionFragment;
+    "DOMAIN_SEPARATOR()": FunctionFragment;
+    "addPaymentMethod(bytes32)": FunctionFragment;
+    "attestationVerifier()": FunctionFragment;
+    "getPaymentMethods()": FunctionFragment;
+    "isPaymentMethod(bytes32)": FunctionFragment;
     "nullifierRegistry()": FunctionFragment;
+    "orchestrator()": FunctionFragment;
     "owner()": FunctionFragment;
-    "paymentMethodToVerifier(uint8)": FunctionFragment;
-    "removeCurrency(bytes32)": FunctionFragment;
-    "removePaymentMethodVerifier(uint8)": FunctionFragment;
+    "paymentMethods(uint256)": FunctionFragment;
+    "removePaymentMethod(bytes32)": FunctionFragment;
     "renounceOwnership()": FunctionFragment;
-    "setPaymentMethodVerifier(uint8,address)": FunctionFragment;
-    "setTimestampBuffer(uint256)": FunctionFragment;
-    "timestampBuffer()": FunctionFragment;
+    "setAttestationVerifier(address)": FunctionFragment;
     "transferOwnership(address)": FunctionFragment;
-    "verifyPayment((bytes,address,uint256,uint256,string,bytes32,uint256,bytes,bytes))": FunctionFragment;
+    "verifyPayment((bytes32,bytes,bytes))": FunctionFragment;
   };
 
   getFunction(
     nameOrSignatureOrTopic:
-      | "addCurrency"
-      | "escrow"
-      | "getCurrencies"
-      | "isCurrency"
+      | "DOMAIN_SEPARATOR"
+      | "addPaymentMethod"
+      | "attestationVerifier"
+      | "getPaymentMethods"
+      | "isPaymentMethod"
       | "nullifierRegistry"
+      | "orchestrator"
       | "owner"
-      | "paymentMethodToVerifier"
-      | "removeCurrency"
-      | "removePaymentMethodVerifier"
+      | "paymentMethods"
+      | "removePaymentMethod"
       | "renounceOwnership"
-      | "setPaymentMethodVerifier"
-      | "setTimestampBuffer"
-      | "timestampBuffer"
+      | "setAttestationVerifier"
       | "transferOwnership"
       | "verifyPayment"
   ): FunctionFragment;
 
   encodeFunctionData(
-    functionFragment: "addCurrency",
-    values: [PromiseOrValue<BytesLike>]
-  ): string;
-  encodeFunctionData(functionFragment: "escrow", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "getCurrencies",
+    functionFragment: "DOMAIN_SEPARATOR",
     values?: undefined
   ): string;
   encodeFunctionData(
-    functionFragment: "isCurrency",
+    functionFragment: "addPaymentMethod",
     values: [PromiseOrValue<BytesLike>]
   ): string;
   encodeFunctionData(
-    functionFragment: "nullifierRegistry",
+    functionFragment: "attestationVerifier",
     values?: undefined
   ): string;
-  encodeFunctionData(functionFragment: "owner", values?: undefined): string;
   encodeFunctionData(
-    functionFragment: "paymentMethodToVerifier",
-    values: [PromiseOrValue<BigNumberish>]
+    functionFragment: "getPaymentMethods",
+    values?: undefined
   ): string;
   encodeFunctionData(
-    functionFragment: "removeCurrency",
+    functionFragment: "isPaymentMethod",
     values: [PromiseOrValue<BytesLike>]
   ): string;
   encodeFunctionData(
-    functionFragment: "removePaymentMethodVerifier",
-    values: [PromiseOrValue<BigNumberish>]
+    functionFragment: "nullifierRegistry",
+    values?: undefined
   ): string;
   encodeFunctionData(
-    functionFragment: "renounceOwnership",
+    functionFragment: "orchestrator",
     values?: undefined
   ): string;
+  encodeFunctionData(functionFragment: "owner", values?: undefined): string;
   encodeFunctionData(
-    functionFragment: "setPaymentMethodVerifier",
-    values: [PromiseOrValue<BigNumberish>, PromiseOrValue<string>]
+    functionFragment: "paymentMethods",
+    values: [PromiseOrValue<BigNumberish>]
   ): string;
   encodeFunctionData(
-    functionFragment: "setTimestampBuffer",
-    values: [PromiseOrValue<BigNumberish>]
+    functionFragment: "removePaymentMethod",
+    values: [PromiseOrValue<BytesLike>]
   ): string;
   encodeFunctionData(
-    functionFragment: "timestampBuffer",
+    functionFragment: "renounceOwnership",
     values?: undefined
   ): string;
+  encodeFunctionData(
+    functionFragment: "setAttestationVerifier",
+    values: [PromiseOrValue<string>]
+  ): string;
   encodeFunctionData(
     functionFragment: "transferOwnership",
     values: [PromiseOrValue<string>]
@@ -179,46 +144,48 @@ export interface ZelleBaseVerifierInterface extends utils.Interface {
   ): string;
 
   decodeFunctionResult(
-    functionFragment: "addCurrency",
+    functionFragment: "DOMAIN_SEPARATOR",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "escrow", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "getCurrencies",
+    functionFragment: "addPaymentMethod",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "isCurrency", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "nullifierRegistry",
+    functionFragment: "attestationVerifier",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "paymentMethodToVerifier",
+    functionFragment: "getPaymentMethods",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "removeCurrency",
+    functionFragment: "isPaymentMethod",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "removePaymentMethodVerifier",
+    functionFragment: "nullifierRegistry",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "renounceOwnership",
+    functionFragment: "orchestrator",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "setPaymentMethodVerifier",
+    functionFragment: "paymentMethods",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "setTimestampBuffer",
+    functionFragment: "removePaymentMethod",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "timestampBuffer",
+    functionFragment: "renounceOwnership",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "setAttestationVerifier",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -231,40 +198,31 @@ export interface ZelleBaseVerifierInterface extends utils.Interface {
   ): Result;
 
   events: {
-    "CurrencyAdded(bytes32)": EventFragment;
-    "CurrencyRemoved(bytes32)": EventFragment;
+    "AttestationVerifierUpdated(address,address)": EventFragment;
     "OwnershipTransferred(address,address)": EventFragment;
-    "PaymentMethodVerifierRemoved(uint8)": EventFragment;
-    "PaymentMethodVerifierSet(uint8,address)": EventFragment;
-    "TimestampBufferSet(uint256)": EventFragment;
+    "PaymentMethodAdded(bytes32)": EventFragment;
+    "PaymentMethodRemoved(bytes32)": EventFragment;
+    "PaymentVerified(bytes32,bytes32,bytes32,uint256,uint256,bytes32,bytes32)": EventFragment;
   };
 
-  getEvent(nameOrSignatureOrTopic: "CurrencyAdded"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "CurrencyRemoved"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "AttestationVerifierUpdated"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "OwnershipTransferred"): EventFragment;
-  getEvent(
-    nameOrSignatureOrTopic: "PaymentMethodVerifierRemoved"
-  ): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "PaymentMethodVerifierSet"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "TimestampBufferSet"): EventFragment;
-}
-
-export interface CurrencyAddedEventObject {
-  currencyCode: string;
+  getEvent(nameOrSignatureOrTopic: "PaymentMethodAdded"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "PaymentMethodRemoved"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "PaymentVerified"): EventFragment;
 }
-export type CurrencyAddedEvent = TypedEvent<[string], CurrencyAddedEventObject>;
-
-export type CurrencyAddedEventFilter = TypedEventFilter<CurrencyAddedEvent>;
 
-export interface CurrencyRemovedEventObject {
-  currencyCode: string;
+export interface AttestationVerifierUpdatedEventObject {
+  oldVerifier: string;
+  newVerifier: string;
 }
-export type CurrencyRemovedEvent = TypedEvent<
-  [string],
-  CurrencyRemovedEventObject
+export type AttestationVerifierUpdatedEvent = TypedEvent<
+  [string, string],
+  AttestationVerifierUpdatedEventObject
 >;
 
-export type CurrencyRemovedEventFilter = TypedEventFilter<CurrencyRemovedEvent>;
+export type AttestationVerifierUpdatedEventFilter =
+  TypedEventFilter<AttestationVerifierUpdatedEvent>;
 
 export interface OwnershipTransferredEventObject {
   previousOwner: string;
@@ -278,46 +236,50 @@ export type OwnershipTransferredEvent = TypedEvent<
 export type OwnershipTransferredEventFilter =
   TypedEventFilter<OwnershipTransferredEvent>;
 
-export interface PaymentMethodVerifierRemovedEventObject {
-  paymentMethod: number;
+export interface PaymentMethodAddedEventObject {
+  paymentMethod: string;
 }
-export type PaymentMethodVerifierRemovedEvent = TypedEvent<
-  [number],
-  PaymentMethodVerifierRemovedEventObject
+export type PaymentMethodAddedEvent = TypedEvent<
+  [string],
+  PaymentMethodAddedEventObject
 >;
 
-export type PaymentMethodVerifierRemovedEventFilter =
-  TypedEventFilter<PaymentMethodVerifierRemovedEvent>;
+export type PaymentMethodAddedEventFilter =
+  TypedEventFilter<PaymentMethodAddedEvent>;
 
-export interface PaymentMethodVerifierSetEventObject {
-  paymentMethod: number;
-  verifier: string;
+export interface PaymentMethodRemovedEventObject {
+  paymentMethod: string;
 }
-export type PaymentMethodVerifierSetEvent = TypedEvent<
-  [number, string],
-  PaymentMethodVerifierSetEventObject
+export type PaymentMethodRemovedEvent = TypedEvent<
+  [string],
+  PaymentMethodRemovedEventObject
 >;
 
-export type PaymentMethodVerifierSetEventFilter =
-  TypedEventFilter<PaymentMethodVerifierSetEvent>;
-
-export interface TimestampBufferSetEventObject {
-  timestampBuffer: BigNumber;
+export type PaymentMethodRemovedEventFilter =
+  TypedEventFilter<PaymentMethodRemovedEvent>;
+
+export interface PaymentVerifiedEventObject {
+  intentHash: string;
+  method: string;
+  currency: string;
+  amount: BigNumber;
+  timestamp: BigNumber;
+  paymentId: string;
+  payeeId: string;
 }
-export type TimestampBufferSetEvent = TypedEvent<
-  [BigNumber],
-  TimestampBufferSetEventObject
+export type PaymentVerifiedEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber, string, string],
+  PaymentVerifiedEventObject
 >;
 
-export type TimestampBufferSetEventFilter =
-  TypedEventFilter<TimestampBufferSetEvent>;
+export type PaymentVerifiedEventFilter = TypedEventFilter<PaymentVerifiedEvent>;
 
-export interface ZelleBaseVerifier extends BaseContract {
+export interface UnifiedPaymentVerifier extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: ZelleBaseVerifierInterface;
+  interface: UnifiedPaymentVerifierInterface;
 
   queryFilter<TEvent extends TypedEvent>(
     event: TypedEventFilter<TEvent>,
@@ -339,36 +301,35 @@ export interface ZelleBaseVerifier extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    addCurrency(
-      _currencyCode: PromiseOrValue<BytesLike>,
+    DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<[string]>;
+
+    addPaymentMethod(
+      _paymentMethod: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
-    escrow(overrides?: CallOverrides): Promise<[string]>;
+    attestationVerifier(overrides?: CallOverrides): Promise<[string]>;
 
-    getCurrencies(overrides?: CallOverrides): Promise<[string[]]>;
+    getPaymentMethods(overrides?: CallOverrides): Promise<[string[]]>;
 
-    isCurrency(
+    isPaymentMethod(
       arg0: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<[boolean]>;
 
     nullifierRegistry(overrides?: CallOverrides): Promise<[string]>;
 
+    orchestrator(overrides?: CallOverrides): Promise<[string]>;
+
     owner(overrides?: CallOverrides): Promise<[string]>;
 
-    paymentMethodToVerifier(
+    paymentMethods(
       arg0: PromiseOrValue<BigNumberish>,
       overrides?: CallOverrides
     ): Promise<[string]>;
 
-    removeCurrency(
-      _currencyCode: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    removePaymentMethodVerifier(
-      _paymentMethod: PromiseOrValue<BigNumberish>,
+    removePaymentMethod(
+      _paymentMethod: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
@@ -376,19 +337,11 @@ export interface ZelleBaseVerifier extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
-    setPaymentMethodVerifier(
-      _paymentMethod: PromiseOrValue<BigNumberish>,
-      _verifier: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    setTimestampBuffer(
-      _timestampBuffer: PromiseOrValue<BigNumberish>,
+    setAttestationVerifier(
+      _newVerifier: PromiseOrValue<string>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
-    timestampBuffer(overrides?: CallOverrides): Promise<[BigNumber]>;
-
     transferOwnership(
       newOwner: PromiseOrValue<string>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -400,36 +353,35 @@ export interface ZelleBaseVerifier extends BaseContract {
     ): Promise<ContractTransaction>;
   };
 
-  addCurrency(
-    _currencyCode: PromiseOrValue<BytesLike>,
+  DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<string>;
+
+  addPaymentMethod(
+    _paymentMethod: PromiseOrValue<BytesLike>,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
-  escrow(overrides?: CallOverrides): Promise<string>;
+  attestationVerifier(overrides?: CallOverrides): Promise<string>;
 
-  getCurrencies(overrides?: CallOverrides): Promise<string[]>;
+  getPaymentMethods(overrides?: CallOverrides): Promise<string[]>;
 
-  isCurrency(
+  isPaymentMethod(
     arg0: PromiseOrValue<BytesLike>,
     overrides?: CallOverrides
   ): Promise<boolean>;
 
   nullifierRegistry(overrides?: CallOverrides): Promise<string>;
 
+  orchestrator(overrides?: CallOverrides): Promise<string>;
+
   owner(overrides?: CallOverrides): Promise<string>;
 
-  paymentMethodToVerifier(
+  paymentMethods(
     arg0: PromiseOrValue<BigNumberish>,
     overrides?: CallOverrides
   ): Promise<string>;
 
-  removeCurrency(
-    _currencyCode: PromiseOrValue<BytesLike>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  removePaymentMethodVerifier(
-    _paymentMethod: PromiseOrValue<BigNumberish>,
+  removePaymentMethod(
+    _paymentMethod: PromiseOrValue<BytesLike>,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
@@ -437,19 +389,11 @@ export interface ZelleBaseVerifier extends BaseContract {
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
-  setPaymentMethodVerifier(
-    _paymentMethod: PromiseOrValue<BigNumberish>,
-    _verifier: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  setTimestampBuffer(
-    _timestampBuffer: PromiseOrValue<BigNumberish>,
+  setAttestationVerifier(
+    _newVerifier: PromiseOrValue<string>,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
-  timestampBuffer(overrides?: CallOverrides): Promise<BigNumber>;
-
   transferOwnership(
     newOwner: PromiseOrValue<string>,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -461,54 +405,45 @@ export interface ZelleBaseVerifier extends BaseContract {
   ): Promise<ContractTransaction>;
 
   callStatic: {
-    addCurrency(
-      _currencyCode: PromiseOrValue<BytesLike>,
+    DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<string>;
+
+    addPaymentMethod(
+      _paymentMethod: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<void>;
 
-    escrow(overrides?: CallOverrides): Promise<string>;
+    attestationVerifier(overrides?: CallOverrides): Promise<string>;
 
-    getCurrencies(overrides?: CallOverrides): Promise<string[]>;
+    getPaymentMethods(overrides?: CallOverrides): Promise<string[]>;
 
-    isCurrency(
+    isPaymentMethod(
       arg0: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<boolean>;
 
     nullifierRegistry(overrides?: CallOverrides): Promise<string>;
 
+    orchestrator(overrides?: CallOverrides): Promise<string>;
+
     owner(overrides?: CallOverrides): Promise<string>;
 
-    paymentMethodToVerifier(
+    paymentMethods(
       arg0: PromiseOrValue<BigNumberish>,
       overrides?: CallOverrides
     ): Promise<string>;
 
-    removeCurrency(
-      _currencyCode: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    removePaymentMethodVerifier(
-      _paymentMethod: PromiseOrValue<BigNumberish>,
+    removePaymentMethod(
+      _paymentMethod: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<void>;
 
     renounceOwnership(overrides?: CallOverrides): Promise<void>;
 
-    setPaymentMethodVerifier(
-      _paymentMethod: PromiseOrValue<BigNumberish>,
-      _verifier: PromiseOrValue<string>,
+    setAttestationVerifier(
+      _newVerifier: PromiseOrValue<string>,
       overrides?: CallOverrides
     ): Promise<void>;
 
-    setTimestampBuffer(
-      _timestampBuffer: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    timestampBuffer(overrides?: CallOverrides): Promise<BigNumber>;
-
     transferOwnership(
       newOwner: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -521,11 +456,14 @@ export interface ZelleBaseVerifier extends BaseContract {
   };
 
   filters: {
-    "CurrencyAdded(bytes32)"(currencyCode?: null): CurrencyAddedEventFilter;
-    CurrencyAdded(currencyCode?: null): CurrencyAddedEventFilter;
-
-    "CurrencyRemoved(bytes32)"(currencyCode?: null): CurrencyRemovedEventFilter;
-    CurrencyRemoved(currencyCode?: null): CurrencyRemovedEventFilter;
+    "AttestationVerifierUpdated(address,address)"(
+      oldVerifier?: PromiseOrValue<string> | null,
+      newVerifier?: PromiseOrValue<string> | null
+    ): AttestationVerifierUpdatedEventFilter;
+    AttestationVerifierUpdated(
+      oldVerifier?: PromiseOrValue<string> | null,
+      newVerifier?: PromiseOrValue<string> | null
+    ): AttestationVerifierUpdatedEventFilter;
 
     "OwnershipTransferred(address,address)"(
       previousOwner?: PromiseOrValue<string> | null,
@@ -536,59 +474,70 @@ export interface ZelleBaseVerifier extends BaseContract {
       newOwner?: PromiseOrValue<string> | null
     ): OwnershipTransferredEventFilter;
 
-    "PaymentMethodVerifierRemoved(uint8)"(
-      paymentMethod?: null
-    ): PaymentMethodVerifierRemovedEventFilter;
-    PaymentMethodVerifierRemoved(
-      paymentMethod?: null
-    ): PaymentMethodVerifierRemovedEventFilter;
-
-    "PaymentMethodVerifierSet(uint8,address)"(
-      paymentMethod?: null,
-      verifier?: null
-    ): PaymentMethodVerifierSetEventFilter;
-    PaymentMethodVerifierSet(
-      paymentMethod?: null,
-      verifier?: null
-    ): PaymentMethodVerifierSetEventFilter;
-
-    "TimestampBufferSet(uint256)"(
-      timestampBuffer?: null
-    ): TimestampBufferSetEventFilter;
-    TimestampBufferSet(timestampBuffer?: null): TimestampBufferSetEventFilter;
+    "PaymentMethodAdded(bytes32)"(
+      paymentMethod?: PromiseOrValue<BytesLike> | null
+    ): PaymentMethodAddedEventFilter;
+    PaymentMethodAdded(
+      paymentMethod?: PromiseOrValue<BytesLike> | null
+    ): PaymentMethodAddedEventFilter;
+
+    "PaymentMethodRemoved(bytes32)"(
+      paymentMethod?: PromiseOrValue<BytesLike> | null
+    ): PaymentMethodRemovedEventFilter;
+    PaymentMethodRemoved(
+      paymentMethod?: PromiseOrValue<BytesLike> | null
+    ): PaymentMethodRemovedEventFilter;
+
+    "PaymentVerified(bytes32,bytes32,bytes32,uint256,uint256,bytes32,bytes32)"(
+      intentHash?: PromiseOrValue<BytesLike> | null,
+      method?: PromiseOrValue<BytesLike> | null,
+      currency?: PromiseOrValue<BytesLike> | null,
+      amount?: null,
+      timestamp?: null,
+      paymentId?: null,
+      payeeId?: null
+    ): PaymentVerifiedEventFilter;
+    PaymentVerified(
+      intentHash?: PromiseOrValue<BytesLike> | null,
+      method?: PromiseOrValue<BytesLike> | null,
+      currency?: PromiseOrValue<BytesLike> | null,
+      amount?: null,
+      timestamp?: null,
+      paymentId?: null,
+      payeeId?: null
+    ): PaymentVerifiedEventFilter;
   };
 
   estimateGas: {
-    addCurrency(
-      _currencyCode: PromiseOrValue<BytesLike>,
+    DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<BigNumber>;
+
+    addPaymentMethod(
+      _paymentMethod: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
-    escrow(overrides?: CallOverrides): Promise<BigNumber>;
+    attestationVerifier(overrides?: CallOverrides): Promise<BigNumber>;
 
-    getCurrencies(overrides?: CallOverrides): Promise<BigNumber>;
+    getPaymentMethods(overrides?: CallOverrides): Promise<BigNumber>;
 
-    isCurrency(
+    isPaymentMethod(
       arg0: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
     nullifierRegistry(overrides?: CallOverrides): Promise<BigNumber>;
 
+    orchestrator(overrides?: CallOverrides): Promise<BigNumber>;
+
     owner(overrides?: CallOverrides): Promise<BigNumber>;
 
-    paymentMethodToVerifier(
+    paymentMethods(
       arg0: PromiseOrValue<BigNumberish>,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    removeCurrency(
-      _currencyCode: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    removePaymentMethodVerifier(
-      _paymentMethod: PromiseOrValue<BigNumberish>,
+    removePaymentMethod(
+      _paymentMethod: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
@@ -596,19 +545,11 @@ export interface ZelleBaseVerifier extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
-    setPaymentMethodVerifier(
-      _paymentMethod: PromiseOrValue<BigNumberish>,
-      _verifier: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    setTimestampBuffer(
-      _timestampBuffer: PromiseOrValue<BigNumberish>,
+    setAttestationVerifier(
+      _newVerifier: PromiseOrValue<string>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
-    timestampBuffer(overrides?: CallOverrides): Promise<BigNumber>;
-
     transferOwnership(
       newOwner: PromiseOrValue<string>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -621,36 +562,37 @@ export interface ZelleBaseVerifier extends BaseContract {
   };
 
   populateTransaction: {
-    addCurrency(
-      _currencyCode: PromiseOrValue<BytesLike>,
+    DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    addPaymentMethod(
+      _paymentMethod: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
-    escrow(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+    attestationVerifier(
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
 
-    getCurrencies(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+    getPaymentMethods(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    isCurrency(
+    isPaymentMethod(
       arg0: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
     nullifierRegistry(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
+    orchestrator(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
     owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    paymentMethodToVerifier(
+    paymentMethods(
       arg0: PromiseOrValue<BigNumberish>,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    removeCurrency(
-      _currencyCode: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    removePaymentMethodVerifier(
-      _paymentMethod: PromiseOrValue<BigNumberish>,
+    removePaymentMethod(
+      _paymentMethod: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -658,19 +600,11 @@ export interface ZelleBaseVerifier extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
-    setPaymentMethodVerifier(
-      _paymentMethod: PromiseOrValue<BigNumberish>,
-      _verifier: PromiseOrValue<string>,
+    setAttestationVerifier(
+      _newVerifier: PromiseOrValue<string>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
-    setTimestampBuffer(
-      _timestampBuffer: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    timestampBuffer(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
     transferOwnership(
       newOwner: PromiseOrValue<string>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }