This commit is contained in:
Cassandra Heart 2024-02-18 18:28:29 -06:00 committed by GitHub
parent bfbd35aae0
commit 53d4664ab7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 45 additions and 22 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ vouchers/
ceremony-client ceremony-client
.config* .config*
.DS_Store .DS_Store
*.mprof

View File

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

View File

@ -414,17 +414,17 @@ func (e *CeremonyDataClockConsensusEngine) runLoop() {
e.frameChan <- latestFrame e.frameChan <- latestFrame
}() }()
var nextFrame *protobufs.ClockFrame
if nextFrame, err = e.prove(latestFrame); err != nil {
e.logger.Error("could not prove", zap.Error(err))
e.state = consensus.EngineStateCollecting
continue
}
if bytes.Equal( if bytes.Equal(
e.frameProverTrie.FindNearest(e.provingKeyAddress).External.Key, e.frameProverTrie.FindNearest(e.provingKeyAddress).External.Key,
e.provingKeyAddress, e.provingKeyAddress,
) { ) {
var nextFrame *protobufs.ClockFrame
if nextFrame, err = e.prove(latestFrame); err != nil {
e.logger.Error("could not prove", zap.Error(err))
e.state = consensus.EngineStateCollecting
continue
}
e.dataTimeReel.Insert(nextFrame) e.dataTimeReel.Insert(nextFrame)
if err = e.publishProof(nextFrame); err != nil { if err = e.publishProof(nextFrame); err != nil {
@ -447,14 +447,14 @@ func (e *CeremonyDataClockConsensusEngine) runLoop() {
e.frameChan <- latestFrame e.frameChan <- latestFrame
}() }()
var nextFrame *protobufs.ClockFrame
if nextFrame, err = e.prove(latestFrame); err != nil {
e.logger.Error("could not prove", zap.Error(err))
e.state = consensus.EngineStateCollecting
continue
}
if e.frameProverTrie.Contains(e.provingKeyAddress) { if e.frameProverTrie.Contains(e.provingKeyAddress) {
var nextFrame *protobufs.ClockFrame
if nextFrame, err = e.prove(latestFrame); err != nil {
e.logger.Error("could not prove", zap.Error(err))
e.state = consensus.EngineStateCollecting
continue
}
e.dataTimeReel.Insert(nextFrame) e.dataTimeReel.Insert(nextFrame)
if err = e.publishProof(nextFrame); err != nil { if err = e.publishProof(nextFrame); err != nil {

View File

@ -206,7 +206,8 @@ func (e *CeremonyDataClockConsensusEngine) sync(
&protobufs.ClockFramesRequest{ &protobufs.ClockFramesRequest{
Filter: e.filter, Filter: e.filter,
FromFrameNumber: from, FromFrameNumber: from,
ToFrameNumber: from + 8, ToFrameNumber: maxFrame,
ParentSelector: latest.ParentSelector,
}, },
grpc.MaxCallRecvMsgSize(600*1024*1024), grpc.MaxCallRecvMsgSize(600*1024*1024),
) )

View File

@ -51,13 +51,13 @@ type DataConsensusEngine interface {
} }
func GetMinimumVersionCutoff() time.Time { func GetMinimumVersionCutoff() time.Time {
return time.Date(2024, time.February, 13, 7, 0, 0, 0, time.UTC) return time.Date(2024, time.February, 19, 0, 0, 0, 0, time.UTC)
} }
func GetMinimumVersion() []byte { func GetMinimumVersion() []byte {
return []byte{0x01, 0x02, 0x04} return []byte{0x01, 0x02, 0x09}
} }
func GetVersion() []byte { func GetVersion() []byte {
return []byte{0x01, 0x02, 0x08} return []byte{0x01, 0x02, 0x09}
} }

View File

@ -75,7 +75,6 @@ func (e *MasterClockConsensusEngine) handleClockFramesResponse(
zap.Binary("peer_id", peerID), zap.Binary("peer_id", peerID),
zap.Binary("expected_peer_id", e.syncingTarget), zap.Binary("expected_peer_id", e.syncingTarget),
) )
return nil
} }
e.syncingStatus = SyncStatusSynchronizing e.syncingStatus = SyncStatusSynchronizing

View File

@ -7,10 +7,13 @@ import (
"flag" "flag"
"fmt" "fmt"
"io/fs" "io/fs"
"log"
"os" "os"
"os/signal" "os/signal"
"path/filepath" "path/filepath"
"runtime/pprof"
"syscall" "syscall"
"time"
"source.quilibrium.com/quilibrium/monorepo/node/protobufs" "source.quilibrium.com/quilibrium/monorepo/node/protobufs"
@ -50,11 +53,30 @@ var (
false, false,
"print the peer id to stdout from the config and exit", "print the peer id to stdout from the config and exit",
) )
memprofile = flag.String(
"memprofile",
"",
"write memory profile after 20m to this file",
)
) )
func main() { func main() {
flag.Parse() flag.Parse()
if *memprofile != "" {
go func() {
for {
time.Sleep(20 * time.Minute)
f, err := os.Create(*memprofile)
if err != nil {
log.Fatal(err)
}
pprof.WriteHeapProfile(f)
f.Close()
}
}()
}
if *balance { if *balance {
config, err := config.LoadConfig(*configDirectory, "") config, err := config.LoadConfig(*configDirectory, "")
if err != nil { if err != nil {
@ -284,5 +306,5 @@ func printLogo() {
func printVersion() { func printVersion() {
fmt.Println(" ") fmt.Println(" ")
fmt.Println(" Quilibrium Node - v1.2.8 Dawn") fmt.Println(" Quilibrium Node - v1.2.9 Dawn")
} }