Fix Review #1

sherlock-admin · 2025-01-07T17:29:23Z

Fix Review of

Repo: gfx-labs/oku-custom-order-types
Commit Hash: bc8d82dad10a3e426dc0fded79d5278ef23581c7

sherlock-admin · 2025-01-07T17:29:31Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

@@ -2,16 +2,17 @@
 pragma solidity ^0.8.19;

 import "./IAutomation.sol";
+import "../oracle/IPythRelay.sol";


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:29:33Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

@@ -2,16 +2,17 @@
 pragma solidity ^0.8.19;

 import "./IAutomation.sol";
+import "../oracle/IPythRelay.sol";
 import "../libraries/ArrayMutation.sol";
 import "../interfaces/openzeppelin/Ownable.sol";
 import "../interfaces/openzeppelin/ERC20.sol";


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:29:34Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

+import "../interfaces/openzeppelin/Pausable.sol";



Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:29:37Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

 import "../libraries/ArrayMutation.sol";
 import "../interfaces/openzeppelin/Ownable.sol";
 import "../interfaces/openzeppelin/ERC20.sol";
 import "../interfaces/openzeppelin/IERC20.sol";
 import "../interfaces/openzeppelin/SafeERC20.sol";
-import "../oracle/IPythRelay.sol";
+import "../interfaces/openzeppelin/Pausable.sol";

 ///@notice This contract owns and handles all of the settings and accounting logic for automated swaps
 ///@notice This contract should not hold any user funds, only collected fees


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:29:38Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol


 ///@notice This contract owns and handles all of the settings and accounting logic for automated swaps
 ///@notice This contract should not hold any user funds, only collected fees
