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

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

@@ -42,52 +42,34 @@ export declare namespace IEscrow {
     depositor: PromiseOrValue<string>;
     delegate: PromiseOrValue<string>;
     token: PromiseOrValue<string>;
-    amount: PromiseOrValue<BigNumberish>;
     intentAmountRange: IEscrow.RangeStruct;
     acceptingIntents: PromiseOrValue<boolean>;
     remainingDeposits: PromiseOrValue<BigNumberish>;
     outstandingIntentAmount: PromiseOrValue<BigNumberish>;
-    makerProtocolFee: PromiseOrValue<BigNumberish>;
-    reservedMakerFees: PromiseOrValue<BigNumberish>;
-    accruedMakerFees: PromiseOrValue<BigNumberish>;
-    accruedReferrerFees: PromiseOrValue<BigNumberish>;
     intentGuardian: PromiseOrValue<string>;
-    referrer: PromiseOrValue<string>;
-    referrerFee: PromiseOrValue<BigNumberish>;
+    retainOnEmpty: PromiseOrValue<boolean>;
   };
 
   export type DepositStructOutput = [
     string,
     string,
     string,
-    BigNumber,
     IEscrow.RangeStructOutput,
     boolean,
     BigNumber,
     BigNumber,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    BigNumber,
     string,
-    string,
-    BigNumber
+    boolean
   ] & {
     depositor: string;
     delegate: string;
     token: string;
-    amount: BigNumber;
     intentAmountRange: IEscrow.RangeStructOutput;
     acceptingIntents: boolean;
     remainingDeposits: BigNumber;
     outstandingIntentAmount: BigNumber;
-    makerProtocolFee: BigNumber;
-    reservedMakerFees: BigNumber;
-    accruedMakerFees: BigNumber;
-    accruedReferrerFees: BigNumber;
     intentGuardian: string;
-    referrer: string;
-    referrerFee: BigNumber;
+    retainOnEmpty: boolean;
   };
 
   export type IntentStruct = {
@@ -124,8 +106,10 @@ export interface IEscrowInterface extends utils.Interface {
     "getDeposit(uint256)": FunctionFragment;
     "getDepositCurrencies(uint256,bytes32)": FunctionFragment;
     "getDepositCurrencyMinRate(uint256,bytes32,bytes32)": FunctionFragment;
+    "getDepositGatingService(uint256,bytes32)": FunctionFragment;
     "getDepositIntent(uint256,bytes32)": FunctionFragment;
     "getDepositIntentHashes(uint256)": FunctionFragment;
+    "getDepositPaymentMethodActive(uint256,bytes32)": FunctionFragment;
     "getDepositPaymentMethodData(uint256,bytes32)": FunctionFragment;
     "getDepositPaymentMethods(uint256)": FunctionFragment;
     "getExpiredIntents(uint256)": FunctionFragment;
@@ -141,8 +125,10 @@ export interface IEscrowInterface extends utils.Interface {
       | "getDeposit"
       | "getDepositCurrencies"
       | "getDepositCurrencyMinRate"
+      | "getDepositGatingService"
       | "getDepositIntent"
       | "getDepositIntentHashes"
+      | "getDepositPaymentMethodActive"
       | "getDepositPaymentMethodData"
       | "getDepositPaymentMethods"
       | "getExpiredIntents"
@@ -179,6 +165,10 @@ export interface IEscrowInterface extends utils.Interface {
       PromiseOrValue<BytesLike>
     ]
   ): string;
+  encodeFunctionData(
+    functionFragment: "getDepositGatingService",
+    values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BytesLike>]
+  ): string;
   encodeFunctionData(
     functionFragment: "getDepositIntent",
     values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BytesLike>]
@@ -187,6 +177,10 @@ export interface IEscrowInterface extends utils.Interface {
     functionFragment: "getDepositIntentHashes",
     values: [PromiseOrValue<BigNumberish>]
   ): string;
+  encodeFunctionData(
+    functionFragment: "getDepositPaymentMethodActive",
+    values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BytesLike>]
+  ): string;
   encodeFunctionData(
     functionFragment: "getDepositPaymentMethodData",
     values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BytesLike>]
