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

package/types/contracts/interfaces/IOrchestratorV3.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,51 +180,20 @@ 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 IOrchestratorV3Interface extends utils.Interface {
   functions: {
+    "acknowledgeIntentCancellation(bytes32)": FunctionFragment;
     "cancelIntent(bytes32)": FunctionFragment;
     "cleanupOrphanedIntents(bytes32[])": 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;
     "getIntentRiskHook(bytes32)": FunctionFragment;
-    "getIntentSettlement(bytes32)": FunctionFragment;
     "getRiskIntent(bytes32)": FunctionFragment;
-    "intentRequiresPostIntentHook(bytes32)": FunctionFragment;
     "pruneIntents(bytes32[])": FunctionFragment;
     "releaseFundsToPayer(bytes32)": FunctionFragment;
     "setDepositPreIntentHook(address,uint256,address)": FunctionFragment;
@@ -208,19 +205,18 @@ export interface IOrchestratorV3Interface extends utils.Interface {
 
   getFunction(
     nameOrSignatureOrTopic:
+      | "acknowledgeIntentCancellation"
       | "cancelIntent"
       | "cleanupOrphanedIntents"
       | "fulfillIntent"
-      | "getAccountIntentCount"
       | "getAccountIntents"
       | "getDepositPreIntentHook"
       | "getDepositRiskHook"
       | "getDepositWhitelistHook"
       | "getIntent"
+      | "getIntentCancellation"
       | "getIntentRiskHook"
-      | "getIntentSettlement"
       | "getRiskIntent"
-      | "intentRequiresPostIntentHook"
       | "pruneIntents"
       | "releaseFundsToPayer"
       | "setDepositPreIntentHook"
@@ -230,6 +226,10 @@ export interface IOrchestratorV3Interface extends utils.Interface {
       | "signalIntent"
   ): FunctionFragment;
 
+  encodeFunctionData(
+    functionFragment: "acknowledgeIntentCancellation",
+    values: [PromiseOrValue<BytesLike>]
+  ): string;
   encodeFunctionData(
     functionFragment: "cancelIntent",
     values: [PromiseOrValue<BytesLike>]
@@ -240,11 +240,7 @@ export interface IOrchestratorV3Interface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "fulfillIntent",
-    values: [IOrchestratorV2.FulfillIntentParamsStruct]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getAccountIntentCount",
-    values: [PromiseOrValue<string>]
+    values: [IOrchestratorV3.FulfillIntentParamsStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "getAccountIntents",
@@ -267,21 +263,17 @@ export interface IOrchestratorV3Interface extends utils.Interface {
     values: [PromiseOrValue<BytesLike>]
   ): string;
   encodeFunctionData(
-    functionFragment: "getIntentRiskHook",
+    functionFragment: "getIntentCancellation",
     values: [PromiseOrValue<BytesLike>]
   ): string;
   encodeFunctionData(
-    functionFragment: "getIntentSettlement",
+    functionFragment: "getIntentRiskHook",
     values: [PromiseOrValue<BytesLike>]
   ): string;
   encodeFunctionData(
     functionFragment: "getRiskIntent",
     values: [PromiseOrValue<BytesLike>]
   ): string;
-  encodeFunctionData(
-    functionFragment: "intentRequiresPostIntentHook",
-    values: [PromiseOrValue<BytesLike>]
-  ): string;
   encodeFunctionData(
     functionFragment: "pruneIntents",
     values: [PromiseOrValue<BytesLike>[]]
@@ -320,23 +312,23 @@ export interface IOrchestratorV3Interface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "signalIntent",
-    values: [IOrchestratorV2.SignalIntentParamsStruct]
+    values: [IOrchestratorV3.SignalIntentParamsStruct]
   ): string;
 
   decodeFunctionResult(
-    functionFragment: "cancelIntent",
+    functionFragment: "acknowledgeIntentCancellation",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "cleanupOrphanedIntents",
+    functionFragment: "cancelIntent",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "fulfillIntent",
+    functionFragment: "cleanupOrphanedIntents",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "getAccountIntentCount",
+    functionFragment: "fulfillIntent",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -357,21 +349,17 @@ export interface IOrchestratorV3Interface extends utils.Interface {
   ): Result;
   decodeFunctionResult(functionFragment: "getIntent", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "getIntentRiskHook",
+    functionFragment: "getIntentCancellation",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "getIntentSettlement",
+    functionFragment: "getIntentRiskHook",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
     functionFragment: "getRiskIntent",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "intentRequiresPostIntentHook",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "pruneIntents",
     data: BytesLike
@@ -402,44 +390,45 @@ export interface IOrchestratorV3Interface extends utils.Interface {
   ): 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;
     "PartialManualReleaseDelayUpdated(uint256)": EventFragment;
     "PaymentVerifierRegistryUpdated(address)": EventFragment;
     "ProtocolFeeRecipientUpdated(address)": EventFragment;
     "ProtocolFeeUpdated(uint256)": EventFragment;
-    "RelayerRegistryUpdated(address)": EventFragment;
     "RiskCallbackGasLimitUpdated(uint256)": EventFragment;
     "RiskHookCallbackFailed(bytes32,address,bytes4,bytes)": 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: "PartialManualReleaseDelayUpdated"
@@ -451,24 +440,12 @@ export interface IOrchestratorV3Interface extends utils.Interface {
     nameOrSignatureOrTopic: "ProtocolFeeRecipientUpdated"
   ): EventFragment;
   getEvent(nameOrSignatureOrTopic: "ProtocolFeeUpdated"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "RelayerRegistryUpdated"): EventFragment;
   getEvent(
     nameOrSignatureOrTopic: "RiskCallbackGasLimitUpdated"
   ): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RiskHookCallbackFailed"): EventFragment;
 }
 
-export interface AllowMultipleIntentsUpdatedEventObject {
-  allowMultiple: boolean;
-}
-export type AllowMultipleIntentsUpdatedEvent = TypedEvent<
-  [boolean],
-  AllowMultipleIntentsUpdatedEventObject
->;
-
-export type AllowMultipleIntentsUpdatedEventFilter =
-  TypedEventFilter<AllowMultipleIntentsUpdatedEvent>;
-
 export interface DepositPreIntentHookSetEventObject {
   escrow: string;
   depositId: BigNumber;
@@ -522,6 +499,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;
@@ -555,44 +570,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;
@@ -668,17 +673,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;
 }
@@ -731,6 +725,11 @@ export interface IOrchestratorV3 extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
+    acknowledgeIntentCancellation(
+      _intentHash: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>;
+
     cancelIntent(
       intentHash: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -742,15 +741,10 @@ export interface IOrchestratorV3 extends BaseContract {
     ): Promise<ContractTransaction>;
 
     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
@@ -777,33 +771,23 @@ export interface IOrchestratorV3 extends BaseContract {
     getIntent(
       intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
-    ): Promise<[IOrchestratorV2.IntentStructOutput]>;
+    ): Promise<[IOrchestratorV3.IntentStructOutput]>;
 
-    getIntentRiskHook(
+    getIntentCancellation(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
-    ): Promise<[string]>;
+    ): Promise<[BigNumber] & { cancelledAt: BigNumber }>;
 
-    getIntentSettlement(
+    getIntentRiskHook(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & {
-        releasedAmount: BigNumber;
-        settledAt: BigNumber;
-      }
-    >;
+    ): Promise<[string]>;
 
     getRiskIntent(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<[IOrchestratorV3.RiskIntentDataStructOutput]>;
 
-    intentRequiresPostIntentHook(
-      _intentHash: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
     pruneIntents(
       intentIds: PromiseOrValue<BytesLike>[],
       overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -841,11 +825,16 @@ export interface IOrchestratorV3 extends BaseContract {
     ): Promise<ContractTransaction>;
 
     signalIntent(
-      params: IOrchestratorV2.SignalIntentParamsStruct,
+      params: IOrchestratorV3.SignalIntentParamsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
   };
 
+  acknowledgeIntentCancellation(
+    _intentHash: PromiseOrValue<BytesLike>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>;
+
   cancelIntent(
     intentHash: PromiseOrValue<BytesLike>,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -857,15 +846,10 @@ export interface IOrchestratorV3 extends BaseContract {
   ): Promise<ContractTransaction>;
 
   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
@@ -892,30 +876,23 @@ export interface IOrchestratorV3 extends BaseContract {
   getIntent(
     intentHash: PromiseOrValue<BytesLike>,
     overrides?: CallOverrides
-  ): Promise<IOrchestratorV2.IntentStructOutput>;
+  ): Promise<IOrchestratorV3.IntentStructOutput>;
 
-  getIntentRiskHook(
+  getIntentCancellation(
     _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>,
     overrides?: CallOverrides
   ): Promise<IOrchestratorV3.RiskIntentDataStructOutput>;
 
-  intentRequiresPostIntentHook(
-    _intentHash: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
   pruneIntents(
     intentIds: PromiseOrValue<BytesLike>[],
     overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -953,11 +930,16 @@ export interface IOrchestratorV3 extends BaseContract {
   ): Promise<ContractTransaction>;
 
   signalIntent(
-    params: IOrchestratorV2.SignalIntentParamsStruct,
+    params: IOrchestratorV3.SignalIntentParamsStruct,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
   callStatic: {
+    acknowledgeIntentCancellation(
+      _intentHash: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<void>;
+
     cancelIntent(
       intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
@@ -969,15 +951,10 @@ export interface IOrchestratorV3 extends BaseContract {
     ): Promise<void>;
 
     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
@@ -1004,33 +981,23 @@ export interface IOrchestratorV3 extends BaseContract {
     getIntent(
       intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
-    ): Promise<IOrchestratorV2.IntentStructOutput>;
+    ): Promise<IOrchestratorV3.IntentStructOutput>;
 
-    getIntentRiskHook(
+    getIntentCancellation(
       _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>,
       overrides?: CallOverrides
     ): Promise<IOrchestratorV3.RiskIntentDataStructOutput>;
 
-    intentRequiresPostIntentHook(
-      _intentHash: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
     pruneIntents(
       intentIds: PromiseOrValue<BytesLike>[],
       overrides?: CallOverrides
@@ -1068,19 +1035,12 @@ export interface IOrchestratorV3 extends BaseContract {
     ): Promise<void>;
 
     signalIntent(
-      params: IOrchestratorV2.SignalIntentParamsStruct,
+      params: IOrchestratorV3.SignalIntentParamsStruct,
       overrides?: CallOverrides
     ): Promise<void>;
   };
 
   filters: {
-    "AllowMultipleIntentsUpdated(bool)"(
-      allowMultiple?: null
-    ): AllowMultipleIntentsUpdatedEventFilter;
-    AllowMultipleIntentsUpdated(
-      allowMultiple?: null
-    ): AllowMultipleIntentsUpdatedEventFilter;
-
     "DepositPreIntentHookSet(address,uint256,address,address)"(
       escrow?: PromiseOrValue<string> | null,
       depositId?: PromiseOrValue<BigNumberish> | null,
@@ -1127,6 +1087,37 @@ export interface IOrchestratorV3 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,
@@ -1158,38 +1149,33 @@ export interface IOrchestratorV3 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,
@@ -1242,13 +1228,6 @@ export interface IOrchestratorV3 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;
@@ -1271,6 +1250,11 @@ export interface IOrchestratorV3 extends BaseContract {
   };
 
   estimateGas: {
+    acknowledgeIntentCancellation(
+      _intentHash: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>;
+
     cancelIntent(
       intentHash: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -1282,15 +1266,10 @@ export interface IOrchestratorV3 extends BaseContract {
     ): 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
@@ -1319,12 +1298,12 @@ export interface IOrchestratorV3 extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    getIntentRiskHook(
+    getIntentCancellation(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    getIntentSettlement(
+    getIntentRiskHook(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
@@ -1334,11 +1313,6 @@ export interface IOrchestratorV3 extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    intentRequiresPostIntentHook(
-      _intentHash: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
     pruneIntents(
       intentIds: PromiseOrValue<BytesLike>[],
       overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -1376,12 +1350,17 @@ export interface IOrchestratorV3 extends BaseContract {
     ): Promise<BigNumber>;
 
     signalIntent(
-      params: IOrchestratorV2.SignalIntentParamsStruct,
+      params: IOrchestratorV3.SignalIntentParamsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
   };
 
   populateTransaction: {
+    acknowledgeIntentCancellation(
+      _intentHash: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>;
+
     cancelIntent(
       intentHash: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -1393,15 +1372,10 @@ export interface IOrchestratorV3 extends BaseContract {
     ): 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
@@ -1430,12 +1404,12 @@ export interface IOrchestratorV3 extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    getIntentRiskHook(
+    getIntentCancellation(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    getIntentSettlement(
+    getIntentRiskHook(
       _intentHash: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
@@ -1445,11 +1419,6 @@ export interface IOrchestratorV3 extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    intentRequiresPostIntentHook(
-      _intentHash: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
     pruneIntents(
       intentIds: PromiseOrValue<BytesLike>[],
       overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -1487,7 +1456,7 @@ export interface IOrchestratorV3 extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     signalIntent(
-      params: IOrchestratorV2.SignalIntentParamsStruct,
+      params: IOrchestratorV3.SignalIntentParamsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
   };