Skip to content

queue multiple fcs #1

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

Closed
wants to merge 37 commits into from
Closed

queue multiple fcs #1

wants to merge 37 commits into from

Conversation

mejango
Copy link
Contributor

@mejango mejango commented Oct 3, 2023

No description provided.

mejango and others added 30 commits August 21, 2023 10:42
@@ -465,9 +505,19 @@ contract JBFundingCycleStore is JBControllerUtility, IJBFundingCycleStore {
// Get the necessary properties for the base funding cycle.
JBFundingCycle memory _baseFundingCycle = _getStructFor(_projectId, _fundingCycle.basedOn);

// Find the base cycle that is not still queued.
while (_baseFundingCycle.start > block.timestamp) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do-while loop?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need a while (true) loop with a conditional here. i made the change.

Comment on lines +538 to +539
while (_fundingCycle.number != 0) {
// If the latest is expired, return an empty funding cycle.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do-while loop?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

works here. done.

JBBallotState _ballotState = _ballotStateOf(_projectId, _fundingCycle);

// While the cycle has a ballot that isn't approved or if it hasn't yet started, get a reference to the funding cycle that the latest is based on, which has the latest approved configuration.
while (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do-while loop?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doesnt work here

// Set the configuration.
configuration = _baseFundingCycle.configuration;
// Get the funding cycle for the configuration.
_fundingCycle = _getStructFor(_projectId, configuration);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

configuration and _fundingCycle aren't needed in this loop, we can get these after we find the correct _baseFundingCycle.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this the same as _fundingCycle = _baseFundingCycle;?

@mejango mejango marked this pull request as draft November 5, 2023 05:17
@mejango mejango closed this Nov 13, 2023
@filipviz filipviz deleted the feature/multiple-queued-fc branch December 15, 2023 21:16
mejango added a commit that referenced this pull request Nov 14, 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.

4 participants