Kill event; mock fix

This commit is contained in:
tim
2025-10-20 13:51:03 -04:00
parent 12fc43f999
commit 316da25f5b
4 changed files with 27 additions and 18 deletions

View File

@@ -1,14 +1,19 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^0.8.30;
import "../test/Deploy.sol";
import "../src/IPartyPool.sol";
import "../src/PartyPlanner.sol";
import "../src/PartyPool.sol";
import "../test/MockERC20.sol";
import "@abdk/ABDKMath64x64.sol";
import "forge-std/Script.sol";
import "forge-std/console2.sol";
import {ABDKMath64x64} from "../lib/abdk-libraries-solidity/ABDKMath64x64.sol";
import {CommonBase} from "../lib/forge-std/src/Base.sol";
import {Script} from "../lib/forge-std/src/Script.sol";
import {StdChains} from "../lib/forge-std/src/StdChains.sol";
import {StdCheatsSafe} from "../lib/forge-std/src/StdCheats.sol";
import {StdUtils} from "../lib/forge-std/src/StdUtils.sol";
import {IERC20} from "../lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
import {IERC20Metadata} from "../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol";
import {PartyPlanner} from "../src/PartyPlanner.sol";
import {PartyPoolViewer} from "../src/PartyPoolViewer.sol";
import {Deploy} from "../test/Deploy.sol";
import {MockERC20} from "../test/MockERC20.sol";
contract DeployMock is Script {
@@ -49,9 +54,9 @@ contract DeployMock is Script {
mintAll(msg.sender, 10_000);
// prepare initial deposits (10_000 units of each token, scaled by _bases)
uint256[] memory initialDeposits = new uint256[](3);
initialDeposits[0] = _bases[0] * 10_000;
initialDeposits[1] = _bases[1] * 10_000;
initialDeposits[2] = _bases[2] * 10_000;
initialDeposits[0] = 10_000 * 10 ** IERC20Metadata(address(tokens[0])).decimals();
initialDeposits[1] = 10_000 * 10 ** IERC20Metadata(address(tokens[1])).decimals();
initialDeposits[2] = 10_000 * 10 ** IERC20Metadata(address(tokens[2])).decimals();
// approve factory to move initial deposits
for (uint i = 0; i < tokens.length; i++) {
IERC20(tokens[i]).approve(address(planner), initialDeposits[i]);
@@ -94,9 +99,9 @@ contract DeployMock is Script {
mintAll(msg.sender, 10_000);
// prepare initial deposits (10_000 units of each token, scaled by _bases)
initialDeposits = new uint256[](3);
initialDeposits[0] = _bases[0] * 10_000;
initialDeposits[1] = _bases[1] * 10_000;
initialDeposits[2] = _bases[2] * 10_000;
initialDeposits[0] = 10_000 * 10 ** IERC20Metadata(address(tokens[0])).decimals();
initialDeposits[1] = 10_000 * 10 ** IERC20Metadata(address(tokens[1])).decimals();
initialDeposits[2] = 10_000 * 10 ** IERC20Metadata(address(tokens[2])).decimals();
// approve factory to move initial deposits
for (uint i = 0; i < tokens.length; i++) {
IERC20(tokens[i]).approve(address(planner), initialDeposits[i]);
@@ -106,7 +111,7 @@ contract DeployMock is Script {
planner.newPool(
'Stablecoin Pool',
'STAP',
tokens,
IERC20[](tokens),
_bases,
ABDKMath64x64.divu(1, 10),
ABDKMath64x64.divu(1,10000),
@@ -137,8 +142,8 @@ contract DeployMock is Script {
mintAll(msg.sender, 10_000);
// prepare initial deposits (10_000 units of each token, scaled by _bases)
initialDeposits = new uint256[](2);
initialDeposits[0] = _bases[0] * 10_000;
initialDeposits[1] = _bases[1] * 10_000;
initialDeposits[0] = 10_000 * 10 ** IERC20Metadata(address(tokens[0])).decimals();
initialDeposits[1] = 10_000 * 10 ** IERC20Metadata(address(tokens[1])).decimals();
// approve factory to move initial deposits
for (uint i = 0; i < tokens.length; i++) {
IERC20(tokens[i]).approve(address(planner), initialDeposits[i]);
@@ -148,7 +153,7 @@ contract DeployMock is Script {
planner.newPool(
'Stable Pair',
'SPAIR',
tokens,
IERC20[](tokens),
_bases,
ABDKMath64x64.divu(8,10), // kappa = 0.8
_feePpm,