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

package/_cjs/types/contracts/interfaces/IOrchestrator.js

@@ -54,7 +54,7 @@ export declare namespace IOrchestrator {
     depositId: PromiseOrValue<BigNumberish>;
     amount: PromiseOrValue<BigNumberish>;
     timestamp: PromiseOrValue<BigNumberish>;
-    paymentMethod: PromiseOrValue<BytesLike>;
+    paymentVerifier: PromiseOrValue<string>;
     fiatCurrency: PromiseOrValue<BytesLike>;
     conversionRate: PromiseOrValue<BigNumberish>;
     referrer: PromiseOrValue<string>;
@@ -84,7 +84,7 @@ export declare namespace IOrchestrator {
     depositId: BigNumber;
     amount: BigNumber;
     timestamp: BigNumber;
-    paymentMethod: string;
+    paymentVerifier: string;
     fiatCurrency: string;
     conversionRate: BigNumber;
     referrer: string;
@@ -98,7 +98,7 @@ export declare namespace IOrchestrator {
     depositId: PromiseOrValue<BigNumberish>;
     amount: PromiseOrValue<BigNumberish>;
     to: PromiseOrValue<string>;
-    paymentMethod: PromiseOrValue<BytesLike>;
+    verifier: PromiseOrValue<string>;
     fiatCurrency: PromiseOrValue<BytesLike>;
     conversionRate: PromiseOrValue<BigNumberish>;
     referrer: PromiseOrValue<string>;
@@ -128,7 +128,7 @@ export declare namespace IOrchestrator {
     depositId: BigNumber;
     amount: BigNumber;
     to: string;
-    paymentMethod: string;
+    verifier: string;
     fiatCurrency: string;
     conversionRate: BigNumber;
     referrer: string;
@@ -147,8 +147,8 @@ export interface IOrchestratorInterface extends utils.Interface {
     "getAccountIntents(address)": FunctionFragment;
     "getIntent(bytes32)": FunctionFragment;
     "pruneIntents(bytes32[])": FunctionFragment;
-    "releaseFundsToPayer(bytes32)": FunctionFragment;
-    "signalIntent((address,uint256,uint256,address,bytes32,bytes32,uint256,address,uint256,bytes,uint256,address,bytes))": FunctionFragment;
+    "releaseFundsToPayer(bytes32,uint256,bytes)": FunctionFragment;
+    "signalIntent((address,uint256,uint256,address,address,bytes32,uint256,address,uint256,bytes,uint256,address,bytes))": FunctionFragment;
   };
 
   getFunction(
@@ -184,7 +184,11 @@ export interface IOrchestratorInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "releaseFundsToPayer",
-    values: [PromiseOrValue<BytesLike>]
+    values: [
+      PromiseOrValue<BytesLike>,
+      PromiseOrValue<BigNumberish>,
+      PromiseOrValue<BytesLike>
+    ]
   ): string;
   encodeFunctionData(
     functionFragment: "signalIntent",
@@ -220,9 +224,9 @@ export interface IOrchestratorInterface extends utils.Interface {
   events: {
     "AllowMultipleIntentsUpdated(bool)": EventFragment;
     "EscrowRegistryUpdated(address)": EventFragment;
-    "IntentFulfilled(bytes32,address,uint256,bool)": EventFragment;
+    "IntentFulfilled(bytes32,address,uint256,bool,bytes32,string)": EventFragment;
     "IntentPruned(bytes32)": EventFragment;
-    "IntentSignaled(bytes32,address,uint256,bytes32,address,address,uint256,bytes32,uint256,uint256)": EventFragment;
+    "IntentSignaled(bytes32,address,uint256,address,address,address,uint256,bytes32,uint256,uint256)": EventFragment;
     "PartialManualReleaseDelayUpdated(uint256)": EventFragment;
     "PaymentVerifierRegistryUpdated(address)": EventFragment;
     "PostIntentHookRegistryUpdated(address)": EventFragment;
@@ -281,9 +285,11 @@ export interface IntentFulfilledEventObject {
   fundsTransferredTo: string;
   amount: BigNumber;
   isManualRelease: boolean;
+  paymentCurrency: string;
+  paymentId: string;
 }
 export type IntentFulfilledEvent = TypedEvent<
-  [string, string, BigNumber, boolean],
+  [string, string, BigNumber, boolean, string, string],
   IntentFulfilledEventObject
 >;
 
@@ -300,7 +306,7 @@ export interface IntentSignaledEventObject {
   intentHash: string;
   escrow: string;
   depositId: BigNumber;
-  paymentMethod: string;
+  verifier: string;
   owner: string;
   to: string;
   amount: BigNumber;
@@ -446,6 +452,8 @@ export interface IOrchestrator extends BaseContract {
 
     releaseFundsToPayer(
       intentHash: PromiseOrValue<BytesLike>,
+      releaseAmount: PromiseOrValue<BigNumberish>,
+      releaseData: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
@@ -482,6 +490,8 @@ export interface IOrchestrator extends BaseContract {
 
   releaseFundsToPayer(
     intentHash: PromiseOrValue<BytesLike>,
+    releaseAmount: PromiseOrValue<BigNumberish>,
+    releaseData: PromiseOrValue<BytesLike>,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
@@ -518,6 +528,8 @@ export interface IOrchestrator extends BaseContract {
 
     releaseFundsToPayer(
       intentHash: PromiseOrValue<BytesLike>,
+      releaseAmount: PromiseOrValue<BigNumberish>,
+      releaseData: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<void>;
 
@@ -542,17 +554,21 @@ export interface IOrchestrator extends BaseContract {
       escrowRegistry?: PromiseOrValue<string> | null
     ): EscrowRegistryUpdatedEventFilter;
 
-    "IntentFulfilled(bytes32,address,uint256,bool)"(
+    "IntentFulfilled(bytes32,address,uint256,bool,bytes32,string)"(
       intentHash?: PromiseOrValue<BytesLike> | null,
       fundsTransferredTo?: PromiseOrValue<string> | null,
       amount?: null,
-      isManualRelease?: null
+      isManualRelease?: null,
+      paymentCurrency?: null,
+      paymentId?: null
     ): IntentFulfilledEventFilter;
     IntentFulfilled(
       intentHash?: PromiseOrValue<BytesLike> | null,
       fundsTransferredTo?: PromiseOrValue<string> | null,
       amount?: null,
-      isManualRelease?: null
+      isManualRelease?: null,
+      paymentCurrency?: null,
+      paymentId?: null
     ): IntentFulfilledEventFilter;
 
     "IntentPruned(bytes32)"(
@@ -562,11 +578,11 @@ export interface IOrchestrator extends BaseContract {
       intentHash?: PromiseOrValue<BytesLike> | null
     ): IntentPrunedEventFilter;
 
-    "IntentSignaled(bytes32,address,uint256,bytes32,address,address,uint256,bytes32,uint256,uint256)"(
+    "IntentSignaled(bytes32,address,uint256,address,address,address,uint256,bytes32,uint256,uint256)"(
       intentHash?: PromiseOrValue<BytesLike> | null,
       escrow?: PromiseOrValue<string> | null,
       depositId?: PromiseOrValue<BigNumberish> | null,
-      paymentMethod?: null,
+      verifier?: null,
       owner?: null,
       to?: null,
       amount?: null,
@@ -578,7 +594,7 @@ export interface IOrchestrator extends BaseContract {
       intentHash?: PromiseOrValue<BytesLike> | null,
       escrow?: PromiseOrValue<string> | null,
       depositId?: PromiseOrValue<BigNumberish> | null,
-      paymentMethod?: null,
+      verifier?: null,
       owner?: null,
       to?: null,
       amount?: null,
@@ -656,6 +672,8 @@ export interface IOrchestrator extends BaseContract {
 
     releaseFundsToPayer(
       intentHash: PromiseOrValue<BytesLike>,
+      releaseAmount: PromiseOrValue<BigNumberish>,
+      releaseData: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
@@ -693,6 +711,8 @@ export interface IOrchestrator extends BaseContract {
 
     releaseFundsToPayer(
       intentHash: PromiseOrValue<BytesLike>,
+      releaseAmount: PromiseOrValue<BigNumberish>,
+      releaseData: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 

package/_cjs/types/contracts/interfaces/IPaymentVerifierRegistry.js

@@ -22,58 +22,41 @@ import type {
 
 export interface IPaymentVerifierRegistryInterface extends utils.Interface {
   functions: {
-    "getCurrencies(bytes32)": FunctionFragment;
-    "getPaymentMethods()": FunctionFragment;
-    "getVerifier(bytes32)": FunctionFragment;
-    "isCurrency(bytes32,bytes32)": FunctionFragment;
-    "isPaymentMethod(bytes32)": FunctionFragment;
+    "getWhitelistedVerifiers()": FunctionFragment;
+    "isAcceptingAllVerifiers()": FunctionFragment;
+    "isWhitelistedVerifier(address)": FunctionFragment;
   };
 
   getFunction(
     nameOrSignatureOrTopic:
-      | "getCurrencies"
-      | "getPaymentMethods"
-      | "getVerifier"
-      | "isCurrency"
-      | "isPaymentMethod"
+      | "getWhitelistedVerifiers"
+      | "isAcceptingAllVerifiers"
+      | "isWhitelistedVerifier"
   ): FunctionFragment;
 
   encodeFunctionData(
-    functionFragment: "getCurrencies",
-    values: [PromiseOrValue<BytesLike>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getPaymentMethods",
+    functionFragment: "getWhitelistedVerifiers",
     values?: undefined
   ): string;
   encodeFunctionData(
-    functionFragment: "getVerifier",
-    values: [PromiseOrValue<BytesLike>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "isCurrency",
-    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>]
+    functionFragment: "isAcceptingAllVerifiers",
+    values?: undefined
   ): string;
   encodeFunctionData(
-    functionFragment: "isPaymentMethod",
-    values: [PromiseOrValue<BytesLike>]
+    functionFragment: "isWhitelistedVerifier",
+    values: [PromiseOrValue<string>]
   ): string;
 
   decodeFunctionResult(
-    functionFragment: "getCurrencies",
+    functionFragment: "getWhitelistedVerifiers",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "getPaymentMethods",
+    functionFragment: "isAcceptingAllVerifiers",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "getVerifier",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "isCurrency", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "isPaymentMethod",
+    functionFragment: "isWhitelistedVerifier",
     data: BytesLike
   ): Result;
 
@@ -107,74 +90,32 @@ export interface IPaymentVerifierRegistry extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    getCurrencies(
-      _paymentMethod: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[string[]]>;
+    getWhitelistedVerifiers(overrides?: CallOverrides): Promise<[string[]]>;
 
-    getPaymentMethods(overrides?: CallOverrides): Promise<[string[]]>;
+    isAcceptingAllVerifiers(overrides?: CallOverrides): Promise<[boolean]>;
 
-    getVerifier(
-      _paymentMethod: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-
-    isCurrency(
-      _paymentMethod: PromiseOrValue<BytesLike>,
-      _currencyCode: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    isPaymentMethod(
-      _paymentMethod: PromiseOrValue<BytesLike>,
+    isWhitelistedVerifier(
+      _verifier: PromiseOrValue<string>,
       overrides?: CallOverrides
     ): Promise<[boolean]>;
   };
 
-  getCurrencies(
-    _paymentMethod: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<string[]>;
+  getWhitelistedVerifiers(overrides?: CallOverrides): Promise<string[]>;
 
-  getPaymentMethods(overrides?: CallOverrides): Promise<string[]>;
-
-  getVerifier(
-    _paymentMethod: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  isCurrency(
-    _paymentMethod: PromiseOrValue<BytesLike>,
-    _currencyCode: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
+  isAcceptingAllVerifiers(overrides?: CallOverrides): Promise<boolean>;
 
-  isPaymentMethod(
-    _paymentMethod: PromiseOrValue<BytesLike>,
+  isWhitelistedVerifier(
+    _verifier: PromiseOrValue<string>,
     overrides?: CallOverrides
   ): Promise<boolean>;
 
   callStatic: {
-    getCurrencies(
-      _paymentMethod: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<string[]>;
-
-    getPaymentMethods(overrides?: CallOverrides): Promise<string[]>;
-
-    getVerifier(
-      _paymentMethod: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<string>;
+    getWhitelistedVerifiers(overrides?: CallOverrides): Promise<string[]>;
 
-    isCurrency(
-      _paymentMethod: PromiseOrValue<BytesLike>,
-      _currencyCode: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
+    isAcceptingAllVerifiers(overrides?: CallOverrides): Promise<boolean>;
 
-    isPaymentMethod(
-      _paymentMethod: PromiseOrValue<BytesLike>,
+    isWhitelistedVerifier(
+      _verifier: PromiseOrValue<string>,
       overrides?: CallOverrides
     ): Promise<boolean>;
   };
@@ -182,51 +123,27 @@ export interface IPaymentVerifierRegistry extends BaseContract {
   filters: {};
 
   estimateGas: {
-    getCurrencies(
-      _paymentMethod: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
+    getWhitelistedVerifiers(overrides?: CallOverrides): Promise<BigNumber>;
 
-    getPaymentMethods(overrides?: CallOverrides): Promise<BigNumber>;
+    isAcceptingAllVerifiers(overrides?: CallOverrides): Promise<BigNumber>;
 
-    getVerifier(
-      _paymentMethod: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    isCurrency(
-      _paymentMethod: PromiseOrValue<BytesLike>,
-      _currencyCode: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    isPaymentMethod(
-      _paymentMethod: PromiseOrValue<BytesLike>,
+    isWhitelistedVerifier(
+      _verifier: PromiseOrValue<string>,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
   };
 
   populateTransaction: {
-    getCurrencies(
-      _paymentMethod: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getPaymentMethods(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    getVerifier(
-      _paymentMethod: PromiseOrValue<BytesLike>,
+    getWhitelistedVerifiers(
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    isCurrency(
-      _paymentMethod: PromiseOrValue<BytesLike>,
-      _currencyCode: PromiseOrValue<BytesLike>,
+    isAcceptingAllVerifiers(
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    isPaymentMethod(
-      _paymentMethod: PromiseOrValue<BytesLike>,
+    isWhitelistedVerifier(
+      _verifier: PromiseOrValue<string>,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
   };

package/_cjs/types/contracts/interfaces/IPostIntentHook.js

@@ -31,7 +31,7 @@ export declare namespace IOrchestrator {
     depositId: PromiseOrValue<BigNumberish>;
     amount: PromiseOrValue<BigNumberish>;
     timestamp: PromiseOrValue<BigNumberish>;
-    paymentMethod: PromiseOrValue<BytesLike>;
+    paymentVerifier: PromiseOrValue<string>;
     fiatCurrency: PromiseOrValue<BytesLike>;
     conversionRate: PromiseOrValue<BigNumberish>;
     referrer: PromiseOrValue<string>;
@@ -61,7 +61,7 @@ export declare namespace IOrchestrator {
     depositId: BigNumber;
     amount: BigNumber;
     timestamp: BigNumber;
-    paymentMethod: string;
+    paymentVerifier: string;
     fiatCurrency: string;
     conversionRate: BigNumber;
     referrer: string;
@@ -73,7 +73,7 @@ export declare namespace IOrchestrator {
 
 export interface IPostIntentHookInterface extends utils.Interface {
   functions: {
-    "execute((address,address,address,uint256,uint256,uint256,bytes32,bytes32,uint256,address,uint256,address,bytes),uint256,bytes)": FunctionFragment;
+    "execute((address,address,address,uint256,uint256,uint256,address,bytes32,uint256,address,uint256,address,bytes),uint256,bytes)": FunctionFragment;
   };
 
   getFunction(nameOrSignatureOrTopic: "execute"): FunctionFragment;

package/_cjs/types/contracts/interfaces/IProtocolViewer.js

@@ -29,7 +29,7 @@ export declare namespace IOrchestrator {
     depositId: PromiseOrValue<BigNumberish>;
     amount: PromiseOrValue<BigNumberish>;
     timestamp: PromiseOrValue<BigNumberish>;
-    paymentMethod: PromiseOrValue<BytesLike>;
+    paymentVerifier: PromiseOrValue<string>;
     fiatCurrency: PromiseOrValue<BytesLike>;
     conversionRate: PromiseOrValue<BigNumberish>;
     referrer: PromiseOrValue<string>;
@@ -59,7 +59,7 @@ export declare namespace IOrchestrator {
     depositId: BigNumber;
     amount: BigNumber;
     timestamp: BigNumber;
-    paymentMethod: string;
+    paymentVerifier: string;
     fiatCurrency: string;
     conversionRate: BigNumber;
     referrer: string;
@@ -132,17 +132,17 @@ export declare namespace IEscrow {
     referrerFee: BigNumber;
   };
 
-  export type DepositPaymentMethodDataStruct = {
+  export type DepositVerifierDataStruct = {
     intentGatingService: PromiseOrValue<string>;
-    payeeDetails: PromiseOrValue<BytesLike>;
+    payeeDetails: PromiseOrValue<string>;
     data: PromiseOrValue<BytesLike>;
   };
 
-  export type DepositPaymentMethodDataStructOutput = [
-    string,
-    string,
-    string
-  ] & { intentGatingService: string; payeeDetails: string; data: string };
+  export type DepositVerifierDataStructOutput = [string, string, string] & {
+    intentGatingService: string;
+    payeeDetails: string;
+    data: string;
+  };
 
   export type CurrencyStruct = {
     code: PromiseOrValue<BytesLike>;
@@ -156,19 +156,19 @@ export declare namespace IEscrow {
 }
 
 export declare namespace IProtocolViewer {
-  export type PaymentMethodDataViewStruct = {
-    paymentMethod: PromiseOrValue<BytesLike>;
-    verificationData: IEscrow.DepositPaymentMethodDataStruct;
+  export type VerifierDataViewStruct = {
+    verifier: PromiseOrValue<string>;
+    verificationData: IEscrow.DepositVerifierDataStruct;
     currencies: IEscrow.CurrencyStruct[];
   };
 
-  export type PaymentMethodDataViewStructOutput = [
+  export type VerifierDataViewStructOutput = [
     string,
-    IEscrow.DepositPaymentMethodDataStructOutput,
+    IEscrow.DepositVerifierDataStructOutput,
     IEscrow.CurrencyStructOutput[]
   ] & {
-    paymentMethod: string;
-    verificationData: IEscrow.DepositPaymentMethodDataStructOutput;
+    verifier: string;
+    verificationData: IEscrow.DepositVerifierDataStructOutput;
     currencies: IEscrow.CurrencyStructOutput[];
   };
 
@@ -176,7 +176,7 @@ export declare namespace IProtocolViewer {
     depositId: PromiseOrValue<BigNumberish>;
     deposit: IEscrow.DepositStruct;
     availableLiquidity: PromiseOrValue<BigNumberish>;
-    paymentMethods: IProtocolViewer.PaymentMethodDataViewStruct[];
+    verifiers: IProtocolViewer.VerifierDataViewStruct[];
     intentHashes: PromiseOrValue<BytesLike>[];
   };
 
@@ -184,13 +184,13 @@ export declare namespace IProtocolViewer {
     BigNumber,
     IEscrow.DepositStructOutput,
     BigNumber,
-    IProtocolViewer.PaymentMethodDataViewStructOutput[],
+    IProtocolViewer.VerifierDataViewStructOutput[],
     string[]
   ] & {
     depositId: BigNumber;
     deposit: IEscrow.DepositStructOutput;
     availableLiquidity: BigNumber;
-    paymentMethods: IProtocolViewer.PaymentMethodDataViewStructOutput[];
+    verifiers: IProtocolViewer.VerifierDataViewStructOutput[];
     intentHashes: string[];
   };
 

package/_cjs/types/contracts/interfaces/index.js

@@ -1,12 +1,10 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
- from "./IAttestationVerifier";
  from "./IEscrow";
  from "./IEscrowRegistry";
  from "./INullifierRegistry";
  from "./IOrchestrator";
- from "./IPaymentVerifier";
  from "./IPaymentVerifierRegistry";
  from "./IPostIntentHook";
  from "./IPostIntentHookRegistry";