@raac/rpc 1.1.0-beta.8 → 1.1.0-beta.80

package/dist/types/typechain-types/contracts/{mocks/libraries/governance/RAACVotingMock.d.ts → interfaces/core/collectors/IDistributionTarget.d.ts}

@@ -1,16 +1,16 @@
-import type { BaseContract, BigNumberish, BytesLike, FunctionFragment, Result, Interface, ContractRunner, ContractMethod, Listener } from "ethers";
+import type { BaseContract, BigNumberish, BytesLike, FunctionFragment, Result, Interface, AddressLike, ContractRunner, ContractMethod, Listener } from "ethers";
 import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, TypedListener, TypedContractMethod } from "../../../../common";
-export interface RAACVotingMockInterface extends Interface {
-    getFunction(nameOrSignature: "calculateBias" | "calculateSlope"): FunctionFragment;
-    encodeFunctionData(functionFragment: "calculateBias", values: [BigNumberish, BigNumberish, BigNumberish]): string;
-    encodeFunctionData(functionFragment: "calculateSlope", values: [BigNumberish]): string;
-    decodeFunctionResult(functionFragment: "calculateBias", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "calculateSlope", data: BytesLike): Result;
+export interface IDistributionTargetInterface extends Interface {
+    getFunction(nameOrSignature: "distributeRewards" | "supportsInterface"): FunctionFragment;
+    encodeFunctionData(functionFragment: "distributeRewards", values: [AddressLike, BigNumberish]): string;
+    encodeFunctionData(functionFragment: "supportsInterface", values: [BytesLike]): string;
+    decodeFunctionResult(functionFragment: "distributeRewards", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "supportsInterface", data: BytesLike): Result;
 }
-export interface RAACVotingMock extends BaseContract {
-    connect(runner?: ContractRunner | null): RAACVotingMock;
+export interface IDistributionTarget extends BaseContract {
+    connect(runner?: ContractRunner | null): IDistributionTarget;
     waitForDeployment(): Promise<this>;
-    interface: RAACVotingMockInterface;
+    interface: IDistributionTargetInterface;
     queryFilter<TCEvent extends TypedContractEvent>(event: TCEvent, fromBlockOrBlockhash?: string | number | undefined, toBlock?: string | number | undefined): Promise<Array<TypedEventLog<TCEvent>>>;
     queryFilter<TCEvent extends TypedContractEvent>(filter: TypedDeferredTopicFilter<TCEvent>, fromBlockOrBlockhash?: string | number | undefined, toBlock?: string | number | undefined): Promise<Array<TypedEventLog<TCEvent>>>;
     on<TCEvent extends TypedContractEvent>(event: TCEvent, listener: TypedListener<TCEvent>): Promise<this>;
@@ -20,22 +20,24 @@ export interface RAACVotingMock extends BaseContract {
     listeners<TCEvent extends TypedContractEvent>(event: TCEvent): Promise<Array<TypedListener<TCEvent>>>;
     listeners(eventName?: string): Promise<Array<Listener>>;
     removeAllListeners<TCEvent extends TypedContractEvent>(event?: TCEvent): Promise<this>;
-    calculateBias: TypedContractMethod<[
-        amount: BigNumberish,
-        unlockTime: BigNumberish,
-        currentTime: BigNumberish
+    distributeRewards: TypedContractMethod<[
+        token: AddressLike,
+        amount: BigNumberish
     ], [
-        bigint
+        boolean
+    ], "nonpayable">;
+    supportsInterface: TypedContractMethod<[
+        interfaceId: BytesLike
+    ], [
+        boolean
     ], "view">;
-    calculateSlope: TypedContractMethod<[amount: BigNumberish], [bigint], "view">;
     getFunction<T extends ContractMethod = ContractMethod>(key: string | FunctionFragment): T;
-    getFunction(nameOrSignature: "calculateBias"): TypedContractMethod<[
-        amount: BigNumberish,
-        unlockTime: BigNumberish,
-        currentTime: BigNumberish
+    getFunction(nameOrSignature: "distributeRewards"): TypedContractMethod<[
+        token: AddressLike,
+        amount: BigNumberish
     ], [
-        bigint
-    ], "view">;
-    getFunction(nameOrSignature: "calculateSlope"): TypedContractMethod<[amount: BigNumberish], [bigint], "view">;
+        boolean
+    ], "nonpayable">;
+    getFunction(nameOrSignature: "supportsInterface"): TypedContractMethod<[interfaceId: BytesLike], [boolean], "view">;
     filters: {};
 }

package/dist/types/typechain-types/contracts/interfaces/core/collectors/IFeeCollector.d.ts

@@ -52,8 +52,8 @@ export declare namespace IFeeCollector {
     };
 }
 export interface IFeeCollectorInterface extends Interface {
-    getFunction(nameOrSignature: "addClaimableToken" | "addFeeType" | "claimCollectorRewards" | "collectFee" | "distributeFees" | "emergencyWithdraw" | "getCollectedFees" | "getCollectedFeesByToken" | "getCollectedFeesByTokenAndFeeType" | "getFeeType" | "getFeeTypes" | "getSupportedTokens" | "getTargetAddress" | "getTargetAmount" | "isTokenSupported" | "pause" | "removeClaimableToken" | "removeFeeType" | "setTargetAddress" | "unpause" | "updateFeeType"): FunctionFragment;
-    getEvent(nameOrSignatureOrTopic: "CollectorRewardsClaimed" | "CollectorUnderlyingClaimed" | "EmergencyWithdrawal" | "FeeCollected" | "FeeDistributed" | "FeeTypeAdded" | "FeeTypeUpdated" | "TargetAddressUpdated" | "TokenAdded" | "TokenRemoved"): EventFragment;
+    getFunction(nameOrSignature: "addClaimableToken" | "addFeeType" | "claimCollectorRewards" | "collectFee" | "distributeFees" | "emergencyWithdraw" | "getCollectedFees" | "getFeeType" | "getFeeTypes" | "getTargetAddress" | "getTargetAmount" | "isTokenSupported" | "pause" | "removeClaimableToken" | "removeFeeType" | "removeTargetFeeType" | "setTargetAddress" | "setTargetFeeType" | "unpause" | "updateFeeType"): FunctionFragment;
+    getEvent(nameOrSignatureOrTopic: "CollectorRewardsClaimed" | "CollectorUnderlyingClaimed" | "EmergencyWithdrawal" | "FeeCollected" | "FeeDistributed" | "FeeTypeAdded" | "FeeTypeRemoved" | "FeeTypeUpdated" | "TargetAddressUpdated" | "TargetFeeTypeRemoved" | "TargetFeeTypeSet" | "TargetRemovedFromWhitelist" | "TargetWhitelisted" | "TokenAdded" | "TokenRemoved"): EventFragment;
     encodeFunctionData(functionFragment: "addClaimableToken", values: [AddressLike]): string;
     encodeFunctionData(functionFragment: "addFeeType", values: [
         BytesLike,
@@ -69,18 +69,17 @@ export interface IFeeCollectorInterface extends Interface {
     encodeFunctionData(functionFragment: "distributeFees", values: [BytesLike, BytesLike, AddressLike]): string;
     encodeFunctionData(functionFragment: "emergencyWithdraw", values: [AddressLike, AddressLike]): string;
     encodeFunctionData(functionFragment: "getCollectedFees", values: [AddressLike, BytesLike]): string;
-    encodeFunctionData(functionFragment: "getCollectedFeesByToken", values: [AddressLike]): string;
-    encodeFunctionData(functionFragment: "getCollectedFeesByTokenAndFeeType", values: [AddressLike, BytesLike]): string;
     encodeFunctionData(functionFragment: "getFeeType", values: [BytesLike]): string;
     encodeFunctionData(functionFragment: "getFeeTypes", values?: undefined): string;
-    encodeFunctionData(functionFragment: "getSupportedTokens", values?: undefined): string;
     encodeFunctionData(functionFragment: "getTargetAddress", values: [BytesLike]): string;
     encodeFunctionData(functionFragment: "getTargetAmount", values: [BytesLike, BytesLike, AddressLike]): string;
     encodeFunctionData(functionFragment: "isTokenSupported", values: [AddressLike]): string;
     encodeFunctionData(functionFragment: "pause", values?: undefined): string;
     encodeFunctionData(functionFragment: "removeClaimableToken", values: [AddressLike]): string;
     encodeFunctionData(functionFragment: "removeFeeType", values: [BytesLike]): string;
+    encodeFunctionData(functionFragment: "removeTargetFeeType", values: [AddressLike]): string;
     encodeFunctionData(functionFragment: "setTargetAddress", values: [BytesLike, AddressLike]): string;
+    encodeFunctionData(functionFragment: "setTargetFeeType", values: [AddressLike, BytesLike]): string;
     encodeFunctionData(functionFragment: "unpause", values?: undefined): string;
     encodeFunctionData(functionFragment: "updateFeeType", values: [BytesLike, IFeeCollector.FeeTypeStruct]): string;
     decodeFunctionResult(functionFragment: "addClaimableToken", data: BytesLike): Result;
@@ -90,18 +89,17 @@ export interface IFeeCollectorInterface extends Interface {
     decodeFunctionResult(functionFragment: "distributeFees", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "emergencyWithdraw", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getCollectedFees", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getCollectedFeesByToken", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getCollectedFeesByTokenAndFeeType", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getFeeType", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getFeeTypes", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getSupportedTokens", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTargetAddress", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTargetAmount", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "isTokenSupported", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "pause", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "removeClaimableToken", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "removeFeeType", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "removeTargetFeeType", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setTargetAddress", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "setTargetFeeType", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "unpause", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateFeeType", data: BytesLike): Result;
 }
@@ -109,13 +107,20 @@ export declare namespace CollectorRewardsClaimedEvent {
     type InputTuple = [
         token: AddressLike,
         target: AddressLike,
-        amount: BigNumberish
+        requestedAmount: BigNumberish,
+        actualAmount: BigNumberish
+    ];
+    type OutputTuple = [
+        token: string,
+        target: string,
+        requestedAmount: bigint,
+        actualAmount: bigint
     ];
-    type OutputTuple = [token: string, target: string, amount: bigint];
     interface OutputObject {
         token: string;
         target: string;
-        amount: bigint;
+        requestedAmount: bigint;
+        actualAmount: bigint;
     }
     type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
     type Filter = TypedDeferredTopicFilter<Event>;
@@ -126,13 +131,20 @@ export declare namespace CollectorUnderlyingClaimedEvent {
     type InputTuple = [
         token: AddressLike,
         target: AddressLike,
-        amount: BigNumberish
+        requestedAmount: BigNumberish,
+        actualAmount: BigNumberish
+    ];
+    type OutputTuple = [
+        token: string,
+        target: string,
+        requestedAmount: bigint,
+        actualAmount: bigint
     ];
-    type OutputTuple = [token: string, target: string, amount: bigint];
     interface OutputObject {
         token: string;
         target: string;
-        amount: bigint;
+        requestedAmount: bigint;
+        actualAmount: bigint;
     }
     type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
     type Filter = TypedDeferredTopicFilter<Event>;
@@ -152,11 +164,26 @@ export declare namespace EmergencyWithdrawalEvent {
     type LogDescription = TypedLogDescription<Event>;
 }
 export declare namespace FeeCollectedEvent {
-    type InputTuple = [feeType: BytesLike, amount: BigNumberish];
-    type OutputTuple = [feeType: string, amount: bigint];
+    type InputTuple = [
+        token: AddressLike,
+        target: AddressLike,
+        feeType: BytesLike,
+        requestedAmount: BigNumberish,
+        actualAmount: BigNumberish
+    ];
+    type OutputTuple = [
+        token: string,
+        target: string,
+        feeType: string,
+        requestedAmount: bigint,
+        actualAmount: bigint
+    ];
     interface OutputObject {
+        token: string;
+        target: string;
         feeType: string;
-        amount: bigint;
+        requestedAmount: bigint;
+        actualAmount: bigint;
     }
     type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
     type Filter = TypedDeferredTopicFilter<Event>;
@@ -198,6 +225,17 @@ export declare namespace FeeTypeAddedEvent {
     type Log = TypedEventLog<Event>;
     type LogDescription = TypedLogDescription<Event>;
 }
+export declare namespace FeeTypeRemovedEvent {
+    type InputTuple = [feeType: BytesLike];
+    type OutputTuple = [feeType: string];
+    interface OutputObject {
+        feeType: string;
+    }
+    type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
+    type Filter = TypedDeferredTopicFilter<Event>;
+    type Log = TypedEventLog<Event>;
+    type LogDescription = TypedLogDescription<Event>;
+}
 export declare namespace FeeTypeUpdatedEvent {
     type InputTuple = [
         feeType: BytesLike,
@@ -228,6 +266,51 @@ export declare namespace TargetAddressUpdatedEvent {
     type Log = TypedEventLog<Event>;
     type LogDescription = TypedLogDescription<Event>;
 }
+export declare namespace TargetFeeTypeRemovedEvent {
+    type InputTuple = [target: AddressLike];
+    type OutputTuple = [target: string];
+    interface OutputObject {
+        target: string;
+    }
+    type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
+    type Filter = TypedDeferredTopicFilter<Event>;
+    type Log = TypedEventLog<Event>;
+    type LogDescription = TypedLogDescription<Event>;
+}
+export declare namespace TargetFeeTypeSetEvent {
+    type InputTuple = [target: AddressLike, feeType: BytesLike];
+    type OutputTuple = [target: string, feeType: string];
+    interface OutputObject {
+        target: string;
+        feeType: string;
+    }
+    type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
+    type Filter = TypedDeferredTopicFilter<Event>;
+    type Log = TypedEventLog<Event>;
+    type LogDescription = TypedLogDescription<Event>;
+}
+export declare namespace TargetRemovedFromWhitelistEvent {
+    type InputTuple = [target: AddressLike];
+    type OutputTuple = [target: string];
+    interface OutputObject {
+        target: string;
+    }
+    type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
+    type Filter = TypedDeferredTopicFilter<Event>;
+    type Log = TypedEventLog<Event>;
+    type LogDescription = TypedLogDescription<Event>;
+}
+export declare namespace TargetWhitelistedEvent {
+    type InputTuple = [target: AddressLike];
+    type OutputTuple = [target: string];
+    interface OutputObject {
+        target: string;
+    }
+    type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
+    type Filter = TypedDeferredTopicFilter<Event>;
+    type Log = TypedEventLog<Event>;
+    type LogDescription = TypedLogDescription<Event>;
+}
 export declare namespace TokenAddedEvent {
     type InputTuple = [token: AddressLike];
     type OutputTuple = [token: string];
@@ -313,17 +396,6 @@ export interface IFeeCollector extends BaseContract {
     ], [
         IFeeCollector.CollectedFeeForTypeStructOutput
     ], "view">;
-    getCollectedFeesByToken: TypedContractMethod<[
-        token: AddressLike
-    ], [
-        IFeeCollector.CollectedFeeForTypeStructOutput[]
-    ], "view">;
-    getCollectedFeesByTokenAndFeeType: TypedContractMethod<[
-        token: AddressLike,
-        feeType: BytesLike
-    ], [
-        IFeeCollector.CollectedFeeForTypeStructOutput
-    ], "view">;
     getFeeType: TypedContractMethod<[
         feeType: BytesLike
     ], [
@@ -333,7 +405,6 @@ export interface IFeeCollector extends BaseContract {
     ], [
         IFeeCollector.FeeTypeStructOutput[]
     ], "view">;
-    getSupportedTokens: TypedContractMethod<[], [string[]], "view">;
     getTargetAddress: TypedContractMethod<[target: BytesLike], [string], "view">;
     getTargetAmount: TypedContractMethod<[
         feeType: BytesLike,
@@ -358,12 +429,23 @@ export interface IFeeCollector extends BaseContract {
     ], [
         void
     ], "nonpayable">;
+    removeTargetFeeType: TypedContractMethod<[
+        target: AddressLike
+    ], [
+        void
+    ], "nonpayable">;
     setTargetAddress: TypedContractMethod<[
         target: BytesLike,
         newAddress: AddressLike
     ], [
         void
     ], "nonpayable">;
+    setTargetFeeType: TypedContractMethod<[
+        target: AddressLike,
+        feeType: BytesLike
+    ], [
+        void
+    ], "nonpayable">;
     unpause: TypedContractMethod<[], [void], "nonpayable">;
     updateFeeType: TypedContractMethod<[
         feeType: BytesLike,
@@ -418,24 +500,12 @@ export interface IFeeCollector extends BaseContract {
     ], [
         IFeeCollector.CollectedFeeForTypeStructOutput
     ], "view">;
-    getFunction(nameOrSignature: "getCollectedFeesByToken"): TypedContractMethod<[
-        token: AddressLike
-    ], [
-        IFeeCollector.CollectedFeeForTypeStructOutput[]
-    ], "view">;
-    getFunction(nameOrSignature: "getCollectedFeesByTokenAndFeeType"): TypedContractMethod<[
-        token: AddressLike,
-        feeType: BytesLike
-    ], [
-        IFeeCollector.CollectedFeeForTypeStructOutput
-    ], "view">;
     getFunction(nameOrSignature: "getFeeType"): TypedContractMethod<[
         feeType: BytesLike
     ], [
         IFeeCollector.FeeTypeStructOutput
     ], "view">;
     getFunction(nameOrSignature: "getFeeTypes"): TypedContractMethod<[], [IFeeCollector.FeeTypeStructOutput[]], "view">;
-    getFunction(nameOrSignature: "getSupportedTokens"): TypedContractMethod<[], [string[]], "view">;
     getFunction(nameOrSignature: "getTargetAddress"): TypedContractMethod<[target: BytesLike], [string], "view">;
     getFunction(nameOrSignature: "getTargetAmount"): TypedContractMethod<[
         feeType: BytesLike,
@@ -448,12 +518,19 @@ export interface IFeeCollector extends BaseContract {
     getFunction(nameOrSignature: "pause"): TypedContractMethod<[], [void], "nonpayable">;
     getFunction(nameOrSignature: "removeClaimableToken"): TypedContractMethod<[token: AddressLike], [void], "nonpayable">;
     getFunction(nameOrSignature: "removeFeeType"): TypedContractMethod<[feeType: BytesLike], [void], "nonpayable">;
+    getFunction(nameOrSignature: "removeTargetFeeType"): TypedContractMethod<[target: AddressLike], [void], "nonpayable">;
     getFunction(nameOrSignature: "setTargetAddress"): TypedContractMethod<[
         target: BytesLike,
         newAddress: AddressLike
     ], [
         void
     ], "nonpayable">;
+    getFunction(nameOrSignature: "setTargetFeeType"): TypedContractMethod<[
+        target: AddressLike,
+        feeType: BytesLike
+    ], [
+        void
+    ], "nonpayable">;
     getFunction(nameOrSignature: "unpause"): TypedContractMethod<[], [void], "nonpayable">;
     getFunction(nameOrSignature: "updateFeeType"): TypedContractMethod<[
         feeType: BytesLike,
@@ -467,27 +544,42 @@ export interface IFeeCollector extends BaseContract {
     getEvent(key: "FeeCollected"): TypedContractEvent<FeeCollectedEvent.InputTuple, FeeCollectedEvent.OutputTuple, FeeCollectedEvent.OutputObject>;
     getEvent(key: "FeeDistributed"): TypedContractEvent<FeeDistributedEvent.InputTuple, FeeDistributedEvent.OutputTuple, FeeDistributedEvent.OutputObject>;
     getEvent(key: "FeeTypeAdded"): TypedContractEvent<FeeTypeAddedEvent.InputTuple, FeeTypeAddedEvent.OutputTuple, FeeTypeAddedEvent.OutputObject>;
+    getEvent(key: "FeeTypeRemoved"): TypedContractEvent<FeeTypeRemovedEvent.InputTuple, FeeTypeRemovedEvent.OutputTuple, FeeTypeRemovedEvent.OutputObject>;
     getEvent(key: "FeeTypeUpdated"): TypedContractEvent<FeeTypeUpdatedEvent.InputTuple, FeeTypeUpdatedEvent.OutputTuple, FeeTypeUpdatedEvent.OutputObject>;
     getEvent(key: "TargetAddressUpdated"): TypedContractEvent<TargetAddressUpdatedEvent.InputTuple, TargetAddressUpdatedEvent.OutputTuple, TargetAddressUpdatedEvent.OutputObject>;
+    getEvent(key: "TargetFeeTypeRemoved"): TypedContractEvent<TargetFeeTypeRemovedEvent.InputTuple, TargetFeeTypeRemovedEvent.OutputTuple, TargetFeeTypeRemovedEvent.OutputObject>;
+    getEvent(key: "TargetFeeTypeSet"): TypedContractEvent<TargetFeeTypeSetEvent.InputTuple, TargetFeeTypeSetEvent.OutputTuple, TargetFeeTypeSetEvent.OutputObject>;
+    getEvent(key: "TargetRemovedFromWhitelist"): TypedContractEvent<TargetRemovedFromWhitelistEvent.InputTuple, TargetRemovedFromWhitelistEvent.OutputTuple, TargetRemovedFromWhitelistEvent.OutputObject>;
+    getEvent(key: "TargetWhitelisted"): TypedContractEvent<TargetWhitelistedEvent.InputTuple, TargetWhitelistedEvent.OutputTuple, TargetWhitelistedEvent.OutputObject>;
     getEvent(key: "TokenAdded"): TypedContractEvent<TokenAddedEvent.InputTuple, TokenAddedEvent.OutputTuple, TokenAddedEvent.OutputObject>;
     getEvent(key: "TokenRemoved"): TypedContractEvent<TokenRemovedEvent.InputTuple, TokenRemovedEvent.OutputTuple, TokenRemovedEvent.OutputObject>;
     filters: {
-        "CollectorRewardsClaimed(address,address,uint256)": TypedContractEvent<CollectorRewardsClaimedEvent.InputTuple, CollectorRewardsClaimedEvent.OutputTuple, CollectorRewardsClaimedEvent.OutputObject>;
+        "CollectorRewardsClaimed(address,address,uint256,uint256)": TypedContractEvent<CollectorRewardsClaimedEvent.InputTuple, CollectorRewardsClaimedEvent.OutputTuple, CollectorRewardsClaimedEvent.OutputObject>;
         CollectorRewardsClaimed: TypedContractEvent<CollectorRewardsClaimedEvent.InputTuple, CollectorRewardsClaimedEvent.OutputTuple, CollectorRewardsClaimedEvent.OutputObject>;
-        "CollectorUnderlyingClaimed(address,address,uint256)": TypedContractEvent<CollectorUnderlyingClaimedEvent.InputTuple, CollectorUnderlyingClaimedEvent.OutputTuple, CollectorUnderlyingClaimedEvent.OutputObject>;
+        "CollectorUnderlyingClaimed(address,address,uint256,uint256)": TypedContractEvent<CollectorUnderlyingClaimedEvent.InputTuple, CollectorUnderlyingClaimedEvent.OutputTuple, CollectorUnderlyingClaimedEvent.OutputObject>;
         CollectorUnderlyingClaimed: TypedContractEvent<CollectorUnderlyingClaimedEvent.InputTuple, CollectorUnderlyingClaimedEvent.OutputTuple, CollectorUnderlyingClaimedEvent.OutputObject>;
         "EmergencyWithdrawal(address,uint256)": TypedContractEvent<EmergencyWithdrawalEvent.InputTuple, EmergencyWithdrawalEvent.OutputTuple, EmergencyWithdrawalEvent.OutputObject>;
         EmergencyWithdrawal: TypedContractEvent<EmergencyWithdrawalEvent.InputTuple, EmergencyWithdrawalEvent.OutputTuple, EmergencyWithdrawalEvent.OutputObject>;
-        "FeeCollected(bytes32,uint256)": TypedContractEvent<FeeCollectedEvent.InputTuple, FeeCollectedEvent.OutputTuple, FeeCollectedEvent.OutputObject>;
+        "FeeCollected(address,address,bytes32,uint256,uint256)": TypedContractEvent<FeeCollectedEvent.InputTuple, FeeCollectedEvent.OutputTuple, FeeCollectedEvent.OutputObject>;
         FeeCollected: TypedContractEvent<FeeCollectedEvent.InputTuple, FeeCollectedEvent.OutputTuple, FeeCollectedEvent.OutputObject>;
         "FeeDistributed(bytes32,bytes32,address,uint256)": TypedContractEvent<FeeDistributedEvent.InputTuple, FeeDistributedEvent.OutputTuple, FeeDistributedEvent.OutputObject>;
         FeeDistributed: TypedContractEvent<FeeDistributedEvent.InputTuple, FeeDistributedEvent.OutputTuple, FeeDistributedEvent.OutputObject>;
         "FeeTypeAdded(bytes32)": TypedContractEvent<FeeTypeAddedEvent.InputTuple, FeeTypeAddedEvent.OutputTuple, FeeTypeAddedEvent.OutputObject>;
         FeeTypeAdded: TypedContractEvent<FeeTypeAddedEvent.InputTuple, FeeTypeAddedEvent.OutputTuple, FeeTypeAddedEvent.OutputObject>;
+        "FeeTypeRemoved(bytes32)": TypedContractEvent<FeeTypeRemovedEvent.InputTuple, FeeTypeRemovedEvent.OutputTuple, FeeTypeRemovedEvent.OutputObject>;
+        FeeTypeRemoved: TypedContractEvent<FeeTypeRemovedEvent.InputTuple, FeeTypeRemovedEvent.OutputTuple, FeeTypeRemovedEvent.OutputObject>;
         "FeeTypeUpdated(bytes32,tuple)": TypedContractEvent<FeeTypeUpdatedEvent.InputTuple, FeeTypeUpdatedEvent.OutputTuple, FeeTypeUpdatedEvent.OutputObject>;
         FeeTypeUpdated: TypedContractEvent<FeeTypeUpdatedEvent.InputTuple, FeeTypeUpdatedEvent.OutputTuple, FeeTypeUpdatedEvent.OutputObject>;
         "TargetAddressUpdated(bytes32,address)": TypedContractEvent<TargetAddressUpdatedEvent.InputTuple, TargetAddressUpdatedEvent.OutputTuple, TargetAddressUpdatedEvent.OutputObject>;
         TargetAddressUpdated: TypedContractEvent<TargetAddressUpdatedEvent.InputTuple, TargetAddressUpdatedEvent.OutputTuple, TargetAddressUpdatedEvent.OutputObject>;
+        "TargetFeeTypeRemoved(address)": TypedContractEvent<TargetFeeTypeRemovedEvent.InputTuple, TargetFeeTypeRemovedEvent.OutputTuple, TargetFeeTypeRemovedEvent.OutputObject>;
+        TargetFeeTypeRemoved: TypedContractEvent<TargetFeeTypeRemovedEvent.InputTuple, TargetFeeTypeRemovedEvent.OutputTuple, TargetFeeTypeRemovedEvent.OutputObject>;
+        "TargetFeeTypeSet(address,bytes32)": TypedContractEvent<TargetFeeTypeSetEvent.InputTuple, TargetFeeTypeSetEvent.OutputTuple, TargetFeeTypeSetEvent.OutputObject>;
+        TargetFeeTypeSet: TypedContractEvent<TargetFeeTypeSetEvent.InputTuple, TargetFeeTypeSetEvent.OutputTuple, TargetFeeTypeSetEvent.OutputObject>;
+        "TargetRemovedFromWhitelist(address)": TypedContractEvent<TargetRemovedFromWhitelistEvent.InputTuple, TargetRemovedFromWhitelistEvent.OutputTuple, TargetRemovedFromWhitelistEvent.OutputObject>;
+        TargetRemovedFromWhitelist: TypedContractEvent<TargetRemovedFromWhitelistEvent.InputTuple, TargetRemovedFromWhitelistEvent.OutputTuple, TargetRemovedFromWhitelistEvent.OutputObject>;
+        "TargetWhitelisted(address)": TypedContractEvent<TargetWhitelistedEvent.InputTuple, TargetWhitelistedEvent.OutputTuple, TargetWhitelistedEvent.OutputObject>;
+        TargetWhitelisted: TypedContractEvent<TargetWhitelistedEvent.InputTuple, TargetWhitelistedEvent.OutputTuple, TargetWhitelistedEvent.OutputObject>;
         "TokenAdded(address)": TypedContractEvent<TokenAddedEvent.InputTuple, TokenAddedEvent.OutputTuple, TokenAddedEvent.OutputObject>;
         TokenAdded: TypedContractEvent<TokenAddedEvent.InputTuple, TokenAddedEvent.OutputTuple, TokenAddedEvent.OutputObject>;
         "TokenRemoved(address)": TypedContractEvent<TokenRemovedEvent.InputTuple, TokenRemovedEvent.OutputTuple, TokenRemovedEvent.OutputObject>;

package/dist/types/typechain-types/contracts/interfaces/core/collectors/ITreasury.d.ts

@@ -1,19 +1,13 @@
 import type { BaseContract, BigNumberish, BytesLike, FunctionFragment, Result, Interface, EventFragment, AddressLike, ContractRunner, ContractMethod, Listener } from "ethers";
 import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, TypedLogDescription, TypedListener, TypedContractMethod } from "../../../../common";
 export interface ITreasuryInterface extends Interface {
-    getFunction(nameOrSignature: "allocateFunds" | "deposit" | "getAllocation" | "getBalance" | "getTotalValue" | "withdraw"): FunctionFragment;
-    getEvent(nameOrSignatureOrTopic: "Deposited" | "FundsAllocated" | "Withdrawn"): EventFragment;
-    encodeFunctionData(functionFragment: "allocateFunds", values: [AddressLike, BigNumberish]): string;
+    getFunction(nameOrSignature: "deposit" | "getBalance" | "withdraw"): FunctionFragment;
+    getEvent(nameOrSignatureOrTopic: "Deposited" | "TokenAdded" | "TokenRemoved" | "Withdrawn"): EventFragment;
     encodeFunctionData(functionFragment: "deposit", values: [AddressLike, BigNumberish]): string;
-    encodeFunctionData(functionFragment: "getAllocation", values: [AddressLike, AddressLike]): string;
     encodeFunctionData(functionFragment: "getBalance", values: [AddressLike]): string;
-    encodeFunctionData(functionFragment: "getTotalValue", values?: undefined): string;
     encodeFunctionData(functionFragment: "withdraw", values: [AddressLike, BigNumberish, AddressLike]): string;
-    decodeFunctionResult(functionFragment: "allocateFunds", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "deposit", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getAllocation", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getBalance", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getTotalValue", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "withdraw", data: BytesLike): Result;
 }
 export declare namespace DepositedEvent {
@@ -28,12 +22,22 @@ export declare namespace DepositedEvent {
     type Log = TypedEventLog<Event>;
     type LogDescription = TypedLogDescription<Event>;
 }
-export declare namespace FundsAllocatedEvent {
-    type InputTuple = [recipient: AddressLike, amount: BigNumberish];
-    type OutputTuple = [recipient: string, amount: bigint];
+export declare namespace TokenAddedEvent {
+    type InputTuple = [token: AddressLike];
+    type OutputTuple = [token: string];
     interface OutputObject {
-        recipient: string;
-        amount: bigint;
+        token: string;
+    }
+    type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
+    type Filter = TypedDeferredTopicFilter<Event>;
+    type Log = TypedEventLog<Event>;
+    type LogDescription = TypedLogDescription<Event>;
+}
+export declare namespace TokenRemovedEvent {
+    type InputTuple = [token: AddressLike];
+    type OutputTuple = [token: string];
+    interface OutputObject {
+        token: string;
     }
     type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
     type Filter = TypedDeferredTopicFilter<Event>;
@@ -70,26 +74,13 @@ export interface ITreasury extends BaseContract {
     listeners<TCEvent extends TypedContractEvent>(event: TCEvent): Promise<Array<TypedListener<TCEvent>>>;
     listeners(eventName?: string): Promise<Array<Listener>>;
     removeAllListeners<TCEvent extends TypedContractEvent>(event?: TCEvent): Promise<this>;
-    allocateFunds: TypedContractMethod<[
-        recipient: AddressLike,
-        amount: BigNumberish
-    ], [
-        void
-    ], "nonpayable">;
     deposit: TypedContractMethod<[
         token: AddressLike,
         amount: BigNumberish
     ], [
         void
     ], "nonpayable">;
-    getAllocation: TypedContractMethod<[
-        allocator: AddressLike,
-        recipient: AddressLike
-    ], [
-        bigint
-    ], "view">;
     getBalance: TypedContractMethod<[token: AddressLike], [bigint], "view">;
-    getTotalValue: TypedContractMethod<[], [bigint], "view">;
     withdraw: TypedContractMethod<[
         token: AddressLike,
         amount: BigNumberish,
@@ -98,26 +89,13 @@ export interface ITreasury extends BaseContract {
         void
     ], "nonpayable">;
     getFunction<T extends ContractMethod = ContractMethod>(key: string | FunctionFragment): T;
-    getFunction(nameOrSignature: "allocateFunds"): TypedContractMethod<[
-        recipient: AddressLike,
-        amount: BigNumberish
-    ], [
-        void
-    ], "nonpayable">;
     getFunction(nameOrSignature: "deposit"): TypedContractMethod<[
         token: AddressLike,
         amount: BigNumberish
     ], [
         void
     ], "nonpayable">;
-    getFunction(nameOrSignature: "getAllocation"): TypedContractMethod<[
-        allocator: AddressLike,
-        recipient: AddressLike
-    ], [
-        bigint
-    ], "view">;
     getFunction(nameOrSignature: "getBalance"): TypedContractMethod<[token: AddressLike], [bigint], "view">;
-    getFunction(nameOrSignature: "getTotalValue"): TypedContractMethod<[], [bigint], "view">;
     getFunction(nameOrSignature: "withdraw"): TypedContractMethod<[
         token: AddressLike,
         amount: BigNumberish,
@@ -126,13 +104,16 @@ export interface ITreasury extends BaseContract {
         void
     ], "nonpayable">;
     getEvent(key: "Deposited"): TypedContractEvent<DepositedEvent.InputTuple, DepositedEvent.OutputTuple, DepositedEvent.OutputObject>;
-    getEvent(key: "FundsAllocated"): TypedContractEvent<FundsAllocatedEvent.InputTuple, FundsAllocatedEvent.OutputTuple, FundsAllocatedEvent.OutputObject>;
+    getEvent(key: "TokenAdded"): TypedContractEvent<TokenAddedEvent.InputTuple, TokenAddedEvent.OutputTuple, TokenAddedEvent.OutputObject>;
+    getEvent(key: "TokenRemoved"): TypedContractEvent<TokenRemovedEvent.InputTuple, TokenRemovedEvent.OutputTuple, TokenRemovedEvent.OutputObject>;
     getEvent(key: "Withdrawn"): TypedContractEvent<WithdrawnEvent.InputTuple, WithdrawnEvent.OutputTuple, WithdrawnEvent.OutputObject>;
     filters: {
         "Deposited(address,uint256)": TypedContractEvent<DepositedEvent.InputTuple, DepositedEvent.OutputTuple, DepositedEvent.OutputObject>;
         Deposited: TypedContractEvent<DepositedEvent.InputTuple, DepositedEvent.OutputTuple, DepositedEvent.OutputObject>;
-        "FundsAllocated(address,uint256)": TypedContractEvent<FundsAllocatedEvent.InputTuple, FundsAllocatedEvent.OutputTuple, FundsAllocatedEvent.OutputObject>;
-        FundsAllocated: TypedContractEvent<FundsAllocatedEvent.InputTuple, FundsAllocatedEvent.OutputTuple, FundsAllocatedEvent.OutputObject>;
+        "TokenAdded(address)": TypedContractEvent<TokenAddedEvent.InputTuple, TokenAddedEvent.OutputTuple, TokenAddedEvent.OutputObject>;
+        TokenAdded: TypedContractEvent<TokenAddedEvent.InputTuple, TokenAddedEvent.OutputTuple, TokenAddedEvent.OutputObject>;
+        "TokenRemoved(address)": TypedContractEvent<TokenRemovedEvent.InputTuple, TokenRemovedEvent.OutputTuple, TokenRemovedEvent.OutputObject>;
+        TokenRemoved: TypedContractEvent<TokenRemovedEvent.InputTuple, TokenRemovedEvent.OutputTuple, TokenRemovedEvent.OutputObject>;
         "Withdrawn(address,uint256,address)": TypedContractEvent<WithdrawnEvent.InputTuple, WithdrawnEvent.OutputTuple, WithdrawnEvent.OutputObject>;
         Withdrawn: TypedContractEvent<WithdrawnEvent.InputTuple, WithdrawnEvent.OutputTuple, WithdrawnEvent.OutputObject>;
     };

package/dist/types/typechain-types/contracts/interfaces/core/collectors/index.d.ts

@@ -1,3 +1,4 @@
 export type { IBaseCollector } from "./IBaseCollector";
+export type { IDistributionTarget } from "./IDistributionTarget";
 export type { IFeeCollector } from "./IFeeCollector";
 export type { ITreasury } from "./ITreasury";