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

package/dist/types/oracles/houses/config.d.ts

@@ -1,13 +1,12 @@
-import { Location, ReturnType, CodeLanguage } from "@chainlink/functions-toolkit";
 declare const requestConfig: {
     source: string;
-    codeLocation: Location;
+    codeLocation: any;
     secrets: {
         apiKey: string;
     };
-    secretsLocation: Location;
+    secretsLocation: any;
     args: any[];
-    codeLanguage: CodeLanguage;
-    expectedReturnType: ReturnType;
+    codeLanguage: any;
+    expectedReturnType: any;
 };
 export default requestConfig;

package/dist/types/oracles/houses/request.d.ts

@@ -1,5 +1,3 @@
-import { Signer } from "ethers5";
-export declare function generateSecretReference(chainId: number, secrets: Record<string, string>, signerV5: Signer): Promise<{
-    encryptedSecrets: string;
-}>;
-export declare function request(chainId: number, houseId: string, signerV5: Signer): Promise<void>;
+import { Signer } from "ethers";
+export declare function generateSecretReference(chainId: number, secrets: Record<string, string>, signer: Signer): Promise<any>;
+export declare function request(chainId: number, houseId: string, signer: Signer): Promise<void>;

package/dist/types/oracles/prime-rate/config.d.ts

@@ -1,14 +1,13 @@
-import { Location, ReturnType, CodeLanguage } from "@chainlink/functions-toolkit";
 declare const requestConfig: {
     name: string;
     sourceURL: string;
-    codeLocation: Location;
+    codeLocation: any;
     secrets: {
         apiKey: string;
     };
-    secretsLocation: Location;
+    secretsLocation: any;
     args: any[];
-    codeLanguage: CodeLanguage;
-    expectedReturnType: ReturnType;
+    codeLanguage: any;
+    expectedReturnType: any;
 };
 export default requestConfig;

package/dist/types/oracles/prime-rate/request.d.ts

@@ -1,2 +1,2 @@
-import { Signer } from "ethers5";
-export declare function request(chainId: number, signerV5: Signer): Promise<void>;
+import { Signer } from "ethers";
+export declare function request(chainId: number, signer: Signer): Promise<void>;

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

@@ -4,6 +4,7 @@ interface RWAVaultInfo {
     totalAssets: string;
     pricePerShare: string;
     vaultToken: string;
+    underlyingAssetToken: string;
     stabilityPool: string;
     vrfConsumer: string;
     indexTokenMintingFee: string;

package/dist/types/utils/artifacts.d.ts

@@ -1775,63 +1775,6 @@ declare const ABIS: {
         type: string;
         anonymous?: undefined;
     })[];
-    nftroyaltyfeecollector: ({
-        inputs: {
-            internalType: string;
-            name: string;
-            type: string;
-        }[];
-        stateMutability: string;
-        type: string;
-        name?: undefined;
-        anonymous?: undefined;
-        outputs?: undefined;
-    } | {
-        inputs: {
-            internalType: string;
-            name: string;
-            type: string;
-        }[];
-        name: string;
-        type: string;
-        stateMutability?: undefined;
-        anonymous?: undefined;
-        outputs?: undefined;
-    } | {
-        anonymous: boolean;
-        inputs: {
-            indexed: boolean;
-            internalType: string;
-            name: string;
-            type: string;
-        }[];
-        name: string;
-        type: string;
-        stateMutability?: undefined;
-        outputs?: undefined;
-    } | {
-        inputs: {
-            internalType: string;
-            name: string;
-            type: string;
-        }[];
-        name: string;
-        outputs: {
-            internalType: string;
-            name: string;
-            type: string;
-        }[];
-        stateMutability: string;
-        type: string;
-        anonymous?: undefined;
-    } | {
-        stateMutability: string;
-        type: string;
-        inputs?: undefined;
-        name?: undefined;
-        anonymous?: undefined;
-        outputs?: undefined;
-    })[];
 };
 export type AssetType = keyof typeof ABIS | string;
 export type ContractType = keyof typeof ABIS;
