From bb9bad005c8be84d9bca9c4605f676af6718faf4 Mon Sep 17 00:00:00 2001 From: 0xneves Date: Thu, 7 Dec 2023 19:42:35 -0300 Subject: [PATCH 1/4] fix: unziping executable correctly --- .github/workflows/fuzz-testing.yml | 109 +++++++++++++++-------------- 1 file changed, 55 insertions(+), 54 deletions(-) diff --git a/.github/workflows/fuzz-testing.yml b/.github/workflows/fuzz-testing.yml index e266ff2..96ab7e4 100644 --- a/.github/workflows/fuzz-testing.yml +++ b/.github/workflows/fuzz-testing.yml @@ -1,59 +1,60 @@ name: Fuzz Testing on: - push: - branches: - - main - pull_request: + push: + branches: + - main + pull_request: jobs: - echidna: - name: Echidna - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - testName: - - TestFactory - - TestSwaplace - - env: - DEPLOYER_PRIVATE_KEY: ${{ secrets.DEPLOYER_PRIVATE_KEY }} - - steps: - - uses: actions/checkout@v2 - - - name: Set up node - uses: actions/setup-node@v1 - with: - node-version: 18.16.0 - - - name: Set up Python 3.8 - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - - name: Install node dependencies - run: yarn install - - - name: Install pip3 - run: | - python -m pip install --upgrade pip - - - name: Install slither - run: | - pip3 install slither-analyzer - - - name: Install echidna - run: | - sudo wget -O /tmp/echidna-2.2.1-Linux.zip https://github.com/crytic/echidna/releases/download/v2.2.1/echidna-2.2.1-Linux.zip - sudo unzip /tmp/echidna-2.2.1-Linux.zip -d /usr/bin - cd /usr/bin - ls -a - sudo chmod +x /usr/bin/echidna - - - name: Run ${{ matrix.testName }} as properties - run: echidna . --contract ${{ matrix.testName }} --test-mode property --config echidna.config.yml - - - name: Run ${{ matrix.testName }} as assertion - run: echidna . --contract ${{ matrix.testName }} --test-mode assertion --config echidna.config.yml + echidna: + name: Echidna + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + testName: + - TestFactory + - TestSwaplace + + env: + DEPLOYER_PRIVATE_KEY: ${{ secrets.DEPLOYER_PRIVATE_KEY }} + + steps: + - uses: actions/checkout@v2 + + - name: Set up node + uses: actions/setup-node@v1 + with: + node-version: 18.16.0 + + - name: Set up Python 3.8 + uses: actions/setup-python@v2 + with: + python-version: 3.8 + + - name: Install node dependencies + run: yarn install + + - name: Install pip3 + run: | + python -m pip install --upgrade pip + + - name: Install slither + run: | + pip3 install slither-analyzer + + - name: Install echidna + run: | + sudo wget -O /tmp/echidna-2.2.1-Linux.zip https://github.com/crytic/echidna/releases/download/v2.2.1/echidna-2.2.1-Linux.zip + sudo unzip /tmp/echidna-2.2.1-Linux.zip -d /usr/bin + sudo tar -xf /tmp/echidna.tar.gz -C /usr/bin + cd /usr/bin + ls -a + sudo chmod +x /usr/bin/echidna + + - name: Run ${{ matrix.testName }} as properties + run: echidna . --contract ${{ matrix.testName }} --test-mode property --config echidna.config.yml + + - name: Run ${{ matrix.testName }} as assertion + run: echidna . --contract ${{ matrix.testName }} --test-mode assertion --config echidna.config.yml From 20bbaa9a3900be209e7df6ea1b764feb95148801 Mon Sep 17 00:00:00 2001 From: 0xneves Date: Thu, 7 Dec 2023 19:50:01 -0300 Subject: [PATCH 2/4] fix: fixing extraction path --- .github/workflows/fuzz-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fuzz-testing.yml b/.github/workflows/fuzz-testing.yml index 96ab7e4..df29fad 100644 --- a/.github/workflows/fuzz-testing.yml +++ b/.github/workflows/fuzz-testing.yml @@ -48,7 +48,7 @@ jobs: run: | sudo wget -O /tmp/echidna-2.2.1-Linux.zip https://github.com/crytic/echidna/releases/download/v2.2.1/echidna-2.2.1-Linux.zip sudo unzip /tmp/echidna-2.2.1-Linux.zip -d /usr/bin - sudo tar -xf /tmp/echidna.tar.gz -C /usr/bin + sudo tar -xf /usr/bin/echidna.tar.gz cd /usr/bin ls -a sudo chmod +x /usr/bin/echidna From bde72a59793bb1a3ae3f6c21cb907c32579f6a79 Mon Sep 17 00:00:00 2001 From: 0xneves Date: Thu, 7 Dec 2023 19:53:35 -0300 Subject: [PATCH 3/4] fix: adding destination folder again --- .github/workflows/fuzz-testing.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/fuzz-testing.yml b/.github/workflows/fuzz-testing.yml index df29fad..73187c7 100644 --- a/.github/workflows/fuzz-testing.yml +++ b/.github/workflows/fuzz-testing.yml @@ -48,9 +48,7 @@ jobs: run: | sudo wget -O /tmp/echidna-2.2.1-Linux.zip https://github.com/crytic/echidna/releases/download/v2.2.1/echidna-2.2.1-Linux.zip sudo unzip /tmp/echidna-2.2.1-Linux.zip -d /usr/bin - sudo tar -xf /usr/bin/echidna.tar.gz - cd /usr/bin - ls -a + sudo tar -xf /usr/bin/echidna.tar.gz -C /usr/bin sudo chmod +x /usr/bin/echidna - name: Run ${{ matrix.testName }} as properties From a1e50f3602404595374d41242874abafa773e2cb Mon Sep 17 00:00:00 2001 From: 0xneves Date: Thu, 7 Dec 2023 20:02:25 -0300 Subject: [PATCH 4/4] fix: removing owner check from make swap - removed the owner check because although the owner needs to be msg.sender, we should not check for view functions since once third party entity could create a swap for someone --- contracts/echidna/TestSwapFactory.sol | 1 - 1 file changed, 1 deletion(-) diff --git a/contracts/echidna/TestSwapFactory.sol b/contracts/echidna/TestSwapFactory.sol index 4c050d6..ad48115 100644 --- a/contracts/echidna/TestSwapFactory.sol +++ b/contracts/echidna/TestSwapFactory.sol @@ -37,7 +37,6 @@ contract TestFactory is SwapFactory { make_asset_array(addr, amountOrId) ); - assert(owner != address(0)); assert(swap.expiry > block.timestamp); assert(swap.biding.length > 0); assert(swap.asking.length > 0);