@raac/rpc 1.1.0-beta.57 → 1.1.0-beta.58

package/dist/RPCLibrary.js

@@ -121,8 +121,8 @@ const getWithdrawRequestInfo_2 = require("./pools/stabilityPool/getWithdrawReque
 const requestWithdraw_2 = require("./pools/stabilityPool/requestWithdraw");
 const artifacts_1 = require("./utils/artifacts");
 const errorDecoder_1 = require("./utils/errorDecoder");
-const request_1 = require("./oracles/prime-rate/request");
-const request_2 = require("./oracles/houses/request");
+// import { request as requestPrimeRate } from "./oracles/prime-rate/request";
+// import { request as requestHousePrices } from "./oracles/houses/request";
 class RPCLibrary {
     signer;
     isConnected;
@@ -133,7 +133,14 @@ class RPCLibrary {
     assets;
     // valid
     wallet;
-    oracles;
+    // oracles: {
+    // 	primeRate: {
+    // 		request: typeof requestPrimeRate;
+    // 	};
+    // 	housePrices: {
+    // 		request: typeof requestHousePrices;
+    // 	};
+    // };
     nfts;
     contracts;
     pools;
@@ -294,14 +301,14 @@ class RPCLibrary {
             decodeErrorMessage: errorDecoder_1.decodeErrorMessage,
             attachDecodedErrorMessage: errorDecoder_1.attachDecodedErrorMessage,
         };
-        this.oracles = {
-            primeRate: {
-                request: request_1.request,
-            },
-            housePrices: {
-                request: request_2.request,
-            },
-        };
+        // this.oracles = {
+        // 	primeRate: {
+        // 		request: requestPrimeRate,
+        // 	},
+        // 	housePrices: {
+        // 		request: requestHousePrices,
+        // 	},
+        // };
     }
     async getWallet(privateKey, provider) {
         // @ts-ignore

package/dist/pools/stabilityPool/getStabilityPoolInfo.js

@@ -15,6 +15,7 @@ async function getStabilityPoolInfo(chainId, address, provider) {
             }
             throw error;
         };
+        console.log(await stabilityPoolContract.deToken());
         // Fetch data from StabilityPool
         const [totalDeposits] = await Promise.all([
             stabilityPoolContract
@@ -29,9 +30,29 @@ async function getStabilityPoolInfo(chainId, address, provider) {
                     .catch(handleError("getUserDeposit")),
             ]);
         }
+        // Fetch RAAC Minter information if needed for APY calculation
+        const raacMinterAddress = (0, contracts_1.getContractAddress)(chainId, "raacminter");
+        let apy = 0n;
+        if (raacMinterAddress && raacMinterAddress !== ethers_1.ethers.ZeroAddress) {
+            const raacMinterABI = (0, artifacts_1.getABI)("raacminter");
+            const raacMinterContract = new ethers_1.ethers.Contract(raacMinterAddress, raacMinterABI, provider);
+            const [emissionRate, totalSupply] = await Promise.all([
+                raacMinterContract.emissionRate().catch(handleError("emissionRate")),
+                raacMinterContract
+                    .getTotalSupply()
+                    .catch(handleError("getTotalSupply")),
+            ]);
+            // APY Calculation
+            // Assuming emissionRate is per block and BLOCKS_PER_YEAR is known
+            const BLOCKS_PER_YEAR = 2102400n; // Approximate number of blocks per year (Ethereum ~15 sec/block)
+            const emissionRatePerYear = emissionRate * BLOCKS_PER_YEAR;
+            apy =
+                totalSupply > 0n ? (emissionRatePerYear * 10000n) / totalSupply : 0n;
+        }
         const result = {
             totalDeposits: ethers_1.ethers.formatEther(totalDeposits ?? 0n),
             userDeposit: ethers_1.ethers.formatEther(userDeposit ?? 0n),
+            apy: parseFloat((apy ?? 0n).toString()) / 100, // APY in percentage
         };
         return result;
     }

package/dist/types/RPCLibrary.d.ts

@@ -96,8 +96,6 @@ import { getWithdrawRequestInfo as getStabilityPoolWithdrawRequestInfo } from ".
 import { requestWithdraw as requestStabilityPoolWithdraw } from "./pools/stabilityPool/requestWithdraw";
 import { getABI } from "./utils/artifacts";
 import { decodeErrorName, getErrorInfo, attachDecodedError, decodeErrorMessage, attachDecodedErrorMessage } from "./utils/errorDecoder";
-import { request as requestPrimeRate } from "./oracles/prime-rate/request";
-import { request as requestHousePrices } from "./oracles/houses/request";
 declare class RPCLibrary {
     signer: Signer | null;
     isConnected: boolean;
@@ -122,14 +120,6 @@ declare class RPCLibrary {
         };
         rpcs: {};
     };
-    oracles: {
-        primeRate: {
-            request: typeof requestPrimeRate;
-        };
-        housePrices: {
-            request: typeof requestHousePrices;
-        };
-    };
     nfts: {
         getBaseUri: typeof getBaseUri;
         mint: typeof mintNFT;

package/dist/types/pools/stabilityPool/getStabilityPoolInfo.d.ts

@@ -3,5 +3,6 @@ import { ChainId } from "../../configs/chains/index";
 declare function getStabilityPoolInfo(chainId: ChainId, address: string, provider: Provider): Promise<{
     totalDeposits: string;
     userDeposit: string;
+    apy: number;
 }>;
 export default getStabilityPoolInfo;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@raac/rpc",
-	"version": "1.1.0-beta.57",
+	"version": "1.1.0-beta.58",
 	"description": "RPC Library for RAAC ",
 	"main": "dist/index.js",
 	"types": "dist/types/index.d.ts",