@zkp2p/contracts-v2 0.0.2 → 0.0.5-rc.1

package/{_esm/types/contracts/unifiedVerifier/SimpleAttestationVerifier.js → _cjs/types/contracts/verifiers/keyHashAdapters/ManagedKeyHashAdapterV2.js}

@@ -4,6 +4,7 @@
 import type {
   BaseContract,
   BigNumber,
+  BigNumberish,
   BytesLike,
   CallOverrides,
   ContractTransaction,
@@ -24,161 +25,143 @@ import type {
   TypedListener,
   OnEvent,
   PromiseOrValue,
-} from "../../common";
+} from "../../../common";
 
-export interface SimpleAttestationVerifierInterface extends utils.Interface {
+export interface ManagedKeyHashAdapterV2Interface extends utils.Interface {
   functions: {
-    "MIN_WITNESS_SIGNATURES()": FunctionFragment;
+    "addMailServerKeyHash(bytes32)": FunctionFragment;
+    "getMailServerKeyHashes()": FunctionFragment;
+    "isMailServerKeyHash(bytes32)": FunctionFragment;
+    "mailServerKeyHashes(uint256)": FunctionFragment;
     "owner()": FunctionFragment;
+    "removeMailServerKeyHash(bytes32)": FunctionFragment;
     "renounceOwnership()": FunctionFragment;
-    "setWitness(address)": FunctionFragment;
-    "setZktlsAttestor(address)": FunctionFragment;
     "transferOwnership(address)": FunctionFragment;
-    "verify(bytes32,bytes[],bytes)": FunctionFragment;
-    "witness()": FunctionFragment;
-    "zktlsAttestor()": FunctionFragment;
   };
 
   getFunction(
     nameOrSignatureOrTopic:
-      | "MIN_WITNESS_SIGNATURES"
+      | "addMailServerKeyHash"
+      | "getMailServerKeyHashes"
+      | "isMailServerKeyHash"
+      | "mailServerKeyHashes"
       | "owner"
+      | "removeMailServerKeyHash"
       | "renounceOwnership"
-      | "setWitness"
-      | "setZktlsAttestor"
       | "transferOwnership"
-      | "verify"
-      | "witness"
-      | "zktlsAttestor"
   ): FunctionFragment;
 
   encodeFunctionData(
-    functionFragment: "MIN_WITNESS_SIGNATURES",
-    values?: undefined
+    functionFragment: "addMailServerKeyHash",
+    values: [PromiseOrValue<BytesLike>]
   ): string;
-  encodeFunctionData(functionFragment: "owner", values?: undefined): string;
   encodeFunctionData(
-    functionFragment: "renounceOwnership",
+    functionFragment: "getMailServerKeyHashes",
     values?: undefined
   ): string;
   encodeFunctionData(
-    functionFragment: "setWitness",
-    values: [PromiseOrValue<string>]
+    functionFragment: "isMailServerKeyHash",
+    values: [PromiseOrValue<BytesLike>]
   ): string;
   encodeFunctionData(
-    functionFragment: "setZktlsAttestor",
-    values: [PromiseOrValue<string>]
+    functionFragment: "mailServerKeyHashes",
+    values: [PromiseOrValue<BigNumberish>]
   ): string;
+  encodeFunctionData(functionFragment: "owner", values?: undefined): string;
   encodeFunctionData(
-    functionFragment: "transferOwnership",
-    values: [PromiseOrValue<string>]
+    functionFragment: "removeMailServerKeyHash",
+    values: [PromiseOrValue<BytesLike>]
   ): string;
   encodeFunctionData(
-    functionFragment: "verify",
-    values: [
-      PromiseOrValue<BytesLike>,
-      PromiseOrValue<BytesLike>[],
-      PromiseOrValue<BytesLike>
-    ]
+    functionFragment: "renounceOwnership",
+    values?: undefined
   ): string;
-  encodeFunctionData(functionFragment: "witness", values?: undefined): string;
   encodeFunctionData(
-    functionFragment: "zktlsAttestor",
-    values?: undefined
+    functionFragment: "transferOwnership",
+    values: [PromiseOrValue<string>]
   ): string;
 
   decodeFunctionResult(
-    functionFragment: "MIN_WITNESS_SIGNATURES",
+    functionFragment: "addMailServerKeyHash",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "renounceOwnership",
+    functionFragment: "getMailServerKeyHashes",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "setWitness", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "setZktlsAttestor",
+    functionFragment: "isMailServerKeyHash",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "transferOwnership",
+    functionFragment: "mailServerKeyHashes",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "removeMailServerKeyHash",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "renounceOwnership",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "verify", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "witness", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "zktlsAttestor",
+    functionFragment: "transferOwnership",
     data: BytesLike
   ): Result;
 
   events: {
+    "MailServerKeyHashAdded(bytes32)": EventFragment;
+    "MailServerKeyHashRemoved(bytes32)": EventFragment;
     "OwnershipTransferred(address,address)": EventFragment;
-    "RequireZktlsValidationUpdated(bool)": EventFragment;
-    "WitnessUpdated(address,address)": EventFragment;
-    "ZktlsAttestorUpdated(address,address)": EventFragment;
   };
 
+  getEvent(nameOrSignatureOrTopic: "MailServerKeyHashAdded"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "MailServerKeyHashRemoved"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "OwnershipTransferred"): EventFragment;
-  getEvent(
-    nameOrSignatureOrTopic: "RequireZktlsValidationUpdated"
-  ): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "WitnessUpdated"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ZktlsAttestorUpdated"): EventFragment;
 }
 
-export interface OwnershipTransferredEventObject {
-  previousOwner: string;
-  newOwner: string;
+export interface MailServerKeyHashAddedEventObject {
+  mailserverKeyHash: string;
 }
-export type OwnershipTransferredEvent = TypedEvent<
-  [string, string],
-  OwnershipTransferredEventObject
+export type MailServerKeyHashAddedEvent = TypedEvent<
+  [string],
+  MailServerKeyHashAddedEventObject
 >;
 
-export type OwnershipTransferredEventFilter =
-  TypedEventFilter<OwnershipTransferredEvent>;
-
-export interface RequireZktlsValidationUpdatedEventObject {
-  required: boolean;
-}
-export type RequireZktlsValidationUpdatedEvent = TypedEvent<
-  [boolean],
-  RequireZktlsValidationUpdatedEventObject
->;
+export type MailServerKeyHashAddedEventFilter =
+  TypedEventFilter<MailServerKeyHashAddedEvent>;
 
-export type RequireZktlsValidationUpdatedEventFilter =
-  TypedEventFilter<RequireZktlsValidationUpdatedEvent>;
-
-export interface WitnessUpdatedEventObject {
-  oldWitness: string;
-  newWitness: string;
+export interface MailServerKeyHashRemovedEventObject {
+  mailserverKeyHash: string;
 }
-export type WitnessUpdatedEvent = TypedEvent<
-  [string, string],
-  WitnessUpdatedEventObject
+export type MailServerKeyHashRemovedEvent = TypedEvent<
+  [string],
+  MailServerKeyHashRemovedEventObject
 >;
 
-export type WitnessUpdatedEventFilter = TypedEventFilter<WitnessUpdatedEvent>;
+export type MailServerKeyHashRemovedEventFilter =
+  TypedEventFilter<MailServerKeyHashRemovedEvent>;
 
-export interface ZktlsAttestorUpdatedEventObject {
-  oldAttestor: string;
-  newAttestor: string;
+export interface OwnershipTransferredEventObject {
+  previousOwner: string;
+  newOwner: string;
 }
-export type ZktlsAttestorUpdatedEvent = TypedEvent<
+export type OwnershipTransferredEvent = TypedEvent<
   [string, string],
-  ZktlsAttestorUpdatedEventObject
+  OwnershipTransferredEventObject
 >;
 
-export type ZktlsAttestorUpdatedEventFilter =
-  TypedEventFilter<ZktlsAttestorUpdatedEvent>;
+export type OwnershipTransferredEventFilter =
+  TypedEventFilter<OwnershipTransferredEvent>;
 
-export interface SimpleAttestationVerifier extends BaseContract {
+export interface ManagedKeyHashAdapterV2 extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: SimpleAttestationVerifierInterface;
+  interface: ManagedKeyHashAdapterV2Interface;
 
   queryFilter<TEvent extends TypedEvent>(
     event: TypedEventFilter<TEvent>,
@@ -200,21 +183,31 @@ export interface SimpleAttestationVerifier extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    MIN_WITNESS_SIGNATURES(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    owner(overrides?: CallOverrides): Promise<[string]>;
-
-    renounceOwnership(
+    addMailServerKeyHash(
+      _mailserverKeyHash: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
-    setWitness(
-      _newWitness: PromiseOrValue<string>,
+    getMailServerKeyHashes(overrides?: CallOverrides): Promise<[string[]]>;
+
+    isMailServerKeyHash(
+      arg0: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<[boolean]>;
+
+    mailServerKeyHashes(
+      arg0: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<[string]>;
+
+    owner(overrides?: CallOverrides): Promise<[string]>;
+
+    removeMailServerKeyHash(
+      _mailserverKeyHash: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
-    setZktlsAttestor(
-      _newAttestor: PromiseOrValue<string>,
+    renounceOwnership(
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
@@ -222,34 +215,33 @@ export interface SimpleAttestationVerifier extends BaseContract {
       newOwner: PromiseOrValue<string>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
+  };
 
-    verify(
-      _digest: PromiseOrValue<BytesLike>,
-      _sigs: PromiseOrValue<BytesLike>[],
-      _data: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[boolean] & { isValid: boolean }>;
+  addMailServerKeyHash(
+    _mailserverKeyHash: PromiseOrValue<BytesLike>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>;
 
-    witness(overrides?: CallOverrides): Promise<[string]>;
+  getMailServerKeyHashes(overrides?: CallOverrides): Promise<string[]>;
 
-    zktlsAttestor(overrides?: CallOverrides): Promise<[string]>;
-  };
+  isMailServerKeyHash(
+    arg0: PromiseOrValue<BytesLike>,
+    overrides?: CallOverrides
+  ): Promise<boolean>;
 
-  MIN_WITNESS_SIGNATURES(overrides?: CallOverrides): Promise<BigNumber>;
+  mailServerKeyHashes(
+    arg0: PromiseOrValue<BigNumberish>,
+    overrides?: CallOverrides
+  ): Promise<string>;
 
   owner(overrides?: CallOverrides): Promise<string>;
 
-  renounceOwnership(
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  setWitness(
-    _newWitness: PromiseOrValue<string>,
+  removeMailServerKeyHash(
+    _mailserverKeyHash: PromiseOrValue<BytesLike>,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
-  setZktlsAttestor(
-    _newAttestor: PromiseOrValue<string>,
+  renounceOwnership(
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
@@ -258,52 +250,54 @@ export interface SimpleAttestationVerifier extends BaseContract {
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
-  verify(
-    _digest: PromiseOrValue<BytesLike>,
-    _sigs: PromiseOrValue<BytesLike>[],
-    _data: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
+  callStatic: {
+    addMailServerKeyHash(
+      _mailserverKeyHash: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<void>;
 
-  witness(overrides?: CallOverrides): Promise<string>;
+    getMailServerKeyHashes(overrides?: CallOverrides): Promise<string[]>;
 
-  zktlsAttestor(overrides?: CallOverrides): Promise<string>;
+    isMailServerKeyHash(
+      arg0: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<boolean>;
 
-  callStatic: {
-    MIN_WITNESS_SIGNATURES(overrides?: CallOverrides): Promise<BigNumber>;
+    mailServerKeyHashes(
+      arg0: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<string>;
 
     owner(overrides?: CallOverrides): Promise<string>;
 
-    renounceOwnership(overrides?: CallOverrides): Promise<void>;
-
-    setWitness(
-      _newWitness: PromiseOrValue<string>,
+    removeMailServerKeyHash(
+      _mailserverKeyHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<void>;
 
-    setZktlsAttestor(
-      _newAttestor: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<void>;
+    renounceOwnership(overrides?: CallOverrides): Promise<void>;
 
     transferOwnership(
       newOwner: PromiseOrValue<string>,
       overrides?: CallOverrides
     ): Promise<void>;
-
-    verify(
-      _digest: PromiseOrValue<BytesLike>,
-      _sigs: PromiseOrValue<BytesLike>[],
-      _data: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    witness(overrides?: CallOverrides): Promise<string>;
-
-    zktlsAttestor(overrides?: CallOverrides): Promise<string>;
   };
 
   filters: {
+    "MailServerKeyHashAdded(bytes32)"(
+      mailserverKeyHash?: null
+    ): MailServerKeyHashAddedEventFilter;
+    MailServerKeyHashAdded(
+      mailserverKeyHash?: null
+    ): MailServerKeyHashAddedEventFilter;
+
+    "MailServerKeyHashRemoved(bytes32)"(
+      mailserverKeyHash?: null
+    ): MailServerKeyHashRemovedEventFilter;
+    MailServerKeyHashRemoved(
+      mailserverKeyHash?: null
+    ): MailServerKeyHashRemovedEventFilter;
+
     "OwnershipTransferred(address,address)"(
       previousOwner?: PromiseOrValue<string> | null,
       newOwner?: PromiseOrValue<string> | null
@@ -312,49 +306,34 @@ export interface SimpleAttestationVerifier extends BaseContract {
       previousOwner?: PromiseOrValue<string> | null,
       newOwner?: PromiseOrValue<string> | null
     ): OwnershipTransferredEventFilter;
-
-    "RequireZktlsValidationUpdated(bool)"(
-      required?: null
-    ): RequireZktlsValidationUpdatedEventFilter;
-    RequireZktlsValidationUpdated(
-      required?: null
-    ): RequireZktlsValidationUpdatedEventFilter;
-
-    "WitnessUpdated(address,address)"(
-      oldWitness?: PromiseOrValue<string> | null,
-      newWitness?: PromiseOrValue<string> | null
-    ): WitnessUpdatedEventFilter;
-    WitnessUpdated(
-      oldWitness?: PromiseOrValue<string> | null,
-      newWitness?: PromiseOrValue<string> | null
-    ): WitnessUpdatedEventFilter;
-
-    "ZktlsAttestorUpdated(address,address)"(
-      oldAttestor?: PromiseOrValue<string> | null,
-      newAttestor?: PromiseOrValue<string> | null
-    ): ZktlsAttestorUpdatedEventFilter;
-    ZktlsAttestorUpdated(
-      oldAttestor?: PromiseOrValue<string> | null,
-      newAttestor?: PromiseOrValue<string> | null
-    ): ZktlsAttestorUpdatedEventFilter;
   };
 
   estimateGas: {
-    MIN_WITNESS_SIGNATURES(overrides?: CallOverrides): Promise<BigNumber>;
+    addMailServerKeyHash(
+      _mailserverKeyHash: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>;
 
-    owner(overrides?: CallOverrides): Promise<BigNumber>;
+    getMailServerKeyHashes(overrides?: CallOverrides): Promise<BigNumber>;
 
-    renounceOwnership(
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    isMailServerKeyHash(
+      arg0: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    mailServerKeyHashes(
+      arg0: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    setWitness(
-      _newWitness: PromiseOrValue<string>,
+    owner(overrides?: CallOverrides): Promise<BigNumber>;
+
+    removeMailServerKeyHash(
+      _mailserverKeyHash: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
-    setZktlsAttestor(
-      _newAttestor: PromiseOrValue<string>,
+    renounceOwnership(
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
@@ -362,37 +341,36 @@ export interface SimpleAttestationVerifier extends BaseContract {
       newOwner: PromiseOrValue<string>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
-
-    verify(
-      _digest: PromiseOrValue<BytesLike>,
-      _sigs: PromiseOrValue<BytesLike>[],
-      _data: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    witness(overrides?: CallOverrides): Promise<BigNumber>;
-
-    zktlsAttestor(overrides?: CallOverrides): Promise<BigNumber>;
   };
 
   populateTransaction: {
-    MIN_WITNESS_SIGNATURES(
+    addMailServerKeyHash(
+      _mailserverKeyHash: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>;
+
+    getMailServerKeyHashes(
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+    isMailServerKeyHash(
+      arg0: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
 
-    renounceOwnership(
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    mailServerKeyHashes(
+      arg0: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    setWitness(
-      _newWitness: PromiseOrValue<string>,
+    owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    removeMailServerKeyHash(
+      _mailserverKeyHash: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
-    setZktlsAttestor(
-      _newAttestor: PromiseOrValue<string>,
+    renounceOwnership(
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -400,16 +378,5 @@ export interface SimpleAttestationVerifier extends BaseContract {
       newOwner: PromiseOrValue<string>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
-
-    verify(
-      _digest: PromiseOrValue<BytesLike>,
-      _sigs: PromiseOrValue<BytesLike>[],
-      _data: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    witness(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    zktlsAttestor(overrides?: CallOverrides): Promise<PopulatedTransaction>;
   };
 }

package/_cjs/types/contracts/verifiers/keyHashAdapters/index.js

@@ -0,0 +1,5 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+ from "./IKeyHashAdapterV2";
+ from "./ManagedKeyHashAdapterV2";

package/_cjs/utils/protocolUtils.js

@@ -55,3 +55,8 @@ export const calculateIntentHash = (
 
   return ethers.utils.hexZeroPad(BigNumber.from(intermediateHash).mod(CIRCOM_FIELD).toHexString(), 32);
 };
+
+
+export const calculatePaymentMethodHash = (paymentMethod: string): string => {
+  return ethers.utils.keccak256(ethers.utils.toUtf8Bytes(paymentMethod));
+}

package/_esm/abis/baseSepolia/Escrow.json

@@ -463,7 +463,7 @@
       {
         "indexed": false,
         "internalType": "uint256",
-        "name": "conversionRate",
+        "name": "minConversionRate",
         "type": "uint256"
       }
     ],
@@ -559,6 +559,12 @@
         "internalType": "uint256",
         "name": "amount",
         "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "netAdditionalAmount",
+        "type": "uint256"
       }
     ],
     "name": "DepositFundsAdded",
@@ -703,6 +709,12 @@
         "name": "amount",
         "type": "uint256"
       },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "netDepositAmount",
+        "type": "uint256"
+      },
       {
         "components": [
           {