@zkp2p/contracts-v2 0.0.4 → 0.0.5-rc.2

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

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