This commit is contained in:
Cassandra Heart 2024-02-22 00:07:17 -06:00 committed by GitHub
parent 643823879b
commit a0a8ffc4e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 26 additions and 16 deletions

View File

@ -886,11 +886,11 @@ func logoVersion(width int) string {
out += " ####################################### ########\n"
out += " ############################# ##\n"
out += " \n"
out += " Quilibrium Node - v1.2.12 Dawn\n"
out += " Quilibrium Node - v1.2.13 Dawn\n"
out += " \n"
out += " DB Console\n"
} else {
out = "Quilibrium Node - v1.2.12 Dawn - DB Console\n"
out = "Quilibrium Node - v1.2.13 Dawn - DB Console\n"
}
return out
}

View File

@ -104,6 +104,7 @@ func (e *CeremonyDataClockConsensusEngine) GetCompressedSyncFrames(
e.filter,
frame.FrameNumber-1,
frame.ParentSelector,
true,
)
if err != nil {
from = 1
@ -115,14 +116,11 @@ func (e *CeremonyDataClockConsensusEngine) GetCompressedSyncFrames(
e.filter,
frame.FrameNumber-1,
parent,
true,
)
if err != nil {
if frame.FrameNumber > 18 {
from = frame.FrameNumber - 16
} else {
from = 2
}
e.logger.Debug("peer fully out of sync, rewinding sync head to min")
from = 1
e.logger.Debug("peer fully out of sync, rewinding sync head to start")
break
}

View File

@ -55,9 +55,9 @@ func GetMinimumVersionCutoff() time.Time {
}
func GetMinimumVersion() []byte {
return []byte{0x01, 0x02, 0x0B}
return []byte{0x01, 0x02, 0x0D}
}
func GetVersion() []byte {
return []byte{0x01, 0x02, 0x0C}
return []byte{0x01, 0x02, 0x0D}
}

View File

@ -416,6 +416,7 @@ func (d *DataTimeReel) addPending(
frame.Filter,
frame.FrameNumber,
selector.FillBytes(make([]byte, 32)),
true,
); err != nil && existing == nil {
d.logger.Debug(
"not stored yet, save data candidate",
@ -524,6 +525,7 @@ func (d *DataTimeReel) processPending(
d.filter,
f,
next.selector.FillBytes(make([]byte, 32)),
false,
)
if err != nil && !errors.Is(err, store.ErrNotFound) {
panic(err)
@ -597,6 +599,7 @@ func (d *DataTimeReel) getTotalDistance(frame *protobufs.ClockFrame) *big.Int {
d.filter,
index.FrameNumber-1,
index.ParentSelector,
true,
) {
distance, err := d.GetDistance(index)
if err != nil {
@ -681,6 +684,7 @@ func (d *DataTimeReel) forkChoice(
d.filter,
rightIndex.FrameNumber-1,
rightIndex.ParentSelector,
true,
)
if err != nil {
// If lineage cannot be verified, set it for later
@ -725,6 +729,7 @@ func (d *DataTimeReel) forkChoice(
d.filter,
leftIndex.FrameNumber-1,
leftIndex.ParentSelector,
true,
)
if err != nil {
panic(err)
@ -734,6 +739,7 @@ func (d *DataTimeReel) forkChoice(
d.filter,
rightIndex.FrameNumber-1,
rightIndex.ParentSelector,
true,
)
if err != nil {
// If lineage cannot be verified, set it for later
@ -788,6 +794,7 @@ func (d *DataTimeReel) forkChoice(
d.filter,
frameNumber,
next,
false,
)
if err != nil {
panic(err)

View File

@ -1390,6 +1390,7 @@ func (e *CeremonyExecutionEngine) VerifyExecution(
),
frame.FrameNumber-1,
frame.ParentSelector,
false,
)
if err != nil && !errors.Is(err, store.ErrNotFound) {
return errors.Wrap(err, "verify execution")

View File

@ -306,5 +306,5 @@ func printLogo() {
func printVersion() {
fmt.Println(" ")
fmt.Println(" Quilibrium Node - v1.2.12 Dawn")
fmt.Println(" Quilibrium Node - v1.2.13 Dawn")
}

View File

@ -72,6 +72,7 @@ type ClockStore interface {
filter []byte,
frameNumber uint64,
parentSelector []byte,
truncate bool,
) (*protobufs.ClockFrame, error)
RangeCandidateDataClockFrames(
filter []byte,
@ -850,6 +851,7 @@ func (p *PebbleClockStore) GetParentDataClockFrame(
filter []byte,
frameNumber uint64,
parentSelector []byte,
truncate bool,
) (*protobufs.ClockFrame, error) {
check := false
data, closer, err := p.db.Get(
@ -880,11 +882,13 @@ func (p *PebbleClockStore) GetParentDataClockFrame(
}
}
if err := p.fillAggregateProofs(parent); err != nil {
return nil, errors.Wrap(
errors.Wrap(err, ErrInvalidData.Error()),
"get clock frame iterator value",
)
if !truncate {
if err := p.fillAggregateProofs(parent); err != nil {
return nil, errors.Wrap(
errors.Wrap(err, ErrInvalidData.Error()),
"get clock frame iterator value",
)
}
}
if closer != nil {