@zkp2p/contracts-v2 0.3.0 → 0.3.1-rc.1

package/types/contracts/OrchestratorV3.ts

@@ -27,7 +27,7 @@ import type {
   PromiseOrValue,
 } from "../common";
 
-export declare namespace IOrchestratorV2 {
+export declare namespace IOrchestratorV3 {
   export type FulfillIntentParamsStruct = {
     paymentProof: PromiseOrValue<BytesLike>;
     intentHash: PromiseOrValue<BytesLike>;
@@ -93,6 +93,34 @@ export declare namespace IOrchestratorV2 {
     data: string;
   };
 
+  export type RiskIntentDataStruct = {
+    owner: PromiseOrValue<string>;
+    to: PromiseOrValue<string>;
+    escrow: PromiseOrValue<string>;
+    depositId: PromiseOrValue<BigNumberish>;
+    amount: PromiseOrValue<BigNumberish>;
+    paymentMethod: PromiseOrValue<BytesLike>;
+    createdAt: PromiseOrValue<BigNumberish>;
+  };
+
+  export type RiskIntentDataStructOutput = [
+    string,
+    string,
+    string,
+    BigNumber,
+    BigNumber,
+    string,
+    BigNumber
+  ] & {
+    owner: string;
+    to: string;
+    escrow: string;
+    depositId: BigNumber;
+    amount: BigNumber;
+    paymentMethod: string;
+    createdAt: BigNumber;
+  };
+
   export type SignalIntentParamsStruct = {
     escrow: PromiseOrValue<string>;
     depositId: PromiseOrValue<BigNumberish>;
@@ -152,58 +180,24 @@ export declare namespace IReferralFee {
   };
 }
 
-export declare namespace IOrchestratorV3 {
-  export type RiskIntentDataStruct = {
-    owner: PromiseOrValue<string>;
-    to: PromiseOrValue<string>;
-    escrow: PromiseOrValue<string>;
-    depositId: PromiseOrValue<BigNumberish>;
-    amount: PromiseOrValue<BigNumberish>;
-    paymentMethod: PromiseOrValue<BytesLike>;
-    postIntentHook: PromiseOrValue<string>;
-  };
-
-  export type RiskIntentDataStructOutput = [
-    string,
-    string,
-    string,
-    BigNumber,
-    BigNumber,
-    string,
-    string
-  ] & {
-    owner: string;
-    to: string;
-    escrow: string;
-    depositId: BigNumber;
-    amount: BigNumber;
-    paymentMethod: string;
-    postIntentHook: string;
-  };
-}
-
 export interface OrchestratorV3Interface extends utils.Interface {
   functions: {
-    "MAX_RISK_CALLBACK_RETURN_DATA()": FunctionFragment;
-    "MIN_RISK_CALLBACK_GAS_LIMIT()": FunctionFragment;
-    "allowMultipleIntents()": FunctionFragment;
+    "acknowledgeIntentCancellation(bytes32)": FunctionFragment;
     "cancelIntent(bytes32)": FunctionFragment;
     "chainId()": FunctionFragment;
     "cleanupOrphanedIntents(bytes32[])": FunctionFragment;
     "escrowRegistry()": FunctionFragment;
     "fulfillIntent((bytes,bytes32,bytes,bytes))": FunctionFragment;
-    "getAccountIntentCount(address)": FunctionFragment;
     "getAccountIntents(address)": FunctionFragment;
     "getDepositPreIntentHook(address,uint256)": FunctionFragment;
     "getDepositRiskHook(address,uint256)": FunctionFragment;
     "getDepositWhitelistHook(address,uint256)": FunctionFragment;
     "getIntent(bytes32)": FunctionFragment;
+    "getIntentCancellation(bytes32)": FunctionFragment;
     "getIntentMinAtSignal(bytes32)": FunctionFragment;
     "getIntentRiskHook(bytes32)": FunctionFragment;
-    "getIntentSettlement(bytes32)": FunctionFragment;
     "getRiskIntent(bytes32)": FunctionFragment;
     "intentCounter()": FunctionFragment;
-    "intentRequiresPostIntentHook(bytes32)": FunctionFragment;
     "owner()": FunctionFragment;
     "pauseOrchestrator()": FunctionFragment;
     "paused()": FunctionFragment;
@@ -211,46 +205,40 @@ export interface OrchestratorV3Interface extends utils.Interface {
     "protocolFee()": FunctionFragment;
     "protocolFeeRecipient()": FunctionFragment;
     "pruneIntents(bytes32[])": FunctionFragment;
-    "relayerRegistry()": FunctionFragment;
     "releaseFundsToPayer(bytes32)": FunctionFragment;
     "renounceOwnership()": FunctionFragment;
     "riskCallbackGasLimit()": FunctionFragment;
-    "setAllowMultipleIntents(bool)": FunctionFragment;
     "setDepositPreIntentHook(address,uint256,address)": FunctionFragment;
     "setDepositRiskHook(address,uint256,address)": FunctionFragment;
     "setDepositWhitelistHook(address,uint256,address)": FunctionFragment;
     "setEscrowRegistry(address)": FunctionFragment;
     "setProtocolFee(uint256)": FunctionFragment;
     "setProtocolFeeRecipient(address)": FunctionFragment;
-    "setRelayerRegistry(address)": FunctionFragment;
     "setRiskCallbackGasLimit(uint256)": FunctionFragment;
     "signalIntent((address,uint256,uint256,address,bytes32,bytes32,uint256,(address,uint256)[],bytes,uint256,address,bytes,bytes))": FunctionFragment;
     "transferOwnership(address)": FunctionFragment;
     "unpauseOrchestrator()": FunctionFragment;
+    "usedGatingSignatureDigests(bytes32)": FunctionFragment;
   };
 
   getFunction(
     nameOrSignatureOrTopic:
-      | "MAX_RISK_CALLBACK_RETURN_DATA"
-      | "MIN_RISK_CALLBACK_GAS_LIMIT"
-      | "allowMultipleIntents"
+      | "acknowledgeIntentCancellation"
       | "cancelIntent"
       | "chainId"
       | "cleanupOrphanedIntents"
       | "escrowRegistry"
       | "fulfillIntent"
-      | "getAccountIntentCount"
       | "getAccountIntents"
       | "getDepositPreIntentHook"
       | "getDepositRiskHook"
       | "getDepositWhitelistHook"
       | "getIntent"
+      | "getIntentCancellation"
       | "getIntentMinAtSignal"
       | "getIntentRiskHook"
-      | "getIntentSettlement"
       | "getRiskIntent"
       | "intentCounter"
-      | "intentRequiresPostIntentHook"
       | "owner"
       | "pauseOrchestrator"
       | "paused"
@@ -258,35 +246,25 @@ export interface OrchestratorV3Interface extends utils.Interface {
       | "protocolFee"
       | "protocolFeeRecipient"
       | "pruneIntents"
-      | "relayerRegistry"
       | "releaseFundsToPayer"
       | "renounceOwnership"
       | "riskCallbackGasLimit"
-      | "setAllowMultipleIntents"
       | "setDepositPreIntentHook"
       | "setDepositRiskHook"
       | "setDepositWhitelistHook"
       | "setEscrowRegistry"
       | "setProtocolFee"
       | "setProtocolFeeRecipient"
-      | "setRelayerRegistry"
       | "setRiskCallbackGasLimit"
       | "signalIntent"
       | "transferOwnership"
       | "unpauseOrchestrator"
+      | "usedGatingSignatureDigests"
   ): FunctionFragment;
 
   encodeFunctionData(
-    functionFragment: "MAX_RISK_CALLBACK_RETURN_DATA",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "MIN_RISK_CALLBACK_GAS_LIMIT",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "allowMultipleIntents",
-    values?: undefined
+    functionFragment: "acknowledgeIntentCancellation",
+    values: [PromiseOrValue<BytesLike>]
   ): string;
   encodeFunctionData(
     functionFragment: "cancelIntent",
@@ -303,11 +281,7 @@ export interface OrchestratorV3Interface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "fulfillIntent",
-    values: [IOrchestratorV2.FulfillIntentParamsStruct]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getAccountIntentCount",
-    values: [PromiseOrValue<string>]
+    values: [IOrchestratorV3.FulfillIntentParamsStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "getAccountIntents",
@@ -330,15 +304,15 @@ export interface OrchestratorV3Interface extends utils.Interface {
     values: [PromiseOrValue<BytesLike>]
   ): string;
   encodeFunctionData(
-    functionFragment: "getIntentMinAtSignal",
+    functionFragment: "getIntentCancellation",
     values: [PromiseOrValue<BytesLike>]
   ): string;
   encodeFunctionData(
-    functionFragment: "getIntentRiskHook",
+    functionFragment: "getIntentMinAtSignal",
     values: [PromiseOrValue<BytesLike>]
   ): string;
   encodeFunctionData(
-    functionFragment: "getIntentSettlement",
+    functionFragment: "getIntentRiskHook",
     values: [PromiseOrValue<BytesLike>]
   ): string;
   encodeFunctionData(
@@ -349,10 +323,6 @@ export interface OrchestratorV3Interface extends utils.Interface {
     functionFragment: "intentCounter",
     values?: undefined
   ): string;
-  encodeFunctionData(
-    functionFragment: "intentRequiresPostIntentHook",
-    values: [PromiseOrValue<BytesLike>]
-  ): string;
   encodeFunctionData(functionFragment: "owner", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "pauseOrchestrator",
@@ -375,10 +345,6 @@ export interface OrchestratorV3Interface extends utils.Interface {
     functionFragment: "pruneIntents",
     values: [PromiseOrValue<BytesLike>[]]
   ): string;
-  encodeFunctionData(
-    functionFragment: "relayerRegistry",
-    values?: undefined
-  ): string;
   encodeFunctionData(
     functionFragment: "releaseFundsToPayer",
     values: [PromiseOrValue<BytesLike>]
@@ -391,10 +357,6 @@ export interface OrchestratorV3Interface extends utils.Interface {
     functionFragment: "riskCallbackGasLimit",
     values?: undefined
   ): string;
-  encodeFunctionData(
-    functionFragment: "setAllowMultipleIntents",
-    values: [PromiseOrValue<boolean>]
-  ): string;
   encodeFunctionData(
     functionFragment: "setDepositPreIntentHook",
     values: [
@@ -431,17 +393,13 @@ export interface OrchestratorV3Interface extends utils.Interface {
     functionFragment: "setProtocolFeeRecipient",
     values: [PromiseOrValue<string>]
   ): string;
-  encodeFunctionData(
-    functionFragment: "setRelayerRegistry",
-    values: [PromiseOrValue<string>]
-  ): string;
   encodeFunctionData(
     functionFragment: "setRiskCallbackGasLimit",
     values: [PromiseOrValue<BigNumberish>]
   ): string;
   encodeFunctionData(
     functionFragment: "signalIntent",
-    values: [IOrchestratorV2.SignalIntentParamsStruct]
+    values: [IOrchestratorV3.SignalIntentParamsStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "transferOwnership",
@@ -451,17 +409,13 @@ export interface OrchestratorV3Interface extends utils.Interface {
     functionFragment: "unpauseOrchestrator",
     values?: undefined
   ): string;
+  encodeFunctionData(
+    functionFragment: "usedGatingSignatureDigests",
+    values: [PromiseOrValue<BytesLike>]
+  ): string;
 
   decodeFunctionResult(
-    functionFragment: "MAX_RISK_CALLBACK_RETURN_DATA",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "MIN_RISK_CALLBACK_GAS_LIMIT",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "allowMultipleIntents",
+    functionFragment: "acknowledgeIntentCancellation",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -481,10 +435,6 @@ export interface OrchestratorV3Interface extends utils.Interface {
     functionFragment: "fulfillIntent",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "getAccountIntentCount",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "getAccountIntents",
     data: BytesLike
@@ -503,15 +453,15 @@ export interface OrchestratorV3Interface extends utils.Interface {
   ): Result;
   decodeFunctionResult(functionFragment: "getIntent", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "getIntentMinAtSignal",
+    functionFragment: "getIntentCancellation",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "getIntentRiskHook",
+    functionFragment: "getIntentMinAtSignal",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "getIntentSettlement",
+    functionFragment: "getIntentRiskHook",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -522,10 +472,6 @@ export interface OrchestratorV3Interface extends utils.Interface {
     functionFragment: "intentCounter",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "intentRequiresPostIntentHook",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "pauseOrchestrator",
@@ -548,10 +494,6 @@ export interface OrchestratorV3Interface extends utils.Interface {
     functionFragment: "pruneIntents",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "relayerRegistry",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "releaseFundsToPayer",
     data: BytesLike
@@ -564,10 +506,6 @@ export interface OrchestratorV3Interface extends utils.Interface {
     functionFragment: "riskCallbackGasLimit",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "setAllowMultipleIntents",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "setDepositPreIntentHook",
     data: BytesLike
@@ -592,10 +530,6 @@ export interface OrchestratorV3Interface extends utils.Interface {
     functionFragment: "setProtocolFeeRecipient",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "setRelayerRegistry",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "setRiskCallbackGasLimit",
     data: BytesLike
@@ -612,19 +546,24 @@ export interface OrchestratorV3Interface extends utils.Interface {
     functionFragment: "unpauseOrchestrator",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "usedGatingSignatureDigests",
+    data: BytesLike
+  ): Result;
 
   events: {
-    "AllowMultipleIntentsUpdated(bool)": EventFragment;
     "DepositPreIntentHookSet(address,uint256,address,address)": EventFragment;
     "DepositRiskHookSet(address,uint256,address,address)": EventFragment;
     "DepositWhitelistHookSet(address,uint256,address,address)": EventFragment;
     "EscrowRegistryUpdated(address)": EventFragment;
+    "IntentCancellationReconciled(bytes32,address)": EventFragment;
+    "IntentCancellationRecorded(bytes32,uint64)": EventFragment;
+    "IntentFeeDistributed(bytes32,uint8,address,uint256)": EventFragment;
     "IntentFulfilled(bytes32,address,uint256,bool)": EventFragment;
     "IntentManagerFeeSnapshotted(bytes32,address,uint256)": EventFragment;
     "IntentPruned(bytes32)": EventFragment;
-    "IntentReferralFeeDistributed(bytes32,address,uint256)": EventFragment;
-    "IntentRiskHookSnapshotted(bytes32,address,bool)": EventFragment;
-    "IntentSettlementRecorded(bytes32,uint256,uint64)": EventFragment;
+    "IntentRiskHookSnapshotted(bytes32,address)": EventFragment;
+    "IntentRiskSettlementExecuted(bytes32,address,address,uint256,uint256,bool,bool)": EventFragment;
     "IntentSignaled(bytes32,address,uint256,bytes32,address,address,uint256,bytes32,uint256,uint256)": EventFragment;
     "OwnershipTransferred(address,address)": EventFragment;
     "PartialManualReleaseDelayUpdated(uint256)": EventFragment;
@@ -632,29 +571,29 @@ export interface OrchestratorV3Interface extends utils.Interface {
     "PaymentVerifierRegistryUpdated(address)": EventFragment;
     "ProtocolFeeRecipientUpdated(address)": EventFragment;
     "ProtocolFeeUpdated(uint256)": EventFragment;
-    "RelayerRegistryUpdated(address)": EventFragment;
     "RiskCallbackGasLimitUpdated(uint256)": EventFragment;
     "RiskHookCallbackFailed(bytes32,address,bytes4,bytes)": EventFragment;
     "Unpaused(address)": EventFragment;
   };
 
-  getEvent(
-    nameOrSignatureOrTopic: "AllowMultipleIntentsUpdated"
-  ): EventFragment;
   getEvent(nameOrSignatureOrTopic: "DepositPreIntentHookSet"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "DepositRiskHookSet"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "DepositWhitelistHookSet"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "EscrowRegistryUpdated"): EventFragment;
+  getEvent(
+    nameOrSignatureOrTopic: "IntentCancellationReconciled"
+  ): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "IntentCancellationRecorded"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "IntentFeeDistributed"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "IntentFulfilled"): EventFragment;
   getEvent(
     nameOrSignatureOrTopic: "IntentManagerFeeSnapshotted"
   ): EventFragment;
   getEvent(nameOrSignatureOrTopic: "IntentPruned"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "IntentRiskHookSnapshotted"): EventFragment;
   getEvent(
-    nameOrSignatureOrTopic: "IntentReferralFeeDistributed"
+    nameOrSignatureOrTopic: "IntentRiskSettlementExecuted"
   ): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "IntentRiskHookSnapshotted"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "IntentSettlementRecorded"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "IntentSignaled"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "OwnershipTransferred"): EventFragment;
   getEvent(
@@ -668,7 +607,6 @@ export interface OrchestratorV3Interface extends utils.Interface {
     nameOrSignatureOrTopic: "ProtocolFeeRecipientUpdated"
   ): EventFragment;
   getEvent(nameOrSignatureOrTopic: "ProtocolFeeUpdated"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "RelayerRegistryUpdated"): EventFragment;
   getEvent(
     nameOrSignatureOrTopic: "RiskCallbackGasLimitUpdated"
   ): EventFragment;
@@ -676,17 +614,6 @@ export interface OrchestratorV3Interface extends utils.Interface {
   getEvent(nameOrSignatureOrTopic: "Unpaused"): EventFragment;
 }
 
-export interface AllowMultipleIntentsUpdatedEventObject {
-  allowMultiple: boolean;
-}
-export type AllowMultipleIntentsUpdatedEvent = TypedEvent<
-  [boolean],
-  AllowMultipleIntentsUpdatedEventObject
->;
-
-export type AllowMultipleIntentsUpdatedEventFilter =
-  TypedEventFilter<AllowMultipleIntentsUpdatedEvent>;
-
 export interface DepositPreIntentHookSetEventObject {
   escrow: string;
   depositId: BigNumber;
@@ -740,6 +667,44 @@ export type EscrowRegistryUpdatedEvent = TypedEvent<
 export type EscrowRegistryUpdatedEventFilter =
   TypedEventFilter<EscrowRegistryUpdatedEvent>;
 
+export interface IntentCancellationReconciledEventObject {
+  intentHash: string;
+  riskHook: string;
+}
+export type IntentCancellationReconciledEvent = TypedEvent<
+  [string, string],
+  IntentCancellationReconciledEventObject
+>;
+
+export type IntentCancellationReconciledEventFilter =
+  TypedEventFilter<IntentCancellationReconciledEvent>;
+
+export interface IntentCancellationRecordedEventObject {
+  intentHash: string;
+  cancelledAt: BigNumber;
+}
+export type IntentCancellationRecordedEvent = TypedEvent<
+  [string, BigNumber],
+  IntentCancellationRecordedEventObject
+>;
+
+export type IntentCancellationRecordedEventFilter =
+  TypedEventFilter<IntentCancellationRecordedEvent>;
+
+export interface IntentFeeDistributedEventObject {
+  intentHash: string;
+  feeType: number;
+  recipient: string;
+  amount: BigNumber;
+}
+export type IntentFeeDistributedEvent = TypedEvent<
+  [string, number, string, BigNumber],
+  IntentFeeDistributedEventObject
+>;
+
+export type IntentFeeDistributedEventFilter =
+  TypedEventFilter<IntentFeeDistributedEvent>;
+
 export interface IntentFulfilledEventObject {
   intentHash: string;
   fundsTransferredTo: string;
@@ -773,44 +738,34 @@ export type IntentPrunedEvent = TypedEvent<[string], IntentPrunedEventObject>;
 
 export type IntentPrunedEventFilter = TypedEventFilter<IntentPrunedEvent>;
 
-export interface IntentReferralFeeDistributedEventObject {
-  intentHash: string;
-  feeRecipient: string;
-  feeAmount: BigNumber;
-}
-export type IntentReferralFeeDistributedEvent = TypedEvent<
-  [string, string, BigNumber],
-  IntentReferralFeeDistributedEventObject
->;
-
-export type IntentReferralFeeDistributedEventFilter =
-  TypedEventFilter<IntentReferralFeeDistributedEvent>;
-
 export interface IntentRiskHookSnapshottedEventObject {
   intentHash: string;
   riskHook: string;
-  requiresPostIntentHook: boolean;
 }
 export type IntentRiskHookSnapshottedEvent = TypedEvent<
-  [string, string, boolean],
+  [string, string],
   IntentRiskHookSnapshottedEventObject
 >;
 
 export type IntentRiskHookSnapshottedEventFilter =
   TypedEventFilter<IntentRiskHookSnapshottedEvent>;
 
-export interface IntentSettlementRecordedEventObject {
+export interface IntentRiskSettlementExecutedEventObject {
   intentHash: string;
-  releasedAmount: BigNumber;
-  settledAt: BigNumber;
+  riskHook: string;
+  token: string;
+  grossAmount: BigNumber;
+  executableAmount: BigNumber;
+  fundsConsumed: boolean;
+  isManualRelease: boolean;
 }
-export type IntentSettlementRecordedEvent = TypedEvent<
-  [string, BigNumber, BigNumber],
-  IntentSettlementRecordedEventObject
+export type IntentRiskSettlementExecutedEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber, boolean, boolean],
+  IntentRiskSettlementExecutedEventObject
 >;
 
-export type IntentSettlementRecordedEventFilter =
-  TypedEventFilter<IntentSettlementRecordedEvent>;
+export type IntentRiskSettlementExecutedEventFilter =
+  TypedEventFilter<IntentRiskSettlementExecutedEvent>;
 
 export interface IntentSignaledEventObject {
   intentHash: string;
@@ -905,17 +860,6 @@ export type ProtocolFeeUpdatedEvent = TypedEvent<
 export type ProtocolFeeUpdatedEventFilter =
   TypedEventFilter<ProtocolFeeUpdatedEvent>;
 
-export interface RelayerRegistryUpdatedEventObject {
-  relayerRegistry: string;
-}
-export type RelayerRegistryUpdatedEvent = TypedEvent<
-  [string],
-  RelayerRegistryUpdatedEventObject
->;
-
-export type RelayerRegistryUpdatedEventFilter =
-  TypedEventFilter<RelayerRegistryUpdatedEvent>;
-
 export interface RiskCallbackGasLimitUpdatedEventObject {
   gasLimit: BigNumber;
 }
@@ -975,15 +919,10 @@ export interface OrchestratorV3 extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    MAX_RISK_CALLBACK_RETURN_DATA(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
-
-    MIN_RISK_CALLBACK_GAS_LIMIT(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
-
-    allowMultipleIntents(overrides?: CallOverrides): Promise<[boolean]>;
+    acknowledgeIntentCancellation(
+      _intentHash: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>;
 
     cancelIntent(
       _intentHash: PromiseOrValue<BytesLike>,
@@ -1000,15 +939,10 @@ export interface OrchestratorV3 extends BaseContract {
     escrowRegistry(overrides?: CallOverrides): Promise<[string]>;
 
     fulfillIntent(
-      _params: IOrchestratorV2.FulfillIntentParamsStruct,
+      _params: IOrchestratorV3.FulfillIntentParamsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
-    getAccountIntentCount(
-      _account: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
-
     getAccountIntents(
       _account: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -1035,7 +969,12 @@ export interface OrchestratorV3 extends BaseContract {
     getIntent(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
-    ): Promise<[IOrchestratorV2.IntentStructOutput]>;
+    ): Promise<[IOrchestratorV3.IntentStructOutput]>;
+
+    getIntentCancellation(
+      _intentHash: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber] & { cancelledAt: BigNumber }>;
 
     getIntentMinAtSignal(
       _intentHash: PromiseOrValue<BytesLike>,
@@ -1047,16 +986,6 @@ export interface OrchestratorV3 extends BaseContract {
       overrides?: CallOverrides
     ): Promise<[string]>;
 
-    getIntentSettlement(
-      _intentHash: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & {
-        releasedAmount: BigNumber;
-        settledAt: BigNumber;
-      }
-    >;
-
     getRiskIntent(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
@@ -1068,11 +997,6 @@ export interface OrchestratorV3 extends BaseContract {
 
     intentCounter(overrides?: CallOverrides): Promise<[BigNumber]>;
 
-    intentRequiresPostIntentHook(
-      arg0: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
     owner(overrides?: CallOverrides): Promise<[string]>;
 
     pauseOrchestrator(
@@ -1092,8 +1016,6 @@ export interface OrchestratorV3 extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
-    relayerRegistry(overrides?: CallOverrides): Promise<[string]>;
-
     releaseFundsToPayer(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -1105,11 +1027,6 @@ export interface OrchestratorV3 extends BaseContract {
 
     riskCallbackGasLimit(overrides?: CallOverrides): Promise<[BigNumber]>;
 
-    setAllowMultipleIntents(
-      _allowMultiple: PromiseOrValue<boolean>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
     setDepositPreIntentHook(
       _escrow: PromiseOrValue<string>,
       _depositId: PromiseOrValue<BigNumberish>,
@@ -1146,18 +1063,13 @@ export interface OrchestratorV3 extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
-    setRelayerRegistry(
-      _relayerRegistry: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
     setRiskCallbackGasLimit(
       _gasLimit: PromiseOrValue<BigNumberish>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
     signalIntent(
-      _params: IOrchestratorV2.SignalIntentParamsStruct,
+      _params: IOrchestratorV3.SignalIntentParamsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
@@ -1169,13 +1081,17 @@ export interface OrchestratorV3 extends BaseContract {
     unpauseOrchestrator(
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
-  };
 
-  MAX_RISK_CALLBACK_RETURN_DATA(overrides?: CallOverrides): Promise<BigNumber>;
-
-  MIN_RISK_CALLBACK_GAS_LIMIT(overrides?: CallOverrides): Promise<BigNumber>;
+    usedGatingSignatureDigests(
+      arg0: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<[boolean]>;
+  };
 
-  allowMultipleIntents(overrides?: CallOverrides): Promise<boolean>;
+  acknowledgeIntentCancellation(
+    _intentHash: PromiseOrValue<BytesLike>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>;
 
   cancelIntent(
     _intentHash: PromiseOrValue<BytesLike>,
@@ -1192,15 +1108,10 @@ export interface OrchestratorV3 extends BaseContract {
   escrowRegistry(overrides?: CallOverrides): Promise<string>;
 
   fulfillIntent(
-    _params: IOrchestratorV2.FulfillIntentParamsStruct,
+    _params: IOrchestratorV3.FulfillIntentParamsStruct,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
-  getAccountIntentCount(
-    _account: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
   getAccountIntents(
     _account: PromiseOrValue<string>,
     overrides?: CallOverrides
@@ -1227,24 +1138,22 @@ export interface OrchestratorV3 extends BaseContract {
   getIntent(
     _intentHash: PromiseOrValue<BytesLike>,
     overrides?: CallOverrides
-  ): Promise<IOrchestratorV2.IntentStructOutput>;
+  ): Promise<IOrchestratorV3.IntentStructOutput>;
 
-  getIntentMinAtSignal(
+  getIntentCancellation(
     _intentHash: PromiseOrValue<BytesLike>,
     overrides?: CallOverrides
   ): Promise<BigNumber>;
 
-  getIntentRiskHook(
+  getIntentMinAtSignal(
     _intentHash: PromiseOrValue<BytesLike>,
     overrides?: CallOverrides
-  ): Promise<string>;
+  ): Promise<BigNumber>;
 
-  getIntentSettlement(
+  getIntentRiskHook(
     _intentHash: PromiseOrValue<BytesLike>,
     overrides?: CallOverrides
-  ): Promise<
-    [BigNumber, BigNumber] & { releasedAmount: BigNumber; settledAt: BigNumber }
-  >;
+  ): Promise<string>;
 
   getRiskIntent(
     _intentHash: PromiseOrValue<BytesLike>,
@@ -1253,11 +1162,6 @@ export interface OrchestratorV3 extends BaseContract {
 
   intentCounter(overrides?: CallOverrides): Promise<BigNumber>;
 
-  intentRequiresPostIntentHook(
-    arg0: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
   owner(overrides?: CallOverrides): Promise<string>;
 
   pauseOrchestrator(
@@ -1277,8 +1181,6 @@ export interface OrchestratorV3 extends BaseContract {
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
-  relayerRegistry(overrides?: CallOverrides): Promise<string>;
-
   releaseFundsToPayer(
     _intentHash: PromiseOrValue<BytesLike>,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -1290,11 +1192,6 @@ export interface OrchestratorV3 extends BaseContract {
 
   riskCallbackGasLimit(overrides?: CallOverrides): Promise<BigNumber>;
 
-  setAllowMultipleIntents(
-    _allowMultiple: PromiseOrValue<boolean>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
   setDepositPreIntentHook(
     _escrow: PromiseOrValue<string>,
     _depositId: PromiseOrValue<BigNumberish>,
@@ -1331,18 +1228,13 @@ export interface OrchestratorV3 extends BaseContract {
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
-  setRelayerRegistry(
-    _relayerRegistry: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
   setRiskCallbackGasLimit(
     _gasLimit: PromiseOrValue<BigNumberish>,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
   signalIntent(
-    _params: IOrchestratorV2.SignalIntentParamsStruct,
+    _params: IOrchestratorV3.SignalIntentParamsStruct,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
@@ -1355,14 +1247,16 @@ export interface OrchestratorV3 extends BaseContract {
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
+  usedGatingSignatureDigests(
+    arg0: PromiseOrValue<BytesLike>,
+    overrides?: CallOverrides
+  ): Promise<boolean>;
+
   callStatic: {
-    MAX_RISK_CALLBACK_RETURN_DATA(
+    acknowledgeIntentCancellation(
+      _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    MIN_RISK_CALLBACK_GAS_LIMIT(overrides?: CallOverrides): Promise<BigNumber>;
-
-    allowMultipleIntents(overrides?: CallOverrides): Promise<boolean>;
+    ): Promise<void>;
 
     cancelIntent(
       _intentHash: PromiseOrValue<BytesLike>,
@@ -1379,15 +1273,10 @@ export interface OrchestratorV3 extends BaseContract {
     escrowRegistry(overrides?: CallOverrides): Promise<string>;
 
     fulfillIntent(
-      _params: IOrchestratorV2.FulfillIntentParamsStruct,
+      _params: IOrchestratorV3.FulfillIntentParamsStruct,
       overrides?: CallOverrides
     ): Promise<void>;
 
-    getAccountIntentCount(
-      _account: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
     getAccountIntents(
       _account: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -1414,27 +1303,22 @@ export interface OrchestratorV3 extends BaseContract {
     getIntent(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
-    ): Promise<IOrchestratorV2.IntentStructOutput>;
+    ): Promise<IOrchestratorV3.IntentStructOutput>;
 
-    getIntentMinAtSignal(
+    getIntentCancellation(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    getIntentRiskHook(
+    getIntentMinAtSignal(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
-    ): Promise<string>;
+    ): Promise<BigNumber>;
 
-    getIntentSettlement(
+    getIntentRiskHook(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & {
-        releasedAmount: BigNumber;
-        settledAt: BigNumber;
-      }
-    >;
+    ): Promise<string>;
 
     getRiskIntent(
       _intentHash: PromiseOrValue<BytesLike>,
@@ -1443,11 +1327,6 @@ export interface OrchestratorV3 extends BaseContract {
 
     intentCounter(overrides?: CallOverrides): Promise<BigNumber>;
 
-    intentRequiresPostIntentHook(
-      arg0: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
     owner(overrides?: CallOverrides): Promise<string>;
 
     pauseOrchestrator(overrides?: CallOverrides): Promise<void>;
@@ -1465,8 +1344,6 @@ export interface OrchestratorV3 extends BaseContract {
       overrides?: CallOverrides
     ): Promise<void>;
 
-    relayerRegistry(overrides?: CallOverrides): Promise<string>;
-
     releaseFundsToPayer(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
@@ -1476,11 +1353,6 @@ export interface OrchestratorV3 extends BaseContract {
 
     riskCallbackGasLimit(overrides?: CallOverrides): Promise<BigNumber>;
 
-    setAllowMultipleIntents(
-      _allowMultiple: PromiseOrValue<boolean>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
     setDepositPreIntentHook(
       _escrow: PromiseOrValue<string>,
       _depositId: PromiseOrValue<BigNumberish>,
@@ -1517,18 +1389,13 @@ export interface OrchestratorV3 extends BaseContract {
       overrides?: CallOverrides
     ): Promise<void>;
 
-    setRelayerRegistry(
-      _relayerRegistry: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
     setRiskCallbackGasLimit(
       _gasLimit: PromiseOrValue<BigNumberish>,
       overrides?: CallOverrides
     ): Promise<void>;
 
     signalIntent(
-      _params: IOrchestratorV2.SignalIntentParamsStruct,
+      _params: IOrchestratorV3.SignalIntentParamsStruct,
       overrides?: CallOverrides
     ): Promise<void>;
 
@@ -1538,16 +1405,14 @@ export interface OrchestratorV3 extends BaseContract {
     ): Promise<void>;
 
     unpauseOrchestrator(overrides?: CallOverrides): Promise<void>;
+
+    usedGatingSignatureDigests(
+      arg0: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<boolean>;
   };
 
   filters: {
-    "AllowMultipleIntentsUpdated(bool)"(
-      allowMultiple?: null
-    ): AllowMultipleIntentsUpdatedEventFilter;
-    AllowMultipleIntentsUpdated(
-      allowMultiple?: null
-    ): AllowMultipleIntentsUpdatedEventFilter;
-
     "DepositPreIntentHookSet(address,uint256,address,address)"(
       escrow?: PromiseOrValue<string> | null,
       depositId?: PromiseOrValue<BigNumberish> | null,
@@ -1594,6 +1459,37 @@ export interface OrchestratorV3 extends BaseContract {
       escrowRegistry?: PromiseOrValue<string> | null
     ): EscrowRegistryUpdatedEventFilter;
 
+    "IntentCancellationReconciled(bytes32,address)"(
+      intentHash?: PromiseOrValue<BytesLike> | null,
+      riskHook?: PromiseOrValue<string> | null
+    ): IntentCancellationReconciledEventFilter;
+    IntentCancellationReconciled(
+      intentHash?: PromiseOrValue<BytesLike> | null,
+      riskHook?: PromiseOrValue<string> | null
+    ): IntentCancellationReconciledEventFilter;
+
+    "IntentCancellationRecorded(bytes32,uint64)"(
+      intentHash?: PromiseOrValue<BytesLike> | null,
+      cancelledAt?: null
+    ): IntentCancellationRecordedEventFilter;
+    IntentCancellationRecorded(
+      intentHash?: PromiseOrValue<BytesLike> | null,
+      cancelledAt?: null
+    ): IntentCancellationRecordedEventFilter;
+
+    "IntentFeeDistributed(bytes32,uint8,address,uint256)"(
+      intentHash?: PromiseOrValue<BytesLike> | null,
+      feeType?: null,
+      recipient?: PromiseOrValue<string> | null,
+      amount?: null
+    ): IntentFeeDistributedEventFilter;
+    IntentFeeDistributed(
+      intentHash?: PromiseOrValue<BytesLike> | null,
+      feeType?: null,
+      recipient?: PromiseOrValue<string> | null,
+      amount?: null
+    ): IntentFeeDistributedEventFilter;
+
     "IntentFulfilled(bytes32,address,uint256,bool)"(
       intentHash?: PromiseOrValue<BytesLike> | null,
       fundsTransferredTo?: PromiseOrValue<string> | null,
@@ -1625,38 +1521,33 @@ export interface OrchestratorV3 extends BaseContract {
       intentHash?: PromiseOrValue<BytesLike> | null
     ): IntentPrunedEventFilter;
 
-    "IntentReferralFeeDistributed(bytes32,address,uint256)"(
-      intentHash?: PromiseOrValue<BytesLike> | null,
-      feeRecipient?: PromiseOrValue<string> | null,
-      feeAmount?: null
-    ): IntentReferralFeeDistributedEventFilter;
-    IntentReferralFeeDistributed(
+    "IntentRiskHookSnapshotted(bytes32,address)"(
       intentHash?: PromiseOrValue<BytesLike> | null,
-      feeRecipient?: PromiseOrValue<string> | null,
-      feeAmount?: null
-    ): IntentReferralFeeDistributedEventFilter;
-
-    "IntentRiskHookSnapshotted(bytes32,address,bool)"(
-      intentHash?: PromiseOrValue<BytesLike> | null,
-      riskHook?: PromiseOrValue<string> | null,
-      requiresPostIntentHook?: null
+      riskHook?: PromiseOrValue<string> | null
     ): IntentRiskHookSnapshottedEventFilter;
     IntentRiskHookSnapshotted(
       intentHash?: PromiseOrValue<BytesLike> | null,
-      riskHook?: PromiseOrValue<string> | null,
-      requiresPostIntentHook?: null
+      riskHook?: PromiseOrValue<string> | null
     ): IntentRiskHookSnapshottedEventFilter;
 
-    "IntentSettlementRecorded(bytes32,uint256,uint64)"(
+    "IntentRiskSettlementExecuted(bytes32,address,address,uint256,uint256,bool,bool)"(
       intentHash?: PromiseOrValue<BytesLike> | null,
-      releasedAmount?: null,
-      settledAt?: null
-    ): IntentSettlementRecordedEventFilter;
-    IntentSettlementRecorded(
+      riskHook?: PromiseOrValue<string> | null,
+      token?: PromiseOrValue<string> | null,
+      grossAmount?: null,
+      executableAmount?: null,
+      fundsConsumed?: null,
+      isManualRelease?: null
+    ): IntentRiskSettlementExecutedEventFilter;
+    IntentRiskSettlementExecuted(
       intentHash?: PromiseOrValue<BytesLike> | null,
-      releasedAmount?: null,
-      settledAt?: null
-    ): IntentSettlementRecordedEventFilter;
+      riskHook?: PromiseOrValue<string> | null,
+      token?: PromiseOrValue<string> | null,
+      grossAmount?: null,
+      executableAmount?: null,
+      fundsConsumed?: null,
+      isManualRelease?: null
+    ): IntentRiskSettlementExecutedEventFilter;
 
     "IntentSignaled(bytes32,address,uint256,bytes32,address,address,uint256,bytes32,uint256,uint256)"(
       intentHash?: PromiseOrValue<BytesLike> | null,
@@ -1721,13 +1612,6 @@ export interface OrchestratorV3 extends BaseContract {
     ): ProtocolFeeUpdatedEventFilter;
     ProtocolFeeUpdated(protocolFee?: null): ProtocolFeeUpdatedEventFilter;
 
-    "RelayerRegistryUpdated(address)"(
-      relayerRegistry?: PromiseOrValue<string> | null
-    ): RelayerRegistryUpdatedEventFilter;
-    RelayerRegistryUpdated(
-      relayerRegistry?: PromiseOrValue<string> | null
-    ): RelayerRegistryUpdatedEventFilter;
-
     "RiskCallbackGasLimitUpdated(uint256)"(
       gasLimit?: null
     ): RiskCallbackGasLimitUpdatedEventFilter;
@@ -1753,14 +1637,11 @@ export interface OrchestratorV3 extends BaseContract {
   };
 
   estimateGas: {
-    MAX_RISK_CALLBACK_RETURN_DATA(
-      overrides?: CallOverrides
+    acknowledgeIntentCancellation(
+      _intentHash: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
-    MIN_RISK_CALLBACK_GAS_LIMIT(overrides?: CallOverrides): Promise<BigNumber>;
-
-    allowMultipleIntents(overrides?: CallOverrides): Promise<BigNumber>;
-
     cancelIntent(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -1776,15 +1657,10 @@ export interface OrchestratorV3 extends BaseContract {
     escrowRegistry(overrides?: CallOverrides): Promise<BigNumber>;
 
     fulfillIntent(
-      _params: IOrchestratorV2.FulfillIntentParamsStruct,
+      _params: IOrchestratorV3.FulfillIntentParamsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
-    getAccountIntentCount(
-      _account: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
     getAccountIntents(
       _account: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -1813,17 +1689,17 @@ export interface OrchestratorV3 extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    getIntentMinAtSignal(
+    getIntentCancellation(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    getIntentRiskHook(
+    getIntentMinAtSignal(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    getIntentSettlement(
+    getIntentRiskHook(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
@@ -1835,11 +1711,6 @@ export interface OrchestratorV3 extends BaseContract {
 
     intentCounter(overrides?: CallOverrides): Promise<BigNumber>;
 
-    intentRequiresPostIntentHook(
-      arg0: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
     owner(overrides?: CallOverrides): Promise<BigNumber>;
 
     pauseOrchestrator(
@@ -1859,8 +1730,6 @@ export interface OrchestratorV3 extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
-    relayerRegistry(overrides?: CallOverrides): Promise<BigNumber>;
-
     releaseFundsToPayer(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -1872,11 +1741,6 @@ export interface OrchestratorV3 extends BaseContract {
 
     riskCallbackGasLimit(overrides?: CallOverrides): Promise<BigNumber>;
 
-    setAllowMultipleIntents(
-      _allowMultiple: PromiseOrValue<boolean>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
     setDepositPreIntentHook(
       _escrow: PromiseOrValue<string>,
       _depositId: PromiseOrValue<BigNumberish>,
@@ -1913,18 +1777,13 @@ export interface OrchestratorV3 extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
-    setRelayerRegistry(
-      _relayerRegistry: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
     setRiskCallbackGasLimit(
       _gasLimit: PromiseOrValue<BigNumberish>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
     signalIntent(
-      _params: IOrchestratorV2.SignalIntentParamsStruct,
+      _params: IOrchestratorV3.SignalIntentParamsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
@@ -1936,19 +1795,17 @@ export interface OrchestratorV3 extends BaseContract {
     unpauseOrchestrator(
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    MAX_RISK_CALLBACK_RETURN_DATA(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
 
-    MIN_RISK_CALLBACK_GAS_LIMIT(
+    usedGatingSignatureDigests(
+      arg0: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
+    ): Promise<BigNumber>;
+  };
 
-    allowMultipleIntents(
-      overrides?: CallOverrides
+  populateTransaction: {
+    acknowledgeIntentCancellation(
+      _intentHash: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
     cancelIntent(
@@ -1966,15 +1823,10 @@ export interface OrchestratorV3 extends BaseContract {
     escrowRegistry(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     fulfillIntent(
-      _params: IOrchestratorV2.FulfillIntentParamsStruct,
+      _params: IOrchestratorV3.FulfillIntentParamsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
-    getAccountIntentCount(
-      _account: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
     getAccountIntents(
       _account: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -2003,17 +1855,17 @@ export interface OrchestratorV3 extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    getIntentMinAtSignal(
+    getIntentCancellation(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    getIntentRiskHook(
+    getIntentMinAtSignal(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    getIntentSettlement(
+    getIntentRiskHook(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
@@ -2025,11 +1877,6 @@ export interface OrchestratorV3 extends BaseContract {
 
     intentCounter(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    intentRequiresPostIntentHook(
-      arg0: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
     owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     pauseOrchestrator(
@@ -2053,8 +1900,6 @@ export interface OrchestratorV3 extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
-    relayerRegistry(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
     releaseFundsToPayer(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -2068,11 +1913,6 @@ export interface OrchestratorV3 extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    setAllowMultipleIntents(
-      _allowMultiple: PromiseOrValue<boolean>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
     setDepositPreIntentHook(
       _escrow: PromiseOrValue<string>,
       _depositId: PromiseOrValue<BigNumberish>,
@@ -2109,18 +1949,13 @@ export interface OrchestratorV3 extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
-    setRelayerRegistry(
-      _relayerRegistry: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
     setRiskCallbackGasLimit(
       _gasLimit: PromiseOrValue<BigNumberish>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
     signalIntent(
-      _params: IOrchestratorV2.SignalIntentParamsStruct,
+      _params: IOrchestratorV3.SignalIntentParamsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -2132,5 +1967,10 @@ export interface OrchestratorV3 extends BaseContract {
     unpauseOrchestrator(
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
+
+    usedGatingSignatureDigests(
+      arg0: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
   };
 }