Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shapella upgrade (capella+shanghai) #482

Merged
merged 2,261 commits into from
May 5, 2023
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
2261 commits
Select commit Hold shift + click to select a range
cdd3747
fix: Lido.getFeeDistribution must return values relative to total fee
arwer13 Mar 29, 2023
5cc268e
fix: typos in StakingRouter comments
arwer13 Mar 29, 2023
0640cb3
Merge branch 'fix/lido-fee-distribution' into shapella-scratch-deploy
arwer13 Mar 29, 2023
5a10882
tests: add a missing visibility modifier
skozin Mar 29, 2023
cae86db
oracle: don't accept a report hash if the deadline is already missed
skozin Mar 29, 2023
7a93c4a
exit bus oracle: remove an unused return value
skozin Mar 29, 2023
39b2242
hash consensus: minor gas optimizations
skozin Mar 29, 2023
abcfe10
Merge branch 'shapella-scratch-deploy' of github.com:lidofinance/lido…
arwer13 Mar 29, 2023
d63ec8f
shapella upgrade scripts: log gasUsed of the deployment
arwer13 Mar 29, 2023
6f37ff5
Make clearNodeOperatorPenalty external
Psirex Mar 29, 2023
48e3a54
Update arrays trim logic in the getStakingRewardsDistribution
Psirex Mar 29, 2023
1e17bad
Remove payable modifier for request.owner in the _transfer
Psirex Mar 29, 2023
f7680b1
Fix keysCount and startIndex check in saveKeysSigs
Psirex Mar 29, 2023
df51ab0
Check maxPositiveTokenRebase not equal to zero
Psirex Mar 29, 2023
e4d0bf7
fix: check stuck+exited<=deposited
krogla Mar 30, 2023
662d47a
fix: exited/stuck check for UIN64_MAX
krogla Mar 30, 2023
9ea7bbc
feat: update Oracle frontend
mymphe Mar 30, 2023
7a40d6c
feat: update manifest
mymphe Mar 30, 2023
5f75eeb
fix: link
mymphe Mar 30, 2023
b1532ef
fix: remove int64 limitations
krogla Mar 30, 2023
a0ea670
Merge pull request #713 from lidofinance/fix/mixbytes_audit
TheDZhon Mar 30, 2023
360585f
Merge pull request #711 from lidofinance/fix/hash-consnesus-fast-lane…
TheDZhon Mar 30, 2023
7e59e84
Merge pull request #714 from lidofinance/fix/is-valid-signature-eip12…
TheDZhon Mar 30, 2023
8a9bd67
Validate invariant exited <= deposited on reporting in StakingRouter
Psirex Mar 30, 2023
92a0dea
Merge pull request #715 from lidofinance/fix/missing-nonce-updates
TheDZhon Mar 30, 2023
fc750ab
Merge pull request #717 from lidofinance/fix/lido-fee-distribution
TheDZhon Mar 30, 2023
5ab42c3
Merge pull request #716 from lidofinance/fix/docs-and-minor-improvements
TheDZhon Mar 30, 2023
3cd94ee
Merge remote-tracking branch 'origin/fix/shapella-upgrade-from-rc0-to…
TheDZhon Mar 30, 2023
b40b251
Merge pull request #718 from lidofinance/fix/stuck-exited-check
TheDZhon Mar 30, 2023
59b0476
fix: stake limit resume handling
TheDZhon Mar 30, 2023
0dd76b0
feat: update NOR -> StakingRouter
mymphe Mar 31, 2023
fd77f5e
feat: update StakingRouter frontend manifest
mymphe Mar 31, 2023
c98c278
scripts: simplify test setup
bulbozaur Mar 31, 2023
b522fd4
Merge pull request #712 from lidofinance/fix/accounting-oracle-extra-…
TheDZhon Mar 31, 2023
6d62b2b
Use uint256 instead uint64 in NOR where possible
Psirex Mar 31, 2023
b3eb257
Don't use signed math in NOR
Psirex Mar 31, 2023
426dbc7
Don't use unsafe math operations
Psirex Apr 1, 2023
9a5d8c2
More proper naming and comments
Psirex Apr 1, 2023
e316d89
fix: review fixes
TheDZhon Apr 2, 2023
7355d2e
Merge pull request #721 from lidofinance/fix/stake-limit-after-pause
TheDZhon Apr 2, 2023
da1cca3
fix: review fixes
TheDZhon Apr 2, 2023
e26094c
Merge pull request #710 from lidofinance/fix/rebaseLimiter-isLimitRea…
TheDZhon Apr 2, 2023
3bd8b91
Merge branch 'fix/shapella-upgrade-from-rc0-to-rc1' of github.com:lid…
Psirex Apr 2, 2023
bd3ddd3
Consistent vars naming. Remove excess range check
Psirex Apr 2, 2023
638d2df
Remove _checkLimit overloading from OracleReportSanityChecker
Psirex Apr 2, 2023
d2227cc
Merge pull request #720 from lidofinance/fix/shapella-minor-statemind…
TheDZhon Apr 2, 2023
b79476b
Gas optimizations and comments improvements
Psirex Apr 3, 2023
638bc7a
base oracle: remove a duplicate check
skozin Mar 21, 2023
e618c30
oracle: discard report that's not yet processing on consensus loss
skozin Mar 27, 2023
a27650c
chore: disable ABI linting for commits
skozin Mar 27, 2023
f3a3f14
feat: update hash consensus tests
Jeday Apr 3, 2023
6b4e46f
fix: check initialized on resume
krogla Apr 3, 2023
3ac7117
fix: initial holder bootstrap
krogla Apr 3, 2023
b35f3e4
refactor: transfer events order
krogla Apr 3, 2023
7ff79ff
refactor: transfer events order
krogla Apr 3, 2023
1c95b44
test: fix steth mock
krogla Apr 3, 2023
cb06e72
feat: baseOracle report discard tests
Jeday Apr 3, 2023
a3a59b1
feat: accounting&exit bus oracles report discard tests
Jeday Apr 3, 2023
6777ddc
fix: contract formatting
Jeday Apr 3, 2023
73eccd7
💅(wq): rename finalization event
folkyatina Apr 3, 2023
583a3e0
chore: comments and extra space
TheDZhon Apr 3, 2023
b75b591
chore: style
TheDZhon Apr 3, 2023
588f19f
Merge pull request #708 from lidofinance/fix/clear-report-processing-…
TheDZhon Apr 3, 2023
57b6752
remove unused methods in UnstructuredRefStorage lib
loga4 Apr 3, 2023
2a9cc90
Merge pull request #723 from lidofinance/fix/remove-unused-methods
TheDZhon Apr 3, 2023
7e2a32f
add zero admin check
loga4 Apr 3, 2023
d1facbd
restrict name size to 31 bytes
loga4 Apr 3, 2023
2032f0d
remove double check on resume pause
loga4 Apr 3, 2023
571407f
update scratch deploy scripts
arwer13 Apr 3, 2023
62d19d7
add active check to onlyNodeOperatorManager
loga4 Apr 3, 2023
9f8eb2e
fix typos
loga4 Apr 3, 2023
2f5f5f6
add override keyword for name
loga4 Apr 3, 2023
68b57ba
fix tests
loga4 Apr 3, 2023
36cb236
fix linter
loga4 Apr 3, 2023
d1f5451
Merge pull request #724 from lidofinance/fix/check-zero-admin-orsc
TheDZhon Apr 3, 2023
67b8894
Merge remote-tracking branch 'origin/fix/shapella-upgrade-from-rc0-to…
TheDZhon Apr 3, 2023
630fc53
Merge pull request #728 from lidofinance/fix/typos
TheDZhon Apr 3, 2023
b1423db
chore: e4 precision helper
TheDZhon Apr 3, 2023
7ceed77
Merge pull request #725 from lidofinance/fix/staking-module-length
TheDZhon Apr 3, 2023
257b306
test: make nonce test more expressive
TheDZhon Apr 4, 2023
81745ff
chore: typos
TheDZhon Apr 4, 2023
0628547
Merge pull request #727 from lidofinance/fix/check-nor-nonce
TheDZhon Apr 4, 2023
afa0765
Merge pull request #726 from lidofinance/fix/resume-pause-double-check
TheDZhon Apr 4, 2023
3410a8a
Fix naming for validators' totals in getNodeOperator
Psirex Apr 4, 2023
296bc4d
Merge branch 'fix/shapella-upgrade-from-rc0-to-rc1' of github.com:lid…
Psirex Apr 4, 2023
847d23c
Merge pull request #719 from lidofinance/fix/nor-int64-math
TheDZhon Apr 4, 2023
7e4b969
fix: add _mintInitialShares
krogla Apr 4, 2023
4c80206
Add requirement comments for IStakingModule
Psirex Apr 4, 2023
e4f556c
Merge pull request #722 from lidofinance/fix/transfer-events-order
TheDZhon Apr 4, 2023
78cef8a
Merge pull request #729 from lidofinance/fix/shapella-istaking-module…
TheDZhon Apr 4, 2023
76a4a91
abi: remove abis and add to gitignore
TheDZhon Apr 4, 2023
78d8efb
Merge branch 'feature/shapella-upgrade' into fix/shapella-upgrade-fro…
TheDZhon Apr 4, 2023
7ef74da
test: fix coverage run
TheDZhon Apr 4, 2023
3c4bb28
test: run yarn compile
TheDZhon Apr 4, 2023
feafec4
Merge pull request #709 from lidofinance/fix/shapella-upgrade-from-rc…
TheDZhon Apr 4, 2023
b609af5
Merge branch 'feature/shapella-upgrade' into shapella-scratch-deploy
arwer13 Apr 5, 2023
7cc557f
fix: clean logs
mymphe Apr 6, 2023
c22fe23
feat: rename back to lidooracle
mymphe Apr 6, 2023
1e30dec
chore: upd lock
mymphe Apr 6, 2023
3015c42
add deployed-upgrade-mainnet-fork-shapella-upgrade.json
arwer13 Apr 6, 2023
aed8fa7
update zhejiang deployed json
arwer13 Apr 6, 2023
b9aed36
update deployed-goerli.json and remove goerlishapella network stuff
arwer13 Apr 7, 2023
990dda7
add dummyImplementation addr to deployed-mainnet-fork-shapella-upgrad…
arwer13 Apr 7, 2023
44a1c8a
update deployed-goerli.json
arwer13 Apr 7, 2023
93aed2d
test: add cases for higher/lower share rates
TheDZhon Apr 8, 2023
c874a63
fix: allow simulated share rate being higher
TheDZhon Apr 8, 2023
dae85ba
chore: wording
TheDZhon Apr 8, 2023
b793e48
test: fix sanity checker test
TheDZhon Apr 8, 2023
00de346
chore: fix rate limit multiplier
TheDZhon Apr 8, 2023
1789516
Update totalFee sanity check
Psirex Apr 9, 2023
03c5280
Forbid using lido as a reward address for a node operator
Psirex Apr 9, 2023
105656a
feat: add state params to token uri
folkyatina Apr 10, 2023
e224ce6
Add comment to the NOR.onlyValidRewardAddress
Psirex Apr 10, 2023
33027e1
💅: formatting and a bit of docs
folkyatina Apr 10, 2023
5a16ded
Merge pull request #731 from lidofinance/fix/shapella-certora-small-f…
TheDZhon Apr 10, 2023
02a93e4
tests: more tests for tokenURI
folkyatina Apr 10, 2023
e3ee224
remove redundant require
loga4 Apr 10, 2023
7a92c9c
fix typos
loga4 Apr 10, 2023
4c617c6
check for existing value
loga4 Apr 10, 2023
d0b48c1
🏗️: replace array parameter in finalize
folkyatina Apr 10, 2023
e6a17b5
remove redundant int type initialization
loga4 Apr 10, 2023
ef19a3f
feat: add event tests
Jeday Apr 10, 2023
2fb7299
replace redundant var
loga4 Apr 10, 2023
7287987
Merge pull request #739 from lidofinance/feature/withdrawal-queue-eve…
TheDZhon Apr 10, 2023
bc2dff2
Merge pull request #741 from lidofinance/fix/sr-redundant-var
TheDZhon Apr 10, 2023
bc0a9c6
chore: extra item with =0 init
TheDZhon Apr 10, 2023
41157c8
Merge pull request #740 from lidofinance/fix/redundant-int-type
TheDZhon Apr 10, 2023
f2b56b2
chore: rollback total exited desc
TheDZhon Apr 10, 2023
ce06e5a
Merge pull request #736 from lidofinance/fix/audit-typos
TheDZhon Apr 10, 2023
a9df2dd
fix: naming improvements and typos
TheDZhon Apr 10, 2023
f3f1460
Merge pull request #737 from lidofinance/fix/oracle-daemon-config-update
TheDZhon Apr 10, 2023
a817df4
Merge pull request #735 from lidofinance/fix/remove-redundant-require
TheDZhon Apr 10, 2023
b354e5a
chore: test typos
TheDZhon Apr 10, 2023
2accf85
fix: review fixes
TheDZhon Apr 10, 2023
47ddc75
chore: review fixes
TheDZhon Apr 10, 2023
24d8f1c
deployed-goerli.json: redeploy OracleReportSanityChecker
arwer13 Apr 11, 2023
3af0ac9
fix summary keys docs
loga4 Apr 11, 2023
e0f6432
chore: add docs about `appeared`
TheDZhon Apr 11, 2023
3cf6ffb
fix: add a slash after the base uri automatically
folkyatina Apr 11, 2023
617e48e
feat: reformat tokenUri to include both amounts
folkyatina Apr 11, 2023
cec1445
💅: docs and polish
folkyatina Apr 11, 2023
660808e
Merge remote-tracking branch 'origin/fix/shapella-upgrade-from-rc1-to…
folkyatina Apr 11, 2023
feb2dd1
fix: split churn limit into appeared/exited
TheDZhon Apr 11, 2023
893f524
chore: typos
TheDZhon Apr 11, 2023
70fafa4
Merge pull request #742 from lidofinance/fix/summary-desc-typo
TheDZhon Apr 11, 2023
ffa1fa0
Merge pull request #730 from lidofinance/fix/too-high-simulated-share…
TheDZhon Apr 11, 2023
0ca6586
update NOR and OracleDaemonConfig deploy parameters
arwer13 Apr 11, 2023
af6c471
Merge pull request #743 from lidofinance/doc/churn-limit
TheDZhon Apr 11, 2023
7782200
Merge branch 'shapella-scratch-deploy' into feat/shapella/update-arag…
arwer13 Apr 11, 2023
157ce1f
Merge pull request #642 from lidofinance/feat/shapella/update-aragon-…
arwer13 Apr 11, 2023
b8fc458
Revert "Feat: split churn limit into exited and appeared"
TheDZhon Apr 12, 2023
9a9e88f
Merge pull request #747 from lidofinance/revert-743-doc/churn-limit
TheDZhon Apr 12, 2023
b29b89f
chore: churn limit explanations
TheDZhon Apr 12, 2023
95e7674
Merge pull request #748 from lidofinance/chore/churn-limit-docs
TheDZhon Apr 12, 2023
aa9ffc5
Revert "Fix: redundant int type"
TheDZhon Apr 12, 2023
f74416e
Merge pull request #749 from lidofinance/revert-740-fix/redundant-int…
TheDZhon Apr 12, 2023
a0e1e8c
feat: findHints before finalize test
Jeday Apr 12, 2023
d2e5286
test: gas test for findCheckpointHints and tokenUri
folkyatina Apr 12, 2023
9c8b632
test: fix a test
folkyatina Apr 12, 2023
ac9ec7e
feat: findCheckpointHints returns NOT_FOUND for unfinalized request
folkyatina Apr 12, 2023
153869d
test: fix tests
folkyatina Apr 12, 2023
95af00f
test: fix test not working without REPORT_GAS
folkyatina Apr 12, 2023
5e82482
Merge branch 'feature/erc4906' into refactor/finalize_params
folkyatina Apr 12, 2023
88d4770
💅: better readability for the checks
folkyatina Apr 12, 2023
da1a3d7
Merge pull request #733 from lidofinance/feature/erc4906
TheDZhon Apr 12, 2023
f84e796
Merge pull request #738 from lidofinance/refactor/finalize_params
TheDZhon Apr 12, 2023
428e96b
Merge remote-tracking branch 'origin/fix/shapella-upgrade-from-rc1-to…
folkyatina Apr 12, 2023
57e73d5
fix storage slot
loga4 Apr 13, 2023
49bd4dd
Merge pull request #753 from lidofinance/fix/hex-small-fixed-round2
TheDZhon Apr 13, 2023
bf72894
📚: improve WQ docs
folkyatina Apr 13, 2023
6733334
feat: make shapella deploy scripts support tx type 2
arwer13 Apr 13, 2023
4a0389b
update local deploy helper script copy-deployed-addresses.py
arwer13 Apr 13, 2023
399fd99
update two mainnet deploy parameters
arwer13 Apr 12, 2023
05848cf
feat: BatchMetadataUpdate for all non-final tokens
folkyatina Apr 13, 2023
a1b24d3
fix bash script for shapella ugprade contracts etherscan verification
arwer13 Apr 13, 2023
30b9e9b
fix(deploy-shapella-contracts-mainnet-fork.sh): set 0 gas price
arwer13 Apr 13, 2023
8d72c4c
doc: add a reference in dsm about churn limit
TheDZhon Apr 13, 2023
19f19b5
fix: wrong fromId in BatchMetadataUpdate event
folkyatina Apr 13, 2023
b72e0ec
Merge pull request #754 from lidofinance/feat/update_more_metadata
TheDZhon Apr 13, 2023
3eec54b
Update github links in StETH comments
Psirex Apr 12, 2023
7a40ae9
Remove onlyRole modifier from Burner token recovery methods
Psirex Apr 12, 2023
614995b
Merge pull request #755 from lidofinance/docs/dsm-churn-limit
TheDZhon Apr 13, 2023
6db4af6
Check arrays length matches in claimWithdrawals
Psirex Apr 12, 2023
3ffc69c
📚: wq docs improvement
folkyatina Apr 13, 2023
c956d93
Remove explicit v check from ECDSA lib
Psirex Apr 12, 2023
a8f645e
Merge pull request #750 from lidofinance/fix/find-hints-for-zero-chec…
TheDZhon Apr 13, 2023
5a94bcb
Forbid zero secondsPerSlot in BaseOracle
Psirex Apr 12, 2023
a06653e
Remove payable conversion from _claim
Psirex Apr 12, 2023
e9509d7
Doesn't decrease allowance on MAX_UINT256 approval
Psirex Apr 13, 2023
9496e61
Merge pull request #751 from lidofinance/fix/shapella-statemind-findi…
TheDZhon Apr 13, 2023
e45c4d6
Merge pull request #732 from lidofinance/fix/shapella-upgrade-from-rc…
TheDZhon Apr 13, 2023
8c3b746
update mainnet-fork deploy json file (for convenience)
arwer13 Apr 13, 2023
1aacce8
Merge branch 'feature/shapella-upgrade' into shapella-scratch-deploy
arwer13 Apr 13, 2023
ee6a4ee
tests fork deployment: use production proxy of LidoLocator
arwer13 Apr 18, 2023
bbc67a7
scripts: kill old fork
bulbozaur Apr 19, 2023
c6e93a5
fix: temporary fork block freeze
bulbozaur Apr 19, 2023
46d51a0
chore: be explicit about fork params
TheDZhon Apr 19, 2023
a5dec8a
fix: update non-cover shares burnt
TheDZhon Apr 19, 2023
85a41c4
update deployed-goerli.json after v2 rc1 -> rc2
arwer13 Apr 20, 2023
07a309d
deployed-goerli.json: add deploy commit for the deployed contracts
arwer13 Apr 20, 2023
038298c
replace deployerEOA for local tests mainnet-fork shapella setup
arwer13 Apr 20, 2023
7b5ac80
fix: force 127.0.0.1 for shapella ganache
TheDZhon Apr 21, 2023
f05996d
deployed mainnet upgrade defaults: set epochsPerFrame for VEBO to 75
arwer13 Apr 24, 2023
9a21072
mvp: bytecode verificator
bulbozaur Apr 11, 2023
f7b8141
require ETHERSCAN_TOKEN
bulbozaur Apr 11, 2023
7bf21ed
feat: verificator improvements
TheDZhon Apr 12, 2023
b53c012
scripts: bytecode verificator
bulbozaur Apr 17, 2023
b369f18
scripts: verificator fixes
bulbozaur Apr 18, 2023
808cd29
fix
bulbozaur Apr 18, 2023
eb8be53
fix: add linux 0.4.24 compiler
TheDZhon Apr 27, 2023
bfafc9f
fix: implement shellchecker suggestions
TheDZhon Apr 27, 2023
1f447ef
fix: regression
TheDZhon Apr 27, 2023
acf7b5b
fix: default is_proxy and is_implementation
TheDZhon Apr 27, 2023
68ad6fa
fix: more regressions
TheDZhon Apr 27, 2023
fd43d06
fix verificator script
bulbozaur Apr 28, 2023
36b2425
Merge pull request #762 from lidofinance/feature/shellchecker-fixes
bulbozaur Apr 28, 2023
a341778
review fixes
bulbozaur Apr 28, 2023
3dc7c95
fix log
bulbozaur Apr 28, 2023
a30fe7f
feat: script for mainnet contracts deployment
arwer13 May 1, 2023
d571a44
fix: review suggestions
TheDZhon May 1, 2023
6d5018e
fix: use sed
TheDZhon May 1, 2023
c785b27
Merge pull request #763 from lidofinance/fix/review-proposals
bulbozaur May 1, 2023
74effae
fix: cd to script dir on start
TheDZhon May 1, 2023
ef5ff7c
update deploy parameters values (fastLaneLengthSlots, etc)
arwer13 May 2, 2023
5c229c8
linter
bulbozaur May 2, 2023
f580b81
Merge pull request #761 from lidofinance/feature/bytecode-verificator…
bulbozaur May 2, 2023
32222b6
add deploy parameters to deployed-mainnet.json
arwer13 May 2, 2023
f33e63b
update mainnet and fork deploy scripts
arwer13 May 2, 2023
47e3a60
Merge branch 'shapella-scratch-deploy' of github.com:lidofinance/lido…
arwer13 May 2, 2023
c0e00e0
Merge pull request #635 from lidofinance/shapella-scratch-deploy
arwer13 May 2, 2023
acb65d5
update deploy param: set fastLaneLengthSlots to 100
arwer13 May 2, 2023
53b0f3e
fix(deploy script): add wait for OracleDaemonConfig .set transactions
arwer13 May 2, 2023
21415b6
add mainnet deployed addresses
arwer13 May 2, 2023
35d8c86
add missed lidoLocator address (proxy address)
arwer13 May 2, 2023
9dac142
config for diffyscan
folkyatina May 2, 2023
834cd57
fix: add LidoLocator proxy and use audited commit
folkyatina May 2, 2023
e595ef3
Merge pull request #764 from lidofinance/diffyscan-config
kadmil May 3, 2023
774393e
feat (deployed-mainnet.json): add proxyConstructorArgs fields
arwer13 May 3, 2023
f814fd1
Merge branch 'feature/shapella-upgrade' of github.com:lidofinance/lid…
arwer13 May 3, 2023
a66ee7b
batch verification
bulbozaur May 3, 2023
67a3875
add env checks
bulbozaur May 3, 2023
65cb78d
add envs
bulbozaur May 3, 2023
65ccd7c
Merge pull request #765 from lidofinance/feature/bytecode-batch-verif…
folkyatina May 3, 2023
e35435a
update calldata
bulbozaur May 3, 2023
feca40b
tests: fix consensus initial epoch
bulbozaur May 5, 2023
c5b7be8
resolve conflicts with develop
bulbozaur May 5, 2023
dc09151
Merge branch 'develop' into feature/shapella-upgrade
bulbozaur May 5, 2023
166cbdf
linter
bulbozaur May 5, 2023
f54b1e2
fix CI submodules deps
bulbozaur May 5, 2023
2a3a53e
update storage layout
bulbozaur May 5, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# top-most EditorConfig file
root = true