-contract AutomationMaster is IAutomationMaster, Ownable {
+contract AutomationMaster is IAutomationMaster, Ownable, Pausable {


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:29:40Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol


 ///@notice This contract owns and handles all of the settings and accounting logic for automated swaps
 ///@notice This contract should not hold any user funds, only collected fees
-contract AutomationMaster is IAutomationMaster, Ownable {
+contract AutomationMaster is IAutomationMaster, Ownable, Pausable {
    using SafeERC20 for IERC20;

    ///@notice maximum pending orders that may exist at a time, limiting the compute requriement for checkUpkeep


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:29:45Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

@@ -27,6 +28,25 @@ contract AutomationMaster is IAutomationMaster, Ownable {
    ///each token must have a registered oracle in order to be tradable


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:29:47Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

@@ -27,6 +28,25 @@ contract AutomationMaster is IAutomationMaster, Ownable {
    ///each token must have a registered oracle in order to be tradable
    mapping(IERC20 => IPythRelay) public oracles;


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:29:49Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

@@ -27,6 +28,25 @@ contract AutomationMaster is IAutomationMaster, Ownable {
    ///each token must have a registered oracle in order to be tradable
    mapping(IERC20 => IPythRelay) public oracles;
    mapping(IERC20 => bytes32) public pythIds;


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:29:51Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

+    mapping(address => uint96) private nonces;
+


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:29:53Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

+    constructor(address owner){
+        _transferOwnership(owner);
+    }
+


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:29:55Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

+    function pauseAll(
+        bool pause,
+        IOracleLess oracleLessContract
+    ) external override onlyOwner {
+        if (pause) {
+            _pause();
+        } else {
+            _unpause();
+        }
+        STOP_LIMIT_CONTRACT.pause(pause);
+        BRACKET_CONTRACT.pause(pause);
+        oracleLessContract.pause(pause);
+    }


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:29:57Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

+        STOP_LIMIT_CONTRACT.pause(pause);
+        BRACKET_CONTRACT.pause(pause);
+        oracleLessContract.pause(pause);
+    }

    ///@notice register Stop Limit and Bracket order contracts


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:30:05Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

@@ -87,9 +107,14 @@ contract AutomationMaster is IAutomationMaster, Ownable {
    }

    ///@notice generate a random and unique order id


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:30:07Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

+    function generateOrderId(
+        address sender
+    ) external override returns (uint96) {
+        uint96 nonce = nonces[sender]++;


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:30:09Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

+    function generateOrderId(
+        address sender
+    ) external override returns (uint96) {
+        uint96 nonce = nonces[sender]++;
        uint256 hashedValue = uint256(


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:30:11Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

+            keccak256(
+                abi.encodePacked(sender, nonce, blockhash(block.number - 1))
+            )


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:30:13Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

-            keccak256(abi.encodePacked(sender, block.timestamp))
+            keccak256(
+                abi.encodePacked(sender, nonce, blockhash(block.number - 1))
+            )
        );


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:30:20Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

    ///@notice determine if a new order meets the minimum order size requirement
    ///Value of @param amountIn of @param tokenIn must meed the minimum USD value


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:30:22Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

+    function checkMinOrderSize(
+        IERC20 tokenIn,
+        uint256 amountIn
+    ) external view override {


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:30:25Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

@@ -151,28 +179,32 @@ contract AutomationMaster is IAutomationMaster, Ownable {

    ///@notice check upkeep on all order types


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:30:27Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

@@ -151,28 +179,32 @@ contract AutomationMaster is IAutomationMaster, Ownable {

    ///@notice check upkeep on all order types
    function checkUpkeep(
-        bytes calldata
+        bytes calldata checkData


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:30:28Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

@@ -151,28 +179,32 @@ contract AutomationMaster is IAutomationMaster, Ownable {

    ///@notice check upkeep on all order types
    function checkUpkeep(
-        bytes calldata
+        bytes calldata checkData
    )
        external
        view
        override
        returns (bool upkeepNeeded, bytes memory performData)
    {
        //check stop limit order


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:30:31Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

+        (upkeepNeeded, performData) = STOP_LIMIT_CONTRACT.checkUpkeep(
+            checkData
+        );


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:30:32Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

-        (upkeepNeeded, performData) = STOP_LIMIT_CONTRACT.checkUpkeep("0x");
+        (upkeepNeeded, performData) = STOP_LIMIT_CONTRACT.checkUpkeep(
+            checkData
+        );
        if (upkeepNeeded) {
            return (true, performData);
        }

        //check bracket order


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:30:34Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

        if (upkeepNeeded) {
            return (true, performData);
        }

        //check bracket order
-        (upkeepNeeded, performData) = BRACKET_CONTRACT.checkUpkeep("0x");
+        (upkeepNeeded, performData) = BRACKET_CONTRACT.checkUpkeep(checkData);


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:30:36Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

        if (upkeepNeeded) {
            return (true, performData);
        }

        //check bracket order
-        (upkeepNeeded, performData) = BRACKET_CONTRACT.checkUpkeep("0x");
+        (upkeepNeeded, performData) = BRACKET_CONTRACT.checkUpkeep(checkData);
        if (upkeepNeeded) {
            return (true, performData);
        }
    }

    ///@notice perform upkeep on any order type


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:30:38Z

oku-custom-order-types/contracts/automatedTrigger/AutomationMaster.sol

+    function performUpkeep(
+        bytes calldata performData
+    ) external override whenNotPaused {


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-07T17:30:42Z

oku-custom-order-types/contracts/automatedTrigger/Bracket.sol

@@ -10,13 +10,14 @@ import "../interfaces/openzeppelin/Ownable.sol";
 import "../interfaces/openzeppelin/IERC20.sol";
 import "../interfaces/openzeppelin/SafeERC20.sol";
 import "../interfaces/openzeppelin/ReentrancyGuard.sol";
+import "../interfaces/openzeppelin/Pausable.sol";


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:39:15Z

oku-custom-order-types/contracts/automatedTrigger/OracleLess.sol

+        //emit event
+        emit OrderCancelled(order.orderId);


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:39:17Z

oku-custom-order-types/contracts/automatedTrigger/OracleLess.sol

-        }
-        return false;
+        //emit event
+        emit OrderCancelled(order.orderId);
    }


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:39:21Z

oku-custom-order-types/contracts/automatedTrigger/OracleLess.sol

+        uint96 pendingOrderIdx,
        bool permit,


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:39:23Z

oku-custom-order-types/contracts/automatedTrigger/OracleLess.sol

        bytes calldata permitPayload
    ) internal {
        //fetch order
        Order memory order = orders[orderId];
-
+        require(
+            order.orderId == pendingOrderIds[pendingOrderIdx],
+            "order doesn't exist"


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:39:25Z

oku-custom-order-types/contracts/automatedTrigger/OracleLess.sol

+        require(
+            order.orderId == pendingOrderIds[pendingOrderIdx],
+            "order doesn't exist"
+        );


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:39:27Z

oku-custom-order-types/contracts/automatedTrigger/OracleLess.sol

+        require(
+            order.orderId == pendingOrderIds[pendingOrderIdx],
+            "order doesn't exist"
+        );
        require(msg.sender == order.recipient, "only order owner");


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:39:30Z

oku-custom-order-types/contracts/automatedTrigger/OracleLess.sol

@@ -207,6 +249,7 @@ contract OracleLess is IOracleLess, Ownable, ReentrancyGuard {
                //refund position partially
                order.tokenIn.safeTransfer(order.recipient, amountInDelta);
            }
+            require(newAmountIn != 0, "newAmountIn == 0");


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:39:32Z

oku-custom-order-types/contracts/automatedTrigger/OracleLess.sol

@@ -207,6 +249,7 @@ contract OracleLess is IOracleLess, Ownable, ReentrancyGuard {
                //refund position partially
                order.tokenIn.safeTransfer(order.recipient, amountInDelta);
            }
+            require(newAmountIn != 0, "newAmountIn == 0");
        }


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:39:40Z

oku-custom-order-types/contracts/automatedTrigger/OracleLess.sol

+            target,
+            (order.tokenIn.allowance(address(this), target))
+        );
+
        uint256 finalTokenIn = order.tokenIn.balanceOf(address(this));
        require(finalTokenIn >= initialTokenIn - order.amountIn, "over spend");


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:39:58Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

@@ -8,10 +8,11 @@ import "../interfaces/openzeppelin/Ownable.sol";
 import "../interfaces/openzeppelin/IERC20.sol";
 import "../interfaces/openzeppelin/SafeERC20.sol";
 import "../interfaces/openzeppelin/ReentrancyGuard.sol";


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:40:00Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

@@ -8,10 +8,11 @@ import "../interfaces/openzeppelin/Ownable.sol";
 import "../interfaces/openzeppelin/IERC20.sol";
 import "../interfaces/openzeppelin/SafeERC20.sol";
 import "../interfaces/openzeppelin/ReentrancyGuard.sol";
+import "../interfaces/openzeppelin/Pausable.sol";

 ///@notice This contract owns and handles all logic associated with STOP_LIMIT orders
 ///STOP_LIMIT orders create a new Bracket order order with the same order ID once filled


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:40:02Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol


 ///@notice This contract owns and handles all logic associated with STOP_LIMIT orders
 ///STOP_LIMIT orders create a new Bracket order order with the same order ID once filled
-contract StopLimit is Ownable, IStopLimit, ReentrancyGuard {
+contract StopLimit is Ownable, IStopLimit, ReentrancyGuard, Pausable {


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:40:05Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

@@ -25,11 +26,25 @@ contract StopLimit is Ownable, IStopLimit, ReentrancyGuard {
    constructor(
        IAutomationMaster _master,


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:40:07Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

+        IPermit2 _permit2,
+        address owner


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:40:08Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

    ) {
        MASTER = _master;
        BRACKET_CONTRACT = _bracket;
        permit2 = _permit2;
+        _transferOwnership(owner);


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:40:16Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

+    ) external override nonReentrant whenNotPaused {
        MasterUpkeepData memory data = abi.decode(
            performData,


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:40:19Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

+            address(BRACKET_CONTRACT),
+            (order.tokenIn.allowance(address(this), address(BRACKET_CONTRACT)))
+        );
+


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:40:20Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

            address(BRACKET_CONTRACT),
-            order.tokenIn,
            order.amountIn


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:40:32Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

@@ -158,19 +195,22 @@ contract StopLimit is Ownable, IStopLimit, ReentrancyGuard {
        bool swapOnFill,
        bool permit,
        bytes calldata permitPayload


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:40:34Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

+    ) external override nonReentrant whenNotPaused {
        if (permit) {
+            require(amountIn < type(uint160).max, "uint160 overflow");
            handlePermit(
-                recipient,
+                msg.sender,
                permitPayload,


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:40:36Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

            handlePermit(
-                recipient,
+                msg.sender,
                permitPayload,
                uint160(amountIn),


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:40:38Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

        }

+        MASTER.checkMinOrderSize(tokenIn, amountIn);
+
        _createOrder(
            stopLimitPrice,
            takeProfit,


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:40:46Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

        bytes calldata permitPayload
-    ) external override nonReentrant {
+    ) external override nonReentrant whenNotPaused {


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:40:48Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

+                    require(
+                        _amountInDelta < type(uint160).max,
+                        "uint160 overflow"
+                    );
                    handlePermit(
                        order.recipient,
                        permitPayload,


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:40:52Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

+    ///@notice allow administrator to cancel any order
+    ///@notice once cancelled, any funds assocaiated with the order are returned to the order recipient
+    ///@notice only pending orders can be cancelled
+    function adminCancelOrder(


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:40:54Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

+        _cancelOrder(order, pendingOrderIdx);
    }



Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:41:02Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

@@ -348,37 +419,31 @@ contract StopLimit is Ownable, IStopLimit, ReentrancyGuard {
            recipient: recipient,
            direction: MASTER.getExchangeRate(tokenIn, tokenOut) >
                stopLimitPrice, //compare to stop price for this order's direction
+            bracketDirection: bracketDirection,
            swapOnFill: swapOnFill
        });
        pendingOrderIds.push(uint96(orderId));
        //emit
        emit OrderCreated(orderId);


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:41:04Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

+        //remove from pending array
+        pendingOrderIds = ArrayMutation.removeFromArray(


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:41:06Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

    }

    ///@notice handle signature and acquisition of asset with permit2
    function handlePermit(
-        address owner,
+        address tokenOwner,
        bytes calldata permitPayload,


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

sherlock-admin · 2025-01-27T17:41:09Z

oku-custom-order-types/contracts/automatedTrigger/StopLimit.sol

-            );
-        }
+        permit2.permit(tokenOwner, payload.permitSingle, payload.signature);
+        permit2.transferFrom(tokenOwner, address(this), amount, token);


Change related to gfx-labs/oku-custom-order-types#1.

Fixes issues: #796, #763, #115, #589, #731, #700, #161, #789, #726, #109, #449, #761, #542, #24, #810, #202, #421, #429, #331, #357, #277, #64, #424, #745, #72, #146, #896, #904, #901, #900, #62, #267, #406, #486, #502, #604, #708, #771, #821, #871

Fix Review

6fcb9c6

sherlock-admin commented Jan 7, 2025

View reviewed changes

sherlock-admin commented Jan 27, 2025

View reviewed changes

		@@ -27,6 +28,25 @@ contract AutomationMaster is IAutomationMaster, Ownable {
		///each token must have a registered oracle in order to be tradable

		@@ -27,6 +28,25 @@ contract AutomationMaster is IAutomationMaster, Ownable {
		///each token must have a registered oracle in order to be tradable
		mapping(IERC20 => IPythRelay) public oracles;

		@@ -87,9 +107,14 @@ contract AutomationMaster is IAutomationMaster, Ownable {
		}

		///@notice generate a random and unique order id

		///@notice determine if a new order meets the minimum order size requirement
		///Value of @param amountIn of @param tokenIn must meed the minimum USD value

		@@ -151,28 +179,32 @@ contract AutomationMaster is IAutomationMaster, Ownable {

		///@notice check upkeep on all order types

		@@ -25,11 +26,25 @@ contract StopLimit is Ownable, IStopLimit, ReentrancyGuard {
		constructor(
		IAutomationMaster _master,

		//remove from pending array
		pendingOrderIds = ArrayMutation.removeFromArray(

Fix Review #1

Are you sure you want to change the base?

Fix Review #1

Conversation

sherlock-admin commented Jan 7, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment