Testing merge into refactored

.github/workflows/foundry-test.yml

@@ -0,0 +1,24 @@
+name: Run Foundry Tests
+
+on:
+  push:
+    branches:
+      [feat/operator-restrictions]  # This wildcard ensures that all branches are in scope
+
+jobs:
+  check:
+    name: Foundry project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+
+      - name: Run tests
+        run: forge test -vvv
+
+      - name: Run snapshot
+        run: forge snapshot

.github/workflows/slither-analysis.yml

@@ -0,0 +1,40 @@
+name: Slither Analysis
+
+on: [push, pull_request]
+
+jobs:
+  analyze:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Run Slither
+      uses: crytic/[email protected]
+      id: slither
+      with:
+        node-version: 16
+        fail-on: none
+        slither-args: --checklist --filter-paths "openzeppelin-contracts" --show-ignored-findings --markdown-root ${{ github.server_url }}/${{ github.repository }}/blob/${{ github.sha }}/
+
+    - name: Save Slither output to file
+      run: echo "${{ steps.slither.outputs.stdout }}" >> slither-output.txt
+
+    - name: Configure Git
+      run: |
+        git config user.name "GitHub Actions Bot"
+        git config user.email "[email protected]"
+
+    - name: Commit and push changes
+      run: |
+        git add slither-output.txt
+        git commit -m "Update Slither analysis output"
+        git push
+
+    # Upload Slither Report as an Artifact
+    - name: Upload Slither Report
+      if: always() # Ensure the artifact is uploaded even if previous steps fail
+      uses: actions/upload-artifact@v3
+      with:
+        name: slither-report
+        path: slither-output.txt 

.github/workflows/slither.yml

@@ -0,0 +1,41 @@
+name: Slither Analysis
+
+on: [push, pull_request]
+
+jobs:
+  analyze:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Run Slither
+      uses: crytic/[email protected]
+      id: slither
+      with:
+        target: 'src'
+        node-version: 16
+        fail-on: none
+        slither-args: --checklist --show-ignored-findings --markdown-root ${{ github.server_url }}/${{ github.repository }}/blob/${{ github.sha }}/
+
+    - name: Save Slither output to file
+      run: echo "${{ steps.slither.outputs.stdout }}" > slither-output.txt
+
+    - name: Configure Git
+      run: |
+        git config user.name "GitHub Actions Bot"
+        git config user.email "[email protected]"
+
+    - name: Commit and push changes
+      run: |
+        git add slither-output.txt
+        git commit -m "Update Slither analysis output"
+        git push
+
+    # Upload Slither Report as an Artifact
+    - name: Upload Slither Report
+      if: always() # Ensure the artifact is uploaded even if previous steps fail
+      uses: actions/upload-artifact@v3
+      with:
+        name: slither-report
+        path: slither-output.txt 

.github/workflows/solhint.yml

@@ -0,0 +1,28 @@
+name: Solhint Linter
+
+on:
+  push:
+    branches:
+      [feat/operator-restrictions] # This wildcard ensures that all branches are in scope
+
+jobs:
+  lint:
+    name: Lint Solidity Files
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: '14'  # You can specify your desired Node.js version here
+
+    - name: Install Solhint
+      run: npm install -g solhint
+
+    - name: Run Solhint
+      run: |
+        solhint --init  
+        solhint 'src/*.sol'

.solhint.json

@@ -0,0 +1,40 @@
+{
+  "extends": "solhint:default",
+  "plugins": [],
+  "rules": {
+    "avoid-throw": "warn",
+    "avoid-suicide": "error",
+    "avoid-sha3": "warn",
+    "avoid-tx-origin:": "warn",
+    "not-rely-on-time": "warn",
+    "not-rely-on-block-hash": "warn",
+    "code-complexity": ["warn",7],
+    "explicit-types": ["warn","explicit"],
+    "max-states-count": ["warn",15],
+    "no-console": "error",
+    "no-empty-blocks": "warn",
+    "no-global-import": "warn",
+    "no-unused-import": "warn",
+    "no-unused-vars": "warn",
+    "one-contract-per-file": "warn",
+    "payable-fallback": "warn",
+    "reason-string": ["warn",{"maxLength":32}],
+    "quotes": ["error","double"],
+    "const-name-snakecase": "warn",
+    "contract-name-camelcase": "warn",
+    "event-name-camelcase": "warn",
+    "func-name-mixedcase": "warn",
+    "use-forbidden-name": "warn",
+    "func-order": "warn",
+    "visibility-modifier-order": "warn",
+    "avoid-call-value": "warn",
+    "avoid-low-level-calls": "warn",
+    "check-send-result": "warn",
+    "compiler-version": ["error","^0.8.0"],
+    "multiple-sends": "warn",
+    "no-complex-fallback": "warn",
+    "no-inline-assembly": "warn",
+    "reentrancy": "warn",
+    "state-visibility": "warn"
+  }
+}

