E2E test migration

.github/workflows/test.yml

@@ -31,6 +31,10 @@ jobs:
 
     name: Foundry project
     runs-on: ubuntu-latest
+    env:
+      # should support archive requests
+      FORK_URL: 'https://eth.llamarpc.com'
+      FORK_BLOCK_NUMBER: 20691292
     steps:
       - uses: actions/checkout@v4
         with:
@@ -66,5 +70,9 @@ jobs:
       - name: Run Forge tests
         if: matrix.profile != 'solc-0.7.6'
         run: |
+          if [ "${{ matrix.profile }}" == "default" ]; then
+            echo "Setting FORK_URL for default profile"
+            export FORK_URL="${{ secrets.MAINNET_ARCHIVE_RPC }}"
+          fi
           FOUNDRY_PROFILE=ci forge test -vvv
         id: test

foundry.toml

@@ -14,7 +14,7 @@ deny_warnings = true
 fs_permissions = [
   { access = "read", path = "./balancer"},
   { access = "read", path = "./networks.json"},
-  { access = "read", path = "./out"}
+  { access = "read", path = "./out"},
 ]
 
 [fmt]

package.json

@@ -36,7 +36,6 @@
     "ethers": "^5.4.0"
   },
   "devDependencies": {
-    "@0x/contract-artifacts-v2": "npm:@0x/contract-artifacts@^2.2.2",
     "@gnosis.pm/safe-contracts": "^1.3.0",
     "@nomicfoundation/hardhat-verify": "^2.0.1",
     "@nomiclabs/hardhat-ethers": "^2.2.3",

test/e2e/BurnFees.t.sol

@@ -0,0 +1,114 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+pragma solidity ^0.8;
+
+import {Vm} from "forge-std/Vm.sol";
+
+import {IERC20} from "src/contracts/interfaces/IERC20.sol";
+
+import {GPv2Interaction} from "src/contracts/libraries/GPv2Interaction.sol";
+import {GPv2Order} from "src/contracts/libraries/GPv2Order.sol";
+import {GPv2Signing} from "src/contracts/mixins/GPv2Signing.sol";
+
+import {SettlementEncoder} from "../libraries/encoders/SettlementEncoder.sol";
+import {Registry, TokenRegistry} from "../libraries/encoders/TokenRegistry.sol";
+import {Helper, IERC20Mintable} from "./Helper.sol";
+
+using SettlementEncoder for SettlementEncoder.State;
+using TokenRegistry for TokenRegistry.State;
+using TokenRegistry for Registry;
+
+contract BurnFeesTest is Helper(false) {
+    IERC20Mintable owl;
+    IERC20Mintable dai;
+
+    function setUp() public override {
+        super.setUp();
+
+        owl = deployMintableErc20("owl", "owl");
+        dai = deployMintableErc20("dai", "dai");
+    }
+
+    function test_uses_post_interaction_to_burn_settlement_fees() external {
+        Vm.Wallet memory trader1 = vm.createWallet("trader1");
+        Vm.Wallet memory trader2 = vm.createWallet("trader2");
+
+        // mint some owl to trader1
+        owl.mint(trader1.addr, 1001 ether);
+        vm.prank(trader1.addr);
+        // approve owl for trading on settlement contract
+        owl.approve(vaultRelayer, type(uint256).max);
+        // place order to sell 1000 owl for min 1000 dai
+        encoder.signEncodeTrade(
+            vm,
+            trader1,
+            GPv2Order.Data({
+                kind: GPv2Order.KIND_SELL,
+                partiallyFillable: false,
+                sellToken: owl,
+                buyToken: dai,
+                sellAmount: 1000 ether,
+                buyAmount: 1000 ether,
+                feeAmount: 1 ether,
+                validTo: 0xffffffff,
+                appData: bytes32(uint256(1)),
+                sellTokenBalance: GPv2Order.BALANCE_ERC20,
+                buyTokenBalance: GPv2Order.BALANCE_ERC20,
+                receiver: GPv2Order.RECEIVER_SAME_AS_OWNER
+            }),
+            domainSeparator,
+            GPv2Signing.Scheme.Eip712,
+            0
+        );
+
+        // mint some dai to trader2
+        dai.mint(trader2.addr, 1000 ether);
+        vm.prank(trader2.addr);
+        // approve dai for trading on settlement contract
+        dai.approve(vaultRelayer, type(uint256).max);
+        // place order to BUY 1000 owl with max 1000 dai
+        encoder.signEncodeTrade(
+            vm,
+            trader2,
+            GPv2Order.Data({
+                kind: GPv2Order.KIND_BUY,
+                partiallyFillable: false,
+                sellToken: dai,
+                buyToken: owl,
+                sellAmount: 1000 ether,
+                buyAmount: 1000 ether,
+                feeAmount: 0,
+                validTo: 0xffffffff,
+                appData: bytes32(uint256(1)),
+                sellTokenBalance: GPv2Order.BALANCE_ERC20,
+                buyTokenBalance: GPv2Order.BALANCE_ERC20,
+                receiver: GPv2Order.RECEIVER_SAME_AS_OWNER
+            }),
+            domainSeparator,
+            GPv2Signing.Scheme.Eip712,
+            0
+        );
+
+        // add post interaction to burn owl fees
+        encoder.addInteraction(
+            GPv2Interaction.Data({target: address(owl), value: 0, callData: abi.encodeCall(owl.burn, (1 ether))}),
+            SettlementEncoder.InteractionStage.POST
+        );
+
+        // set the token prices
+        IERC20[] memory tokens = new IERC20[](2);
+        tokens[0] = owl;
+        tokens[1] = dai;
+        uint256[] memory prices = new uint256[](2);
+        prices[0] = 1;
+        prices[1] = 1;
+        encoder.tokenRegistry.tokenRegistry().setPrices(tokens, prices);
+
+        SettlementEncoder.EncodedSettlement memory encodedSettlement = encoder.encode(settlement);
+        vm.prank(solver);
+        vm.expectEmit();
+        emit IERC20.Transfer(address(settlement), address(0), 1 ether);
+        settle(encodedSettlement);
+
+        assertEq(dai.balanceOf(address(settlement)), 0, "dai balance of settlement contract not 0");
+    }
+}