Skip to content
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.

Sign up for GitHub

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

Feature/uni 379 combine utoken and uerc20 #55

Merged
merged 11 commits into from
Dec 3, 2021
Merged

Feature/uni 379 combine utoken and uerc20 #55

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f23d7be
chg: Combine utoken and uerc20.
twygod Nov 29, 2021
61cee34
chg: have UToken to use ERC20Permit directly
maxweng Nov 30, 2021
c85d700
chg: use enum show error message.
twygod Nov 30, 2021
0444d57
chg: use custom error show error message.
twygod Nov 30, 2021
9e75f04
chg: add UDai contract.
twygod Nov 30, 2021
8620f4c
chg: rename getRemainingDebtCeiling()
maxweng Nov 30, 2021
aed82c4
chg: rename custom errors
maxweng Dec 1, 2021
3bdd2ce
chg: add test case to test borrow when credit limit is negative.
twygod Dec 1, 2021
b7fcede
chg: need to reset allowance for token compatibility
maxweng Dec 1, 2021
1e85eec
Merge branch 'develop' into feature/uni-379-combine-utoken-and-uerc20
twygod Dec 2, 2021
f041e4a
Merge commit '76045867996dae9bc152ec857abcdd1e14a2ad5c' into feature/…
maxweng Dec 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions contracts/interfaces/IUErc20.sol
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions contracts/interfaces/IUToken.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,24 +53,6 @@ interface IUToken {
*/
function calculatingFee(uint256 amount) external view returns (uint256);

/**
* @dev Get member loan data
* @param member Member address
* @return Loan
*/
function getLoan(address member)
external
view
returns (
uint256,
uint256,
address,
uint256,
int256,
bool,
uint256
);

/**
* @dev Calculating member's borrowed interest
* @param account Member address
Expand Down
18 changes: 0 additions & 18 deletions contracts/market/UErc20.sol
View file
Open in desktop

This file was deleted.

Loading