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

chore: Sync SR1.5 branch with the latest develop #858

Draft
wants to merge 176 commits into
base: develop
Choose a base branch
from

Conversation

tamtamchik
Copy link
Member

Trying to make the update as smooth as possible 🫡

Restored CI actions, unit tests, and scratch deployment.

TODO:

  • fix integration tests on scratch (consider changes from SR1.5)
  • fix integration tests on the mainnet fork (add upgrade steps for applying changes from SR1.5 to protocol on the mainnet fork)
  • move /contracts/*/test_helpers/ to /test
    • rename based on __Mock / __Harness convention
    • format as other test contracts

Port of lidofinance/core#216

mkurayan and others added 30 commits May 23, 2024 18:08
Depending on the size of the third-phase report, it may be split into multiple transactions.
Distribute reward separately using the permissionless method in each staking module.
…-third-phase-fix

Feat/multi transaction oracle third phase fix
Update contract version and reward distribution state.
new parameter placed at the end of struct to preserve data order compatibility on read
mkurayan and others added 24 commits September 11, 2024 13:09
Ackee L2: Potential revert on underflow.
In the Staking Router, an unsafe update of the exited validators count could potentially cause
the total exited validators count to exceed the total deposited validators count.

This would break the pre-defined invariant:
activeValidatorsCount = totalDepositedValidators - totalExitedValidators.

This fix ensures the integrity of the active validators count by preventing such an underflow.
Ackee L3: The clearNodeOperatorPenalty returns always false
Ackee I2: Missing event on clearNodeOperatorPenalty
Ackee I3: Typo in node operator registry function name
# Conflicts:
#	lib/deploy.ts
#	scripts/scratch/deployed-testnet-defaults.json
#	scripts/scratch/steps/0030-deploy-template-and-app-bases.ts
#	scripts/scratch/steps/0090-deploy-non-aragon-contracts.ts
#	test/0.4.24/contracts/NodeOperatorsRegistry__Harness.sol
#	test/0.4.24/nor/nor.aux.test.ts
#	test/0.4.24/nor/nor.initialize.upgrade.test.ts
#	test/0.4.24/nor/nor.management.flow.test.ts
#	test/0.4.24/nor/nor.rewards.penalties.flow.test.ts
#	test/0.4.24/nor/nor.signing.keys.test.ts
#	test/0.8.9/contracts/StakingModule__Mock.sol
#	test/0.8.9/contracts/StakingRouter__MockForDepositSecurityModule.sol
#	test/0.8.9/contracts/StakingRouter__MockForSanityChecker.sol
#	test/0.8.9/contracts/oracle/OracleReportSanityCheckerMocks.sol
#	test/0.8.9/depositSecurityModule.test.ts
#	test/0.8.9/oracle/accountingOracle.submitReport.test.ts
#	test/0.8.9/oracle/accountingOracle.submitReportExtraData.test.ts
#	test/0.8.9/oracle/baseOracle.accessControl.test.ts
#	test/0.8.9/sanityChecker/oracleReportSanityChecker.misc.test.ts
#	test/0.8.9/sanityChecker/oracleReportSanityChecker.negative-rebase.test.ts
#	test/0.8.9/stakingRouter/stakingRouter.misc.test.ts
#	test/0.8.9/stakingRouter/stakingRouter.module-management.test.ts
#	test/0.8.9/stakingRouter/stakingRouter.module-sync.test.ts
#	test/0.8.9/stakingRouter/stakingRouter.rewards.test.ts
#	test/0.8.9/stakingRouter/stakingRouter.status-control.test.ts
#	test/0.8.9/stakingRouter/stakingRouter.versioned.test.ts
#	test/common/minFirstAllocationStrategy.t.sol
#	test/deploy/dao.ts
…velop-sync

# Conflicts:
#	test/0.8.9/oracle/hashConsensus.submitReport.test.ts
@tamtamchik tamtamchik requested review from a team as code owners October 11, 2024 16:08
@tamtamchik tamtamchik marked this pull request as draft October 11, 2024 16:08
@tamtamchik tamtamchik changed the base branch from master to develop October 11, 2024 16:09
@tamtamchik tamtamchik changed the title chore: update SR1.5 dev branch with latest changes from develop branch chore: Sync SR1.5 branch with the latest develop Oct 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants