@raac/rpc 1.1.0-beta.63 → 1.1.0-beta.65

package/dist/RPCLibrary.js

@@ -43,6 +43,8 @@ const redeemNFTFromRWAVault_1 = __importDefault(require("./pools/rwaVault/redeem
 const getRWAVaultInfo_1 = __importDefault(require("./pools/rwaVault/getRWAVaultInfo"));
 const getNextRandomNFT_1 = __importDefault(require("./pools/rwaVault/getNextRandomNFT"));
 const requestRandomSeed_1 = __importDefault(require("./pools/rwaVault/requestRandomSeed"));
+const previewDeposit_1 = __importDefault(require("./pools/rwaVault/previewDeposit"));
+const previewWithdraw_1 = __importDefault(require("./pools/rwaVault/previewWithdraw"));
 // ERC20 Vault Adapter
 const getERC20VaultAdapterInfo_1 = __importDefault(require("./pools/rwaVault/adapters/erc20/getERC20VaultAdapterInfo"));
 const getERC20VaultAdapterTotalValue_1 = __importDefault(require("./pools/rwaVault/adapters/erc20/getERC20VaultAdapterTotalValue"));
@@ -106,8 +108,6 @@ const calculateInsuranceFee_1 = __importDefault(require("./pools/lendingPool/cal
 const getTotalPropertiesCount_1 = __importDefault(require("./nfts/getTotalPropertiesCount"));
 const getParameters_1 = __importDefault(require("./pools/lendingPool/getParameters"));
 const getAdapters_1 = __importDefault(require("./pools/lendingPool/getAdapters"));
-const getWithdrawRequestInfo_1 = require("./pools/lendingPool/getWithdrawRequestInfo");
-const requestWithdraw_1 = require("./pools/lendingPool/requestWithdraw");
 const openVaultPosition_1 = __importDefault(require("./pools/lendingPool/openVaultPosition"));
 const getAdapterAddress_1 = require("./pools/lendingPool/getAdapterAddress");
 const getAdapterAddress_2 = require("./pools/rwaVault/getAdapterAddress");
@@ -117,8 +117,8 @@ const getApprovalForAll_1 = __importDefault(require("./nfts/getApprovalForAll"))
 const setApprovalForAll_1 = __importDefault(require("./nfts/setApprovalForAll"));
 const approveNFT_1 = __importDefault(require("./nfts/approveNFT"));
 const vaultOpened_1 = __importDefault(require("./pools/lendingPool/vaultOpened"));
-const getWithdrawRequestInfo_2 = require("./pools/stabilityPool/getWithdrawRequestInfo");
-const requestWithdraw_2 = require("./pools/stabilityPool/requestWithdraw");
+const getWithdrawRequestInfo_1 = require("./pools/stabilityPool/getWithdrawRequestInfo");
+const requestWithdraw_1 = require("./pools/stabilityPool/requestWithdraw");
 const artifacts_1 = require("./utils/artifacts");
 const errorDecoder_1 = require("./utils/errorDecoder");
 // import { request as requestPrimeRate } from "./oracles/prime-rate/request";
@@ -216,8 +216,8 @@ class RPCLibrary {
                 depositToStabilityPool: depositToStabilityPool_1.default,
                 withdrawFromStabilityPool: withdrawFromStabilityPool_1.default,
                 getRawUserDepositInStabilityPool: getRawUserDepositsInStabilityPool_1.default,
-                getWithdrawRequestInfo: getWithdrawRequestInfo_2.getWithdrawRequestInfo,
-                requestWithdraw: requestWithdraw_2.requestWithdraw,
+                getWithdrawRequestInfo: getWithdrawRequestInfo_1.getWithdrawRequestInfo,
+                requestWithdraw: requestWithdraw_1.requestWithdraw,
             },
             // LendingPool
             lendingPool: {
@@ -249,8 +249,6 @@ class RPCLibrary {
                 // ERC721 Adapter
                 getERC721AdapterInfo: getERC721AdapterInfo_1.default,
                 getERC721AdapterDeposits: getERC721AdapterDeposits_1.default,
-                requestWithdraw: requestWithdraw_1.requestWithdraw,
-                getWithdrawRequestInfo: getWithdrawRequestInfo_1.getWithdrawRequestInfo,
                 openVaultPosition: openVaultPosition_1.default,
                 getAdapterAddress: getAdapterAddress_1.getAdapterAddress,
                 getAdapterAddressOnly: getAdapterAddress_1.getAdapterAddressOnly,
@@ -275,6 +273,8 @@ class RPCLibrary {
                 getAdapters: getAdapters_2.default,
                 getAdapterAddress: getAdapterAddress_2.getAdapterAddress,
                 getAdapterAddressOnly: getAdapterAddress_2.getAdapterAddressOnly,
+                previewDeposit: previewDeposit_1.default,
+                previewWithdraw: previewWithdraw_1.default,
             },
             depositToLendingPool: depositToLendingPool_1.default,
             withdrawFromLendingPool: withdrawFromLendingPool_1.default,

package/dist/oracles/houses/request.js

@@ -135,7 +135,7 @@ async function request(chainId, houseId, signerV5) {
     const overrides = {
         gasLimit: 1_500_000,
     };
-    const requestTx = await consumerContract.sendRequest(config_1.default.source, config_1.default.secretsLocation, encryptedSecretsReference, [houseId], [], subscriptionId, callbackGasLimit, overrides);
+    const requestTx = await consumerContract.sendRequest([houseId], [], overrides);
     const requestTxReceipt = await requestTx.wait(1);
     console.log(`Transaction confirmed, see https://sepolia.etherscan.io/tx/${requestTx.hash} for more details.`);
     console.log(`Functions request has been initiated in transaction ${requestTx.hash} with request ID ${requestTxReceipt?.events[2]?.args?.id}. Note the request ID may change if a re-org occurs, but the transaction hash will remain constant.\nWaiting for fulfillment from the Decentralized Oracle Network...\n`);

package/dist/oracles/prime-rate/request.js

@@ -108,7 +108,7 @@ async function request(chainId, signerV5) {
     const overrides = {
         gasLimit: 1_500_000,
     };
-    const requestTx = await consumerContract.sendRequest(source, config_1.default.secretsLocation, encryptedSecretsReference, config_1.default.args, [], subscriptionId, callbackGasLimit, overrides);
+    const requestTx = await consumerContract.sendRequest([], [], overrides);
     const requestTxReceipt = await requestTx.wait(1);
     console.log(`Transaction confirmed, see https://sepolia.etherscan.io/tx/${requestTx.hash} for more details.`);
     console.log(`Functions request has been initiated in transaction ${requestTx.hash} with request ID ${requestTxReceipt?.events[2]?.args?.id}. Note the request ID may change if a re-org occurs, but the transaction hash will remain constant.\nWaiting for fulfillment from the Decentralized Oracle Network...\n`);

package/dist/pools/rwaVault/depositToRWAVault.js

@@ -1,23 +1,16 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+const ethers_1 = require("ethers");
 const _helpers_1 = require("./_helpers");
 const getAdapterAddress_1 = require("./getAdapterAddress");
-const getAllowance_1 = __importDefault(require("../../wallet/assets/getAllowance"));
-async function depositToRWAVault(chainId, adapter, data, receiver, signer) {
+async function depositToRWAVault(chainId, adapter, data, receiver, minSharesOut, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
     }
     try {
         const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, signer);
         const adapterAddress = await (0, getAdapterAddress_1.getAdapterAddress)(chainId, adapter);
-        console.log("adapterAddress", adapterAddress.address);
-        console.log("data", data);
-        console.log("receiver", receiver);
-        console.log(await (0, getAllowance_1.default)(chainId, "crvusd", await signer.getAddress(), adapterAddress.address, signer.provider));
-        const tx = await rwaVaultContract.depositAsset(adapterAddress.address, data, receiver);
+        const tx = await rwaVaultContract.depositAsset(adapterAddress.address, data, receiver, ethers_1.ethers.parseEther(minSharesOut));
         console.log(`Deposit transaction sent to RWA Vault:`, tx.hash);
         const receipt = await tx.wait();
         console.log(`Deposited to RWA Vault successfully:`, receipt?.hash);

package/dist/pools/rwaVault/getRWAVaultInfo.js

@@ -4,7 +4,7 @@ const _helpers_1 = require("./_helpers");
 async function getRWAVaultInfo(chainId, provider) {
     try {
         const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, provider);
-        const [totalAssets, pricePerShare, vaultToken, underlyingAssetToken, stabilityPool, vrfConsumer, indexTokenMintingFee, feeCollector, vrfRequestDelay, allowVRFRequest, llamaTemple, llamaPerkDiscount, llamaPerkMultiplier, llamaPerkClassName] = await Promise.all([
+        const [totalAssets, pricePerShare, vaultToken, underlyingAssetToken, stabilityPool, vrfConsumer, indexTokenMintingFee, feeCollector, vrfRequestDelay, allowVRFRequest,] = await Promise.all([
             rwaVaultContract.totalAssets(),
             rwaVaultContract.pricePerShare(),
             rwaVaultContract.vaultToken(),
@@ -15,10 +15,6 @@ async function getRWAVaultInfo(chainId, provider) {
             rwaVaultContract.feeCollector(),
             rwaVaultContract.vrfRequestDelay(),
             rwaVaultContract.allowVRFRequest(),
-            rwaVaultContract.llamaTemple(),
-            rwaVaultContract.llamaPerkDiscount(),
-            rwaVaultContract.llamaPerkMultiplier(),
-            rwaVaultContract.llamaPerkClassName()
         ]);
         return {
             totalAssets: totalAssets.toString(),
@@ -31,10 +27,6 @@ async function getRWAVaultInfo(chainId, provider) {
             feeCollector,
             vrfRequestDelay: vrfRequestDelay.toString(),
             allowVRFRequest,
-            llamaTemple,
-            llamaPerkDiscount: llamaPerkDiscount.toString(),
-            llamaPerkMultiplier: llamaPerkMultiplier.toString(),
-            llamaPerkClassName
         };
     }
     catch (error) {

package/dist/pools/rwaVault/previewDeposit.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ethers_1 = require("ethers");
+const _helpers_1 = require("./_helpers");
+async function previewDeposit(chainId, assetValue, provider) {
+    try {
+        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, provider);
+        const shares = await rwaVaultContract.previewDeposit(ethers_1.ethers.parseEther(assetValue));
+        return shares;
+    }
+    catch (error) {
+        console.error(`Error depositing to RWA Vault:`, error);
+        throw new Error(`Deposit to RWA Vault failed: ${error.message}`);
+    }
+}
+exports.default = previewDeposit;

package/dist/pools/rwaVault/previewWithdraw.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ethers_1 = require("ethers");
+const _helpers_1 = require("./_helpers");
+async function previewWithdraw(chainId, assetValue, provider) {
+    try {
+        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, provider);
+        const shares = await rwaVaultContract.previewDeposit(ethers_1.ethers.parseEther(assetValue));
+        return shares;
+    }
+    catch (error) {
+        console.error(`Error depositing to RWA Vault:`, error);
+        throw new Error(`Deposit to RWA Vault failed: ${error.message}`);
+    }
+}
+exports.default = previewWithdraw;

package/dist/pools/rwaVault/redeemNFTFromRWAVault.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const ethers_1 = require("ethers");
 const _helpers_1 = require("./_helpers");
-async function redeemNFTFromRWAVault(chainId, signer) {
+async function redeemNFTFromRWAVault(chainId, adapter, tokenId, maxSharesBurn, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
     }
     try {
         const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, signer);
-        const tx = await rwaVaultContract.redeemNFT({
-            nonce: await signer.getNonce(),
-        });
+        const tx = await rwaVaultContract.redeemNFT(adapter, tokenId, ethers_1.ethers.parseEther(maxSharesBurn));
         console.log(`Redeem NFT transaction sent to RWA Vault:`, tx.hash);
         const receipt = await tx.wait();
         console.log(`Redeemed NFT from RWA Vault successfully:`, receipt?.hash);

package/dist/scripts/index.js

@@ -221,7 +221,7 @@ const execute = async () => {
     // await rwaVaultContract.setIndexTokenMintingFee(0);
     await rpc.wallet.assets.approveAsset(chainId, "crvusd", erc20AdapterAddress, "200", signer);
     const data = new ethers_1.ethers.AbiCoder().encode(["uint256"], [ethers_1.ethers.parseEther("200")]);
-    await rpc.pools.rwaVault.depositToRWAVault(chainId, "crvusdadapter", data, signer.address, signer);
+    // await rpc.pools.rwaVault.depositToRWAVault(chainId, "crvusdadapter", data, signer.address, signer);
     console.log(await rwaVaultContract.pricePerShare());
     console.log(await vaultTokenContract.balanceOf(signer.address));
     console.log(await crvusdContract.balanceOf(signer.address));

package/dist/types/RPCLibrary.d.ts

@@ -26,6 +26,8 @@ import redeemNFTFromRWAVault from "./pools/rwaVault/redeemNFTFromRWAVault";
 import getRWAVaultInfo from "./pools/rwaVault/getRWAVaultInfo";
 import getNextRandomNFT from "./pools/rwaVault/getNextRandomNFT";
 import requestRandomSeed from "./pools/rwaVault/requestRandomSeed";
+import previewDeposit from "./pools/rwaVault/previewDeposit";
+import previewWithdraw from "./pools/rwaVault/previewWithdraw";
 import getERC20VaultAdapterInfo from "./pools/rwaVault/adapters/erc20/getERC20VaultAdapterInfo";
 import getERC20VaultAdapterTotalValue from "./pools/rwaVault/adapters/erc20/getERC20VaultAdapterTotalValue";
 import getERC20VaultAdapterAssetValue from "./pools/rwaVault/adapters/erc20/getERC20VaultAdapterAssetValue";
@@ -81,8 +83,6 @@ import calculateInsuranceFee from "./pools/lendingPool/calculateInsuranceFee";
 import getTotalPropertiesCount from "./nfts/getTotalPropertiesCount";
 import getParameters from "./pools/lendingPool/getParameters";
 import getAdapters from "./pools/lendingPool/getAdapters";
-import { getWithdrawRequestInfo } from "./pools/lendingPool/getWithdrawRequestInfo";
-import { requestWithdraw } from "./pools/lendingPool/requestWithdraw";
 import openVaultPosition from "./pools/lendingPool/openVaultPosition";
 import { getAdapterAddress as getLendingPoolAdapterAddress, getAdapterAddressOnly as getLendingPoolAdapterAddressOnly } from "./pools/lendingPool/getAdapterAddress";
 import { getAdapterAddress as getRWAVaultAdapterAddress, getAdapterAddressOnly as getRWAVaultAdapterAddressOnly } from "./pools/rwaVault/getAdapterAddress";
@@ -191,8 +191,6 @@ declare class RPCLibrary {
             getERC20AdapterBalance: typeof getERC20AdapterBalance;
             getERC721AdapterInfo: typeof getERC721AdapterInfo;
             getERC721AdapterDeposits: typeof getERC721AdapterDeposits;
-            requestWithdraw: typeof requestWithdraw;
-            getWithdrawRequestInfo: typeof getWithdrawRequestInfo;
             openVaultPosition: typeof openVaultPosition;
             getAdapterAddress: typeof getLendingPoolAdapterAddress;
             getAdapterAddressOnly: typeof getLendingPoolAdapterAddressOnly;
@@ -214,6 +212,8 @@ declare class RPCLibrary {
             getAdapters: typeof getRWAVaultAdapters;
             getAdapterAddress: typeof getRWAVaultAdapterAddress;
             getAdapterAddressOnly: typeof getRWAVaultAdapterAddressOnly;
+            previewDeposit: typeof previewDeposit;
+            previewWithdraw: typeof previewWithdraw;
         };
         depositToLendingPool: typeof depositToLendingPool;
         withdrawFromLendingPool: typeof withdrawFromLendingPool;

package/dist/types/pools/rwaVault/depositToRWAVault.d.ts

@@ -1,5 +1,5 @@
-import { BytesLike, Signer } from "ethers";
+import { BytesLike, ethers, Signer } from "ethers";
 import { ChainId } from "../../configs/chains/index";
 import { RWAVaultAdapterId } from "./types";
-declare function depositToRWAVault(chainId: ChainId, adapter: RWAVaultAdapterId, data: BytesLike, receiver: string, signer: Signer): Promise<import("ethers").ContractTransactionReceipt>;
+declare function depositToRWAVault(chainId: ChainId, adapter: RWAVaultAdapterId, data: BytesLike, receiver: string, minSharesOut: string, signer: Signer): Promise<ethers.ContractTransactionReceipt>;
 export default depositToRWAVault;

package/dist/types/pools/rwaVault/getRWAVaultInfo.d.ts

@@ -11,10 +11,6 @@ interface RWAVaultInfo {
     feeCollector: string;
     vrfRequestDelay: string;
     allowVRFRequest: boolean;
-    llamaTemple: string;
-    llamaPerkDiscount: string;
-    llamaPerkMultiplier: string;
-    llamaPerkClassName: string;
 }
 declare function getRWAVaultInfo(chainId: ChainId, provider: Provider): Promise<RWAVaultInfo>;
 export default getRWAVaultInfo;

package/dist/types/pools/rwaVault/previewDeposit.d.ts

@@ -0,0 +1,4 @@
+import { Provider } from "ethers";
+import { ChainId } from "../../configs/chains/index";
+declare function previewDeposit(chainId: ChainId, assetValue: string, provider: Provider): Promise<bigint>;
+export default previewDeposit;

package/dist/types/pools/rwaVault/previewWithdraw.d.ts

@@ -0,0 +1,4 @@
+import { Provider } from "ethers";
+import { ChainId } from "../../configs/chains/index";
+declare function previewWithdraw(chainId: ChainId, assetValue: string, provider: Provider): Promise<bigint>;
+export default previewWithdraw;

package/dist/types/pools/rwaVault/redeemNFTFromRWAVault.d.ts

@@ -1,4 +1,5 @@
-import { Signer } from "ethers";
+import { ethers, Signer } from "ethers";
 import { ChainId } from "../../configs/chains/index";
-declare function redeemNFTFromRWAVault(chainId: ChainId, signer: Signer): Promise<import("ethers").ContractTransactionReceipt>;
+import { RWAVaultAdapterId } from "./types";
+declare function redeemNFTFromRWAVault(chainId: ChainId, adapter: RWAVaultAdapterId, tokenId: string, maxSharesBurn: string, signer: Signer): Promise<ethers.ContractTransactionReceipt>;
 export default redeemNFTFromRWAVault;

package/dist/types/typechain-types/@openzeppelin/contracts/interfaces/index.d.ts

@@ -1,5 +1,4 @@
 import type * as draftIerc6093Sol from "./draft-IERC6093.sol";
 export type { draftIerc6093Sol };
 export type { IERC2981 } from "./IERC2981";
-export type { IERC4626 } from "./IERC4626";
 export type { IERC5267 } from "./IERC5267";

package/dist/types/typechain-types/@openzeppelin/contracts/token/ERC20/extensions/index.d.ts

@@ -1,4 +1,3 @@
 export type { ERC20Permit } from "./ERC20Permit";
-export type { ERC4626 } from "./ERC4626";
 export type { IERC20Metadata } from "./IERC20Metadata";
 export type { IERC20Permit } from "./IERC20Permit";

package/dist/types/typechain-types/{typechain-types/@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.d.ts → @openzeppelin/contracts-upgradeable/utils/ReentrancyGuardUpgradeable.d.ts}

@@ -1,6 +1,6 @@
 import type { BaseContract, BigNumberish, FunctionFragment, Interface, EventFragment, ContractRunner, ContractMethod, Listener } from "ethers";
 import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, TypedLogDescription, TypedListener } from "../../../common";
-export interface ContextUpgradeableInterface extends Interface {
+export interface ReentrancyGuardUpgradeableInterface extends Interface {
     getEvent(nameOrSignatureOrTopic: "Initialized"): EventFragment;
 }
 export declare namespace InitializedEvent {
@@ -14,10 +14,10 @@ export declare namespace InitializedEvent {
     type Log = TypedEventLog<Event>;
     type LogDescription = TypedLogDescription<Event>;
 }
-export interface ContextUpgradeable extends BaseContract {
-    connect(runner?: ContractRunner | null): ContextUpgradeable;
+export interface ReentrancyGuardUpgradeable extends BaseContract {
+    connect(runner?: ContractRunner | null): ReentrancyGuardUpgradeable;
     waitForDeployment(): Promise<this>;
-    interface: ContextUpgradeableInterface;
+    interface: ReentrancyGuardUpgradeableInterface;
     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>;

package/dist/types/typechain-types/@openzeppelin/contracts-upgradeable/utils/index.d.ts

@@ -1,2 +1,3 @@
 export type { ContextUpgradeable } from "./ContextUpgradeable";
 export type { PausableUpgradeable } from "./PausableUpgradeable";
+export type { ReentrancyGuardUpgradeable } from "./ReentrancyGuardUpgradeable";

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

@@ -52,20 +52,18 @@ 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" | "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;
+    getFunction(nameOrSignature: "BASIS_POINTS" | "BURN" | "DEFAULT_ADMIN_ROLE" | "DISTRIBUTOR_ROLE" | "EMERGENCY_ROLE" | "FEE_MANAGER_ROLE" | "OTHER" | "RAAC_CORP" | "REPAIR_FUND" | "TREASURY" | "VERAAC" | "addClaimableToken" | "addFeeType" | "addWhitelistedTarget" | "burnAddress" | "claimCollectorRewards" | "claimNFTUnderlying" | "collectFee" | "collectedFeesByToken" | "distributeFees" | "emergencyWithdraw" | "feeTypeKeys" | "feeTypes" | "getCollectedFees" | "getFeeType" | "getFeeTypes" | "getRoleAdmin" | "getTargetAddress" | "getTargetAmount" | "grantRole" | "hasRole" | "isTargetWhitelisted" | "isTokenSupported" | "isValidDistributionTarget" | "otherAddress" | "pause" | "paused" | "raacCorpAddress" | "removeClaimableToken" | "removeFeeType" | "removeTargetFeeType" | "removeWhitelistedTarget" | "renounceRole" | "repairFundAddress" | "revokeRole" | "setTargetAddress" | "setTargetFeeType" | "supportedTokens" | "supportsInterface" | "targetFeeType" | "treasuryAddress" | "unpause" | "updateFeeType" | "veRAACAddress"): FunctionFragment;
+    getEvent(nameOrSignatureOrTopic: "CollectorRewardsClaimed" | "CollectorUnderlyingClaimed" | "EmergencyWithdrawal" | "FeeCollected" | "FeeDistributed" | "FeeTypeAdded" | "FeeTypeRemoved" | "FeeTypeUpdated" | "Paused" | "RoleAdminChanged" | "RoleGranted" | "RoleRevoked" | "TargetAddressUpdated" | "TargetFeeTypeRemoved" | "TargetFeeTypeSet" | "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;
     encodeFunctionData(functionFragment: "DISTRIBUTOR_ROLE", values?: undefined): string;
     encodeFunctionData(functionFragment: "EMERGENCY_ROLE", values?: undefined): string;
     encodeFunctionData(functionFragment: "FEE_MANAGER_ROLE", values?: undefined): string;
-    encodeFunctionData(functionFragment: "MAX_FEE_AMOUNT", values?: undefined): string;
     encodeFunctionData(functionFragment: "OTHER", values?: undefined): string;
     encodeFunctionData(functionFragment: "RAAC_CORP", values?: undefined): string;
     encodeFunctionData(functionFragment: "REPAIR_FUND", values?: undefined): string;
     encodeFunctionData(functionFragment: "TREASURY", values?: undefined): string;
-    encodeFunctionData(functionFragment: "TREASURY_UPDATE_DELAY", values?: undefined): string;
     encodeFunctionData(functionFragment: "VERAAC", values?: undefined): string;
     encodeFunctionData(functionFragment: "addClaimableToken", values: [AddressLike]): string;
     encodeFunctionData(functionFragment: "addFeeType", values: [
@@ -97,19 +95,23 @@ export interface FeeCollectorInterface extends Interface {
     encodeFunctionData(functionFragment: "hasRole", values: [BytesLike, AddressLike]): string;
     encodeFunctionData(functionFragment: "isTargetWhitelisted", values: [AddressLike]): string;
     encodeFunctionData(functionFragment: "isTokenSupported", values: [AddressLike]): string;
+    encodeFunctionData(functionFragment: "isValidDistributionTarget", values: [AddressLike]): string;
     encodeFunctionData(functionFragment: "otherAddress", values?: undefined): string;
     encodeFunctionData(functionFragment: "pause", values?: undefined): string;
     encodeFunctionData(functionFragment: "paused", values?: undefined): string;
     encodeFunctionData(functionFragment: "raacCorpAddress", values?: undefined): string;
     encodeFunctionData(functionFragment: "removeClaimableToken", values: [AddressLike]): string;
     encodeFunctionData(functionFragment: "removeFeeType", values: [BytesLike]): string;
+    encodeFunctionData(functionFragment: "removeTargetFeeType", values: [AddressLike]): 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: "setTargetFeeType", values: [AddressLike, BytesLike]): string;
     encodeFunctionData(functionFragment: "supportedTokens", values: [BigNumberish]): string;
     encodeFunctionData(functionFragment: "supportsInterface", values: [BytesLike]): string;
+    encodeFunctionData(functionFragment: "targetFeeType", values: [AddressLike]): string;
     encodeFunctionData(functionFragment: "treasuryAddress", values?: undefined): string;
     encodeFunctionData(functionFragment: "unpause", values?: undefined): string;
     encodeFunctionData(functionFragment: "updateFeeType", values: [BytesLike, IFeeCollector.FeeTypeStruct]): string;
@@ -120,12 +122,10 @@ export interface FeeCollectorInterface extends Interface {
     decodeFunctionResult(functionFragment: "DISTRIBUTOR_ROLE", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "EMERGENCY_ROLE", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "FEE_MANAGER_ROLE", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "MAX_FEE_AMOUNT", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "OTHER", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "RAAC_CORP", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "REPAIR_FUND", 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;
@@ -149,19 +149,23 @@ export interface FeeCollectorInterface extends Interface {
     decodeFunctionResult(functionFragment: "hasRole", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "isTargetWhitelisted", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "isTokenSupported", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "isValidDistributionTarget", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "otherAddress", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "pause", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "paused", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "raacCorpAddress", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "removeClaimableToken", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "removeFeeType", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "removeTargetFeeType", 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: "setTargetFeeType", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "supportedTokens", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "supportsInterface", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "targetFeeType", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "treasuryAddress", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "unpause", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateFeeType", data: BytesLike): Result;
@@ -396,6 +400,29 @@ 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];
@@ -470,12 +497,10 @@ export interface FeeCollector extends BaseContract {
     DISTRIBUTOR_ROLE: TypedContractMethod<[], [string], "view">;
     EMERGENCY_ROLE: TypedContractMethod<[], [string], "view">;
     FEE_MANAGER_ROLE: TypedContractMethod<[], [string], "view">;
-    MAX_FEE_AMOUNT: TypedContractMethod<[], [bigint], "view">;
     OTHER: TypedContractMethod<[], [string], "view">;
     RAAC_CORP: TypedContractMethod<[], [string], "view">;
     REPAIR_FUND: TypedContractMethod<[], [string], "view">;
     TREASURY: TypedContractMethod<[], [string], "view">;
-    TREASURY_UPDATE_DELAY: TypedContractMethod<[], [bigint], "view">;
     VERAAC: TypedContractMethod<[], [string], "view">;
     addClaimableToken: TypedContractMethod<[
         token: AddressLike
@@ -619,6 +644,11 @@ export interface FeeCollector extends BaseContract {
         boolean
     ], "view">;
     isTokenSupported: TypedContractMethod<[arg0: AddressLike], [boolean], "view">;
+    isValidDistributionTarget: TypedContractMethod<[
+        target: AddressLike
+    ], [
+        boolean
+    ], "view">;
     otherAddress: TypedContractMethod<[], [string], "view">;
     pause: TypedContractMethod<[], [void], "nonpayable">;
     paused: TypedContractMethod<[], [boolean], "view">;
@@ -633,6 +663,11 @@ export interface FeeCollector extends BaseContract {
     ], [
         void
     ], "nonpayable">;
+    removeTargetFeeType: TypedContractMethod<[
+        target: AddressLike
+    ], [
+        void
+    ], "nonpayable">;
     removeWhitelistedTarget: TypedContractMethod<[
         target: AddressLike
     ], [
@@ -657,12 +692,19 @@ export interface FeeCollector extends BaseContract {
     ], [
         void
     ], "nonpayable">;
+    setTargetFeeType: TypedContractMethod<[
+        target: AddressLike,
+        feeType: BytesLike
+    ], [
+        void
+    ], "nonpayable">;
     supportedTokens: TypedContractMethod<[arg0: BigNumberish], [string], "view">;
     supportsInterface: TypedContractMethod<[
         interfaceId: BytesLike
     ], [
         boolean
     ], "view">;
+    targetFeeType: TypedContractMethod<[arg0: AddressLike], [string], "view">;
     treasuryAddress: TypedContractMethod<[], [string], "view">;
     unpause: TypedContractMethod<[], [void], "nonpayable">;
     updateFeeType: TypedContractMethod<[
@@ -679,12 +721,10 @@ export interface FeeCollector extends BaseContract {
     getFunction(nameOrSignature: "DISTRIBUTOR_ROLE"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "EMERGENCY_ROLE"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "FEE_MANAGER_ROLE"): TypedContractMethod<[], [string], "view">;
-    getFunction(nameOrSignature: "MAX_FEE_AMOUNT"): TypedContractMethod<[], [bigint], "view">;
     getFunction(nameOrSignature: "OTHER"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "RAAC_CORP"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "REPAIR_FUND"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "TREASURY"): TypedContractMethod<[], [string], "view">;
-    getFunction(nameOrSignature: "TREASURY_UPDATE_DELAY"): TypedContractMethod<[], [bigint], "view">;
     getFunction(nameOrSignature: "VERAAC"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "addClaimableToken"): TypedContractMethod<[token: AddressLike], [void], "nonpayable">;
     getFunction(nameOrSignature: "addFeeType"): TypedContractMethod<[
@@ -813,12 +853,14 @@ export interface FeeCollector extends BaseContract {
     ], "view">;
     getFunction(nameOrSignature: "isTargetWhitelisted"): TypedContractMethod<[arg0: AddressLike], [boolean], "view">;
     getFunction(nameOrSignature: "isTokenSupported"): TypedContractMethod<[arg0: AddressLike], [boolean], "view">;
+    getFunction(nameOrSignature: "isValidDistributionTarget"): TypedContractMethod<[target: AddressLike], [boolean], "view">;
     getFunction(nameOrSignature: "otherAddress"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "pause"): TypedContractMethod<[], [void], "nonpayable">;
     getFunction(nameOrSignature: "paused"): TypedContractMethod<[], [boolean], "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: "removeTargetFeeType"): TypedContractMethod<[target: AddressLike], [void], "nonpayable">;
     getFunction(nameOrSignature: "removeWhitelistedTarget"): TypedContractMethod<[target: AddressLike], [void], "nonpayable">;
     getFunction(nameOrSignature: "renounceRole"): TypedContractMethod<[
         role: BytesLike,
@@ -839,8 +881,15 @@ export interface FeeCollector extends BaseContract {
     ], [
         void
     ], "nonpayable">;
+    getFunction(nameOrSignature: "setTargetFeeType"): TypedContractMethod<[
+        target: AddressLike,
+        feeType: BytesLike
+    ], [
+        void
+    ], "nonpayable">;
     getFunction(nameOrSignature: "supportedTokens"): TypedContractMethod<[arg0: BigNumberish], [string], "view">;
     getFunction(nameOrSignature: "supportsInterface"): TypedContractMethod<[interfaceId: BytesLike], [boolean], "view">;
+    getFunction(nameOrSignature: "targetFeeType"): TypedContractMethod<[arg0: AddressLike], [string], "view">;
     getFunction(nameOrSignature: "treasuryAddress"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "unpause"): TypedContractMethod<[], [void], "nonpayable">;
     getFunction(nameOrSignature: "updateFeeType"): TypedContractMethod<[
@@ -863,6 +912,8 @@ export interface FeeCollector extends BaseContract {
     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: "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>;
@@ -895,6 +946,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>;
+        "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>;

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

@@ -172,7 +172,7 @@ export interface Treasury extends BaseContract {
         token: AddressLike,
         amount: BigNumberish
     ], [
-        void
+        boolean
     ], "nonpayable">;
     getBalance: TypedContractMethod<[token: AddressLike], [bigint], "view">;
     getRoleAdmin: TypedContractMethod<[role: BytesLike], [string], "view">;
@@ -233,7 +233,7 @@ export interface Treasury extends BaseContract {
         token: AddressLike,
         amount: BigNumberish
     ], [
-        void
+        boolean
     ], "nonpayable">;
     getFunction(nameOrSignature: "getBalance"): TypedContractMethod<[token: AddressLike], [bigint], "view">;
     getFunction(nameOrSignature: "getRoleAdmin"): TypedContractMethod<[role: BytesLike], [string], "view">;