@raac/rpc 1.1.0-beta.42 → 1.1.0-beta.43

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

@@ -52,8 +52,8 @@ export declare namespace IFeeCollector {
     };
 }
 export interface FeeCollectorInterface extends Interface {
-    getFunction(nameOrSignature: "BASIS_POINTS" | "BURN" | "DEFAULT_ADMIN_ROLE" | "DISTRIBUTOR_ROLE" | "EMERGENCY_ROLE" | "FEE_MANAGER_ROLE" | "MAX_FEE_AMOUNT" | "OTHER" | "RAAC_CORP" | "REPAIR_FUND" | "ROYALTY_FEE" | "TREASURY" | "TREASURY_UPDATE_DELAY" | "VERAAC" | "addClaimableToken" | "addFeeType" | "burnAddress" | "claimCollectorRewards" | "claimNFTUnderlying" | "collectFee" | "collectedFees" | "collectedFeesByToken" | "distributeFees" | "distributionPeriod" | "emergencyWithdraw" | "feeTypes" | "getCollectedFees" | "getCollectedFeesByToken" | "getCollectedFeesByTokenAndFeeType" | "getFeeType" | "getFeeTypes" | "getRoleAdmin" | "getSupportedTokens" | "getTargetAddress" | "getTargetAmount" | "grantRole" | "hasRole" | "isTokenSupported" | "otherAddress" | "pause" | "paused" | "pendingRepairFund" | "pendingTreasury" | "raacCorpAddress" | "removeClaimableToken" | "removeFeeType" | "renounceRole" | "repairFundAddress" | "revokeRole" | "setTargetAddress" | "supportsInterface" | "totalDistributed" | "treasuryAddress" | "unpause" | "updateFeeType" | "userRewards" | "veRAACAddress"): FunctionFragment;
-    getEvent(nameOrSignatureOrTopic: "CollectorRewardsClaimed" | "CollectorUnderlyingClaimed" | "EmergencyWithdrawal" | "FeeCollected" | "FeeDistributed" | "FeeTypeAdded" | "FeeTypeUpdated" | "Paused" | "RoleAdminChanged" | "RoleGranted" | "RoleRevoked" | "TargetAddressUpdated" | "TokenAdded" | "TokenRemoved" | "Unpaused"): EventFragment;
+    getFunction(nameOrSignature: "BASIS_POINTS" | "BURN" | "DEFAULT_ADMIN_ROLE" | "DISTRIBUTOR_ROLE" | "EMERGENCY_ROLE" | "FEE_MANAGER_ROLE" | "MAX_FEE_AMOUNT" | "OTHER" | "RAAC_CORP" | "REPAIR_FUND" | "TREASURY" | "TREASURY_UPDATE_DELAY" | "VERAAC" | "addClaimableToken" | "addFeeType" | "addWhitelistedTarget" | "burnAddress" | "claimCollectorRewards" | "claimNFTUnderlying" | "collectFee" | "collectedFeesByToken" | "distributeFees" | "emergencyWithdraw" | "feeTypeKeys" | "feeTypes" | "getCollectedFees" | "getFeeType" | "getFeeTypes" | "getRoleAdmin" | "getTargetAddress" | "getTargetAmount" | "grantRole" | "hasRole" | "isTargetWhitelisted" | "isTokenSupported" | "otherAddress" | "pause" | "paused" | "raacCorpAddress" | "removeClaimableToken" | "removeFeeType" | "removeWhitelistedTarget" | "renounceRole" | "repairFundAddress" | "revokeRole" | "setTargetAddress" | "supportedTokens" | "supportsInterface" | "treasuryAddress" | "unpause" | "updateFeeType" | "veRAACAddress"): FunctionFragment;
+    getEvent(nameOrSignatureOrTopic: "CollectorRewardsClaimed" | "CollectorUnderlyingClaimed" | "EmergencyWithdrawal" | "FeeCollected" | "FeeDistributed" | "FeeTypeAdded" | "FeeTypeRemoved" | "FeeTypeUpdated" | "Paused" | "RoleAdminChanged" | "RoleGranted" | "RoleRevoked" | "TargetAddressUpdated" | "TargetRemovedFromWhitelist" | "TargetWhitelisted" | "TokenAdded" | "TokenRemoved" | "Unpaused"): EventFragment;
     encodeFunctionData(functionFragment: "BASIS_POINTS", values?: undefined): string;
     encodeFunctionData(functionFragment: "BURN", values?: undefined): string;
     encodeFunctionData(functionFragment: "DEFAULT_ADMIN_ROLE", values?: undefined): string;
@@ -64,7 +64,6 @@ export interface FeeCollectorInterface extends Interface {
     encodeFunctionData(functionFragment: "OTHER", values?: undefined): string;
     encodeFunctionData(functionFragment: "RAAC_CORP", values?: undefined): string;
     encodeFunctionData(functionFragment: "REPAIR_FUND", values?: undefined): string;
-    encodeFunctionData(functionFragment: "ROYALTY_FEE", values?: undefined): string;
     encodeFunctionData(functionFragment: "TREASURY", values?: undefined): string;
     encodeFunctionData(functionFragment: "TREASURY_UPDATE_DELAY", values?: undefined): string;
     encodeFunctionData(functionFragment: "VERAAC", values?: undefined): string;
@@ -78,46 +77,42 @@ export interface FeeCollectorInterface extends Interface {
         BigNumberish,
         BigNumberish
     ]): string;
+    encodeFunctionData(functionFragment: "addWhitelistedTarget", values: [AddressLike]): string;
     encodeFunctionData(functionFragment: "burnAddress", values?: undefined): string;
     encodeFunctionData(functionFragment: "claimCollectorRewards", values: [AddressLike, AddressLike, BytesLike]): string;
     encodeFunctionData(functionFragment: "claimNFTUnderlying", values: [AddressLike, AddressLike, BigNumberish, BytesLike]): string;
     encodeFunctionData(functionFragment: "collectFee", values: [AddressLike, AddressLike, BigNumberish, BytesLike]): string;
-    encodeFunctionData(functionFragment: "collectedFees", values: [BytesLike]): string;
     encodeFunctionData(functionFragment: "collectedFeesByToken", values: [AddressLike, BytesLike]): string;
     encodeFunctionData(functionFragment: "distributeFees", values: [BytesLike, BytesLike, AddressLike]): string;
-    encodeFunctionData(functionFragment: "distributionPeriod", values?: undefined): string;
     encodeFunctionData(functionFragment: "emergencyWithdraw", values: [AddressLike, AddressLike]): string;
+    encodeFunctionData(functionFragment: "feeTypeKeys", values: [BigNumberish]): string;
     encodeFunctionData(functionFragment: "feeTypes", values: [BytesLike]): 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: "getRoleAdmin", values: [BytesLike]): string;
-    encodeFunctionData(functionFragment: "getSupportedTokens", values?: undefined): string;
     encodeFunctionData(functionFragment: "getTargetAddress", values: [BytesLike]): string;
     encodeFunctionData(functionFragment: "getTargetAmount", values: [BytesLike, BytesLike, AddressLike]): string;
     encodeFunctionData(functionFragment: "grantRole", values: [BytesLike, AddressLike]): string;
     encodeFunctionData(functionFragment: "hasRole", values: [BytesLike, AddressLike]): string;
+    encodeFunctionData(functionFragment: "isTargetWhitelisted", values: [AddressLike]): string;
     encodeFunctionData(functionFragment: "isTokenSupported", values: [AddressLike]): string;
     encodeFunctionData(functionFragment: "otherAddress", values?: undefined): string;
     encodeFunctionData(functionFragment: "pause", values?: undefined): string;
     encodeFunctionData(functionFragment: "paused", values?: undefined): string;
-    encodeFunctionData(functionFragment: "pendingRepairFund", values?: undefined): string;
-    encodeFunctionData(functionFragment: "pendingTreasury", values?: undefined): string;
     encodeFunctionData(functionFragment: "raacCorpAddress", values?: undefined): string;
     encodeFunctionData(functionFragment: "removeClaimableToken", values: [AddressLike]): string;
     encodeFunctionData(functionFragment: "removeFeeType", values: [BytesLike]): string;
+    encodeFunctionData(functionFragment: "removeWhitelistedTarget", values: [AddressLike]): string;
     encodeFunctionData(functionFragment: "renounceRole", values: [BytesLike, AddressLike]): string;
     encodeFunctionData(functionFragment: "repairFundAddress", values?: undefined): string;
     encodeFunctionData(functionFragment: "revokeRole", values: [BytesLike, AddressLike]): string;
     encodeFunctionData(functionFragment: "setTargetAddress", values: [BytesLike, AddressLike]): string;
