[FIX] polyswap contract and submit order script

Author: Intermarch3

.env.sample

@@ -1,4 +1,4 @@
-POLYSWAP_HANDLER=0x8a1C17fa964061443C84e5f98A69D7C1A643fFAd # with polymarket mock
+POLYSWAP_HANDLER=0x0D92aFDB0D334c221A946927877b12157Bed2F5d # with polymarket mock
 COMPOSABLE_COW=0xfdaFc9d1902f4e0b84f65F49f244b32b31013b74
 POLYMARKET_MOCK=0x62e36fBc7D6518A3DeEA0f863f50c8AC4c4a7695 # Polymarket mock contract
 POLYMARKET=0x4bFb41d5B3570DeFd03C39a9A4D8dE6Bd8B8982E

script/SubmitSingleOrder.s.sol

@@ -13,6 +13,7 @@ import {Enum} from "safe/common/Enum.sol";
 
 // Composable CoW
 import {IConditionalOrder, ComposableCoW} from "composable-cow/src/ComposableCoW.sol";
+import {IValueFactory} from "composable-cow/src/interfaces/IValueFactory.sol";
 
 // Polyswap
 import {PolyswapOrder} from "../src/PolyswapOrder.sol";
@@ -37,10 +38,10 @@ contract SubmitSingleOrder is Script {
             sellToken: sellToken,
             buyToken: buyToken,
             receiver: address(0),
-            sellAmount: 1e17, // 0.1 sell token
-            minBuyAmount: 90e16, // 0.09 buy token
+            sellAmount: 100000, // 0.1 sell token
+            minBuyAmount: 80000, // 0.08 buy token
             t0: block.timestamp,
-            t: block.timestamp + 30 days,
+            t: block.timestamp + 1 days,
             polymarketOrderHash: polymarketOrderHash
         });
 
@@ -50,8 +51,7 @@ contract SubmitSingleOrder is Script {
             staticInput: abi.encode(polyswapOrder)
         });
 
-        // bytes32 orderHash = composableCow.hash(params);
-        // console.logBytes32(orderHash);
+        console.logBytes32(composableCow.hash(params));
 
         vm.startBroadcast(deployerPrivateKey);
 
@@ -60,9 +60,11 @@ contract SubmitSingleOrder is Script {
             address(composableCow),
             0,
             abi.encodeCall(
-                composableCow.create,
+                composableCow.createWithContext,
                 (
                     params,
+                    IValueFactory(0x52eD56Da04309Aca4c3FECC595298d80C2f16BAc), // TimestampValueFactory
+                    bytes(""),
                     true
                 )
             ),
@@ -73,3 +75,28 @@ contract SubmitSingleOrder is Script {
         vm.stopBroadcast();
     }
 }
+
+contract ApproveSellTokenOnSafe is Script {
+    using SafeLib for Safe;
+
+    function run() external {
+        uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
+        Safe safe = Safe(payable(vm.envAddress("SAFE")));
+        IERC20 sellToken = IERC20(vm.envAddress("SELL_TOKEN"));
+        address spender = vm.envAddress("SPENDER");
+
+        safe.executeSingleOwner(
+            address(sellToken),
+            0,
+            abi.encodeCall(
+                sellToken.approve,
+                (
+                    spender,
+                    type(uint256).max
+                )
+            ),
+            Enum.Operation.Call,
+            vm.addr(deployerPrivateKey)
+        );
+    }
+}

src/PolyswapOrder.sol

@@ -50,13 +50,13 @@ library PolyswapOrder {
         if (!(address(self.sellToken) != address(0) && address(self.buyToken) != address(0))) {
             revert IConditionalOrder.OrderNotValid(INVALID_TOKEN);
         }
-        if (!(self.t0 > block.timestamp)) revert IConditionalOrder.OrderNotValid(INVALID_START_DATE);
+        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);
 
         // 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);
@@ -79,7 +79,7 @@ library PolyswapOrder {
             sellAmount: self.sellAmount,
             buyAmount: self.minBuyAmount,
             validTo: self.t.toUint32(),
-            appData: self.polymarketOrderHash,
+            appData: bytes32(0x053e648e24f8653eb9cffe71f170227d25f8fd69c135bcf2125ae24f4d210b9b), // need to create our own app data
             feeAmount: 0,
             kind: GPv2Order.KIND_SELL,
             partiallyFillable: false,

test/Notes.md

@@ -8,7 +8,7 @@
 `cast call $POLYMARKET_MOCK "getOrderStatus(bytes32)((bool,uint256))" $POLYMARKET_ORDER_HASH --rpc-url https://polygon-rpc.com`
 
 #### approve the sell token on the safe to the spender
-`cast send $SELL_TOKEN "approve(address,address,uint256)" $SAFE $SPENDER 0.01ether --private-key $PRIVATE_KEY --rpc-url https://polygon-rpc.com`
+`forge script ./script/SubmitSingleOrder.s.sol:ApproveSellTokenOnSafe --rpc-url https://polygon-rpc.com --broadcast --private-key $PRIVATE_KEY`
 
 ### if first time conditional order on safe:
 #### set fallback handler one time