Skip to content

Commit

Permalink
Merge branch 'mainnet' of https://github.com/AleoHQ/snarkVM into feat…
Browse files Browse the repository at this point in the history 
…/max-transmissions-limit
  • Loading branch information
@howardwu
howardwu committed Nov 30, 2023
2 parents dd3218c + 6c1d418 commit 3300460
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 13 deletions.
19 changes: 14 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<a href="https://circleci.com/gh/AleoHQ/snarkVM"><img src="https://dl.circleci.com/status-badge/img/gh/AleoHQ/snarkVM/tree/testnet3.svg?style=svg"></a>
<a href="https://codecov.io/gh/AleoHQ/snarkVM"><img src="https://codecov.io/gh/AleoHQ/snarkVM/branch/master/graph/badge.svg?token=cck8tS9HpO"/></a>
<a href="https://aleo.org/discord"><img src="https://img.shields.io/discord/700454073459015690?logo=discord"/></a>
<a href="https://github.com/AleoHQ/snarkVM"><img src="https://img.shields.io/badge/contributors-34-ee8449"/></a>
<a href="https://github.com/AleoHQ/snarkVM"><img src="https://img.shields.io/badge/contributors-41-ee8449"/></a>
</p>

## Table of Contents
Expand Down Expand Up @@ -85,7 +85,7 @@ snarkvm

## 4. Contributors

Thank you for helping make SnarkVM better!
Thank you for helping make snarkVM better!
[🧐 What do the emojis mean?](https://allcontributors.org/docs/en/emoji-key)

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
Expand All @@ -104,21 +104,21 @@ Thank you for helping make SnarkVM better!
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/collinc97"><img src="https://avatars.githubusercontent.com/u/16715212?v=4?s=100" width="100px;" alt="Collin Chin"/><br /><sub><b>Collin Chin</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=collinc97" title="Code">💻</a> <a href="https://github.com/AleoHQ/snarkvm/commits?author=collinc97" title="Documentation">📖</a> <a href="https://github.com/AleoHQ/snarkvm/pulls?q=is%3Apr+reviewed-by%3Acollinc97" title="Reviewed Pull Requests">👀</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://www.kestrel.edu/~coglio"><img src="https://avatars.githubusercontent.com/u/2409151?v=4?s=100" width="100px;" alt="Alessandro Coglio"/><br /><sub><b>Alessandro Coglio</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=acoglio" title="Code">💻</a> <a href="https://github.com/AleoHQ/snarkvm/commits?author=acoglio" title="Documentation">📖</a> <a href="https://github.com/AleoHQ/snarkvm/commits?author=acoglio" title="Tests">⚠️</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://alessandrocoglio.info"><img src="https://avatars.githubusercontent.com/u/2409151?v=4?s=100" width="100px;" alt="Alessandro Coglio"/><br /><sub><b>Alessandro Coglio</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=acoglio" title="Code">💻</a> <a href="https://github.com/AleoHQ/snarkvm/commits?author=acoglio" title="Documentation">📖</a> <a href="https://github.com/AleoHQ/snarkvm/commits?author=acoglio" title="Tests">⚠️</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/niklaslong"><img src="https://avatars.githubusercontent.com/u/13221615?v=4?s=100" width="100px;" alt="Niklas Long"/><br /><sub><b>Niklas Long</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=niklaslong" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jules"><img src="https://avatars.githubusercontent.com/u/30194392?v=4?s=100" width="100px;" alt="jules"/><br /><sub><b>jules</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=jules" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/amousa11"><img src="https://avatars.githubusercontent.com/u/12452142?v=4?s=100" width="100px;" alt="Ali Mousa"/><br /><sub><b>Ali Mousa</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=amousa11" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.chenweikeng.com/"><img src="https://avatars.githubusercontent.com/u/14937807?v=4?s=100" width="100px;" alt="Weikeng Chen"/><br /><sub><b>Weikeng Chen</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=weikengchen" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Protryon"><img src="https://avatars.githubusercontent.com/u/8600837?v=4?s=100" width="100px;" alt="Max Bruce"/><br /><sub><b>Max Bruce</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=Protryon" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/evan-schott"><img src="https://avatars.githubusercontent.com/u/53463459?v=4?s=100" width="100px;" alt="Evan Schott"/><br /><sub><b>Evan Schott</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=evan-schott" title="Code">💻</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Protryon"><img src="https://avatars.githubusercontent.com/u/8600837?v=4?s=100" width="100px;" alt="Max Bruce"/><br /><sub><b>Max Bruce</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=Protryon" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/zhiqiangxu"><img src="https://avatars.githubusercontent.com/u/1265027?v=4?s=100" width="100px;" alt="zhiqiangxu"/><br /><sub><b>zhiqiangxu</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=zhiqiangxu" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jrchatruc"><img src="https://avatars.githubusercontent.com/u/49622509?v=4?s=100" width="100px;" alt="Javier Rodríguez Chatruc"/><br /><sub><b>Javier Rodríguez Chatruc</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=jrchatruc" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/emmorais"><img src="https://avatars.githubusercontent.com/u/13047772?v=4?s=100" width="100px;" alt="Eduardo Morais"/><br /><sub><b>Eduardo Morais</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=emmorais" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/zvolin"><img src="https://avatars.githubusercontent.com/u/34972409?v=4?s=100" width="100px;" alt="Maciej Zwoliński"/><br /><sub><b>Maciej Zwoliński</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=zvolin" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ilitteri"><img src="https://avatars.githubusercontent.com/u/67517699?v=4?s=100" width="100px;" alt="Ivan Litteri"/><br /><sub><b>Ivan Litteri</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=ilitteri" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/FranFiuba"><img src="https://avatars.githubusercontent.com/u/5733366?v=4?s=100" width="100px;" alt="Francisco Strambini"/><br /><sub><b>Francisco Strambini</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=FranFiuba" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/swift-mx"><img src="https://avatars.githubusercontent.com/u/80231732?v=4?s=100" width="100px;" alt="swift-mx"/><br /><sub><b>swift-mx</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=swift-mx" title="Code">💻</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/HarukaMa"><img src="https://avatars.githubusercontent.com/u/861659?v=4?s=100" width="100px;" alt="Haruka"/><br /><sub><b>Haruka</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/issues?q=author%3AHarukaMa" title="Bug reports">🐛</a> <a href="https://github.com/AleoHQ/snarkvm/commits?author=HarukaMa" title="Code">💻</a></td>
Expand All @@ -130,11 +130,20 @@ Thank you for helping make SnarkVM better!
<td align="center" valign="top" width="14.28%"><a href="https://github.com/psivesely"><img src="https://avatars.githubusercontent.com/u/3538418?v=4?s=100" width="100px;" alt="Psi Vesely"/><br /><sub><b>Psi Vesely</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=psivesely" title="Code">💻</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/swift-mx"><img src="https://avatars.githubusercontent.com/u/80231732?v=4?s=100" width="100px;" alt="swift-mx"/><br /><sub><b>swift-mx</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=swift-mx" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/ignacio-avecilla-39386a191/"><img src="https://avatars.githubusercontent.com/u/63374472?v=4?s=100" width="100px;" alt="Nacho Avecilla"/><br /><sub><b>Nacho Avecilla</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=IAvecilla" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/qy3u"><img src="https://avatars.githubusercontent.com/u/65523321?v=4?s=100" width="100px;" alt="qy3u"/><br /><sub><b>qy3u</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=qy3u" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/happysalada"><img src="https://avatars.githubusercontent.com/u/5317234?v=4?s=100" width="100px;" alt="Yt"/><br /><sub><b>Yt</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=happysalada" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/unordered-set"><img src="https://avatars.githubusercontent.com/u/78592281?v=4?s=100" width="100px;" alt="Kostyan"/><br /><sub><b>Kostyan</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=unordered-set" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/stanlagermin"><img src="https://avatars.githubusercontent.com/u/40028493?v=4?s=100" width="100px;" alt="stanlagermin"/><br /><sub><b>stanlagermin</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=stanlagermin" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/sukey2008"><img src="https://avatars.githubusercontent.com/u/35202440?v=4?s=100" width="100px;" alt="Sukey"/><br /><sub><b>Sukey</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=sukey2008" title="Code">💻</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/AlexZhao6666"><img src="https://avatars.githubusercontent.com/u/136443781?v=4?s=100" width="100px;" alt="Alex Zhao"/><br /><sub><b>Alex Zhao</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=AlexZhao6666" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ghostant-1017"><img src="https://avatars.githubusercontent.com/u/53888545?v=4?s=100" width="100px;" alt="ghost ant"/><br /><sub><b>ghost ant</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=ghostant-1017" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/psivesely"><img src="https://avatars.githubusercontent.com/u/3538418?v=4?s=100" width="100px;" alt="Psi Vesely"/><br /><sub><b>Psi Vesely</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=psivesely" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/features/security"><img src="https://avatars.githubusercontent.com/u/27347476?v=4?s=100" width="100px;" alt="Dependabot"/><br /><sub><b>Dependabot</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=dependabot" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/apps/dependabot-preview"><img src="https://avatars.githubusercontent.com/u/27347476?v=4?s=100" width="100px;" alt="Dependabot Preview"/><br /><sub><b>Dependabot Preview</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=dependabot-preview" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://allcontributors.org/"><img src="https://avatars.githubusercontent.com/u/46410174?v=4?s=100" width="100px;" alt="All Contributors"/><br /><sub><b>All Contributors</b></sub></a><br /><a href="https://github.com/AleoHQ/snarkvm/commits?author=all-contributors" title="Documentation">📖</a></td>
</tr>
</tbody>
Expand Down
8 changes: 3 additions & 5 deletions ledger/committee/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,14 @@ impl<N: Network> Committee<N> {

/// Initializes a new `Committee` instance.
pub fn new_genesis(members: IndexMap<Address<N>, (u64, bool)>) -> Result<Self> {
// Ensure there are exactly 4 members.
ensure!(members.len() == 4, "Genesis committee must have 4 members");
// Return the new committee.
Self::new(0u64, members)
}

/// Initializes a new `Committee` instance.
pub fn new(starting_round: u64, members: IndexMap<Address<N>, (u64, bool)>) -> Result<Self> {
// Ensure there are at least 4 members.
ensure!(members.len() >= 4, "Committee must have at least 4 members");
// Ensure there are at least 3 members.
ensure!(members.len() >= 3, "Committee must have at least 3 members");
// Ensure there are no more than the maximum number of members.
ensure!(
members.len() <= Self::MAX_COMMITTEE_SIZE as usize,
Expand Down Expand Up @@ -400,7 +398,7 @@ mod tests {
// Set the number of rounds.
const NUM_ROUNDS: u64 = 256 * 2_000;
// Sample the number of members.
let num_members = rng.gen_range(4..50);
let num_members = rng.gen_range(3..50);
// Sample a committee.
let committee = crate::test_helpers::sample_committee_custom(num_members, rng);
// Check the leader distribution.
Expand Down
6 changes: 3 additions & 3 deletions ledger/committee/src/prop_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ impl Arbitrary for ValidatorSet {

fn arbitrary_with(_: Self::Parameters) -> Self::Strategy {
// use minimal validator set to speed up tests that require signing from the committee members
validator_set(any_valid_validator(), size_range(4..=4usize)).boxed()
validator_set(any_valid_validator(), size_range(3..=4usize)).boxed()
}
}

Expand All @@ -149,7 +149,7 @@ pub fn any_valid_private_key() -> BoxedStrategy<PrivateKey<CurrentNetwork>> {

#[allow(dead_code)]
fn too_small_committee() -> BoxedStrategy<Result<Committee<CurrentNetwork>>> {
(1u64.., validator_set(any_valid_validator(), 0..4)).prop_map(to_committee).boxed()
(1u64.., validator_set(any_valid_validator(), 0..3)).prop_map(to_committee).boxed()
}

#[allow(dead_code)]
Expand Down Expand Up @@ -199,5 +199,5 @@ fn invalid_stakes(#[strategy(too_low_stake_committee())] committee: Result<Commi

#[proptest]
fn invalid_member_count(#[strategy(too_small_committee())] committee: Result<Committee<CurrentNetwork>>) {
assert!(matches!(committee, Err(e) if e.to_string().as_str() == "Committee must have at least 4 members"))
assert!(matches!(committee, Err(e) if e.to_string().as_str() == "Committee must have at least 3 members"))
}

0 comments on commit 3300460

Please sign in to comment.