[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8
indent_style = space
indent_size = 4

[*.{js,yml}]
indent_size = 2
2 changes: 1 addition & 1 deletion .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
run: yarn test:unit

- name: Run Solidity linters
run: yarn lint:sol:solhint
run: yarn lint:sol

- name: Run JS linters
run: yarn lint:js
Expand Down
8 changes: 8 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn compile
yarn lint:sol

# TODO: uncomment. it's temporarily disabled on staking_router + withdrawals-poc merge
# yarn lint:js:fix
4 changes: 4 additions & 0 deletions .mocharc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"require": "hardhat/register",
"timeout": 40000
}
14 changes: 13 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,17 @@
"trailingComma": "none",
"bracketSpacing": true,
"jsxBracketSameLine": false,
"printWidth": 140
"printWidth": 120,
"overrides": [
{
"files": "*.sol",
"options": {
"printWidth": 120,
"tabWidth": 4,
"useTabs": false,
"singleQuote": false,
"bracketSpacing": false
}
}
]
}
9 changes: 5 additions & 4 deletions .solhint.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{
"extends": "solhint:recommended",
"plugins": [
"lido"
],
"plugins": ["lido"],
"rules": {
"no-inline-assembly": "off",
"var-name-mixedcase": "off",
"compiler-version": "off",
"reason-string": "off",
"no-empty-blocks": "off",
"func-name-mixedcase": "off",
"lido/fixed-compiler-version": "error"
"lido/fixed-compiler-version": "error",
"visibility-modifier-order": "error",
"no-unused-vars": "error",
"func-visibility": ["warn", { "ignoreConstructors": true }]
}
}
File renamed without changes.
41 changes: 0 additions & 41 deletions .soliumrc.json

This file was deleted.

Loading