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

Sync master with develop #802

Merged
merged 115 commits into from
Dec 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
115 commits
Select commit Hold shift + click to select a range
076d757
Add forge unit-tests for Math256
claudijd Apr 18, 2023
758f0ed
Remove overly verbose comments
claudijd Apr 18, 2023
6bec866
Fix import for Math256
claudijd Apr 18, 2023
3e52131
Fix review feedback items
claudijd Apr 19, 2023
d3d08bd
Fix solidity version
claudijd Apr 19, 2023
fa2e900
Add check against underflow
claudijd May 24, 2023
876ad29
chore(deps): bump requests from 2.30.0 to 2.31.0
dependabot[bot] May 26, 2023
b9fbf6c
Revert implementation check for division by zero
Jun 1, 2023
06a6229
Clean up math256 tests to run on forge
Jun 3, 2023
9d94693
Add forge tests for signature utils
Jun 3, 2023
d083a39
Further clean up on math256
Jun 3, 2023
8d076a8
Add forge tests for unstructured storage
Jun 7, 2023
aaf5777
Remove unnecessary ECDSA import
Jun 7, 2023
94b9ba2
Merge pull request #772 from claudijd/add_accounting_check
TheDZhon Jun 7, 2023
4358f5a
Merge pull request #773 from lidofinance/dependabot/pip/requests-2.31.0
TheDZhon Jun 7, 2023
c0d578a
Update test/0.8.9/unstructured-storage.test.sol
Jun 7, 2023
df50f66
clean up signature utils tests
Jun 7, 2023
817ef9a
Updates to unstructured storage tests per review feedback
Jun 7, 2023
b664abc
Merge branch 'add_unstructured_storage_tests' of https://github.com/c…
Jun 7, 2023
4e4ac72
Merge pull request #756 from claudijd/feature/shappella-upgrade-math2…
TheDZhon Jun 7, 2023
28df06c
Add position fuzzing throughout
Jun 7, 2023
24b9c85
Merge pull request #774 from claudijd/add_unstructured_storage_tests
TheDZhon Jun 8, 2023
4ac71a8
build: upload ABIs to a published release
madlabman Jun 22, 2023
4b29de7
Merge pull request #777 from lidofinance/build/attach-abis-to-release
TheDZhon Jun 22, 2023
e03da9d
chore: replace action-gh-release with gh cli
madlabman Jun 23, 2023
004f26f
Merge pull request #778 from lidofinance/build/attach-abis-to-release
TheDZhon Jun 26, 2023
b95fbb0
chore(deps-dev): bump aiohttp from 3.8.4 to 3.8.5
dependabot[bot] Jul 20, 2023
42be078
chore(deps-dev): bump certifi from 2023.5.7 to 2023.7.22
dependabot[bot] Jul 25, 2023
f74c743
Merge pull request #784 from lidofinance/dependabot/pip/certifi-2023.…
TheDZhon Aug 18, 2023
de6d827
Merge pull request #783 from lidofinance/dependabot/pip/aiohttp-3.8.5
TheDZhon Aug 18, 2023
e156f08
feat(scratch deploy): mvp of local scratch deployment
arwer13 Sep 11, 2023
b40c7ca
feat(scratch deploy): goerli mvp setup
arwer13 Sep 12, 2023
d85d630
scratch deploy docs little improvements
arwer13 Sep 15, 2023
344b53b
fix(scratch deploy): restore 12-check-dao in scratch deploy
arwer13 Sep 18, 2023
4e44a59
fix(scratch deploy): missing STAKING_MODULE_ROLE in LidoTemplate
arwer13 Sep 18, 2023
96c8024
deploy to goerli for debug purposes under new "goerlidebug" network
arwer13 Sep 18, 2023
632702d
add boilerplate for scratch acceptance test
arwer13 Sep 18, 2023
c1a6166
fix goerlidebug genesis time and redeploy
arwer13 Oct 2, 2023
f4e46fa
bump hardhat-etherscan: ^2.1.8 -> ^3.1.7
arwer13 Oct 2, 2023
f0853b0
feat(scratch): improve console output (a.o. log every tx)
arwer13 Oct 2, 2023
ce597d3
chore(scratch): cleanup here and there
arwer13 Oct 2, 2023
6c5c26b
feat(scratch): set testnets voting times to 15/5 minutes
arwer13 Oct 2, 2023
740b982
feat(scratch): update testnets vesting params - 3 EOAs only, no vesting
arwer13 Oct 2, 2023
36c103a
feat(scratch): plug curated staking module on deploy
arwer13 Oct 2, 2023
352ba49
feat(scratch): transfer all ownership to Agent at the end
arwer13 Oct 2, 2023
dd9b7d1
feat(scratch): add holesky network setup
arwer13 Oct 2, 2023
ccf00e5
feat(scratch): keep explicit DummyEmptyContract entry in deployed-x.json
arwer13 Oct 2, 2023
8269b77
docs(scratch): update readme
arwer13 Oct 2, 2023
efb0d56
feat(scratch): massive work on the deploy and verification scripts
arwer13 Oct 3, 2023
f9bdfd0
fix(scratch): fields in LidoLocator.implementation
arwer13 Oct 3, 2023
83329b4
fix(scratch): missing } type
arwer13 Oct 3, 2023
8c0e82e
feat(scratch): add deployed-holesky.json
arwer13 Oct 3, 2023
4c66f09
refactor: etherscan verification script
arwer13 Oct 3, 2023
1ef0e4d
fix(scratch acceptance test): reading ldo address from state
arwer13 Oct 3, 2023
957fcb8
fix: withdrawal flow test
TheDZhon Oct 3, 2023
60942b1
fix: more robust finalization
TheDZhon Oct 3, 2023
d6972bd
fix: add deployed simple dvt proxy info
krogla Oct 3, 2023
1777131
refactor verify-contracts-code
arwer13 Oct 3, 2023
1940033
Merge branch 'feat/scratch-holesky' of github.com:lidofinance/lido-da…
krogla Oct 4, 2023
945bc35
fix(deployed-holesky.json): LDO ctor arg (parentSnapShotBlock)
arwer13 Oct 4, 2023
29f9490
fix: simpledvt params
krogla Oct 9, 2023
7b78221
feat(deployed-holesky.json): add missing addresses and parameters
arwer13 Oct 9, 2023
9474397
fix: transfer OracleDaemonConfig admin role to agent
arwer13 Oct 10, 2023
1cd079d
feat: set OracleDaemonConfig params upon deployment
arwer13 Oct 10, 2023
085a60f
fix: deployment when specified gateSealFactory is zero address
arwer13 Oct 10, 2023
517c01d
feat(deployed-holesky.json): add Aragon std apps Repo addresses
arwer13 Oct 10, 2023
470e9f6
fix(deployed-holesky): oracle and NOR repo addresses
arwer13 Oct 10, 2023
d66db72
refactor(deployed-x.json): 'owner' and 'multisigAddress' --> 'deployer'
arwer13 Oct 10, 2023
653f78a
refactor(deployed-testnet-defaults.json): use `null` for unspecified
arwer13 Oct 10, 2023
eda1672
refactor: clean-up part of obsolete docs and scripts
arwer13 Oct 11, 2023
c860aeb
refactor: unify deployed-xxx.json format
arwer13 Oct 11, 2023
fe1cf4d
refactor: more cleaning up, moving files, updating docs
arwer13 Oct 12, 2023
115e9dc
chore(deps-dev): bump urllib3 from 2.0.2 to 2.0.7
dependabot[bot] Oct 17, 2023
029cc9e
refactor: sort keys in deployed-x.json alphabetically
arwer13 Oct 20, 2023
d215e08
refactor(scratch deploy): remove more obsolete code
arwer13 Oct 23, 2023
33f6be9
refactor(scratch deploy): persistNetworkState2 and deployed-x.json fmt
arwer13 Oct 24, 2023
21bad5b
code review: small fixes here and there
arwer13 Oct 24, 2023
1f2b68a
feat(scratch-deploy): vest Agent with enough LDO to vote
arwer13 Oct 27, 2023
e9071f5
feat(scratch deploy): count total gas used
arwer13 Oct 29, 2023
d862c79
refactor(scratch deploy): update scripts numerical prefixes
arwer13 Oct 29, 2023
93c8ed3
feat(scratch deploy): update ACL setup to match mainnet more
arwer13 Oct 31, 2023
33e085b
feat(scratch deploy): add check of non-aragon permissions
arwer13 Oct 31, 2023
9677230
Merge pull request #790 from lidofinance/feat/scratch-holesky
arwer13 Nov 4, 2023
86bb131
Merge branch 'develop' into dependabot/pip/urllib3-2.0.7
TheDZhon Nov 5, 2023
def39ce
Merge pull request #800 from lidofinance/dependabot/pip/urllib3-2.0.7
TheDZhon Nov 5, 2023
573f7ea
feat(scratch deploy): set withdrawalQueue baseUri upon deploy
arwer13 Nov 21, 2023
e6d9413
doc(scratch): add small note about env var WITHDRAWAL_QUEUE_BASE_URI
arwer13 Nov 21, 2023
5f30950
fix(testnet defaults): add missing "Lido: " prefix to unstETH full name
arwer13 Nov 22, 2023
cbe79d3
Merge pull request #805 from lidofinance/fix/scratch-wq-base-uri
arwer13 Nov 22, 2023
61f1d6e
refactor(github flows): bump actions/checkout v3 -> v4
arwer13 Nov 22, 2023
c320f3d
refactor(github flow): bump actions/setup-node v3 -> v4
arwer13 Nov 22, 2023
ab4e81e
refactor(github flow): bump NodeJS version 16 -> 18
arwer13 Nov 22, 2023
b50aade
try forge github action to run anvil (#808)
arwer13 Nov 23, 2023
986869f
refactor: CI anvil run command and missing debug output
arwer13 Nov 23, 2023
9f13999
doc(scratch-deploy): local deploy: remove accounts.json setup step
arwer13 Nov 23, 2023
d787857
chore(deps-dev): bump eth-abi from 4.0.0 to 4.2.0
dependabot[bot] Nov 24, 2023
124bfd2
feat(scratch): after deploy run simple acceptance test (on fork)
arwer13 Nov 27, 2023
8becfe6
feat: on scratch deploy grant NOR's MANAGE_NODE_OPERATOR_ROLE to voting
arwer13 Nov 27, 2023
43aaa74
refactor(github flows): remove obsolete files
arwer13 Nov 27, 2023
dfe71bd
fix(github flow): attempt to fix bytecode checks (assert-bytecode.yml)
arwer13 Nov 27, 2023
abf0b8b
refactor: generate artifacts.json on CI, remove it from repo and compile
arwer13 Nov 27, 2023
fb8c68b
fix(workflows): typo in assert-bytecode.yml
arwer13 Nov 27, 2023
f3f79df
chore(deps-dev): bump aiohttp from 3.8.4 to 3.9.0
dependabot[bot] Nov 28, 2023
8581569
fix(workflows): attemp to fix storage-layout updating the action used
arwer13 Nov 28, 2023
fea112c
fix(workflow): attempt to fix assert-bytecode (ignore LidoTemplate)
arwer13 Nov 28, 2023
1c57abe
fix(workflow): 2nd attempt to fix assert-bytecode (ignore LidoTemplate)
arwer13 Nov 28, 2023
6831106
fix(workflow storage-layout-check): ignore ERC1967Proxy
arwer13 Nov 28, 2023
0801db3
fix(workflow): 3rd attempt to fix assert-bytecode (restore ignores)
arwer13 Nov 28, 2023
a0dcbdf
refactor(storage-layout-action): refer to v1 again (not dev branch)
arwer13 Nov 28, 2023
caeab68
refactor(workflow): restore assert-bytecode condition: only master
arwer13 Nov 28, 2023
e5c98a9
Merge pull request #811 from lidofinance/dependabot/pip/eth-abi-4.2.0
TheDZhon Nov 29, 2023
3ca9082
Merge branch 'develop' into dependabot/pip/aiohttp-3.9.0
TheDZhon Nov 29, 2023
bfc9fb6
Merge pull request #812 from lidofinance/dependabot/pip/aiohttp-3.9.0
TheDZhon Nov 29, 2023
2842af4
feat(scratch): assign MANAGE_NODE_OPERATOR_ROLE to agent (manager is …
arwer13 Dec 6, 2023
c5a5797
Merge pull request #807 from lidofinance/feat/ci-scratcy-deploy
arwer13 Dec 7, 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
20 changes: 0 additions & 20 deletions .github/deployed-bytecode-consts.js

This file was deleted.

24 changes: 0 additions & 24 deletions .github/prepare-accounts-json.py

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/analyse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
security-events: write
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Setup node.js version
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 18

- name: Get yarn cache directory path
id: yarn-cache-dir-path
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
run: >
curl -sSL https://install.python-poetry.org | python - &&
poetry install --no-root

- name: Remove foundry.toml
run: rm -f foundry.toml

Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/assert-bytecode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,22 @@ name: Verify deployed contracts' bytecode

on:
pull_request:
branches:
- 'master'
branches: [master]

jobs:
assert-bytecode:
name: Assert deployed contracts bytecode
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false

- name: Setup node.js version
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 18

- name: Get yarn cache directory path
id: yarn-cache-dir-path
Expand Down Expand Up @@ -49,6 +48,9 @@ jobs:
- name: Compile contracts
run: yarn compile

- name: Write config for action-verify-bytecode
run: yarn extract-artifacts

- name: Verify bytecode
uses: lidofinance/action-verify-bytecode@master
with:
Expand All @@ -64,5 +66,5 @@ jobs:
cat _actual _expected | sort | uniq -u | tee _diff
[ -s _diff ] && exit 1 || exit 0
env:
IGNORE_REGEX: test|lib|mock|interface|template|OrderedCallback|Pausable|Versioned|BeaconChainDepositor|PausableUntil
IGNORE_REGEX: test|lib|mock|interface|template|OrderedCallback|Pausable|Versioned|BeaconChainDepositor|PausableUntil|WithdrawalsManagerProxy|WithdrawalsManagerStub|ERC1967Proxy
if: ${{ always() }}
6 changes: 3 additions & 3 deletions .github/workflows/fix-abi-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false

- name: Setup node.js version
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 18

- name: Get yarn cache directory path
id: yarn-cache-dir-path
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false

- name: Setup node.js version
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 18

- name: Get yarn cache directory path
id: yarn-cache-dir-path
Expand Down Expand Up @@ -57,14 +57,14 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false

- name: Setup node.js version
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 18

- name: Get yarn cache directory path
id: yarn-cache-dir-path
Expand Down
61 changes: 61 additions & 0 deletions .github/workflows/release-abis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
---
name: Upload ABIs to a published release

on:
release:
types: [published] # stable and pre-releases

permissions:
contents: write

jobs:
release-abis:
name: Build ABIs and upload to the release
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
persist-credentials: false

- name: Setup node.js version
uses: actions/setup-node@v4
with:
node-version: 18

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn config get cacheFolder)" >> "$GITHUB_OUTPUT"

- name: Cache yarn cache
id: cache-yarn-cache
uses: actions/cache@v3
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: yarn-${{ hashFiles('**/yarn.lock') }}

- name: Cache node_modules
id: cache-node-modules
uses: actions/cache@v3
with:
path: '**/node_modules'
key: node_modules-${{ hashFiles('**/yarn.lock') }}
restore-keys: node_modules-${{ hashFiles('**/yarn.lock') }}

- name: Install modules
run: yarn
if: |
steps.cache-yarn-cache.outputs.cache-hit != 'true' ||
steps.cache-node-modules.outputs.cache-hit != 'true'

- name: Compile contracts
run: yarn compile

- name: Make an ABIs archive
run: zip -j abis.zip lib/abi/*.json

- name: Upload the archive to the release
run: |
gh release view "$GITHUB_REF" || exit;
gh release upload "$GITHUB_REF" abis.zip;
55 changes: 55 additions & 0 deletions .github/workflows/scratch-deploy-local.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Scratch deploy on local clean anvil

on:
pull_request:
branches: [master, develop]

jobs:
do-scratch-deploy:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
persist-credentials: false

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1

- name: Start anvil in background
# For the port see port in scripts/scratch/dao-local-deploy.sh in RPC_URL env var
run: anvil -p 8555 --mnemonic "test test test test test test test test test test test junk" &

- name: Setup node.js version
uses: actions/setup-node@v4
with:
node-version: 18

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT

- name: Cache yarn cache
id: cache-yarn-cache
uses: actions/cache@v3
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: yarn-${{ hashFiles('**/yarn.lock') }}

- name: Cache node_modules
id: cache-node-modules
uses: actions/cache@v3
with:
path: '**/node_modules'
key: node_modules-${{ hashFiles('**/yarn.lock') }}
restore-keys: node_modules-${{ hashFiles('**/yarn.lock') }}

- name: Install modules
run: yarn
if: |
steps.cache-yarn-cache.outputs.cache-hit != 'true' ||
steps.cache-node-modules.outputs.cache-hit != 'true'

- name: Run local deploy script
run: bash scripts/scratch/dao-local-deploy.sh
7 changes: 4 additions & 3 deletions .github/workflows/storage-layout-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
name: Assert storage layout
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup node.js version
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: 'yarn'

- name: Submodules
Expand All @@ -32,3 +32,4 @@ jobs:
mode: check
src-folder: ./contracts
ignore-folders: '{test_helpers,template,mocks}'
ignore-contracts: 'WithdrawalsManagerProxy|WithdrawalsManagerStub|ERC1967Proxy'
6 changes: 3 additions & 3 deletions .github/workflows/storage-layout-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ jobs:
name: Update storage layout
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup node.js version
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: 'yarn'

- name: Install yarn deps
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ cli/vendor
# e2e temp data
/deployed-e2e.json

/deployed-local.json

# OS relative
.DS_Store

Expand Down
Loading
Loading