@raac/rpc 1.1.0-beta.83 → 1.1.0-beta.85

package/dist/oracles/encryptSecretURLs.js

@@ -1,23 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encryptSecretURLs = encryptSecretURLs;
-const functions_toolkit_1 = require("@chainlink/functions-toolkit");
-const chainlink_networks_config_1 = __importDefault(require("./chainlink-networks-config"));
-async function encryptSecretURLs(chainId, urls, signerV5) {
-    const network = chainlink_networks_config_1.default[chainId];
-    const functionsRouterAddress = network.functionsRouter;
-    const donId = network.donId;
-    const secretsManager = new functions_toolkit_1.SecretsManager({
-        signer: signerV5,
-        functionsRouterAddress,
-        donId,
-    });
-    await secretsManager.initialize();
-    const encryptedSecrets = await secretsManager.encryptSecretsUrls(urls);
-    const isVerified = await secretsManager.verifyOffchainSecrets(urls);
+const chainlinkjs_1 = require("@raac/chainlinkjs");
+async function encryptSecretURLs(chainId, urls, signer) {
+    const { chain, network } = chainlinkjs_1.utils.getChainAndNetwork(chainId);
+    const secretsConnector = new chainlinkjs_1.connectors.ChainlinkSecretsConnector(signer, { chain, network });
+    const encryptedSecrets = await secretsConnector.encryptSecretsUrls(urls);
+    const isVerified = await secretsConnector.verifyOffchainSecrets(urls);
     if (!isVerified) {
         throw new Error("Offchain secrets verification failed");
     }

package/dist/oracles/encryptSecrets.js

@@ -4,26 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encryptSecrets = encryptSecrets;
-const configs_1 = require("../configs");
-const chainlink_networks_config_1 = __importDefault(require("./chainlink-networks-config"));
-const functions_toolkit_1 = require("@chainlink/functions-toolkit");
+const chainlinkjs_1 = require("@raac/chainlinkjs");
 const fs_1 = __importDefault(require("fs"));
-async function encryptSecrets(chainId, secrets, outputFile, signerV5) {
-    const chain = (0, configs_1.getChainConfig)(chainId);
-    const network = chainlink_networks_config_1.default[chainId];
-    if (!chain) {
-        throw new Error(`Chain configuration not found for chainId: ${chainId}`);
-    }
-    const functionsRouterAddress = network.functionsRouter;
-    const donId = network.donId;
-    const secretsManager = new functions_toolkit_1.SecretsManager({
-        // ethers v5 signer again
-        signer: signerV5,
-        functionsRouterAddress,
-        donId,
-    });
-    await secretsManager.initialize();
-    const encryptedSecrets = await secretsManager.encryptSecrets(secrets);
+async function encryptSecrets(chainId, secrets, outputFile, signer) {
+    const { chain, network } = chainlinkjs_1.utils.getChainAndNetwork(chainId);
+    const secretsConnector = new chainlinkjs_1.connectors.ChainlinkSecretsConnector(signer, chain, network);
+    const encryptedSecrets = await secretsConnector.encryptSecrets(secrets);
     fs_1.default.writeFileSync(outputFile, JSON.stringify(encryptedSecrets, null, 2), { encoding: 'utf8' });
     return encryptedSecrets;
 }

package/dist/oracles/houses/config.js

@@ -4,16 +4,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
-const functions_toolkit_1 = require("@chainlink/functions-toolkit");
+const chainlinkjs_1 = require("@raac/chainlinkjs");
+const { Location, ReturnType, CodeLanguage } = chainlinkjs_1.enums;
 const requestConfig = {
     source: fs_1.default.readFileSync("./oracles/houses/api.js").toString(),
-    codeLocation: functions_toolkit_1.Location.Inline,
+    codeLocation: Location.Inline,
     // Optional
     secrets: { apiKey: process.env.RAAC_HOUSING_API_KEY ?? "" },
     // Optional
-    secretsLocation: functions_toolkit_1.Location.DONHosted,
+    secretsLocation: Location.DONHosted,
     args: [],
-    codeLanguage: functions_toolkit_1.CodeLanguage.JavaScript,
-    expectedReturnType: functions_toolkit_1.ReturnType.uint256,
+    codeLanguage: CodeLanguage.JavaScript,
+    expectedReturnType: ReturnType.uint256,
 };
 exports.default = requestConfig;

package/dist/oracles/houses/request.js

@@ -5,36 +5,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSecretReference = generateSecretReference;
 exports.request = request;
-const functions_toolkit_1 = require("@chainlink/functions-toolkit");
-const configs_1 = require("../../configs");
-const getContractAddress_1 = __importDefault(require("../../contracts/getContractAddress"));
-const ethers5_1 = require("ethers5");
+const fs_1 = __importDefault(require("fs"));
+const ethers_1 = require("ethers");
+const chainlinkjs_1 = require("@raac/chainlinkjs");
+const { decodeResult, simulateScript, decomposeFromChainId } = chainlinkjs_1.utils;
+const { ChainlinkFunctionConnector, ChainlinkSecretsConnector } = chainlinkjs_1.connectors;
+const FulfillmentCode = chainlinkjs_1.enums.FulfillmentCode;
+const ResponseListener = chainlinkjs_1.listeners.ResponseListener;
 const config_1 = __importDefault(require("./config"));
-const chainlink_networks_config_1 = __importDefault(require("../chainlink-networks-config"));
+const getContractAddress_1 = __importDefault(require("../../contracts/getContractAddress"));
 const artifacts_1 = require("../../utils/artifacts");
-const fs_1 = __importDefault(require("fs"));
 const subscriptionIds = {
     8453: 4392,
     17000: 4392,
     11155111: 4392,
     18453: 4392,
 };
-async function generateSecretReference(chainId, secrets, signerV5) {
-    const chain = (0, configs_1.getChainConfig)(chainId);
-    const network = chainlink_networks_config_1.default[chainId];
-    if (!chain) {
-        throw new Error(`Chain configuration not found for chainId: ${chainId}`);
-    }
+async function generateSecretReference(chainId, secrets, signer) {
     const slotId = 0;
-    const functionsRouterAddress = network.functionsRouter;
-    const donId = network.donId;
-    const secretsManager = new functions_toolkit_1.SecretsManager({
-        // ethers v5 signer again
-        signer: signerV5,
-        functionsRouterAddress,
-        donId,
-    });
-    await secretsManager.initialize();
+    const { chain, network } = decomposeFromChainId(chainId);
+    const secretsManager = new ChainlinkSecretsConnector(signer, { chain, network });
     const encryptedSecrets = await secretsManager.encryptSecrets(secrets);
     fs_1.default.writeFileSync("encryptedFunctionsBeaconSecrets.json", JSON.stringify(encryptedSecrets, null, 2), { encoding: 'utf8' });
     // DONHoster secrets
@@ -51,20 +41,16 @@ async function generateSecretReference(chainId, secrets, signerV5) {
     //   });
     return encryptedSecrets;
 }
-async function request(chainId, houseId, signerV5) {
-    const chain = (0, configs_1.getChainConfig)(chainId);
-    const network = chainlink_networks_config_1.default[chainId];
-    if (!chain) {
-        throw new Error(`Chain configuration not found for chainId: ${chainId}`);
-    }
+async function request(chainId, houseId, signer) {
+    const { chain, network } = decomposeFromChainId(chainId);
     // Simulate the request first
     {
-        const { responseBytesHexstring, errorString } = await (0, functions_toolkit_1.simulateScript)({
+        const { responseBytesHexstring, errorString } = await simulateScript({
             ...config_1.default,
             args: [houseId],
         });
         if (responseBytesHexstring) {
-            console.log(`\nResponse returned by script during local simulation: ${(0, functions_toolkit_1.decodeResult)(responseBytesHexstring, config_1.default.expectedReturnType).toString()}\n`);
+            console.log(`\nResponse returned by script during local simulation: ${decodeResult(responseBytesHexstring, config_1.default.expectedReturnType).toString()}\n`);
         }
         if (errorString) {
             console.log(`\nError returned by simulated script:\n${errorString}\n`);
@@ -76,42 +62,27 @@ async function request(chainId, houseId, signerV5) {
     const subscriptionId = subscriptionIds[chainId];
     const slotId = 0;
     const callbackGasLimit = 300_000;
-    const consumerContract = new ethers5_1.ethers.Contract(contractAddress, contractAbi, signerV5);
-    const linkTokenAddress = network.linkToken;
+    const consumerContract = new ethers_1.ethers.Contract(contractAddress, contractAbi, signer);
     const functionsRouterAddress = network.functionsRouter;
-    const subscriptionManager = new functions_toolkit_1.SubscriptionManager({
-        // Use the v5 signer here (toolkit expects ethers v5 types)
-        signer: signerV5,
-        linkTokenAddress,
-        functionsRouterAddress,
-    });
-    await subscriptionManager.initialize();
-    const donId = network.donId;
-    const secretsManager = new functions_toolkit_1.SecretsManager({
-        // ethers v5 signer again
-        signer: signerV5,
-        functionsRouterAddress,
-        donId,
-    });
-    await secretsManager.initialize();
-    const subInfo = await subscriptionManager.getSubscriptionInfo(subscriptionId);
+    const subscriptionManager = new ChainlinkFunctionConnector(signer, { chain, network });
+    const secretsManager = new ChainlinkSecretsConnector(signer, { chain, network });
+    const subInfo = await subscriptionManager.getSubscription(subscriptionId);
     if (!subInfo.consumers
         .map((c) => c.toLowerCase())
         .includes(contractAddress.toLowerCase())) {
         throw Error(`Consumer contract ${contractAddress} has not been added to subscription ${subscriptionId}`);
     }
-    // Use the v5 provider for gas data (to avoid type mismatches)
-    const { gasPrice } = await signerV5.provider.getFeeData();
+    const { gasPrice } = await signer.provider.getFeeData();
     // @ts-ignore
-    const gasPriceWei = BigInt(Math.ceil(ethers5_1.ethers.utils.formatUnits(gasPrice, "wei").toString()));
+    const gasPriceWei = BigInt(Math.ceil(ethers_1.ethers.formatUnits(gasPrice, "wei").toString()));
     const estimatedCostJuels = await subscriptionManager.estimateFunctionsRequestCost({
-        donId,
+        donId: subscriptionManager.donId,
         subscriptionId,
         callbackGasLimit,
         gasPriceWei,
     });
-    const estimatedCostLink = ethers5_1.ethers.utils.formatUnits(estimatedCostJuels.toString(), 18);
-    const subBalanceLink = ethers5_1.ethers.utils.formatUnits(subInfo.balance.toString(), 18);
+    const estimatedCostLink = ethers_1.ethers.formatUnits(estimatedCostJuels.toString(), 18);
+    const subBalanceLink = ethers_1.ethers.parseUnits(subInfo.balance, 18);
     if (subInfo.balance <= estimatedCostJuels) {
         throw Error(`Subscription ${subscriptionId} does not have sufficient funds. The estimated cost is ${estimatedCostLink} LINK, but the subscription only has ${subBalanceLink} LINK.`);
     }
@@ -127,8 +98,8 @@ async function request(chainId, houseId, signerV5) {
         slotId,
         version,
     });
-    const responseListener = new functions_toolkit_1.ResponseListener({
-        provider: signerV5.provider,
+    const responseListener = new ResponseListener({
+        provider: signer.provider,
         functionsRouterAddress,
     });
     console.log(`Waiting for transaction for RAACHousePriceOracle contract ${contractAddress} on network ${network.name} to be confirmed...`);
@@ -146,9 +117,9 @@ async function request(chainId, houseId, signerV5) {
         // Get response data
         const { requestId, totalCostInJuels, responseBytesHexstring, errorString, fulfillmentCode, } = await responseListener.listenForResponseFromTransaction(requestTx.hash, undefined, NUM_CONFIRMATIONS, undefined);
         switch (fulfillmentCode) {
-            case functions_toolkit_1.FulfillmentCode.FULFILLED:
+            case FulfillmentCode.FULFILLED:
                 if (responseBytesHexstring !== "0x") {
-                    console.log(`Request ${requestId} fulfilled!\nResponse has been sent to consumer contract: ${(0, functions_toolkit_1.decodeResult)(responseBytesHexstring, config_1.default.expectedReturnType).toString()}\n`);
+                    console.log(`Request ${requestId} fulfilled!\nResponse has been sent to consumer contract: ${decodeResult(responseBytesHexstring, config_1.default.expectedReturnType).toString()}\n`);
                 }
                 else if (errorString.length > 0) {
                     console.error(`Request ${requestId} fulfilled with error: ${errorString}\n`);
@@ -156,13 +127,13 @@ async function request(chainId, houseId, signerV5) {
                 else {
                     console.warn(`Request ${requestId} fulfilled with empty response data.\n`);
                 }
-                const linkCost = ethers5_1.ethers.utils.formatUnits(totalCostInJuels.toString(), 18);
+                const linkCost = ethers_1.ethers.formatUnits(totalCostInJuels.toString(), 18);
                 console.log(`Total request cost: ${linkCost + " LINK"}`);
                 break;
-            case functions_toolkit_1.FulfillmentCode.USER_CALLBACK_ERROR:
+            case FulfillmentCode.USER_CALLBACK_ERROR:
                 console.error("Error encountered when calling consumer contract callback.\nEnsure the fulfillRequest function in RAACHousePriceOracle is correct and the --callbackgaslimit is sufficient.");
                 break;
-            case functions_toolkit_1.FulfillmentCode.COST_EXCEEDS_COMMITMENT:
+            case FulfillmentCode.COST_EXCEEDS_COMMITMENT:
                 console.error(`Request ${requestId} failed due to a gas price spike when attempting to respond.`);
                 break;
             default:

package/dist/oracles/houses/simulate.js

@@ -4,15 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.simulate = simulate;
-const functions_toolkit_1 = require("@chainlink/functions-toolkit");
+const chainlinkjs_1 = require("@raac/chainlinkjs");
+const { simulateScript, decodeResult } = chainlinkjs_1.utils;
 const config_1 = __importDefault(require("./config"));
 async function simulate(houseId) {
-    const { responseBytesHexstring, errorString } = await (0, functions_toolkit_1.simulateScript)({
+    const { responseBytesHexstring, errorString } = await simulateScript({
         ...config_1.default,
         args: [houseId],
     });
     if (responseBytesHexstring) {
-        console.log(`\nResponse returned by script during local simulation: ${(0, functions_toolkit_1.decodeResult)(responseBytesHexstring, config_1.default.expectedReturnType).toString()}\n`);
+        console.log(`\nResponse returned by script during local simulation: ${decodeResult(responseBytesHexstring, config_1.default.expectedReturnType).toString()}\n`);
     }
     if (errorString) {
         console.log(`\nError returned by simulated script:\n${errorString}\n`);

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

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const functions_toolkit_1 = require("@chainlink/functions-toolkit");
+const chainlinkjs_1 = require("@raac/chainlinkjs");
+const { Location, ReturnType, CodeLanguage } = chainlinkjs_1.enums;
 const requestConfig = {
     name: "prime-rate",
     sourceURL: "https://emerald-many-grasshopper-318.mypinata.cloud/ipfs/bafkreid3kubchc3f2sspzq25pnmnw3mppkhv46xvzg72xx7zqs2plvjbqu",
-    codeLocation: functions_toolkit_1.Location["Inline"],
+    codeLocation: Location["Inline"],
     // Optional
     secrets: { apiKey: process.env.FRED_API_KEY ?? "" },
     // Optional
-    secretsLocation: functions_toolkit_1.Location["DONHosted"],
+    secretsLocation: Location["DONHosted"],
     args: [],
-    codeLanguage: functions_toolkit_1.CodeLanguage.JavaScript,
-    expectedReturnType: functions_toolkit_1.ReturnType.uint256,
+    codeLanguage: CodeLanguage.JavaScript,
+    expectedReturnType: ReturnType.uint256,
 };
 exports.default = requestConfig;

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

@@ -4,10 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.request = request;
-const functions_toolkit_1 = require("@chainlink/functions-toolkit");
+const chainlinkjs_1 = require("@raac/chainlinkjs");
+const { decodeResult, simulateScript, decomposeFromChainId } = chainlinkjs_1.utils;
+const { ChainlinkFunctionConnector, ChainlinkSecretsConnector } = chainlinkjs_1.connectors;
+const FulfillmentCode = chainlinkjs_1.enums.FulfillmentCode;
+const ResponseListener = chainlinkjs_1.listeners.ResponseListener;
+const ethers_1 = require("ethers");
 const configs_1 = require("../../configs");
 const getContractAddress_1 = __importDefault(require("../../contracts/getContractAddress"));
-const ethers5_1 = require("ethers5");
 const config_1 = __importDefault(require("./config"));
 const chainlink_networks_config_1 = __importDefault(require("../chainlink-networks-config"));
 const artifacts_1 = require("../../utils/artifacts");
@@ -17,10 +21,10 @@ const subscriptionIds = {
     11155111: 4392,
     18453: 4392,
 };
-async function request(chainId, signerV5) {
-    const chain = (0, configs_1.getChainConfig)(chainId);
-    const network = chainlink_networks_config_1.default[chainId];
-    if (!chain) {
+async function request(chainId, signer) {
+    const chainConfig = (0, configs_1.getChainConfig)(chainId);
+    const networkConfig = chainlink_networks_config_1.default[chainId];
+    if (!chainConfig) {
         throw new Error(`Chain configuration not found for chainId: ${chainId}`);
     }
     const sourceFetch = await fetch(config_1.default.sourceURL);
@@ -28,12 +32,12 @@ async function request(chainId, signerV5) {
     console.log("Reading source from URL: ", config_1.default.sourceURL);
     // Simulate the request first
     {
-        const { responseBytesHexstring, errorString } = await (0, functions_toolkit_1.simulateScript)({
+        const { responseBytesHexstring, errorString } = await simulateScript({
             ...config_1.default,
             source,
         });
         if (responseBytesHexstring) {
-            console.log(`\nResponse returned by script during local simulation: ${(0, functions_toolkit_1.decodeResult)(responseBytesHexstring, config_1.default.expectedReturnType).toString()}\n`);
+            console.log(`\nResponse returned by script during local simulation: ${decodeResult(responseBytesHexstring, config_1.default.expectedReturnType).toString()}\n`);
         }
         if (errorString) {
             console.log(`\nError returned by simulated script:\n${errorString}\n`);
@@ -41,7 +45,7 @@ async function request(chainId, signerV5) {
         console.log("Local simulation of source code completed...");
     }
     // Get the RPC endpoint from the chain config and derive a v5 provider
-    const rpcUrl = chain.rpcs?.[0] ?? chain.rpc ?? undefined;
+    const rpcUrl = chainConfig.rpcs?.[0] ?? chainConfig.rpc ?? undefined;
     if (!rpcUrl)
         throw new Error("No RPC URL found in chain configuration");
     const contractAddress = (0, getContractAddress_1.default)(chainId, "raacprimerateoracle");
@@ -49,42 +53,29 @@ async function request(chainId, signerV5) {
     const subscriptionId = subscriptionIds[chainId];
     const slotId = 0;
     const callbackGasLimit = 300_000;
-    const consumerContract = new ethers5_1.ethers.Contract(contractAddress, contractAbi, signerV5);
-    const linkTokenAddress = network.linkToken;
-    const functionsRouterAddress = network.functionsRouter;
-    const subscriptionManager = new functions_toolkit_1.SubscriptionManager({
-        // Use the v5 signer here (toolkit expects ethers v5 types)
-        signer: signerV5,
-        linkTokenAddress,
-        functionsRouterAddress,
-    });
-    await subscriptionManager.initialize();
-    const donId = network.donId;
-    const secretsManager = new functions_toolkit_1.SecretsManager({
-        // ethers v5 signer again
-        signer: signerV5,
-        functionsRouterAddress,
-        donId,
-    });
-    await secretsManager.initialize();
+    const consumerContract = new ethers_1.ethers.Contract(contractAddress, contractAbi, signer);
+    // const linkTokenAddress = network.linkToken;
+    const functionsRouterAddress = networkConfig.functionsRouter;
+    const { chain, network } = decomposeFromChainId(chainId);
+    const subscriptionManager = new ChainlinkFunctionConnector(signer, { chain, network });
+    const secretsManager = new ChainlinkSecretsConnector(signer, { chain, network });
     const subInfo = await subscriptionManager.getSubscriptionInfo(subscriptionId);
     if (!subInfo.consumers
         .map((c) => c.toLowerCase())
         .includes(contractAddress.toLowerCase())) {
         throw Error(`Consumer contract ${contractAddress} has not been added to subscription ${subscriptionId}`);
     }
-    // Use the v5 provider for gas data (to avoid type mismatches)
-    const { gasPrice } = await signerV5.provider.getFeeData();
+    const { gasPrice } = await signer.provider.getFeeData();
     // @ts-ignore
-    const gasPriceWei = BigInt(Math.ceil(ethers5_1.ethers.utils.formatUnits(gasPrice, "wei").toString()));
+    const gasPriceWei = BigInt(Math.ceil(ethers_1.ethers.formatUnits(gasPrice, "wei").toString()));
     const estimatedCostJuels = await subscriptionManager.estimateFunctionsRequestCost({
-        donId,
+        donId: subscriptionManager.donId,
         subscriptionId,
         callbackGasLimit,
         gasPriceWei,
     });
-    const estimatedCostLink = ethers5_1.ethers.utils.formatUnits(estimatedCostJuels.toString(), 18);
-    const subBalanceLink = ethers5_1.ethers.utils.formatUnits(subInfo.balance.toString(), 18);
+    const estimatedCostLink = ethers_1.ethers.formatUnits(estimatedCostJuels.toString(), 18);
+    const subBalanceLink = ethers_1.ethers.parseUnits(subInfo.balance.toString(), 18);
     if (subInfo.balance <= estimatedCostJuels) {
         throw Error(`Subscription ${subscriptionId} does not have sufficient funds. The estimated cost is ${estimatedCostLink} LINK, but the subscription only has ${subBalanceLink} LINK.`);
     }
@@ -100,11 +91,11 @@ async function request(chainId, signerV5) {
         slotId,
         version,
     });
-    const responseListener = new functions_toolkit_1.ResponseListener({
-        provider: signerV5.provider,
+    const responseListener = new ResponseListener({
+        provider: signer.provider,
         functionsRouterAddress,
     });
-    console.log(`Waiting for transaction for RAACPrimeRateOracle contract ${contractAddress} on network ${network.name} to be confirmed...`);
+    console.log(`Waiting for transaction for RAACPrimeRateOracle contract ${contractAddress} on network ${networkConfig.name} to be confirmed...`);
     const overrides = {
         gasLimit: 1_500_000,
     };
@@ -115,13 +106,13 @@ async function request(chainId, signerV5) {
     try {
         // localFunctionsTestnet needs 0 or 1 confirmations to work correctly as it's local.
         // If on live testnet or mainnet, setting to undefined then uses the functions-toolkit default of 2 confirmations.
-        const NUM_CONFIRMATIONS = network.confirmations;
+        const NUM_CONFIRMATIONS = networkConfig.confirmations;
         // Get response data
         const { requestId, totalCostInJuels, responseBytesHexstring, errorString, fulfillmentCode, } = await responseListener.listenForResponseFromTransaction(requestTx.hash, undefined, NUM_CONFIRMATIONS, undefined);
         switch (fulfillmentCode) {
-            case functions_toolkit_1.FulfillmentCode.FULFILLED:
+            case FulfillmentCode.FULFILLED:
                 if (responseBytesHexstring !== "0x") {
-                    console.log(`Request ${requestId} fulfilled!\nResponse has been sent to consumer contract: ${(0, functions_toolkit_1.decodeResult)(responseBytesHexstring, config_1.default.expectedReturnType).toString()}\n`);
+                    console.log(`Request ${requestId} fulfilled!\nResponse has been sent to consumer contract: ${decodeResult(responseBytesHexstring, config_1.default.expectedReturnType).toString()}\n`);
                 }
                 else if (errorString.length > 0) {
                     console.error(`Request ${requestId} fulfilled with error: ${errorString}\n`);
@@ -129,13 +120,13 @@ async function request(chainId, signerV5) {
                 else {
                     console.warn(`Request ${requestId} fulfilled with empty response data.\n`);
                 }
-                const linkCost = ethers5_1.ethers.utils.formatUnits(totalCostInJuels.toString(), 18);
+                const linkCost = ethers_1.ethers.formatUnits(totalCostInJuels.toString(), 18);
                 console.log(`Total request cost: ${linkCost + " LINK"}`);
                 break;
-            case functions_toolkit_1.FulfillmentCode.USER_CALLBACK_ERROR:
+            case FulfillmentCode.USER_CALLBACK_ERROR:
                 console.error("Error encountered when calling consumer contract callback.\nEnsure the fulfillRequest function in RAACPrimeRateOracle is correct and the --callbackgaslimit is sufficient.");
                 break;
-            case functions_toolkit_1.FulfillmentCode.COST_EXCEEDS_COMMITMENT:
+            case FulfillmentCode.COST_EXCEEDS_COMMITMENT:
                 console.error(`Request ${requestId} failed due to a gas price spike when attempting to respond.`);
                 break;
             default:

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

@@ -4,19 +4,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.simulate = simulate;
-const functions_toolkit_1 = require("@chainlink/functions-toolkit");
+const chainlinkjs_1 = require("@raac/chainlinkjs");
+const { simulateScript, decodeResult } = chainlinkjs_1.utils;
 const config_1 = __importDefault(require("./config"));
 async function simulate() {
     // Simulate the request first
     const sourceFetch = await fetch(config_1.default.sourceURL);
     const source = await sourceFetch.text();
     console.log("Reading source from URL: ", config_1.default.sourceURL);
-    const { responseBytesHexstring, errorString } = await (0, functions_toolkit_1.simulateScript)({
+    const { responseBytesHexstring, errorString } = await simulateScript({
         ...config_1.default,
         source,
     });
     if (responseBytesHexstring) {
-        console.log(`\nResponse returned by script during local simulation: ${(0, functions_toolkit_1.decodeResult)(responseBytesHexstring, config_1.default.expectedReturnType).toString()}\n`);
+        console.log(`\nResponse returned by script during local simulation: ${decodeResult(responseBytesHexstring, config_1.default.expectedReturnType).toString()}\n`);
     }
     if (errorString) {
         console.log(`\nError returned by simulated script:\n${errorString}\n`);

package/dist/pools/rwaVault/getRWAVaultInfo.js

@@ -4,10 +4,11 @@ const _helpers_1 = require("./_helpers");
 async function getRWAVaultInfo(chainId, provider) {
     try {
         const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, provider);
-        const [totalAssets, pricePerShare, vaultToken, stabilityPool, vrfConsumer, indexTokenMintingFee, feeCollector, vrfRequestDelay, allowVRFRequest,] = await Promise.all([
+        const [totalAssets, pricePerShare, vaultToken, underlyingAssetToken, stabilityPool, vrfConsumer, indexTokenMintingFee, feeCollector, vrfRequestDelay, allowVRFRequest,] = await Promise.all([
             rwaVaultContract.totalAssets(),
             rwaVaultContract.pricePerShare(),
             rwaVaultContract.vaultToken(),
+            rwaVaultContract.underlyingAssetToken(),
             rwaVaultContract.stabilityPool(),
             rwaVaultContract.vrfConsumer(),
             rwaVaultContract.indexTokenMintingFee(),
@@ -19,6 +20,7 @@ async function getRWAVaultInfo(chainId, provider) {
             totalAssets: totalAssets.toString(),
             pricePerShare: pricePerShare.toString(),
             vaultToken,
+            underlyingAssetToken,
             stabilityPool,
             vrfConsumer,
             indexTokenMintingFee: indexTokenMintingFee.toString(),

package/dist/scripts/index.js

@@ -10,8 +10,7 @@ const RPCLibrary_1 = __importDefault(require("../RPCLibrary"));
 const contracts_1 = require("../utils/contracts");
 const artifacts_1 = require("../utils/artifacts");
 const _helpers_1 = require("../pools/rwaVault/_helpers");
-const ethers5_1 = require("ethers5");
-const chainId = 11155111;
+const chainId = 8453;
 const config = chains_1.default[chainId];
 const TEST_MNEMONIC = process.env.TEST_MNEMONIC;
 const TEST_PRIVATE_KEY = process.env.TEST_PRIVATE_KEY;
@@ -61,8 +60,8 @@ async function setup() {
     const StabilityPoolAddress = (0, contracts_1.getContractAddress)(chainId, "stabilitypool");
     const StabilityPoolABI = (0, artifacts_1.getABI)("stabilitypool");
     const StabilityPoolContract = new ethers_1.ethers.Contract(StabilityPoolAddress, StabilityPoolABI, signer);
-    const providerV5 = new ethers5_1.ethers.providers.JsonRpcProvider(config.rpcs[0]);
-    const signerV5 = new ethers5_1.ethers.Wallet(TEST_PRIVATE_KEY, providerV5);
+    // const provider = new ethers.JsonRpcProvider(config.rpcs[0]);
+    const signerPrivateKey = new ethers_1.ethers.Wallet(TEST_PRIVATE_KEY, provider);
     const TreasuryAddress = (0, contracts_1.getContractAddress)(chainId, "treasury");
     const TreasuryABI = (0, artifacts_1.getABI)("treasury");
     const TreasuryContract = new ethers_1.ethers.Contract(TreasuryAddress, TreasuryABI, signer);
@@ -140,12 +139,6 @@ async function setup() {
     // console.log(tx);
     // let tx = await StabilityPoolContract.setLiquidationVaultTokenSplit(2_50, 2_50, 90_00, 5_00)
     // await tx.wait();
-    // console.log(await raacNFTContract.hasRole(await raacNFTContract.ADMIN_ROLE(), signer.address))
-    console.log(await housePriceContract.oracle());
-    // await (await housePriceContract.setOracle(signer.address)).wait();
-    // return;
-    await (await housePriceContract.setHousePrice("8", ethers_1.ethers.parseEther("63500"))).wait();
-    return;
     await (await RWAVaultContract.registerDepositableAdapter("0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44")).wait();
     // // console.log(await rpc.wallet.assets.getBalance(chainId, "rwaindextoken", signer.address, provider))
     // // set the base uri to instruxi data gateway

package/dist/scripts/liquidation.js

@@ -9,7 +9,7 @@ const chains_1 = __importDefault(require("../configs/chains"));
 const RPCLibrary_1 = __importDefault(require("../RPCLibrary"));
 const contracts_1 = require("../utils/contracts");
 const artifacts_1 = require("../utils/artifacts");
-const chainId = 11155111;
+const chainId = 8453;
 const config = chains_1.default[chainId];
 const TEST_MNEMONIC = process.env.TEST_MNEMONIC;
 const TEST_PRIVATE_KEY = process.env.TEST_PRIVATE_KEY;
@@ -53,43 +53,27 @@ async function setupLiquidityPool() {
     rpc.address = signer.address;
     rpc.provider = provider;
     rpc.chainId = chainId;
-    const MockLiquidityPoolAddress = "0x0cAa0daa4f5EC8934428Ae406965B044f42F7D49";
+    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 200 million in crvusd
+    // mint 10 million in crvusd
     console.log("Minting 100 million in crvusd");
-    await rpc.wallet.assets.mintAsset(chainId, "crvusd", 9800000n, signer.address, signer);
-    // deposit 100 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
-    // );
-    // const d1 = new ethers.AbiCoder().encode(
-    // 	["uint256"],
-    // 	[ethers.parseEther("5000000")]
-    // );
-    // await rpc.pools.rwaVault.depositToRWAVault(
-    // 	chainId,
-    // 	"crvusdadapter",
-    // 	d1,
-    // 	signer.address,
-    // 	"0",
-    // 	signer
-    // );
-    // deposit 100 million in the Mock Liquidity Pool
+    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);
+    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
     console.log("Depositing 5 million in the Mock Liquidity Pool");
-    await rpc.wallet.assets.approveAsset(chainId, "crvusd", MockLiquidityPoolAddress, "9800000", signer);
+    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("9800000"),
+        ethers_1.ethers.parseEther("100000000"),
         ethers_1.ethers.parseEther(indextokenBalance.toString()),
     ], 0, signer.address)).wait();
     return;

package/dist/types/oracles/encryptSecretURLs.d.ts

@@ -1,5 +1,5 @@
-import { Signer } from "ethers5";
-export declare function encryptSecretURLs(chainId: number, urls: string[], signerV5: Signer): Promise<{
-    encryptedSecrets: string;
-    isVerified: true;
+import { Signer } from 'ethers';
+export declare function encryptSecretURLs(chainId: number, urls: string[], signer: Signer): Promise<{
+    encryptedSecrets: any;
+    isVerified: any;
 }>;

package/dist/types/oracles/encryptSecrets.d.ts

@@ -1,4 +1,2 @@
-import { Signer } from "ethers5";
-export declare function encryptSecrets(chainId: number, secrets: Record<string, string>, outputFile: string, signerV5: Signer): Promise<{
-    encryptedSecrets: string;
-}>;
+import { Signer } from "ethers";
+export declare function encryptSecrets(chainId: number, secrets: Record<string, string>, outputFile: string, signer: Signer): Promise<any>;