-
Notifications
You must be signed in to change notification settings - Fork 41
add permissionless lending features #634
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
KevinMomanyi
wants to merge
14
commits into
NilFoundation:main
Choose a base branch
from
KevinMomanyi:lendingpoolfactory
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
d9aa3f4
add permissionless lending features
KevinMomanyi d27980a
GlobalLedger fuctions
KevinMomanyi f2e698e
add changes to the code
KevinMomanyi 95c6283
add changes to code
KevinMomanyi 26a6306
add missing functionalities to the code
KevinMomanyi d6900f6
add missing functionalities to the contracts
KevinMomanyi 323c89e
chore: switch to pnpm and update dependencies
KevinMomanyi 09f87d3
chore: remove package-lock.json after switching to pnpm
KevinMomanyi b7bf558
Added asyncDeploy with asyncCall and role-based access in GlobalLedger
KevinMomanyi 995a7c0
Initial commit: Lending protocol with asyncDeploy and niljs integration
KevinMomanyi 4c847d2
Updated LendingPoolFactory to use Nil.asyncCall for cross-shard inter…
KevinMomanyi 52a13ab
Add INilAsync.sol, modify LendingPoolFactory.sol, and update deploy a…
KevinMomanyi 996a70f
Refactor deployLendingPool.ts with type safety, event decoding, and t…
KevinMomanyi e1973e0
Fix: Remove asyncCall return check in LendingPoolFactory
KevinMomanyi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| // SPDX-License-Identifier: UNLICENSED | ||
| pragma solidity ^0.8.28; | ||
|
|
||
| import "@nilfoundation/smart-contracts/contracts/Nil.sol"; | ||
| import "./LendingPool.sol"; // Import LendingPool contract | ||
|
|
||
| /// @title LendingPoolFactory | ||
| /// @dev Handles deployment of LendingPool contracts across different shards | ||
| contract LendingPoolFactory { | ||
| address public globalLedger; | ||
| address public interestManager; | ||
| address public oracle; | ||
| TokenId public usdt; | ||
| TokenId public eth; | ||
| uint8 public shardCounter; // Tracks which shard to deploy to (0-3) | ||
|
|
||
| event LendingPoolDeployed(address pool, uint8 shardId, address owner); | ||
|
|
||
| constructor( | ||
| address _globalLedger, | ||
| address _interestManager, | ||
| address _oracle, | ||
| TokenId _usdt, | ||
| TokenId _eth | ||
| ) { | ||
| globalLedger = _globalLedger; | ||
| interestManager = _interestManager; | ||
| oracle = _oracle; | ||
| usdt = _usdt; | ||
| eth = _eth; | ||
| shardCounter = 0; | ||
| } | ||
|
|
||
| /// @notice Deploys a new LendingPool contract to a shard | ||
| function deployLendingPool() external { | ||
| bytes memory constructorArgs = abi.encode( | ||
| globalLedger, | ||
| interestManager, | ||
| oracle, | ||
| usdt, | ||
| eth, | ||
| msg.sender | ||
| ); | ||
|
|
||
| // Compute full contract creation bytecode | ||
| bytes memory bytecode = bytes.concat( | ||
| type(LendingPool).creationCode, | ||
| constructorArgs | ||
| ); | ||
|
|
||
| // Call asyncDeploy with correct parameters | ||
| address poolAddress = Nil.asyncDeploy( | ||
| shardCounter, // Shard ID | ||
| msg.sender, // Refund to the sender | ||
| address(0), // Bounce to (set to 0 for now) | ||
| 0, // Fee credit (set to 0 unless required) | ||
| 0, // Forward kind (set to 0 unless forwarding behavior is needed) | ||
| 0, // Value (set to 0 unless ETH needs to be sent) | ||
| bytecode, // Contract creation code + constructor args | ||
| 0 // Salt (set to 0; can be changed for deterministic addresses) | ||
| ); | ||
|
|
||
| require(poolAddress != address(0), "Deployment failed"); | ||
|
|
||
| // Assuming Nil provides an alternative method for cross-shard calls | ||
| // Using Nil.asyncCall to interact with GlobalLedger | ||
| (bool success, ) = address(Nil).call( | ||
|
||
| abi.encodeWithSignature( | ||
| "asyncCall(uint8,address,address,uint256,uint256,uint256,bytes,uint256)", | ||
| 0, // Assuming GlobalLedger is on shard 0 | ||
| address(0), // Refund address (not needed here) | ||
| globalLedger, // Target: GlobalLedger contract | ||
| 0, // Fee credit | ||
| 0, // Forward kind | ||
| 0, // ETH value to send | ||
| abi.encodeWithSignature( | ||
| "registerLendingPool(address)", | ||
| poolAddress | ||
| ), // Method to call | ||
| 0 // Salt (set to 0) | ||
| ) | ||
| ); | ||
|
|
||
| require(success, "Failed to register LendingPool in GlobalLedger"); | ||
|
|
||
| emit LendingPoolDeployed(poolAddress, shardCounter, msg.sender); | ||
| shardCounter = (shardCounter + 1) % 4; // Cycle through shards | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| { | ||
|
||
| "compilerOptions": { | ||
| /* Visit https://aka.ms/tsconfig to read more about this file */ | ||
|
|
||
| /* Projects */ | ||
| // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ | ||
| // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ | ||
| // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ | ||
| // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ | ||
| // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ | ||
| // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ | ||
|
|
||
| /* Language and Environment */ | ||
| "target": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ | ||
| // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ | ||
| // "jsx": "preserve", /* Specify what JSX code is generated. */ | ||
| // "libReplacement": true, /* Enable lib replacement. */ | ||
| // "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */ | ||
| // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ | ||
| // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ | ||
| // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ | ||
| // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ | ||
| // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ | ||
| // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ | ||
| // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ | ||
| // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ | ||
|
|
||
| /* Modules */ | ||
| "module": "commonjs", /* Specify what module code is generated. */ | ||
| // "rootDir": "./", /* Specify the root folder within your source files. */ | ||
| // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ | ||
| // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ | ||
| // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ | ||
| // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ | ||
| // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ | ||
| // "types": [], /* Specify type package names to be included without being referenced in a source file. */ | ||
| // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ | ||
| // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ | ||
| // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ | ||
| // "rewriteRelativeImportExtensions": true, /* Rewrite '.ts', '.tsx', '.mts', and '.cts' file extensions in relative import paths to their JavaScript equivalent in output files. */ | ||
| // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ | ||
| // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ | ||
| // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ | ||
| // "noUncheckedSideEffectImports": true, /* Check side effect imports. */ | ||
| // "resolveJsonModule": true, /* Enable importing .json files. */ | ||
| // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ | ||
| // "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */ | ||
|
|
||
| /* JavaScript Support */ | ||
| // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ | ||
| // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ | ||
| // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ | ||
|
|
||
| /* Emit */ | ||
| // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ | ||
| // "declarationMap": true, /* Create sourcemaps for d.ts files. */ | ||
| // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ | ||
| // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ | ||
| // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ | ||
| // "noEmit": true, /* Disable emitting files from a compilation. */ | ||
| // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ | ||
| // "outDir": "./", /* Specify an output folder for all emitted files. */ | ||
| // "removeComments": true, /* Disable emitting comments. */ | ||
| // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ | ||
| // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ | ||
| // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ | ||
| // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ | ||
| // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ | ||
| // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ | ||
| // "newLine": "crlf", /* Set the newline character for emitting files. */ | ||
| // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ | ||
| // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ | ||
| // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ | ||
| // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ | ||
| // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ | ||
|
|
||
| /* Interop Constraints */ | ||
| // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ | ||
| // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ | ||
| // "isolatedDeclarations": true, /* Require sufficient annotation on exports so other tools can trivially generate declaration files. */ | ||
| // "erasableSyntaxOnly": true, /* Do not allow runtime constructs that are not part of ECMAScript. */ | ||
| // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ | ||
| "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */ | ||
| // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ | ||
| "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ | ||
|
|
||
| /* Type Checking */ | ||
| "strict": true, /* Enable all strict type-checking options. */ | ||
| // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ | ||
| // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ | ||
| // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ | ||
| // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ | ||
| // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ | ||
| // "strictBuiltinIteratorReturn": true, /* Built-in iterators are instantiated with a 'TReturn' type of 'undefined' instead of 'any'. */ | ||
| // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ | ||
| // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ | ||
| // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ | ||
| // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ | ||
| // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ | ||
| // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ | ||
| // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ | ||
| // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ | ||
| // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ | ||
| // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ | ||
| // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ | ||
| // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ | ||
| // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ | ||
|
|
||
| /* Completeness */ | ||
| // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ | ||
| "skipLibCheck": true /* Skip type checking all .d.ts files. */ | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,32 @@ | ||
| import "@nomicfoundation/hardhat-chai-matchers"; | ||
| import "@nomicfoundation/hardhat-ignition-ethers"; | ||
| import "@nomicfoundation/hardhat-ethers"; | ||
| import "@nomicfoundation/hardhat-ignition-ethers"; | ||
| import "@typechain/hardhat"; | ||
| import "@nomicfoundation/hardhat-toolbox"; | ||
| import "@nomiclabs/hardhat-ethers"; | ||
| import '@nomiclabs/hardhat-waffle'; | ||
|
|
||
|
|
||
| import * as dotenv from "dotenv"; | ||
| import type { HardhatUserConfig } from "hardhat/config"; | ||
|
|
||
| // Import niljs (correct scoped package) | ||
| import "@nilfoundation/niljs"; | ||
|
|
||
| import "./task/run-lending-protocol"; | ||
|
|
||
| dotenv.config(); | ||
| dotenv.config(); // Load .env variables | ||
|
|
||
| const config: HardhatUserConfig = { | ||
| ignition: { | ||
| requiredConfirmations: 1, | ||
| }, | ||
| defaultNetwork: "nil", | ||
| solidity: { | ||
| version: "0.8.28", // or your desired version | ||
| version: "0.8.28", // Match your Solidity version | ||
| settings: { | ||
| viaIR: true, // needed to compile router | ||
| optimizer: { | ||
| enabled: true, | ||
| runs: 200, | ||
| }, | ||
| }, | ||
| }, | ||
| networks: { | ||
| nil: { | ||
| url: process.env.NIL_RPC_ENDPOINT, | ||
| accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : [], | ||
| }, | ||
| }, | ||
| }; | ||
|
|
||
| export default config; | ||
| export default config; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With the deployment of the contract, there should be a function which calls the globalLedger to register the lending pool
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
well noted Sir, I will make changes