autowrap; sendAmounts() restored

test/Deploy.sol

@@ -0,0 +1,79 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.30;
+
+import {IERC20} from "../lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
+import {IWETH9} from "../src/IWETH9.sol";
+import {PartyPlanner} from "../src/PartyPlanner.sol";
+import {PartyPool} from "../src/PartyPool.sol";
+import {PartyPoolBalancedPair} from "../src/PartyPoolBalancedPair.sol";
+import {PartyPoolDeployer, PartyPoolBalancedPairDeployer} from "../src/PartyPoolDeployer.sol";
+import {PartyPoolMintImpl} from "../src/PartyPoolMintImpl.sol";
+import {PartyPoolSwapImpl} from "../src/PartyPoolSwapImpl.sol";
+import {PartyPoolViewer} from "../src/PartyPoolViewer.sol";
+import {WETH9} from "./WETH9.sol";
+
+library Deploy {
+    address internal constant PROTOCOL_FEE_RECEIVER = 0x70997970C51812dc3A010C7d01b50e0d17dc79C8; // dev account #1
+    uint256 internal constant PROTOCOL_FEE_PPM = 100_000; // 10%
+
+    function newPartyPlanner() internal returns (PartyPlanner) {
+        IWETH9 wrapper = new WETH9();
+        return new PartyPlanner(
+            wrapper,
+            new PartyPoolSwapImpl(wrapper),
+            new PartyPoolMintImpl(wrapper),
+            new PartyPoolDeployer(),
+            new PartyPoolBalancedPairDeployer(),
+            PROTOCOL_FEE_PPM,
+            PROTOCOL_FEE_RECEIVER
+        );
+    }
+
+    function newPartyPool(
+        string memory name_,
+        string memory symbol_,
+        IERC20[] memory tokens_,
+        uint256[] memory bases_,
+        int128 _kappa,
+        uint256 _swapFeePpm,
+        uint256 _flashFeePpm,
+        bool _stable
+    ) internal returns (PartyPool) {
+        IWETH9 wrapper = new WETH9();
+        return _stable && tokens_.length == 2 ?
+        new PartyPoolBalancedPair(
+            name_,
+            symbol_,
+            tokens_,
+            bases_,
+            _kappa,
+            _swapFeePpm,
+            _flashFeePpm,
+            PROTOCOL_FEE_PPM,
+            PROTOCOL_FEE_RECEIVER,
+            wrapper,
+            new PartyPoolSwapImpl(wrapper),
+            new PartyPoolMintImpl(wrapper)
+        ) :
+        new PartyPool(
+            name_,
+            symbol_,
+            tokens_,
+            bases_,
+            _kappa,
+            _swapFeePpm,
+            _flashFeePpm,
+            PROTOCOL_FEE_PPM,
+            PROTOCOL_FEE_RECEIVER,
+            wrapper,
+            new PartyPoolSwapImpl(wrapper),
+            new PartyPoolMintImpl(wrapper)
+        );
+    }
+
+
+    function newViewer() internal returns (PartyPoolViewer) {
+        IWETH9 wrapper = new WETH9();
+        return new PartyPoolViewer(new PartyPoolSwapImpl(wrapper), new PartyPoolMintImpl(wrapper));
+    }
+}

test/GasTest.sol

@@ -9,7 +9,7 @@ import "../src/LMSRStabilized.sol";
 import "../src/PartyPool.sol";
 import "../src/PartyPlanner.sol";
 import "../lib/openzeppelin-contracts/contracts/interfaces/IERC3156FlashBorrower.sol";
-import {Deploy} from "../src/Deploy.sol";
+import {Deploy} from "./Deploy.sol";
 
 /// @notice Test contract that implements the flash callback for testing flash loans
 contract FlashBorrower is IERC3156FlashBorrower {

test/PartyPlanner.t.sol

@@ -9,7 +9,7 @@ import {StdUtils} from "../lib/forge-std/src/StdUtils.sol";
 import {Test} from "../lib/forge-std/src/Test.sol";
 import {ERC20} from "../lib/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";
 import {IERC20} from "../lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
-import {Deploy} from "../src/Deploy.sol";
+import {Deploy} from "./Deploy.sol";
 import {IPartyPool} from "../src/IPartyPool.sol";
 import {LMSRStabilized} from "../src/LMSRStabilized.sol";
 import {PartyPlanner} from "../src/PartyPlanner.sol";

test/PartyPool.t.sol

@@ -11,7 +11,7 @@ import "../src/PartyPool.sol";
 // Import the flash callback interface
 import "../lib/openzeppelin-contracts/contracts/interfaces/IERC3156FlashBorrower.sol";
 import {PartyPlanner} from "../src/PartyPlanner.sol";
-import {Deploy} from "../src/Deploy.sol";
+import {Deploy} from "./Deploy.sol";
 import {PartyPoolViewer} from "../src/PartyPoolViewer.sol";
 
 /// @notice Test contract that implements the flash callback for testing flash loans

test/WETH9.sol

@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.30;
+
+import {IWETH9} from "../src/IWETH9.sol";
+
+contract WETH9 is IWETH9 {
+    string public name = "Wrapped Ether";
+    string public symbol = "WETH";
+    uint8 public decimals = 18;
+
+    event Deposit(address indexed dst, uint256 wad);
+    event Withdrawal(address indexed src, uint256 wad);
+
+    mapping(address => uint256) public balanceOf;
+    mapping(address => mapping(address => uint256)) public allowance;
+
+    receive() external payable {
+        deposit();
+    }
+
+    function deposit() public payable {
+        balanceOf[msg.sender] += msg.value;
+        emit Deposit(msg.sender, msg.value);
+    }
+
+    function withdraw(uint256 wad) public {
+        require(balanceOf[msg.sender] >= wad, "");
+        balanceOf[msg.sender] -= wad;
+        payable(msg.sender).transfer(wad);
+        emit Withdrawal(msg.sender, wad);
+    }
+
+    function totalSupply() public view returns (uint256) {
+        return address(this).balance;
+    }
+
+    function approve(address guy, uint256 wad) public returns (bool) {
+        allowance[msg.sender][guy] = wad;
+        emit Approval(msg.sender, guy, wad);
+        return true;
+    }
+
+    function transfer(address dst, uint256 wad) public returns (bool) {
+        return transferFrom(msg.sender, dst, wad);
+    }
+
+    function transferFrom(
+        address src,
+        address dst,
+        uint256 wad
+    ) public returns (bool) {
+        require(balanceOf[src] >= wad, "");
+
+        if (
+            src != msg.sender && allowance[src][msg.sender] != type(uint256).max
+        ) {
+            require(allowance[src][msg.sender] >= wad, "");
+            allowance[src][msg.sender] -= wad;
+        }
+
+        balanceOf[src] -= wad;
+        balanceOf[dst] += wad;
+
+        emit Transfer(src, dst, wad);
+
+        return true;
+    }
+}