Skip to content

fix: skip overwriteCollateral after sunset a coll #9

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

Open
ashl3333 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: skip overwriteCollateral after sunset a coll #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/core/TroveManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ contract TroveManager is ITroveManager, Initializable, OwnableUpgradeable {
_updateIntegrals(_borrower, 0, supply);

totalActiveCollateral = totalActiveCollateral + _collateralAmount;
uint256 _newTotalDebt = supply + _compositeDebt;
uint256 _newTotalDebt = totalActiveDebt + _compositeDebt;
require(_newTotalDebt + defaultedDebt <= maxSystemDebt, "Collateral debt limit reached");
totalActiveDebt = _newTotalDebt;
emit TroveUpdated(_borrower, _compositeDebt, _collateralAmount, stake, TroveManagerOperation.open);
Expand Down
2 changes: 2 additions & 0 deletions src/core/facets/FactoryFacet.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ contract FactoryFacet is IFactoryFacet, AccessControlInternal {
}
}
if (!collateralEnabled) {
/*
Queue memory queueCached = s.queue;
if (queueCached.nextSunsetIndexKey > queueCached.firstSunsetIndexKey) {
SunsetIndex memory sIdx = s.sunsetIndexes[queueCached.firstSunsetIndexKey];
Expand All @@ -95,6 +96,7 @@ contract FactoryFacet is IFactoryFacet, AccessControlInternal {
return;
}
}
*/
s.collateralTokens.push(_collateral);
s.indexByCollateral[_collateral] = s.collateralTokens.length;
} else {
Expand Down