@raac/rpc 1.1.0-beta.72 → 1.1.0-beta.74

package/dist/configs/chains/8453.json

@@ -17,7 +17,7 @@
         "raachouseprices": {
             "id": "raachouseprices",
             "name": "RAAC House Prices",
-            "contract": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9"
+            "contract": "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9"
         },
         "auctionfactory": {
             "id": "auctionfactory",
@@ -37,12 +37,12 @@
         "feecollector": {
             "id": "feecollector",
             "name": "Fee Collector",
-            "contract": "0xa513E6E4b8f2a923D98304ec87F64353C4D5C853"
+            "contract": "0x0165878A594ca255338adfa4d48449f69242Eb8F"
         },
         "treasury": {
             "id": "treasury",
             "name": "Treasury",
-            "contract": "0x0165878A594ca255338adfa4d48449f69242Eb8F"
+            "contract": "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707"
         },
         "repairfund": {
             "id": "repairfund",
@@ -57,7 +57,7 @@
         "rwavault": {
             "id": "rwavault",
             "name": "RWA Vault",
-            "contract": "0x59b670e9fA9D0A427751Af201D676719a970857b"
+            "contract": "0xc6e7DF5E7b4f2A278906862b61205850344D4e7d"
         },
         "complianceregistry": {
             "id": "complianceregistry",
@@ -67,7 +67,7 @@
         "rwaindextokencollector": {
             "id": "rwaindextokencollector",
             "name": "RWA Index Token Collector",
-            "contract": "0xc6e7DF5E7b4f2A278906862b61205850344D4e7d"
+            "contract": "0x3Aa5ebB10DC797CAC828524e59A333d0A371443c"
         },
         "raactokencollector": {
             "id": "raactokencollector",
@@ -89,19 +89,19 @@
         "stabilitypool": {
             "id": "stabilitypool",
             "name": "Stability Pool",
-            "contract": "0x68B1D87F95878fE05B998F19b66F4baba5De1aed"
+            "contract": "0x9A9f2CCfdE556A7E9Ff0848998Aa4a0CFD8863AE"
         },
         "lendingpool": {
             "id": "lendingpool",
             "name": "Lending Pool",
-            "contract": "0x9A676e781A523b5d0C0e43731313A708CB607508"
+            "contract": "0x0DCd1Bf9A1b36cE34237eEaFef220932846BCD82"
         }
     },
     "nfts": {
         "raacnft": {
             "id": "raacnft",
             "name": "RAAC NFT",
-            "contract": "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707"
+            "contract": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9"
         }
     },
     "assets": {
@@ -121,13 +121,13 @@
             "id": "rtoken",
             "name": "RToken",
             "decimals": 18,
-            "contract": "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318"
+            "contract": "0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6"
         },
         "detoken": {
             "id": "detoken",
             "name": "DEToken",
             "decimals": 18,
-            "contract": "0x0B306BF915C4d645ff596e518fAf3F9669b97016"
+            "contract": "0x9A676e781A523b5d0C0e43731313A708CB607508"
         },
         "raactoken": {
             "id": "raactoken",
@@ -145,13 +145,13 @@
             "id": "debttoken",
             "name": "Debt Token",
             "decimals": 18,
-            "contract": "0x610178dA211FEF7D417bC0e6FeD39F05609AD788"
+            "contract": "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318"
         },
         "rwaindextoken": {
             "id": "rwaindextoken",
             "name": "Index Token",
             "decimals": 18,
-            "contract": "0x3Aa5ebB10DC797CAC828524e59A333d0A371443c"
+            "contract": "0x68B1D87F95878fE05B998F19b66F4baba5De1aed"
         },
         "complianceregistry": {
             "id": "complianceregistry",
@@ -163,7 +163,7 @@
             "id": "rwaindextokencollector",
             "name": "RWA Index Token Collector",
             "decimals": 18,
-            "contract": "0xc6e7DF5E7b4f2A278906862b61205850344D4e7d"
+            "contract": "0x3Aa5ebB10DC797CAC828524e59A333d0A371443c"
         },
         "raactokencollector": {
             "id": "raactokencollector",
@@ -177,13 +177,13 @@
             "raacnftadapter": {
                 "id": "raacnftadapter",
                 "name": "RAAC NFT Adapter",
-                "contract": "0x09635F643e140090A9A8Dcd712eD6285858ceBef",
+                "contract": "0x7a2088a1bFc9d81c55368AE168C2C02570cB814F",
                 "type": "ERC721"
             },
             "rwaindextokenadapter": {
                 "id": "rwaindextokenadapter",
                 "name": "RWA Index Token",
-                "contract": "0x7a2088a1bFc9d81c55368AE168C2C02570cB814F",
+                "contract": "0x4A679253410272dd5232B3Ff7cF5dbB88f295319",
                 "type": "ERC20"
             }
         },
@@ -191,13 +191,13 @@
             "raacnftadapter": {
                 "id": "raacnftadapter",
                 "name": "RAAC NFT Adapter",
-                "contract": "0xa85233C63b9Ee964Add6F2cffe00Fd84eb32338f",
+                "contract": "0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44",
                 "type": "ERC721"
             },
             "crvusdadapter": {
                 "id": "crvusdadapter",
                 "name": "CRVUSD Adapter",
-                "contract": "0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44",
+                "contract": "0x4ed7c70F96B99c776995fB64377f0d4aB3B0e1C1",
                 "type": "ERC20"
             }
         }

package/dist/pools/lendingPool/getLendingPoolInfo.js

@@ -39,6 +39,7 @@ async function getLendingPoolInfo(chainId, userAddress, provider) {
         const maxRate = rateData?.maxRate ?? 0n;
         const optimalUtilizationRate = rateData?.optimalUtilizationRate ?? 0n;
         const protocolFeeRate = rateData?.protocolFeeRate ?? 0n;
+        const pendingProtocolFeeAmount = reserve?.[8];
         // Compute APY
         let apr;
         if (utilization <= optimalUtilizationRate && optimalUtilizationRate > 0) {
@@ -53,6 +54,7 @@ async function getLendingPoolInfo(chainId, userAddress, provider) {
             apr = apr > maxRate ? maxRate : apr;
         }
         // compute the APY
+        // FIXME: This is not correct
         let apy;
         const grossLiquidityRate = utilization * currentUsageRate / BigInt(1e27);
         const protocolFeeAmount = grossLiquidityRate * protocolFeeRate / BigInt(1e27);
@@ -89,6 +91,7 @@ async function getLendingPoolInfo(chainId, userAddress, provider) {
             apy: (Number(apy.toString()) / 1e25).toFixed(2),
             userRedeemable: ethers_1.ethers.formatEther(userRedeemable ?? 0n),
             apr: (Number(apr.toString()) / 1e25).toFixed(2),
+            pendingProtocolFeeAmount: ethers_1.ethers.formatEther(pendingProtocolFeeAmount),
         };
         return result;
     }

package/dist/scripts/liquidation.js

@@ -53,15 +53,18 @@ async function setupLiquidityPool() {
     rpc.address = signer.address;
     rpc.provider = provider;
     rpc.chainId = chainId;
-    const MockLiquidityPoolAddress = "0xE6E340D132b5f46d1e472DebcD681B2aBc16e57E";
-    const MockLiquidityPoolABI = ["function add_liquidity(uint256[2] amounts, uint256 min_mint_amount, address receiver) external"];
+    const MockLiquidityPoolAddress = "0x9E545E3C0baAB3E08CdfD552C960A1050f373042";
+    const MockLiquidityPoolABI = [
+        "function add_liquidity(uint256[2] amounts, uint256 min_mint_amount, address receiver) external",
+    ];
     const MockLiquidityPoolContract = new ethers_1.ethers.Contract(MockLiquidityPoolAddress, MockLiquidityPoolABI, signer);
     // mint 10 million in crvusd
     console.log("Minting 100 million in crvusd");
     await rpc.wallet.assets.mintAsset(chainId, "crvusd", 200000000n, signer.address, signer);
     // deposit 5 million in the RWA Vault
     console.log("Depositing 5 million in the RWA Vault");
-    await rpc.wallet.assets.approveAsset(chainId, "crvusd", await rpc.pools.rwaVault.getAdapterAddress(chainId, "crvusdadapter").address, "100000000", signer);
+    await rpc.wallet.assets.approveAsset(chainId, "crvusd", await rpc.pools.rwaVault.getAdapterAddress(chainId, "crvusdadapter")
+        .address, "100000000", signer);
     const d1 = new ethers_1.ethers.AbiCoder().encode(["uint256"], [ethers_1.ethers.parseEther("100000000")]);
     await rpc.pools.rwaVault.depositToRWAVault(chainId, "crvusdadapter", d1, signer.address, "0", signer);
     // deposit 5 million in the Mock Liquidity Pool
@@ -69,7 +72,10 @@ async function setupLiquidityPool() {
     await rpc.wallet.assets.approveAsset(chainId, "crvusd", MockLiquidityPoolAddress, "100000000", signer);
     const indextokenBalance = (await rpc.wallet.assets.getBalance(chainId, "rwaindextoken", signer.address, provider)).balance;
     await rpc.wallet.assets.approveAsset(chainId, "rwaindextoken", MockLiquidityPoolAddress, indextokenBalance, signer);
-    await (await MockLiquidityPoolContract.add_liquidity([ethers_1.ethers.parseEther("100000000"), ethers_1.ethers.parseEther(indextokenBalance.toString())], 0, signer.address)).wait();
+    await (await MockLiquidityPoolContract.add_liquidity([
+        ethers_1.ethers.parseEther("100000000"),
+        ethers_1.ethers.parseEther(indextokenBalance.toString()),
+    ], 0, signer.address)).wait();
     return;
 }
 async function setupLendingPool() {
@@ -105,7 +111,7 @@ async function initiateLiquidation(adapter, user, data) {
     const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
     const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, signer);
     const adapterAddress = rpc.pools.lendingPool.getAdapterAddress(chainId, adapter).address;
-    await (await lendingPoolContract.initiateLiquidation(adapterAddress, user, data));
+    await await lendingPoolContract.initiateLiquidation(adapterAddress, user, data);
     console.log("Liquidation initiated");
 }
 async function liquidate(pooladapter, vaultadapter, user, data) {
@@ -121,7 +127,7 @@ async function liquidate(pooladapter, vaultadapter, user, data) {
     const StabilityPoolContract = new ethers_1.ethers.Contract(StabilityPoolAddress, StabilityPoolABI, signer);
     const adapterAddress = rpc.pools.lendingPool.getAdapterAddress(chainId, pooladapter).address;
     const vaultAddress = rpc.pools.rwaVault.getAdapterAddress(chainId, vaultadapter).address;
-    await (await StabilityPoolContract.liquidateBorrower(adapterAddress, vaultAddress, user, data, 0));
+    await await StabilityPoolContract.liquidateBorrower(adapterAddress, vaultAddress, user, data, 0);
     console.log("Position liquidated.");
 }
 const updateNFTPrice = async (tokenId, price) => {
@@ -148,10 +154,23 @@ const updateNFTPrice = async (tokenId, price) => {
  * 4. Initiate the liquidation
  * 5. Liquidate
  */
-// setupLiquidityPool()
-// setupLendingPool()
-// updateNFTPrice("1", "730000")
-// getPosition("raacnftadapter", "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", new ethers.AbiCoder().encode(["uint256"], ["1"]))
-// initiateLiquidation("raacnftadapter", "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", new ethers.AbiCoder().encode(["uint256"], ["1"]))
-liquidate("raacnftadapter", "raacnftadapter", "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", new ethers_1.ethers.AbiCoder().encode(["uint256"], ["1"]));
+setupLiquidityPool();
+// setupLendingPool();
+// updateNFTPrice("1", "760000");
+// getPosition(
+// 	"raacnftadapter",
+// 	"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
+// 	new ethers.AbiCoder().encode(["uint256"], ["1"])
+// );
+// initiateLiquidation(
+// 	"raacnftadapter",
+// 	"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
+// 	new ethers.AbiCoder().encode(["uint256"], ["1"])
+// );
+// liquidate(
+// 	"raacnftadapter",
+// 	"raacnftadapter",
+// 	"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
+// 	new ethers.AbiCoder().encode(["uint256"], ["1"])
+// );
 // npx ts-node-dev --transpile-only --env-file=.env scripts/liquidation.ts

package/dist/types/pools/lendingPool/getLendingPoolInfo.d.ts

@@ -19,5 +19,6 @@ declare function getLendingPoolInfo(chainId: ChainId, userAddress: string, provi
     apy: string;
     userRedeemable: string;
     apr: string;
+    pendingProtocolFeeAmount: string;
 }>;
 export default getLendingPoolInfo;

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

@@ -2,6 +2,8 @@ import type * as access from "./access";
 export type { access };
 import type * as interfaces from "./interfaces";
 export type { interfaces };
+import type * as proxy from "./proxy";
+export type { proxy };
 import type * as token from "./token";
 export type { token };
 import type * as utils from "./utils";

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

@@ -0,0 +1,65 @@
+import type { BaseContract, FunctionFragment, Interface, EventFragment, AddressLike, ContractRunner, ContractMethod, Listener } from "ethers";
+import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, TypedLogDescription, TypedListener } from "../../../common";
+export interface IERC1967Interface extends Interface {
+    getEvent(nameOrSignatureOrTopic: "AdminChanged" | "BeaconUpgraded" | "Upgraded"): EventFragment;
+}
+export declare namespace AdminChangedEvent {
+    type InputTuple = [previousAdmin: AddressLike, newAdmin: AddressLike];
+    type OutputTuple = [previousAdmin: string, newAdmin: string];
+    interface OutputObject {
+        previousAdmin: string;
+        newAdmin: string;
+    }
+    type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
+    type Filter = TypedDeferredTopicFilter<Event>;
+    type Log = TypedEventLog<Event>;
+    type LogDescription = TypedLogDescription<Event>;
+}
+export declare namespace BeaconUpgradedEvent {
+    type InputTuple = [beacon: AddressLike];
+    type OutputTuple = [beacon: string];
+    interface OutputObject {
+        beacon: string;
+    }
+    type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
+    type Filter = TypedDeferredTopicFilter<Event>;
+    type Log = TypedEventLog<Event>;
+    type LogDescription = TypedLogDescription<Event>;
+}
+export declare namespace UpgradedEvent {
+    type InputTuple = [implementation: AddressLike];
+    type OutputTuple = [implementation: string];
+    interface OutputObject {
+        implementation: string;
+    }
+    type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
+    type Filter = TypedDeferredTopicFilter<Event>;
+    type Log = TypedEventLog<Event>;
+    type LogDescription = TypedLogDescription<Event>;
+}
+export interface IERC1967 extends BaseContract {
+    connect(runner?: ContractRunner | null): IERC1967;
+    waitForDeployment(): Promise<this>;
+    interface: IERC1967Interface;
+    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>;
+    on<TCEvent extends TypedContractEvent>(filter: TypedDeferredTopicFilter<TCEvent>, listener: TypedListener<TCEvent>): Promise<this>;
+    once<TCEvent extends TypedContractEvent>(event: TCEvent, listener: TypedListener<TCEvent>): Promise<this>;
+    once<TCEvent extends TypedContractEvent>(filter: TypedDeferredTopicFilter<TCEvent>, listener: TypedListener<TCEvent>): Promise<this>;
+    listeners<TCEvent extends TypedContractEvent>(event: TCEvent): Promise<Array<TypedListener<TCEvent>>>;
+    listeners(eventName?: string): Promise<Array<Listener>>;
+    removeAllListeners<TCEvent extends TypedContractEvent>(event?: TCEvent): Promise<this>;
+    getFunction<T extends ContractMethod = ContractMethod>(key: string | FunctionFragment): T;
+    getEvent(key: "AdminChanged"): TypedContractEvent<AdminChangedEvent.InputTuple, AdminChangedEvent.OutputTuple, AdminChangedEvent.OutputObject>;
+    getEvent(key: "BeaconUpgraded"): TypedContractEvent<BeaconUpgradedEvent.InputTuple, BeaconUpgradedEvent.OutputTuple, BeaconUpgradedEvent.OutputObject>;
+    getEvent(key: "Upgraded"): TypedContractEvent<UpgradedEvent.InputTuple, UpgradedEvent.OutputTuple, UpgradedEvent.OutputObject>;
+    filters: {
+        "AdminChanged(address,address)": TypedContractEvent<AdminChangedEvent.InputTuple, AdminChangedEvent.OutputTuple, AdminChangedEvent.OutputObject>;
+        AdminChanged: TypedContractEvent<AdminChangedEvent.InputTuple, AdminChangedEvent.OutputTuple, AdminChangedEvent.OutputObject>;
+        "BeaconUpgraded(address)": TypedContractEvent<BeaconUpgradedEvent.InputTuple, BeaconUpgradedEvent.OutputTuple, BeaconUpgradedEvent.OutputObject>;
+        BeaconUpgraded: TypedContractEvent<BeaconUpgradedEvent.InputTuple, BeaconUpgradedEvent.OutputTuple, BeaconUpgradedEvent.OutputObject>;
+        "Upgraded(address)": TypedContractEvent<UpgradedEvent.InputTuple, UpgradedEvent.OutputTuple, UpgradedEvent.OutputObject>;
+        Upgraded: TypedContractEvent<UpgradedEvent.InputTuple, UpgradedEvent.OutputTuple, UpgradedEvent.OutputObject>;
+    };
+}

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

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

package/dist/types/typechain-types/{contracts/core/vaults/ERC721VaultAdapter.sol/IPriceOracle.d.ts → @openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.d.ts}

@@ -1,14 +1,23 @@
-import type { BaseContract, BigNumberish, BytesLike, FunctionFragment, Result, Interface, ContractRunner, ContractMethod, Listener } from "ethers";
-import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, TypedListener, TypedContractMethod } from "../../../../common";
-export interface IPriceOracleInterface extends Interface {
-    getFunction(nameOrSignature: "getLatestPrice"): FunctionFragment;
-    encodeFunctionData(functionFragment: "getLatestPrice", values: [BigNumberish]): string;
-    decodeFunctionResult(functionFragment: "getLatestPrice", data: BytesLike): Result;
+import type { BaseContract, FunctionFragment, Interface, EventFragment, AddressLike, ContractRunner, ContractMethod, Listener } from "ethers";
+import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, TypedLogDescription, TypedListener } from "../../../../common";
+export interface ERC1967ProxyInterface extends Interface {
+    getEvent(nameOrSignatureOrTopic: "Upgraded"): EventFragment;
 }
-export interface IPriceOracle extends BaseContract {
-    connect(runner?: ContractRunner | null): IPriceOracle;
+export declare namespace UpgradedEvent {
+    type InputTuple = [implementation: AddressLike];
+    type OutputTuple = [implementation: string];
+    interface OutputObject {
+        implementation: string;
+    }
+    type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
+    type Filter = TypedDeferredTopicFilter<Event>;
+    type Log = TypedEventLog<Event>;
+    type LogDescription = TypedLogDescription<Event>;
+}
+export interface ERC1967Proxy extends BaseContract {
+    connect(runner?: ContractRunner | null): ERC1967Proxy;
     waitForDeployment(): Promise<this>;
-    interface: IPriceOracleInterface;
+    interface: ERC1967ProxyInterface;
     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>;
@@ -18,12 +27,10 @@ export interface IPriceOracle 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>;
-    getLatestPrice: TypedContractMethod<[
-        tokenId: BigNumberish
-    ], [
-        bigint
-    ], "view">;
     getFunction<T extends ContractMethod = ContractMethod>(key: string | FunctionFragment): T;
-    getFunction(nameOrSignature: "getLatestPrice"): TypedContractMethod<[tokenId: BigNumberish], [bigint], "view">;
-    filters: {};
+    getEvent(key: "Upgraded"): TypedContractEvent<UpgradedEvent.InputTuple, UpgradedEvent.OutputTuple, UpgradedEvent.OutputObject>;
+    filters: {
+        "Upgraded(address)": TypedContractEvent<UpgradedEvent.InputTuple, UpgradedEvent.OutputTuple, UpgradedEvent.OutputObject>;
+        Upgraded: TypedContractEvent<UpgradedEvent.InputTuple, UpgradedEvent.OutputTuple, UpgradedEvent.OutputObject>;
+    };
 }

package/dist/types/typechain-types/@openzeppelin/contracts/{utils/math/Math.d.ts → proxy/ERC1967/ERC1967Utils.d.ts}

@@ -1,11 +1,11 @@
 import type { BaseContract, FunctionFragment, Interface, ContractRunner, ContractMethod, Listener } from "ethers";
 import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, TypedListener } from "../../../../common";
-export interface MathInterface extends Interface {
+export interface ERC1967UtilsInterface extends Interface {
 }
-export interface Math extends BaseContract {
-    connect(runner?: ContractRunner | null): Math;
+export interface ERC1967Utils extends BaseContract {
+    connect(runner?: ContractRunner | null): ERC1967Utils;
     waitForDeployment(): Promise<this>;
-    interface: MathInterface;
+    interface: ERC1967UtilsInterface;
     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/proxy/ERC1967/index.d.ts

@@ -0,0 +1,2 @@
+export type { ERC1967Proxy } from "./ERC1967Proxy";
+export type { ERC1967Utils } from "./ERC1967Utils";

package/dist/types/typechain-types/{contracts/mocks/core/oracles/MockERC20PriceOracle.sol/IPriceOracle.d.ts → @openzeppelin/contracts/proxy/Proxy.d.ts}

@@ -1,14 +1,11 @@
-import type { BaseContract, BytesLike, FunctionFragment, Result, Interface, ContractRunner, ContractMethod, Listener } from "ethers";
-import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, TypedListener, TypedContractMethod } from "../../../../../common";
-export interface IPriceOracleInterface extends Interface {
-    getFunction(nameOrSignature: "getLatestPrice"): FunctionFragment;
-    encodeFunctionData(functionFragment: "getLatestPrice", values?: undefined): string;
-    decodeFunctionResult(functionFragment: "getLatestPrice", data: BytesLike): Result;
+import type { BaseContract, FunctionFragment, Interface, ContractRunner, ContractMethod, Listener } from "ethers";
+import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, TypedListener } from "../../../common";
+export interface ProxyInterface extends Interface {
 }
-export interface IPriceOracle extends BaseContract {
-    connect(runner?: ContractRunner | null): IPriceOracle;
+export interface Proxy extends BaseContract {
+    connect(runner?: ContractRunner | null): Proxy;
     waitForDeployment(): Promise<this>;
-    interface: IPriceOracleInterface;
+    interface: ProxyInterface;
     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>;
@@ -18,8 +15,6 @@ export interface IPriceOracle 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>;
-    getLatestPrice: TypedContractMethod<[], [bigint], "view">;
     getFunction<T extends ContractMethod = ContractMethod>(key: string | FunctionFragment): T;
-    getFunction(nameOrSignature: "getLatestPrice"): TypedContractMethod<[], [bigint], "view">;
     filters: {};
 }

package/dist/types/typechain-types/{contracts/core/vaults/ERC20VaultAdapter.sol/IPriceOracle.d.ts → @openzeppelin/contracts/proxy/beacon/IBeacon.d.ts}

@@ -1,14 +1,14 @@
 import type { BaseContract, BytesLike, FunctionFragment, Result, Interface, ContractRunner, ContractMethod, Listener } from "ethers";
 import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, TypedListener, TypedContractMethod } from "../../../../common";
-export interface IPriceOracleInterface extends Interface {
-    getFunction(nameOrSignature: "getLatestPrice"): FunctionFragment;
-    encodeFunctionData(functionFragment: "getLatestPrice", values?: undefined): string;
-    decodeFunctionResult(functionFragment: "getLatestPrice", data: BytesLike): Result;
+export interface IBeaconInterface extends Interface {
+    getFunction(nameOrSignature: "implementation"): FunctionFragment;
+    encodeFunctionData(functionFragment: "implementation", values?: undefined): string;
+    decodeFunctionResult(functionFragment: "implementation", data: BytesLike): Result;
 }
-export interface IPriceOracle extends BaseContract {
-    connect(runner?: ContractRunner | null): IPriceOracle;
+export interface IBeacon extends BaseContract {
+    connect(runner?: ContractRunner | null): IBeacon;
     waitForDeployment(): Promise<this>;
-    interface: IPriceOracleInterface;
+    interface: IBeaconInterface;
     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>;
@@ -18,8 +18,8 @@ export interface IPriceOracle 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>;
-    getLatestPrice: TypedContractMethod<[], [bigint], "view">;
+    implementation: TypedContractMethod<[], [string], "view">;
     getFunction<T extends ContractMethod = ContractMethod>(key: string | FunctionFragment): T;
-    getFunction(nameOrSignature: "getLatestPrice"): TypedContractMethod<[], [bigint], "view">;
+    getFunction(nameOrSignature: "implementation"): TypedContractMethod<[], [string], "view">;
     filters: {};
 }

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

@@ -0,0 +1 @@
+export type { IBeacon } from "./IBeacon";

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

@@ -0,0 +1,7 @@
+import type * as erc1967 from "./ERC1967";
+export type { erc1967 };
+import type * as beacon from "./beacon";
+export type { beacon };
+import type * as transparent from "./transparent";
+export type { transparent };
+export type { Proxy } from "./Proxy";

package/dist/types/typechain-types/@openzeppelin/contracts/proxy/transparent/ProxyAdmin.d.ts

@@ -0,0 +1,74 @@
+import type { BaseContract, BytesLike, FunctionFragment, Result, Interface, EventFragment, AddressLike, ContractRunner, ContractMethod, Listener } from "ethers";
+import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, TypedLogDescription, TypedListener, TypedContractMethod } from "../../../../common";
+export interface ProxyAdminInterface extends Interface {
+    getFunction(nameOrSignature: "UPGRADE_INTERFACE_VERSION" | "owner" | "renounceOwnership" | "transferOwnership" | "upgradeAndCall"): FunctionFragment;
+    getEvent(nameOrSignatureOrTopic: "OwnershipTransferred"): EventFragment;
+    encodeFunctionData(functionFragment: "UPGRADE_INTERFACE_VERSION", values?: undefined): string;
+    encodeFunctionData(functionFragment: "owner", values?: undefined): string;
+    encodeFunctionData(functionFragment: "renounceOwnership", values?: undefined): string;
+    encodeFunctionData(functionFragment: "transferOwnership", values: [AddressLike]): string;
+    encodeFunctionData(functionFragment: "upgradeAndCall", values: [AddressLike, AddressLike, BytesLike]): string;
+    decodeFunctionResult(functionFragment: "UPGRADE_INTERFACE_VERSION", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "renounceOwnership", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "transferOwnership", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "upgradeAndCall", data: BytesLike): Result;
+}
+export declare namespace OwnershipTransferredEvent {
+    type InputTuple = [previousOwner: AddressLike, newOwner: AddressLike];
+    type OutputTuple = [previousOwner: string, newOwner: string];
+    interface OutputObject {
+        previousOwner: string;
+        newOwner: string;
+    }
+    type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
+    type Filter = TypedDeferredTopicFilter<Event>;
+    type Log = TypedEventLog<Event>;
+    type LogDescription = TypedLogDescription<Event>;
+}
+export interface ProxyAdmin extends BaseContract {
+    connect(runner?: ContractRunner | null): ProxyAdmin;
+    waitForDeployment(): Promise<this>;
+    interface: ProxyAdminInterface;
+    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>;
+    on<TCEvent extends TypedContractEvent>(filter: TypedDeferredTopicFilter<TCEvent>, listener: TypedListener<TCEvent>): Promise<this>;
+    once<TCEvent extends TypedContractEvent>(event: TCEvent, listener: TypedListener<TCEvent>): Promise<this>;
+    once<TCEvent extends TypedContractEvent>(filter: TypedDeferredTopicFilter<TCEvent>, listener: TypedListener<TCEvent>): Promise<this>;
+    listeners<TCEvent extends TypedContractEvent>(event: TCEvent): Promise<Array<TypedListener<TCEvent>>>;
+    listeners(eventName?: string): Promise<Array<Listener>>;
+    removeAllListeners<TCEvent extends TypedContractEvent>(event?: TCEvent): Promise<this>;
+    UPGRADE_INTERFACE_VERSION: TypedContractMethod<[], [string], "view">;
+    owner: TypedContractMethod<[], [string], "view">;
+    renounceOwnership: TypedContractMethod<[], [void], "nonpayable">;
+    transferOwnership: TypedContractMethod<[
+        newOwner: AddressLike
+    ], [
+        void
+    ], "nonpayable">;
+    upgradeAndCall: TypedContractMethod<[
+        proxy: AddressLike,
+        implementation: AddressLike,
+        data: BytesLike
+    ], [
+        void
+    ], "payable">;
+    getFunction<T extends ContractMethod = ContractMethod>(key: string | FunctionFragment): T;
+    getFunction(nameOrSignature: "UPGRADE_INTERFACE_VERSION"): TypedContractMethod<[], [string], "view">;
+    getFunction(nameOrSignature: "owner"): TypedContractMethod<[], [string], "view">;
+    getFunction(nameOrSignature: "renounceOwnership"): TypedContractMethod<[], [void], "nonpayable">;
+    getFunction(nameOrSignature: "transferOwnership"): TypedContractMethod<[newOwner: AddressLike], [void], "nonpayable">;
+    getFunction(nameOrSignature: "upgradeAndCall"): TypedContractMethod<[
+        proxy: AddressLike,
+        implementation: AddressLike,
+        data: BytesLike
+    ], [
+        void
+    ], "payable">;
+    getEvent(key: "OwnershipTransferred"): TypedContractEvent<OwnershipTransferredEvent.InputTuple, OwnershipTransferredEvent.OutputTuple, OwnershipTransferredEvent.OutputObject>;
+    filters: {
+        "OwnershipTransferred(address,address)": TypedContractEvent<OwnershipTransferredEvent.InputTuple, OwnershipTransferredEvent.OutputTuple, OwnershipTransferredEvent.OutputObject>;
+        OwnershipTransferred: TypedContractEvent<OwnershipTransferredEvent.InputTuple, OwnershipTransferredEvent.OutputTuple, OwnershipTransferredEvent.OutputObject>;
+    };
+}