changed withdraw feature

Author: Axel Valavaara

broadcast/DeployOrderContract.s.sol/11155111/run-1760904010014.json

@@ -168,14 +168,14 @@ contract OrderContract is ReentrancyGuard{
             revert OrderContract__OrderCannotBeConfirmedInCurrentState();
         }
         // update amount paid for the offer by the user
-        uint256 amountToPay = offers[offerId].price + AGENT_FEE;
+        uint256 amountToPay = offers[offerId].price;
 
         offers[offerId].paid = amountToPay;
         offers[offerId].status = OrderStatus.Confirmed;
 
         offers[offerId].timestamp = block.timestamp;
         bool success= ERC20(i_pyUSD).transferFrom(msg.sender, address(this), amountToPay);
-        
+        _burnA3A(100 ether, msg.sender); // Burn 5 A3A tokens from user as confirmation fee.
         if (!success) {
             revert OrderContract__ERC20TransferFailed();
         }
@@ -258,16 +258,14 @@ contract OrderContract is ReentrancyGuard{
         if (!success) {
             revert OrderContract__ERC20TransferFailed();
         }
-        A3AToken(i_a3aToken).mint(msg.sender, (PyUsdAmount*ADDITIONAL_PRECISION)*100);
-    }
-
-    function withdrawPyUSD(uint256 amount) external onlyOwner nonReentrant {
-        bool success = ERC20(i_pyUSD).transfer(msg.sender, amount);
-        if (!success) {
+        bool transferSuccess = ERC20(i_pyUSD).transfer(i_owner,PyUsdAmount);
+        if (!transferSuccess) {
             revert OrderContract__ERC20TransferFailed();
         }
+        A3AToken(i_a3aToken).mint(msg.sender, (PyUsdAmount*ADDITIONAL_PRECISION)*100);
     }
-     
+
+
 
     /*//////////////////////////////////////////////////////////////
                      INTERNAL AND PRIVATE FUNCTIONS

broadcast/DeployOrderContract.s.sol/11155111/run-1760989140248.json

@@ -148,7 +148,7 @@ contract OrderContractTest is Test {
         // Arrange
         uint64 offerId = 1;
         uint256 priceForOffer = 5 ether;
-        uint256 expectedAmountPaid = priceForOffer + orderContract.getAgentFee(); // AGENT_FEE i 1 ether
+        uint256 expectedAmountPaid = priceForOffer; 
         uint256 expectedTimeStamp = block.timestamp;
         // Act
         vm.startPrank(USER);
@@ -165,7 +165,7 @@ contract OrderContractTest is Test {
         // Arrange
         uint64 offerId = 1;
         uint256 priceForOffer = 5 ether;
-        uint256 expectedAmountPaid = priceForOffer + orderContract.getAgentFee(); // AGENT_FEE is 1 ether
+        uint256 expectedAmountPaid = priceForOffer;
 
 
         // Act
@@ -188,6 +188,22 @@ contract OrderContractTest is Test {
         orderContract.confirmOrder(offerId);
     }
 
+    function testConfirmOrderBurnsA3ATokens() public proposeOrderForUser orderProposedAnsweredByAgent {
+        // Arrange
+        uint64 offerId = 1;
+        uint256 priceForOffer = 5 ether;
+        uint256 userA3ABalanceBefore = a3aToken.balanceOf(USER);
+        uint256 expectedA3ABurned = 100 ether;
+        // Act
+        vm.startPrank(USER);
+        ERC20Mock(pyUSD).approve(address(orderContract), priceForOffer);
+        orderContract.confirmOrder(offerId);
+        vm.stopPrank();
+        uint256 userA3ABalanceAfter = a3aToken.balanceOf(USER);
+        // Assert
+        assertEq(userA3ABalanceBefore - userA3ABalanceAfter, expectedA3ABurned);
+    }
+
 
     /*//////////////////////////////////////////////////////////////
                        PROPOSE ORDER ANSWER TESTS
@@ -271,7 +287,7 @@ contract OrderContractTest is Test {
         // Arrange
         uint64 offerId = 1;
         uint256 sellerBalanceBefore = ERC20Mock(pyUSD).balanceOf(SELLER);
-        uint256 expectedAmountPaid = 5 ether + orderContract.getAgentFee();
+        uint256 expectedAmountPaid = 5 ether;
         // Act
         vm.prank(addressController);
         orderContract.finalizeOrder(offerId);   
@@ -334,35 +350,6 @@ contract OrderContractTest is Test {
         assertEq(uint8(offer.status), uint8(OrderContract.OrderStatus.Proposed));
     }
 
-
-    /*//////////////////////////////////////////////////////////////
-                          WITHDRAW PYUSD TESTS
-    //////////////////////////////////////////////////////////////*/
-    function testOnlyOwnerCanWithdrawFunds() public orderConfirmed {
-        // Arrange
-        uint64 offerId = 1;
-        // Act / Assert
-        vm.prank(address(0x123));
-        vm.expectRevert(OrderContract.OrderContract__onlyOwnerCanWithdrawFunds.selector);
-        orderContract.withdrawPyUSD(offerId);
-    }
-
-    function testWithdrawFunds() public orderConfirmed {
-        // Arrange
-        
-        
-        uint256 contractBalanceBefore = ERC20Mock(pyUSD).balanceOf(address(orderContract));
-        uint256 ownerBalanceBefore = ERC20Mock(pyUSD).balanceOf(owner);
-        uint256 amountToWithdraw = 0.5e6;
-        // Act
-        vm.prank(owner);
-        orderContract.withdrawPyUSD(amountToWithdraw);
-        uint256 contractBalanceAfter = ERC20Mock(pyUSD).balanceOf(address(orderContract));
-        uint256 ownerBalanceAfter = ERC20Mock(pyUSD).balanceOf(owner);
-        // Assert
-        assertEq(contractBalanceBefore - contractBalanceAfter, amountToWithdraw);
-        assertEq(ownerBalanceAfter - ownerBalanceBefore, amountToWithdraw);
-    }
     /*//////////////////////////////////////////////////////////////
                        USER ORDER MAPPINGS TESTS
     //////////////////////////////////////////////////////////////*/