+    encodeFunctionData(functionFragment: "supportedTokens", values: [BigNumberish]): string;
     encodeFunctionData(functionFragment: "supportsInterface", values: [BytesLike]): string;
-    encodeFunctionData(functionFragment: "totalDistributed", values?: undefined): string;
     encodeFunctionData(functionFragment: "treasuryAddress", values?: undefined): string;
     encodeFunctionData(functionFragment: "unpause", values?: undefined): string;
     encodeFunctionData(functionFragment: "updateFeeType", values: [BytesLike, IFeeCollector.FeeTypeStruct]): string;
-    encodeFunctionData(functionFragment: "userRewards", values: [AddressLike]): string;
     encodeFunctionData(functionFragment: "veRAACAddress", values?: undefined): string;
     decodeFunctionResult(functionFragment: "BASIS_POINTS", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "BURN", data: BytesLike): Result;
@@ -129,65 +124,67 @@ export interface FeeCollectorInterface extends Interface {
     decodeFunctionResult(functionFragment: "OTHER", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "RAAC_CORP", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "REPAIR_FUND", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "ROYALTY_FEE", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "TREASURY", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "TREASURY_UPDATE_DELAY", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "VERAAC", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "addClaimableToken", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "addFeeType", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "addWhitelistedTarget", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "burnAddress", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "claimCollectorRewards", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "claimNFTUnderlying", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "collectFee", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "collectedFees", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "collectedFeesByToken", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "distributeFees", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "distributionPeriod", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "emergencyWithdraw", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "feeTypeKeys", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "feeTypes", 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: "getRoleAdmin", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getSupportedTokens", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTargetAddress", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTargetAmount", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "grantRole", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "hasRole", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "isTargetWhitelisted", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "isTokenSupported", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "otherAddress", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "pause", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "paused", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "pendingRepairFund", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "pendingTreasury", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "raacCorpAddress", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "removeClaimableToken", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "removeFeeType", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "removeWhitelistedTarget", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "renounceRole", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "repairFundAddress", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "revokeRole", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setTargetAddress", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "supportedTokens", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "supportsInterface", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "totalDistributed", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "treasuryAddress", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "unpause", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateFeeType", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "userRewards", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "veRAACAddress", data: BytesLike): Result;
 }
 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>;
@@ -198,13 +195,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>;
@@ -224,11 +228,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>;
@@ -270,6 +289,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,
@@ -366,6 +396,28 @@ export declare namespace TargetAddressUpdatedEvent {
     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];
@@ -422,7 +474,6 @@ export interface FeeCollector extends BaseContract {
     OTHER: TypedContractMethod<[], [string], "view">;
     RAAC_CORP: TypedContractMethod<[], [string], "view">;
     REPAIR_FUND: TypedContractMethod<[], [string], "view">;
-    ROYALTY_FEE: TypedContractMethod<[], [string], "view">;
     TREASURY: TypedContractMethod<[], [string], "view">;
     TREASURY_UPDATE_DELAY: TypedContractMethod<[], [bigint], "view">;
     VERAAC: TypedContractMethod<[], [string], "view">;
@@ -442,6 +493,11 @@ export interface FeeCollector extends BaseContract {
     ], [
         boolean
     ], "nonpayable">;
+    addWhitelistedTarget: TypedContractMethod<[
+        target: AddressLike
+    ], [
+        void
+    ], "nonpayable">;
     burnAddress: TypedContractMethod<[], [string], "view">;
     claimCollectorRewards: TypedContractMethod<[
         token: AddressLike,
@@ -466,25 +522,6 @@ export interface FeeCollector extends BaseContract {
     ], [
         boolean
     ], "nonpayable">;
-    collectedFees: TypedContractMethod<[
-        arg0: BytesLike
-    ], [
-        [
-            bigint,
-            bigint,
-            bigint,
-            bigint,
-            bigint,
-            bigint
-        ] & {
-            treasuryAmount: bigint;
-            repairFundAmount: bigint;
-            burnAmount: bigint;
-            veRAACTokenAmount: bigint;
-            raacCorpAmount: bigint;
-            otherAmount: bigint;
-        }
-    ], "view">;
     collectedFeesByToken: TypedContractMethod<[
         arg0: AddressLike,
         arg1: BytesLike
@@ -512,32 +549,13 @@ export interface FeeCollector extends BaseContract {
     ], [
         void
     ], "nonpayable">;
-    distributionPeriod: TypedContractMethod<[
-    ], [
-        [
-            bigint,
-            bigint,
-            bigint,
-            bigint,
-            bigint,
-            bigint,
-            bigint
-        ] & {
-            startTime: bigint;
-            endTime: bigint;
-            lastUpdateTime: bigint;
-            value: bigint;
-            weightedSum: bigint;
-            totalDuration: bigint;
-            weight: bigint;
-        }
-    ], "view">;
     emergencyWithdraw: TypedContractMethod<[
         token: AddressLike,
         recipient: AddressLike
     ], [
         void
     ], "nonpayable">;
+    feeTypeKeys: TypedContractMethod<[arg0: BigNumberish], [string], "view">;
     feeTypes: TypedContractMethod<[
         arg0: BytesLike
     ], [
@@ -565,17 +583,6 @@ export interface FeeCollector 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
     ], [
@@ -586,7 +593,6 @@ export interface FeeCollector extends BaseContract {
         IFeeCollector.FeeTypeStructOutput[]
     ], "view">;
     getRoleAdmin: TypedContractMethod<[role: BytesLike], [string], "view">;
-    getSupportedTokens: TypedContractMethod<[], [string[]], "view">;
     getTargetAddress: TypedContractMethod<[target: BytesLike], [string], "view">;
     getTargetAmount: TypedContractMethod<[
         feeType: BytesLike,
@@ -607,24 +613,15 @@ export interface FeeCollector extends BaseContract {
     ], [
         boolean
     ], "view">;
+    isTargetWhitelisted: TypedContractMethod<[
+        arg0: AddressLike
+    ], [
+        boolean
+    ], "view">;
     isTokenSupported: TypedContractMethod<[arg0: AddressLike], [boolean], "view">;
     otherAddress: TypedContractMethod<[], [string], "view">;
     pause: TypedContractMethod<[], [void], "nonpayable">;
     paused: TypedContractMethod<[], [boolean], "view">;
-    pendingRepairFund: TypedContractMethod<[
-    ], [
-        [string, bigint] & {
-            newAddress: string;
-            effectiveTime: bigint;
-        }
-    ], "view">;
-    pendingTreasury: TypedContractMethod<[
-    ], [
-        [string, bigint] & {
-            newAddress: string;
-            effectiveTime: bigint;
-        }
-    ], "view">;
     raacCorpAddress: TypedContractMethod<[], [string], "view">;
     removeClaimableToken: TypedContractMethod<[
         token: AddressLike
@@ -636,6 +633,11 @@ export interface FeeCollector extends BaseContract {
     ], [
         void
     ], "nonpayable">;
+    removeWhitelistedTarget: TypedContractMethod<[
+        target: AddressLike
+    ], [
+        void
+    ], "nonpayable">;
     renounceRole: TypedContractMethod<[
         role: BytesLike,
         callerConfirmation: AddressLike
@@ -655,12 +657,12 @@ export interface FeeCollector extends BaseContract {
     ], [
         void
     ], "nonpayable">;
+    supportedTokens: TypedContractMethod<[arg0: BigNumberish], [string], "view">;
     supportsInterface: TypedContractMethod<[
         interfaceId: BytesLike
     ], [
         boolean
     ], "view">;
-    totalDistributed: TypedContractMethod<[], [bigint], "view">;
     treasuryAddress: TypedContractMethod<[], [string], "view">;
     unpause: TypedContractMethod<[], [void], "nonpayable">;
     updateFeeType: TypedContractMethod<[
@@ -669,7 +671,6 @@ export interface FeeCollector extends BaseContract {
     ], [
         void
     ], "nonpayable">;
-    userRewards: TypedContractMethod<[arg0: AddressLike], [bigint], "view">;
     veRAACAddress: TypedContractMethod<[], [string], "view">;
     getFunction<T extends ContractMethod = ContractMethod>(key: string | FunctionFragment): T;
     getFunction(nameOrSignature: "BASIS_POINTS"): TypedContractMethod<[], [bigint], "view">;
@@ -682,7 +683,6 @@ export interface FeeCollector extends BaseContract {
     getFunction(nameOrSignature: "OTHER"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "RAAC_CORP"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "REPAIR_FUND"): TypedContractMethod<[], [string], "view">;
-    getFunction(nameOrSignature: "ROYALTY_FEE"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "TREASURY"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "TREASURY_UPDATE_DELAY"): TypedContractMethod<[], [bigint], "view">;
     getFunction(nameOrSignature: "VERAAC"): TypedContractMethod<[], [string], "view">;
@@ -698,6 +698,7 @@ export interface FeeCollector extends BaseContract {
     ], [
         boolean
     ], "nonpayable">;
+    getFunction(nameOrSignature: "addWhitelistedTarget"): TypedContractMethod<[target: AddressLike], [void], "nonpayable">;
     getFunction(nameOrSignature: "burnAddress"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "claimCollectorRewards"): TypedContractMethod<[
         token: AddressLike,
@@ -722,25 +723,6 @@ export interface FeeCollector extends BaseContract {
     ], [
         boolean
     ], "nonpayable">;
-    getFunction(nameOrSignature: "collectedFees"): TypedContractMethod<[
-        arg0: BytesLike
-    ], [
-        [
-            bigint,
-            bigint,
-            bigint,
-            bigint,
-            bigint,
-            bigint
-        ] & {
-            treasuryAmount: bigint;
-            repairFundAmount: bigint;
-            burnAmount: bigint;
-            veRAACTokenAmount: bigint;
-            raacCorpAmount: bigint;
-            otherAmount: bigint;
-        }
-    ], "view">;
     getFunction(nameOrSignature: "collectedFeesByToken"): TypedContractMethod<[
         arg0: AddressLike,
         arg1: BytesLike
@@ -768,32 +750,13 @@ export interface FeeCollector extends BaseContract {
     ], [
         void
     ], "nonpayable">;
-    getFunction(nameOrSignature: "distributionPeriod"): TypedContractMethod<[
-    ], [
-        [
-            bigint,
-            bigint,
-            bigint,
-            bigint,
-            bigint,
-            bigint,
-            bigint
-        ] & {
-            startTime: bigint;
-            endTime: bigint;
-            lastUpdateTime: bigint;
-            value: bigint;
-            weightedSum: bigint;
-            totalDuration: bigint;
-            weight: bigint;
-        }
-    ], "view">;
     getFunction(nameOrSignature: "emergencyWithdraw"): TypedContractMethod<[
         token: AddressLike,
         recipient: AddressLike
     ], [
         void
     ], "nonpayable">;
+    getFunction(nameOrSignature: "feeTypeKeys"): TypedContractMethod<[arg0: BigNumberish], [string], "view">;
     getFunction(nameOrSignature: "feeTypes"): TypedContractMethod<[
         arg0: BytesLike
     ], [
@@ -821,17 +784,6 @@ export interface FeeCollector 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
     ], [
@@ -839,7 +791,6 @@ export interface FeeCollector extends BaseContract {
     ], "view">;
     getFunction(nameOrSignature: "getFeeTypes"): TypedContractMethod<[], [IFeeCollector.FeeTypeStructOutput[]], "view">;
     getFunction(nameOrSignature: "getRoleAdmin"): TypedContractMethod<[role: BytesLike], [string], "view">;
-    getFunction(nameOrSignature: "getSupportedTokens"): TypedContractMethod<[], [string[]], "view">;
     getFunction(nameOrSignature: "getTargetAddress"): TypedContractMethod<[target: BytesLike], [string], "view">;
     getFunction(nameOrSignature: "getTargetAmount"): TypedContractMethod<[
         feeType: BytesLike,
@@ -860,27 +811,15 @@ export interface FeeCollector extends BaseContract {
     ], [
         boolean
     ], "view">;
+    getFunction(nameOrSignature: "isTargetWhitelisted"): TypedContractMethod<[arg0: AddressLike], [boolean], "view">;
     getFunction(nameOrSignature: "isTokenSupported"): TypedContractMethod<[arg0: AddressLike], [boolean], "view">;
     getFunction(nameOrSignature: "otherAddress"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "pause"): TypedContractMethod<[], [void], "nonpayable">;
     getFunction(nameOrSignature: "paused"): TypedContractMethod<[], [boolean], "view">;
-    getFunction(nameOrSignature: "pendingRepairFund"): TypedContractMethod<[
-    ], [
-        [string, bigint] & {
-            newAddress: string;
-            effectiveTime: bigint;
-        }
-    ], "view">;
-    getFunction(nameOrSignature: "pendingTreasury"): TypedContractMethod<[
-    ], [
-        [string, bigint] & {
-            newAddress: string;
-            effectiveTime: bigint;
-        }
-    ], "view">;
     getFunction(nameOrSignature: "raacCorpAddress"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "removeClaimableToken"): TypedContractMethod<[token: AddressLike], [void], "nonpayable">;
     getFunction(nameOrSignature: "removeFeeType"): TypedContractMethod<[feeType: BytesLike], [void], "nonpayable">;
+    getFunction(nameOrSignature: "removeWhitelistedTarget"): TypedContractMethod<[target: AddressLike], [void], "nonpayable">;
     getFunction(nameOrSignature: "renounceRole"): TypedContractMethod<[
         role: BytesLike,
         callerConfirmation: AddressLike
@@ -900,8 +839,8 @@ export interface FeeCollector extends BaseContract {
     ], [
         void
     ], "nonpayable">;
+    getFunction(nameOrSignature: "supportedTokens"): TypedContractMethod<[arg0: BigNumberish], [string], "view">;
     getFunction(nameOrSignature: "supportsInterface"): TypedContractMethod<[interfaceId: BytesLike], [boolean], "view">;
-    getFunction(nameOrSignature: "totalDistributed"): TypedContractMethod<[], [bigint], "view">;
     getFunction(nameOrSignature: "treasuryAddress"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "unpause"): TypedContractMethod<[], [void], "nonpayable">;
     getFunction(nameOrSignature: "updateFeeType"): TypedContractMethod<[
@@ -910,7 +849,6 @@ export interface FeeCollector extends BaseContract {
     ], [
         void
     ], "nonpayable">;
-    getFunction(nameOrSignature: "userRewards"): TypedContractMethod<[arg0: AddressLike], [bigint], "view">;
     getFunction(nameOrSignature: "veRAACAddress"): TypedContractMethod<[], [string], "view">;
     getEvent(key: "CollectorRewardsClaimed"): TypedContractEvent<CollectorRewardsClaimedEvent.InputTuple, CollectorRewardsClaimedEvent.OutputTuple, CollectorRewardsClaimedEvent.OutputObject>;
     getEvent(key: "CollectorUnderlyingClaimed"): TypedContractEvent<CollectorUnderlyingClaimedEvent.InputTuple, CollectorUnderlyingClaimedEvent.OutputTuple, CollectorUnderlyingClaimedEvent.OutputObject>;
@@ -918,28 +856,33 @@ export interface FeeCollector 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: "Paused"): TypedContractEvent<PausedEvent.InputTuple, PausedEvent.OutputTuple, PausedEvent.OutputObject>;
     getEvent(key: "RoleAdminChanged"): TypedContractEvent<RoleAdminChangedEvent.InputTuple, RoleAdminChangedEvent.OutputTuple, RoleAdminChangedEvent.OutputObject>;
     getEvent(key: "RoleGranted"): TypedContractEvent<RoleGrantedEvent.InputTuple, RoleGrantedEvent.OutputTuple, RoleGrantedEvent.OutputObject>;
     getEvent(key: "RoleRevoked"): TypedContractEvent<RoleRevokedEvent.InputTuple, RoleRevokedEvent.OutputTuple, RoleRevokedEvent.OutputObject>;
     getEvent(key: "TargetAddressUpdated"): TypedContractEvent<TargetAddressUpdatedEvent.InputTuple, TargetAddressUpdatedEvent.OutputTuple, TargetAddressUpdatedEvent.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>;
     getEvent(key: "Unpaused"): TypedContractEvent<UnpausedEvent.InputTuple, UnpausedEvent.OutputTuple, UnpausedEvent.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>;
         "Paused(address)": TypedContractEvent<PausedEvent.InputTuple, PausedEvent.OutputTuple, PausedEvent.OutputObject>;
@@ -952,6 +895,10 @@ export interface FeeCollector extends BaseContract {
         RoleRevoked: TypedContractEvent<RoleRevokedEvent.InputTuple, RoleRevokedEvent.OutputTuple, RoleRevokedEvent.OutputObject>;
         "TargetAddressUpdated(bytes32,address)": TypedContractEvent<TargetAddressUpdatedEvent.InputTuple, TargetAddressUpdatedEvent.OutputTuple, TargetAddressUpdatedEvent.OutputObject>;
         TargetAddressUpdated: TypedContractEvent<TargetAddressUpdatedEvent.InputTuple, TargetAddressUpdatedEvent.OutputTuple, TargetAddressUpdatedEvent.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>;