@@ -238,6 +232,10 @@ export interface IEscrowInterface extends utils.Interface {
     functionFragment: "getDepositCurrencyMinRate",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "getDepositGatingService",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "getDepositIntent",
     data: BytesLike
@@ -246,6 +244,10 @@ export interface IEscrowInterface extends utils.Interface {
     functionFragment: "getDepositIntentHashes",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "getDepositPaymentMethodActive",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "getDepositPaymentMethodData",
     data: BytesLike
@@ -272,31 +274,28 @@ export interface IEscrowInterface extends utils.Interface {
     "DepositAcceptingIntentsUpdated(uint256,bool)": EventFragment;
     "DepositClosed(uint256,address)": EventFragment;
     "DepositCurrencyAdded(uint256,bytes32,bytes32,uint256)": EventFragment;
-    "DepositCurrencyRemoved(uint256,bytes32,bytes32)": EventFragment;
     "DepositDelegateRemoved(uint256,address)": EventFragment;
     "DepositDelegateSet(uint256,address,address)": EventFragment;
-    "DepositFundsAdded(uint256,address,uint256,uint256)": EventFragment;
+    "DepositFundsAdded(uint256,address,uint256)": EventFragment;
     "DepositIntentAmountRangeUpdated(uint256,tuple)": EventFragment;
     "DepositMinConversionRateUpdated(uint256,bytes32,bytes32,uint256)": EventFragment;
+    "DepositPaymentMethodActiveUpdated(uint256,bytes32,bool)": EventFragment;
     "DepositPaymentMethodAdded(uint256,bytes32,bytes32,address)": EventFragment;
-    "DepositPaymentMethodRemoved(uint256,bytes32)": EventFragment;
-    "DepositReceived(uint256,address,address,uint256,uint256,tuple,address,address)": EventFragment;
-    "DepositWithdrawn(uint256,address,uint256,bool)": EventFragment;
+    "DepositReceived(uint256,address,address,uint256,tuple,address,address)": EventFragment;
+    "DepositRetainOnEmptyUpdated(uint256,bool)": EventFragment;
+    "DepositWithdrawn(uint256,address,uint256)": EventFragment;
     "DustCollected(uint256,uint256,address)": EventFragment;
+    "DustRecipientUpdated(address)": EventFragment;
     "DustThresholdUpdated(uint256)": EventFragment;
     "FundsLocked(uint256,bytes32,uint256,uint256)": EventFragment;
     "FundsUnlocked(uint256,bytes32,uint256)": EventFragment;
-    "FundsUnlockedAndTransferred(uint256,bytes32,uint256,uint256,uint256,uint256,address)": EventFragment;
+    "FundsUnlockedAndTransferred(uint256,bytes32,uint256,uint256,address)": EventFragment;
     "IntentExpirationPeriodUpdated(uint256)": EventFragment;
     "IntentExpiryExtended(uint256,bytes32,uint256)": EventFragment;
-    "MakerFeeRecipientUpdated(address)": EventFragment;
-    "MakerFeesCollected(uint256,uint256,address)": EventFragment;
-    "MakerProtocolFeeUpdated(uint256)": EventFragment;
     "MaxIntentsPerDepositUpdated(uint256)": EventFragment;
     "MinDepositAmountSet(uint256)": EventFragment;
     "OrchestratorUpdated(address)": EventFragment;
     "PaymentVerifierRegistryUpdated(address)": EventFragment;
-    "ReferrerFeesCollected(uint256,uint256,address)": EventFragment;
   };
 
   getEvent(
@@ -304,7 +303,6 @@ export interface IEscrowInterface extends utils.Interface {
   ): EventFragment;
   getEvent(nameOrSignatureOrTopic: "DepositClosed"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "DepositCurrencyAdded"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "DepositCurrencyRemoved"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "DepositDelegateRemoved"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "DepositDelegateSet"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "DepositFundsAdded"): EventFragment;
@@ -314,13 +312,17 @@ export interface IEscrowInterface extends utils.Interface {
   getEvent(
     nameOrSignatureOrTopic: "DepositMinConversionRateUpdated"
   ): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "DepositPaymentMethodAdded"): EventFragment;
   getEvent(
-    nameOrSignatureOrTopic: "DepositPaymentMethodRemoved"
+    nameOrSignatureOrTopic: "DepositPaymentMethodActiveUpdated"
   ): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "DepositPaymentMethodAdded"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "DepositReceived"): EventFragment;
+  getEvent(
+    nameOrSignatureOrTopic: "DepositRetainOnEmptyUpdated"
+  ): EventFragment;
   getEvent(nameOrSignatureOrTopic: "DepositWithdrawn"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "DustCollected"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "DustRecipientUpdated"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "DustThresholdUpdated"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "FundsLocked"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "FundsUnlocked"): EventFragment;
@@ -331,9 +333,6 @@ export interface IEscrowInterface extends utils.Interface {
     nameOrSignatureOrTopic: "IntentExpirationPeriodUpdated"
   ): EventFragment;
   getEvent(nameOrSignatureOrTopic: "IntentExpiryExtended"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "MakerFeeRecipientUpdated"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "MakerFeesCollected"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "MakerProtocolFeeUpdated"): EventFragment;
   getEvent(
     nameOrSignatureOrTopic: "MaxIntentsPerDepositUpdated"
   ): EventFragment;
@@ -342,7 +341,6 @@ export interface IEscrowInterface extends utils.Interface {
   getEvent(
     nameOrSignatureOrTopic: "PaymentVerifierRegistryUpdated"
   ): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ReferrerFeesCollected"): EventFragment;
 }
 
 export interface DepositAcceptingIntentsUpdatedEventObject {
@@ -382,19 +380,6 @@ export type DepositCurrencyAddedEvent = TypedEvent<
 export type DepositCurrencyAddedEventFilter =
   TypedEventFilter<DepositCurrencyAddedEvent>;
 
-export interface DepositCurrencyRemovedEventObject {
-  depositId: BigNumber;
-  paymentMethod: string;
-  currencyCode: string;
-}
-export type DepositCurrencyRemovedEvent = TypedEvent<
-  [BigNumber, string, string],
-  DepositCurrencyRemovedEventObject
->;
-
-export type DepositCurrencyRemovedEventFilter =
-  TypedEventFilter<DepositCurrencyRemovedEvent>;
-
 export interface DepositDelegateRemovedEventObject {
   depositId: BigNumber;
   depositor: string;
@@ -424,10 +409,9 @@ export interface DepositFundsAddedEventObject {
   depositId: BigNumber;
   depositor: string;
   amount: BigNumber;
-  netAdditionalAmount: BigNumber;
 }
 export type DepositFundsAddedEvent = TypedEvent<
-  [BigNumber, string, BigNumber, BigNumber],
+  [BigNumber, string, BigNumber],
   DepositFundsAddedEventObject
 >;
 
@@ -460,6 +444,19 @@ export type DepositMinConversionRateUpdatedEvent = TypedEvent<
 export type DepositMinConversionRateUpdatedEventFilter =
   TypedEventFilter<DepositMinConversionRateUpdatedEvent>;
 
+export interface DepositPaymentMethodActiveUpdatedEventObject {
+  depositId: BigNumber;
+  paymentMethod: string;
+  active: boolean;
+}
+export type DepositPaymentMethodActiveUpdatedEvent = TypedEvent<
+  [BigNumber, string, boolean],
+  DepositPaymentMethodActiveUpdatedEventObject
+>;
+
+export type DepositPaymentMethodActiveUpdatedEventFilter =
+  TypedEventFilter<DepositPaymentMethodActiveUpdatedEvent>;
+
 export interface DepositPaymentMethodAddedEventObject {
   depositId: BigNumber;
   paymentMethod: string;
@@ -474,24 +471,11 @@ export type DepositPaymentMethodAddedEvent = TypedEvent<
 export type DepositPaymentMethodAddedEventFilter =
   TypedEventFilter<DepositPaymentMethodAddedEvent>;
 
-export interface DepositPaymentMethodRemovedEventObject {
-  depositId: BigNumber;
-  paymentMethod: string;
-}
-export type DepositPaymentMethodRemovedEvent = TypedEvent<
-  [BigNumber, string],
-  DepositPaymentMethodRemovedEventObject
->;
-
-export type DepositPaymentMethodRemovedEventFilter =
-  TypedEventFilter<DepositPaymentMethodRemovedEvent>;
-
 export interface DepositReceivedEventObject {
   depositId: BigNumber;
   depositor: string;
   token: string;
   amount: BigNumber;
-  netDepositAmount: BigNumber;
   intentAmountRange: IEscrow.RangeStructOutput;
   delegate: string;
   intentGuardian: string;
@@ -502,7 +486,6 @@ export type DepositReceivedEvent = TypedEvent<
     string,
     string,
     BigNumber,
-    BigNumber,
     IEscrow.RangeStructOutput,
     string,
     string
@@ -512,14 +495,25 @@ export type DepositReceivedEvent = TypedEvent<
 
 export type DepositReceivedEventFilter = TypedEventFilter<DepositReceivedEvent>;
 
+export interface DepositRetainOnEmptyUpdatedEventObject {
+  depositId: BigNumber;
+  retainOnEmpty: boolean;
+}
+export type DepositRetainOnEmptyUpdatedEvent = TypedEvent<
+  [BigNumber, boolean],
+  DepositRetainOnEmptyUpdatedEventObject
+>;
+
+export type DepositRetainOnEmptyUpdatedEventFilter =
+  TypedEventFilter<DepositRetainOnEmptyUpdatedEvent>;
+
 export interface DepositWithdrawnEventObject {
   depositId: BigNumber;
   depositor: string;
   amount: BigNumber;
-  acceptingIntents: boolean;
 }
 export type DepositWithdrawnEvent = TypedEvent<
-  [BigNumber, string, BigNumber, boolean],
+  [BigNumber, string, BigNumber],
   DepositWithdrawnEventObject
 >;
 
@@ -529,7 +523,7 @@ export type DepositWithdrawnEventFilter =
 export interface DustCollectedEventObject {
   depositId: BigNumber;
   dustAmount: BigNumber;
-  makerFeeRecipient: string;
+  dustRecipient: string;
 }
 export type DustCollectedEvent = TypedEvent<
   [BigNumber, BigNumber, string],
@@ -538,6 +532,17 @@ export type DustCollectedEvent = TypedEvent<
 
 export type DustCollectedEventFilter = TypedEventFilter<DustCollectedEvent>;
 
+export interface DustRecipientUpdatedEventObject {
+  dustRecipient: string;
+}
+export type DustRecipientUpdatedEvent = TypedEvent<
+  [string],
+  DustRecipientUpdatedEventObject
+>;
+
+export type DustRecipientUpdatedEventFilter =
+  TypedEventFilter<DustRecipientUpdatedEvent>;
+
 export interface DustThresholdUpdatedEventObject {
   dustThreshold: BigNumber;
 }
@@ -579,12 +584,10 @@ export interface FundsUnlockedAndTransferredEventObject {
   intentHash: string;
   unlockedAmount: BigNumber;
   transferredAmount: BigNumber;
-  makerFees: BigNumber;
-  referrerFees: BigNumber;
   to: string;
 }
 export type FundsUnlockedAndTransferredEvent = TypedEvent<
-  [BigNumber, string, BigNumber, BigNumber, BigNumber, BigNumber, string],
+  [BigNumber, string, BigNumber, BigNumber, string],
   FundsUnlockedAndTransferredEventObject
 >;
 
@@ -615,41 +618,6 @@ export type IntentExpiryExtendedEvent = TypedEvent<
 export type IntentExpiryExtendedEventFilter =
   TypedEventFilter<IntentExpiryExtendedEvent>;
 
-export interface MakerFeeRecipientUpdatedEventObject {
-  makerFeeRecipient: string;
-}
-export type MakerFeeRecipientUpdatedEvent = TypedEvent<
-  [string],
-  MakerFeeRecipientUpdatedEventObject
->;
-
-export type MakerFeeRecipientUpdatedEventFilter =
-  TypedEventFilter<MakerFeeRecipientUpdatedEvent>;
-
-export interface MakerFeesCollectedEventObject {
-  depositId: BigNumber;
-  collectedFees: BigNumber;
-  makerFeeRecipient: string;
-}
-export type MakerFeesCollectedEvent = TypedEvent<
-  [BigNumber, BigNumber, string],
-  MakerFeesCollectedEventObject
->;
-
-export type MakerFeesCollectedEventFilter =
-  TypedEventFilter<MakerFeesCollectedEvent>;
-
-export interface MakerProtocolFeeUpdatedEventObject {
-  makerProtocolFee: BigNumber;
-}
-export type MakerProtocolFeeUpdatedEvent = TypedEvent<
-  [BigNumber],
-  MakerProtocolFeeUpdatedEventObject
->;
-
-export type MakerProtocolFeeUpdatedEventFilter =
-  TypedEventFilter<MakerProtocolFeeUpdatedEvent>;
-
 export interface MaxIntentsPerDepositUpdatedEventObject {
   maxIntentsPerDeposit: BigNumber;
 }
@@ -694,19 +662,6 @@ export type PaymentVerifierRegistryUpdatedEvent = TypedEvent<
 export type PaymentVerifierRegistryUpdatedEventFilter =
   TypedEventFilter<PaymentVerifierRegistryUpdatedEvent>;
 
-export interface ReferrerFeesCollectedEventObject {
-  depositId: BigNumber;
-  collectedFees: BigNumber;
-  referrer: string;
-}
-export type ReferrerFeesCollectedEvent = TypedEvent<
-  [BigNumber, BigNumber, string],
-  ReferrerFeesCollectedEventObject
->;
-
-export type ReferrerFeesCollectedEventFilter =
-  TypedEventFilter<ReferrerFeesCollectedEvent>;
-
 export interface IEscrow extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
@@ -764,6 +719,12 @@ export interface IEscrow extends BaseContract {
       overrides?: CallOverrides
     ): Promise<[BigNumber]>;
 
+    getDepositGatingService(
+      _depositId: PromiseOrValue<BigNumberish>,
+      _paymentMethod: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<[string]>;
+
     getDepositIntent(
       _depositId: PromiseOrValue<BigNumberish>,
       _intentHash: PromiseOrValue<BytesLike>,
@@ -775,6 +736,12 @@ export interface IEscrow extends BaseContract {
       overrides?: CallOverrides
     ): Promise<[string[]]>;
 
+    getDepositPaymentMethodActive(
+      _depositId: PromiseOrValue<BigNumberish>,
+      _paymentMethod: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<[boolean]>;
+
     getDepositPaymentMethodData(
       _depositId: PromiseOrValue<BigNumberish>,
       _paymentMethod: PromiseOrValue<BytesLike>,
@@ -792,7 +759,7 @@ export interface IEscrow extends BaseContract {
     ): Promise<
       [string[], BigNumber] & {
         expiredIntents: string[];
-        reclaimedAmount: BigNumber;
+        reclaimableAmount: BigNumber;
       }
     >;
 
@@ -848,6 +815,12 @@ export interface IEscrow extends BaseContract {
     overrides?: CallOverrides
   ): Promise<BigNumber>;
 
+  getDepositGatingService(
+    _depositId: PromiseOrValue<BigNumberish>,
+    _paymentMethod: PromiseOrValue<BytesLike>,
+    overrides?: CallOverrides
+  ): Promise<string>;
+
   getDepositIntent(
     _depositId: PromiseOrValue<BigNumberish>,
     _intentHash: PromiseOrValue<BytesLike>,
@@ -859,6 +832,12 @@ export interface IEscrow extends BaseContract {
     overrides?: CallOverrides
   ): Promise<string[]>;
 
+  getDepositPaymentMethodActive(
+    _depositId: PromiseOrValue<BigNumberish>,
+    _paymentMethod: PromiseOrValue<BytesLike>,
+    overrides?: CallOverrides
+  ): Promise<boolean>;
+
   getDepositPaymentMethodData(
     _depositId: PromiseOrValue<BigNumberish>,
     _paymentMethod: PromiseOrValue<BytesLike>,
@@ -876,7 +855,7 @@ export interface IEscrow extends BaseContract {
   ): Promise<
     [string[], BigNumber] & {
       expiredIntents: string[];
-      reclaimedAmount: BigNumber;
+      reclaimableAmount: BigNumber;
     }
   >;
 
@@ -932,6 +911,12 @@ export interface IEscrow extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    getDepositGatingService(
+      _depositId: PromiseOrValue<BigNumberish>,
+      _paymentMethod: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<string>;
+
     getDepositIntent(
       _depositId: PromiseOrValue<BigNumberish>,
       _intentHash: PromiseOrValue<BytesLike>,
@@ -943,6 +928,12 @@ export interface IEscrow extends BaseContract {
       overrides?: CallOverrides
     ): Promise<string[]>;
 
+    getDepositPaymentMethodActive(
+      _depositId: PromiseOrValue<BigNumberish>,
+      _paymentMethod: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<boolean>;
+
     getDepositPaymentMethodData(
       _depositId: PromiseOrValue<BigNumberish>,
       _paymentMethod: PromiseOrValue<BytesLike>,
@@ -960,7 +951,7 @@ export interface IEscrow extends BaseContract {
     ): Promise<
       [string[], BigNumber] & {
         expiredIntents: string[];
-        reclaimedAmount: BigNumber;
+        reclaimableAmount: BigNumber;
       }
     >;
 
@@ -1015,17 +1006,6 @@ export interface IEscrow extends BaseContract {
       minConversionRate?: null
     ): DepositCurrencyAddedEventFilter;
 
-    "DepositCurrencyRemoved(uint256,bytes32,bytes32)"(
-      depositId?: PromiseOrValue<BigNumberish> | null,
-      paymentMethod?: PromiseOrValue<BytesLike> | null,
-      currencyCode?: PromiseOrValue<BytesLike> | null
-    ): DepositCurrencyRemovedEventFilter;
-    DepositCurrencyRemoved(
-      depositId?: PromiseOrValue<BigNumberish> | null,
-      paymentMethod?: PromiseOrValue<BytesLike> | null,
-      currencyCode?: PromiseOrValue<BytesLike> | null
-    ): DepositCurrencyRemovedEventFilter;
-
     "DepositDelegateRemoved(uint256,address)"(
       depositId?: PromiseOrValue<BigNumberish> | null,
       depositor?: PromiseOrValue<string> | null
@@ -1046,17 +1026,15 @@ export interface IEscrow extends BaseContract {
       delegate?: PromiseOrValue<string> | null
     ): DepositDelegateSetEventFilter;
 
-    "DepositFundsAdded(uint256,address,uint256,uint256)"(
+    "DepositFundsAdded(uint256,address,uint256)"(
       depositId?: PromiseOrValue<BigNumberish> | null,
       depositor?: PromiseOrValue<string> | null,
-      amount?: null,
-      netAdditionalAmount?: null
+      amount?: null
     ): DepositFundsAddedEventFilter;
     DepositFundsAdded(
       depositId?: PromiseOrValue<BigNumberish> | null,
       depositor?: PromiseOrValue<string> | null,
-      amount?: null,
-      netAdditionalAmount?: null
+      amount?: null
     ): DepositFundsAddedEventFilter;
 
     "DepositIntentAmountRangeUpdated(uint256,tuple)"(
@@ -1081,6 +1059,17 @@ export interface IEscrow extends BaseContract {
       newMinConversionRate?: null
     ): DepositMinConversionRateUpdatedEventFilter;
 
+    "DepositPaymentMethodActiveUpdated(uint256,bytes32,bool)"(
+      depositId?: PromiseOrValue<BigNumberish> | null,
+      paymentMethod?: PromiseOrValue<BytesLike> | null,
+      active?: null
+    ): DepositPaymentMethodActiveUpdatedEventFilter;
+    DepositPaymentMethodActiveUpdated(
+      depositId?: PromiseOrValue<BigNumberish> | null,
+      paymentMethod?: PromiseOrValue<BytesLike> | null,
+      active?: null
+    ): DepositPaymentMethodActiveUpdatedEventFilter;
+
     "DepositPaymentMethodAdded(uint256,bytes32,bytes32,address)"(
       depositId?: PromiseOrValue<BigNumberish> | null,
       paymentMethod?: PromiseOrValue<BytesLike> | null,
@@ -1094,21 +1083,11 @@ export interface IEscrow extends BaseContract {
       intentGatingService?: null
     ): DepositPaymentMethodAddedEventFilter;
 
-    "DepositPaymentMethodRemoved(uint256,bytes32)"(
-      depositId?: PromiseOrValue<BigNumberish> | null,
-      paymentMethod?: PromiseOrValue<BytesLike> | null
-    ): DepositPaymentMethodRemovedEventFilter;
-    DepositPaymentMethodRemoved(
-      depositId?: PromiseOrValue<BigNumberish> | null,
-      paymentMethod?: PromiseOrValue<BytesLike> | null
-    ): DepositPaymentMethodRemovedEventFilter;
-
-    "DepositReceived(uint256,address,address,uint256,uint256,tuple,address,address)"(
+    "DepositReceived(uint256,address,address,uint256,tuple,address,address)"(
       depositId?: PromiseOrValue<BigNumberish> | null,
       depositor?: PromiseOrValue<string> | null,
       token?: PromiseOrValue<string> | null,
       amount?: null,
-      netDepositAmount?: null,
       intentAmountRange?: null,
       delegate?: null,
       intentGuardian?: null
@@ -1118,36 +1097,49 @@ export interface IEscrow extends BaseContract {
       depositor?: PromiseOrValue<string> | null,
       token?: PromiseOrValue<string> | null,
       amount?: null,
-      netDepositAmount?: null,
       intentAmountRange?: null,
       delegate?: null,
       intentGuardian?: null
     ): DepositReceivedEventFilter;
 
-    "DepositWithdrawn(uint256,address,uint256,bool)"(
+    "DepositRetainOnEmptyUpdated(uint256,bool)"(
+      depositId?: PromiseOrValue<BigNumberish> | null,
+      retainOnEmpty?: null
+    ): DepositRetainOnEmptyUpdatedEventFilter;
+    DepositRetainOnEmptyUpdated(
+      depositId?: PromiseOrValue<BigNumberish> | null,
+      retainOnEmpty?: null
+    ): DepositRetainOnEmptyUpdatedEventFilter;
+
+    "DepositWithdrawn(uint256,address,uint256)"(
       depositId?: PromiseOrValue<BigNumberish> | null,
       depositor?: PromiseOrValue<string> | null,
-      amount?: null,
-      acceptingIntents?: null
+      amount?: null
     ): DepositWithdrawnEventFilter;
     DepositWithdrawn(
       depositId?: PromiseOrValue<BigNumberish> | null,
       depositor?: PromiseOrValue<string> | null,
-      amount?: null,
-      acceptingIntents?: null
+      amount?: null
     ): DepositWithdrawnEventFilter;
 
     "DustCollected(uint256,uint256,address)"(
       depositId?: PromiseOrValue<BigNumberish> | null,
       dustAmount?: null,
-      makerFeeRecipient?: PromiseOrValue<string> | null
+      dustRecipient?: PromiseOrValue<string> | null
     ): DustCollectedEventFilter;
     DustCollected(
       depositId?: PromiseOrValue<BigNumberish> | null,
       dustAmount?: null,
-      makerFeeRecipient?: PromiseOrValue<string> | null
+      dustRecipient?: PromiseOrValue<string> | null
     ): DustCollectedEventFilter;
 
+    "DustRecipientUpdated(address)"(
+      dustRecipient?: PromiseOrValue<string> | null
+    ): DustRecipientUpdatedEventFilter;
+    DustRecipientUpdated(
+      dustRecipient?: PromiseOrValue<string> | null
+    ): DustRecipientUpdatedEventFilter;
+
     "DustThresholdUpdated(uint256)"(
       dustThreshold?: null
     ): DustThresholdUpdatedEventFilter;
@@ -1177,13 +1169,11 @@ export interface IEscrow extends BaseContract {
       amount?: null
     ): FundsUnlockedEventFilter;
 
-    "FundsUnlockedAndTransferred(uint256,bytes32,uint256,uint256,uint256,uint256,address)"(
+    "FundsUnlockedAndTransferred(uint256,bytes32,uint256,uint256,address)"(
       depositId?: PromiseOrValue<BigNumberish> | null,
       intentHash?: PromiseOrValue<BytesLike> | null,
       unlockedAmount?: null,
       transferredAmount?: null,
-      makerFees?: null,
-      referrerFees?: null,
       to?: null
     ): FundsUnlockedAndTransferredEventFilter;
     FundsUnlockedAndTransferred(
@@ -1191,8 +1181,6 @@ export interface IEscrow extends BaseContract {
       intentHash?: PromiseOrValue<BytesLike> | null,
       unlockedAmount?: null,
       transferredAmount?: null,
-      makerFees?: null,
-      referrerFees?: null,
       to?: null
     ): FundsUnlockedAndTransferredEventFilter;
 
@@ -1214,31 +1202,6 @@ export interface IEscrow extends BaseContract {
       newExpiryTime?: null
     ): IntentExpiryExtendedEventFilter;
 
-    "MakerFeeRecipientUpdated(address)"(
-      makerFeeRecipient?: PromiseOrValue<string> | null
-    ): MakerFeeRecipientUpdatedEventFilter;
-    MakerFeeRecipientUpdated(
-      makerFeeRecipient?: PromiseOrValue<string> | null
-    ): MakerFeeRecipientUpdatedEventFilter;
-
-    "MakerFeesCollected(uint256,uint256,address)"(
-      depositId?: PromiseOrValue<BigNumberish> | null,
-      collectedFees?: null,
-      makerFeeRecipient?: PromiseOrValue<string> | null
-    ): MakerFeesCollectedEventFilter;
-    MakerFeesCollected(
-      depositId?: PromiseOrValue<BigNumberish> | null,
-      collectedFees?: null,
-      makerFeeRecipient?: PromiseOrValue<string> | null
-    ): MakerFeesCollectedEventFilter;
-
-    "MakerProtocolFeeUpdated(uint256)"(
-      makerProtocolFee?: null
-    ): MakerProtocolFeeUpdatedEventFilter;
-    MakerProtocolFeeUpdated(
-      makerProtocolFee?: null
-    ): MakerProtocolFeeUpdatedEventFilter;
-
     "MaxIntentsPerDepositUpdated(uint256)"(
       maxIntentsPerDeposit?: null
     ): MaxIntentsPerDepositUpdatedEventFilter;
@@ -1266,17 +1229,6 @@ export interface IEscrow extends BaseContract {
     PaymentVerifierRegistryUpdated(
       paymentVerifierRegistry?: PromiseOrValue<string> | null
     ): PaymentVerifierRegistryUpdatedEventFilter;
-
-    "ReferrerFeesCollected(uint256,uint256,address)"(
-      depositId?: PromiseOrValue<BigNumberish> | null,
-      collectedFees?: null,
-      referrer?: PromiseOrValue<string> | null
-    ): ReferrerFeesCollectedEventFilter;
-    ReferrerFeesCollected(
-      depositId?: PromiseOrValue<BigNumberish> | null,
-      collectedFees?: null,
-      referrer?: PromiseOrValue<string> | null
-    ): ReferrerFeesCollectedEventFilter;
   };
 
   estimateGas: {
@@ -1310,6 +1262,12 @@ export interface IEscrow extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    getDepositGatingService(
+      _depositId: PromiseOrValue<BigNumberish>,
+      _paymentMethod: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     getDepositIntent(
       _depositId: PromiseOrValue<BigNumberish>,
       _intentHash: PromiseOrValue<BytesLike>,
@@ -1321,6 +1279,12 @@ export interface IEscrow extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    getDepositPaymentMethodActive(
+      _depositId: PromiseOrValue<BigNumberish>,
+      _paymentMethod: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     getDepositPaymentMethodData(
       _depositId: PromiseOrValue<BigNumberish>,
       _paymentMethod: PromiseOrValue<BytesLike>,
@@ -1390,6 +1354,12 @@ export interface IEscrow extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
+    getDepositGatingService(
+      _depositId: PromiseOrValue<BigNumberish>,
+      _paymentMethod: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
     getDepositIntent(
       _depositId: PromiseOrValue<BigNumberish>,
       _intentHash: PromiseOrValue<BytesLike>,
@@ -1401,6 +1371,12 @@ export interface IEscrow extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
+    getDepositPaymentMethodActive(
+      _depositId: PromiseOrValue<BigNumberish>,
+      _paymentMethod: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
     getDepositPaymentMethodData(
       _depositId: PromiseOrValue<BigNumberish>,
       _paymentMethod: PromiseOrValue<BytesLike>,