feat: add simple tests + minor changes on the core contracts

Author: Pybast

.env.sample

@@ -10,4 +10,6 @@ POLYMARKET_ORDER_HASH=0x40000000000000000000000000000000000000000000000000000000
 SPENDER=0xC92E8bdf79f0507f65a392b0ab4667716BFE0110 # GPv2VaultRelayer contract on Polygon
 
 SELL_TOKEN=0xc2132D05D31c914a87C6611C10748AEb04B58e8F # USDT on Polygon
-BUY_TOKEN=0x2791bca1f2de4661ed88a30c99a7a9449aa84174 # USDC on Polygon
+BUY_TOKEN=0x2791bca1f2de4661ed88a30c99a7a9449aa84174 # USDC on Polygon
+
+RPC_URL_POLYGON=https://1rpc.io/matic

.gitignore

@@ -1,7 +1,7 @@
 # Compiler files
 cache/
 out/
-
+**/.DS_Store
 # Ignores development broadcast logs
 !/broadcast
 /broadcast/*/31337/

foundry.lock

@@ -0,0 +1,17 @@
+{
+  "lib/composable-cow": {
+    "rev": "54ee414d8e8291a915b387e4f29b04d9cd0ebbbd"
+  },
+  "lib/ctf-exchange": {
+    "rev": "503c0af02f9199177227f69ffcd5a7e4ca7b5d47"
+  },
+  "lib/extensible-fallback-handler": {
+    "rev": "11273c1f08eda18ed8ff49ec1d4abec5e451ff21"
+  },
+  "lib/forge-std": {
+    "rev": "77041d2ce690e692d6e03cc812b57d1ddaa4d505"
+  },
+  "lib/openzeppelin-contracts": {
+    "rev": "e4f70216d759d8e6a64144a9e1f7bbeed78e7079"
+  }
+}

foundry.toml

@@ -3,4 +3,9 @@ src = "src"
 out = "out"
 libs = ["lib"]
 
+[rpc_endpoints]
+polygon = "${RPC_URL_POLYGON}"
+
+
+
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options

remappings.txt

@@ -1,4 +1,4 @@
-@openzeppelin/=lib/composable-cow/lib/@openzeppelin/
+@openzeppelin/=lib/openzeppelin-contracts/
 common/=lib/ctf-exchange/src/common/
 composable-cow/=lib/composable-cow/
 @composable-cow/=lib/composable-cow/src
@@ -10,3 +10,4 @@ openzeppelin-contracts/=lib/openzeppelin-contracts/contracts/
 openzeppelin/=lib/composable-cow/lib/@openzeppelin/contracts/
 safe/=lib/composable-cow/lib/safe/contracts/
 safe/=lib/extensible-fallback-handler/contracts/
+

src/Polyswap.sol

@@ -57,7 +57,7 @@ contract Polyswap is BaseConditionalOrder {
         if (status.isFilledOrCancelled && status.remaining != 0) {
             revert IConditionalOrder.PollNever(POLYMARKET_ORDER_CANCELLED);
         }
-        if (!(status.isFilledOrCancelled && status.remaining == 0)) {
+        if (status.isFilledOrCancelled == false || status.remaining != 0) {
             revert IConditionalOrder.PollTryNextBlock(CONDITION_NOT_MET);
         }
     }

src/PolyswapOrder.sol

@@ -47,17 +47,17 @@ library PolyswapOrder {
      * @param self The PolyswapOrder order to validate
      */
     function validate(Data memory self, Trading polymarket) internal view {
-        if (!(self.sellToken != self.buyToken)) revert IConditionalOrder.OrderNotValid(INVALID_SAME_TOKEN);
-        if (!(address(self.sellToken) != address(0) && address(self.buyToken) != address(0))) {
+        if (self.sellToken == self.buyToken) revert IConditionalOrder.OrderNotValid(INVALID_SAME_TOKEN);
+        if (address(self.sellToken) == address(0) || address(self.buyToken) == address(0)) {
             revert IConditionalOrder.OrderNotValid(INVALID_TOKEN);
         }
-        if (!(self.t0 < type(uint32).max)) revert IConditionalOrder.OrderNotValid(INVALID_START_DATE);
-        if (!(self.t > self.t0 && self.t < type(uint32).max)) revert IConditionalOrder.OrderNotValid(INVALID_END_DATE);
-        if (!(self.sellAmount > 0)) revert IConditionalOrder.OrderNotValid(INVALID_SELL_AMOUNT);
-        if (!(self.minBuyAmount > 0)) revert IConditionalOrder.OrderNotValid(INVALID_MIN_BUY_AMOUNT);
+        if (self.t0 > block.timestamp) revert IConditionalOrder.OrderNotValid(INVALID_START_DATE);
+        if (self.t <= self.t0 || self.t < block.timestamp) revert IConditionalOrder.OrderNotValid(INVALID_END_DATE);
+        if (self.sellAmount < 0) revert IConditionalOrder.OrderNotValid(INVALID_SELL_AMOUNT);
+        if (self.minBuyAmount < 0) revert IConditionalOrder.OrderNotValid(INVALID_MIN_BUY_AMOUNT);
 
         // Check if the Polymarket order is valid and not filled or cancelled.
-        if (!(self.polymarketOrderHash != 0)) revert IConditionalOrder.OrderNotValid(INVALID_POLYMARKET_ORDER_HASH);
+        if (self.polymarketOrderHash == 0) revert IConditionalOrder.OrderNotValid(INVALID_POLYMARKET_ORDER_HASH);
         OrderStatus memory order = polymarket.getOrderStatus(self.polymarketOrderHash);
         if (order.remaining == 0 && order.isFilledOrCancelled == false) {
             revert IConditionalOrder.OrderNotValid(INVALID_POLYMARKET_ORDER_HASH);
@@ -81,7 +81,7 @@ library PolyswapOrder {
             buyAmount: self.minBuyAmount,
             validTo: self.t.toUint32(),
             appData: self.appData,
-            feeAmount: 0,
+            feeAmount: 0, // TODO we should allow for some fees
             kind: GPv2Order.KIND_SELL,
             partiallyFillable: false,
             sellTokenBalance: GPv2Order.BALANCE_ERC20,