diff --git a/.github/workflows/echidna.yml b/.github/workflows/echidna.yml index 4b9396ea..097fc793 100644 --- a/.github/workflows/echidna.yml +++ b/.github/workflows/echidna.yml @@ -4,15 +4,15 @@ on: push: paths: - ".github/workflows/echidna.yml" - - "program-analysis/echidna/**/*.sol" - - "program-analysis/echidna/**/*.yml" + - "src/program-analysis/echidna/**/*.sol" + - "src/program-analysis/echidna/**/*.yml" branches: - master pull_request: paths: - ".github/workflows/echidna.yml" - - "program-analysis/echidna/**/*.sol" - - "program-analysis/echidna/**/*.yml" + - "src/program-analysis/echidna/**/*.sol" + - "src/program-analysis/echidna/**/*.yml" schedule: # run CI every day even if no PRs/merges occur - cron: "0 12 * * *" @@ -27,25 +27,25 @@ jobs: matrix: include: - name: Exercise 1 - workdir: program-analysis/echidna/exercises/exercise1/ + workdir: src/program-analysis/echidna/exercises/exercise1/ files: solution.sol contract: TestToken outcome: failure expected: 'echidna_test_balance:\s*failed' - name: Exercise 2 - workdir: program-analysis/echidna/exercises/exercise2/ + workdir: src/program-analysis/echidna/exercises/exercise2/ files: solution.sol contract: TestToken outcome: failure expected: 'echidna_no_transfer:\s*failed' - name: Exercise 3 - workdir: program-analysis/echidna/exercises/exercise3/ + workdir: src/program-analysis/echidna/exercises/exercise3/ files: solution.sol contract: TestToken outcome: failure expected: 'echidna_test_balance:\s*failed' - name: Exercise 4 - workdir: program-analysis/echidna/exercises/exercise4/ + workdir: src/program-analysis/echidna/exercises/exercise4/ files: solution.sol config: config.yaml contract: TestToken @@ -76,32 +76,32 @@ jobs: outcome: failure expected: 'testPoolBalance():\s*failed' - name: TestToken - workdir: program-analysis/echidna/example/ + workdir: src/program-analysis/echidna/example/ files: testtoken.sol contract: TestToken outcome: failure expected: 'echidna_balance_under_1000:\s*failed' - name: Gas estimation - workdir: program-analysis/echidna/example/ + workdir: src/program-analysis/echidna/example/ files: gas.sol config: gas.yaml outcome: success expected: "f(42,123," flaky: true - name: Multi - workdir: program-analysis/echidna/example/ + workdir: src/program-analysis/echidna/example/ files: multi.sol config: filter.yaml outcome: failure expected: 'echidna_state4:\s*failed' - name: Assert - workdir: program-analysis/echidna/example/ + workdir: src/program-analysis/echidna/example/ files: assert.sol config: assert.yaml outcome: failure expected: 'inc(uint256):\s*failed' - name: PopsicleBroken - workdir: program-analysis/echidna/example/ + workdir: src/program-analysis/echidna/example/ files: PopsicleBroken.sol solc-version: 0.8.4 config: Popsicle.yaml @@ -109,7 +109,7 @@ jobs: outcome: failure expected: 'totalBalanceAfterTransferIsPreserved(address,uint256):\s*failed' - name: PopsicleFixed - workdir: program-analysis/echidna/example/ + workdir: src/program-analysis/echidna/example/ files: PopsicleFixed.sol solc-version: 0.8.4 config: Popsicle.yaml @@ -117,7 +117,7 @@ jobs: outcome: success expected: 'totalBalanceAfterTransferIsPreserved(address,uint256):\s*passing' - name: TestDepositWithPermit - workdir: program-analysis/echidna/example/ + workdir: src/program-analysis/echidna/example/ files: TestDepositWithPermit.sol solc-version: 0.8.0 config: testdeposit.yaml @@ -125,7 +125,7 @@ jobs: outcome: success expected: 'testERC20PermitDeposit(uint256):\s*passing' - name: MultiABI - workdir: program-analysis/echidna/example/ + workdir: src/program-analysis/echidna/example/ files: allContracts.sol solc-version: 0.8.0 config: allContracts.yaml diff --git a/.github/workflows/lint_format.yml b/.github/workflows/lint_format.yml index c3d6605a..c716aef6 100644 --- a/.github/workflows/lint_format.yml +++ b/.github/workflows/lint_format.yml @@ -25,12 +25,12 @@ jobs: run: | npm ci - - name: Remove Medusa uncessary files + - name: Remove unnecessary Medusa files run: | - rm -rf program-analysis/medusa/chain - rm -rf program-analysis/medusa/compilation - rm -rf program-analysis/medusa/fuzzing - rm program-analysis/medusa/docs/theme/highlight.js + rm -rf src/program-analysis/medusa/chain + rm -rf src/program-analysis/medusa/compilation + rm -rf src/program-analysis/medusa/fuzzing + rm src/program-analysis/medusa/docs/theme/highlight.js - name: Run lint run: | diff --git a/.github/workflows/manticore.yml b/.github/workflows/manticore.yml index 09df3375..a15b1e4e 100644 --- a/.github/workflows/manticore.yml +++ b/.github/workflows/manticore.yml @@ -4,13 +4,13 @@ on: push: paths: - ".github/workflows/manticore.yml" - - "program-analysis/manticore/**/*.py" + - "src/program-analysis/manticore/**/*.py" branches: - master pull_request: paths: - ".github/workflows/manticore.yml" - - "program-analysis/manticore/**/*.py" + - "src/program-analysis/manticore/**/*.py" schedule: # run CI every day even if no PRs/merges occur - cron: "0 12 * * *" @@ -33,4 +33,4 @@ jobs: solc-select use 0.5.11 - name: Run Tests run: | - bash program-analysis/manticore/scripts/gh_action_test.sh + bash src/program-analysis/manticore/scripts/gh_action_test.sh diff --git a/.github/workflows/medusa.yml b/.github/workflows/medusa.yml index 8f06b830..bebda0bd 100644 --- a/.github/workflows/medusa.yml +++ b/.github/workflows/medusa.yml @@ -4,15 +4,15 @@ on: push: paths: - ".github/workflows/medusa.yml" - - "program-analysis/echidna/**/*.sol" - - "program-analysis/echidna/**/*.yml" + - "src/program-analysis/echidna/**/*.sol" + - "src/program-analysis/echidna/**/*.yml" branches: - master pull_request: paths: - ".github/workflows/medusa.yml" - - "program-analysis/echidna/**/*.sol" - - "program-analysis/echidna/**/*.yml" + - "src/program-analysis/echidna/**/*.sol" + - "src/program-analysis/echidna/**/*.yml" schedule: # run CI every day even if no PRs/merges occur - cron: "0 12 * * *" @@ -27,25 +27,25 @@ jobs: matrix: include: - name: Exercise 1 - workdir: program-analysis/echidna/exercises/exercise1/ + workdir: src/program-analysis/echidna/exercises/exercise1/ files: solution.sol contract: TestToken outcome: failure expected: 'echidna_test_balance()\" failed after the following call sequence' - name: Exercise 2 - workdir: program-analysis/echidna/exercises/exercise2/ + workdir: src/program-analysis/echidna/exercises/exercise2/ files: solution.sol contract: TestToken outcome: failure expected: 'echidna_no_transfer()\" failed after the following call sequence' - name: Exercise 3 - workdir: program-analysis/echidna/exercises/exercise3/ + workdir: src/program-analysis/echidna/exercises/exercise3/ files: solution.sol contract: TestToken outcome: failure expected: 'echidna_test_balance()\" failed after the following call sequence' - name: Exercise 4 - workdir: program-analysis/echidna/exercises/exercise4/ + workdir: src/program-analysis/echidna/exercises/exercise4/ files: solution.sol contract: TestToken outcome: failure @@ -75,41 +75,41 @@ jobs: # outcome: failure # expected: 'testPoolBalance():\s*failed' - name: TestToken - workdir: program-analysis/echidna/example/ + workdir: src/program-analysis/echidna/example/ files: testtoken.sol contract: TestToken outcome: failure expected: 'echidna_balance_under_1000()\" failed after the following call sequence' - name: Multi - workdir: program-analysis/echidna/example/ + workdir: src/program-analysis/echidna/example/ files: multi.sol contract: C config: filter.yaml outcome: failure expected: 'echidna_state4()\" failed after the following call sequence' - name: Assert - workdir: program-analysis/echidna/example/ + workdir: src/program-analysis/echidna/example/ files: assert.sol config: assert.yaml contract: Incrementor outcome: failure expected: 'inc(uint256)\" resulted in an assertion failure after the following call sequence' - name: PopsicleBroken - workdir: program-analysis/echidna/example/ + workdir: src/program-analysis/echidna/example/ files: PopsicleBroken.sol solc-version: 0.8.4 contract: PopsicleBroken outcome: failure expected: 'PopsicleBroken.totalBalanceAfterTransferIsPreserved(address,uint256)\" resulted in an assertion failure after the following call sequence' - name: PopsicleFixed - workdir: program-analysis/echidna/example/ + workdir: src/program-analysis/echidna/example/ files: PopsicleFixed.sol solc-version: 0.8.4 contract: PopsicleFixed outcome: success expected: '\[PASSED\] Assertion Test: PopsicleFixed.totalBalanceAfterTransferIsPreserved(address,uint256)' - name: TestDepositWithPermit - workdir: program-analysis/echidna/example/ + workdir: src/program-analysis/echidna/example/ files: TestDepositWithPermit.sol solc-version: 0.8.0 config: testdeposit.yaml @@ -117,7 +117,7 @@ jobs: outcome: success expected: '\[PASSED\] Assertion Test: TestDepositWithPermit.testERC20PermitDeposit(uint256)' # - name: MultiABI - # workdir: program-analysis/echidna/example/ + # workdir: src/program-analysis/echidna/example/ # files: allContracts.sol # solc-version: 0.8.0 # config: allContracts.yaml diff --git a/.github/workflows/slither.yml b/.github/workflows/slither.yml index 6daee37f..0ebb821b 100644 --- a/.github/workflows/slither.yml +++ b/.github/workflows/slither.yml @@ -4,13 +4,13 @@ on: push: paths: - ".github/workflows/slither.yml" - - "program-analysis/slither/**/*.py" + - "src/program-analysis/slither/**/*.py" branches: - master pull_request: paths: - ".github/workflows/slither.yml" - - "program-analysis/slither/**/*.py" + - "src/program-analysis/slither/**/*.py" schedule: # run CI every day even if no PRs/merges occur - cron: "0 12 * * *" @@ -31,4 +31,4 @@ jobs: pip install solc-select - name: Run Tests run: | - bash program-analysis/slither/scripts/gh_action_test.sh + bash src/program-analysis/slither/scripts/gh_action_test.sh diff --git a/src/program-analysis/manticore/scripts/gh_action_test.sh b/src/program-analysis/manticore/scripts/gh_action_test.sh index 4188fd3e..14751fc2 100644 --- a/src/program-analysis/manticore/scripts/gh_action_test.sh +++ b/src/program-analysis/manticore/scripts/gh_action_test.sh @@ -64,7 +64,7 @@ test_exercise(){ pip install manticore==0.3.5 crytic-compile==0.1.13 -cd program-analysis/manticore +cd src/program-analysis/manticore sudo add-apt-repository ppa:sri-csl/formal-methods -y sudo apt-get update diff --git a/src/program-analysis/slither/scripts/gh_action_test.sh b/src/program-analysis/slither/scripts/gh_action_test.sh index d2bc01e4..a4e59a5e 100644 --- a/src/program-analysis/slither/scripts/gh_action_test.sh +++ b/src/program-analysis/slither/scripts/gh_action_test.sh @@ -53,7 +53,7 @@ test_exercise(){ } -cd program-analysis/slither +cd src/program-analysis/slither pip install slither-analyzer solc-select install 0.8.20 solc-select use 0.8.20