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

package/dist/configs/chains/11155111.json

@@ -17,7 +17,7 @@
         "raachouseprices": {
             "id": "raachouseprices",
             "name": "RAAC House Prices",
-            "contract": "0x96EBC781867cF33F0Fac64e44388CBF065c78e92"
+            "contract": "0xF122d4Dcc791c6735d937E7118087A505c81b2b3"
         },
         "auctionfactory": {
             "id": "auctionfactory",
@@ -37,12 +37,12 @@
         "feecollector": {
             "id": "feecollector",
             "name": "Fee Collector",
-            "contract": "0xf460b2436753AEed5Df275CA33528f5C9abB579D"
+            "contract": "0x297d74333c285d5F39820c268C9e9AAb788e3625"
         },
         "treasury": {
             "id": "treasury",
             "name": "Treasury",
-            "contract": "0xDc1FCd959881533CCFBfB572881CdC6d8a2b35E7"
+            "contract": "0xF361850f103611D0ce869f369Fa62811B4BAa68B"
         },
         "repairfund": {
             "id": "repairfund",
@@ -57,17 +57,17 @@
         "rwavault": {
             "id": "rwavault",
             "name": "RWA Vault",
-            "contract": "0xEC9e67e9b6ceD5e48b5Dd39915414e7BbDf952f2"
+            "contract": "0x7D819769ADDbBcc7D482E7e8FcC2812De0929875"
         },
         "complianceregistry": {
             "id": "complianceregistry",
             "name": "Compliance Registry",
-            "contract": "0x95bc6FCfB69BDbF723De06bCa1a689ad68762CC5"
+            "contract": "0x74E2aEcC41F096Dca69368A7D10604142C44CfF0"
         },
         "rwaindextokencollector": {
             "id": "rwaindextokencollector",
             "name": "RWA Index Token Collector",
-            "contract": "0xdbEd45218e5c040Cdf696C740937997162cFb720"
+            "contract": "0xc4999Db2fd4A58d870F9c8D18fBe4177308e2481"
         },
         "raactokencollector": {
             "id": "raactokencollector",
@@ -77,41 +77,36 @@
         "raachousepriceoracle": {
             "id": "raachousepriceoracle",
             "name": "RAAC House Price Oracle",
-            "contract": "0x8C881051D397014E6D4ea711764E6875506d88D1"
+            "contract": "0x6e15A7037cB6EEA74F8a5fCD20EBaa77e331093D"
         },
         "raacprimerateoracle": {
             "id": "raacprimerateoracle",
             "name": "RAAC Prime Rate Oracle",
-            "contract": "0x312F47A51F398C6504B31794dfCf604acF174c67"
+            "contract": "0x158c6c40DF3E7f9B1AdA92Ab7D4B8b437749BF6b"
         },
         "crvusdtousdoracle": {
             "id": "crvusdtousdoracle",
             "name": "CRVUSD to USD Oracle",
-            "contract": "0x627897baf46851500F116cec76346921C3292246"
-        },
-        "nftroyaltyfeecollector": {
-            "id": "nftroyaltyfeecollector",
-            "name": "NFT Royalty Fee Collector",
-            "contract": "0x352b225A9f96ad9d90A1e8db4f1908943729b511"
+            "contract": "0x8A2E4B94ebf21A4b9CAF52958B2B8b6099CE46cA"
         }
     },
     "pools": {
         "stabilitypool": {
             "id": "stabilitypool",
             "name": "Stability Pool",
-            "contract": "0xd7663c079445A070Ef24405CD5ef1511B9d9E060"
+            "contract": "0xF88967cbdEf88063b4c4d0F4F5E93b429C39689A"
         },
         "lendingpool": {
             "id": "lendingpool",
             "name": "Lending Pool",
-            "contract": "0xefCff23AEed94ae0f23377DFDaB78C3c868eeB33"
+            "contract": "0x90d4e68C41333053248784e570C998EC915d5161"
         }
     },
     "nfts": {
         "raacnft": {
             "id": "raacnft",
             "name": "RAAC NFT",
-            "contract": "0xb16453caAFF3c75e9D090793dD60C46668c1de52"
+            "contract": "0xbac60A20C0B932b65E18F636C94e9f4b41F3A426"
         }
     },
     "assets": {
@@ -125,19 +120,19 @@
             "id": "crvusd",
             "name": "CRVUSD",
             "decimals": 18,
-            "contract": "0x8047a14301583CAaf9e2128D5F88F9f435659d35"
+            "contract": "0xfbA5b62A1a9d7Bd2bE46ca861DBfd49702E82f19"
         },
         "rtoken": {
             "id": "rtoken",
             "name": "RToken",
             "decimals": 18,
-            "contract": "0xc96c34825aa96A77A4AD884e393960a70c5f1186"
+            "contract": "0xeb957D30f3F3c3534D3Dcd0828C7747602803B7A"
         },
         "detoken": {
             "id": "detoken",
             "name": "DEToken",
             "decimals": 18,
-            "contract": "0x5841dc06d2C9e0D2605392f669be71Bfe6d04cf7"
+            "contract": "0x229495b726Bdc55917DBE89674306D3F3Daa5aE5"
         },
         "raactoken": {
             "id": "raactoken",
@@ -155,13 +150,13 @@
             "id": "debttoken",
             "name": "Debt Token",
             "decimals": 18,
-            "contract": "0x98db917a623a92a8553Fe59b9f05B8c936aa1E1e"
+            "contract": "0xd4bE0b77c07C58fc5cAea5629587f54572090F88"
         },
         "rwaindextoken": {
             "id": "rwaindextoken",
             "name": "RWA Index Token",
             "decimals": 18,
-            "contract": "0x1c1789629B2511821aC78618eBd23d41E7b04989"
+            "contract": "0xa96a1578dCBd8bca443142567C19d61DF1513937"
         }
     },
     "adapters": {
@@ -169,13 +164,13 @@
             "raacnftadapter": {
                 "id": "raacnftadapter",
                 "name": "RAAC NFT Adapter",
-                "contract": "0x608aD2608DAdDb633ceBe22d6Fcb7C9e660FfA65",
+                "contract": "0xd8Cb90b0A5b288F5f0c9a519Ae4B1B47D5E69353",
                 "type": "ERC721"
             },
             "rwaindextokenadapter": {
                 "id": "rwaindextokenadapter",
                 "name": "RWA Index Token",
-                "contract": "0x5374287a807c5513fC31bc9AECE5aC40f0e37c71",
+                "contract": "0x216433c8408A349B4b7342d60F948d89317E3366",
                 "type": "ERC20"
             }
         },
@@ -183,7 +178,7 @@
             "raacnftadapter": {
                 "id": "raacnftadapter",
                 "name": "RAAC NFT Adapter",
-                "contract": "0x531F5d54Fda86f103E297ECE796c8B799B835E0c",
+                "contract": "0x5b10F4F746f10632e4Bb832A2e93bd5543830D7d",
                 "type": "ERC721"
             },
             "crvusdadapter": {

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`);