Skip to content

Commit

Permalink
🚧 update contracts and tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@audsssy
audsssy committed Dec 5, 2023
1 parent 1d1c1d5 commit 24bf742
Show file tree
Hide file tree
Showing 2 changed files with 123 additions and 34 deletions.
18 changes: 8 additions & 10 deletions src/KaliCurve.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ contract KaliCurve is Storage {
_;
}

modifier forSale(uint256 curveId) {
if (!this.getCurveMintStatus(curveId)) revert NotAuthorized();
modifier isOpen(uint256 curveId) {
if (curveId == 0 || !this.getCurveMintStatus(curveId)) revert InvalidMint();
_;
}

Expand Down Expand Up @@ -167,7 +167,7 @@ contract KaliCurve is Storage {
/// -----------------------------------------------------------------------

/// @notice Donate to receive ImpactDAO tokens.
function donate(uint256 curveId, address patron, uint256 donation) external payable initialized forSale(curveId) {
function donate(uint256 curveId, address patron, uint256 donation) external payable initialized isOpen(curveId) {
// Retrieve ImpactDAO and curve owner.
uint256 totalDonation;
address impactDAO = this.getImpactDao(curveId);
Expand All @@ -176,7 +176,6 @@ contract KaliCurve is Storage {
// Validate mint conditions.
uint256 burnPrice = this.getPrice(false, curveId);
if (donation != this.getPrice(true, curveId) || donation < burnPrice) revert InvalidAmount();
if (curveId == 0 || !this.getCurveMintStatus(curveId)) revert InvalidMint();
if (msg.sender == owner) revert NotAuthorized();

// Confirm ImpactDAO exists.
Expand Down Expand Up @@ -214,16 +213,15 @@ contract KaliCurve is Storage {
address impactDAO = this.getImpactDao(curveId);
if (IKaliTokenManager(impactDAO).balanceOf(patron) == 0) revert InvalidBurn();

// Decrement supply.
decrementCurveSupply(curveId);

// Send burn price to patron.
(bool success,) = patron.call{value: this.getPrice(false, curveId)}("");
if (!success) addUnclaimed(patron, this.getPrice(false, curveId));
// Add burn price to patron's unclaimed.
addUnclaimed(patron, this.getPrice(false, curveId));

// Burn ImpactDAO tokens.
IKaliTokenManager(impactDAO).burnTokens(this.getCurveOwner(curveId), 1 ether);
IKaliTokenManager(impactDAO).burnTokens(patron, 1 ether);

// Decrement supply.
decrementCurveSupply(curveId);
}

/// -----------------------------------------------------------------------
Expand Down
139 changes: 115 additions & 24 deletions test/KaliCurve.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,7 @@ contract KaliCurveTest is Test {
assertEq(_constant_c, uint48(0));
}

function testCurveWithDaoTreasury_SetCurveData_NotOwner(
uint96 scale,
uint16 ratio,
uint48 constant_a,
uint48 constant_b,
uint48 constant_c
) public payable {
function testCurveWithDaoTreasury_SetCurveData_NotOwner() public payable {
testCurveWithDaoTreasury();
vm.warp(block.timestamp + 100);

Expand All @@ -133,9 +127,7 @@ contract KaliCurveTest is Test {

bool status = kaliCurve.getCurveMintStatus(1);

vm.prank(alice);
kaliCurve.setCurveMintStatus(1, !status);
assertEq(kaliCurve.getCurveMintStatus(1), !status);
setMintStatus(alice, 1, !status);
}

function testCurveWithDaoTreasury_SetCurveMintStatus_NotOwner(bool status) public payable {
Expand Down Expand Up @@ -288,7 +280,6 @@ contract KaliCurveTest is Test {
vm.warp(block.timestamp + 100);

uint256 amount = kaliCurve.getPrice(true, kaliCurve.getCurveCount());
emit log_uint(amount);

vm.deal(bob, 10 ether);
vm.prank(bob);
Expand All @@ -298,13 +289,111 @@ contract KaliCurveTest is Test {
// assertEq();
}

function testDonate_NotInitialized() public payable {}
function testDonateWithDaoTreasury_NotInitialized() public payable {
vm.expectRevert(KaliCurve.NotInitialized.selector);
vm.prank(dao);
kaliCurve.donate(1, alice, 1 ether);
}

function testDonate_NotAuthorized() public payable {}

function testDonate_InvalidMint() public payable {}
function testDonateWithDaoTreasury_InvalidMint_NotOpen() public payable {
testCurveWithDaoTreasury();
vm.warp(block.timestamp + 100);

setMintStatus(alice, 1, false);

vm.deal(bob, 10 ether);
vm.expectRevert(KaliCurve.InvalidMint.selector);
vm.prank(bob);
kaliCurve.donate(1, bob, 1 ether);
}

function testDonateWithDaoTreasury_InvalidMint_CurveZero() public payable {
testCurveWithDaoTreasury();
vm.warp(block.timestamp + 100);

vm.deal(bob, 10 ether);
vm.expectRevert(KaliCurve.InvalidMint.selector);
vm.prank(bob);
kaliCurve.donate(0, bob, 1 ether);
}

function testDonateWithDaoTreasury_InvalidAmount() public payable {
testCurveWithDaoTreasury();
vm.warp(block.timestamp + 100);
uint256 amount = kaliCurve.getPrice(true, kaliCurve.getCurveCount());

vm.deal(bob, 10 ether);
vm.expectRevert(KaliCurve.InvalidAmount.selector);
vm.prank(bob);
kaliCurve.donate(1, bob, amount + 1 ether);
}

// todo: try to refactor this beast
// todo: and add custom errors tests
function testLeave_NewUsers() public payable {
testDonateWithDaoTreasury_NewUsers();

uint256 supply = kaliCurve.getCurveSupply(1);
address impactDao = kaliCurve.getImpactDao(1);
uint256 burnPrice = kaliCurve.getPrice(false, 1);

// Bob leaves.
vm.prank(bob);
kaliCurve.leave(1, bob);

// Validate.
assertEq(IKaliTokenManager(impactDao).balanceOf(bob), 0);
assertEq(kaliCurve.getCurveSupply(1), supply - 1);
assertEq(kaliCurve.getUnclaimed(bob), burnPrice);

// Bob claims funds.
uint256 bobBalance = address(bob).balance;
vm.prank(bob);
kaliCurve.claim();
assertEq(address(bob).balance, bobBalance + burnPrice);

uint256 _burnPrice = kaliCurve.getPrice(false, 1);

// Charlie leaves.
vm.prank(charlie);
kaliCurve.leave(1, charlie);

// Validate.
assertEq(IKaliTokenManager(impactDao).balanceOf(charlie), 0);
assertEq(kaliCurve.getCurveSupply(1), supply - 2);
assertEq(kaliCurve.getUnclaimed(charlie), _burnPrice);

// Charlie claims funds.
uint256 charlieBalance = address(charlie).balance;
vm.prank(charlie);
kaliCurve.claim();
assertEq(address(charlie).balance, charlieBalance + _burnPrice);
}

function testLeave_RecurringUser() public payable {
testDonateWithDaoTreasury_RecurringUser();

uint256 supply = kaliCurve.getCurveSupply(1);
address impactDao = kaliCurve.getImpactDao(1);

vm.prank(charlie);
kaliCurve.leave(1, charlie);

// Validate.
assertEq(IKaliTokenManager(impactDao).balanceOf(charlie), 0);
assertEq(kaliCurve.getCurveSupply(1), supply - 1);
}

function testLeave_InvalidBurn() public payable {
testLeave_RecurringUser();

function testLeave() public payable {}
// Charlies tries to leave again.
vm.expectRevert(KaliCurve.InvalidBurn.selector);
vm.prank(charlie);
kaliCurve.leave(1, charlie);
}

/// -----------------------------------------------------------------------
/// Fuzzy Curve Test
Expand Down Expand Up @@ -378,10 +467,6 @@ contract KaliCurveTest is Test {
assertEq(_constant_c, constant_c);
}

/// -----------------------------------------------------------------------
/// Getter Test
/// -----------------------------------------------------------------------

/// -----------------------------------------------------------------------
/// Custom Error Test
/// -----------------------------------------------------------------------
Expand Down Expand Up @@ -464,23 +549,29 @@ contract KaliCurveTest is Test {
uint256 constant_b,
uint256 constant_c
) internal returns (uint256) {
uint256 price;
uint256 _price;

supply = mint ? supply + 1 : supply;
burnRatio = mint ? 100 : uint256(100) - burnRatio;

if (curveType == CurveType.LINEAR) {
// Return linear pricing based on, a * b * x + b.
price = (constant_a * supply * scale + constant_b * scale) * burnRatio / 100;
_price = (constant_a * supply * scale + constant_b * scale) * burnRatio / 100;
} else if (curveType == CurveType.CURVE) {
// Return curve pricing based on, a * c * x^2 + b * c * x + c.
price = (constant_a * (supply ** 2) * scale + constant_b * supply * scale + constant_c * scale) * burnRatio
_price = (constant_a * (supply ** 2) * scale + constant_b * supply * scale + constant_c * scale) * burnRatio
/ 100;
} else {
price = 0;
_price = 0;
}

emit log_uint(price);
return price;
emit log_uint(_price);
return _price;
}

function setMintStatus(address user, uint256 curveId, bool status) internal {
vm.prank(user);
kaliCurve.setCurveMintStatus(curveId, status);
assertEq(kaliCurve.getCurveMintStatus(curveId), status);
}
}

0 comments on commit 24bf742

Please sign in to comment.