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

avoid confusion in README.md #190

Merged
merged 1 commit into from
Mar 25, 2024
Merged

Conversation

bap2pecs
Copy link
Contributor

@bap2pecs bap2pecs commented Feb 6, 2024

there is

trustedAggregatorTimeout: uint64, If a sequence is not verified in this timeout everyone can verify it

so it's confusing if we don't mention that pendingStateTimeout means everyone can consolidate it after this timeout because for trusted aggregator, it doesn't need to honor this timeout:

    function consolidatePendingState(
        uint32 rollupID,
        uint64 pendingStateNum
    ) external {
        RollupData storage rollup = rollupIDToRollupData[rollupID];
        // Check if pending state can be consolidated
        // If trusted aggregator is the sender, do not check the timeout or the emergency state
        if (!hasRole(_TRUSTED_AGGREGATOR_ROLE, msg.sender)) {
            if (isEmergencyState) {
                revert OnlyNotEmergencyState();
            }

            if (!_isPendingStateConsolidable(rollup, pendingStateNum)) {
                revert PendingStateNotConsolidable();
            }
        }
        _consolidatePendingState(rollup, pendingStateNum);
    }

@cla-bot cla-bot bot added the cla-signed label Feb 6, 2024
@invocamanman
Copy link
Collaborator

Hey!
Pls make all the PRs, on develop, since will be the next "main" branch in short term.

I though it was implied, but ye is more consistent with the comment above ^^

@bap2pecs bap2pecs changed the base branch from main to develop February 13, 2024 20:12
@bap2pecs
Copy link
Contributor Author

@invocamanman just updated!

Copy link

sonarcloud bot commented Feb 13, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
15 Security Hotspots
21.3% Duplication on New Code (required ≤ 20%)
C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarCloud

idea Catch issues before they fail your Quality Gate with our IDE extension SonarLint SonarLint

@invocamanman invocamanman merged commit 8222986 into 0xPolygonHermez:develop Mar 25, 2024
2 of 4 checks passed
@bap2pecs bap2pecs deleted the patch-3 branch March 26, 2024 11:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants