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.

Sign up for GitHub

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: merge master into m2-mainnet #79

Merged
merged 9 commits into from
Nov 30, 2023
Merged

chore: merge master into m2-mainnet #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5edcc78
fix: remove husky command that only needs to be run once
Nov 8, 2023
b0dd616
Merge pull request #59 from Layr-Labs/chore/fix-contributing-doc
wadealexc Nov 8, 2023
cda67ff
update nonSignerForQuorumIndex outside of loop
gpsanant Nov 16, 2023
7c8a7c9
Merge branch 'master' into fix-loop-reset-nonSignerForQuorumIndex
ChaoticWalrus Nov 16, 2023
d5d520e
Merge pull request #65 from Layr-Labs/fix-loop-reset-nonSignerForQuor…
gpsanant Nov 16, 2023
119085d
chore: add MacOS indexing file to gitignore
ChaoticWalrus Nov 16, 2023
92aefd2
chore: correct addresses for M2 Goerli deployment
ChaoticWalrus Nov 16, 2023
bee1c9f
Merge pull request #67 from Layr-Labs/repo-cleanup
ChaoticWalrus Nov 16, 2023
dc69503
chore: merge branch 'master' into m2-mainnet
wadealexc Nov 30, 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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ node_modules/

# Dotenv file
.env


*.DS_Store
2 changes: 0 additions & 2 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ npm install

npx husky install

npx husky add .husky/commit-msg 'npx --no -- commitlint --edit ${1}'

forge install
```

Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ The current implementation of this contract is the [BLSSignatureChecker](./docs/

| Name | Solidity | Contract | Notes |
| ------------------------- | ----------------------------- | ------------------------------------------------------------------------------------------------- | ----- |
| BLSOperatorStateRetriever | BLSOperatorStateRetriever.sol | [`0xf60a...7251`](https://goerli.etherscan.io/address/0xf60a330F8c1A0C0ecf3Eab1D54b00F3a8FE37251) | |
| BLSPubkeyCompendium | BLSPubkeyCompendium.sol | [`0xdd53...B9Bb`](https://goerli.etherscan.io/address/0xdd53D44257d5F4EB0ca60F60d88827C1b433B9Bb) | |
| BLSOperatorStateRetriever | BLSOperatorStateRetriever.sol | [`0x737D...A3a3`](https://goerli.etherscan.io/address/0x737Dd62816a9392e84Fa21C531aF77C00816A3a3) | |
| BLSPubkeyCompendium | BLSPubkeyCompendium.sol | [`0xc81d...1b19`](https://goerli.etherscan.io/address/0xc81d3963087Fe09316cd1E032457989C7aC91b19) | |

## Further reading

Expand Down
6 changes: 4 additions & 2 deletions src/BLSSignatureChecker.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,13 @@ contract BLSSignatureChecker is IBLSSignatureChecker {
stakeRegistry.getTotalStakeAtBlockNumberFromIndex(quorumNumber, referenceBlockNumber, nonSignerStakesAndSignature.totalStakeIndices[quorumNumberIndex]);
// copy total stake to signed stake
quorumStakeTotals.signedStakeForQuorum[quorumNumberIndex] = quorumStakeTotals.totalStakeForQuorum[quorumNumberIndex];

// keep track of the nonSigners index in the quorum
uint32 nonSignerForQuorumIndex = 0;

// loop through all nonSigners, checking that they are a part of the quorum via their quorumBitmap
// if so, load their stake at referenceBlockNumber and subtract it from running stake signed
for (uint32 i = 0; i < nonSignerStakesAndSignature.nonSignerPubkeys.length; i++) {
// keep track of the nonSigners index in the quorum
uint32 nonSignerForQuorumIndex = 0;
// if the nonSigner is a part of the quorum, subtract their stake from the running total
if (BitmapUtils.numberIsInBitmap(nonSignerQuorumBitmaps[i], quorumNumber)) {
quorumStakeTotals.signedStakeForQuorum[quorumNumberIndex] -=
Expand Down
Loading