Skip to content

Commit 7aa4097

Browse files
authored
Merge branch 'master' into dev-state-network-forking
2 parents 3b47e68 + 52a49d7 commit 7aa4097

File tree

70 files changed

+1225
-981
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1225
-981
lines changed

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Build artifacts
2929
run: mdbook build
3030
- name: Upload artifact
31-
uses: actions/upload-pages-artifact@v1
31+
uses: actions/upload-pages-artifact@v2
3232
with:
3333
path: ./book
3434
deploy:

.github/workflows/echidna.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,15 @@ jobs:
115115
config: Popsicle.yaml
116116
contract: PopsicleFixed
117117
outcome: success
118-
expected: 'totalBalanceAfterTransferIsPreserved(address,uint256):\s*passed'
118+
expected: 'totalBalanceAfterTransferIsPreserved(address,uint256):\s*passing'
119119
- name: TestDepositWithPermit
120120
workdir: program-analysis/echidna/example/
121121
files: TestDepositWithPermit.sol
122122
solc-version: 0.8.0
123123
config: testdeposit.yaml
124124
contract: TestDepositWithPermit
125125
outcome: success
126-
expected: 'testERC20PermitDeposit(uint256):\s*passed'
126+
expected: 'testERC20PermitDeposit(uint256):\s*passing'
127127
- name: MultiABI
128128
workdir: program-analysis/echidna/example/
129129
files: multiabi.sol

.github/workflows/lint_links.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@ on:
1212
- ".github/workflows/lint_links.yml"
1313
- "**.md"
1414
schedule:
15-
# run CI at 09:00, on day 1 of the month even if no PRs/merges occur
16-
- cron: "0 9 1 * *"
15+
# run CI at 09:00 every Tuesday even if no PRs/merges occur
16+
- cron: "0 9 * * 2"
1717

1818
jobs:
1919
markdown-link-check:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@master
22+
- uses: actions/checkout@v3
2323
- uses: gaurav-nelson/github-action-markdown-link-check@v1
2424
with:
2525
use-quiet-mode: "yes"
26+
check-modified-files-only: ${{ (github.event_name == 'pull_request' && 'yes') || 'no' }}

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Bug reports and feature suggestions can be submitted to our issue tracker. For b
1010

1111
## Questions
1212

13-
Questions can be submitted to the issue tracker, but you may get a faster response if you ask in our [chat room](https://empireslacking.herokuapp.com/) (in the #ethereum channel).
13+
Questions can be submitted to the issue tracker, but you may get a faster response if you ask in our [chat room](https://slack.empirehacking.nyc/) (in the #ethereum channel).
1414

1515
## Code
1616

SUMMARY.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
- [How to filter functions](./program-analysis/echidna/basic/filtering-functions.md)
7373
- [How to test assertions](./program-analysis/echidna/basic/assertion-checking.md)
7474
- [How to write good properties step by step](./program-analysis/echidna/basic/property-creation.md)
75+
- [How to write properties that use ether](./program-analysis/echidna/basic/working-with-eth.md)
7576
- [Advanced](./program-analysis/echidna/advanced/README.md)
7677
- [How to collect a corpus](./program-analysis/echidna/advanced/collecting-a-corpus.md)
7778
- [How to use optimization mode](./program-analysis/echidna/advanced/optimization_mode.md)
@@ -80,7 +81,9 @@
8081
- [How to test bytecode-only contracts](./program-analysis/echidna/advanced/testing-bytecode.md)
8182
- [How to use hevm cheats to test permit](./program-analysis/echidna/advanced/hevm-cheats-to-test-permit.md)
8283
- [How to seed Echidna with unit tests](./program-analysis/echidna/advanced/end-to-end-testing.md)
84+
- [How to fuzz contracts with external libraries](./program-analysis/echidna/advanced/working-with-libraries.md)
8385
- [Understanding and using `multi-abi`](./program-analysis/echidna/advanced/using-multi-abi.md)
86+
- [Interacting with off-chain data via FFI cheatcode](./program-analysis/echidna/advanced/interacting-with-offchain-data-via-ffi.md)
8487
- [Fuzzing tips](./program-analysis/echidna/fuzzing_tips.md)
8588
- [Frequently Asked Questions](./program-analysis/echidna/frequently_asked_questions.md)
8689
- [Exercises](./program-analysis/echidna/exercises/README.md)

development-guidelines/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
List of smart contract development best practices
1+
List of Best Practices for Smart Contract Development
22

3-
- [High-level best practices](./guidelines.md): High-level best-practices for all smart contracts
4-
- [Token integration checklist](./token_integration.md): What to check when interacting with arbitrary tokens
5-
- [Incident Response Recommendations](./incident_response.md): Guidelines on how to formulate an incident response plan
6-
- [Secure development workflow](./workflow.md): A rough, high-level process to follow while you write code
3+
- [High-Level Best Practices](./guidelines.md): Essential high-level best practices for all smart contracts
4+
- [Token Integration Checklist](./token_integration.md): Important aspects to consider when interacting with various tokens
5+
- [Incident Response Recommendations](./incident_response.md): Guidelines on establishing an effective incident response plan
6+
- [Secure Development Workflow](./workflow.md): A recommended high-level process to adhere to while writing code

0 commit comments

Comments
 (0)