README.md

@@ -21,6 +21,17 @@ To run code in this repository, follow these steps:
    ```bash
    forge build
 
-5. **Run tests:**
+5. **Run unit tests:**
    ```bash
-   forge test
+   # tests will be ran on ethereum mainnet
+   forge test -vvv --match-path test/AdvancedOrderEngine.t.sol
+   ```
+
+6. **Run deploy and setup script**
+   ```bash
+   source .env
+   forge script script/deployOrderEngine.s.sol --rpc-url $PEGASUS_RPC_URL --legacy --broadcast
+
+   # deploy and verify
+   forge script script/deployOrderEngine.s.sol --rpc-url $PEGASUS_RPC_URL --broadcast -vvv --legacy --verify --verifier blockscout --verifier-url https://pegasus.lightlink.io/api/? --watch
+   ```

broadcast/deployFacilitatorSwapContract.s.sol/1890/run-1712310260.json

@@ -0,0 +1,52 @@
+{
+  "transactions": [
+    {
+      "hash": "0xf22157bc265e79fb7b7fc419044fb340e5f547f4d1a94ab6d60d751a48687be5",
+      "transactionType": "CREATE",
+      "contractName": "OrderEngine",
+      "contractAddress": "0x490Fb03F26B1c384D24f95e5771299770fef565f",
+      "function": null,
+      "arguments": null,
+      "transaction": {
+        "type": "0x00",
+        "from": "0xf29f5fc83c9310c887efce9d68cae1f046b6511b",
+        "gas": "0xd7c66",
+        "data": "0x6080806040523461001a57610b5b9081610020823930815050f35b600080fdfe608060405260048036101561001357600080fd5b60003560e01c90816321cd19a91461069f5781634416e986146104d857816395de97cc146104b7578163b4c07547146100d557508063b91611f41461007c5763c3c1f2ec1461006157600080fd5b602061007461006f3661077e565b610985565b604051908152f35b60007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100d05760206040517fb91209a767a8178c503c992a2db0dd232393048d748c43a04d40fcccacc0df008152f35b600080fd5b60207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100d05780359067ffffffffffffffff82116100d057366023830112156100d05781602461012e93369301359101610895565b60606101c060405161013f8161082d565b60008152600060208201526000604082015260008382015260006080820152600060a0820152600060c0820152600060e0820152600061010082015260006101208201526000610140820152600061016082015282610180820152826101a082015201526101e0818051810103126100d05760208101516040820151916060810151608082015160a08301516101d760c08501610b04565b6101e360e08601610b04565b6101f06101008701610b04565b6101fd6101208801610b04565b9161020b6101408901610b04565b936101608901519586151587036100d0576101808a0151976101a08b0151996101c08c01519b6101e001519c6040519b60208d015260208c5261024d8c610879565b6040519c60208e015260208d526102638d610879565b6040519d60208f01528d6020815261027a90610879565b6040519e8f916102898361082d565b825260208201526040015260608d015260808c015273ffffffffffffffffffffffffffffffffffffffff1660a08b015273ffffffffffffffffffffffffffffffffffffffff1660c08a015273ffffffffffffffffffffffffffffffffffffffff1660e089015273ffffffffffffffffffffffffffffffffffffffff1661010088015273ffffffffffffffffffffffffffffffffffffffff1661012087015215156101408601526101608501526101808401526101a08301526101c082015260405180916020825280516020830152602081015160408301526040810151606083015260608101516080830152608081015160a083015260a081015173ffffffffffffffffffffffffffffffffffffffff1660c083015260c081015173ffffffffffffffffffffffffffffffffffffffff1660e083015260e081015173ffffffffffffffffffffffffffffffffffffffff1661010083015261010081015173ffffffffffffffffffffffffffffffffffffffff1661012083015261012081015173ffffffffffffffffffffffffffffffffffffffff1661014083015261014081015115156101608301526101608101516101808301526101808101516101a083016101e09052610200830161045c916107cf565b906101a08101517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09283858203016101c0860152610499916107cf565b906101c0015191838203016101e08401526104b3916107cf565b0390f35b60206104cd60a06104c73661077e565b01610906565b3b1515604051908152f35b6104e13661077e565b6104ed60a08201610906565b6104f960c08301610906565b61050560e08401610906565b9061016061010094610518868201610906565b9361012090610528828401610906565b9061014091610538838601610927565b9361055161054a610180880188610934565b3691610895565b602081519101209761056a61054a6101a0890189610934565b602081519101209961058361054a6101c08a018a610934565b602081519101209b6040519d8e918a35602084015260208b0135604084015260408b0135606084015260608b0135608084015260808b013560a084015273ffffffffffffffffffffffffffffffffffffffff978880968180941660c08701521660e08501521691015216908b0152169088015215158287015201356101808501526101a08401526101c08301526101e09081830152815261020081019181831067ffffffffffffffff84111761067157507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0090826040526020835261066c6102208201826107cf565b030190f35b6041907f4e487b71000000000000000000000000000000000000000000000000000000006000525260246000fd5b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc6040813601126100d057813567ffffffffffffffff918282116100d0576101e09082360301126100d0576106f5908301610985565b60405160208101917f1901000000000000000000000000000000000000000000000000000000000000835260243560228301526042820152604281526080810192818410908411176107505760209350826040525190208152f35b6041847f4e487b71000000000000000000000000000000000000000000000000000000006000525260246000fd5b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc906020828201126100d0576004359167ffffffffffffffff83116100d057826101e0920301126100d05760040190565b919082519283825260005b8481106108195750507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8460006020809697860101520116010190565b6020818301810151848301820152016107da565b6101e0810190811067ffffffffffffffff82111761084a57604052565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040810190811067ffffffffffffffff82111761084a57604052565b92919267ffffffffffffffff9182811161084a5760405192601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f011684019081118482101761084a576040528294818452818301116100d0578281602093846000960137010152565b3573ffffffffffffffffffffffffffffffffffffffff811681036100d05790565b3580151581036100d05790565b9035907fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1813603018212156100d0570180359067ffffffffffffffff82116100d0576020019181360383136100d057565b61099160a08201610906565b9061099e60c08201610906565b6109aa60e08301610906565b90610160610100936109bd858201610906565b92610120956109cd878401610906565b90610140916109dd838601610927565b92610180946109f161054a87890189610934565b6020815191012098610a0a61054a6101a08a018a610934565b602081519101209a610a2361054a6101c08b018b610934565b602081519101209c6040519e8f927fb91209a767a8178c503c992a2db0dd232393048d748c43a04d40fcccacc0df0060208501528b35604085015260208c0135606085015260408c0135608085015260608c013560a085015260808c013560c085015273ffffffffffffffffffffffffffffffffffffffff988980978180951660e088015216908501521691015216908b0152168489015215159087015201356101a08501526101c08401526101e083015261020090818301528152610220810181811067ffffffffffffffff82111761084a576040526020815191012090565b519073ffffffffffffffffffffffffffffffffffffffff821682036100d05756fea26469706673582212201805f314460b1a5374bb253f72f024bdc8ea21cc2e77073b1164f84307a2015264736f6c63430008150033",
+        "nonce": "0x9"
+      },
+      "additionalContracts": [],
+      "isFixedGasLimit": false
+    },
+    {
+      "hash": "0xb19713a8dfe84120ca9a90e8908450883ef3458d28c96bdc9a23114b3fe3f089",
+      "transactionType": "CREATE",
+      "contractName": "FacilitatorSwap",
+      "contractAddress": "0x8eE74f511c7e46D96E46C364009e69a9DeddC20F",
+      "function": null,
+      "arguments": null,
+      "transaction": {
+        "type": "0x00",
+        "from": "0xf29f5fc83c9310c887efce9d68cae1f046b6511b",
+        "gas": "0xb0beb",
+        "value": "0x0",
+        "data": "0x6080806040523461003c57600080546001600160a01b031916736b3ea22c757bbf9c78ccaaa2ed9562b57001720b1790556108bb90816100428239f35b600080fdfe60406080815260048036101561001457600080fd5b600091823560e01c80632499e3a2146101af578063c851cc32146101375763e1f21c671461004157600080fd5b346101335760607ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261013357826100796106ec565b926024359073ffffffffffffffffffffffffffffffffffffffff9081831680930361012f57602093604492865197889586947f095ea7b300000000000000000000000000000000000000000000000000000000865285015284356024850152165af190811561012657506100eb575080f35b6020813d821161011e575b8161010360209383610642565b8101031261011a5751801515036101175780f35b80fd5b5080fd5b3d91506100f6565b513d84823e3d90fd5b8380fd5b8280fd5b83346101175760207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101175773ffffffffffffffffffffffffffffffffffffffff6101846106ec565b167fffffffffffffffffffffffff000000000000000000000000000000000000000082541617815580f35b5082346101175760c07ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101175767ffffffffffffffff8335818111610133576101ff903690860161060c565b93909460249283358181116106085761021b903690840161060c565b505060443581811161060857610234903690840161060c565b50506064358181116106085761024d903690840161060c565b60849491943583811161060457610267903690860161060c565b96909460a435948511610600573660238601121561060057848101359761028d896106b2565b9761029a8651998a610642565b8989526020998a8a0197368683830101116105ac57818d92878e93018b378b0101528a8073ffffffffffffffffffffffffffffffffffffffff988982541690828d51925af19b3d156105f8573d9c6102f18e6106b2565b9d88519e8f906103019082610642565b528d8d8d3d92013e5b156105f4578d61032060449c9d9e9f8390610730565b88517fc3c1f2ec0000000000000000000000000000000000000000000000000000000081528681018f9052813588820152818f01359d81019d909d528089013560648e0152606081013560848e0152608081013560a48e01528c60c48b61038960a0850161070f565b169101528c60e48b61039d60c0850161070f565b169101528c6101048b6103b260e0850161070f565b169101528c6101248b6103c8610100850161070f565b169101528c6101448b6103de610120850161070f565b169101526101408101358015158091036105f0578d8f9261049590829361016484015261016081013561018484015261043261041e610180830183610798565b6101e06101a48701526102048601916107e8565b6104856104796104466101a0850185610798565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdc949185898403016101c48a01526107e8565b926101c0810190610798565b91858403016101e48601526107e8565b038173490fb03f26b1c384d24f95e5771299770fef565f5af49b8c156105e4578e9c6105b0575b5060a0916104c991610730565b0135948786168096036105ac5715610581573595861680960361057d57156105535750509261053f92827f9a150784ee1734e823c00b5a817fab779b92b02d62cbfdc1c509b1ed3054c2e8999a9561054d979451998a998a5289015287015235606086015260c0608086015260c0850190610827565b9083820360a0850152610827565b0390a180f35b60328a917f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b8a80fd5b838c6032857f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b8c80fd5b909b508c81813d83116105dd575b6105c88183610642565b810103126105d957519a60a06104bc565b8d80fd5b503d6105be565b8e8951903d90823e3d90fd5b8f80fd5b8b80fd5b60609c61030a565b8880fd5b8780fd5b8580fd5b9181601f8401121561063d5782359167ffffffffffffffff831161063d576020808501948460051b01011161063d57565b600080fd5b90601f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0910116810190811067ffffffffffffffff82111761068357604052565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b67ffffffffffffffff811161068357601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01660200190565b6004359073ffffffffffffffffffffffffffffffffffffffff8216820361063d57565b359073ffffffffffffffffffffffffffffffffffffffff8216820361063d57565b9015610769578035907ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe218136030182121561063d570190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b90357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe18236030181121561063d57016020813591019167ffffffffffffffff821161063d57813603831361063d57565b601f82602094937fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0938186528686013760008582860101520116010190565b919082519283825260005b8481106108715750507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8460006020809697860101520116010190565b60208183018101518483018201520161083256fea2646970667358221220502c9b787c38b03faace0f456e585cdc4b8fd1097bd573294dc0fb27aa5c3de464736f6c63430008150033",
+        "nonce": "0xa"
+      },
+      "additionalContracts": [],
+      "isFixedGasLimit": false
+    }
+  ],
+  "receipts": [],
+  "libraries": [
+    "src/libraries/OrderEngine.sol:OrderEngine:0x490fb03f26b1c384d24f95e5771299770fef565f"
+  ],
+  "pending": [
+    "0xf22157bc265e79fb7b7fc419044fb340e5f547f4d1a94ab6d60d751a48687be5",
+    "0xb19713a8dfe84120ca9a90e8908450883ef3458d28c96bdc9a23114b3fe3f089"
+  ],
+  "returns": {},
+  "timestamp": 1712310260,
+  "chain": 1890,
+  "multi": false,
+  "commit": "9a9f020"
+}