coosld/ceremonyclient
1
0
Fork 0
mirror of https://github.com/QuilibriumNetwork/ceremonyclient.git synced 2026-02-21 10:27:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: cutoff frames should use constants

Browse Source
This commit is contained in:
Cassandra Heart 2025-11-19 02:07:56 -06:00
parent 0a2e2fee03
commit 21b735f841
No known key found for this signature in database
GPG Key ID: 371083BFA6C240AA
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
node/consensus/global/event_distributor.go
View File

@ -24,6 +24,7 @@ import (
consensustime "source.quilibrium.com/quilibrium/monorepo/node/consensus/time"
globalintrinsics "source.quilibrium.com/quilibrium/monorepo/node/execution/intrinsics/global"
"source.quilibrium.com/quilibrium/monorepo/node/execution/intrinsics/global/compat"
"source.quilibrium.com/quilibrium/monorepo/node/execution/intrinsics/token"
"source.quilibrium.com/quilibrium/monorepo/node/p2p"
"source.quilibrium.com/quilibrium/monorepo/protobufs"
"source.quilibrium.com/quilibrium/monorepo/types/channel"
@ -544,7 +545,7 @@ func (e *GlobalConsensusEngine) evaluateForProposals(
if bytes.Equal(allocation.ConfirmationFilter, bp) {
allocated = allocation.Status != 4
if e.config.P2P.Network != 0 ||
data.Frame.Header.FrameNumber > 255840 {
data.Frame.Header.FrameNumber > token.FRAME_2_1_EXTENDED_ENROLL_END {
e.logger.Info(
"checking pending status of allocation",
zap.Int("status", int(allocation.Status)),

12
node/execution/intrinsics/global/global_prover_confirm.go
View File

@ -9,6 +9,7 @@ import (
"github.com/iden3/go-iden3-crypto/poseidon"
"github.com/pkg/errors"
"source.quilibrium.com/quilibrium/monorepo/node/execution/intrinsics/token"
hgstate "source.quilibrium.com/quilibrium/monorepo/node/execution/state/hypergraph"
"source.quilibrium.com/quilibrium/monorepo/types/crypto"
"source.quilibrium.com/quilibrium/monorepo/types/execution/intrinsics"
@ -498,8 +499,8 @@ func (p *ProverConfirm) Verify(frameNumber uint64) (bool, error) {
joinFrame := binary.BigEndian.Uint64(joinFrameBytes)
// Check timing constraints
if joinFrame < 255840 && joinFrame >= 244100 {
if frameNumber < 255840 {
if joinFrame < token.FRAME_2_1_EXTENDED_ENROLL_END && joinFrame >= 244100 {
if frameNumber < token.FRAME_2_1_EXTENDED_ENROLL_END {
// If joined before frame 255840, cannot confirm until frame 255840
return false, errors.Wrap(
errors.New("cannot confirm before frame 255840"),
@ -510,8 +511,8 @@ func (p *ProverConfirm) Verify(frameNumber uint64) (bool, error) {
// Set this to either 255840 - 360 or the raw join frame if higher than it
// so the provers before can immeidately join after the wait, those after
// still have the full 360.
if joinFrame < 252480 {
joinFrame = 252480
if joinFrame < (token.FRAME_2_1_EXTENDED_ENROLL_END - 360) {
joinFrame = (token.FRAME_2_1_EXTENDED_ENROLL_END - 360)
}
}
@ -519,7 +520,8 @@ func (p *ProverConfirm) Verify(frameNumber uint64) (bool, error) {
// immediately, for joins after 255840, normal 360 frame wait applies.
// If the join frame precedes the genesis frame (e.g. not mainnet), we
// ignore the topic altogether
if joinFrame >= 252480 || joinFrame <= 244100 {
if joinFrame >= (token.FRAME_2_1_EXTENDED_ENROLL_END-360) ||
joinFrame <= 244100 {
framesSinceJoin := frameNumber - joinFrame
if framesSinceJoin < 360 {
return false, errors.Wrap(

3
node/execution/intrinsics/global/global_prover_reject.go
View File

@ -8,6 +8,7 @@ import (
"github.com/iden3/go-iden3-crypto/poseidon"
"github.com/pkg/errors"
"source.quilibrium.com/quilibrium/monorepo/node/execution/intrinsics/token"
hgstate "source.quilibrium.com/quilibrium/monorepo/node/execution/state/hypergraph"
"source.quilibrium.com/quilibrium/monorepo/types/crypto"
"source.quilibrium.com/quilibrium/monorepo/types/execution/intrinsics"
@ -476,7 +477,7 @@ func (p *ProverReject) Verify(frameNumber uint64) (bool, error) {
joinFrame := binary.BigEndian.Uint64(joinFrameBytes)
// Special case: if join was before frame 255840, can reject any time
if joinFrame >= 255840 {
if joinFrame >= token.FRAME_2_1_EXTENDED_ENROLL_END {
// Otherwise same timing constraints as confirm
framesSinceJoin := frameNumber - joinFrame
if framesSinceJoin > 720 {