Skip to content

Commit 09b197a

Browse files
committed
Merge branch 'master' into non-standard-erc20-list
2 parents 5ce309e + 4ae8bd9 commit 09b197a

File tree

26 files changed

+1058
-207
lines changed

26 files changed

+1058
-207
lines changed

.github/workflows/deploy.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ on:
33
push:
44
branches:
55
- master
6+
ignore-paths:
7+
- "**.rs"
8+
- "**.py"
9+
- "**.sol"
610
workflow_dispatch:
711

812
jobs:

.github/workflows/echidna.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1-
name: Echidna
1+
name: Run Echidna tests
22

33
on:
44
push:
5-
paths-ignore:
6-
- "**.md"
7-
- "**.rs"
8-
- "**.py"
5+
paths:
6+
- ".github/workflows/echidna.yml"
7+
- "program-analysis/echidna/**/*.sol"
8+
- "program-analysis/echidna/**/*.yml"
99
branches:
1010
- master
11-
- dev
1211
pull_request:
12+
paths:
13+
- ".github/workflows/echidna.yml"
14+
- "program-analysis/echidna/**/*.sol"
15+
- "program-analysis/echidna/**/*.yml"
1316
schedule:
1417
# run CI every day even if no PRs/merges occur
1518
- cron: "0 12 * * *"
@@ -112,15 +115,15 @@ jobs:
112115
config: Popsicle.yaml
113116
contract: PopsicleFixed
114117
outcome: success
115-
expected: 'totalBalanceAfterTransferIsPreserved(address,uint256):\s*passed'
118+
expected: 'totalBalanceAfterTransferIsPreserved(address,uint256):\s*passing'
116119
- name: TestDepositWithPermit
117120
workdir: program-analysis/echidna/example/
118121
files: TestDepositWithPermit.sol
119122
solc-version: 0.8.0
120123
config: testdeposit.yaml
121124
contract: TestDepositWithPermit
122125
outcome: success
123-
expected: 'testERC20PermitDeposit(uint256):\s*passed'
126+
expected: 'testERC20PermitDeposit(uint256):\s*passing'
124127
- name: MultiABI
125128
workdir: program-analysis/echidna/example/
126129
files: multiabi.sol

.github/workflows/lint_links.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,23 @@ on:
44
push:
55
branches:
66
- master
7+
paths:
8+
- ".github/workflows/lint_links.yml"
9+
- "**.md"
710
pull_request:
11+
paths:
12+
- ".github/workflows/lint_links.yml"
13+
- "**.md"
814
schedule:
9-
# run CI at 09:00, on day 1 of the month even if no PRs/merges occur
10-
- cron: "0 9 1 * *"
15+
# run CI at 09:00 every Tuesday even if no PRs/merges occur
16+
- cron: "0 9 * * 2"
1117

1218
jobs:
1319
markdown-link-check:
1420
runs-on: ubuntu-latest
1521
steps:
16-
- uses: actions/checkout@master
22+
- uses: actions/checkout@v3
1723
- uses: gaurav-nelson/github-action-markdown-link-check@v1
1824
with:
1925
use-quiet-mode: "yes"
26+
check-modified-files-only: ${{ (github.event_name == 'pull_request' && 'yes') || 'no' }}

.github/workflows/manticore.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Run Manticore tests
2+
3+
on:
4+
push:
5+
paths:
6+
- ".github/workflows/manticore.yml"
7+
- "program-analysis/manticore/**/*.py"
8+
branches:
9+
- master
10+
pull_request:
11+
paths:
12+
- ".github/workflows/manticore.yml"
13+
- "program-analysis/manticore/**/*.py"
14+
schedule:
15+
# run CI every day even if no PRs/merges occur
16+
- cron: "0 12 * * *"
17+
18+
jobs:
19+
tests:
20+
runs-on: ubuntu-22.04
21+
strategy:
22+
fail-fast: false
23+
steps:
24+
- uses: actions/checkout@v3
25+
- name: Set up Python 3.8
26+
uses: actions/setup-python@v4
27+
with:
28+
python-version: 3.8
29+
- name: Install dependencies
30+
run: |
31+
pip install solc-select
32+
solc-select install 0.5.11
33+
solc-select use 0.5.11
34+
- name: Run Tests
35+
run: |
36+
bash program-analysis/manticore/scripts/gh_action_test.sh
Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
name: CI
1+
name: Run Slither tests
22

33
on:
44
push:
5-
paths-ignore:
6-
- "**.md"
5+
paths:
6+
- ".github/workflows/slither.yml"
7+
- "program-analysis/slither/**/*.py"
78
branches:
89
- master
9-
- dev
1010
pull_request:
11+
paths:
12+
- ".github/workflows/slither.yml"
13+
- "program-analysis/slither/**/*.py"
1114
schedule:
1215
# run CI every day even if no PRs/merges occur
1316
- cron: "0 12 * * *"
@@ -17,8 +20,6 @@ jobs:
1720
runs-on: ubuntu-22.04
1821
strategy:
1922
fail-fast: false
20-
matrix:
21-
type: ["slither", "manticore"]
2223
steps:
2324
- uses: actions/checkout@v3
2425
- name: Set up Python 3.8
@@ -31,7 +32,5 @@ jobs:
3132
solc-select install 0.5.11
3233
solc-select use 0.5.11
3334
- name: Run Tests
34-
env:
35-
TEST_TYPE: ${{ matrix.type }}
3635
run: |
37-
bash program-analysis/${TEST_TYPE}/scripts/gh_action_test.sh
36+
bash program-analysis/slither/scripts/gh_action_test.sh

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
.DS_Store
2+
node_modules

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ We welcome contributions, and you can contribute by following our [contributing
1616
- [Learn EVM](./learn_evm): EVM technical knowledge
1717
- [EVM Opcodes](./learn_evm/evm_opcodes.md): Details on all EVM opcodes
1818
- [Transaction Tracing](./learn_evm/tracing.md): Helper scripts and guidance for generating and navigating transaction traces
19+
- [Arithmetic Checks](./learn_evm/arithmetic-checks.md): A guide to performing arithmetic checks in the EVM
1920
- [Yellow Paper Guidance](./learn_evm/yellow-paper.md): Symbol reference for more easily reading the Ethereum yellow paper
2021
- [Forks <> EIPs](./learn_evm/eips_forks.md): Summarize the EIPs included in each Ethereum fork
2122
- [Forks <> CIPs](./learn_evm/cips_forks.md): Summarize the CIPs and EIPs included in each Celo fork _(EVM-compatible chain)_

SUMMARY.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
- [Learn EVM](./learn_evm/README.md)
1111
- [EVM Opcode Reference](./learn_evm/evm_opcodes.md)
1212
- [Transaction Tracing](./learn_evm/tracing.md)
13+
- [Arithmetic Checks](./learn_evm/arithmetic-checks.md)
1314
- [Yellow Paper Guidance](./learn_evm/yellow-paper.md):
1415
- [Forks <> EIPs](./learn_evm/eips_forks.md)
1516
- [Forks <> CIPs](./learn_evm/cips_forks.md)
@@ -79,6 +80,7 @@
7980
- [How to test bytecode-only contracts](./program-analysis/echidna/advanced/testing-bytecode.md)
8081
- [How to use hevm cheats to test permit](./program-analysis/echidna/advanced/hevm-cheats-to-test-permit.md)
8182
- [How to seed Echidna with unit tests](./program-analysis/echidna/advanced/end-to-end-testing.md)
83+
- [How to fuzz contracts with external libraries](./program-analysis/echidna/advanced/working-with-libraries.md)
8284
- [Understanding and using `multi-abi`](./program-analysis/echidna/advanced/using-multi-abi.md)
8385
- [Fuzzing tips](./program-analysis/echidna/fuzzing_tips.md)
8486
- [Frequently Asked Questions](./program-analysis/echidna/frequently_asked_questions.md)

book

Lines changed: 0 additions & 1 deletion
This file was deleted.

book.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ no-section-label = true
1515
additional-css = ["static/custom.css"]
1616
additional-js = ["static/script.js"]
1717
default-theme = "light"
18+
mathjax-support = true
1819

1920
[output.html.fold]
2021
enable = true

0 commit comments

Comments
 (0)