@@ -3531,61 +3474,5 @@ declare const getABI: (name: keyof typeof ABIS) => ({
     stateMutability: string;
     type: string;
     anonymous?: undefined;
-})[] | ({
-    inputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    stateMutability: string;
-    type: string;
-    name?: undefined;
-    anonymous?: undefined;
-    outputs?: undefined;
-} | {
-    inputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    type: string;
-    stateMutability?: undefined;
-    anonymous?: undefined;
-    outputs?: undefined;
-} | {
-    anonymous: boolean;
-    inputs: {
-        indexed: boolean;
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    type: string;
-    stateMutability?: undefined;
-    outputs?: undefined;
-} | {
-    inputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    outputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    stateMutability: string;
-    type: string;
-    anonymous?: undefined;
-} | {
-    stateMutability: string;
-    type: string;
-    inputs?: undefined;
-    name?: undefined;
-    anonymous?: undefined;
-    outputs?: undefined;
 })[];
 export { getABI, ABIS };

package/dist/utils/artifacts.js

@@ -35,7 +35,6 @@ const Treasury_json_1 = __importDefault(require("../artifacts/core/collectors/Tr
 const RWAIndexTokenCollector_json_1 = __importDefault(require("../artifacts/core/collectors/RWAIndexTokenCollector.sol/RWAIndexTokenCollector.json"));
 const RAACTokenCollector_json_1 = __importDefault(require("../artifacts/core/collectors/RAACTokenCollector.sol/RAACTokenCollector.json"));
 const CrvUSDToUSDOracle_json_1 = __importDefault(require("../artifacts/core/oracles/CrvUSDToUSDOracle.sol/CrvUSDToUSDOracle.json"));
-const NFTRoyaltyFeeCollector_json_1 = __importDefault(require("../artifacts/core/collectors/NFTRoyaltyFeeCollector.sol/NFTRoyaltyFeeCollector.json"));
 const CRVUSD_ABI = crvUSDToken_json_1.default.abi;
 const RToken_json_2 = __importDefault(require("../artifacts/core/tokens/RToken.sol/RToken.json")); // assert { type: "json" }; // TODO: Isnt this same as rcrvusd?
 const RTOKEN_ABI = RToken_json_2.default.abi;
@@ -96,7 +95,6 @@ const ABIS = {
     rwaindextokencollector: RWAIndexTokenCollector_json_1.default.abi,
     raactokencollector: RAACTokenCollector_json_1.default.abi,
     crvusdtousdoracle: CRVUSDTOUSDORACLE_ABI,
-    nftroyaltyfeecollector: NFTRoyaltyFeeCollector_json_1.default.abi
 };
 exports.ABIS = ABIS;
 const getABI = (name) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@raac/rpc",
-	"version": "1.1.0-beta.83",
+	"version": "1.1.0-beta.85",
 	"description": "RPC Library for RAAC ",
 	"main": "dist/index.js",
 	"types": "dist/types/index.d.ts",
@@ -26,15 +26,14 @@
 	"author": "RAAC",
 	"license": "MIT",
 	"dependencies": {
-		"@chainlink/functions-toolkit": "^0.3.2",
-		"csv-parser": "^3.2.0",
-		"ethers": "^6.0.0",
-		"ethers5": "npm:ethers@5.7.2"
+		"@raac/chainlinkjs": "1.0.1",
+		"csv-parser": "3.2.0",
+		"ethers": "6.16.0"
 	},
 	"devDependencies": {
-		"eslint": "^8.0.0",
-		"ts-node": "^10.9.2",
-		"ts-node-dev": "^2.0.0",
-		"typescript": "^5.7.3"
+		"eslint": "9.39.2",
+		"ts-node": "10.9.2",
+		"ts-node-dev": "2.0.0",
+		"typescript": "5.9.3"
 	}
 }

package/dist/artifacts/core/collectors/NFTRoyaltyFeeCollector.sol/NFTRoyaltyFeeCollector.json

@@ -1,246 +0,0 @@
-{
-    "_format": "hh-sol-artifact-1",
-    "contractName": "NFTRoyaltyFeeCollector",
-    "sourceName": "contracts/core/collectors/NFTRoyaltyFeeCollector.sol",
-    "abi": [
-        {
-            "inputs": [
-                {
-                    "internalType": "address",
-                    "name": "_weth",
-                    "type": "address"
-                },
-                {
-                    "internalType": "address",
-                    "name": "_feeCollector",
-                    "type": "address"
-                }
-            ],
-            "stateMutability": "nonpayable",
-            "type": "constructor"
-        },
-        {
-            "inputs": [],
-            "name": "InvalidAddress",
-            "type": "error"
-        },
-        {
-            "inputs": [
-                {
-                    "internalType": "address",
-                    "name": "owner",
-                    "type": "address"
-                }
-            ],
-            "name": "OwnableInvalidOwner",
-            "type": "error"
-        },
-        {
-            "inputs": [
-                {
-                    "internalType": "address",
-                    "name": "account",
-                    "type": "address"
-                }
-            ],
-            "name": "OwnableUnauthorizedAccount",
-            "type": "error"
-        },
-        {
-            "inputs": [],
-            "name": "ReentrancyGuardReentrantCall",
-            "type": "error"
-        },
-        {
-            "inputs": [
-                {
-                    "internalType": "address",
-                    "name": "token",
-                    "type": "address"
-                }
-            ],
-            "name": "SafeERC20FailedOperation",
-            "type": "error"
-        },
-        {
-            "anonymous": false,
-            "inputs": [
-                {
-                    "indexed": true,
-                    "internalType": "address",
-                    "name": "token",
-                    "type": "address"
-                },
-                {
-                    "indexed": true,
-                    "internalType": "address",
-                    "name": "to",
-                    "type": "address"
-                },
-                {
-                    "indexed": false,
-                    "internalType": "uint256",
-                    "name": "amount",
-                    "type": "uint256"
-                }
-            ],
-            "name": "EmergencyWithdrawal",
-            "type": "event"
-        },
-        {
-            "anonymous": false,
-            "inputs": [
-                {
-                    "indexed": true,
-                    "internalType": "address",
-                    "name": "token",
-                    "type": "address"
-                },
-                {
-                    "indexed": false,
-                    "internalType": "uint256",
-                    "name": "amount",
-                    "type": "uint256"
-                }
-            ],
-            "name": "FeeCollected",
-            "type": "event"
-        },
-        {
-            "anonymous": false,
-            "inputs": [
-                {
-                    "indexed": true,
-                    "internalType": "address",
-                    "name": "previousOwner",
-                    "type": "address"
-                },
-                {
-                    "indexed": true,
-                    "internalType": "address",
-                    "name": "newOwner",
-                    "type": "address"
-                }
-            ],
-            "name": "OwnershipTransferred",
-            "type": "event"
-        },
-        {
-            "inputs": [
-                {
-                    "internalType": "address",
-                    "name": "_token",
-                    "type": "address"
-                }
-            ],
-            "name": "distributeCollectedFees",
-            "outputs": [
-                {
-                    "internalType": "bool",
-                    "name": "",
-                    "type": "bool"
-                }
-            ],
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "inputs": [
-                {
-                    "internalType": "address",
-                    "name": "_token",
-                    "type": "address"
-                },
-                {
-                    "internalType": "address",
-                    "name": "recipient",
-                    "type": "address"
-                }
-            ],
-            "name": "emergencyWithdraw",
-            "outputs": [],
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "inputs": [],
-            "name": "feeCollector",
-            "outputs": [
-                {
-                    "internalType": "address",
-                    "name": "",
-                    "type": "address"
-                }
-            ],
-            "stateMutability": "view",
-            "type": "function"
-        },
-        {
-            "inputs": [],
-            "name": "owner",
-            "outputs": [
-                {
-                    "internalType": "address",
-                    "name": "",
-                    "type": "address"
-                }
-            ],
-            "stateMutability": "view",
-            "type": "function"
-        },
-        {
-            "inputs": [],
-            "name": "renounceOwnership",
-            "outputs": [],
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "inputs": [
-                {
-                    "internalType": "address",
-                    "name": "_feeCollector",
-                    "type": "address"
-                }
-            ],
-            "name": "setFeeCollector",
-            "outputs": [],
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "inputs": [
-                {
-                    "internalType": "address",
-                    "name": "newOwner",
-                    "type": "address"
-                }
-            ],
-            "name": "transferOwnership",
-            "outputs": [],
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "inputs": [],
-            "name": "weth",
-            "outputs": [
-                {
-                    "internalType": "address",
-                    "name": "",
-                    "type": "address"
-                }
-            ],
-            "stateMutability": "view",
-            "type": "function"
-        },
-        {
-            "stateMutability": "payable",
-            "type": "receive"
-        }
-    ],
-    "bytecode": "0x60803461012757601f610a3038819003918201601f19168301916001600160401b0383118484101761012c57808492604094855283398101031261012757610052602061004b83610142565b9201610142565b33156101115760008054336001600160a01b0319821681178355604051949290916001600160a01b0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09080a3600180556001600160a01b031680158015610100575b6100ef5760018060a01b0319600254161760025560018060a01b031660018060a01b031960035416176003556108d990816101578239f35b63e6c4247b60e01b60005260046000fd5b506001600160a01b038216156100b7565b631e4fbdf760e01b600052600060045260246000fd5b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b03821682036101275756fe6080604052600436101561001b575b361561001957600080fd5b005b6000803560e01c80625c92bf1461040b5780633fc8cef3146103e25780636382d9ad146101e3578063715018a61461019b5780638da5cb5b14610174578063a42dce801461011d578063c415b95c146100f45763f2fde38b1461007e575061000e565b346100f15760203660031901126100f1576100976106d0565b61009f6107b3565b6001600160a01b031680156100dd5781546001600160a01b03198116821783556001600160a01b03166000805160206108648339815191528380a380f35b631e4fbdf760e01b82526004829052602482fd5b80fd5b50346100f157806003193601126100f1576003546040516001600160a01b039091168152602090f35b50346100f15760203660031901126100f1576101376106d0565b61013f6107b3565b6001600160a01b0316801561016557600380546001600160a01b03191691909117905580f35b63e6c4247b60e01b8252600482fd5b50346100f157806003193601126100f157546040516001600160a01b039091168152602090f35b50346100f157806003193601126100f1576101b46107b3565b80546001600160a01b03198116825581906001600160a01b03166000805160206108648339815191528280a380f35b50346100f15760403660031901126100f1576101fd6106d0565b6024356001600160a01b038116918282036103de5761021a6107b3565b610222610776565b6001600160a01b0316908161031157504761023e8115156106e6565b8380808084875af13d1561030c573d6001600160401b0381116102f85760405190610273601f8201601f19166020018361073d565b81528560203d92013e5b156102a3576020600080516020610884833981519152915b604051908152a36001805580f35b60405162461bcd60e51b815260206004820152602760248201527f4e4654526f79616c7479466565436f6c6c6563746f723a207472616e736665726044820152660819985a5b195960ca1b6064820152608490fd5b634e487b7160e01b86526041600452602486fd5b61027d565b6040516370a0823160e01b8152306004820152602081602481865afa9081156103d357859161038e575b5060008051602061088483398151915291610389826103836020949361037560405193849263a9059cbb60e01b8985015260248401610798565b03601f19810183528261073d565b856107dc565b610295565b90506020813d6020116103cb575b816103a96020938361073d565b810103126103c6575160008051602061088483398151915261033b565b600080fd5b3d915061039c565b6040513d87823e3d90fd5b8380fd5b50346100f157806003193601126100f1576002546040516001600160a01b039091168152602090f35b50346100f15760203660031901126100f1576104256106d0565b61042d610776565b6001600160a01b03811615610669575b6040516370a0823160e01b81523060048201526001600160a01b039190911691602082602481865afa91821561065c578192610628575b508161048a575b60018055602060405160018152f35b60018060a01b036003541660405160208381830163095ea7b360e01b81526104c8846104ba898860248401610798565b03601f19810186528561073d565b83519082895af183513d8261060c575b5050156105c7575b505080602060018060a01b0360035416608460405180948193636033e31560e01b83528960048401523060248401528860448401527f1f49de3380557c514cedfeafa4b0515d7e744b9e861dd34381fe6813d97079ca60648401525af180156105bc5761056b575b5050602060008051602061084483398151915291604051908152a238808061047b565b6020813d6020116105b4575b816105846020938361073d565b810103126105b057519081151582036100f1575060209050600080516020610844833981519152610548565b5080fd5b3d9150610577565b6040513d84823e3d90fd5b6105ff610605926040519063095ea7b360e01b60208301526024820152846044820152604481526105f960648261073d565b866107dc565b846107dc565b38806104e0565b9091506106205750843b15155b38806104d8565b600114610619565b9091506020813d602011610654575b816106446020938361073d565b810103126103c657519038610474565b3d9150610637565b50604051903d90823e3d90fd5b50476106768115156106e6565b60025482906001600160a01b0316803b156105b0578190600460405180958193630d0e30db60e41b83525af1801561065c576106c0575b50506002546001600160a01b031661043d565b6106c99161073d565b38816106ad565b600435906001600160a01b03821682036103c657565b156106ed57565b60405162461bcd60e51b815260206004820152602260248201527f4e4654526f79616c7479466565436f6c6c6563746f723a206e6f2062616c616e604482015261636560f01b6064820152608490fd5b601f909101601f19168101906001600160401b0382119082101761076057604052565b634e487b7160e01b600052604160045260246000fd5b600260015414610787576002600155565b633ee5aeb560e01b60005260046000fd5b6001600160a01b039091168152602081019190915260400190565b6000546001600160a01b031633036107c757565b63118cdaa760e01b6000523360045260246000fd5b906000602091828151910182855af115610837576000513d61082e57506001600160a01b0381163b155b61080d5750565b635274afe760e01b60009081526001600160a01b0391909116600452602490fd5b60011415610806565b6040513d6000823e3d90fdfe06c5efeff5c320943d265dc4e5f1af95ad523555ce0c1957e367dda5514572df8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09495d03190a79a43e534c9e328ff322f6283261383f5f19c809564f6ad5a57b3a26469706673582212201268317d978df24b8234926c146f092ab89370388fa47c489e618353b559773b64736f6c634300081e0033",
-    "deployedBytecode": "0x6080604052600436101561001b575b361561001957600080fd5b005b6000803560e01c80625c92bf1461040b5780633fc8cef3146103e25780636382d9ad146101e3578063715018a61461019b5780638da5cb5b14610174578063a42dce801461011d578063c415b95c146100f45763f2fde38b1461007e575061000e565b346100f15760203660031901126100f1576100976106d0565b61009f6107b3565b6001600160a01b031680156100dd5781546001600160a01b03198116821783556001600160a01b03166000805160206108648339815191528380a380f35b631e4fbdf760e01b82526004829052602482fd5b80fd5b50346100f157806003193601126100f1576003546040516001600160a01b039091168152602090f35b50346100f15760203660031901126100f1576101376106d0565b61013f6107b3565b6001600160a01b0316801561016557600380546001600160a01b03191691909117905580f35b63e6c4247b60e01b8252600482fd5b50346100f157806003193601126100f157546040516001600160a01b039091168152602090f35b50346100f157806003193601126100f1576101b46107b3565b80546001600160a01b03198116825581906001600160a01b03166000805160206108648339815191528280a380f35b50346100f15760403660031901126100f1576101fd6106d0565b6024356001600160a01b038116918282036103de5761021a6107b3565b610222610776565b6001600160a01b0316908161031157504761023e8115156106e6565b8380808084875af13d1561030c573d6001600160401b0381116102f85760405190610273601f8201601f19166020018361073d565b81528560203d92013e5b156102a3576020600080516020610884833981519152915b604051908152a36001805580f35b60405162461bcd60e51b815260206004820152602760248201527f4e4654526f79616c7479466565436f6c6c6563746f723a207472616e736665726044820152660819985a5b195960ca1b6064820152608490fd5b634e487b7160e01b86526041600452602486fd5b61027d565b6040516370a0823160e01b8152306004820152602081602481865afa9081156103d357859161038e575b5060008051602061088483398151915291610389826103836020949361037560405193849263a9059cbb60e01b8985015260248401610798565b03601f19810183528261073d565b856107dc565b610295565b90506020813d6020116103cb575b816103a96020938361073d565b810103126103c6575160008051602061088483398151915261033b565b600080fd5b3d915061039c565b6040513d87823e3d90fd5b8380fd5b50346100f157806003193601126100f1576002546040516001600160a01b039091168152602090f35b50346100f15760203660031901126100f1576104256106d0565b61042d610776565b6001600160a01b03811615610669575b6040516370a0823160e01b81523060048201526001600160a01b039190911691602082602481865afa91821561065c578192610628575b508161048a575b60018055602060405160018152f35b60018060a01b036003541660405160208381830163095ea7b360e01b81526104c8846104ba898860248401610798565b03601f19810186528561073d565b83519082895af183513d8261060c575b5050156105c7575b505080602060018060a01b0360035416608460405180948193636033e31560e01b83528960048401523060248401528860448401527f1f49de3380557c514cedfeafa4b0515d7e744b9e861dd34381fe6813d97079ca60648401525af180156105bc5761056b575b5050602060008051602061084483398151915291604051908152a238808061047b565b6020813d6020116105b4575b816105846020938361073d565b810103126105b057519081151582036100f1575060209050600080516020610844833981519152610548565b5080fd5b3d9150610577565b6040513d84823e3d90fd5b6105ff610605926040519063095ea7b360e01b60208301526024820152846044820152604481526105f960648261073d565b866107dc565b846107dc565b38806104e0565b9091506106205750843b15155b38806104d8565b600114610619565b9091506020813d602011610654575b816106446020938361073d565b810103126103c657519038610474565b3d9150610637565b50604051903d90823e3d90fd5b50476106768115156106e6565b60025482906001600160a01b0316803b156105b0578190600460405180958193630d0e30db60e41b83525af1801561065c576106c0575b50506002546001600160a01b031661043d565b6106c99161073d565b38816106ad565b600435906001600160a01b03821682036103c657565b156106ed57565b60405162461bcd60e51b815260206004820152602260248201527f4e4654526f79616c7479466565436f6c6c6563746f723a206e6f2062616c616e604482015261636560f01b6064820152608490fd5b601f909101601f19168101906001600160401b0382119082101761076057604052565b634e487b7160e01b600052604160045260246000fd5b600260015414610787576002600155565b633ee5aeb560e01b60005260046000fd5b6001600160a01b039091168152602081019190915260400190565b6000546001600160a01b031633036107c757565b63118cdaa760e01b6000523360045260246000fd5b906000602091828151910182855af115610837576000513d61082e57506001600160a01b0381163b155b61080d5750565b635274afe760e01b60009081526001600160a01b0391909116600452602490fd5b60011415610806565b6040513d6000823e3d90fdfe06c5efeff5c320943d265dc4e5f1af95ad523555ce0c1957e367dda5514572df8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09495d03190a79a43e534c9e328ff322f6283261383f5f19c809564f6ad5a57b3a26469706673582212201268317d978df24b8234926c146f092ab89370388fa47c489e618353b559773b64736f6c634300081e0033",
-    "linkReferences": {},
-    "deployedLinkReferences": {}
-}